gentoo resync : 23.09.2020

30 files changed, 80 insertions, 462 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index d040f6512d45..47cd016ccabf 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-spindle/Manifest b/dev-vcs/git-spindle/Manifest
deleted file mode 100644
index 9fb8ee023989..000000000000
--- a/dev-vcs/git-spindle/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST git-spindle-3.3.tar.gz 1854895 BLAKE2B b1330ba728a7f124024ad755ead350fc3e8b2a3065afe70f56b4053bc2a308920c5e2ec4d4bfee566ad199d58ec0cc3d25ac69be1e5999a2527a9711b79f4164 SHA512 5d56f51d952ccfea321be79108a795d9e7dd7eca78d966955e76e1c8297eafc9899ef40b6ef1bfff692fe0ce7c3d54ead0ff5fdf31eb559d3ebc0ef9de91c3e8
-EBUILD git-spindle-3.3-r1.ebuild 669 BLAKE2B 030221392aa61557a5a353c4c3bb77b4d32934caf70b196521d12de1e2c012b022eab2c36437c7c44e53c4e0dead5b73a4eb2d9eac99611ca73a1ff4db28737a SHA512 3ae89f482e44a299bae1d1059ab5567c1d2943086206b2eccf10f0650b7a9f22084837b7db28fba46f5ee831896d9445807aaca2eec361cd03f0779edc6a2cbb
-MISC metadata.xml 626 BLAKE2B f24c2dedc0f5d576e138ca4eb7a77d892c16ac5b7a96bc41161b49d39e97920ea11eea3bb3c67a72086a756ec40fae9fb8b866eb38c6fd86ba885b41f01d8cdb SHA512 7f2be03b228a372aeb1a17913d790ec69c2d02d684c9495c460fff28b00b4a36e14b66e25e0ed31f0c9c0913ff5292cff02ca690308fe3feee84b66e9b3678b6
diff --git a/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild b/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild
deleted file mode 100644
index ec1ea0e27378..000000000000
--- a/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Git subcommands for interacting with central services"
-HOMEPAGE="http://seveas.github.io/git-spindle/"
-SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-vcs/git
-	dev-python/github3[${PYTHON_USEDEP}]
-	dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/whelk[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-vcs/git-spindle/metadata.xml b/dev-vcs/git-spindle/metadata.xml
deleted file mode 100644
index baa38de52430..000000000000
--- a/dev-vcs/git-spindle/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<name>Nicolas Bock</name>
-		<email>nicolasbock@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">
-		Many central git hosting services, such as GitHub and GitLab, provide
-		an API to perform actions such as creating repositories and filing
-		pull requests. git-spindle is a collection of git subcommands to make
-		using these services easier.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">seveas/git-spindle</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-vcs/hg-evolve/Manifest b/dev-vcs/hg-evolve/Manifest
index 342b5c682bce..1300a3f5f146 100644
--- a/dev-vcs/hg-evolve/Manifest
+++ b/dev-vcs/hg-evolve/Manifest
@@ -1,3 +1,3 @@
-DIST hg-evolve-10.0.1.tar.gz 810363 BLAKE2B 8d9de203262a90a37120f2a0fd4ec29352719f8aca6ca91138a5efa99087ec0084d4ed8b1f828f6df49dd93d2c3d3327119e8f4f17815e5fd1022af6b7a1f803 SHA512 0ab0d64962671f2a107a0b5d56d3c8ec3d29325ac425ee109c1e08d899c1c4124af5676deb60bb4e82f9786474c47f587fec267e27b741b9f73ab18fc473ecc6
-EBUILD hg-evolve-10.0.1.ebuild 764 BLAKE2B dad3a999e0f5a439a5a79fe42d2ef6e86672ece4b76e60c2ea42fe868002c07cce75c4837e3a6440d0df50c870689b1e91057a0e9af9247fbb21bfd053807a0a SHA512 41bb97620a8908b0e6c3d3cf5688e20a91990789fc796069cf08f9f5c2ddaf49271e2a22e646e4f0098ba58b328d38182db9368126c474abb8bdf840a5e3a502
+DIST hg-evolve-10.0.2.tar.gz 809860 BLAKE2B 13420a8247a0a708bedd0863aa20b08699d0a374bd259b043636ccc65343b6661d95b94ef80f81724aca655edf1e9448c7f78a28470d7fb1e76aa9fa0c1cb06d SHA512 9250c5d46a6b3263e9d09f6ca72a912887c793ec4d2f7c9440aa07058f2706a28f2d78352b9c91d20bbd4d8fd4abf2e21d92d72f32faf046d6b8ff2dc2f6d15f
+EBUILD hg-evolve-10.0.2-r1.ebuild 754 BLAKE2B ffbdfd30cb33d0aee4b2fe55f46732959ae1cdcf7a4c867c3218af2ff2aab6588f6bc92c426c35ae6a0508bee130ef336f04a2165e446f999d6fe57a555910c2 SHA512 0b1b89f4ad510575dd3128f95c60b5cfd1d56fa894517cce8cd6f772c6db1edfa5452eea25f2ff988811a729c487d23c36c0349f0a196a16192532d07d95804c
 MISC metadata.xml 287 BLAKE2B 62f44642d7581105c39d8f7ce9a9e7463e14605c8b9229074ed1d9537448d07999bdc8f29ed6d635625d628d54b4656e12ca9c5f0e9c61a9cad999ba3f1cb432 SHA512 51c3ee1aeeaa5bdb8d990cbec310842a8f7901087a99384a87cedcf764cc813cbec83d822d6dfe62803cff9792aef1d718dbb8eb8537eae46c5eb5bdad119fbf
diff --git a/dev-vcs/hg-evolve/hg-evolve-10.0.1.ebuild b/dev-vcs/hg-evolve/hg-evolve-10.0.2-r1.ebuild
index 6ac77b0d8610..86f87960d3a9 100644
--- a/dev-vcs/hg-evolve/hg-evolve-10.0.1.ebuild
+++ b/dev-vcs/hg-evolve/hg-evolve-10.0.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit distutils-r1
 
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 130e84d63cd9..880feceb4452 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,7 +1,5 @@
-DIST hg-git-0.8.13.tar.gz 127399 BLAKE2B 0cf47df27dfc19cb66d546c1647af4f6b112035ee089c42331c0f2c045ead9e9abf796f0ed0747f52efe1452a9a2ccec237ae4c0296173ae283c180ae5cdb75b SHA512 55eed0704dc2829e6f027bc842e69aa5d193c824521e4c96171cecabd0155b0635a06b5ff2be61cdf0fff1bcb075190a324087b4171fba05df8db76527878a4a
-DIST hg-git-0.8.8.tar.gz 98508 BLAKE2B e7636c3809b2be8a7fcce44a72f89f39927a282c34384047036470fc832b34be1922de75a2a9b468ec125ea716263333f5f58e6a0c7de12729b7dd18c68b657a SHA512 c3b28273024f2429ed526354048f0e37d0af6be591020fa3b1e8d1321247d72129f7c8fbcef73e69d60e243a6f86380dc4d89f0e8f913b786ef4497421237aac
+DIST hg-git-0.9.0.tar.bz2 129138 BLAKE2B a3758d3ff4daae98bccb71ac5471418b191596d7605c5fe867fde230a8deaacb3097b7f5f6f34ee55ba871a850c1c6f7cb6c1e9c05e388419136aecd66b775ea SHA512 03982292f042b9b48f58eeb04413f563b35fa8be1c31ca27825db8fbf293e4dfcb4bb62b6f504d82438a11c967496fb9bbd6aff5d77ae7eefdeb7747c53fcb82
 DIST hg-git-0.9.0a1.tar.bz2 128165 BLAKE2B dfe415a26554d6de714b64aa79f771e08f2c7ac02ee42732524b85a6572003bd428ea29823774d5ea4fa0eee251629bcbc78d9421773c312925a0114e51098ff SHA512 43119bacd4bfc169c8403b3d67e14609ada454a7635c50af5db3683ccd36e1d3be2ec0896204f0850b0cb0c09ded24ae723ad3eb6ddc381553f8c2b2ff2c84a1
-EBUILD hg-git-0.8.13.ebuild 704 BLAKE2B d7d392beca63439af85f5e862c79e01487798d56d1958d15af5df7aa0a0fd4720cc29528b9eec17507c2862318b86e8184598d7beca0802362fd186a83085f0a SHA512 fca80ff4da4219162f8caa1af56a6b982081198a69d2663bdd97f560a869191162b0dc93320be763c9872f28cefa2d85d1c8ab57b57b6c1f63658fbc18605819
-EBUILD hg-git-0.8.8.ebuild 697 BLAKE2B de1b6b49eeef84667cad1bbe50a10ef919352b49e402f9d0a48c7ff2c6f560dbd5e208d5456a38c07473bc8dbab1f23eef8cc85a8d90d333a4b98f30715601a8 SHA512 b0f24d48a56171a5c30575df57db48ac859bedd5912a48194a9183c06930e5e56b01a06e5dbcee7462d692f1c9a41f79fb593a73cdd0ebf418da05b24bee9cf2
-EBUILD hg-git-0.9.0_rc1.ebuild 810 BLAKE2B 075e8622820d3d0f7e2f1ea07f568c1e81b4718f4e0e3d19bfbd214f96ac41c93242351542bc2edbd201567c6f849d7e64f6187de76be866ad14f6682b0e18d5 SHA512 2516ff8415ceb5bf9022ccad3eeb592a3288a4797a84cb5cd18b56e641bdd9cd7fd012e6034ae0d6ef2414d8dc97c386d19af0d9b687305c2dc3ac526993936f
+EBUILD hg-git-0.9.0.ebuild 802 BLAKE2B d8228a596755e72319cc660e1a9f076c48dca55d7234a2955e4341a2a66c16f96ab4e559c37ddd6d3bad18051fe97e21cacde63d398773654ea0d2b95f065688 SHA512 a66826818433034d955cb1f0b4a38517d86f746639e3fc244a681e364bebf9adceede5d023fa02cfe22788b1ee3f6de7cdb0648e6fb7d67daa0e29af4af207f4
+EBUILD hg-git-0.9.0_rc1-r1.ebuild 799 BLAKE2B 09dc14d7fb1d1a4d8da4dfb655791933f64986d1311332d8c3fb0b7f26667bb2c63cd6cbd5b2666095c5efed9598af87472875168c7bd875ff954232b78ee164 SHA512 bd74c97a578af03a0642fc8c85585ce3e37a15cf8b9d8a0f603fcc1d5e97ce02badbee06043181a73da8075d5b1af125690e2b39807fa970e2cb82d50204b9b8
 MISC metadata.xml 317 BLAKE2B 53e7e3877f6f42a888ad50ba824e4a50f4535d4a9345ff2a661ae3df79e57bddfb8faa80ea632856a530b99518e90d4311f8090003880f3a5cf073fec1d8c926 SHA512 98a36b756fe1f1ee4f2d7c1f7f0dee8925a1396d2b44eff84274aa4c6e871d87d17808e157c6020cbeeec763e44fc4ba6e5d266561b3fe5c015f04c864349a09
diff --git a/dev-vcs/hg-git/hg-git-0.8.8.ebuild b/dev-vcs/hg-git/hg-git-0.8.8.ebuild
deleted file mode 100644
index cf1461ddfdee..000000000000
--- a/dev-vcs/hg-git/hg-git-0.8.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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 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/hg-git/hg-git-0.9.0_rc1.ebuild b/dev-vcs/hg-git/hg-git-0.9.0.ebuild
index e369cbc472b7..96c5e8576a8e 100644
--- a/dev-vcs/hg-git/hg-git-0.9.0_rc1.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.9.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://foss.heptapod.net/mercurial/hg-git/-/archive/${MY_PV}/${PN}-${M
 
 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"
+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="
diff --git a/dev-vcs/hg-git/hg-git-0.8.13.ebuild b/dev-vcs/hg-git/hg-git-0.9.0_rc1-r1.ebuild
index 966cb0bea758..a2653658ef55 100644
--- a/dev-vcs/hg-git/hg-git-0.8.13.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.9.0_rc1-r1.ebuild
@@ -2,23 +2,26 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
+MY_PV=${PV/_rc/a}
 DESCRIPTION="push to and pull from a Git repository using Mercurial"
 HOMEPAGE="https://hg-git.github.io https://pypi.org/project/hg-git/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://foss.heptapod.net/mercurial/hg-git/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.bz2"
 
 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"
+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-3.6[${PYTHON_USEDEP}]
+	>=dev-vcs/mercurial-4.3[${PYTHON_USEDEP}]
 	>=dev-python/dulwich-0.19.0[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
+
+S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 6a282d741377..0f4322a58d62 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -4,9 +4,9 @@ DIST mercurial-5.2.2.tar.gz 7333065 BLAKE2B 9cec5a6ebe4693a1b96fe268211aa2eaa066
 DIST mercurial-5.3.2.tar.gz 7514256 BLAKE2B 250ecd5c0a64138cbcda599513efba7b040c0fed0f020c73ade2525e0ef8a9ad06c10c5df4e16eb9bbeb3ab0f2cbb622a65f6d4827b269654c662810ef0385fb SHA512 b0afcf82b51676d2e7592eb9b29f9611d59816399166400027b6c8b29c10c9ddc96b57f7913e78f938b1345bb7ac29ecd4ddc793165b7cf192c3c7a95712cc99
 DIST mercurial-5.4.2.tar.gz 7730738 BLAKE2B 689a50e1675f678436bb805a5de1379646943f865734a85ef39187f4d90007125c33d6f8dfa6256510fc4214c82153060c671c601fe4b7810f1df77f5b542ed2 SHA512 92d730e330dcf333b2c8f6b784582e3a639759bcad594ac06b4e92f567a70c6938e33a3c322286d6b3ccccaedb634ad3febd2cf927702b3826013a76af2a9c15
 DIST mercurial-5.5.1.tar.gz 7759341 BLAKE2B 285100036543c6a74a6ec6c3d055b5fcdc8ed044092b1b3699b16412eab4d85179baac42a0a27081aa715af0215c39a511728ae947689628e0c4717bdbeed209 SHA512 9cf02dd637154a5205d81eddf69681bd05405a29592c348c9d9cfa3b57ad3e678f98876fa6899d85d33a502b61f81e320262c7da394efb55fcca1d1219ca7cf5
-EBUILD mercurial-5.2.2-r1.ebuild 4058 BLAKE2B 34042ced46f70b449bd2b5227a6b75189fed424a0ebbe5a89aafe5fe333ad69d4fd9be38408839540a31fcc6f88bc57b9c8e6a1d9b0467a21e362df1a1c37742 SHA512 7d7d5bd4c6883256c5a5554ac31134b5bb4f78b28cbc84711a6ce70852419c9e1924cf05facc793ec0a6813bf5b6570436e30f41391873cf8e8ea272e095b3e2
-EBUILD mercurial-5.3.2.ebuild 4065 BLAKE2B fdb792f9fa429c7e2a28eed69108307ff3e90842c11a7814b2d73081170201cde11105f688dc1b3b5b561111a490f8854dcdc07bb54c450dc08dc9735378f91d SHA512 db9fd1d352cfec13b4fc5686b1d8f7e7dce992d9424a064a6f7db81c5c769d18c088fca40cc661614e6a5cc127f57bbbdc54bd756dd0c3d327ce6e76017a0b90
-EBUILD mercurial-5.4.2.ebuild 4073 BLAKE2B dced5716e83ef3d2922b71a304a475ef0ce3cfb70d7f06bb7f9c0539097c2770803b060874085838c01beadd6f98ebcd20f4eabb3c372050de81366b1e4c967b SHA512 485af7244bb419b8309f33ba78b1746e605aab363b376b74b6eb0356d3daed7a89b5c9b8ad60113b9de448fa7cb0120ffd4ff807017a94c1b43c4f9b4eca0e78
-EBUILD mercurial-5.5.1.ebuild 4076 BLAKE2B d10bf251406f0d696d58ab7fb44cbcc8f2f8a3d11be6d3c69f258b07e2f6761d3ac23ef73f00810fa87fab9cc1f48e30a2f8ee1b2cf6bb063e4251a972bbf6bb SHA512 e6167adc94277ca62e06d5078d41b2f14b34320700996bdc8f014e5c55806a52f2af7b15dc54479aaeae63fb403ac53f0224c7f9722fc0bd69454601632ce598
+EBUILD mercurial-5.2.2-r2.ebuild 4048 BLAKE2B d9afb13058b168c4ccb3466987883a3b0fc61cfa3107aa2920cdd02a2416963dd4ac83b137031390b95107c4a2bcf07661f223a52aa2e6d9066fc0866821ad20 SHA512 0e0df21ed7d1f4808449b49d3043245a6a1c173db83213c8ab669e03d6927514f49bd480531a15b7e7639747e19c338eb6dd4cbda9968e4b21a7e746c4de2854
+EBUILD mercurial-5.3.2-r1.ebuild 4053 BLAKE2B 57d2a34b5c7ae27484034707b91fa590c4d51663ad18af0c6415d5e8dbb1162c444631cad9e79a0121c160b7b23c70dbddd47b2ab266a2d9c1f52502530a032c SHA512 5ccf72b22e8c7cf3ffff5954a8a464e0bd4abd4546c0e58cd82ec25fda5ae668a9905b9d916017444db133b05fea1a66a9df4639df9f15e09a0b4b4c8cb8e2be
+EBUILD mercurial-5.4.2-r1.ebuild 4062 BLAKE2B 7341625a36cee88eeadf4c4cc870935f3dd1e8fe6c34b1cb5e4fb2e8c892cbdbcba04de1fb59cb04a2a69129da17c28211b54524024795c7ff10f2e7ff14c602 SHA512 cfd91527f009b561aaba01788ac9ddfcf79ec6f35d316157f779f0f5ca2ac410d53c6581eb7724d033a2510655766f924b1fab0266446be0dd55e6f2904b7c50
+EBUILD mercurial-5.5.1-r1.ebuild 4066 BLAKE2B aae8630d7f04779c88056c87ee1a93c5fb8d4043d21099e463bfea2b658f01453faf1abd6d25056ee6fb7373efea76255c9fc5284d4f3a12b59b505e431da341 SHA512 d29490aad369da1878f27c2010a220712a53488b221595c092b86fba56754c8f4fdabf283bb5a1277998f89a073282b303195c1a3558aa0f6f1d4dbec1b5675d
 EBUILD mercurial-9999.ebuild 4022 BLAKE2B 3eb57bf9fa8e98e4c3fe69bf32a0c680dd52c078432cf06552bb3fa171a60deac1f7846f9798891a814be1d30966241214993326aa038be1f4111bb1953ed47f SHA512 82bb2b230fa1919805e388283350a270e0db8d38d48c3532cadccd5d3d7e8ebb3dcc9d670c97adac0005f021afc0f035054c1608787e840256d1f30613d823a0
 MISC metadata.xml 483 BLAKE2B f81d3e855c41f0f5bef819cf4fbb537591f187917c76b5d153f9bf5f4cc14959c5aeef17ec9e5a0596d8e6bd2d8db0ad86dd4dea5ddfdd44a4c063acdc6a8a81 SHA512 3132d4cf6a2ba22ee8f93aef8de590bd576143dd80f56d515afb14cd5962899c0dfc4aee8552f041bac77b997055b2b407bad104591286be985de839f159fc83
diff --git a/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild b/dev-vcs/mercurial/mercurial-5.2.2-r2.ebuild
index 79871f6f4a18..5211de4c22a5 100644
--- a/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.2.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
diff --git a/dev-vcs/mercurial/mercurial-5.3.2.ebuild b/dev-vcs/mercurial/mercurial-5.3.2-r1.ebuild
index aaa1c5c47161..d1758b7cbd66 100644
--- a/dev-vcs/mercurial/mercurial-5.3.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..8} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
@@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~ppc-aix ~amd64-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 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg emacs gpg test tk zsh-completion"
 
 RDEPEND="
diff --git a/dev-vcs/mercurial/mercurial-5.4.2.ebuild b/dev-vcs/mercurial/mercurial-5.4.2-r1.ebuild
index 0fc50bd105b8..86a1127fb83e 100644
--- a/dev-vcs/mercurial/mercurial-5.4.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..8} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
@@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv x86 ~ppc-aix ~amd64-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 ~riscv x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg emacs gpg test tk zsh-completion"
 
 RDEPEND="
