gentoo resync : 16.01.2018

15 files changed, 67 insertions, 125 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 9a1073c574fd..bce854651fe2 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 7199cb0f9ebd..8c4631ece714 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -14,21 +14,21 @@ AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d697
 DIST git-2.13.6.tar.xz 4756820 BLAKE2B 5fdb7aae5ceb1e1d0bd9be2541e8d39f28503ebeda5ef30eee306348afb290171cba7f8d6e0002775288bfba699ca12e388a4007008509d91a9ac92e90fb5d5c SHA512 ed39784205e1077f886eebdfb34a205fb0433071de29f673a79ea32bca31a2ba9bdabba208c9679ea2f6f295bafad52a7e7852b5bd2ccb1e6c99a1d2e76e8ada
 DIST git-2.14.3.tar.xz 4802252 BLAKE2B 9b5a13e337ba1f4609875897a3ee92dd5a433fa5e7f8bbac1436dcd8275514378fe99dd8cfcf6212e27825e43f000100850ad6f3a0b3fd53bbf9ee820a3973d8 SHA512 e32e9ff904cbc2a77d78ca08953e3b69ac527c333a898dd053806e3d7e684ad4ae153ae7663b7ff9c16e2414c3189878a2e6c95fe9320b4af6cb1e7fa5102643
 DIST git-2.15.1.tar.xz 4894768 BLAKE2B 89258e58ff06b50759364c79bebc9a70a267eca7bd25c1feb73ca49cb2b9cf5f6b890729aee4c9bda9025cbacfd8ed29d1a251ee0add9cd84c277e2bb29dbad5 SHA512 dcf300b28e41f7757d866e768d641137718b43eb6d12a2cfff99fb429775e0cab87bbff48147b8588bc0f69e92eb5ca2ad1f75c8cf5205e41853d8e8652f900b
-DIST git-2.16.0.rc1.tar.xz 4944496 BLAKE2B b14c207b0cce3ff3ab90f39546ef4d6352c7a76a1b1bb268c4bc0c6cfcb9894a7e0153fc3106ab73806c6f5199df07ebd3a884cd43d5e8413ef7a73015ca59c7 SHA512 7e63457e2bbca5d77eed84f48039ba577b715dec23c2cf6c85ce433e534791896f8a8bc7618b7df1493ff4b994d351efc9a3df4afb8954c7dbbec7df670fb72b
+DIST git-2.16.0.rc2.tar.xz 4946128 BLAKE2B a0cf9ca4ce4fee2721a8f5c0333b3395b103377da619119316e0c6175fee19d1f89abeb502c79293c573c32628edb460d1e39d3c77b87075ac782cdc619610d8 SHA512 6078cec99aa03cdb3915c91759d01ce741740fcda0659d030024aa0b4195cd77af1089695ad2138f38e63b7b8a46a336abea9f19e125db13f85e1ca8be844787
 DIST git-htmldocs-2.13.6.tar.xz 1110668 BLAKE2B 7cfbd453c72c3e300244f9a8c4d13efd60d22219dee48f6a06e6f23fb3a0bd5bc66e624829d685b3ae8b47b81bba39e605f0dd6fd3459364c83b2d922be94a64 SHA512 9eb26f04836620bf4486d3bb2a170ab2b0af319f7f53e2677f4c1445767f5c3521cfdbb274dcc4df2bfd2fc5bf0ca18c6a4a9ca0b9f957c53f66e530684af6cc
 DIST git-htmldocs-2.14.3.tar.xz 1116824 BLAKE2B ca7068a4983e2f7c3694222f6a932d8db132b0a20a50a10415f58a77100a95d8e0fd2e8cf980ece8ef55be0f0ca652cc1a75af62a22b9d60ff19ad4801383416 SHA512 a73160724f944832f915ff29c557e2a968d6c5ae5c4e9759d96444af8841e52a1193d50a74f01deb1ec5ef03b3301897bd85c5ebb82ac22d8188d528629d74d4
 DIST git-htmldocs-2.15.1.tar.xz 1134848 BLAKE2B 1efb6d4ca16779c39be69fed57fccb023ddac6bb9c9727ebd7050eb40035c1d56dbce0191224e8d3370d433d8e1cf210df9bc9bde2effb6fbb2d62bfd5e9e440 SHA512 50e53b506c17b046c42a8d9f888741b1f408fb7bb566d981ad6dcda3383f1d310008732a849b4755e7233dc83477f354e9c6d5d4e1fcf0e81af54d49153e8c34
