gentoo resync : 16.09.2020

34 files changed, 302 insertions, 93 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index f471ae9524c7..d040f6512d45 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 29f5fb6b0117..b040cc16c58e 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -2,5 +2,5 @@ AUX fossil-2.10-check-lib64-for-tcl.patch 445 BLAKE2B a8282820edafb15ae6542b9f13
 DIST fossil-src-2.11.1.tar.gz 5850806 BLAKE2B 640807055100888d6bfea13539efb02190f07db5edcec58025952e464d50d4bd13992e5e8f5e515b01f52eaa3409d7a536bd4b48aecb5fdcf6214e47dc4963ed SHA512 055306c0d5c2f9b536ace6385ed79b5ced56d77dfc8e08b38f51075e97dfebfffca10aa7e17d2b22b9945c71b12eb131d49f3651e2890820dc9cb04719cd0265
 DIST fossil-src-2.12.1.tar.gz 6011181 BLAKE2B f9437c4fb20314706bbbec70efbb6a53e2ac7760986baf88ea72505f03877a5d1069d0d2828aa2bfefac96c1358e4c8f824405d61fd24d490442fa8b768711e9 SHA512 08b7fef5a3071e968dedbc645aebf2e873ecf80049b5986d38f851a407b2b8b0c854cfcdfa5ec80eac5bc1b158c5fac3bb4b263d1adb8be470529e67dc6e8cee
 EBUILD fossil-2.11.1.ebuild 1803 BLAKE2B b54945558e0ea1c47fb53bba1791c336502b4313944f1e2b136233090de7fff386bbb34fd767fd4ebbae9dd8e1e7a9f82184772f06fb57d1a4f3fd8c26ce7c6e SHA512 904b64bcd8c4d6ea15133ada565655751388fefd455e795725f883707fb41e6d9db4237307c4d725b10a78a289e997c40dcca5970fa53219eddfb7f8629c7fdc
-EBUILD fossil-2.12.1.ebuild 1808 BLAKE2B 310f26c69a11c49587ff79db06f49a7c54a7501487c85c487df6f54da38404df2d4ceafee93a700e88166187793309571880f335c75a19b836b29fd2dca752d4 SHA512 a3b413d0d0232a8925881f54e8b33b3eb85774fc09fc5847b108ec153ce8626e2b92fb5a7115fd0b6596e32f12a6b914a44b0aec55ee56e37f2ba69c23ae449b
+EBUILD fossil-2.12.1.ebuild 1806 BLAKE2B febd0057f56cc43b09e58b534063e770c207b17793a2e825ad54e70a5e89ebbef6267c65e560e9f9e4cc5573665e0ca5ab483af77bd793c3b08a48c20f586c94 SHA512 87004dbe90b567ea0a48672d0b40f3e4096ba13ffb5c2ddbfcf7be935a5ccfcf4a16dcd6d36163af2b4b1332610f12c9818e18a88f2f8edd36dfca5d668fc7d3
 MISC metadata.xml 1165 BLAKE2B c370f1370c7250945135e56514558acd016742f6d8a9c51e98b9533e094b47dbdc07808abbb1341ad1e987dac6f5f13d2e2f0fef45587935accf082c15227330 SHA512 6ef05c3722bb110e403294b002c253eb1ae4f29a4f5306dccee3abd52ce61c8ae04ed2255f551298d94b8b99d96c799f05bd6df7a9d4e9af08e4c10ce306d0ab
diff --git a/dev-vcs/fossil/fossil-2.12.1.ebuild b/dev-vcs/fossil/fossil-2.12.1.ebuild
index e75b80518477..62eb7be69f19 100644
--- a/dev-vcs/fossil/fossil-2.12.1.ebuild
+++ b/dev-vcs/fossil/fossil-2.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+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"
 
diff --git a/dev-vcs/git-bz/Manifest b/dev-vcs/git-bz/Manifest
deleted file mode 100644
index de6f9431832f..000000000000
--- a/dev-vcs/git-bz/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST git-bz-0.2015.09.08.tar.bz2 46980 BLAKE2B c5aae20c4c3946b01620f0cdd33248a67ffc3a3e8fb84bab6bb6ccda778ac82e7fb7fb6bbe463fb13733e5b8bf5ba95d0e316b0dbcee3ef30c5003c353521ce5 SHA512 8a468183f23d182ea566ceb524b05028c483e5eecc0c8babec42d67e99b8779af430d18373e130dcc13c8c58135ac62faf0a700c2731320617b47b00f5678133
-EBUILD git-bz-0.2015.09.08.ebuild 803 BLAKE2B c0794bd2321c2709fa7206efab999d379b440d3c9bf37eef734f2ed41247a71469b6c6673f955aaf9500874532986e9a9449a3f95718c73c5eea34050df8dfe6 SHA512 45d41ebd5cd1383b1268aceecfc7091f9f2cdfafac447a7a16ce64b869075e5512c10dcb76bac27d0f6c5e3cea043b3da0333aa8ac1e4b0c12ece433372a5ac1
-MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-vcs/git-bz/git-bz-0.2015.09.08.ebuild b/dev-vcs/git-bz/git-bz-0.2015.09.08.ebuild
deleted file mode 100644
index b2b53fc0f807..000000000000
--- a/dev-vcs/git-bz/git-bz-0.2015.09.08.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite'
-
-inherit python-single-r1
-
-DESCRIPTION="Bugzilla subcommand for git"
-HOMEPAGE="http://www.fishsoup.net/software/git-bz/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-vcs/git
-	${PYTHON_DEPS}"
-
-src_configure() {
-	# custom script
-	./configure --prefix="${EPREFIX}/usr" || die
-}
-
-src_install() {
-	default
-	python_fix_shebang "${ED%/}"/usr/bin/${PN}
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/pycrypto; then
-		elog "For Chrome/-ium cookie decryption support, please install:"
-		elog "  dev-python/pycrypto"
-	fi
-}
diff --git a/dev-vcs/git-bz/metadata.xml b/dev-vcs/git-bz/metadata.xml
deleted file mode 100644
index 0319eec4c8be..000000000000
--- a/dev-vcs/git-bz/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index 47ea9b794aa7..4a8afe6e54b9 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,4 +1,4 @@
 DIST git-flow-1.12.3.tar.gz 66173 BLAKE2B c6045fda9df8e305ccde8fac844614c840c5361f41848af6bf3394f64ffbbc5b03c20ed966960667d9aba76b0ed105f4caa2a5c0d5eab02a24720bff7b0aea48 SHA512 807cd36de7f5c9b4a7b28101de5ea8cfcbf528ff76578e4914c788b8098c7d3d91f8c19a3274e124ee7f7b4bdb6efdc5de2b74e09f374b71ae685beaa86e3e5a
 DIST git-flow-completion-0.6.0.tar.gz 7823 BLAKE2B 24dedfc0cddb5acfa57333895533f5c882a0c85db6e08539ff5c33f984eec40cb06da6d5f0ba812348c9cbf226080875de0269b295791ee5d4c8b2732a1ea1b2 SHA512 1082ad47938ec78045f4cbd12340a82960ba3de204c21a95e1166cb0b86e96dbbc3e5fc8af1945c951d5edd43b4026021761e8377795acbb87af3c1e391cb256
 EBUILD git-flow-1.12.3.ebuild 947 BLAKE2B b6f1f2798e625f6d71c6096e6da68bad4520d0f1893655d2822ac3249e549cb673995d11fa184a16c5599425ba5f31a6d38f34872548eddb9e8e29765d89630a SHA512 50b73fc71b89e87b302913ed49f303212dc69746940bf7c5729b9b39650f6e2da1f7771a2f407f5598ebfde59bdd0dcf83d7dc0cdd600478461e7875c47bd7ef
