From 6e9af3131fd9852dac5bad5d8d8c93fae4f10257 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 19 May 2018 18:10:06 -0700 Subject: [PATCH] dev-vcs/git: make perl packlist cleanup work on 32bit Signed-off-by: Robin H. Johnson 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 5f587fc48aff..ef8239e6b0df 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 e9f0c242bcf6..b1eec1319702 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 2306f55ec64e..ec767a414c47 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 339c9e96dd10..592c262cdb86 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 339c9e96dd10..592c262cdb86 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 339c9e96dd10..592c262cdb86 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 339c9e96dd10..592c262cdb86 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 -- 2.26.2