commit: 2a95c45ef0c7f9ded26a1c11bff8b049d7b48e57 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Sep 18 16:09:48 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Sep 18 16:13:41 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a95c45e
media-libs/tiff: EAPI-7 bump Package-Manager: Portage-2.3.49, Repoman-2.3.10 media-libs/tiff/tiff-4.0.9-r4.ebuild | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/media-libs/tiff/tiff-4.0.9-r4.ebuild b/media-libs/tiff/tiff-4.0.9-r4.ebuild index f0f7306f5cb..25c34ed45b9 100644 --- a/media-libs/tiff/tiff-4.0.9-r4.ebuild +++ b/media-libs/tiff/tiff-4.0.9-r4.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit autotools libtool ltprune multilib-minimal +inherit autotools libtool multilib-minimal DESCRIPTION="Tag Image File Format (TIFF) library" HOMEPAGE="http://libtiff.maptools.org"; @@ -15,10 +15,11 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="+cxx jbig jpeg lzma static-libs test zlib" -RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) +RDEPEND=" + jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )" + lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" REQUIRED_USE="test? ( jpeg )" #483132 @@ -48,6 +49,7 @@ src_prepare() { multilib_src_configure() { local myeconfargs=( --without-x + --with-docdir=/usr/share/doc/${PF} $(use_enable cxx) $(use_enable jbig) $(use_enable jpeg) @@ -76,6 +78,6 @@ multilib_src_test() { } multilib_src_install_all() { - prune_libtool_files --all - rm -f "${ED%/}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} + find "${D}" -name '*.la' -delete || die + rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die }
