gentoo resync : 13.06.2020

17 files changed, 115 insertions, 402 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 76831eea73b3..090bdc4b0fff 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index 0bd71ab5e38d..1b8064438627 100644
--- a/dev-vcs/cvsps/Manifest
+++ b/dev-vcs/cvsps/Manifest
@@ -3,7 +3,7 @@ AUX cvsps-2.2_beta1-solaris.patch 3398 BLAKE2B 116d7988d71fd55dc4e7fa0e707f0909d
 AUX cvsps-3.13-make.patch 1126 BLAKE2B bc5c7aa08816a8cad99a05e0b20cad5de55026c056b97962a11e4aa4f56f48695fac5dbcc77b8a44cfea3f4ace27fc24a894b7968c7b843476ea78a4560ce648 SHA512 eca9b73848d4d219de2f29021f6b5376ce507ea4b4cbf17b7007c96f75b8598feebf9d18750dbd617b903cfbdfd9ed0ec2d83c6f05462e1dfc4b100bc3745ca1
 DIST cvsps-2.2b1.tar.gz 62763 BLAKE2B 35a86b93e69aba83fd96294b9ff993100b2b63e9dda9bd21899fc4a6df42513dde1297cebecfa6f95b43e293eb718e55ff3c9af7ac31187c8cfcd38242cefeb8 SHA512 9e6f95df53cdc16566f1606a9299ee641de9b020a373c9004218b3db23fbdcce9e32d4a57dce332580bc4e6429b90977c2753facd0ad8f9a9234b79f03a7a33d
 DIST cvsps-3.13.tar.gz 64437 BLAKE2B ec0755d39be448485a900a99cee9ef79f36343beedef80e10d6b0f48f7746b93ff54ff6b85fc1650408a228e363f45567f107be108d6bb1183c4998c5705f567 SHA512 9fe2be4839c7a6f31a788102fd6ebb1e2e0693f09a4dad2bca5cd5d0788088eb34388d592778f04bcfec9817e3ffffb66d70db9aa47996d3bd1c45cf7cd8464f
-EBUILD cvsps-2.2_beta1-r1.ebuild 914 BLAKE2B 8ca72fe19387ec6c3fa64791dd54868de1e711fbcce4db9710340d89f56cb10d7d3c89d17c8928a016512e20f808a34bd110dd35b8c7cd9d94be63515d87ba2a SHA512 54722a0715431c0aca46b71956ecc7b8556e65cfe9ae14423d6978324bd076c67ad40aa744c9b1a00c93dca998ac1794641ccf0e65d38d9fb1d408df4c45fc32
+EBUILD cvsps-2.2_beta1-r1.ebuild 913 BLAKE2B 0770e272abceeaeac6f12a1fabd8650f739ac5f4221184ee26ae5f2289dd716219ef076a11d5cf68ff186d0f23f55c5b05451b995321a06c70bacc7890a50b23 SHA512 292a2f7c589ab5e476c2d4ed29d24da3ec8f55cbe54a1ab52d11c29d1562ceafb4d5b734fac8636376db0de70eeca4086b9c08fb985461b9826c01e2995f6a3c
 EBUILD cvsps-2.2_beta1.ebuild 904 BLAKE2B 0c21448304a5e37302aed50fe363f43fe01d758e2ef84fdb325445684f3df625640d6417d80875f6144d869b0ea443c401894953ee508142e24ea529cea03dad SHA512 119a76fd719852359f9a4047ea35133d24100114dc5760c25ccff890ef0419edbcb050ffc392091291aeff930ed10606e259f8c32fbface631d668eab7a2de14
 EBUILD cvsps-3.13-r2.ebuild 1003 BLAKE2B 99e8d145aa28f98cbceef9f0ad427fb9845ce177e2a463b0d8e6de2282a28aa8034285ce4537e4ac2244d182dae832cf5cc8a6b845effbfc6811fcdaba830b17 SHA512 486dcc6e74494504b528b92eb6d2d890e38879b14ffc7a729a7806e1bad8625622c3c6379bb225bed1d6b28c172c184857eee917e783b39dbdd4a0509533009f
 MISC metadata.xml 323 BLAKE2B 2aa38c904f2a7ac09a4c62906f1535332a43428b602632b96d1a728d35e5c8031a50c1750474e932f127d83bc3a56e2e2cfed1d02fb747d33a0045408e8adca3 SHA512 0788681a1fce2712b5722546e57da91895b3c292ff564062f0b16d9c910ad96b4a46e18e5d71a64fdd0a6980d000c2200b791fe95d1b2bff286e94ee60ce4edf
diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
index 17062912280c..74055a036735 100644
--- a/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 8a9749c09371..775dcbeaab2e 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,9 +1,11 @@
 AUX fossil-2.10-check-lib64-for-tcl.patch 445 BLAKE2B a8282820edafb15ae6542b9f134553c5b6d7b3b685959baa531071923f0611fb22ce5945ab2ecbd4d1bae3c6234c557ac2edc872363cf05a3045bf70bebe1a1b SHA512 ccc3f6cf55902748bf8a27ea1c7c1733a2e33a45b297a7f9f732dc772e021e461052e30f841c7fa83c6303e6c7d8f8aac96f248c909d824237edb17335cb3e2f
 DIST fossil-src-2.10.tar.gz 5634327 BLAKE2B 1a02ef0d32b06dd09760d6a62450ad7bc15de97b5263d50ec776dbf0e2fff6b6fba4ec944eecffdaf31737f4a45e30aa898a728590a0c6e2ae171937a349e92b SHA512 aad54e3eaa2d647257c5c723fca4e55981aac0432d3d0b4deaa9651c7db7d27cb9f26f7ff40c31c452cb8dd54b0f0663c632183dc11982bc9cc24adf78b952e5
