gentoo auto-resync : 26:07:2022 - 14:59:07

3 files changed, 15 insertions, 21 deletions

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 7d85b5b00ca0..d11413fc30b4 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -4,10 +4,10 @@ AUX aseprite-1.2.35_laf_fixes.patch 1265 BLAKE2B 9c0c7ab527f15fdce6de34351c2f4b0
 AUX aseprite-1.2.35_shared_json11.patch 1786 BLAKE2B e2ceb13497e61f8fa9d9025ded3ee8e0ffd12dfe2024a7a14d6210c712ec8574c9be3e932b0c04a7a2aad8ebb127e303f6f8d1f29e14177103b686f645210350 SHA512 f67a7d65567204e17c134d99e79f5a7bf29e9d17d28953ebadcc3921cdb80a9dd865979878138eb7c664486706a094dbcf8c105127ba833b049c5a59eb6af1cf
 AUX aseprite-1.2.35_shared_libarchive.patch 5056 BLAKE2B b681461ccc86889fe387fe0a061e4f785f45f2d46a28dd08144a8458bf19ef19f73bea7937515f74363f77655976761c512a198ac9a562d2e2acfb116875bafe SHA512 51ba9b5fb31a2eaa5bfdff61b2ca77aeb94aa080d3b894f641bcbf46b44c81a7310c4da426b69d9399c1b414a5f843b0633466d0eec5eb9048cd8f6b5d944f9c
 AUX aseprite-1.2.35_shared_webp.patch 3815 BLAKE2B 4d7b5e66c2f8c6a53e8f35e0373ac224caaad3e1da927e1e8979d23e9106f49c8f105bd100aea06ca49b8ad5d2bbf5b868725eb9939b46fc5f69453246b1752f SHA512 b4a452b1ab1f94e4b47d0f567a7d9f35ffafc477372479701a3ba5ce2cf9860751f0f6db2d30eed9911a24959e07c2c1ba6c919f863248dbccd35b07b111b6b5
-AUX skia-m102_remove_angle2.patch 562 BLAKE2B c4140e33bac4fb929510ca2317c73c3643bca02f975af84342cf23ecd9b440e8042942489d23f81eb3e37e93593a81630784134dbe8d0a8d9800c32211d8f209 SHA512 2099a86ff03bbe12dc83a691557f19b6e56889032203c5b3e17e533f7dd8ff38f2c4f28a4b25c320c501a7d29617f8190d73cf195a1150f0b867b84c587c9816
+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 skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.tar.gz 53866802 BLAKE2B c8a67c96a78bb09802b54536f994a0964ba46f1996cc1e7f41757c08802519ec0c7fe22c667b546e7d9cdee6b0d257f8629f2294b880ff9b5acac6a7f3bf18bf SHA512 15c44ffe7d1e9c678ab80826e4a76e783014859b05f1dc9410077e1a1a45b8b3bcc80bd99237e7b1a7e7301f73abdb51f7ddb10010ffe97418b2fc1356ea55e9
+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 4985 BLAKE2B 1ed04db758abf125ef2d9129dbae42d740ad2fa8d7c381b5dca5520933f546427129bf3f4b7035f2c9131f64cc80813e9c54d2b604180fe10d3a175c51090e0d SHA512 9634c1dcebf92950383dca7beff05d423322f3db4de1e142db3aadaa83f90d3503edadc46fd560395bb505d506ec59ba0be9e4c0298ad9658c0a36ef00dbb38d
+EBUILD aseprite-1.2.35.ebuild 4948 BLAKE2B d98e5dfee3f7ff05976afd380f36f44faeb546bb08bb232df6d2761f7a72d3f5594aacfc031501c70f86ea35e25a06b8726962c099e95e1914a48de9b20f63a4 SHA512 668f7431d22782a2eaecaa4c85ecb6d2f4de093f8e65ae6ae25d410247ae2d1b74211722e105b5fd4b43cb66cd28c8327063cf6a74f98d6460f8d4aa277d5fae
 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
index 367e97fc2ace..5e6b00b68a0c 100644
--- a/dev-games/aseprite/aseprite-1.2.35.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.35.ebuild
@@ -7,12 +7,13 @@ 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://skia.googlesource.com/skia/+archive/${SKIA_REV}.tar.gz -> skia-${SKIA_VER}-${SKIA_REV}.tar.gz"
+	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"
@@ -68,18 +69,11 @@ PATCHES=(
 	"${FILESDIR}/${P}_laf_fixes.patch"
 )
 
-src_unpack() {
-	unpack "Aseprite-v${PV}-Source.zip"
-	# Unpack skia into separate dir
-	mkdir -p "${WORKDIR}/skia" || die
-	cd "${WORKDIR}/skia" || die
-	unpack "skia-${SKIA_VER}-${SKIA_REV}.tar.gz"
-}
-
 src_prepare() {
 	cmake_src_prepare
 	# Skia: remove custom optimizations
-	sed -i -e 's:"\/\/gn\/skia\:optimize",::g' skia/gn/BUILDCONFIG.gn || die
+	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
@@ -92,7 +86,7 @@ src_prepare() {
 
 src_configure() {
 	einfo "Skia configuration"
-	cd "${WORKDIR}/skia" || die
+	cd "${WORKDIR}/skia-${SKIA_REV}" || die
 
 	tc-export AR CC CXX
 
@@ -164,10 +158,10 @@ src_configure() {
 		-DLAF_WITH_EXAMPLES=OFF
 		-DLAF_WITH_TESTS="$(usex test)"
 		-DFULLSCREEN_PLATFORM=ON
-		-DSKIA_DIR="${WORKDIR}/skia/"
-		-DSKIA_LIBRARY_DIR="${WORKDIR}/skia/out/Static/"
-		-DSKIA_LIBRARY="${WORKDIR}/skia/out/Static/libskia.a"
-		-DSKSHAPER_LIBRARY="${WORKDIR}/skia/out/Static/libskshaper.a"
+		-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
@@ -187,7 +181,7 @@ src_configure() {
 
 src_compile() {
 	einfo "Skia compilation"
-	cd "${WORKDIR}/skia" || die
+	cd "${WORKDIR}/skia-${SKIA_REV}" || die
 	eninja -C out/Static
 
 	einfo "Aseprite compilation"
diff --git a/dev-games/aseprite/files/skia-m102_remove_angle2.patch b/dev-games/aseprite/files/skia-m102_remove_angle2.patch
index 71b9bd6f3326..7539a1e9aeb7 100644
--- a/dev-games/aseprite/files/skia-m102_remove_angle2.patch
+++ b/dev-games/aseprite/files/skia-m102_remove_angle2.patch
@@ -1,5 +1,5 @@
---- a/skia/third_party/zlib/BUILD.gn	2022-07-10 00:39:12.507321714 +0300
-+++ b/skia/third_party/zlib/BUILD.gn	2022-07-10 00:40:49.175261689 +0300
+--- a/skia-3338e90707323d2cd3a150276acb9f39933deee2/third_party/zlib/BUILD.gn	2022-07-10 00:39:12.507321714 +0300
++++ b/skia-3338e90707323d2cd3a150276acb9f39933deee2/third_party/zlib/BUILD.gn	2022-07-10 00:40:49.175261689 +0300
 @@ -197,12 +197,3 @@
  config("zlib_config") {
  }