3 files changed, 17 insertions, 52 deletions
diff --git a/dev-python/cu2qu/Manifest b/dev-python/cu2qu/Manifest
index ac22d15d4cc6..bb189e752a90 100644
--- a/dev-python/cu2qu/Manifest
+++ b/dev-python/cu2qu/Manifest
@@ -1,2 +1 @@
-DIST cu2qu-1.6.7.post1.zip 136959 BLAKE2B 9b1ffbe234177794b0c3726c8959351e614d2e9a03e5b95e462beacaa2a6ba2932732b92e32d2dd91a712c6b73beeeab50f143b6d4248073975a057dc20dd1eb SHA512 a0dbed28403ae2bbdbf4719d9e34d5861250dc1510129d658b336d773a5153e0955d5f2ff018f5f93d88394658918fad2a58aebb99cef998d4cf9128a300f489
-DIST cu2qu-1.6.7.zip 215819 BLAKE2B 328df385c459f82805eaa9483ccf49ab1faae2f4a878381d2a7fd1e2be01d15f55eb5f2afabc1a0487d3bed4ae407cc2042989bc820620bd1ac0b33f95d441bc SHA512 929d353cf8ef6f989cd373c49ba77082cfdd35edce6aafa1c13d983782562a16245d75d086d3a7e28dd217bda6c19d50966a4fb1ce50d5a0397eb1304816a28f
+DIST cu2qu-1.6.7.post2.zip 136950 BLAKE2B d6835a7a1b978e7ef22ff6daf6284965be8b0f60386dd7483dbafbe89e7320f3803f183cc2e859974c18f812405ebd515097e634a153d05a2d317f7df197473d SHA512 63969b31945c5e66c8bbe92650e73fd4824cf6b65252cbe1c0219a4ac34358a998ec1669f9a297a9540b02e161fb0768a2cce88991a6cc00c1d5dd9b80f99049
diff --git a/dev-python/cu2qu/cu2qu-1.6.7-r1.ebuild b/dev-python/cu2qu/cu2qu-1.6.7-r1.ebuild
deleted file mode 100644
index 13cbd272fed0..000000000000
--- a/dev-python/cu2qu/cu2qu-1.6.7-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Cubic-to-quadratic bezier curve conversion"
-HOMEPAGE="https://github.com/googlefonts/cu2qu"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/fonttools-3.32[${PYTHON_USEDEP}]
-	>=dev-python/defcon-0.6.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	app-arch/unzip
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/fs[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cu2qu/cu2qu-1.6.7_p1.ebuild b/dev-python/cu2qu/cu2qu-1.6.7_p2.ebuild
index 85a0ab067e39..bcc8141dd3de 100644
--- a/dev-python/cu2qu/cu2qu-1.6.7_p1.ebuild
+++ b/dev-python/cu2qu/cu2qu-1.6.7_p2.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
-MYPV="${PV/_p/.post}"
-MYP="${PN}-${MYPV}"
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 optfeature pypi
 
 DESCRIPTION="Cubic-to-quadratic bezier curve conversion"
-HOMEPAGE="https://github.com/googlefonts/cu2qu"
-SRC_URI="mirror://pypi/${MYP:0:1}/${PN}/${MYP}.zip"
-S="${WORKDIR}/${MYP}"
+HOMEPAGE="
+	https://pypi.org/project/cu2qu/
+	https://github.com/googlefonts/cu2qu
+"
+SRC_URI="$(pypi_sdist_url "${PN}" "$(pypi_translate_version "${PV}")" .zip)"
 
 LICENSE="Apache-2.0"
 KEYWORDS="~amd64"
@@ -21,22 +20,20 @@ SLOT="0"
 
 RDEPEND="
 	>=dev-python/fonttools-3.32[${PYTHON_USEDEP}]
-	>=dev-python/defcon-0.6.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
+	<dev-python/fs-3[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	app-arch/unzip
 	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/fs[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	export CU2QU_WITH_CYTHON=1
-	distutils-r1_src_prepare
+src_configure() {
+	CU2QU_WITH_CYTHON=1
+}
+
+pkg_postinst() {
+	optfeature "cli support" dev-python/defcon
 }