diff --git a/dev-vcs/mercurial/mercurial-5.5.1.ebuild b/dev-vcs/mercurial/mercurial-5.5.1-r1.ebuild
index 2b111cea9199..ce2ef0fdc4c0 100644
--- a/dev-vcs/mercurial/mercurial-5.5.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..8} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 9022feb85367..b936cabc40b3 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,7 +1,5 @@
-DIST repo-1.27 29945 BLAKE2B 930fa876b8889d64c8d12444f4cd59bebbdf9848d455e114fc9306922d931aa721320db65a07c38f705c39950538a1d5ae5ca66e359d2f2e38061d144ac11cb2 SHA512 a9f651e5fd1da1c74b31aebf32d03cf868183fa529eaf2b079015f9e778a2bb7c1ef49e06564703534c45fa1bd7bc5bd3d91a91477c336e549c1208afa74ace6
 DIST repo-2.5 38761 BLAKE2B 26d002bb7e5a24dc958bb4e0653c2cc260b2766d81fd55edf9a0373542365ed89a224805293383e2c16d8fc331038b265d3b2aca3a9a637d893f4a9c8221ce76 SHA512 36e515241fd9705c63beaf662309dc2ab6406552ba845fe020c878ac82e7eb7e1cd73924a076cf5fe4800ea70919bb5ad5d2d43566d5b0a559f81a45f9a58fe8
 DIST repo-2.8 39134 BLAKE2B af52a2c06e09de83100cb297d585f89bcbe85d6e9e5c358024a371ee4d47c59992745d1088b164fc670cdd9db7394a5f3521967e3eb80840c53993af8b0172b1 SHA512 6d577fce34eb298035a7b98c24fc21521c8c9efbdf02abc37af8a54552893ecf8cdce2db5efbc5398d7f99226408f6cc9ce2f81c2961d9d5dd21fb0264194431