-MISC metadata.xml 479 BLAKE2B bc1220bb065da9d65d28929adbe6cd94672f6cc92c9dea3a0468048da5a46ab8402cee64b6b63b7ebba7c9efa3acb061fe65e0bac37cc7a346b246049dabbee9 SHA512 12507dc676fc74a491390f9d15733c2a4ceb8f67d7a447aa2068e10f8f7f6020bb031d00a3c1192a01eb89e8d356fe8f200baa35d06c1182432b5aa12fedce9f
+MISC metadata.xml 337 BLAKE2B a8eeb744378930c829e05987de857fe66fc1988bf5d7f35a6e6bf5f86a149795f0d5dc3d21c29dc172ec4e82917ed39976b9558090b65981c6c027e4389ba4fd SHA512 5c4e0c195b36c37750b4d0d941ebfb94183704955806af13184613270332ff8e67749d749e9f84e2a49460435607cf5b50c8b8d7667621d5d3eab10888119cfe
diff --git a/dev-vcs/git-flow/metadata.xml b/dev-vcs/git-flow/metadata.xml
index 2b1cda651a62..8bfb4a949f25 100644
--- a/dev-vcs/git-flow/metadata.xml
+++ b/dev-vcs/git-flow/metadata.xml
@@ -5,10 +5,6 @@
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
-	<longdescription>
-		Git extensions to provide high-level repository operations for Vincent
-		Driessen's branching model.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">petervanderdoes/gitflow-avh</remote-id>
 	</upstream>
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 52eac14498ec..445ab90bbb29 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -29,14 +29,14 @@ DIST git-manpages-2.25.4.tar.xz 459344 BLAKE2B b0ac88f691984f39f6cfbf41d2d61ab44
 DIST git-manpages-2.26.2.tar.xz 462052 BLAKE2B 27fc44360c9f890e9f7754e8423f5596548f076f5fec5dfc6c752e8b3caa5f64ba182c1566b67878b19fbb115297e08def1bf9d2711c7334cbb8e1b20fc039a1 SHA512 9591e94683a6b49d8b9f2afddc826576023fdfa6de6db4af3a28a2af00b175d5be710d86a31d0f1b8320cc38b6f27698e17fb3e8c1f2b0c5ced37296ef1109b6
 DIST git-manpages-2.27.0.tar.xz 470724 BLAKE2B 83db9c5aaf9ada63d4e6146ffa4f20f1d21797ba7c7b27ade9d6f4dedb1091591b8afe4f368a4433cf75d2b148d68cec725f5504504c703eb7c22916d17b8069 SHA512 a4ceb7b86d67d15a52fec22e9bac5c8b1a5447041c3278710c2e24f70d6d443853d6a6ec5eb5ab7633390c5fa2494dd495096c26a6467d9cb13d9da007a73d12
 DIST git-manpages-2.28.0.tar.xz 472524 BLAKE2B 84752bee094eb879be8905dd561593e9f2a71d91971be7be83ed421bdeef83f7165f9506297bf23127a46a1d05c718999dab6b3ac3bda0ce0fba95ca64145de8 SHA512 ba4d41c2c2efd1eb5ab8ccf00efcebbc2fbbd31ab325da66b05181d15f677c2fc97c9eefd58c3b1c75a07276b399214f398df8d084c1a5092f982ce392876a2f
