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 158C71382C5 for ; Sun, 20 May 2018 01:10:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C86DE09BA; Sun, 20 May 2018 01:10:40 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 BDEFDE09BA for ; Sun, 20 May 2018 01:10:39 +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 0B1EE335C9E for ; Sun, 20 May 2018 01:10:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C7F802BA for ; Sun, 20 May 2018 01:10:35 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1526778630.6e9af3131fd9852dac5bad5d8d8c93fae4f10257.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git/git-2.16.1.ebuild dev-vcs/git/git-2.16.3.ebuild dev-vcs/git/git-2.17.0.ebuild dev-vcs/git/git-9999-r1.ebuild dev-vcs/git/git-9999-r2.ebuild dev-vcs/git/git-9999-r3.ebuild dev-vcs/git/git-9999.ebuild X-VCS-Directories: dev-vcs/git/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 6e9af3131fd9852dac5bad5d8d8c93fae4f10257 X-VCS-Branch: master Date: Sun, 20 May 2018 01:10:35 +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: 894c3791-cbfa-43cf-847c-0300e1de51cf X-Archives-Hash: 5e24daedf6c1cb311fcad502e8525a1e commit: 6e9af3131fd9852dac5bad5d8d8c93fae4f10257 Author: Robin H. Johnson gentoo org> AuthorDate: Sun May 20 01:10:06 2018 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun May 20 01:10:30 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e9af313 dev-vcs/git: make perl packlist cleanup work on 32bit Signed-off-by: Robin H. Johnson gentoo.org> Package-Manager: Portage-2.3.33, Repoman-2.3.9 dev-vcs/git/git-2.16.1.ebuild | 8 +++++--- dev-vcs/git/git-2.16.3.ebuild | 8 +++++--- dev-vcs/git/git-2.17.0.ebuild | 10 ++++++---- dev-vcs/git/git-9999-r1.ebuild | 10 ++++++---- dev-vcs/git/git-9999-r2.ebuild | 10 ++++++---- dev-vcs/git/git-9999-r3.ebuild | 10 ++++++---- dev-vcs/git/git-9999.ebuild | 10 ++++++---- 7 files changed, 40 insertions(+), 26 deletions(-) diff --git a/dev-vcs/git/git-2.16.1.ebuild b/dev-vcs/git/git-2.16.1.ebuild index 5f587fc48af..ef8239e6b0d 100644 --- a/dev-vcs/git/git-2.16.1.ebuild +++ b/dev-vcs/git/git-2.16.1.ebuild @@ -534,9 +534,11 @@ src_install() { newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb newdoc "${S}"/gitweb/README README.gitweb - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; + for d in "${ED}"/usr/lib{64,}/perl5/ ; do + test -d "$d" && find "$d" \ + -name .packlist \ + -delete + done else rm -rf "${ED}"/usr/share/gitweb fi diff --git a/dev-vcs/git/git-2.16.3.ebuild b/dev-vcs/git/git-2.16.3.ebuild index e9f0c242bcf..b1eec131970 100644 --- a/dev-vcs/git/git-2.16.3.ebuild +++ b/dev-vcs/git/git-2.16.3.ebuild @@ -534,9 +534,11 @@ src_install() { newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb newdoc "${S}"/gitweb/README README.gitweb - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; + for d in "${ED}"/usr/lib{64,}/perl5/ ; do + test -d "$d" && find "$d" \ + -name .packlist \ + -delete + done else rm -rf "${ED}"/usr/share/gitweb fi diff --git a/dev-vcs/git/git-2.17.0.ebuild b/dev-vcs/git/git-2.17.0.ebuild index 2306f55ec64..ec767a414c4 100644 --- a/dev-vcs/git/git-2.17.0.ebuild +++ b/dev-vcs/git/git-2.17.0.ebuild @@ -543,10 +543,12 @@ src_install() { newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb newdoc "${S}"/gitweb/README README.gitweb - find "${ED%/}"/usr/lib64/perl5/ \ - -name .packlist \ - -delete \ - || die + for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do + test -d "$d" && find "${d}" \ + -name .packlist \ + -delete \ + || die + done else rm -rf "${ED%/}"/usr/share/gitweb fi diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 339c9e96dd1..592c262cdb8 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -543,10 +543,12 @@ src_install() { newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb newdoc "${S}"/gitweb/README README.gitweb - find "${ED%/}"/usr/lib64/perl5/ \ - -name .packlist \ - -delete \ - || die + for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do + test -d "$d" && find "${d}" \ + -name .packlist \ + -delete \ + || die + done else rm -rf "${ED%/}"/usr/share/gitweb fi diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 339c9e96dd1..592c262cdb8 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -543,10 +543,12 @@ src_install() { newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb newdoc "${S}"/gitweb/README README.gitweb - find "${ED%/}"/usr/lib64/perl5/ \ - -name .packlist \ - -delete \ - || die + for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do + test -d "$d" && find "${d}" \ + -name .packlist \ + -delete \ + || die + done else rm -rf "${ED%/}"/usr/share/gitweb fi diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 339c9e96dd1..592c262cdb8 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -543,10 +543,12 @@ src_install() { newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb newdoc "${S}"/gitweb/README README.gitweb - find "${ED%/}"/usr/lib64/perl5/ \ - -name .packlist \ - -delete \ - || die + for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do + test -d "$d" && find "${d}" \ + -name .packlist \ + -delete \ + || die + done else rm -rf "${ED%/}"/usr/share/gitweb fi diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 339c9e96dd1..592c262cdb8 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -543,10 +543,12 @@ src_install() { newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb newdoc "${S}"/gitweb/README README.gitweb - find "${ED%/}"/usr/lib64/perl5/ \ - -name .packlist \ - -delete \ - || die + for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do + test -d "$d" && find "${d}" \ + -name .packlist \ + -delete \ + || die + done else rm -rf "${ED%/}"/usr/share/gitweb fi