-DIST git-htmldocs-2.16.0.rc1.tar.xz 1159900 BLAKE2B 609a851c4024ae9ff859072ef6abb07e590d1fd81f10f142c67899f2ed0f8ebc0524370eb0fd5c75300cde73157b6846b8401ee84a03ab35e2f53a8d54d90c9d SHA512 67a6ba5c64bb044bae8e931dedde14679c7d637241871d992e9d991c5e13cd4b83267f3fcb9450a2086473ac28e968d52843ad0361d93354aae69e8057d58a7e
+DIST git-htmldocs-2.16.0.rc2.tar.xz 1159672 BLAKE2B e0769344224ea591a25e80f798a5b55bde8cd959be750cc96f9a5a2da82c39db9c4e1a5f1b895b92f38bd01431b4d57db8c3407a8aea26fbd16384504b7b7564 SHA512 44ce34629180c579cd3efde964aa218e03e9bfb821842bd312429201c7404b0d4a89b332c1c4b62265e3dd9db88c2ac0e143db1d332aece955dd819aa8caeee7
 DIST git-manpages-2.13.6.tar.xz 407660 BLAKE2B 76bae6c11cf21f39adf121b4580fe10021e354374e37de6ca5eee6e60e1c7ef3b2dafb086c6b8d88f35216204269945cf45fcd6868f9940d2f00b72a87bad8e2 SHA512 b24a96053e348e1d2ebf5c66d968074bc73471f07ac3a680d8b16fd211b69b5fdfad6a087473edf9941ad08493e4d7ff0a916b85ce40ebe19b3e3dad6a4baf5f
 DIST git-manpages-2.14.3.tar.xz 411324 BLAKE2B c896a54305276ff0bb1d860f02833f5902bf869e746333c0598f8c494efb56c65c4a9d5d9eeb54a9a38a6b07776abddc4267b73c2ff020cedf65248ac89afca6 SHA512 3e1215bdc28df84fd26ba40f6aedfa9f2140c170af48148b1b89d28e8b411686376715920f86d9db9aa18f4a3f4e8f68082da7632febbcbc7fc956f32807da50
 DIST git-manpages-2.15.1.tar.xz 413124 BLAKE2B 61407bc2c87fddff7a992c25f71768e39bee56941a7291f8c03ee59d10f7db36259e80c6f85ca0303c5e79edb3e1ff02b4abc6c8577bb1f3072b8a469ca55f23 SHA512 de02606554c14fdb780f2885b8b88e6b15e82e4debe9f59da75d57832a41f688be9882e74eacd0dc36db7a42bfbd88c5168b378ca0c8658317fe68e207ec2d18
