summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2020-09-10 21:43:32 +0200
committerLars Wendler <polynomial-c@gentoo.org>2020-09-10 21:43:57 +0200
commit2cc4cf4ab5dc702c3786a2a2ad59ed3fc379beae (patch)
tree522fde06a956893586983f19dfed6f57ee4a1a90 /media-libs
parentdev-python/numpy: Bump to 1.19.2 (diff)
downloadgentoo-2cc4cf4ab5dc702c3786a2a2ad59ed3fc379beae.tar.gz
gentoo-2cc4cf4ab5dc702c3786a2a2ad59ed3fc379beae.tar.bz2
gentoo-2cc4cf4ab5dc702c3786a2a2ad59ed3fc379beae.zip
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@gentoo.org>
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libpng-compat/libpng-compat-1.5.30.ebuild25
1 files 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 d0ba31d9b8d6..da883b36c4f1 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() {