diff --git a/dev-python/cffsubr/Manifest b/dev-python/cffsubr/Manifest
index 98aba92a6f..c9dc814692 100644
--- a/dev-python/cffsubr/Manifest
+++ b/dev-python/cffsubr/Manifest
@@ -1 +1 @@
-DIST cffsubr-0.2.9_p1.gh.tar.gz 124635 BLAKE2B c040339d113247b34195d7b7a220b449810ced52ffeea209bde2bb871c964a1da7d734c7167ece88ade03b26e722dca7f235a70326ff8c9b268b707ba5730a79 SHA512 8f1ea1fb732b772c1ac479883df6993ff2d56457c725d621bb1ebebf7a27393bb96771b9db8364513ae7f815bc74da15dd8c22695eeaf6f65d8dc62c8ae947dc
+DIST cffsubr-0.2.9.post1.tar.gz 12671095 BLAKE2B 6805fa9adaabee7236abb351b23437248c93a9a9c1f64363ca023cbe1371dd0a612e0b5823f3064c0979cb9a9ee0442a6219952ffd2384ab444a28987f416a3f SHA512 8c83001010951990d4e0dcecd1820e0f469042518c63cf82b66425c383b640f525f253b10f16ad587e9492a9aed070715d776d909ab4e897c99a22a7678f38a7
diff --git a/dev-python/cffsubr/cffsubr-0.2.9_p1.ebuild b/dev-python/cffsubr/cffsubr-0.2.9_p1.ebuild
index 94a3b83f98..9cfdc74445 100644
--- a/dev-python/cffsubr/cffsubr-0.2.9_p1.ebuild
+++ b/dev-python/cffsubr/cffsubr-0.2.9_p1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
-MY_PV="${PV/_p/.post}"
 DESCRIPTION="Standalone CFF subroutinizer based on AFDKO tx tool"
-HOMEPAGE="https://github.com/adobe-type-tools/cffsubr"
-SRC_URI="https://github.com/adobe-type-tools/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
+HOMEPAGE="
+	https://pypi.org/project/cffsubr/
+	https://github.com/adobe-type-tools/cffsubr
+"
 
 KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
@@ -21,9 +21,6 @@ RDEPEND="
 	>=dev-python/fonttools-4.10.2[${PYTHON_USEDEP}]
 	>=dev-util/afdko-3.6.1[${PYTHON_USEDEP}]
 "
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-system_tx.diff"
@@ -32,13 +29,9 @@ PATCHES=(
 
 distutils_enable_tests pytest
 
-pkg_setup() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
-}
-
 src_prepare() {
-	default
-
 	# remove bundled afdko
 	rm -rf external || die
+
+	distutils-r1_src_prepare
 }
diff --git a/dev-python/cffsubr/files/cffsubr-0.2.8-fix-setup-py.patch b/dev-python/cffsubr/files/cffsubr-0.2.8-fix-setup-py.patch
deleted file mode 100644
index 2d429c2b84..0000000000
--- a/dev-python/cffsubr/files/cffsubr-0.2.8-fix-setup-py.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/setup.py
-+++ b//setup.py
-@@ -135,7 +135,6 @@
-     platforms=["posix", "nt"],
-     package_dir={"": "src"},
-     packages=find_packages("src"),
--    ext_modules=[tx],
-     zip_safe=False,
-     cmdclass=cmdclass,
-     install_requires=[
-@@ -145,7 +144,6 @@
-     setup_requires=[
-         "setuptools_scm",
-         # finds all git tracked files including submodules when making sdist MANIFEST
--        "setuptools-git-ls-files",
-     ],
-     extras_require={"testing": ["pytest"]},
-     python_requires=">=3.6",