commit: a07974088923c8a72d2ba477c5c0c91faf1c5265 Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> AuthorDate: Fri Apr 20 14:45:05 2018 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Mon Apr 23 14:53:13 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0797408
app-admin/chrpath: epatch->PATCHES=() Also dropped eutils as unneeded. Package-Manager: Portage-2.3.31, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/8087 app-admin/chrpath/chrpath-0.13-r2.ebuild | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild index fe4a867ea64..ae32d8001b8 100644 --- a/app-admin/chrpath/chrpath-0.13-r2.ebuild +++ b/app-admin/chrpath/chrpath-0.13-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils autotools +inherit autotools DESCRIPTION="chrpath can modify the rpath and runpath of ELF executables" HOMEPAGE="http://directory.fsf.org/project/chrpath/"; @@ -15,15 +15,18 @@ SLOT="0" KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" +PATCHES=( + "${FILESDIR}"/${P}-multilib.patch + "${FILESDIR}"/${PN}-keepgoing.patch + "${FILESDIR}"/${P}-testsuite-1.patch +) + src_prepare() { - epatch "${FILESDIR}"/${P}-multilib.patch - epatch "${FILESDIR}"/${PN}-keepgoing.patch - epatch "${FILESDIR}"/${P}-testsuite-1.patch + default # disable installing redundant docs in the wrong dir sed -i -e '/doc_DATA/d' Makefile.am || die # fix for automake-1.13, #467538 sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die - eapply_user eautoreconf } @@ -32,7 +35,8 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die - dodoc ChangeLog AUTHORS NEWS README - use static-libs || find "${D}" -name "*.la" -exec rm '{}' + + default + if ! use static-libs; then + find "${D}" -name "*.la" -delete || die + fi }
