commit: 6e9af3131fd9852dac5bad5d8d8c93fae4f10257
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun May 20 01:10:06 2018 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> 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 <robbat2 <AT> 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