-DIST git-manpages-2.16.0.rc1.tar.xz 417108 BLAKE2B 8fe8c4fe68039c565af22b6f95ec3bd92e918857f7d18c504c74891bccd8e46c964f4d0acb794b47426f163f4151af7f50b5c979ca3b1d019257107ef26f7d47 SHA512 f14ad4b06f5125335e5300e65f96e854edaab95a3f79d5942aca15eb72820643650a6ebf9524925df7def2c1f6b359c14c3e8cc7ea94710ebf2c33de66f62deb
-EBUILD git-2.13.6.ebuild 19013 BLAKE2B 33cda14b40308cbafc3ad5895eea7126c27ef20dc8d8a4dd3c0740b52046096bac6d6ad4a9d9894513d1eadb379c323c0ecbe1bcbb470ab6e11d6950f4d2f504 SHA512 ba6f3f6a4bc384d8c7cd1061fec38d5037e0007d050061dbb854a705ae1d93ce93d9572feea6d97800169db178811ad2266499949c15ba37389f749a25552274
-EBUILD git-2.14.3.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
-EBUILD git-2.15.1.ebuild 19495 BLAKE2B 3805120b40df21a440ae5d47075aa2d1929bf00825e8e1b5827e9bd5772aecd65b08b424a4336594ba0e971a3f8e28e3beea4d39e08b9b6669d0d127b9c4ab6d SHA512 18b14460fbefe35f246409af0c9bb4bd93ad169d7c1014a9f5826bd3fb6f73c11d4d8bbbb7726d719c2c98fd6e9a1129ae0e1553229573026e9010d6f490c5f1
-EBUILD git-2.16.0_rc1.ebuild 19495 BLAKE2B 3805120b40df21a440ae5d47075aa2d1929bf00825e8e1b5827e9bd5772aecd65b08b424a4336594ba0e971a3f8e28e3beea4d39e08b9b6669d0d127b9c4ab6d SHA512 18b14460fbefe35f246409af0c9bb4bd93ad169d7c1014a9f5826bd3fb6f73c11d4d8bbbb7726d719c2c98fd6e9a1129ae0e1553229573026e9010d6f490c5f1
-EBUILD git-9999-r1.ebuild 19495 BLAKE2B 3805120b40df21a440ae5d47075aa2d1929bf00825e8e1b5827e9bd5772aecd65b08b424a4336594ba0e971a3f8e28e3beea4d39e08b9b6669d0d127b9c4ab6d SHA512 18b14460fbefe35f246409af0c9bb4bd93ad169d7c1014a9f5826bd3fb6f73c11d4d8bbbb7726d719c2c98fd6e9a1129ae0e1553229573026e9010d6f490c5f1
-EBUILD git-9999-r2.ebuild 19495 BLAKE2B 3805120b40df21a440ae5d47075aa2d1929bf00825e8e1b5827e9bd5772aecd65b08b424a4336594ba0e971a3f8e28e3beea4d39e08b9b6669d0d127b9c4ab6d SHA512 18b14460fbefe35f246409af0c9bb4bd93ad169d7c1014a9f5826bd3fb6f73c11d4d8bbbb7726d719c2c98fd6e9a1129ae0e1553229573026e9010d6f490c5f1
-EBUILD git-9999-r3.ebuild 19495 BLAKE2B 3805120b40df21a440ae5d47075aa2d1929bf00825e8e1b5827e9bd5772aecd65b08b424a4336594ba0e971a3f8e28e3beea4d39e08b9b6669d0d127b9c4ab6d SHA512 18b14460fbefe35f246409af0c9bb4bd93ad169d7c1014a9f5826bd3fb6f73c11d4d8bbbb7726d719c2c98fd6e9a1129ae0e1553229573026e9010d6f490c5f1
-EBUILD git-9999.ebuild 19495 BLAKE2B 3805120b40df21a440ae5d47075aa2d1929bf00825e8e1b5827e9bd5772aecd65b08b424a4336594ba0e971a3f8e28e3beea4d39e08b9b6669d0d127b9c4ab6d SHA512 18b14460fbefe35f246409af0c9bb4bd93ad169d7c1014a9f5826bd3fb6f73c11d4d8bbbb7726d719c2c98fd6e9a1129ae0e1553229573026e9010d6f490c5f1
+DIST git-manpages-2.16.0.rc2.tar.xz 417216 BLAKE2B 39d434afb66201acd440bdd7dfe6bf099a0d5e0d35926debbc51d149039dc654fb0e76689efd29f918a07b01acf14491cc2e0c48f497dc4e8517fcd3f21ffd95 SHA512 5921e26f05578d10e88686de65340f4c71e602aac4f373bcc2bb86036f0ed40ac93af2463f5557895fac2cc99468dbf6095186a6198b9d4e9e97bc9882616bbe
+EBUILD git-2.13.6.ebuild 18885 BLAKE2B 097dc3192b7f71372eb3c001bf8aaa9f86b5d3f0479087c7daeaa13fcb77acb987463a565bc394e0aaa3014c72726e6364fc138ede07abf77062561711db80a0 SHA512 931fe26d4f73ac6ffb7794f913581041768dd0db0ec142640c8b2470b92adfd6198919e148e9675151cc1d67b1753c4259089afb6ebda8ea26a8733d8c2631dd
+EBUILD git-2.14.3.ebuild 19363 BLAKE2B 7b06642fe92fa81859c400ba03c2c3ff97ea99d57451510e7597bfc9d94e0259aa465bd6165a0940534eb175cee49217d76b7869feb9065a4a900edc6244b67c SHA512 a315292faf871312cfcd89b702a1c1449461fbb02c63746c24344bfba1ce94b4bb078f133d09655b6298b0b41c9f9007675508d7db194b2b6f55fa90e789de84
+EBUILD git-2.15.1.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
+EBUILD git-2.16.0_rc2.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
+EBUILD git-9999-r1.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
+EBUILD git-9999-r2.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
+EBUILD git-9999-r3.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
+EBUILD git-9999.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
 MISC metadata.xml 2066 BLAKE2B c5a716346a69a971cb78e5b0435f921e218ae8b07a714a4718e2238924a947f9143f10829031237ad74d051106ead5296673d58b99035ef9f77a1c5cd430242a SHA512 a0018307f19e6695002fa52a7cf898071ea8b7798ed7454f544a3bd15a3448cdab322fac5fcbae7b72e9a9ecf823c56b6ced8de560e68012be0ea6d09b0640bd
