gentoo resync : 15.02.2018

10 files changed, 128 insertions, 47 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 198452942eca..93e4f1254b97 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 238973d785db..50c6b8e71e80 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -30,9 +30,9 @@ EBUILD git-2.13.6.ebuild 18874 BLAKE2B bcafbe72ca9e7b0d1f8c6c43461ef1d225ca2ee18
 EBUILD git-2.14.3.ebuild 19352 BLAKE2B 375c5540c22cbe94fb89f81b099f3d29a92f4f6ef5757792ba80d2b839451988bb9bdec65720b8be7e47dc2ffcea47eeb92531da930705d1c4d40094c435fd56 SHA512 9fee218882dbccd73ea9f0014311630a50194dc090a7a4eddf5970c6c7e675a7a98e2849a9ff8867894f1d84d5ade79ac3edb6a9784005b5d1a6f5c6deebe4ac
 EBUILD git-2.15.1.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
 EBUILD git-2.16.0.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
-EBUILD git-2.16.1.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
-EBUILD git-9999-r1.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
-EBUILD git-9999-r2.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
-EBUILD git-9999-r3.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
-EBUILD git-9999.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
+EBUILD git-2.16.1.ebuild 19266 BLAKE2B db732dbdcc07e3d904aafadf29c6a604c283191f7d09357155990e995956f29aa5e4d90fd1abf8a9ae9ea962af832ed2be67c26ecbd4b74990083993bc1b266d SHA512 12d1a033926417dd00abfed6f2d1896ec950de8db1f8ddae3f8f56667cc6e078b81774dc487c457e019aa1abb7d624e8c644e66d2899a6f2991de26e9a3560aa
+EBUILD git-9999-r1.ebuild 19268 BLAKE2B c5d980343d17117b4a61bd5ea470b507fdc9061ca760b0140f3591a16f8cc5eeb4756db1bf8c1ff8c984bcd85e5b04e4ce251122b26a55282c0381420ee0dfef SHA512 e3fc8dbf927ac71d8e9fc1caa49f5359f2f6fd8999637d30a674793c16a4be0fef5b9249e87273f0b2289e1583efc724ef3d6fd3bc28d8088dab92617dbf6245
+EBUILD git-9999-r2.ebuild 19268 BLAKE2B c5d980343d17117b4a61bd5ea470b507fdc9061ca760b0140f3591a16f8cc5eeb4756db1bf8c1ff8c984bcd85e5b04e4ce251122b26a55282c0381420ee0dfef SHA512 e3fc8dbf927ac71d8e9fc1caa49f5359f2f6fd8999637d30a674793c16a4be0fef5b9249e87273f0b2289e1583efc724ef3d6fd3bc28d8088dab92617dbf6245
+EBUILD git-9999-r3.ebuild 19268 BLAKE2B c5d980343d17117b4a61bd5ea470b507fdc9061ca760b0140f3591a16f8cc5eeb4756db1bf8c1ff8c984bcd85e5b04e4ce251122b26a55282c0381420ee0dfef SHA512 e3fc8dbf927ac71d8e9fc1caa49f5359f2f6fd8999637d30a674793c16a4be0fef5b9249e87273f0b2289e1583efc724ef3d6fd3bc28d8088dab92617dbf6245
+EBUILD git-9999.ebuild 19268 BLAKE2B c5d980343d17117b4a61bd5ea470b507fdc9061ca760b0140f3591a16f8cc5eeb4756db1bf8c1ff8c984bcd85e5b04e4ce251122b26a55282c0381420ee0dfef SHA512 e3fc8dbf927ac71d8e9fc1caa49f5359f2f6fd8999637d30a674793c16a4be0fef5b9249e87273f0b2289e1583efc724ef3d6fd3bc28d8088dab92617dbf6245
 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 67a7f811554e..67db3890c141 100644
