Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-02-28 09:15:11 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-02-28 09:15:11 +0000
commit: 628a0a1b76f8b7b08c8286a429bd1371f790e421 (patch)
tree: e48540e8fbcb44536694fa701814ca0538e16d69 /dev-python
parent: 22f877e87a316dd892787c57f205a45abe8ae144 (diff)
download: baldeagleos-repo-628a0a1b76f8b7b08c8286a429bd1371f790e421.tar.gz
baldeagleos-repo-628a0a1b76f8b7b08c8286a429bd1371f790e421.tar.xz
baldeagleos-repo-628a0a1b76f8b7b08c8286a429bd1371f790e421.zip
143 files changed, 1725 insertions, 1027 deletions
diff --git a/dev-python/MutatorMath/Manifest b/dev-python/MutatorMath/Manifest
index fc02a1687782..40ad3235a14e 100644
--- a/dev-python/MutatorMath/Manifest
+++ b/dev-python/MutatorMath/Manifest
@@ -1 +1 @@
-DIST MutatorMath-3.0.1.gh.tar.gz 234416 BLAKE2B 999b0fb3c5cca8252fc27efa099e5046d17604b77a38322fd3a13b7e96d7b6ac123dafe75f3a295e908ec8891e5342df319c7faca3612d953849895e8c99f17a SHA512 a1be360c866783543b375872a406eb61ac41ce21a6fd7c9b8d349758525c998d7d2613ad55208a5f8709a81c0ea8ea7e4bad76f0a554e8ce8e62aa6c9a00bbb5
+DIST MutatorMath-3.0.1.zip 421722 BLAKE2B bfa6f796ac0b67f2c8d22bdca9f1dfbcebe9b8185778563c1c67c5e8a5748cf0462e06d9e58dc5ea49e5986f9faeabb9310ce775281f9ee888262047b0f87dea SHA512 9f0af87f4811b27dd3b0e791a230fe0fa1e90e9605673d8753fb3966155483a37fd126646e4deeae79233e8ecc22ee042ae5f985a1bdc5e2696997eff444b801
diff --git a/dev-python/MutatorMath/MutatorMath-3.0.1-r1.ebuild b/dev-python/MutatorMath/MutatorMath-3.0.1-r2.ebuild
index 598ad17d34e3..5406a779ede0 100644
--- a/dev-python/MutatorMath/MutatorMath-3.0.1-r1.ebuild
+++ b/dev-python/MutatorMath/MutatorMath-3.0.1-r2.ebuild
@@ -1,15 +1,19 @@
-# 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_{7,8,9,10,11} )
-
-inherit distutils-r1
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A library for piecewise linear interpolation in multiple dimensions"
-HOMEPAGE="https://github.com/LettError/MutatorMath"
-SRC_URI="https://github.com/LettError/MutatorMath/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://pypi.org/project/MutatorMath/
+	https://github.com/LettError/MutatorMath
+"
+SRC_URI="$(pypi_sdist_url --no-normalize ${PN} ${PV} .zip)"
 
 KEYWORDS="~amd64"
 LICENSE="BSD"
@@ -20,12 +24,13 @@ RDEPEND="
 	dev-python/fontMath[${PYTHON_USEDEP}]
 	>=dev-python/fonttools-3.32[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
 BDEPEND="
+	app-arch/unzip
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/unicodedata2[${PYTHON_USEDEP}]
+		>=dev-python/unicodedata2-15.0.0[${PYTHON_USEDEP}]
 	)
 "
 
+DOCS=( Docs README.rst )
+
 distutils_enable_tests setup.py
diff --git a/dev-python/WSME/Manifest b/dev-python/WSME/Manifest
deleted file mode 100644
index 45e23f278532..000000000000
--- a/dev-python/WSME/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST WSME-0.11.0.tar.gz 89863 BLAKE2B 3dfb9bbb2cce48eca47ec2498db8f69f1a4e9466cd6370f49fe874d640c244ae2e9cddbba1f3f5e1701612c80baaa2d3dd3f3a1309c9559c9da3b5f8dbdf4919 SHA512 5bbf2179a7efa413981ffcb360868875a1283a9cfde02626eb715fe9c61ff05367c62a346011a6d681b8c269c18e115e763f7bf589b456ec81a707bd102f913e
diff --git a/dev-python/WSME/WSME-0.11.0.ebuild b/dev-python/WSME/WSME-0.11.0.ebuild
deleted file mode 100644
index 38e08e22bce7..000000000000
--- a/dev-python/WSME/WSME-0.11.0.ebuild
+++ /dev/null
@@ -1,44 +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="Simplify the writing of REST APIs, and extend them with additional protocols"
-HOMEPAGE="
-	https://opendev.org/x/wsme
-	https://pypi.org/project/WSME/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/webob-1.8.0[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/pbr[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/transaction[${PYTHON_USEDEP}]
-		dev-python/pecan[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/flask-restful[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
diff --git a/dev-python/WSME/metadata.xml b/dev-python/WSME/metadata.xml
deleted file mode 100644
index 60bbd48b0274..000000000000
--- a/dev-python/WSME/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>lssndrbarbieri@gmail.com</email>
-  <name>Alessandro Barbieri</name>
-  <description>co-maintainers welcome</description>
- </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
- <stabilize-allarches/>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/asyncmy/Manifest b/dev-python/asyncmy/Manifest
index 4efaa7ade62d..aebae1111c12 100644
--- a/dev-python/asyncmy/Manifest
+++ b/dev-python/asyncmy/Manifest
@@ -1 +1,2 @@
 DIST asyncmy-0.2.5.gh.tar.gz 136467 BLAKE2B 1d5f687a5044653f00653d1b07129fdcb8465b7739e9d9d4b7481fbe3f406f0191c0642d46329e3639c8024a89ff70b8417bd26cdeaf804e278256e0bbb03eef SHA512 6777ccb9be483e2af996e3c814cb00a8db3b5d360c5543224265fd28c851bde4dfa9b81930c7928c10714f9ebed9134b1b5cc72f07c633fbb6eb4add7a10915d
+DIST asyncmy-0.2.7.gh.tar.gz 141090 BLAKE2B a16aa12dd68d7e7af36f854b0c05e03870c09087b85cd4154df30b2353fa1e6863def03e07873211594b5dce726b0ea18ceb796503cec83e62ebda9276498a40 SHA512 570add3f83088ed970305af26b17b639aed1954872f52310a4c24a588ce705481203ad5f0e82084d9d6a24a34913bc396b279c57c4b7b715ff2ef4840bc619c9
diff --git a/dev-python/asyncmy/asyncmy-0.2.7.ebuild b/dev-python/asyncmy/asyncmy-0.2.7.ebuild
new file mode 100644
index 000000000000..767ac17c5275
--- /dev/null
+++ b/dev-python/asyncmy/asyncmy-0.2.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_REQ_USE="ssl"
+DISTUTILS_USE_PEP517=poetry
+inherit databases distutils-r1 optfeature
+
+DESCRIPTION="A fast asyncio MySQL driver"
+HOMEPAGE="
+	https://pypi.org/project/asyncmy/
+	https://github.com/long2ice/asyncmy
+"
+SRC_URI="https://github.com/long2ice/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+TEST_S="${S}_test"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		$(emysql --get-depend)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+
+	cp -a "${S}" "${TEST_S}" || die
+	rm -r "${TEST_S}"/asyncmy || die
+}
+
+src_test() {
+	emysql --start
+	local sockfile=$(emysql --get-sockfile)
+
+	local myargs=(
+		--user=root
+		--socket="${sockfile}"
+		--silent
+		--execute="ALTER USER 'root'@'localhost' IDENTIFIED BY '123456';"
+	)
+
+	ebegin "Changing database password"
+	mysql "${myargs[@]}"
+	eend $? || emysql --die "Changing database password failed"
+
+	distutils-r1_src_test
+	emysql --stop
+}
+
+python_test() {
+	cd "${T}" || die
+	epytest "${TEST_S}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	find "${ED}"/usr/lib -name '*.md' -delete || die
+	find "${ED}"/usr/lib -name LICENSE -delete || die
+}
+
+pkg_postinst() {
+	optfeature "sha256_password and caching_sha2_password auth methods" dev-python/cryprography
+}
diff --git a/dev-python/auditok/auditok-0.2.0.ebuild b/dev-python/auditok/auditok-0.2.0.ebuild
index c8e45f30dc30..4b0a09e32787 100644
--- a/dev-python/auditok/auditok-0.2.0.ebuild
+++ b/dev-python/auditok/auditok-0.2.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 12a352f19925..1e4edc098426 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,2 +1,3 @@
 DIST aws-sam-translator-1.58.1.gh.tar.gz 1151817 BLAKE2B a3ba2cc304e25a5d527fdef793deb232c1852ceda51df1bfe75ccbe150c8b08d8dfebfa1933f1722e20cecad6f88af596bbeffd203fce7855c3faaaee2f434bf SHA512 341d6346f7daaab3713962613a89b53d0e852d274222e408d9f314a01ec55fa1bc4ac0111bab54ab802caaa956923f0504c2bf620f06073a85c70c8fa28d15ad
 DIST aws-sam-translator-1.59.0.gh.tar.gz 1688806 BLAKE2B 66e63f5d008b120d95b2258552ba7ea531b6dc2d0090360c3777bcac167f95a0167cf200a8b29d798699e87a060befee71f7e8316ed395eded073960b4f1a18b SHA512 558b5dfe586c0badb7b5b5f35a6b841ffe94f2e6fb68acf7c492529abfe3756760fc5d8cdb16550ebbc47671fa12e09620b445d086f008d05f80606710ec67a9
+DIST serverless-application-model-1.60.0.gh.tar.gz 4600046 BLAKE2B 8a73c303389930fcee728cfe2d5829a6dab7bd8491722b5416ea28db4504eff710da97f91e054fc53b631128783e54dd9071f5e0d6fdd194bf72796555850c9f SHA512 543f2f7a3bbaace552dd954c28d61633f4315e251e426dac2acdef91b4e82c102e1108b54f67cd45efe41d1827b0287bf5752e8411abeb252a2367bfb5536ae3
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.60.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.60.0.ebuild
new file mode 100644
index 000000000000..2fa677eb180f
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.60.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=serverless-application-model-${PV}
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# so much noise...
+	sed -i -e '/log_cli/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AWS_DEFAULT_REGION=us-east-1
+	epytest -o addopts=
+}
diff --git a/dev-python/beziers/beziers-0.4.0-r1.ebuild b/dev-python/beziers/beziers-0.4.0-r1.ebuild
deleted file mode 100644
index bc5cd466564b..000000000000
--- a/dev-python/beziers/beziers-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Python bezier manipulation library"
-HOMEPAGE="https://github.com/simoncozens/beziers.py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pyclipper[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/shapely[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-python/dotmap[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-no-install-tests.patch" )
-
-distutils_enable_tests pytest
diff --git a/dev-python/beziers/beziers-0.4.0-r2.ebuild b/dev-python/beziers/beziers-0.4.0-r2.ebuild
new file mode 100644
index 000000000000..4ef729e5a464
--- /dev/null
+++ b/dev-python/beziers/beziers-0.4.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Bezier curve manipulation library"
+HOMEPAGE="
+	https://pypi.org/project/beziers/
+	https://github.com/simoncozens/beziers.py
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="dev-python/pyclipper[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/dotmap[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.4.0-no-install-tests.patch" )
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "alpha_shape support" "dev-python/numpy dev-python/scipy dev-python/shapely"
+	optfeature "brush support" dev-python/shapely
+	optfeature "pen protocol support" dev-python/fonttools
+	optfeature "plot support" dev-python/matplotlib
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index f52714e53694..3aa651fc728b 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,2 +1,3 @@
 DIST boto3-1.26.74.gh.tar.gz 602525 BLAKE2B 6d9b397864649ecd9b3f46bcee832c57cdce809545522f3beaf0d2eb98ca1f99e5fcab132f3389a4b2edcd585d9f6759de961b1f83f5912420629b6b03092c36 SHA512 eba11711dbd77988deb1695b954b6eb931b8ad49f96971e221415355de9bd2f3015b5a58be34a7378180f59500f9c15135192ccb97454141dbcaa664f0183627
 DIST boto3-1.26.79.gh.tar.gz 605312 BLAKE2B c36b86ab289be9c08a1ab43274a4f4db71cede08598b6f8092af8404bc9994e345b263b144ee3a1974ea276fce63c330d7ffa6335bb889bea32e380e9003a8c7 SHA512 cfc789296b904c0c3bd3999153067f4fb174b323f0fbd22e8f4a49aed98338e20fd238876e2f55f608f5d6b60b584e15d370400e8d0a8a00b0689e0867d00f05
+DIST boto3-1.26.80.gh.tar.gz 606204 BLAKE2B ae80c1ec7e99f48844c4eec39df1f6802df1fbbf2d94f1b7ddc04c7a21cb885823ebadb11cf9e81b51af9aa5f09775c02e52e926b94c49331307873b86702446 SHA512 e4ab89f2afe506d7d1ba9e1615e3a92ba4bf5dc9a85d3a14f034c1b14733d99cebf594bb6dc80914bf444da34d09c045c8933cf3c97e6ccfa9e31901e99d76ee
diff --git a/dev-python/boto3/boto3-1.26.80.ebuild b/dev-python/boto3/boto3-1.26.80.ebuild
new file mode 100644
index 000000000000..9523f65d5fb9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.80.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index df786de31aec..e852f0fe5415 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,2 +1,3 @@
 DIST botocore-1.29.74.gh.tar.gz 11153254 BLAKE2B b3d3b75643cd5e3fac54a09e971daa23a043ba9f7ab773c2fd57dc15417c1b30c6f503515bad8734332bc40c4210e4ac09566c0742649c6ac3592e81ae9f8d79 SHA512 944ebbf1268fa9e8bb68ce5960da347613bcab585bf54c2fd6dbecb499088c1dc426357cde0a0f0d1780ecbc06acc33d8587f37c7f3d13577283b4549a353406
 DIST botocore-1.29.79.gh.tar.gz 11184048 BLAKE2B 062326a477fb27844ec47af28b77424863d6ff407dbcfd95bc9aa26d4009f503364f3d438997fe437b4830b8ef8c7bfb7e026313364bb3e9429cd3b7c2eae261 SHA512 260cf6a533e32c6f514774e5c5ef6830feb77058e1074e730d7fa05fb7067dac093f1a612ed11e02db116671ca9f7301ed29e1625f6e47724301d25b03eb3c30
+DIST botocore-1.29.80.gh.tar.gz 11197756 BLAKE2B 62f70c71f6b5892ff4daaede65389c75a159ebc29da69b2b2f9b59fabcf1818d91b968cbb04f48acce8310f34b96dbb30189c1fdc609e124202a6743d5b3e65a SHA512 27f31ba27448c5ea3214dcd585d60901761f6cd26e384a861aa377842dd3561f293c261a6a3fd91e78cc3ea75f48b9369e77f4a8d1a4b4dd08fbdde9335ee5a8
diff --git a/dev-python/botocore/botocore-1.29.80.ebuild b/dev-python/botocore/botocore-1.29.80.ebuild
new file mode 100644
index 000000000000..0f4daaa48e81
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.80.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cairocffi/cairocffi-1.4.0.ebuild b/dev-python/cairocffi/cairocffi-1.4.0.ebuild
index 6b8664c41c31..de102169949e 100644
--- a/dev-python/cairocffi/cairocffi-1.4.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.4.0.ebuild
@@ -4,16 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
-inherit distutils-r1 virtualx
+inherit distutils-r1 pypi virtualx
 
 DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
 HOMEPAGE="
 	https://github.com/Kozea/cairocffi/
 	https://pypi.org/project/cairocffi/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 35fa0f6f5eaf..709d786d40cc 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -2,3 +2,4 @@ DIST cfn-lint-0.72.10.gh.tar.gz 3252485 BLAKE2B 34290170b4620f2f094d96ebb41cb9e5
 DIST cfn-lint-0.72.9.gh.tar.gz 3239001 BLAKE2B 935d07e58d12a7b95bb589523a9ef49c9f508386d58384e7b391442ef02e304e583d687fce0f8faf892049525d6e621670061ab96a124229de7fc94df3e3533e SHA512 bf83e4146d4f2951e670c07a3a0bb3ab212881af9687c16244cade18bac101468c35532516731f66a80708312a9ee33bc531be9a6b7fab671bf54d596886a523
 DIST cfn-lint-0.73.1.gh.tar.gz 3337094 BLAKE2B 0fd3ac1116f8d38ebc4eef04bca5a6f6970c270682941a820240180d5eaa5908a8320e4e2adb0f29fe132dd56215fb42377435099a3ccb95697cc2caaa391794 SHA512 efdc54f983f9b7200ee725a844a9d83674309c080fb62c63e02430eb81c2992c4232a42bbe34d7b7f4ecc5097403bd9d8bf55806876f83e4ba3993e62597b675
 DIST cfn-lint-0.73.2.gh.tar.gz 3343513 BLAKE2B 48ec085ec1d4c6fcee57d44915b65760481cd753805de3817c63aa093480aef15c81583cfa5f61f62407002c0d82cb9f36f146afffcc6f30dc0043f4f6fa991b SHA512 f85909cefb0882d4b36c26542c9ec65af520797e25b849bdbeb2e7e18b4f1675f0ede1b7cb19c529d8d393345ed48d98cc67e7e5d752790c3d9829bd6d69c052
