gentoo resync : 31.05.2021

22 files changed, 178 insertions, 63 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 9a87632567a8..947cdf846f55 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest
index 102e7fda7d55..3d86c24dc8fc 100644
--- a/dev-vcs/cvs-fast-export/Manifest
+++ b/dev-vcs/cvs-fast-export/Manifest
@@ -1,3 +1,3 @@
 DIST cvs-fast-export-1.57.tar.gz 503473 BLAKE2B 06d5b03d550be9604a04b4f03cd19d06abbe84efb6fbb424a3ae8c58f2964dff31e1718baf61adf70fe17c2beb6753cdd0fba9e0e1a5ba5e9d8ae7b87721a336 SHA512 bb129d58a66ca8aa9feb6dcdf6d83553ed1099d6023041c4fb8fa9b923461b6eb9e59ec304b3443f754d7710a2655fd2c104cbaa5ac604ee471de727b92fc091
-EBUILD cvs-fast-export-1.57.ebuild 953 BLAKE2B 7cc0f6269302fd10b315c34c0fca5c10c0bd6398e41cafa71ac1f7b9d624e0e5b94ec0a9dc4c825157cf1618f382a4b4a856fcb6f49ec63a1deaa48ec91862c0 SHA512 1d4c1be36f656d3336061ec50d5957a0b48f0b1c9c04e876a5f2100ad447d7c80b030879c6f32d2822c46d25efdff0b95e15fa73294db1b1246694edb5903859
+EBUILD cvs-fast-export-1.57.ebuild 931 BLAKE2B 439b7f5ba4c6bdc8c09dc0f8906db1faba85dc08eaf63a3c3c9859f6d10781bb5857493a7580da3167e7d87c185eb7dff502a98b1335f0b8b19719742b1b64b0 SHA512 d53f87163c8447025b3cb5e3fd7b3474c4cf0bf832f9d027a0b878daf73314cd304652235d33b956e960fe094d4c19683d797c9c48507b6b026deb3949a02960
 MISC metadata.xml 333 BLAKE2B abc76cd8de16656f7017b18c9119941bc5ae73cef7381c664f5580584c1e8e27b4833d6f8e7e514fa0c80470c81b4ae11957fc75dbf735d83fba0307321b3a73 SHA512 d33f6487d5ec4d5b76132cb761ddbba1db898f72502ae8afaf011090bc1bc53ae26f4c8bd335b9faa146dbb703f816c949cdcd35a3384ba03b03069d654b6955
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.57.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.57.ebuild
index 45dc138ac582..54fb82e4114e 100644
--- a/dev-vcs/cvs-fast-export/cvs-fast-export-1.57.ebuild
+++ b/dev-vcs/cvs-fast-export/cvs-fast-export-1.57.ebuild
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-text/asciidoc"
+BDEPEND="app-text/asciidoc"
 
 RESTRICT=test # upstream does not ship some tests in tarball
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index f67be858781a..5034b8a084af 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -17,25 +17,25 @@ DIST git-2.28.1.tar.xz 6119248 BLAKE2B 69999a39d1c5c1dc69b8c7721a594104b51d2af69
 DIST git-2.29.3.tar.xz 6189996 BLAKE2B 9e30b7c4eab0d74a7d3d1387774958fc1ce7fde6239bd8daaa277304cde1f3249484fd703a1827c703ec9400ac2c1e7c288bd2956a3854521bf561437de58617 SHA512 3a21be5005675e5406964519f3c8441826b311274de8c5bacdc3ede564efef3d87f085682f31c89166a5022738a3cbd8e767d2bca3bd57d6f55b2451e36681dd
 DIST git-2.30.2.tar.xz 6329820 BLAKE2B 1c553c183d5426c524852bfba38b39196d9f0fb83854fec3291959474374db41a68a4118785412037ba16230662d94f03b05bb7ea577f0272552e63b68086f95 SHA512 4f7e1c30f8eee849d1febeda872d56c60c5d051a31726505a4c7bab11b274d3a2ab5588f910b7b49c5c0ec5228a18457f705c7b66e8bbdf809d3c75c59032b7e
 DIST git-2.31.1.tar.xz 6413368 BLAKE2B 2d40aa3e5336e57b3cab42c36dd07698be7a811e2890f4c9ecaaa375f985313bb8e14fe7a70c1beff3009a9102b935e4a6065019ab3b2520f09339e2a0fcdb93 SHA512 9aa334a3e8519700ff5d112153ec42677722980094caa9d22aa91afdb65166bd9a98fa445c0d327c428ebfa73bf4832e9b3836109a1d9319feafe3191cfd170e
-DIST git-2.32.0.rc0.tar.xz 6501284 BLAKE2B 0e581a7b9eefaab75ceb8400758f5eb5d86d980dc20ad2439debca816ee6f30b8de1b41aa4a1ff14abdd74e0d672037c86a16c2be91285d161741001fa9164b5 SHA512 f75fda443e3640eff21c7be57726e08360141191ac9ffc2f456574e19e4c2cc20403fb32bf45034c03b519f1a385e152e603cf08c6da622f05593b2c4444206f
+DIST git-2.32.0.rc2.tar.xz 6503120 BLAKE2B 802623a634743a97b1fcd1c0590291ac72ae02340c0a5a28781788bac2ea729e901981dc4d39589685f8fc72ca50958d1388dd3616ca3fe5933ea135b79c2ab8 SHA512 1e9d96d4c54882f571dd5fd075ebe842ecd4da24cf97d06fd65f9fa81baa55b1d74237164b9cae64249c242b90e375f71dc52d6b1d700cf2d6abb7e18c1c1206
 DIST git-htmldocs-2.26.3.tar.xz 1305208 BLAKE2B d5bb834b00a9d0cd3cdcd671e33142595e4ac28be8eab2326263f548718d52cf141b7fa6afee8da05a15ac75252455945dd34d60ffe5cda6cf1d612b7ee35953 SHA512 ff6c912572d32a1f32ec4c73e07e1404155ccbf81509a741e25e9dbcf42e5348dce59c40b0bb5d64993d8a981e2afd773393b2aeacde457870aa1f03feb9a1a6
 DIST git-htmldocs-2.28.1.tar.xz 1348296 BLAKE2B 6bbaf94a963204d85100554578fb2520c44b74332e6dfd0f468fa3217efad2a484ef427359411569ca503a809aec00edde21ab577ee9ddc9779f0b702402ed4c SHA512 9e672673f271a136f9c2d1ed827dbc76656b40315cb5d11d95aa18c006fad8ea2c2535f2092f1b6514a6ae7f88589178fc90299b496f446debb673e8f36f8909
 DIST git-htmldocs-2.29.3.tar.xz 1365468 BLAKE2B b8b2d46a5b35f6962f06bd9837ddc613aa5f4096dcdabea4308fcc52bf4f639fbdade2f91e01738cce6befb8b63faf57f8ecab1200048794d873f12055f04bdd SHA512 217a313636b5e7470e58d21428c81262f9d9909227f6a47c8445eb301bb20dd8393d0e600b8e7dad04b030a688561f93cdce317ad714cecd0505c198e1fe44a2
 DIST git-htmldocs-2.30.2.tar.xz 1342648 BLAKE2B a81b2111a79b7b211f99c0ac2b3d397d627316fc1eab56f091088b4ff26d80c353efcea4154f84640dea952dddaf496f3c8f63d2c371d6ce97bf888fad2db237 SHA512 7fc8bb1a9e484f5f49ad41c89ee8e5059970e3091e1d72b86800f8d255fe00be3d8072194cbc913ef6d98aa014ba9e8efae062a9ae595f4dcafaa0c3e637d297
 DIST git-htmldocs-2.31.1.tar.xz 1357592 BLAKE2B 54b48cfe2bb8e5dad9fdff862aa91e5805b0cd331b459d51a71ed913ca68d1aea6c6c69cfadbe8b6101b4d7be63c3811027a2ed42f9d2b0d3509664726b8ad78 SHA512 d243f4e3047c0e29bdd9127ff529c7fab5ebf40a4afaa04c3a9261ae398aa61c16a4413b7bf580c7f874d632b866908d92322ea0502141d811b78b7636c8d28b
