gentoo auto-resync : 18:08:2022 - 14:34:37

4 files changed, 5 insertions, 211 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 5645bb98be38..cb3e95ac82d0 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 0034503c498c..617dc5c2f102 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -6,10 +6,8 @@ AUX aseprite-1.2.35_shared_libarchive.patch 5056 BLAKE2B b681461ccc86889fe387fe0
 AUX aseprite-1.2.35_shared_webp.patch 3815 BLAKE2B 4d7b5e66c2f8c6a53e8f35e0373ac224caaad3e1da927e1e8979d23e9106f49c8f105bd100aea06ca49b8ad5d2bbf5b868725eb9939b46fc5f69453246b1752f SHA512 b4a452b1ab1f94e4b47d0f567a7d9f35ffafc477372479701a3ba5ce2cf9860751f0f6db2d30eed9911a24959e07c2c1ba6c919f863248dbccd35b07b111b6b5
 AUX skia-m102_remove_angle2.patch 644 BLAKE2B 11705c6376ad85303b8d64e6046e6e31191774d940458ddc64b8bf2d2e998168d3f1c8cd4361d623c040a03fd948ee4e0b6189c774522ae255cd0f2f572bf4c0 SHA512 bc587d92286528cbaec140a0492d5381a1dfce8263e4a2c2231b1e28778e3e5919b3896ccae416faa1b39f34517b6ada77ccaf671d25ae7d3c552a7991f5bb45
 DIST Aseprite-v1.1.9-Source.zip 11746265 BLAKE2B fa16be059a7bb3b83705c56e7e93cbbb71676617a8d0798f0e481b09199ae069b85826615f8609acabb10a4e9a9da0857f2f99b03c2b913f26eee6d4dfdc0f0a SHA512 44c5878c67e69d2510c862e8f6869d727aa47b3d23d41d4e7318eca54c6d72fc5f89e72c70c160ce6da78fa091e11eedefa74e0273dc4cea59b2fe16c8851d9e
-DIST Aseprite-v1.2.35-Source.zip 61972632 BLAKE2B f9e24d04a19756f65041cb9c96a4142fe5078a4f6d8b48f69e79501822ff8a5070f350cf9016e5500fec5aeb82d4d8eb2c8d8b42a73fd8bc73aecab185d002fe SHA512 2577a683516adc9c601300da15e9099d6fa698fec32f4b62ce95c46412c1dd26b0538cc23996e0a1060ac4a4de47c2538124c4a01ade375f3b4efcbc99fbbdc8
 DIST Aseprite-v1.2.37-Source.zip 61977600 BLAKE2B f904e5f2a296fa5dae6dedb7b32d5249a8cda64e3b545057e9c033e3e428f050ee128b4f96098a655d871339a77b48d7be58fdad8edffd252d8bbd7b80d0db5f SHA512 c846a6bd6f11bea18e49146cac735a165c6ab7ca63f76b3dfaf7c1f64ddc6719804bfbb340e05ecb75a171b12db9a6a0444b26782d31a84cc810b7266843b0e9
 DIST skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.gh.tar.gz 53944562 BLAKE2B 9da3e8386cd7a18a6ee9362743bee4146c41038af8868a6f5e8a2dce468e4dc4669b488861d117da8d1bd8461b2ad47bfc300774a33a84153bca345d63a929a7 SHA512 9ae0032ee3861ce4958af6eb7047273d28b1faa3823576ef568e3c7faed7f49a9976540a72c3fa38234a4ae6319ac381324eff807938f9763781fd33ad67d075
 EBUILD aseprite-1.1.9.ebuild 2751 BLAKE2B 6c5780619c95e893e181291c0fbce2f826f8ac6ba2cc559fd33c1461432e2498461f02496031b0ffc50bd974dc64ae47301c4546d600c823d809a7f162c74e64 SHA512 4178e2fb7f9c8b6b267cae0bc83d9887718057c99c4f6dd9acf7c2f41f484e463e75df78a60fbd7f8699de5ae2ee221e476148bf2bb5e93e7c064b66f6b1ac2e