-EBUILD repo-1.27.ebuild 823 BLAKE2B 159755dc5fdb25fae05fa1026c3f19ccd4b93a412d6b425a541a4c6f794c7f5922d6ead911177f55ea8e298555b82447668f7439724a12647dabeeb2e8794ea8 SHA512 638ae406a07fae698242a91e4d2aad5fc723fa2236a90c914e30064f018abe4f06a4be832c88148e49eb256c6d73f6a9c961696720afbff92a09f919c37aeb1b
 EBUILD repo-2.5.ebuild 853 BLAKE2B 5123c3b627a65cf07ab9586308676a9c3edb1b5037525d6b2af702203b4223676ebf5a018239d6655aae90c2daef1358995a490b37a0c67bda6e66c000907ae0 SHA512 b5862ce4158e106a6a21138371b5471f6f70bc5844b074de0f1334daf3183238df0d81784afc448c403cdbb027ce240948c0743d9e39a2c19f053112bf578883
 EBUILD repo-2.8.ebuild 859 BLAKE2B fe8ad85ef67acc2ecfa5ab5a4f84ce25d5b71efda9dd5ebf5d1888e0adb0074ccb5fc5cf374e4adfcd3cd1349bb74fea53f8aeaad087f315f98004720b56b0c4 SHA512 8c12b6b3350b182241dd8b82890a3966dd99938aa344f0df3833df41ec532d09812f0f4b6dddbabcc26abb32cf567b1206a1c0ae74efa288b92e3afdeaefcb86
 MISC metadata.xml 214 BLAKE2B c0c4c0ad9c74c68b5d7e4e539dc441e82a025754b84fa14f01d0f6772b5acacc836523305857e1a8ef54d472e77a339d2361ec4bc70651cbf13e7be34b051d81 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd
diff --git a/dev-vcs/repo/repo-1.27.ebuild b/dev-vcs/repo/repo-1.27.ebuild
deleted file mode 100644
index 668b64040fce..000000000000
--- a/dev-vcs/repo/repo-1.27.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: The $PV tracks the *repo launcher version*, not the last signed release
-# of the repo project.  They are confusingly different currently.
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Google tool for managing git, particularly multiple repos"
-HOMEPAGE="https://gerrit.googlesource.com/git-repo"
-SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!app-admin/radmind
-	!dev-util/repo"
-
-S=${WORKDIR}
-
-src_install() {
-	python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
-}
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 99ddebb7d9ff..288ff8cdc899 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -5,6 +5,6 @@ AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa60
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
 DIST subversion-1.13.0.tar.bz2 8508122 BLAKE2B 761def1bb3a1fe5333534ebda0940b618c343f919688055cdef69552bc515ad6cd9db3ac67c8c73075487d4f45d93bb57fa467288756dfa163fc72c8e8c7b548 SHA512 36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2
 DIST subversion-1.14.0.tar.bz2 8497531 BLAKE2B 261f1401a96b181ccbdea9ab6e1dde301aa2c67296a0dc458a1d7e544530411b656d0d5335f985c9222c2d44fc8f962b1a960b81e4ff4883d373cb4405af2461 SHA512 af6b706fdc91f7ab292fce9d9de582da306fd11e92767dc852687e71a6a8b65bb867fa70d5afd7f76a46005acb1b3c2d3193e690def48cd26875b3a7851cd13b
-EBUILD subversion-1.13.0-r1.ebuild 15766 BLAKE2B 10c9688414713da03840f7ccee255156f50a1faad64c0513fbc39820bf21d42e1ff6c87cb8bd40270595cf795c0de0d41d3cdabd95b5eb40711826eb2dc2ec7a SHA512 e467b90ff4e7636cafcce5f60387c1a1446937b7fc6abf464bcfa2252c41e7117d9f0717f29c6d89c60c2185e9050c642667827fcb6a8805e13cda0bab02ea24
-EBUILD subversion-1.14.0.ebuild 15293 BLAKE2B 7d6d2377b26f6a17894f07335b1ef56f97f46595c4bfe1d4291ccfdd511d60428c8ba2a66c2b56a8da23e362bb34394756c63064df2087a5208a72caa5118095 SHA512 ae1781c78c6d17117f2c93af19f7308ae34d4e862e5f27d49c9aa3667a63d0ebc32f6ee3a0cf9ac05210555300e964b1b895335b835b682a99de678f5f733e68
-MISC metadata.xml 770 BLAKE2B 3fc171f38c8332b6ebf65452866062a0c1e9e0019f5b84e5a61da936396641fac71a96d2c06c3179fb9545df163a8888c8460034284089076e3c1f7c281ef0bb SHA512 0ad45cbda96545bf72ff456f1b7c4d295580bead15e37c8861a571769731623ecca00f4a18b565cdd3c370d3e2ded68854bdf0fca3229434584c8ab340be90ff
+EBUILD subversion-1.13.0-r2.ebuild 13081 BLAKE2B 99250f98b677b87f9f1b194c2673fd8c0f4c837c3201aa03c522753c71f875bb907c7532f1da7281209361ddfb633e2c1b3c3fb567fc48a9bbb7063818964229 SHA512 23e99c3f743d061cc2ed01b6632e52fa04d7bff3fdd6760dce797fa3acde36ee973dd50fd809fa62ad22460f39c0152c7646c0da3e03ace8764679a2400c01ed
+EBUILD subversion-1.14.0-r1.ebuild 12626 BLAKE2B 07756d526cd4a0747f9a4a9a41708b521f5415622c6e1d45a04a6715ac3a7d5eaa87c4b26d4f77ee2a80c44f8eacd9ef5fdeb9c2a90f931d0205b3d2bda71eb0 SHA512 d75fa62eafd61865f3fd659a6e4bdb7b40ec083e53aa7f36b5dd5a0b2b354d8a08a7a43d11a165afcf77650f1ad0641230c5185f3e22e77f508672c997f933eb
+MISC metadata.xml 693 BLAKE2B f9384d6683c910b74391176650014192d0893aaea9f45da26940212ea9d2f0121c30d85dc6a6400715655bca11f580a1255616f6c1663d93cfcf592fb50992e2 SHA512 14d47f3a97ff2d83ae573070022dfbf0622ef09abda125d9a4db95a2b48762ffbde47da09ba32df1a49e9a0dc207f1b66d5440d847392b6e62c8732abc407670
diff --git a/dev-vcs/subversion/metadata.xml b/dev-vcs/subversion/metadata.xml
index b2b200e9148b..90882d9cd881 100644
--- a/dev-vcs/subversion/metadata.xml
+++ b/dev-vcs/subversion/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Mikle Kolyada</name>
 	</maintainer>
 	<use>
-		<flag name="ctypes-python">Build and install Ctypes Python bindings</flag>
 		<flag name="dso">Enable runtime module search</flag>
 		<flag name="extras">Install extra scripts (examples, tools, hooks)</flag>
 		<flag name="http">Enable http support using <pkg>net-libs/serf</pkg></flag>
