gentoo resync : 09.07.2022

21 files changed, 169 insertions, 561 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index a8f7fd9f9c04..8743f8b7b201 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvsgraph/Manifest b/dev-vcs/cvsgraph/Manifest
index 1d1c51c6b9aa..a789893e6100 100644
--- a/dev-vcs/cvsgraph/Manifest
+++ b/dev-vcs/cvsgraph/Manifest
@@ -1,3 +1,3 @@
 DIST cvsgraph-1.7.0.tar.gz 202678 BLAKE2B 589195f3642b0bc181a581a8f832eded3e6add44b2c9ee5c76a1a4f347384fbd59cd1f7f22c37d56810636dc13bad900bbe7973f9bfa061c37baa8becdaf35d5 SHA512 b2a5bec073e7fbba2a2b1975bb4583c8fa87d29a985b7bcedcaf556c744b822ea5ff65b5ca3c4bd6da6bb6697f5e023a7ce35cf5084f2d59fdd15297790e7aab
-EBUILD cvsgraph-1.7.0.ebuild 893 BLAKE2B 6534a598a7079ccbddec6caca1583980bc12f01e922583acc5c65590122f24f1bb76dc6060d97b41b3cddb20166ffb1d9e0679b87f6041430d700b2bb3a61d47 SHA512 5d978f74674f17049299efd1e538e4b6f366240336d5a2e85814b3bf0cf4bc4082aa836a124a2faf4fc9049a33dea78105a8cfd951c6e39be9dccd14c1a235fb
+EBUILD cvsgraph-1.7.0-r1.ebuild 907 BLAKE2B 29c3743dddcc424e05dba2db108f7b3d1da65eb33d18d4808ec632d0037129090a17bd93465ec93419487a9477be1fce7566deb5ad8ee956b3007de912a2ee68 SHA512 30aab54fc3341c325d26826d95829be7d4804ceee547e963be9afbc904880e3c89338c76d8548f376b8863433e1ddf9cb7c9cb053b356c4364272de7744d2d06
 MISC metadata.xml 494 BLAKE2B 2e59e5b8e30c6f57bba69208dfd5000f5ac2c077c82bfde298cbaaa74cf0845ab2ac2180e988e6a401a8a03667f4fefc12399858695bcb5e7de389c2f5baf73c SHA512 4525a444d4e7222b054429941ef1bfd8148c7eb8978b36004ffee0ed835df7876269ec05ac838b980cd70eb3734ce5c8c602f5f67574d03301bec798eb77c8c7
diff --git a/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild b/dev-vcs/cvsgraph/cvsgraph-1.7.0-r1.ebuild
index dd740865ae50..fda489c6a3dc 100644
--- a/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild
+++ b/dev-vcs/cvsgraph/cvsgraph-1.7.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
@@ -16,7 +16,7 @@ DEPEND="media-libs/gd
 	zlib? ( sys-libs/zlib )
 	gif? ( media-libs/giflib )
 	png? ( media-libs/libpng )
-	jpeg? ( virtual/jpeg )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	truetype? ( media-libs/freetype )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index a3155b8a11d2..c8bad17665ab 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -3,7 +3,9 @@ AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6
 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.12.0.tar.gz 1004892 BLAKE2B 9396768256341e59500dffc95136e710b2d3d1c9d5cb4d70fc7fba8e81e16a3656006b5558dae417fbbad7baf1373d953708006b96a8873f68502ea469462326 SHA512 4b8ec716f572682747f43ae1a9232612d95d44384d28bbf97ef461a93546cdfcc81125f816b4c8ea5efcf4d23f42edeb8a89df3c7167ceac4709eeeaf49965a9
+DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0dae98566f5a8b5d51b115d222c8aa6daab838ba67fa4c697391c8f58d4b05ddb7920bf65913d217f562aabd352f SHA512 c02150997982c1f8ce65a5f021364fc4c346339f5be4104f82ba6f7688cc05bad3d764e2cf920a22c5f209dc4b857c789907ff58c0d2809bc7ca7c3481b045fd
 EBUILD git-cola-3.10.1.ebuild 2486 BLAKE2B 8ec3e8f3737b1955a6169a2d6997d4ee9d9565fad0223955a5df1763d1e6ffb0fe839129d4eb4ea2e2986dd96e3f6a770bd472ba833234d3ca25d115643871c7 SHA512 458fe11168fcd3d839029220a5ec13731238bf24e8ae7120df3476e015d740de615e6d90c2e9cfbd22d70310a0fc6eb07bf92b96fd8301e30c84dfbb9b8659e3
 EBUILD git-cola-3.11.0.ebuild 2457 BLAKE2B dec9f6f5643428efd6eec292e86dc20f510c650f189e7ead68c0644cd91cb5b4564cf87cb2c7350d11a2972eca8b55f39b3b133e9dd3510771bb97d7dd05d3d5 SHA512 6fb7b1422d5a2dbdfad15650da60b81aea9911e47f42d11ae1da6ee6230547e7f1d7b615544f8214cf904d056e1122cf34d6b16843f65b9f18d601b89b413ac3
 EBUILD git-cola-3.12.0.ebuild 2455 BLAKE2B 9fdd4a558d45b96685efad001c2cf7c29daa9a6adf6844d7cea18a85e0a8eb28621986ba8c15f0d3e1ed0051b79faa4644284742f8eeb82bdae58a6252549609 SHA512 8ab1918ceacd575b3664b9f45aefdbdd80ac411af112ca24421ecaa1e7f72dc90251cb7373f477aba85d675e782036776862129731980ab76ee5f2be6b959662
+EBUILD git-cola-4.0.1.ebuild 1717 BLAKE2B 483f0f60851defae0106d7f10f8919ad3997938f677bb72edd5fca3af822d50e834faa234437853702bbb94fceb43a660f26e098784318d32b71e79d1544998a SHA512 79e05dc8f7f772c9dac6a879a867a9f691af53fefd565b3c31d7cfc67e14d3448c7a8355d4fa2ceda1bfd9eaa99dd3a41267c35eaa2ec5bd3663b637d14fe338
 MISC metadata.xml 595 BLAKE2B a1a74266c1afcbcf94bcb95b8218669f09ce709d0803e37cca482b2e89dee176d1d898236ba024e7266106133d1bfb3008fd1ff3ce11793c606fc7dcffb408e6 SHA512 fe44a4445bf71d09eaa6be66af2370d3c0e94dada507ace584ffe9dd8b5edafd472355cee7aceb554c31b0bafbd29faeb318e853d0d165fb1d2a7f8f8bf86379