-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.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
-EBUILD git-2.28.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
-EBUILD git-9999.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
+EBUILD git-2.23.3.ebuild 19572 BLAKE2B 5841475703086587bb399d8c7f7298b9a3da33184fe7a9f060a8d286a8392014bc6133aa4ed4d727f0d7c37915d900d7d760ad994909da32061152bfe5f9bf2f SHA512 5ef0dcfd745b800a27fbbe8186c3050fc11dfac243bdb54e590d45f50a24645204b9eb5747ef3e2a0ed8b760aa3a38c7bad66357e900b4ed151a100d0e8dca3d
+EBUILD git-2.24.3.ebuild 19520 BLAKE2B 8d0545fe4531bcc09138641ae52c5840a30ea884194bd3106957447988869bd3c3d1e343285d6f2c49374bd06532e462613f3016b6bfccfe2172a6713be51b53 SHA512 e017844d87dee555355ddc45f25bdff34d75a1f3a3d49e5f214aead8fbbd0316f0f39abe1afcca919c7b83ff226c00fb4524dd900983a9c7811d0d167d946673
+EBUILD git-2.25.4.ebuild 19520 BLAKE2B 8d0545fe4531bcc09138641ae52c5840a30ea884194bd3106957447988869bd3c3d1e343285d6f2c49374bd06532e462613f3016b6bfccfe2172a6713be51b53 SHA512 e017844d87dee555355ddc45f25bdff34d75a1f3a3d49e5f214aead8fbbd0316f0f39abe1afcca919c7b83ff226c00fb4524dd900983a9c7811d0d167d946673
+EBUILD git-2.26.2.ebuild 19520 BLAKE2B 8d0545fe4531bcc09138641ae52c5840a30ea884194bd3106957447988869bd3c3d1e343285d6f2c49374bd06532e462613f3016b6bfccfe2172a6713be51b53 SHA512 e017844d87dee555355ddc45f25bdff34d75a1f3a3d49e5f214aead8fbbd0316f0f39abe1afcca919c7b83ff226c00fb4524dd900983a9c7811d0d167d946673
+EBUILD git-2.27.0.ebuild 19529 BLAKE2B 72e4fcd7d3f80fb563d5f9621066e73ce939beabcf74833557e513aeb10fe6bdff1ca8b853893d8b9988c813d81693132faf0928b0785f9a7ab44f8c2af72aec SHA512 acb6319405d397c136faca7456dca8234291761aa21a7388aa068977a32a47b000821ed7c0d19e467c8298ae0ec42a092df3e9e19d5c79e989a340b1377ff9e0
+EBUILD git-2.28.0.ebuild 19529 BLAKE2B 72e4fcd7d3f80fb563d5f9621066e73ce939beabcf74833557e513aeb10fe6bdff1ca8b853893d8b9988c813d81693132faf0928b0785f9a7ab44f8c2af72aec SHA512 acb6319405d397c136faca7456dca8234291761aa21a7388aa068977a32a47b000821ed7c0d19e467c8298ae0ec42a092df3e9e19d5c79e989a340b1377ff9e0
+EBUILD git-9999-r1.ebuild 19529 BLAKE2B 72e4fcd7d3f80fb563d5f9621066e73ce939beabcf74833557e513aeb10fe6bdff1ca8b853893d8b9988c813d81693132faf0928b0785f9a7ab44f8c2af72aec SHA512 acb6319405d397c136faca7456dca8234291761aa21a7388aa068977a32a47b000821ed7c0d19e467c8298ae0ec42a092df3e9e19d5c79e989a340b1377ff9e0
+EBUILD git-9999-r2.ebuild 19529 BLAKE2B 72e4fcd7d3f80fb563d5f9621066e73ce939beabcf74833557e513aeb10fe6bdff1ca8b853893d8b9988c813d81693132faf0928b0785f9a7ab44f8c2af72aec SHA512 acb6319405d397c136faca7456dca8234291761aa21a7388aa068977a32a47b000821ed7c0d19e467c8298ae0ec42a092df3e9e19d5c79e989a340b1377ff9e0
+EBUILD git-9999-r3.ebuild 19529 BLAKE2B 72e4fcd7d3f80fb563d5f9621066e73ce939beabcf74833557e513aeb10fe6bdff1ca8b853893d8b9988c813d81693132faf0928b0785f9a7ab44f8c2af72aec SHA512 acb6319405d397c136faca7456dca8234291761aa21a7388aa068977a32a47b000821ed7c0d19e467c8298ae0ec42a092df3e9e19d5c79e989a340b1377ff9e0
+EBUILD git-9999.ebuild 19529 BLAKE2B 72e4fcd7d3f80fb563d5f9621066e73ce939beabcf74833557e513aeb10fe6bdff1ca8b853893d8b9988c813d81693132faf0928b0785f9a7ab44f8c2af72aec SHA512 acb6319405d397c136faca7456dca8234291761aa21a7388aa068977a32a47b000821ed7c0d19e467c8298ae0ec42a092df3e9e19d5c79e989a340b1377ff9e0
 MISC metadata.xml 2277 BLAKE2B 49819fd1ea6ca2a1cf2043fde6d4cd9197db5ef44543fae528475524a35ee52d31a04f20c638b892a6d8c4dd757d302bfd43efb41242e98351d01db7654c2a05 SHA512 65b8ef639ddbec202cc7bcbed31c109d8f6fc64e52d47522eb38955401bea86a846390cfddbebd946f5f5941be83c401a1028d6721e12c6317f92a63568b56cb
diff --git a/dev-vcs/git/git-2.23.3.ebuild b/dev-vcs/git/git-2.23.3.ebuild
index 5bcc5dc91c6f..355a12921dc7 100644
--- a/dev-vcs/git/git-2.23.3.ebuild
+++ b/dev-vcs/git/git-2.23.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
diff --git a/dev-vcs/git/git-2.24.3.ebuild b/dev-vcs/git/git-2.24.3.ebuild
index bb1534e97f9a..d2136e6f43f2 100644
--- a/dev-vcs/git/git-2.24.3.ebuild
+++ b/dev-vcs/git/git-2.24.3.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_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
diff --git a/dev-vcs/git/git-2.25.4.ebuild b/dev-vcs/git/git-2.25.4.ebuild
index bb1534e97f9a..d2136e6f43f2 100644
--- a/dev-vcs/git/git-2.25.4.ebuild
+++ b/dev-vcs/git/git-2.25.4.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_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
diff --git a/dev-vcs/git/git-2.26.2.ebuild b/dev-vcs/git/git-2.26.2.ebuild
index bb1534e97f9a..d2136e6f43f2 100644
--- a/dev-vcs/git/git-2.26.2.ebuild
+++ b/dev-vcs/git/git-2.26.2.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_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
diff --git a/dev-vcs/git/git-2.27.0.ebuild b/dev-vcs/git/git-2.27.0.ebuild
index 35ba555d64a9..f50e94d2e745 100644
--- a/dev-vcs/git/git-2.27.0.ebuild
+++ b/dev-vcs/git/git-2.27.0.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_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
diff --git a/dev-vcs/git/git-2.28.0.ebuild b/dev-vcs/git/git-2.28.0.ebuild
index 35ba555d64a9..f50e94d2e745 100644
--- a/dev-vcs/git/git-2.28.0.ebuild
+++ b/dev-vcs/git/git-2.28.0.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_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 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 35ba555d64a9..f50e94d2e745 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_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 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 35ba555d64a9..f50e94d2e745 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_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 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 35ba555d64a9..f50e94d2e745 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_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 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 35ba555d64a9..f50e94d2e745 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_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
diff --git a/dev-vcs/github-pages-publish/Manifest b/dev-vcs/github-pages-publish/Manifest
index 0d7a8e3504e8..5aed2cad10b0 100644
--- a/dev-vcs/github-pages-publish/Manifest
+++ b/dev-vcs/github-pages-publish/Manifest
@@ -1,3 +1,3 @@
 DIST github-pages-publish-0.1.3.tar.gz 3568 BLAKE2B d19d9d218d584f92a70016b6522b1e27edecf7de8dcc1fb4ca790980ec2a4ffd4f401f11ac7cd2483e5e723f9ae088678dc3aa346eb66de536a5c10435ff1953 SHA512 a501a6fbdf10038a35b5df8add58a79813d6cc2b26b2bfed2a2db7d02740c587a60402459c2fcdeeec66c72f1d5df532023490219daba14ce60782a2018b93d6
 EBUILD github-pages-publish-0.1.3.ebuild 755 BLAKE2B 655da651e3a39a4c2beda67a829e28eb7a00e3bfe0adeaff1c95106570cc058cbb64468fe3d52fb1af1b2331104f1f8bdd303b9f9d47544119ed4ba509ec84ab SHA512 5779dfa8da944a458409ab8c859ea4f99612283d824608976e4ddc838efe48e6a2e242ef318051e0bc02ae7bcd941b27936b99637c51174ebf4e9f1a9c167e98
