From: Robin H. Johnson <robbat2@gentoo.org>
Date: Mon, 21 May 2018 05:08:08 +0000 (-0700)
Subject: dev-vcs/git: improve perl packlist cleanup
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d2f244bff1b9d0a3dc32f8e4f1b175f664b92592;p=gentoo.git

dev-vcs/git: improve perl packlist cleanup

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 ef8239e6b0df..e675a47660d5 100644
--- a/dev-vcs/git/git-2.16.1.ebuild
+++ b/dev-vcs/git/git-2.16.1.ebuild
@@ -535,9 +535,10 @@ src_install() {
 		newdoc  "${S}"/gitweb/README README.gitweb
 
 		for d in "${ED}"/usr/lib{64,}/perl5/ ; do
-			test -d "$d" && find "$d" \
+			if test -d "$d" ; then find "$d" \
 				-name .packlist \
-				-delete
+				-delete || die
+			fi
 		done
 	else
 		rm -rf "${ED}"/usr/share/gitweb
diff --git a/dev-vcs/git/git-2.16.3.ebuild b/dev-vcs/git/git-2.16.3.ebuild
index b1eec1319702..d0faf8d3a1fc 100644
--- a/dev-vcs/git/git-2.16.3.ebuild
+++ b/dev-vcs/git/git-2.16.3.ebuild
@@ -535,9 +535,10 @@ src_install() {
 		newdoc  "${S}"/gitweb/README README.gitweb
 
 		for d in "${ED}"/usr/lib{64,}/perl5/ ; do
-			test -d "$d" && find "$d" \
+			if test -d "$d" ; then find "$d" \
 				-name .packlist \
-				-delete
+				-delete || die
+			fi
 		done
 	else
 		rm -rf "${ED}"/usr/share/gitweb
diff --git a/dev-vcs/git/git-2.17.0.ebuild b/dev-vcs/git/git-2.17.0.ebuild
index ec767a414c47..5f55ce0d640b 100644
--- a/dev-vcs/git/git-2.17.0.ebuild
+++ b/dev-vcs/git/git-2.17.0.ebuild
@@ -544,10 +544,10 @@ src_install() {
 		newdoc  "${S}"/gitweb/README README.gitweb
 
 		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
-			test -d "$d" && find "${d}" \
+			if test -d "$d" ; then find "$d" \
 				-name .packlist \
-				-delete \
-				|| die
+				-delete || die
+			fi
 		done
 	else
 		rm -rf "${ED%/}"/usr/share/gitweb
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 592c262cdb86..1fb66925cbfb 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -544,10 +544,10 @@ src_install() {
 		newdoc  "${S}"/gitweb/README README.gitweb
 
 		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
-			test -d "$d" && find "${d}" \
+			if test -d "$d" ; then find "$d" \
 				-name .packlist \
-				-delete \
-				|| die
+				-delete || die
+			fi
 		done
 	else
 		rm -rf "${ED%/}"/usr/share/gitweb
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 592c262cdb86..1fb66925cbfb 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -544,10 +544,10 @@ src_install() {
 		newdoc  "${S}"/gitweb/README README.gitweb
 
 		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
-			test -d "$d" && find "${d}" \
+			if test -d "$d" ; then find "$d" \
 				-name .packlist \
-				-delete \
-				|| die
+				-delete || die
+			fi
 		done
 	else
 		rm -rf "${ED%/}"/usr/share/gitweb
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 592c262cdb86..259fc34ecd4e 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -544,10 +544,10 @@ src_install() {
 		newdoc  "${S}"/gitweb/README README.gitweb
 
 		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
-			test -d "$d" && find "${d}" \
+			if test -d "$d" ; then find "${d}" \
 				-name .packlist \
-				-delete \
-				|| die
+				-delete || die
+			fi
 		done
 	else
 		rm -rf "${ED%/}"/usr/share/gitweb
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 592c262cdb86..1fb66925cbfb 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -544,10 +544,10 @@ src_install() {
 		newdoc  "${S}"/gitweb/README README.gitweb
 
 		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
-			test -d "$d" && find "${d}" \
+			if test -d "$d" ; then find "$d" \
 				-name .packlist \
-				-delete \
-				|| die
+				-delete || die
+			fi
 		done
 	else
 		rm -rf "${ED%/}"/usr/share/gitweb