+DIST cfn-lint-0.74.0.gh.tar.gz 3633749 BLAKE2B 68ba32c66a6cc4ddf1260523679565e7074e159c1d63b8e408a40426e0c3e7ec60159075b8dc91bb40d2fbdb8fb5a5fd55c0f70d02c165900a64a0d032285492 SHA512 635621995b74068ec2be9fcda0b710ab975e8aea428317d254fd6e93b2602071b985a6d80c12321b8245c2569b84b6c7c46e4cacfd59f0d0e21926ad6782e2f0
diff --git a/dev-python/cfn-lint/cfn-lint-0.74.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.74.0.ebuild
new file mode 100644
index 000000000000..5d67809f6acd
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.74.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.59.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/commandlines/commandlines-0.4.1.ebuild b/dev-python/commandlines/commandlines-0.4.1-r1.ebuild
index 029794e60cdb..72c8ee90cee9 100644
--- a/dev-python/commandlines/commandlines-0.4.1.ebuild
+++ b/dev-python/commandlines/commandlines-0.4.1-r1.ebuild
@@ -1,22 +1,25 @@
-# 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_{7,8,9,10,11} pypy3 )
-
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Routines for extracting information from fontTools glyphs"
 HOMEPAGE="
 	https://commandlines.github.io
+	https://pypi.org/project/commandlines/
 	https://github.com/chrissimpkins/commandlines
 "
-SRC_URI="https://github.com/chrissimpkins/commandlines/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/chrissimpkins/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 KEYWORDS="~amd64"
 SLOT="0"
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
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
 }
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index 5a9dc4704f75..94e9acdf9a27 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,2 +1,2 @@
 DIST cx_Freeze-6.13.1.gh.tar.gz 1486207 BLAKE2B aa0151fed482714e41a859059f9672950249ad7fe50fa2accaa9d6af7ddc183a8f74d87337f274849a34a404dda0c732300343b58cd872f3bd03bf275c2f4d97 SHA512 48d569fdce5c6cb100232ce3577f0a55a40f3d1dcafa884a4d62af7f27200a21eb892504b47fb7cd106f410354b70d98a8e5245382431bc1f6d990510c77cb36
-DIST cx_Freeze-6.14.2.gh.tar.gz 1647508 BLAKE2B 7b14a75a21dbeb360c61609e9ac018c6e8bba6ffb357781cc2d8d27cd3cc27e054587845d117ce25912cd57b3fe83c037e5b76f55cd593890f66056ff18039df SHA512 40158afb0e2291c4a2f161eb2ef733fc8a2107c620dcf87f812bb0f6b81bfd06e3ec1b4108333c7d43a4855605621745395e765a825a68f3dd62b3edc21fc3c3
+DIST cx_Freeze-6.14.5.gh.tar.gz 1648095 BLAKE2B 81707d17c2118a8db4d768b2fbe83278c6b01509a5a1d3e7f3a41efaa29607fc4b254e9d545a4697b77d4932100f344a8013ac59084bb74d97d1b12cb927ec6e SHA512 52233a138da3250e97668a5c225e78b864bebaa43ea2b30de01af2de7739f48a25030e10d36ccec609240822de308ad030eaa26c2ede8b29318d2b30647cf1c8
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.14.2.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
index 3ef0f7762c5d..333d03572485 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.14.2.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
@@ -55,3 +55,7 @@ EPYTEST_DESELECT=(
 	# new setuptools?
 	tests/test_command_bdist_rpm.py::test_bdist_rpm
 )
+EPYTEST_IGNORE=(
+	# windows-specific test
+	tests/test_winversioninfo.py
+)
diff --git a/dev-python/dateparser/Manifest b/dev-python/dateparser/Manifest
index 381b32fe86ec..17dcfcb6d04d 100644
--- a/dev-python/dateparser/Manifest
+++ b/dev-python/dateparser/Manifest
@@ -1,2 +1,2 @@
-DIST dateparser-1.1.5.tar.gz 295364 BLAKE2B ab34dc41a3602df7b4cf448f4fd0be410b514e5e02d252f911019be1ac6092fc1ac1ddf58ed6ae349958691f67817974bda95e7266d82127a1beebfbf28100fa SHA512 0a2ea4a8a4b580ed8f0939b3bc7175fa40bc37df1469711ce2b802bc24a8b45484f8c5f6b9297a8343c1fbe281892e6521b19c35468305d8ba7e584e444a7bf2
 DIST dateparser-1.1.6.tar.gz 295659 BLAKE2B fbdb31ecbe48ef3b27eb283fe590b49a03ebbcca9402846e1f18f70052d5339fbfd5bc3f92dd6b4888e185ccd3ccf538e845dff320c2fa16a3cd560aba7faa87 SHA512 5f9eb6c85bb221a61ab30b274a73572e199e930298c30b438bec12511c677c272d9a778458b99f291eb8636ee1d797b90260fef66ae6c480018eca80b23b162a
+DIST dateparser-1.1.7.tar.gz 295818 BLAKE2B 11bb07f6c3c46a5e19111715a8801b8789d7f1fd0fd407232a071ddd40b337153dce3b42197f3a2fd8081c505f4418abb3ff265e25641a95eed31575c6ad2a70 SHA512 d333fa2007c069f7424def9694544767a8885eec5d476e9dd73605754fd53f5a9dbbeb19f24291ac6c6ffa09b4014a3135ad8fbabadae1655c78a8d5fe36f907
diff --git a/dev-python/dateparser/dateparser-1.1.5.ebuild b/dev-python/dateparser/dateparser-1.1.7.ebuild
index dd8cafadfd3e..14902d676004 100644
--- a/dev-python/dateparser/dateparser-1.1.5.ebuild
+++ b/dev-python/dateparser/dateparser-1.1.7.ebuild
@@ -5,11 +5,13 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 optfeature
+inherit distutils-r1 optfeature pypi
 
 DESCRIPTION="Date parsing library designed to parse dates from HTML pages"
-HOMEPAGE="https://github.com/scrapinghub/dateparser"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://pypi.org/project/dateparser/
+	https://github.com/scrapinghub/dateparser
+"
 
 LICENSE="BSD-4"
 SLOT="0"
diff --git a/dev-python/decopatch/decopatch-1.4.10.ebuild b/dev-python/decopatch/decopatch-1.4.10.ebuild
index 1711f808fc05..1701b95b29a4 100644
--- a/dev-python/decopatch/decopatch-1.4.10.ebuild
+++ b/dev-python/decopatch/decopatch-1.4.10.ebuild
@@ -7,8 +7,10 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 DISTUTILS_USE_PEP517=setuptools
 
 DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="dev-python/mkdocs-material"
-
+DOCS_DEPEND=(
+	dev-python/mkdocs-material
+	dev-python/regex
+)
 inherit distutils-r1 docs
 
 DESCRIPTION="Create decorators easily in python"
diff --git a/dev-python/dotmap/Manifest b/dev-python/dotmap/Manifest
index 0d06fae4db64..5ee4dfb26a22 100644
--- a/dev-python/dotmap/Manifest
+++ b/dev-python/dotmap/Manifest
@@ -1,2 +1 @@
-DIST dotmap-1.3.28.tar.gz 12097 BLAKE2B c172a3c4b8f4b10e2351d342cf38eed1ea8cac510eb4a66fa7df5660628fcf57056083af519f8360e78dce1d494185d2b09edfc7a4e7e604af658af15335fcc3 SHA512 9d16b1886884464cbe9df5d0af6426c869969767b9fee527cf108551d8f0d5d81f479d429350e31c89b9db2d3cc6d395945321f56688850dca7bfa2bbf273451
 DIST dotmap-1.3.30.tar.gz 12391 BLAKE2B f6e5713704d2f7c828c0a373174348900ebe39b72fd85456ed374a62f474c67e916b5956afeec246d8a6e9253b08c5e495c781d2915cecb38bee0d0b256810d2 SHA512 8e6d3e4419c3dbd1c0a3209dfc7bcda859bf547ab3fe88471c04a7f4c34219c9ca13b848788e6a24c6d3ece539f9ba0a16600f7941abdbd99c4e6d0badf4af27
diff --git a/dev-python/dotmap/dotmap-1.3.28.ebuild b/dev-python/dotmap/dotmap-1.3.28.ebuild
deleted file mode 100644
index 3da1da90fde7..000000000000
--- a/dev-python/dotmap/dotmap-1.3.28.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-#don't bump to python 3.10 until https://github.com/drgrib/dotmap/issues/76 is resolved
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Dot access dictionary with dynamic hierarchy creation and ordered iteration"
-HOMEPAGE="
-	https://github.com/drgrib/dotmap
-	https://pypi.org/project/dotmap/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-distutils_enable_tests unittest
diff --git a/dev-python/dotmap/dotmap-1.3.30.ebuild b/dev-python/dotmap/dotmap-1.3.30-r1.ebuild
index 2cd7433d9180..be07f303dfa2 100644
--- a/dev-python/dotmap/dotmap-1.3.30.ebuild
+++ b/dev-python/dotmap/dotmap-1.3.30-r1.ebuild
@@ -1,18 +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_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
 
 DESCRIPTION="Dot access dictionary with dynamic hierarchy creation and ordered iteration"
 HOMEPAGE="
-	https://github.com/drgrib/dotmap
 	https://pypi.org/project/dotmap/