-DIST git-htmldocs-2.32.0.rc0.tar.xz 1381420 BLAKE2B 3f10f2cb2b52d6e79556b5228430afb8cfa78a1919ee7a92e3f610a4e35c94722200ae1aa966ebe36ee8669cda8a6bda5d0fe82f78a3adceff29f457d90370c5 SHA512 60e9939cec8331b25582950848daa24765cbed005334895ebc7daeea8dd5234c1a97aea417f5df3f73384a77620a7fea84e4f8ac189e1e92f93659444a38d427
+DIST git-htmldocs-2.32.0.rc2.tar.xz 1381256 BLAKE2B cbfcd742097020f29783835cd91936aa6e68e7eecfcb67a31c44432338ee4a0ddc4349516ffa708c3380ee9250c0687d1a5225929c007e1d9754a86aaa6ee017 SHA512 c01f9360557e89aa1872c550219af82e622664a6510b3693ebb3526ebc98a7376f5e0b1346c924cc750222f595a8d2d17f2930e2a978d5689d9c7822e2dcd9a2
 DIST git-manpages-2.26.3.tar.xz 462116 BLAKE2B 3191f719c5f2f0df34a66a041ab8590cbb43ed8df6d4b430df04e4255544048a982c00dbcbc7d7d9057830d5354c595d853e9f7558efdd6049be74e81d61a20d SHA512 8f9b64b0554867a56a647ac4f76351858342f84a38fd9977c606612c034dcad552afba8489a81ce227ed48a90d78f23d203452086175e218efb3f0fe8429f9f9
 DIST git-manpages-2.28.1.tar.xz 472404 BLAKE2B d6b411dee47439b91e61f93fdca24fc5a707807c9445b69df81be8cdf6b78e24ea8424c0a36a3b4bd7db82e303b4139449a3fdc7de43d65d50f8b9e936e73669 SHA512 b543934fb9a91636033a2a7262180bf62b5493be3c222fb882aa992fe15f9fc0b9cc6723f3afa65fe8c60b8909af4337139bc0c355df0ac063f9e915d4b574bd
 DIST git-manpages-2.29.3.tar.xz 478456 BLAKE2B e568b92badda851be5d5c0524455d1eb728e4633dd88144edc8e22d84c64ad195538d906ae3443789ea14607be536d1de0f30b448ab0860d605b65a6476455fb SHA512 5d1a26c1342c31ca3501f2e40ec55c6e5dddd1ee2de909ec65425dea92455f00ca23a10e7475dcfe5b9a60dc4c2012778e86797cc8922de20638fcc07c60d941
 DIST git-manpages-2.30.2.tar.xz 482180 BLAKE2B 97180d13ba73f229d205b662ca16d497baff57a23b9b621fab69bc1bb4f2ac4f52b861443917ae01ebab7130640e1b7352aa193d7c0cd945cb552749ee1367c9 SHA512 fcb2ab9dd4c29593d08b80f6731ccc3b9a54514d6cc002434f8e36277fd814d4be7e69f0563291cea4f16c35e4822def57ade50d7d10a897619b13c6a6893aa7
 DIST git-manpages-2.31.1.tar.xz 487784 BLAKE2B 9fe67839cca51f18b0aca16678eadb9ee8e609cbbae26bf1804c39b8bf5415e1069cb50162b75f9f8ec69bd6511f271d3116ac33016af2e57e65b88ad6c4b165 SHA512 a5fb8a1c3f08707d4d2d835a55b295677559856984ffeeb650827b433625a74f22ef4aac10e1b14eba5860e11567543b146d52dd055b2613e5a510e0f4f3c3fd
-DIST git-manpages-2.32.0.rc0.tar.xz 491992 BLAKE2B fd1614792bceace51f8cc4de5ee32beac720d4b85786477acd4e53c1e65f498b36973945c26c609eb85cbd6a2fdb2e9975f2bc08024ee3daff8c301d23369dc9 SHA512 a823126dbbbd6e1e46be2f3ac0ae538475c0c73224d5210c3d92e32de65ea5ac3bb069a1936d7d84a1bece44a3cf4ffc5d6c42c2fbf14b1e3999b060041e8977
+DIST git-manpages-2.32.0.rc2.tar.xz 491940 BLAKE2B 95c60aa7680768d3aa846e98692c3cb1a0657bf7beabc18f9eca4a39383be9276c48ccbe56d68ed41ff20717fcb2e2924f751412204ca62976500add0bcce830 SHA512 0797b7090e8a72ac58d1ad0bdf1d11dd76675e7ec312fc5df91b349c265985da22ff8cd31b601c28903329197fbd55f9959cb3a6d4785e1276d7727780a85268
 EBUILD git-2.26.3.ebuild 19107 BLAKE2B 179378cc1e95801735e26890af170385d10b66987745fa222405e7b16a261b888b13b11314aed0bccbdf1f96aa522fbe941fb41f4c4fd65ca32271810e0cefe3 SHA512 0587749fb008de4ff70a238fdec702e5cd8d50946c01a1cc780445f0dd856c3856ddeb24396e810285695b161a678913739cbd8cdc7bca9bd82daf916f942ad3
 EBUILD git-2.28.1.ebuild 19115 BLAKE2B 961dd5d1a8cc9fcc93bb6edbd8be11135272e569429fff34d468e498888b1d1bc8e4cc609ad03152aa4adf2d674ca87c2dfafcddda5521638a0fb34fb8c17728 SHA512 b0f5d927f70a09ae0607f362014c62f01960cbde0f82850b59c855f5eedaa255c532d7cd009df86b288043f65073a6ddf223355562db69824dd26a3ae0260f99
 EBUILD git-2.29.3.ebuild 18172 BLAKE2B ecffedbbf6d6936c50e11a42d658270ae8830694f3ace431893d33384c5aadb6f13d9b996fb43cb50c20461d3db6b438fb870a02bed78e1be8355590cfe9eaf8 SHA512 0ae5cd383ded761461492acd67acd910cb0b46ee6ce54747b03452e4c4358baa41ba276a0574e8f9bc914a1e5eb252eccd52bae3b44de6b76e3b96b6d6e1003f
 EBUILD git-2.30.2.ebuild 18173 BLAKE2B 4429fabf567077c22a78f25430c44b5a37ae7322445b57cd22f7e95a4153f41d2b879a48b16fcf8b2855ed08d4a60c529f972e31ccb0cd03e1f9dd6b829510d7 SHA512 eaddad6c5a51f1fb8e3df432c63ed27bf418acbbe42d312a9903dd4fccc833ec9150e134cd57a78661a04ebc12a1632953c42e226df3cb8516876b21cdb6cf75
-EBUILD git-2.31.1.ebuild 18063 BLAKE2B 61d5b65fad5a6e19ea95747c16580a2e3737a7e390183f6d4ebdd78b29bbcf6f25c2f435a7cd2ebaab5329b524582e871847c1bc81a4859c749fe39880e4a23a SHA512 c2c44c528ef8c3e2a36c48ec20e8959dc32aa8f8e9b2f69caff002a4e259610db38abdc1967ddbd15174a7e4d190326d1bacc34847bd940b51c198b9f0f5e2c2
-EBUILD git-2.32.0_rc0.ebuild 18064 BLAKE2B c0b71b212216fa28e4a70629162a2a5dcebc144a2dbc85275e3cfd7f6c1bebe51577ef752abb69d72625897c7ce096b44081d4374900ca7e0ac83f74d7cb1a76 SHA512 dfcc3595b4ec0f90b31ac5e804b4f3fa50f485a0012c774f0231c1f71f6aceb78464a3fc5b743b4a325f8290182b156b86278b1626e0aa42100f5985ad357abe
+EBUILD git-2.31.1.ebuild 18055 BLAKE2B ea16b293db77aca43fdd3f63b0a51d4c550d50a161cfc9f996597abf75c7362b84a27fb2ea1a1959505c0c65960a5a0ac88d93b197312b20da6828d9c6da091a SHA512 5f4c6ab18bfedffe5a85323cf04e424c9f7fdfbd8f3d55d7ef784f03e7d5973c602c4779ad59beff4b9f0f9d9a00fd603e0ba4a8f2bc9d7459b231a4d6c00f01
+EBUILD git-2.32.0_rc2.ebuild 18064 BLAKE2B c0b71b212216fa28e4a70629162a2a5dcebc144a2dbc85275e3cfd7f6c1bebe51577ef752abb69d72625897c7ce096b44081d4374900ca7e0ac83f74d7cb1a76 SHA512 dfcc3595b4ec0f90b31ac5e804b4f3fa50f485a0012c774f0231c1f71f6aceb78464a3fc5b743b4a325f8290182b156b86278b1626e0aa42100f5985ad357abe
 EBUILD git-9999-r1.ebuild 18036 BLAKE2B 2f5763790baad0c4c27f05ac837649f9c861ed2ab4c3f84f80cbcd8f7413320aca9f0a1337e4f1f89487400ba2cc22e6cd882fbba3113ca67a53d9d9f1027e60 SHA512 1c040da8a1335a44b807b14f6b89cde15794481d2e7a05decd7693b6d1baa655b3edf15e705f02361feb661bf6a7b3be7ed24e29de814fe957cf4ba6e35fcb59
 EBUILD git-9999-r2.ebuild 18036 BLAKE2B 2f5763790baad0c4c27f05ac837649f9c861ed2ab4c3f84f80cbcd8f7413320aca9f0a1337e4f1f89487400ba2cc22e6cd882fbba3113ca67a53d9d9f1027e60 SHA512 1c040da8a1335a44b807b14f6b89cde15794481d2e7a05decd7693b6d1baa655b3edf15e705f02361feb661bf6a7b3be7ed24e29de814fe957cf4ba6e35fcb59
 EBUILD git-9999-r3.ebuild 18066 BLAKE2B ded96d874acbaf9148591d4e0718d16aad9e6c8a4686483a559498f98d399e9b965e56d87f51a3c4077f3bef8f0c541ef2e259ec8479e126c224794a42f56b2c SHA512 10e5f75804a4f61d2aad099a76f21b14eccd1b71fb060dc7e1bed5dc5ecc0750db4f0dd4d13b7f4cf500fbf22ba71802e838a245302f1d229ad27b68c60708a8
