gentoo auto-resync : 29:09:2023 - 17:37:53

5 files changed, 29 insertions, 9 deletions

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 8b3d3799c61b..b617911f0800 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -6,8 +6,8 @@ AUX gpac-2.2.0-ffmpeg6.patch 1162 BLAKE2B bed72ce7db91a5c25f74ae33561fa47c2951db
 DIST gpac-2.0.0.tar.gz 11362932 BLAKE2B a8489831efb77c374d13e2edb3951e60a94907c4cd8601919e1390aee0e9002249e97a9200fd006c2aa783c516f701f7695aa84b5f3596a3bc90290916ff4086 SHA512 e95e6d78167fc306917b3ac89e56ba511bbcb0c825da118f5ba374504499352104b5c1f3ee71e7ec018015b8e302f9b07162d22287ddb21c8564b097d900913f
 DIST gpac-2.2.0.tar.gz 11376708 BLAKE2B f50c131912787c274a5b2d37e242e37ddd07f2c6eab3a932ec243f0fc36aeb06d4f16fd861eb3534f93534c291c55fddc2bcd1f573d2ed186e17464512a1f089 SHA512 4ac63a79a5d1057aadb59429af84ca9e4e0c0b863b19beafb60bd1c30425357dec45b5d6d48d452eb94002b059c9eb0c7bb0cc14222194f641604f964b3207c2
 DIST gpac-2.2.1.tar.gz 11377184 BLAKE2B 44b47459da0f203d0e4c0eed5836a59f44fb508db4e601b46e9ffdb53d89bb49e22ccdfe7951b17581130f186c47ae8efc0d9002685d5cf9a3547159356d2d9e SHA512 873df4c2fdc3594a0f3bce66d511cee14669643042ab1ca8d7f370ad3f50636c32c31f79818051d00bf844de30a5533ae30c81ed168baf2626a152771b6a6845
-EBUILD gpac-2.0.0.ebuild 3259 BLAKE2B 6abca7a4e0f0ef384e5b81fc24a511effc6925610ddf079f8934e20ea4b227831aad72b11deb5cf547d87eca5c57c4cea84dac2403ed4e0d9394d5298bd6b3a1 SHA512 930f88012e50dba329040c7ccce94eadeb4e63b7ae9dd6c6797c894c052d0f28944b7d65f7fea42bd1889f46bfa3c0b061eecfc59019155d674ccdb958aece3e
-EBUILD gpac-2.2.0.ebuild 3199 BLAKE2B f541ecf756502931b4215a19c563b0f52dc49726b5824cc8247c0305ff51b905ce3803371e483b529befcfab24b7b49cc439595a648ae638b7567394b840dbce SHA512 e0c62631796848443a3aff2b669160724c1f91dd9a4bf77201cbfdb035e3f94558fb2b437f491cea9e301c421ca548e583430229961b4abbb763caa958ef2fb8
-EBUILD gpac-2.2.1-r1.ebuild 3199 BLAKE2B 6d876b233fbc383488bacb1ef77e13e7fb1325d09d6be80b84d6e90fff222286dabec1225c7b5516dad5734306db97126703fc4e918bb0f7ea4ac9faab7653d9 SHA512 ed2fcec143caf06428977a84522949aecf7ff15bfa618c2ba2fad1690738b7bee4003e911c819d80a34893388923e82474e09cdeef3b50bdcc70a5f960a94f26
-EBUILD gpac-9999.ebuild 3153 BLAKE2B b252f7f92aeb3ac1eb6cedb40ff2b03ea1eb723658b9ea8c09bc11ef24c44b6b0c4562b7ef1fec981ccf6087f028fb19b4da52dad1ae9766e557d9e02b00e1ef SHA512 7f0a85c80d7a0e9a0eaf19ca4f1d8c0efb273249a2ace297d89b7aff1b91b0b3577140235b83ba666461dc12b76c2e5e2f17c7e19f8cb12cb33114f7da734043
+EBUILD gpac-2.0.0.ebuild 3354 BLAKE2B 5c55018a050f8dacee193372c0c97161e628613a50454e325aae39dcac11fecdd0b1d2f816ba21295a9b493467b4542dbc4264f1b34e796fff493a798bd7151b SHA512 02e8e64a69d731ace0e0846b322aa3fa310b278f874d3d4505bd391887c74dc585e5fc338d9e8400509de8d57ef7e751b2c9725f4d35e43ff1a4269a3bd268ca
+EBUILD gpac-2.2.0.ebuild 3322 BLAKE2B f1b08d5da5e9a640f9583011d62bdd5b023e9e13b8ff1f3d6815285cbc7e782a9161b13dda6f12be509cbf751f26adc2e610e6b6b487ced9a564758d57f7e255 SHA512 8476f1d169719b389f625aec0804c54b4ee8e53ff4c274111709c39c1bf5261a83f8fb849ff15f297df3dfbf9d9672c5caab304853186a0915b10e1dcb3c2064
+EBUILD gpac-2.2.1-r1.ebuild 3322 BLAKE2B 509e5436e088059b9138b4e4164123089ffe3b618924ff3b2906efe42832a40fc81d44867b5dfd515f5f705ded6e8b8881f040f57cc3355de0338800a5cf44d4 SHA512 b0a118aebcb52d6b6b7cc567f0fc0137f697c15c6c6799c48d039a67403078a03f12c945b76d33770b646fd31649703fc52f256707f906c974e4ddfd177dc54e
+EBUILD gpac-9999.ebuild 3276 BLAKE2B ab7fd6c71c4754d02f0502037660c6474edbfbdc54443edf1bb2235b02594e70f35e02d97a45e49b7d9d663c6ae7788fb57fe01c8b2d9497d0913946b4199611 SHA512 2dd177c842d2bf7ef3bbfe144db213bfb05de9d7a90a54c791792039181abf90f0861f94fde5e98a248e3a21bfd5555669bcf54e2b4b10ccb352d627889904e8
 MISC metadata.xml 357 BLAKE2B d08714f001a00d250eaffef3818ed1cf0ea1dfd907799ac7f87c13d32f34106a3dc3982c24729d09c9eaec20143b68b2e966db97a061ee8a4592a8a5d20b8ab2 SHA512 7417738d0c891a1544fa25a9fe4785025e83ed7e5d498335215f70e61b3b599b17cbd9114e660fc5db4315dfeddee99a351b76ff0b801657f990827187f416c5
