gentoo resync : 05.12.2021

28 files changed, 259 insertions, 363 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index ef12bc1eee41..561d6748f62e 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvsspam/Manifest b/dev-vcs/cvsspam/Manifest
deleted file mode 100644
index 9130a93189cb..000000000000
--- a/dev-vcs/cvsspam/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cvsspam-0.2.12-svn.patch 806 BLAKE2B 228b320f9e02d8d756d8b191be7f38d39be7ebe88f6da7f4956cd3ee6d5312bb750e4884b63535ba4f1a3e54fdc78ca55c23ee414d3e0f92022c77c77bed20cc SHA512 ee3092a73edae7f5ca85800206f520653dda8334ceeef745c6d0390bba747ad4a7fd8e03b39188ac2e0bf76315fa8178e9106a7ac8b68083a2a610733b5ae03c
-DIST cvsspam-0.2.12.tar.gz 83714 BLAKE2B 4c71f76a489da136fefaaf4c6735bd074f7439b709bb2b3872ccbf3dea80c366be3de3dfd3ff3c8a59162ad97a6d81a2b6b5fdc0f59562dcef78fb9cf45c146f SHA512 80786f980fe5070fff90de8e7a470cdf91ee8ddbd4c37fb1d98d0ddc042d157f2f74998962eaab1a24503b9147fae2129db35f1d505b557a8c75325d1e101bec
-EBUILD cvsspam-0.2.12.ebuild 723 BLAKE2B 3aabac15816209470a6c4eb505e893b62d6138422561442d13d30622892504fa3a258a7814c12977557dff688e72647e50682bef22b4010b49f36171a1c0c19c SHA512 f4cbfd45e44ded8f94c7aa2e96f7a0ceb7b93b88100c4a1db426d8906190268c40d384339c0e3711ba57b95b8e38d7de3eaf9689f99e47f9efd9444bc1a8c667
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-vcs/cvsspam/cvsspam-0.2.12.ebuild b/dev-vcs/cvsspam/cvsspam-0.2.12.ebuild
deleted file mode 100644
index a45ae40b915d..000000000000
--- a/dev-vcs/cvsspam/cvsspam-0.2.12.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch
-
-DESCRIPTION="Utility to send colored HTML CVS-mails"
-HOMEPAGE="http://www.badgers-in-foil.co.uk/projects/cvsspam/"
-SRC_URI="http://www.badgers-in-foil.co.uk/projects/cvsspam/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="subversion"
-
-RDEPEND="dev-lang/ruby
-	subversion? ( dev-vcs/subversion )
-"
-
-src_prepare() {
-	use subversion && epatch "${FILESDIR}/${P}-svn.patch"
-}
-
-src_install() {
-	dobin collect_diffs.rb
-	dobin cvsspam.rb
-	dobin record_lastdir.rb
-	insinto /etc/cvsspam
-	doins cvsspam.conf
-
-	dohtml cvsspam-doc.html
-	dodoc CREDITS TODO cvsspam-doc.pdf
-}
diff --git a/dev-vcs/cvsspam/files/cvsspam-0.2.12-svn.patch b/dev-vcs/cvsspam/files/cvsspam-0.2.12-svn.patch
deleted file mode 100644
index 3278f94bc005..000000000000
--- a/dev-vcs/cvsspam/files/cvsspam-0.2.12-svn.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- cvsspam.rb.old	2006-12-02 13:36:48.000000000 -0500
-+++ cvsspam.rb	2006-12-02 13:38:28.000000000 -0500
-@@ -1386,12 +1386,10 @@
- $allTags = Hash.new
- 
- File.open("#{$logfile}.emailtmp", File::RDWR|File::CREAT|File::TRUNC) do |mail|
-+  reader = LogReader.new($stdin)
- 
-   $diff_output_limiter = OutputSizeLimiter.new(mail, $mail_size_limit)
- 
--  File.open($logfile) do |log|
--    reader = LogReader.new(log)
--
-     until reader.eof
-       handler = $handlers[reader.currentLineCode]
-       if handler == nil
-@@ -1399,12 +1397,11 @@
-       end
-       handler.handleLines(reader.getLines, $diff_output_limiter)
-     end
--  end
- 
- end
- 
- if $subjectPrefix == nil
--  $subjectPrefix = "[CVS #{Repository.array.join(',')}]"
-+  $subjectPrefix = "[SVN #{Repository.array.join(',')}]"
- end
- 
- if $files_in_subject
diff --git a/dev-vcs/cvsspam/metadata.xml b/dev-vcs/cvsspam/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/dev-vcs/cvsspam/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 9f183ed0b608..6acaadd09fe1 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,9 +1,11 @@
 AUX README.gentoo 227 BLAKE2B 828266fe46d9eb866250b57921df446055c7835cce3c3d17014563451acfc100f0e3ade6805514d620852273f011c12a8dd581ad90ffa135e5ab168a87790d46 SHA512 9e8b672fe6998a255dea761e186d5a9031895e8ec0eb14d4942c81a462a238ef1eec0431671da8be3ee4bbacd7f81cec6ec1f9e75e2f4429c3472faad5ba2c2d
 AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6200140ec7059bfee2323443a5ea62481b6b4c43b6fcc1e116acf8f67082ade03b2a8a23aed1 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac
 DIST git-cola-3.10.1.tar.gz 996036 BLAKE2B 2d705b853cf67a0f437d8dc77d46d5804124af600f872717c832843586d3c739e67a79ebe50ba2a8db38afd4217a7bb94db9cb8e27d51a00087ced340f4877d6 SHA512 79496023bfaa05049079eec2cdaf8449a6598faebedb4a13acf178209edc63e725eb1b003700a1dcfee09072d34e5a49d7053f070e45b498562cc124cd0582d4