diff --git a/dev-vcs/git/git-2.31.1.ebuild b/dev-vcs/git/git-2.31.1.ebuild
index f5707f92982d..d7a440dddaf6 100644
--- a/dev-vcs/git/git-2.31.1.ebuild
+++ b/dev-vcs/git/git-2.31.1.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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.32.0_rc0.ebuild b/dev-vcs/git/git-2.32.0_rc2.ebuild
index 25d24a32c1b6..25d24a32c1b6 100644
--- a/dev-vcs/git/git-2.32.0_rc0.ebuild
+++ b/dev-vcs/git/git-2.32.0_rc2.ebuild
diff --git a/dev-vcs/hg-evolve/Manifest b/dev-vcs/hg-evolve/Manifest
index 997e83d28931..a34e5882a5b4 100644
--- a/dev-vcs/hg-evolve/Manifest
+++ b/dev-vcs/hg-evolve/Manifest
@@ -1,3 +1,3 @@
-DIST hg-evolve-10.3.0.tar.gz 831866 BLAKE2B 5c56d214be9cbf31adbf41fd35f020e196f009435d1afffe61e24353dd1d5ecbc245a6525e1dbdbe54bc71d59f365d8a8a6aa860797d979f0c65b88f3623d3bb SHA512 212bf88bd5b5841a17c5cfa77a6ccb4a1e314e16d4ed19f54653f56f108c1640179b67331d6fe365b09e38ce51f3b0abfbecaebd1e0a0ed2de34c81d79110f87
-EBUILD hg-evolve-10.3.0.ebuild 782 BLAKE2B 8e1792d9dc8bb45640a380d035d4ecadee72bae319e866fb49ffd97a5829005fcbce3cc3dbed2ed586b9b8d5ff4df2cdf785c9b8a8556a498bdfe1db86288c01 SHA512 0f329a03e2d0e30fb6433ac10698d9cf5fc556783271558c6eb1b1bc0a9b741685c24201ed6f2d5d194a40c0e682aa0f5b61fa546139038353daafff7921e81f
+DIST hg-evolve-10.3.2.tar.gz 849975 BLAKE2B 7a91b532ced91cdce3778d61fae577d2048d539b7943d1721d5aa062499deb4dbe7e58c26ef8b6e0fb07ed7982b375a00be252e4e785d80b478af893373e3518 SHA512 7bb24ae0b202a4009a7383dd4f2bc842ece218dd6d6f8f1ae2a19da37761a931e4ee0a476dbbf1fce1c2e8a2e6d4aae89c128f06d0ad004838423802b26cfb12
+EBUILD hg-evolve-10.3.2.ebuild 783 BLAKE2B 9fc96ee77821458da5d0ae2286f9398279371b820480191d462657897d6cb1760bc1263de438cb5057454ce5e1fb315fee97021a0f31359bca5bc2adb80338de SHA512 5e52e4882e970f21f601c8ba6c06c709a78dd439dfaa38896be909ff64160ad0a9bc768595285c332582d6e6c8641a34d21cddc5d33a99222b89ac3684bc177b
 MISC metadata.xml 287 BLAKE2B 62f44642d7581105c39d8f7ce9a9e7463e14605c8b9229074ed1d9537448d07999bdc8f29ed6d635625d628d54b4656e12ca9c5f0e9c61a9cad999ba3f1cb432 SHA512 51c3ee1aeeaa5bdb8d990cbec310842a8f7901087a99384a87cedcf764cc813cbec83d822d6dfe62803cff9792aef1d718dbb8eb8537eae46c5eb5bdad119fbf
diff --git a/dev-vcs/hg-evolve/hg-evolve-10.3.0.ebuild b/dev-vcs/hg-evolve/hg-evolve-10.3.2.ebuild
index 0aeb1aa086bf..206caa0d765e 100644
--- a/dev-vcs/hg-evolve/hg-evolve-10.3.0.ebuild
+++ b/dev-vcs/hg-evolve/hg-evolve-10.3.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/dev-vcs/hub/Manifest b/dev-vcs/hub/Manifest
index 63743b13602d..ca9e8c424bd7 100644
--- a/dev-vcs/hub/Manifest
+++ b/dev-vcs/hub/Manifest
@@ -1,3 +1,3 @@
 DIST hub-2.14.2.tar.gz 2080107 BLAKE2B b0ff7bcebca7f4b515acf412b756da8512dad7c89f1976cc749c68d70303ff7172b6817e92c839c1864b55ac137e67cf1c99fa07e09b01fd76ad3d40be8d2163 SHA512 4809d12966cc983f42c8aef482e07bc4226e25fc4deba838e418664ce14ac9d2ac42842d0721a46466a80c0e492392542ecfaaccc2cea0efdd60df8b60a3ca02
-EBUILD hub-2.14.2.ebuild 795 BLAKE2B bf936f7a785cd3e32ed17de4515396cda3aaa8243ac76eb92077fdf6ee9184accc91bd222e2c0cc61e999537325f8ffec455f3e4431ca0ede9379e21e235e232 SHA512 a428dddac5ff71302476e6245e90e788fc2b38c5decb1484bc032728bb34e80f7fe9d15492db7aa1ff9dae98a23cd48b632c2041524b6be632d1b605d81dfbfa
-MISC metadata.xml 334 BLAKE2B c10c297b5f493184b2191daf7c8c8df963054d3bd682aec7c9768784171f2eacb267fec32b817ea93a85d57e1bc248f5454ab8984270b94c997287b4ab983cfd SHA512 448ebf7bab89832d682b7e99a2fde5e04f242c7cca13272f5827f680077a310d670ff1f201073d07d779b8fb1905e066cd0de7b4f82879233ea6f366b0992f7a
+EBUILD hub-2.14.2-r1.ebuild 1115 BLAKE2B 2eb9a4982cd866740c6155922144a1480aa1183442a72aabc20fa5e52ea9c750b36b252c8d5b295d9239b6aee8a38eb2e8ba43505758ceeb6e684dfac86654cd SHA512 80c50bac844272df73d5c79b3ffd5b17ce7bdfd91d4cd98fb647c9e3a778d6af395b17114f51a494c13c2ec9062d559e31b1ccae3220476fd9501208453899fe
+MISC metadata.xml 333 BLAKE2B 6b8558935ba9cdc2e58411fe56c98ab9283d96ce2aee0ddf42a810944899784a2d6ca24d7c9411e5f08405fbd10ee13a660bf3bac5fb2550be046a4383dc334a SHA512 3d41f908ebda62b211a6b9097205a25acbcdfc983e260577720c10d9546b5dcb65a1177cd3b05b69707e27f3b896998590e50ab7ae449c0d17dd6cece5522dc0
diff --git a/dev-vcs/hub/hub-2.14.2.ebuild b/dev-vcs/hub/hub-2.14.2-r1.ebuild
index 6f8110005117..783e6080a8f5 100644
--- a/dev-vcs/hub/hub-2.14.2.ebuild
+++ b/dev-vcs/hub/hub-2.14.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,9 +13,15 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
+BDEPEND="sys-apps/groff"
 RDEPEND=">=dev-vcs/git-1.7.3"
 
 src_compile() {
+	# The eclass setting GOFLAGS at all overrides this default
+	# in the upstream Makefile. It'll *FALL BACK* to bundled/vendored
+	# modules but without this, it'll try fetching. On platforms
+	# without network-sandbox (or relying on it), this is not okay.
+	export GOFLAGS="${GOFLAGS} -mod=vendor"
 	emake bin/hub man-pages
 }
 
diff --git a/dev-vcs/hub/metadata.xml b/dev-vcs/hub/metadata.xml
index cfaa84c658f3..1034740608da 100644
--- a/dev-vcs/hub/metadata.xml
+++ b/dev-vcs/hub/metadata.xml
@@ -6,6 +6,6 @@
     <name>William Hubbs</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">defunkt/hub</remote-id>