-MISC metadata.xml 690 BLAKE2B 44cba5368226e6cc68ef5625a155c4aa41c243515e11ffea4886dc0a33d85f21c0b171910fa301429ebcb9f7fa93b41f5a565486f37d5391102ea38c93470d00 SHA512 e06cae5ac90a76620423fc720abee1165f4d0856fb083275e7d7f9c93c9c5689cd3d2b87489fe33bced9c3ad1d91f1eb681413abbb3ddd0079addf8a183fa025
+MISC metadata.xml 538 BLAKE2B 6fcb31332ebbdeff780c6baaa38e62aa94e5fddcb06ae01892d78a8fd914bb61dda690d65865caa533d8e44fd15956c344e23c268d4b046a76b9296fc85862a6 SHA512 6c463b6f1cfa87d3e08baeb74e2e2daf747864989819df43e1e0c83ee6f1eab6a2cffad4afeaa4a057c61c225340f146bbd8edc397b023919b024267dd454a7a
diff --git a/dev-vcs/github-pages-publish/metadata.xml b/dev-vcs/github-pages-publish/metadata.xml
index aac060ab13fd..725d129c2da6 100644
--- a/dev-vcs/github-pages-publish/metadata.xml
+++ b/dev-vcs/github-pages-publish/metadata.xml
@@ -5,10 +5,6 @@
 		<email>rafaelmartins@gentoo.org</email>
 		<name>Rafael G. Martins</name>
 	</maintainer>
-	<longdescription lang="en">
-		A script that commits files from a directory to the gh-pages branch
-		of the current Git repository.
-	</longdescription>
 	<upstream>
 		<maintainer status="active">
 			<email>rafaelmartins@gentoo.org</email>
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 2cafcaeaf3c3..6a282d741377 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -3,8 +3,10 @@ AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb40
 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.2.tar.gz 7730738 BLAKE2B 689a50e1675f678436bb805a5de1379646943f865734a85ef39187f4d90007125c33d6f8dfa6256510fc4214c82153060c671c601fe4b7810f1df77f5b542ed2 SHA512 92d730e330dcf333b2c8f6b784582e3a639759bcad594ac06b4e92f567a70c6938e33a3c322286d6b3ccccaedb634ad3febd2cf927702b3826013a76af2a9c15
+DIST mercurial-5.5.1.tar.gz 7759341 BLAKE2B 285100036543c6a74a6ec6c3d055b5fcdc8ed044092b1b3699b16412eab4d85179baac42a0a27081aa715af0215c39a511728ae947689628e0c4717bdbeed209 SHA512 9cf02dd637154a5205d81eddf69681bd05405a29592c348c9d9cfa3b57ad3e678f98876fa6899d85d33a502b61f81e320262c7da394efb55fcca1d1219ca7cf5
 EBUILD mercurial-5.2.2-r1.ebuild 4058 BLAKE2B 34042ced46f70b449bd2b5227a6b75189fed424a0ebbe5a89aafe5fe333ad69d4fd9be38408839540a31fcc6f88bc57b9c8e6a1d9b0467a21e362df1a1c37742 SHA512 7d7d5bd4c6883256c5a5554ac31134b5bb4f78b28cbc84711a6ce70852419c9e1924cf05facc793ec0a6813bf5b6570436e30f41391873cf8e8ea272e095b3e2
 EBUILD mercurial-5.3.2.ebuild 4065 BLAKE2B fdb792f9fa429c7e2a28eed69108307ff3e90842c11a7814b2d73081170201cde11105f688dc1b3b5b561111a490f8854dcdc07bb54c450dc08dc9735378f91d SHA512 db9fd1d352cfec13b4fc5686b1d8f7e7dce992d9424a064a6f7db81c5c769d18c088fca40cc661614e6a5cc127f57bbbdc54bd756dd0c3d327ce6e76017a0b90
-EBUILD mercurial-5.4.2.ebuild 4069 BLAKE2B 29c243c2ec8289596271a0555f40cf8c3740f372279a0586cda67b8ddaf6e9d294c7b18cd777557283b0cb448d601577c2c203230d24ccd5b4c6ba1fbc9683a0 SHA512 20606c5a0b4f29e688c465954917ed7c72c51c410a5ab948262e34d9056a792aef952a611bd0da3e005579f0c73306092feb4b0c5dc80ea31c577a1ce7d318bd
-EBUILD mercurial-9999.ebuild 4032 BLAKE2B 802015b5f8f386bf38d7397aec896b4ae0557b6096295dd103adb29c75fad955e280d90032ecb8f28686fe7b7f69faa523775ce19b770c43dac17378db8ee451 SHA512 1c5cad662f4482fa1ec1f25824f367b72fd9e2a3b79b058ef852c3a30ef1a974aecdd39d0e8da19aedf7d7a92f3ac49c718d200b1699e106c685d448efe8f250
+EBUILD mercurial-5.4.2.ebuild 4073 BLAKE2B dced5716e83ef3d2922b71a304a475ef0ce3cfb70d7f06bb7f9c0539097c2770803b060874085838c01beadd6f98ebcd20f4eabb3c372050de81366b1e4c967b SHA512 485af7244bb419b8309f33ba78b1746e605aab363b376b74b6eb0356d3daed7a89b5c9b8ad60113b9de448fa7cb0120ffd4ff807017a94c1b43c4f9b4eca0e78
+EBUILD mercurial-5.5.1.ebuild 4076 BLAKE2B d10bf251406f0d696d58ab7fb44cbcc8f2f8a3d11be6d3c69f258b07e2f6761d3ac23ef73f00810fa87fab9cc1f48e30a2f8ee1b2cf6bb063e4251a972bbf6bb SHA512 e6167adc94277ca62e06d5078d41b2f14b34320700996bdc8f014e5c55806a52f2af7b15dc54479aaeae63fb403ac53f0224c7f9722fc0bd69454601632ce598
+EBUILD mercurial-9999.ebuild 4022 BLAKE2B 3eb57bf9fa8e98e4c3fe69bf32a0c680dd52c078432cf06552bb3fa171a60deac1f7846f9798891a814be1d30966241214993326aa038be1f4111bb1953ed47f SHA512 82bb2b230fa1919805e388283350a270e0db8d38d48c3532cadccd5d3d7e8ebb3dcc9d670c97adac0005f021afc0f035054c1608787e840256d1f30613d823a0
 MISC metadata.xml 483 BLAKE2B f81d3e855c41f0f5bef819cf4fbb537591f187917c76b5d153f9bf5f4cc14959c5aeef17ec9e5a0596d8e6bd2d8db0ad86dd4dea5ddfdd44a4c063acdc6a8a81 SHA512 3132d4cf6a2ba22ee8f93aef8de590bd576143dd80f56d515afb14cd5962899c0dfc4aee8552f041bac77b997055b2b407bad104591286be985de839f159fc83
