gentoo resync : 22.05.2018

13 files changed, 135 insertions, 26 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 12d8c105947d..9e58e2dbe124 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 44bb9a52de0b..a1751aaf57d9 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 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
+EBUILD git-2.16.1.ebuild 19319 BLAKE2B 2f240ace3b44b6b6859c066505ca3bf69643fe1e30133ea8fca3d71144e4cf96d54967372d8e182283550a34de2c7fccff557942ce06ed04970893da410603b6 SHA512 fc530abf2c08fdf37246ff3d66e3e7746e63a3278df907b2c3790fcf0d7dd6e2e8c89d40455d9136e2d7df0ae0e13fd3103c4335aa0b0a588c669c9ea11864cd
+EBUILD git-2.16.3.ebuild 19329 BLAKE2B e99c8147a71debead1b44aceee153796a88962fa5e68fa37e807b8e613ac9b9e6502a1553bd576cb1ade5f821742c459bfd9b6510a2431e4a7462c71386ac8bd SHA512 67698a7360b6ed2b17108931106a6c9041981be4b24c9de4fb33c75333c81406bed868cf2f31daa51d9334b8e340dc050b058f426b67885ae320a98e632b2aff
+EBUILD git-2.17.0.ebuild 19309 BLAKE2B ec379625357f33a6cfa8049eaa9e207b299de0618284561210e55efec6d9f381a91384837fc29ba16bbf78ca65f50bd71ffbcfcb10f2126b058047e694c6502c SHA512 4fe18afaf0eb09ec9a3ce204a0b84e215525f824fef99cb0eb88d70acae390476b2069b2523edd896a2611ac38c2603e93918d1b9b518b23efdb35a44c574f5e
+EBUILD git-9999-r1.ebuild 19309 BLAKE2B f38bc51a1e5f629336b88f1a4ca98bbe4d06219dcca0e5b0f86a4a4153c7457843108da243afd7d713a66b39af6bb541ba5dbbe40575fccea9729a7d7d33dc8f SHA512 dd5a983ab78ffc1426e784b8130f14a1ddefe4be08c02be1fb5dd43ff0454c0734bcd5f59a1502be9ee74e212454479962f873180e6eb8d973b683f22bd7bd0d
+EBUILD git-9999-r2.ebuild 19309 BLAKE2B f38bc51a1e5f629336b88f1a4ca98bbe4d06219dcca0e5b0f86a4a4153c7457843108da243afd7d713a66b39af6bb541ba5dbbe40575fccea9729a7d7d33dc8f SHA512 dd5a983ab78ffc1426e784b8130f14a1ddefe4be08c02be1fb5dd43ff0454c0734bcd5f59a1502be9ee74e212454479962f873180e6eb8d973b683f22bd7bd0d
+EBUILD git-9999-r3.ebuild 19311 BLAKE2B a6924f4f466d922c227f96d9c170132b3ae8517f25343089e0785bad6726a6e5804f94e8f9092c46430a428ef555c762551f3811d9ff36c08a4b3695c120dd40 SHA512 176a648a57ec497a4f5db1bf9b3115ac72f051e3967e3d2b9f7494c02e66a27fcde667dbe27a7ba548924ca43def395a83c0a625b11faea73af949eab99b4879
+EBUILD git-9999.ebuild 19309 BLAKE2B f38bc51a1e5f629336b88f1a4ca98bbe4d06219dcca0e5b0f86a4a4153c7457843108da243afd7d713a66b39af6bb541ba5dbbe40575fccea9729a7d7d33dc8f SHA512 dd5a983ab78ffc1426e784b8130f14a1ddefe4be08c02be1fb5dd43ff0454c0734bcd5f59a1502be9ee74e212454479962f873180e6eb8d973b683f22bd7bd0d
 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 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
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 621c271d5c47..b45d9b76bd78 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,8 +1,10 @@
 AUX hg-git-0.8.10-hg45-memctx.patch 1817 BLAKE2B 73e638b88698950e3f178c30c063ea269717738923c4f81a25795eb3ac90b14b5477a08c185a37931a174d18855709cf55089819e5c73859c8af7323959adc6f SHA512 63b24d3a5cf0f553521184049b9c8452e1d66af9a89bb20960ca5198c58af53b0e106dead0cbe2b61f1b6a786ef33547eb9215483eafb57191dd1c053ec124be
 AUX hg-git-0.8.10-hg45-memfilectx.patch 2586 BLAKE2B c40212ab0d201993d2f97b425e84e0f09cabe94e804078c680dd3084859e65d3beb4a570d717f57c1eb2bfeda10d3fdc1440d3d12fcf816d05cf2ea033bb8969 SHA512 3211680a1ebcd508f7a4794ac796bd25fda22087a98f51b7d06e8b9ba16314db061ac8a0085dd0ccecf834c316f27bca54acd87c2152b3bb72df7d6580d5dff9
 DIST hg-git-0.8.10.tar.gz 116019 BLAKE2B 425a066864051f03e3a3305e74a5920055a7f4c79826711c567a59fcb32171db3ca732ba3bb61edac4ac9847fff897cca4fe0d02e65f69e7b0f0440fa2f32cf4 SHA512 ea6de91114005d38568eae1fa5f38aafe73c472c480496ea05b4472c1d8fbc89e76c9bb34eef2641b89e6d0c3f2a9a187d844687214f5599d0b4d0f6b7928c32
