gentoo resync : 05.02.2020

39 files changed, 345 insertions, 123 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index f900683acecd..f97726ced9e3 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/bzr-rewrite/Manifest b/dev-vcs/bzr-rewrite/Manifest
index 22da179d810b..675bc40d4f91 100644
--- a/dev-vcs/bzr-rewrite/Manifest
+++ b/dev-vcs/bzr-rewrite/Manifest
@@ -1,3 +1,3 @@
 DIST bzr-rewrite-0.6.3.tar.gz 33045 BLAKE2B 93a884ad225bf6953be8b052500a5a98b36b98b434c1afb1f73548e898f60b6716e974bbe0bb2bae54ca57713889169bdad11365759ca34bad96e4b2c97e0891 SHA512 f1a55307e80090dcc3739e4b111e08b02e4c4ec07ed479a5ac28d2d40535a699492eba785c142d8f6396032ed9db143d86dc68dac5280c071b79a9818ac69250
-EBUILD bzr-rewrite-0.6.3.ebuild 528 BLAKE2B 4110d4d415f8be4b30d3bd76bda56dfb7bf8b504028712eb4bfcec2a7945ba6dc76b67e667e31c7b345dc66bcf1b538cf60e2c4f341f2def4b006f96c11c9674 SHA512 685364254c80852b3e0100a68b8f55afe7aa94a245474431b7cfd9a1b363c5f1187f2514c6f0f2b973bf7b8e9a6329800ce95ce9891f5b44411bdea69ee15fd9
+EBUILD bzr-rewrite-0.6.3.ebuild 529 BLAKE2B 5b7dc2afda81ca0656da761b9aae786f786068271900c2149f49a7554d6e162357fa9bf4f77ffce024dbcd52266a8211f68daffbd7f13f9f16c8fcf1e988dd92 SHA512 e24f1f1bbec7071ef6bc890795454bc1d161972fcb185002034b753f4870e16fa389a6a6072ec52cbe01e73d41fdac724c43f1433c73fce972b6e93975c55474
 MISC metadata.xml 251 BLAKE2B 08c15ece32d9da3db50c1eec9624e2befc3f75886f704caec02d6b14a24648491c10c9cdaa25d7f69bce2531d73258dc54b28c92ef6d29d1742e4b5e516b788d SHA512 f05104f73a09c8e5501ef51ebb48acab3419ee56dbe8ba3a5a49be40ab77e952149f7e78f289773870ea5fd41c1ec82e72dd4ce4dd2a8e4264b7272cdd134488
diff --git a/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild b/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild
index d90a497685ee..9acba8bc2b5a 100644
--- a/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild
+++ b/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/bzr-rewrite/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 x86"
+KEYWORDS="~alpha amd64 x86"
 IUSE=""
 
 DEPEND=">=dev-vcs/bzr-2.5.0
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index eba3f2beb840..df925431ac47 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -1,5 +1,5 @@
 DIST bzr-2.7.0.tar.gz 11586410 BLAKE2B 9d61d5efa1c02667fdb93d66fc4290f279c74bff2fd0174149243563bc5013085438410221fb6565f986ef17e957b680a1bdd3142e23843b4cbc39c7855dbd98 SHA512 c39ad3715d865788da74d8de8b469e1dc93d18b6cbcbc569464cdeb9bb2173bf8d7f4f8ee8f7599fbcbbe322817a4c72e785d544e622753699c425c32597d9aa
 DIST bzr-2.7.1_pre.tar.gz 10964137 BLAKE2B d126730d782f232d6c486e31ab465a1a295de456eb59fc1db4d215529ec38e78826da1bedbe6a80af0e874188635c83742c5ae5b07c42dd968f1d0d88596a35e SHA512 b65c63dff33f1646e6db84d9307b870140c2c7b3b16cef69eb4bfb5a5a94cb1721ed74c26e6ad78232fffb4b5055cb4096d9835197db9b97f91c16e8a79658b3
-EBUILD bzr-2.7.0.ebuild 2571 BLAKE2B e01a294debdd54baa09d08dd7eff162280c2441b8bab10b9d6d0a7017ed23398ed0976b9dd48978c69c8b4f2bf4f9e0d9674f6f7ca358d8701ff4751e1c252c9 SHA512 e4f08f690317733d6dc0c96c858c6aa492ca0c2a20a1eca49847ab9deebd628ebd7ad729b90cc4d32d369dbb41b75b1666078135f061bedf44721afbe7ff0052
+EBUILD bzr-2.7.0.ebuild 2572 BLAKE2B 02abd0690ee69b988180cdd697c0e736a03c76788fb7c9a8e3bd1fe174e696048d6eb903cea98abdcf3d992f4e4a391dbba053db14c0682c4497c59ca7b1fdff SHA512 a549317dedb1d0a68f143fcaec6881c1c961191754c574931712e52a32573822dd0f64e8519eacd58c13fcadbd6e682a9eb77144ac5ec350e90808efe1e2e168
 EBUILD bzr-2.7.1_pre.ebuild 2574 BLAKE2B ebec55cfe81f9127dbf8a04a7763abaaa1483308a4d02d890ec0812a7bc8602d9ca13741069352d08a9c35cbb09fd7361615e324ee0aacea0693ccfad09443bc SHA512 f332f496ff7f74f413cd5ae86556f8ac61bf13436cdbca627dc1df18ee6561e52a0444cfdad989a3e45d8f4d399fde26aee397fc25cb093f0773bea57f42b83f
 MISC metadata.xml 772 BLAKE2B 8f1d371a225b5b6702748efc93dde757d88a39c0a8124abc898eff891a4867c92dbc19a356b4c0726682e5304b80be333e12a981d04b0ae89e480cb2f6b6c3a3 SHA512 cc63dba9888058f60521da2fdc43697f1fc8bde194782346279560b50ceaa555b464599d28641350cd25f67aebe2f449cbe306dd651620bc891271acf8aaddac
diff --git a/dev-vcs/bzr/bzr-2.7.0.ebuild b/dev-vcs/bzr/bzr-2.7.0.ebuild
index a8a4e4ad7a78..5945657f23b7 100644
--- a/dev-vcs/bzr/bzr-2.7.0.ebuild
+++ b/dev-vcs/bzr/bzr-2.7.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://bazaar-vcs.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="curl doc +sftp test"
 PLOCALES="ar ast bs ca cs de el en_AU en_GB es fa fo fr gl he id it ja ko ms my nb nl oc pl pt_BR ro ru sco si sk sr sv tr ug uk vi zh_CN"
 
diff --git a/dev-vcs/bzrtools/Manifest b/dev-vcs/bzrtools/Manifest
index 3b75a94a84cf..ff660c6f96c4 100644
--- a/dev-vcs/bzrtools/Manifest
+++ b/dev-vcs/bzrtools/Manifest
@@ -1,3 +1,3 @@
 DIST bzrtools-2.5.tar.gz 74508 BLAKE2B 8e864cc0bd1fa05325502fe6772d57aba29613d56160cf356a8a38417a4c8516f98d2f32798c2511baf06a5222a1a7ac3b58fb30b5f09088c1ef19356c4e15c4 SHA512 5bc07715a3ed525a9bed5b789ea7a4079c9a56a8ce798b2eff56b27e6eae574fac23b8cc96529a5ea44b8d4ce02c512a7e22d21f046801461ba38a8d2050aa16
-EBUILD bzrtools-2.5.ebuild 710 BLAKE2B 013ccfb0ef13691f5ec405f08d71aebbe62d2b97b35da46fba064369b5bf9c0993f42a6b8cf83bdb77f7e4553d53d253e3dbf85dabfa52c64deb0d0ca33da855 SHA512 cfeb4b24bea1c7049e7fde2539d7c565022685c77818ee664a205f28f36e419d64c90230783bc8d419b1ed53b432dcc76355151af3979a7497d1e388c2760bf4
+EBUILD bzrtools-2.5.ebuild 711 BLAKE2B 001abde572ef22ff24489c734be5acfc3c15823849417625f8d8fc26437ac8eb8a7dcb57d27c47e6ef1d912689f2850677ebf3b6054f00fb0f27499e9b75d14e SHA512 152319b6c5a6ec418750a7a851a0581d315d624b350719d7df1f3fb023699b72d2386606d9a5a41f2e096ae78a047ed4bf62c3e0d1bc9d98a42e3bc0a7b1860a
 MISC metadata.xml 248 BLAKE2B 5ffacbef7eddd0193eb5d83d6d8e21f810abbb55db04c158d017f304fc0a1f92de4e6c7bcf23d0631c3b6116de8c037c0d3b0764989c2448d2eb223a0023de74 SHA512 88b165b7a532426ca6539c3ed0ca45b50387eeee1a37f677257bae71f4ac5c0d4e5565efa78166bfb55ba8fcf04cdf02327d976b386bc38a2335a81d455a5fca
diff --git a/dev-vcs/bzrtools/bzrtools-2.5.ebuild b/dev-vcs/bzrtools/bzrtools-2.5.ebuild
index 6defe8183234..2edbba6dd3e6 100644
--- a/dev-vcs/bzrtools/bzrtools-2.5.ebuild
+++ b/dev-vcs/bzrtools/bzrtools-2.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/stable/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 #IUSE="test"
 
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index ef50190fd973..c8852dc2f7c9 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -21,5 +21,5 @@ DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8
 DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512e9ab2efb1db995f2128d29b48674460bce0902067fabb5b81beaafae70c36e6c0a717d71f7c5b625b408327c4a54 SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a
 DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