diff --git a/dev-vcs/mercurial/mercurial-5.4.2.ebuild b/dev-vcs/mercurial/mercurial-5.4.2.ebuild
index 904d75ce7a99..0fc50bd105b8 100644
--- a/dev-vcs/mercurial/mercurial-5.4.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.4.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 ~riscv x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg emacs gpg test tk zsh-completion"
 
 RDEPEND="
diff --git a/dev-vcs/mercurial/mercurial-5.5.1.ebuild b/dev-vcs/mercurial/mercurial-5.5.1.ebuild
new file mode 100644
index 000000000000..2b111cea9199
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-5.5.1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..8} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="https://www.mercurial-scm.org/"
+SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+chg emacs gpg test tk zsh-completion"
+
+RDEPEND="
+	app-misc/ca-certificates
+	dev-python/zstandard[${PYTHON_USEDEP}]
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )
+	zsh-completion? ( app-shells/zsh )"
+
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
+	test? ( app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}] )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+# Too many tests fail #608720
+RESTRICT="test"
+
+python_prepare_all() {
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+	# Use absolute import for zstd
+	sed -i -e 's/from \.* import zstd/import zstd/' \
+		mercurial/utils/compression.py \
+		mercurial/wireprotoframing.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	filter-flags -ftracer -ftree-vectorize
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile build_ext --no-zstd
+}
+
+python_compile_all() {
+	rm -r contrib/win32 || die
+	if use chg; then
+		emake -C contrib/chg
+	fi
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install build_ext --no-zstd
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins contrib/zsh_completion _hg
+	fi
+
+	dobin hgeditor
+	if use tk; then
+		dobin contrib/hgk
+	fi
+	python_foreach_impl python_doscript contrib/hg-ssh
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el )
+
+	if use chg; then
+		dobin contrib/chg/chg
+		doman contrib/chg/chg.1
+		RM_CONTRIB+=( chg )
+	fi
+
+	for f in ${RM_CONTRIB[@]}; do
+		rm -rf contrib/${f} || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+	dodoc CONTRIBUTORS hgweb.cgi
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	rm -f test-largefiles*		# tends to time out
+	if [[ ${EUID} -eq 0 ]]; then
+		einfo "Removing tests which require user privileges to succeed"
+		rm -f test-convert*
+		rm -f test-lock-badness*
+		rm -f test-permissions*
+		rm -f test-pull-permission*
+		rm -f test-journal-exists*
+		rm -f test-repair-strip*
+	fi
+
+	popd &>/dev/null || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local TEST_DIR
+
+	rm -rf "${TMPDIR}"/test
+	distutils_install_for_testing
+	cd tests || die
+	"${PYTHON}" run-tests.py --verbose \
+		--tmpdir="${TMPDIR}"/test \
+		--with-hg="${TEST_DIR}"/scripts/hg \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 3be5d10a8454..a008a42e4067 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..8} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 elisp-common eutils distutils-r1 mercurial flag-o-matic
diff --git a/dev-vcs/python-gitlab/Manifest b/dev-vcs/python-gitlab/Manifest
index e0ab401e7799..8323c7f6c297 100644
--- a/dev-vcs/python-gitlab/Manifest
+++ b/dev-vcs/python-gitlab/Manifest
@@ -4,10 +4,12 @@ DIST python-gitlab-1.8.0.tar.gz 115603 BLAKE2B 8ebebc1735e5531b4f95d82122b6ecf78
 DIST python-gitlab-1.9.0.tar.gz 116460 BLAKE2B f0a0d9679e4e742d966c678f8dcc6b2464e5ae8a013038221b3c484e6bb6ae23c166f82fec85c3560ebbce3cf80bc23657b1b906d8c6f284a64589545acdb035 SHA512 cb0d58896f55837f7088ab08551f2e9f9f82e8a04c19979a69bc042c95cdb2d04174dec49a236ddcf1344c50e9ffc6f929750b008bf6e619225c80bf9490afaa
 DIST python-gitlab-2.2.0.tar.gz 136178 BLAKE2B 23f04638ba34f63048143e834342ea81e8a8cacdbc0502490543bc5b6de9fea6a58c884bc4111aea0fb27a343d22b9dfc62d5000b873ab90105f6aa5a80b7ff5 SHA512 bdf34e4b9e45f5767faf81d52caf1b800d931a105940bb80b1e58cc8efc34a319196a6aa437d49215f0f4ff24359cc2497853486698a23413b2bb3dfe169e5e3
 DIST python-gitlab-2.3.1.tar.gz 142026 BLAKE2B 94bc2c65722fc83abb1793fc9b5eabcb3224ac9087af111c5865ffd0ee553f579187cf881b5dbc20536e6d7956a6c563b9e5ea4866dc4617639413a5e0075146 SHA512 2e48dfb025ca1645e78a3c5b4fa53085819dcffc916c43558a760a9471f08315249d0199d8db1740aba50e895762f48ffb19b1031e6204039229a48f5b93e447