+    <remote-id type="github">github/hub</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 062db7a9af4d..8374ed030ceb 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -9,13 +9,17 @@ DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bitmaps-2.1.0.crate 16717 BLAKE2B 817045077c198a84d114f68474b14515309bf56abde29398fcb47d7593d41c3fac069825d8a2aa1a598dea5b4865b94a21e83d03dc8d069672e1b835bc1ad551 SHA512 a423ea009bf61629e6dd7cb954f2781dd3c578d2216cd843957e0db05abc8f8c5971d2cca1915929b2b3c7b712450c817bb1de8d08715a1ca2641ace015a1dc7
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
+DIST bytes-cast-0.1.0.crate 9869 BLAKE2B 658d66fc50faf4e3b9c2182c50cb38e14a6b38d42e2be5bdb5052cff98593fabc14d9d296f28f5231f49a197a9744dad67669732f8dd76c16d711c0f44dc4bc2 SHA512 7f23243a3cb3d6451ba4914c186a42896d071a304d95442cd230a5b1e48622809c5a20c33a8f5d4aa99a4f1636e7256648623c6fcbad8fa96a62ec0e0b8854c9
+DIST bytes-cast-derive-0.1.0.crate 6477 BLAKE2B 1f5192d4ba994c483686c8b35dfa9b8d59936be48bd9478404361b0a3a405f9204d80ced4495ca1366c050e43267ff3fefe57428b974a79b3b2a75b30236abef SHA512 360ca8c763cb5486d4cccb19a1a8546858671aac145ff4b21261bc9e075b57f830ea00ca0c48c7de89de9ab757b06320c86e7621620eb83bc1d2e08c25b65065
 DIST cc-1.0.60.crate 53351 BLAKE2B 95fec29226818496e56c132d45eaf728df17f3ab1b939842dc228febe7bdfabc9b0b407fab65a6a7d308a1e57a40702a2810516882f712319de119ca7cad4b52 SHA512 3aaeb5f6b0fed31dd65f8c884252d8a6f8f79cd801edf7626aebf4f2843a414cf45ec72b4d6f88f9e9fdd959e0547b9ee5da817b7c34235196113cdbe915b888
 DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST const_fn-0.4.4.crate 16138 BLAKE2B 80885ad10a5649876d37635dc6eb8b426e68f23d7bfdac234ae32816e7fae6d246ff0657d904a3b18dc5ab93fcaa3d4ff28984a1144fa3557d082c1c4d064fd1 SHA512 d79f07982c8ead364f314672ed471d41c6f31431cf511eff5e4c42ebdde324842110ffb8238394d9e8ba2ac19d884fa5f359ba04cef83acb1ca9431e14acb030
 DIST cpython-0.4.1.crate 103177 BLAKE2B 74e47a6e5422d3b35ad0f35b5dd01717489c3bee8219c77ef83e08ed289d9d5dbdb6021ec5d3ab1c99a0a6c25f94ced1d372e6653160e50798a1f2f9d453bd80 SHA512 1ef01f060428c950b876b3b189d4898e49042269a6ed53a2afb495a127fd7a9b04d5a67edc93328152eadd90a8bf433f8ec700049a755d2b828d35405038bec7
+DIST cpython-0.5.2.crate 118024 BLAKE2B f50bfbc15b280cda22a7c7c47ec5453139fb8591b66c78de7897937296bb3805d7fd356ab09233293cedb5fe131699cf4517fcbf9b1ef61bb7ebb99d1c21e84a SHA512 9b2406afa2e309f9c748e42ac8d7d875b125e5cd40b8dc515c45ec87d1610bce50ab1ba2d95d7bec584de98e171377f08cb8a3ce0a0268383f030ed8631b728e
 DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST crossbeam-0.7.3.crate 9906 BLAKE2B fcdfb2fc07670cc90e1a60f58b798ecf913cc27153123c430e6920cdbce8459837d8a2ac7436f1fa37389b3912fb3166917af812fee474b73923c8af316a5b84 SHA512 9b06c2379364827df715a1cf6a842d6d793f53082e21eb6daeea0ac03dbc2e6a7902d0cbd39dc8d81d82b02641925f4a70b443d65a413f8e497eb3a9be55a8d0
@@ -29,13 +33,14 @@ DIST crossbeam-queue-0.2.3.crate 14753 BLAKE2B 1dc60d5a48672f26f0c3afd0b14efc943
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
 DIST ctor-0.1.16.crate 4770 BLAKE2B d1234c086e370d0f86b3ef7011c111a0e439c94ce0aa25bf16fde3496056d3143e5798b7eee1d47c72d90f564dbba06e49d9e7cd381597276c1789b47fbcd574 SHA512 68b4a39ff49bd1ccbbf467da5f376cffb68ca10290ee9c587b063f7281c84d36a5c93ae242702e2135b53178de984d99d4dc0c246d4fbd566b8e81b573f442b3
+DIST derive_more-0.99.11.crate 53812 BLAKE2B 84b97e9be1ad2ab0bcc7616cf6f75996dd9b67f0f9798fd4b80cc87568ec5dd3f782f2964fb82623dd0f249640c2eae69a3ecdb15719840c75a29b4ffdbfa788 SHA512 1a7957c440ae4ed62368bfce4d100475fcd02c8e2fcdb08143abbebf3746a4eafe29208cd9f2dd8872546cffccb17e29a2c2d2192d433e2829644ea0e9e8d020
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST flate2-1.0.17.crate 74154 BLAKE2B fa4a99769adf7e5e64d54d415b228ac81585b7906ee76c42025d47be664be25e876ba5f3be03b77928112f9790fb20424ecbfd28d8a1cead43b86a680bbbcf96 SHA512 156192c2368aca1f66195044d42bbef21488ddebb4677488a2b04d372ba7622a097917d9ae56bd1a5e02dd8f2f42c84a08af54b7db44278444cc306610d446b4
 DIST flate2-1.0.19.crate 73768 BLAKE2B 1cdce9db71ace32d45b90774cc0804f4f663d1193687e9487ffcb8b8962006c680449dcdabd296e1b1046bb3dc2d910a11106f24debea5c63f757b471fc33fa1 SHA512 6e802f351085ce8804afad32d9502980269e2c03e2315349b9dcdbbb6895f61c89fbde822e31504eb00d94e665e1a8186ea3d128b5b612c61323494a8dd4332e
-DIST format-bytes-0.1.3.crate 3555 BLAKE2B db366d002192b87faf9d7dc9a9036af136521544c90234a88deef02316c7a84198964ed2c26d703df8a4915eabd55289dea2ffb1bdb70f0d289d1d7115ba02fb SHA512 d87d0dc896fc39b176a8f2ddbcb7c251fe8c2765414ba117d4dead6af6f1ba92f2249c6c4376a93e47b00c788f31f78844f0d43184246bf34e767c0dc374e17e
-DIST format-bytes-macros-0.1.2.crate 3261 BLAKE2B 8d76491f596a362e9f4cbc2fca5eb6f28da12f9cd3541b94c87c81cef4dd31c5660d647063015220865cc4dbece7e99b19c368e5f8c8131757a83e4821edfe75 SHA512 787f59331414afbdc392897fcf14bc5a86329b2be9fade084f35d9927f4f63bb5dd45b127c85ce71891c8c265487411f9c6964dadf1ed8e17137ce79f8ec88ee
+DIST format-bytes-0.2.2.crate 6532 BLAKE2B 81d77323851ca2c2d722709846a53d15a4031e60dc3d4fdd086b8e2b6650171e586932880142ddc28597b557ebc266d45c21b2dde18a9930e8a07e2c427d2149 SHA512 81e70a240cea546dbb904d977fb1fa371e88e0fcb76422094cc661d991603a3719d71779488611e7182f404cf2597cb9938c50c5a124edad0554b10698707692
+DIST format-bytes-macros-0.3.0.crate 3434 BLAKE2B 24a11e9ebd57ea6a645e13d5190b269fd4a1a5174e77aed519097e677520488331bf84904370452870f96aabd77be901b57eb6a096ce56ae259bfc816be34f59 SHA512 e775b156ed51b81850d949952f8ee02fb7cfd9c1f98ce6d92462b589646cf60482ff8bc442006d27c031729cd7b3082238da5829bada5e1aabdd163bedf45962
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST gcc-0.3.55.crate 37262 BLAKE2B 3341dc7136c14fa822a67fdeb72f7ea50b1264823e695e189d69604b8b8cce898ee2d40d8a536d0f520f5e190576afde16afa5d9cbe0a2c4b8600cf50bbd1447 SHA512 b045b60cf65c1deae44e4f40d0f511dab05c82be5065390dfbdaf5b51ee2d0653c3a6d8d1e7606e4bb6d234adfd22a8c68bde724406f3edb4bb6366617d46a86
 DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
