12 files changed, 104 insertions, 91 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 2906f63db662..c24fc0a9ae70 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-big-picture/Manifest b/dev-vcs/git-big-picture/Manifest
index 5ad092a666a8..95354d1e3fc0 100644
--- a/dev-vcs/git-big-picture/Manifest
+++ b/dev-vcs/git-big-picture/Manifest
@@ -1,8 +1,5 @@
-DIST git-big-picture-1.0.0.tar.gz 2952246 BLAKE2B caf28b57399bbdc2c80feda70e2a043dc1a8ffdc1e88bc79ccec44d6857e52726961e5febe9d1dbe1230818990a291900237cc01f65e819995243cbbc47ba8a9 SHA512 3b5416d3802c91ee35ad31ef702ada5f23b33cd77ef4c1f15cf22bb7f7d1e3c315e100aabdca3831b56d52b1d1637afa86382f89f0a2bbc8c60970095cd53d43
-DIST git-big-picture-1.1.1.tar.gz 2960674 BLAKE2B 00b3117f810b78965e5a260000689c3275f078307f8e5ef90e6a032036eeedcda743c6eff3e3a1f53744d71d9b3bf2692efc558d5f5b20eada9a9b2e21559796 SHA512 1bf1b620d73cccb058034bc8920adcab117fbda8b921937aac6b90e2162cf4b334cae934b0395efdf40b5e9a363e7ec69090ca943c839829dedaa40428dbdb13
 DIST git-big-picture-1.2.0.tar.gz 2963822 BLAKE2B 2e2a5c223c212cc73f44a2f91ad1b83d46279baec77633b6253f21f0e3bc7eb2968fc9e47800976db9a720713597329ff442853b9bf151ebf112b60ebf87946e SHA512 144e098fedc8f0e9d7c2360ff8194d5100effd13b0b04598680d441b1ffa9d3307982e6404c54b859dffb3ff8d8ba1b5a7a01245b5bf7e87f36268b7e6b9d266
-EBUILD git-big-picture-1.0.0.ebuild 716 BLAKE2B 8783643bfe34e5b43efb9545bd901d022d984cf000c6eb04a182e493df52e7713db667a476d20dd9db1df9a492b1740eb4193a0771eb03bb2b39e40792dedfab SHA512 b234296687ceb1aae19757d42d4baa822233889087dcea91fd71efae7f5759cd4006b4d9bbb884049261c499828f7a8e3fae83a926b4423d48b35cd8f8eb8792
-EBUILD git-big-picture-1.1.1-r1.ebuild 844 BLAKE2B 166b86b88b090fd2fa71700448665a6609b8850849ab4d462b41869de3afa10d93c300d229f54a9c6e21db1ced3747c5876004c4b290d836c8774ebce4c9aa14 SHA512 b37112a7915fcd2fe5d080a568bd7d18219e6e4a11f336fc91d7269ae54c28892f5f09b8ea7587cd1d4e516e57a84b3b62e962c97a88fc09e436936b33155ed8
-EBUILD git-big-picture-1.1.1.ebuild 876 BLAKE2B 5c43832dc4e02c9164a6ae4c9b4488eabdee730572b5a5535fc0519be22c0b3ca97670ce675dfb9b92d6498e171252cae0348a9091a8b356746181d4db120c98 SHA512 0fe6e14a0c7c3bd76ad1c659f0094210240ce25403068e86d74991b6c4f17701a19a0c8bcdd8c18ee65e311d56205614cb74cf09d626ad8bc1ade515b7ddda05
+DIST git-big-picture-1.2.1.tar.gz 2964502 BLAKE2B 1213c29e01c8556f694ecd12dcb397ba20f7a899042c2a02e7c10d80acdfbcc0e9f6c7b72f82575a3bff55af16fce993ad8d31a25f19ed655e55ad5d25e89f75 SHA512 efbbd730fad8f1e913a81d66bf758cdb2be548ed083fd9a778a79ff56f891fe57bb620c8ac3f6f65736b588619189b14332ca23902d3d510e4c6c4bc9714b682
 EBUILD git-big-picture-1.2.0.ebuild 889 BLAKE2B 3def5d0bc40f1051d5661c7fbc2eaf6de5ab82f12bc6610e79d5392488653a81f92e214b9411c052ae211f9b6716fdc0f134b9e3dbf3463a0159c6453f20177c SHA512 5de8adb1d17bfdad010e4169496943e59c8ae51ee4bd43c9f50674c7d45e781cc5ab53145a8b7a807b0b5414d6679186e800027e455ad791816dc7028cc4cbdb