-EBUILD cvs-1.12.12-r12.ebuild 2966 BLAKE2B e9520ed778ddf7ddbcf6aa2779b80091ce0d793498f0c80033a16581c80a3876a42ddd62404205edd5c5ef6a720d1ae5eabed907430edbdbb1f9fcb4c5477f80 SHA512 483c4d719e620f35db54a305f5ff70c08982ba80c2646bb3b12809b5ebb496fee3721138929c92c32a5fdc378c0ef1bca6166812b6c08681bebd8b05c6e84d69
+EBUILD cvs-1.12.12-r12.ebuild 2967 BLAKE2B 61c47efbc6dcdef5e63286a7665e39568c7273df3c25427564cde862d3d3f690c7229a8fc1b42baf0f1042eb5b9121123d657a729a3301476f7bbcadfba964ff SHA512 72a6e5f4f29b85b11247075bf23935e55c8eb806347cad2dd6d80e759e751f9e78cb7400e15c633132c6e0f7de7e94d6bdb149864c9548fb154a3accdf80aebe
 MISC metadata.xml 238 BLAKE2B 7cfdf56d73fb2842fdc430be958eda28a1feca63fb12e3b4eca388a268c9b9dfb80100d649503f333242d60084dd8b0ed7340ed5fcdbc25f2b6cda956d13a603 SHA512 ae7619f8ee8ed9bf4db2e5f53bedddc7b3653066c7dd5de3aa79623e340fdafc579a5821ed6ba49aefa52de33bf1901d082e23f4ce1e8b5ee791ae9a526a5d6a
diff --git a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
index 85ae8bdd41be..ff6dca4d2b97 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 RESTRICT="test"
diff --git a/dev-vcs/cvs2svn/Manifest b/dev-vcs/cvs2svn/Manifest
index c897417d6abd..5f09fab88ec5 100644
--- a/dev-vcs/cvs2svn/Manifest
+++ b/dev-vcs/cvs2svn/Manifest
@@ -1,5 +1,5 @@
 DIST cvs2svn-2.4.0.tar.gz 514891 BLAKE2B 0dd0d15ab28f96e56854295a789284a00ad8d172dbd849068fb05811a728f854d83b52856b6254ee0ac947425d972fb810b627aab95116040d4370bb98de6e0c SHA512 726fb8a3b3261eeb6d8097973f2741aa7a433f847bcef6701a6c0b7dc3d8fb5da1726e40f008d1dffac71791b953ddb9ade5db5809c98731d78e94da6465506a
 DIST cvs2svn-2.5.0.tar.gz 539332 BLAKE2B 54d70750c601c1d5c701f853686d958e9b8b92c4109d9294ec139d3cc8d4c9e102abed976fe9f845d0d0a1ccb65f504a08ef27f48bdf001254cf6e26087e50e2 SHA512 226972553c9d9cbae81c6e85079f4201944cf77ce68ebd6020ef2cd88bf457241739cef401c4bd3bf656b1992fbf84639b8df72d1921eee9d043fde94fba1c6a
-EBUILD cvs2svn-2.4.0-r1.ebuild 1225 BLAKE2B c355f731e98fbc8b08bee4e0a20e08dc230b34ceb47f3cb70cafaa6157c1a6be8ea519ffa549657a044a60b2432bc6f67aa34613365c4c44869ad49956d510ad SHA512 50d2ac46473d593307e79ee6c8142f9072c3e48ea51a85ab5c23585a652d88c8b35008f892ffc3daa58b45537c4bf4fcc167aa74e7005cac19811970a8a179b0
+EBUILD cvs2svn-2.4.0-r1.ebuild 1226 BLAKE2B bffaff00afc4e03208300fac0bcbd34681a87cfd2b6a631e93358332c3f3b04873f9aebf3c9011931fbf19be297133417a4c39b212ffe0b5ef69f01a96c697c0 SHA512 a7713cb07f69b5a7a4c0a875610a55efe1fda466051bfc66efd0c3942112590ed82b8efd437c6e2382588aec17f8591ce89ce38c0c61a341e2bb020d37a38e71
 EBUILD cvs2svn-2.5.0.ebuild 1230 BLAKE2B 3f5cf3f21162a01e47d7126659ae491fe9d6b179454750321a5b9960c66c4c34e9b6e4849cfb5784e218e2658f246050d927e4d16d84c6b3e321fdffdb389eb8 SHA512 87e96e0cc7377b10aab333642941d1f23d90d2595a95e668a1d08a1afe634bbfd14bf474a471273a381482185d94f5b26bb1d8d35ca61807d1ebe1cdf712dddb
 MISC metadata.xml 282 BLAKE2B 19bc0e385352904411b33830410bfc0a9a9c2b67c37b253f7c336dd455d413d34fd89569430a4016e4bef1660b9b710e6c08fb192584915fcf911b15593cf694 SHA512 165091ed860bbc62f00932c46e6d4944fe7444ac8bdfd1014a9781b8769d1a9d234578937b63ac7b90bdd8f57b21de50f74e759a44fa2b2d1e8edd854aa17ae3
diff --git a/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild
index f62aa0e9d40b..5e1c14dbfce0 100644
--- a/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild
+++ b/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://cvs2svn.tigris.org/files/documents/1462/${FILEVER}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bazaar git test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index e579c33cf6fa..d68511f39f18 100644
--- a/dev-vcs/cvsps/Manifest
+++ b/dev-vcs/cvsps/Manifest
@@ -3,6 +3,6 @@ AUX cvsps-2.2_beta1-solaris.patch 3648 BLAKE2B 0e4471b476485f0202c458cb5505636d0
 AUX cvsps-3.13-make.patch 1189 BLAKE2B 682e089bb25716e71f049a2ce1641c14ac8b60a8253024f7c5b14db3d3be7d169b2e1bd487652dea56dc5bc9a963689660b7b4a059786e46dec3e6b4f48897ca SHA512 0ddc7115a0a66f418f81468230c92b17f3b7c6a38a82505de79c27764ee46ee5805ebf1d0a12360df77718cccf9bf2ac61f45b21c1cfecb7700e648ea1187e9e
 DIST cvsps-2.2b1.tar.gz 62763 BLAKE2B 35a86b93e69aba83fd96294b9ff993100b2b63e9dda9bd21899fc4a6df42513dde1297cebecfa6f95b43e293eb718e55ff3c9af7ac31187c8cfcd38242cefeb8 SHA512 9e6f95df53cdc16566f1606a9299ee641de9b020a373c9004218b3db23fbdcce9e32d4a57dce332580bc4e6429b90977c2753facd0ad8f9a9234b79f03a7a33d
 DIST cvsps-3.13.tar.gz 64437 BLAKE2B ec0755d39be448485a900a99cee9ef79f36343beedef80e10d6b0f48f7746b93ff54ff6b85fc1650408a228e363f45567f107be108d6bb1183c4998c5705f567 SHA512 9fe2be4839c7a6f31a788102fd6ebb1e2e0693f09a4dad2bca5cd5d0788088eb34388d592778f04bcfec9817e3ffffb66d70db9aa47996d3bd1c45cf7cd8464f
-EBUILD cvsps-2.2_beta1.ebuild 906 BLAKE2B fb872d47b3d89907a09c433bf769020685f87265b5c0a8f6707cbde29e934c8783f54de7d099848e296222bbb39b18d119e4b27ea1793d99f8884383ea39ee7c SHA512 5c64644d0baa832b737415b6d045048982711d2da539f9d8c033fac535cc0dea670faca774427bb2584909bc26275bd5a4dffab6449de4077cfd7410dbe033d9
+EBUILD cvsps-2.2_beta1.ebuild 907 BLAKE2B d6b48f04387b04db687c0a89e05cb8348df8da9f6ac98f7e4c0c953628ab85cdfe36fb2c9946106009ed4ac038cd9884dcf7649bdf84104deb2e4fecdce507d1 SHA512 6a44090250709ebd3ed9a615cb5918409b35bdcb8bd5994a49d15f9e9314685a166e5a7d369e743cd69be14559bb4c77aa0b5106b68e09797519a6605adb0510
 EBUILD cvsps-3.13-r2.ebuild 1016 BLAKE2B 4b8ad09f420f2cdd8c5deaca57114dfa7ecfb0870d8569f3e071638544a48496d7167e6564c7271de4bdbb0b0f835b4dbb223b2991178f2e06db4d2ff60c496c SHA512 f1163dc80ae8e46c7da93b1f507a4fa22ca2ec6f448a4b8f8fdb0cf89255b1cedd352e08b30ce5a4502fe6013449e8e01d2eca998350b23568c96d2a325e7ffe
 MISC metadata.xml 323 BLAKE2B 2aa38c904f2a7ac09a4c62906f1535332a43428b602632b96d1a728d35e5c8031a50c1750474e932f127d83bc3a56e2e2cfed1d02fb747d33a0045408e8adca3 SHA512 0788681a1fce2712b5722546e57da91895b3c292ff564062f0b16d9c910ad96b4a46e18e5d71a64fdd0a6980d000c2200b791fe95d1b2bff286e94ee60ce4edf
diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
index d5f68f1b445b..44d02edb71ab 100644
--- a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 13e5ededa53e..a8e2c2a26be0 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -15,5 +15,5 @@ EBUILD darcs-2.10.3-r1.ebuild 4751 BLAKE2B a5e2fad1a29d43c82f7e3f6f38630c3201ca3
 EBUILD darcs-2.12.0.ebuild 4791 BLAKE2B b9e6085aacdfe01ad75de297bc07d92eaa44020582c32ab0205e6e611c3cc397e3d44ae54971be00f0912d704df6937e419205f75256724927a1925e679faaf6 SHA512 7acd3d2ec037f65df5b7e5b9e466c7c181c411b461ad9cef45ce1a32e9f8174420a7d42ac356a305e554b3ad6cef54a1a7f694349ca09c88e9e0649f5073b3d2
 EBUILD darcs-2.12.4.ebuild 4477 BLAKE2B b803195ef7164c026944e943954ed3fc2f712c98a49f2aad9d01dcc4a7a2a6151d03c41b5bd1771f8017dda7b3c753a4db85450de97b6be3a5de0608045a3014 SHA512 173e6683a317a5a79f0f20f656bc7eb9be0a870871e8d6979a2db2687ad7eff35b0bcd1eff4e74d7eb55c31f2924887ffe6a6e6460f0aa24ce66fb0e427298ad
 EBUILD darcs-2.12.5.ebuild 4555 BLAKE2B aa01eda188a3e57a9dfff277d74549531ef0f98f970df24da3af24c4f6ab44c5939eedea7bbc54412ed685904c60d43f7784d2a792a0a523060cba5bef37cf1a SHA512 16e7e10dd0e3806b2dafa09791822f31fe6e34e2aacfd57c9854a8a2ec2797e226c01e4cfea4cb720c19ac83336ccea970823c58716a0469637af156b012f87f
-EBUILD darcs-2.8.4-r6.ebuild 4687 BLAKE2B ac4991b7a79083f8a6407d1412898c247cbe7264601e3e93038a2df2cafe2228c82867175bf16efcbfd364ff01d2d753cea0c8904f38f995aca9c37e56d109a6 SHA512 07e976ab4039e33dbfe679b4baebbefeb24a31215131aff8dbd40849d52b2b8c7af2ef623646a81a312da2030ac7b320b30e2c9c23f5a9cc8900a7f9ec130a81
+EBUILD darcs-2.8.4-r6.ebuild 4688 BLAKE2B 564e2205a2d516f0620eedbf9f39c4ae86dddc7bb375503b4a2935c207fc0eb9693563056e5f3efea3f0ffd0d2a205752a227fa2e2ab0623afdc5d723decceeb SHA512 ca981b4bec7013d6d269a237885e9aa2d926f580d90ef503a451e8b61219caac631c50d532f27c6f2a07ad9f7e8595774acf3de426151e8f03d5c4b645b21724
 MISC metadata.xml 593 BLAKE2B c4ab655306f001cc3fe3007152e25d32d97fd3a87db76051c6c75b1d53c2c6ebd2105b2674bea5872e678b577c3cca737a3bbf6fe89923bc4f780ea2dc8642fc SHA512 cab7d36edce3f7da1742ebf086f69468f2745cb58fae83e74fa3e6016f4a7285aaa57100fed17df47940a51029ea78892147b7fe86ef2e456b7e34cc34a421bd
diff --git a/dev-vcs/darcs/darcs-2.8.4-r6.ebuild b/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
index 41b7649deacc..060d5f33281f 100644
--- a/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
+++ b/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index f36657f6e25d..59d4e3351287 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,5 +1,7 @@
+DIST fossil-src-2.10.tar.gz 5634327 BLAKE2B 1a02ef0d32b06dd09760d6a62450ad7bc15de97b5263d50ec776dbf0e2fff6b6fba4ec944eecffdaf31737f4a45e30aa898a728590a0c6e2ae171937a349e92b SHA512 aad54e3eaa2d647257c5c723fca4e55981aac0432d3d0b4deaa9651c7db7d27cb9f26f7ff40c31c452cb8dd54b0f0663c632183dc11982bc9cc24adf78b952e5
 DIST fossil-src-2.8.tar.gz 5359975 BLAKE2B 6b63eadc8cd563d646698edc9972a52ec1feb868cb362449c232c99dcb81fea2fa227d631ebf8b695417c571933784dfffd5ecbec2a5027ac9901578a054c559 SHA512 5c6a8dc1545c43b3c95fbbec343db023e27a9db58f282a881bb7e488e3e26a0f7913a41f505dedf618b884507e48956780bd0e12482e184345d68edd1e79ff8e
 DIST fossil-src-2.9.tar.gz 5440118 BLAKE2B 2817e3c88073a26ef384d45271511eaacf5394a67ba6041ba0b37f321303abcba28655daf7963b8e51a8bc9bfeee681cea1f318f5ba66e93a5317b98771ad059 SHA512 c3786d4ae5517c88917819448863e9e1e37704a7073a1c87c042660313b77ce3a63f32e35e6a56af1c681e7b8a5acc652b4447d0387b8a8a5b3b5aa04dd9a9b5
+EBUILD fossil-2.10.ebuild 1532 BLAKE2B ea4e60d58501a90082b16fa9f34a2e1f1288064be2e4f31f05359a83e5673475e368b8b533221771f07abb7758d46a361537d580b52c7346d8552249d8d25411 SHA512 f7707a36961431a90c6cb39623b6d3ac681ff9a2e06729e7c3de9b980cb9d564c4262b7952c0e534d9dfa014d3d73bb969d74015102a8009244f3886b25a6d1f
 EBUILD fossil-2.8.ebuild 1529 BLAKE2B 8bfc18c0e98ce9838faa1fe65484bac119ec242f8085c9eaf912a1d5b65ae19598924bd4445e7717895b6e4de9ae0e50f662fc4b16a63089911d5a97a7005cc2 SHA512 b6174bcb75f9e6395b71c8b82103104b97a065af34720bc4aed358f71ac34033624022b06dfcdb0d03d583ff9c8891d21ed1073d4c21872d6a07150b20bf6306
 EBUILD fossil-2.9.ebuild 1534 BLAKE2B b56c917b54b543bc6db8bd3bc4c91e5912e97a31a7785f29c4bf2eb29750f3735f589e657e5344fc7b1b2bdac5e7282b2d67ff5d0c9ef7a5401f525cfb2330e6 SHA512 3b4ab6992cbcb3e4ef43409b2d9bd077e38130f1f8c88830f11e57c185a362d676000891d4677a2d3f7c01d5ec167c07768bb6f688db6cffad00e515afd861e6
 MISC metadata.xml 1165 BLAKE2B c370f1370c7250945135e56514558acd016742f6d8a9c51e98b9533e094b47dbdc07808abbb1341ad1e987dac6f5f13d2e2f0fef45587935accf082c15227330 SHA512 6ef05c3722bb110e403294b002c253eb1ae4f29a4f5306dccee3abd52ce61c8ae04ed2255f551298d94b8b99d96c799f05bd6df7a9d4e9af08e4c10ce306d0ab
diff --git a/dev-vcs/fossil/fossil-2.10.ebuild b/dev-vcs/fossil/fossil-2.10.ebuild
new file mode 100644
index 000000000000..af7391ebfacf
--- /dev/null
+++ b/dev-vcs/fossil/fossil-2.10.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simple, high-reliability, source control management, and more"
+HOMEPAGE="http://www.fossil-scm.org/"
+SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
+	tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks"
+
+REQUIRED_USE="ssl? ( !miniz )"
+
+DEPEND="
+	sys-libs/zlib
+	|| ( sys-libs/readline:0 dev-libs/libedit )
+	system-sqlite? ( >=dev-db/sqlite-3.28.0:3 )
+	ssl? ( dev-libs/openssl:0 )
+	tcl? ( dev-lang/tcl:0= )
+"
+RDEPEND="${DEPEND}"
+
+# Tests can't be run from the build directory
+RESTRICT="test"
+
+src_configure() {
+	# this is not an autotools situation so don't make it seem like one
+	# --with-tcl: works
+	# --without-tcl: dies
+	local myconf="--with-openssl=$(usex ssl auto none)"
+	use debug         && myconf+=' --fossil-debug'
+	use json          && myconf+=' --json'
+	use system-sqlite && myconf+=' --disable-internal-sqlite'
+	use static        && myconf+=' --static'
+	use tcl           && myconf+=' --with-tcl=1'
+	use fusefs        || myconf+=' --disable-fusefs'
+
+	local u useflags
+	useflags=( legacy-mv-rm miniz tcl-stubs tcl-private-stubs
+			   th1-docs th1-hooks )
+	for u in ${useflags[@]} ; do
+		use ${u} &&  myconf+=" --with-${u}"
+	done
+
+	tc-export CC
+	./configure ${myconf} || die
+}
+
+src_install() {
+	dobin fossil
+}
diff --git a/dev-vcs/git-spindle/Manifest b/dev-vcs/git-spindle/Manifest
index 8f6a45a15b42..7b923b9e84fc 100644
--- a/dev-vcs/git-spindle/Manifest
+++ b/dev-vcs/git-spindle/Manifest
@@ -1,4 +1,4 @@
 DIST git-spindle-3.3.tar.gz 1854895 BLAKE2B b1330ba728a7f124024ad755ead350fc3e8b2a3065afe70f56b4053bc2a308920c5e2ec4d4bfee566ad199d58ec0cc3d25ac69be1e5999a2527a9711b79f4164 SHA512 5d56f51d952ccfea321be79108a795d9e7dd7eca78d966955e76e1c8297eafc9899ef40b6ef1bfff692fe0ce7c3d54ead0ff5fdf31eb559d3ebc0ef9de91c3e8