@@ -43,6 +48,7 @@ DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a
 DIST hermit-abi-0.1.16.crate 9889 BLAKE2B 1d1681d484019adb9c27336ef87fe9680c18a57de71ca9bb3022878411ce8f933bcb0f5d03f190425039a53a427ecbe75f8eea654661340ebbc165fbb61322b8 SHA512 b9aa336e195fdbb3c1a1fc7167f3efd284c2c3ab0613ec47f07b5cf5865b56cac3aa0da4936f6a336f036993344126b3d872875c362c516e0ca538d8e36195f9
 DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
 DIST hex-0.4.2.crate 13385 BLAKE2B fb185e0888736515b8c1c4c00f831f1a4a7b2a04bc0262c80bb2425563b3ca8059fadeff8660ad738bcbb522d432dde98ed6b14aa1fb8c03cdcfec6ae282a55b SHA512 b37504fa6e41caa77c924b24893a7b505330aa8c39501b3ac283fbdffa9af2b89ccb9ae004ff415af1c813fb3da222dba62f17bb3b6210a259661e2312d099a5
+DIST home-0.5.3.crate 7890 BLAKE2B ed1cfadae63d1fb0a66f38aa5440dd09a98343e3afadcf1495bf69f3ce813774c9a49776c6b3641001b6007c01e24ffa6d2600c1bab05c4ea3353c74ddae2fd6 SHA512 cb3b7b24db30a8b29f36f90a0d345b2e187f9e76f22203e142a77c8308dcc62e97b5714fb0ed890210b31375cf30d3362b8d740fe189079a6d3a095be50dcb0b
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST im-rc-15.0.0.crate 182171 BLAKE2B 94605a89b9f375cc2e0a60f107db600ca57b7f342d1d686ed73a24d9e4851d790b71293b0b0440262ee45ec94defa8780c7611969fbbe36532b328964ef12c22 SHA512 4be0ad2ef6272d39b3305dcf50c97836839c4917163c030ff2a950fb16deb4eed0d3026f09743479b344f9f688419449e8732923ee1146aa655ff5aae6279003
 DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
@@ -60,15 +66,18 @@ DIST memoffset-0.5.6.crate 7382 BLAKE2B 42ebb93b567b339822201e31830971c32452b3d6
 DIST memoffset-0.6.1.crate 7706 BLAKE2B 351e6ff24a61b1016e7749571e1e66dae370c58746baf00b4688bb1e2d8c88621aa6f135468593bcd8ba30acf2c097d06a0dd7243eb06b9825e3fc1ffd31ea52 SHA512 74d081af00b7e442198b786d79e4ef35c243d2e78347ab9cb50e127569aed3fd77b47b95df6f361a716abce27c8cc6cb1dfa12c92b0b2208b21f9eb9527b61be
 DIST mercurial-5.5.2.tar.gz 7761053 BLAKE2B af823bc80844a7a6f9b173caf73aa298c141638e4f3b6ee4d37c9472d77f1cd79c1e5f6875de699904037468815ae42fe32b5537e50eb94373258683f45e919a SHA512 e154592deed6168a32e7fd075fa034908ca72826ae49a92c84a6ad82b820753906578f064ac623018442d83d125a551eecc057179e66ac7217398a192e903629
 DIST mercurial-5.6.1.tar.gz 7836342 BLAKE2B 8880a501168eec9ccdbc33cd7c51791acecec5e8e462f6998ffff59fc03bd4f0ac18d72c4c962cd84dc336657371384ab0ccb4cdd44690d8023e51997050943c SHA512 d84d7d9ae4c738e3cb62b26c4dc7f3943abc1b1a55ccc46a4e3435896f715efb30d4d6ff4df6d02a8bef7bd6ead2d21a44342fb8a2101e8fe04211d21efc13b1
-DIST mercurial-5.7.tar.gz 7899435 BLAKE2B 0b2403848247ab9d0e6756b73a22e5a48eaaf35a7a20506fdb2db82c331345777df10a8f862d4856db37640d9d35ba495a965e706a6e1389cc82fd127cbba6df SHA512 ecf1fb38e372acb5e29998cbe1105ecfb846a2bb43254419c89395c52fd28c37abe8eb850584f32f6ef53b539e6a7ef5a4dae10b816b747d20c6b0b4933f4b62
+DIST mercurial-5.8.tar.gz 7985326 BLAKE2B 3b64343b692c389368b9c61baf367fe739bb79a7b555308fcd4f09069472b393343f57608954017038c849d6812cd6fe5e1e20bbc6a95974d827d7e402c60bd7 SHA512 79eec3a468a1826d4910d140797f26f281ff5e5fb9a0e09656d458577e05cf11ac6032c0d282aeec2996edbd7af954652c97097ea4485b211dad7424c4d20979
 DIST micro-timer-0.3.1.crate 3357 BLAKE2B 13c518d2b3de6fa683078b9906b719498da2e2be5a23e7a2511f3d1d69730769031ed6b488927bec845c0405782f55cfe5af8610d56d92e716ff5d9056650f5a SHA512 197beadbdf35dd0892f6e0c1a09b6b57472166ecaec3e10be12c436e1381540100092c9e717684db44b53375390cf2c245fdc6fdb376117fdf5b4405ade73cf7
 DIST micro-timer-macros-0.3.1.crate 2928 BLAKE2B 148639d1f22965c7487fefd19b1413797aad0f9e0c4eb8ee7be181e7b6bd39e03a6d3d68131b05e09f87a3ef653d6eda643952025983b49736a9c6ddb778aafa SHA512 9c9ffc8432c9377d2de3fce931f398d7f77012f496dd6c011718abd46535205766d9f5a7c97ff14ecd87bb172039d8e92a8c45cfd9c14d220a368448da1b7917
 DIST miniz_oxide-0.4.2.crate 46206 BLAKE2B 0da9fd14549b88dafd5d53e997034cdad99a424bb19bb78061527f4dbf27d1dc258d618955f894564a1676adc75a49d5bc9d562f26ace4e61634693e7db6b8ff SHA512 e33c81926e7a78ad68014f3e89471755c20bb594b11c94f214094bdb65000b5ec71369a537f12e7956f55cbcae1d7752bf954aac527e41b9878503dd6ad3e95c
 DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
+DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036
+DIST paste-0.1.18.crate 12259 BLAKE2B ed72b93a27166b0989743c2528d4a41f4b87ffdd0c588557d11a5f37f85d5b8f03ced86150af6209f9fa8d0f6efee705769b26a2f4dc3363f35cc3ac12c0e6ad SHA512 a4d9c75f6f358d6c86eb0a66cdf22eedec180db37358ca2870a992e215d5b389b7991837d8f2769742ac1b093674cb4352ef9d6754a249253472fbcb3a81c001
+DIST paste-impl-0.1.18.crate 9451 BLAKE2B e465c4c7eef44d02eb1b61b5290090513607b452f4adc11487947b7047ddc44905d7a02df827feb2142f0e74583afdd9648c1c66086f10e1bd861b663200bf8c SHA512 c635efee46cb251b76ee9427432f81a0d944cdf1d0a95693d824c6085e7dea7e1e3f48c692ae27946f69e4e78d8080220058acf98e5c8a78482007349f8a7a4b
 DIST pkg-config-0.3.18.crate 14674 BLAKE2B a03292e97a195f8eef0cb74f2f640193b2045846b7d79a898927d6b6849b65a7e6bbd45fcd4103d3152e64c6f9c0316f2abf1c86a8a24c0467564894e1d45b54 SHA512 b4cae39a11bb80f6df96262ed77844270c0a02793ace5dd255820e9ce52a5f3a43b36bd6296ab9428253e96f9b991bb6a7090d7b749db1ecb0b03aa721813d8a
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
@@ -78,7 +87,9 @@ DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffc
 DIST proc-macro2-1.0.21.crate 36909 BLAKE2B b4759b2fbbb242aeebc7b8155c6d9f316c96672b37ce3540ae6acc579e6bafa01fe4cca37639125cc38e539000f1f6921d2c104bba80f0c2581a6ddf16d74223 SHA512 bc8ca2254c43c5d0eb799cab503fa89ff49d8e98aba5c9c1f960efd5286dd217351eac6774bdd96fbc392290c8de62ecaf4a6ed1e300715ff014ffd9326f9ae4
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
 DIST python27-sys-0.4.1.crate 36851 BLAKE2B c1623280859bc34147cce7681924dbb46f3db3c9ee372220810591206cacd360fcd081813981cb67659b070c2db5dafc95a512817a28e1422fd099abd92f005e SHA512 3a752a940c62a70819e297f8c8dec4d4a644c22ceae8a2f0834fcc2e928e4c02992ebeb689375924a27a8017fc33f4dc4d9f3dab5fda501e4df46cbedd8f9be6
+DIST python27-sys-0.5.2.crate 37459 BLAKE2B a122bf29fbb16b46876c885811219e08376f666e385055ddc4976a0ba9a7d90954143a55a68033113d1e52375bdba68519fbade2cc8bba56174ada9e89448790 SHA512 670087e6edf55084fbe005f33baddd7936900f18753181288d9fb06deec56bc09cb78cd2ec2c94529be5ae603b95de364ea7f92e5d4cd2aad727672fe96754ec
 DIST python3-sys-0.4.1.crate 41591 BLAKE2B c2cdf1b6398b4bb5125368e4f576c44751c80b262d749050c803d85781fc3551d7170b818f33138d4a8ba7cf60515da8b0537bf1664cb51abbca2524d0ccb3f0 SHA512 c7082d6ffb60f3876f14d3e7ab4982ec2bdf2d6989adba4393e11200cb47a6da1b9ff68c4b5d36fff1e1dabdb1fbd0bd432b1976be2b03b86a05368c9617f8d0