diff --git a/dev-vcs/git/git-2.13.6.ebuild b/dev-vcs/git/git-2.13.6.ebuild
index 81e7734629c8..3f4dab26bde8 100644
--- a/dev-vcs/git/git-2.13.6.ebuild
+++ b/dev-vcs/git/git-2.13.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -280,7 +280,6 @@ src_prepare() {
 }
 
 git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
@@ -294,13 +293,12 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+
 }
 
 src_configure() {
diff --git a/dev-vcs/git/git-2.14.3.ebuild b/dev-vcs/git/git-2.14.3.ebuild
index d079a65a75eb..fde79e887f8a 100644
--- a/dev-vcs/git/git-2.14.3.ebuild
+++ b/dev-vcs/git/git-2.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {
diff --git a/dev-vcs/git/git-2.15.1.ebuild b/dev-vcs/git/git-2.15.1.ebuild
index 3f45eb3ef445..d3e89d0092f7 100644
--- a/dev-vcs/git/git-2.15.1.ebuild
+++ b/dev-vcs/git/git-2.15.1.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {
diff --git a/dev-vcs/git/git-2.16.0_rc1.ebuild b/dev-vcs/git/git-2.16.0_rc2.ebuild
index 3f45eb3ef445..d3e89d0092f7 100644
--- a/dev-vcs/git/git-2.16.0_rc1.ebuild
+++ b/dev-vcs/git/git-2.16.0_rc2.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 3f45eb3ef445..d3e89d0092f7 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 3f45eb3ef445..d3e89d0092f7 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 3f45eb3ef445..d3e89d0092f7 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 3f45eb3ef445..d3e89d0092f7 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index 5737c3611eef..e956f665ea4f 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1,8 +1,6 @@
 AUX svn2git-1.0.10-version.patch 900 BLAKE2B 748f66cf3fcb3937365b5d2b01d2bd1bd7d91932b2057be81063b55ee93d94c62806e3e9abd3e2392358b0527c7e29f59caa849f3928ebd17352c92296ba31fb SHA512 51d69b34c5d2a481b04d3ef43368815a406fd709aeaa358e60e41c75b776895e79a11b402d87cb4d0c4b0b70776dd31f34809fbece9b069bc834510872af4b03
-AUX svn2git-1.0.2.1-include-path.patch 637 BLAKE2B d251c22b0139683dede572dbd69583fa4238b6c19bf8c78603c75eadcb4ccd37ecd376790eeac3a7b414dbbd3610f22df8c5b5f9bb0b07b3f5d6566e40192a53 SHA512 1711a6281622bfe781fdf05df3644073ff6d2240cba1744540bf28b9f8732482002cc4769e040db93f08b0f8378e4cd9b4288f8bf7db4ee759d5c5c1770b3fe3
-DIST svn2git-1.0.10.tar.gz 26667 BLAKE2B 50b8817cbdbee72622a1bf3d3f654d292366fbf8018346a4277b435769e71c94f990aae5d7bb1ec9860b3758d5daecf3b2bcd61c9d6a68a78de67d57d11f24d1 SHA512 7148721a5470be2537494349a63e02abf2a0a115c1cea51dae7c407c4480b4576ed3f572b4d1cfa2d5af6df37d3941dda3b174d298b6bf5530de68b5b504ed49
+AUX svn2git-1.0.2.1-include-path.patch 641 BLAKE2B 4df6dbbb8935377355cf9fa35c005e349f5ce5b7d7decb7fb5038db5b70bff25aa1ff91b345c1f3b3d9a3c4a7c566417a49b4385a7f7e6660dcd54f528990210 SHA512 2be52266425ba4b287eb5adde4f2a643759a65b5ece00a7ef1982256dc0f460c069afd4b7d4aee63f2e4a99ebcaabc6f24b5688dd939cb172f333c2d4755a36f
 DIST svn2git-1.0.11.tar.gz 30986 BLAKE2B 76300c05e070364b4bec8340534dd494fb93bc6b3965c938918821c3321eb59d2e691163b418e2ab7ece131776d9fd550a05345fb56d449d68c530c3f90d3f95 SHA512 8fa082d8da2dfc9687ebb4269b3861a053f83afb71a5c0666155bdb179d7799de3f37f3d58cabe02069bda8e8fd306bb729ba04709c0654ba8a5c24952142de9
-EBUILD svn2git-1.0.10.ebuild 1136 BLAKE2B 99f1090d3286c845ce486c716f4d22782c74339f412a8ca35612cc4c28ceace3dfd74c401d4fdf1e50c04a19f871c39b80ab538f245a4146bba1f24668e6e83b SHA512 41533788c0db01aabe51384f3b3744f96053b26fea2a1e2d163f21211684f3c24c2ecef5b407637e53689ddc649093184e03bd88f5edb67649046ea5106a832c
-EBUILD svn2git-1.0.11.ebuild 1169 BLAKE2B 67bf677eba6cafcb34b78fe6b7c9ed0f16c859560d0d07f60023af70fec37de3b63f36d0a57944c93744ceffb2cdd84055ee7f57b403d3eb00c0f8a996c609a7 SHA512 9e1a3300a721e032b7b6ec7fda1602ea7c5ad921acd7d7e74228796915b250172a8a0f001e544f9c1d2ebb928c0101540e98ed843dbcaa62ee05a1b04b9d4e6d
-EBUILD svn2git-9999.ebuild 1169 BLAKE2B 67bf677eba6cafcb34b78fe6b7c9ed0f16c859560d0d07f60023af70fec37de3b63f36d0a57944c93744ceffb2cdd84055ee7f57b403d3eb00c0f8a996c609a7 SHA512 9e1a3300a721e032b7b6ec7fda1602ea7c5ad921acd7d7e74228796915b250172a8a0f001e544f9c1d2ebb928c0101540e98ed843dbcaa62ee05a1b04b9d4e6d
+EBUILD svn2git-1.0.11-r1.ebuild 1230 BLAKE2B aef6f52f1eec8783b48d62ca67ab4801b524221244db5453a661344947262557920626b2ff640282c4bd146ae74c5b3266fa37b5f41f3d0e5b9a42f0b4e6a7b6 SHA512 b3cd213677fae1ccb9e8548a1140dbfedc157793d009f32ee7cbca262d122fcf5722c4e5743411820828a2f9b76a3e4cfb5d450671fac59506ae4bbe95a6c895
+EBUILD svn2git-9999.ebuild 1230 BLAKE2B aef6f52f1eec8783b48d62ca67ab4801b524221244db5453a661344947262557920626b2ff640282c4bd146ae74c5b3266fa37b5f41f3d0e5b9a42f0b4e6a7b6 SHA512 b3cd213677fae1ccb9e8548a1140dbfedc157793d009f32ee7cbca262d122fcf5722c4e5743411820828a2f9b76a3e4cfb5d450671fac59506ae4bbe95a6c895
 MISC metadata.xml 341 BLAKE2B a717046fb841b51b7e24fec4206379614a66d18aa60f8665e81f914beb100931418a37a2ed242ab7f48e9ed65affa0468f20192ab1d3661547d5db6d00dfbc23 SHA512 9026002122daf2c35d3c407ca605e353c8b6b39514572207bf3642ad98b8265965e2b56244ebfa1f864670426e98dbe21fec948e17cf97fdafce8bafb27bf590
diff --git a/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch b/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
index 2349b3080835..e5c898ba9738 100644
--- a/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
+++ b/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
@@ -1,5 +1,5 @@
---- src/src.pro	2011-01-11 09:02:15.696463807 +0100
-+++ src/src.pro	2011-01-11 09:03:59.793959849 +0100
+--- a/src/src.pro	2011-01-11 09:02:15.696463807 +0100
++++ b/src/src.pro	2011-01-11 09:03:59.793959849 +0100
 @@ -3,8 +3,8 @@
  # Automatically generated by qmake (2.01a) dim. dc. 23 13:49:28 2007
  ######################################################################
diff --git a/dev-vcs/svn2git/svn2git-1.0.10.ebuild b/dev-vcs/svn2git/svn2git-1.0.10.ebuild
deleted file mode 100644
index d23b946dd204..000000000000
--- a/dev-vcs/svn2git/svn2git-1.0.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils qt4-r2
-[ "$PV" == "9999" ] && inherit git
-
-DESCRIPTION="Tool for one-time conversion from svn to git"
-HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
-if [ "$PV" == "9999" ]; then
-	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-# KEYWORDS way up
-
-DEPEND="dev-vcs/subversion
-	dev-qt/qtcore:4"
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-
-S=${WORKDIR}/${PN}-${PN}
-
-src_prepare() {
-	# Note: patching order matters
-	epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch
-	if [[ "$PV" != "9999" ]]; then
-		epatch "${FILESDIR}"/${PN}-1.0.10-version.patch
-		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
-	fi
-
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	insinto /usr/share/${PN}/samples
-	doins samples/*.rules || die 'doins failed'
-	dobin svn-all-fast-export || die 'dobin failed'
-	dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
-}
diff --git a/dev-vcs/svn2git/svn2git-1.0.11.ebuild b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
index c9fa2d784940..0fd35c4b742f 100644
--- a/dev-vcs/svn2git/svn2git-1.0.11.ebuild
+++ b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils qt4-r2
-[ "$PV" == "9999" ] && inherit git-r3
+inherit desktop qmake-utils
+[[ "${PV}" == "9999" ]] && inherit git-r3
 
 DESCRIPTION="Tool for one-time conversion from svn to git"
 HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
-if [ "$PV" == "9999" ]; then
+if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -21,24 +20,32 @@ SLOT="0"
 IUSE=""
 # KEYWORDS way up
 
-DEPEND="dev-vcs/subversion
-	dev-qt/qtcore:4"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-vcs/subversion"
 RDEPEND="${DEPEND}
 	dev-vcs/git"
 
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch )
+
 src_prepare() {
 	# Note: patching order matters
-	epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch
-	if [[ "$PV" != "9999" ]]; then
-		epatch "${FILESDIR}"/${PN}-1.0.10-version.patch
+	default
+
+	if [[ "${PV}" != "9999" ]]; then
+		eapply "${FILESDIR}"/${PN}-1.0.10-version.patch
 		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
 	fi
+}
 
-	qt4-r2_src_prepare
+src_configure() {
+	eqmake5 fast-export2.pro
 }
 
 src_install() {
-	dodoc README.md
+	einstalldocs
 	insinto /usr/share/${PN}/samples
 	doins samples/*.rules || die 'doins failed'
 	dobin svn-all-fast-export || die 'dobin failed'
diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
index c9fa2d784940..0fd35c4b742f 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils qt4-r2
-[ "$PV" == "9999" ] && inherit git-r3
+inherit desktop qmake-utils
+[[ "${PV}" == "9999" ]] && inherit git-r3
 
 DESCRIPTION="Tool for one-time conversion from svn to git"
 HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
-if [ "$PV" == "9999" ]; then
+if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -21,24 +20,32 @@ SLOT="0"
 IUSE=""
 # KEYWORDS way up
 
-DEPEND="dev-vcs/subversion
-	dev-qt/qtcore:4"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-vcs/subversion"
 RDEPEND="${DEPEND}
 	dev-vcs/git"
 
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch )
+
 src_prepare() {
 	# Note: patching order matters
-	epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch
-	if [[ "$PV" != "9999" ]]; then
-		epatch "${FILESDIR}"/${PN}-1.0.10-version.patch
+	default
+
+	if [[ "${PV}" != "9999" ]]; then
+		eapply "${FILESDIR}"/${PN}-1.0.10-version.patch
 		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
 	fi
+}
 
-	qt4-r2_src_prepare
+src_configure() {
+	eqmake5 fast-export2.pro
 }
 
 src_install() {
-	dodoc README.md
+	einstalldocs
 	insinto /usr/share/${PN}/samples
 	doins samples/*.rules || die 'doins failed'
 	dobin svn-all-fast-export || die 'dobin failed'