15 files changed, 15 insertions, 257 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 23dfc2d19a16..fb22122c4950 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-big-picture/Manifest b/dev-vcs/git-big-picture/Manifest
index b47a7e58e9e9..417fdceed577 100644
--- a/dev-vcs/git-big-picture/Manifest
+++ b/dev-vcs/git-big-picture/Manifest
@@ -1,8 +1,3 @@
-DIST git-big-picture-1.2.0.tar.gz 2963822 BLAKE2B 2e2a5c223c212cc73f44a2f91ad1b83d46279baec77633b6253f21f0e3bc7eb2968fc9e47800976db9a720713597329ff442853b9bf151ebf112b60ebf87946e SHA512 144e098fedc8f0e9d7c2360ff8194d5100effd13b0b04598680d441b1ffa9d3307982e6404c54b859dffb3ff8d8ba1b5a7a01245b5bf7e87f36268b7e6b9d266
-DIST git-big-picture-1.2.1.tar.gz 2964502 BLAKE2B 1213c29e01c8556f694ecd12dcb397ba20f7a899042c2a02e7c10d80acdfbcc0e9f6c7b72f82575a3bff55af16fce993ad8d31a25f19ed655e55ad5d25e89f75 SHA512 efbbd730fad8f1e913a81d66bf758cdb2be548ed083fd9a778a79ff56f891fe57bb620c8ac3f6f65736b588619189b14332ca23902d3d510e4c6c4bc9714b682
 DIST git-big-picture-1.2.2.tar.gz 2964564 BLAKE2B 39971b21a9c9a0a8d1bf41f37350a158b634d2eaa0add460c1c18b70f643ab226736d53a337d4ed2583903a5d6c3188ab7a1b06f48a3f354e28d57ec74441599 SHA512 62c43727bb688d6572e7caafe9c5da3b782504738dd0d83d5df675ba757e8be22a8630ec1863c07f0fd2e54549b2ccbd1250ba8f367a6f840afa7b8962c487e8
-EBUILD git-big-picture-1.2.0.ebuild 889 BLAKE2B 3def5d0bc40f1051d5661c7fbc2eaf6de5ab82f12bc6610e79d5392488653a81f92e214b9411c052ae211f9b6716fdc0f134b9e3dbf3463a0159c6453f20177c SHA512 5de8adb1d17bfdad010e4169496943e59c8ae51ee4bd43c9f50674c7d45e781cc5ab53145a8b7a807b0b5414d6679186e800027e455ad791816dc7028cc4cbdb
-EBUILD git-big-picture-1.2.1.ebuild 889 BLAKE2B 1bb995fb57d6e0613d31400de3072b2396fd7a5eb5fd412a50eb8ee3c6e858aa4acecaa89ef32c8c0dacd61f18b01b50df933ff09d6a14c0f8198c0be00af4ff SHA512 c69c4c9b0515dca95b10173bc0dc4874c3786515eba0a5ba0e605ccc7d2d3c38777eec6db8fd6fae0682f86edcc35fa00cf47d1abd430c0fe762274a861ff969
 EBUILD git-big-picture-1.2.2-r1.ebuild 974 BLAKE2B 53dc27a0f10a870ddd90d75ea2e1da83ff7547386a4884c6dc5b61d52ad7e6ccdc0cf527d1de0a57014e940cf0a45cc39d409b3b128907aa5f71637c30151cc0 SHA512 137854500b179e7d2ff1135cd9aaf04fb6279f8968658760b4cf99c05bd580a5af088b6629e25499475d0511874391cf930bcfb238a5bc53be55446329205f04
-EBUILD git-big-picture-1.2.2.ebuild 889 BLAKE2B 7699f537203c2e84a9b5b705ce2e664c7e2750c972036ec8bf6e14db75891db068f2bbdd5f29ec823295c15d08b219220361010c01bb57948dbd5041dcfed12d SHA512 2144352cfebf5f6b31b4e9688e8319d25966e86b08553ec8def429799e69d326cda3193e5207b7924cc642cbdd6c5237f3220d1d7c8853b0f2de6fb5034c4f50
 MISC metadata.xml 399 BLAKE2B 5e912fe66108f5588e14b1766b905e2c19aa6bc8529ac855be153efa928222bd455eec6c21cbefbfa62fa005732356f0368b47eebd4bb91cfbb77ba427dbe356 SHA512 790e96e16572a401754dc67f30fd2bca0a1cf11ef95afca4cab8379fc1b2684389a73ce118e05c062c9ec768c0098240ab7ec1cda40e7ed1a81c0a3525ea1ba3