+DIST python-gitlab-2.5.0.tar.gz 148916 BLAKE2B f870833a01adac08b71dc402bc11ba9c1be19c920735faf04de9bfca3b1a154706da4bc0475437997e3b03d8c9a56977a6691df05b750d64a1f8b964ecd05612 SHA512 7382f9ea2388c6916f3c7e63df137d73f0fdfb3890a8bbb47e766f3476b6febecd1dcbc588445ae1af1b5f17c9a3e6ed9a931fd9fff010c2c37967eab5440824
 EBUILD python-gitlab-1.13.0.ebuild 1056 BLAKE2B a5ba3f51a51969f47b0dfdbe1b640f706216bfa107258e21a4c70d1ab7a95f174895d301d8074307f566690873fc2cabc982be781bb573c7fe08d3f8d98a2e91 SHA512 9a52e6e716218183aa453a500e93fe5bd460fbdad72d424115e9ed2d89528859691a27f5cddb81c86d24cfeb6115f83185cf783d707876aeef8c9bb4b45d0001
 EBUILD python-gitlab-1.7.0.ebuild 1056 BLAKE2B a5ba3f51a51969f47b0dfdbe1b640f706216bfa107258e21a4c70d1ab7a95f174895d301d8074307f566690873fc2cabc982be781bb573c7fe08d3f8d98a2e91 SHA512 9a52e6e716218183aa453a500e93fe5bd460fbdad72d424115e9ed2d89528859691a27f5cddb81c86d24cfeb6115f83185cf783d707876aeef8c9bb4b45d0001
 EBUILD python-gitlab-1.8.0.ebuild 1056 BLAKE2B a5ba3f51a51969f47b0dfdbe1b640f706216bfa107258e21a4c70d1ab7a95f174895d301d8074307f566690873fc2cabc982be781bb573c7fe08d3f8d98a2e91 SHA512 9a52e6e716218183aa453a500e93fe5bd460fbdad72d424115e9ed2d89528859691a27f5cddb81c86d24cfeb6115f83185cf783d707876aeef8c9bb4b45d0001
 EBUILD python-gitlab-1.9.0.ebuild 1056 BLAKE2B a5ba3f51a51969f47b0dfdbe1b640f706216bfa107258e21a4c70d1ab7a95f174895d301d8074307f566690873fc2cabc982be781bb573c7fe08d3f8d98a2e91 SHA512 9a52e6e716218183aa453a500e93fe5bd460fbdad72d424115e9ed2d89528859691a27f5cddb81c86d24cfeb6115f83185cf783d707876aeef8c9bb4b45d0001
 EBUILD python-gitlab-2.2.0.ebuild 806 BLAKE2B 068b38234ea175c04fde4d825837331436a29a4c140cb6eed8beea66e1bf548f8634ff903d026a6b6c4418a1fdfc66ae063d8fd9d9cb29141057c0571b0bd640 SHA512 89d2709fc88963d76996f033f9360bbd8a341ea8e6181334cef17ab8796e73efaac79c46e825e3fd1c6732270d96be3a273091571e97bdff0c8ad6a8ab9ffe10
 EBUILD python-gitlab-2.3.1.ebuild 806 BLAKE2B 068b38234ea175c04fde4d825837331436a29a4c140cb6eed8beea66e1bf548f8634ff903d026a6b6c4418a1fdfc66ae063d8fd9d9cb29141057c0571b0bd640 SHA512 89d2709fc88963d76996f033f9360bbd8a341ea8e6181334cef17ab8796e73efaac79c46e825e3fd1c6732270d96be3a273091571e97bdff0c8ad6a8ab9ffe10
+EBUILD python-gitlab-2.5.0.ebuild 806 BLAKE2B 068b38234ea175c04fde4d825837331436a29a4c140cb6eed8beea66e1bf548f8634ff903d026a6b6c4418a1fdfc66ae063d8fd9d9cb29141057c0571b0bd640 SHA512 89d2709fc88963d76996f033f9360bbd8a341ea8e6181334cef17ab8796e73efaac79c46e825e3fd1c6732270d96be3a273091571e97bdff0c8ad6a8ab9ffe10
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-vcs/python-gitlab/python-gitlab-2.5.0.ebuild b/dev-vcs/python-gitlab/python-gitlab-2.5.0.ebuild
new file mode 100644
index 000000000000..fb687ff4c2f1
--- /dev/null
+++ b/dev-vcs/python-gitlab/python-gitlab-2.5.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Python command line interface to gitlab API"
+HOMEPAGE="https://github.com/python-gitlab/python-gitlab/"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/python-gitlab/python-gitlab"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="test"
+
+BDEPEND="test? (
+		dev-python/httmock[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r *.rst docs
+}
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 0df78ff1a3c4..9022feb85367 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -4,4 +4,4 @@ DIST repo-2.8 39134 BLAKE2B af52a2c06e09de83100cb297d585f89bcbe85d6e9e5c358024a3
 EBUILD repo-1.27.ebuild 823 BLAKE2B 159755dc5fdb25fae05fa1026c3f19ccd4b93a412d6b425a541a4c6f794c7f5922d6ead911177f55ea8e298555b82447668f7439724a12647dabeeb2e8794ea8 SHA512 638ae406a07fae698242a91e4d2aad5fc723fa2236a90c914e30064f018abe4f06a4be832c88148e49eb256c6d73f6a9c961696720afbff92a09f919c37aeb1b
 EBUILD repo-2.5.ebuild 853 BLAKE2B 5123c3b627a65cf07ab9586308676a9c3edb1b5037525d6b2af702203b4223676ebf5a018239d6655aae90c2daef1358995a490b37a0c67bda6e66c000907ae0 SHA512 b5862ce4158e106a6a21138371b5471f6f70bc5844b074de0f1334daf3183238df0d81784afc448c403cdbb027ce240948c0743d9e39a2c19f053112bf578883
 EBUILD repo-2.8.ebuild 859 BLAKE2B fe8ad85ef67acc2ecfa5ab5a4f84ce25d5b71efda9dd5ebf5d1888e0adb0074ccb5fc5cf374e4adfcd3cd1349bb74fea53f8aeaad087f315f98004720b56b0c4 SHA512 8c12b6b3350b182241dd8b82890a3966dd99938aa344f0df3833df41ec532d09812f0f4b6dddbabcc26abb32cf567b1206a1c0ae74efa288b92e3afdeaefcb86
-MISC metadata.xml 338 BLAKE2B 49e4b3e3767754bb7a0661cb388f3e18b372fa713d0e3b92c742cddb2fe21e384b1689fd72b23865d7b363ab01bae90a5a11956593eccc915f1b6c99e52c2718 SHA512 0a83263d882281636f6925d20c9e8b991267a1b7d73d7bd6e545c77372424fd602e28d6c9a82668d0a73500bcb8dd8287f7891b66e3fe1517907001f3fb43cd4
+MISC metadata.xml 214 BLAKE2B c0c4c0ad9c74c68b5d7e4e539dc441e82a025754b84fa14f01d0f6772b5acacc836523305857e1a8ef54d472e77a339d2361ec4bc70651cbf13e7be34b051d81 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd
diff --git a/dev-vcs/repo/metadata.xml b/dev-vcs/repo/metadata.xml
index de0e9961d994..496b9d3fd3e6 100644
--- a/dev-vcs/repo/metadata.xml
+++ b/dev-vcs/repo/metadata.xml
@@ -4,7 +4,4 @@
 <maintainer type="person">
 	<email>vapier@gentoo.org</email>
 </maintainer>