+DIST fossil-src-2.11.tar.gz 5850256 BLAKE2B af825ca9b79360149d53001b2952259bbad50fe05e77e84e54d58b11a66e612fd8c5f7bb3a8c36dd6f1b267ede3a1ed4c6b8229d10c6f25ff4de858842e100ce SHA512 0489b5b8595a0c50c8a7d787ff2d4a30980dce83b33052f7bf8f4630320fe8a0276bc73a00f3ced2962a474df1fddb2dd2e0d70f8854e1fc83e3746ea63b6ba1
 DIST fossil-src-2.8.tar.gz 5359975 BLAKE2B 6b63eadc8cd563d646698edc9972a52ec1feb868cb362449c232c99dcb81fea2fa227d631ebf8b695417c571933784dfffd5ecbec2a5027ac9901578a054c559 SHA512 5c6a8dc1545c43b3c95fbbec343db023e27a9db58f282a881bb7e488e3e26a0f7913a41f505dedf618b884507e48956780bd0e12482e184345d68edd1e79ff8e
 DIST fossil-src-2.9.tar.gz 5440118 BLAKE2B 2817e3c88073a26ef384d45271511eaacf5394a67ba6041ba0b37f321303abcba28655daf7963b8e51a8bc9bfeee681cea1f318f5ba66e93a5317b98771ad059 SHA512 c3786d4ae5517c88917819448863e9e1e37704a7073a1c87c042660313b77ce3a63f32e35e6a56af1c681e7b8a5acc652b4447d0387b8a8a5b3b5aa04dd9a9b5
 EBUILD fossil-2.10-r1.ebuild 1785 BLAKE2B c9b8d29a0da8dc51377f3e83238b031efc61d95f3211b467229754503f11340371ea865f98f7141fad1268f123e12bf3ee1a7e2bcc58ecc4f9b8ec068b63470f SHA512 ca346dd213a307865eb7b77ae6031de1b4a7415fb7b3195c8fd06b1941ed125d91d7e48b81e4466b22c711975ffc9e70259248620345bf49838e42dc0008bbdb
 EBUILD fossil-2.10.ebuild 1532 BLAKE2B ea4e60d58501a90082b16fa9f34a2e1f1288064be2e4f31f05359a83e5673475e368b8b533221771f07abb7758d46a361537d580b52c7346d8552249d8d25411 SHA512 f7707a36961431a90c6cb39623b6d3ac681ff9a2e06729e7c3de9b980cb9d564c4262b7952c0e534d9dfa014d3d73bb969d74015102a8009244f3886b25a6d1f
+EBUILD fossil-2.11.ebuild 1808 BLAKE2B 310f26c69a11c49587ff79db06f49a7c54a7501487c85c487df6f54da38404df2d4ceafee93a700e88166187793309571880f335c75a19b836b29fd2dca752d4 SHA512 a3b413d0d0232a8925881f54e8b33b3eb85774fc09fc5847b108ec153ce8626e2b92fb5a7115fd0b6596e32f12a6b914a44b0aec55ee56e37f2ba69c23ae449b
 EBUILD fossil-2.8.ebuild 1529 BLAKE2B 8bfc18c0e98ce9838faa1fe65484bac119ec242f8085c9eaf912a1d5b65ae19598924bd4445e7717895b6e4de9ae0e50f662fc4b16a63089911d5a97a7005cc2 SHA512 b6174bcb75f9e6395b71c8b82103104b97a065af34720bc4aed358f71ac34033624022b06dfcdb0d03d583ff9c8891d21ed1073d4c21872d6a07150b20bf6306
 EBUILD fossil-2.9.ebuild 1534 BLAKE2B b56c917b54b543bc6db8bd3bc4c91e5912e97a31a7785f29c4bf2eb29750f3735f589e657e5344fc7b1b2bdac5e7282b2d67ff5d0c9ef7a5401f525cfb2330e6 SHA512 3b4ab6992cbcb3e4ef43409b2d9bd077e38130f1f8c88830f11e57c185a362d676000891d4677a2d3f7c01d5ec167c07768bb6f688db6cffad00e515afd861e6
 MISC metadata.xml 1165 BLAKE2B c370f1370c7250945135e56514558acd016742f6d8a9c51e98b9533e094b47dbdc07808abbb1341ad1e987dac6f5f13d2e2f0fef45587935accf082c15227330 SHA512 6ef05c3722bb110e403294b002c253eb1ae4f29a4f5306dccee3abd52ce61c8ae04ed2255f551298d94b8b99d96c799f05bd6df7a9d4e9af08e4c10ce306d0ab