-EBUILD aseprite-1.2.35.ebuild 4953 BLAKE2B 486a36e9842834b2459fa6c01d17746662aa8c12bbd14ec1fa93492b98abce1dc74826ba4493a08aef4319f8fe7f34590aa29833eadc355efbccb43554e7e2a3 SHA512 0c2714d682069e7f1c47b1a080316f7428069fdce440c4b1a8df15084787d44711489a969e510c4812527d994273a5a89de25a9cdae8e07b701c3470e1d747df
-EBUILD aseprite-1.2.37.ebuild 5009 BLAKE2B 087c4b8a07e01b7b402ff0ec2df173eaeadbc5fde0066707ec7857b9ba8b4a8fca0216266bc556c700957ce1502bf826363a08d01cfc9cc3961244bb80b2ecc9 SHA512 3acc1898ae9f7db9000a572442bf37fc5cb2557924e5f1c3727ff65655ae59294ff3735bacaa3bba39899375a63fabdc92d429223137af44fe38156a20b79753
+EBUILD aseprite-1.2.37.ebuild 5074 BLAKE2B f2d6f624acc979bf17fe03fd2e01108477f7f68b02a850fb8216d40fd3f38d032d2fe0a1e7ab2fa56c1d25411e508015c3c306c8d326acfdb99dff0ce0cb3a94 SHA512 1620656405836b89f05538359e225ecef2c9563a7444dfbf237c7a4caa2d0c80e683e3ce07adde536de766d4b30ebb720d8f294e556fa43180af6276c607028e
 MISC metadata.xml 684 BLAKE2B a1ad6d72f940738634ce874c50abaadaee4f897a1a694170da97d4403a9fa69383934fff7392c1417b9b954c3c98a4f138a9da1921e01171a8ebf1ab91d9f256 SHA512 a4d1efc2228d170e868d8328d64a8195fec01807ca4a4424e44f55354d57ab1949c827dbadf6b8a2037979fa684cb6445d95feb37a61b4d3ac637620699f9a77
