gentoo resync : 20.05.2018

8 files changed, 47 insertions, 33 deletions

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index eba8d85ca56a..44bb9a52de0b 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -21,11 +21,11 @@ DIST git-htmldocs-2.17.0.tar.xz 1172652 BLAKE2B 9e6ccc120aa45ee98a21ac862a130a96
 DIST git-manpages-2.16.1.tar.xz 417188 BLAKE2B 239fb33967d17c8b10efb2e0d1963f7be3404b7f262b49f89b3f4a538135d80268fbe7fe0e561c9cb2d86840eb46b61653ed363d8da27d1169c435d8e1d5e851 SHA512 20c7646b5f1e3c633ce6aae5ee5fcbe4ca1e59fc9253ec9a9e45c7cd8a8ac7a5e71e36258eb747e3bd6d51b3b7971137315dcdbdff493e0f8774ecd3e309735a
 DIST git-manpages-2.16.3.tar.xz 417152 BLAKE2B 2719a9a603dc49db1a61a2cec42427bdcdc96fab9d21d16c5a8c70d7dba271a1e5b29f4f83f32c525c4866e3497352017af3777a769893c9543e65d625972375 SHA512 b34a3658412a144fed6f818acc05c0b4be2453ae63f9430dcd53cda750f737bd3da50390bd3f4266e69befa521eddd222985fd531acca1ebd4ca62c6c5b2a85c
 DIST git-manpages-2.17.0.tar.xz 419316 BLAKE2B f8c4e586d376c31e7728e1fb78032249cc8b20d356e2d7c8d42f1c4a6025dc89d5de81548ea2fb1af5c95276bd3b3f9e650379357f30edd773000b98371fcceb SHA512 b2f7734416f5c336cea272baa87efd10b175a357f5f722f20bb5d287b1886bdb213c4fc2f0c6a3b83fa34423e83139bab5eac70dc9669a72c75c2392dbd517f1