+DIST python3-sys-0.5.2.crate 44605 BLAKE2B 72e68e32334e709bb291ef609b1da2f123cb0f080f6bc517bedc9eb46ae68fe37b6fe4655aca9b478a65726f03097ef6400c351b7a301885e019fa45328161d2 SHA512 abcc7624b5c8b018f553c5971414a33974e759056b50a20883c98168e790b26b94287f111fa1e00c6c78841cc5cc1a7462262462e6a9e72e5991140b729d4046
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
 DIST rand-0.3.23.crate 11318 BLAKE2B 5ad9b187fcdfc515c606a73bd1e9aa3215e367659c35a013c9d4d0f80f9832331dfb971ca370a627c0a2afe2b8860514740e00b1d7572e221a557b5570cff6ff SHA512 a4f46fb7dfe39677dfc112eeb56fb3c28cec4cdaaf95f336f2a494f0b2b30fdf22ceb9ea956f90e13c7ffe711a68aef9fc1a80d9a911d93221ae263c243fb2c3
@@ -123,6 +134,7 @@ DIST twox-hash-1.6.0.crate 21402 BLAKE2B 97a3e7ea21a891ca514438c249dd792c7bba299
 DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST users-0.11.0.crate 21980 BLAKE2B c106e9ed67b9ad766bb7318506261579768185aea3d956d9e8b2adb52349525fe69703ee3bb2e4fb02aa223bfa6fc92a14d8128412623f70654254f842d7322c SHA512 e28028f895780bd59a11069b81b87470a287a447e42566cfb8de0e2d4ba8c90a3ce92901e253dcd2628383c8ed06c10714bc0181a57bf257f7edb3510936e596
 DIST vcpkg-0.2.10.crate 11504 BLAKE2B ab7e64091fd2c12292282a0311716468bcf584dd3764cd0c4803d40702104a57ace0a138b06cb1429a166a61e069788b2c45c3286d3f4c5bbf6ac30e816add14 SHA512 4c790344fd3510eaaca5e1539cd676c60124b2ef157e85f89322f294ab6831c2acf6efed1529de4bb23d9abfd0b5f962eaf8d3221c827b0718834d152b28c141
 DIST vcpkg-0.2.11.crate 12600 BLAKE2B 1c44c8df531a75f686c0497e70a72aa0c1b554c02ed256e6b08407b17066ed949f03bda42645d56e1227b50dc4c0e3865f10856605c2eadab3b74f55f005789b SHA512 d67bc244c81827165bf976808f79fd02f9149a19006898e60ff8ef11df2d72657c56bc9fc14c8f91b091075ceb23c3f96a3df81be345bb01881679eb47a0e6e9
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
@@ -138,6 +150,6 @@ DIST zstd-safe-2.0.5+zstd.1.4.5.crate 9002 BLAKE2B bf92884b629d5685dd563e481e63c
 DIST zstd-sys-1.4.17+zstd.1.4.5.crate 2046794 BLAKE2B 40584094797d4cc479cff9d1b89abd1f7e800f774725dc03c531b67078027d5b82464984d4e2a76cabcd9d336234d245f93692d0111e2469ef21ca1ea6260d77 SHA512 89439b20e4e0bce6455d982fb7467c45436ee68572395db662d056eb2e09e95ad600947bf11c27ba60b161c2e2511e04cac8dcfacc5f85fcf9222d4a206bdc30
 EBUILD mercurial-5.5.2.ebuild 4061 BLAKE2B da38ff4ffd116c2fb030dec3f3bb85e249e07390ae0d3350b375cd6375041e46092228e1f785656fb9d21ae4a0a44630332e6352d18190a71be75299c6d9cf85 SHA512 1de4c1fa8f3fe0ceb177458740290ed1c66f9cec65557d6daf9b7f798453f1e17bf554abc1dc6931ce2f48129299cd74ae4de90d687b7b9875857a135bb56229
 EBUILD mercurial-5.6.1-r1.ebuild 6439 BLAKE2B 119cf765f54bae3a1da008a0d60579c59615a18ea57e0b36ff629d4c6893e3e44817556862c461accd54d2decfaefa7c1028be5f146e37ab6b1e05ac17741282 SHA512 ce86f0374814309e33720b8642dcb1afacfb4182a1e8d64476f68c31061b87948b47780a52e9db5993a081f26b95ec223c097e4825be7957fcc7cce662c9d2bb
-EBUILD mercurial-5.7.ebuild 6679 BLAKE2B f7bb9156a1960873df7d566ae61343e9ed8385fd3282da4a5c2f1ddb714b6ff0c9ea7ff9f97e122d1312c0c1abeca320488e909e922d480556d8156dabfa2e10 SHA512 8be573d4b8b30949c14bfe32ea0be21b50be44bfd549d1f80a0d60d577ab9872074337f9b8a287bb56dccf2557b73c930d8a91c1e380eb8dbe1d11d102e04ad2
-EBUILD mercurial-9999.ebuild 4520 BLAKE2B 3a322c1fb2319d662f2010a5c00a86955905b95bd8fa6cf9e0f5357e888dbebc5051482fe8a9c28b908bbcd1e198098dafa2e01b539e0a203edfc017303e9762 SHA512 97187ec4fa1b66c8f20514ff492d29e4a9dc15998f82b2d36bc3906769583646db091e93af38b1871e8534024a06b13fc434c20016ad569c58e4c6a4dce3f671
+EBUILD mercurial-5.8.ebuild 6731 BLAKE2B 0a1bb8b78ec431b22cd80c86135de8283f7d6916772286092b909ad811eba8f5cb95cc770b67c29fe8a052be1645eab6f80bb96c665c30a02bde52c2a4adc364 SHA512 f2aa230069cb30c1bb27523220df074c3449050d44001a4c9fd98fdc2b2f9be86a8e4bdec90d4bd9bfdc791e1738c7399db61bd5e0c2b7dc314730ce44996717
+EBUILD mercurial-9999.ebuild 4433 BLAKE2B 0fdd9ea821d61deb3e7edc2c14f5406f9d407220c20b40199d4fc82f6a02bbefda3b90427d1e1bd4e2a7143a73ce95162b63f5b4bb0a9730f34316f4688b27e7 SHA512 690cca0e6d2da5e453c5d4507e0861eaff27b2abb995f332dd3f5dff8e11d7be07c6e1ec2fdfef0425de6259a4262f5e650486498a73c1d619a9ff573ee7dfe2
 MISC metadata.xml 531 BLAKE2B a9536112ae921c160f7ac8535c50cb25743fa72bfa92529874eb5888c7d968d68080e4516c531143870cefdc7d78efa7e816b042c540bd0c7785a34dfcc133f9 SHA512 ee4dae2ce506e6c5968f1d917e43839366eefec2ba7ad3119b8a61ee527449fbeb87b51bea2b826ef184bfa322825b4e8bf7693d26d063e117773ac9d15fbc08
diff --git a/dev-vcs/mercurial/mercurial-5.7.ebuild b/dev-vcs/mercurial/mercurial-5.8.ebuild
index 9905370dff5a..9405990cae35 100644
--- a/dev-vcs/mercurial/mercurial-5.7.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.8.ebuild
@@ -17,12 +17,15 @@ autocfg-1.0.1
 bitflags-1.2.1
 bitmaps-2.1.0
 byteorder-1.3.4
+bytes-cast-0.1.0
+bytes-cast-derive-0.1.0
 cc-1.0.66
 cfg-if-0.1.10
 cfg-if-1.0.0
+chrono-0.4.19
 clap-2.33.3
 const_fn-0.4.4
-cpython-0.4.1
+cpython-0.5.2
 crc32fast-1.2.1
 crossbeam-channel-0.4.4
 crossbeam-channel-0.5.0
@@ -31,18 +34,19 @@ crossbeam-epoch-0.9.1
 crossbeam-utils-0.7.2
 crossbeam-utils-0.8.1
 ctor-0.1.16
+derive_more-0.99.11
 difference-2.0.0
 either-1.6.1
 env_logger-0.7.1
 flate2-1.0.19
-format-bytes-0.1.3
-format-bytes-macros-0.1.2
+format-bytes-0.2.2
+format-bytes-macros-0.3.0
 fuchsia-cprng-0.1.1
 gcc-0.3.55
 getrandom-0.1.15
 glob-0.3.0
 hermit-abi-0.1.17
-hex-0.4.2
+home-0.5.3
 humantime-1.3.0
 im-rc-15.0.0
 itertools-0.9.0
@@ -58,16 +62,19 @@ memoffset-0.6.1
 micro-timer-0.3.1
 micro-timer-macros-0.3.1
 miniz_oxide-0.4.3