diff --git a/dev-vcs/git-cola/git-cola-4.0.1.ebuild b/dev-vcs/git-cola/git-cola-4.0.1.ebuild
new file mode 100644
index 000000000000..68d4675e79db
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-4.0.1.ebuild
@@ -0,0 +1,79 @@
+# 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=true
+DISTUTILS_USE_PEP517=setuptools
+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="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
+		)
+	")
+"
+
+# right now, dev-python/jaraco-packaging is mask, so we cannot generate docs
+#distutils_enable_sphinx docs \
+#	'>=dev-python/jaraco-packaging-9' \
+#	'dev-python/rst-linker'
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
+	sed -i -e 's:--flake8::' pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	cd "${T}" || die
+	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
+	epytest "${S}"/test
+}
+
+src_compile() {
+	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 86e672efd181..4b0f221ada4e 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -21,7 +21,7 @@ DIST git-2.35.2.tar.xz 6876028 BLAKE2B 2d59f0ef195770b3bd57ef8160ab24da5e1402531
 DIST git-2.35.3.tar.xz 6876328 BLAKE2B f584e9d94d167ba19bd2a00377f04eb4edf69cddbd2993a324178338b2e20e7fd126b51882ac7c7914c5118d0eab1ff9beddeb96a901a18fdfe027e21351ab61 SHA512 c92f8663988c57702bb5ee542ac8f36e8a43d377d16106ee462ce0b0a575b9d51baaafc654bf1821fbea2fe476ffd64d7fb87084c7de4dd8065b01d5083492c5
 DIST git-2.36.0.tar.xz 7003024 BLAKE2B 72bb148fc5fded2976554788eaf599d20fe9f200ac1dd1ddd4ed89f7f5c8d6c1025907080620bab477b4efadf41d883e890dff73c80d0ff5f0becd83f13ebd88 SHA512 dce0d7dbe684af070271830a01bf1b9cc289182f5106f6e3303b1b3a0d5dc74bebf6ac0174373db05a28f5acc62acb095bc9385dabeeecc1d6e8567dce29b766
 DIST git-2.36.1.tar.xz 7004044 BLAKE2B 99f54efb4ea1d8db0e3afd3dc9780cb37fc853e4757f4b37d68a6badd90eeed3e2943c97393eaed6adf61c82b97b5d01ca8d015784f5425072b1db14d39144ce SHA512 459432bd0c1d5a87c828a6fbf6d3473f14bf6b95783b3f27ea4f3af1ba9fd0e712a96a41276a16c6ebeb7ac3583a5f445eedd0a9e19fe160c2c8e309ec58818e
-DIST git-2.37.0.rc2.tar.xz 7044232 BLAKE2B dca5e02e24ef103dfdc0360e4d2d1cca5ac488ba5ecbebf4e05b6feca7e6828b174eebc4e76c72b5c13ec317359cdcaeb5576a70871d8dc1b56fa98e03351830 SHA512 1b81180f2ed4566a74bc37d47fa9790eb70048c43b5204a9eda03d6fe6dd8c273ccb464d2490877b6ada901845edc9ec7cc1a6d73c064be5d426ff9b9e64e1e5
+DIST git-2.37.0.tar.xz 6978796 BLAKE2B 204a06a6d35f4f1960d031c09eeef43273982e95c5825ab813899de3d30018c9e8d88425a51ce9447d4ae6183de1270017c6e0ecc9d601df897281e107def145 SHA512 2ae3c845c9d0e0f5245e47f95c958c86a4aa2c47dfe31bff6fc81b2434d2e9402b7eced18700c04ba7158ed6a72807a81c4cde6a26dd30c969b4267b8fce4d0a
 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
@@ -30,7 +30,7 @@ DIST git-htmldocs-2.35.2.tar.xz 1411248 BLAKE2B d4f318f6277015bb6aef3a556bbf7a9a
 DIST git-htmldocs-2.35.3.tar.xz 1411664 BLAKE2B c7d849b9573a257de47fc8d654f7f791d21917cf65315b4ae6909ba2ebbe90970bc9e6c9949266913b1e529e662bfc375acee26ebf9304162eeccc87ce3da067 SHA512 52b97dab838fff1a865ae4d449fbb77fbac3c528666d1b936c73bffac856f16583d1b182379bc4e6851f78bccab519c3ea7e5902fc502b2e8ab7bb85043c7eea
 DIST git-htmldocs-2.36.0.tar.xz 1426148 BLAKE2B ba121e8f7d6a232f3df2b5a50c0f4a798c80808562c710f306f26fa79c124e5e1580c0626a2fce04f4a17b96d40a2683809550f37028cbc436b359de91100599 SHA512 62ee14c2f1ff34c0fbdf281ea2bb08bf6a24850d1d8dc68ffb12ae15e343c167ac869559395769fb352bd441baa8f2d45d696923a04e2f04bca921c990d75a9d
 DIST git-htmldocs-2.36.1.tar.xz 1426284 BLAKE2B 2213f870b7fe35cc76ce8654ed8c50c0e9694c58acac4aa2350f826422db6bf2fc238fbd12075f98e84539fdf6ca5624984e21844d1d1c1ceb90e3b090438a7d SHA512 3aa2ca197a789161571a6961dae8c2723ff5ba05a2d8ce7443f7fd9ef46fe5a3d001364831345f3fc4e028140022d20afefbabdf4a82cdeb311167793b292c1f
-DIST git-htmldocs-2.37.0.rc2.tar.xz 1444244 BLAKE2B 49a698f988a08448379da541b76ec3319ca3794eb193470b9621996ecfbd35961f494dfea255ff1b809844f783ae9df518fb0c2b498a3827f4b186053a3a3011 SHA512 dbdaaf4fad0f6e67bc6ef194e16094a4ae8e61548aee42555c2c4b423ea525140618ff12db58fdb7ff7c8bdd782c4712d554f469746aa9e4ac2b500bb8f773c8
+DIST git-htmldocs-2.37.0.tar.xz 1444540 BLAKE2B 9249de4b49d0812cf5f3ceb0a062b396ca4f9482232c69c75177201d19c4094ca79acb61d47c9a80f9db8749ac634bb2cc3bb2fa96bd6b4a34798cf1da2dd74c SHA512 8f9ff2bfdb55db41805f4366c6eb6f116e37774b7dbbac193c4a817357c47c44664eb69eb1b55acfaabc513dbbd2393d7a93295b4443630f65bd6791fc742a87
 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
@@ -39,7 +39,7 @@ DIST git-manpages-2.35.2.tar.xz 497548 BLAKE2B 5e7c9e85879e57e5b157dc8d0a8b836d8
 DIST git-manpages-2.35.3.tar.xz 497672 BLAKE2B aef5a7c579392f55fa63f1ce36c03579f4fcce443e867ac2a162a3d72344639ee11949748a51547315579b37e0fc6d5915ea203ddc556b2511125781428ce001 SHA512 25ac8f1690ccbc0e36b7d05115aebde1911909307ac29d930158b61ecd68972b8a9c3af018d73f34251d42cabf8d3d392173a448ec948df0a3119c2a2b87bd60
 DIST git-manpages-2.36.0.tar.xz 503604 BLAKE2B 438f533dce6628143c0ca348bc372017f049126933bf07a63ce9150114632a048778d8e0876970b406144aa584d512470ae4426be9c5bb8a3a581680ac9443a1 SHA512 67c2fb1c974ffe15aa09b9c36338f3ae9805573b35291e128210fc99c9fd97b1e26be571819d6b073c5adfe4c6f688c15e31790aa9eb62c1effacfb8aa21eb1c
 DIST git-manpages-2.36.1.tar.xz 503680 BLAKE2B d43fc90584b2f9e3bae30460f0c545b4fb96a5c70ad03c73d655481e5737b75a8d7a293db5bfdd752aabfc835a4a11e77474a5a0f144c8791b2dd433a3e45b70 SHA512 dd2fd6c5186aac53d7834ccf0cb6c380758624bb4583c6c5703b5b7a24c65d4199403fbcf7033c69bd3dcfbe048baaef3e886b9ba99c8afeb375e18e5b3e6e40
-DIST git-manpages-2.37.0.rc2.tar.xz 510240 BLAKE2B e300ceb4c0094803a1c4f30e6b701928bfdcabf87f03ebb9c46b24edd25b58b62864b8d8b17b6dc87588dc4c83afd56a935479e3e60af209907c5280abba8a57 SHA512 1a2940cdaeccbfe786a613b800fdafbf73ee6fcc5d4d39cbdc004aea3ccd9577262cde49a79c9cfe34112d407220a18b314cbb56dae9e0ece1fb6041d86ccd6c
+DIST git-manpages-2.37.0.tar.xz 509992 BLAKE2B 67a1bc6e3a92b69d30b5e977b170cf11ac37d85dc318b35e12b728b8e17d6cfaaca7bbd343da8745be2547be8ad3dd9d930a24c0ba716dcb96aaf0610e25b11d SHA512 d739670caa11b70f3ed50665764e78a5b4c3d3d912976898d22d10d45ba3e2599b9e13d2a2502f97076a9d88b5f9e67bb11d204c8c43149b81e8243d28981711
 EBUILD git-2.32.0-r1.ebuild 17396 BLAKE2B d3e72aee885b6c6f42fd8299943ef62bffa72bb6795b8d363d3f51d811643f3e497b580ba76e09041621006ac0cbb37edcbddc153c7857cae6c86ce76312aa7d SHA512 fff18efa738dbf828654033931ae7eab90e8f4995ff9033a7865559c4f0cbc270f406cd4c87c7ff9ea14af38e9a3be9c70b6254caddd98250f60ca6b6bec97eb
 EBUILD git-2.33.1.ebuild 17292 BLAKE2B 64fd297bf8d695d2f82745eec25790b26f7faa1f1c95af123cbefdc216964dbecbe2e01b2775c43d40633355b81b1d5047fd0a05d3394c1d736a25d38c7cbc55 SHA512 0379fee683ef4e83bb9d0da35a1d1e7371b3975263351fad482f14f550e17c2ea5bd6041bdd834541b585afd87136d74a8102db3205b953edbd9232a551e7221
 EBUILD git-2.34.1-r1.ebuild 17299 BLAKE2B 0b6dde0f056ea0682e71561d993ee90660753942c4e6b876af48f0c341adcac3d524ba83a948e9bda970e363e53ca0a9e057ab21a41647c4624af87994b8d0ff SHA512 154f6e0172f32906fc833e9228c95e0014fcfcfaf041dae8539c0f8113e8201bfac04a8f5299d678aab0bd05af0e96243b0c86936fba453d01ffa82ca2a335bb
@@ -49,7 +49,7 @@ EBUILD git-2.35.2.ebuild 17306 BLAKE2B d012ebbd57af3c0c0b71d14736dd096877daae1be
 EBUILD git-2.35.3.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-2.36.0.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-2.36.1.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
-EBUILD git-2.37.0_rc2.ebuild 17351 BLAKE2B 9cfc8cc03cce0e26ca7ec3ef1a72270a18602b2a102f993b95e119da1e330f3044f50fa314874dad5e84b0d01e8fae63e62f69380c3932c2842e2d4e9f4a05dc SHA512 d3541fb2ffd4e9fd5869b9c7f47b48fd26c968a11d5b385125abbdb2212abe7720754ce2b0f537714390f71f892c40265ef030328e6ae84de0b235aa1d9ab56a
+EBUILD git-2.37.0.ebuild 17351 BLAKE2B 9cfc8cc03cce0e26ca7ec3ef1a72270a18602b2a102f993b95e119da1e330f3044f50fa314874dad5e84b0d01e8fae63e62f69380c3932c2842e2d4e9f4a05dc SHA512 d3541fb2ffd4e9fd5869b9c7f47b48fd26c968a11d5b385125abbdb2212abe7720754ce2b0f537714390f71f892c40265ef030328e6ae84de0b235aa1d9ab56a
 EBUILD git-9999-r1.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-9999-r2.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-9999-r3.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
diff --git a/dev-vcs/git/git-2.37.0_rc2.ebuild b/dev-vcs/git/git-2.37.0.ebuild
index 6b4a3f2ff057..6b4a3f2ff057 100644
--- a/dev-vcs/git/git-2.37.0_rc2.ebuild
+++ b/dev-vcs/git/git-2.37.0.ebuild
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 353c0e56f0ff..9d7a2a296609 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -3,7 +3,7 @@ DIST hg-git-0.10.3.tar.bz2 146867 BLAKE2B cad4103cbb517c7126787fcfd5c6a9d20b8140
 DIST hg-git-0.9.0.tar.bz2 129138 BLAKE2B a3758d3ff4daae98bccb71ac5471418b191596d7605c5fe867fde230a8deaacb3097b7f5f6f34ee55ba871a850c1c6f7cb6c1e9c05e388419136aecd66b775ea SHA512 03982292f042b9b48f58eeb04413f563b35fa8be1c31ca27825db8fbf293e4dfcb4bb62b6f504d82438a11c967496fb9bbd6aff5d77ae7eefdeb7747c53fcb82
 DIST hg-git-0.9.0a1.tar.bz2 128165 BLAKE2B dfe415a26554d6de714b64aa79f771e08f2c7ac02ee42732524b85a6572003bd428ea29823774d5ea4fa0eee251629bcbc78d9421773c312925a0114e51098ff SHA512 43119bacd4bfc169c8403b3d67e14609ada454a7635c50af5db3683ccd36e1d3be2ec0896204f0850b0cb0c09ded24ae723ad3eb6ddc381553f8c2b2ff2c84a1
 EBUILD hg-git-0.10.2.ebuild 790 BLAKE2B f3f7cd34fef06c515754ea0d0596fc2791acd0f8c151a3ff27b764b9d640cca14ab61931f2a1dc9d7b2566d9463033329ef904c6111fc25db67c968df04116ce SHA512 ea9fc251692e938340034a32f19628d3f5cc829269d34e516c0f8b7aa9344479bb3fb4f5fac1a7c125fca0ce42a5119c34e6681493ba850509be9d9a3efaa99d
-EBUILD hg-git-0.10.3.ebuild 791 BLAKE2B e05a6e4a3a0a7c07cb8c35e82e127088d12155f9b69a6be96c578e592ac6fa5ebd55f48aae0dcb03d54f33e6efa401f0f73a186b080bdc932a896d4a66afd025 SHA512 7b27e4ece4d2801dff34281e21543294b7f6ac44efefeaa9d44585a6e4fe2cd05260ab77a2ad03dea83c73309db166b5edd7ea14e0edb2104864339c0312851f
+EBUILD hg-git-0.10.3.ebuild 788 BLAKE2B 6214501396c539d0b88088e2440ae6acf3ee3a55839849f9a5ee1afed60e36a5480b9005ab50aabdc50ba96320b18bcd9e9060f858d632be23374efad7aa55de SHA512 13c469f36c16d0be71219189cd65f90f3d4ce4eb709698fb4df1710a4fe08cff3ec020363330f46146ae8db048f400386d5d40a4814b3b7737819935d104de10
 EBUILD hg-git-0.9.0.ebuild 816 BLAKE2B 83917189f748ab8d8a3f1cea4d3f1b71a3e79d0e42d79c4318be724a45acc2c98b2207e1beaefe62fade43f04b1feee73217e1fa5e6434de46e6be926ebb5eec SHA512 dee9b5a84425aeedc48d3b41d0ea0ca1476e21aebc75b3bbefae7425212af1f406c53a538294d6231a857973228dd4b293f6b18c2254d2d41f46f87df0249829
 EBUILD hg-git-0.9.0_rc1-r1.ebuild 786 BLAKE2B d4b149d3c34d63750f2bdd3d4af23ac290e6069c9067badece26d3f1cbbb70864cb1ae533e548017c1f2f0f1cd1fa0bec0d26d0689a6325b8cd097040e3301b9 SHA512 0a98580e0b923df1ad39c1712ef8ce32b43df82cd7bfdd1cea0b7601f3cc8baf3f38c57e1308f72c79ea05eb2e6a56e2b13e27af5e8198edc214f3950730fa48
 MISC metadata.xml 318 BLAKE2B 542f1ba6089efe6c9950e4032d682b3921df3c67226b9841bdc73d9c5b08492d3297c7725023d25fd281aafd4690cb31ebe67ea48369e03ab0700aff2d74234b SHA512 bc4fb056c2af59211d3dd6b997a0f50b40b1effe726de1adc91ff8783814e2d1367b12344a2dc03cd3f0f9de04699bf2291c0b5ec12193c27e9286eecf5c156e
diff --git a/dev-vcs/hg-git/hg-git-0.10.3.ebuild b/dev-vcs/hg-git/hg-git-0.10.3.ebuild
index ba3ed1c602f8..67ad5e7c9e1a 100644
--- a/dev-vcs/hg-git/hg-git-0.10.3.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.10.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://foss.heptapod.net/mercurial/hg-git/-/archive/${MY_PV}/${PN}-${M
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest
index 8f56324c5285..420a08de360c 100644
--- a/dev-vcs/pre-commit/Manifest
+++ b/dev-vcs/pre-commit/Manifest
@@ -1,7 +1,3 @@
-DIST pre-commit-2.17.0.tar.gz 261131 BLAKE2B 114fac379690ee4c1c60970a1b0fbcd20faea785837c174514c3fc3d247ec79f52fb5f14c96a762921395d682017a9cc406dc59b3042fc955cd65019fb781a3f SHA512 54b5af9088083ad0c57fab09c06c35bd5921b29348454fc8fc16081d3c6a2e0add13f8a18f06b7408a0e06babc5e15659b37ab53797edd3514d516059e2343a8
-DIST pre-commit-2.18.1.tar.gz 263642 BLAKE2B 0ddd0e8bc7450c6bce2080155851c4b8d7e81fe1683dbea389d24e79906b52850ca8cc16b57a4b6192a389a10f8e9d0dfeaa23deaf59027093dc4db61b4533c1 SHA512 38ad176675b40eb4fd2475e51f3079cff5d84733401592a8a00021cba6656f01a38c5835298db50607fd8d188728c127600c731795fbc149436a5e4aada94fc1
 DIST pre-commit-2.19.0.tar.gz 266117 BLAKE2B d2105fb9aa64e63c7d93142228545e3597eb4a1637f850ce5d3f14b0826bdfb8a8d971779690c4fda6823fa1915fc57f9c86b9ffae48dbe39e7a225123304f5c SHA512 9cc28c5e9ce4be87e09e7be01138c35bbe954efb6c1400e92b1a6b5f50e426b59d74651802359015840d5ec4a5583bf8f579bf7f08eb778d5950c8c8dfe4c80c
-EBUILD pre-commit-2.17.0.ebuild 1598 BLAKE2B 4ce3456da8315ca58792da3ad9d78ee0395d2090b02e505fb43a1ed6a87f1d5ac7a73ce5bc2e27063a045acebc4c1593cd20b0490c25779b3ac3b5f5b2ac5552 SHA512 d2a746ce673958c7985531299281b4b475db2c46edc17716ac72ee3f513deefa15185bd48a6532cdffaefd09ecf8743b42b4dad273f4e54cbf8caec7399dac94
-EBUILD pre-commit-2.18.1.ebuild 1600 BLAKE2B 6b9a7d9e7e640ffa62a7f797cfc8fec15e4cfb9fe1fe207694e67920f723eb4471f980d0b7a8b71776ec914fdba7d5c417db01384f63e075492ba6d8ddd94de3 SHA512 3ac9c85151f10089e0170ac8e922bba85eb71701b020890d03e8e0ed0c08de40058af7de73eb96ba3e73b680384436ca0164bfcb00affed9d807013fa84b682e
-EBUILD pre-commit-2.19.0.ebuild 1646 BLAKE2B 47a35f1c7439bd568556d2b81813d3516ba68f6e8ea4d6169bb448131b4e3fc3342605f882e1278fd9ff73949ac0fb5af16f3068a5663d9facac3f2037a3cf91 SHA512 58f97c33db011542c8c084f1ae470813713e8def4550d73220e53d6087400388f6fbefe976dd0e4c3c90e4fc3d28a1f5bbc99e063dbd409544e557d49254e481
+EBUILD pre-commit-2.19.0.ebuild 1644 BLAKE2B 24cc7660399918058adedae779a17925b76cb07f82186b7b011514b15d0abbcabeccd4814260243d44b48257600744e46f9c2b851c04f952ec66aa297324ae0c SHA512 2336a641068cf6e0acf2bc5e8404d0be1204fa4edfc4cdaeee5417f1e3c0a77def2317b6de6c96be1f2db5001421717792fe9e40f4689939480d644a49034644
 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
deleted file mode 100644
index 3d2b9177deee..000000000000
--- a/dev-vcs/pre-commit/pre-commit-2.17.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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/pre-commit/pre-commit-2.18.1.ebuild b/dev-vcs/pre-commit/pre-commit-2.18.1.ebuild
deleted file mode 100644
index 2794cad11571..000000000000
--- a/dev-vcs/pre-commit/pre-commit-2.18.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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/pre-commit/pre-commit-2.19.0.ebuild b/dev-vcs/pre-commit/pre-commit-2.19.0.ebuild
index b30bc1b3b4b9..6697add00888 100644
--- a/dev-vcs/pre-commit/pre-commit-2.19.0.ebuild
+++ b/dev-vcs/pre-commit/pre-commit-2.19.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
 
 RDEPEND="dev-vcs/git
 	$(python_gen_cond_dep '
diff --git a/dev-vcs/stagit/Manifest b/dev-vcs/stagit/Manifest
new file mode 100644
index 000000000000..e91b957c3f3d
--- /dev/null
+++ b/dev-vcs/stagit/Manifest
@@ -0,0 +1,4 @@
+AUX stagit-1.1-pkg-config.patch 578 BLAKE2B b25ff1e3bbb4eed09aec97bef30f965a3cdf50ebd05ee42e65aaefc9b090f38debadcbe4e81dfac7af3b00765d8905bcecbf1477e1df9b5a607f69a2576cd74d SHA512 19d2336729eb34fc8ddb330a8655e9d1ba736d415c2735a21cc9ac6ba66cbf48e52fe8c72e67c9eb8e5b6a7427c51ed3a89b2ebef5f400788a1f60e7109edded
+DIST stagit-1.1.tar.gz 19648 BLAKE2B f77f7d79a475d5e7eda734fb0dc5f4006156df90c0019b0cc664efe8a5e0b988e2c9f0bf36efcbabbb06d7c59e6ad81434184c2c73bfef28849261251eb052b8 SHA512 e75d47b84d2783f7396a932b402a4dd36572027931559eae908861f9b8c658f43f5110bdfc81c5a0b65be3a0c53939ba9adabcc1e36fe88a6dab54b929526e0f
+EBUILD stagit-1.1.ebuild 631 BLAKE2B c7cd3ad40e86f7be2f65571c5d425e6c8a5454456878f5784abb8eb44f7a240bda5beb57631ecfda4287451370b1a290b5b9ac8e35ea9a95ff38c17e19ae05dd SHA512 758631e6fa7f44aae36c4a39b5f87b14e121bc718f9a0d0ca00bc2c4815474c90fcd11526511aa0933297630f40ba76155224e84b7017a5effec8b0fa6db749f
+MISC metadata.xml 248 BLAKE2B 2a8d109f789d4f561986cfd5830c49c96b715e2fd50c0340e5c7ca385f72d09c0accf9102e1e1338e971400861d3baa95c083623231cbe96dc9e8163639dee25 SHA512 46a1388868fb5dcf5e3f85cbe8438d441c8a1ff291fcceb1cb4cf20a505e84e945c73967342eb7faadbaa51a7630977d9d447fe16505395fe7a05024e6242185
diff --git a/dev-vcs/stagit/files/stagit-1.1-pkg-config.patch b/dev-vcs/stagit/files/stagit-1.1-pkg-config.patch
new file mode 100644
index 000000000000..f4bc82d30502
--- /dev/null
+++ b/dev-vcs/stagit/files/stagit-1.1-pkg-config.patch
@@ -0,0 +1,18 @@
+From a0fd5bc899aa6552f14a64adcce24467376062c3 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Tue, 5 Jul 2022 20:52:35 +0100
+Subject: [PATCH] build: Use pkg-config to find libgit2
+
+--- a/Makefile
++++ b/Makefile
+@@ -8,8 +8,8 @@ PREFIX = /usr/local
+ MANPREFIX = ${PREFIX}/man
+ DOCPREFIX = ${PREFIX}/share/doc/${NAME}
+ 
+-LIBGIT_INC = -I/usr/local/include
+-LIBGIT_LIB = -L/usr/local/lib -lgit2
++LIBGIT_INC = $(shell pkg-config --cflags libgit2)
++LIBGIT_LIB = $(shell pkg-config --libs libgit2)
+ 
+ # use system flags.
+ STAGIT_CFLAGS = ${LIBGIT_INC} ${CFLAGS}
diff --git a/dev-vcs/stagit/metadata.xml b/dev-vcs/stagit/metadata.xml
new file mode 100644
index 000000000000..e91ef31902f9
--- /dev/null
+++ b/dev-vcs/stagit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-vcs/stagit/stagit-1.1.ebuild b/dev-vcs/stagit/stagit-1.1.ebuild
new file mode 100644
index 000000000000..c820b61e2951
--- /dev/null
+++ b/dev-vcs/stagit/stagit-1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Generates static HTML pages for a Git repository"
+HOMEPAGE="https://codemadness.org/stagit.html"
+SRC_URI="https://codemadness.org/releases/stagit/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/libgit2:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1-pkg-config.patch )
+
+src_install() {
+	emake DESTDIR="${D}" \
+		  DOCPREFIX="${EPREFIX}"/usr/share/doc/${PF} \
+		  MANPREFIX="${EPREFIX}"/usr/share/man \
+		  PREFIX="${EPREFIX}"/usr \
+		  install
+}
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 8568a6296ffa..2dcb158d1f2a 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -4,8 +4,6 @@ AUX svnserve.confd 322 BLAKE2B 53eb3105691af05e4dde3451569f46621ed78a1ea7e7650b0
 AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43ab3f2f6eb6d1946dd8efb86e532df3576487ad9f49acdb3b9d95b804019d296fae0f757541957a95 SHA512 3efca4e5065cbe37f5137f3f67a0a654195e50ce0b00468f5edb1e5d476daa82422b1e833281d8edba111360b20d001a5991731e9f32bf3c88ffba75042e2b10
 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
-DIST subversion-1.14.1.tar.bz2 8504612 BLAKE2B 27c6c5a9e656680b10fbc4b5c6d5fed36759d42d908e2bd5e56e19a7477c779c72314eb4a6766a13f1af047a759f9f9334b963c1d41cd48573b9800d5b671cc1 SHA512 0a70c7152b77cdbcb810a029263e4b3240b6ef41d1c19714e793594088d3cca758d40dfbc05622a806b06463becb73207df249393924ce591026b749b875fcdd
 DIST subversion-1.14.2.tar.bz2 8606570 BLAKE2B cf15c61b932823fb18b52f83d84907386f068d2d40e14dbab94c42ad9d4c0fdf35d82db78036d7c1f2be47c2d51cdd27bfb966eb7607a52a21e072aeff76fb38 SHA512 20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc
-EBUILD subversion-1.14.1.ebuild 12732 BLAKE2B b14f4d45aeee58b6f35220db98190fd7cf43dbf6438b402410e0a3797e62e37379a175e26ff23fd0ec580b02579f571e258982e02fb9556b80925015fd0d8e59 SHA512 a4594ab26152e2988ef82a50bb9dffba3cf6711178f986f188ee5102d3f1c37e0a30df6a8a897a6e7eab152b56f8361b1c204e72cb8f9aae0d3f13d71388ccbd
 EBUILD subversion-1.14.2-r1.ebuild 12709 BLAKE2B 715b097039ddc999af7e50b1d191d8ede532c6230134a84e8a359931d17b381c4c69dee3d12ff77e8ee9bc46089795fe76580c065cc28983e0eb56e9c03c587d SHA512 b3917f442f11122ff4e71a58a12ea8bc0d814ea8d0f1e42600c39560bdf5289726b08597062e2e7d24638d2adf6f1017ab1ec74a190afc18965bcd23a425a368
 MISC metadata.xml 845 BLAKE2B 01e13e03afd275ac996834a9aae57d8b07cda38acd55f77a6b7e28533faf96f9b5091830e34298f9af68a2b712bfae82637400151e2b73e563e36348951ef23c SHA512 337bc69860f94b798dfbb957f501781fe0039407c6768a53bee9e6badad430ba080baad0edd20ede40638a0a018bf57481b049a46f4303b1a2a42d9dd3e76d1b
diff --git a/dev-vcs/subversion/subversion-1.14.1.ebuild b/dev-vcs/subversion/subversion-1.14.1.ebuild
deleted file mode 100644
index a7a8cdbc9104..000000000000
--- a/dev-vcs/subversion/subversion-1.14.1.ebuild
+++ /dev/null
@@ -1,442 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{8,9} )
-USE_RUBY="ruby27 ruby26"
-DISTUTILS_OPTIONAL=1
-WANT_AUTOMAKE="none"
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool multilib perl-module python-any-r1 ruby-single toolchain-funcs xdg-utils
-
-MY_P="${P/_/-}"
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="https://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0 BSD MIT BSD-2 FSFAP unicode"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="apache2 berkdb debug doc extras gnome-keyring java kwallet nls perl plaintext-password-storage ruby sasl test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	app-arch/lz4
-	>=dev-db/sqlite-3.7.12
-	>=dev-libs/apr-1.5:1
-	>=dev-libs/apr-util-1.5:1
-	dev-libs/expat
-	dev-libs/libutf8proc:=
-	>=net-libs/serf-1.3.4
-	sys-apps/file
-	sys-libs/zlib
-	berkdb? ( >=sys-libs/db-4.0.14:= )
-	gnome-keyring? (
-		dev-libs/glib:2
-		app-crypt/libsecret
-		sys-apps/dbus
-	)
-	kwallet? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kwallet:5
-		sys-apps/dbus
-	)
-	perl? ( dev-lang/perl:= )
-	ruby? ( ${RUBY_DEPS} )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-RDEPEND="${COMMON_DEPEND}
-	apache2? (
-		acct-group/apache
-		acct-user/apache
-		www-servers/apache[apache2_modules_dav]
-	)
-	!apache2? (
-		acct-group/svnusers
-		acct-user/svn
-	)
-	java? ( >=virtual/jre-1.8 )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )
-"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	!!<sys-apps/sandbox-1.6
-	doc? ( app-doc/doxygen )
-	gnome-keyring? ( virtual/pkgconfig )
-	java? ( >=virtual/jdk-1.8 )
-	kwallet? (
-		kde-frameworks/kdelibs4support:5
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-	perl? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )
-	test? ( ${PYTHON_DEPS} )
-"
-
-want_apache
-
-pkg_setup() {
-	if use berkdb ; then
-		local apu_bdb_version="$("${EPREFIX}"/usr/bin/apu-1-config --includes \
-			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
-			| sed 's:.*b::')"
-		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
-			if [[ -n "${apu_bdb_version}" ]] ; then
-				SVN_BDB_VERSION="${apu_bdb_version}"
-				einfo "Matching db version to apr-util"
-			else
-				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
-				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
-			fi
-		fi
-		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
-		einfo
-
-		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
-			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
-			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
-			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
-			eerror "Aborting to avoid possible run-time crashes."
-			die "Berkeley DB version mismatch"
-		fi
-	fi
-
-	depend.apache_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-
-	# https://issues.apache.org/jira/browse/SVN-4813#comment-16813739
-	append-cppflags -P
-
-	if use debug ; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-
-	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
-	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
-
-	# Allow for custom repository locations.
-	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-
-	if use ruby ; then
-		local rbslot
-		RB_VER=""
-		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
-			if has_version dev-lang/ruby:${rbslot} ;  then
-				RB_VER="${rbslot/.}"
-				break
-			fi
-		done
-		[[ -z "${RB_VER}" ]] && die "No useable ruby version found"
-	fi
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/721300
-	rm "${WORKDIR}"/patches/subversion-1.10.0_rc1-utf8proc_include.patch || die
-
-	eapply "${WORKDIR}/patches"
-	eapply_user
-
-	chmod +x build/transform_libtool_scripts.sh || die
-
-	sed -i \
-		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-	# this bites us in particular on Solaris
-	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
-		die "/bin/sh is not POSIX shell!"
-
-	eautoconf
-	elibtoolize
-
-	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
-		-i build-outputs.mk || die "sed failed"
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		$(use_with apache2 apache-libexecdir)
-		$(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
-		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
-		--without-ctypesgen
-		--disable-runtime-module-search
-		$(use_with gnome-keyring)
-		$(use_enable java javahl)
-		$(use_with java jdk "${JAVA_HOME}")
-		$(use_with kwallet)
-		$(use_enable nls)
-		$(use_enable plaintext-password-storage)
-		$(use_with sasl)
-		--with-serf
-		--with-apr="${EPREFIX}/usr/bin/apr-1-config"
-		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config"
-		--disable-experimental-libtool
-		--without-jikes
-		--disable-mod-activation
-		--disable-static
-		--enable-svnxx
-	)
-
-	if use perl || use ruby; then
-		myconf+=( --with-swig )
-	else
-		myconf+=( --without-swig )
-	fi
-
-	if use java ; then
-		myconf+=( --without-junit )
-	fi
-
-	case ${CHOST} in
-		*-aix*)
-			# avoid recording immediate path to sharedlibs into executables
-			append-ldflags -Wl,-bnoipath
-		;;
-		*-cygwin*)
-			# no LD_PRELOAD support, no undefined symbols
-			myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
-			;;
-		*-interix*)
-			# loader crashes on the LD_PRELOADs...
-			myconf+=( --disable-local-library-preloading )
-		;;
-		*-solaris*)
-			# need -lintl to link
-			use nls && append-libs intl
-			# this breaks installation, on x64 echo replacement is 32-bits
-			myconf+=( --disable-local-library-preloading )
-		;;
-		*-mint*)
-			myconf+=( --enable-all-static --disable-local-library-preloading )
-		;;
-		*)
-			# inject LD_PRELOAD entries for easy in-tree development
-			myconf+=( --enable-local-library-preloading )
-		;;
-	esac
-
-	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
-	#compile for x86 on amd64, so workaround this issue again
-	#check newer versions, if this is still/again needed
-	#myconf+=( --disable-disallowing-of-undefined-references )
-
-	# for build-time scripts
-	if use test; then
-		python_setup
-	fi
-
-	# Remove when >=dev-libs/libutf8proc-2.5.0 is stable
-	# https://bugs.gentoo.org/721300
-	append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc
-
-	# allow overriding Python include directory
-	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
-	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake local-all
-
-	if use perl ; then
-		emake swig-pl
-	fi
-
-	if use ruby ; then
-		emake swig-rb
-	fi
-
-	if use java ; then
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
-	fi
-
-	if use extras ; then
-		emake tools
-	fi
-
-	if use doc ; then
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			emake doc-javahl
-		fi
-	fi
-}
-
-src_test() {
-	if has_version ~${CATEGORY}/${P} ; then
-		default
-	else
-		ewarn "The test suite shows errors when there is an older version of"
-		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
-		ewarn "before running the test suite."
-		ewarn "Test suite skipped."
-	fi
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" local-install
-
-	if use perl ; then
-		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
-		perl_delete_localpod
-		find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
-	fi
-
-	if use ruby ; then
-		emake DESTDIR="${D}" install-swig-rb
-	fi
-
-	if use java ; then
-		emake DESTDIR="${D}" install-javahl
-		java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
-		java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
-	fi
-
-	# Install Apache module configuration.
-	if use apache2 ; then
-		keepdir "${APACHE_MODULES_CONFDIR}"
-		insinto "${APACHE_MODULES_CONFDIR}"
-		doins "${FILESDIR}/47_mod_dav_svn.conf"
-	fi
-
-	# Install Bash Completion, bug 43179.
-	newbashcomp tools/client-side/bash_completion svn
-	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
-	rm -f tools/client-side/bash_completion
-
-	# Install hot backup script, bug 54304.
-	newbin tools/backup/hot-backup.py svn-hot-backup
-	rm -fr tools/backup
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245.
-	newinitd "${FILESDIR}"/svnserve.initd3 svnserve
-	newconfd "${FILESDIR}"/svnserve.confd svnserve
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	#adjust default user and group with disabled apache2 USE flag, bug 381385
-	if ! use apache2 ; then
-		sed -e "s\USER:-apache\USER:-svn\g" \
-			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
-			-i "${ED%/}"/etc/init.d/svnserve || die
-		sed -e "0,/apache/s//svn/" \
-			-e "s:apache:svnusers:" \
-			-i "${ED%/}"/etc/xinetd.d/svnserve || die
-	fi
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dodoc tools/xslt/svnindex.{css,xsl}
-	rm -fr tools/xslt
-
-	# Install extra files.
-	if use extras ; then
-		cat <<- EOF > 80subversion-extras
-			PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-			ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-		EOF
-		doenvd 80subversion-extras
-
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
-
-		find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr
-		rm -fr tools/client-side/svnmucc
-		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
-		rm -fr tools/{buildbot,dev,diff,po}
-	fi
-
-	if use doc ; then
-		docinto html
-		dodoc -r doc/doxygen/html/*
-
-		if use java ; then
-			java-pkg_dojavadoc doc/javadoc
-		fi
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	cd "${ED%/}"/usr/share/locale
-	for i in * ; do
-		if [[ ${i} != *${LINGUAS}* ]] ; then
-			rm -r ${i} || die
-		fi
-	done
-}
-
-pkg_preinst() {
-	# Compare versions of Berkeley DB, bug 122877.
-	if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then
-		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
-			CHANGED_BDB_VERSION="1"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
-		ewarn "You upgraded from an older version of Berkeley DB and may experience"
-		ewarn "problems with your repository. Run the following commands as root to fix it:"
-		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	fi
-
-	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
-}
-
-pkg_postrm() {
-	:
-}
-
-pkg_config() {
-	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
-	# already has EPREFIX in it
-	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
-		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
-	else
-		mkdir -p "${SVN_REPOS_LOC}/conf"
-
-		einfo "Populating repository directory..."
-		# Create initial repository.
-		"${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
-
-		einfo "Setting repository permissions..."
-		SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
-		SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
-		if use apache2 ; then
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
-		else
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
-		fi
-		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
-		chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} "${SVN_REPOS_LOC}/repos"
-	fi
-}
diff --git a/dev-vcs/svneverever/Manifest b/dev-vcs/svneverever/Manifest
index f06be1592e70..213d53ae408f 100644
--- a/dev-vcs/svneverever/Manifest
+++ b/dev-vcs/svneverever/Manifest
@@ -4,5 +4,6 @@ DIST svneverever-1.7.1.tar.gz 10888 BLAKE2B d250be7c1fca9bd84cf0ce217cd46a1fb99d
 EBUILD svneverever-1.5.0.ebuild 516 BLAKE2B 22c271024df1b86f4ad2985ad411d9278d8b4419e906b652205e84a67b1b434f43335dd6ca2b53c089005857e4918f2f6ea1408fdd5489930e7b345793093cad SHA512 41685e6dcc3c8c90afa95085fc6d4a7b8506c16b07aaa864333c04217401770e554280d5f8368f1258c360bc514ae92c20ca9495f4eae87403efc4b2dec59d02
 EBUILD svneverever-1.6.0.ebuild 482 BLAKE2B 266bd5e21b0015f3fe425085056c99c1dfbc24bd62f951648f4ea366c800cfbc1a48c68a9704adeb0033c0166116b0d19fc267f76dff4315f57da6f53951a95a SHA512 b9acb53dc48fa63bda5df09bbdcf7820a3b7d33321479c6e2929a6c51376883d2f9d8b77a80506fa4e591d6b44f89e4ba877a2d2b769e8d15eaae24d084c0e3d
 EBUILD svneverever-1.7.1-r1.ebuild 449 BLAKE2B 8a777535d72af5e751f86e068e859bb5dc0de53433c25228c741c2f0f33125e831bf2483883eb1fed1add4dbbd531aa757377a298cbc711c29a545c312103f62 SHA512 ad5b982f8feba03ee484115d0c6a98f7fce46a65492b30a9b10e6abc1802f5f15d286e4b2713940866c5f8d52c7e63b699289c86f1950ab8b85810eb6b296272
+EBUILD svneverever-1.7.1-r2.ebuild 449 BLAKE2B b57ac4c070113d8ebe37e97b8b9bf35870472d4e0fc4c21f0cfb7fdb0f0dfdeecf1fc7e9f17c137cd967bd30e1da50c4dd39fb3065a5e9b73dc7f8d9c21e2eee SHA512 a4ed10c55524c5a504b820fb34d42cb4e11165af46c2520b66069b598930e05d72decc9c8e39c4f7b0cde97460e08e000a493fbaeebd3ed0cfa335f13bd9b1f5
 EBUILD svneverever-1.7.1.ebuild 482 BLAKE2B 266bd5e21b0015f3fe425085056c99c1dfbc24bd62f951648f4ea366c800cfbc1a48c68a9704adeb0033c0166116b0d19fc267f76dff4315f57da6f53951a95a SHA512 b9acb53dc48fa63bda5df09bbdcf7820a3b7d33321479c6e2929a6c51376883d2f9d8b77a80506fa4e591d6b44f89e4ba877a2d2b769e8d15eaae24d084c0e3d
 MISC metadata.xml 335 BLAKE2B 58c656866231b8630ac2072865455d73bf6b65a1bf6ae5f446b4e6cfa5f1903f630f62757271742c66c01dc32d79605c0991f4967e82f2676b9e428e616070e5 SHA512 fbf046b1c7aced8d80b5e210e75b3d10b3f5b87a7fe63ad843b97260d477a7609a7289e4ede59108de8c58eddb2a476078c82bcbe91cb418bde8c57a8887d36d
diff --git a/dev-vcs/svneverever/svneverever-1.7.1-r2.ebuild b/dev-vcs/svneverever/svneverever-1.7.1-r2.ebuild
new file mode 100644
index 000000000000..8c1a552c2d41
--- /dev/null
+++ b/dev-vcs/svneverever/svneverever-1.7.1-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool collecting path entries across SVN history"
+HOMEPAGE="https://github.com/hartwork/svneverever"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-python/pysvn[${PYTHON_USEDEP}]"