-EBUILD git-2.16.1.ebuild 19258 BLAKE2B 35694f144eb0e35e8587e2ce04cce21110df84623faa02b41590c667c2d4607bd93659c8c8cd5934326779fc0f17ad0b24b1b354390d834460a491e63e33c5c5 SHA512 a0702320d6e0e67cd831f18ce4243c1d0f4dc7c432482680476eeba180d5dc005eb2d1ccd9c1058d127d07fb159bf0fcccf571198e9313d91f69244c6817d26c
-EBUILD git-2.16.3.ebuild 19268 BLAKE2B c5d980343d17117b4a61bd5ea470b507fdc9061ca760b0140f3591a16f8cc5eeb4756db1bf8c1ff8c984bcd85e5b04e4ce251122b26a55282c0381420ee0dfef SHA512 e3fc8dbf927ac71d8e9fc1caa49f5359f2f6fd8999637d30a674793c16a4be0fef5b9249e87273f0b2289e1583efc724ef3d6fd3bc28d8088dab92617dbf6245
-EBUILD git-2.17.0.ebuild 19251 BLAKE2B 1b81428260cfb1829433d496c8b5efa9668a8df352218e6698672766aa167a6c77f96262bd827a42fb843112264b9d3c64b165a976b0089ce81e30abceba092f SHA512 4626bc71cd0c8f44f41a65a2738a2caa419c18ca384fc5353789b75ca50c6d32ed39d880118b2848c75a4cf0ab983de262db8fc3beeca739efa576303b7874dc
-EBUILD git-9999-r1.ebuild 19251 BLAKE2B 4dcb016e41f27611fceeac8c106e45fff825a36e5fbfd0651af409fd8b839e22f2de8a90015c4a87078fdcc6a95310cd510191e43017830ae1df8a93943965da SHA512 d0f4aefa7805da12462d8d23e3f0f3fdb1da7b22706a3b36c0d3c2f5b8fcc4a6ddb4ffda86e7edb3802da78d06bd4062075f50b9920a4a6a5394e6849e8685cb
-EBUILD git-9999-r2.ebuild 19251 BLAKE2B 4dcb016e41f27611fceeac8c106e45fff825a36e5fbfd0651af409fd8b839e22f2de8a90015c4a87078fdcc6a95310cd510191e43017830ae1df8a93943965da SHA512 d0f4aefa7805da12462d8d23e3f0f3fdb1da7b22706a3b36c0d3c2f5b8fcc4a6ddb4ffda86e7edb3802da78d06bd4062075f50b9920a4a6a5394e6849e8685cb
-EBUILD git-9999-r3.ebuild 19251 BLAKE2B 4dcb016e41f27611fceeac8c106e45fff825a36e5fbfd0651af409fd8b839e22f2de8a90015c4a87078fdcc6a95310cd510191e43017830ae1df8a93943965da SHA512 d0f4aefa7805da12462d8d23e3f0f3fdb1da7b22706a3b36c0d3c2f5b8fcc4a6ddb4ffda86e7edb3802da78d06bd4062075f50b9920a4a6a5394e6849e8685cb
-EBUILD git-9999.ebuild 19251 BLAKE2B 4dcb016e41f27611fceeac8c106e45fff825a36e5fbfd0651af409fd8b839e22f2de8a90015c4a87078fdcc6a95310cd510191e43017830ae1df8a93943965da SHA512 d0f4aefa7805da12462d8d23e3f0f3fdb1da7b22706a3b36c0d3c2f5b8fcc4a6ddb4ffda86e7edb3802da78d06bd4062075f50b9920a4a6a5394e6849e8685cb
+EBUILD git-2.16.1.ebuild 19299 BLAKE2B cbc95f48a7e079f72b9da5e2ec824174efcb3816b82dc985f3acc855c852cfa5e8a89ad07485815bb5f589eb5511c006b2069087968217e2340a4f80ebed2645 SHA512 d038d964d8628fb8b7ff2ebbc94e801ebe12023e8c2bdbd1998e8295af020133834faafa41eb90ec54719d2ff39b880d0d642b14a9d0ed242e1a97e23afefc80
+EBUILD git-2.16.3.ebuild 19309 BLAKE2B ed2fdef292152ccc05e50d135a9a346fbd794bf40bdf240364aa24d03d4e849fee533a3b391b38a9cdc50330857688f1671e30eb3147205c19979db6feabc0b4 SHA512 d9a14e5a041020a5963dcf1d878a46a763d7a74cb7020dbc2c9af572a796a0da239a93c9753c7fd201d0b38fb6d79ebda8e0b9e95c67a3d6281f6a729cf70a1b
+EBUILD git-2.17.0.ebuild 19304 BLAKE2B 9189402c0c7c6dac99e022218032b73977aa1e46de68373aba3ab028c6f543ee3004caf47ebcd4408e4b2f0010c9123af240c7016dea6741954d4b26ad73b4f3 SHA512 7c3e0cfc05d23bec8d7ef93d36499cee010734d4466e5bd6478ddcccef95b06f0e25495c372c1f58cedbbab0da00762ecbd6967b66af18cd53836e65820770b9
+EBUILD git-9999-r1.ebuild 19304 BLAKE2B 8ebd1fb50d5647312645cf8a925ade06e7771e8b3161b44640b9959f299ec7ec425282a5122324a49267b3b973f5a44b84c438c99f7284c721328bd1386835b1 SHA512 e5228b9afa6630b232ee2b0c05dd6bef83486fe57b90a64d60b41289a3a75dd1929e62fb49dc8f3adb1a9e2a990d42beb031748017434b7b1359a33c9bca4367
+EBUILD git-9999-r2.ebuild 19304 BLAKE2B 8ebd1fb50d5647312645cf8a925ade06e7771e8b3161b44640b9959f299ec7ec425282a5122324a49267b3b973f5a44b84c438c99f7284c721328bd1386835b1 SHA512 e5228b9afa6630b232ee2b0c05dd6bef83486fe57b90a64d60b41289a3a75dd1929e62fb49dc8f3adb1a9e2a990d42beb031748017434b7b1359a33c9bca4367
+EBUILD git-9999-r3.ebuild 19304 BLAKE2B 8ebd1fb50d5647312645cf8a925ade06e7771e8b3161b44640b9959f299ec7ec425282a5122324a49267b3b973f5a44b84c438c99f7284c721328bd1386835b1 SHA512 e5228b9afa6630b232ee2b0c05dd6bef83486fe57b90a64d60b41289a3a75dd1929e62fb49dc8f3adb1a9e2a990d42beb031748017434b7b1359a33c9bca4367
+EBUILD git-9999.ebuild 19304 BLAKE2B 8ebd1fb50d5647312645cf8a925ade06e7771e8b3161b44640b9959f299ec7ec425282a5122324a49267b3b973f5a44b84c438c99f7284c721328bd1386835b1 SHA512 e5228b9afa6630b232ee2b0c05dd6bef83486fe57b90a64d60b41289a3a75dd1929e62fb49dc8f3adb1a9e2a990d42beb031748017434b7b1359a33c9bca4367
 MISC metadata.xml 2066 BLAKE2B c5a716346a69a971cb78e5b0435f921e218ae8b07a714a4718e2238924a947f9143f10829031237ad74d051106ead5296673d58b99035ef9f77a1c5cd430242a SHA512 a0018307f19e6695002fa52a7cf898071ea8b7798ed7454f544a3bd15a3448cdab322fac5fcbae7b72e9a9ecf823c56b6ced8de560e68012be0ea6d09b0640bd
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