--- a/dev-vcs/git/git-2.16.1.ebuild
+++ b/dev-vcs/git/git-2.16.1.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -572,7 +572,7 @@ src_install() {
 }
 
 src_test() {
-	local disabled="t9128-git-svn-cmd-branch.sh"
+	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
@@ -603,7 +603,7 @@ src_test() {
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
+		disabled+=" t5000-tar-tree.sh"
 	fi
 
 	cvs=0
@@ -612,10 +612,10 @@ src_test() {
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
+		disabled+=" ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
@@ -625,17 +625,17 @@ src_test() {
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 	fi
 
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
+		disabled+=" ${tests_perl}"
 	fi
 
 	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
+	disabled+=" ${test_svn}"
 
 	# Reset all previously disabled tests
 	cd "${S}/t"
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 67a7f811554e..e9f0c242bcf6 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -572,7 +572,7 @@ src_install() {
 }
 
 src_test() {
-	local disabled="t9128-git-svn-cmd-branch.sh"
+	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
@@ -603,7 +603,7 @@ src_test() {
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
+		disabled+=" t5000-tar-tree.sh"
 	fi
 
 	cvs=0
@@ -612,10 +612,10 @@ src_test() {
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
+		disabled+=" ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
@@ -625,17 +625,17 @@ src_test() {
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 	fi
 
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
+		disabled+=" ${tests_perl}"
 	fi
 
 	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
+	disabled+=" ${test_svn}"
 
 	# Reset all previously disabled tests
 	cd "${S}/t"
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 67a7f811554e..e9f0c242bcf6 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -572,7 +572,7 @@ src_install() {
 }
 
 src_test() {
-	local disabled="t9128-git-svn-cmd-branch.sh"
+	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
@@ -603,7 +603,7 @@ src_test() {
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
+		disabled+=" t5000-tar-tree.sh"
 	fi
 
 	cvs=0
@@ -612,10 +612,10 @@ src_test() {
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
+		disabled+=" ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
@@ -625,17 +625,17 @@ src_test() {
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 	fi
 
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
+		disabled+=" ${tests_perl}"
 	fi
 
 	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
+	disabled+=" ${test_svn}"
 
 	# Reset all previously disabled tests
 	cd "${S}/t"
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 67a7f811554e..e9f0c242bcf6 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -572,7 +572,7 @@ src_install() {
 }
 
 src_test() {
-	local disabled="t9128-git-svn-cmd-branch.sh"
+	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
@@ -603,7 +603,7 @@ src_test() {
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
+		disabled+=" t5000-tar-tree.sh"
 	fi
 
 	cvs=0
@@ -612,10 +612,10 @@ src_test() {
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
+		disabled+=" ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
@@ -625,17 +625,17 @@ src_test() {
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 	fi
 
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
+		disabled+=" ${tests_perl}"
 	fi
 
 	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
+	disabled+=" ${test_svn}"
 
 	# Reset all previously disabled tests
 	cd "${S}/t"
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 67a7f811554e..e9f0c242bcf6 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -572,7 +572,7 @@ src_install() {
 }
 
 src_test() {
-	local disabled="t9128-git-svn-cmd-branch.sh"
+	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
@@ -603,7 +603,7 @@ src_test() {
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
+		disabled+=" t5000-tar-tree.sh"
 	fi
 
 	cvs=0
@@ -612,10 +612,10 @@ src_test() {
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
+		disabled+=" ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
@@ -625,17 +625,17 @@ src_test() {
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 	fi
 
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
+		disabled+=" ${tests_perl}"
 	fi
 
 	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
+	disabled+=" ${test_svn}"
 
 	# Reset all previously disabled tests
 	cd "${S}/t"
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index f2d247904c0f..b614c4bbd66a 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,6 +1,8 @@
 DIST tortoisehg-4.4.1.tar.gz 7923557 BLAKE2B b2574bb87693a3fb824c3c02424b8f5828c1e3673b111ae82ff0692588083eec639a67b200ce6e3def58e5a0e021898c3df62a053fa61d477f92d4226d3a1b69 SHA512 b364e6d16845c03aacaf691e8528e0bd87151026f9f55bcaf61ba67d1eebfc3f9935457e5ca3391e29417682367b9b33803a9870817c22db31f1dd26850e9d53
 DIST tortoisehg-4.4.2.tar.gz 8939270 BLAKE2B 858ef57f6e80244ebb99b43608b1d939896f60d2154e461a128efdb0d5ebffbf1b8d5a9a40596316b0bed8edd74e292b5e562e3119f75177d430c081ba07511c SHA512 6b0335d8022d015846d456d351b168f826afa5223b77ee45f2124fbd1099904cca4e2a3ca6cb7a48324491211a149bd431d29fab6932e8f8240542e13d814381
+DIST tortoisehg-4.5.tar.gz 8941832 BLAKE2B b5dda8acf483400bc7cdcc511ca26bb7edbda94aa7ce03fe2b2e3eadc4e7616a7773e7aa974815d51e06a0a8014186b3cb1817eb751509ee85db8b1a3cd4a5b9 SHA512 258956c1d8f7e3b47f35be1d4587a51bbf79d3b9bd218ab16dbfd36c366570b3b8d32fb9b9af54c3389f69e98185185e7900e6f26fb46d6024c979fb6dfb0f3f
 EBUILD tortoisehg-4.4.1-r1.ebuild 1958 BLAKE2B 9bcbdb8041527e8f28e3fa892c1361aba4bef802795d3031d3743713a3cbaedbe5ee36190f5233e6677714bed1462e6033f8fbe2a9ca8908c55de58caf32ac5d SHA512 f5a6d20b69f1196892fc7f7a66605653ea397881122bf9164260160d1be2b05490ee724be7b959bccfe9cb3cb6d92c6feac431e17cc7277811cf8d2e3c5e1c16
 EBUILD tortoisehg-4.4.2.ebuild 1960 BLAKE2B 0b7e73641f2cca4e70f52000e1d3bb0a5a7782a067fff385df4516c9c95b472c5e3ba0a3a9fefe9062d12ee571e8a98714ab073c28ff95fe395a133d35f18218 SHA512 fc5a09758d42c7c6e789607eac3431f8c310490c11e682be905bf7aa2299e5db3bd51692b9438d61521bd4cf16a856e0f6b5091fce23a986f08c22572b1e4afa
-EBUILD tortoisehg-9999.ebuild 1960 BLAKE2B 0b7e73641f2cca4e70f52000e1d3bb0a5a7782a067fff385df4516c9c95b472c5e3ba0a3a9fefe9062d12ee571e8a98714ab073c28ff95fe395a133d35f18218 SHA512 fc5a09758d42c7c6e789607eac3431f8c310490c11e682be905bf7aa2299e5db3bd51692b9438d61521bd4cf16a856e0f6b5091fce23a986f08c22572b1e4afa
+EBUILD tortoisehg-4.5.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de
+EBUILD tortoisehg-9999.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.5.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.5.ebuild
new file mode 100644
index 000000000000..3e6b1f3db8cc
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-4.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND="dev-vcs/mercurial"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
+	>=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.3 )"
+
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	if [[ ${L10N+set} ]]; then
+		cd i18n/tortoisehg || die
+		local x y keep
+		for x in *.po; do
+			keep=false
+			for y in ${L10N}; do
+				if [[ ${y} == ${x%.po}* ]]; then
+					keep=true
+					break
+				fi
+			done
+			${keep} || rm "${x}" || die
+		done
+		cd "${S}" || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	if use doc ; then
+		dohtml -r doc/build/html/
+	fi
+	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
+	domenu contrib/thg.desktop
+
+	# Remove file that collides with >=mercurial-4.0 (bug #599266).
+	rm "${ED%/}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \
+		|| die
+}
+
+pkg_postinst() {
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
+	elog "dev-python/qscintilla-python."
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 441fed1aec6e..3e6b1f3db8cc 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.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
@@ -9,7 +9,7 @@ inherit distutils-r1 eutils
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-4.3 <dev-vcs/mercurial-4.5"
+	HG_DEPEND=">=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6"
 else
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
@@ -36,12 +36,12 @@ DEPEND="${RDEPEND}
 DISTUTILS_IN_SOURCE_BUILD=1
 
 python_prepare_all() {
-	if [[ ${LINGUAS+set} ]]; then
+	if [[ ${L10N+set} ]]; then
 		cd i18n/tortoisehg || die
 		local x y keep
 		for x in *.po; do
 			keep=false
-			for y in ${LINGUAS}; do
+			for y in ${L10N}; do
 				if [[ ${y} == ${x%.po}* ]]; then
 					keep=true
 					break
@@ -68,7 +68,7 @@ python_install_all() {
 	domenu contrib/thg.desktop
 
 	# Remove file that collides with >=mercurial-4.0 (bug #599266).
-	rm "${ED}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \
+	rm "${ED%/}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \
 		|| die
 }