+num-integer-0.1.44
 num-traits-0.2.14
 num_cpus-1.13.0
 output_vt100-0.1.2
+paste-0.1.18
+paste-impl-0.1.18
 pkg-config-0.3.19
 ppv-lite86-0.2.10
 pretty_assertions-0.6.1
 proc-macro-hack-0.5.19
 proc-macro2-1.0.24
-python27-sys-0.4.1
-python3-sys-0.4.1
+python27-sys-0.5.2
+python3-sys-0.5.2
 quick-error-1.2.3
 quote-1.0.7
 rand-0.3.23
@@ -105,6 +112,7 @@ twox-hash-1.6.0
 typenum-1.12.0
 unicode-width-0.1.8
 unicode-xid-0.2.1
+users-0.11.0
 vcpkg-0.2.11
 vec_map-0.8.2
 version_check-0.9.2
@@ -130,15 +138,14 @@ LICENSE="GPL-2+
 	rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT PSF-2 Unlicense )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+chg emacs gpg test tk rust zsh-completion"
+IUSE="+chg emacs gpg test tk rust"
 
 BDEPEND="rust? ( ${RUST_DEPEND} )"
 RDEPEND="
 	app-misc/ca-certificates
 	dev-python/zstandard[${PYTHON_USEDEP}]
 	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	zsh-completion? ( app-shells/zsh )"
+	tk? ( dev-lang/tk )"
 
 DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 	test? (
@@ -217,10 +224,8 @@ 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
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh_completion _hg
 
 	dobin hgeditor
 	if use tk; then
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index bc9d4124ebec..516f17871e10 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -17,7 +17,7 @@ EHG_REPO_URI="https://www.mercurial-scm.org/repo/hg"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
-IUSE="+chg emacs gpg test tk rust zsh-completion"
+IUSE="+chg emacs gpg test tk rust"
 
 BDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
@@ -28,8 +28,7 @@ RDEPEND="
 	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}] )"
@@ -106,10 +105,8 @@ 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
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh_completion _hg
 
 	dobin hgeditor
 	if use tk; then
diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest
index 18483fecfa3f..17e119013a84 100644
--- a/dev-vcs/pre-commit/Manifest
+++ b/dev-vcs/pre-commit/Manifest
@@ -1,3 +1,5 @@
 DIST pre-commit-2.12.1.tar.gz 246313 BLAKE2B 45ee7c8217f88eeaa2e9eb11efd79291d6577134799b328f252bd4d4283c11754b36ffeedf045a5101c6edc8cdf330d566e404ae34f1a831a830e8e0346337e9 SHA512 6dbd804e1001276e6e8cea7c31b321a05798b38c59f37d5900317c3a9ceccf5103afcbdfd29f9438be3595a18ae15eb09dd222c91c439da47d7728a0e0a55c70
-EBUILD pre-commit-2.12.1.ebuild 1712 BLAKE2B 33a7360f824846898a5d4ee580b99ac1e274e6fe5cca49c94b99178313db0efbbce4b15250d8a83962e391d1ca8231f71b6c1373b0eb5702d17dd3105d59037a SHA512 e62620084bb56f228c0b5f50419324a504988d32def557e6c62a29da9c609430c02193cdd777c920738880ee2805c15d1497441c6d200d92f674d4b3bc89147a
+DIST pre-commit-2.13.0.tar.gz 252631 BLAKE2B 7e6b3af46dfaf9928d2cb2aa6cad05423bf6e417e2324af71b241e1aaa2eec6fcb271869f98c040cd4fb8c608a1fabd244c8286864f469a06c44684cd2bf33eb SHA512 5dfc297b3f900afef8f1c355b38ce086af7c836d1e577af8ec95ffb30e82df8b866131da4ff12933339bda63e4a90833c3852265d4f2d4a59bf92bce2b972a5e
+EBUILD pre-commit-2.12.1.ebuild 1711 BLAKE2B f21a7772ffedf6cfffcebae0c6e57e90c4e94e7818d210b6d961f653f2e262e75e957b4bf5ebc9e826a2ed7876dcefdf6096b0eec84008d316ad655295d6860b SHA512 f3149dde9bb2242abe4ffa32be2e3cac7041c6d36644568e98fec98c0de189ece1b4002fe14d127f34d3cbedb8b960c07d582a543986ca68394aee897f4047a4
+EBUILD pre-commit-2.13.0.ebuild 2066 BLAKE2B ae99b4039b7b06cbd36879a928d7ca55a911accdae6099d7c2f8a4fb9ea4d86fbd2ecfed615012817ec50d27f857b769d0963ffa065cf3f0238705c8a8f52847 SHA512 6876cd8807b5fc714d601065f27d8736717ca79a6d172b9464d73f11dbbfadf9b0a5321bbcfe7dfbe3caf12b83bc587d823a344c92229c22b0975887643d87f7
 MISC metadata.xml 379 BLAKE2B 6224574b28f758241c6ad965ad59a423db76bd21c64c3577691104a8f45a4ee9b570f9cf1557f2ce17f00bf496b9eeb83741679dc0d6e1bb23c421f90fe9070f SHA512 f14032e386c2bb591390034086c7d4a2e8ce9aacc536574c517dff4691aa8c39bc966307ee91a5f76708f14601312fd16528a676e1918d82b2761185bc27df9f
diff --git a/dev-vcs/pre-commit/pre-commit-2.12.1.ebuild b/dev-vcs/pre-commit/pre-commit-2.12.1.ebuild
index 5a4c4ea945f6..1dd37b2abb3b 100644
--- a/dev-vcs/pre-commit/pre-commit-2.12.1.ebuild
+++ b/dev-vcs/pre-commit/pre-commit-2.12.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # TODO: figure out why these tests - all of which invoke git - fail:
 #  - tests/main_test.py::test_all_cmds[autoupdate,hook-impl,install,install-hooks,migrate-config,run,uninstall]
diff --git a/dev-vcs/pre-commit/pre-commit-2.13.0.ebuild b/dev-vcs/pre-commit/pre-commit-2.13.0.ebuild
new file mode 100644
index 000000000000..d2e6b60c37b1
--- /dev/null
+++ b/dev-vcs/pre-commit/pre-commit-2.13.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A framework for managing and maintaining multi-language Git pre-commit hooks"
+HOMEPAGE="https://pre-commit.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# TODO: figure out why these tests - all of which invoke git - fail:
+#  - tests/main_test.py::test_all_cmds[autoupdate,hook-impl,install,install-hooks,migrate-config,run,uninstall],
+#    tests/main_test.py::test_try_repo:
+#     Calling "git rev-parse" fails with "fatal: not a git repository (or any of the parent directories): .git".
+#     NOT a sandbox issue it seems, as disabling it does not help.
+#  - tests/commands/install_uninstall_test.py::test_environment_not_sourced:
+#      Unexpected error "/usr/bin/env: 'python3.8': No such file or directory" - but only if pre-commit
+#      has previously been installed.
+#  - tests/commands/install_uninstall_test.py::test_installed_from_venv:
+#     the function invoking "git commit" returns 1 instead of 0, no details.
+RESTRICT="test"
+
+RDEPEND="dev-vcs/git
+	$(python_gen_cond_dep '
+		dev-python/cfgv[${PYTHON_USEDEP}]
+		dev-python/identify[${PYTHON_USEDEP}]
+		dev-python/nodeenv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20.0.8[${PYTHON_USEDEP}]
+	')"
+BDEPEND="test? (
+	$(python_gen_cond_dep '
+		dev-python/pytest-env[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+	')
+)"
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	default
+
+	# These tests require a boatload of dependencies (e.g. Conda, Go, R and more) in order to run
+	# and while some of them do include "skip if not found" logic, most of them do not.
+	rm -rf tests/languages tests/repository_test.py
+}
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 5435ee041ccd..15309f119176 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -4,5 +4,5 @@ AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43
 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
 DIST subversion-1.14.1.tar.bz2 8504612 BLAKE2B 27c6c5a9e656680b10fbc4b5c6d5fed36759d42d908e2bd5e56e19a7477c779c72314eb4a6766a13f1af047a759f9f9334b963c1d41cd48573b9800d5b671cc1 SHA512 0a70c7152b77cdbcb810a029263e4b3240b6ef41d1c19714e793594088d3cca758d40dfbc05622a806b06463becb73207df249393924ce591026b749b875fcdd
-EBUILD subversion-1.14.1.ebuild 12653 BLAKE2B d563a7af9d7028311a5216dcc7ab14ebcf4f3d1af1686a360edeafd32c4823480dc1ebfe6c04716c0559020ca6fe4279b25d84d3c72d18f2427d85b6e08da26c SHA512 f39e03d06f1d049b37f841f6c048cc21bae250dff6d78e5aa2cbc91c73641a8b5e8efc8b3f10e6702ac98d46f46177bca0f91a05fd1c4f7c1e3e71f814aac310
+EBUILD subversion-1.14.1.ebuild 12655 BLAKE2B e7301b1a075d60f250e5dc52c00364bb1d051f92b52e11877c6730c5d2cff290648c8562f1cf5717edcbd16a67c0de5980c12ab0be84948a8f893468d4ad8e76 SHA512 7823ef9ac34fd4dbe7f8ef31c41cd1a4fbafc9e1abb60d3f9ac3b2f8a68ff02d0d3f0c72f69f620d5e79f443b3cb51b5cd682e0d29277809839a7d93760fb8c8
 MISC metadata.xml 560 BLAKE2B b6b78084ae0792c458969a47b6d1a13cf330c2b410582f39c207b585a47692a7ae86b1b8c86c77da4f289331dbec2ad114b86cc9edebb3423c7ce144458e71e7 SHA512 d10e6922066c5579a7cebb53e328ba02fd92e7919cafe96e89dfa49c6d5d40e4e9247f95c987bab16e90803b54dbb9c4229afb219428f254e7850802d0d4fce1
diff --git a/dev-vcs/subversion/subversion-1.14.1.ebuild b/dev-vcs/subversion/subversion-1.14.1.ebuild
index 8b2a3c3cda41..164331d9933e 100644
--- a/dev-vcs/subversion/subversion-1.14.1.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 USE_RUBY="ruby26 ruby25 ruby24"
 DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 9c1c35f3e4de..bb6eabd4d62e 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,4 +1,4 @@
-DIST tortoisehg-5.7.tar.gz 8910721 BLAKE2B ebca9526fc39c94c26f28db6dd70527c528308d9003fca0d9cfb61f984a9a5d80f910d68d0d1449221bbb4e040d2919ed34fec1e0aee4d9f5ed55cbcdb8ba714 SHA512 d143c9e83d3b0771ffd4a3bd9cd50e8bc169e5d29e33a0681c3234898a7566427f070ff3ad8668709b5e4d63be92fd700211dee03e98ff16c7c23fc0870c9e4c
-EBUILD tortoisehg-5.7.ebuild 1682 BLAKE2B 3bdc3dd99e369ef0260bfd0342373ebd56bf5f1ad2d51e5dd10d50e797886cd3b07010106229ef68cef92b490efc6543be14078855530754ce434246493ca942 SHA512 d64d18cc3f2b827bc997886a7114b9cb2aad77acda7a7dbcc19a65fcfd359924e78b33650f43effbe9e4a429a506715aa414f703f8f48f60b42fa354b3f91447
-EBUILD tortoisehg-9999.ebuild 1682 BLAKE2B 3bdc3dd99e369ef0260bfd0342373ebd56bf5f1ad2d51e5dd10d50e797886cd3b07010106229ef68cef92b490efc6543be14078855530754ce434246493ca942 SHA512 d64d18cc3f2b827bc997886a7114b9cb2aad77acda7a7dbcc19a65fcfd359924e78b33650f43effbe9e4a429a506715aa414f703f8f48f60b42fa354b3f91447
+DIST tortoisehg-5.8.tar.gz 8636455 BLAKE2B 1f4171ca4eb465aabacaf53b97785c5f05fc501a11329af008695f706d8d2cb9c5eee5e64bb5a60fdf7234f33ed6a937dfacce49cb36ac9e9b8505be271b4f35 SHA512 b9fe80a98cfafe0dbc90be5fe6f83b466fe596b4ec135d0eacc5618e39c0249a3a352bed640a7cecb99d53eaf60908d60d7748009492cbd8202fc191ef428278
+EBUILD tortoisehg-5.8.ebuild 2130 BLAKE2B d839112c2667f8d9c2a1f77e6a39f03bab7e00ffccd7155d0f237aaa02cdad43ee0f765e5abdde2aa0b3f502683a0073594e74242c77872e6183ad17b84d617e SHA512 f2a901430c69089581175679d3af8ddc636d29dc71fbb5c594a6878b6433240d4c067c3e13375f6f9894daaf44cd8b8942c785e7e98efaccc0e77d7246b225bb
+EBUILD tortoisehg-9999.ebuild 2130 BLAKE2B d839112c2667f8d9c2a1f77e6a39f03bab7e00ffccd7155d0f237aaa02cdad43ee0f765e5abdde2aa0b3f502683a0073594e74242c77872e6183ad17b84d617e SHA512 f2a901430c69089581175679d3af8ddc636d29dc71fbb5c594a6878b6433240d4c067c3e13375f6f9894daaf44cd8b8942c785e7e98efaccc0e77d7246b225bb
 MISC metadata.xml 804 BLAKE2B 23d41703f9bdd446ac385fae5919c21684a73c4bfd468f7a0a18c9dc728964e71ee9724dfa4eacb544da54e79c2b9a5f4009ba8318d1e97f2314826cbe4429a9 SHA512 14fcda893984839424b6bcc6d6b0b966edb862fdd3b483f909c552da2775dba413b2155915480526780afec05a5ad7e3652391ccdbe5e76f7daa265fdfd6ef75
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.7.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.8.ebuild
index 439a13c2c812..f54b981fe3da 100644
--- a/dev-vcs/tortoisehg/tortoisehg-5.7.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-5.8.ebuild
@@ -6,18 +6,19 @@ PYTHON_COMPAT=( python3_{7..9} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit desktop distutils-r1 xdg-utils
+inherit desktop distutils-r1 optfeature xdg-utils
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-5.6[${PYTHON_USEDEP}]
-		<dev-vcs/mercurial-5.8[${PYTHON_USEDEP}]"
+	SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-5.7[${PYTHON_USEDEP}]
+		<dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]"
+	S="${WORKDIR}/thg-${PV}"
 else
 	inherit mercurial
-	EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg"
+	EHG_REPO_URI="https://foss.heptapod.net/mercurial/${PN}/thg"
 	EHG_REVISION="stable"
-	HG_DEPEND=">=dev-vcs/mercurial-5.6[${PYTHON_USEDEP}]"
+	HG_DEPEND=">=dev-vcs/mercurial-5.7[${PYTHON_USEDEP}]"
 fi
 
 DESCRIPTION="Set of graphical tools for Mercurial"
@@ -25,6 +26,8 @@ HOMEPAGE="https://tortoisehg.bitbucket.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	${HG_DEPEND}
@@ -33,16 +36,29 @@ RDEPEND="
 	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
 	>=dev-python/qscintilla-python-2.9.4[qt5(+),${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/mock
+		dev-python/pytest
+	)
+"
 
 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"
+
+	sed -i -e 's:share/doc/tortoisehg:share/doc/'"${PF}"':' setup.py || die
 	distutils-r1_python_prepare_all
 }
 
+python_test() {
+	${EPYTHON} tests/run-tests.py -m 'not largefiles' --doctest-modules tests || die
+	${EPYTHON} tests/run-tests.py -m largefiles tests || die
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
@@ -55,6 +71,8 @@ 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."
+
+	optfeature "the core git extension support" dev-python/pygit2
 }
 
 pkg_postrm() {
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 439a13c2c812..f54b981fe3da 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -6,18 +6,19 @@ PYTHON_COMPAT=( python3_{7..9} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit desktop distutils-r1 xdg-utils
+inherit desktop distutils-r1 optfeature xdg-utils
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-5.6[${PYTHON_USEDEP}]
-		<dev-vcs/mercurial-5.8[${PYTHON_USEDEP}]"
+	SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-5.7[${PYTHON_USEDEP}]
+		<dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]"
+	S="${WORKDIR}/thg-${PV}"
 else
 	inherit mercurial
-	EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg"
+	EHG_REPO_URI="https://foss.heptapod.net/mercurial/${PN}/thg"
 	EHG_REVISION="stable"
-	HG_DEPEND=">=dev-vcs/mercurial-5.6[${PYTHON_USEDEP}]"
+	HG_DEPEND=">=dev-vcs/mercurial-5.7[${PYTHON_USEDEP}]"
 fi
 
 DESCRIPTION="Set of graphical tools for Mercurial"
@@ -25,6 +26,8 @@ HOMEPAGE="https://tortoisehg.bitbucket.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	${HG_DEPEND}
@@ -33,16 +36,29 @@ RDEPEND="
 	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
 	>=dev-python/qscintilla-python-2.9.4[qt5(+),${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/mock
+		dev-python/pytest
+	)
+"
 
 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"
+
+	sed -i -e 's:share/doc/tortoisehg:share/doc/'"${PF}"':' setup.py || die
 	distutils-r1_python_prepare_all
 }
 
+python_test() {
+	${EPYTHON} tests/run-tests.py -m 'not largefiles' --doctest-modules tests || die
+	${EPYTHON} tests/run-tests.py -m largefiles tests || die
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
@@ -55,6 +71,8 @@ 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."
+
+	optfeature "the core git extension support" dev-python/pygit2
 }
 
 pkg_postrm() {