diff --git a/dev-vcs/subversion/subversion-1.13.0-r1.ebuild b/dev-vcs/subversion/subversion-1.13.0-r2.ebuild
index a0276cada505..4d9e70f3d1a9 100644
--- a/dev-vcs/subversion/subversion-1.13.0-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.13.0-r2.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
 GENTOO_DEPEND_ON_PERL="no"
 
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 flag-o-matic java-pkg-opt-2 libtool ltprune multilib perl-module ruby-single toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool ltprune multilib perl-module python-any-r1 ruby-single toolchain-funcs xdg-utils
 
 MY_P="${P/_/-}"
 DESCRIPTION="Advanced version control system"
@@ -22,7 +22,7 @@ LICENSE="Subversion GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
+IUSE="apache2 berkdb debug doc +dso extras gnome-keyring +http java kwallet nls perl ruby sasl test vim-syntax"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -36,7 +36,6 @@ COMMON_DEPEND="
 	sys-apps/file
 	sys-libs/zlib
 	berkdb? ( >=sys-libs/db-4.0.14:= )
-	ctypes-python? ( ${PYTHON_DEPS} )
 	gnome-keyring? (
 		dev-libs/glib:2
 		app-crypt/libsecret
@@ -53,7 +52,6 @@ COMMON_DEPEND="
 		sys-apps/dbus
 	)
 	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
 	ruby? ( ${RUBY_DEPS} )
 	sasl? ( dev-libs/cyrus-sasl )"
 RDEPEND="${COMMON_DEPEND}
@@ -64,7 +62,6 @@ RDEPEND="${COMMON_DEPEND}
 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
 DEPEND="${COMMON_DEPEND}
 	!!<sys-apps/sandbox-1.6
-	ctypes-python? ( dev-python/ctypesgen )
 	doc? ( app-doc/doxygen )
 	gnome-keyring? ( virtual/pkgconfig )
 	http? ( virtual/pkgconfig )
@@ -75,17 +72,11 @@ DEPEND="${COMMON_DEPEND}
 	)
 	nls? ( sys-devel/gettext )
 	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
 	ruby? ( dev-lang/swig )
 	test? ( ${PYTHON_DEPS} )"
 
 REQUIRED_USE="
-	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? (
-		${PYTHON_REQUIRED_USE}
-		!dso
-	)"
+	test? ( !dso )"
 
 want_apache
 
@@ -176,12 +167,6 @@ src_prepare() {
 	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
 		-i build-outputs.mk || die "sed failed"
 
-	if use python ; then
-		# XXX: make python_copy_sources accept path
-		S=${S}/subversion/bindings/swig/python python_copy_sources
-		rm -r "${S}"/subversion/bindings/swig/python || die
-	fi
-
 	xdg_environment_reset
 }
 