-EBUILD git-spindle-3.3-r1.ebuild 675 BLAKE2B a9ef20a0a7730320dec99f7adf181a491efc42d4999039bd4eee917cf20df359a92ea54b65078e75362f62c4a541faee2ef3336c9adb4c8b45ff07a92d608b11 SHA512 247053f55f4697ce592e1c7e3845396676763ce6a17d9e0f3e13868c7016733203315b39653b9d933a2d0b2efbad082a95e8d22dbe4d4019b047e24f59aa4791
+EBUILD git-spindle-3.3-r1.ebuild 669 BLAKE2B 030221392aa61557a5a353c4c3bb77b4d32934caf70b196521d12de1e2c012b022eab2c36437c7c44e53c4e0dead5b73a4eb2d9eac99611ca73a1ff4db28737a SHA512 3ae89f482e44a299bae1d1059ab5567c1d2943086206b2eccf10f0650b7a9f22084837b7db28fba46f5ee831896d9445807aaca2eec361cd03f0779edc6a2cbb
 EBUILD git-spindle-3.3.ebuild 558 BLAKE2B 4b26b9e249dff4a544e270371797210e4a5dc38d574b252a6c0b926760cc5a37e9a5631130d3746e49d45f55d3fe6d5d01a3568554476a76cf79443a2a7383cb SHA512 b271c3bef677459ebb1a31b9c44db218608675fd7c891c92c17c74fc9b040c9b6f8ff448ec2ad9af15acd9cfd24341fcf0a07534dcf019367f782c7990b1206b
 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
index 3e47f7f45c32..ec1ea0e27378 100644
--- a/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild
+++ b/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 1512fa20b1d0..abcfd809de9a 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -25,7 +25,7 @@ DIST git-manpages-2.23.1.tar.xz 448432 BLAKE2B 0de4b2c0dcc3a70188a66d8aa6e16aeaa
 DIST git-manpages-2.24.1.tar.xz 453752 BLAKE2B 51a549099205341bfec5a7998e5f66e9fc78ffd05fd04e745401a8bcc5bffcb64f26a64c7e24c9822bc2d62d000ea2b13779ffe19f065124a8e42b306fb5a2d3 SHA512 ee1e70fdbfc6eae97dc3b3180fa119b0d1189db7cae3e45b8baa9311d0c1162a5b46824a785e91288522a9fd00b8e4ff07590f4e4722a08955d6a9d048cc3a90
 DIST git-manpages-2.25.0.tar.xz 456636 BLAKE2B 672557d167b7d2ff48089bc5be1fa446f25eed4412d6e48549d5907f7addab9f721a03a8bcb7ca3fb1804220021566ebac549d9878df9f1030f283ed5e44ddf3 SHA512 3ad1756b1f12898823a8981e3b650f588c6c1fb2d51371739c754108e67c2cd13e4d2bcb8291534523eac60e7a05253d4ddf2f3528e28d4e1b50eafa42168847
 EBUILD git-2.21.1.ebuild 19095 BLAKE2B f30353eb20be8e7c6dabf7649fd3903ddf41fa4e994294831d0c85881c20c246d396a71fbbbf23416b01fae0b58a68779feff0a379cb11a8a9f9660bc901be72 SHA512 e62383957ff0e73dcb35c628c180154d29138d6998d0ecb6beb0411db6b731c3d699c08df1dd43279de97ad2e9f8b68177d5289c89304949684f20115b10d205
-EBUILD git-2.23.1-r1.ebuild 19573 BLAKE2B bf9661a3b4193dba3964bb35cf675ee68597d1cf34084691c34b9fcbab4aa362dcb2723ec1eff7129503ebda37cda3b4f2e4128820a885aee99266b62f1164b7 SHA512 0360bb64aff6dcb1205b8f8ee623f17ee0b833ec10507f65b37468b50555f7e5552c5f40695fd7bc40465979a8540197a74146562c6efefc3741d32837729ce4
+EBUILD git-2.23.1-r1.ebuild 19574 BLAKE2B 7a0d11136a9affa4b8f778ca030bc29a4f209a89bc07bbf2290ae5887eef0b8bee7caffed97e14315a1ffc414f9d8b0bb511b12879709afa36599530ece65072 SHA512 2af3a45ea705d11b9925f1b74c0b465e84ceb5d82d95c1fc45fc4f301185ef77de18fe59b4c84488abbc780098aba910b27bc9ec95b726af26634b32f1e31e33
 EBUILD git-2.24.1.ebuild 19524 BLAKE2B f0efa75a1b2ba691649d86f505d509a02c46bac0c1a8dbe7a8bc848fb50ade93fd823f2dfb3772c678133d332f76edc32dc7fd2a6bcf6d5f738f408233ace672 SHA512 494825f6024b9e8368bd17bbd971cc66fff5e5e86851b8ef9d28d3006107fbaa1e461b4a73c6256d5e99d0236ff9c965aa45fe3624e81ceb33d4f7371379d555
 EBUILD git-2.25.0.ebuild 19533 BLAKE2B 20b73ab9cce220ca44b43849d52435985e5b7d5b1e875656e4c308fa88439fa75bb91acf74cdb2382c5b4eef78d3773dd2f69a08bacb9c28e26fc4b6c1282e1e SHA512 be6efd87c38ca46e289e3dd2bb49b0d77cb7e97f37a6e2ab3ac5e0dff34b701bafee56ca0ef632d8351d7e10a1f39763a2273185a38a8c211b4c502b798c7342
 EBUILD git-9999-r1.ebuild 19533 BLAKE2B 20b73ab9cce220ca44b43849d52435985e5b7d5b1e875656e4c308fa88439fa75bb91acf74cdb2382c5b4eef78d3773dd2f69a08bacb9c28e26fc4b6c1282e1e SHA512 be6efd87c38ca46e289e3dd2bb49b0d77cb7e97f37a6e2ab3ac5e0dff34b701bafee56ca0ef632d8351d7e10a1f39763a2273185a38a8c211b4c502b798c7342
diff --git a/dev-vcs/git/git-2.23.1-r1.ebuild b/dev-vcs/git/git-2.23.1-r1.ebuild
index f37cc8e36d2c..08388bd1da01 100644
--- a/dev-vcs/git/git-2.23.1-r1.ebuild
+++ b/dev-vcs/git/git-2.23.1-r1.ebuild
@@ -46,7 +46,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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/hg-evolve/Manifest b/dev-vcs/hg-evolve/Manifest
index 11b053e6224b..eafc40ebffe6 100644
--- a/dev-vcs/hg-evolve/Manifest
+++ b/dev-vcs/hg-evolve/Manifest
@@ -1,5 +1,5 @@
 DIST hg-evolve-8.5.1.tar.gz 755965 BLAKE2B c9d6ea06f91cc537e1ea9266a09cded59e3dfb69f0bb5300a40b971bda6f9ce680c81978c23806972ca88931d9f2d67eedce14ba1f56670fa3c18194b63e2999 SHA512 7c5d9608d03ab81fc7291edb3f0ddb016cd4b267997bf66fcb221c9c917fbd34bfb4637bbb0c60b460a32304ee45fd7e30db929312dfbaa94df17baf7947482e
 DIST hg-evolve-9.2.1.tar.gz 775584 BLAKE2B 03b57b464cf3395c5206f14310e202d5bfe3046816d943d1fb2b304f8fe66226f2b5773dec9feae4c487b6efdbf9ff18416dc55679e658264236c65b3a76d26c SHA512 927ba873c583a4027d8c745ba8eb70e8768cd7c4c9a36f773d33d9a77807345cc9d2029c8cbe0d626984a963700399447f2bee01c6a0820a4a46894719f76869
 EBUILD hg-evolve-8.5.1.ebuild 749 BLAKE2B 3d42920b21837708f764dbe4e012e11938c722802a22724bac8931c3e671b07ff389a9f8c920b555c27daa830b47bcab20e0aac3b037e83d9006775d21434b42 SHA512 f3b40e73c9ba525e53707ed0df74c9a3566b6ce5dcf986b16d67350a69664773019c27955343e261ad4bb28335a8ecaf6b00ca310a5d2bce590e3c7d34bcf127
