gentoo resync : 02.02.2022

30 files changed, 882 insertions, 280 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 147a130fb011..268beeb3becf 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 630c51b842cf..a81877d29261 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -2,10 +2,8 @@ AUX README.gentoo 227 BLAKE2B 828266fe46d9eb866250b57921df446055c7835cce3c3d1701
 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
+DIST git-cola-3.12.0.tar.gz 1004892 BLAKE2B 9396768256341e59500dffc95136e710b2d3d1c9d5cb4d70fc7fba8e81e16a3656006b5558dae417fbbad7baf1373d953708006b96a8873f68502ea469462326 SHA512 4b8ec716f572682747f43ae1a9232612d95d44384d28bbf97ef461a93546cdfcc81125f816b4c8ea5efcf4d23f42edeb8a89df3c7167ceac4709eeeaf49965a9
 EBUILD git-cola-3.10.1.ebuild 2486 BLAKE2B 8ec3e8f3737b1955a6169a2d6997d4ee9d9565fad0223955a5df1763d1e6ffb0fe839129d4eb4ea2e2986dd96e3f6a770bd472ba833234d3ca25d115643871c7 SHA512 458fe11168fcd3d839029220a5ec13731238bf24e8ae7120df3476e015d740de615e6d90c2e9cfbd22d70310a0fc6eb07bf92b96fd8301e30c84dfbb9b8659e3
-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
+EBUILD git-cola-3.11.0.ebuild 2457 BLAKE2B dec9f6f5643428efd6eec292e86dc20f510c650f189e7ead68c0644cd91cb5b4564cf87cb2c7350d11a2972eca8b55f39b3b133e9dd3510771bb97d7dd05d3d5 SHA512 6fb7b1422d5a2dbdfad15650da60b81aea9911e47f42d11ae1da6ee6230547e7f1d7b615544f8214cf904d056e1122cf34d6b16843f65b9f18d601b89b413ac3
+EBUILD git-cola-3.12.0.ebuild 2457 BLAKE2B 9bc8d5330b6f3093f3e5cdb74d3aa8b02d41a52cf3c024c59cbfddd9dca8ab43f7852a7c494471395094b820b91773b9729165c5ab99fed7fb25e22e14251896 SHA512 0f2c0665d62afd9288f1ecea7b3d892e5e4f063ecf6aba561b10592a1f8830a03c4905a3aa9044814659b1905e30df4c1e2e3d1857a6c4d75d3152501341907f
 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
index 1aa8af03490f..ebab708004f6 100644
--- a/dev-vcs/git-cola/git-cola-3.11.0.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,7 +34,6 @@ BDEPEND="sys-devel/gettext
 		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]
 		)