+DIST git-cola-3.11.0.tar.gz 997046 BLAKE2B 7a8270c30e0cbd919dcd6f8e38ca420257630717e535ef11ed337fde2461b544453b20363906a5b769cd23d96ca77ce72d71729f46ae6abada83ae4d33628cbc SHA512 f05862b9b27ff5dfe9b220bbee4f3f455a7ce98acaa0bb0a8cdbb44f8cb97ce265df036ba48d5abb0bf46a91fd782cd73a67ca544b4662d36e8023e92c80b541
 DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
 DIST git-cola-3.9.tar.gz 992335 BLAKE2B ab591d953173aa69773a82eb91ebcc6fa5bc5e31efa78ad27f3e1e57e22c4222d70914f059dffb0b05b2b366d3208e127ad123ccfeb1b4c1b648daae0bf53352 SHA512 91f4bb40c166669e05136985920113d7482a396a46adf45fcf05e8ee56677fee7ebfb6a793face79737a17be42aa5e32b216a30847e8e4a5b8dc5b3b4eba5395
 EBUILD git-cola-3.10.1.ebuild 2488 BLAKE2B c866ce1934780c48e19a1d6bcb796048ba7fd4af5b54d0567f4e8194d640b852e9c24f0f16705dc839514342ad4fcb5062176a5bef87a61f7e4646db04d6ae3c SHA512 df5b1e44cc3200b2e0080fd39b1d3e7a753f61e9e812f05fa864020724624bd07495f8c1618a0ffa58147d2177cbdac4357cab63112987ce735a1654a50eb1c6
+EBUILD git-cola-3.11.0.ebuild 2404 BLAKE2B d33e8f32a7c23839216e6ede77a346cc584a35e8763ece27968137c38ec2037c715cba16f9a8576a0b38caac410688237d5d19b0e2b47541ce3e1a0211b3406b SHA512 ac6699eaf45e8bdc77489017819351869db66d56fa2d584868763301d037fc272f4aabd78f22fad5fd235103422524b3a654853c62bf8adedf9db7c5027d144d
 EBUILD git-cola-3.8.ebuild 2477 BLAKE2B 6cc1a0d6f61526d6f145adfbce03ce98d117ebef4de0153e18220c2dc216f3fc046ce36f11751bba07d5a6e0e86298ddfa7203c22a7f94fe8721dc9d0aedc4ca SHA512 ce381d9f2dc31ccbf09930ad1dea21ab20cbe83080a1f86add25be93f38d117cfeed36d878693d20fb9d7e71f398e16caab2a4cf458add1312dddb49003c9012
 EBUILD git-cola-3.9.ebuild 2437 BLAKE2B d645c01f2291a0e0edaa25fd42f3e40e58ca7a0e366ae69cf229abee74d72c936f21377590e4090eaf33cdee46bb0f27f32be883b05d77fd78250a5283225721 SHA512 751c5e2aea3ebe73614a07d30bdf42ff395329ab5c63697df4659244e114f269ac43c526bb9a981e55111f3df43f1535cfe1aa76653019bfff6c3f31ae2a805c
 MISC metadata.xml 595 BLAKE2B a1a74266c1afcbcf94bcb95b8218669f09ce709d0803e37cca482b2e89dee176d1d898236ba024e7266106133d1bfb3008fd1ff3ce11793c606fc7dcffb408e6 SHA512 fe44a4445bf71d09eaa6be66af2370d3c0e94dada507ace584ffe9dd8b5edafd472355cee7aceb554c31b0bafbd29faeb318e853d0d165fb1d2a7f8f8bf86379