+DIST hg-git-0.8.11.tar.gz 118537 BLAKE2B 05a63633f8909260428197334812d314cdba115324fa7dd70ccb5d0ee1e21089be0b8bb0cb1cf09f5f738cbee00e3e688646daa3debed9fa36fac2ff62bfcb8b SHA512 ced6b8b522f75b0e2b59c5113b3afd7b02eb2e3798a7aecdc211a15aba1363d3785234e909644626b5c16d7e8b158a6fe1f1120dcd85b5709d8a84ff1f4b6655
 DIST hg-git-0.8.8.tar.gz 98508 BLAKE2B e7636c3809b2be8a7fcce44a72f89f39927a282c34384047036470fc832b34be1922de75a2a9b468ec125ea716263333f5f58e6a0c7de12729b7dd18c68b657a SHA512 c3b28273024f2429ed526354048f0e37d0af6be591020fa3b1e8d1321247d72129f7c8fbcef73e69d60e243a6f86380dc4d89f0e8f913b786ef4497421237aac
 EBUILD hg-git-0.8.10-r1.ebuild 800 BLAKE2B c8cdbe02f8d1b72922d1143a3cbd7f8f971d13de62f2841c59e52cac107ec5ff25d977ae29fc27444783bed30db955f88ebda714bf3df3f0ea43071cd13afa31 SHA512 848a5b4cc539da8fb4e578a11602e279f562211bcde22d5e7a0b8fe49e0f8fe01d4d560b90bfd17d7a502f5ad80cd664fad0ada8d02b60f42c60d7fcd648f9b6
 EBUILD hg-git-0.8.10.ebuild 707 BLAKE2B d0013bc65ff7b9470d40728d9fc4393fc552cbefa710ca340ff894069e0e2af56415313eb632f117a85674bfa68e57d401f0dc28eb85fdb1ccaa700773b9c9ab SHA512 11e15d0520c9371175706bb633e71101f179072270987a952628d7fe6b11294d67501b9e934e7fbf61270794ce57ce81941e5109e42b41c88f8ee04995bc9fe9