+	https://github.com/drgrib/dotmap
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 KEYWORDS="~amd64"
diff --git a/dev-python/font-v/font-v-2.1.0-r1.ebuild b/dev-python/font-v/font-v-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..c4b2d3af3ea0
--- /dev/null
+++ b/dev-python/font-v/font-v-2.1.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 edo
+
+DESCRIPTION="Font version reporting and modification tool"
+HOMEPAGE="https://github.com/source-foundry/font-v"
+SRC_URI="https://github.com/source-foundry/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/fonttools[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-vcs/git )"
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
+
+src_unpack() {
+	default
+
+	# tests expect default git clone
+	mv "${WORKDIR}"/{${P},${PN}} || die
+}
+
+src_test() {
+	edo git init
+	edo git config --global user.email "larry@example.com"
+	edo git config --global user.name "Larry the Cow"
+	edo git add .
+	edo git commit -m "init"
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/font-v/font-v-2.1.0.ebuild b/dev-python/font-v/font-v-2.1.0.ebuild
deleted file mode 100644
index 5fb0ca54af36..000000000000
--- a/dev-python/font-v/font-v-2.1.0.ebuild
+++ /dev/null
@@ -1,41 +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="Font version string reporting and modification library"
-HOMEPAGE="https://github.com/source-foundry/font-v"
-SRC_URI="https://github.com/source-foundry/font-v/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/fonttools[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-vcs/git )"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-
-src_test() {
-	#it want a git repo
-	git init || die
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	git add . || die
-	git commit -m 'init' || die
-
-	#pure madness
-	#https://github.com/source-foundry/font-v/blob/e6746e4a045c99e56af661918c96259b1f444ed4/tests/test_utilities.py#L34
-	sed -e "s|\"font-v\"|\"${PWD##*/}\"|g" -i "tests/test_utilities.py" || die
-
-	python_foreach_impl python_test
-}
diff --git a/dev-python/fontMath/Manifest b/dev-python/fontMath/Manifest
index ae0ebc4b2c1a..af53b959b1fb 100644
--- a/dev-python/fontMath/Manifest
+++ b/dev-python/fontMath/Manifest
@@ -1 +1 @@
-DIST fontMath-0.9.2.gh.tar.gz 29835 BLAKE2B 0be37992c5009c5f0271da1cdfa464983e720f0b558b177b03abb5fa1f700f8171b40d39144e0976d815c33ba86e5bab90364502f3464cbab5cb18ad27cd88a8 SHA512 5305da4d688716a473b440114f37eb342eaf26d801c8c10361b8d98f84022f6da3afc112828b32a4286992d35b2f0075cad7a33086768f3e004b80fe59b0117e
+DIST fontMath-0.9.3.zip 39324 BLAKE2B 055c5336e2c393f2cd26be0a2c4177309c9b6888f70cc2a3e67cb0f26b785917f235305bbeeeba30afdb241015aa822c8f7537c73da0a649b559f3dbdde19737 SHA512 2249667be5f9d0ccfef8b68211c7b62b4a099c47505830481bfcad28ec7f162454c5e5fe9c5a3929180b8098406226e6d26e935c5a9b752a5e7ce86e13496234
diff --git a/dev-python/fontMath/fontMath-0.9.2.ebuild b/dev-python/fontMath/fontMath-0.9.2.ebuild
deleted file mode 100644
index d877f2897067..000000000000
--- a/dev-python/fontMath/fontMath-0.9.2.ebuild
+++ /dev/null
@@ -1,28 +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="A collection of objects that implement fast font math"
-HOMEPAGE="https://github.com/robotools/fontMath"
-SRC_URI="https://github.com/robotools/fontMath/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/fonttools-4.9[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
-}
diff --git a/dev-python/fontMath/fontMath-0.9.3.ebuild b/dev-python/fontMath/fontMath-0.9.3.ebuild
new file mode 100644
index 000000000000..18792f4f3cb4
--- /dev/null
+++ b/dev-python/fontMath/fontMath-0.9.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
+
+DESCRIPTION="A collection of objects that implement fast font math"
+HOMEPAGE="
+	https://pypi.org/project/fontMath/
+	https://github.com/robotools/fontMath
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${PN}" "${PV}" .zip)"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=dev-python/fonttools-3.32.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch b/dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch
new file mode 100644
index 000000000000..4a85cde3891e
--- /dev/null
+++ b/dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch
@@ -0,0 +1,34 @@
+url: https://github.com/fonttools/fonttools/issues/2996
+
+commit ca9d98d94c3ba98db934f0d1e3a77134171f2262
+Author: Jérôme Carretero <cJ-gentoo@zougloub.eu>
+Date:   Fri Feb 17 19:24:46 2023 -0500
+
+    Fixup pypy3 compatibility
+
+diff --git a/Lib/fontTools/misc/macCreatorType.py b/Lib/fontTools/misc/macCreatorType.py
+index 6b191054b..f680f238d 100644
+--- a/Lib/fontTools/misc/macCreatorType.py
++++ b/Lib/fontTools/misc/macCreatorType.py
+@@ -24,7 +24,7 @@ def getMacCreatorAndType(path):
+ 	"""
+ 	if xattr is not None:
+ 		try:
+-			finderInfo = xattr.getxattr(path, 'com.apple.FinderInfo')
++			finderInfo = xattr.getxattr(str(path), 'com.apple.FinderInfo')
+ 		except (KeyError, IOError):
+ 			pass
+ 		else:
+diff --git a/Lib/fontTools/subset/svg.py b/Lib/fontTools/subset/svg.py
+index 4ed2cbd20..4a8823928 100644
+--- a/Lib/fontTools/subset/svg.py
++++ b/Lib/fontTools/subset/svg.py
+@@ -77,7 +77,7 @@ def iter_referenced_ids(tree: etree.Element) -> Iterator[str]:
+ 
+         attrs = el.attrib
+         if "style" in attrs:
+-            attrs = {**attrs, **parse_css_declarations(el.attrib["style"])}
++            attrs = {**dict(attrs), **dict(parse_css_declarations(el.attrib["style"]))}
+         for attr in ("fill", "clip-path"):
+             if attr in attrs:
+                 value = attrs[attr]
diff --git a/dev-python/fonttools/fonttools-4.38.0-r1.ebuild b/dev-python/fonttools/fonttools-4.38.0-r1.ebuild
new file mode 100644
index 000000000000..86caeab956b1
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.38.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="
+	https://github.com/fonttools/fonttools/
+	https://pypi.org/project/fonttools/
+"
+SRC_URI="
+	https://github.com/fonttools/fonttools/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/fonttools-4.38.0-pypy3.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	export FONTTOOLS_WITH_CYTHON=1
+}
+
+src_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/http_ece/Manifest b/dev-python/http-ece/Manifest
index c958f55b267c..c22f0dae2165 100644
--- a/dev-python/http_ece/Manifest
+++ b/dev-python/http-ece/Manifest
@@ -1 +1 @@
-DIST http_ece-1.1.0.gh.tar.gz 19406 BLAKE2B 3347d318ac30c14d6d0b6149746c6dd8ad1681664c165a1dd89858cc50b04452db1576841280f44fe701ca0cb662dad6cbf4c44188b24dad9863185f76e0839d SHA512 22e5d23258c8a4216d63ee0c0e2765dfc742a1887baddca337cce090213e78c8849de01e3bd83c92628eb85ecdbcd6ad4e0462a47fde741028b83cb972865908
+DIST http-ece-1.1.0.gh.tar.gz 19406 BLAKE2B 3347d318ac30c14d6d0b6149746c6dd8ad1681664c165a1dd89858cc50b04452db1576841280f44fe701ca0cb662dad6cbf4c44188b24dad9863185f76e0839d SHA512 22e5d23258c8a4216d63ee0c0e2765dfc742a1887baddca337cce090213e78c8849de01e3bd83c92628eb85ecdbcd6ad4e0462a47fde741028b83cb972865908
diff --git a/dev-python/http_ece/http_ece-1.1.0.ebuild b/dev-python/http-ece/http-ece-1.1.0.ebuild
index daed2fc8047f..c6061dc4fb94 100644
--- a/dev-python/http_ece/http_ece-1.1.0.ebuild
+++ b/dev-python/http-ece/http-ece-1.1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 MY_PN="encrypted-content-encoding"
diff --git a/dev-python/http_ece/metadata.xml b/dev-python/http-ece/metadata.xml
index ddb5b0f1787e..ddb5b0f1787e 100644
--- a/dev-python/http_ece/metadata.xml
+++ b/dev-python/http-ece/metadata.xml
diff --git a/dev-python/hyperglot/Manifest b/dev-python/hyperglot/Manifest
index 201a72402648..f4a73cd9d57c 100644
--- a/dev-python/hyperglot/Manifest
+++ b/dev-python/hyperglot/Manifest
@@ -1,2 +1 @@
-DIST hyperglot-0.3.8.gh.tar.gz 7535789 BLAKE2B ea95372cfff195d2f991cc9a6bc3e26a9576e234167dde0c3a550979f6657e23b2169beb9d67b05fe8de1922e8a299ae24653da611e4277027798b2d139bc12f SHA512 32b8a08795fad10bfe909ddcab9578a53d1a0faf5a9ac79c2a129d2529d00166336560528f298ff8433fdc1149791da948fa2ef4f4d67780bd79b8f8126bdaf6
-DIST hyperglot-0.3.9.gh.tar.gz 7534924 BLAKE2B 504907a27e10977cba079cc03db489d1ee169de84e07d32308f4c682fda9be9e9d4b0af10f3ea0d0b3756582130ab3ab4474a730804b4a5ccd2acd0d97cfe787 SHA512 9bf3fad12e66d475dbca627164674a8f3d06779b44e3fac56b95de7058c863421ce107e76fab51dbf95d3ce7d6be5d9aeb340c73521dd85183f2982d36383758
+DIST hyperglot-0.4.4.gh.tar.gz 7552359 BLAKE2B eb365fd04ffd65a74a8eb78bdb822265a2b7dc5e8e2356dec0411f36a02168380297b84652cddb6275723cb54313e4b06b5570ee24e4dfa6803b1e32580c261c SHA512 80dadd65c2655a1a22b0c6c61818d4306d12ec8f71c9786fbf9d1fd55f624f7ed4f73c396c3027d3bd5af70eb6336d58d41939d4dee5e4f6d3b0c1dc49e50b9b
diff --git a/dev-python/hyperglot/hyperglot-0.3.9.ebuild b/dev-python/hyperglot/hyperglot-0.3.9.ebuild
deleted file mode 100644
index 7e1e745a273b..000000000000
--- a/dev-python/hyperglot/hyperglot-0.3.9.ebuild
+++ /dev/null
@@ -1,30 +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="Detect language support for font binaries"
-HOMEPAGE="
-	https://hyperglot.rosettatype.com/
-	https://github.com/rosettatype/hyperglot
-	https://pypi.org/project/hyperglot/
-"
-SRC_URI="https://github.com/rosettatype/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-3+ OFL"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3[${PYTHON_USEDEP}]
-	>=dev-python/unicodedata2-13.0.0[${PYTHON_USEDEP}]
-	>=dev-python/colorlog-4.7.2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/hyperglot/hyperglot-0.3.8.ebuild b/dev-python/hyperglot/hyperglot-0.4.4.ebuild
index 7e1e745a273b..57cbc92a4357 100644
--- a/dev-python/hyperglot/hyperglot-0.3.8.ebuild
+++ b/dev-python/hyperglot/hyperglot-0.4.4.ebuild
@@ -1,30 +1,32 @@
-# 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_{7,8,9,10,11} )
-
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Detect language support for font binaries"
 HOMEPAGE="
 	https://hyperglot.rosettatype.com/
-	https://github.com/rosettatype/hyperglot
 	https://pypi.org/project/hyperglot/
+	https://github.com/rosettatype/hyperglot
 "
 SRC_URI="https://github.com/rosettatype/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
-LICENSE="GPL-3+ OFL"
+LICENSE="GPL-3"
 KEYWORDS="~amd64"
 SLOT="0"
 
 RDEPEND="
 	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/colorlog-4.7.2[${PYTHON_USEDEP}]
 	>=dev-python/fonttools-4.0.2[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.3[${PYTHON_USEDEP}]
 	>=dev-python/unicodedata2-13.0.0[${PYTHON_USEDEP}]
-	>=dev-python/colorlog-4.7.2[${PYTHON_USEDEP}]
 "
 
+DOCS=( {CHANGELOG,README}.md CONTRIBUTORS.txt README{_comparison,_database}.md )
+
 distutils_enable_tests pytest
diff --git a/dev-python/itemadapter/Manifest b/dev-python/itemadapter/Manifest
index 663ea5b49e4b..84f8821831f8 100644
--- a/dev-python/itemadapter/Manifest
+++ b/dev-python/itemadapter/Manifest
@@ -1,3 +1,2 @@
-DIST itemadapter-0.4.0.tar.gz 14682 BLAKE2B ce7c9bcebd1dd75c35e76af2a788e6b3695c4e2fa19cc7dc467dc8dcd58deb71ae2f9272195d5030c0a72b80f56171ed9760eefd6c5c2b2769176ca8b441d6b8 SHA512 c7226c2e0e8c2f1695ec62e67a60b99ed92f4e71c9003a274292df91cef54abc382f614eb08422be6d532c0e91fa0bf962d2b5f6b2220e107b5ba43d921be15d
 DIST itemadapter-0.6.0.tar.gz 16325 BLAKE2B 75fa4c520de2c8fef8bf84ca416c2603d3237d86a994d4c083d6ad3469b03d8398ecd5828a3a3d18f742462002294c1872a493f4b29983907eaadb2b8af8f1fa SHA512 faa6170ea72d29f15c0332f38b288d8a4f1e2bb7229d3eb61227b52231c4d16d52bed09eda52acaf8653093afbc59ba2ec9ef8a2a4d408502f70704cea82c9ec
 DIST itemadapter-0.7.0.tar.gz 16849 BLAKE2B 1efd7251c50f17e8e3e52d3544b24ccdc5e5fcae90ad46f010959e3d5e6b2703271e310a37762b087a873a1ae0c0c9249ca19229cd062d974a05119d2e7ec221 SHA512 7402650f82fa16c2976821c5033a156c0994ad059581a714cb9a920235b1d2d4bbba60fbb186374377fb5dfc16ec59c5d432987e5c7906655c4e20d27f5e65cd
diff --git a/dev-python/itemadapter/itemadapter-0.4.0.ebuild b/dev-python/itemadapter/itemadapter-0.4.0.ebuild
deleted file mode 100644
index 7040b02533a1..000000000000
--- a/dev-python/itemadapter/itemadapter-0.4.0.ebuild
+++ /dev/null
@@ -1,27 +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,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="Common interface for scrapy data container classes"
-HOMEPAGE="https://scrapy.org/"
-SRC_URI="https://github.com/scrapy/itemadapter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="${DEPEND}
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/scrapy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 44ecc8158bca..895cf8916aa5 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1 +1,2 @@
 DIST jc-1.22.5.gh.tar.gz 12820323 BLAKE2B 2248ce17322b79f6902d595d1afa9a9afff64c153f08396de7b4441f5be0bda000188740a39435f7049e2a0d940e3fb5e6a53b4cca20c518b4522145b7447264 SHA512 72f4d0389ccc716ff61cb182ce26597a65ae1b1a449ad24078f5369b3b4c824ff27366d06456075ee55b24c5c91beb59f2dc8ec86f9b7db47728808e0647724b
+DIST jc-1.23.0.gh.tar.gz 12850876 BLAKE2B d0eb0bdca90115583409238eb8b4081bec92fa46b9c2054fc9d3637126bc3e21fa295c90d2f3910645b21d5f60b432461ebb6482bf8930a8b1c06deb3b2e027a SHA512 24d5675573e3050a3d6c9ba7bbe6be786a1f318eb7d8800ef160848163065b1fc961939ab1cae37a89407ecfd426c1aace3fef6f7985cc18e80e0d44b0fcb4be
diff --git a/dev-python/jc/jc-1.23.0.ebuild b/dev-python/jc/jc-1.23.0.ebuild
new file mode 100644
index 000000000000..b36f6bd9f1d2
--- /dev/null
+++ b/dev-python/jc/jc-1.23.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
+HOMEPAGE="
+	https://github.com/kellyjonbrazil/jc/
+	https://pypi.org/project/jc/
+"
+SRC_URI="
+	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index e8897321bced..63f70adec5cc 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -3,3 +3,4 @@ DIST jupyter_console-6.5.0.tar.gz 35609 BLAKE2B 056386eaa1c214b27ff10993d08fc535
 DIST jupyter_console-6.5.1.tar.gz 35754 BLAKE2B 1b3e189e8a057b0f57e6a1c1409797aff9b6584edd96975c5b91a7c5d55d8601e44a3f9e0218413351d67d7175a7f6c86c3734e14ba881f6ab25ea9f1748576d SHA512 3fbd97b1ab05596ac56ba8f6038af787698197b5148f7e33a79ad5cdcc9a78c80c2534e3e2c298aeb92ce880686731b9ba206d7d0094ad67d7cd4996c02e2327
 DIST jupyter_console-6.6.0.tar.gz 19523 BLAKE2B 5fd393b2d6abaab68ce9b96632a757f6c1bd43ac192744a9ce58be1e8bcc7accc1bfdf5428c908b270a66c14014177ce559fa97a6d0da93d3bfa34af101c5c98 SHA512 e1c4d0953ffba22660d680250b3b64887ec908e0bc420caedaf9afbe0ceb4b3e8eb5ac9b5b477aadcb773867ea7fce7b7da16bb8b4e403d9cf98484271577c0b
 DIST jupyter_console-6.6.1.tar.gz 34188 BLAKE2B c502fb86152010906d552a8d7141f52d8aab56e5df0389d93c3e4881acf3cc9b73d80c5d0a8193e7b179079a7310c68ae54ce2205b68a5f7538b9de33d54eb66 SHA512 dc30b9f0fd8c121e17fe9f9352c2ff4945795b11db74a13fe943bf4424bc0ddaa7745ad12477c7a37c51bedc6c1ce29b72803cf2e1bf82b5d8d124fed0a2e4c8
+DIST jupyter_console-6.6.2.tar.gz 34270 BLAKE2B 860d3b8d5f6292c4198aaaeec4e41d4e0764e48b374c9754c06aa45d0da56a60dc74a71a8db2243e5704647fa080dbfc86112bbb5467b414b82fd9168b056ab4 SHA512 4a7508ff9ae4d1c31644588f0a594f86c2183a0799b737d6b892eeebc4892193681e3e2eb54e8a8a5ba496120722602fce87802df78015a49adc76485edb9947
diff --git a/dev-python/jupyter_console/jupyter_console-6.6.2.ebuild b/dev-python/jupyter_console/jupyter_console-6.6.2.ebuild
new file mode 100644
index 000000000000..f3ac25df4987
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-6.6.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
+HOMEPAGE="https://jupyter.org"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.30[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.4[${PYTHON_USEDEP}]
+"
+# util-linux provides script(1)
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		sys-apps/util-linux
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/markdown-include/Manifest b/dev-python/markdown-include/Manifest
index a95469e82dbe..22e29f8b4a93 100644
--- a/dev-python/markdown-include/Manifest
+++ b/dev-python/markdown-include/Manifest
@@ -1,2 +1,3 @@
 DIST markdown-include-0.7.0.gh.tar.gz 16696 BLAKE2B 0816c25afe73f0046d9cf56ad6a985bf76ebd7b4f78f64db631697ffcd07f9e0550b2dd74411945e38c27965153be186a89d82c55aa7bf4570be47c1cfca2917 SHA512 2d4350ad87cc7e5dab116f4df7648d3a7ffc0c18e38b61ddfca9a6cf76a64bd1d41dcbf7525fd41c81cbc64abe1f776cd3ad9847e25fe790f16c4a024265390d
 DIST markdown-include-0.8.0.tar.gz 20208 BLAKE2B 62aeda968baaece8c95d3e73d9606b8206b6ac5f425a72ff1ecdd9e202a42f41d18ca2f3981efb9cbe5fb4aa37e22c97791cf1170ae1377f096a64404564efe0 SHA512 1288b66b3faf665d7886cb5d28372335286528b9bfbf5b7320128bf5ec21590533dbe4aa0466f339f24701da9f33cf3615ef5a7c227665513910bf26af9e6007
+DIST markdown-include-0.8.1.tar.gz 21873 BLAKE2B 83090f66af6f6b7dfc441bce97a0ca91bed3f94274030297e5f46fe8d42d3b3e83afc9f981941870f5bf361bfb5edd54bdda4c5d85595cc5599375f5a2478490 SHA512 4ae155d7e114de9d8ca32c129fe5778e7fc9516321357d8e4d90fad651a1dcb54b1fb144bc51e981cf728f1632dc293ed8cc1e7d4219154a2350780ea6f9b7b2
diff --git a/dev-python/markdown-include/markdown-include-0.8.1.ebuild b/dev-python/markdown-include/markdown-include-0.8.1.ebuild
new file mode 100644
index 000000000000..d380172040de
--- /dev/null
+++ b/dev-python/markdown-include/markdown-include-0.8.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Syntax which allows for inclusion of contents of other Markdown docs"
+HOMEPAGE="https://github.com/cmacmackin/markdown-include"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/markdown-3.4[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i "s/description-file/description_file/" setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/mastodon-py/mastodon-py-1.7.0.ebuild b/dev-python/mastodon-py/mastodon-py-1.7.0.ebuild
index 4ca043d548a6..426eba0a9abd 100644
--- a/dev-python/mastodon-py/mastodon-py-1.7.0.ebuild
+++ b/dev-python/mastodon-py/mastodon-py-1.7.0.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/http_ece[${PYTHON_USEDEP}]
+		dev-python/http-ece[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/pytest-vcr[${PYTHON_USEDEP}]
 		dev-python/requests-mock[${PYTHON_USEDEP}]
@@ -51,5 +51,5 @@ src_prepare() {
 }
 
 pkg_postinst() {
-	optfeature "webpush support" "dev-python/cryptography dev-python/http_ece"
+	optfeature "webpush support" "dev-python/cryptography dev-python/http-ece"
 }
diff --git a/dev-python/mastodon-py/mastodon-py-1.8.0.ebuild b/dev-python/mastodon-py/mastodon-py-1.8.0.ebuild
index 4ca043d548a6..426eba0a9abd 100644
--- a/dev-python/mastodon-py/mastodon-py-1.8.0.ebuild
+++ b/dev-python/mastodon-py/mastodon-py-1.8.0.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/http_ece[${PYTHON_USEDEP}]
+		dev-python/http-ece[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/pytest-vcr[${PYTHON_USEDEP}]
 		dev-python/requests-mock[${PYTHON_USEDEP}]
@@ -51,5 +51,5 @@ src_prepare() {
 }
 
 pkg_postinst() {
-	optfeature "webpush support" "dev-python/cryptography dev-python/http_ece"
+	optfeature "webpush support" "dev-python/cryptography dev-python/http-ece"
 }
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 06dca92e0dff..60e327affb80 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1 +1,2 @@
 DIST more-itertools-9.0.0.tar.gz 104237 BLAKE2B 523fe14889862edc2f05da79156914e12984d62168df46630fbe3169ebbe48ba66e018a65bd17dfad54676e5334335dbcda5c442556970442ccc2a792940bcc4 SHA512 a1e73a7a3e4530d070d639baa01c08d91ca11cdab6fec36131764001c2b78f1649e19ddf78ee3c1295f2f9d9951ea7483a4fd1f7c12d5655c3b696db7de35c1e
+DIST more-itertools-9.1.0.tar.gz 107389 BLAKE2B e2f5ba6daf5ee2dbb01a9f2c07f8595418285e8472960054681a551a42e39200e40a2799c644d37a0d8654307c9119b05364e47d590c933e6082fa5be390579c SHA512 635a97caa457ede1b7ea12fd1ee75bd8722e97a089a2d35f143dc77bcbaa2e3793338513af87408476a8a1443367b270ec0d239d652fc8f96f102308e1f3e937
diff --git a/dev-python/more-itertools/more-itertools-9.1.0.ebuild b/dev-python/more-itertools/more-itertools-9.1.0.ebuild
new file mode 100644
index 000000000000..6e429896b2ef
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-9.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="
+	https://github.com/more-itertools/more-itertools/
+	https://pypi.org/project/more-itertools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests unittest
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index f61cae68c042..d8602650e030 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1 +1,2 @@
 DIST natsort-8.2.0.tar.gz 145643 BLAKE2B d101ae2fa1cb009892e9712ece87d3825f3fca7970475e46176e5acbc29481ac79d491f1bae0721d85d3e67ecf39e5f54e2a984f0398356f32a5f0ec18a3e98d SHA512 d7e35c48ee36e69812c26b2cd333c57f1ec70c54017c4f51ed06dbb7619afc11cd1d589035faee700e1adf1e6b759b43ee497685fc88518be62c41957e15884e
+DIST natsort-8.3.0.tar.gz 123448 BLAKE2B 7fd480c8bfaceaca7431716e7721acac89d4a5c87a951ecf2754d80062437776eee823d7b94c58e2b9bc6864d9c0f595ee8667c538609c296694a548c126ab58 SHA512 63a65a99c9475e8ae96d722ae4c093cc73034c0dfdd254b24ae02904dd81cc8be36038c8a3fc514080f436d4124847f0f331d06a87c435f0b7b7d1d72313ae0d
diff --git a/dev-python/natsort/natsort-8.3.0.ebuild b/dev-python/natsort/natsort-8.3.0.ebuild
new file mode 100644
index 000000000000..9a89bfcc7cb5
--- /dev/null
+++ b/dev-python/natsort/natsort-8.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Natural sorting for Python"
+HOMEPAGE="
+	https://github.com/SethMMorton/natsort/
+	https://pypi.org/project/natsort/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "sorting results that match most file browsers" "dev-python/pyicu"
+}
diff --git a/dev-python/nosehtmloutput/Manifest b/dev-python/nosehtmloutput/Manifest
deleted file mode 100644
index 1931a9e9a980..000000000000
--- a/dev-python/nosehtmloutput/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nosehtmloutput-0.0.7.tar.gz 7582 BLAKE2B 6f2155358d91491fa42238404548379fa8046bdc8d81f4d2f7520330477032fb01838a0055838b2ac230cfc3804eaa22488e836d2afa553e54318e762e3eb543 SHA512 29461eec7f6f5c642730090fe93c1ecda9e0bb4e26bb977866c161854b5d4ec9cf037b1531b881d9504629dbddb8bc65888a416d14d99357dec99acd56ec553d
diff --git a/dev-python/nosehtmloutput/metadata.xml b/dev-python/nosehtmloutput/metadata.xml
deleted file mode 100644
index 94200988c26d..000000000000
--- a/dev-python/nosehtmloutput/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>lssndrbarbieri@gmail.com</email>
-  <name>Alessandro Barbieri</name>
- </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
- <stabilize-allarches/>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/nosehtmloutput/nosehtmloutput-0.0.7.ebuild b/dev-python/nosehtmloutput/nosehtmloutput-0.0.7.ebuild
deleted file mode 100644
index 8bc760df7546..000000000000
--- a/dev-python/nosehtmloutput/nosehtmloutput-0.0.7.ebuild
+++ /dev/null
@@ -1,27 +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="Nose plugin for generating HTML output"
-HOMEPAGE="
-	https://opendev.org/openstack/nose-html-output
-	https://pypi.org/project/nosehtmloutput/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests nose
diff --git a/dev-python/nosexcover/Manifest b/dev-python/nosexcover/Manifest
deleted file mode 100644
index 90bda662ebdf..000000000000
--- a/dev-python/nosexcover/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nosexcover-1.0.11.tar.gz 2903 BLAKE2B 297dc37504e2db992600ee4ec7c6c2cabdb36d8e137298755bdc6fe4af8dba666e99975a894ee534de62b4576514a3d912e6b98bcb43f228db9b58849788c092 SHA512 a4c75aac5095aa8323094b2a4eceb3af26243e6c87dd8720df8cf43ae0f76c28c638fe2c3cbcad621b7c2779115dccbb32e6a2f33a8bc5efb22a0fb0901d64fa
diff --git a/dev-python/nosexcover/metadata.xml b/dev-python/nosexcover/metadata.xml
deleted file mode 100644
index 377abc5c60a3..000000000000
--- a/dev-python/nosexcover/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>lssndrbarbieri@gmail.com</email>
-  <name>Alessandro Barbieri</name>
-  <description>co-maintainers welcome</description>
- </maintainer>
- <upstream>
-  <bugs-to>https://github.com/cmheisel/nose-xcover/issues</bugs-to>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/nosexcover/nosexcover-1.0.11.ebuild b/dev-python/nosexcover/nosexcover-1.0.11.ebuild
deleted file mode 100644
index 9415e9ccd5da..000000000000
--- a/dev-python/nosexcover/nosexcover-1.0.11.ebuild
+++ /dev/null
@@ -1,27 +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="Extends nose.plugins.cover to add Cobertura-style XML reports"
-HOMEPAGE="
-	https://github.com/cmheisel/nose-xcover
-	https://pypi.org/project/nosexcover/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	dev-python/nose[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.4[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests nose
diff --git a/dev-python/opentypespec/Manifest b/dev-python/opentypespec/Manifest
index 31d20321e704..79108035e0aa 100644
--- a/dev-python/opentypespec/Manifest
+++ b/dev-python/opentypespec/Manifest
@@ -1 +1 @@
-DIST opentypespec-1.8.4.tar.gz 15963 BLAKE2B 3d796ffa37f7a617a3be8d5a323fbe8f88e57e05aa031edfe1e48115a65526585d522a2426ed5d5ad970621d0cc301238bed8ac0c2beaab526f0b8679572e2ef SHA512 30c96322901ae99c3f8f71d7621660d7273b0ced60c86a253c573c32d491ce1ef6da750106f4aa8fdd005583be6fc31ef9513c301bfe0a6a39e1b6634ede1e9d
+DIST opentypespec-1.9.1.tar.gz 22450 BLAKE2B 53b426f86c1210460f94c8f830987c0ecf1d560e57ec07e890bb359f20b66293357784f2de652a441b17e92c4a031d13f8540b73d16669715c5827a2464a27fc SHA512 2dc2305fe3b03ef5067effe599694c4e64826b44821c0e2c149c5e3c749932c79afba35f81d58b1435c2ddb3422d81625fae0420b7e9e6c5ed36bb667a5bedb3
diff --git a/dev-python/opentypespec/opentypespec-1.8.4.ebuild b/dev-python/opentypespec/opentypespec-1.8.4.ebuild
deleted file mode 100644
index 0b2ce7f25993..000000000000
--- a/dev-python/opentypespec/opentypespec-1.8.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bezier manipulation library"
-HOMEPAGE="https://github.com/simoncozens/opentypespec-py"
-SRC_URI="https://github.com/simoncozens/opentypespec-py/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-py-${PV}"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RESTRICT="test" #https://github.com/simoncozens/opentypespec-py/issues/1
-
-distutils_enable_tests setup.py
diff --git a/dev-python/opentypespec/opentypespec-1.9.1.ebuild b/dev-python/opentypespec/opentypespec-1.9.1.ebuild
new file mode 100644
index 000000000000..015bd1d02a88
--- /dev/null
+++ b/dev-python/opentypespec/opentypespec-1.9.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="Data derived from the OpenType specification"
+HOMEPAGE="
+	https://pypi.org/project/opentypespec/
+	https://github.com/simoncozens/opentypespec-py
+"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+
+distutils_enable_tests pytest
diff --git a/dev-python/parsel/Manifest b/dev-python/parsel/Manifest
index 7b4db1cb9845..266b6a774822 100644
--- a/dev-python/parsel/Manifest
+++ b/dev-python/parsel/Manifest
@@ -1,2 +1 @@
-DIST parsel-1.6.0.tar.gz 100678 BLAKE2B 9fe937013d84d168cab4e415affecece272f7b2af729448aaf802240d0d7aca553d85de5747cf06ecbd17099e2bd81c741a3afd6bbad803916afdfd3673c07d6 SHA512 d3161522e1102cceeb1f29ab020b33019d4ac7f096cfab8fbe40f54073e49afc24f02aa54206d86f56c8f92e3db2d0d2f8a3dbdfa6417492cf299201f2ae6604
 DIST parsel-1.7.0.tar.gz 46036 BLAKE2B e83b5f7f5a7a4274632a38586641be761482c6978670f6c747249d4063f5596bacc42d698d294da1aa9fb972bbaf21cbe3247e49560f1b9c29a3d79eee4dd00a SHA512 850784cfb32fbf619dbcd53152edb569b199965e59f3ec088892a8d432aaf08c1a61f3562499c5c592d9578fb28f871d519e3d7b344e3b7a12fbaaca57909f89
diff --git a/dev-python/parsel/parsel-1.6.0.ebuild b/dev-python/parsel/parsel-1.6.0.ebuild
deleted file mode 100644
index ebe4f8c47d15..000000000000
--- a/dev-python/parsel/parsel-1.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="Utility to extract data from XML/HTML documents using XPath or CSS selectors"
-HOMEPAGE="https://scrapy.org/"
-SRC_URI="https://github.com/scrapy/parsel/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/w3lib[${PYTHON_USEDEP}]
-"
-BDEPEND="${DEPEND}
-	test? (
-		dev-python/sybil[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.6.0-pytest-runner.patch" )
-
-distutils_enable_tests pytest
-
-python_test() {
-	py.test --ignore=docs || die
-}
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 981481bfb314..d9cecd3dc380 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1 +1,2 @@
 DIST peewee-3.15.4.gh.tar.gz 908759 BLAKE2B 5bb53598f44c75f4b819d7aa032a2bc812f1e6de415b4cc01e22e521e4881dd409ceaf26435ddfcf08167c5193594917f23b15ae91f037fa4216d78752e77247 SHA512 9042e1c4fffac0c395500597981ab4732383c273e2b7f2b129b2b7702d9762772a219bb848a1f0aff802c468f38327f629df1c49028858451578115cf0811a13
+DIST peewee-3.16.0.gh.tar.gz 1085430 BLAKE2B 3acfbbc9d8cce7e4bd1c0027905f4ca44431f376a243adffbfadd4d3f15b4e729c4736076e8ec72c40261ca269c66d811afb6c25b9d075d5913a13869da4f4dd SHA512 f77a040831bd3189135196ede9748c92af9db21127839dfacd7712586273bdd22c688ca22bfa373805fa1b64f770b7cea850cba53e73f324f25ced1305830409
diff --git a/dev-python/peewee/peewee-3.15.4.ebuild b/dev-python/peewee/peewee-3.15.4-r1.ebuild
index 934dcba5e2a6..43c2a7437311 100644
--- a/dev-python/peewee/peewee-3.15.4.ebuild
+++ b/dev-python/peewee/peewee-3.15.4-r1.ebuild
@@ -25,6 +25,12 @@ KEYWORDS="amd64 ~riscv x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
+DEPEND="
+	dev-db/sqlite
+"
+RDEPEND="
+	${DEPEND}
+"
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/peewee/peewee-3.16.0-r1.ebuild b/dev-python/peewee/peewee-3.16.0-r1.ebuild
new file mode 100644
index 000000000000..ef546bdad51e
--- /dev/null
+++ b/dev-python/peewee/peewee-3.16.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="
+	https://github.com/coleifer/peewee/
+	https://pypi.org/project/peewee/
+"
+SRC_URI="
+	https://github.com/coleifer/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-db/sqlite
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index f14f35712bfe..868128f27cc4 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -4,4 +4,4 @@ DIST pikepdf-6.2.8.gh.tar.gz 2906054 BLAKE2B 7b639741112857dbf784da7245f905e7666
 DIST pikepdf-6.2.9.gh.tar.gz 2906102 BLAKE2B bd876f506714b237a6010b72c4557bc600e2ee4d6621131c21902ae9f41eb39a9a54a6c08d08dfa84fb3eeec8f2ae7e256d1f1fde533dbc2660a2b415077c8a7 SHA512 2b16e51c999fe1d1f593a9079ae0f13fdaa1955b5d55023169e3a805cbdda07b7ca4108ecea66463a1a253712b851b6dc824aed2c80e5f0caa3ba398d413bd64
 DIST pikepdf-7.0.0.gh.tar.gz 2899924 BLAKE2B 0aeb5b9a26b8f5363ed62ac59e4ffd6dc11aba44c2d3248f8e47c31811cfb810ec7e11150e1bf64ea28242bb7749e3fa2f2fc2bded3af64123e39aa1e4595b8d SHA512 5a11b0a3f35f7d7071ad0553be598f9d2e2d95ce325c080c69e9551e07ebde0102f02990d5ef32be860b468fefc1c29d5f9ff581d1f75321314c52fb2de2f389
 DIST pikepdf-7.1.0.gh.tar.gz 2900167 BLAKE2B 1293e580257a0f077146e1dff37ce825ef504a62aaadbfc466ce77a491bdfc101e01c7f314dbc039f69df08924ad1dab8de74ffedd0675cfc8139895289f6405 SHA512 e8fee8a69c0d6a5d148b3d001bd72be341ae7294401777f06b698d261329850832fdc3ea2b6ab9d8abb9fb99b041fe7a1a5750a22846528c76a03019b3ac4ca5
-DIST pikepdf-7.1.1.gh.tar.gz 2901140 BLAKE2B 50b61eb49ecf6ded00a5e1af1a23d6755622cfcab533b132c8e75419a17aaa3f2d1806070611ec822475fddb9176da06cff1bef178bbc98002bf50198d3d1d2a SHA512 50a6fddc8291cc54fbb3249bc05e84b7e78b2f50055314aabc7beed78116a02174afee29332ea94793f961d8e586826f178c7fea4060db07799cfeaa6fffbe03
+DIST pikepdf-7.1.1.tar.gz 2911088 BLAKE2B 0c65830ce4ec8f36814dd2a523dcc753380df7b6e4ce176b0e61e1e7f5f8bbfa01c9ef1ab093cbfeaf7dd1c67ada4e7dca53cf6da8b04cbceca825276179627b SHA512 e59bf20008df058aa2bbccedf71294ffc39a7aa774eeebcc33214ec7864be461959317bbd92f3df415690bb4ef3bbb63f9c05c613bcb9023b680637c07f3bd75
diff --git a/dev-python/pikepdf/pikepdf-7.1.1.ebuild b/dev-python/pikepdf/pikepdf-7.1.1.ebuild
index 0bf5bf573035..f9a94357690d 100644
--- a/dev-python/pikepdf/pikepdf-7.1.1.ebuild
+++ b/dev-python/pikepdf/pikepdf-7.1.1.ebuild
@@ -4,21 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
-MY_P=${P/_p/.post}
 DESCRIPTION="Python library to work with pdf files based on qpdf"
 HOMEPAGE="
 	https://github.com/pikepdf/pikepdf/
 	https://pypi.org/project/pikepdf/
 "
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
diff --git a/dev-python/pooch/Manifest b/dev-python/pooch/Manifest
index ee30b77b2b53..8f1544872239 100644
--- a/dev-python/pooch/Manifest
+++ b/dev-python/pooch/Manifest
@@ -1 +1,2 @@
 DIST pooch-1.6.0.tar.gz 52318 BLAKE2B c5cdf04a27a5754accee5a4522d5e6a51c4e71b7034cd570c6a2f30bc580ba9c15e0717be792e7cdd020ca745e6813a63681ce966ad61c0ed4aaa8b84829b920 SHA512 e1b6253b8879ef172bd6370139a7807355c7e1c03a1626ac46cb083b1f7d8beb5a8adb08c0828eb34e96a7164211d2dc7da214fd0176eb0606fe4ff47911257c
+DIST pooch-1.7.0.tar.gz 57457 BLAKE2B d85fc3cc707bfa639f46bf75b89dd31714f7a4f64a90ff7a6c92b792a8209e66a5fffb62912a336cd481330c37c0037df116d27ea06808bf02f1039e2aac930b SHA512 60126b893a9a1422aad12349143fbe72e485004f79b06da752f51ae374f375efae693304210c8d62b211433d7ce75fab53a50a6f267b1952df83fdccc2de13a7
diff --git a/dev-python/pooch/pooch-1.7.0.ebuild b/dev-python/pooch/pooch-1.7.0.ebuild
new file mode 100644
index 000000000000..85888366b696
--- /dev/null
+++ b/dev-python/pooch/pooch-1.7.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Manage your Python library's sample data files"
+HOMEPAGE="
+	https://github.com/fatiando/pooch/
+	https://pypi.org/project/pooch/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.5.0[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pytest-localftpserver[${PYTHON_USEDEP}]
+		dev-python/tqdm[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Needs network
+	pooch/tests/test_core.py::test_check_availability_invalid_downloader
+	pooch/tests/test_core.py::test_load_registry_from_doi
+	pooch/tests/test_core.py::test_load_registry_from_doi_zenodo_with_slash
+	pooch/tests/test_downloaders.py::test_invalid_doi_repository
+	pooch/tests/test_downloaders.py::test_doi_url_not_found
+	pooch/tests/test_downloaders.py::test_figshare_url_file_not_found
+	pooch/tests/test_downloaders.py::test_doi_downloader
+)
+
+### docs no included in pypi tarball
+# distutils_enable_sphinx doc \
+#	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -k "not network"
+}
diff --git a/dev-python/praw/Manifest b/dev-python/praw/Manifest
index 84397917c77c..76b176036a62 100644
--- a/dev-python/praw/Manifest
+++ b/dev-python/praw/Manifest
@@ -1 +1,2 @@
 DIST praw-7.6.1.gh.tar.gz 25083372 BLAKE2B eab92be89585bbe485b4d51c1c3c15def597b3a5cdb1326cf166931e4be22bea2975c76c48c8b673b30945ec5b559efba84d0310eebbdaa2881a37e30351af31 SHA512 91fa6efe0ea56d53ea49df8c1046ff620571d9dc80e6fdc5a5da3651cd24d7553455b62d02db8e37531a7bf34be0fbbc8c9555281b4887b73e9b8758966db55a
+DIST praw-7.7.0.gh.tar.gz 25092955 BLAKE2B e50a20b6d8fc58214480b9edb91a332a9e50626aeb67155298f1746b2615852bc89d3e338d120d2910c93f1713302f41754f5f87259388c9fedd1c358e65dd63 SHA512 40a8882cdcaa10f538f9cf9552414184050b16008eed4c4e31fc52dfc0d337daad6bd1041d462d26476c692ae8997f675cf5ce2630d8d8be091023b7deb98181
diff --git a/dev-python/praw/praw-7.7.0.ebuild b/dev-python/praw/praw-7.7.0.ebuild
new file mode 100644
index 000000000000..ba19b7a6b847
--- /dev/null
+++ b/dev-python/praw/praw-7.7.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Python Reddit API Wrapper"
+HOMEPAGE="
+	https://pypi.org/project/praw/
+	https://github.com/praw-dev/praw
+"
+SRC_URI="https://github.com/praw-dev/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( {AUTHORS,CHANGES,README}.rst SECURITY.md )
+
+RDEPEND="
+	<dev-python/prawcore-3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+BDEPEND="test? (
+	dev-python/betamax[${PYTHON_USEDEP}]
+	dev-python/betamax-matchers[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme \
+	dev-python/sphinx-rtd-dark-mode
+
+python_prepare_all() {
+	# disable optional dependencies
+	sed "/update_checker/d" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local epytestargs=(
+		# spams deprecation warnings
+		-p no:asyncio
+	)
+	epytest "${epytestargs[@]}"
+}
diff --git a/dev-python/protego/Manifest b/dev-python/protego/Manifest
index c3bd61ba584d..ec7f41c27eb5 100644
--- a/dev-python/protego/Manifest
+++ b/dev-python/protego/Manifest
@@ -1,2 +1 @@
-DIST protego-0.1.16.tar.gz 3187814 BLAKE2B 91591f21ce813e127794678602df21a38b269de69504f8aba9720aedc705225036737f4c7ca5c61cebac91d93eaa1161ee322acd8ee0c67f2c23096a6b2529c9 SHA512 3f029f34c4da6dc612dcdd747f56d421dca60f163315e0f72497435dbd74da77a5a02ee35f15774aad431e2b6e69a582c038d435ba0c07a53b3f0c83cb1c958a
 DIST protego-0.2.1.tar.gz 3188678 BLAKE2B 2874ffbc7f185946aa4e520ace1c49bea8de9e686ea45b2e70780919f411030d7f3411e8176997c2da2c0d15c8aae563a994acde0c6128deaa26649a138c8e57 SHA512 ef8a8196d8ece577eec90cc2e2cca2899625bd777c18f01c8e72a6130d4c2c13f71fa6e32a3e8e43b749f7556f4e3dbb1662e5e94ae18e6c8a7eef950779be1b
diff --git a/dev-python/protego/protego-0.1.16.ebuild b/dev-python/protego/protego-0.1.16.ebuild
deleted file mode 100644
index be128d2ac799..000000000000
--- a/dev-python/protego/protego-0.1.16.ebuild
+++ /dev/null
@@ -1,19 +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,10,11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="robots.txt parser with support for modern conventions"
-HOMEPAGE="https://scrapy.org/"
-SRC_URI="https://github.com/scrapy/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/psycopg2cffi/Manifest b/dev-python/psycopg2cffi/Manifest
index 26be24ea9ba5..d267c2e4016f 100644
--- a/dev-python/psycopg2cffi/Manifest
+++ b/dev-python/psycopg2cffi/Manifest
@@ -1 +1 @@
-DIST psycopg2cffi-2.9.0.tar.gz 65512 BLAKE2B 2e106eea22feb08aa7154dfc4959a9e68d946b34e872711f19856521dca050d0380498d3c20e762b31e7181ecfc5371a1b02c4bb711bccccfe56a4af9f497ffc SHA512 afd3ce9fa76dcd2df29b7aa8c5d31a33058023dc020ac829b95b8f7950fa17f2733f86a8c45f3d6eefeafae1c7f3997cbae820da98952d71336f7a1c72e84353
+DIST psycopg2cffi-2.9.0.gh.tar.gz 117682 BLAKE2B 9fe983f8f72fe384b1946143331b17dbcd03d12579241c7444d0d1c8bb7d51ed9576eace780ae3dd58c2d621b21f045347e25692514fa2fbbee2aac21ef89adb SHA512 520c4aaad33916ff5e1a7089888e04134bd5ad6f3115415a3dd04fb48afdc8ad0c68bf9e71d9158640392d3a2cd0b280eea8fa7a3d2ed63944e234d52f8cce43
diff --git a/dev-python/psycopg2cffi/files/psycopg2cffi-2.9.0-include-tests.patch b/dev-python/psycopg2cffi/files/psycopg2cffi-2.9.0-include-tests.patch
new file mode 100644
index 000000000000..1237fa7d56a8
--- /dev/null
+++ b/dev-python/psycopg2cffi/files/psycopg2cffi-2.9.0-include-tests.patch
@@ -0,0 +1,10 @@
+--- a/setup.py
++++ b/setup.py
+@@ -57,7 +57,7 @@ setup_kwargs = dict(
+     description=README[0].strip(),
+     long_description=''.join(README),
+     test_suite='psycopg2cffi.tests.suite',
+-    packages=['psycopg2cffi', 'psycopg2cffi._impl', 'psycopg2cffi.tests'],
++    packages=['psycopg2cffi', 'psycopg2cffi._impl', 'psycopg2cffi.tests', 'psycopg2cffi.tests.psycopg2_tests'],
+     install_requires=['six'],
+ )
diff --git a/dev-python/psycopg2cffi/psycopg2cffi-2.9.0-r1.ebuild b/dev-python/psycopg2cffi/psycopg2cffi-2.9.0-r1.ebuild
new file mode 100644
index 000000000000..1b50801742f8
--- /dev/null
+++ b/dev-python/psycopg2cffi/psycopg2cffi-2.9.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+inherit databases distutils-r1 edo
+
+DESCRIPTION="Implementation of the psycopg2 module using cffi. Compatible with Psycopg 2.5."
+HOMEPAGE="
+	https://pypi.org/project/psycopg2cffi/
+	https://github.com/chtd/psycopg2cffi
+"
+SRC_URI="https://github.com/chtd/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-db/postgresql:="
+RDEPEND="
+	${DEPEND}
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	virtual/python-cffi[${PYTHON_USEDEP}]
+	test? (
+		$(epostgres --get-depend)
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${P}-include-tests.patch )
+
+EPYTEST_DESELECT=(
+	# hang
+	tests/psycopg2_tests/test_cancel.py::CancelTests::test_async_cancel
+	# fail
+	tests/psycopg2_tests/test_dates.py::FromTicksTestCase::test_date_value_error_sec_59_99
+	tests/psycopg2_tests/test_types_basic.py::TypesBasicTests::testEmptyArray
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+	epytest --pyargs ${PN}
+}
+
+src_test() {
+	local -x PSYCOPG2_TESTDB_HOST="localhost"
+	local -x PSYCOPG2_TESTDB_PORT="55432"
+	local -x PSYCOPG2_TESTDB_USER="postgres"
+	epostgres --start ${PSYCOPG2_TESTDB_PORT}
+	edo createdb -h ${PSYCOPG2_TESTDB_HOST} -p ${PSYCOPG2_TESTDB_PORT} -U postgres psycopg2_test
+
+	distutils-r1_src_test
+	epostgres --stop
+}
diff --git a/dev-python/psycopg2cffi/psycopg2cffi-2.9.0.ebuild b/dev-python/psycopg2cffi/psycopg2cffi-2.9.0.ebuild
deleted file mode 100644
index 501137c6c2d2..000000000000
--- a/dev-python/psycopg2cffi/psycopg2cffi-2.9.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Implementation of the psycopg2 module using cffi. Compatible with Psycopg 2.5."
-HOMEPAGE="
-	https://github.com/chtd/psycopg2cffi
-	https://pypi.org/project/psycopg2cffi/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-db/postgresql:*
-	dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-cffi[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pure-protobuf/Manifest b/dev-python/pure-protobuf/Manifest
index 101a75a41af7..26bc8272e32f 100644
--- a/dev-python/pure-protobuf/Manifest
+++ b/dev-python/pure-protobuf/Manifest
@@ -1,2 +1,2 @@
-DIST pure_protobuf-2.2.1.tar.gz 16458 BLAKE2B 6a461f0f1b56341ee4288a5990d713cafcdce6788111c7b011e72e742cf5060fb4c535cf9c197183a72e886eab7b72bf5790105c578467e3f6f3d1fa9d063b0f SHA512 fa142061fc33e2a646e5392d22f0f80012b3c08f3133b00e0aa661762cd693702eb64a3e4db09e270e5d8de751d7a15167295d242c6db73f8153bb4a49fbdc10
 DIST pure_protobuf-2.2.2.tar.gz 16441 BLAKE2B bb5d2dac77b65d29beaf125a524dcf2bb3250737cb5b140d05c5ff397205cabe853ab87bd091bbaff88d169ca514ded2525cbe14ad81f504f55d47a1106bc805 SHA512 f9107d52e8dd3183af9917fc5c70d38c043c9bb80d9a067e8bfbc0dd5271feb10dd0820bcfd829517b4c6fc66f7faaf7e5ebfbb6748315debbcdcc3714264310
+DIST pure_protobuf-2.2.3.tar.gz 16445 BLAKE2B 38f13a975b4364e900e30e80d66e735ba4d871455002778f7caace14574de38fbfcf6735115b41a9c77cf023fea49dcaa1e43817e93f54388538f7619f26225a SHA512 b2189ff0971c0f797a526c056691e2d2e860d9a07be2d78ea30f5e74f940f95646235f2570c8d5d42559f184d37e0e3250f8caf4659092f567dd598c7b926a98
diff --git a/dev-python/pure-protobuf/pure-protobuf-2.2.1.ebuild b/dev-python/pure-protobuf/pure-protobuf-2.2.3.ebuild
index 6bbdcd2c4406..d995570c33bd 100644
--- a/dev-python/pure-protobuf/pure-protobuf-2.2.1.ebuild
+++ b/dev-python/pure-protobuf/pure-protobuf-2.2.3.ebuild
@@ -1,21 +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_{7,8,9,10,11} )
 DISTUTILS_USE_PEP517=hatchling
-inherit distutils-r1
+inherit distutils-r1 pypi
 
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Python implementation of Protocol Buffers data types with dataclasses support"
 HOMEPAGE="
 	https://github.com/eigenein/protobuf
 	https://pypi.org/project/pure-protobuf/
 "
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index afb51634a1d4..c294f2807ccf 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,2 +1,3 @@
 DIST pygame-2.1.2.gh.tar.gz 6100415 BLAKE2B 4b81c2f0abc2c2c4732ddb8f8e6d4bffa5169e3d3ee2d9ea2798d294623a9c70e2ff004825030606285124ef1347177b46adc676db450785e8420de45f37db34 SHA512 531cb0371853def7a3ddb8eb0110fbd58acaf1b2351d7518402c9a960baca705bb34da879015e7a6cd5f2f8af98c57e7bc732021a8f62ed9f90cacf068c9c2d6
 DIST pygame-2.1.3.gh.tar.gz 6517003 BLAKE2B 9f2062b24ef2e97995207fbf7572a8aa4d3475356e8646356758ad72b0b744fcf911adaa78bb730ed43c95fa23b8ed733a5573882bd83e112ae5e7e6ef099de9 SHA512 28f46826f58f73607b28c1411c6f2b71796cd4f98103df2dd47db842f578fe7f26dac01cb60d1cb00ac9dacfa62c6c3b913a244379ce70bd03265424e29052e6
+DIST pygame-2.2.0.gh.tar.gz 6530469 BLAKE2B 301b8decd7afe7ad44d97b086ad27209a084884993122f0c8d6973e718cb811587aa2e2c34b5e9fc5859410ced4c298b24127b4bf166dbeaa225b5c731c66cb6 SHA512 212e0f6390fa84f4fbcb3051ecb83c324a59d7591fd216a0f17946a581cf01540116162357b41004a387fbd3395e030a5a6d5f804496d84558125f512c9c2617
diff --git a/dev-python/pygame/pygame-2.2.0.ebuild b/dev-python/pygame/pygame-2.2.0.ebuild
new file mode 100644
index 000000000000..303edb79d795
--- /dev/null
+++ b/dev-python/pygame/pygame-2.2.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="
+	https://www.pygame.org/
+	https://github.com/pygame/pygame/
+	https://pypi.org/project/pygame/
+"
+SRC_URI="
+	https://github.com/pygame/pygame/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples opengl test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freetype
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/portmidi
+	media-libs/sdl2-image
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+	X? ( media-libs/libsdl2[opengl?,threads,video,X] )
+	!X? ( media-libs/libsdl2[threads] )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		media-libs/sdl2-image[gif,jpeg,png,tiff,webp]
+		media-libs/sdl2-mixer[mp3,vorbis,wav]
+	)
+"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig
+"
+# util-linux provides script
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)
+"
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py || die
+}
+
+python_configure_all() {
+	find src_c/cython -name '*.pyx' -exec touch {} + || die
+	"${EPYTHON}" setup.py cython_only || die
+}
+
+python_test() {
+	local -x PYTHONPATH=${BUILD_DIR}/install/lib
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=disk
+	script -eqc "${EPYTHON} -m pygame.tests -v" || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}$(python_get_sitedir)"/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pygobject/pygobject-3.42.2.ebuild b/dev-python/pygobject/pygobject-3.42.2.ebuild
index 55202ff28850..b64798a6d8e3 100644
--- a/dev-python/pygobject/pygobject-3.42.2.ebuild
+++ b/dev-python/pygobject/pygobject-3.42.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=no
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
 inherit gnome.org meson virtualx xdg distutils-r1
 
@@ -29,7 +29,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	test? (
-		dev-libs/atk[introspection]
+		>=app-accessibility/at-spi2-core-2.46.0[introspection]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		x11-libs/gdk-pixbuf:2[introspection,jpeg]
 		x11-libs/gtk+:3[introspection]
diff --git a/dev-python/pypandoc/Manifest b/dev-python/pypandoc/Manifest
deleted file mode 100644
index ea8f70982da1..000000000000
--- a/dev-python/pypandoc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pypandoc-1.8.1.tar.gz 30374 BLAKE2B 864ab8d4db8857adcbd13fd72b1ef6d4d1857a5ff6e7511b5d8269c183d80e6c8f391f2982097e592e3a1417c2ee6a5b068956b76218ae13842f1a881ecb4047 SHA512 527de67fb4a329642a69422e6237a6f3b1df0d089fbeeb118c9fd2d54878d7d0565c161b0e8fd6aa864bd63498ed65b07d69f14c3976ffc079f31c12ebbe7c04
-DIST pypandoc-1.8.tar.gz 31218 BLAKE2B 8eabcfa76b3022f0f8ed03dc2bb351d159018f63aa4a656d2b44d20ee59c0c6863fdc5ac168a86a70bf099c5c82c97451de97057a3e40c74c9b8af3eedb3c71c SHA512 a8b0e3656788cdf43af214c75ecc4f4bd27620ead00a7ce4c32ca44b4f30d7e2196164162eb12470db25c17e9b2f26868149a7b29549b0b9ebbedfc8e470bdb1
diff --git a/dev-python/pypandoc/files/pypandoc-1.7.4-dont-install-examples.patch b/dev-python/pypandoc/files/pypandoc-1.7.4-dont-install-examples.patch
deleted file mode 100644
index 2e84756c8f7f..000000000000
--- a/dev-python/pypandoc/files/pypandoc-1.7.4-dont-install-examples.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 44fa67fc92993301ec3e446d342a74c49d58334c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Anna=20=E2=80=9CCyberTailor=E2=80=9D?= <cyber@sysrq.in>
-Date: Fri, 18 Mar 2022 08:41:08 +0500
-Subject: [PATCH] Don't install examples
-
-See Gentoo Bugzilla: https://bugs.gentoo.org/835475
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -32,14 +32,6 @@ packages = [
-     { include = "pypandoc" },
- ]
- 
--include = [
--"examples/*",
--"LICENSE",
--"README.md",
--"tests.py",
--"filter_test.md",
--]
--
- [tool.poetry.dependencies]
- python = "^2.7 || ^3.6"
- 
diff --git a/dev-python/pypandoc/metadata.xml b/dev-python/pypandoc/metadata.xml
deleted file mode 100644
index 3ba4618b9552..000000000000
--- a/dev-python/pypandoc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>lssndrbarbieri@gmail.com</email>
-  <name>Alessandro Barbieri</name>
-  <description>co-maintainers welcome</description>
- </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/pypandoc/pypandoc-1.8.1.ebuild b/dev-python/pypandoc/pypandoc-1.8.1.ebuild
deleted file mode 100644
index 05658f0605cd..000000000000
--- a/dev-python/pypandoc/pypandoc-1.8.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=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pypandoc provides a thin wrapper for pandoc, a universal document converter"
-HOMEPAGE="
-	https://github.com/NicklasTegner/pypandoc
-	https://pypi.org/project/pypandoc/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	app-text/pandoc
-	dev-haskell/pandoc-citeproc
-	dev-texlive/texlive-latex
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.25.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pypandoc/pypandoc-1.8.ebuild b/dev-python/pypandoc/pypandoc-1.8.ebuild
deleted file mode 100644
index 05658f0605cd..000000000000
--- a/dev-python/pypandoc/pypandoc-1.8.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
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pypandoc provides a thin wrapper for pandoc, a universal document converter"
-HOMEPAGE="
-	https://github.com/NicklasTegner/pypandoc
-	https://pypi.org/project/pypandoc/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	app-text/pandoc
-	dev-haskell/pandoc-citeproc
-	dev-texlive/texlive-latex
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.25.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index e8784419c177..4559b2357a85 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,2 +1 @@
-DIST pysol_cards-0.14.2.tar.gz 18113 BLAKE2B 63704d97598927b600a8f34eb46565e8bf927bc27cd409579de6ac5f4b9154a881b1727c30a61381c169a267b313a4aabfe796a98341208ffb9a8327ca83ec71 SHA512 5e296819ebd6a874175c098b0000524defeb22456bdce961270ecfe26de48fb0d5f5b56eeb3457a12c51f72c9d90abdd35ebaf91244ceaa7d3034caff2b59386
 DIST pysol_cards-0.14.3.tar.gz 18322 BLAKE2B 730da3d597377305c86e528606edd3db9f07390d333283a228c2411d35f2e19da61d27f21e3d2650b84ba0f4b0d48e87cf7004d518845fe2a40b041e286d5a28 SHA512 00bb25393eab855d7444324b33e0561bfbcc86ae53306b58623fa15ea005378aff6af51846aab4634b43fdba5497c3872c32baf3a51013ee01d5ab2d7a7a9d51
diff --git a/dev-python/pysol_cards/pysol_cards-0.14.2.ebuild b/dev-python/pysol_cards/pysol_cards-0.14.2.ebuild
deleted file mode 100644
index 87d66f7d1c64..000000000000
--- a/dev-python/pysol_cards/pysol_cards-0.14.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 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="Deal PySol FreeCell cards"
-HOMEPAGE="https://pypi.org/project/pysol-cards/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/random2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pytest-cases/Manifest b/dev-python/pytest-cases/Manifest
index 06a9735c6c42..570ddba2bf9f 100644
--- a/dev-python/pytest-cases/Manifest
+++ b/dev-python/pytest-cases/Manifest
@@ -1,2 +1,2 @@
-DIST pytest-cases-3.6.11.tar.gz 1082043 BLAKE2B 396f7fa414729a49a8fb668126b959d13e5d10133ea0a47073cc42b8ce0a38c07df2e98c216e4904205696cf511a96d98e248e8f97a9324ee950e4399c1de746 SHA512 ee81d520eba8ab995bb4c32ba082a0107183d1d2892a29c3dc19d52a5324b1a73da2dbc97c202fdf6e6e17ac766f1d0383e87ee81ad22e49f7720a5e6417d0da
 DIST pytest-cases-3.6.13.tar.gz 1082993 BLAKE2B c5259d78ce11dbeff2acca63762360622758edc19b8982f4cbade44459ae347c0c5b4334d9fcf42cf587ef301a193b9ab4c3a496462c403550580549c9be869b SHA512 70bb05afce137cc456dc98fd62d5fa778ce8728c7ffb30a05b765b88a689ce2ff01005f594c5be90e4892debbe925b2c05961d9e4bc567610da1be5b01f5a659
+DIST pytest-cases-3.6.14.tar.gz 1083239 BLAKE2B be32c3762f0baf74149276553e07817b75f7eb722ff54bfa46eb8756183fea1ac30089735cb4db7c45406d2c2477c7f95a80779aee388561bac55ac8c5cd84d2 SHA512 a621f55836cae197e3fd1f3460c56d6c1f813e3d0e42e8b193f6cb8c88496a3be18643b1df51cc499f15e09e25cebb8ed3f0e593779ea6d8a4c03a2bd92f6f30
diff --git a/dev-python/pytest-cases/pytest-cases-3.6.11.ebuild b/dev-python/pytest-cases/pytest-cases-3.6.14.ebuild
index 4c809795e886..52352c77d93e 100644
--- a/dev-python/pytest-cases/pytest-cases-3.6.11.ebuild
+++ b/dev-python/pytest-cases/pytest-cases-3.6.14.ebuild
@@ -1,18 +1,22 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="dev-python/mkdocs-material"
-DOCS_DIR="docs"
-inherit distutils-r1 docs
+
+inherit distutils-r1 docs pypi
 
 DESCRIPTION="Separate test code from test cases in pytest"
-HOMEPAGE="https://pypi.org/project/pytest-cases/ https://github.com/smarie/python-pytest-cases"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://pypi.org/project/pytest-cases/
+	https://github.com/smarie/python-pytest-cases
+"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/pytest-cython/Manifest b/dev-python/pytest-cython/Manifest
index 646c449b7b96..e4663bfb6680 100644
--- a/dev-python/pytest-cython/Manifest
+++ b/dev-python/pytest-cython/Manifest
@@ -1,2 +1 @@
-DIST pytest-cython-0.1.1.tar.gz 817776 BLAKE2B d9b812cefc45153a1ce7abb0b1be2e7fc329b88d89ed48529f62a38c402d74bb164ed6b928f291586f0064820dc52156eacdf161da3a0d65d10f5a15681a17e4 SHA512 353a6c3b67df0608b24f24e04ba5d3fa48065d3960834e32bf44f2dfcd6248cb4c86de528c15dbfd20e36811bfb0ae04670f6441afb74bcb7bd1d7af71060463
-DIST pytest-cython-0.2.0.tar.gz 16201 BLAKE2B 7e32bdb0eb7b83d7d6444b8f102c25b64057e37d8f8d69bd579880f800151cee874c8e94c16b2aa12a82931666ff41112569ccd2ab225dafa95b87f89d44ddaa SHA512 0ab793c116f4b5b1dc20214d7151e71dc9b58473a19983105e9e06502568af962344853091f0f6bdeb70d6d044ba6a3add98148d4bd81eceb8e143050d288f79
+DIST pytest-cython-0.2.1.tar.gz 16083 BLAKE2B 79140d313a745e47660588e4bec32777debb7b878fd085c1a4e0785b4f0a85e03ad53fafaf43ce93cdd42d02f59000dc6196c62ce803b3c5d736719ca9a43b05 SHA512 6dbceaef0220e4ccd18409a78c1901ccb647aaa1d3763863cd8cba3580c5005969cae67824f25e03b57ee4364a86e5cdff95b87e657f8501de72ba3c7f59c164
diff --git a/dev-python/pytest-cython/pytest-cython-0.1.1.ebuild b/dev-python/pytest-cython/pytest-cython-0.1.1.ebuild
deleted file mode 100644
index 91573e48c506..000000000000
--- a/dev-python/pytest-cython/pytest-cython-0.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Plugin for testing Cython extension modules"
-HOMEPAGE="https://github.com/lgpage/pytest-cython"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_sphinx docs dev-python/sphinx-py3doc-enhanced-theme
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -vv \
-		--deselect tests/test_pytest_cython.py::test_wrap_c_ext_module \
-		--deselect tests/test_pytest_cython.py::test_cython_ext_module \
-		--deselect tests/test_pytest_cython.py::test_wrap_cpp_ext_module \
-		--deselect tests/test_pytest_cython.py::test_pure_py_module \
-		|| die
-}
diff --git a/dev-python/pytest-cython/pytest-cython-0.2.0.ebuild b/dev-python/pytest-cython/pytest-cython-0.2.0.ebuild
deleted file mode 100644
index 202ebb50ccf6..000000000000
--- a/dev-python/pytest-cython/pytest-cython-0.2.0.ebuild
+++ /dev/null
@@ -1,25 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Plugin for testing Cython extension modules"
-HOMEPAGE="https://github.com/lgpage/pytest-cython"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	>=dev-python/pytest-4.6.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_sphinx docs dev-python/sphinx-py3doc-enhanced-theme
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-cython/pytest-cython-0.2.1.ebuild b/dev-python/pytest-cython/pytest-cython-0.2.1.ebuild
new file mode 100644
index 000000000000..1ebf708a8d27
--- /dev/null
+++ b/dev-python/pytest-cython/pytest-cython-0.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
+
+DESCRIPTION="Plugin for testing Cython extension modules"
+HOMEPAGE="
+	https://pypi.org/project/pytest-cython/
+	https://github.com/lgpage/pytest-cython
+"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/pytest-4.6.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs \
+	dev-python/myst_parser \
+	dev-python/sphinx-py3doc-enhanced-theme
+
+python_test() {
+	epytest tests
+}
diff --git a/dev-python/pytest-harvest/Manifest b/dev-python/pytest-harvest/Manifest
index 82a97c9aee38..3e5f25609bb7 100644
--- a/dev-python/pytest-harvest/Manifest
+++ b/dev-python/pytest-harvest/Manifest
@@ -1,2 +1 @@
-DIST pytest-harvest-1.10.3.tar.gz 77312 BLAKE2B 301a9c890c527213025f33e72fc9a9e7d23354ef174e489b3e40e3597bf5b180ecd15f584cd736d379a4010f739e0aedcb5914012f0db767a45c7dfd4f38d126 SHA512 ba76e86a9109daeef70ac5ee454e92655468e2dbf4ade39d62e80b67f09978e78cc7f41bdf366f946d6a859b0b3f6d1f937155b4a486799b5806b9f68634e7ae
 DIST pytest-harvest-1.10.4.tar.gz 77384 BLAKE2B 93acd363b9874ef0a8e776c3472cde27417776850d004e83f00ecd52c7c9acbf1758d0062bd14fb83889c9b688a1f92352e42afe2dd6a9b01c567e8afe9d2f1c SHA512 61e371478b0fe809cb5e39040596a241ef3630641d7465799a5e24a953453924f3f6b5b8b94e67a51f1f5b2cb744bb2a698a7d50b6d638dc866a856bf74abe7a
diff --git a/dev-python/pytest-harvest/pytest-harvest-1.10.3.ebuild b/dev-python/pytest-harvest/pytest-harvest-1.10.3.ebuild
deleted file mode 100644
index ab710cef7937..000000000000
--- a/dev-python/pytest-harvest/pytest-harvest-1.10.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="dev-python/mkdocs-material"
-DOCS_DIR="docs"
-inherit distutils-r1 docs
-
-DESCRIPTION="Store and retrieve data created during your pytest tests execution"
-HOMEPAGE="https://pypi.org/project/pytest-harvest/ https://github.com/smarie/python-pytest-harvest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/decopatch[${PYTHON_USEDEP}]
-	>=dev-python/makefun-1.5[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pytest-cases[${PYTHON_USEDEP}]
-		dev-python/tabulate[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed "/pytest-runner/d" -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	docs_compile
-}
-
-python_test() {
-	epytest pytest_harvest/tests --doctest-modules
-}
diff --git a/dev-python/python-daemon/python-daemon-2.3.2.ebuild b/dev-python/python-daemon/python-daemon-2.3.2.ebuild
index ed6c42c769d9..a1ad2acf97cf 100644
--- a/dev-python/python-daemon/python-daemon-2.3.2.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.3.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # build system and tests use GPL-3.0+ but none of these files are installed
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/lockfile[${PYTHON_USEDEP}]
diff --git a/dev-python/python-gammu/Manifest b/dev-python/python-gammu/Manifest
index 142f2e7924a6..8e87bc3fd56d 100644
--- a/dev-python/python-gammu/Manifest
+++ b/dev-python/python-gammu/Manifest
@@ -1 +1,2 @@
+DIST python-gammu-3.2.4.gh.tar.gz 144136 BLAKE2B ef06b78568e9b88da95d09029191a2de0c4e26cb6b222326bffd0134a9c7eb743bab20201347d3be8a81db43f6005ec2a0550e1976a59de9ee9202c733ae41e0 SHA512 9d76b402c50018cc52476376952edebb6b0934aa374ea2a2177f5497d0949fcc77644aa2a35c7402b3f2179962d903409b7b1949c5e85a0e5130058d34f89664
 DIST python-gammu-3.2.4.tar.gz 144136 BLAKE2B ef06b78568e9b88da95d09029191a2de0c4e26cb6b222326bffd0134a9c7eb743bab20201347d3be8a81db43f6005ec2a0550e1976a59de9ee9202c733ae41e0 SHA512 9d76b402c50018cc52476376952edebb6b0934aa374ea2a2177f5497d0949fcc77644aa2a35c7402b3f2179962d903409b7b1949c5e85a0e5130058d34f89664
diff --git a/dev-python/python-gammu/python-gammu-3.2.4-r1.ebuild b/dev-python/python-gammu/python-gammu-3.2.4-r1.ebuild
new file mode 100644
index 000000000000..a9435554aedb
--- /dev/null
+++ b/dev-python/python-gammu/python-gammu-3.2.4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Gammu"
+HOMEPAGE="
+	https://wammu.eu/python-gammu/
+	https://github.com/gammu/python-gammu/
+	https://pypi.org/project/python-gammu/
+"
+SRC_URI="
+	https://github.com/gammu/python-gammu/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=app-mobilephone/gammu-1.34.0
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		$(python_gen_impl_dep sqlite)
+		app-mobilephone/gammu[dbi]
+	)
+"
+
+DOCS=( AUTHORS NEWS.rst README.rst )
+
+distutils_enable_tests unittest
+
+python_test() {
+	rm -rf gammu || die
+	eunittest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		docompress -x /usr/share/doc/${P}/examples
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/python-multipart/Manifest b/dev-python/python-multipart/Manifest
index cdb993e00fa1..7ab83c256204 100644
--- a/dev-python/python-multipart/Manifest
+++ b/dev-python/python-multipart/Manifest
@@ -1 +1,2 @@
 DIST python-multipart-0.0.5.gh.tar.gz 48018 BLAKE2B cfff5c1c57ada3ba3d50da71273435781d62d3907ca1b7e6180cd319f2680258b3e1e278dff760106e7ca9c116f4c5c7adf957601d6d8465bf300e6211b83773 SHA512 c2fabeb77a25119c4bbb71c3faa6de58e27ac2f0c768298eac62b519fc51e5d95fdea05c4f3846ed47205f297802982a001577a73b2feec2d9f585c784d6c3d7
+DIST python-multipart-0.0.6.gh.tar.gz 48648 BLAKE2B 4995136e6fcda8df952a6ee868238a507f3d5ea8f8454d4c4933e89b4897440f9186bd820af427f81b3240ca3610aa8300a944e4a0436291cc414f5e97daca30 SHA512 fb996725266996aefb5284b4815ecd8d0005344359f29780f0c2817125f625f3910be14d7d937e975b3ca9fb27a2a483401ab342a0c861df0e1112d447b1f083
diff --git a/dev-python/python-multipart/python-multipart-0.0.6.ebuild b/dev-python/python-multipart/python-multipart-0.0.6.ebuild
new file mode 100644
index 000000000000..c32811d69c48
--- /dev/null
+++ b/dev-python/python-multipart/python-multipart-0.0.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A streaming multipart parser for Python"
+HOMEPAGE="
+	https://github.com/andrew-d/python-multipart/
+	https://pypi.org/project/python-multipart/
+"
+SRC_URI="
+	https://github.com/andrew-d/python-multipart/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-xmp-toolkit/Manifest b/dev-python/python-xmp-toolkit/Manifest
index e0364abfab3b..c03dc430d529 100644
--- a/dev-python/python-xmp-toolkit/Manifest
+++ b/dev-python/python-xmp-toolkit/Manifest
@@ -1 +1 @@
-DIST python-xmp-toolkit-2.0.1.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
+DIST python-xmp-toolkit-2.0.1.gh.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
index 48080d9b82d6..39e027960ea3 100644
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
@@ -4,23 +4,23 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
 inherit distutils-r1
 
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/python-xmp-toolkit/${PN}.git"
-else
-	SRC_URI="https://github.com/python-xmp-toolkit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
-fi
-
 DESCRIPTION="Library for working with XMP metadata"
-HOMEPAGE="https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/"
+HOMEPAGE="
+	https://github.com/python-xmp-toolkit/python-xmp-toolkit/
+	https://pypi.org/project/python-xmp-toolkit/
+"
+SRC_URI="
+	https://github.com/python-xmp-toolkit/python-xmp-toolkit/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 DEPEND="
 	test? ( media-libs/exempi )
@@ -29,7 +29,9 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 "
 
-PATCHES=( "${FILESDIR}"/${P}-test.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+)
 
 distutils_enable_sphinx docs
 distutils_enable_tests unittest
diff --git a/dev-python/scramp/Manifest b/dev-python/scramp/Manifest
index e9a859d77819..deb396948c2c 100644
--- a/dev-python/scramp/Manifest
+++ b/dev-python/scramp/Manifest
@@ -1,2 +1 @@
-DIST scramp-1.4.1.tar.gz 30939 BLAKE2B e82edcb4d64ec63a36521742b0526b582860dc31a30410e96108243e51c1dbc3eaf1d7a7a6eec4cca775528a6d80601f1d2e55dbf4ab422d51f0c0bad1195c4d SHA512 47015e0429da1353eb6c89ac89c90ab3e646418af828deb754adc05764cbe2da98a553388a3d3c84320d470b63a66d1882ab96e5a43fd2c2c7e39a82155fb74c
 DIST scramp-1.4.4.tar.gz 21059 BLAKE2B 3577c4447027193bc7a97fc889d7f27271fcdf4491a747a8f1e2b0c560ea66e8228187f2132b51646d9fc3f3d9f48c0b761b1e16c61997eecedb858437430d0e SHA512 60832835ccc3551ef99ee47fc069d4443b4319fa4acb0b3d08eeef434b9358988d9d660ce4fba2ec651d1ea074b3f416bcbeddfa33ab3c91bf26ab325607b874
diff --git a/dev-python/scramp/scramp-1.4.1.ebuild b/dev-python/scramp/scramp-1.4.1.ebuild
deleted file mode 100644
index 2b1e15f2adfb..000000000000
--- a/dev-python/scramp/scramp-1.4.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 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="A pure-Python implementation of the SCRAM authentication protocol."
-HOMEPAGE="
-	https://pypi.org/project/scramp/
-	https://github.com/tlocke/scramp
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/asn1crypto-1.4.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 81d5d6d13ad6..da712e266f63 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,2 +1,3 @@
+DIST sentry-python-1.16.0.gh.tar.gz 325763 BLAKE2B e53f6051a74065950c4f1ce9010a87071b4a715990643cb7e955411ffb784fabc7ca6f2ade3cc6c66eb0718c6fc4993c6035763a0937b8a1cd66289f3f026806 SHA512 7f46f6c66b0e4f97e7f64a0eba9c396fbb9ab95607ba8ecb4880bb117c4f3fff7881a6787ea814981bdfabd84ea2b172c878821877403852661e746b6fe666bb
 DIST sentry-sdk-1.14.0.gh.tar.gz 312667 BLAKE2B 02772c3313a6cdb5f872df93274b291cdbae35db8387eab3816261b446bb438afd41610580cc642299877d8f03732a1d7bae4e6ad9824a92f4126677a4a3ca1a SHA512 cd0c4ca10d61825919721335fe0413f1050bd8d1f41a2f3f4a25b843c4bf83d35610382f55dc14fe86f70cca962e30a8d9d0708a07b10730783ae09b22f20e04
 DIST sentry-sdk-1.15.0.gh.tar.gz 317804 BLAKE2B 65a45f0da5327057827f4533418d846d8d4dc4bdd2723fddd754e5391e12c50946bb2f3f7914c5ee03cfdac324d565e68158aaca8e6686dc4502a02813cd6442 SHA512 9ae477c3ddc90c4189f4cbcca8756d7b0bd2df0358afa553467b431a2a131f32c9a9df9ce0ca3cca4d98b5a14746222f21476c164bf6da09bc06d94ce7ed0afe
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.16.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.16.0.ebuild
new file mode 100644
index 000000000000..d3fb5e2dedf7
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.16.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+MY_P=sentry-python-${PV}
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="
+	https://sentry.io/
+	https://github.com/getsentry/sentry-python/
+	https://pypi.org/project/sentry-sdk/
+"
+SRC_URI="
+	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# tests require Internet access
+	tests/integrations/httpx/test_httpx.py
+	tests/integrations/requests/test_requests.py
+	tests/integrations/stdlib/test_httplib.py
+	tests/integrations/flask/test_flask.py
+	tests/integrations/django/test_basic.py
+	# wtf is it supposed to do?!
+	tests/integrations/gcp/test_gcp.py
+	# broken by rq-1.10.1 (optional dep)
+	tests/integrations/rq/test_rq.py
+	# fastapi is not packaged
+	tests/integrations/asgi/test_fastapi.py
+	# TODO
+	tests/integrations/bottle
+	# TODO: causes breakage in other tests
+	tests/integrations/starlette
+	# TODO
+	tests/integrations/tornado
+	# requires mockupdb
+	tests/integrations/pymongo
+)
+
+EPYTEST_DESELECT=(
+	# hangs
+	'tests/test_transport.py::test_transport_works'
+	# TODO
+	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+	tests/test_client.py::test_databag_depth_stripping
+	tests/test_client.py::test_databag_string_stripping
+	tests/test_client.py::test_databag_breadth_stripping
+	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/asgi/test_asgi.py::test_websocket
+	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
+	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
+	# incompatible version?
+	tests/integrations/falcon/test_falcon.py
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
+	# test_circular_references: apparently fragile
+	'tests/integrations/threading/test_threading.py::test_circular_references'
+	# test for new feature, fails with IndexError
+	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	# TODO
+	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
+	tests/test_profiler.py::test_sample_buffer
+	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
+	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
+	tests/test_profiler.py::test_thread_scheduler_single_background_thread
+	# broken with py3.11, *shrug*
+	tests/test_profiler.py::test_extract_stack_with_max_depth
+	# TODO
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
+)
diff --git a/dev-python/sphinxcontrib-restbuilder/Manifest b/dev-python/sphinxcontrib-restbuilder/Manifest
index bde5235cdcd6..f64f350fee4b 100644
--- a/dev-python/sphinxcontrib-restbuilder/Manifest
+++ b/dev-python/sphinxcontrib-restbuilder/Manifest
@@ -1 +1 @@
-DIST sphinxcontrib-restbuilder-0.3.tar.gz 24926 BLAKE2B 885ec51030ef05c9bf528efc5ee8ac1552692d760854c750342947b599411a1d469aff577938286ef22de0e051450605e646b7b904dd69b513c9016ddbc8345c SHA512 0b94d05a2fed1f2203fea94cd3a525a62530ec1777d28d59f9232241dd6816eedf871d6a6f616f6f9ce2946a90143871be09d8cae75747b224a6032e284963ed
+DIST sphinxcontrib-restbuilder-0.3.gh.tar.gz 24926 BLAKE2B 885ec51030ef05c9bf528efc5ee8ac1552692d760854c750342947b599411a1d469aff577938286ef22de0e051450605e646b7b904dd69b513c9016ddbc8345c SHA512 0b94d05a2fed1f2203fea94cd3a525a62530ec1777d28d59f9232241dd6816eedf871d6a6f616f6f9ce2946a90143871be09d8cae75747b224a6032e284963ed
diff --git a/dev-python/sphinxcontrib-restbuilder/sphinxcontrib-restbuilder-0.3-r1.ebuild b/dev-python/sphinxcontrib-restbuilder/sphinxcontrib-restbuilder-0.3-r1.ebuild
new file mode 100644
index 000000000000..b1167fe72cf1
--- /dev/null
+++ b/dev-python/sphinxcontrib-restbuilder/sphinxcontrib-restbuilder-0.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+MY_PN=${PN#sphinxcontrib-}
+DESCRIPTION="A Sphinx builder/writer to output reStructuredText (rst) files"
+HOMEPAGE="
+	https://pypi.org/project/sphinxcontrib-restbuilder/
+	https://github.com/sphinx-contrib/restbuilder
+"
+SRC_URI="https://github.com/sphinx-contrib/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	rm -rf sphinxcontrib || die
+	distutils_write_namespace sphinxcontrib
+	epytest
+}
diff --git a/dev-python/sphinxcontrib-restbuilder/sphinxcontrib-restbuilder-0.3.ebuild b/dev-python/sphinxcontrib-restbuilder/sphinxcontrib-restbuilder-0.3.ebuild
deleted file mode 100644
index 3693dcf20df1..000000000000
--- a/dev-python/sphinxcontrib-restbuilder/sphinxcontrib-restbuilder-0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Sphinx builder/writer to output reStructuredText (rst) files"
-HOMEPAGE="
-	https://github.com/sphinx-contrib/restbuilder
-	https://pypi.org/project/sphinxcontrib-restbuilder/
-"
-SRC_URI="https://github.com/sphinx-contrib/restbuilder/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/sphinxcontrib-/}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sre-yield/Manifest b/dev-python/sre-yield/Manifest
new file mode 100644
index 000000000000..d7e92d27c2f3
--- /dev/null
+++ b/dev-python/sre-yield/Manifest
@@ -0,0 +1 @@
+DIST sre-yield-1.2.gh.tar.gz 23485 BLAKE2B 51362de6b5eb7ba23175430fdd62973d1839472e57870d2e8bba0ed124a1e5e3ab55bc7a8d45302c42b91321b2304b43f4a5b7d2bdcfa79918b153d4972ea2f3 SHA512 419d63807052b6c1301c67d0638009a0f1fee4d272846cf9d55608eda5d3ca1542a73b534eef6f868066e4cd966613dae55bc63b452e723b3fcbfab03b24d00e
diff --git a/dev-python/sre_yield/metadata.xml b/dev-python/sre-yield/metadata.xml
index 32515f0f6ffe..32515f0f6ffe 100644
--- a/dev-python/sre_yield/metadata.xml
+++ b/dev-python/sre-yield/metadata.xml
diff --git a/dev-python/sre-yield/sre-yield-1.2-r1.ebuild b/dev-python/sre-yield/sre-yield-1.2-r1.ebuild
new file mode 100644
index 000000000000..bd349d494737
--- /dev/null
+++ b/dev-python/sre-yield/sre-yield-1.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Python module to generate regular all expression matches"
+HOMEPAGE="
+	https://pypi.org/project/sre-yield/
+	https://github.com/sre-yield/sre-yield
+"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+
+distutils_enable_tests unittest
diff --git a/dev-python/sre_yield/Manifest b/dev-python/sre_yield/Manifest
deleted file mode 100644
index 698a62d9bd4f..000000000000
--- a/dev-python/sre_yield/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sre_yield-1.2.tar.gz 23491 BLAKE2B 350800649a01b2f2fbe8efb2d9afb1a2a2c6305b1873c0939ad9e02efaa867c1539ba9db692e7fef8eff2d983dac25e406f295b38e26134400388dc0ef54de2f SHA512 ef0621d2d52b36575a22ddb66409f37537bb67296235248c1c802f887aab30cdefb426caa6fd2913ebfd5daa3885151088cab2324a4cbfe5707cdad51c352f89
diff --git a/dev-python/sre_yield/sre_yield-1.2.ebuild b/dev-python/sre_yield/sre_yield-1.2.ebuild
deleted file mode 100644
index 3f62c6b22d33..000000000000
--- a/dev-python/sre_yield/sre_yield-1.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to generate regular all expression matches"
-HOMEPAGE="https://github.com/google/sre_yield"
-SRC_URI="https://github.com/google/sre_yield/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-SLOT="0"
-
-distutils_enable_tests pytest
diff --git a/dev-python/stringbrewer/stringbrewer-0.0.1.ebuild b/dev-python/stringbrewer/stringbrewer-0.0.1.ebuild
index 9827c1e6ee7c..39873d0c999d 100644
--- a/dev-python/stringbrewer/stringbrewer-0.0.1.ebuild
+++ b/dev-python/stringbrewer/stringbrewer-0.0.1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64"
 SLOT="0"
 
 RDEPEND="
-	dev-python/sre_yield[${PYTHON_USEDEP}]
+	dev-python/sre-yield[${PYTHON_USEDEP}]
 	dev-python/rstr[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index 8ca55cf87099..1120bdf05c69 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,3 +1,4 @@
 DIST tifffile-2023.1.23.1.gh.tar.gz 324017 BLAKE2B ffc4a329096ac3eb44990635dea4f5d0211564d5a8847795671d3d816148721d3c6fab059514764eb45bc48c8a114382c0a1705cc606d750ef869d49e67b2c85 SHA512 fad8e2f40cc550a83030b29b528566d7b5b9cbe016c9fd04911ab4cca4e8e69523d9b17db83eee018d1ff3005cab0f36762b4a1271859b504c77a0809e07b0be
 DIST tifffile-2023.2.2.gh.tar.gz 324485 BLAKE2B fb3404efa1af8197af8e3b77c2b1fbb76c215ee8d599da8974c6231b72789117edddf23072c898eb752789d789080b16106da90406a3a178388f3a863171d202 SHA512 5915374d62665d766b02d2a3c0e2f644581f3809cc650dda70feffec43151398fbbd23b2fe000be02a65fd7647e097c43c3c92482c85fe5027966038179a785f
+DIST tifffile-2023.2.27.gh.tar.gz 326444 BLAKE2B 8c5081b7434329181d5f6df416b739c43d24ff9a9c3dc2ac4b3d6d6dd5ba165290d224648e5e6b4f46bd611c85204114f8b563cb110b7b50ba73aefd0e427f2e SHA512 97ba6b6ac469e4ab92822fd51dc45ebc00776834e5b171679abed24448d5be479a06e5e401bd055a21029641668f63912246b93f15424a3b268733729515452e
 DIST tifffile-2023.2.3.gh.tar.gz 324906 BLAKE2B b9417ea561de7a185f1a57a6f36a6efde12caa85cd15fd787ae1ca50e73d328f83ec6cd196042d3a11a62706ac27bfad8ecc42e0a235201ee208fdb95d942c16 SHA512 f73dd77c149afa976ac468f0fac37a1bafe35ae4bcb377a91e7922573237805cdc6e00cbcd7bb78f3213a9da4878ec020a058567523b9a4c5958e013f9bdc94b
diff --git a/dev-python/tifffile/tifffile-2023.2.27.ebuild b/dev-python/tifffile/tifffile-2023.2.27.ebuild
new file mode 100644
index 000000000000..66babf481615
--- /dev/null
+++ b/dev-python/tifffile/tifffile-2023.2.27.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read and write TIFF files"
+HOMEPAGE="
+	https://pypi.org/project/tifffile/
+	https://github.com/cgohlke/tifffile/
+	https://www.cgohlke.com/
+"
+SRC_URI="
+	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/dask[${PYTHON_USEDEP}]
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/test_tifffile.py::test_class_omexml
+	tests/test_tifffile.py::test_class_omexml_fail
+	tests/test_tifffile.py::test_class_omexml_modulo
+	tests/test_tifffile.py::test_class_omexml_attributes
+	tests/test_tifffile.py::test_class_omexml_multiimage
+	tests/test_tifffile.py::test_write_ome
+	tests/test_tifffile.py::test_write_ome_manual
+	# requires tons of free space
+	tests/test_tifffile.py::test_write_3gb
+	tests/test_tifffile.py::test_write_5GB_bigtiff
+	tests/test_tifffile.py::test_write_5GB_fails
+	tests/test_tifffile.py::test_write_6gb
+	tests/test_tifffile.py::test_write_bigtiff
+	'tests/test_tifffile.py::test_write_imagej_raw'
+	# TODO
+	tests/test_tifffile.py::test_issue_imagej_hyperstack_arg
+	tests/test_tifffile.py::test_issue_description_overwrite
+)
diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest
index e0bbd83b0256..769fa0952c76 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -1,2 +1,3 @@
 DIST tld-0.12.6.tar.gz 358405 BLAKE2B cf7bd68f26507cd4ac1c681705d8c495131a8b3aa64115e0259f7ef33f61c5db4911cc8cb1493e901237d401bd4eff4bda9cd687d19d9e1e275c3d87980069ae SHA512 ff10041178976af97c920a519ce3bb5a0a46f4299c24419db9a0502e89296e2bd66885dac5927e940c3abc22d6b390336916622cab771a57ba1c8f0960de2583
 DIST tld-0.12.7.gh.tar.gz 444946 BLAKE2B ccd39014b3facdbb836aa33b0daddc819be2ad246985f8bbcd0f13ef01d026c7c9aaeb1cb41312602cf7babe6ec8273c9456a5afb83850f77cd90ad3f9a9b7f9 SHA512 11b573cea770f7aa1ae58f2e6787e62dddd515b2a91b5d4f89e160615b4e3d0d9219f43e3c94251efd3d5b46779390ed66a312ca1751b224284a0765da972b28
+DIST tld-0.13.gh.tar.gz 443877 BLAKE2B 9f84307ce704500096dd2abff75ead534dbd17b59ea0d3dae84394b791aeee873638e6e224ddd3b5c598293a46ead964ae36022b0c3c7411de7c64096d0c69cc SHA512 87157ca2fc8977a96f6289269015bc5a90f3f033fb8ea96552eb8d00d05a346d8f3c61123a311803aa301c735a510a2c0986364f3b2ae4366e2c34aea15b538d
diff --git a/dev-python/tld/tld-0.13.ebuild b/dev-python/tld/tld-0.13.ebuild
new file mode 100644
index 000000000000..9c3a1d08c342
--- /dev/null
+++ b/dev-python/tld/tld-0.13.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extract the top level domain (TLD) from the URL given"
+HOMEPAGE="
+	https://github.com/barseghyanartur/tld/
+	https://pypi.org/project/tld/
+"
+SRC_URI="
+	https://github.com/barseghyanartur/tld/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/Faker[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/--cov/d' pytest.ini || die
+}
diff --git a/dev-python/toposort/Manifest b/dev-python/toposort/Manifest
index e0352e8e82f3..faa359912380 100644
--- a/dev-python/toposort/Manifest
+++ b/dev-python/toposort/Manifest
@@ -1 +1,2 @@
 DIST toposort-1.9.tar.gz 10878 BLAKE2B fc2f6543ae74ea6e448ffe2be4e47438842b5ba95eac2f45fcc8d72e682054af0b80a0d453c5afaebeb1c9881d6874ab16ea523b19aad589545c8aae0b8cf255 SHA512 ec86f59f5e61b6d1c783965095f71693306a83a8b54a0661cddb3c51a5e2f9314075b453a901b5e3664b77d9e047901120622dbc23d642269a9546f41395388a
+DIST toposort-1.10.tar.gz 11132 BLAKE2B 373c9549cb5e64d2636fe8bd67d73a8eeab671243b562654660bc59c2ceddc4196fad3882bd68d873647ddf504a6c90174b5c995dbd7c8e457744b4daceaa099 SHA512 7578706b2b383f4e1c7228aebc2f590ec51953e36d594572d494bc928d4f207da7419a9b662a2f77426347f49d33f355f67f45e28226a7e4546d6c16c743dc4e
diff --git a/dev-python/toposort/toposort-1.10.ebuild b/dev-python/toposort/toposort-1.10.ebuild
new file mode 100644
index 000000000000..87f067f24b2e
--- /dev/null
+++ b/dev-python/toposort/toposort-1.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Implements a topological sort algorithm"
+HOMEPAGE="
+	https://gitlab.com/ericvsmith/toposort/
+	https://pypi.org/project/toposort/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+python_test() {
+	"${EPYTHON}" test/test_toposort.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/ttfautohint-py/ttfautohint-py-0.5.1-r1.ebuild b/dev-python/ttfautohint-py/ttfautohint-py-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..a889067156ab
--- /dev/null
+++ b/dev-python/ttfautohint-py/ttfautohint-py-0.5.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for ttfautohint, a free auto-hinter for TrueType fonts"
+HOMEPAGE="
+	https://pypi.org/project/ttfautohint-py/
+	https://github.com/fonttools/ttfautohint-py
+"
+SRC_URI="https://github.com/fonttools/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="media-gfx/ttfautohint"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fonttools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	rm -r src/c || die
+}
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/ttfautohint-py/ttfautohint-py-0.5.1.ebuild b/dev-python/ttfautohint-py/ttfautohint-py-0.5.1.ebuild
deleted file mode 100644
index e7e1e05d526e..000000000000
--- a/dev-python/ttfautohint-py/ttfautohint-py-0.5.1.ebuild
+++ /dev/null
@@ -1,36 +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="A Python wrapper for ttfautohint"
-HOMEPAGE="https://github.com/fonttools/ttfautohint-py"
-SRC_URI="https://github.com/fonttools/ttfautohint-py/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="media-gfx/ttfautohint"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/fonttools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r src/c || die
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
-	export TTFAUTOHINTPY_BUNDLE_DLL=0
-	default
-}
diff --git a/dev-python/uharfbuzz/Manifest b/dev-python/uharfbuzz/Manifest
index cec68ddd504e..b68ec9b56987 100644
--- a/dev-python/uharfbuzz/Manifest
+++ b/dev-python/uharfbuzz/Manifest
@@ -1 +1 @@
-DIST uharfbuzz-0.33.0.gh.tar.gz 38023 BLAKE2B 5cf2d8afc8174d5fb679a38fb4147ea15d753a4b2f745c194d6f75868f878a6ae22a0a3bb77b823eeafcdcda325f89ac69539767e2bc1217b88d594c561ea385 SHA512 dc1afdfd39750284544aa8bc244c36a4b60a99423d11d568759ac908fcc34eeb39e97089eba00524bc9dbe1604aab8c35bd40b98f7913016ad022832266e7145
+DIST uharfbuzz-0.33.0.zip 1364513 BLAKE2B 668a9b7083d1a75c6845b2177b876447a25e28b15bc14e52518f1bf158ca4e23f01a0d42eb1aea02dce65c64496101ea00c8fd4d68e5ba7c1d149d920ba6624a SHA512 923ade6a4cefca9d1cfdee19fbf7b769480072695da67a1b6b75738172dad1c3236ff7d2263eeaeb6f08c235ff6efd952f095c63957549c589fafde31ca604eb
diff --git a/dev-python/uharfbuzz/files/uharfbuzz-0.23.0-system-harfbuzz.patch b/dev-python/uharfbuzz/files/uharfbuzz-0.23.0-system-harfbuzz.patch
deleted file mode 100644
index 8ff591bb1ab3..000000000000
--- a/dev-python/uharfbuzz/files/uharfbuzz-0.23.0-system-harfbuzz.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -13,7 +13,7 @@
- with open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
-     long_description = f.read()
- 
--define_macros = [('HB_NO_MT', '1'), ('HB_EXPERIMENTAL_API', '1')]
-+define_macros = [('HB_EXPERIMENTAL_API', '1')]
- linetrace = False
- if int(os.environ.get('CYTHON_LINETRACE', '0')):
-     linetrace = True
-@@ -21,7 +21,7 @@
- 
- extra_compile_args = []
- extra_link_args = []
--libraries = []
-+libraries = ['harfbuzz', 'harfbuzz-subset']
- if platform.system() != 'Windows':
-     extra_compile_args.append('-std=c++11')
-     define_macros.append(('HAVE_MMAP', '1'))
-@@ -39,11 +39,9 @@
- extension = Extension(
-     'uharfbuzz._harfbuzz',
-     define_macros=define_macros,
--    include_dirs=['harfbuzz/src'],
-+    include_dirs=['/usr/include/harfbuzz'],
-     sources=[
--        'src/uharfbuzz/_harfbuzz.pyx',
--        'harfbuzz/src/harfbuzz.cc',
--        'harfbuzz/src/hb-subset-repacker.cc',
-+        'src/uharfbuzz/_harfbuzz.pyx'
-     ],
-     language='c++',
-     libraries=libraries,
diff --git a/dev-python/uharfbuzz/uharfbuzz-0.33.0.ebuild b/dev-python/uharfbuzz/uharfbuzz-0.33.0-r1.ebuild
index c27bb26d17c5..b3ccf675d4bd 100644
--- a/dev-python/uharfbuzz/uharfbuzz-0.33.0.ebuild
+++ b/dev-python/uharfbuzz/uharfbuzz-0.33.0-r1.ebuild
@@ -3,33 +3,33 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
 
 DESCRIPTION="Streamlined Cython bindings for the HarfBuzz shaping engine"
-HOMEPAGE="https://github.com/harfbuzz/uharfbuzz"
-SRC_URI="https://github.com/harfbuzz/uharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://pypi.org/project/uharfbuzz/
+	https://github.com/harfbuzz/uharfbuzz
+"
+SRC_URI="$(pypi_sdist_url ${PN} ${PV} .zip)"
 
 KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-RDEPEND=">=media-libs/harfbuzz-4.3.0[experimental(-)]"
-DEPEND="
-	${RDEPEND}
+RDEPEND=">=media-libs/harfbuzz-4.3.0:=[experimental(-)]"
+BDEPEND="
+	app-arch/unzip
 	>=dev-python/cython-0.28.1[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-2.1[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.31[${PYTHON_USEDEP}]
 "
 
 PATCHES=( "${FILESDIR}/${PN}-0.33.0-system-harfbuzz.patch" )
 
 distutils_enable_tests pytest
 
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 	export USE_SYSTEM_HARFBUZZ=1
 }
diff --git a/dev-python/unicodedata2/Manifest b/dev-python/unicodedata2/Manifest
index c29513be4013..26cbaa44cf24 100644
--- a/dev-python/unicodedata2/Manifest
+++ b/dev-python/unicodedata2/Manifest
@@ -1 +1 @@
-DIST unicodedata2-14.0.0.gh.tar.gz 624067 BLAKE2B 0394af31670dbc3e89f616144f88081a69e1e4d9404d432a3f70c8973e967f28b914413219e0b22f089ccaa898193a45f4a2ce41bfe1f889622c69bd9b56735e SHA512 bb0b1e3834a892d23bda0d51443655b244e0f24cbb9ed51065afac3fdd2ed01a6382d4015ea0dcfaddc99c7858e19e3e3e86a9024a5600cb67cef219ebc719ba
+DIST unicodedata2-15.0.0.tar.gz 592775 BLAKE2B 7d65d44dd9868858b587c77f385caee360e26178ca586663eb67ec42e63f7108739982639fa2a12b150f8ad3b7ab3cbc3aa683a3b52bc2bb116a4a6d23f01a1d SHA512 77bb7e827c4e5737983509406795c30f231737aa4410fcbeb3b9c3ef21b8a156c0459bc2edb4190f7c004f32f78b839c29d4c2211b60a172f5c677a43272e701
diff --git a/dev-python/unicodedata2/unicodedata2-14.0.0.ebuild b/dev-python/unicodedata2/unicodedata2-14.0.0.ebuild
deleted file mode 100644
index 935db84a6424..000000000000
--- a/dev-python/unicodedata2/unicodedata2-14.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MYPV="$(ver_rs 3 -)"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Unicodedata backport for python 2/3 updated to the latest unicode version"
-HOMEPAGE="https://github.com/mikekap/unicodedata2"
-SRC_URI="https://github.com/mikekap/unicodedata2/archive/refs/tags/${MYPV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${MYPV}"
-KEYWORDS="~amd64"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-distutils_enable_tests pytest
diff --git a/dev-python/unicodedata2/unicodedata2-15.0.0.ebuild b/dev-python/unicodedata2/unicodedata2-15.0.0.ebuild
new file mode 100644
index 000000000000..444e2d41e210
--- /dev/null
+++ b/dev-python/unicodedata2/unicodedata2-15.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="Unicodedata backport updated to the latest Unicode version"
+HOMEPAGE="
+	https://pypi.org/project/unicodedata2/
+	https://github.com/mikekap/unicodedata2
+"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DOCS=( {CHANGELOG,README}.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index 1173cae68ca4..972e67cc782d 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,2 +1,3 @@
 DIST vdirsyncer-0.18.0.tar.gz 115125 BLAKE2B d81bb9b51658d16a3b9ea044846561a1ce2dac3a839d7e0a165f0136069fcd0716525ab2b908be7cafed60846a1aed6fd72aa1d31fc2a38dbe6de8d0e6585226 SHA512 7fb3d0f7d982d8390d278de1a620231e6ead1ec64057c5dbac98dcff491fa3e6b9ed8ba953995458e393aab73b0b9ab8ba14010e06f90a04d8ee2c28c7c7fbfd
 DIST vdirsyncer-0.19.0.tar.gz 122533 BLAKE2B 18e3359fb743a8ce71f80c46da21555c4984ca47791e1a4e899408050e4a4bbad184fa94026fede1168fa3a7695539d93f1985b85c640aa1c0ca4fdf52920766 SHA512 9b8e467bdc9daf6d50981bfec1f67a1c990b07bc62a6e2d3ede35712fde60206672af53d53aca6587daee132ab74bf74f04d8bb4dbaa804dfe97dca9370b323c
+DIST vdirsyncer-0.19.1.tar.gz 122699 BLAKE2B 31fd6351046f5e668312594fa698a647e67f4b66e989a60c2bc6312748f09ea7971d3b5c04ceacbedbb7618e75febfdf175a82f286ca9425f14828ff044997d5 SHA512 2b0917bf69cfa298600b6b35b50db12ca57e1a963baf2ea9839a3c2f9f686f2f83f47c01e44ad2e12287ecfd470fe1a9ee4a756c0f8985236c2fe8d0454b6a15
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.19.1.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.19.1.ebuild
new file mode 100644
index 000000000000..5f552eee140f
--- /dev/null
+++ b/dev-python/vdirsyncer/vdirsyncer-0.19.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 pypi systemd
+
+DESCRIPTION="Synchronize calendars and contacts"
+HOMEPAGE="
+	https://github.com/pimutils/vdirsyncer/
+	https://pypi.org/project/vdirsyncer/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	<dev-python/click-9[${PYTHON_USEDEP}]
+	>=dev-python/click-5.0[${PYTHON_USEDEP}]
+	<dev-python/click-log-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
+	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.8.0[${PYTHON_USEDEP}]
+	<dev-python/aiostream-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/aiostream-0.4.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/aioresponses[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
+
+distutils_enable_tests pytest
+
+python_test() {
+	# skip tests needing servers running
+	local -x DAV_SERVER=skip
+	local -x REMOTESTORAGE_SERVER=skip
+	# pytest dies hard if the envvars do not have any value...
+	local -x CI=false
+	local -x DETERMINISTIC_TESTS=false
+
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/system/utils/test_main.py::test_request_ssl
+	)
+
+	epytest -o addopts=
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	systemd_douserunit contrib/vdirsyncer.{service,timer}
+}
diff --git a/dev-python/vharfbuzz/Manifest b/dev-python/vharfbuzz/Manifest
index d23b7890d17a..04ef53dfa226 100644
--- a/dev-python/vharfbuzz/Manifest
+++ b/dev-python/vharfbuzz/Manifest
@@ -1,2 +1 @@
-DIST vharfbuzz-0.1.3.gh.tar.gz 9359 BLAKE2B c4d7e2a1a939c59f63008f99cc6cf4ce622adebe493248c3536632051e32fe0e1ca9d48b91273ef3c157afefbfcc0062232d964cba954f1b867d91bbdc16ad41 SHA512 0b2e90da6ba613cbc24bf67d2815d6d2e857463e077410a6c86e4a4d77a734bc6b3ddaf3fbd564d06fcd2295eda13e095da55241cc31c38959703114b0cf56bf
 DIST vharfbuzz-0.1.4.gh.tar.gz 9362 BLAKE2B 6a688990e9a56e6b53cda8d1293681c3e84a888f6052e4eb3e8f62d95b145a465f3b3ed2e20f1cafc0eb3befadc5a23417fcb8d4770c1b3b009eacc985a65ca7 SHA512 0c0cf27238c0d7a763a1c683df3c2ec1d48fc11af0c347a1039d0f957efb91b21c4292d66a3c9dff60dacc1c21e3ace35fa162f262e9f3e50c24048647092a21
diff --git a/dev-python/vharfbuzz/vharfbuzz-0.1.3.ebuild b/dev-python/vharfbuzz/vharfbuzz-0.1.4-r1.ebuild
index d716cd9a919e..5673a0b6d694 100644
--- a/dev-python/vharfbuzz/vharfbuzz-0.1.3.ebuild
+++ b/dev-python/vharfbuzz/vharfbuzz-0.1.4-r1.ebuild
@@ -1,15 +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
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="A user-friendlier way to use Harfbuzz in Python"
-HOMEPAGE="https://github.com/simoncozens/vharfbuzz"
-SRC_URI="https://github.com/simoncozens/vharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://pypi.org/project/vharfbuzz/
+	https://github.com/simoncozens/vharfbuzz
+"
+SRC_URI="https://github.com/simoncozens/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 KEYWORDS="~amd64"
@@ -19,6 +22,5 @@ RDEPEND="
 	dev-python/fonttools[${PYTHON_USEDEP}]
 	dev-python/uharfbuzz[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
 
 distutils_enable_sphinx docs
diff --git a/dev-python/vharfbuzz/vharfbuzz-0.1.4.ebuild b/dev-python/vharfbuzz/vharfbuzz-0.1.4.ebuild
deleted file mode 100644
index d716cd9a919e..000000000000
--- a/dev-python/vharfbuzz/vharfbuzz-0.1.4.ebuild
+++ /dev/null
@@ -1,24 +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="A user-friendlier way to use Harfbuzz in Python"
-HOMEPAGE="https://github.com/simoncozens/vharfbuzz"
-SRC_URI="https://github.com/simoncozens/vharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	dev-python/fonttools[${PYTHON_USEDEP}]
-	dev-python/uharfbuzz[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_sphinx docs
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-02-28 09:15:11 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-02-28 09:15:11 +0000
commit	628a0a1b76f8b7b08c8286a429bd1371f790e421 (patch)
tree	e48540e8fbcb44536694fa701814ca0538e16d69 /dev-python
parent	22f877e87a316dd892787c57f205a45abe8ae144 (diff)
download	baldeagleos-repo-628a0a1b76f8b7b08c8286a429bd1371f790e421.tar.gz baldeagleos-repo-628a0a1b76f8b7b08c8286a429bd1371f790e421.tar.xz baldeagleos-repo-628a0a1b76f8b7b08c8286a429bd1371f790e421.zip