[gentoo-commits] repo/gentoo:master commit in: media-libs/libpng-compat/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libpng-compat/

[Michał Górny]

commit:     abb9a0b9fd23098b016fbe46cdb42aa5bd5f6d4c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  5 19:21:51 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov  8 06:47:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abb9a0b9

media-libs/libpng-compat: Move from media-libs/libpng

Bug: https://bugs.gentoo.org/697820
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-libs/libpng-compat/Manifest                  |  3 ++
 .../libpng-compat/libpng-compat-1.2.59.ebuild      | 43 ++++++++++++++++
 .../libpng-compat/libpng-compat-1.5.30.ebuild      | 60 ++++++++++++++++++++++
 media-libs/libpng-compat/metadata.xml              | 24 +++++++++
 4 files changed, 130 insertions(+)

diff --git a/media-libs/libpng-compat/Manifest b/media-libs/libpng-compat/Manifest
new file mode 100644
index 00000000000..4ca0b598965
--- /dev/null
+++ b/media-libs/libpng-compat/Manifest
@@ -0,0 +1,3 @@
+DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff28903083792cf07dae841ad13b3636b9d715d9bbfc459a134dfdf2a9b37bac1fbcff14a91c214340325ba8266431e SHA512 bfdc51eca72a76697f1396611a08aa4ce6a169837197699c55d845fdef17850e8f7665b7b81ba815c277453737f12eeb41409ff9c7eca1ac0c0d134c44492a6e
+DIST libpng-1.5.30-apng.patch.gz 10272 BLAKE2B 335b99e30a476b358483b0ca44d895580bddad05d18ab7f47b4cfa383a04c53c1db7d5773919445c281b0b0921485b946cb67c36db07aad494f051d4db19e4e1 SHA512 1c06e2e1b2420580d4399b7b752df9ed193c81febcc9983351fc72ce3900dc43a433780e7a0184b612b7723d8870a514db7398ec0c081dabe6cb4ea824880236
+DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d

diff --git a/media-libs/libpng-compat/libpng-compat-1.2.59.ebuild b/media-libs/libpng-compat/libpng-compat-1.2.59.ebuild
new file mode 100644
index 00000000000..c785849ddb9
--- /dev/null
+++ b/media-libs/libpng-compat/libpng-compat-1.2.59.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# this ebuild is only for the libpng12.so.0 SONAME for ABI compat
+
+inherit libtool multilib-minimal
+
+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}
+
+LICENSE="libpng"
+SLOT="1.2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~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"
+
+DOCS=""
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf --disable-static
+}
+
+multilib_src_compile() {
+	emake libpng12.la
+}
+
+multilib_src_install() {
+	newlib.so .libs/libpng12.so.0.* libpng12.so.0
+}

diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
new file mode 100644
index 00000000000..79fc3abbfcd
--- /dev/null
+++ b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# this ebuild is only for the libpng15.so.15 SONAME for ABI compat
+
+inherit eutils libtool multilib-minimal
+
+MY_P=libpng-${PV}
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/libpng/${MY_P}.tar.xz
+	apng? ( https://dev.gentoo.org/~polynomial-c/${MY_P}-apng.patch.gz )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="libpng"
+SLOT="1.5"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="apng neon"
+
+RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	!=media-libs/libpng-1.5*"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+DOCS=""
+
+pkg_setup() {
+	local _preserved_lib=${EROOT}/usr/$(get_libdir)/libpng15.so.15
+	[[ -e ${_preserved_lib} ]] && rm -f "${_preserved_lib}"
+}
+
+src_prepare() {
+	default
+	if use apng; then
+		# fix windows path in patch file. Please check for each release if this can be removed again.
+		sed 's@scripts\\symbols.def@scripts/symbols.def@' \
+			-i "${WORKDIR}"/${PN}-*-apng.patch || die
+		eapply "${WORKDIR}"/${PN}-*-apng.patch
+		# Don't execute symbols check with apng patch wrt #378111
+		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
+	fi
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-static \
+		--enable-arm-neon=$(usex neon)
+}
+
+multilib_src_compile() {
+	emake libpng15.la
+}
+
+multilib_src_install() {
+	newlib.so .libs/libpng15.so.15.* libpng15.so.15
+}

diff --git a/media-libs/libpng-compat/metadata.xml b/media-libs/libpng-compat/metadata.xml
new file mode 100644
index 00000000000..973c824aaa4
--- /dev/null
+++ b/media-libs/libpng-compat/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="apng">support unofficial APNG (Animated PNG) spec</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:libpng:libpng</remote-id>
+		<remote-id type="sourceforge">apng</remote-id>
+	</upstream>
+	<slots>
+		<slot name="0">For building against. This is the only slot
+			that provides headers and command line tools.</slot>
+		<slot name="1.2">For binary compatibility, provides libpng12.so.0
+			only.</slot>
+		<slot name="1.5">For binary compatibility, provides libpng15.so.15
+			only.</slot>
+		<subslots>Reflect ABI compatibility for libpng.so.</subslots>
+	</slots>
+</pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: media-libs/libpng-compat/

[Lars Wendler]

commit:     2cc4cf4ab5dc702c3786a2a2ad59ed3fc379beae
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 10 19:43:32 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 19:43:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc4cf4a

media-libs/libpng-compat: Fixed build with USE="apng"

- Converted to EAPI-7
- Minor improvements

Closes: https://bugs.gentoo.org/741546
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../libpng-compat/libpng-compat-1.5.30.ebuild      | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
index d0ba31d9b8d..da883b36c4f 100644
--- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # this ebuild is only for the libpng15.so.15 SONAME for ABI compat
 
 inherit eutils libtool multilib-minimal
 
-MY_P=libpng-${PV}
+MY_P="libpng-${PV}"
 DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/"
 SRC_URI="mirror://sourceforge/libpng/${MY_P}.tar.xz
 	apng? ( https://dev.gentoo.org/~polynomial-c/${MY_P}-apng.patch.gz )"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="libpng"
 SLOT="1.5"
@@ -21,13 +21,13 @@ IUSE="apng neon"
 
 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	!=media-libs/libpng-1.5*"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils"
 
 DOCS=""
 
 pkg_setup() {
-	local _preserved_lib=${EROOT}/usr/$(get_libdir)/libpng15.so.15
+	local _preserved_lib="${EROOT}/usr/$(get_libdir)/libpng15.so.15"
 	[[ -e ${_preserved_lib} ]] && rm -f "${_preserved_lib}"
 }
 
@@ -36,8 +36,8 @@ src_prepare() {
 	if use apng; then
 		# fix windows path in patch file. Please check for each release if this can be removed again.
 		sed 's@scripts\\symbols.def@scripts/symbols.def@' \
-			-i "${WORKDIR}"/${PN}-*-apng.patch || die
-		eapply "${WORKDIR}"/${PN}-*-apng.patch
+			-i "${WORKDIR}"/${PN/-compat}-*-apng.patch || die
+		eapply "${WORKDIR}"/${PN/-compat}-*-apng.patch
 		# Don't execute symbols check with apng patch wrt #378111
 		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
 	fi
@@ -45,10 +45,11 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-static \
-		--enable-arm-neon=$(usex neon)
+	local myeconfargs=(
+		--disable-static
+		--enable-arm-neon="$(usex neon)"
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/libpng-compat/

[Fabian Groffen]

commit:     46bcc47c8d739381bb490f87665758a32c2fa2ad
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 17:45:38 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 17:46:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46bcc47c

media-libs/libpng-compat: drop ppc-aix m68k-mint

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 media-libs/libpng-compat/libpng-compat-1.5.30.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
index da883b36c4f..fd1b3b679b1 100644
--- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="libpng"
 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 ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng neon"
 
 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: media-libs/libpng-compat/

[Lars Wendler]

commit:     c0f0a5f1b35c2e09bd32eff150674305673e2d81
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 14 00:31:02 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr 14 06:46:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f0a5f1

media-libs/libpng-compat: use cpu_flags_arm_neon, not 'neon' in USE

USE="neon" is deprecated and shouldn't be used.

Closes: https://bugs.gentoo.org/782733
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/libpng-compat/libpng-compat-1.5.30.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
index 9d75a935744..ff778abc777 100644
--- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="libpng"
 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="apng neon"
+IUSE="apng cpu_flags_arm_neon"
 
 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	!=media-libs/libpng-1.5*"
@@ -47,7 +47,7 @@ src_prepare() {
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-static
-		--enable-arm-neon="$(usex neon)"
+		$(use_enable cpu_flags_arm_neon arm-neon check)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }

[gentoo-commits] repo/gentoo:master commit in: media-libs/libpng-compat/

[Lars Wendler]

commit:     82539306a95fb03f858ba890b81965a7387337c9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 14 00:33:54 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr 14 06:46:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82539306

media-libs/libpng-compat: drop unused eutils

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/libpng-compat/libpng-compat-1.5.30.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
index ff778abc777..fc2d59af30c 100644
--- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # this ebuild is only for the libpng15.so.15 SONAME for ABI compat
 
-inherit eutils libtool multilib-minimal
+inherit libtool multilib-minimal
 
 MY_P="libpng-${PV}"
 DESCRIPTION="Portable Network Graphics library"

[gentoo-commits] repo/gentoo:master commit in: media-libs/libpng-compat/

[Lars Wendler]

commit:     7f580dd940f3d64e036e1da5e5efd4f05c897d0d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 14 00:34:27 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr 14 06:46:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f580dd9

media-libs/libpng-compat: define blank array, not blank string for DOCS

This is more conventional.

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/libpng-compat/libpng-compat-1.5.30.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
index fc2d59af30c..21c669bb96b 100644
--- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
@@ -24,7 +24,9 @@ RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 DEPEND="${RDEPEND}"
 BDEPEND="app-arch/xz-utils"
 
-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=()
 
 pkg_setup() {
 	local _preserved_lib="${EROOT}/usr/$(get_libdir)/libpng15.so.15"

[gentoo-commits] repo/gentoo:master commit in: media-libs/libpng-compat/

[Sam James]

commit:     47a81ab7e62bb0fc71e74b3f799bcd52904a6645
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  5 16:49:17 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  6 10:02:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47a81ab7

media-libs/libpng-compat: fix sourceforge remote-id

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/libpng-compat/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libpng-compat/metadata.xml b/media-libs/libpng-compat/metadata.xml
index 973c824aaa4..e6cbb055b09 100644
--- a/media-libs/libpng-compat/metadata.xml
+++ b/media-libs/libpng-compat/metadata.xml
@@ -10,7 +10,7 @@
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libpng:libpng</remote-id>
-		<remote-id type="sourceforge">apng</remote-id>
+		<remote-id type="sourceforge">libpng</remote-id>
 	</upstream>
 	<slots>
 		<slot name="0">For building against. This is the only slot

[gentoo-commits] repo/gentoo:master commit in: media-libs/libpng-compat/

[Sam James]

commit:     d8f2252d1f45b846243257dccfbfec6eb80cd5aa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 12:27:08 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 10:03:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8f2252d

media-libs/libpng-compat: Copy codec@ as co-maint.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/23004
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/libpng-compat/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/media-libs/libpng-compat/metadata.xml b/media-libs/libpng-compat/metadata.xml
index 4354ec6f334d..5f08da95b1cc 100644
--- a/media-libs/libpng-compat/metadata.xml
+++ b/media-libs/libpng-compat/metadata.xml
@@ -5,6 +5,10 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>codec@gentoo.org</email>
+		<name>Codec project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libpng:libpng</remote-id>
 		<remote-id type="sourceforge">libpng</remote-id>

[gentoo-commits] repo/gentoo:master commit in: media-libs/libpng-compat/

[Sam James]

commit:     ae451481404fffd2efe7cee69f13d511c22dfab4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 21:49:41 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 21:49:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae451481

media-libs/libpng-compat: EAPI 8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ....2.59.ebuild => libpng-compat-1.2.59-r1.ebuild} | 25 ++++++++++++----------
 ....5.30.ebuild => libpng-compat-1.5.30-r1.ebuild} | 16 ++++++++------
 2 files changed, 23 insertions(+), 18 deletions(-)

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
similarity index 58%
rename from media-libs/libpng-compat/libpng-compat-1.2.59.ebuild
rename to 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
similarity index 83%
rename from media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
rename to 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[@]}"
 }