-EBUILD hg-evolve-9.2.1.ebuild 749 BLAKE2B 4a63e25c569825030fd154abcd9aadcc6d348bbd182f5b76645bd9b012aeb67871ab561fda9a8e1866bae752c511ff44f0d4d85bc68c2f1c4ae7c9c9b23c6343 SHA512 1fda93e980dc30a073ab717c7a9acf464b365ff2ff14914fcf39f824ce08534bf3d6fcf4495dc51b11918bcfe185901788f01119f1371a9f50132dce78ed188e
+EBUILD hg-evolve-9.2.1.ebuild 759 BLAKE2B 5ea48e93c7b87b8c908a8effa6dc386a627279ad953effd4d562e3a93d410ef7703991afc64cf106a2a21895488f09ece09aabcd99ecb72a1823ffbdaf3e0724 SHA512 7de4ac79d1ffbd486df3eb41a2255e9b8ca24d780a251b56adf6c61bd50337909c0375d9634b287d78c0c39c14e9e688b97dfa854f02b70f65e73186b43c60bf
 MISC metadata.xml 395 BLAKE2B a61ed69918c8861a242c5add3e383902abb25cd10dc6f74b59a8e02fef50fa5a4da459494f3ac720989ada3ca730bbeeecb34d412129a191b210639b0473bcd9 SHA512 1676e93039dcb739017c0c119376b9c93e8cd1f7ae3a31c48e5eb6aa2ec92662bc7b5a834c00ecfe689408f27169559eb84e8e48a004e1f87e1eb59bfbbd7d16
diff --git a/dev-vcs/hg-evolve/hg-evolve-9.2.1.ebuild b/dev-vcs/hg-evolve/hg-evolve-9.2.1.ebuild
index 4f1db8db068d..7c697729d1a6 100644
--- a/dev-vcs/hg-evolve/hg-evolve-9.2.1.ebuild
+++ b/dev-vcs/hg-evolve/hg-evolve-9.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 756d534037e2..9364d94296b6 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,11 +1,10 @@
 AUX hg-git-0.8.12-hg-4.8.patch 6647 BLAKE2B 86e0fb6bd9f9b9d10e38024cecf447857ae5339085a3f919cd924d3a397003d85b59014ba920ee5f5f62ef54acb862feeef325a9d76168e5f5ba37c34dfa9dad SHA512 8536ba20dbe5e8d1e3872a058d3e4f402ee39a7f91d1fc0102e6d169bc246ed728bfac517ef620b157d563644b18982f7f8d2fd63ab1f5138e5550b4280b8619
-DIST hg-git-0.8.11.tar.gz 118537 BLAKE2B 05a63633f8909260428197334812d314cdba115324fa7dd70ccb5d0ee1e21089be0b8bb0cb1cf09f5f738cbee00e3e688646daa3debed9fa36fac2ff62bfcb8b SHA512 ced6b8b522f75b0e2b59c5113b3afd7b02eb2e3798a7aecdc211a15aba1363d3785234e909644626b5c16d7e8b158a6fe1f1120dcd85b5709d8a84ff1f4b6655
 DIST hg-git-0.8.12.tar.gz 124456 BLAKE2B 31a899ba1f2e0de861d81e7ff5fac9f82e9c08813b77fa8a4da3aeae590d7e8cb6c37abb80ebe34a80835c210f10145df7429685cb71ffab7bfe8d5a628d3d12 SHA512 77af45c8f35febe354382ee043be7f0f2c53e1ac7ae331a7068a0e117ed0f54adaa7c7f5127e247e089c9204b9130dde286aa887997b7ab7ede48f447797608e
+DIST hg-git-0.8.13.tar.gz 127399 BLAKE2B 0cf47df27dfc19cb66d546c1647af4f6b112035ee089c42331c0f2c045ead9e9abf796f0ed0747f52efe1452a9a2ccec237ae4c0296173ae283c180ae5cdb75b SHA512 55eed0704dc2829e6f027bc842e69aa5d193c824521e4c96171cecabd0155b0635a06b5ff2be61cdf0fff1bcb075190a324087b4171fba05df8db76527878a4a
 DIST hg-git-0.8.13_pre20190808.zip 171168 BLAKE2B 52cc847224977e6bf27b095b31773bdfd655ddbc6bdd169f5940dee65ee74ad357a8bd09120ac11a88b2a6058c5e18d4a4efbebd230d95c1093d1116429c0048 SHA512 9baf91288bf3762333e1da9394dfd717ffd7ed583d7f565babbe4888bab5766e7e6925ac7b1e154074d4ebc10a955790d59aad9423f693b8ded0a7f94ac69a74
 DIST hg-git-0.8.8.tar.gz 98508 BLAKE2B e7636c3809b2be8a7fcce44a72f89f39927a282c34384047036470fc832b34be1922de75a2a9b468ec125ea716263333f5f58e6a0c7de12729b7dd18c68b657a SHA512 c3b28273024f2429ed526354048f0e37d0af6be591020fa3b1e8d1321247d72129f7c8fbcef73e69d60e243a6f86380dc4d89f0e8f913b786ef4497421237aac
-EBUILD hg-git-0.8.11.ebuild 707 BLAKE2B 6bf0f75ecf2877a5b3d4775949aea77332dbb57d874c21acf36c10c0a377e543f6087e882a34127c56b92931ab47456f36a10019091c247cd81e0e84c4fa0b71 SHA512 b404e426bbfe1cefe5d56db9ef463ca4833c1e40dd7ec5ef9c4fd2eb249301fafcc8e321417557058307b8992420a56244245e1a908485c30977b30428849123
 EBUILD hg-git-0.8.12-r1.ebuild 750 BLAKE2B b8e1005953ae97583fabbcd3c72e0e732fe76abd3c089aecd3f9590f809253dfca1b694c14cfc51e5867f7beca5e9bcba3202399610bdf1df422ac57fb48a395 SHA512 aad9af3857bbc577d54af072c0913183a9eeaf2bf1e2846e773273cf6adf53ca5a170630d98786887d1d4d11357edfc9f6c7f65a9d88dbcd80c7ff2191787344
-EBUILD hg-git-0.8.12.ebuild 704 BLAKE2B 67f021ab754992b636235ffd2ad7dd43dca05ea63096764f4e63e77ea683b6a6ab057b6581300fb38f95d2dab3a7425a7694b9ea2e24146f38be240400303de8 SHA512 a23762cace05828e78628187a6fd4c34acb6d2a9b9ae9889005d209560fe36af792b8d81eda6e831a97b509c22378e966aaec7153408cf1d07234bdbaed5cac9
+EBUILD hg-git-0.8.13.ebuild 704 BLAKE2B d7d392beca63439af85f5e862c79e01487798d56d1958d15af5df7aa0a0fd4720cc29528b9eec17507c2862318b86e8184598d7beca0802362fd186a83085f0a SHA512 fca80ff4da4219162f8caa1af56a6b982081198a69d2663bdd97f560a869191162b0dc93320be763c9872f28cefa2d85d1c8ab57b57b6c1f63658fbc18605819
 EBUILD hg-git-0.8.13_pre20190808.ebuild 899 BLAKE2B 0a6570cb3d850486a8d6daae374b854de3013f216c4819525873eef7eb406ce12fcc120caacff37adddaf09490d18a44ae3abdcb50f41cac59cdd3f01a75a16f SHA512 cf89efaef6efc4a7a77f22bc177729bc476a810f20b2bf0d1fc63e9ba129bbd78f8ba235554c23a0aaef0caea5f335a44d3e061c5684f9232f6cdfa20bb9c503
 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
deleted file mode 100644
index c8f0f56632ed..000000000000
--- a/dev-vcs/hg-git/hg-git-0.8.11.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 ~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/hg-git/hg-git-0.8.12.ebuild b/dev-vcs/hg-git/hg-git-0.8.13.ebuild
index 241771d68ef9..966cb0bea758 100644
--- a/dev-vcs/hg-git/hg-git-0.8.12.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.8.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ 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/"
+HOMEPAGE="https://hg-git.github.io https://pypi.org/project/hg-git/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 IUSE=""
 
 RDEPEND="