diff --git a/dev-vcs/git-big-picture/git-big-picture-1.2.0.ebuild b/dev-vcs/git-big-picture/git-big-picture-1.2.0.ebuild
deleted file mode 100644
index ee6e9b1c4603..000000000000
--- a/dev-vcs/git-big-picture/git-big-picture-1.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Visualization tool for Git repositories"
-HOMEPAGE="https://github.com/git-big-picture/git-big-picture"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-util/cram[${PYTHON_USEDEP}]
-	)
-"
-# No need for "[python]" or "[${PYTHON_USEDEP}]" with any of these
-# since they are invoked using subprocess
-RDEPEND="
-	dev-vcs/git
-	media-gfx/graphviz[svg]
-"
-
-RESTRICT="!test? ( test )"
-
-python_test() {
-	pytest -vv test.py || die "Tests fail with ${EPYTHON}"
-
-	distutils_install_for_testing
-	cram test.cram || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-vcs/git-big-picture/git-big-picture-1.2.1.ebuild b/dev-vcs/git-big-picture/git-big-picture-1.2.1.ebuild
deleted file mode 100644
index 8d0b7a15fdd2..000000000000
--- a/dev-vcs/git-big-picture/git-big-picture-1.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Visualization tool for Git repositories"
-HOMEPAGE="https://github.com/git-big-picture/git-big-picture"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-util/cram[${PYTHON_USEDEP}]
-	)
-"
-# No need for "[python]" or "[${PYTHON_USEDEP}]" with any of these
-# since they are invoked using subprocess
-RDEPEND="
-	dev-vcs/git
-	media-gfx/graphviz[svg]
-"
-
-RESTRICT="!test? ( test )"
-
-python_test() {
-	pytest -vv test.py || die "Tests fail with ${EPYTHON}"
-
-	distutils_install_for_testing
-	cram test.cram || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-vcs/git-big-picture/git-big-picture-1.2.2.ebuild b/dev-vcs/git-big-picture/git-big-picture-1.2.2.ebuild
deleted file mode 100644
index d1b02520c98f..000000000000
--- a/dev-vcs/git-big-picture/git-big-picture-1.2.2.ebuild
+++ /dev/null
@@ -1,40 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Visualization tool for Git repositories"
-HOMEPAGE="https://github.com/git-big-picture/git-big-picture"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-util/cram[${PYTHON_USEDEP}]
-	)
-"
-# No need for "[python]" or "[${PYTHON_USEDEP}]" with any of these
-# since they are invoked using subprocess
-RDEPEND="
-	dev-vcs/git
-	media-gfx/graphviz[svg]
-"
-
-RESTRICT="!test? ( test )"
-
-python_test() {
-	pytest -vv test.py || die "Tests fail with ${EPYTHON}"
-
-	distutils_install_for_testing
-	cram test.cram || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index c3a272773ab4..7dcf120155e4 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1,8 +1,5 @@
-DIST svn2git-1.0.16.tar.gz 44489 BLAKE2B 0be673592a6032b0f46f7ab80e50862e6979a6540d17eadb2c0e4c3f40737283fb17cc51340810bbfc17dba7ee258537d5618de95da3843851e20ae843a47626 SHA512 11289c98fcae98ec2137b778c064e73f47957c987a8d413946a8cde44d679565eae878e69e3a60b5c48c0753dd4935d001eb6ba28253cea995ee4fd40379b583
-DIST svn2git-1.0.17.tar.gz 46473 BLAKE2B ab862a310f8d21b33d49f5152df458fb1524abe2e353e6395d7b20d80ee3967338ca04ff5e282623937ca13b38e9018ba81d4c3e89f3c69e1002bff7ddd8621a SHA512 6d02ffa0923bcc80878c08e5a4f2f00476485e34d1c7361ddfa8bdfd521c0d36a22b46e7cd872e617ecd604f2d724166ea95008338bba41ee7e1200dc919baf4
 DIST svn2git-1.0.18.tar.gz 53514 BLAKE2B 1e40318e484df4eee9ab3586b73cc6a7d9599f8f04e31531e2591dc0bb6f84190d35fb6b9128dd512bab59648e838f479fd81894f97cfce7af4365e0932b26e4 SHA512 ff851a5c3a225c8b6efa9fbf90bd72439bc1303f8138384c2bac779d6cfe52c77125ec3b80b320205e08bbee9910c5203a95c112909c3336750938d2271c2517
-EBUILD svn2git-1.0.16.ebuild 1034 BLAKE2B ddbb36477b2dbd88f52598c46dfe6c357a3ee03f17ba668897a11cdf1da6b2d11bbaa160526b7ece14437883ba7583a596f3f9c66f5fdf65c693d76427a7b8b7 SHA512 61d9606dc51ba6efd15b615d6573a357a73b84c01303c6b561b6f3f09aed6db4e9698231b86622913a97118b8a85c36df71b238ee5a2bb0390475c13c7c68d1e
-EBUILD svn2git-1.0.17.ebuild 1034 BLAKE2B bf4bc2dd9ccd89a21f5161275c5d4b6536c3824cb0f4f8218b0603ee24f01d2d0d87f63aac37bd47b6f673946d688aff9e6888aa6f51c333db683567cab49b03 SHA512 f0993c376ae1c3949cc00a51d09112eca009230d8a671dd37cc30b385a474f19d3ac135a3f3b22f1e789d5498f6ebbaafa19d169a3df32e295f67c31cdf2f230
+EBUILD svn2git-1.0.18-r1.ebuild 1026 BLAKE2B 5f19c15f7c7db328795f28d4dc3c5c84a3a1882f63b7e962908da72eaf35f2672e97def62d7be3712f17105b6cfca0991e004ba0c251d01ccdf9c637c2a4617c SHA512 cb9fe406acbbf25f2a0c1065704355a4407f4d14548033311891c59667dd460043529f28e48c11cf4bac6f309baaa19da2b789feb04b7fa17b3db7847fa19eae
 EBUILD svn2git-1.0.18.ebuild 1034 BLAKE2B bf4bc2dd9ccd89a21f5161275c5d4b6536c3824cb0f4f8218b0603ee24f01d2d0d87f63aac37bd47b6f673946d688aff9e6888aa6f51c333db683567cab49b03 SHA512 f0993c376ae1c3949cc00a51d09112eca009230d8a671dd37cc30b385a474f19d3ac135a3f3b22f1e789d5498f6ebbaafa19d169a3df32e295f67c31cdf2f230
-EBUILD svn2git-9999.ebuild 1038 BLAKE2B 059a84ce943445d0779faf33c7c370c238f23de5917c6a7fdbabff1b835a87be854f99094eed0f801a13409ff94ec08c93f126020fa5d8223b6e70081d40099f SHA512 79e71b22e1df2c6a9e94d262bd2851507cc5fe284706e65e24dfa83be2364e9434a33067a4ddbe10b4a4a4841b2452c2eea4285dbbbf08fa859d59b6b98cae65
+EBUILD svn2git-9999.ebuild 1030 BLAKE2B 4247ae3c8727646523a62fb5bd30905776dae0efed247406e691bedc4456348c877c072c2e45793647b2cbf45fc2f41e0afcdb3df836ae048f1209c6361bab11 SHA512 5ce0a42798aa47c88b8b1cc3b1dd0d076b35f89c80f2aac2c10c313650768b49c8be94d56c1119d2a4a7575290c17cddaef1d77b999c875c166579dfa2649606
 MISC metadata.xml 342 BLAKE2B 6979ab5bc57e2ce266d7907bdba2498d60028107152811ccd07cb9c23087c575dbcf0cd867b3a4b879d0521f7c31586d03c439f98f214ffa9f03312f27953bb3 SHA512 0f1f3d6c555daafd485fa93c5575ba38522c183b471f97141649d4487dc2966938896cd9550b58728a3ed122abf8b9900e50e2f6c64c47db81d3786e45deaa80
diff --git a/dev-vcs/svn2git/svn2git-1.0.16.ebuild b/dev-vcs/svn2git/svn2git-1.0.16.ebuild
deleted file mode 100644
index 0db87be987a4..000000000000
--- a/dev-vcs/svn2git/svn2git-1.0.16.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils
-[[ "${PV}" == "9999" ]] && inherit git-r3
-
-DESCRIPTION="Tool for one-time conversion from svn to git"
-HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
-else
-	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-# KEYWORDS way up
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-vcs/subversion"
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-
-DOCS=( README.md )
-
-src_configure() {
-	local qmake_args=(
-		APR_INCLUDE=/usr/include/apr-1
-		PREFIX=/usr
-		SVN_INCLUDE=/usr/include/subversion-1
-		VERSION=${PV}
-	)
-	eqmake5 "${qmake_args[@]}" fast-export2.pro
-}
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/${PN}/samples
-	doins samples/*.rules
-	dobin svn-all-fast-export
-	dosym svn-all-fast-export /usr/bin/svn2git
-}
diff --git a/dev-vcs/svn2git/svn2git-1.0.17.ebuild b/dev-vcs/svn2git/svn2git-1.0.18-r1.ebuild
index 7b8fb13d3724..23d663c4c084 100644
--- a/dev-vcs/svn2git/svn2git-1.0.17.ebuild
+++ b/dev-vcs/svn2git/svn2git-1.0.18-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop qmake-utils
+inherit qmake-utils
 [[ "${PV}" == "9999" ]] && inherit git-r3
 
 DESCRIPTION="Tool for one-time conversion from svn to git"
diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
index 71f0f843766f..7db66f10e468 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop qmake-utils
+inherit qmake-utils
 [[ "${PV}" == "9999" ]] && inherit git-r3
 
 DESCRIPTION="Tool for one-time conversion from svn to git"
diff --git a/dev-vcs/svneverever/Manifest b/dev-vcs/svneverever/Manifest
index 213d53ae408f..cda9483ae211 100644
--- a/dev-vcs/svneverever/Manifest
+++ b/dev-vcs/svneverever/Manifest
@@ -1,9 +1,4 @@
-DIST svneverever-1.5.0.tar.gz 9286 BLAKE2B 8400e202f191131b494a894b112c92f4cf5977396fa8d1c11f5e17a309159dbab2df4d84bc24c88e0dd41d306b171c1eaeb679c900e94fdb3aee542d819f43e0 SHA512 b47e367b6c180ff92f24d70efaa5fd6697e266c28d05abf2555a59a4e34a603b97d70a045163b6cd6ab786f4ec5d9f5dc59277e79d98b70770c7d2ce672f9a8d
-DIST svneverever-1.6.0.tar.gz 10735 BLAKE2B ea69032fb61176dab5c80da0a3ea03f0aef65537798a5c0c7517176cdb487e1ae5c04259eb7f5625e80e1e2612166c506cccfbfadbe4eae5e1d8a33369a4c94f SHA512 93bf33bd82c91cd58fc2106eb236a75b659b19367f94914e4475844fca3d7693703d18a6f51f5f98db3f18d46e72adbc0ef9174ede49bec19f047255d38e03d2
 DIST svneverever-1.7.1.tar.gz 10888 BLAKE2B d250be7c1fca9bd84cf0ce217cd46a1fb99d1e6b8ec28c19e281b8f953331219354c5ac8f90bb9b1e3003ceb2a23e6dc8dbc1a78822aa79e5c0edc27d4e99780 SHA512 066a56bac798f513cd6332b19f89a00d67866dabd52c501c911fe48cbf978e74698e5d2bd59e3eaff31cf924c49ad7ce7e88ad339284d1af005ad1265633f1be
-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
+EBUILD svneverever-1.7.1-r3.ebuild 481 BLAKE2B 3ea14ec3813d94de8c61d5af39f3e613c24f5dc4bfb560d5d837dfd20e78bd773f0f93842132f2bcd6b50fcf4cd2b2365e35b36edad8e2d4d35d985c7a8d537f SHA512 bd0b388c47782fa758a4c728d59b66ef76784b083cedce6b0b22b9d53214e9eb82ac42ee946604d0f0e69141303044ecaf7aa8cf09d2fabd8ea069e01d87ccd0
+MISC metadata.xml 384 BLAKE2B cdb51e9f0707e7ff2b6f5ee2223b3070897546e6c6424db33b7a1045089509f7cf29e0c03cd013a11e1c4fce135490fadc6318602595b0e9bed87d1b378248ad SHA512 aebd50df763aea536d19085c80772eee96366f2d169ed956e0100df3bd307f60a908d6667da9c729666ae8088806f01dcdf8f1d6f083316ebb4da40a7ad81477
diff --git a/dev-vcs/svneverever/metadata.xml b/dev-vcs/svneverever/metadata.xml
index d5bce3870f40..faa26c1dea35 100644
--- a/dev-vcs/svneverever/metadata.xml
+++ b/dev-vcs/svneverever/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">hartwork/svneverever</remote-id>
+		<remote-id type="pypi">svneverever</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/svneverever/svneverever-1.5.0.ebuild b/dev-vcs/svneverever/svneverever-1.5.0.ebuild
deleted file mode 100644
index d1149df182b6..000000000000
--- a/dev-vcs/svneverever/svneverever-1.5.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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}]
-	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-vcs/svneverever/svneverever-1.6.0.ebuild b/dev-vcs/svneverever/svneverever-1.6.0.ebuild
deleted file mode 100644
index ab9b0424d609..000000000000
--- a/dev-vcs/svneverever/svneverever-1.6.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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}]"
diff --git a/dev-vcs/svneverever/svneverever-1.7.1-r1.ebuild b/dev-vcs/svneverever/svneverever-1.7.1-r3.ebuild
index aeea6a31b84a..deef0b7db965 100644
--- a/dev-vcs/svneverever/svneverever-1.7.1-r1.ebuild
+++ b/dev-vcs/svneverever/svneverever-1.7.1-r3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
 
diff --git a/dev-vcs/svneverever/svneverever-1.7.1.ebuild b/dev-vcs/svneverever/svneverever-1.7.1.ebuild
deleted file mode 100644
index ab9b0424d609..000000000000
--- a/dev-vcs/svneverever/svneverever-1.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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}]"