diff --git a/dev-vcs/fossil/fossil-2.11.ebuild b/dev-vcs/fossil/fossil-2.11.ebuild
new file mode 100644
index 000000000000..e75b80518477
--- /dev/null
+++ b/dev-vcs/fossil/fossil-2.11.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simple, high-reliability, source control management, and more"
+HOMEPAGE="https://www.fossil-scm.org/"
+SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
+	  tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks"
+
+REQUIRED_USE="ssl? ( !miniz )"
+
+RDEPEND="
+	sys-libs/zlib
+	|| (
+		sys-libs/readline:0
+		dev-libs/libedit
+	)
+	system-sqlite? ( >=dev-db/sqlite-3.28.0:3 )
+	ssl? ( dev-libs/openssl:0 )
+	tcl? ( dev-lang/tcl:0= )
+"
+
+# Either tcl or jimtcl need to be present to build Fossil (Bug #675778)
+DEPEND="${RDEPEND}
+	!tcl? (
+		|| (
+			dev-lang/tcl:*
+			dev-lang/jimtcl:*
+		)
+	)
+"
+
+# Tests can't be run from the build directory
+RESTRICT="test"
+
+# fossil-2.10-check-lib64-for-tcl.patch: Bug 690828
+PATCHES=( "${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch )
+
+src_configure() {
+	# this is not an autotools situation so don't make it seem like one
+	# --with-tcl: works
+	# --without-tcl: dies
+	local myconf="--with-openssl=$(usex ssl auto none)"
+	use debug         && myconf+=' --fossil-debug'
+	use json          && myconf+=' --json'
+	use system-sqlite && myconf+=' --disable-internal-sqlite'
+	use static        && myconf+=' --static'
+	use tcl           && myconf+=' --with-tcl=1'
+	use fusefs        || myconf+=' --disable-fusefs'
+
+	local u useflags
+	useflags=( legacy-mv-rm miniz tcl-stubs tcl-private-stubs
+			   th1-docs th1-hooks )
+	for u in ${useflags[@]} ; do
+		use ${u} &&  myconf+=" --with-${u}"
+	done
+
+	tc-export CC CXX
+	CC_FOR_BUILD=${CC} ./configure ${myconf} || die
+}
+
+src_install() {
+	dobin fossil
+}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 01418e51d1e0..9030ac869512 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -15,22 +15,22 @@ DIST git-2.23.3.tar.xz 5716108 BLAKE2B 9d0e63e075d8e64bf2772bdd3e49e9907ae093bcf
 DIST git-2.24.3.tar.xz 5774192 BLAKE2B a8bea56f85a12863565325984a303ac2d964e0371de5252252a736a376a22cc1695da15b46d35bdec8a36c2ebd7ba7040727265acee37892350aad08209ed15f SHA512 b2fbafd0faa06a304e960f78696f5c033eb5330b18af28c0d169af86aa836dada0c3cf349993b1c9a6129d0c42788167a393f9db9be981610318dca5743b2c87
 DIST git-2.25.4.tar.xz 5880976 BLAKE2B a3ac79918ba174a93844d9518a2f1c6970abe2cd31acea260742d3c03a31a03131f53603a3bd3e525a60f8ebcfbbaa3b92228e2486717ca2d389a978e39bd5ec SHA512 ca2ecc561d06dbb393fe47d445f0d69423d114766d9bcc125ef1d6d37e350ad903c456540cea420c1a51635b750cde3901e4196f29ce95b315fda11270173450
 DIST git-2.26.2.tar.xz 6007864 BLAKE2B efce003a95e24dbb6e14feebd35874c9ed1a5c06d7f0722d4dfefae830613b64b81faa41d5952400fa382b385d15d48829f8ee3b4d065e134bd38fa0e10bf570 SHA512 5d92d07b171c5cd6e89a29c1211c73c1c900cd51c74d690aebfb4a3d0e93b541b09b42b6d6a1a82f5c3d953096771f9a8605c63be139f559f58698c1a0eabcfc
-DIST git-2.27.0.rc2.tar.xz 6054356 BLAKE2B 62b848447a90e68e0265ebbdb1fe78cd28f5e3104fe1c8272cc783c0ba59f9324ebcee523f1a6009188d8ba050ccb7ff832034d3e4e9ab5c5d7a3657e80786c1 SHA512 02cb439255c6861ec0fe17705539c97e80c4eab6671797039d65357cce4802fb11575036b96e0054ad6b75c4d730779cb59a2e1fb66261a9f02e75d091d38f4f
+DIST git-2.27.0.tar.xz 6074636 BLAKE2B 72c992ee35a50cdeb2363f04edfab65358216b8415f31f217b6e837d1f7bc28b90e49850006596a8f5f1932fd3011c4253df287d445dca58e335d2f6e7bab8c2 SHA512 8ddea44503db7caf1f6080e64555541aa64a7b8761fd6541965ee244d9c4a47befccda1a239f11d86c2ad0ff24923d084f65712f5f2d6cfa178573e3471c6c33
 DIST git-htmldocs-2.23.3.tar.xz 1295344 BLAKE2B 7a6d8198cf8285717f11731ea907ea06786c486701a729d071deedc5437a595dab355ae2d0ac2814b10503ab4161e76a1245663a9ce35ce48d03be9905315db3 SHA512 2c86c03f29f1a4fc2acb17a17a9e1a3df2ec95138895f5c8e776859772ebc7b95c24af0e328508ccf1ea85b7adaa86a9aedc4d0c353ffc91ad5810ecc9a48059
 DIST git-htmldocs-2.24.3.tar.xz 1307828 BLAKE2B 5d6dda03e2c51346326a1258a14a0ee16fab7fe83c80b4a1a0b307a6343db851d89b96afcf616e10ad5831352a90332ac602e5713444855327e11be8992a5274 SHA512 14289fb46cff48bece0cdafea9ef201facdb58eafce4b735ce50489356deb993c481ac1b6e96a2f98cfe30434280997c47f2cca0bdb2b6e85c31cb7cf17cc257
 DIST git-htmldocs-2.25.4.tar.xz 1296896 BLAKE2B 4f6469acdcd699698bd1f19bd0d911fd522c1890115f25c087a7870b855eb9354340fe17e9e6aaec7fb27cd951fe28cadbf26e1aeadc76f3c3a1cde4d23e42cd SHA512 e10c6fa52e213a2b18290fed375f6e176eef17b0a19f6906f09d6228d18bece88ff0ec97d871db0ba29fc0fbff73740312ab01eab809bd6a9a41c8b295cf8d67
 DIST git-htmldocs-2.26.2.tar.xz 1304788 BLAKE2B e0de88c5c41646d5fb9b54e2ee873c7904e1b85c67f971499f0227eb2dd59cabd4ffc58c468cf8a7a7466920af972dbc7f95d78003e487edac9a15a9c49b80a2 SHA512 b577693180b4fc035af211e3b83e98ad5e1bfbb98706924858df6558383b82ca05f870bdae90f8a14c8bf664f091ee928af52dcdebdfb98dc7387fdfe2e3a396
-DIST git-htmldocs-2.27.0.rc2.tar.xz 1325644 BLAKE2B 91b873c73fd90a2abc1cd71f61b206e256f95eb0d9c7d3d21426be8aa631d297f69aa95f33664e874e8a9110743b955d83c8fa8df69ccd77355293bbb1192b34 SHA512 83a0ec7bbbaea7af0ac5a94de60a9adfe5457bf2c411c3c81c785347cb22984e24298c080745eeee5914473c055c052dfcb776e0b270022e3e90cb88e6c5f210
+DIST git-htmldocs-2.27.0.tar.xz 1325820 BLAKE2B a86cb62b6e42e451201a69e92c897566a78ed4965a98ef7b09f7c4674f60a334357ea8834ec5d97764f5f7e8fe580b8ac3af4da588b72a0e01f065adcd019aec SHA512 6af974ea6c8458f72c5fc7a372611e0153b705a85092a5fe37587a3165368712e077f582ce4085538f48df925d60898b96c32275182b7ef034711ab53e7ab811
 DIST git-manpages-2.23.3.tar.xz 449464 BLAKE2B bfc0153e43724df7210110e836d47f17258e45a876aa9bf4604c3f38e690e0e5379d4394df96c3dd84ea4d7371b7843729e6fb5d4b43fd7d4a9b4c3f4062a922 SHA512 a7b5fc48a5b840eb9b668b441ad3c30f65adc73c22cda461ffaca1cfddf154bf1974cab6c372b4534fd45a43a2e2ab96513364845a7db4285b88e31bf7619f8e
 DIST git-manpages-2.24.3.tar.xz 454796 BLAKE2B b340b33593e596a7a87385110fea53a96b68f0b0c5c02e046a1aff5ff7c7a6bf3d7a55c4d33796db8e84824df72451ad51db9fc44df4840ecd0183c0ef49eba0 SHA512 22709e159196da27befc26eef3ab40dab9700c95abf6892860a81c8e5df7d85ad423c877e6c88949cfc611c4dfebd956f02a78f0340c1cd4d58c48f80e3e1cce
 DIST git-manpages-2.25.4.tar.xz 459344 BLAKE2B b0ac88f691984f39f6cfbf41d2d61ab443573974277536641daddf0e9b7755ea9cb6bc96ecf3c14479809036171e461eff72cb498c63a56eea041341b8a65af5 SHA512 a67b881f289d5b3e2187ad55c5176258c30108c73fc7c18d50c1a6b42b241ce46dba28acf2f7bfc994b044444a6678096a35ad60936ea6cba07b52ddf647da17
 DIST git-manpages-2.26.2.tar.xz 462052 BLAKE2B 27fc44360c9f890e9f7754e8423f5596548f076f5fec5dfc6c752e8b3caa5f64ba182c1566b67878b19fbb115297e08def1bf9d2711c7334cbb8e1b20fc039a1 SHA512 9591e94683a6b49d8b9f2afddc826576023fdfa6de6db4af3a28a2af00b175d5be710d86a31d0f1b8320cc38b6f27698e17fb3e8c1f2b0c5ced37296ef1109b6
-DIST git-manpages-2.27.0.rc2.tar.xz 470652 BLAKE2B 1cb6112e20141de0e10416053d08f1f8ebff2d158fe61245403fb0506b0b004e6b54c752957e5fa6c1510828a9128cf33995e16030e85c8af60e7a45df85856b SHA512 1b7e9488aceff1e453dcca6536d2475350c13d6a3ee286523877fdfc4ae9dd7912fd421685f0e0e4f93a8ba023220295bffc0e93c3f35e548556aaf8b1a0096e
+DIST git-manpages-2.27.0.tar.xz 470724 BLAKE2B 83db9c5aaf9ada63d4e6146ffa4f20f1d21797ba7c7b27ade9d6f4dedb1091591b8afe4f368a4433cf75d2b148d68cec725f5504504c703eb7c22916d17b8069 SHA512 a4ceb7b86d67d15a52fec22e9bac5c8b1a5447041c3278710c2e24f70d6d443853d6a6ec5eb5ab7633390c5fa2494dd495096c26a6467d9cb13d9da007a73d12
 EBUILD git-2.23.3.ebuild 19570 BLAKE2B 75aaef3ba36662b32abbfa30cd597265e7149a270c38188d790cbbaf64691ddbc192a3dd780e5e27c8b4bc5c2990d4278b49965f77a2bbbc7e8a4389c00b0de3 SHA512 73c26e4ba8d1b9be24d7c13eb69d1684050eb2de7be08ff32cf27769e2977897594a1cf1c7ce03262f5ed28db75bf4c6b175bc3274bc23bf560f8ba3a9423fc8
 EBUILD git-2.24.3.ebuild 19518 BLAKE2B 2a48be84a263f274d0f7c0384423ba5afbd4451145ab50bf3c61048a2443e98811b22217b47e4df15fb40745e1bec49ad648f195bdfc5eab138ec0c891db2fe6 SHA512 15a65e017b6c28610f10485f39f3012900281fec91272ab8189f56b72993befcd593459561ae0199f07ccb6bc65724feb2c9306342ed62564dad16b95324fdce
 EBUILD git-2.25.4.ebuild 19518 BLAKE2B 2a48be84a263f274d0f7c0384423ba5afbd4451145ab50bf3c61048a2443e98811b22217b47e4df15fb40745e1bec49ad648f195bdfc5eab138ec0c891db2fe6 SHA512 15a65e017b6c28610f10485f39f3012900281fec91272ab8189f56b72993befcd593459561ae0199f07ccb6bc65724feb2c9306342ed62564dad16b95324fdce
 EBUILD git-2.26.2.ebuild 19518 BLAKE2B 2a48be84a263f274d0f7c0384423ba5afbd4451145ab50bf3c61048a2443e98811b22217b47e4df15fb40745e1bec49ad648f195bdfc5eab138ec0c891db2fe6 SHA512 15a65e017b6c28610f10485f39f3012900281fec91272ab8189f56b72993befcd593459561ae0199f07ccb6bc65724feb2c9306342ed62564dad16b95324fdce
-EBUILD git-2.27.0_rc2.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
+EBUILD git-2.27.0.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
 EBUILD git-9999-r1.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
 EBUILD git-9999-r2.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
 EBUILD git-9999-r3.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
diff --git a/dev-vcs/git/git-2.27.0_rc2.ebuild b/dev-vcs/git/git-2.27.0.ebuild
index 35ba555d64a9..35ba555d64a9 100644
--- a/dev-vcs/git/git-2.27.0_rc2.ebuild
+++ b/dev-vcs/git/git-2.27.0.ebuild
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index b3243cfd705b..2bff4750f25e 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,6 +1,7 @@
-AUX hg-git-0.8.12-hg-4.8.patch 6647 BLAKE2B 86e0fb6bd9f9b9d10e38024cecf447857ae5339085a3f919cd924d3a397003d85b59014ba920ee5f5f62ef54acb862feeef325a9d76168e5f5ba37c34dfa9dad SHA512 8536ba20dbe5e8d1e3872a058d3e4f402ee39a7f91d1fc0102e6d169bc246ed728bfac517ef620b157d563644b18982f7f8d2fd63ab1f5138e5550b4280b8619
 DIST hg-git-0.8.13.tar.gz 127399 BLAKE2B 0cf47df27dfc19cb66d546c1647af4f6b112035ee089c42331c0f2c045ead9e9abf796f0ed0747f52efe1452a9a2ccec237ae4c0296173ae283c180ae5cdb75b SHA512 55eed0704dc2829e6f027bc842e69aa5d193c824521e4c96171cecabd0155b0635a06b5ff2be61cdf0fff1bcb075190a324087b4171fba05df8db76527878a4a
 DIST hg-git-0.8.8.tar.gz 98508 BLAKE2B e7636c3809b2be8a7fcce44a72f89f39927a282c34384047036470fc832b34be1922de75a2a9b468ec125ea716263333f5f58e6a0c7de12729b7dd18c68b657a SHA512 c3b28273024f2429ed526354048f0e37d0af6be591020fa3b1e8d1321247d72129f7c8fbcef73e69d60e243a6f86380dc4d89f0e8f913b786ef4497421237aac
+DIST hg-git-0.9.0a1.tar.bz2 128165 BLAKE2B dfe415a26554d6de714b64aa79f771e08f2c7ac02ee42732524b85a6572003bd428ea29823774d5ea4fa0eee251629bcbc78d9421773c312925a0114e51098ff SHA512 43119bacd4bfc169c8403b3d67e14609ada454a7635c50af5db3683ccd36e1d3be2ec0896204f0850b0cb0c09ded24ae723ad3eb6ddc381553f8c2b2ff2c84a1
 EBUILD hg-git-0.8.13.ebuild 704 BLAKE2B d7d392beca63439af85f5e862c79e01487798d56d1958d15af5df7aa0a0fd4720cc29528b9eec17507c2862318b86e8184598d7beca0802362fd186a83085f0a SHA512 fca80ff4da4219162f8caa1af56a6b982081198a69d2663bdd97f560a869191162b0dc93320be763c9872f28cefa2d85d1c8ab57b57b6c1f63658fbc18605819
 EBUILD hg-git-0.8.8.ebuild 697 BLAKE2B de1b6b49eeef84667cad1bbe50a10ef919352b49e402f9d0a48c7ff2c6f560dbd5e208d5456a38c07473bc8dbab1f23eef8cc85a8d90d333a4b98f30715601a8 SHA512 b0f24d48a56171a5c30575df57db48ac859bedd5912a48194a9183c06930e5e56b01a06e5dbcee7462d692f1c9a41f79fb593a73cdd0ebf418da05b24bee9cf2
+EBUILD hg-git-0.9.0_rc1.ebuild 812 BLAKE2B a557f0fa65ff915134724c71e56ad8e11eeaebb8bad0340bfa6310a88e9a489eb34efc48602d24a37bb4126fcb0956c5a77fe0764d70536035cf9f23d50a0876 SHA512 093127093bf151ec78792a13db12a8c1aba3f9140ad5d65a7aefef6aa6c42271fa6fbb70e34376d87e0de2312660ebdedb167acdb65aef36b410c06b0ff355d2
 MISC metadata.xml 317 BLAKE2B 53e7e3877f6f42a888ad50ba824e4a50f4535d4a9345ff2a661ae3df79e57bddfb8faa80ea632856a530b99518e90d4311f8090003880f3a5cf073fec1d8c926 SHA512 98a36b756fe1f1ee4f2d7c1f7f0dee8925a1396d2b44eff84274aa4c6e871d87d17808e157c6020cbeeec763e44fc4ba6e5d266561b3fe5c015f04c864349a09
diff --git a/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch b/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch
deleted file mode 100644
index c456ce53c740..000000000000
--- a/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-https://bitbucket.org/durin42/hg-git/commits/ae6b1ba7482963bc9de51f299891e99005794e4e/raw
-https://bitbucket.org/durin42/hg-git/commits/143b7511eadbea7507d847c805241a6db290ffe7/raw
-https://bitbucket.org/durin42/hg-git/commits/8d00fde45adbc6c3c0ccab8e362b5f5c36c171e6/raw
-
-# HG changeset patch
-# User Alain Leufroy
-# Date 1541695757 -3600
-# Node ID ae6b1ba7482963bc9de51f299891e99005794e4e
-# Parent  6ae26ba7b928019e48dd1c73358c18d6dd2d86f3
-compat: fix for hg 4.8
-
-089fc0db0954 introduced a new `createopts` parameter.
-
-`hggit` does not support repository creation, so we can just ignore
-it.
-
-diff --git a/hggit/gitrepo.py b/hggit/gitrepo.py
---- a/hggit/gitrepo.py
-+++ b/hggit/gitrepo.py
-@@ -13,7 +13,7 @@
- 
- 
- class gitrepo(peerrepository):
--    def __init__(self, ui, path, create, intents=None):
-+    def __init__(self, ui, path, create, intents=None, **kwargs):
-         if create:  # pragma: no cover
-             raise error.Abort('Cannot create a git repository.')
-         self._ui = ui
-
-# HG changeset patch
-# User Kevin Bullock <kbullock@ringworld.org>
-# Date 1543713965 21600
-# Node ID 143b7511eadbea7507d847c805241a6db290ffe7
-# Parent  ae6b1ba7482963bc9de51f299891e99005794e4e
-compat: glob some verify output that changed in hg 4.8
-
-diff --git a/tests/test-push-r.t b/tests/test-push-r.t
---- a/tests/test-push-r.t
-+++ b/tests/test-push-r.t
-@@ -64,7 +64,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  1 files, 1 changesets, 1 total revisions
-+  *1 changesets* (glob)
-   pushing to test-1
-   searching for changes
-   adding changesets
-@@ -75,7 +75,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  1 files, 2 changesets, 2 total revisions
-+  *2 changesets* (glob)
-   pushing to test-2
-   searching for changes
-   adding changesets
-@@ -86,7 +86,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  1 files, 3 changesets, 3 total revisions
-+  *3 changesets* (glob)
-   pushing to test-3
-   searching for changes
-   adding changesets
-@@ -97,7 +97,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  1 files, 4 changesets, 4 total revisions
-+  *4 changesets* (glob)
-   pushing to test-4
-   searching for changes
-   adding changesets
-@@ -108,7 +108,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  1 files, 2 changesets, 2 total revisions
-+  *2 changesets* (glob)
-   pushing to test-5
-   searching for changes
-   adding changesets
-@@ -119,7 +119,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  1 files, 3 changesets, 3 total revisions
-+  *3 changesets* (glob)
-   pushing to test-6
-   searching for changes
-   adding changesets
-@@ -130,7 +130,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  2 files, 4 changesets, 5 total revisions
-+  *4 changesets* (glob)
-   pushing to test-7
-   searching for changes
-   adding changesets
-@@ -141,7 +141,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  3 files, 5 changesets, 6 total revisions
-+  *5 changesets* (glob)
-   pushing to test-8
-   searching for changes
-   adding changesets
-@@ -152,7 +152,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  2 files, 5 changesets, 5 total revisions
-+  *5 changesets* (glob)
-   $ cd test-8
-   $ hg pull ../test-7
-   pulling from ../test-7
-@@ -168,4 +168,4 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  4 files, 9 changesets, 7 total revisions
-+  *9 changesets* (glob)
-
-# HG changeset patch
-# User Kevin Bullock <kbullock@ringworld.org>
-# Date 1543713996 21600
-# Node ID 8d00fde45adbc6c3c0ccab8e362b5f5c36c171e6
-# Parent  143b7511eadbea7507d847c805241a6db290ffe7
-compat: update how we register gitnode template keyword
-
-diff --git a/hggit/__init__.py b/hggit/__init__.py
---- a/hggit/__init__.py
-+++ b/hggit/__init__.py
-@@ -94,9 +94,11 @@
-     command = registrar.command(cmdtable)
-     configitem = registrar.configitem(configtable)
-     compat.registerconfigs(configitem)
-+    templatekeyword = registrar.templatekeyword()
- 
- except (ImportError, AttributeError):
-     command = cmdutil.command(cmdtable)
-+    templatekeyword = compat.templatekeyword()
- 
- # support for `hg clone git://github.com/defunkt/facebox.git`
- # also hg clone git+ssh://git@github.com/schacon/simplegit.git
-@@ -207,7 +209,6 @@
- 
- 
- def extsetup(ui):
--    templatekw.keywords.update({'gitnode': gitnodekw})
-     revset.symbols.update({
-         'fromgit': revset_fromgit, 'gitnode': revset_gitnode
-     })
-@@ -455,12 +456,30 @@
-     raise LookupError(rev, git.map_file, _('ambiguous identifier'))
- 
- 
--def gitnodekw(**args):
--    """:gitnode: String. The Git changeset identification hash, as a 40 hexadecimal
--digit string."""
--    node = args['ctx']
--    repo = args['repo']
-+def _gitnodekw(node, repo):
-     gitnode = repo.githandler.map_git_get(node.hex())
-     if gitnode is None:
-         gitnode = ''
-     return gitnode
-+
-+
-+if (hgutil.safehasattr(templatekw, 'templatekeyword') and
-+        hgutil.safehasattr(templatekw.templatekeyword._table['node'],
-+                           '_requires')):
-+    @templatekeyword('gitnode', requires={'ctx', 'repo'})
-+    def gitnodekw(context, mapping):
-+        """:gitnode: String. The Git changeset identification hash, as a
-+        40 hexadecimal digit string."""
-+        node = context.resource(mapping, 'ctx')
-+        repo = context.resource(mapping, 'repo')
-+        return _gitnodekw(node, repo)
-+
-+else:
-+    # COMPAT: hg < 4.6 - templatekeyword API changed
-+    @templatekeyword('gitnode')
-+    def gitnodekw(**args):
-+        """:gitnode: String. The Git changeset identification hash, as a
-+        40 hexadecimal digit string."""
-+        node = args['ctx']
-+        repo = args['repo']
-+        return _gitnodekw(node, repo)
-diff --git a/hggit/compat.py b/hggit/compat.py
---- a/hggit/compat.py
-+++ b/hggit/compat.py
-@@ -2,6 +2,7 @@
-     bookmarks,
-     context,
-     phases,
-+    templatekw,
-     url,
-     util as hgutil,
- )
-@@ -192,3 +193,14 @@
-     if hasconfigitems:
-         return getconfig(section, item)
-     return getconfig(section, item, CONFIG_DEFAULTS[section][item])
-+
-+
-+class templatekeyword(object):
-+    def __init__(self):
-+        self._table = {}
-+
-+    def __call__(self, name):
-+        def decorate(func):
-+            templatekw.keywords.update({name: func})
-+            return func
-+        return decorate
diff --git a/dev-vcs/hg-git/hg-git-0.9.0_rc1.ebuild b/dev-vcs/hg-git/hg-git-0.9.0_rc1.ebuild
new file mode 100644
index 000000000000..5db03cc9263d
--- /dev/null
+++ b/dev-vcs/hg-git/hg-git-0.9.0_rc1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PV=${PV/_rc/a}
+DESCRIPTION="push to and pull from a Git repository using Mercurial"
+HOMEPAGE="https://hg-git.github.io https://pypi.org/project/hg-git/"
+SRC_URI="https://foss.heptapod.net/mercurial/hg-git/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-vcs/mercurial-4.3[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.19.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index d110a12de195..159d002a3e48 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -5,8 +5,8 @@ AUX mercurial-4.8.1-unbundle_zstd.patch 393 BLAKE2B 8556147baa6e493ee81aef1a68b2
 DIST mercurial-5.2.2.tar.gz 7333065 BLAKE2B 9cec5a6ebe4693a1b96fe268211aa2eaa06643d5b8812c427757839d5389319f0e2ff3c1ed964a56bf8a3c46f7630321abf508c61691102856dfbdbd72fed662 SHA512 875e75587ab1f1c54edd2f7198dff21e6b287425f215a9d28ef98d5359420df90ca7ef0128ec7b772c4a31dc95b1082b4d6d28f1754968a08408516ba9ec91ee
 DIST mercurial-5.3.2.tar.gz 7514256 BLAKE2B 250ecd5c0a64138cbcda599513efba7b040c0fed0f020c73ade2525e0ef8a9ad06c10c5df4e16eb9bbeb3ab0f2cbb622a65f6d4827b269654c662810ef0385fb SHA512 b0afcf82b51676d2e7592eb9b29f9611d59816399166400027b6c8b29c10c9ddc96b57f7913e78f938b1345bb7ac29ecd4ddc793165b7cf192c3c7a95712cc99
 DIST mercurial-5.4.tar.gz 7722447 BLAKE2B 9abd7b62ca6e44ede626331d080f7a0e8e7fb980c169fbfc2e847549c915b65789e317b674a8317bf58ced3cab4e2de790513e45c6556d32cac649fe23e04fdc SHA512 5f92d653ab74da4696ba7f1402e6cb219c0c514a5eeecb9d7282ab95aef2c6f16d5c8e3d0149525f3dc694a133c713b671ba92327e1b0dc3ad8701d522986d8d
