From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F044E1382C5 for ; Mon, 23 Apr 2018 14:53:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4866DE0901; Mon, 23 Apr 2018 14:53:23 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F0D5E0901 for ; Mon, 23 Apr 2018 14:53:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3054C335C2E for ; Mon, 23 Apr 2018 14:53:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC74527C for ; Mon, 23 Apr 2018 14:53:20 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1524495193.a07974088923c8a72d2ba477c5c0c91faf1c5265.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/chrpath/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/chrpath/chrpath-0.13-r2.ebuild X-VCS-Directories: app-admin/chrpath/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: a07974088923c8a72d2ba477c5c0c91faf1c5265 X-VCS-Branch: master Date: Mon, 23 Apr 2018 14:53:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ae57bdbb-f90d-4fa5-bcbe-a81c8b491577 X-Archives-Hash: cf8fc58a3e1e9d577ee6edbea5a96997 commit: a07974088923c8a72d2ba477c5c0c91faf1c5265 Author: Marty E. Plummer startmail com> AuthorDate: Fri Apr 20 14:45:05 2018 +0000 Commit: Mikle Kolyada gentoo 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 }