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[@]}"
}