-<longdescription>
-Tool for managing multiple git repositories. From Google, useful for building Android.
-</longdescription>
 </pkgmetadata>
diff --git a/dev-vcs/tkcvs/Manifest b/dev-vcs/tkcvs/Manifest
index 0b3f6897cdb8..2a57c830c5db 100644
--- a/dev-vcs/tkcvs/Manifest
+++ b/dev-vcs/tkcvs/Manifest
@@ -1,5 +1,5 @@
 DIST tkcvs-8.2.3.tar.gz 570910 BLAKE2B e612fb2fa01ad0205973eef48eaa6c11677d3aec8f1a5344b1d1719aafde79e830f550f990a7bceb8063edb530de807b7878937015bcd0175aef038031663bb0 SHA512 42fb03acf6367e02f6f7b3e1ad66232be4825f152b3e4d123080e0ce7d2f53b5eacb71ac95fbc15224fb4c4c2cae979b612dbb11d0cd0b8fc4a0222a8cd40c8a
 DIST tkcvs_9.3.2.tar.gz 614022 BLAKE2B dfea4c4f9cca6929b1298c73f2e446f6421a9c07a6878fd5990b55f5ee7936d5bb73fdcc3668a60bfb06c3f20353a93e4cdce96b5c4e12d382f6b5c610bf8476 SHA512 3ee52135ca49a156abf3f7abbbf123be6d95053c249168b1f9bde65b969f5c50157d6cb41fb1920d794926bce7e23bd014ef30f4a786ebb8d4a72ff67f3c21c3
 EBUILD tkcvs-8.2.3.ebuild 927 BLAKE2B b4a22c3dc12c5e4d74f2ac96d1c3fc19097cd0ccf3546517fa762f56dc3a3344ceecb889f41fe7d0657fa240f3bd2b2ef732496c4133937358f938b2c27afa11 SHA512 a9d20f59ff32cfaac97caa531a2239b111d6df93ac929401f66347c2f109a24d6f72bfd57ff47345dd7ebb0a1eba1890d8277be779a7ec42a53d709ab328a6e6
-EBUILD tkcvs-9.3.2.ebuild 1033 BLAKE2B f45a0b5ca89765f4e02f30ce8d0e8ef63bd441ea05d5267267fccd4b31b61904c125907fcd912f2b71bc813bc807da07d74dbf2adecc3b3934fbdb8367d107af SHA512 598ba7e9707f175189e6f24d56bc60cfc755937a9c30b97af2ea8897853cb2267a47126c70ee5a715157195a82436eb33cee2fef54085d391b0756ff47d8f7e9
+EBUILD tkcvs-9.3.2.ebuild 1031 BLAKE2B 165d13088ac58419e680da3ce663a4d8e3e0878a7db2f237588af57f4e686bc6f01e0ed316c33b0ceb2078981fe363dff8e2fa93414d751da3bdb1a0825e855c SHA512 857ad4c775a0450f4aaf0cd469c87df3932d7a01964dc421a32bf8885fe19baaf54c8e6d1ce928cb9b43b584548bdaabdaf8c5765437ab9596a8e63fac5a8f65
 MISC metadata.xml 253 BLAKE2B 19a7f4e84d1def1f97bb3b985a4959704c25d31ff2b1b7e6527ec6867d68dc2a6b15c0399935a8311789c4fac61136dcfdebaf7c113f296ec50c9523597a74db SHA512 9881e4487c9512c1b72ff2fa72a45b82ef3bf4ade0ec982aea1222f629367ac784ef922b839224add5829cba1717a25d49c31c1481610a02658d0bb265d4eaf6
diff --git a/dev-vcs/tkcvs/tkcvs-9.3.2.ebuild b/dev-vcs/tkcvs/tkcvs-9.3.2.ebuild
index 2809f3345297..2b2a7ea29e6e 100644
--- a/dev-vcs/tkcvs/tkcvs-9.3.2.ebuild
+++ b/dev-vcs/tkcvs/tkcvs-9.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE=""
 
 DEPEND="dev-lang/tk"
diff --git a/dev-vcs/topgit/Manifest b/dev-vcs/topgit/Manifest
index e847adc02ba9..8f928f7472d1 100644
--- a/dev-vcs/topgit/Manifest
+++ b/dev-vcs/topgit/Manifest
@@ -1,5 +1,6 @@
+AUX topgit-0.19.12-Rename-T-to-TESTSUITE.patch 2339 BLAKE2B a1a23b807bc76880123acb51949eb948b9398bf2c39a22c4223aa029e67225ef493fe2b7fd1bf934e8652c833d39e9ecc504352020f5b1d1899442c875baf77c SHA512 c447a7d18e7486dd5fd4b6173389603177fb9986293cd1bf46035f786fb689b112659cf170e0c431f6c09aaf4415d3d4e3e520c26610afba56281efa9e35d43f
 DIST topgit-0.19.12.tar.gz 302492 BLAKE2B 5691823e58774883d33bc96e5d10b871a40224c97e3deb90f4fef051dbcecd6a7d3c979fe6b7e6c9aac64d485b9c4324b4d666a7ae64cb82cd325498d33e0cae SHA512 cb9245fbec7a4a15822a5b70d7052be200aa8b574b528dd929121597eb7dcec97532b0fd4d6a4d6bb63676194ed0ab2129e106fb88f63561187620ec431f9efb
 DIST topgit-0.9.tar.gz 37025 BLAKE2B e28b0fd4cdf4cf063bad939c712fc9354ffc2d9c5e431f637e8306454d7a871268902253a1d2c59afa94406223b1fdc1627f3dda04586c88c0b609a72a1eaa87 SHA512 15b4ec44fb1711273155350924806f9ddce330251d3f300f5d2ecf445f4822c40b5c7309429876746ed8226c00f74292956f51f9126c8c359c3f4d589c73791c