@@ -58,6 +57,9 @@ python_prepare_all() {
 	# fix ssh-askpass directory reference
 	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
 
+	# disable flake8 testing, it's not useful for ebuilds
+	sed -i -e 's:--flake8::' pytest.ini || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-vcs/git-cola/git-cola-3.9.ebuild b/dev-vcs/git-cola/git-cola-3.12.0.ebuild
index ef74afe09e0a..51817bdd4a3b 100644
--- a/dev-vcs/git-cola/git-cola-3.9.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.12.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_SINGLE_IMPL=true
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
@@ -23,8 +23,7 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[network,${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
 	')
 	dev-vcs/git
@@ -34,9 +33,9 @@ BDEPEND="sys-devel/gettext
 		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
 		test? (
 			${VIRTUALX_DEPEND}
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/nose[\${PYTHON_USEDEP}]
 			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
 		)
 	")
 "
@@ -58,11 +57,14 @@ python_prepare_all() {
 	# fix ssh-askpass directory reference
 	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
 
+	# disable flake8 testing, it's not useful for ebuilds
+	sed -i -e 's:--flake8::' pytest.ini || die
+
 	distutils-r1_python_prepare_all
 }
 
 python_configure_all() {
-	mydistutilsargs=( --no-vendor-libs --no-private-libs )
+	DISTUTILS_ARGS=( --no-vendor-libs --no-private-libs )
 }
 
 python_compile_all() {
@@ -80,8 +82,7 @@ python_compile_all() {
 python_test() {
 	GIT_CONFIG_NOSYSTEM=true \
 	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C.utf8" \
-	virtx nosetests --verbose --with-id --with-doctest \
-		--exclude=sphinxtogithub
+	virtx epytest cola test
 }
 
 python_install_all() {
diff --git a/dev-vcs/git-cola/git-cola-3.8.ebuild b/dev-vcs/git-cola/git-cola-3.8.ebuild
deleted file mode 100644
index d467fc38d90b..000000000000
--- a/dev-vcs/git-cola/git-cola-3.8.ebuild
+++ /dev/null
@@ -1,114 +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_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/PyQt5[network,${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,${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/mock[\${PYTHON_USEDEP}]
-			dev-python/nose[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-		)
-	")
-"
-
-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() {
-	mydistutilsargs=( --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="en_US.utf8" \
-	virtx nosetests --verbose --with-id --with-doctest \
-		--exclude=sphinxtogithub
-}
-
-src_install() {
-	distutils-r1_src_install
-}
-
-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
-
-	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-filter-repo/Manifest b/dev-vcs/git-filter-repo/Manifest
index 6e3059a4e7d3..a11fb9acb859 100644
--- a/dev-vcs/git-filter-repo/Manifest
+++ b/dev-vcs/git-filter-repo/Manifest
@@ -2,4 +2,4 @@ DIST git-filter-repo-2.33.0.tar.xz 148024 BLAKE2B d23b47575cad60db2c42fe794d6b64
 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
+MISC metadata.xml 335 BLAKE2B ce4ba8c7ea94f81ae7a41ae00f4360c8336e3d2a347a876a6f540440bb40adb77e7f3ed3fa0a90cd42b4e3350df8d89745aabdb680fed53953a8ea1d79f1bed3 SHA512 8a0b5fc58e207671ba46f687cc034de859e97507ee7d79a397d47f3ce97039a17b87a15da024fb6e6c351ad409e82bc107fcdab1c15eaf0ffecfeeaa513f7581
diff --git a/dev-vcs/git-filter-repo/metadata.xml b/dev-vcs/git-filter-repo/metadata.xml
index 8cb46cff61f8..e4dab52e37b3 100644
--- a/dev-vcs/git-filter-repo/metadata.xml
+++ b/dev-vcs/git-filter-repo/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index c1c3fbeee390..dec64c73d0e4 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -1,6 +1,6 @@
 DIST git-lfs-2.11.0.tar.gz 2839623 BLAKE2B e9d0e8ea37f19617a4f727abdc93c3c937052ad98b6ac40de27ced6b250789701797d04f1bf795b259e83155e5d8a1ca122dbf8b40503c2c41d6d891a3ecf096 SHA512 2117b425864a36f773c14d34c78999636d836646184cf8d89045ef6de90cbded873d4de4613ecfafb0fa2ea8ae068e11f5ae22eed6af01715b5fac9be70f033b
 DIST git-lfs-2.13.3.tar.gz 2901796 BLAKE2B 84bbce719e83229bbb7116f5c337e0748a2be223b260e03653dab23f6c8d20087a09695d6ef7abf45e128bfd79c5eb994cb14fb906330675174830603a2e3ba2 SHA512 2c9e10e4f2fdb5d6bae8994db5879f50596109f3057e7369a9edca3c13c3f4d77e268e3903a0abca60cf8e342ff54bc4920c01a530f8eb400e3a0cc11a171f74
-EBUILD git-lfs-2.11.0.ebuild 1392 BLAKE2B d6e33aa99c265dd3e2fd889c5bd9a70b751e15cc9757343e1e1bd7bec432e8015611e7b3009d1cd291eaa6b69e0a6fb7581d50f744f1a164d52936095ee5c03d SHA512 497ae5f9fa85cc412cb1708f13e75acaafc4087c5243aee8bdc9ff4567756cd60602cda6092ea1f98fe560a7ae9a6a05f69ffbb862136d2782b2850d8512ad15
-EBUILD git-lfs-2.13.3.ebuild 1573 BLAKE2B 19932b5efa8c05057333f8deec710129cb2c6d516af3d97c88fea86099b4ec14c4d5146648892ce82aaad7a18ba5194782ce243dd3a55472d44aaad22b1f78ae SHA512 741cc618ea2fe808e9a9761d170f614bc0d8de75753297bfdc63b1d1ea982dc9649e7ba24bb899af771e353e3d471d06dcedf76539fa7f0e74cb16b3fdfb837d
-EBUILD git-lfs-9999.ebuild 1574 BLAKE2B a4115ded4f732b9a9e4d2c16ce0ccb75ee553ff311433aaa56e9a4f799b6a69db0360526dbb1b610805063b756a4de3f717db6a7b0025da41033684dc13aca72 SHA512 7ccef2d1bedb5bff04bc8cb73d3f8c797790173278d6bcccacb82e2072b6203859114d7525990dbb897a30281c44642ef626d321e1d28a893806a5adc7a97e69
+EBUILD git-lfs-2.11.0-r1.ebuild 1416 BLAKE2B 952314086d8a9716c49a72d5945aeb4cba5140451e45fc60eea7a04a10f7c07d5a9439f41ee30d542c938930bc37476e2d1471dfd4adf4d75b6b4dda45a1d125 SHA512 2b613f04ce9a31aa8c94603f4489ff22f85e5ede7b1deb5df5f4cd28c826e46cd6d28c7f14c3eca4d8f7425750aca8b2e2360c423ba93b1c68d2dcc8d6fdc1a0
+EBUILD git-lfs-2.13.3-r1.ebuild 1597 BLAKE2B a7d3bc880490893328cdc32e758514293e24097955037d4a874e22752c60393a2c9a10324ac701db3a3ace3d2ef64339c38789f9da7dc70bf254ac3b2301cd6d SHA512 5dc3bf175d04a149d8733442b87a914cad22ab98de6939c4f72386e5f471f0e7fc0dd146bf869c6c9986a87ecdaa9b5cac0273a756882ca85bbb6ff0cf900013
+EBUILD git-lfs-9999.ebuild 1598 BLAKE2B 37d77779c03abb5dea7f7edb0737aff64decd778f16f4433c193acf2d15015ef0a832d9f0de7483a772d3654b15fa60aef2d9fe107cf634b0e80b34a14e03338 SHA512 1fbfba9042c84cc89bc9500389a5db5587594ab02bb10f05786f430a45f607e12e7bda56c8e82744cc8ea73703086f3a2557ad3542b3699fe5c10d7d235ce37b
 MISC metadata.xml 477 BLAKE2B f26242dee1117690332342dbd12f3739eeff572ff6e64ffb979a18c6fe7fca5e305beb08c9aab02ceb4c9dd1cbab6401a3a31d326f5d25d1ee30fb62fd711673 SHA512 9ae6594f42265b3f33cb977eaceab2a5fbb45f3e6a7c64c7cd4cfb88b8d56da0cc6f9d7564beda45969bb525f537e7a3e7d3b764456f3210c3e4c16e9d7545bb
diff --git a/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild b/dev-vcs/git-lfs/git-lfs-2.11.0-r1.ebuild
index 6fdbdcf910e1..5db47f6cb90f 100644
--- a/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-2.11.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
 SLOT="0"
 IUSE="doc test"
 
-BDEPEND="doc? ( app-text/ronn )"
+BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )"
 RDEPEND="dev-vcs/git"
 
 RESTRICT+=" !test? ( test )"
diff --git a/dev-vcs/git-lfs/git-lfs-2.13.3.ebuild b/dev-vcs/git-lfs/git-lfs-2.13.3-r1.ebuild
index 5c5be39ec301..2cf565a6aba2 100644
--- a/dev-vcs/git-lfs/git-lfs-2.13.3.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-2.13.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
 SLOT="0"
 IUSE="doc test"
 
-BDEPEND="doc? ( app-text/ronn )"
+BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )"
 RDEPEND="dev-vcs/git"
 
 RESTRICT+=" !test? ( test )"
diff --git a/dev-vcs/git-lfs/git-lfs-9999.ebuild b/dev-vcs/git-lfs/git-lfs-9999.ebuild
index 641f9c79a60b..9074b5b98409 100644
--- a/dev-vcs/git-lfs/git-lfs-9999.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
 SLOT="0"
 IUSE="doc test"
 
-BDEPEND="doc? ( app-text/ronn )"
+BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )"
 RDEPEND="dev-vcs/git"
 
 RESTRICT+=" !test? ( test )"
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index c7863b4afcb8..b4717cb9e740 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -16,20 +16,24 @@ AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d697
 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.1.tar.xz 6623760 BLAKE2B 9b5d7a450ec495898bcc0e1f6ae87c0ad102d039cf7c4106cdfe3ada501d9bfaf22b83c522de383d3c01f7d5a29dbfd7fc44b371efa8fc3a418ab3c609a692c1 SHA512 a1a8e9e6f64b1da25508fbd2f783564dcdbe181fb5ff1ebab3bdac6db6094e18acc334479a1abf22ac17ce4f733cc3e10a664db9ab234cd523735a3f027b42db
-DIST git-2.35.0.rc1.tar.xz 6865756 BLAKE2B 6e55dc6d7f040ce066380745fc9d213adbefe4f3c7c09cf3a3a1557cdfc756f5f1baff4028061820ad45383e2d16efc0a651b36b9dd4268c3ebbca5d0450215a SHA512 fe7fdf5dfa9f3c7ac89158fd73520335cb0c10ab992258dbb88ee1a90b03f4f8bfbe490dcf704770e91245e162014deb400f3b507dd6fda4f52b01c16081b2cd
+DIST git-2.35.0.tar.xz 6873768 BLAKE2B e432b742a4d45c41f2d0224f10bd51d4856dc2e43101b1b7a90a86b6882d0a9f64fd5d302e64948ee71ed2730de7066bb33821cb5984ae319b546bd59c0327af SHA512 ae391e1cda7b4e7d49e09e7412cd2da8d643c71f20967fd7b600be00a13d3b126c2bc3a2deece935742084ecbbd1eb51455b10365e0d65423979241e9e7b94a9
+DIST git-2.35.1.tar.xz 6874520 BLAKE2B 028ff97b47748871da145720d0d258a0dcf4acc60b10c787dee5703fcab5f6e621c5671ee9e7a25009e82a2830400f35fa232d88c62606a6687260c744680025 SHA512 926c6813ef61931e1a1c43dfd7b15e20dc5878c1752876bd08f039249c9ed09f20f096b2f01947de9c9522c942e9fa8c1363d7d31a488bbe3f93c0cff31fcbcb
 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.1.tar.xz 1406464 BLAKE2B 6ee2f58df3c1622d96ac4b1a70d4dc3d0c973635774dd6bb89fea3e502dd82d99d676e2f9cb33c14c429c3d4680cd6020213154099b3f7fe71ad67602ca9bc6c SHA512 cf9fa952d43e477528deece9f22d1bb63fa50b3a831fae20812c6af31c1dbaf193abe2fed48ac9966bcf1787442ceed19f00c00e524a1911f0ea31952a52fc8f
-DIST git-htmldocs-2.35.0.rc1.tar.xz 1410404 BLAKE2B 4d3202d31e71ce3b72f4d2fa503fe16a79af22120635da5de511f8f2f7d586fc11b8d74c05782a7ce867f80973c6a3fec4580eccd3a6c6307856aad818e8251f SHA512 87b9b24b4faf9ede8b2200eadd80dcf2b0011ae5cda477f9161a89853f4583a794d541343b9c4fefec341ecbeded2185ba550e5701858b13f7ac66dfcc1395df
+DIST git-htmldocs-2.35.0.tar.xz 1410536 BLAKE2B c77eb10ff773597a996f1ffada4d419e0e4c00fa3b962824e4f57fe5d4fd15f9b3a02fd46bac8f643ba8d828d58caa1ad926b24f5ca54e66f7261b0996b1f877 SHA512 9a428212d6327c8b0bbeb7591d12c42ca78864d3cc839f0c3d5053281a00ed0fdcc67c71fe13203fadf3a7e7b5dc47034fc452a8dfb59d980ee441f908790845
+DIST git-htmldocs-2.35.1.tar.xz 1410148 BLAKE2B 68c3d12341271b861f42135bd4bd6e68ebcc6466931d383378b49aac42f77187f3fadc237974349cb0b50e4c5fb7a8ab185114341dd3012d159e420405d9ef91 SHA512 52a40644a7cd38caddecc43182863ca2f456644fff918ed4c8f826cbf269352c73d6bdc9119d25fcf537bc2fa38750791013329e4b0e32c8d14f0769dab85804
 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.1.tar.xz 497280 BLAKE2B aa3c67cec861eb40eda3e7827d3e380fdfb6f189027fb7e5618258b80ac33918cb3c2ca4d2f8dc5fbee959578766564137e9c4818672f5138304270c486658fe SHA512 8f3b56fa477e5aafec3ef29933234c362a372f59ed95694c4fb82ebb82d2a8ebc0ac17ae36caa9185964eef1700ea8732816e73df4ddd918afc949a8371fa0d8
-DIST git-manpages-2.35.0.rc1.tar.xz 497540 BLAKE2B 02eef1be106d7d2e13d367d837a8c262f1da9ef4463e8e961048142066e4b5cf0d85cc6d281663a3ac34bf4c90dcc151168b42bea9bfdece45b3179d707ffc15 SHA512 391257f5906703005108d612ad308bf6ad3c54f2efccd908de5ea84bfe06b7259cca8f9ab43b48780a91dc16db986beb6f5606b01a7ee5f5d05c9e6022d379cd
+DIST git-manpages-2.35.0.tar.xz 497388 BLAKE2B 5aa9d11da4726ce024f6578c351e18bb60eb62cd84c15c3a421440078f8b43d681add1bdd7342cf1235e0bfe0030705adc791423cde856274d6c7d6227cc0eae SHA512 288a443780c395ee9c9738ab544d4bb666e9e549fa499f52af81f2f581d45d7f04976d98491dbae1a30b213ddeb544829f643d86c2cfc424e9b17df23fb3c8fc
+DIST git-manpages-2.35.1.tar.xz 497284 BLAKE2B 2d0d633320982243316575cc278df6c6a9ef181bf45ea9c1c8288e2677e4e71a33af96bada9bd90b03310be7dd33f2762b6b95489e267e2c191dcc7d1a715fe7 SHA512 0f4c46880f0e6d493112dcd4753fbe3702c06aa68be09bcbfc90263a355deba080995a08916b1f2404e4e17d720ee0de46a55e450c6cabeb1c147dcb2cd919d5
 EBUILD git-2.32.0-r1.ebuild 17992 BLAKE2B 703f1d8fb18c0ec56be69c58bdf6a9048d551b76cf62f914f3f888992c34c394f131d1e104238af55c276170b34f5687e0fa664f8fbd880fdbe70bb00fd749dd SHA512 8d3a490eb7ca1b2202ff4d45453ea1e57631c7abf2d6973f1b24150a6461b880c80702bc0dec756e7cdc4cb6d0102005b346f6b5653d932d046f1a7c68495547
 EBUILD git-2.33.1.ebuild 17888 BLAKE2B 76bf11b57727a9c2a8d9cf30f75a13f9ae5fd6942c974dc53e651e24a3069da5fa311cc44d9c98bcfbb4c07eae50e8910d8903e70eae82d52bb621d9d314886f SHA512 9649794b74c0ab250996806b5336878c44865175b5f81528b9f68992f732b4fe2c45a57826882722b78c1313b6285447b85f48671bb84a981e025d92684c125c
 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_rc1.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
+EBUILD git-2.35.0.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
+EBUILD git-2.35.1.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
 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.0_rc1.ebuild b/dev-vcs/git/git-2.35.0.ebuild
index 075208f7ce0d..075208f7ce0d 100644
--- a/dev-vcs/git/git-2.35.0_rc1.ebuild
+++ b/dev-vcs/git/git-2.35.0.ebuild
diff --git a/dev-vcs/git/git-2.35.1.ebuild b/dev-vcs/git/git-2.35.1.ebuild
new file mode 100644
index 000000000000..075208f7ce0d
--- /dev/null
+++ b/dev-vcs/git/git-2.35.1.ebuild
@@ -0,0 +1,660 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+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="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:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: seen
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=seen ;;
+	esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${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"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	gnome-keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre2:= )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
+		cgi? (
+			dev-perl/CGI
+			highlight? ( app-text/highlight )
+		)
+		cvs? (
+			>=dev-vcs/cvsps-2.1:0
+			dev-perl/DBI
+			dev-perl/DBD-SQLite
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		subversion? (
+			dev-vcs/subversion[-dso(-),perl]
+			dev-perl/libwww-perl
+			dev-perl/TermReadKey
+		)
+	)
+	perforce? ( ${PYTHON_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gnome-keyring? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND="${BDEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
+
+	# Make submodule output quiet
+	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+
+	if use perforce ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local extlibs myopts
+
+	myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex perforce '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads '' NO_PTHREADS=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	elif use ppcsha1 ; then
+		myopts+=( PPC_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+		if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then
+			myopts+=( HAVE_GETDELIM=1 )
+		fi
+	fi
+
+	if has_version '>=app-text/asciidoc-8.0' ; then
+		myopts+=( ASCIIDOC8=YesPlease )
+	fi
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]] ; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	if use prefix ; then
+		# bug #757309
+		eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
+	fi
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use perforce && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake gitweb || die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man || die "emake man failed"
+		if use doc ; then
+			git_emake info html || die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info || die "emake info html failed"
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree || die
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake git-subtree.html git-subtree.1
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake || die
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake || die
+		popd &>/dev/null || die
+
+	fi
+}
+
+src_install() {
+	git_emake DESTDIR="${D}" install || die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake DESTDIR="${D}" install
+		popd &>/dev/null || die
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if [[ -d "${d}" ]] ; then
+				find "${d}" -name .packlist -delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if ! use prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
+			"git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	plocale_for_each_disabled_locale rm_loc
+}
+
+src_test() {
+	local disabled=()
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]] ; then
+		if [[ ${cvs} -eq 1 ]] ; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		[[ ${cvs} -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=${cvs}+1
+		[[ ${cvs} -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=${cvs}+1
+		if [[ ${cvs} -lt 3 ]] ; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		if [[ -f "${i}" ]] ; then
+			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+		fi
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+	elog "completion."
+	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	elog "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index a99ad33fc41f..1e48707d1f9d 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -1,5 +1,6 @@
+AUX 41-fix-build-with-meson-0.61.1.patch 1182 BLAKE2B d835f58c4514103f1a09cb5ddc14f98a1d3559045cc747c228b88970b8323f77537a6bd51b30e93f0ac2b572e544d16ffff6656dc0e9a11feace2896ef641515 SHA512 1bb4a7d79694fc10cabf39234eea7e78ad96a484c183333469a1907402ea2b8da8c497f8b4da85e021defeaed4587fba5a7319b169b8ab8819b0d238d4040898
 DIST gitg-3.32.1.tar.xz 10613836 BLAKE2B 43c2c37f5c06cb6155906d5988f0787334af7a9091e537fa7b0fc1a9de3138f261a3e3c578afc663c7b57a33f39c19318a53daf7896c465922138197c3bbb778 SHA512 243e630b3e5bb1919dc307e6b3fed1b1b0e3884d2a2507e4526b4af61e86f1cd7004a3dbb96001ffb0280cefe7cdb9b109c39996718913c7410224830c0145a4
 DIST gitg-41.tar.xz 10604696 BLAKE2B bc8a07565338f77a0a4706d6ff145ed09096acb0230fb160218a6374b87968ffde6615b6e2970ca9162ef542f877c3c8ab2023396c13e023cc47dd5bf466f22c SHA512 4e8fe0b1ab5302f975f58277e5ae42300a96d20bb1c41426d8c0e058a53420fcca73f75566f593f5aa2882b3a0e1608cdd542bc4f68c731153ba9185972d6f51
 EBUILD gitg-3.32.1-r1.ebuild 1952 BLAKE2B 1f5b072583bd1777ab7b54bed220921ea94880b46d94ac06bddcdbc5b9828cbb386152b381fcc6d5a106dc9b0abe00911fa235ac46abb486bcf6f5b045ecc3ef SHA512 be9308fd5438f6867b275ae7afa01cc12bcb1bd36213b0456614571604f386d9ec358d2e7039322ad8901deced33688e44529a5fb10cbd77ec28a536c2a37ecc
-EBUILD gitg-41.ebuild 2067 BLAKE2B d8d44516f97e4179d1d6d9c1073cbbfe226f6c7f9bbaddba57769f2e343a2a4702b7db77cfd31903441bca23c202af0c70b7e07adad5261f0083723134b8aff7 SHA512 4c1bc859a401d9b165a322856411a773b7f848ae706bffd5bc594209eca38a8519f8f05fa7474cf2fe52dba12f919b82e6d93ef0e02cfe89072bd023a951ce56
+EBUILD gitg-41.ebuild 2135 BLAKE2B 703b1b8357abdbe8ad4f29f55f9a034bf6f7f7cc0a3397573479630836eda19725eb81776cd55507ebcb03330d92f4497bed1839451b5ecb8cd471039461e3bd SHA512 6e9bc9be3ab904ec644f7ae53f10fc9d30641ca17841867a008235f703e1544ca1b0a177fd4da2275e6790a32fd18fc50f5f1caf9047c29485bf0e47afd2e446
 MISC metadata.xml 825 BLAKE2B 80afe83910f10e46ef7367897965440086ac6d0af1d88d24501f83ee79e3f1e0f6616bb8b76e89822a496ed5101fefe9ac927a773543b8f84bc9f7ad08bfdec2 SHA512 397f02a9fe2d282a12e1128210c5818e86cc123729aaabcdbdc038a319132d9c16e9b8a30ecc54ef1c03da0bc35892a9b1093eaa02aba60789ba43de9969fcb8
diff --git a/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch b/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..0467f7d1ad89
--- /dev/null
+++ b/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,38 @@
+https://gitlab.gnome.org/GNOME/gitg/-/commit/1978973b12848741b08695ec2020bac98584d636
+https://bugs.gentoo.org/831666
+
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:17:52 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:8:0: ERROR: Function does not take positional arguments.
+data/meson.build:44:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index a8b90fd1..2413531d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -6,7 +6,6 @@ desktop_config = configuration_data()
+ desktop_config.set('icon', application_id)
+ desktop_config.set('binary', gitg_name)
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: desktop + '.in.in',
+@@ -42,7 +41,6 @@ appdata_config = configuration_data()
+ appdata_config.set('app-id', application_id)
+ appdata_config.set('gettext', gitg_name)
+ i18n.merge_file(
+-  appdata,
+   type: 'xml',
+   input: configure_file(
+     input: appdata + '.in.in',
+-- 
+GitLab
+
diff --git a/dev-vcs/gitg/gitg-41.ebuild b/dev-vcs/gitg/gitg-41.ebuild
index 37bca5db740d..01bf024b29a0 100644
--- a/dev-vcs/gitg/gitg-41.ebuild
+++ b/dev-vcs/gitg/gitg-41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,6 +48,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
+)
+
 src_prepare() {
 	default
 	vala_src_prepare
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 7fb086996dee..54092fd43d5c 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -1,5 +1,5 @@
 DIST gitolite-gentoo-2.3.1.tar.bz2 198849 BLAKE2B 88268e4588003cb1b8b4e340fd858a2be65b8156f3ff5033cf7f8c988d8373c4dc7c41b0d589126e143e8eaa19071fda87532f9052c06f7952f5f3ef549e486a SHA512 994ee759d87659eb4f4bfbe6618d1bd74e83df2e6c8d710ca1c929d86e05b1152639bf5c99b906f7d20f9585163f872f04d9710e29b1d73ada998595553d294e
 DIST gitolite-gentoo-3.6.6.1.tar.bz2 155262 BLAKE2B 3dfa89223824ea04be6c0598abad3c6fb982c0031507aa2ab4ad8ecb9cfc5b64846e48f1710cf4436b4947d2f7288398b2603ac8f9a732902cf17a9a168e6b3d SHA512 76765972b06e985879bd3384be62e4b57676d0d67e6d55b56a63a2d802fe3ee76576e0da20896f11764a311dfcde0bfaf4309105ddc8c55c0c09bb098ed6a1bb
 EBUILD gitolite-gentoo-2.3.1-r2.ebuild 1653 BLAKE2B 7af6010dcf5b536224c5e57755f454a931e8a4061aad2f7dddbe86891618c60bbe0c40fd579bc1527fe99799eac1d7f73f31eb9ac4dc1f7376fd5218c676eadb SHA512 dc8a8874d218fb56ce4666118e421d24ddf323bbb12541be79cc0d29481222155797fe1dc3d4fa69ace0a37e1e58cf2d17d51aad42de094579fc8d2efe55af74
-EBUILD gitolite-gentoo-3.6.6.1-r2.ebuild 2699 BLAKE2B ffcf08d0d62fbc88af4a98b6936f8855dba65fe766f20a0b3801755ad0bdbfb758a5843def3856278fbb93cdd8e63019eb8d68f7669e2763b61b1a652ff7d083 SHA512 00c0a45523ef4a2b69c6d5a7a7df71021167159275b3a8826c2f00ffb1872c4120471d719c7b2add5aa2f5428f3ee643b27769e8e6f3f806fed38fc508807e8c
+EBUILD gitolite-gentoo-3.6.6.1-r2.ebuild 2697 BLAKE2B b3000656f544084e3587bc37bc18e1730bfa9216cdc875dc38cd46ce818d21dd65a9532d5c26b0385c9008e5bb4c4403207b14dfcad9a9596189429ff1557d63 SHA512 9ecc7fc2ef804adbd8f05dfba6a5d668b7a1eda58a97a18c75171a795ca0fe5da3e5f5d87b467de67ec4fc0030cf537a0718b67e1a605d8d28dcf5cdd87cf148
 MISC metadata.xml 480 BLAKE2B d3524b1d64cf32814329c1cc96d92c816b333dec23a2f9fe03f22b7d361b449ef6700985d94e98253dcb60862e38fc6f5a36ac3bd92f110fa92291a85627b308 SHA512 bf7340f6554cd04dc1b8fc7c9d4f08023ce56514a38344f83a03a235b63389df4fb20b2f5d5761c4d82f1cf67e687420a52395b9afc807322d39d96e96ec7915
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
index bdac564d2a2c..0f02b78dc441 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -69,7 +69,7 @@ src_install() {
 
 	dodir /usr/bin
 	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+		dosym ../libexec/${PN}/${bin} /usr/bin/${bin}
 	done
 
 	if use tools; then
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index 9ffd14751f0e..0b0c0d0cc5db 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -1,5 +1,5 @@
 DIST gitolite-2.3.1.tar.gz 255807 BLAKE2B b51a664d6e786702cad999fa8df6d86f80eb9cc908ed092b55272c59a4bd52145302e638612f1788d68b2445b8c665f025b24c47d50992dd3f6ef2fd6eb63ee7 SHA512 a658104b54ff6668022a6010b961fbe13b8e7a66242d547e0e4cf685574d8a1fd60065112095b0d73b826f6346973cb3a5db307d84fd5aceba852f2ddd0c86ee
 DIST gitolite-3.6.11.tar.gz 198340 BLAKE2B 9daf1e2cb2ebdca652d87aaa67b433174d35ece2ad859de6c6d6295f453b6fa86d15240e964fdc58fc4ee5b1018b935b7032e6bacef9743487189857782220cd SHA512 7c11b3dfde9ecf9ef66185aab175d78302c42cc24f13e3e855fa27ffaee65b5887bdd7f96b00b6eed944b91af2b86993b284d1a09fe5a5a3cce82acd33631212
 EBUILD gitolite-2.3.1-r2.ebuild 1448 BLAKE2B 5635d6b5666137d57635d399edf6c9d8715f509019848cadaa69f297d7c340361ea2c12e5b22b3f5ecf877cf4e231268142a0e50da25d92defdfec6c3dd3854e SHA512 1a313c4ad8bf4dc6c61c569cdf0ca1ba3f8f566f2156756c6fd3f4881b7330b299f8e6a6e4b1b774dabfb6f271323ea686d093f928d19a69f173362c500baeb2
-EBUILD gitolite-3.6.11-r1.ebuild 2289 BLAKE2B bbef6eb06d89f93a645f7fba5e5758d3a7ae1ba1d35f24efad7d606aa270798a7347cfea38e556239397e31f5fd35491b06795d89e5d364c2c52456ca39e6943 SHA512 0c2d25c27980391a0f23218857be340e7a9e14600dfb23c3bac92d79c0e39127b9d4a5bc2b21fd042276e9cf2cb98886611e1149c8b2dd1d3c444773a79cce8c
+EBUILD gitolite-3.6.11-r1.ebuild 2287 BLAKE2B 24af50177b11371b4fb2094c14abcaf7a956d65eb5a4c291effa16ad8e3699696e54460719f547e569309ec500ba40cd0861ff7481c8195aab6b10d848efb8a4 SHA512 7cc604adfc2640b91f55920c7fc757b29790bde29ca8c71fe2fea2614090528498e89a0f1f68b08b351312f10d84636b2f002c6624a05e04bc27fa4d80ba95cd
 MISC metadata.xml 782 BLAKE2B 4200d317ed8e94aec00251d532408b25ac3b93433f136870bd2d991517eb3360064a5a2514f4d8fa12a53b699107a971aed65ee474d9391b0436c34a85625412 SHA512 e0bec70e3165fb253fa01a57133f5dc592117e8a5679a545902b18266b137bca1083998af8fa771c826a89915cd3c0bb2ea7b848c453bdc740d25a83f595dcc4
diff --git a/dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild b/dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild
index c83049e8e95e..dab1116f65a7 100644
--- a/dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild
+++ b/dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -71,7 +71,7 @@ src_install() {
 
 	dodir /usr/bin
 	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+		dosym ../libexec/${PN}/${bin} /usr/bin/${bin}
 	done
 
 	if use tools; then
diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest
index 29ab1ba95e2d..014753d06000 100644
--- a/dev-vcs/pre-commit/Manifest
+++ b/dev-vcs/pre-commit/Manifest
@@ -1,5 +1,7 @@
 DIST pre-commit-2.15.0.tar.gz 255545 BLAKE2B 8fbb1fd6b1298ff1c5a6884dae53c79d108e8c4b74d05d6be36d562327fd024432d60e6df4570217e1b3f4ad8e33ee4d0d54a5d940f4833a46d4e9cb59698b3c SHA512 b87985aa625509d7a21e31e5774f259c264ec74fef88fc5e290cbac0326cdbadc37ab54b5bf3048d815cf9bc6d4adb71619fcb84c955c1bc9741da8dfd34251c
 DIST pre-commit-2.16.0.tar.gz 256930 BLAKE2B e515dcc9109c91cc7ab5ce60f662ebd62cce4f23e32676b7c295332c959fa10a34c320a197d15d7307b94aee53e7ade5da62aed8bbe122262db15d88d82e9757 SHA512 c9eb14a40e25e8408c2b2b5687eba4908d609bbb7bcf58a0153326696d272bca555156fd75f3ec5f0dec219aeeb4084df77f329f47cf190e40052c11e92fe185
+DIST pre-commit-2.17.0.tar.gz 261131 BLAKE2B 114fac379690ee4c1c60970a1b0fbcd20faea785837c174514c3fc3d247ec79f52fb5f14c96a762921395d682017a9cc406dc59b3042fc955cd65019fb781a3f SHA512 54b5af9088083ad0c57fab09c06c35bd5921b29348454fc8fc16081d3c6a2e0add13f8a18f06b7408a0e06babc5e15659b37ab53797edd3514d516059e2343a8
 EBUILD pre-commit-2.15.0.ebuild 2055 BLAKE2B 118b92db9ad79a4ee2478255906e7f4c4f311f02d4b381a6a169da37ab0bf384defae18275bbf72d1ea4139fa3df2cf559fc98ed6fd33ff5f609333ef7ce5474 SHA512 146c889595830f1c6e90c1785d18a544bf2c72fe538f451412968942653c4227d74a2879a85bd52ed0eadbe18224f4d9238d3f9ca05630a8e1c061451d7d5368
 EBUILD pre-commit-2.16.0.ebuild 2088 BLAKE2B 992c8a5dd400f442469abd5b53dadef3ede090b3dd3087b4a231bcb52da61c0fd7857cbe5b61935966971b25c5f06cb78731e81ebfd9d2aa1fbc03c2ed541459 SHA512 18017370fde8385652e9c0a0f4ba0b3856d22322503f3e0cc77b0aa3a8b94b3ca7e4541907c24979cdc42c551cea250a5bf17dc360cfa1c9469afa01aaa595bd
+EBUILD pre-commit-2.17.0.ebuild 1600 BLAKE2B 6b9a7d9e7e640ffa62a7f797cfc8fec15e4cfb9fe1fe207694e67920f723eb4471f980d0b7a8b71776ec914fdba7d5c417db01384f63e075492ba6d8ddd94de3 SHA512 3ac9c85151f10089e0170ac8e922bba85eb71701b020890d03e8e0ed0c08de40058af7de73eb96ba3e73b680384436ca0164bfcb00affed9d807013fa84b682e
 MISC metadata.xml 380 BLAKE2B 99842a97367e91700c6f714f427b7b3d4b7212c401abae5ab715dfaa724776f02fe250184a33504d3433bb58cd5679af59a32ec21a7e7432481160dab36a4d95 SHA512 45330930d1e58fc1de0fd0ba55cd488dee96579ceab3be5073b91ff8f4f2b9adefff533dbfa5b0e8b23fbb648d45c0b7b4073a1ec57b586600cc2bf6347e0bbb
diff --git a/dev-vcs/pre-commit/pre-commit-2.17.0.ebuild b/dev-vcs/pre-commit/pre-commit-2.17.0.ebuild
new file mode 100644
index 000000000000..2794cad11571
--- /dev/null
+++ b/dev-vcs/pre-commit/pre-commit-2.17.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A framework for managing and maintaining multi-language Git pre-commit hooks"
+HOMEPAGE="https://pre-commit.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-vcs/git
+	$(python_gen_cond_dep '
+		>=dev-python/cfgv-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/identify-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/nodeenv-0.11.1[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20.0.8[${PYTHON_USEDEP}]
+	')"
+BDEPEND="test? (
+	$(python_gen_cond_dep '
+		dev-python/pytest-env[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+	')
+)"
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
+
+# The former two require a boatload of dependencies (e.g. Conda, Go, R and more) in order to run
+# and while some of them do include "skip if not found" logic, most of them do not.
+# The latter consistently fail with
+#     Calling "git rev-parse" fails with "fatal: not a git repository (or any of the parent directories): .git".
+# including with the sandbox disabled and when run manually with tox.
+EPYTEST_DESELECT=(
+	tests/languages/
+	tests/repository_test.py
+	tests/main_test.py::test_all_cmds
+	tests/main_test.py::test_try_repo
+)
+
+distutils_enable_tests pytest
diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
index 3642b9e4a3e6..a0f603f3804b 100644
--- a/dev-vcs/rcs/Manifest
+++ b/dev-vcs/rcs/Manifest
@@ -1,11 +1,6 @@
 AUX rcs-5.10.0-glibc-2.34.patch 1276 BLAKE2B b254af7dd5c8fa14211b0501be41a1e9411bf67a2d9351bf1e375eba9ea3cc118be989f0fe7ce4504329c40ba3a36eb84ba2b66897317328e90108e1190fb238 SHA512 3d398005e3d9bf2143a4590abfb82094287810e7bc6274869d64b3800ff15faabfa12a3cc5b5d087fb1831adb1394b22324d3d80d7e0dad47e3d1a2263573361
 AUX rcs-5.10.0-test-t632.patch 976 BLAKE2B 95837ba618cf67ffb46c58b9389933615874e318205e3e755a0d34137b8aafdde8f8772669d78c79df6e314ac958f20f97cb4953e756907a36f5db7d30cf99fc SHA512 08d4c1537d78217dbe9f0157cbb4649790d1863ee36623b2e05219ba91f83b55b20eb59149ccd98d67b7a6a59d0236c645045d613dce24a77b6b3dc9b56d8a3c
 AUX rcs-5.10.0-test-t808.patch 895 BLAKE2B 77f406a10101aac745b5ce8eef14514eb4b7722a0b8091f3e39b2ad5db8fc5e569aa51abcccbf90c7278a3dfd3a84b1e95c4c949c8140b1f84a9fe9c37cfe686 SHA512 15e81e6eb3520101237bbfd6d45fcf80155084f13f892d1ac38dc216e7f5aac1e2a469a9546dea8711dcbfba37b8079a6a9c93f50b0387bd936323aa456605e7
-AUX rcs-5.9.4-test-t810.patch 737 BLAKE2B 767a6ce0e3977bf9d982b14eb180bf222388da6408b5d943f9de13a2a2e731e50dc0af60140853fcb1f5e61cdb5cfecefc00b782dbddab29d81ff437611f4e51 SHA512 8a11c9a53be98465efefb2ac41469cc93b4caf0e2259591cef4bf3af72e0ada6d733d47a0c9e1fcf6513bf84ff6d1c1c485c85b8654a87606bcf64481fe67b67
 DIST rcs-5.10.0.tar.xz 890872 BLAKE2B 32000df00c639cec90fb9128503b67957a23c82a08651953b57434c3f14ecea555155da933d5be801ad216aa27ccf496a7aae325cecf73f9bc121f3a3c659cba SHA512 d42bded1214f27dfcbe912bbabad8479555a02bc57000a62512d63ff0672de1ed23911cd15c9d1aa4b9a53794ac3fd45937fa1cbc0fcb9d54a3ede4d831f76d0
-DIST rcs-5.9.3.tar.xz 800736 BLAKE2B aa3f17555e5b65a9d65dfa781f2e12496e282128d9412529f67a831b5d6035302a6f70c4fe0b9d9519a2bf02fc5a98d03f4aa3b86696fd27874bfa7549e8c8a3 SHA512 99b124a94f285d8c675a2a51397ca4a97468f053d42aecf543e9266f16aea6b2667613f565c3462ffd2350c28e22baa4d01d598e2cc7e1e940625086f6de0ba6
-DIST rcs-5.9.4.tar.xz 801360 BLAKE2B 18cb97aae7a70f9f12b1018d6b6b42fbc06dd96b491caa7ee5ae2a4a746339e22ffc93ead5756add62f8a08d5cd1ec589c242f0a75e9d78aff29b95114869b25 SHA512 c501a46b8d2e166ec0b54301d72687d9b38b31d84517fcc8dd560a296e7ad250962a92f019e53b2921af9045755e2e7f2f2acc9542dbe0d19ee110ef36861cd4
 EBUILD rcs-5.10.0.ebuild 1001 BLAKE2B d3d0c7cc9781c8638507be99650af5e3960e4a332f5ef506813e6d1510d68adc1cfd773b5754aa121c1e5d058ac0092f2fd169ba1eef71bcafe1c166042bd6bd SHA512 50cae1a7336b4699daff71463a19d10d52de8fc2644925da7f51df69ed33daaf45e3142797317847a1ba0ca747945e7d816d6b3ad72849b7814f8faf1042f762
-EBUILD rcs-5.9.3.ebuild 871 BLAKE2B 4df338fe8d4879d87503149398fd97b0c57aa26ac12480c06fd427519ae00f0299fc58596e27195034cf62a9c64aefa527a1c076f217f99011cdce4119543f31 SHA512 c20b4245d22c83509e3c5d8777946aa2bcdea83a7120529ed8352330a7587504f26112a12e6f128916887894836917a43f400db31cedf4877a6d78adc83e92f5
-EBUILD rcs-5.9.4.ebuild 922 BLAKE2B 54aa8f16351f580046b7cb579fd1cc301073d37ad94693a2ed29d4b26645c0cf452487947d60820eb8e390fb7a2d4b255d1f03645110216c00aa1fdde99c2a50 SHA512 5a15bf6011f8056824a884fa337b4e5f47efe190f5905d50032d8b7bc0e3503db08abf9f6d84736ffb01c909440c5270162965f76f0516212f98d3628e5a9e62
 MISC metadata.xml 615 BLAKE2B 4e00cd56075f6ac650d317e09a31bf40b3d64c098ff472f032bbeed9e30188e98e81fc0175cbf9d0a565cdc4bcdac6e6da6d551d48e6cb9fb82e45de0c840f42 SHA512 c51c417b5440c81d4517879495ba0f8b941d8201089bb09499045ba7b16a4de1c29938e9124d43e244639cbd2177cfaa3b8432686a7ce23421e7386471fa4032
diff --git a/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch b/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch
deleted file mode 100644
index 568731e1903f..000000000000
--- a/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=f2330a6268d244e97f47a97f4767736fc3b31455
-https://bugs.gentoo.org/820230
-
-From: Thien-Thi Nguyen <ttn@gnu.org>
-Date: Thu, 5 Apr 2018 16:20:35 +0200
-Subject: [v] Avoid "test FILE1 -nt FILE2".
-
-* tests/t810: Use "btdt mtimecmp" instead of "test -nt".
-Thanks to both sergio and Xose Vazquez Perez
-for indirectly signalling this problem.  See 2018-04-05,
-"Add support for "btdt mtimecmp FILE1 FILE2"" for details.
---- a/tests/t810
-+++ b/tests/t810
-@@ -27,7 +27,8 @@ split_std_out_err no
- 
- must 'echo new line >> $w'
- must 'ci -mm -l -d -T $w'
--test $w -nt $v && problem "$w newer than $v"
-+test 1 = `./btdt mtimecmp $w $v` \
-+    && problem "$w newer than $v"
- 
- exit 0
- 
-cgit v1.2.1
diff --git a/dev-vcs/rcs/rcs-5.9.3.ebuild b/dev-vcs/rcs/rcs-5.9.3.ebuild
deleted file mode 100644
index 3b42b11ff880..000000000000
--- a/dev-vcs/rcs/rcs-5.9.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic
-
-DESCRIPTION="Revision Control System"
-HOMEPAGE="https://www.gnu.org/software/rcs/"
-SRC_URI="mirror://gnu/rcs/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="doc"
-
-RDEPEND="
-	sys-apps/diffutils
-	sys-apps/ed"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e '/gets is a security hole/d' \
-		lib/stdio.in.h || die
-}
-
-src_configure() {
-	append-flags -std=gnu99
-	econf
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc ChangeLog NEWS README
-
-	if use doc; then
-		emake -C doc html
-		rm -R "${ED}/usr/share/doc/rcs"
-		mv doc/rcs.html doc/html
-		dodoc -r doc/html/
-	fi
-}
diff --git a/dev-vcs/rcs/rcs-5.9.4.ebuild b/dev-vcs/rcs/rcs-5.9.4.ebuild
deleted file mode 100644
index e00c34d58f3f..000000000000
--- a/dev-vcs/rcs/rcs-5.9.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch flag-o-matic
-
-DESCRIPTION="Revision Control System"
-HOMEPAGE="https://www.gnu.org/software/rcs/"
-SRC_URI="mirror://gnu/rcs/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="doc"
-
-RDEPEND="
-	sys-apps/diffutils
-	sys-apps/ed"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-test-t810.patch
-
-	sed -i -e '/gets is a security hole/d' \
-		lib/stdio.in.h || die
-}
-
-src_configure() {
-	append-flags -std=gnu99
-	econf
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc ChangeLog NEWS README
-
-	if use doc; then
-		emake -C doc html
-		rm -R "${ED}/usr/share/doc/rcs"
-		mv doc/rcs.html doc/html
-		dodoc -r doc/html/
-	fi
-}
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index 7176c5d22194..07663e7914bf 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,3 +1,5 @@
 DIST stgit-1.4.tar.gz 390734 BLAKE2B a2c8b6848cacd743022318ebf9a0512c6bd02a2b8c864db2270e5075c82dfd9e6037a3a79978b2061487bf040864077b0f7836c66986d82ff3eb902331589d87 SHA512 5251dc26a7c64dcc83021399f95ea911d6b65cfb2ee5c016c886447740ed48b66d3f0bd92a45b4aed40ae2e77dfe6ba62336dbba6773a1879ab749c95bb99b4b
-EBUILD stgit-1.4.ebuild 1814 BLAKE2B 40c7993866ef309dfd3e4d517de07d9cc525dc9b3658793dc2b446b7a59907e2161c725bad71d0df6015bd9da180a288b1b0e98b04438d0b58701648c0473341 SHA512 4b4fb8363a90b2b2c5e412fb623d6cc8bad86dac113f3895ae509f9cdecf63f11e16de32eb49dcdc076c1ad0f7927db77413b9843159e87ad4dc577ce0a7e85d
+DIST stgit-1.5.tar.gz 398562 BLAKE2B 922e014dcd0976a6b9ac884faa5ac6d8cb0e9efe6c56201c85675afb041e0190d07fb3cbcd366664b736d428d93188fc92c19db9a8d1fdc322054e1480b5b8f8 SHA512 6f018754f43c3ba48ce381b59f0e4033c295f0bd0acee4d07c1457f2c004caee9d8e9f6b2af1ee0d46941777639c7f5a49caa4c0dd01a72c3f3a43a34bf9b2bf
+EBUILD stgit-1.4.ebuild 1813 BLAKE2B 1505ba0218afe136851c24864fac25f85495b0a8bc2bf6e0dcec665f53e50def7a1e24ebe054e0d0b1da909ce18b0b164231e59766b2db74e062d8853ff2bc17 SHA512 cd838bcab5e06caaf2aa08fd03dbab09af2c26cb74f1aee9ecaee3de28daaa8213788da8b0f1431ef4d497075292e7b91cff3c716081867287f422656faaf645
+EBUILD stgit-1.5.ebuild 1819 BLAKE2B 097322735d473fce8c5cba1f247ba5b72d7949ea84702fb10e60baa10906f4fd86fdcc5a07fd7cd3075b665251ed5cc71890d2d82b226bf77e412e590b39b569 SHA512 bac4f938dfb1d4702d1ea0eb5d9a1a844696186e92f5d31cdf41433fc06594f8a2f5c949d8f3a2a53b988d6b69407c0260c7606f893e91a7fe992e577cd9a318
 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
index ffb9c6761f48..27a2b51f5133 100644
--- a/dev-vcs/stgit/stgit-1.4.ebuild
+++ b/dev-vcs/stgit/stgit-1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10}  )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-vcs/stgit/stgit-1.5.ebuild b/dev-vcs/stgit/stgit-1.5.ebuild
new file mode 100644
index 000000000000..23c4d6bccb08
--- /dev/null
+++ b/dev-vcs/stgit/stgit-1.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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'
+}