gentoo auto-resync : 26:12:2022 - 02:06:21

3 files changed, 25 insertions, 20 deletions

diff --git a/media-libs/libpng-compat/Manifest b/media-libs/libpng-compat/Manifest
index b6cfe9e42ec4..e6a79863bf3e 100644
--- a/media-libs/libpng-compat/Manifest
+++ b/media-libs/libpng-compat/Manifest
@@ -1,5 +1,5 @@
 DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff28903083792cf07dae841ad13b3636b9d715d9bbfc459a134dfdf2a9b37bac1fbcff14a91c214340325ba8266431e SHA512 bfdc51eca72a76697f1396611a08aa4ce6a169837197699c55d845fdef17850e8f7665b7b81ba815c277453737f12eeb41409ff9c7eca1ac0c0d134c44492a6e
 DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d
-EBUILD libpng-compat-1.2.59.ebuild 900 BLAKE2B f0cdaf25bd129a47fe60229973497b3d45d772eaefc6eac9406947d0acd72969e49bb9cfaf838a4798a9ca4edb00ff612c805a1e8b563ba99ed08a5b4c1ac6e7 SHA512 810dc61ed8cf6e17e6be2e3b3f9c4f8232dce3c20a32f7680a641f09b28e188130158a95f147405aafb9e164c43a44608c79d604517c022c5e3bbd59044d33e4
-EBUILD libpng-compat-1.5.30.ebuild 1398 BLAKE2B b6cd70c28ac819f51a7f818e0847b70d66169f8ca5bf1a1fe5a521159a86f47e3768e5aa7e12422839ee8696a67a460bcf6f46508dff63f0479011756fd03ee8 SHA512 94fe6566944b17983f2c4f67b46f0589ee7ec4ef4630d909cd6ec0e7bfe3e8bf20981eefc87e43735f60a43bf7d420723af8eb113d3af527494970816a237d78
+EBUILD libpng-compat-1.2.59-r1.ebuild 1005 BLAKE2B 23909fba03228d43982369ca570fe8687f640667939e3e2381e5fda6c9caca436e25627dc0433722af0f2dca36c7e19c81901b2030752490aca6a4afe28db33d SHA512 9aa76124c02c9b0b81cd05e629a93b17052d32f88390346ae19df57ebf02c66995805151d441b54fcad3201d651a22122535c7267718d15d32eefe70e4e088a7
+EBUILD libpng-compat-1.5.30-r1.ebuild 1356 BLAKE2B 0aa30c0dece6dcc317a419174286d3bc81044817a18c1f6b6f756792ff9c0cd105035a05c39ea5592fb1b68d0e31e6d76d7c0f07a1153f43f782bd46d9d694d1 SHA512 2faef82ccf87dabbffb9244c2dba98a576812d36de44188994f42eb0ef1da92a109e1ae29abb99424e5a7d8165333efc492e0caf4ab9df2405beaefbcf3fd7d8
 MISC metadata.xml 750 BLAKE2B 4ab8b2f2e0787e4f877dd996e5e2af7d2d630b4c52064892fbfe0a68ce807a03217d4b57e90a5e13f7e41dc33b4bd8c34387e9dc30e87b06eb2c631401cc215c SHA512 1afb7c2085868832cf5b8f5afa309a3704ac941992db806e7b2befe35482e6be6f7e59ea0c0dd220f3db1008c92b489fbe2dd174f5859ec539e6e8e0158c4a73
diff --git a/media-libs/libpng-compat/libpng-compat-1.2.59.ebuild b/media-libs/libpng-compat/libpng-compat-1.2.59-r1.ebuild
index 4fa1efb0d889..f3cad8bf0993 100644
--- a/media-libs/libpng-compat/libpng-compat-1.2.59.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.2.59-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-# this ebuild is only for the libpng12.so.0 SONAME for ABI compat
+# This ebuild is only for the libpng12.so.0 SONAME for ABI compat
 
 inherit libtool multilib-minimal
 
@@ -11,27 +11,30 @@ MY_P=libpng-${PV}
 DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/"
 SRC_URI="mirror://sourceforge/libpng/${MY_P}.tar.xz"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="libpng"
 SLOT="1.2"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	!=media-libs/libpng-1.2*"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	!=media-libs/libpng-1.2*
+"
+DEPEND="${RDEPEND}"
 
-DOCS=""
+# Don't install any docs here because we're literally just installing the
+# old library for compatibility. Use libpng for the full contents.
+DOCS=()
 
 src_prepare() {
 	default
+
 	elibtoolize
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} econf --disable-static
+	ECONF_SOURCE="${S}" econf
 }
 
 multilib_src_compile() {
diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30-r1.ebuild
index a906a0b68259..ba986eb8c9c0 100644
--- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.5.30-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# this ebuild is only for the libpng15.so.15 SONAME for ABI compat
+# This ebuild is only for the libpng15.so.15 SONAME for ABI compat
 
 inherit libtool multilib-minimal
 
@@ -18,10 +18,11 @@ SLOT="1.5"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="cpu_flags_arm_neon"
 
-RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	!=media-libs/libpng-1.5*"
+RDEPEND="
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	!=media-libs/libpng-1.5*
+"
 DEPEND="${RDEPEND}"
-BDEPEND="app-arch/xz-utils"
 
 # Don't install any docs here because we're literally just installing the
 # old library for compatibility. Use libpng for the full contents.
@@ -34,14 +35,15 @@ pkg_setup() {
 
 src_prepare() {
 	default
+
 	elibtoolize
 }
 
 multilib_src_configure() {
 	local myeconfargs=(
-		--disable-static
 		$(use_enable cpu_flags_arm_neon arm-neon check)
 	)
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }