gentoo resync : 22.05.2021

29 files changed, 105 insertions, 532 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 1da00b93f669..9a87632567a8 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/bfg/Manifest b/dev-vcs/bfg/Manifest
index 5c2d5b7169df..b87f4cf078c7 100644
--- a/dev-vcs/bfg/Manifest
+++ b/dev-vcs/bfg/Manifest
@@ -1,3 +1,3 @@
 DIST bfg-1.13.0.jar 13465496 BLAKE2B 1f9eaa44f032c182a8d50dfebaee668a2d7de2361ea48336932e5168a6a3b6970bbca742943917d4ecc392586f03d19add1d1cd9772e023389b9711874871c53 SHA512 e037be1dd52bd122a57fed18ebc4923238666e9985ad2d40174344a1ca45a05abd9a59f1c2ea743be49d094fd76a5794a0e3160a9d3be04a7986c3a444df4fa8
-EBUILD bfg-1.13.0.ebuild 648 BLAKE2B 96cfc698f88b14874af51e314bd2de26aa9c2f447243b3b3f886e4da8a4fa2f2e18874036c6a48ab36681b5ad6c0ca4119a41adc56360b90210cae3420f4b364 SHA512 abe0bb1a8025a342333a2bd0c777b88aa79d3e773bec91c3ea4bef8c385784355a9ac2d60978d5ebee6e8965ee210e3980c4f22dd16d5b9e8385898965010d0f
+EBUILD bfg-1.13.0.ebuild 557 BLAKE2B 3507f33ec14065419a0cad1bb026cd454cb62b7f6f7ead3343f90216b59578f927fae8102a3db5493a790c37e2a51587eca5035bf977f9bbed3326f72e9a33c6 SHA512 5f6a7384970ce083fe5f8712c31503108216a615385ccbe96608d7a2c5e77bc9ef6cb2da33fd5a4f71d9f979ba704909a58e171c981f1ddc6fea04367ff0bace
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-vcs/bfg/bfg-1.13.0.ebuild b/dev-vcs/bfg/bfg-1.13.0.ebuild
index 93e964d47199..90b1cc8cd116 100644
--- a/dev-vcs/bfg/bfg-1.13.0.ebuild
+++ b/dev-vcs/bfg/bfg-1.13.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit java-pkg-2
 
-DESCRIPTION="a faster alternative to git-filter-branch for removing bad data from git repos"
+DESCRIPTION="A faster alternative to git-filter-branch for removing bad data from git repos"
 HOMEPAGE="https://rtyley.github.io/bfg-repo-cleaner/"
 SRC_URI="https://repo1.maven.org/maven2/com/madgag/${PN}/${PV}/${P}.jar"
 
@@ -13,19 +13,11 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.7"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
 
 S=${WORKDIR}
 
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-}
-
-src_unpack() { :; }
-src_compile() { :; }
-
 src_install() {
 	java-pkg_newjar "${DISTDIR}"/${P}.jar
 	java-pkg_dolauncher ${PN}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 5b2d9c8bf6e0..f67be858781a 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -16,28 +16,28 @@ DIST git-2.26.3.tar.xz 6009184 BLAKE2B 12c0b8fb460024e7767919cac3e36ecb215e25566
 DIST git-2.28.1.tar.xz 6119248 BLAKE2B 69999a39d1c5c1dc69b8c7721a594104b51d2af691e1f2ef6a2f2bee99bd5b319c856cfccc4166cfd3426cf8eb58b3b4aea5ed2ae15061fba0f0f3e44c7d24e4 SHA512 6acd7f42eeaf4fcb085fe2ab3d65f53a264fd38ef84321b77eb7c21bbb146e42ec9f27cc36cd9f3569f6d1758742119efd0af9bf6414fe7c577c434ed154fb8f
 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.0.tar.xz 6414252 BLAKE2B c9186c0e212767956cbabc685989408860600a19ff56637453f9cd45e143b6fb5b7104b188726506481782fcdfe3e7b28d5c9cf374172b81e5bfedf249292793 SHA512 b8f7608d4349c983c426494227b0ec9d032e67c775382a32675418f629f365817ac99a61c24e3a380bc5eb65351058dbf55d526890055acf58ad4f028022f513
 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-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.0.tar.xz 1357332 BLAKE2B 06fe5fdde4193ffccf243eae8c112b6bf74b3a554283e0f688a47275a47de4c1c4dce9fe6dfa550885786ab8df46fa83fadd22746bc64e430af42785eda30583 SHA512 31a7d715454060bbc260a6001d971df0eea16c819de96a9316bb465a67661ebe805a8ea2f5f223c070b6aa1affd1e72970b223474e6221bf87ac3b233d229fdd
 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-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.0.tar.xz 487764 BLAKE2B e5acc25fe28c666afd017d29a9cce7b0e37d2b1dee93f911683c5e54972fe4def59964409bd232666963b4509d4ca30fb9b95757e2fdfe308559e455bf8160d3 SHA512 9bf426d5aadd4ac011f9b3694547da795bf5e8bc77a79ef69de56d6f39c3a0fdc039db25d4671810a5320a6c057f2364ec096413eebbbeabc26a7d3b65c9c787
 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
 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.0-r1.ebuild 18063 BLAKE2B 61d5b65fad5a6e19ea95747c16580a2e3737a7e390183f6d4ebdd78b29bbcf6f25c2f435a7cd2ebaab5329b524582e871847c1bc81a4859c749fe39880e4a23a SHA512 c2c44c528ef8c3e2a36c48ec20e8959dc32aa8f8e9b2f69caff002a4e259610db38abdc1967ddbd15174a7e4d190326d1bacc34847bd940b51c198b9f0f5e2c2
 EBUILD git-2.31.1.ebuild 18063 BLAKE2B 61d5b65fad5a6e19ea95747c16580a2e3737a7e390183f6d4ebdd78b29bbcf6f25c2f435a7cd2ebaab5329b524582e871847c1bc81a4859c749fe39880e4a23a SHA512 c2c44c528ef8c3e2a36c48ec20e8959dc32aa8f8e9b2f69caff002a4e259610db38abdc1967ddbd15174a7e4d190326d1bacc34847bd940b51c198b9f0f5e2c2
-EBUILD git-9999-r1.ebuild 18035 BLAKE2B 4013564c523735c53a04fe8120d3112866dd44357e421a46c32e3dc650edc9f4fc3e45fa1455060c4fea07821f47862bfe2d9d4c8b4994f0fbd6a18339fd0681 SHA512 1b8398bb0bfca49b158a37fd892881dde76e2fe54bde6e5f8ad6f43e98559d209df8a2928e7706bb715d49e2fe52508304f3faa2d92a7a8a178b9c2b1cb60de9
-EBUILD git-9999-r2.ebuild 18035 BLAKE2B 4013564c523735c53a04fe8120d3112866dd44357e421a46c32e3dc650edc9f4fc3e45fa1455060c4fea07821f47862bfe2d9d4c8b4994f0fbd6a18339fd0681 SHA512 1b8398bb0bfca49b158a37fd892881dde76e2fe54bde6e5f8ad6f43e98559d209df8a2928e7706bb715d49e2fe52508304f3faa2d92a7a8a178b9c2b1cb60de9
-EBUILD git-9999-r3.ebuild 18065 BLAKE2B 0efd1d331958dd9bd6ce99326bef8a78cf683c8940ac3031363d40229dc64dcc8a1bb4cae57d38eeec6d7cdcca1e0a88a4481086234f1c88c753ea1c7d34a54e SHA512 d78442540f26356aac8349b2f64e81c7b3f6020a92d2c910e77bc010a7c9ebf7b4034f003de04cf53683709a58101d2bc2ce8ac03513e26a1001f844fc70096a
-EBUILD git-9999.ebuild 18035 BLAKE2B fe4e62d86dcbab3091dae4f8c8a6994ff904b3ec5eb369a1ec8d01c9adb940809686656c525b65e9b26eaf03758209b7aee86954135a508659811a58cb3b4967 SHA512 c28c2ac98fc4b519c686abc672ec5e28b71d6c1288382abf993b00e00885cb2a5349ee82cc5372dfafe96c87e77a7018bb829258dcc3ba6bb85c5138c2ee5f11
+EBUILD git-2.32.0_rc0.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
+EBUILD git-9999.ebuild 18036 BLAKE2B eb6e8778a69d293f093f4aa875936a7659dbd51cf885942ab448730d2b90cdd2164eb8e5404e12cf1d1ed786459fb93306013360a11f6784edbb4da835f07788 SHA512 6f6dd5190c7c772b6607a0e4c865158a717d0d4ce5079b395a5d3f6ab69d86273620d5dfbbf44d51f1c7ec4f4643f564d3da97abcd5b47628253c33571e2707d
 MISC metadata.xml 2277 BLAKE2B 49819fd1ea6ca2a1cf2043fde6d4cd9197db5ef44543fae528475524a35ee52d31a04f20c638b892a6d8c4dd757d302bfd43efb41242e98351d01db7654c2a05 SHA512 65b8ef639ddbec202cc7bcbed31c109d8f6fc64e52d47522eb38955401bea86a846390cfddbebd946f5f5941be83c401a1028d6721e12c6317f92a63568b56cb
diff --git a/dev-vcs/git/git-2.31.0-r1.ebuild b/dev-vcs/git/git-2.32.0_rc0.ebuild
index f5707f92982d..25d24a32c1b6 100644
--- a/dev-vcs/git/git-2.31.0-r1.ebuild
+++ b/dev-vcs/git/git-2.32.0_rc0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 15046ddabac7..033fc0bd04aa 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 15046ddabac7..033fc0bd04aa 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index c9b5027cb49b..dd8ccb8f0601 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index fd0d97f5e8fd..c65c13233ee7 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest
index d5e21efb608b..64783220b128 100644
--- a/dev-vcs/kdesvn/Manifest
+++ b/dev-vcs/kdesvn/Manifest
@@ -1,3 +1,3 @@
 DIST kdesvn-2.1.0.tar.xz 2096108 BLAKE2B b2807e6222d5743858a9592fe568c851e466f1349bb97869c3acab892b6ef9ce730d6ec1875b720b2ebb5e2099f6d4287bf76995d7b95800f0814499736b97c7 SHA512 ec1ad8422fd698a9c07d43c3051aabff615ea774c0e988ae07843f1935a2a5c3390cf175db5c10acfe3d94abcd7a2b9b41680047598c4e7b53162cdb4e74768d
-EBUILD kdesvn-2.1.0.ebuild 1655 BLAKE2B 3233029235f3d0828594ab4d55b7d07531ef7f4191934f48d60b3d188f2f0993f45caad49fdcbf150235ff471c99aa5f1af5c93c1ee5598bda37b8510795b7d1 SHA512 be6c1e3f0298d737727a7ba8d93b9658407d999d1be7ca811ee3eec67f0dd83a9c27bf80a2892f93d7dec798237b7be2ca494de8af30cfc70122a4a6dd64182b
+EBUILD kdesvn-2.1.0.ebuild 1653 BLAKE2B 40faa0ab4652d7f773abc4ae802f07068fabe5d29275bab5cf4fd146047638e7430798694ee6f2f692a47bded7077359de499dac9a3866288c32aabb0a710381 SHA512 6bf1ede2ec2757171b0dad6a83cdee27cdf37ed95ec9987694ba822c291a5fea36ae312eaf5a04eea61bf0f42a24e48be89b78b35173f62f65e06ecbd5e9b663
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild
index 911581739576..e246998c71fc 100644
--- a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild
+++ b/dev-vcs/kdesvn/kdesvn-2.1.0.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
@@ -9,7 +9,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="A frontend to the subversion vcs"
-HOMEPAGE="https://apps.kde.org/en/kdesvn"
+HOMEPAGE="https://apps.kde.org/kdesvn/"
 
 if [[ ${PV} != 9999* ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 1a8b9f2a1af9..062db7a9af4d 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -138,6 +138,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 6678 BLAKE2B 8980dae7348ce42648626676a988b5ff2cbd5c3faf318a61323cbb3f0944a4a2c9be7c666da539f608767c51498b4deddf2d10f05fd4855d37e6df171faa5e34 SHA512 9c9e49af5e4854a5df0f80b7996473b04ff822364f7e2a52a34fe31d1ec9bf6d846ee8f0716fa8725522625bb262ff6b1756a6063477ac904a23e85f090d963c
-EBUILD mercurial-9999.ebuild 4519 BLAKE2B 75c7c4e747181b2b0a34bf0c3ed60f737f44960e3584229b7ede7ba5ae7ab27bd6662dd3036c4c6b2482464a89d7c4899fb98b9a45bf5838df75e57be53f3e8e SHA512 69dabc649c0aad8996f7a0b1b0567b20b77976c375589bf021978eb8ffecc9534681e43e0543039a3323a811ccc2a2caf72404f1c513cd6991c30a969472c121
+EBUILD mercurial-5.7.ebuild 6679 BLAKE2B f7bb9156a1960873df7d566ae61343e9ed8385fd3282da4a5c2f1ddb714b6ff0c9ea7ff9f97e122d1312c0c1abeca320488e909e922d480556d8156dabfa2e10 SHA512 8be573d4b8b30949c14bfe32ea0be21b50be44bfd549d1f80a0d60d577ab9872074337f9b8a287bb56dccf2557b73c930d8a91c1e380eb8dbe1d11d102e04ad2
+EBUILD mercurial-9999.ebuild 4520 BLAKE2B 3a322c1fb2319d662f2010a5c00a86955905b95bd8fa6cf9e0f5357e888dbebc5051482fe8a9c28b908bbcd1e198098dafa2e01b539e0a203edfc017303e9762 SHA512 97187ec4fa1b66c8f20514ff492d29e4a9dc15998f82b2d36bc3906769583646db091e93af38b1871e8534024a06b13fc434c20016ad569c58e4c6a4dce3f671
 MISC metadata.xml 531 BLAKE2B a9536112ae921c160f7ac8535c50cb25743fa72bfa92529874eb5888c7d968d68080e4516c531143870cefdc7d78efa7e816b042c540bd0c7785a34dfcc133f9 SHA512 ee4dae2ce506e6c5968f1d917e43839366eefec2ba7ad3119b8a61ee527449fbeb87b51bea2b826ef184bfa322825b4e8bf7693d26d063e117773ac9d15fbc08
diff --git a/dev-vcs/mercurial/mercurial-5.7.ebuild b/dev-vcs/mercurial/mercurial-5.7.ebuild
index c9d1c758c601..9905370dff5a 100644
--- a/dev-vcs/mercurial/mercurial-5.7.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 CARGO_OPTIONAL=1
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index a18543f19b66..bc9d4124ebec 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 CARGO_OPTIONAL=1
diff --git a/dev-vcs/mr/Manifest b/dev-vcs/mr/Manifest
index a00a15c54a92..9207d3e38da9 100644
--- a/dev-vcs/mr/Manifest
+++ b/dev-vcs/mr/Manifest
@@ -3,6 +3,6 @@ DIST mr-1.20171231.tar.xz 52876 BLAKE2B a0c79ce738240bec1864f68d3a1a0006130abbe0
 DIST mr-1.20180726.tar.xz 60168 BLAKE2B 5ab704eded07f23981b46f2ea9d1b143d8ac158e2ee217eeb3572dbe5ac587c8f81f9168ba4ba4f2f4efcfd5965b93ec8be0a7b1dc7a7c4b4948581ededc2e60 SHA512 709bfbb8dc41ff1b69fd1e14387b3744948d4ba41c81a7803fe53720e40d686ed36a3d3a4d8614f24ebd566451785c8c1fb558ac4724b1cb4b44c1fedada55b1
 EBUILD mr-1.20170129.ebuild 582 BLAKE2B faf107fc26bb09f6e37b56041d35ba31241f0cc6e4ef35c97195d8a26dcaf5d7f3b6a7c25817aa8bca8fa920ed97a17c9685274f1707326204904001c610fc49 SHA512 4a1ceca4e4ed0c33e8b440101d827f0f4ff0edaaf2b51307b09032df3d4184711f1a4480200d9a99d41255086cc864082aae838de231eff2647dfd7e7559264e
 EBUILD mr-1.20171231.ebuild 582 BLAKE2B 77a0a4386ad093b1e22b3a35b0f5136a276891ef3ec287c106d6cb77f18f8b8097884a2e5f849bfd30987be5cb2d0261660a85db9b3763cf87ffadcfcecfbc18 SHA512 4588e47ad06b0a696b0bdfbac012879f46d0293068e64b52993aa929e15d868b2b0c3cf2037d2227109567eedb673df55e0bec29d97363577081bfeee8d6c883
-EBUILD mr-1.20180726.ebuild 581 BLAKE2B 59142c99d9ea3cb8d63d8c1852accee6414597ed0d8cff273a7a462dfa1c990d531814ac60bb457feb08b5d175543616858b9220ec669c8bae16883456055f4a SHA512 b5c6dba7ff2da748fedb78271c4ee9ca0e9450d409b18a91f05676135ebb621e9f20ba5ef6f8304c649e2dda0e13461c4e1a4d10253fcb469fa72728beb3c026
+EBUILD mr-1.20180726.ebuild 579 BLAKE2B 265afe8821bbc51d5f7c98851962ae5f3210eb10dececca0ef37720a24a766d63a4515c0fdd9404309b9b2fe432d00e476f9104f44bb74f2e4f3fd5c1ace3b4c SHA512 ea3f34fd5027b90001e35377108631bf5ee091ab0a5fd5d0d1e56919e1e33644e127480e875bada2aaa78cab39b820cf32da1e3ac7fafca5cbbfae0aadf126d8
 EBUILD mr-1.99999999.ebuild 583 BLAKE2B 635eb59e84c51b375ebb585d5803ef4489ee0fdb3abdc7b6c74d90c8cf6a22518c5e136c7a12af21a8a3e5c7395a7bff4933a431327c496d7e8aba62756edd80 SHA512 d823aaf42d687cbfe30f6e8f671d6f3f831c5678dba172de9687211ba88cd75ab41cc40c966fd3655667ce876a97148c16ceb08010766c5607c9995a45a53888
 MISC metadata.xml 1277 BLAKE2B db16bc955489887b1d8ce168c08171e061dd19ec8b32c4b00195c80d294b494d0a02c5b3862edfcc30a9dd08303ec35d94c366aa895f2b83ae5269d7cb83556f SHA512 43cc57009889ef7f81756c38284dbd2b49105d60979977f239c1ca3ba10d1b57769fd88bc839ba209e4a3835e9bf7293fd4b8a863170a908bd674c27d7e90b09
diff --git a/dev-vcs/mr/mr-1.20180726.ebuild b/dev-vcs/mr/mr-1.20180726.ebuild
index fcba5489be18..091071d6d1a9 100644
--- a/dev-vcs/mr/mr-1.20180726.ebuild
+++ b/dev-vcs/mr/mr-1.20180726.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 5be53d440aea..e404f87cc01a 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,9 +1,8 @@
-DIST repo-2.11 39791 BLAKE2B 535de238d934eb2717af7bddd960c158501a56dd400ae02f3665e30c34bd68a1973de4c84e2ea76f48aa027249dfd4270153f1a7d4c4a2d5d883b580f02664e9 SHA512 1889ee9c782a6dc90b782c8ca9c5411b97c4495e0d27add62b9661a5961a782096037e081e984c965e44d33459e8fe4428528b5ebfff9fe356ce401cb610480a
 DIST repo-2.12 43035 BLAKE2B 3a3b1997a09f08093aa2d5cf6c7a3747d6a9a6c29e6c199574757d4d87fdd57b7cc8b18bb1ddfa7c47392f73a22211f996f6ba8175448162e305106c9ac6cafe SHA512 409525040ec8fe6c6a6d923c4e23ab93f5ccc62d01d310ad6b56d55f45d88c2bf469e9b46943e799b8d5238cbc0a9610d0f64f35cf0f3a68b79cbd8c92f044a3
 DIST repo-2.14 44203 BLAKE2B 72094daad380b3a03c9dca488e0bfc2a64bcaed5b025490c07fdc627eaae825bd71d0a8aafca5307dd4a0fecf59d530e7a692b030699a2cdc34cbec569076383 SHA512 37bc4e5b63e2cb1567633708f9680817c346b8105ca495538036aad87fe278f3ab5143f0f57fd40d4051de8016cc785648e9f0b65ebf2430677f037030f71343
+DIST repo-2.15 44704 BLAKE2B 6d90cecb4d748f7fb3febec95e16ed1638112a945aa36f7d7cc12232cdf4bcd66d286aa1054fd23de5ae7e896ac52c05465778aaec759e5d0251227deb220d18 SHA512 e6aad90f6058f4e5750ce44f8951ac4df39dd39c1615d7f68670a0b8ac5007f52e3bb6219d6ca0842908ef6c87843c6fd655b3b2a47fcf410e2a74d47a334d34
 DIST repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64 4280 BLAKE2B 6c369d36176d5bd4d3f4ed4df39bbd6542022dd186375bd05a978889c574819e3328d19c7dac2982233614786078f73bfd1f0c80aa7c0c6c79bdfab776ed6e39 SHA512 f484bee79c3724a6daf8a69b3df80feef3c6aaad3bfb49443caabc52735dd7f3b0fcb3ad4b7480bc020c9b4cac2f3b044693ef761df6fc9d34e854289baf1f3d
-EBUILD repo-2.11.ebuild 855 BLAKE2B 90ed321fac6817e45621968f6468786c86e3c113d2f3b5fcbf0b8c4088f95e8aa9e278953fcd10b3c81cddf006c4cabd8edb82cf4e231d074382cb81f163836b SHA512 0a35308ab33a968f1127455ee1b924176448fb5b02e293fd4e1ae352191a72d4b160395edf49a5ec2d4f9c59866ed13bd59c93a33d797397fcf972de4029f5ab
 EBUILD repo-2.12-r1.ebuild 1253 BLAKE2B f9a3b7eb2a335376a68519eb2d7cad7ea7765c28132b23b31ba6fde4c2a1cf81304f2d1d84d4293346f8a99e9c02934824d9db40d62f57ca4537ebfeb9a21bd4 SHA512 7706d0558c7c5d2c5975dbde52cce0710deea1b3204ff499e83f20e49bf66275481f122f7a76919abd58b23a7d565a0be89b0cedc72cd60e8301207e2063e3e2
-EBUILD repo-2.12.ebuild 882 BLAKE2B a2a00314a8c618249302208fe2f6e052ce77436b497753d3f7f752f45a41ee1d89399e0392b8da344941c11e0c3bf1ab5ba98657c011456c989f2e16188e1cd0 SHA512 f498665d9813bd127149d53f82cb0df9d1d7c07dd098442ecdf237492d50f0115a90794e90cfa11f7138a633978772438ca56970626483b25964bdbb931c1562
-EBUILD repo-2.14.ebuild 1259 BLAKE2B 72d5575bb10ced240034b4cc2aa4928e519ffa1bbe5dcc381a8443f98a84896656020df70d783820ef8eac5c86d6b35f30354e7f9673b1ba7e3e4d525ec2a366 SHA512 85fbf59f7e4cea4011aaf4eb65449e6b6ffea04f5d8370f126db8f4ec99ed1b6dfe485772a0efc5f3db8d7b935bff05c505c95aab73ef68ca6f19aec6a89178e
+EBUILD repo-2.14.ebuild 1253 BLAKE2B f9a3b7eb2a335376a68519eb2d7cad7ea7765c28132b23b31ba6fde4c2a1cf81304f2d1d84d4293346f8a99e9c02934824d9db40d62f57ca4537ebfeb9a21bd4 SHA512 7706d0558c7c5d2c5975dbde52cce0710deea1b3204ff499e83f20e49bf66275481f122f7a76919abd58b23a7d565a0be89b0cedc72cd60e8301207e2063e3e2
+EBUILD repo-2.15.ebuild 1259 BLAKE2B 72d5575bb10ced240034b4cc2aa4928e519ffa1bbe5dcc381a8443f98a84896656020df70d783820ef8eac5c86d6b35f30354e7f9673b1ba7e3e4d525ec2a366 SHA512 85fbf59f7e4cea4011aaf4eb65449e6b6ffea04f5d8370f126db8f4ec99ed1b6dfe485772a0efc5f3db8d7b935bff05c505c95aab73ef68ca6f19aec6a89178e
 MISC metadata.xml 214 BLAKE2B c0c4c0ad9c74c68b5d7e4e539dc441e82a025754b84fa14f01d0f6772b5acacc836523305857e1a8ef54d472e77a339d2361ec4bc70651cbf13e7be34b051d81 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd
diff --git a/dev-vcs/repo/repo-2.11.ebuild b/dev-vcs/repo/repo-2.11.ebuild
deleted file mode 100644
index 742d33af95de..000000000000
--- a/dev-vcs/repo/repo-2.11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: The ${PV} tracks the *repo launcher version*, not the last signed release
-# of the repo project.  The launcher only gets a new update when changes are
-# made in it.
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-r1
-
-DESCRIPTION="Google tool for managing git, particularly multiple repos"
-HOMEPAGE="https://gerrit.googlesource.com/git-repo"
-SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!app-admin/radmind
-	!dev-util/repo"
-
-S=${WORKDIR}
-
-src_install() {
-	python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
-}
diff --git a/dev-vcs/repo/repo-2.14.ebuild b/dev-vcs/repo/repo-2.14.ebuild
index a1697a75edb5..583e55b6f0eb 100644
--- a/dev-vcs/repo/repo-2.14.ebuild
+++ b/dev-vcs/repo/repo-2.14.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-vcs/repo/repo-2.12.ebuild b/dev-vcs/repo/repo-2.15.ebuild
index 0df8d726dda8..a1697a75edb5 100644
--- a/dev-vcs/repo/repo-2.12.ebuild
+++ b/dev-vcs/repo/repo-2.15.ebuild
@@ -9,11 +9,16 @@ EAPI="7"
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit python-r1
+inherit bash-completion-r1 python-r1
+
+# This file rarely changes, so track it independently.
+COMP_VER="511a0e54f5801a3f36c00fac478a596d83867d10"
+COMP_NAME="${PN}-${COMP_VER}-bash-completion.sh.base64"
 
 DESCRIPTION="Google tool for managing git, particularly multiple repos"
 HOMEPAGE="https://gerrit.googlesource.com/git-repo"
-SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
+SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}
+	https://gerrit.googlesource.com/git-repo/+/${COMP_VER}/completion.bash?format=TEXT -> ${COMP_NAME}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -27,8 +32,11 @@ RDEPEND="${PYTHON_DEPS}
 
 S=${WORKDIR}
 
-src_unpack() { :; }
+src_unpack() {
+	base64 -d <"${DISTDIR}/${COMP_NAME}" >completion.bash || die
+}
 
 src_install() {
 	python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
+	newbashcomp completion.bash ${PN}
 }
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index ec398ea24753..da823c1f6562 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,5 +1,5 @@
-DIST stgit-0.23.tar.gz 303836 BLAKE2B 018e0caf74a3c449a71362e3694b2ddf030f5ee23e3212a98b378b7118bae9fd15d0e4ab2a2a746a12b34e46aa2edb86657a4a7125f3c5ca8aa0142fe3d73534 SHA512 b3c9b5c0833cb7e5137faf0df48af6a11b9508b994cdf55b587567d1c146fd4ae29e7beb6d1a34b3f87e5b3854af035dd7e5ca35338c20740e91da7b47c4568d
 DIST stgit-1.0.tar.gz 302201 BLAKE2B 2be1eb648edbefed6270e8f52039afd5d6d4140e8e16656a9f28f6b168eb5ce02c814a3e2b91bc628a80de1e15f0491b82af18fc2cad4e556bcd23ef247fe082 SHA512 e33db953d810f024ee2159ea5bb1b1367a5c673d78d789e8b20ad1d773dccaaf0fe4ccb713b8de082d4a79a3f51d421a2d3d88be24f2e0e770e070e640744894
-EBUILD stgit-0.23.ebuild 1853 BLAKE2B 96f55b091752c9e13a6f04f22c44eb5e8f53b9a0b1635203e983d453c246415ae3f143f8d252a3f0c1907e5d3c541c54880e4d2ab063ebb47c5c9fa7f2eda262 SHA512 473504f44afea4198161f91246d53bb214d2e29c20e83ad2822c2a91836527043d17f3dd88db982d2517abdebf3aa7d37427e444b4cbb6d72fa7c0adf95a9cfc
-EBUILD stgit-1.0.ebuild 1853 BLAKE2B 96f55b091752c9e13a6f04f22c44eb5e8f53b9a0b1635203e983d453c246415ae3f143f8d252a3f0c1907e5d3c541c54880e4d2ab063ebb47c5c9fa7f2eda262 SHA512 473504f44afea4198161f91246d53bb214d2e29c20e83ad2822c2a91836527043d17f3dd88db982d2517abdebf3aa7d37427e444b4cbb6d72fa7c0adf95a9cfc
-MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8
+DIST stgit-1.1.tar.gz 313862 BLAKE2B 2d15ba7c2f55ff1211f0d9a3002878102f5023e897d0830daa688a2af8c6a386ec0cf076c728b6f45650ee3382379a32fb4efb25d0da3b28302f158dfca6ef62 SHA512 917c645f219b2725d1e88186674a6184c96f1457d5c7722b4da17931d963f0fe0c675cdaaca435ba7405ba498d6db9a01c9f554d1aa3093cc3205d224d9d9759
+EBUILD stgit-1.0.ebuild 1833 BLAKE2B c48cc767a018f9cddd4f22352ae99119b6ad1700ba35e659e3ebf36cc274c80e01f349333d8293c706c84399211c57cbc3b6c4c258530204f677f6326858fbf4 SHA512 d03f5a3d4294363daf91779b86ece5e6d49d122ae0283b25bce55f156929e7a12f29d8f6e76accd946592e5c66d01513e096d6422b4022995f830290c5e974a8
+EBUILD stgit-1.1.ebuild 1839 BLAKE2B 8b1b383b61ac342878b352070e9fa76df4084a134b838d3c26b3b6a5cc6801e8d655fb8fd54c0145c0b15f6d0b50f7bc41c95ede6b294b9c1b0180f1e472d404 SHA512 f0cdf95683f346c12e6a2b4eeb515a7bd7000638d6724606149b36a1e7a01344a4d56fd4f1aa27803c0d46a17c5c3ef7158a566b39a588c5179192a25ec8cad6
+MISC metadata.xml 346 BLAKE2B 7407539392698e06f225fa923759d1511ca2ce2ef3d99abe4253bfcf1776d28623ba24edf140a71bdf6637925bcdd8cc69e0e8e6aeee6a67ff6850b1de623d65 SHA512 22f829c87ae9f67118209cbd3499aea4e830f7737825f26d686bbcf32f29a7de553a8c0da73d09617ceac3fd197f96df4f4dc44b7cafffde933dfb92757aea6a
diff --git a/dev-vcs/stgit/metadata.xml b/dev-vcs/stgit/metadata.xml
index 4f503c94254e..43dd4526edf3 100644
--- a/dev-vcs/stgit/metadata.xml
+++ b/dev-vcs/stgit/metadata.xml
@@ -5,4 +5,8 @@
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">stacked-git/stgit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/stgit/stgit-1.0.ebuild b/dev-vcs/stgit/stgit-1.0.ebuild
index 8eb84b347baa..0daa07cbdef7 100644
--- a/dev-vcs/stgit/stgit-1.0.ebuild
+++ b/dev-vcs/stgit/stgit-1.0.ebuild
@@ -59,8 +59,7 @@ src_compile() {
 
 	# bug 526468
 	if use doc; then
-		emake DESTDIR="${D}" \
-			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
+		emake htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
 			mandir="${EPREFIX}/usr/share/man/" \
 			doc
 	fi
diff --git a/dev-vcs/stgit/stgit-0.23.ebuild b/dev-vcs/stgit/stgit-1.1.ebuild
index 8eb84b347baa..adc3ed22386c 100644
--- a/dev-vcs/stgit/stgit-0.23.ebuild
+++ b/dev-vcs/stgit/stgit-1.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=">=dev-vcs/git-1.6.3.3"
@@ -59,8 +59,7 @@ src_compile() {
 
 	# bug 526468
 	if use doc; then
-		emake DESTDIR="${D}" \
-			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
+		emake htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
 			mandir="${EPREFIX}/usr/share/man/" \
 			doc
 	fi
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index f172b3b1e047..5435ee041ccd 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -3,8 +3,6 @@ AUX svnserve.confd 322 BLAKE2B 53eb3105691af05e4dde3451569f46621ed78a1ea7e7650b0
 AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43ab3f2f6eb6d1946dd8efb86e532df3576487ad9f49acdb3b9d95b804019d296fae0f757541957a95 SHA512 3efca4e5065cbe37f5137f3f67a0a654195e50ce0b00468f5edb1e5d476daa82422b1e833281d8edba111360b20d001a5991731e9f32bf3c88ffba75042e2b10
 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.0.tar.bz2 8497531 BLAKE2B 261f1401a96b181ccbdea9ab6e1dde301aa2c67296a0dc458a1d7e544530411b656d0d5335f985c9222c2d44fc8f962b1a960b81e4ff4883d373cb4405af2461 SHA512 af6b706fdc91f7ab292fce9d9de582da306fd11e92767dc852687e71a6a8b65bb867fa70d5afd7f76a46005acb1b3c2d3193e690def48cd26875b3a7851cd13b
 DIST subversion-1.14.1.tar.bz2 8504612 BLAKE2B 27c6c5a9e656680b10fbc4b5c6d5fed36759d42d908e2bd5e56e19a7477c779c72314eb4a6766a13f1af047a759f9f9334b963c1d41cd48573b9800d5b671cc1 SHA512 0a70c7152b77cdbcb810a029263e4b3240b6ef41d1c19714e793594088d3cca758d40dfbc05622a806b06463becb73207df249393924ce591026b749b875fcdd
-EBUILD subversion-1.14.0-r1.ebuild 12644 BLAKE2B 4c06f988ecfff3e0bece2dc00859e2da41215901e75c94fab3f6124c806894433e7edfcfe7e904dcdf95fc0dea42a983b84727e9fb5807f19a14da7b707d5388 SHA512 40cce7df31f6a1ce2b207fc9de1f27cd102d17db0aebc6a4328e998cd9668fc215a034905cf0946a135c523654e740f44166a739d50cad27d0d8465fd7cc2321
-EBUILD subversion-1.14.1.ebuild 12645 BLAKE2B 71815edfa58188fb74cc108aa59a7b8abfe85f0a34154d13ae6e4a327e56c0eea366ef7ca5ca4995f695be16a28c71114326ccdcb156ea5fb5676cbbec1dac32 SHA512 8019f3fc38c89bbdf4b7e033ee5e95f2d350f13be5ecc1f1930c92f55494b17a87c04793ff0465f648fad66ff522c3529780daaf27b11d8bce325b326e95479e
+EBUILD subversion-1.14.1.ebuild 12653 BLAKE2B d563a7af9d7028311a5216dcc7ab14ebcf4f3d1af1686a360edeafd32c4823480dc1ebfe6c04716c0559020ca6fe4279b25d84d3c72d18f2427d85b6e08da26c SHA512 f39e03d06f1d049b37f841f6c048cc21bae250dff6d78e5aa2cbc91c73641a8b5e8efc8b3f10e6702ac98d46f46177bca0f91a05fd1c4f7c1e3e71f814aac310
 MISC metadata.xml 560 BLAKE2B b6b78084ae0792c458969a47b6d1a13cf330c2b410582f39c207b585a47692a7ae86b1b8c86c77da4f289331dbec2ad114b86cc9edebb3423c7ce144458e71e7 SHA512 d10e6922066c5579a7cebb53e328ba02fd92e7919cafe96e89dfa49c6d5d40e4e9247f95c987bab16e90803b54dbb9c4229afb219428f254e7850802d0d4fce1
diff --git a/dev-vcs/subversion/subversion-1.14.0-r1.ebuild b/dev-vcs/subversion/subversion-1.14.0-r1.ebuild
deleted file mode 100644
index 611d2627561d..000000000000
--- a/dev-vcs/subversion/subversion-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,441 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-USE_RUBY="ruby26 ruby25 ruby24"
-DISTUTILS_OPTIONAL=1
-WANT_AUTOMAKE="none"
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool perl-module python-any-r1 ruby-single toolchain-funcs xdg-utils
-
-MY_P="${P/_/-}"
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="https://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0 BSD MIT BSD-2 FSFAP unicode"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="apache2 berkdb debug doc extras gnome-keyring java kwallet nls perl ruby sasl test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	app-arch/lz4
-	>=dev-db/sqlite-3.7.12
-	>=dev-libs/apr-1.5:1
-	>=dev-libs/apr-util-1.5:1
-	dev-libs/expat
-	dev-libs/libutf8proc:=
-	>=net-libs/serf-1.3.4
-	sys-apps/file
-	sys-libs/zlib
-	berkdb? ( >=sys-libs/db-4.0.14:= )
-	gnome-keyring? (
-		dev-libs/glib:2
-		app-crypt/libsecret
-		sys-apps/dbus
-	)
-	kwallet? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kwallet:5
-		sys-apps/dbus
-	)
-	perl? ( dev-lang/perl:= )
-	ruby? ( ${RUBY_DEPS} )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-RDEPEND="${COMMON_DEPEND}
-	apache2? (
-		acct-group/apache
-		acct-user/apache
-		www-servers/apache[apache2_modules_dav]
-	)
-	!apache2? (
-		acct-group/svnusers
-		acct-user/svn
-	)
-	java? ( >=virtual/jre-1.8 )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )
-"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	!!<sys-apps/sandbox-1.6
-	doc? ( app-doc/doxygen )
-	gnome-keyring? ( virtual/pkgconfig )
-	java? ( >=virtual/jdk-1.8 )
-	kwallet? (
-		kde-frameworks/kdelibs4support:5
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-	perl? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )
-	test? ( ${PYTHON_DEPS} )
-"
-
-want_apache
-
-pkg_setup() {
-	if use berkdb ; then
-		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
-			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
-			| sed 's:.*b::')"
-		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
-			if [[ -n "${apu_bdb_version}" ]] ; then
-				SVN_BDB_VERSION="${apu_bdb_version}"
-				einfo "Matching db version to apr-util"
-			else
-				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
-				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
-			fi
-		fi
-		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
-		einfo
-
-		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
-			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
-			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
-			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
-			eerror "Aborting to avoid possible run-time crashes."
-			die "Berkeley DB version mismatch"
-		fi
-	fi
-
-	depend.apache_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-
-	# https://issues.apache.org/jira/browse/SVN-4813#comment-16813739
-	append-cppflags -P
-
-	if use debug ; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-
-	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
-	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
-
-	# Allow for custom repository locations.
-	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-
-	if use ruby ; then
-		local rbslot
-		RB_VER=""
-		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
-			if has_version dev-lang/ruby:${rbslot} ;  then
-				RB_VER="${rbslot/.}"
-				break
-			fi
-		done
-		[[ -z "${RB_VER}" ]] && die "No useable ruby version found"
-	fi
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/721300
-	rm "${WORKDIR}"/patches/subversion-1.10.0_rc1-utf8proc_include.patch || die
-
-	eapply "${WORKDIR}/patches"
-	eapply_user
-
-	chmod +x build/transform_libtool_scripts.sh || die
-
-	sed -i \
-		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-	# this bites us in particular on Solaris
-	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
-		die "/bin/sh is not POSIX shell!"
-
-	eautoconf
-	elibtoolize
-
-	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
-		-i build-outputs.mk || die "sed failed"
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		$(use_with apache2 apache-libexecdir)
-		$(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
-		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
-		--without-ctypesgen
-		--disable-runtime-module-search
-		$(use_with gnome-keyring)
-		$(use_enable java javahl)
-		$(use_with java jdk "${JAVA_HOME}")
-		$(use_with kwallet)
-		$(use_enable nls)
-		$(use_with sasl)
-		--with-serf
-		--with-apr="${EPREFIX}/usr/bin/apr-1-config"
-		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config"
-		--disable-experimental-libtool
-		--without-jikes
-		--disable-mod-activation
-		--disable-static
-		--enable-svnxx
-	)
-
-	if use perl || use ruby; then
-		myconf+=( --with-swig )
-	else
-		myconf+=( --without-swig )
-	fi
-
-	if use java ; then
-		myconf+=( --without-junit )
-	fi
-
-	case ${CHOST} in
-		*-aix*)
-			# avoid recording immediate path to sharedlibs into executables
-			append-ldflags -Wl,-bnoipath
-		;;
-		*-cygwin*)
-			# no LD_PRELOAD support, no undefined symbols
-			myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
-			;;
-		*-interix*)
-			# loader crashes on the LD_PRELOADs...
-			myconf+=( --disable-local-library-preloading )
-		;;
-		*-solaris*)
-			# need -lintl to link
-			use nls && append-libs intl
-			# this breaks installation, on x64 echo replacement is 32-bits
-			myconf+=( --disable-local-library-preloading )
-		;;
-		*-mint*)
-			myconf+=( --enable-all-static --disable-local-library-preloading )
-		;;
-		*)
-			# inject LD_PRELOAD entries for easy in-tree development
-			myconf+=( --enable-local-library-preloading )
-		;;
-	esac
-
-	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
-	#compile for x86 on amd64, so workaround this issue again
-	#check newer versions, if this is still/again needed
-	#myconf+=( --disable-disallowing-of-undefined-references )
-
-	# for build-time scripts
-	if use test; then
-		python_setup
-	fi
-
-	# Remove when >=dev-libs/libutf8proc-2.5.0 is stable
-	# https://bugs.gentoo.org/721300
-	append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc
-
-	# allow overriding Python include directory
-	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
-	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake local-all
-
-	if use perl ; then
-		emake swig-pl
-	fi
-
-	if use ruby ; then
-		emake swig-rb
-	fi
-
-	if use java ; then
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
-	fi
-
-	if use extras ; then
-		emake tools
-	fi
-
-	if use doc ; then
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			emake doc-javahl
-		fi
-	fi
-}
-
-src_test() {
-	if has_version ~${CATEGORY}/${P} ; then
-		default
-	else
-		ewarn "The test suite shows errors when there is an older version of"
-		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
-		ewarn "before running the test suite."
-		ewarn "Test suite skipped."
-	fi
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" local-install
-
-	if use perl ; then
-		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
-		perl_delete_localpod
-		find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
-	fi
-
-	if use ruby ; then
-		emake DESTDIR="${D}" install-swig-rb
-	fi
-
-	if use java ; then
-		emake DESTDIR="${D}" install-javahl
-		java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
-		java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
-	fi
-
-	# Install Apache module configuration.
-	if use apache2 ; then
-		keepdir "${APACHE_MODULES_CONFDIR}"
-		insinto "${APACHE_MODULES_CONFDIR}"
-		doins "${FILESDIR}/47_mod_dav_svn.conf"
-	fi
-
-	# Install Bash Completion, bug 43179.
-	newbashcomp tools/client-side/bash_completion svn
-	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
-	rm -f tools/client-side/bash_completion
-
-	# Install hot backup script, bug 54304.
-	newbin tools/backup/hot-backup.py svn-hot-backup
-	rm -fr tools/backup
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245.
-	newinitd "${FILESDIR}"/svnserve.initd3 svnserve
-	newconfd "${FILESDIR}"/svnserve.confd svnserve
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	#adjust default user and group with disabled apache2 USE flag, bug 381385
-	if ! use apache2 ; then
-		sed -e "s\USER:-apache\USER:-svn\g" \
-			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
-			-i "${ED%/}"/etc/init.d/svnserve || die
-		sed -e "0,/apache/s//svn/" \
-			-e "s:apache:svnusers:" \
-			-i "${ED%/}"/etc/xinetd.d/svnserve || die
-	fi
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dodoc tools/xslt/svnindex.{css,xsl}
-	rm -fr tools/xslt
-
-	# Install extra files.
-	if use extras ; then
-		cat <<- EOF > 80subversion-extras
-			PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-			ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-		EOF
-		doenvd 80subversion-extras
-
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
-
-		find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr
-		rm -fr tools/client-side/svnmucc
-		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
-		rm -fr tools/{buildbot,dev,diff,po}
-	fi
-
-	if use doc ; then
-		docinto html
-		dodoc -r doc/doxygen/html/*
-
-		if use java ; then
-			java-pkg_dojavadoc doc/javadoc
-		fi
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	cd "${ED%/}"/usr/share/locale
-	for i in * ; do
-		if [[ ${i} != *${LINGUAS}* ]] ; then
-			rm -r ${i} || die
-		fi
-	done
-}
-
-pkg_preinst() {
-	# Compare versions of Berkeley DB, bug 122877.
-	if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then
-		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
-			CHANGED_BDB_VERSION="1"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
-		ewarn "You upgraded from an older version of Berkeley DB and may experience"
-		ewarn "problems with your repository. Run the following commands as root to fix it:"
-		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	fi
-
-	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
-}
-
-pkg_postrm() {
-	:
-}
-
-pkg_config() {
-	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
-	# already has EPREFIX in it
-	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
-		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
-	else
-		mkdir -p "${SVN_REPOS_LOC}/conf"
-
-		einfo "Populating repository directory..."
-		# Create initial repository.
-		"${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
-
-		einfo "Setting repository permissions..."
-		SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
-		SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
-		if use apache2 ; then
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
-		else
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
-		fi
-		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
-		chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} "${SVN_REPOS_LOC}/repos"
-	fi
-}
diff --git a/dev-vcs/subversion/subversion-1.14.1.ebuild b/dev-vcs/subversion/subversion-1.14.1.ebuild
index 1479f99c5478..8b2a3c3cda41 100644
--- a/dev-vcs/subversion/subversion-1.14.1.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.1.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
 GENTOO_DEPEND_ON_PERL="no"
 
-inherit autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool perl-module python-any-r1 ruby-single toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool multilib perl-module python-any-r1 ruby-single toolchain-funcs xdg-utils
 
 MY_P="${P/_/-}"
 DESCRIPTION="Advanced version control system"
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Apache-2.0 BSD MIT BSD-2 FSFAP unicode"
 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 debug doc extras gnome-keyring java kwallet nls perl ruby sasl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-vcs/vcsh/Manifest b/dev-vcs/vcsh/Manifest
index 264576d03f66..e1d715c64d9b 100644
--- a/dev-vcs/vcsh/Manifest
+++ b/dev-vcs/vcsh/Manifest
@@ -1,3 +1,5 @@
 DIST vcsh-1.20151229.1.tar.gz 38309 BLAKE2B 9f9bb6fecfbfb01a88f7f0fb15cac3d83cb470ee6a73bfbbf2fde11b6d0bc7b8ea70da0c527563b4c06caa261fde98273baa80623783bef7345e02380d005f04 SHA512 da26044aa9bf884c178b1a2493f6bb4bea978d39d97f0dd31aef0130bac375ef2e519a3f7a14087467a3fccfd815f11c0718ca0f668d61dd91c97ac74af8afeb
+DIST vcsh-1.20190621.4.tar.gz 40262 BLAKE2B 541f0fe4873236d6b2af2f2a71c446954ca401b69beeca9b21c61a51e3cff11fd1999addcdf4f5d699ff54fa08e6b81a33e0b6d586cad250470e4646cbd5edd9 SHA512 d86168198f468bbf74d7c83dfe61e07e39772c98467b713f7a4972b779f046c51a2c983ddd444d0332d2a586159d86ccb6560d4cffb5a6441534c425a717ffe3
 EBUILD vcsh-1.20151229.1.ebuild 917 BLAKE2B a877d89dbff5b922f3c1c4f45811c1f56060429a0f78db1ac44885171624af2dfae903972e3d76f4ad93f8360aa863b24db7b1858a0fe9bf8da1387525b54fd9 SHA512 e79025a27a3a5aca7af1d6905033ced9779262735ed1d665068858cd65ed548069a164896cf6a5d9815c49b9b6543f98e41f5320504c2a9e4f3bb061f2ae5450
+EBUILD vcsh-1.20190621.4.ebuild 876 BLAKE2B bb81252c4e85dcaad7786a47214b3b01c0febd95fb438d9211593c14f8df731f83726b54ae0828bab4374b23153b7c27891264bf48b6dc15d3ef95636325130b SHA512 48f1964d8c5d5ba1ab0d7e11606f52e3c77b294c97f6d3dd3de18165f485a8e4fb950c05c9c3980f4067852f80510104a177ba073f10f25b1a99a971c84afd9c
 MISC metadata.xml 323 BLAKE2B 371d4afb7fc196b496f78215314b00694546dd2a998376efd2d21532b852b4321439866dcdc58607e03bf2d9f9e3454072642c3cc0e8e268fef04addc519e63f SHA512 53f63accf14a80139fd3d951f4916bd3bce437e445c6ed603d7fceb90cce3acaecb376024a1fc4633ba7db840754d10e83e1332352faeac33e5ede792bab310a
diff --git a/dev-vcs/vcsh/vcsh-1.20190621.4.ebuild b/dev-vcs/vcsh/vcsh-1.20190621.4.ebuild
new file mode 100644
index 000000000000..20daa45b2ae0
--- /dev/null
+++ b/dev-vcs/vcsh/vcsh-1.20190621.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION='Manage config files in $HOME via fake bare git repositories'
+HOMEPAGE="https://github.com/RichiH/vcsh/"
+
+MY_PV="$(ver_rs 2 '-')"
+SRC_URI="https://github.com/RichiH/vcsh/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-3 GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="dev-vcs/git"
+DEPEND=""
+
+DOCS=( changelog README.md CONTRIBUTORS )
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's,vendor-completions,site-functions,' \
+		-e "s,\(\$(DOCDIR_PREFIX)\)/\$(self),\1/${PF}," \
+		Makefile || die "sed failed"
+
+	# remove dysfunctional tests
+	sed -i -e 's,install: all,install:,' \
+		Makefile || die "sed failed"
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	default
+	dodoc -r doc/sample_hooks
+}