diff --git a/media-video/gpac/gpac-2.0.0.ebuild b/media-video/gpac/gpac-2.0.0.ebuild
index 34e01f0cc807..884c45073b43 100644
--- a/media-video/gpac/gpac-2.0.0.ebuild
+++ b/media-video/gpac/gpac-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -64,7 +64,6 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.0-configure.patch"
-	"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
 )
 
 DOCS=(
@@ -91,6 +90,9 @@ my_use() {
 src_prepare() {
 	default
 	sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
+
+	# TODO: remove when old zlib is no longer in tree
+	has_version "<sys-libs/zlib-1.3" && eapply "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
 }
 
 src_configure() {
diff --git a/media-video/gpac/gpac-2.2.0.ebuild b/media-video/gpac/gpac-2.2.0.ebuild
index f99b1f15a15f..abd67bfaac3c 100644
--- a/media-video/gpac/gpac-2.2.0.ebuild
+++ b/media-video/gpac/gpac-2.2.0.ebuild
@@ -64,7 +64,6 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-configure.patch"
-	"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
 	"${FILESDIR}/${PN}-2.2.0-ffmpeg6.patch"
 	"${FILESDIR}/${PN}-2.2.0-ffmpeg6-deux.patch"
 )
@@ -88,6 +87,13 @@ my_use() {
 	fi
 }
 
+src_prepare() {
+	default
+
+	# TODO: remove when old zlib is no longer in tree
+	has_version "<sys-libs/zlib-1.3" && eapply "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
+}
+
 src_configure() {
 	tc-export CC CXX AR RANLIB
 
diff --git a/media-video/gpac/gpac-2.2.1-r1.ebuild b/media-video/gpac/gpac-2.2.1-r1.ebuild
index fc002d795023..406fedb39196 100644
--- a/media-video/gpac/gpac-2.2.1-r1.ebuild
+++ b/media-video/gpac/gpac-2.2.1-r1.ebuild
@@ -64,7 +64,6 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-configure.patch"
-	"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
 	"${FILESDIR}/${PN}-2.2.0-ffmpeg6.patch"
 	"${FILESDIR}/${PN}-2.2.0-ffmpeg6-deux.patch"
 )
@@ -88,6 +87,13 @@ my_use() {
 	fi
 }
 
+src_prepare() {
+	default
+
+	# TODO: remove when old zlib is no longer in tree
+	has_version "<sys-libs/zlib-1.3" && eapply "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
+}
+
 src_configure() {
 	tc-export CC CXX AR RANLIB
 
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index f21d8e2a08aa..963ca68ca30f 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -64,7 +64,6 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-configure.patch"
-	"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
 	"${FILESDIR}/${PN}-2.2.0-ffmpeg6.patch"
 )
 
@@ -87,6 +86,13 @@ my_use() {
 	fi
 }
 
+src_prepare() {
+	default
+
+	# TODO: remove when old zlib is no longer in tree
+	has_version "<sys-libs/zlib-1.3" && eapply "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
+}
+
 src_configure() {
 	tc-export CC CXX AR RANLIB