diff --git a/dev-games/aseprite/aseprite-1.2.35.ebuild b/dev-games/aseprite/aseprite-1.2.35.ebuild
deleted file mode 100644
index 701559c4ea4b..000000000000
--- a/dev-games/aseprite/aseprite-1.2.35.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop ninja-utils toolchain-funcs xdg-utils
-
-SKIA_VER="m102"
-# Last commit in ${SKIA_VER} feature branch
-# Don't use skia.googlesource.com, it produces non-reproducible tarballs
-SKIA_REV="3338e90707323d2cd3a150276acb9f39933deee2"
-
-DESCRIPTION="Animated sprite editor & pixel art tool"
-HOMEPAGE="https://www.aseprite.org"
-SRC_URI="https://github.com/aseprite/aseprite/releases/download/v${PV}/Aseprite-v${PV}-Source.zip
-	https://github.com/google/skia/archive/${SKIA_REV}.tar.gz -> skia-${SKIA_VER}-${SKIA_REV}.gh.tar.gz"
-
-# See https://github.com/aseprite/aseprite#license
-LICENSE="Aseprite-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="kde test webp"
-RESTRICT="bindist mirror !test? ( test )"
-
-RDEPEND="
-	app-arch/libarchive:=
-	app-text/cmark:=
-	dev-cpp/json11
-	dev-libs/tinyxml
-	media-libs/freetype
-	media-libs/giflib:=
-	media-libs/harfbuzz:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	net-misc/curl
-	sys-libs/zlib:=
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libxcb:=
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		kde-frameworks/kio:5
-	)
-	webp? ( media-libs/libwebp:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( dev-cpp/gtest )
-	app-arch/unzip
-	dev-util/gn
-	virtual/pkgconfig"
-
-DOCS=(
-	docs/ase-file-specs.md
-	docs/gpl-palette-extension.md
-	README.md
-)
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}/skia-${SKIA_VER}_remove_angle2.patch"
-	"${FILESDIR}/${P}_check_colorSpace.patch"
-	"${FILESDIR}/${P}_shared_libarchive.patch"
-	"${FILESDIR}/${P}_shared_json11.patch"
-	"${FILESDIR}/${P}_shared_webp.patch"
-	"${FILESDIR}/${P}_laf_fixes.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# Skia: remove custom optimizations
-	sed -i -e 's:"\/\/gn\/skia\:optimize",::g' \
-		"skia-${SKIA_REV}/gn/BUILDCONFIG.gn" || die
-	# Aseprite: don't install tga bundled library
-	sed -i -e '/install/d' src/tga/CMakeLists.txt || die
-	# Aseprite: don't use bundled gtest
-	sed -i -e '/add_subdirectory(googletest)/d' \
-		laf/third_party/CMakeLists.txt || die
-	# Fix shebang in thumbnailer
-	sed -i -e 's:#!/usr/bin/sh:#!/bin/sh:' \
-		src/desktop/linux/aseprite-thumbnailer || die
-}
-
-src_configure() {
-	einfo "Skia configuration"
-	cd "${WORKDIR}/skia-${SKIA_REV}" || die
-
-	tc-export AR CC CXX
-
-	passflags() {
-		local _f _x
-		_f=( ${1} )
-		_x="[$(printf '"%s", ' "${_f[@]}")]"
-		myconf_gn+=( ${2}="${_x}" )
-	}
-
-	local myconf_gn=(
-		ar=\"${AR}\"
-		cc=\"${CC}\"
-		cxx=\"${CXX}\"
-
-		is_official_build=true
-		is_component_build=false
-		is_debug=false
-
-		skia_use_egl=false
-		skia_use_dawn=false
-		skia_use_dng_sdk=false
-		skia_use_metal=false
-		skia_use_sfntly=false
-		skia_use_wuffs=false
-
-		skia_enable_pdf=false
-		skia_enable_svg=false
-		skia_use_expat=false
-		skia_use_ffmpeg=false
-		skia_use_fontconfig=false
-		skia_use_freetype=true
-		skia_use_gl=true
-		skia_use_harfbuzz=true
-		skia_use_icu=false
-		skia_use_libjpeg_turbo_decode=true
-		skia_use_libjpeg_turbo_encode=true
-		skia_use_libpng_decode=true
-		skia_use_libpng_encode=true
-		skia_use_libwebp_decode=$(usex webp true false)
-		skia_use_libwebp_encode=$(usex webp true false)
-		skia_use_lua=false
-		skia_use_vulkan=false
-		skia_use_x11=false
-		skia_use_xps=false
-		skia_use_zlib=true
-	)
-
-	passflags "${CFLAGS}" extra_cflags_c
-	passflags "${CXXFLAGS}" extra_cflags_cc
-	passflags "${LDFLAGS}" extra_ldflags
-	myconf_gn="${myconf_gn[@]}"
-	set -- gn gen --args="${myconf_gn% }" out/Static
-	echo "$@"
-	"$@" || die
-
-	einfo "Aseprite configuration"
-	cd "${WORKDIR}" || die
-
-	local mycmakeargs=(
-		-DENABLE_CCACHE=OFF
-		-DENABLE_DESKTOP_INTEGRATION=ON
-		-DENABLE_STEAM=OFF
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_QT_THUMBNAILER="$(usex kde)"
-		-DENABLE_UPDATER=OFF
-		-DENABLE_UI=ON
-		-DENABLE_WEBP="$(usex webp)"
-		-DLAF_WITH_EXAMPLES=OFF
-		-DLAF_WITH_TESTS="$(usex test)"
-		-DFULLSCREEN_PLATFORM=ON
-		-DSKIA_DIR="${WORKDIR}/skia-${SKIA_REV}/"
-		-DSKIA_LIBRARY_DIR="${WORKDIR}/skia-${SKIA_REV}/out/Static/"
-		-DSKIA_LIBRARY="${WORKDIR}/skia-${SKIA_REV}/out/Static/libskia.a"
-		-DSKSHAPER_LIBRARY="${WORKDIR}/skia-${SKIA_REV}/out/Static/libskshaper.a"
-		-DUSE_SHARED_CMARK=ON
-		-DUSE_SHARED_CURL=ON
-		-DUSE_SHARED_FREETYPE=ON
-		-DUSE_SHARED_GIFLIB=ON
-		-DUSE_SHARED_HARFBUZZ=ON
-		-DUSE_SHARED_JPEGLIB=ON
-		-DUSE_SHARED_JSON11=ON
-		-DUSE_SHARED_LIBARCHIVE=ON
-		-DUSE_SHARED_LIBPNG=ON
-		-DUSE_SHARED_PIXMAN=ON
-		-DUSE_SHARED_TINYXML=ON
-		-DUSE_SHARED_WEBP=ON
-		-DUSE_SHARED_ZLIB=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	einfo "Skia compilation"
-	cd "${WORKDIR}/skia-${SKIA_REV}" || die
-	eninja -C out/Static
-
-	einfo "Aseprite compilation"
-	cd "${WORKDIR}" || die
-	cmake_src_compile
-}
-
-src_install() {
-	newicon -s 64 "${S}/data/icons/ase64.png" "${PN}.png"
-	cmake_src_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-games/aseprite/aseprite-1.2.37.ebuild b/dev-games/aseprite/aseprite-1.2.37.ebuild
index aeb7901ac8ac..0848144f77df 100644
--- a/dev-games/aseprite/aseprite-1.2.37.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.37.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit cmake desktop ninja-utils toolchain-funcs xdg-utils
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake desktop ninja-utils python-any-r1 toolchain-funcs xdg-utils
 
 SKIA_VER="m102"
 # Last commit in ${SKIA_VER} feature branch
@@ -48,6 +50,7 @@ RDEPEND="
 	webp? ( media-libs/libwebp:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	test? ( dev-cpp/gtest )
 	app-arch/unzip
 	dev-util/gn