-EBUILD mercurial-5.2.2-r1.ebuild 4254 BLAKE2B 543b201e0a2e3b5f1b0aab0a923232d08827644cf0f8037b6e085b7fa3f2db1941fa1bc37168d4424af46da351c7b47a8cfa38ed7bd775d3848aa4a65c457098 SHA512 7c514839c68522b7fc97ef8af14abe0a7595612d6fb7daca714e1f7e53f9627d5ef63e096e459c80a47e66177ba9704df8db3193ef621bc9b7d4ae35da98e39d
-EBUILD mercurial-5.3.2.ebuild 4261 BLAKE2B 7f9c514844fb1273c798cb950fb5a6297fd0a4e1507b05ff54eeaa5bcc93ad4da5c998d09b1ed9ce987d72947fef8a5ff049646e6eec4851c6baa3914d6f431f SHA512 1859206f9bf314a09809c7b9a2375501c0b386e28eb2f4f4d515786f270050c50d3748d50ec8b70e620ebc8fe2768d10ad23895d6aff6fcc1ea50228ee50534b
+EBUILD mercurial-5.2.2-r1.ebuild 4255 BLAKE2B 5c5674ed8531f928586ce757e427d993b807fd60a468cbcd20dd7808887ce08a2bc3895998defc5b710811d5da879f2f988206a77f864d2b3e30ed4656ccf494 SHA512 3f2a17bf0cfa8ab76402ffb5f125b6e8f1de461a86be0ba6ea4d59f0a9f0437118358257f29a9b05adf8101f9094764f1ce4440cb2a75f82da0ffaa837078f76
+EBUILD mercurial-5.3.2.ebuild 4262 BLAKE2B 33d5f02a567bc2ad2e408e128fc086f0cf677c43505a91a6a2cf09839bf9cf3746d066a92f53b88749f9d113e77ca7489fb4cf3b66d4a9786439c3d31b5385b7 SHA512 18bea024806a77d0c6b24c23ed87bb1de4831066abe55d6f0b385d7cf39a276399dd89400ae6b6988a70b31f4190d97b4548610c82693713264979f8d022bbc0
 EBUILD mercurial-5.4.ebuild 4266 BLAKE2B 070746bf6e8b7a1ab4ee60dba7cfaf9d3e6c7e9ed513cbdc31039c28eef80e7aa0f7c4749a5527a511d8627d4d4e43e157482fe2f164af8f79f0761cd3b900bf SHA512 725e6dda70241f4688783104c9cddc5048d61c071f4be85ea37c16d12a7b1257da8666031e3b4bd8b00b7d95f4b199adb1f0bb95755b71cc2b067791d3020a39
 EBUILD mercurial-9999.ebuild 4219 BLAKE2B 567a43e6491cf5317dd96998a57a6d562d07583a9b45ff4f45d01f1f2e1b61243ac646356efb90d86da51dad6634d5ea9a574a348ed73f4a2acf484a2608083f SHA512 d4e0373b8374205a72141e1376b7b17a209cd0e83456e5a0f95d382fa8b20173274f65cac74151a7dd99afb56a50cddf1fe352007fa5e1d7e198b5a37529f3c1
 MISC metadata.xml 483 BLAKE2B f81d3e855c41f0f5bef819cf4fbb537591f187917c76b5d153f9bf5f4cc14959c5aeef17ec9e5a0596d8e6bd2d8db0ad86dd4dea5ddfdd44a4c063acdc6a8a81 SHA512 3132d4cf6a2ba22ee8f93aef8de590bd576143dd80f56d515afb14cd5962899c0dfc4aee8552f041bac77b997055b2b407bad104591286be985de839f159fc83