+EBUILD git-big-picture-1.2.1.ebuild 889 BLAKE2B 1bb995fb57d6e0613d31400de3072b2396fd7a5eb5fd412a50eb8ee3c6e858aa4acecaa89ef32c8c0dacd61f18b01b50df933ff09d6a14c0f8198c0be00af4ff SHA512 c69c4c9b0515dca95b10173bc0dc4874c3786515eba0a5ba0e605ccc7d2d3c38777eec6db8fd6fae0682f86edcc35fa00cf47d1abd430c0fe762274a861ff969
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/dev-vcs/git-big-picture/git-big-picture-1.0.0.ebuild b/dev-vcs/git-big-picture/git-big-picture-1.0.0.ebuild
deleted file mode 100644
index f8cb39383304..000000000000
--- a/dev-vcs/git-big-picture/git-big-picture-1.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Visualization tool for Git repositories"
-HOMEPAGE="https://github.com/git-big-picture/git-big-picture"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# No need for "[python]" or "[${PYTHON_USEDEP}]" with any of these
-# since they are invoked using subprocess
-RDEPEND="
-	dev-vcs/git
-	media-gfx/graphviz[svg]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	mv test.py test_some.py || die  # help pytest with test discovery
-	default
-}
diff --git a/dev-vcs/git-big-picture/git-big-picture-1.1.1.ebuild b/dev-vcs/git-big-picture/git-big-picture-1.1.1.ebuild
deleted file mode 100644
index 160479d2633e..000000000000
--- a/dev-vcs/git-big-picture/git-big-picture-1.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Visualization tool for Git repositories"
-HOMEPAGE="https://github.com/git-big-picture/git-big-picture"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# No need for "[python]" or "[${PYTHON_USEDEP}]" with any of these
-# since they are invoked using subprocess
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-util/cram[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	dev-vcs/git
-	media-gfx/graphviz[svg]
-"
-
-RESTRICT="!test? ( test )"
-
-python_test() {
-	pytest -vv test.py || die "Tests fail with ${EPYTHON}"
-
-	distutils_install_for_testing
-	cram test.cram || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-vcs/git-big-picture/git-big-picture-1.1.1-r1.ebuild b/dev-vcs/git-big-picture/git-big-picture-1.2.1.ebuild
index 3164eba3540d..8d0b7a15fdd2 100644
--- a/dev-vcs/git-big-picture/git-big-picture-1.1.1-r1.ebuild
+++ b/dev-vcs/git-big-picture/git-big-picture-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -18,6 +18,7 @@ IUSE="test"
 
 DEPEND="
 	test? (
+		dev-python/parameterized[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-util/cram[${PYTHON_USEDEP}]
 	)
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index b4717cb9e740..87c6249143f5 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -33,7 +33,7 @@ EBUILD git-2.33.1.ebuild 17888 BLAKE2B 76bf11b57727a9c2a8d9cf30f75a13f9ae5fd6942
 EBUILD git-2.34.1-r1.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
 EBUILD git-2.34.1.ebuild 17887 BLAKE2B 3823133aa91e9fb11e7ed1f4094cbdc27b94cc8e45bbed46c82d671ada31ec698984cddfd05c81f829ff58b041e5c43bc908e876a2f71ca117d3c00636ef65fa SHA512 2ae6cff9fbbcf4c6b00a5f623685236a41651b17a45d6b850962846202d147702c4aac7c46120b7772464d2b318994a3c68c4bf3323f4b6f01e8f799a5a414ed
 EBUILD git-2.35.0.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
-EBUILD git-2.35.1.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
+EBUILD git-2.35.1.ebuild 17889 BLAKE2B e3413ab7883bdf06c93d5acbb22777f67cb42c93c5ef39e8fa241d6c20c8b6f1870b2f990932f75485eb7a2859d5b03f4eb5dc885a38a5da6d8b3afd96d5bd73 SHA512 d3b4670a83e71cef1efe82bacf5b346b44ea21510ef0cc17db737c02cc527ab0b23a3d99b64408f516506e3340ca1c69dc7d1b67947da6403d5f13bdd3d52394
 EBUILD git-9999-r1.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
 EBUILD git-9999-r2.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
 EBUILD git-9999-r3.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
diff --git a/dev-vcs/git/git-2.35.1.ebuild b/dev-vcs/git/git-2.35.1.ebuild
index 075208f7ce0d..ea399dac9551 100644
--- a/dev-vcs/git/git-2.35.1.ebuild
+++ b/dev-vcs/git/git-2.35.1.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
+	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"
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index a7304eb33cfa..5dab27a906b1 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -6,4 +6,4 @@ DIST repo-v2.17-bash-completion.sh.base64 5736 BLAKE2B 59c357d76feb176b7c64791ff
 EBUILD repo-2.15.ebuild 1253 BLAKE2B f9a3b7eb2a335376a68519eb2d7cad7ea7765c28132b23b31ba6fde4c2a1cf81304f2d1d84d4293346f8a99e9c02934824d9db40d62f57ca4537ebfeb9a21bd4 SHA512 7706d0558c7c5d2c5975dbde52cce0710deea1b3204ff499e83f20e49bf66275481f122f7a76919abd58b23a7d565a0be89b0cedc72cd60e8301207e2063e3e2
 EBUILD repo-2.17.ebuild 1218 BLAKE2B f4876b7f1d9f953615bf4305cbfc3d98ec84976d0a694bd0f74a39995f48d42d7477d161c336301b8590f0480caa844433172228aebf38b0e0a32aff260fb997 SHA512 0b35bdcb0769f19e3abadd778e6f50de3ee59b6ebc1f6d9b4491cf025f469d3fcfc1f1ff25958905225b46ba0dd20ba83b996d42a3c0196803cc01e94c274290
 EBUILD repo-2.21.ebuild 964 BLAKE2B 4fb9d6382d8240d54102907a0abf7eb7c806700e3a78cfdccdcf4740efc710820b2141f2001b4aca025be72840d8e06e6d37dc0f77d7fd99620f4032f6a0ba0d SHA512 3c6d3c5939be9be51429d4451dac183de902d1bd00967bde131d985cfdd91989d7b3077ca69e1564b6d30061111c400993f1c8044a5565710a94c331d8517e00
-MISC metadata.xml 215 BLAKE2B 344b2d45a66df1c90f44ffca3343c1dec6f3fa2510ff1460d7652259f31f50bf80a8fef7a89ddd4fc86273290e98d04a1949ff881a9ca9464eaf81a422acfdb2 SHA512 059a722b5adb3ac6d86ab064c11bf5d472f7ad6156538798e7f61ee3b8c42d07ff7e2b951deac22472761526208214c3b7dd4950c09b894f419d0bbd00121f7d
+MISC metadata.xml 248 BLAKE2B 2545c58c45b8fd57a236bab059e0bd3da47a3e0d3881d141a9b2dc2e275a2d8f0663d83366b45103b48fd257d62a4a2314a8dd6b79113f8b86c91a90524918c5 SHA512 1397e06cb2ad5941988872f37df6f54100aaa06bfc7ef30ba394f95191ddaa1e9f2180d8eb856eb10f9646d9cbc4a6f020805470633c492519e66e3de788439a
diff --git a/dev-vcs/repo/metadata.xml b/dev-vcs/repo/metadata.xml
index 8041df927597..7517f8d97dd7 100644
--- a/dev-vcs/repo/metadata.xml
+++ b/dev-vcs/repo/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>vapier@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<name>Mike Frysinger</name>
+		<email>vapier@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index c49bee16a47b..19a7070d27c7 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,8 +1,10 @@
 DIST tortoisehg-5.8.1.tar.gz 8636858 BLAKE2B 66473695e1364ff676ab314ce8b5a5e59cbe6ece68795d92278e450f70386a9e047dfd8975e7312bda10c183879d9634767f64a9c916f889f3edcf4847bf2468 SHA512 29903240c5522841e0ddc0f78741d20d589b6b48e82bf38023b87184e987721111a6a9675ccb85a31d9781cf1b8fa3d28801fef5bae187ae467d7da8f1ef982f
 DIST tortoisehg-5.9.1.tar.gz 8637928 BLAKE2B 57687359eb00018a811e28449dccce260569f7a26c91bf25a6473427f9942fd536c4458cae593baa371c65713f626208e6627e952e78001947b8f952988c3103 SHA512 8df24a66e24ddb95af353a363149dcee37bc678ebd741f578a8bc09d6844b52537f287b908bce2dab4e4603310867095821b52332bd5bdc55b0f114bad647eff
 DIST tortoisehg-5.9.3.tar.gz 8637453 BLAKE2B 9fa90c108f32b1e15c233e7ccbadbda08e434f23aa5c5fe7c235c743c98f54f4222a1804c06b0ca300cc3d0b049c117007a53452ff20ae4411bca30d8ed9013b SHA512 870b3b717962b8450d07fca5300f971d187236edce5a9d2926144b832c0771b8f5a324bdfd05a1fed3d2b4de4bad913c0c8f4435908e602e268c561ed64abbb2
+DIST tortoisehg-6.1.tar.gz 8651661 BLAKE2B 0b66c057973eeef443370151884205144d75a7f21f3f3af5521ba43c2e366cc28c52850ddd7eec6e33ba97236fca99e63fdf9c0eb570213f382d726e63837217 SHA512 98b2d1c357f0996f8e2ef9e2440fe005e28672effe8a871a2bf940a973cbba9f49afb234eb28d4d9b3a15bad4bedd61d302e975787e76f9abd52f5958a7a219f
 EBUILD tortoisehg-5.8.1.ebuild 2164 BLAKE2B 14da93c64160f5a6c91f149c7a288d5a881d434475ebf7fd3ea3a083d9ff4979351a4cbe6c0aa63d80a54c3ce4add40ced1740455ca7f070af601283055487d9 SHA512 242b69d6694fe007cf99c22a815add13e177243475d03006272a4757d7fc0e1892be03986626cc00aada6d8fb316dd0bfa2738197ab8ed50f60eca033eeb04b5
 EBUILD tortoisehg-5.9.1.ebuild 2166 BLAKE2B 37f3f4cceb3c06419e6e8748e4275d1dd1a7016c487ff84896214cdd38b846c65ef670df8d9edf1b0f50c55644424bcf54777965efc57e78a514fde0fe540ff2 SHA512 7428b10790d699dfeef38a0113e3310ba5c7a30799e47799fca9d9183658ca8ca0d9c6797f2cddb5b37e1c6f2ac8fa55384dbbc6d03bac0c7e1e4e56c2e67229
 EBUILD tortoisehg-5.9.3.ebuild 2169 BLAKE2B 23660fadace44396ff213f865691694b6b98eb857b6524b1b9427dec66e7228ed029cc5a1255e5459ba2deda1f7b120664a9822e30a0d3a780a302606c8c920f SHA512 1017438897af04d732680baf8778a2597e0b2f61cef2eb9b21e0f4b82b377f8cc1319c8ca6a19b0f3f99fdae780b65daea9850de2dd6c8bfb694b15c5aa274fb
-EBUILD tortoisehg-9999.ebuild 2169 BLAKE2B 27c3b486e3564b18894f2408ced68d0163773d62481cab64ccf302d5fdf6beefd7ab85fa9f46a207e62c5ef8c80d5d4a4d33c370e01e938e75d58aa94da3ab09 SHA512 a7f0a57a68c50e8d049ae13f88ecfcfb4348df479b760f2393ed8a44a1360373c4688b7346e91f0e8c6e667a007ff7223b5cd034bbfc2f494c69b907f4caaadd
+EBUILD tortoisehg-6.1.ebuild 2278 BLAKE2B 58939a72d5a5b3f0e29a888c7c5bd1dd10c6cee156f15ece7a96d2275a120b4de407f68ff0754559c20beb22f803b3e3a7790723ea48552b0fdf040b87d0e657 SHA512 e82068b5541af14d1240dacad789b842d3afde556903fdf80651614f4e5d5ce3f9a037fc5a5975a27f36ff62d927bc98ea9f2b23250acc6ed52286e8248685e1
+EBUILD tortoisehg-9999.ebuild 2168 BLAKE2B 15d7fde70b89afb0d760d1b11ea5f7f2f1bbd9eb70c85a86dc9123f1e7199ef047f9eae7d8f38aab32fc4844c46038e18f3a6e2d32eadb8e87e30b283cca224b SHA512 c14c6428297b9dab3b7204d504ae4cf46938ed117f4168462d8757acc5654f3f79a548cb0a4dea0803ff7556d9795ff80544312f0ff40cbb955b2c676cf30128
 MISC metadata.xml 805 BLAKE2B b09f8454c68278c180c84a62c54410909d731307058fcfb973d48b304269ae4eac6d4e61d4f04857813659029869097e3ba5a4d2bb6fea698797b364ba588cbe SHA512 33aa011e53112a7e1589205bf563fefb3db2cc931f4643a03abfc6baafd1b57c59a4f712814dfd3e3e1eb6b299fb34af53bcb2d1c08accaed6989f23b3e41acc
diff --git a/dev-vcs/tortoisehg/tortoisehg-6.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-6.1.ebuild
new file mode 100644
index 000000000000..1141a498eeb4
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-6.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit desktop distutils-r1 optfeature xdg-utils
+
+# Tag isn't provided this time
+COMMIT_SHA="cdfdf8c593f98863b4034b38001c71bc9fb970c3"
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${COMMIT_SHA}/thg-${COMMIT_SHA}.tar.gz -> ${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]
+		<dev-vcs/mercurial-6.2[${PYTHON_USEDEP}]"
+	S="${WORKDIR}/thg-${COMMIT_SHA}"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://foss.heptapod.net/mercurial/${PN}/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND=">=dev-vcs/mercurial-5.9[${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-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index b2992eb0f27b..fbf56b913fc3 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -12,14 +12,14 @@ 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.8[${PYTHON_USEDEP}]
-		<dev-vcs/mercurial-5.10[${PYTHON_USEDEP}]"
+	HG_DEPEND=">=dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]
+		<dev-vcs/mercurial-6.2[${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.8[${PYTHON_USEDEP}]"
+	HG_DEPEND=">=dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]"
 fi
 
 DESCRIPTION="Set of graphical tools for Mercurial"