dev-vcs/git: make perl packlist cleanup work on 32bit

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Package-Manager: Portage-2.3.33, Repoman-2.3.9

diff --git a/dev-vcs/git/git-2.16.1.ebuild b/dev-vcs/git/git-2.16.1.ebuild
index 5f587fc48aff492bbabad8086c445b17443ba408..ef8239e6b0df77eca8d8934d2c136d5619512325 100644 (file)
--- 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 e9f0c242bcf658a247cbfea09554feee646a6cbb..b1eec1319702445d941b594cf7adf40a72017d3b 100644 (file)
--- 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 2306f55ec64e87a72ded3add9a4d511feaef64c4..ec767a414c471e7fbe0e842e0432e472fea853a0 100644 (file)
--- 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 339c9e96dd105c8a69b472eb24ea55f4ed0592bf..592c262cdb8633b52a14b2999d4be138b99ffbb4 100644 (file)
--- 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 339c9e96dd105c8a69b472eb24ea55f4ed0592bf..592c262cdb8633b52a14b2999d4be138b99ffbb4 100644 (file)
--- 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 339c9e96dd105c8a69b472eb24ea55f4ed0592bf..592c262cdb8633b52a14b2999d4be138b99ffbb4 100644 (file)
--- 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 339c9e96dd105c8a69b472eb24ea55f4ed0592bf..592c262cdb8633b52a14b2999d4be138b99ffbb4 100644 (file)
--- 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