-	>=dev-vcs/mercurial-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}]
+	>=dev-vcs/mercurial-3.6[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.19.0[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 8150a1b8d50c..be818b3590a1 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -7,10 +7,12 @@ DIST mercurial-4.9.1.tar.gz 7076867 BLAKE2B 8cedc66a8ddffc543a8849bbc98ebfc9ed61
 DIST mercurial-4.9.tar.gz 7075692 BLAKE2B ed11442e0cd5b27f47394ed1c15016930556d5cdc59ab18f1e0d5371e434eb752b68d3d9f6dd34ed9c63df62a646223e86c6c5178775d9b856eed5df65677900 SHA512 59a5467cebb51f17cce7bcada37f8d85906493ab2e3d443ceeae2c6598fb69d2d59f1e99c73bd08345c5f90501a7bae0d70e04c770ea7653ec30648e591c97fb
 DIST mercurial-5.0.2.tar.gz 7202797 BLAKE2B 7059efa2cf80c433ec25748c7c49ae0caa688363f5ef2983e0adf39a0a691ea99aaf4a090ebeda11b89e74263c548289cca3f82f40d77efbf925e12231b341cc SHA512 8b328e2e5a2896b690492d75c055bb13cd76df6efb087ef770f60ead86e30f7d952cb3ca82a696c0c5ce7039c319bd0fc9b448a52c079653622760317d5bb315
 DIST mercurial-5.1.2.tar.gz 7286238 BLAKE2B 0dcb2556e568e222da628bcfeceba56df8ab04f123f79add1953ce13bbf51e5cb0733fa72d5cff00250aaf0e3bfae5c52cc5cd72c1b6aa1fccb6820fce5a7018 SHA512 a8ce9d9220a5ddf452264801f06e81fe1e699ff700d085e3f82c6877910c6ef0e594203590f198b7b9e31c9a1ed627c8fa2a3a1513d0c5087cf775835a78c408
-EBUILD mercurial-4.6.2.ebuild 3572 BLAKE2B a778503a0d44cabc9905fa1caad2eb3587431086752fec8b02dd23f8d8db3a7ccef63a8022f671d56cbe457775f45065b2cb19d6a4d63eb59f62fbe9eb644ce0 SHA512 68cf4d34c9bafe70191d86806173c85eaf57a92337644da72f06cbc37ad5265e09c354ecfd0998c47e439504faff422deaf4d5e3409cb5984629c1135b9bf7d4
-EBUILD mercurial-4.9-r2.ebuild 3958 BLAKE2B 4d794d785df0866fb1edefdf96b9eff6433c830d2b0df59a17346ec029aa218bac431a77b2231c99c833cecdb46d34f483162fa00a3aefeb97f7d2d3ecaf425e SHA512 4d962e6dbbf2f657070a185d4ab9140e0cd837321e33b4654b4a5a036d2760219a8cf2a60f39113e7dd94baa8fb2a5f9038ee78153716c28e098f8c008575f47
+DIST mercurial-5.2.2.tar.gz 7333065 BLAKE2B 9cec5a6ebe4693a1b96fe268211aa2eaa06643d5b8812c427757839d5389319f0e2ff3c1ed964a56bf8a3c46f7630321abf508c61691102856dfbdbd72fed662 SHA512 875e75587ab1f1c54edd2f7198dff21e6b287425f215a9d28ef98d5359420df90ca7ef0128ec7b772c4a31dc95b1082b4d6d28f1754968a08408516ba9ec91ee
+EBUILD mercurial-4.6.2.ebuild 3573 BLAKE2B 1d8b75759f9e14cbc847e6ac2a693b4dad67ed08044b0836537c2db0f1661fa1ae89d79aef29d5372868705d6b11059ef69e99757d4a96322e798d8ee8f82f38 SHA512 3251d338787121d15e900853efc0addc5d1ba5b8b928be8a1e91d8fc80ca3f1527431963ec6675dd470e7704e2632a787d26e5b2c1a078df9d06e665ba28ddfc
+EBUILD mercurial-4.9-r2.ebuild 3959 BLAKE2B a1a5b8c374be038543980591a7518b2c84c1a8ae08ed0b6f40ad4f1062c1db2a9260bda0c5951ad1078ea3e34bb59d8e378a9eb8045d178c9c1a0141ecf07c24 SHA512 c6bb1988e1ee6bd63d714b6d54c6da48358522e327666c4d43225c2eb43fb3d5e01cb46ea01d3dfad5bb42631d6f691bcf3b76f8841d9000cccb11efa2870fb5
 EBUILD mercurial-4.9.1.ebuild 3968 BLAKE2B f08b6484565bfb45caeb82104f6e4c947a6d11b36747b723ef51606139caae49f6e0d8e2c076e9f64eae9c122ba3c5645230d1b1847e6b3149d3b615eb9fd510 SHA512 2355751f9e2b52ca4ba54df7c7ddf7c44fff5092842a00341bb9c686abdd3967ca256cd607bfc862d3137b6abf97f99e706e97ffa7770dbe8dfb38872f00ee1b
 EBUILD mercurial-5.0.2.ebuild 3964 BLAKE2B a03add4df62dc635fca9671af74a4738f69ca9b3b230a2cffc7d41e36935c2ff00173707044430eed646ff220ae7f9c13e9d1b8cdf110462ce6053563276a409 SHA512 ca085e487b6589a4624ecb02e4ab059524a5d7ee46c2616d4abb59ee54bb1b280a0eaf599ea7b65b955cde3e60421cb97da11170f4d1c6510f1e74abe42e45ab
-EBUILD mercurial-5.1.2.ebuild 3964 BLAKE2B a03add4df62dc635fca9671af74a4738f69ca9b3b230a2cffc7d41e36935c2ff00173707044430eed646ff220ae7f9c13e9d1b8cdf110462ce6053563276a409 SHA512 ca085e487b6589a4624ecb02e4ab059524a5d7ee46c2616d4abb59ee54bb1b280a0eaf599ea7b65b955cde3e60421cb97da11170f4d1c6510f1e74abe42e45ab
-EBUILD mercurial-9999.ebuild 4334 BLAKE2B 87bfebc02e9a47d384c71ee89ac4656cbfc70a50c720f82a1c18af36335f96f28fe2b03d0d357b0e5246b4e57e0a91c7972c9c2a8e9a67fe7464d38fe0044658 SHA512 4c2715f8d1fc12728fc6b96a3c61def70603f055ae9b933c546df1bb0ca331a7cc87eeafa8d9d1e1300c6a9b2f1b67e91f598edb01687d4b5c471035da4d7dee
-MISC metadata.xml 435 BLAKE2B 4a66c0cf836f306eca99c5a3f1144f76cce278100d8dbc817624b9a7fba203311aa39a8c46d3e2fd18646865ea9bf458d439084ddb0552b24083950480bfeeaa SHA512 a45d2794e3f041b0165244006952d164953b6638fa81e6899e1d4199c336b94490839a13b43b398bc4d5adad4faa47e8e8e79ea5b884d425db4c91fe3533c96c
+EBUILD mercurial-5.1.2.ebuild 4057 BLAKE2B a6dbbdfbd7ef5edc1aaec295bc38f1fb2dc088750cf2a54c644c641ea945cc6d6952033350a3c4d9f3366aa084b1aceec7462c7add7870683ea438bd1676f666 SHA512 40a882d2b8ab49e4a2722b4424d667503e8b2f39686767f863560d1e194ad1999cbaccc2a8aa692af69645342b9ff4bfbf967e11d416eb4ecab2bacd496cc59b
+EBUILD mercurial-5.2.2-r1.ebuild 4267 BLAKE2B 350f850282cfe4c9ca409dfae80f0cd20a8699d29c1938927dbd94242e3f9aed966e9908b5d7389722e9482cf3298500b78de259b25189272a88038fe88d05b2 SHA512 d1ec042f2919f86a3f500753846d66e541bbff4ec7b620e58c4c6d60838552071dfa1c712206491fbb238f943a412e5f9b4bda1ac23b758a72561e1afab793e4
+EBUILD mercurial-9999.ebuild 4227 BLAKE2B b52d73328c251fe849cf053bc147a1e49cf77903e284648a7404fe1d5f342c1b199d003456e43c2cbf4b26ce53414b1fc43d6fbc88ea55eb1bca7718517797d8 SHA512 06349897b9a018ce9432a597a7d48b3e84b5d8086f570d79f4975a6c6a3b48f4bf7afc97cec5ca18fe25d78da542689575578a1ca98d34d4cbf2bb9a8fb738a7
+MISC metadata.xml 544 BLAKE2B a95ef3aa49d289113a878ea473a975ac0e836684ec6950f362ed2ef110f6ab461c746bd99177e6c315707f987338d137509b3e286d7637084ac3cdec4aaf774b SHA512 24d33ff3094877d2365fd0fb04d21ae242a6dc5dc64ed3f09c9cd6fe39f637fa6ef5eaffedcd91e63fcb9382831cf14d18e01ae2a222ac8caf41dae623418738
diff --git a/dev-vcs/mercurial/mercurial-4.6.2.ebuild b/dev-vcs/mercurial/mercurial-4.6.2.ebuild
index 621ffb624f22..0f14591a2bd5 100644
--- a/dev-vcs/mercurial/mercurial-4.6.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.6.2.ebuild
@@ -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 sparc 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 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bugzilla emacs gpg test tk"
 
 RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
diff --git a/dev-vcs/mercurial/mercurial-4.9-r2.ebuild b/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
index 62fbdaf07e1a..fec507f335c9 100644
--- a/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
@@ -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 sparc 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 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg bugzilla emacs gpg test tk"
 
 RDEPEND="app-misc/ca-certificates
diff --git a/dev-vcs/mercurial/mercurial-5.1.2.ebuild b/dev-vcs/mercurial/mercurial-5.1.2.ebuild
index c3f5137de8f6..7ae34dee8a9e 100644
--- a/dev-vcs/mercurial/mercurial-5.1.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -151,6 +151,9 @@ pkg_postinst() {
 	elog "  dev-vcs/git"
 	elog "  dev-vcs/monotone"
 	elog "  dev-vcs/subversion"
+
+	elog "If you want to use bugzilla extension"
+	elog "please install dev-python/mysqlclient"
 }
 
 pkg_postrm() {
diff --git a/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild b/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
new file mode 100644
index 000000000000..7d67135fc8ab
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="https://www.mercurial-scm.org/"
+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 ~sparc ~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"
+
+BROKEN_PYTHON="
+	!~dev-python/python-3.5.0
+	!~dev-python/python-3.5.1
+	!~dev-python/python-3.5.2
+	!~dev-python/python-3.6.0
+	!~dev-python/python-3.6.1"
+
+BDEPEND="${BROKEN_PYTHON}"
+
+RDEPEND="${BROKEN_PYTHON}
+	app-misc/ca-certificates
+	dev-python/zstandard[${PYTHON_USEDEP}]
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )
+	zsh-completion? ( app-shells/zsh )"
+
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
+	test? ( app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}] )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+# Too many tests fail #608720
+RESTRICT="test"
+
+python_prepare_all() {
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+	# Use absolute import for zstd
+	sed -i -e 's/from \.* import zstd/import zstd/' \
+		mercurial/utils/compression.py \
+		mercurial/wireprotoframing.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	strip-flags -ftracer -ftree-vectorize
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile build_ext --no-zstd
+}
+
+python_compile_all() {
+	rm -r contrib/win32 || die
+	if use chg; then
+		emake -C contrib/chg
+	fi
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install build_ext --no-zstd
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins contrib/zsh_completion _hg
+	fi
+
+	dobin hgeditor
+	if use tk; then
+		dobin contrib/hgk
+	fi
+	python_foreach_impl python_doscript contrib/hg-ssh
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el )
+
+	if use chg; then
+		dobin contrib/chg/chg
+		doman contrib/chg/chg.1
+		RM_CONTRIB+=( chg )
+	fi
+
+	for f in ${RM_CONTRIB[@]}; do
+		rm -rf contrib/${f} || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+	dodoc CONTRIBUTORS hgweb.cgi
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	rm -f test-largefiles*		# tends to time out
+	if [[ ${EUID} -eq 0 ]]; then
+		einfo "Removing tests which require user privileges to succeed"
+		rm -f test-convert*
+		rm -f test-lock-badness*
+		rm -f test-permissions*
+		rm -f test-pull-permission*
+		rm -f test-journal-exists*
+		rm -f test-repair-strip*
+	fi
+
+	popd &>/dev/null || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local TEST_DIR
+
+	rm -rf "${TMPDIR}"/test
+	distutils_install_for_testing
+	cd tests || die
+	"${PYTHON}" run-tests.py --verbose \
+		--tmpdir="${TMPDIR}"/test \
+		--with-hg="${TEST_DIR}"/scripts/hg \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 4715bed5111f..8c12d545eb87 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -1,32 +1,42 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
+PYTHON_COMPAT=( python2_7 python3_{6..7} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 elisp-common eutils distutils-r1 mercurial flag-o-matic
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="https://www.mercurial-scm.org/"
-EHG_REPO_URI="http://selenic.com/repo/hg"
-EHG_REVISION="@"
+EHG_REPO_URI="https://www.mercurial-scm.org/repo/hg"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
 IUSE="+chg bugzilla emacs gpg test tk zsh-completion"
 
-RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+BROKEN_PYTHON="
+	!~dev-python/python-3.5.0
+	!~dev-python/python-3.5.1
+	!~dev-python/python-3.5.2
+	!~dev-python/python-3.6.0
+	!~dev-python/python-3.6.1"
+
+BDEPEND="${BROKEN_PYTHON}
+	dev-python/docutils[${PYTHON_USEDEP}]"
+
+RDEPEND="${BROKEN_PYTHON}
+	app-misc/ca-certificates
+	dev-python/zstandard[${PYTHON_USEDEP}]
 	gpg? ( app-crypt/gnupg )
 	tk? ( dev-lang/tk )
-	zsh-completion? ( app-shells/zsh )
-	app-misc/ca-certificates"
+	zsh-completion? ( app-shells/zsh )"
+
 DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 	test? ( app-arch/unzip
-		dev-python/pygments[${PYTHON_USEDEP}] )
-	dev-python/docutils[${PYTHON_USEDEP}]"
+		dev-python/pygments[${PYTHON_USEDEP}] )"
 
 SITEFILE="70${PN}-gentoo.el"
 