diff --git a/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild b/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
index 0e787e47cd80..b44d17881df0 100644
--- a/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg emacs gpg test tk zsh-completion"
 
 BROKEN_PYTHON="
diff --git a/dev-vcs/mercurial/mercurial-5.3.2.ebuild b/dev-vcs/mercurial/mercurial-5.3.2.ebuild
index b296c9f4cc6f..54d98257aa1b 100644
--- a/dev-vcs/mercurial/mercurial-5.3.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg emacs gpg test tk zsh-completion"
 
 BROKEN_PYTHON="
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index a414847e38a3..580ec9f30944 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,10 +1,6 @@
 AUX stgit-0.16-man-linkfix.patch 429 BLAKE2B 11cd98b7a58a55fed445be700bc492a4fd926b9bac20a54e095b9c9470d6294a4c32800622b42e87ff10908a40a2bf71e8e139dc306ade3b4989c10609dcceaa SHA512 c71e32a6e6b007ebbbe738dae93bf2109d2be1ed3f3418c98c6ff6ebb602fb8523f974160276649bb66745340d752d69e87c9f0730ca3dd595a6b2b32a0104df
-DIST stgit-0.19.tar.gz 246256 BLAKE2B ece625a0f78f4a80a9a20b25d0638ee71475029ebd861b28dccc444a70d631e687372031c2dee03faebc8890b8742674d6fd7c2ee1794e8a2d7044721a254847 SHA512 0edad0c600145fc779262ddae4300d4718fd04316face62cb1fb5c01e39cb0824355091863aae8d5b14bee9ebb36ac591e5e0dc9fe343c12a7c781227cac6330
-DIST stgit-0.20.tar.gz 319696 BLAKE2B 85402c84148f5ec93c65be2899240ffa143049de63f734e56438fd17d59ba32cacd279dc3d2eb306ebd11f139f2b4183be814989443401f7d696eba93228a1b7 SHA512 45c4715f7b0c8d8e7f1104694feac7bff07428a6e532ba41bf30807b715990cc1b22a1e82757bb72eb886b987b7c9126d729f9fc161c03497c4d9fa719aae599
 DIST stgit-0.21.tar.gz 319605 BLAKE2B 92bb879d8b8804c8a1b2ca8038d010a0b5118970a4482d87d6bc295992849511c33acb46f376034af6609d42c0323d692bff0ea9bf217cc860e53915fb3c982e SHA512 394c2b30596819f1376bd7432be6923a8dad73f58f049022fe64d1520fd75418665af8069aac98843df051f7fbefbb367762ad4ba57f13bf747819035c7d63ee
 DIST stgit-0.22.tar.gz 308815 BLAKE2B 46c6214012b8d6973273bec716b1ffdafde3ea17930da94de0f73e91e8753fc7ce1d890964c8fac1d32e6343f86e54057b732414fb187b5c9f50e2fa581e6321 SHA512 bfef074b952e01d9041a4ed5dfc6786c29ebb4b09a424ca09e9131ad21c418c4d79ec13eb908f5e8b015ebbc709aacb13824a1c9cad6d97e018a166b014c5e6f
