diff --git a/dev-python/libversion/Manifest b/dev-python/libversion/Manifest
index 27278b9..f80f902 100644
--- a/dev-python/libversion/Manifest
+++ b/dev-python/libversion/Manifest
@@ -1,4 +1,4 @@
-DIST libversion-1.2.4.tar.gz 8389 BLAKE2B 998b1a1d1e1666a239f21a9bf84c0ec89b80fa7cb4ae0e7fb773131e561d4598f01e232451201ae06e8aeb0efad89c2ce6661e3f7f14212d564924818ca90d7f SHA512 ab78e65182c6475a174eb31836dcc83c915cb584ebb8dc82a6690d3ee44d77bedae28809648b5c38df640f7fe815a2aadc7954c193e9e0712dc35cbc1d7cd8b2
-EBUILD libversion-1.2.4.ebuild 732 BLAKE2B d4eed2eb2b39896552f9030422a4cb2d421fba3fbea84c2875195ee0d61cd99fef528c17e272d8e2da65626a2095f79ba94fbaa56503c8fb042d5f87c252235f SHA512 2912acb987f274cce26e857375064a34c0872bdedfcb927e6524cdbaae7e32948b42611fc1913c6943d974f97f17f4bf6b498ea97defe5ee6c0567c58f8dad52
-EBUILD libversion-9999.ebuild 732 BLAKE2B d4eed2eb2b39896552f9030422a4cb2d421fba3fbea84c2875195ee0d61cd99fef528c17e272d8e2da65626a2095f79ba94fbaa56503c8fb042d5f87c252235f SHA512 2912acb987f274cce26e857375064a34c0872bdedfcb927e6524cdbaae7e32948b42611fc1913c6943d974f97f17f4bf6b498ea97defe5ee6c0567c58f8dad52
+DIST libversion-1.2.4.gh.tar.gz 8389 BLAKE2B 998b1a1d1e1666a239f21a9bf84c0ec89b80fa7cb4ae0e7fb773131e561d4598f01e232451201ae06e8aeb0efad89c2ce6661e3f7f14212d564924818ca90d7f SHA512 ab78e65182c6475a174eb31836dcc83c915cb584ebb8dc82a6690d3ee44d77bedae28809648b5c38df640f7fe815a2aadc7954c193e9e0712dc35cbc1d7cd8b2
+EBUILD libversion-1.2.4.ebuild 722 BLAKE2B 4ecfb2890f5ce2d8a8904a1f66d47c371b038c3f6bcf3d448503b0348b2f188943cd11a98899a11785419ad06ba8edf558c8cbad7c93ea3b1df8967bb830d603 SHA512 1e6c40dedb173f583eaa0b4408982f73a4314318c6f4631c5c0e50a5beb170165f66195ed8eb6f23e54d240842da5fb53f72e9bcea4d024bf15dc2fd2d47610f
+EBUILD libversion-9999.ebuild 722 BLAKE2B 4ecfb2890f5ce2d8a8904a1f66d47c371b038c3f6bcf3d448503b0348b2f188943cd11a98899a11785419ad06ba8edf558c8cbad7c93ea3b1df8967bb830d603 SHA512 1e6c40dedb173f583eaa0b4408982f73a4314318c6f4631c5c0e50a5beb170165f66195ed8eb6f23e54d240842da5fb53f72e9bcea4d024bf15dc2fd2d47610f
 MISC metadata.xml 444 BLAKE2B 25dcf0d1d70855de030396f950f627b6d0eceddd5317c43762c9d5fb81039982ba33c5c7efccbcbe4138b0513c81e296f89d5c2df2c1572026bc1b5f5233e23d SHA512 78b640f4ccf51b3fa36d2d329135239e0c8090cd5150f1e84ef6cefb36f8b91ac615415eb4ee95d60077dda7f8eb3b084e24baa83f521b69c29dfe3dbae3186d
diff --git a/dev-python/libversion/libversion-1.2.4.ebuild b/dev-python/libversion/libversion-1.2.4.ebuild
index f66745f..9fa79ae 100644
--- a/dev-python/libversion/libversion-1.2.4.ebuild
+++ b/dev-python/libversion/libversion-1.2.4.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{6..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
-if [[ ${PV} != *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/repology/py-libversion.git"
+else
 	MY_PN="py-${PN}"
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/repology/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/repology/${MY_PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/repology/py-libversion.git"
 fi
 
 DESCRIPTION="Python bindings for libversion"
diff --git a/dev-python/libversion/libversion-9999.ebuild b/dev-python/libversion/libversion-9999.ebuild
index f66745f..9fa79ae 100644
--- a/dev-python/libversion/libversion-9999.ebuild
+++ b/dev-python/libversion/libversion-9999.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{6..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
-if [[ ${PV} != *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/repology/py-libversion.git"
+else
 	MY_PN="py-${PN}"
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/repology/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/repology/${MY_PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/repology/py-libversion.git"
 fi
 
 DESCRIPTION="Python bindings for libversion"