@@ -37,20 +47,23 @@ python_prepare_all() {
 	# fix up logic that won't work in Gentoo Prefix (also won't outside in
 	# certain cases), bug #362891
 	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+	sed -i -e '/    hgenv =/a\' -e '    hgenv.pop("PYTHONPATH", None)' setup.py || die
+	# Use absolute import for zstd
+	sed -i -e 's/from \.* import zstd/import zstd/' \
+		mercurial/utils/compression.py \
+		mercurial/wireprotoframing.py || die
 
 	distutils-r1_python_prepare_all
 }
 
-python_configure_all() {
+python_compile() {
 	strip-flags -ftracer -ftree-vectorize
-	# Note: make it impl-conditional if py3 is supported
-	append-flags -fno-strict-aliasing
-
-	"${PYTHON}" setup.py build_mo || die
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile build_ext --no-zstd
 }
 
 python_compile_all() {
-	rm -r contrib/{win32,macosx} || die
+	rm -r contrib/win32 || die
 	emake doc
 	if use chg; then
 		emake -C contrib/chg
@@ -61,6 +74,10 @@ python_compile_all() {
 	fi
 }
 
+python_install() {
+	distutils-r1_python_install build_ext --no-zstd
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 
@@ -71,12 +88,10 @@ python_install_all() {
 		newins contrib/zsh_completion _hg
 	fi
 
-	rm -f doc/*.?.txt || die
-	dodoc CONTRIBUTORS doc/*.txt
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
-
 	dobin hgeditor
-	dobin contrib/hgk
+	if use tk; then
+		dobin contrib/hgk
+	fi
 	python_foreach_impl python_doscript contrib/hg-ssh
 
 	if use emacs; then
@@ -84,8 +99,7 @@ python_install_all() {
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 
-	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
-	                  *.el mercurial.spec)
+	local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el )
 
 	if use chg; then
 		dobin contrib/chg/chg
@@ -94,47 +108,40 @@ python_install_all() {
 	fi
 
 	for f in ${RM_CONTRIB[@]}; do
-		rm -rf contrib/$f || die
+		rm -rf contrib/${f} || die
 	done
 
 	dodoc -r contrib
 	docompress -x /usr/share/doc/${PF}/contrib
 	doman doc/*.?
-
-	cat > "${T}/80mercurial" <<-EOF
-HG="${EPREFIX}/usr/bin/hg"
-EOF
-	doenvd "${T}/80mercurial"
+	dodoc CONTRIBUTORS hgweb.cgi
 
 	insinto /etc/mercurial/hgrc.d
 	doins "${FILESDIR}/cacerts.rc"
 }
 
 src_test() {
-	cd tests || die
-	rm -rf *svn* || die					# Subversion tests fail with 1.5
-	rm -f test-archive* || die			# Fails due to verbose tar output changes
-	rm -f test-convert-baz* || die		# GNU Arch baz
-	rm -f test-convert-cvs* || die		# CVS
-	rm -f test-convert-darcs* || die	# Darcs
-	rm -f test-convert-git* || die		# git
-	rm -f test-convert-mtn* || die		# monotone
-	rm -f test-convert-tla* || die		# GNU Arch tla
-	rm -f test-doctest* || die			# doctest always fails with python 2.5.x
-	rm -f test-largefiles* || die		# tends to time out
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	rm -f test-largefiles*		# tends to time out
 	if [[ ${EUID} -eq 0 ]]; then
 		einfo "Removing tests which require user privileges to succeed"
-		rm -f test-command-template* || die	# Test is broken when run as root
-		rm -f test-convert* || die			# Test is broken when run as root
-		rm -f test-lock-badness* || die		# Test is broken when run as root
-		rm -f test-permissions* || die		# Test is broken when run as root
-		rm -f test-pull-permission* || die	# Test is broken when run as root
-		rm -f test-clone-failure* || die
-		rm -f test-journal-exists* || die
-		rm -f test-repair-strip* || die
+		rm -f test-convert*
+		rm -f test-lock-badness*
+		rm -f test-permissions*
+		rm -f test-pull-permission*
+		rm -f test-journal-exists*
+		rm -f test-repair-strip*
 	fi
 
-	cd .. || die
+	popd &>/dev/null || die
 	distutils-r1_src_test
 }
 
diff --git a/dev-vcs/mercurial/metadata.xml b/dev-vcs/mercurial/metadata.xml
index 37d1b32ccb33..d868ce0a9583 100644
--- a/dev-vcs/mercurial/metadata.xml
+++ b/dev-vcs/mercurial/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="chg">Support Mercurial command server client</flag>
-    <flag name="bugzilla">Support bugzilla integration.</flag>
-    <flag name="gpg">Support signing with GnuPG.</flag>
-    <flag name="tk">Install dev-lang/tk for hgk script.</flag>
-  </use>
+	<maintainer type="person">
+		<email>cedk@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="chg">Support Mercurial command server client</flag>
+		<flag name="bugzilla">Support bugzilla integration.</flag>
+		<flag name="gpg">Support signing with GnuPG.</flag>
+		<flag name="tk">Install dev-lang/tk for hgk script.</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">mercurial</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
index 85d29f484416..a4e10cc57b72 100644
--- a/dev-vcs/rcs/Manifest
+++ b/dev-vcs/rcs/Manifest
@@ -1,5 +1,5 @@
 DIST rcs-5.9.3.tar.xz 800736 BLAKE2B aa3f17555e5b65a9d65dfa781f2e12496e282128d9412529f67a831b5d6035302a6f70c4fe0b9d9519a2bf02fc5a98d03f4aa3b86696fd27874bfa7549e8c8a3 SHA512 99b124a94f285d8c675a2a51397ca4a97468f053d42aecf543e9266f16aea6b2667613f565c3462ffd2350c28e22baa4d01d598e2cc7e1e940625086f6de0ba6
 DIST rcs-5.9.4.tar.xz 801360 BLAKE2B 18cb97aae7a70f9f12b1018d6b6b42fbc06dd96b491caa7ee5ae2a4a746339e22ffc93ead5756add62f8a08d5cd1ec589c242f0a75e9d78aff29b95114869b25 SHA512 c501a46b8d2e166ec0b54301d72687d9b38b31d84517fcc8dd560a296e7ad250962a92f019e53b2921af9045755e2e7f2f2acc9542dbe0d19ee110ef36861cd4
-EBUILD rcs-5.9.3.ebuild 893 BLAKE2B 77b3f2344937441d88d313910533ffccfbb07e58dcb81ad2f78448c264c936c71eee0b57583d8ca148207c23127ff231584dd3e649a5f36f920783be7541b8fe SHA512 1c4b02ed8a8eb64a848ff5cb80a5f3190acb4af5f864233a21945fdf6a8f00ee94d6b2d9100603676bc8a2b57f325d85f9fc259ceee5919300bd0e61757e2518
+EBUILD rcs-5.9.3.ebuild 894 BLAKE2B ca548841fe28e82713943fd517c6d1c5ab8960db76d16cd5e7e949ae2c8a0b4f35f1c144193a0eb8b095f76f8a98fa225e21b6c83e54b2119e671829d934000e SHA512 8dc2b588dc417f57295e2cd8200d04b806648559379a8b2b82dcd258906192f4ce44073716275b8c0fba0096472df1bfc23ae3c656b7f5e64fa68ba862ae550d
 EBUILD rcs-5.9.4.ebuild 903 BLAKE2B e46c2bde28bc2a318e63eddb1df11622500957f4014584ff3579f061e0fdc6c66378a98b74a174c5321dd176c08db0ed0917d6076abbfecf5149e29f543b3541 SHA512 fce7bba759326aa79690d510d5dbf3dd83a710d6f022eba8ab674a2c5a5ff6122d7dcf51bd706429d6dc65470237490ea7c9e3bf745bf92354f6e9f4c122ded3
 MISC metadata.xml 614 BLAKE2B 053b53062b14bba99cb48bc2c19af60ae78c8e0bebb378f6c7c8e6a3d5b9b5b8950d165c7c582d7c8df34c98c12a86e1666f2a7ab38c4fe1fa915cbe4fba00ed SHA512 db77e48d0c4775308f57044e38b8e41c4cd110b42c4a2c305b8d7d719d1885418c1fd534383fec0ed9c38d4be1bf731dd6d00c064afdd3ea0fae9c432bdd4c3b
diff --git a/dev-vcs/rcs/rcs-5.9.3.ebuild b/dev-vcs/rcs/rcs-5.9.3.ebuild
index a58f20daafd1..47bdf514955b 100644
--- a/dev-vcs/rcs/rcs-5.9.3.ebuild
+++ b/dev-vcs/rcs/rcs-5.9.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/rcs/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index de1e97f25451..a5d2ffce84a1 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.12.2.tar.bz2 8506584 BLAKE2B 535e4c6c369537baa7f9fc9123d0314de1bb8d4b3c51e0216662047fd1084ceb6a1f349de54bf575f0eb8e1041fcd6525e6cf27dbd908e2148578cb9fb807bb3 SHA512 b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136
 DIST subversion-1.13.0.tar.bz2 8508122 BLAKE2B 761def1bb3a1fe5333534ebda0940b618c343f919688055cdef69552bc515ad6cd9db3ac67c8c73075487d4f45d93bb57fa467288756dfa163fc72c8e8c7b548 SHA512 36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2
-EBUILD subversion-1.12.2.ebuild 15505 BLAKE2B 7a83d647ec119c24b75456607a6250d0baec29d0022df416f38a23cec1f06b13be44dba8e0d7352affd5a8ab9d8453b7f04dffe282f6675edf5e063506d3c094 SHA512 829637a9a23bdd80fe47a1fba7613c9d3aa0da98b40b05184b01d77d078737615959ce6b032b34570bb79a1ee911143b3d5f37ecd4282dfe6fa60e8803b36ae6
+EBUILD subversion-1.12.2.ebuild 15506 BLAKE2B 496cfb7edc67cc127d1513cb83614132257774ed18a45779ff194bb044f723b4897e63b6f7398083620df6bf02cd0f4398f04fc3e3b4fddf915543a4b434fd71 SHA512 52894ce6cadec57392fa895f7fdff3eb4c10208816cded6c5a88db8356a5ab13f17fa3373d7c91d21a514c33404ac6947549798f0ed14c7d48c4690c351c8be8
 EBUILD subversion-1.13.0.ebuild 15515 BLAKE2B e2b4820662dcb8e12362fd2d6cb143ce5b1f884cb2b8526bf6ff69f6375e824bf74cf529080ec9ae7c2a706c45f08c4bbd9ea63982fcfd21c0d9660d59244bff SHA512 b0820e3d8e0a8722534e5803bcb99499899d42f93ce24208052dbf48d129ffeea253b71d76ec4b7b084d292bf9286435e3674fda50c2aa281637d043c4a178b4
 MISC metadata.xml 575 BLAKE2B 10cda26a50a50e6ac6b16d578d1a3856f88ac12b56ac6ff1768c4a0e0240b2e6abea6b1f66a6ea7d3f817e75eb9e2d5e14999ad2ba330b55784ec5028781b994 SHA512 f2a6ff822a11d452c133aca4abeb1ffb214d946c7e706d1caa269564c4dc55374c17449a4912df54b12ce562d66058baf2e710f3e9e46ca3602e9d8483555584
diff --git a/dev-vcs/subversion/subversion-1.12.2.ebuild b/dev-vcs/subversion/subversion-1.12.2.ebuild
index 361a65f81cba..133e7dedbf40 100644
--- a/dev-vcs/subversion/subversion-1.12.2.ebuild
+++ b/dev-vcs/subversion/subversion-1.12.2.ebuild
@@ -21,7 +21,7 @@ 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"
+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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-vcs/svneverever/Manifest b/dev-vcs/svneverever/Manifest
index 74260865fd80..4577a0ed4072 100644
--- a/dev-vcs/svneverever/Manifest
+++ b/dev-vcs/svneverever/Manifest
@@ -1,5 +1,5 @@
 DIST svneverever-1.3.2.tar.gz 7160 BLAKE2B 0791451740b1b08efe320488067929e856fb2cb20ee82c3dbf666e37bee1835a1e1532f12cef666668f6da1c91a42ce80080625ee0d3760c8a02786ec1995c92 SHA512 cd43f18220b6a7adde3c7f451d9177b76f1c5f42384a0bf21719bb6d2dd56c51c278b81d8275328ec0ea9c3835cebc5d79be20a72294c5e14b3c339cba60ec8b
 DIST svneverever-1.4.2.tar.gz 7741 BLAKE2B f43a2e1d63065bf1f453f67d4cd4e6bc6a6f990c66eef0fd510e7f118bd84f10756a3066e3b6bc82b98155cb39be86e9139eb918a53d015fd1c79645d85a9f51 SHA512 fdf799bab23aa19861013ed40c513aece12df22051013e7110b1508fc1f4055faf32406c0c942651a31a6bd5cfecf972b64652ce5f211c41a6a144311f64124f
-EBUILD svneverever-1.3.2.ebuild 482 BLAKE2B 532a429e588c75c6e350227152d94004ac221a5157f8dd7ed7e25e1233d0dd90fa3e4108fe8fe0274d750379a404729fa56c5e1a9fc60684917bf8ecfade2b24 SHA512 ebd945e1f9bb039f27261fb8c459c6e5b18c72cfbc513917bbe1e37031478a91c54adf1cf825dbb3d863e720078bb5c27534c6049a82ef8d463886020d459d3d
+EBUILD svneverever-1.3.2.ebuild 476 BLAKE2B 5c5a88fffdc5e40e253a70eba285e68f05091b36e9684afa44a34ad11eaa9f50841aa552ccd73ae67bfcd9d64e6d532e1a07f583865ff69f7c591250f6410d51 SHA512 2562eee5fc47defa18b7a8c4a5c6ccb4f9e75fdc19c169df29dcecda01daf8cabc2200264526c9acd5a881fd64023a077ef8354903f77a5722d8d38d6f078146
 EBUILD svneverever-1.4.2.ebuild 476 BLAKE2B 5c5a88fffdc5e40e253a70eba285e68f05091b36e9684afa44a34ad11eaa9f50841aa552ccd73ae67bfcd9d64e6d532e1a07f583865ff69f7c591250f6410d51 SHA512 2562eee5fc47defa18b7a8c4a5c6ccb4f9e75fdc19c169df29dcecda01daf8cabc2200264526c9acd5a881fd64023a077ef8354903f77a5722d8d38d6f078146
 MISC metadata.xml 334 BLAKE2B 8d3ce38a8ae3289ed55ea0daa72adcbfa8ea7cfaea7bbae2f7afded9c79cf3d41658ccc0bdc324db4640e73f3fd902be86bec29927f73582d860f697564a9f6d SHA512 d50e4630b891664dd365e38a57ed146acdcca6d645994d010b58b46b70adb77c3bad5f0ab5088302dd8f21adb33e8b478ac31426dd8bfcf94b1f82fe2613b446
diff --git a/dev-vcs/svneverever/svneverever-1.3.2.ebuild b/dev-vcs/svneverever/svneverever-1.3.2.ebuild
index 935c80b8b97a..50dbc6439b2c 100644
--- a/dev-vcs/svneverever/svneverever-1.3.2.ebuild
+++ b/dev-vcs/svneverever/svneverever-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Tool collecting path entries across SVN history"