-EBUILD stgit-0.19.ebuild 1882 BLAKE2B dadb04a29107bfbf0c5c897a87832530fe54829dfda617ac890f957d5024f3ca92ac9d2cfe25d1726fdb45504752aa456f1664850a3367700f24d89f05caeb1b SHA512 a39ef9bfceac8f443a7edfe0997c579b6a3d97fbd3d1cbdc0d76d9fb82d15a3368930099442f66a4cf87dbae525cd09341a6e9872e7bc30ed32edd5fb39f99a0
-EBUILD stgit-0.20.ebuild 1887 BLAKE2B 093a1f795c94a8943913d61b292b0157260bebfd3d80c262cb858f8a81440778f92fe0a30af396665bfa1ff8dcfcb5f4f6517aac8305370dafe43354b9a5babb SHA512 7ca719e9e4ce7c0b51499e007df93243adcdd99fef0c24dec6ad9527c4052cc2241e5e31f2eb7fd9151575efdc928232c42c7a31c74e6015f711d73ff37f3c15
-EBUILD stgit-0.21.ebuild 1889 BLAKE2B 87652129693e5648f177bb6412fdc45d7414237f636660a9f5ad22f167626bb64e773a14ef58b0d7b66332ec24974dded6060ecf9e22384926a9396ee3ae6352 SHA512 351e7a3389ead3b879b7fa5667559c2974c08111b371291b9866590e0a90f48e18f341a4667c5157ee280af9c6e0d26663b1e0f3d17bda072b5766d591f25f81
+EBUILD stgit-0.21.ebuild 1883 BLAKE2B aedcb46f09e670914d19905483f6974b36196a9d746490a9368376d06d83786754b96513ade7df8203e02286745135e8a127d7bed043f5ecd8ca84620eb50528 SHA512 f1f2a8a7ec098783ccf6061eb51a38e47adac3f5c66b473c7f8b886306951eb5f5efc6455c4460278b590ae70976a8d376ccda34be886c5cedb335cdd02d3d30
 EBUILD stgit-0.22.ebuild 1889 BLAKE2B 87652129693e5648f177bb6412fdc45d7414237f636660a9f5ad22f167626bb64e773a14ef58b0d7b66332ec24974dded6060ecf9e22384926a9396ee3ae6352 SHA512 351e7a3389ead3b879b7fa5667559c2974c08111b371291b9866590e0a90f48e18f341a4667c5157ee280af9c6e0d26663b1e0f3d17bda072b5766d591f25f81
 MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8