-EBUILD topgit-0.19.12.ebuild 748 BLAKE2B a4aecf5eca106139cd3343ec418a1852a534dbef94a5655e99a92aec6b052a60f03dfecaed4767abf01502fcf932e9201665df1fe106b1ed57e8a2e5a7bba498 SHA512 3e2de52d6d464c1eb5d00cc0da38f806b7aacbc08670675c423c2611a0199726147f98cf928a78c32c96d627b1329b38cbc7c9633a7c994c5fdde6ef54c96c97
+EBUILD topgit-0.19.12.ebuild 848 BLAKE2B ed7dac8adb25a33e775f385c7eaca1acfbb3c7e05b19827710db18cf84cd404dd599a31c9e1b57a53a3bb4bb0a2e5a3f331c503309e710adee09b71df61f49a2 SHA512 8923725255455e128c44c343d6a5589b4bdf4794ab8ce6c4072699a9e76095435d818a119eb9c75d2e7f178e700c10354abcfd539c2c99cb8342d9865ca6dcc6
 EBUILD topgit-0.9-r1.ebuild 692 BLAKE2B d604f1d2800d5953d2d7f296b5596fee898b95d51eedb80dda8d121dbad3c3611f4ecb40a2e5f22e8143981961639f68d5086539fe08a9d0e8e67940fc5df08d SHA512 2984e19bb3c22e8d83b0c8ad85b8c9939c3dddec3844ffeffd5e5cb6b2d857c3da9e214a3e89fe16acaede8aecf20c820b68c5793080d87476bb3bf40d90f996
 MISC metadata.xml 455 BLAKE2B 6928af22b505988592f48120217cf6c8a9e5f4fd0a0d2040126bb730f3a4dc7b1a5d428d00ffe6fcf0abc5b00cf5c4eb847e5d4ff3288f38b79483708980aa08 SHA512 12408a1b03499ee4718189bec87eb725462c8e2d279bcaef81b18f411f86d0588bffb145dbc793fb9fb9419f7644ff2529a03db636443b157f55b2d7a9c6594e
diff --git a/dev-vcs/topgit/files/topgit-0.19.12-Rename-T-to-TESTSUITE.patch b/dev-vcs/topgit/files/topgit-0.19.12-Rename-T-to-TESTSUITE.patch
new file mode 100644
index 000000000000..23e54f886494
--- /dev/null
+++ b/dev-vcs/topgit/files/topgit-0.19.12-Rename-T-to-TESTSUITE.patch
@@ -0,0 +1,62 @@
+From 3df81dacc84bc20471542855139c5b1948409412 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Wed, 26 Aug 2020 15:27:06 +0300
+Subject: [PATCH] Rename $(T) to $(TESTSUITE)
+
+$(T) is used in Gentoo for temp directory during builging package.
+---
+ t/Makefile.mak | 8 ++++----
+ t/Makefile.sh  | 6 +++---
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/t/Makefile.mak b/t/Makefile.mak
+index bf8805c..73f6171 100644
+--- a/t/Makefile.mak
++++ b/t/Makefile.mak
+@@ -116,11 +116,11 @@ test: pre-clean TG-TEST-SETTINGS $(TEST_LINT) FORCE
+ 	$(Q)set -m && $(CACHE_SETUP_TTY) $(MAKE) $${GNO_PD_OPT} -f Makefile.mak aggregate-results-and-cleanup
+ 
+ prove: pre-clean TG-TEST-SETTINGS $(TEST_LINT) FORCE
+-	@echo "*** prove ***" && set -m && $(CACHE_SETUP) $(PROVE) --exec $(SHELL_PATH_SQ)'' $(TESTLIB_PROVE_OPTS) $(T) :: $(TESTLIB_TEST_OPTS)
++	@echo "*** prove ***" && set -m && $(CACHE_SETUP) $(PROVE) --exec $(SHELL_PATH_SQ)'' $(TESTLIB_PROVE_OPTS) $(TESTSUITE) :: $(TESTLIB_TEST_OPTS)
+ 	$(Q)$(NOCLEANCMT)$(MAKE) $${GNO_PD_OPT} -f Makefile.mak -s post-clean-except-prove-cache
+ 
+-.PRECIOUS: $(T)
+-$(T): FORCE
++.PRECIOUS: $(TESTSUITE)
++$(TESTSUITE): FORCE
+ 	@echo "*** $@ ***"; $(SHELL_PATH_SQ)'' $@ $(TESTLIB_TEST_OPTS)
+ 
+ # How to clean up
+@@ -169,7 +169,7 @@ test-lint-filenames:
+ 
+ # Run the tests without using prove
+ 
+-run-individual-tests: $(T)
++run-individual-tests: $(TESTSUITE)
+ 
+ aggregate-results-and-cleanup:
+ 	$(Q)set -m && ec=0 && $(SHELL_PATH_SQ)'' -c 'TESTLIB_TEST_PARENT_INT_ON_ERROR=$$$$ exec "$$@"' $(SHELL_PATH_SQ)'' \
+diff --git a/t/Makefile.sh b/t/Makefile.sh
+index ca2cf9c..dc94168 100644
+--- a/t/Makefile.sh
++++ b/t/Makefile.sh
+@@ -35,12 +35,12 @@ quotevar TEST_RESULTS_DIRECTORY TEST_RESULTS_DIRECTORY_SQ
+ 
+ v_wildcard ALLT 't[0-9][0-9][0-9][0-9]-*.sh'
+ v_sort ALLT $ALLT
+-[ -n "$T" ] || T="$ALLT"
+-[ -n "$LINTTESTS" ] || LINTTESTS="$T"
++[ -n "$TESTSUITE" ] || TESTSUITE="$ALLT"
++[ -n "$LINTTESTS" ] || LINTTESTS="$TESTSUITE"
+ 
+ # Extra shell scripts to run through check-non-portable-shell.pl
+ # These will ALWAYS be "checked" whenever the test-lint target is made
+-# By default all $(T) test files are checked so they don't need to be
++# By default all $(TESTSUITE) test files are checked so they don't need to be
+ # in this list
+ 
+ v_wildcard LINTSCRIPTS '*.sh'
+-- 
+2.26.2
+
diff --git a/dev-vcs/topgit/topgit-0.19.12.ebuild b/dev-vcs/topgit/topgit-0.19.12.ebuild
index eab7ae62e258..be20e7d630dc 100644
--- a/dev-vcs/topgit/topgit-0.19.12.ebuild
+++ b/dev-vcs/topgit/topgit-0.19.12.ebuild
@@ -16,9 +16,15 @@ KEYWORDS="~amd64 ~x86"
 BDEPEND="sys-apps/sed
 	virtual/awk"
 RDEPEND=">=dev-vcs/git-2.10.0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${PN}-${P}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-Rename-T-to-TESTSUITE.patch"
+)
+
 src_compile() {
 	# Needed because of "hardcoded" paths
 	emake prefix="/usr" sharedir="/usr/share/doc/${PF}"