diff --git a/dev-vcs/git-cola/git-cola-3.11.0.ebuild b/dev-vcs/git-cola/git-cola-3.11.0.ebuild
new file mode 100644
index 000000000000..1aa8af03490f
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-3.11.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-flake8[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
+		)
+	")
+"
+
+python_prepare_all() {
+	# make sure that tests also use the system provided QtPy
+	rm -r qtpy || die
+
+	rm share/git-cola/bin/*askpass* || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	DISTUTILS_ARGS=( --no-vendor-libs --no-private-libs )
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc ; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	GIT_CONFIG_NOSYSTEM=true \
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C.utf8" \
+	virtx epytest cola test
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	# remove empty bin folder
+	rm -R "${ED}"/usr/share/git-cola/bin || die
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/dev-vcs/git-deploy/Manifest b/dev-vcs/git-deploy/Manifest
deleted file mode 100644
index 8d4938ef9ed1..000000000000
--- a/dev-vcs/git-deploy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST git-deploy-6.0.1_p20131024.tar.gz 55394 BLAKE2B 7d2f7578948033e182e271c44752be27bcddc4b2480a795d110675feea9408ac7b786b135f058f224f5edcbb184bcd022b19bb3d7614a366ec29b2ea4d5f6d2b SHA512 cf3504b8f40d86cd8322ed93f2fe43593bcbf2db37685d3337b89501f39b38298dfb6d6cd51dd3f518f6048b680446a1660b85887ef73647829608e77b497634
-EBUILD git-deploy-6.0.1_p20131024-r1.ebuild 1451 BLAKE2B 2d9db22596ad7423dffc94c63c65f229da9d1ef15afc19e3397a098ef49aced14fd1a412d950ebe0c5b888273eba2fc90bc665ac64007ce5d45345ac52f3d192 SHA512 0f65a7dd21b1892f751a1c6c4bac233d6870af55efe480ae79ec11cfc4994ccb54008d245a258c1ca8a4d2f98b1c84a9bc680e32d37ee0d264bc33871cd67726
-MISC metadata.xml 254 BLAKE2B d989c07f02c15f2621b71f305093cfae46a5038b69db89b271af140a2cd2561eda65820897e966326d5ce0b00ed15e4b48a2359f2a8bd439b187477a9cc9d047 SHA512 65efc2ef54dd6fce7095d615d5b353e3bd063aec6bebd5c7e5b6134ea5b3fdc0304fb5472145afbe21f26faa6f56d2a5e4227bbcbc78df4fdd64382819b6ee6d
diff --git a/dev-vcs/git-deploy/git-deploy-6.0.1_p20131024-r1.ebuild b/dev-vcs/git-deploy/git-deploy-6.0.1_p20131024-r1.ebuild
deleted file mode 100644
index f7e78a6147c7..000000000000
--- a/dev-vcs/git-deploy/git-deploy-6.0.1_p20131024-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-functions
-
-COMMIT="e9ef93debd12d85e70676dd79b4bd78ac2b05271"
-
-DESCRIPTION="make deployments so easy that you'll let new hires do them on their
-first day"
-HOMEPAGE="https://github.com/git-deploy/git-deploy"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="dev-vcs/git
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	virtual/perl-Term-ANSIColor
-	virtual/perl-Time-HiRes
-	virtual/perl-Memoize
-	virtual/perl-Data-Dumper"
-DEPEND="dev-lang/perl
-	test? (
-		${COMMON_DEPEND}
-		virtual/perl-File-Temp
-		)"
-RDEPEND="dev-lang/perl:=
-${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	pod2man -n git-deploy README.pod > git-deploy.1 || die
-}
-
-src_test() {
-	local testdir=${TMPDIR}/git-deploy-test
-
-	# Prepare for tests
-	cp -a "${S}/" $testdir || die
-	cd $testdir || die
-
-	git config --global user.name "git-deploy" || die
-	git config --global user.email "git-deploy@localhost" || die
-
-	git init . || die
-	git add . || die
-	git commit -a -m 'git-deploy testing' || die
-
-	USER="git-deploy" perl t/run.t || die
-}
-
-src_install() {
-	perl_set_version
-	dobin git-deploy
-
-	insinto $VENDOR_LIB
-	doins -r lib/Git
-
-	doman git-deploy.1
-
-	newdoc Changes ChangeLog
-}
diff --git a/dev-vcs/git-deploy/metadata.xml b/dev-vcs/git-deploy/metadata.xml
deleted file mode 100644
index 3677b7123579..000000000000
--- a/dev-vcs/git-deploy/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">git-deploy/git-deploy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-vcs/git-filter-repo/Manifest b/dev-vcs/git-filter-repo/Manifest
index a041b07420a9..6e3059a4e7d3 100644
--- a/dev-vcs/git-filter-repo/Manifest
+++ b/dev-vcs/git-filter-repo/Manifest
@@ -1,3 +1,5 @@
 DIST git-filter-repo-2.33.0.tar.xz 148024 BLAKE2B d23b47575cad60db2c42fe794d6b648ee14b0c126cc832b267030e6c8b4edb0acd6fe7e2666da086b3c79184a7e4362b585dfab8966102552f8317e3027d5d32 SHA512 9a4fc3e95c9b6bd399925bb8554acf93711a015756cc826a9f9ed06e91538addb78b3120876c46af4245892adfca7428d915a33d6d2890d9c0196cef5d4faa0f
+DIST git-filter-repo-2.34.0.tar.xz 149112 BLAKE2B 7b9316fe4ee07ce996e92977947f64f753296b681f7a6ad32610b6478af637f558aa0eb2294a5066b09c8e654f279c2c22358f36ce12d2869f7874f36bbf1df5 SHA512 debd638f22d3543607b3d26dbdca867975ce2fd2ce03d4088e4e1d4e1be1db4655aeb8ef9de5b3930df4006511653e0b517646d1be51ab55807d19f404e14450
 EBUILD git-filter-repo-2.33.0.ebuild 712 BLAKE2B 63b2280eab89b700ac09414d093974135d9f7f29b6eb27eb58ecb9bb11c450d1a7c980e9e8e42c1486c84a5cff145c7193e194de811bd18fbe520d13220dc05a SHA512 08109d66461f634658c2e0037ceef91b36d393d88eee2ca1459cbb8f4c9e468bea1e97993617f017fe4476eed6188d93be58e4e7e9995a6834c496dc90873054
+EBUILD git-filter-repo-2.34.0.ebuild 712 BLAKE2B 63b2280eab89b700ac09414d093974135d9f7f29b6eb27eb58ecb9bb11c450d1a7c980e9e8e42c1486c84a5cff145c7193e194de811bd18fbe520d13220dc05a SHA512 08109d66461f634658c2e0037ceef91b36d393d88eee2ca1459cbb8f4c9e468bea1e97993617f017fe4476eed6188d93be58e4e7e9995a6834c496dc90873054
 MISC metadata.xml 334 BLAKE2B bd5285f5c361e2e7d8a9fd7abc0e92b657e301d4d3674ea09e98db0c621ed769a7f009fb14693c655eef3af7c1ba71b9c7d84ff18f998c732867ef8f586b2d23 SHA512 66e76189541c836c5c9d08287e1bf872f61a775b642b28997a47440a1c7522fb49ccd6f5ba4975a74121e51d615aafa66cc7a920a30e45c6ce07195eeb625413
diff --git a/dev-vcs/git-filter-repo/git-filter-repo-2.34.0.ebuild b/dev-vcs/git-filter-repo/git-filter-repo-2.34.0.ebuild
new file mode 100644
index 000000000000..dfc0b43cc287
--- /dev/null
+++ b/dev-vcs/git-filter-repo/git-filter-repo-2.34.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+inherit python-single-r1
+
+DESCRIPTION="Quickly rewrite git repository history (filter-branch replacement)"
+HOMEPAGE="https://github.com/newren/git-filter-repo/"
+SRC_URI="
+	https://github.com/newren/git-filter-repo/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-vcs/git-2.24.0"
+
+src_compile() {
+	:
+}
+
+src_test() {
+	bash t/run_tests || die
+}
+
+src_install() {
+	python_fix_shebang git-filter-repo
+	dobin git-filter-repo
+	doman Documentation/man1/git-filter-repo.1
+}
diff --git a/dev-vcs/git-mailz/Manifest b/dev-vcs/git-mailz/Manifest
index 7fd8639664bc..ef00c053f0d5 100644
--- a/dev-vcs/git-mailz/Manifest
+++ b/dev-vcs/git-mailz/Manifest
@@ -1,3 +1,3 @@
 DIST git-mailz-0.14.tar.gz 8204 BLAKE2B e008216319b2ec39eed132e4c2792afabc75066b390d04f3a9e645aab234391f9d07c0fea3d965a4fe67b39f87536c2f2b3ee0959ecfdfabc7fb2e1a3c10c2de SHA512 fd6c518de135113482f2f3a4e9d89b41b1797c8219e1ed9f424a5c4ae575400e7ccd9f835b40be5d74a5eb4e1bc7d3dfedd2412a317baea7e20494169399b70c
-EBUILD git-mailz-0.14.ebuild 528 BLAKE2B eee8a413c8eefdecbe29e32a1322831f95899f5ced8b1e75d551db0b28b83b5d6593ee026cf392319bfb0dc30294737b781c0015e37f18ccfa126f99532c9e8b SHA512 f46bda22107bfe473c95b53870e522a3520a013fc3bbbee39ae183bfc963bb70b2f3fa7ee8467d0dab7b13959aa8d8cf596e2ac9eba15d2f755cba3eb15b944c
+EBUILD git-mailz-0.14.ebuild 601 BLAKE2B 54131f025cd4bd16f8e08bce72bc557e862bb3749c8ddb713a0d60c2eb8de55cd8d03676c4396ad1534a777b8fd5f8c58a536cdcf7e4814fb0c147244b847cc8 SHA512 f82aca113d037779943b168cd8e040970db16a9ab1eaffdd98a7a188b0e722d0701ab70d6dcfe2b6ff3bed7537780a058abe86898f930d8fae895b5e2e65b630
 MISC metadata.xml 256 BLAKE2B cbe5f8a797fefb855f4accb978b785677ddb78482da3eafb43d8b4ce85c1fadc5bbdaeaab3523563b9a966518e7b75710de7c0bb7f31995a43bf7f09ee82a611 SHA512 be0864c3ee74df84f72b82854b77a586da8f04f0a5a0f0beabdf8fb20155b9406bc3b4e198e4f9dd1399962693fcff7fc7dea78fdf11426927947f4cca064c4a
diff --git a/dev-vcs/git-mailz/git-mailz-0.14.ebuild b/dev-vcs/git-mailz/git-mailz-0.14.ebuild
index 99ee973ab4e0..2e6371feb75b 100644
--- a/dev-vcs/git-mailz/git-mailz-0.14.ebuild
+++ b/dev-vcs/git-mailz/git-mailz-0.14.ebuild
@@ -10,12 +10,15 @@ SRC_URI="http://codex.sigpipe.cz/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-shells/zsh
 	dev-vcs/git
 	virtual/mta
 "
+BDEPEND="test? ( dev-util/cram )"
 
 src_compile() {
 	emake GZIPCMD="true"
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 11d6643600c4..e0895127d6a3 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -12,22 +12,22 @@ AUX git-daemon.confd 710 BLAKE2B aee2e1493bb67c09b87497724df90cb74e9a5a7f123101a
 AUX git-daemon.socket 116 BLAKE2B 0fbf31de87810ac737adfab21acf87b0d95f62df5208fea3d79ebe010a4971b731ba1684852f3b926ecc7e23bcb9a386b2e612801701299c64d4c6390ed4befe SHA512 e383d358999ea0c7201c1709015a9b7c4dd9dd71287605640aca837fac1e2ee33a5a1684e1c3414c08742605f185b722f4864afd5be8b79a9f0d8f7ae0f9b701
 AUX git-daemon.xinetd 260 BLAKE2B 594a046b5b2b580b7cfed1b620e014160965046c5e5a42359b6134af0a4c03a30a9464db5e19c6027645d9084550743e397af2d6566b7543a2b509e025aeb1e1 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c
 AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d6979006fc24721db8b389395ac98a98444f032eaf7c66d6c02ab394a764e16a9cd3b5446b6be9061b9bdd89cf964 SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9
-DIST git-2.31.1.tar.xz 6413368 BLAKE2B 2d40aa3e5336e57b3cab42c36dd07698be7a811e2890f4c9ecaaa375f985313bb8e14fe7a70c1beff3009a9102b935e4a6065019ab3b2520f09339e2a0fcdb93 SHA512 9aa334a3e8519700ff5d112153ec42677722980094caa9d22aa91afdb65166bd9a98fa445c0d327c428ebfa73bf4832e9b3836109a1d9319feafe3191cfd170e
 DIST git-2.32.0.tar.xz 6551348 BLAKE2B 546203ce3f749ba806866a9e9767bc807794cec435fd0b60306ae6cd2b1b17a0159ef9774c79c4f59d0dba45b36941085b55f103e1820450d560bffa41d1058f SHA512 1ab3e7022ccee411d14a7da5c37d6259ef5c0f85ebed8f49698e25c65cbc7a46f8096919fcb6568360bfe284dd7475b596eee1a167db966096255a405853837c
 DIST git-2.33.1.tar.xz 6558636 BLAKE2B f4959d5309f85e063448673a3f06f1d3cdd65ced5f5173cfe5a38df3b5547cae1c08275bda02e48307e8290628735e2ea1ff49222262e7cd29b252a6aa4d4a15 SHA512 16d417183232e1057bea754d59cdf4bbacc5f1527d1de6ee04cdd293a2512bfa7208e20f6130816605528b59cb1bc3188c5bddf1a42c1413095ee74e44dd2f91
-DIST git-2.34.0.rc2.tar.xz 6597020 BLAKE2B f683f93ce74eface8bd2023c21718d59297a0fa7102600692e1712bbcca6ad49556a85d8710f1e9e186e216cc28b0f3acf60b50f450f8a48bf896b7fbf1317b0 SHA512 ab28dd1f7f788b0e1177b8024e646a154fa15e0294c1c7bdef6e40e19ade8bbcc08d58ef8cf2bdaca2844f6acb60ad8824c59592077c5ee0da55ca3a67217fbe
-DIST git-htmldocs-2.31.1.tar.xz 1357592 BLAKE2B 54b48cfe2bb8e5dad9fdff862aa91e5805b0cd331b459d51a71ed913ca68d1aea6c6c69cfadbe8b6101b4d7be63c3811027a2ed42f9d2b0d3509664726b8ad78 SHA512 d243f4e3047c0e29bdd9127ff529c7fab5ebf40a4afaa04c3a9261ae398aa61c16a4413b7bf580c7f874d632b866908d92322ea0502141d811b78b7636c8d28b
+DIST git-2.34.0.tar.xz 6623924 BLAKE2B 1b50fb2594ad7c87df5214495a0a24f8122f67e844b0312bbee44d9cfdad201fe589a819cf56971706df534001cdbd52d4174fa72124212d4276cee9acd37759 SHA512 3102c1ebe408eb549ebd0f9b1420663ed04a2720e4dc676c1854a9e7b8306bb49dc931b734aa7eb612eb7adc2ad92730c0d2dd704dbd859ba61e5ceba909fcc3
+DIST git-2.34.1.tar.xz 6623760 BLAKE2B 9b5d7a450ec495898bcc0e1f6ae87c0ad102d039cf7c4106cdfe3ada501d9bfaf22b83c522de383d3c01f7d5a29dbfd7fc44b371efa8fc3a418ab3c609a692c1 SHA512 a1a8e9e6f64b1da25508fbd2f783564dcdbe181fb5ff1ebab3bdac6db6094e18acc334479a1abf22ac17ce4f733cc3e10a664db9ab234cd523735a3f027b42db
 DIST git-htmldocs-2.32.0.tar.xz 1381664 BLAKE2B d1b47aa99d32a252fd20df26eff44a558044f3a389379b161bb43621eb28375eb0621969849a31938ba7fc9fc58b140d27d703559ea5735d0a0ffd2e93cd9692 SHA512 12b84e342f0d19afe385ab8a685ae625e86c3295d1555992e0c427b361aa2cdfc89a679e7dbc468d3568a325dafbf699468aadcdb02f93e372eff3dd96a7cf7f
 DIST git-htmldocs-2.33.1.tar.xz 1396744 BLAKE2B cbd65cf08fc7ea466fcd72820ba3e2135ade37f69c436a4ee7276dc71fb62f6270b71e2f46d981f5681a0fd3c30613d61680c2ef2460d0d7d292f7455e114128 SHA512 5b856b919067e1f644539d43a85aab6f602537ea0970b6248b471e3fa6756a8494f0525a69d22ad3795fcf9e106ff8439e0f6716ba0b8c895d7aad8c59e5bd74
-DIST git-htmldocs-2.34.0.rc2.tar.xz 1406064 BLAKE2B d222eaaafbc8d4a50e829a397f88cce789fd52345a692b74905985122bc21c822e6ca28b72218f9554064b6207d992f484d3ef31da928bfc23812c4eff4940a5 SHA512 2143a3620dacc31439f2df5ff8210a53b152ef012b957ca94fe1574fcbf5701c22730b5856a613372006c98c5d24f43ec8c9b13b5fecbe4b8ab096dd4a585245
-DIST git-manpages-2.31.1.tar.xz 487784 BLAKE2B 9fe67839cca51f18b0aca16678eadb9ee8e609cbbae26bf1804c39b8bf5415e1069cb50162b75f9f8ec69bd6511f271d3116ac33016af2e57e65b88ad6c4b165 SHA512 a5fb8a1c3f08707d4d2d835a55b295677559856984ffeeb650827b433625a74f22ef4aac10e1b14eba5860e11567543b146d52dd055b2613e5a510e0f4f3c3fd
+DIST git-htmldocs-2.34.0.tar.xz 1406204 BLAKE2B db606a9015a4efa8d162dbdf3eea34a60f87a85e2acbeed23ff731e241086354bd278726fb301eedc83ff9f44a71e3c68c78b151d4e837b32a188ad5ccca3b3f SHA512 8f6e768ebeb4dd6cc45537391c30f47cfab67fd7abb308d0b15a082a463c0c01cd94f855f9e7ee2e4b2983300d31431666ce84dc9243b0ec37869d5a868862c1
+DIST git-htmldocs-2.34.1.tar.xz 1406464 BLAKE2B 6ee2f58df3c1622d96ac4b1a70d4dc3d0c973635774dd6bb89fea3e502dd82d99d676e2f9cb33c14c429c3d4680cd6020213154099b3f7fe71ad67602ca9bc6c SHA512 cf9fa952d43e477528deece9f22d1bb63fa50b3a831fae20812c6af31c1dbaf193abe2fed48ac9966bcf1787442ceed19f00c00e524a1911f0ea31952a52fc8f
 DIST git-manpages-2.32.0.tar.xz 491868 BLAKE2B 7598a864246aed771371924604ee13d3f51b839b10b254bb1159dd47266513f5cd6484aab200a7b4ed427edc76538a98e39a040a17201483965175f5e1c5f484 SHA512 5c9950bd5d6904972cddf4afad534197d843c0dee8198d14ec5a3448873cab37dac88295b2a4df3658749f048bda4800b54fdc850517be7208906c911832c66e
 DIST git-manpages-2.33.1.tar.xz 494288 BLAKE2B 1f8bd4f23de31a285d3f4327e562dddafdf9f28e8b36334e54f5e280c81fc8170e8b153ca42baa642d02d8e6fdfcac9a8fdd3cee1e32c29bcd53f689d1a6c463 SHA512 d465a7b491046b7a5da6ad1fc6c62b351c69905932e0672263de5a1d3abe1113660cff9fe30c7be1d1695c6170ceca5a11b3f65e9b2d1545f35cc653e4c6ad62
-DIST git-manpages-2.34.0.rc2.tar.xz 497372 BLAKE2B 025993e4781000584f76088fd9953fc55b655d5cd72dfe3e962586b2daf2dd239afe30ed389d267888bff8e3069e9369a6a7acde227c1c7f13d7a8df7e49a3a8 SHA512 aea9620de62787a184f6c9c1951c1af5f25ed3f5b249e3ff6c623681f5ee090690d0bb5da0c6badeea1192eeabb453ec8e2f5fbf4ac243289ac0a150645d55b5
-EBUILD git-2.31.1.ebuild 18099 BLAKE2B ab308fff8ecd6a734a46beaa8b86eedebc8488a79db12e13a8677b1af96ff90bd31fc7b9c875f21b58c5e33c9c13e4f9c482fb3a8f5283ede0ff695e40d82efb SHA512 ab49cec5a5cdac3012c38556a8c892557b075247a96c469317c482bead721541d1097f21eb55f05ef3205c6e1beb21f4e0c7671afb853d7931ac2624fa95c118
-EBUILD git-2.32.0-r1.ebuild 18216 BLAKE2B 3aa6b3d25c63c2fc961a08f99f7b4ff0e629243ba6c5169a9ec982e5700d65a180fab6be15468d4a214801b40027be8fa9dbf7aaefdaaf76cd74946753cdee6f SHA512 a02f203c80fc5b03f55e4f34095210ac0028483760a8c4a9ce132c80f6c9bd289fdcc0cc1d0060c4350b07a05de212f184d46ad7f0c2c4845cc3f8d7377a3a06
+DIST git-manpages-2.34.0.tar.xz 497252 BLAKE2B a61b32cdfea99373edf227f84f8d5e6c6664f5399ce9b213f23368bd6029efe118e6de3ccb02beefdc5311487709916a245667dfe505e9f594e993641df7dfbe SHA512 367b047ac36213d62129a9bbe11617e10cf58a837f13896580dfa7ba2fe485eb3bc662d5b530ff8896039ba8b73219e98e2562f588b4589d27e8fece887d1589
+DIST git-manpages-2.34.1.tar.xz 497280 BLAKE2B aa3c67cec861eb40eda3e7827d3e380fdfb6f189027fb7e5618258b80ac33918cb3c2ca4d2f8dc5fbee959578766564137e9c4818672f5138304270c486658fe SHA512 8f3b56fa477e5aafec3ef29933234c362a372f59ed95694c4fb82ebb82d2a8ebc0ac17ae36caa9185964eef1700ea8732816e73df4ddd918afc949a8371fa0d8
+EBUILD git-2.32.0-r1.ebuild 18215 BLAKE2B e4e5e4a4685cfc0c6b9879c1b900e5be5ab1acec26ed6a070901987e3c538303430429ef92a94c2746791ea88bf01d07557479e6cda8655608c00ec682767875 SHA512 bcac636fe83b1e84c20288f8c184b836df340eacdbc7e4edae661c3eac320d43131bdddbabe5d2e8552ed1a8a0025825d6e4fb26a4c8b7e4e3497d48530d80a5
 EBUILD git-2.33.1.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
-EBUILD git-2.34.0_rc2.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
+EBUILD git-2.34.0.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
+EBUILD git-2.34.1.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
 EBUILD git-9999-r1.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
 EBUILD git-9999-r2.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
 EBUILD git-9999-r3.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
diff --git a/dev-vcs/git/git-2.32.0-r1.ebuild b/dev-vcs/git/git-2.32.0-r1.ebuild
index d9b4b7cd33ed..50b3cfccc709 100644
--- a/dev-vcs/git/git-2.32.0-r1.ebuild
+++ b/dev-vcs/git/git-2.32.0-r1.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.34.0_rc2.ebuild b/dev-vcs/git/git-2.34.0.ebuild
index 6fd30df80506..6fd30df80506 100644
--- a/dev-vcs/git/git-2.34.0_rc2.ebuild
+++ b/dev-vcs/git/git-2.34.0.ebuild
diff --git a/dev-vcs/git/git-2.31.1.ebuild b/dev-vcs/git/git-2.34.1.ebuild
index e15dae7192f9..6fd30df80506 100644
--- a/dev-vcs/git/git-2.31.1.ebuild
+++ b/dev-vcs/git/git-2.34.1.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
 	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
 	# See https://git-scm.com/docs/gitworkflows#_graduation
 	# In order of stability:
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -61,7 +61,7 @@ DEPEND="
 	)
 	dev-libs/openssl:0=
 	sys-libs/zlib
-	pcre? ( dev-libs/libpcre2 )
+	pcre? ( dev-libs/libpcre2:= )
 	perl? ( dev-lang/perl:=[-build(-)] )
 	tk? ( dev-lang/tk:0= )
 	curl? (
@@ -141,7 +141,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch
+	"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
 
 	# Make submodule output quiet
 	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index 8320c3e06611..1a6adf8a441a 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,3 +1,5 @@
 DIST stgit-1.1.tar.gz 313862 BLAKE2B 2d15ba7c2f55ff1211f0d9a3002878102f5023e897d0830daa688a2af8c6a386ec0cf076c728b6f45650ee3382379a32fb4efb25d0da3b28302f158dfca6ef62 SHA512 917c645f219b2725d1e88186674a6184c96f1457d5c7722b4da17931d963f0fe0c675cdaaca435ba7405ba498d6db9a01c9f554d1aa3093cc3205d224d9d9759
+DIST stgit-1.4.tar.gz 390734 BLAKE2B a2c8b6848cacd743022318ebf9a0512c6bd02a2b8c864db2270e5075c82dfd9e6037a3a79978b2061487bf040864077b0f7836c66986d82ff3eb902331589d87 SHA512 5251dc26a7c64dcc83021399f95ea911d6b65cfb2ee5c016c886447740ed48b66d3f0bd92a45b4aed40ae2e77dfe6ba62336dbba6773a1879ab749c95bb99b4b
 EBUILD stgit-1.1.ebuild 1840 BLAKE2B 06b57cfc1df07ac5b62045f765c3d6e03083e1132c12e6d775d5d637a2d4e8fba5a8779e639e9adac07c11c166fa7378d8fe341f53039a4b58a9714d9ed2e9eb SHA512 e365bd59428eef6feb3c71b1282753127f48f49c51408878957a490bf27d426eb70b8d45eb10f92e39dddaeae31f5c3b5eda769d909540994b00631c626c7965
+EBUILD stgit-1.4.ebuild 1848 BLAKE2B daa16c4d0766dff8e8db67a9c4d18e59e907d5a0f38ff790141592ed10f06f1e3687e4054f2e68b07f82d30b1cb646b88992303c0b804a920495778b890dad9d SHA512 8fc12389ad0378c3514efec93bc0ac4ed7d71dc1ef86d0ce495e07c7322762959d7104cd51bbb33772b8b0fe3eece7a0ccb86f36cb5ab3e2a6ee9ab593eb7a18
 MISC metadata.xml 347 BLAKE2B 152f011c7facd06cc1c654f388b4a44bbd8486549c07f1329d228e252a411bfb565e4f5b9e37bf9eefc23fda47a774c347d2e82070ac21c0880806bca99a6685 SHA512 04b087c0e6c6ae99128dab9c29e49d55e1cbcac3890f6324d3ea66b14530e92ca9ed32e9a6dfa23f06e23f8b79b3e57ceff2c9cc2995af4e01c91914d50361d0
diff --git a/dev-vcs/stgit/stgit-1.4.ebuild b/dev-vcs/stgit/stgit-1.4.ebuild
new file mode 100644
index 000000000000..06367525ebb8
--- /dev/null
+++ b/dev-vcs/stgit/stgit-1.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10}  )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Manage a stack of patches using GIT as a backend"
+HOMEPAGE="https://stacked-git.github.io"
+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 ~riscv ~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
+	)"
+
+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 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/topgit/Manifest b/dev-vcs/topgit/Manifest
index 152f86e81e3a..44658f921c66 100644
--- a/dev-vcs/topgit/Manifest
+++ b/dev-vcs/topgit/Manifest
@@ -1,6 +1,3 @@
-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.19.13.tar.gz 355721 BLAKE2B 0f70d7720d0ca2f7724fe5fa3bb100c7f812c0bb18fd9acb4897487d90f31da957bc0b4e47e9dcdd08594366fb31c4f46447cf78989f828f337edd8f8f231bf3 SHA512 8e477504c5f873651854c9412864c9dcb0ee35d0349b65e7c5d618a0add0fad3f749381edbe17195981bae3ff9f0e7323286abf7a5c6b744721ba2cc2a5d40d4
-EBUILD topgit-0.19.12.ebuild 846 BLAKE2B cff23a51c81250e59d2b9f1bd62da9ad8737bf4adb2368ce058ebe83f83a18ba8101fc7c8e0440e20e5ba89da948abfd16e05133896835d0b6d7d6254a6f0cd4 SHA512 8ed16a345ad0bb066366d0cc6fb0e442dcfc8c40bfe1816db7b7de0343e9b2e0a0ce44bac061cfc8b6a5f53fb079c03a6c47f4d50662f99ef2fb334da90d6575
-EBUILD topgit-0.19.13.ebuild 877 BLAKE2B 1e6f37bb0347333027ccf767b8ba1ed507cd6fdd97a0a787fa584ed8f4fcdf221343ebafbd98b077cf6853e46aabea12b5b961b8c9fe40426c92aae8a0dc966e SHA512 0db18249df626c09087e5edcdce3b0bbd7870460a2c8baecf71cc6e532d0b715116ad72a6b1091d06c6ff25fd89737feabfe6ddb043dadd6f08e894a41d7a3ac
+EBUILD topgit-0.19.13.ebuild 875 BLAKE2B 8eef3583510fa9f8cc56945cbf83b8f29fa5be802519907e4d23478b3e1a63abe3661a40341c78d03459830fd41fee0956e2c546864f452b5ab9b2a40afa5db1 SHA512 be763c350c58c3d01f76b603819891b3d147f5c76118e7960e85c909c83b3af15ff5c8d5c5231af374c87a202debfa2cd48a49664d9f145775108b5cf32fdefc
 MISC metadata.xml 486 BLAKE2B 44790d7afe48d2d2f36bd2b2c946d842a71ea76fcfa5297541f036531e82059e8d1f0e712402cbab4c45fdeaebfe7841e418da3a6655e4fefb2d994cf439ca62 SHA512 0336f1e67faf3a7d3645e72cec0329ea3fdcd293a44b1808abffaf87b381d80509988a7fa26e29d3c50510d110bd01373e279547fac400782d3c1b9eba20dbdb
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
deleted file mode 100644
index 23e54f886494..000000000000
--- a/dev-vcs/topgit/files/topgit-0.19.12-Rename-T-to-TESTSUITE.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-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
deleted file mode 100644
index 7a7635c00079..000000000000
--- a/dev-vcs/topgit/topgit-0.19.12.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="A different patch queue manager"
-HOMEPAGE="https://mackyle.github.io/topgit/topgit.html https://github.com/mackyle/topgit"
-SRC_URI="https://github.com/mackyle/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="/usr" sharedir="/usr/share/doc/${PF}" install
-
-	newbashcomp contrib/tg-completion.bash tg
-	dodoc README
-}
diff --git a/dev-vcs/topgit/topgit-0.19.13.ebuild b/dev-vcs/topgit/topgit-0.19.13.ebuild
index ffbf4291c89c..22d15a089a9b 100644
--- a/dev-vcs/topgit/topgit-0.19.13.ebuild
+++ b/dev-vcs/topgit/topgit-0.19.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mackyle/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="dev-lang/perl
 	sys-apps/sed
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 585e4c571edd..c49bee16a47b 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,10 +1,8 @@
 DIST tortoisehg-5.8.1.tar.gz 8636858 BLAKE2B 66473695e1364ff676ab314ce8b5a5e59cbe6ece68795d92278e450f70386a9e047dfd8975e7312bda10c183879d9634767f64a9c916f889f3edcf4847bf2468 SHA512 29903240c5522841e0ddc0f78741d20d589b6b48e82bf38023b87184e987721111a6a9675ccb85a31d9781cf1b8fa3d28801fef5bae187ae467d7da8f1ef982f
-DIST tortoisehg-5.8.tar.gz 8636455 BLAKE2B 1f4171ca4eb465aabacaf53b97785c5f05fc501a11329af008695f706d8d2cb9c5eee5e64bb5a60fdf7234f33ed6a937dfacce49cb36ac9e9b8505be271b4f35 SHA512 b9fe80a98cfafe0dbc90be5fe6f83b466fe596b4ec135d0eacc5618e39c0249a3a352bed640a7cecb99d53eaf60908d60d7748009492cbd8202fc191ef428278
 DIST tortoisehg-5.9.1.tar.gz 8637928 BLAKE2B 57687359eb00018a811e28449dccce260569f7a26c91bf25a6473427f9942fd536c4458cae593baa371c65713f626208e6627e952e78001947b8f952988c3103 SHA512 8df24a66e24ddb95af353a363149dcee37bc678ebd741f578a8bc09d6844b52537f287b908bce2dab4e4603310867095821b52332bd5bdc55b0f114bad647eff
-DIST tortoisehg-5.9.tar.gz 8637690 BLAKE2B 818b866314a04857838ea971d9a26df6604fc97a7968ee1419337fccc413d228e5597bef80256b35a2084956f356e9015c2c9c00181ab600ee75b5a86f8ec358 SHA512 14b91a2193f0eaeb39d49b131ec9214732b6898e7ee2a57091cf5be61a37ec5a0b71d8eea5d67b30ea8796565c25aa1bd1fd23ff178ae1a7dcdbfd5b333e525f
+DIST tortoisehg-5.9.3.tar.gz 8637453 BLAKE2B 9fa90c108f32b1e15c233e7ccbadbda08e434f23aa5c5fe7c235c743c98f54f4222a1804c06b0ca300cc3d0b049c117007a53452ff20ae4411bca30d8ed9013b SHA512 870b3b717962b8450d07fca5300f971d187236edce5a9d2926144b832c0771b8f5a324bdfd05a1fed3d2b4de4bad913c0c8f4435908e602e268c561ed64abbb2
 EBUILD tortoisehg-5.8.1.ebuild 2164 BLAKE2B 14da93c64160f5a6c91f149c7a288d5a881d434475ebf7fd3ea3a083d9ff4979351a4cbe6c0aa63d80a54c3ce4add40ced1740455ca7f070af601283055487d9 SHA512 242b69d6694fe007cf99c22a815add13e177243475d03006272a4757d7fc0e1892be03986626cc00aada6d8fb316dd0bfa2738197ab8ed50f60eca033eeb04b5
-EBUILD tortoisehg-5.8.ebuild 2166 BLAKE2B 203d7f67301c454e992646afa656365f0bd8f220a7865f3da4f48d2440de4f34d371e9f39c728955bd694dab7d34862d9b52f48be448dedea5b98f40709cdfda SHA512 f0634d3da8794c73e8b2e55e8043ff9077d59162f00e2ce8d1fb617f4fdba81765d4180c0caae55ee085f230c2c1b064e43473404d13cbfb0bab7f77460a7051
 EBUILD tortoisehg-5.9.1.ebuild 2166 BLAKE2B 37f3f4cceb3c06419e6e8748e4275d1dd1a7016c487ff84896214cdd38b846c65ef670df8d9edf1b0f50c55644424bcf54777965efc57e78a514fde0fe540ff2 SHA512 7428b10790d699dfeef38a0113e3310ba5c7a30799e47799fca9d9183658ca8ca0d9c6797f2cddb5b37e1c6f2ac8fa55384dbbc6d03bac0c7e1e4e56c2e67229
-EBUILD tortoisehg-5.9.ebuild 2167 BLAKE2B 0c1237de6a4b74cf252937f5d47abc8485f14931a4a3d88f7c7eee133402bbd039cefdfc25319c72aea6e077c188234c567123e5f0fbe6f48d609d9576a432d7 SHA512 b94e7458441b661d61feb203812ba903d5f2f3c8d43681a8878137f8fe8965f2ac712868cd860e7229d8a134bd42e272c9e74c9e355693a701047603d86cfcb9
-EBUILD tortoisehg-9999.ebuild 2167 BLAKE2B 0c1237de6a4b74cf252937f5d47abc8485f14931a4a3d88f7c7eee133402bbd039cefdfc25319c72aea6e077c188234c567123e5f0fbe6f48d609d9576a432d7 SHA512 b94e7458441b661d61feb203812ba903d5f2f3c8d43681a8878137f8fe8965f2ac712868cd860e7229d8a134bd42e272c9e74c9e355693a701047603d86cfcb9
+EBUILD tortoisehg-5.9.3.ebuild 2169 BLAKE2B 23660fadace44396ff213f865691694b6b98eb857b6524b1b9427dec66e7228ed029cc5a1255e5459ba2deda1f7b120664a9822e30a0d3a780a302606c8c920f SHA512 1017438897af04d732680baf8778a2597e0b2f61cef2eb9b21e0f4b82b377f8cc1319c8ca6a19b0f3f99fdae780b65daea9850de2dd6c8bfb694b15c5aa274fb
+EBUILD tortoisehg-9999.ebuild 2169 BLAKE2B 27c3b486e3564b18894f2408ced68d0163773d62481cab64ccf302d5fdf6beefd7ab85fa9f46a207e62c5ef8c80d5d4a4d33c370e01e938e75d58aa94da3ab09 SHA512 a7f0a57a68c50e8d049ae13f88ecfcfb4348df479b760f2393ed8a44a1360373c4688b7346e91f0e8c6e667a007ff7223b5cd034bbfc2f494c69b907f4caaadd
 MISC metadata.xml 805 BLAKE2B b09f8454c68278c180c84a62c54410909d731307058fcfb973d48b304269ae4eac6d4e61d4f04857813659029869097e3ba5a4d2bb6fea698797b364ba588cbe SHA512 33aa011e53112a7e1589205bf563fefb3db2cc931f4643a03abfc6baafd1b57c59a4f712814dfd3e3e1eb6b299fb34af53bcb2d1c08accaed6989f23b3e41acc
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.8.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.8.ebuild
deleted file mode 100644
index 31b4b602f288..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-5.8.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit desktop distutils-r1 optfeature xdg-utils
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-5.7[${PYTHON_USEDEP}]
-		<dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]"
-	S="${WORKDIR}/thg-${PV}"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://foss.heptapod.net/mercurial/${PN}/thg"
-	EHG_REVISION="stable"
-	HG_DEPEND=">=dev-vcs/mercurial-5.7[${PYTHON_USEDEP}]"
-fi
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="https://tortoisehg.bitbucket.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${HG_DEPEND}
-	dev-python/iniparse[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
-	>=dev-python/qscintilla-python-2.9.4[qt5(+),${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc/source
-
-python_prepare_all() {
-	# Remove file that collides with >=mercurial-4.0 (bug #599266).
-	rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py"
-
-	sed -i -e 's:share/doc/tortoisehg:share/doc/'"${PF}"':' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	${EPYTHON} tests/run-tests.py -m 'not largefiles' --doctest-modules tests || die
-	${EPYTHON} tests/run-tests.py -m largefiles tests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
-	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
-	domenu contrib/thg.desktop
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	elog "When startup of ${PN} fails with an API version mismatch error"
-	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
-	elog "dev-python/qscintilla-python."
-
-	optfeature "the core git extension support" dev-python/pygit2
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.9.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.9.3.ebuild
index 97e0009c544a..4c3e2b2f0e6f 100644
--- a/dev-vcs/tortoisehg/tortoisehg-5.9.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-5.9.3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 97e0009c544a..b2992eb0f27b 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 DISTUTILS_USE_SETUPTOOLS=no