diff --git a/dev-vcs/stgit/stgit-0.19.ebuild b/dev-vcs/stgit/stgit-0.19.ebuild
deleted file mode 100644
index b3260fa330ca..000000000000
--- a/dev-vcs/stgit/stgit-0.19.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Manage a stack of patches using GIT as a backend"
-HOMEPAGE="http://www.procode.org/stgit/"
-UPSTREAM_VER=
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${UPSTREAM_PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND=">=dev-vcs/git-1.6.3.3"
-
-# NOTE: It seems to be quite important which asciidoc version to use.
-# So keep an eye on it for the future.
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-		dev-lang/perl
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.16-man-linkfix.patch"
-)
-
-pkg_setup() {
-	if ! use doc; then
-		echo
-		ewarn "Manpages will not be built and installed."
-		ewarn "Enable the 'doc' useflag, if you want them."
-		echo
-	fi
-}
-
-python_prepare_all() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && \
-		eapply "${WORKDIR}"/patches-upstream
-
-	# this will be a noop, as we are working with a tarball,
-	# but throws git errors --> just get rid of it
-	echo "version=\"${PV}\"" > "${S}"/stgit/builtin_version.py
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	# bug 526468
-	if use doc; then
-		emake DESTDIR="${D}" \
-			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
-			mandir="${EPREFIX}/usr/share/man/" \
-			doc
-	fi
-}
-
-src_install() {
-	if use doc; then
-		emake DESTDIR="${D}" \
-			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
-			mandir="${EPREFIX}/usr/share/man/" \
-			install-doc install-html
-	fi
-
-	distutils-r1_src_install
-
-	newbashcomp stgit-completion.bash 'stg'
-}
diff --git a/dev-vcs/stgit/stgit-0.20.ebuild b/dev-vcs/stgit/stgit-0.20.ebuild
deleted file mode 100644
index 7bfcddb4aaee..000000000000
--- a/dev-vcs/stgit/stgit-0.20.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Manage a stack of patches using GIT as a backend"
-HOMEPAGE="http://www.procode.org/stgit/"
-UPSTREAM_VER=
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${UPSTREAM_PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND=">=dev-vcs/git-1.6.3.3"
-
-# NOTE: It seems to be quite important which asciidoc version to use.
-# So keep an eye on it for the future.
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-		dev-lang/perl
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.16-man-linkfix.patch"
-)
-
-pkg_setup() {
-	if ! use doc; then
-		echo
-		ewarn "Manpages will not be built and installed."
-		ewarn "Enable the 'doc' useflag, if you want them."
-		echo
-	fi
-}
-
-python_prepare_all() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && \
-		eapply "${WORKDIR}"/patches-upstream
-
-	# this will be a noop, as we are working with a tarball,
-	# but throws git errors --> just get rid of it
-	echo "version=\"${PV}\"" > "${S}"/stgit/builtin_version.py
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	# bug 526468
-	if use doc; then
-		emake DESTDIR="${D}" \
-			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
-			mandir="${EPREFIX}/usr/share/man/" \
-			doc
-	fi
-}
-
-src_install() {
-	if use doc; then
-		emake DESTDIR="${D}" \
-			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
-			mandir="${EPREFIX}/usr/share/man/" \
-			install-doc install-html
-	fi
-
-	distutils-r1_src_install
-
-	newbashcomp completion/stgit.bash 'stg'
-}
diff --git a/dev-vcs/stgit/stgit-0.21.ebuild b/dev-vcs/stgit/stgit-0.21.ebuild
index caede5a5d004..4ca1755f6627 100644
--- a/dev-vcs/stgit/stgit-0.21.ebuild
+++ b/dev-vcs/stgit/stgit-0.21.ebuild
@@ -18,7 +18,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"