@@ -191,7 +176,7 @@ src_configure() {
 		$(use_with apache2 apache-libexecdir)
 		$(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
 		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
-		$(use_with ctypes-python ctypesgen "${EPREFIX}/usr")
+		--without-ctypesgen
 		$(use_enable dso runtime-module-search)
 		$(use_with gnome-keyring)
 		$(use_enable java javahl)
@@ -209,7 +194,7 @@ src_configure() {
 		--enable-svnxx
 	)
 
-	if use python || use perl || use ruby; then
+	if use perl || use ruby; then
 		myconf+=( --with-swig )
 	else
 		myconf+=( --without-swig )
@@ -253,56 +238,22 @@ src_configure() {
 	#myconf+=( --disable-disallowing-of-undefined-references )
 
 	# for build-time scripts
-	if use ctypes-python || use python || use test; then
+	if use test; then
 		python_setup
 	fi
 
-	if use python && [[ ${CHOST} == *-darwin* ]] ; then
-		export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-		export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-		export ac_cv_python_compile="$(tc-getCC)"
-	fi
-
 	# Remove when >=dev-libs/libutf8proc-2.5.0 is stable
 	# https://bugs.gentoo.org/721300
 	append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc
 
-	# allow overriding Python include directory
 	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
 	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
-	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
 	econf "${myconf[@]}"
 }
 
 src_compile() {
 	emake local-all
 
-	if use ctypes-python ; then
-		# pre-generate .py files
-		use ctypes-python && emake ctypes-python
-
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-
-	if use python ; then
-		swig_py_compile() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			python_export PYTHON_INCLUDEDIR
-			emake swig-py \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn"
-		}
-
-		# this will give us proper BUILD_DIR for symlinking
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_compile
-	fi
-
 	if use perl ; then
 		emake swig-pl
 	fi
@@ -331,26 +282,6 @@ src_compile() {
 src_test() {
 	if has_version ~${CATEGORY}/${P} ; then
 		default
-
-		if use ctypes-python ; then
-			python_test() {
-				"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
-					|| die "ctypes-python tests fail with ${EPYTHON}"
-			}
-
-			distutils-r1_src_test
-		fi
-
-		if use python ; then
-			swig_py_test() {
-				pushd "${BUILD_DIR}" >/dev/null || die
-				"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
-				popd >/dev/null || die
-			}
-
-			BUILD_DIR=subversion/bindings/swig/python \
-			python_foreach_impl swig_py_test
-		fi
 	else
 		ewarn "The test suite shows errors when there is an older version of"
 		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
@@ -362,29 +293,6 @@ src_test() {
 src_install() {
 	emake -j1 DESTDIR="${D}" local-install
 
-	if use ctypes-python ; then
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	if use python ; then
-		swig_py_install() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			emake \
-				DESTDIR="${D}" \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn" \
-				install-swig-py
-		}
-
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_install
-	fi
-
 	if use perl ; then
 		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
 		perl_delete_localpod
@@ -453,10 +361,6 @@ src_install() {
 		rm -fr tools/client-side/svnmucc
 		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
 		rm -fr tools/{buildbot,dev,diff,po}
-
-		insinto /usr/share/${PN}
-		find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
-		doins -r tools
 	fi
 
 	if use doc ; then
diff --git a/dev-vcs/subversion/subversion-1.14.0.ebuild b/dev-vcs/subversion/subversion-1.14.0-r1.ebuild
index 7e77db66d8d0..aa394f63def1 100644
--- a/dev-vcs/subversion/subversion-1.14.0.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.0-r1.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
 GENTOO_DEPEND_ON_PERL="no"
 
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 flag-o-matic java-pkg-opt-2 libtool perl-module ruby-single toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool perl-module python-any-r1 ruby-single toolchain-funcs xdg-utils
 
 MY_P="${P/_/-}"
 DESCRIPTION="Advanced version control system"
@@ -21,8 +21,8 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Subversion GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="apache2 berkdb ctypes-python debug doc extras gnome-keyring java kwallet nls perl python ruby sasl test"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="apache2 berkdb debug doc extras gnome-keyring java kwallet nls perl ruby sasl test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -37,7 +37,6 @@ COMMON_DEPEND="
 	sys-apps/file
 	sys-libs/zlib
 	berkdb? ( >=sys-libs/db-4.0.14:= )
-	ctypes-python? ( ${PYTHON_DEPS} )
 	gnome-keyring? (
 		dev-libs/glib:2
 		app-crypt/libsecret
@@ -53,7 +52,6 @@ COMMON_DEPEND="
 		sys-apps/dbus
 	)
 	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
 	ruby? ( ${RUBY_DEPS} )
 	sasl? ( dev-libs/cyrus-sasl )
 "
@@ -75,7 +73,6 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	!!<sys-apps/sandbox-1.6
-	ctypes-python? ( dev-python/ctypesgen )
 	doc? ( app-doc/doxygen )
 	gnome-keyring? ( virtual/pkgconfig )
 	java? ( >=virtual/jdk-1.8 )
@@ -85,17 +82,10 @@ DEPEND="${COMMON_DEPEND}
 	)
 	nls? ( sys-devel/gettext )
 	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
 	ruby? ( dev-lang/swig )
 	test? ( ${PYTHON_DEPS} )
 "
 
-REQUIRED_USE="
-	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )
-"
-
 want_apache
 
 pkg_setup() {
@@ -178,12 +168,6 @@ src_prepare() {
 	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
 		-i build-outputs.mk || die "sed failed"
 
-	if use python ; then
-		# XXX: make python_copy_sources accept path
-		S=${S}/subversion/bindings/swig/python python_copy_sources
-		rm -r "${S}"/subversion/bindings/swig/python || die
-	fi
-
 	xdg_environment_reset
 }
 
@@ -193,7 +177,7 @@ src_configure() {
 		$(use_with apache2 apache-libexecdir)
 		$(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
 		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
-		$(use_with ctypes-python ctypesgen "${EPREFIX}/usr")
+		--without-ctypesgen
 		--disable-runtime-module-search
 		$(use_with gnome-keyring)
 		$(use_enable java javahl)
@@ -211,7 +195,7 @@ src_configure() {
 		--enable-svnxx
 	)
 
-	if use python || use perl || use ruby; then
+	if use perl || use ruby; then
 		myconf+=( --with-swig )
 	else
 		myconf+=( --without-swig )
@@ -255,16 +239,10 @@ src_configure() {
 	#myconf+=( --disable-disallowing-of-undefined-references )
 
 	# for build-time scripts
-	if use ctypes-python || use python || use test; then
+	if use test; then
 		python_setup
 	fi
 
-	if use python && [[ ${CHOST} == *-darwin* ]] ; then
-		export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-		export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-		export ac_cv_python_compile="$(tc-getCC)"
-	fi
-
 	# Remove when >=dev-libs/libutf8proc-2.5.0 is stable
 	# https://bugs.gentoo.org/721300
 	append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc
@@ -272,39 +250,12 @@ src_configure() {
 	# allow overriding Python include directory
 	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
 	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
-	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
 	econf "${myconf[@]}"
 }
 
 src_compile() {
 	emake local-all
 
-	if use ctypes-python ; then
-		# pre-generate .py files
-		use ctypes-python && emake ctypes-python
-
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-
-	if use python ; then
-		swig_py_compile() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			python_export PYTHON_INCLUDEDIR
-			emake swig-py \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn"
-		}
-
-		# this will give us proper BUILD_DIR for symlinking
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_compile
-	fi
-
 	if use perl ; then
 		emake swig-pl
 	fi
@@ -333,26 +284,6 @@ src_compile() {
 src_test() {
 	if has_version ~${CATEGORY}/${P} ; then
 		default
-
-		if use ctypes-python ; then
-			python_test() {
-				"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
-					|| die "ctypes-python tests fail with ${EPYTHON}"
-			}
-
-			distutils-r1_src_test
-		fi
-
-		if use python ; then
-			swig_py_test() {
-				pushd "${BUILD_DIR}" >/dev/null || die
-				"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
-				popd >/dev/null || die
-			}
-
-			BUILD_DIR=subversion/bindings/swig/python \
-			python_foreach_impl swig_py_test
-		fi
 	else
 		ewarn "The test suite shows errors when there is an older version of"
 		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
@@ -364,29 +295,6 @@ src_test() {
 src_install() {
 	emake -j1 DESTDIR="${D}" local-install
 
-	if use ctypes-python ; then
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	if use python ; then
-		swig_py_install() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			emake \
-				DESTDIR="${D}" \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn" \
-				install-swig-py
-		}
-
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_install
-	fi
-
 	if use perl ; then
 		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
 		perl_delete_localpod
@@ -455,10 +363,6 @@ src_install() {
 		rm -fr tools/client-side/svnmucc
 		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
 		rm -fr tools/{buildbot,dev,diff,po}
-
-		insinto /usr/share/${PN}
-		find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
-		doins -r tools
 	fi
 
 	if use doc ; then
diff --git a/dev-vcs/tkcvs/Manifest b/dev-vcs/tkcvs/Manifest
index 2a57c830c5db..efb5cddbf279 100644
--- a/dev-vcs/tkcvs/Manifest
+++ b/dev-vcs/tkcvs/Manifest
@@ -1,5 +1,3 @@
-DIST tkcvs-8.2.3.tar.gz 570910 BLAKE2B e612fb2fa01ad0205973eef48eaa6c11677d3aec8f1a5344b1d1719aafde79e830f550f990a7bceb8063edb530de807b7878937015bcd0175aef038031663bb0 SHA512 42fb03acf6367e02f6f7b3e1ad66232be4825f152b3e4d123080e0ce7d2f53b5eacb71ac95fbc15224fb4c4c2cae979b612dbb11d0cd0b8fc4a0222a8cd40c8a
 DIST tkcvs_9.3.2.tar.gz 614022 BLAKE2B dfea4c4f9cca6929b1298c73f2e446f6421a9c07a6878fd5990b55f5ee7936d5bb73fdcc3668a60bfb06c3f20353a93e4cdce96b5c4e12d382f6b5c610bf8476 SHA512 3ee52135ca49a156abf3f7abbbf123be6d95053c249168b1f9bde65b969f5c50157d6cb41fb1920d794926bce7e23bd014ef30f4a786ebb8d4a72ff67f3c21c3
-EBUILD tkcvs-8.2.3.ebuild 927 BLAKE2B b4a22c3dc12c5e4d74f2ac96d1c3fc19097cd0ccf3546517fa762f56dc3a3344ceecb889f41fe7d0657fa240f3bd2b2ef732496c4133937358f938b2c27afa11 SHA512 a9d20f59ff32cfaac97caa531a2239b111d6df93ac929401f66347c2f109a24d6f72bfd57ff47345dd7ebb0a1eba1890d8277be779a7ec42a53d709ab328a6e6
-EBUILD tkcvs-9.3.2.ebuild 1031 BLAKE2B 165d13088ac58419e680da3ce663a4d8e3e0878a7db2f237588af57f4e686bc6f01e0ed316c33b0ceb2078981fe363dff8e2fa93414d751da3bdb1a0825e855c SHA512 857ad4c775a0450f4aaf0cd469c87df3932d7a01964dc421a32bf8885fe19baaf54c8e6d1ce928cb9b43b584548bdaabdaf8c5765437ab9596a8e63fac5a8f65
+EBUILD tkcvs-9.3.2.ebuild 1030 BLAKE2B a508bb5644454be569e897fe96e1dcf55876513faeee7d817b6b6846a7c4af1e060c2eaf7329ac4dbd2c1dd1853dc5c1e6dcf25a4ef2183a7f7c6e3792693841 SHA512 102a7a8f754c4bc1b0f4c6f85b0cd7a657e35374bdddbe634f32839076fdfb2a7ca53a2f608e7aaa44480ba69ea017db6f804cd1b2d7760b582685a2d238e753
 MISC metadata.xml 253 BLAKE2B 19a7f4e84d1def1f97bb3b985a4959704c25d31ff2b1b7e6527ec6867d68dc2a6b15c0399935a8311789c4fac61136dcfdebaf7c113f296ec50c9523597a74db SHA512 9881e4487c9512c1b72ff2fa72a45b82ef3bf4ade0ec982aea1222f629367ac784ef922b839224add5829cba1717a25d49c31c1481610a02658d0bb265d4eaf6
diff --git a/dev-vcs/tkcvs/tkcvs-8.2.3.ebuild b/dev-vcs/tkcvs/tkcvs-8.2.3.ebuild
deleted file mode 100644
index 8038509e10e9..000000000000
--- a/dev-vcs/tkcvs/tkcvs-8.2.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib
-
-DESCRIPTION="Tcl/Tk-based graphical interface to CVS with Subversion support"
-HOMEPAGE="http://www.twobarleycorns.net/tkcvs.html"
-SRC_URI="http://www.twobarleycorns.net/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/tk"
-RDEPEND="${DEPEND}
-	dev-vcs/cvs
-	dev-vcs/subversion
-	sys-apps/diffutils
-	dev-util/tkdiff"
-
-src_prepare() {
-	sed \
-		-e "/set MANDIR/s/man man1/share man man1/" \
-		-e "/set LIBDIR/s/lib/$(get_libdir)/" \
-		-i doinstall.tcl || die
-}
-
-src_install() {
-	# bug 66030
-	unset DISPLAY
-	./doinstall.tcl -nox "${D}"/usr || die
-
-	# dev-tcktk/tkdiff
-	rm "${D}"/usr/bin/tkdiff
-
-	# Add docs...this is important
-	dodoc {CHANGELOG,FAQ}.txt
-
-	make_desktop_entry ${PN} TkCVS "${EPREFIX}"/usr/$(get_libdir)/tkcvs/bitmaps/ticklefish_med.gif
-}
diff --git a/dev-vcs/tkcvs/tkcvs-9.3.2.ebuild b/dev-vcs/tkcvs/tkcvs-9.3.2.ebuild
index 2b2a7ea29e6e..c10d6e3ab38f 100644
--- a/dev-vcs/tkcvs/tkcvs-9.3.2.ebuild
+++ b/dev-vcs/tkcvs/tkcvs-9.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="dev-lang/tk"
diff --git a/dev-vcs/topgit/Manifest b/dev-vcs/topgit/Manifest
index 8f928f7472d1..d9fde3f1c32f 100644
--- a/dev-vcs/topgit/Manifest
+++ b/dev-vcs/topgit/Manifest
@@ -1,6 +1,6 @@
 AUX topgit-0.19.12-Rename-T-to-TESTSUITE.patch 2339 BLAKE2B a1a23b807bc76880123acb51949eb948b9398bf2c39a22c4223aa029e67225ef493fe2b7fd1bf934e8652c833d39e9ecc504352020f5b1d1899442c875baf77c SHA512 c447a7d18e7486dd5fd4b6173389603177fb9986293cd1bf46035f786fb689b112659cf170e0c431f6c09aaf4415d3d4e3e520c26610afba56281efa9e35d43f
 DIST topgit-0.19.12.tar.gz 302492 BLAKE2B 5691823e58774883d33bc96e5d10b871a40224c97e3deb90f4fef051dbcecd6a7d3c979fe6b7e6c9aac64d485b9c4324b4d666a7ae64cb82cd325498d33e0cae SHA512 cb9245fbec7a4a15822a5b70d7052be200aa8b574b528dd929121597eb7dcec97532b0fd4d6a4d6bb63676194ed0ab2129e106fb88f63561187620ec431f9efb
 DIST topgit-0.9.tar.gz 37025 BLAKE2B e28b0fd4cdf4cf063bad939c712fc9354ffc2d9c5e431f637e8306454d7a871268902253a1d2c59afa94406223b1fdc1627f3dda04586c88c0b609a72a1eaa87 SHA512 15b4ec44fb1711273155350924806f9ddce330251d3f300f5d2ecf445f4822c40b5c7309429876746ed8226c00f74292956f51f9126c8c359c3f4d589c73791c
-EBUILD topgit-0.19.12.ebuild 848 BLAKE2B ed7dac8adb25a33e775f385c7eaca1acfbb3c7e05b19827710db18cf84cd404dd599a31c9e1b57a53a3bb4bb0a2e5a3f331c503309e710adee09b71df61f49a2 SHA512 8923725255455e128c44c343d6a5589b4bdf4794ab8ce6c4072699a9e76095435d818a119eb9c75d2e7f178e700c10354abcfd539c2c99cb8342d9865ca6dcc6
+EBUILD topgit-0.19.12.ebuild 846 BLAKE2B cff23a51c81250e59d2b9f1bd62da9ad8737bf4adb2368ce058ebe83f83a18ba8101fc7c8e0440e20e5ba89da948abfd16e05133896835d0b6d7d6254a6f0cd4 SHA512 8ed16a345ad0bb066366d0cc6fb0e442dcfc8c40bfe1816db7b7de0343e9b2e0a0ce44bac061cfc8b6a5f53fb079c03a6c47f4d50662f99ef2fb334da90d6575
 EBUILD topgit-0.9-r1.ebuild 692 BLAKE2B d604f1d2800d5953d2d7f296b5596fee898b95d51eedb80dda8d121dbad3c3611f4ecb40a2e5f22e8143981961639f68d5086539fe08a9d0e8e67940fc5df08d SHA512 2984e19bb3c22e8d83b0c8ad85b8c9939c3dddec3844ffeffd5e5cb6b2d857c3da9e214a3e89fe16acaede8aecf20c820b68c5793080d87476bb3bf40d90f996
 MISC metadata.xml 455 BLAKE2B 6928af22b505988592f48120217cf6c8a9e5f4fd0a0d2040126bb730f3a4dc7b1a5d428d00ffe6fcf0abc5b00cf5c4eb847e5d4ff3288f38b79483708980aa08 SHA512 12408a1b03499ee4718189bec87eb725462c8e2d279bcaef81b18f411f86d0588bffb145dbc793fb9fb9419f7644ff2529a03db636443b157f55b2d7a9c6594e
diff --git a/dev-vcs/topgit/topgit-0.19.12.ebuild b/dev-vcs/topgit/topgit-0.19.12.ebuild
index be20e7d630dc..7a7635c00079 100644
--- a/dev-vcs/topgit/topgit-0.19.12.ebuild
+++ b/dev-vcs/topgit/topgit-0.19.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mackyle/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="sys-apps/sed
 	virtual/awk"
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 15432b39ae32..a6830acdecfe 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,6 +1,4 @@
-DIST tortoisehg-5.3.2.tar.gz 8910859 BLAKE2B 4cc2253f0adbd79fe84507043491198ddd9fa559c3e9296c831b8e0fccd6cb2806a31ffd6d417591f5fcb3afce78e696f7052d70b760a566bf72c6602ca31ea8 SHA512 b15894158a0d5e628015d07b4f8c77c96f3e1d7543fe2984693b99b2acfa411922b06683e62de437cb50dd5817155d4e59045d7fb47c9be8ee27b9bccf77da7e
-DIST tortoisehg-5.4.1.tar.gz 8580608 BLAKE2B db66e114d046fdf2228779a2e224c6244afe4e6463d8f00b7f3b291f0dc9fd043ca3e938a6769e3c6a54ec4d2252dca44fedf790ca9683fa42a55d0cdfce0cb9 SHA512 f8d4bda4ac23b49f304e3561930b75f899ac09937b4da446ee3f38236fa0095e19228dc2e388d5608077096209ded161d194f6edef5d2d4a257b5bf57c0634cc
-EBUILD tortoisehg-5.3.2.ebuild 1506 BLAKE2B 7ee7236d6237e664131219cc5aadc3cab5d2085fc8d113a5139b28053d870d8dec3c193e7d308d71e1fc65f814811cbd4ea6277befa60bd1a097c663918bb1e7 SHA512 05df1967214d5f238efec09cbdd5dc36f20ccfee018b179a7ef3eb2b44aedd24f1813f3b1b62a53cd8a7efa1af0be6386f62d6bb4ba67d4b67f3b323fd2eba6d
-EBUILD tortoisehg-5.4.1.ebuild 1417 BLAKE2B 2d46a8ce8af3621445eb5911f4a62c1eba1572a0ed30f0729f0286c60727d6c8b22782612ffb85e5b6f82a0543113a22a687e2f5e4d7e121b78b3d572c2da069 SHA512 5db18fff1118902258468f8e34a394b4465b85e7f762dd08361dff2b581c583370abf9a71ced361cdaabb7835eac26f49cf8f27b7cee19030b729bee00b45fb3
-EBUILD tortoisehg-9999.ebuild 1544 BLAKE2B 2f31a2367a6b87d29c7830b9841a3af8db0b0278d11d13ec5dbf814f9baebb25b0eb35d42f79f54d2b2a755e2f2d20d54b3deb52472e388069d081eb12fd1074 SHA512 ab1dc02cbfa9b3eda70c7e5582e70f5ec864ee8c89f37c65ced12a2b79ae71881fec7142877c642fa52f428da8691a0e3de91a4a89123a2c9bcad3956339dfa8
+DIST tortoisehg-5.5.1.tar.gz 8918085 BLAKE2B 33aef61d97a34f45b10b291eb3a71bc46b70a1f24006fda0e651e88c61b0351701a3abdf6c1b0277fd81a0c5c9ff225b742215103c280eb11976a86e6bf2a47c SHA512 ca2d3833e379620b1a467b5a6016c8dbd54837d6ac5267063eb6768675dcb0c020a9b4ca2b2b8924a57c9e7d117668347e23762e8ff46c87825290071783aaa8
+EBUILD tortoisehg-5.5.1.ebuild 1599 BLAKE2B 105f731aa25c4039994c6c165b4bdbe84558a6a8f91e4d2025a11fd068d39050a12a20c8e133b3cfe72aafa2be4edd8a1e47a10f77359fbf3704a3fe13b5e02a SHA512 0302ce34c000a686bb101e1d2f91a199baa4a744368740338bc60ba8b6cb49420237525db201ac1f78932d961622887b8e2560bda2f4c62b58b236f25590b9a0
+EBUILD tortoisehg-9999.ebuild 1599 BLAKE2B 105f731aa25c4039994c6c165b4bdbe84558a6a8f91e4d2025a11fd068d39050a12a20c8e133b3cfe72aafa2be4edd8a1e47a10f77359fbf3704a3fe13b5e02a SHA512 0302ce34c000a686bb101e1d2f91a199baa4a744368740338bc60ba8b6cb49420237525db201ac1f78932d961622887b8e2560bda2f4c62b58b236f25590b9a0
 MISC metadata.xml 480 BLAKE2B bcedb4594b6c09b3e55feace29681250fca0131c51b0181b0c79231117137a3f3813f88b2384b51f9bc116d5cbe189b7a9505797f33fba3bc53c7c1f1989a552 SHA512 bc98f7e0444dabd2ae4f771f647cedacee2006c5e2f1d903dd8363f05a4a42b3d9a3f183798147d59091efadaf01d0001af19a0670e9a4a33d7215803b2c56fd
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.4.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.4.1.ebuild
deleted file mode 100644
index 22bb6864ee17..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-5.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit desktop distutils-r1
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-SRC_URI="https://bitbucket.org/tortoisehg/thg/get/${PV}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="https://tortoisehg.bitbucket.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-S_MAGIC="290ae7c8fa05"
-S="${WORKDIR}/tortoisehg-thg-${S_MAGIC}"
-distutils_enable_sphinx html
-
-RDEPEND=">=dev-vcs/mercurial-5.4[${PYTHON_USEDEP}]
-	<dev-vcs/mercurial-5.5[${PYTHON_USEDEP}]
-	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}"
-
-python_prepare_all() {
-	# Remove file that collides with >=mercurial-4.0 (bug #599266).
-	rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py"
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
-	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
-	domenu contrib/thg.desktop
-}
-
-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-5.3.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.5.1.ebuild
index 757231a11582..1a78d11682d2 100644
--- a/dev-vcs/tortoisehg/tortoisehg-5.3.2.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-5.5.1.ebuild
@@ -4,18 +4,18 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit desktop distutils-r1
+inherit desktop distutils-r1 xdg-utils
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
-	HG_DEPEND=" >=dev-vcs/mercurial-5.3.1
-		<dev-vcs/mercurial-5.4"
+	SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-5.4
+		<dev-vcs/mercurial-5.6"
 else
 	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg"
 	EHG_REVISION="stable"
-	HG_DEPEND="dev-vcs/mercurial"
+	HG_DEPEND=">=dev-vcs/mercurial-5.4"
 fi
 
 DESCRIPTION="Set of graphical tools for Mercurial"
@@ -23,17 +23,17 @@ HOMEPAGE="https://tortoisehg.bitbucket.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc"
 
-distutils_enable_sphinx html
-
-RDEPEND="${HG_DEPEND}
+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}]"
+	>=dev-python/qscintilla-python-2.9.4[qt5(+),${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
+distutils_enable_sphinx doc/source
+
 python_prepare_all() {
 	# Remove file that collides with >=mercurial-4.0 (bug #599266).
 	rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py"
@@ -48,7 +48,12 @@ python_install_all() {
 }
 
 pkg_postinst() {
+	xdg_icon_cache_update
 	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."
 }
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 6f0201707268..1a78d11682d2 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -4,18 +4,18 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit desktop distutils-r1
+inherit desktop distutils-r1 xdg-utils
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
-	HG_DEPEND=" >=dev-vcs/mercurial-5.3.1
-		<dev-vcs/mercurial-5.4"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-5.4
+		<dev-vcs/mercurial-5.6"
 else
 	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg"
 	EHG_REVISION="stable"
-	HG_DEPEND="dev-vcs/mercurial"
+	HG_DEPEND=">=dev-vcs/mercurial-5.4"
 fi
 
 DESCRIPTION="Set of graphical tools for Mercurial"
@@ -23,17 +23,17 @@ HOMEPAGE="https://tortoisehg.bitbucket.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc"
 
-distutils_enable_sphinx html
-
-RDEPEND="${HG_DEPEND}
+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}]"
+	>=dev-python/qscintilla-python-2.9.4[qt5(+),${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
+distutils_enable_sphinx doc/source
+
 python_prepare_all() {
 	# Remove file that collides with >=mercurial-4.0 (bug #599266).
 	rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py"
@@ -48,7 +48,12 @@ python_install_all() {
 }
 
 pkg_postinst() {
+	xdg_icon_cache_update
 	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."
 }
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}