+EBUILD hg-git-0.8.11.ebuild 707 BLAKE2B 6bf0f75ecf2877a5b3d4775949aea77332dbb57d874c21acf36c10c0a377e543f6087e882a34127c56b92931ab47456f36a10019091c247cd81e0e84c4fa0b71 SHA512 b404e426bbfe1cefe5d56db9ef463ca4833c1e40dd7ec5ef9c4fd2eb249301fafcc8e321417557058307b8992420a56244245e1a908485c30977b30428849123
 EBUILD hg-git-0.8.8.ebuild 697 BLAKE2B de1b6b49eeef84667cad1bbe50a10ef919352b49e402f9d0a48c7ff2c6f560dbd5e208d5456a38c07473bc8dbab1f23eef8cc85a8d90d333a4b98f30715601a8 SHA512 b0f24d48a56171a5c30575df57db48ac859bedd5912a48194a9183c06930e5e56b01a06e5dbcee7462d692f1c9a41f79fb593a73cdd0ebf418da05b24bee9cf2
 MISC metadata.xml 317 BLAKE2B 53e7e3877f6f42a888ad50ba824e4a50f4535d4a9345ff2a661ae3df79e57bddfb8faa80ea632856a530b99518e90d4311f8090003880f3a5cf073fec1d8c926 SHA512 98a36b756fe1f1ee4f2d7c1f7f0dee8925a1396d2b44eff84274aa4c6e871d87d17808e157c6020cbeeec763e44fc4ba6e5d266561b3fe5c015f04c864349a09
diff --git a/dev-vcs/hg-git/hg-git-0.8.11.ebuild b/dev-vcs/hg-git/hg-git-0.8.11.ebuild
new file mode 100644
index 000000000000..c8f0f56632ed
--- /dev/null
+++ b/dev-vcs/hg-git/hg-git-0.8.11.ebuild
@@ -0,0 +1,24 @@
+# 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
+
+DESCRIPTION="push to and pull from a Git repository using Mercurial"
+HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-vcs/mercurial-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index de60858802d4..2551806994b7 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,6 +1,8 @@
 DIST tortoisehg-4.5.2.tar.gz 7935559 BLAKE2B c69107f28767936232937ee0b730b9b937dc1a475d142f0783b59b434072be1b2413f141e02985f3efe09a107782e64411323bd7c0a41be8802b1f23f54fdc77 SHA512 7be831203a33a9d7ea9e3caebb5a4d3f21ff0f07c508926b33b43db39ae11b3533c4274af78cdc2955fbea20f3e4ebe364004c9ad0a781ec7d49c19c2f5a1935
 DIST tortoisehg-4.5.3.tar.gz 7929645 BLAKE2B 95b867f372d636ed84eda918a707e24f4b11e34679ae9ed1c25f82a7aa6bb77f424bd68a99b5f961d14960a2f33005536996de2f3df9871684bb53f68130b1b2 SHA512 0c6c512f7a46a084904a5e66912deb8ef4abb99a6a97c46b6b058537332f091395f4b9b8a4b645d7c42637abbb4e8abe16f5040fd694bb43ea8b4c6ddb1e18f6
+DIST tortoisehg-4.6.tar.gz 7947478 BLAKE2B b2176e3fd508a84c247802490822d47ed117f3102b4ddc10987114018611a710696e2910f3e4b63f80357611fd2ebd8333322df1e5f549a9a618ea1b9017e430 SHA512 a57d3f10dde22da48b03252e41286dd40b7e261ae9ac9a0c09c8ccc361773d9f66ddb0f71c7eb800bfdae65587915a988367472885eb473ee810a07828044ce0
 EBUILD tortoisehg-4.5.2.ebuild 1954 BLAKE2B 39ba4dcab7e5adc52259be8fde3759374be41a5b222933f12c1fba2214e47827187164fe63342a59767e75d37ccb888deb45c329943698bedb52a39f813c24eb SHA512 cd6906236863be316c45f0208ef174cdaf03a7075d148bf1cb573fc4620f051a81ba764c8852109ed2365da15c8395947d0622feffd0d6831069df0c4634e6bb
 EBUILD tortoisehg-4.5.3.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de
+EBUILD tortoisehg-4.6.ebuild 1956 BLAKE2B d50b774f17318c1cf54b28ad6e4af8df223505ca784679f9ddef11c8a22a1b814f38ee285c6f825745c0076f37bfa3c5104c4b36cb6e138822880418d8a93c52 SHA512 6b6e0868b76709c25461777c13af1c65c14ac6e843aadca60246bf831366395a2b0169caac279a8d7ea48120101550ad3647640759be8d97b89955cb8b72b737
 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.6.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.6.ebuild
new file mode 100644
index 000000000000..7b53e9b14fbf
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-4.6.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.5 <dev-vcs/mercurial-4.7"
+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."
+}