Adding metadata

62 files changed, 242 insertions, 1314 deletions

diff --git a/dev-python/apscheduler/Manifest b/dev-python/apscheduler/Manifest
index edbf5fc811a6..5d3a51ea561c 100644
--- a/dev-python/apscheduler/Manifest
+++ b/dev-python/apscheduler/Manifest
@@ -1,2 +1,3 @@
-DIST apscheduler-3.11.0.tar.gz 107347 BLAKE2B 1c18a3779f73a6efaaa92e9a12bd34afaa4afbbeed76bf20b07a2eb9dbb11740e7e6d0f2a94bdd6c8a7ad16ea4db855ccce8a9dc007aa6da7d91b7362af90753 SHA512 c66d87773d3fe353e5f0bbc4bc9ba05337b555db0810e42e2e384fd9717438fda501d0c724cd7180010b11e5d8db901922b79a163aec3a420a6a65eafb6f39f6
 DIST apscheduler-3.11.1.tar.gz 108044 BLAKE2B d36901dce5875e7b2bd0788e855e50f601467a28a0156862305f9b69959f64df4c65821d81635fb177580e7f3a91f24e3921509a607c1a46e6e40940767a447b SHA512 3d7683565eec3448b2e8fa4ae2b5772cd052faf89b2815e8ba92a6376e2f980da420604016a8193225e7f10a0a9959294ac75c8e23185870274ba9e55ba3cf45
+DIST apscheduler-3.11.2.tar.gz 108683 BLAKE2B 4278a2630acfcfd504134c8783610ac532ec4beae17c84c726c32fbb4b5d82886fd2bfd4f79939cd04ebbaa3da27e1a6e6b2ed0ede79750c9d8827e5be7c942f SHA512 80f514e337d3cbf1a6e76c33159f29961ebb8c8489e50dc985f00ee70e4c45cc60b7a8eb5eacbf7c8d56fd13620c3842d91173caac590fa113ac0b080f8053a6
+DIST apscheduler-3.11.2.tar.gz.provenance 9599 BLAKE2B 1e4732ce870c2b175e09da3f8c6a8430da0756946ef1803fdb767aeae02dc72bbd473dbb978f5f6b080f7bfb69493b2901407c15396bcef607d58e58cb08b76a SHA512 770e87a12be70b3e326de93e861a7401e52a5e2bd026be0b25bab43470c6baecef730979f7f564e5016d48813cea455dcb261caf4f6e10194a3ec18702ad64ca
diff --git a/dev-python/apscheduler/apscheduler-3.11.0.ebuild b/dev-python/apscheduler/apscheduler-3.11.2.ebuild
index 3fb9f356940b..e98158a1472b 100644
--- a/dev-python/apscheduler/apscheduler-3.11.0.ebuild
+++ b/dev-python/apscheduler/apscheduler-3.11.2.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_PN=APScheduler
+PYPI_VERIFY_REPO=https://github.com/agronholm/apscheduler
 PYTHON_COMPAT=( python3_{10..14} )
 
 inherit distutils-r1 pypi
@@ -25,21 +26,16 @@ RDEPEND="
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/anyio-4.5.2[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		>=dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
 		dev-python/tornado[${PYTHON_USEDEP}]
 	)
 "
 
+EPYTEST_PLUGINS=( anyio pytest-timeout )
 distutils_enable_tests pytest
 
 PATCHES=(
 	# disable test fixtures using external servers (mongodb, redis...)
 	"${FILESDIR}"/apscheduler-3.11.0-external-server-tests.patch
 )
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio
-}
diff --git a/dev-python/asyncssh/Manifest b/dev-python/asyncssh/Manifest
index 700d9340e666..33f7d976e2ef 100644
--- a/dev-python/asyncssh/Manifest
+++ b/dev-python/asyncssh/Manifest
@@ -1,2 +1,2 @@
-DIST asyncssh-2.21.0.tar.gz 539740 BLAKE2B 49032b7139dd451d0cd96d0b25dbe06f21f52813f1e2142c93af3460003fbe25a93b5a1b4a0fdff99c16f5dd085e7264605319013b6a5cd8cf2d02bc7801dead SHA512 d634e0f731721a430d7b77cf07fc853edf78657bfbda9c49bb17379e0d57c65bec5ff116512c3b542dfdf8ec2aef44342eb4a8028d5513aab8cbe0c3921bda3e
 DIST asyncssh-2.21.1.tar.gz 540515 BLAKE2B 58526728faeae902109525763cb71a2f4cfe19cd2f7a3619021f931790073937c725e24a540fdc281b718939dbe590da9de1630cdc602e731f4d27c8f73606d4 SHA512 49714106c3f7c44aa0998aec6fbf4f7171e81446f78818271140452ca4c945c645289335992233e71233203c38f06831582ca48e593dd2655272747af1818b37
+DIST asyncssh-2.22.0.tar.gz 540523 BLAKE2B 250253711d7a4bfda448f63888f6665d7af8ffc27c1da7389dbd996b64c028d3c0b5a0baa3f5d6e04294857cf5a8ff6b3d4a6d5c5e3a46094ddfde7f59ac4205 SHA512 30340dbfa0db60071458ce51f24d972760b3284ed7bc10613546eddb39cb191076e02c0f1405d9f2f74bed8d5102f182d5e7e8264ad0c46b10e536cd80819da6
diff --git a/dev-python/asyncssh/asyncssh-2.21.0.ebuild b/dev-python/asyncssh/asyncssh-2.22.0.ebuild
index e2b28263b7c0..79c63285a297 100644
--- a/dev-python/asyncssh/asyncssh-2.21.0.ebuild
+++ b/dev-python/asyncssh/asyncssh-2.22.0.ebuild
@@ -10,44 +10,40 @@ inherit distutils-r1 optfeature pypi
 
 DESCRIPTION="Asynchronous SSHv2 client and server library"
 HOMEPAGE="
-	https://github.com/ronf/asyncssh
+	https://github.com/ronf/asyncssh/
 	https://pypi.org/project/asyncssh/
 "
 
 LICENSE="|| ( EPL-2.0 GPL-2+ )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	virtual/openssh
 	>=dev-python/cryptography-39.0[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
 "
-
 BDEPEND="
 	test? (
 		dev-python/aiofiles[${PYTHON_USEDEP}]
 		>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-		>=dev-python/fido2-0.9.2[${PYTHON_USEDEP}]
 		>=dev-python/gssapi-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/libnacl-1.4.2[${PYTHON_USEDEP}]
 		>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		amd64? (
+			>=dev-python/fido2-2[${PYTHON_USEDEP}]
+		)
 	)
 "
 
-EPYTEST_XDIST=1
+EPYTEST_PLUGINS=()
+# xdist: fails on serializing 'type'
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
 
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p rerunfailures --reruns=5
-}
-
 pkg_postinst() {
 	optfeature "OpenSSH private key encryption support" ">=dev-python/bcrypt-3.1.3"
-	optfeature "key exchange and authentication with U2F/FIDO2 security keys support" ">=dev-python/fido2-0.9.2"
+	optfeature "key exchange and authentication with U2F/FIDO2 security keys support" ">=dev-python/fido2-2"
 	optfeature "GSSAPI key exchange and authentication support" ">=dev-python/gssapi-1.2.0"
 	optfeature "using asyncssh with dev-libs/libsodium" "dev-python/libnacl"
 	optfeature "X.509 certificate authentication support" ">=dev-python/pyopenssl-23.0.0"
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 6985d3b96e03..9011a9d461fc 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -5,8 +5,6 @@ DIST Django-5.1.15.checksum.txt 2493 BLAKE2B ad415c28c9676c39de6fd93976706a7228f
 DIST Django-5.2.8.checksum.txt 2540 BLAKE2B 6ce5b10c1125ac0f8429dd2050d252e4c3a32c00cc71b727cdf48b80add05031cc017bc0976a6e3bd9ee69ac1c1b8e5eb50c793ff48dc2d611a8396e2a0564ee SHA512 b17e87987f0c9d772d4265e10cbfd51db6ef31dc43f25364762df1dd0da1acf9ca5aa0f300110f511d8eb1e8e87bf48ecc19a0710e7a01b19884459f644982a7
 DIST Django-5.2.9.checksum.txt 2483 BLAKE2B b46ad16f6096fb52ad83518d0976fe3cad4b7b21f984be6aa8fd20255306635ccfed7f018ff420052d94ca97d2444dedc4d9a4deacf95fe92718f979aaa7157d SHA512 e72fcd67ebf3542d1f17aed46cc6dcf5efa3e1f39ad6914c50521170a944f08b94ec36caccc254178be8bcf306b76654285d37c02eb4d8c6f0728df53054a3b2
 DIST Django-6.0.checksum.txt 2463 BLAKE2B 7b0add97f793695868326b8eb58f22433b67d7b9539c932737b7ac148d0816b059436665f38dfdad007d57ed417c4353a8e970601c6a60e678c321f15bb431a3 SHA512 183de83b61595533330ff21412b587c1eeca5a7d9df956f4d2b735b603483ed96169032a387c49d2ab2e0577a1285b4411f3020dbb2025bdd2c0983527c6ede5
-DIST Django-6.0b1.checksum.txt 2540 BLAKE2B 6f045bd743c38698c7c0bbf914aca26d8eca883db60f530456b0261570fa73690755965416bf71c8f78bd6a388c5fd63de255c09a7b882eacc270f805c1c1543 SHA512 b300ba29fa55c523255fb3688079c823873e44c2b3bcd4ce3ef91e67dfac83798b56ac0588ea7487841a2d0b69af038ee563e62ebf570feaf405e0971cb453b5
-DIST Django-6.0rc1.checksum.txt 2551 BLAKE2B 0f7837fd757ba1b5845fdace35277516a9372b563623348245150ba875bc1cda4689941e1f188b6e6574a3173f7c3f66fc4cfdefeacc9737ec74ae23308f443a SHA512 92aa1687f370b53b5c69d18e7c9db26ed65d708b51e043e5f9fd32a60d68d6071e5835cedb4a44b774fcc6dbd0a993860a30a596191cf51c91e54388e4d7e023
 DIST django-4.2.17-pypy3.patch.xz 5900 BLAKE2B 2a564fc31d8e2f3def5a532d3bca1a4426a496c659192f602d659e0c1a5f5882978baedb384cc3b67fda8c836513ce43aece80db1528c8e8b6e9ca420f7572ce SHA512 9c9d935aff6db7230a26931b5e7f5f94f3b5ff4fc8f7d4201178571de9d9c7929a0e1e558cc2d9b54b8ee91f85819a5680d24fad6251620515a4a020e3b2d66d
 DIST django-4.2.26.tar.gz 10433052 BLAKE2B 5c6cd5cafcca047970b5bd9d4d6f6dedb0fdc51ff27421b409d3f08ec87422e4c33542c299389f315e2390b38498da4a0b8b934f24ececb0f3f9de729fc3975c SHA512 49fc2d3796719b201567bcd1d68d4a018a62ffbd5aef3c609cbeb4e415f6508e383908949dba45fc3c2c9ca6d53f88c80598cf72ea29bf7b9fbd7d237dcc5077
 DIST django-4.2.27.tar.gz 10432781 BLAKE2B 1a5864841d86881f245f4e8a11db290aa76753b713f3584aa1a2334131191c472839c2c5ae98bbb2c9e5ed85d99e558f08844a6d38fa87c716092efcd5fcc0b8 SHA512 8bb5e63ef13066aa8ee051ba2b7914f3c848f9c7406f2f53dd1fbaedf1ad752d342ea670485d81969d2b60a42dea2c6064065431e1415e408a7da026785e8ff1
@@ -15,5 +13,3 @@ DIST django-5.1.15.tar.gz 10719662 BLAKE2B fd8a78384b04cf1e0fa7553ebd7db77078450
 DIST django-5.2.8.tar.gz 10849032 BLAKE2B c24bed7d303ef60d468b898e8b5f09eea21ff98ddc1ee5f44f6c796c47b645cddcd877d0a64817e7c993023c8ed6cc8211ac72470ad4c500c8e54918e4a75a44 SHA512 e360b69d45841c5c6068e96560621155cba5450901c0f598da226bc6fb9ea89c5a909f5568e4b492aa852006e7b00ab3528aa8f5ff6d97baa6227e7dcf8c068c
 DIST django-5.2.9.tar.gz 10848762 BLAKE2B 45dc5c96153e57622a1ec52d93db358c3ca6100a82fd95d26f451d44a2792e78948c89c4e90fb0db8c48cbce8e6aad8d0dedc54fa13bf74fa623e6f85251a98a SHA512 669bb4e21b2073fd7a59971efa6d662c5bbfc05284867b562f93b6e56039b06f843726a1a964a4763458c211e238b21d1f91e70cda394d78031a2324bbf35d7f
 DIST django-6.0.tar.gz 10932418 BLAKE2B 897e529e59791ef6813c3abfa44ed7ce9dd051a2770c0fbfdcf47ae9aacc3e0f10a6b0fb6cd47bbd5d609dfd1d8a442528af9c42422c13d6e08bdc5937f35358 SHA512 ebc54f2320c7d7307cffff40d68142596e2cb91128eeec4a21ed88b5791aba6fe3ef599a13ef59b6e5e620531259496e4a7d1ae061e80bcdeb8a6b743c220cb6
-DIST django-6.0b1.tar.gz 11172994 BLAKE2B 03f52be511d9e3509402ff2ec8a5f582a0c199503d41f395e3e34ad37f3aadcadd7f5c4c134bc2685186a833342c0a15e734468316d4241ae3ffc8e8b886b5e8 SHA512 5007fee32b7af26afa4f9aaa506d2cb552a38ba5ac221775c12511f4fed815fae1901352ff9c35bfed48b766ee01f323a0773dcdf5e2924793612ae565c300a0
-DIST django-6.0rc1.tar.gz 10921876 BLAKE2B 35d3010cfd9aed79b8df2e50d34d731c056c86a31f0148a4b5c737f268f44353d5a5fe672ee2b5b352e25a90a08adc0f98de9c2ff820d55658aaab517b2fd9e4 SHA512 ebee0f89719992f28e49ee15ec4543fe5f65caefcf624a96146e3bb2ec327cc4646d3228d127384d97a72e0e197d636741fdb753d0291fc9fd888e496e742ea5
diff --git a/dev-python/django/django-4.2.27.ebuild b/dev-python/django/django-4.2.27.ebuild
index 1fe26958d1ed..7a83ba74dc13 100644
--- a/dev-python/django/django-4.2.27.ebuild
+++ b/dev-python/django/django-4.2.27.ebuild
@@ -17,7 +17,6 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/python/django-4.2.17-pypy3.patch.xz
 	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
 "
 
@@ -55,9 +54,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/django-4.0-bashcomp.patch
-	"${WORKDIR}"/django-4.2.17-pypy3.patch
-	# https://code.djangoproject.com/ticket/35661
-	"${FILESDIR}"/django-5.1-more-pypy3.patch
 	# https://code.djangoproject.com/ticket/34900
 	"${FILESDIR}"/django-4.2.21-py313.patch
 	# upstream hardcodes fixed versions, we backported the fixes
diff --git a/dev-python/django/django-6.0_beta1.ebuild b/dev-python/django/django-6.0_beta1.ebuild
deleted file mode 100644
index a465ac119c59..000000000000
--- a/dev-python/django/django-6.0_beta1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..14} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 multiprocessing optfeature verify-sig
-
-MY_P=${P/_beta/b}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="
-	https://www.djangoproject.com/
-	https://github.com/django/django/
-	https://pypi.org/project/Django/
-"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P^}.checksum.txt )
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/asgiref-4[${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.9.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
-	sys-libs/timezone-data
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		>=dev-python/docutils-0.19[${PYTHON_USEDEP}]
-		>=dev-python/jinja2-2.11.0[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/selenium-4.8.0[${PYTHON_USEDEP}]
-		>=dev-python/tblib-1.5.0[${PYTHON_USEDEP}]
-		sys-devel/gettext
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-django-20240807 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/django-4.0-bashcomp.patch
-	# upstream hardcodes fixed versions, we backported the fixes
-	"${FILESDIR}"/django-5.2.6-htmlparser.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P^}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite \
-		-v2 --parallel="${EPYTEST_JOBS:-$(makeopts_jobs)}" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion django-admin
-	bashcomp_alias django-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:0
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-}
diff --git a/dev-python/django/django-6.0_rc1.ebuild b/dev-python/django/django-6.0_rc1.ebuild
deleted file mode 100644
index dd43736a8ffd..000000000000
--- a/dev-python/django/django-6.0_rc1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..14} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 multiprocessing optfeature verify-sig
-
-MY_P=${P/_}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="
-	https://www.djangoproject.com/
-	https://github.com/django/django/
-	https://pypi.org/project/Django/
-"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P^}.checksum.txt )
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/asgiref-4[${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.9.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
-	sys-libs/timezone-data
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		>=dev-python/docutils-0.19[${PYTHON_USEDEP}]
-		>=dev-python/jinja2-2.11.0[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/selenium-4.8.0[${PYTHON_USEDEP}]
-		>=dev-python/tblib-1.5.0[${PYTHON_USEDEP}]
-		sys-devel/gettext
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-django-20240807 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/django-4.0-bashcomp.patch
-	# upstream hardcodes fixed versions, we backported the fixes
-	"${FILESDIR}"/django-5.2.6-htmlparser.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P^}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite \
-		-v2 --parallel="${EPYTEST_JOBS:-$(makeopts_jobs)}" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion django-admin
-	bashcomp_alias django-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:0
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-}
diff --git a/dev-python/importlib-metadata/Manifest b/dev-python/importlib-metadata/Manifest
index 4ff86a72cba8..7900b815d7f6 100644
--- a/dev-python/importlib-metadata/Manifest
+++ b/dev-python/importlib-metadata/Manifest
@@ -1 +1,2 @@
 DIST importlib_metadata-8.7.0.tar.gz 56641 BLAKE2B e73f16eed080e1713aef17e53ee7420f9233119489a0090decfee3395694c8d717b0b2e8ab4f4414153c49d511aaaca73c4a649bfec85904d46f685369532756 SHA512 f23579486a4529135b063605728e232ba798cdda0886562e14c20ca1d4cbff65ae464543c2a2adc37bd41b9e5c5519b1700b936c6fdcaab96b317c80c484c611
+DIST importlib_metadata-8.7.1.tar.gz 57107 BLAKE2B 0cbb0b8f26b30d646f4fd89bfaf278fc1f900ddfc36fb9e0551cd078c96b0f5363dc07048f5bb9df67e74fdec4d1bbe833ed6da80f988d0df09df2ac043b8b38 SHA512 4a79998ae235a3031a43c07cd70291f45a993193189000b3c6ba9628960191de4657aa547c9076333c6e3b1504ca63d3a1ea8578ab0dcdea865fb5896b420df0
diff --git a/dev-python/importlib-metadata/importlib-metadata-8.7.1.ebuild b/dev-python/importlib-metadata/importlib-metadata-8.7.1.ebuild
new file mode 100644
index 000000000000..f036914505f4
--- /dev/null
+++ b/dev-python/importlib-metadata/importlib-metadata-8.7.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( python3_{10..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="
+	https://github.com/python/importlib_metadata/
+	https://pypi.org/project/importlib-metadata/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	>=dev-python/zipp-3.20[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/jaraco-test-5.4[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_metadata"
+		version = "${PV}"
+		description = "Read metadata from Python packages"
+	EOF
+}
diff --git a/dev-python/insipid-sphinx-theme/Manifest b/dev-python/insipid-sphinx-theme/Manifest
index 2045fb099063..d99c594f8a6d 100644
--- a/dev-python/insipid-sphinx-theme/Manifest
+++ b/dev-python/insipid-sphinx-theme/Manifest
@@ -1,4 +1,2 @@
-DIST insipid_sphinx_theme-0.4.3.tar.gz 111846 BLAKE2B b6ae6ae7fc38bc7bf024f7cbdb2ae02eaedfe96567886281d6241034829c1405e94016451f463657f1ea638e5cec57ae04d4d7517e0beb3ba177d889877b7151 SHA512 63b39f082f21cc5f5ee927dab2bb40b36605bce30399e7910927c6106dbf293b33c9e21308b338888b67ef8c823668a479fb1f4ffaeeb62401aca567fc4d8a54
-DIST insipid_sphinx_theme-0.4.3.tar.gz.provenance 9552 BLAKE2B a7fbd3e8aef82372463bb335b86832c50ba0b6381f21e7d5a17d6b7ba593febe4ae2ae3ad93b0467d2e65b39855f4b30bae2a5d399db5619f9bd2c5263e80fb6 SHA512 1b6f231869c7eb8e29010cc4e7e300d99fdceb8f77a49a77474b8fe5193e8e6bd5a1048d68a713d634c8b32ac8ca065e0bd183ba467fba0cd249dfbe9cff578d
 DIST insipid_sphinx_theme-0.4.4.tar.gz 123908 BLAKE2B a02d800300173ca9bbec2412983c88d788bd272a8da55ba0cb887a63187cbdfe9f6d6899e0b817bdd79c89dfa680ea52d0712cff60f103660a76840684f94b7f SHA512 28edc4f65189821214deae504ec7585811ffecc75db70096117b74f39d41c8e653aa44919d962b9723d5ebd21e7b1d33379edc08d0f50bae69c619695a21f5b3
 DIST insipid_sphinx_theme-0.4.4.tar.gz.provenance 9685 BLAKE2B 3b7a386a84e83ee0b0116a2ecbbbac382e815c6b460b81f9a1d90867ec3b0377bfa8c8bfb555d778140f32f08bc32ef3aac7408cedd54361900cf152d4dc245b SHA512 ab3a21179c6cf67f8eed2a78e48be09ad7edc18340db6fb9f8f9aac5ed6f15d0669192e17f90280628e59904e12ba29e850e2862612384163ecda4ad6d292dcf
diff --git a/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.3.ebuild b/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.3.ebuild
deleted file mode 100644
index 87b3a3ba09ed..000000000000
--- a/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_VERIFY_REPO=https://github.com/mgeier/insipid-sphinx-theme
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Insipid Sphinx theme"
-HOMEPAGE="
-	https://pypi.org/project/insipid-sphinx-theme/
-	https://github.com/mgeier/insipid-sphinx-theme/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/jinja2-2.11[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.18[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CONTRIBUTING,NEWS,README}.rst )
-
-# needs sphinx_last_updated_by_git
-#distutils_enable_sphinx "doc"
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index bcb31b01228d..f145acea4a51 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,2 +1,2 @@
-DIST jaraco_functools-4.2.1.tar.gz 19661 BLAKE2B 0052dd97f7d6a341d59aacfd089b8973292707cb65653c2f3b3777aee415bce5bd58e0883d903c028d5899cbf62e519e5bad3731dce76d1d1bd68c7072d691f2 SHA512 f32a0a3410cffb9467a2713d2867b95e4b7491f4df28e5191cceb4e748104617ff3df79f4a86916388fca8cbe379cd8f314ed5276826057aa07b35fb7e046568
 DIST jaraco_functools-4.3.0.tar.gz 19755 BLAKE2B c49e39a1b689b9d68e619b8164e1746d53bf3ccc30bd8810846fce122f7a21c67288a8ee1d425f47b410adf18baec3223d78f6b6a7db02d18ab75af535f6cc6b SHA512 494c1eba6963d6c679200d110f3f4de00be7caa5b3783675debfa53f622d6c13bfcadda291f3cdb3ce670d8975a20c813a6a7f9c9145bf5f0503eb71363ed86f
+DIST jaraco_functools-4.4.0.tar.gz 19943 BLAKE2B c731e73db1fc74d33d0d312f3c93fc61dae1d47a239f34ad2ab8c5cd45b5dba40a1f50c96fa5d30740bb6a4dcbeae2eec99e5b1ca370574c6c226c107dd344a1 SHA512 7bfdddd2da31dee0461e791726254fcfbcf69dd198ccdfd2c87c771feb589b17a5789669e23c2cc8be4b207c073d84b03c26da3fcf7ae9c3157efd088f50cec3
diff --git a/dev-python/jaraco-functools/jaraco-functools-4.2.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-4.4.0.ebuild
index c05ea8c9cc11..f035dd4f167b 100644
--- a/dev-python/jaraco-functools/jaraco-functools-4.2.1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-4.4.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}]
@@ -29,6 +29,7 @@ BDEPEND="
 	)
 "
 
+EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
 
 src_configure() {
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index d12ab8aeaca8..a11d7c268c91 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1,3 +1 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
-EBUILD langdetect-1.0.9.ebuild 494 BLAKE2B 9cd8a2a93a8d45bf51fe2324402b175d641762ea591fcb99459427f977a95eccffa6ca4777ca4df39814eea6eac62711567faa654456d32f79023a4685804504 SHA512 d973b85ba1a44389a4275f02a779a93a005f7c2e096467b94b072862e4984d5b42cf33f9821ac68aa5b85b12c98983a90b96049989d8c84497969174b6bb838e
-MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
new file mode 100644
index 000000000000..637368d2f237
--- /dev/null
+++ b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
@@ -0,0 +1,13 @@
+Fix "Package 'langdetect.profiles' is absent from the `packages` configuration."
+
+--- a/setup.py
++++ b/setup.py
+@@ -18,7 +18,7 @@ setup(
+     author_email='michal.danilak@gmail.com',
+     url='https://github.com/Mimino666/langdetect',
+     keywords='language detection library',
+-    packages=['langdetect', 'langdetect.utils', 'langdetect.tests'],
++    packages=['langdetect', 'langdetect.utils', 'langdetect.tests', 'langdetect.profiles'],
+     include_package_data=True,
+     install_requires=['six'],
+     license='MIT',
diff --git a/dev-python/langdetect/langdetect-1.0.9.ebuild b/dev-python/langdetect/langdetect-1.0.9.ebuild
index 271137de443d..7100f5f39dd8 100644
--- a/dev-python/langdetect/langdetect-1.0.9.ebuild
+++ b/dev-python/langdetect/langdetect-1.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,4 +19,6 @@ KEYWORDS="~amd64"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
+PATCHES=( "${FILESDIR}/${P}-explicit-config.patch" )
+
 distutils_enable_tests unittest
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index 020e07f2a3dd..c0f74ac187e2 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -2,11 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>marcin.deranek@slonko.net</email>
-  <name>Marcin Deranek</name>
+  <email>pastalian46@gmail.com</email>
+  <name>Takuya Wakazono</name>
  </maintainer>
- <upstream>
-  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
- </upstream>
- <origin>slonko-overlay</origin>
+ 
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/latexrestricted/latexrestricted-0.6.2.ebuild b/dev-python/latexrestricted/latexrestricted-0.6.2.ebuild
index 3b8160ae68ec..fed9ebfb01a3 100644
--- a/dev-python/latexrestricted/latexrestricted-0.6.2.ebuild
+++ b/dev-python/latexrestricted/latexrestricted-0.6.2.ebuild
@@ -20,4 +20,4 @@ SRC_URI="
 
 LICENSE="LPPL-1.3c"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 93fce3fe20c1..070988919d8b 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,4 +1,2 @@
-DIST pyfakefs-5.10.0.gh.tar.gz 257657 BLAKE2B abf84ee4c1dab06c741eee83a6fce1f366d44d48b987f7fb79e996771e030b989c53f83a5d74c2504067b08848b359251a2e61cb177cd3f5328fa9e058201d20 SHA512 1b35cf3c0ed329e653834673bab2fbfd9d9850809b9282d5cdb90dc1a26fe39fa651778aa3ffa060b3ecccc12fcb432d45029e59b51d6f8e87fda824bbaff2cd
-DIST pyfakefs-5.10.1.gh.tar.gz 257867 BLAKE2B 374e773d968a0a24aa1e561caf8b0d58472bca7f8f864f47c156c8b3bd8e8f5c6e55a90ee4c3473c98fc2fb8c06c44d41e34c530d61b2f0550d2f4448c60d3ac SHA512 00a46de59f1e7180848e7a66d61f6c008580c41e7bc70cf78d6bcd0e80ba67956b15b72015b5ee2f4038f27c18210952522f9f4767788da015c52a2c28fd14ac
 DIST pyfakefs-5.10.2.gh.tar.gz 257936 BLAKE2B bc6adfadd0d2adcb0f56d0e9c53db5003f0a128c2f877004cf629cc70e26865c424187a737423924178f8d189ff02aebef541df6302c171c7bceaf4be6af2fc7 SHA512 57a46f01ad2985884fe8b448c3625007bbf29689e42eb956788f5f213e9557e6d0964c0e9702e784a2dfe1bd73af90d5a9dad52dd3d0ac1c1f395ea90cef47f1
-DIST pyfakefs-5.9.3.gh.tar.gz 256673 BLAKE2B 638720a82f06a0c54298959e4f9d32195fc9ffb2bae00f21fb6c4cc93862e6cb6c5680d7c4e5340ffd6259505f1ce291fdcdbcced077ab89a2b0ba58c365e732 SHA512 5a79fc56836bd8c3416f653c3222f7d93203cff112f08b9ae357b271c695a720f65fc90a8a3bfff2b8b6168ddd8dfba0219ba8582e0f54ec4d9ce393ab55dab9
+DIST pyfakefs-6.0.0.gh.tar.gz 255364 BLAKE2B 953b367fa95cbb2dccf3367de4ba6f768387d87bce2f6849b9cba4b269d52ad15f1facc12137be16095944fec9d863f6bb32aa0eeead27c97a4059e7b7d6b60e SHA512 49112c5f89843eace74ab2011b4ee1db1e5e100d3358950f4664ef3fb7f309fcef720e571e66e4b88d0997cb81f02b30c1063ac55a1877651e8aa9c3e7fa3ee4
diff --git a/dev-python/pyfakefs/pyfakefs-5.10.0.ebuild b/dev-python/pyfakefs/pyfakefs-5.10.0.ebuild
deleted file mode 100644
index 14368a34dfb1..000000000000
--- a/dev-python/pyfakefs/pyfakefs-5.10.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1
-
-DESCRIPTION="A fake file system that mocks the Python file system modules"
-HOMEPAGE="
-	https://github.com/pytest-dev/pyfakefs/
-	https://pypi.org/project/pyfakefs/
-"
-SRC_URI="
-	https://github.com/pytest-dev/pyfakefs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
-
-EPYTEST_PLUGINS=( "${PN}" )
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires *.dist-info/RECORD file that we're stripping
-		pyfakefs/tests/fake_filesystem_test.py::RealFileSystemAccessTest::test_add_package_metadata
-		# wants dev-python/openpyxl
-		pyfakefs/tests/patched_packages_test.py::TestPatchedPackages::test_read_excel
-	)
-	local EPYTEST_IGNORE=(
-		# test for regression with opentimelineio package
-		pyfakefs/pytest_tests/segfault_test.py
-		# test for regression with undefined package
-		pyfakefs/pytest_tests/pytest_fixture_test.py
-	)
-
-	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			pyfakefs/pytest_tests/pytest_reload_pandas_test.py
-		)
-	fi
-
-	case ${EPYTHON} in
-		pypy3.11)
-			EPYTEST_DESELECT+=(
-				# TODO: this test messes up everything
-				pyfakefs/tests/fake_filesystem_unittest_test.py::TestDeprecationSuppression::test_no_deprecation_warning
-				# TODO
-				pyfakefs/tests/fake_pathlib_test.py::SkipPathlibTest::test_exists
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/pyfakefs/pyfakefs-5.10.1.ebuild b/dev-python/pyfakefs/pyfakefs-5.10.1.ebuild
deleted file mode 100644
index 14368a34dfb1..000000000000
--- a/dev-python/pyfakefs/pyfakefs-5.10.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1
-
-DESCRIPTION="A fake file system that mocks the Python file system modules"
-HOMEPAGE="
-	https://github.com/pytest-dev/pyfakefs/
-	https://pypi.org/project/pyfakefs/
-"
-SRC_URI="
-	https://github.com/pytest-dev/pyfakefs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
-
-EPYTEST_PLUGINS=( "${PN}" )
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires *.dist-info/RECORD file that we're stripping
-		pyfakefs/tests/fake_filesystem_test.py::RealFileSystemAccessTest::test_add_package_metadata
-		# wants dev-python/openpyxl
-		pyfakefs/tests/patched_packages_test.py::TestPatchedPackages::test_read_excel
-	)
-	local EPYTEST_IGNORE=(
-		# test for regression with opentimelineio package
-		pyfakefs/pytest_tests/segfault_test.py
-		# test for regression with undefined package
-		pyfakefs/pytest_tests/pytest_fixture_test.py
-	)
-
-	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			pyfakefs/pytest_tests/pytest_reload_pandas_test.py
-		)
-	fi
-
-	case ${EPYTHON} in
-		pypy3.11)
-			EPYTEST_DESELECT+=(
-				# TODO: this test messes up everything
-				pyfakefs/tests/fake_filesystem_unittest_test.py::TestDeprecationSuppression::test_no_deprecation_warning
-				# TODO
-				pyfakefs/tests/fake_pathlib_test.py::SkipPathlibTest::test_exists
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/pyfakefs/pyfakefs-5.9.3.ebuild b/dev-python/pyfakefs/pyfakefs-6.0.0.ebuild
index 14368a34dfb1..9d2d4ed78e00 100644
--- a/dev-python/pyfakefs/pyfakefs-5.9.3.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-6.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 EPYTEST_PLUGINS=( "${PN}" )
 distutils_enable_tests pytest
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index c9c50f176184..a25479547231 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1 +1,2 @@
 DIST pygresql-6.0.1.tar.gz 271855 BLAKE2B 76d3f18d2bdbe7aa1d4459784fd5f1d3d76feaaeb911f1679c66d1a579cef27a00af619416f03cfcd69804e4f5a997d82765c3e32d9ab371c6011b0915e3e018 SHA512 47b0296596d5d914ccd48e09f352f8da38ed82a0861a148525a675431df51b1261d03e7bbb158947d4d525d82e1790d0a4d4c4d293b29550c50965e2a4e89847
+DIST pygresql-6.2.0.tar.gz 272156 BLAKE2B 4fcd987b2c174e253765476fc754b71f58228ecfc142ce9c9e6e2d5dc473fa3f7ce8a1a1799ffdbb64c161254720c99010d2f59e2a19963305ac18e8fa026418 SHA512 437c19795670bea17989ddcd213341135d70dfcc3035cc82e25ab08c70df14e653b513ed8d0a7e118d8344b895950eec34ace824d09e07e12d3b5fe10912d069
diff --git a/dev-python/pygresql/pygresql-6.2.0.ebuild b/dev-python/pygresql/pygresql-6.2.0.ebuild
new file mode 100644
index 000000000000..3c2e5f5b11b1
--- /dev/null
+++ b/dev-python/pygresql/pygresql-6.2.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN="PyGreSQL"
+POSTGRES_COMPAT=( 9.6 {10..18} )
+PYTHON_COMPAT=( python3_{10..14} )
+
+inherit distutils-r1 postgres pypi
+
+DESCRIPTION="A Python interface for the PostgreSQL database"
+HOMEPAGE="
+	https://pygresql.github.io/
+	https://github.com/PyGreSQL/PyGreSQL/
+	https://pypi.org/project/PyGreSQL/
+"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+
+DEPEND="${POSTGRES_DEP}"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? (
+		dev-db/postgresql[server]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2-CFLAGS.patch
+)
+
+distutils_enable_tests unittest
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		postgres_pkg_setup
+	fi
+}
+
+src_test() {
+	local db="${T}/pgsql"
+	initdb --username=portage -D "${db}" || die
+	pg_ctl -w -D "${db}" start \
+		-o "-h '127.0.0.1' -p 5432 -k '${T}'" || die
+	psql -h "${T}" -U portage -d postgres \
+		-c "ALTER ROLE portage WITH PASSWORD 'postgres';" || die
+	createdb -h "${T}" -U portage test || die
+
+	cat > tests/LOCAL_PyGreSQL.py <<-EOF || die
+		dbhost = '${T}'
+	EOF
+
+	rm -rf pg || die
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${db}" stop || die
+}
+
+python_install_all() {
+	local DOCS=( docs/*.rst docs/community/* docs/contents/tutorial.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index 5310df1e1e31..a393c37dcac7 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -1,7 +1,5 @@
-DIST pypdf-6.1.3.gh.tar.gz 8097681 BLAKE2B 90b617886d9e6ccdac701308479c3db6671f850f91002339c6e6530b270eef196204f54456956cfa3cf8f4853063996ae158f09d34e4b11a43319f712d6ed262 SHA512 6fc723a2bf3d93d2a759e982bc1f131393711a7e55b9508a13293d1d5cedb3f28857bc49560e3e283057bb6e63bbfd3b925e2b13de7388833f1d8cfcbc2c0ab6
 DIST pypdf-6.2.0.gh.tar.gz 8292284 BLAKE2B 5df0f87c0df7760c510b92a66e80cd260064583812e8d50c9c8b735e1b21b1e81ba0170fc112145df1d7de4681da5ed42555ef850d874a62eda5e08655878d21 SHA512 dcbcced7a0fef3cd08834850300e8eb9608e92a6092fbc68e448a43fa7ea80d3f03b864d294d526633b1bf693af8d97af42290e2d98b05078cc85c385f523194
 DIST pypdf-6.3.0.gh.tar.gz 8295782 BLAKE2B cba7ff1a55f52cfa5d83e8dd11c9a9be6b38f3c9eb42ce14d22b080fdfea72e21da6698d2b05ed02d9aa5b537bd5202205ef11e9c87f2442b56fdd2659a19f3b SHA512 3271c1d991f724e1fb3e85f420a7d60570122460b38ff16b1cd8b3c9dbcadc1d59a6474568a6baf3d7be5669c013938e10246223850f1882027a9d29b016499d
-DIST pypdf-6.4.0.gh.tar.gz 8297749 BLAKE2B c5259669ebf291af2c2a52b8547672dfdbbd9c6d98696f0264d5d77cc3bfa65c9421959608e1a49a31db19afd6c7a1b056ebf3a876bcca3e628ce3162a598719 SHA512 013b05c02878ae8e37899be2f431f5f10856cc35f259af0a6960b78494e6cd81fc7513af8b369dd68f83ce6f74f0dee5df353b86a2ec2ae0e67532cd0d602714
-DIST pypdf-6.4.1.gh.tar.gz 8295153 BLAKE2B 348a1a467bba56e244df5e35392cefb62e46191ea7ac61a8a19cdba3986245ce7ceee7563c597cf7c3135e32eebe1ef7990112a725b595ecee871d41cc025da1 SHA512 677456611df6841002b64aa1fa8b115068762e7f7b5a94247f65204ae693b7e81487a49cfbaf4d60d08340abc80c22ef6d07cf2a084ae8783c8665c8d23db36c
 DIST pypdf-6.4.2.gh.tar.gz 8295275 BLAKE2B 745936795cabbdd7f561743fb7a0e6b497a683fe23f32560336e82c3f5866a289ffd771e60f73d1782f73f5019191375704f0bc66617eb24cec860ab2613af8d SHA512 985f5a41bf2ab9ea9930dcd6a8f203596d1b50518f63ee815e0e6e74e050afd9a124b380fd8066c7f0b134886a645e165598d7764e3a40c3670df7e8de5c1995
+DIST pypdf-6.5.0.gh.tar.gz 8301408 BLAKE2B 9df78a6d9cd8da07d55649ad92491a97d9fc02ea5329b8d6697a05f27a3c0dd1225271dfc4fda7cee6f6c571e328559cd42ead3535904f69c7517a90aa4dceb9 SHA512 09b098660affaaab94c2b7c3aec25538c639c1b15190aee01fa6d9e5882ad75299d53629bd4566bc7c667bfbad8cc8dc05a389598f29dd777121ea9eb10bea40
 DIST pypdf-sample-files-8c405ece5eff12396a34a1fae3276132002e1753.gh.tar.gz 11748093 BLAKE2B c5989200893b28a3c2062bb024a5cfc6f3389dc259ec129857979fa43469e1274559612b4d555499e2c7e16cf34be07825229932bf4d147fa6d7324d043e97d5 SHA512 c9771129b7668a2fd1fa79bb859ae9213f3d60341cf1b9937ff0eaab0de9bf4c35adcb7b896e93329038dc0f3809a0c697c523f8fe41b43030b0b029a88058e3
diff --git a/dev-python/pypdf/pypdf-6.1.3.ebuild b/dev-python/pypdf/pypdf-6.1.3.ebuild
deleted file mode 100644
index 720a04bc8bdd..000000000000
--- a/dev-python/pypdf/pypdf-6.1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=8c405ece5eff12396a34a1fae3276132002e1753
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/pypdf/
-	https://github.com/py-pdf/pypdf/
-"
-SRC_URI="
-	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/pillow-8.0.0[jpeg,jpeg2k,tiff,zlib,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		media-libs/jbig2dec[png]
-	)
-"
-
-EPYTEST_PLUGINS=()
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
-
-python_test() {
-	epytest -o addopts= -m "not enable_socket"
-}
diff --git a/dev-python/pypdf/pypdf-6.4.1.ebuild b/dev-python/pypdf/pypdf-6.4.1.ebuild
deleted file mode 100644
index 5434607478d9..000000000000
--- a/dev-python/pypdf/pypdf-6.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=8c405ece5eff12396a34a1fae3276132002e1753
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/pypdf/
-	https://github.com/py-pdf/pypdf/
-"
-SRC_URI="
-	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/pillow-8.0.0[jpeg,jpeg2k,tiff,zlib,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		media-libs/jbig2dec[png]
-	)
-"
-
-EPYTEST_PLUGINS=( pytest-timeout )
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
-
-python_test() {
-	epytest -o addopts= -m "not enable_socket"
-}
diff --git a/dev-python/pypdf/pypdf-6.4.0.ebuild b/dev-python/pypdf/pypdf-6.5.0.ebuild
index 5434607478d9..5434607478d9 100644
--- a/dev-python/pypdf/pypdf-6.4.0.ebuild
+++ b/dev-python/pypdf/pypdf-6.5.0.ebuild
diff --git a/dev-python/pyro5/Manifest b/dev-python/pyro5/Manifest
index 56c28ac55ea0..c4fa94c81221 100644
--- a/dev-python/pyro5/Manifest
+++ b/dev-python/pyro5/Manifest
@@ -1 +1,2 @@
 DIST Pyro5-5.15.tar.gz 447559 BLAKE2B e8831a4321205a8affef5cf0b986b3a10480296b03ac132cb5faa5508a1dbe0ba59a8dfb9a7ec284483d0736224291d033a02061b277078b26c1f71b1fd6bcc8 SHA512 bafed86363b0fd94900f0c708ffb6aa664587a7c032aa974b766556ec86d5db0eb89a8ceffa0a1e7dd043be8d0a1d8826fa79e1ca95002dbe380213c367684a3
+DIST pyro5-5.16.tar.gz 448592 BLAKE2B dbf0e144564afd7bcfa47fe8cdf9571a5b15be462705db360f2e770333482705864fb1567c028fe2d92573b6e6fcd0ef18d27ef90bf9fa41976e573975085a30 SHA512 4a3c67bedb33788f0dfb9e0d75889b339b12da8806d6f4e1ced6e4b62812071a028d232a0ef44c95841acba523aa7466317c5269f17a0ac3d62c8b3667ac6e3a
diff --git a/dev-python/pyro5/pyro5-5.16.ebuild b/dev-python/pyro5/pyro5-5.16.ebuild
new file mode 100644
index 000000000000..988550bf7319
--- /dev/null
+++ b/dev-python/pyro5/pyro5-5.16.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..14} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Distributed object middleware for Python (RPC)"
+HOMEPAGE="
+	https://pyro5.readthedocs.io/
+	https://github.com/irmen/Pyro5/
+	https://pypi.org/project/Pyro5/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/build[${PYTHON_USEDEP}]
+	>=dev-python/serpent-1.40[${PYTHON_USEDEP}]
+"
+
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source \
+	dev-python/sphinx-rtd-theme
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# https://github.com/irmen/Pyro5/issues/83 (pypy3 specific)
+		tests/test_server.py::TestServerOnce::testRegisterWeak
+	)
+
+	epytest -m 'not network'
+}
diff --git a/dev-python/python-lsp-black/python-lsp-black-2.0.0.ebuild b/dev-python/python-lsp-black/python-lsp-black-2.0.0.ebuild
index 7fc81e5321b9..fc9bcdd6c978 100644
--- a/dev-python/python-lsp-black/python-lsp-black-2.0.0.ebuild
+++ b/dev-python/python-lsp-black/python-lsp-black-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index b9877902625b..ffdea008cbb3 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,4 +1,4 @@
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
-DIST reportlab-4.4.4.tar.gz 3711935 BLAKE2B 533ef3b23a83d472d29dc631032de56454c3a8d97d4b6f8336b54e7787c7318ce89eedf91a1edd5750aa31b451d3565afb6bfda1773d7b6104caf363578efaae SHA512 0366fa5986f0da99e34baac95b02873b4ea27e80f149fd43010063172f3d9d60dfae4f24f20f1f735d485be4cd9b41e0872682eb7200070913524c39c8bf6eb4
 DIST reportlab-4.4.5.tar.gz 3910836 BLAKE2B ace85c323739bbbbf74dc76d0b0143e25867893c42bbd3b53277497267b81669ddde722fe0188842974f41757fb02ef14a0af868563453dd2068208c75cfa927 SHA512 400240eb3cd511c7c4a27d25ff754aff4ce6cbda1d93106cbea1f51f4c7ab2ad7991204965f861f8eefa04f97660ddb47dbdcc9c55cd9a6f205c55f8feede937
 DIST reportlab-4.4.6.tar.gz 3910805 BLAKE2B 55fd316b38595a65fbd0f3a9c1f163be867111ca6f2aad4821fe91081674766d05dd15a5e4c689ad2471929d8c8529c8fe27770aeabb4dc3ca98785a9a094c40 SHA512 dc3fcf2728a709d31467e86c32982409a2e3d00b1fee0871ad65d93923683dd9da2a1ed129babe287f7d00ac3613853121f97e9781efa31b0837cc02ff9185e6
+DIST reportlab-4.4.7.tar.gz 3714000 BLAKE2B 41dc91418f101e1437e3af84dbd2d66d52e880a20f1865c770e6815d7fcdc259c67949420000e53fd2782abca65d66ff4940286c56f8f088a4903ef0637550e9 SHA512 0960f8d5fec4fb7a09e1dbd791246ec254a551850b8bb3ad92be2add55550bdbf300dc44ad77f2ab00c73bd16d27349b4dd672582b6b4996d1e2ae426401bc40
diff --git a/dev-python/reportlab/reportlab-4.4.4.ebuild b/dev-python/reportlab/reportlab-4.4.7.ebuild
index 8a839e9f3214..98aabd48b087 100644
--- a/dev-python/reportlab/reportlab-4.4.4.ebuild
+++ b/dev-python/reportlab/reportlab-4.4.7.ebuild
@@ -20,7 +20,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/charset-normalizer[${PYTHON_USEDEP}]
diff --git a/dev-python/rich-click/Manifest b/dev-python/rich-click/Manifest
index 9a0d0d73637a..97f254a8ae8d 100644
--- a/dev-python/rich-click/Manifest
+++ b/dev-python/rich-click/Manifest
@@ -1,3 +1,3 @@
 DIST rich-click-1.8.9.gh.tar.gz 8142387 BLAKE2B de7aa54989747d47c2d147cec8235c4619a90b5a536266dbf2f499f704c3671bb4697bbcb23b0d0827caaf52d65dd29157f01918d29abc9c469fdd6c84af0c84 SHA512 6655ee3ac54fdae5a1221ef2ceaae35aa2ed8381c29f9808bb852d0790426a90d1fcb1a82faa61a22112946b988f891fc76dc3976ae756702458c547d7014745
-DIST rich-click-1.9.3.gh.tar.gz 8523240 BLAKE2B bba09c1046f0ecc6c478e31214538c6c8f9fcd75a971acdf720fa27bae582dadc7ba7d06089d8591fd9c56a9d71201c41f0d16c0f33830ea8e5afb405fbdc16c SHA512 93b05bbea12471e1a3e4c710b2f34fab024e5dbeab7f77ac8301be640a0a97fd02f8b1a64c06119727b3751656270d5595c5e9dde5bcccfd2d037fa013120407
 DIST rich-click-1.9.4.gh.tar.gz 8523687 BLAKE2B d4e4d192334d511494ffd76ba7a05337deabe820afd80524e010ba58f78862fea7048323acd87a2ef7177366353a96a1575950d3ad0d5676930d48887c1381ef SHA512 c42751ef91c5877c2082b466da1743e9adba5215af7a0f93755d955db18e57276522f10ea4cc3c74e2b25457e0d042edb6533dea6d7f933dd15deb3b74f3b5d3
+DIST rich-click-1.9.5.gh.tar.gz 8523814 BLAKE2B fe5649b89694992331ccdcaa703b9391d70d4dd5126f3dd1617071206f978b26196319f0e63d2cec858afd0c2b3dce935c5bf991d1b364606d1ebc64d2c67c04 SHA512 5f7c35d3c6471cd67653b209bcf546d05634574b39b02497188f90e15fc2041f301f20061db9904d764b1aaeab1094f297f88ea1b217cb5dacfdf956b6c036e7
diff --git a/dev-python/rich-click/rich-click-1.9.3.ebuild b/dev-python/rich-click/rich-click-1.9.5.ebuild
index 26678a6ac2ab..26678a6ac2ab 100644
--- a/dev-python/rich-click/rich-click-1.9.3.ebuild
+++ b/dev-python/rich-click/rich-click-1.9.5.ebuild
diff --git a/dev-python/sphinx-panels/sphinx-panels-0.6.0-r1.ebuild b/dev-python/sphinx-panels/sphinx-panels-0.6.0-r1.ebuild
index 704224a9f2c7..c55f5da9862b 100644
--- a/dev-python/sphinx-panels/sphinx-panels-0.6.0-r1.ebuild
+++ b/dev-python/sphinx-panels/sphinx-panels-0.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 919f933a65b4..1f08093a713b 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,4 +1,3 @@
 DIST sphinx-8.2.3.gh.tar.gz 8378376 BLAKE2B ddfa406140bebcaa09299a56fedf1170db6504a9ce3807e20c555f5e088d81acbfd19f2621a824b91199713b301380fd2056cf2282ea81f4a0858dd714eb7e45 SHA512 23066d9e98f3e36ee34ac3bc5af45792762f858e1e670145b7d1db7e98fa9e9654d87a27b9316dd72704aeea75b53f73d07d22f723c915d23a95f59bbd4f6365
-DIST sphinx-9.0.3.gh.tar.gz 8843780 BLAKE2B 4d3bb39c612f099cd93d99a7f808012a511aca7f885124de2a29aca9ff40e139cbbf340a0895a40c6e7747113839d9b69785ba501b26219b92b61f3c4a5225f9 SHA512 49014e02017d1d70a84c0877d24c13732ee936d456e01b72e53dcaa7009cdf18c9dd5d0c23d25adb718439999d2d82cbcd29ba7e97289c394f3a1cdb456fe8af
 DIST sphinx-9.0.4.gh.tar.gz 8843746 BLAKE2B 4cae21fa2b980f529f58444c4cf793ec455f5a0ea43944fa44e9e99a3d03de48f88f170e6c7382dea99cd0bb895729ee0b43cafe2aef1e84a190ea244e4c08da SHA512 8652e6a65060a81609275afa6301bb0eaccda939e2988f86d548796a215a86c923c9240422497abe77652a436479930e81dfdf43fba9722b63a50542d3ac9522
 DIST sphinx-9.1.0rc1.gh.tar.gz 8833000 BLAKE2B 12d327d8a15aae35c3e9bae4dd812334c7bc05ab16b8662c72d22d1d9a5b05eda6fff0be6299fda83a5cd8b9b88af8e5d704f78bdfe177081e68ad141f958a01 SHA512 02c24534b9137972dc48bb88e1c033ffd081c2493cd4a58eddc817f0ef340e883e53ac8deafaf1bb34977f8350f8cdfeb1b12e10f388ecdf33a5e761d15ccc58
diff --git a/dev-python/sphinx/sphinx-9.0.3.ebuild b/dev-python/sphinx/sphinx-9.0.3.ebuild
deleted file mode 100644
index a32dc380ae22..000000000000
--- a/dev-python/sphinx/sphinx-9.0.3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..14} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx/
-	https://pypi.org/project/Sphinx/
-"
-SRC_URI="
-	https://github.com/sphinx-doc/sphinx/archive/v${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-if [[ ${PV} != *_rc* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-IUSE="doc latex"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.14[${PYTHON_USEDEP}]
-	>=dev-python/babel-2.13[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.23[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.20[${PYTHON_USEDEP}]
-	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-3.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
-	>=dev-python/roman-numerals-py-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-2.2[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-applehelp-1.0.7[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-devhelp-1.0.6[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.6[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-jsmath-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-qthelp-1.0.6[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.9[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-"
-BDEPEND="
-	>=dev-python/flit-core-3.11
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		app-text/dvipng
-		>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.0[${PYTHON_USEDEP}]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		virtual/imagemagick-tools[jpeg,png,svg]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
-)
-
-EPYTEST_PLUGINS=()
-EPYTEST_RERUNS=5
-# EPYTEST_XDIST breaks stuff
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# roman-numerals-py has been renamed (no -py), but the package can't be pkgmoved "yet".
-	# For rc1, simply fix pip check by using the old name.
-	sed -i -e 's:roman-numerals:roman-numerals-py:' pyproject.toml || die
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# we can't use distutils_enable_sphinx because it would
-	# introduce a dep on itself
-	use doc && build_sphinx doc
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3.11)
-			EPYTEST_DESELECT+=(
-				# TODO
-				tests/test_util/test_util_inspect.py::test_is_classmethod_descriptor
-				tests/test_util/test_util_inspect.py::test_is_builtin_classmethod_like
-				# minor repr() differences
-				tests/test_util/test_util_typing.py::test_restify
-				tests/test_util/test_util_typing.py::test_stringify_annotation
-				tests/test_util/test_util_typing.py::test_stringify_type_union_operator
-				# from pypy3 era
-				tests/test_ext_autodoc/test_ext_autodoc.py::test_autodoc_exception
-				tests/test_ext_autodoc/test_ext_autodoc.py::test_autodoc_ignore_module_all
-				tests/test_ext_autodoc/test_ext_autodoc.py::test_autodoc_inherited_members_None
-				tests/test_ext_autodoc/test_ext_autodoc.py::test_autodoc_subclass_of_builtin_class
-				tests/test_ext_autodoc/test_ext_autodoc.py::test_automethod_for_builtin
-				tests/test_ext_autodoc/test_ext_autodoc.py::test_cython
-				tests/test_ext_autodoc/test_ext_autodoc.py::test_partialfunction
-				tests/test_ext_autodoc/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-				tests/test_ext_autodoc/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
-				tests/test_ext_autodoc/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-				tests/test_ext_autodoc/test_ext_autodoc_autofunction.py::test_builtin_function
-				tests/test_ext_autodoc/test_ext_autodoc_autofunction.py::test_methoddescriptor
-				tests/test_ext_autodoc/test_ext_autodoc_automodule.py::test_automodule_inherited_members
-				tests/test_ext_autodoc/test_ext_autodoc_preserve_defaults.py::test_preserve_defaults_special_constructs
-				tests/test_ext_autodoc/test_ext_autodoc_signatures.py::test_format_class_signatures_text_signature
-				tests/test_ext_autodoc/test_ext_autodoc_signatures.py::test_format_class_signatures_no_text_signature
-				tests/test_ext_autodoc/test_ext_autodoc_signatures.py::test_format_method_signatures_error_handling
-				tests/test_ext_autosummary/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-				tests/test_ext_autosummary/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-				tests/test_util/test_util_inspect.py::test_isattributedescriptor
-				tests/test_util/test_util_inspect.py::test_signature
-				tests/test_util/test_util_typing.py::test_is_invalid_builtin_class
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/sphinx/sphinx-9.0.4.ebuild b/dev-python/sphinx/sphinx-9.0.4.ebuild
deleted file mode 100644
index a32dc380ae22..000000000000
--- a/dev-python/sphinx/sphinx-9.0.4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..14} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx/
-	https://pypi.org/project/Sphinx/
-"
-SRC_URI="
-	https://github.com/sphinx-doc/sphinx/archive/v${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-if [[ ${PV} != *_rc* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-IUSE="doc latex"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.14[${PYTHON_USEDEP}]
-	>=dev-python/babel-2.13[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.23[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.20[${PYTHON_USEDEP}]
-	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-3.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
-	>=dev-python/roman-numerals-py-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-2.2[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-applehelp-1.0.7[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-devhelp-1.0.6[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.6[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-jsmath-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-qthelp-1.0.6[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.9[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-"
-BDEPEND="
-	>=dev-python/flit-core-3.11
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		app-text/dvipng
-		>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.0[${PYTHON_USEDEP}]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		virtual/imagemagick-tools[jpeg,png,svg]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
-)
-
-EPYTEST_PLUGINS=()
-EPYTEST_RERUNS=5
-# EPYTEST_XDIST breaks stuff
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# roman-numerals-py has been renamed (no -py), but the package can't be pkgmoved "yet".
-	# For rc1, simply fix pip check by using the old name.
-	sed -i -e 's:roman-numerals:roman-numerals-py:' pyproject.toml || die
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# we can't use distutils_enable_sphinx because it would
-	# introduce a dep on itself
-	use doc && build_sphinx doc
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3.11)
-			EPYTEST_DESELECT+=(
-				# TODO
-				tests/test_util/test_util_inspect.py::test_is_classmethod_descriptor
-				tests/test_util/test_util_inspect.py::test_is_builtin_classmethod_like
-				# minor repr() differences
-				tests/test_util/test_util_typing.py::test_restify
-				tests/test_util/test_util_typing.py::test_stringify_annotation
-				tests/test_util/test_util_typing.py::test_stringify_type_union_operator
-				# from pypy3 era
-				tests/test_ext_autodoc/test_ext_autodoc.py::test_autodoc_exception
-				tests/test_ext_autodoc/test_ext_autodoc.py::test_autodoc_ignore_module_all
-				tests/test_ext_autodoc/test_ext_autodoc.py::test_autodoc_inherited_members_None
-				tests/test_ext_autodoc/test_ext_autodoc.py::test_autodoc_subclass_of_builtin_class
-				tests/test_ext_autodoc/test_ext_autodoc.py::test_automethod_for_builtin
-				tests/test_ext_autodoc/test_ext_autodoc.py::test_cython
-				tests/test_ext_autodoc/test_ext_autodoc.py::test_partialfunction
-				tests/test_ext_autodoc/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-				tests/test_ext_autodoc/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
-				tests/test_ext_autodoc/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-				tests/test_ext_autodoc/test_ext_autodoc_autofunction.py::test_builtin_function
-				tests/test_ext_autodoc/test_ext_autodoc_autofunction.py::test_methoddescriptor
-				tests/test_ext_autodoc/test_ext_autodoc_automodule.py::test_automodule_inherited_members
-				tests/test_ext_autodoc/test_ext_autodoc_preserve_defaults.py::test_preserve_defaults_special_constructs
-				tests/test_ext_autodoc/test_ext_autodoc_signatures.py::test_format_class_signatures_text_signature
-				tests/test_ext_autodoc/test_ext_autodoc_signatures.py::test_format_class_signatures_no_text_signature
-				tests/test_ext_autodoc/test_ext_autodoc_signatures.py::test_format_method_signatures_error_handling
-				tests/test_ext_autosummary/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-				tests/test_ext_autosummary/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-				tests/test_util/test_util_inspect.py::test_isattributedescriptor
-				tests/test_util/test_util_inspect.py::test_signature
-				tests/test_util/test_util_typing.py::test_is_invalid_builtin_class
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-2.0.0.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-2.0.0.ebuild
deleted file mode 100644
index 95069f7ce90f..000000000000
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-2.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx extension which outputs Apple help book"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-applehelp/
-	https://pypi.org/project/sphinxcontrib-applehelp/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
-
-PDEPEND="
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${PDEPEND} )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-2.0.0.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-2.0.0.ebuild
deleted file mode 100644
index f1797ac5d2c3..000000000000
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-2.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx extension which outputs Devhelp documents"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-devhelp/
-	https://pypi.org/project/sphinxcontrib-devhelp/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
-
-PDEPEND="
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${PDEPEND} )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.1.0.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.1.0.ebuild
deleted file mode 100644
index c587aa2be355..000000000000
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx extension which outputs HTML help book"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-htmlhelp/
-	https://pypi.org/project/sphinxcontrib-htmlhelp/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
-
-PDEPEND="
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${PDEPEND}
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r3.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r3.ebuild
deleted file mode 100644
index cc6560d9452d..000000000000
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx extension which renders display math in HTML via JavaScript"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-jsmath/
-	https://pypi.org/project/sphinxcontrib-jsmath/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
-
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${PDEPEND} )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# This is already fixed in upstream, remove it on next version bump,
-	# see https://github.com/sphinx-doc/sphinxcontrib-jsmath/pull/10
-	sed -i 's/.text()/.read_text()/' tests/test_jsmath.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-2.0.0.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-2.0.0.ebuild
deleted file mode 100644
index d714319ebd1f..000000000000
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-2.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx extension which outputs QtHelp documents"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-qthelp/
-	https://pypi.org/project/sphinxcontrib-qthelp/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
-
-PDEPEND="
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-		${PDEPEND}
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-2.0.0.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-2.0.0.ebuild
deleted file mode 100644
index 44d8d1d97070..000000000000
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-2.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx extension which outputs outputs serialized HTML files"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-serializinghtml/
-	https://pypi.org/project/sphinxcontrib-serializinghtml/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
-
-PDEPEND="
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${PDEPEND} )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index 946287713db6..01df84c06214 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,2 +1 @@
-DIST sphinxcontrib_websupport-1.2.7.tar.gz 599362 BLAKE2B 544e77a739e0ecd9391893f56eeec2df4d5ddc6840a30e9a92e84e35e9ed0a765d4190790a13e329621ba045ee46b5e01d4d0825b6f37e9848953f9e796ae8af SHA512 daa5ecf6fd3fb6df6a9a3b60668d42d50d93454dc3c2703a1dd43d75220b326e90c5e0ae2cca27afe62e41ae03e7144e6b4cfe70096b857af74c8981fadba9ca
 DIST sphinxcontrib_websupport-2.0.0.tar.gz 600125 BLAKE2B 975ff0ceb1f94a87cf57f0ea7f9b80aae4dea7583d90ceb142491ea935201acbb21828b5f56f104fa95643cbc8050c21459c34da123172292955908a2bfb036b SHA512 2a38530db266b6eb26f200ac135a98d1ea982baae4d20fa6dbccc8ff36c6f4c4b7fe012665372c1065553cd27ebba4178127b40481e0b25363436a4a7a3920e0
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7-r1.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7-r1.ebuild
deleted file mode 100644
index 2eda49a61a46..000000000000
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_TESTED=( pypy3_11 python3_{11..14} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx websupport extension"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-websupport/
-	https://pypi.org/project/sphinxcontrib-websupport/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
-
-RDEPEND="
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
-"
-# avoid circular dependency with sphinx
-PDEPEND="
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-"
-# there are additional optional test deps on sqlalchemy and whoosh
-BDEPEND="
-	test? (
-		${PDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/sqlalchemy[${PYTHON_USEDEP}]
-			dev-python/whoosh[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild
deleted file mode 100644
index 7a441dc84cb5..000000000000
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_TESTED=( python3_{10..13} pypy3 pypy3_11 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx websupport extension"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-websupport/
-	https://pypi.org/project/sphinxcontrib-websupport/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
-
-RDEPEND="
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
-"
-# avoid circular dependency with sphinx
-PDEPEND="
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-"
-# there are additional optional test deps on sqlalchemy and whoosh
-BDEPEND="
-	test? (
-		${PDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/sqlalchemy[${PYTHON_USEDEP}]
-			dev-python/whoosh[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-2.0.0.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-2.0.0.ebuild
index c596487a3c3b..76d08c198a99 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-2.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_TESTED=( pypy3_11 python3_{11..14} )
+PYTHON_TESTED=( python3_{12..14} )
 PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
 
 inherit distutils-r1 pypi
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index 2deafec7d4c8..feabb4bb9b8e 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,2 +1,2 @@
-DIST tifffile-2025.10.16.gh.tar.gz 362127 BLAKE2B df4b16596110f7db0ea6c2f371a14e4dc92f45a3337535c7f276c20c3daf7845eb90f5874f8a9281b226cafc085ef2725d6004e80b9aacb015a7aabee50ef402 SHA512 066817c268f4a3207261857b24ba2d2b7f100aedd1947d8b0d8b0a54a0dee6cb71ca0213555ab598457d2d98bda09f4cd57ec8c76b03024e2727a8b7e9b95588
 DIST tifffile-2025.12.12.gh.tar.gz 364067 BLAKE2B 7d790b7e27ff3975167a689ebd9011fc5a885d5d92c85083dfc11792391ef1bdf68682ff14c2aaa230601ae5793d668648fbd05d741c27e27a94a0987fa92e18 SHA512 87554790ae69b0e6a5cfb3b352df56a885c37f0d491ebf996bec13b2b5d9aa4ab6f57f514d81db967632a6f8e9d64cb92c90b7539ac931eae3147fb9183f6d5b
+DIST tifffile-2025.12.20.gh.tar.gz 364177 BLAKE2B f271c0f353eb444795a4913464d30196058d8b4eb980e5708f9ffa5b07b2744c621c9c76eb7f0f70a5e12e54875fa48993f1abc31a89254625563300eff93fc5 SHA512 88a918d61cca690433f8176c48624419d9367178fb28c0e1f102391c28c8552c04babf32656ddb28f443adf1872e86545550bf20568cea36b752dbda54a2fe34
diff --git a/dev-python/tifffile/tifffile-2025.10.16.ebuild b/dev-python/tifffile/tifffile-2025.12.20.ebuild
index 5b5faa624889..5b5faa624889 100644
--- a/dev-python/tifffile/tifffile-2025.10.16.ebuild
+++ b/dev-python/tifffile/tifffile-2025.12.20.ebuild
diff --git a/dev-python/types-setuptools/Manifest b/dev-python/types-setuptools/Manifest
index 4998978f4013..50adac272590 100644
--- a/dev-python/types-setuptools/Manifest
+++ b/dev-python/types-setuptools/Manifest
@@ -1,4 +1,2 @@
-DIST types_setuptools-80.9.0.20250529.tar.gz 41337 BLAKE2B c6251c9380efd198b96cd9c30c953c28e1729ece3f5120fe299e9f8bfbf1e6e68e0047a3c19d9c82d49c96031e7fec5b7d819895890155a04e5027c4ec71d5dd SHA512 449bfc4ccede10e2c1c44a318245a10d6398b550c97dec5a44f4b22107f97504355a2f77d2ca4db58641b2fdf777c4b0cc942b4e0105038642f3f5c894af29c0
-DIST types_setuptools-80.9.0.20250801.tar.gz 41182 BLAKE2B ee65184c64be0f207bf7bc32d9dc0f22e504211069d9a842fd8bf64c9bd5a8388fd9458a17a5d97a8d5e9db034e5a534b8ecdd597ca4ccbf0ed80889476674a0 SHA512 4d66ef89f291a6790ce30db495e157d21ffc7a4c7933f1f5ae53d7f163fa84dd6fb41112ed5dac5fa96e985c0455d474a902dab5acf5710b4a96eb505d51260c
-DIST types_setuptools-80.9.0.20250809.tar.gz 41209 BLAKE2B 031af80e4847a0e2233a494528b0cc6611db057154a385a81cc8c9cb2ea58e637e4909210ec809030968b513bd1a2441be43726904625fc2927b8a6e8ac498d1 SHA512 96b575bdf76de7b0a50cac4198221c34f029e1f435cde044620c72ef795b0cc34433aa340e4a41c8a294fc960d7f8c68f0eb28bcd43e84b17985068fb79f3ecb
 DIST types_setuptools-80.9.0.20250822.tar.gz 41296 BLAKE2B c516853b056856dba1594a1ff78a665b4cf18c9f0be42931a07dfb46b0157fa4da871a95b5f1636a25c9955a0634fbde7366f5d5bf13a63e66fe619cc14b674e SHA512 45eb43575f18865ae8d168f6b7e6e99823323baca1d9b00cc797ac62c7a4e24503233ac1dff2804b361339c016251cd98fe72826187b9dab311ef68933f8e012
+DIST types_setuptools-80.9.0.20251221.tar.gz 42240 BLAKE2B f5ffbf3c3aa1335b2215b96d9757afc30b8abef3baf602ffefd115ce335c5d5f98d603ee7d18d11d870c4bff2fbda37a85e1633c77a21a2bb0bbd8141f582af4 SHA512 0502ab67233cb5a48e2d820b9d0e1386a58ccaedea218becef509cfd4584b3b522355e75af85f63daa4548f06d8b285396c166598daac11fec91e1c7ecb4123d
diff --git a/dev-python/types-setuptools/types-setuptools-80.9.0.20250529.ebuild b/dev-python/types-setuptools/types-setuptools-80.9.0.20250529.ebuild
deleted file mode 100644
index 6ebe6ced4375..000000000000
--- a/dev-python/types-setuptools/types-setuptools-80.9.0.20250529.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
diff --git a/dev-python/types-setuptools/types-setuptools-80.9.0.20250809.ebuild b/dev-python/types-setuptools/types-setuptools-80.9.0.20250809.ebuild
deleted file mode 100644
index 6ebe6ced4375..000000000000
--- a/dev-python/types-setuptools/types-setuptools-80.9.0.20250809.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
diff --git a/dev-python/types-setuptools/types-setuptools-80.9.0.20250801.ebuild b/dev-python/types-setuptools/types-setuptools-80.9.0.20251221.ebuild
index 6ebe6ced4375..8ae418e8f6ba 100644
--- a/dev-python/types-setuptools/types-setuptools-80.9.0.20250801.ebuild
+++ b/dev-python/types-setuptools/types-setuptools-80.9.0.20251221.ebuild
@@ -13,4 +13,4 @@ HOMEPAGE="https://pypi.org/project/types-setuptools/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/uritools/Manifest b/dev-python/uritools/Manifest
index 5bbb21055523..9af34bc0db64 100644
--- a/dev-python/uritools/Manifest
+++ b/dev-python/uritools/Manifest
@@ -1 +1,2 @@
 DIST uritools-5.0.0.tar.gz 22730 BLAKE2B 3fb746f2f11508f6bcfabbaa8e1863889cbabc147dc9bf47e03e3f3f7799fd85e074ce2e49b2491bcb50228bcca150cfc4452450479317e390e2dbe865ab1cd6 SHA512 bed01223e98033ad4962845f73bd211f035805e982ac41b584a0129ab20e3cf60f29eaf01ac064715fc35a4b8f95b688de22d8cc00f0e1e5f3a39a68a2f04db4
+DIST uritools-6.0.1.tar.gz 22857 BLAKE2B 649d518ea922ce4c319496ee154d1f45793a2bb9da0663597d184d924035d4a086fd02cc0a3db28398cb263baf3044d0a294afea415dd9d7874ba140c9bea31c SHA512 32a8e4fad14fd2a0475fc92e185ef86e8dee3e80342a881877953ba8673ada2e820beb73db465dfe38842759c0aa394c921ed41b48ec57c630d139eb04da0f91
diff --git a/dev-python/uritools/uritools-6.0.1.ebuild b/dev-python/uritools/uritools-6.0.1.ebuild
new file mode 100644
index 000000000000..dc781740c6a1
--- /dev/null
+++ b/dev-python/uritools/uritools-6.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+DOCS_BUILDER="sphinx"
+PYTHON_COMPAT=( python3_{10..14} )
+
+DOCS_DIR="docs"
+
+inherit distutils-r1 docs pypi
+
+DESCRIPTION="RFC 3986-compliant URI parsing, classification and composition"
+HOMEPAGE="
+	https://github.com/tkem/uritools/
+	https://pypi.org/project/uritools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 9e13c4271c59..fdc494fc0b44 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,5 +1,4 @@
-DIST uvicorn-0.35.0.gh.tar.gz 712106 BLAKE2B 117f925e295a8475d403e5c29126ffee64cdc62e54b532a8f1ba25862741f2b5d7e164e45878aa00b5e7839d1799e7f8c56d2f85ee3a92520cce7c9059690227 SHA512 f7340bae22774d40c573f5d0657cbec64b5f4b6d97a693dbb3e1d42d539e30e4bca679faf6f6359b07828a3ffb4ac22a94195b99c09078af531cf13a5afe479c
-DIST uvicorn-0.36.0.gh.tar.gz 815375 BLAKE2B 44df6b0543debfb3471b81bc8684a48f6b6a409ac1f9303d50b332ba604f11078e8ec6ee90c964cc5e919424b2b382f3776c06004927b6a195d52d45a1282480 SHA512 4639a4abc98e76749c5267acc17a35bfee713a1242c9c3a6254ee68a8911db30b0ea9358d9749346dc8ca38f4d52bb209964083409087b5a5582b55a1346182b
-DIST uvicorn-0.37.0.gh.tar.gz 815857 BLAKE2B 2de453b020d6659c53dcf0ea10ab9f155f9f4f25242c0be53247f49081dd49dfd3aeacd03555dba4560534abe0809e725b565bc3191676adaf4b5d76a1413e3a SHA512 be933111c14fc6c31335c8b13e1147542aa69045b856982a4aa841ef3e078fdc8626fc17287fc23ecf63ad8f2c54647d521b090963c71ddb6a4ba494e4299de1
 DIST uvicorn-0.38.0.tar.gz 80605 BLAKE2B b7dd7f9bcb5b72f1cbf381bb263dbcbe6aa4d3c252540e64f60ee471e248480995525e646bc852487d37bc768be7072e7b7b20f9f7a7efd6022dc3ed88d0d57f SHA512 29b1a838cef63f90839fac7799723ed56711f21d4016437b62363fd9f45f76ea683d2be9ec7491f6c79a05159d0b5814e0e9247c67dc92342577c24ae392fdd7
 DIST uvicorn-0.38.0.tar.gz.provenance 9257 BLAKE2B 94b9804d3740ac2db01c4715fa60b413e4af12f70a4e955ced6326ef06b2d43f1d5dca96f833e951a108521b9d8aeb27d3c6061b586cf180eaf777efc3be38d2 SHA512 a4cdfe7406e4d15398edd958c553eaff1d36692b2cc368be59ace7495ed14d62a172afada542122896eecdd5f81ea185976e4a13a4c6fbf2de5f7171328254a4
+DIST uvicorn-0.40.0.tar.gz 81761 BLAKE2B 9b71d6d56a81f265f10293434813f08e34456221627e52ab680e4889b664daaa9be2cf46437d5ca992e933c7e493362f92bf3c8621f6477d8503a2ffdd5ce35c SHA512 b56f625577509e46724a91881d7d1e5242ac50bd686f5cdbeb1973f7be48c85c1cda8d7275eb04bc0241c221f11820e31f7e4d3ad949a9793b81f8492d667cb7
+DIST uvicorn-0.40.0.tar.gz.provenance 9247 BLAKE2B 3cd0b5a8913ad854adb4d043928c51dfa04486919c842ff1b63467cf19e66165762837c8038cb5615f0b46836d57e897be80dcefa327996d03da4657fdd3ab47 SHA512 234dcb974a066fa655502ab231ef19cfb8d776e861ba256dc038cafb447d88a7a9469d82fd3a99f11136b2b3a03202b6ba423e1a0981ad3f40a7b1a1136cc787
diff --git a/dev-python/uvicorn/uvicorn-0.35.0.ebuild b/dev-python/uvicorn/uvicorn-0.35.0.ebuild
deleted file mode 100644
index 30673f7da1d2..000000000000
--- a/dev-python/uvicorn/uvicorn-0.35.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2021-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="
-	https://www.uvicorn.org/
-	https://github.com/encode/uvicorn/
-	https://pypi.org/project/uvicorn/
-"
-# as of 0.28.0, no tests in sdist
-SRC_URI="
-	https://github.com/encode/uvicorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/a2wsgi[${PYTHON_USEDEP}]
-		>=dev-python/httptools-0.6.3[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.28[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.4[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-			dev-python/trustme[${PYTHON_USEDEP}]
-			dev-python/watchfiles[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-EPYTEST_PLUGINS=( anyio pytest-{mock,rerunfailures} )
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# too long path for unix socket
-		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-		# TODO
-		'tests/protocols/test_http.py::test_close_connection_with_multiple_requests[httptools]'
-		'tests/protocols/test_websocket.py::test_send_binary_data_to_server_bigger_than_default_on_websockets[httptools-max=defaults sent=defaults+1]'
-		'tests/protocols/test_websocket.py::test_send_binary_data_to_server_bigger_than_default_on_websockets[h11-max=defaults sent=defaults+1]'
-	)
-	case ${EPYTHON} in
-		pypy3*)
-			# TODO
-			EPYTEST_DESELECT+=(
-				tests/middleware/test_logging.py::test_running_log_using_fd
-			)
-			;;
-		python3.14*)
-			EPYTEST_DESELECT+=(
-				# TODO
-				tests/test_auto_detection.py::test_loop_auto
-			)
-			;;
-	esac
-
-	epytest --reruns=5
-}
-
-pkg_postinst() {
-	optfeature "auto reload on file changes" dev-python/watchfiles
-}
diff --git a/dev-python/uvicorn/uvicorn-0.37.0.ebuild b/dev-python/uvicorn/uvicorn-0.37.0.ebuild
deleted file mode 100644
index a220c4e838d4..000000000000
--- a/dev-python/uvicorn/uvicorn-0.37.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2021-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="
-	https://www.uvicorn.org/
-	https://github.com/Kludex/uvicorn/
-	https://pypi.org/project/uvicorn/
-"
-# as of 0.28.0, no tests in sdist
-SRC_URI="
-	https://github.com/Kludex/uvicorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/a2wsgi[${PYTHON_USEDEP}]
-		>=dev-python/httptools-0.6.3[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.28[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.4[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-			dev-python/trustme[${PYTHON_USEDEP}]
-			dev-python/watchfiles[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-EPYTEST_PLUGINS=( anyio pytest-mock )
-EPYTEST_RERUNS=5
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# too long path for unix socket
-		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-		# TODO
-		'tests/protocols/test_http.py::test_close_connection_with_multiple_requests[httptools]'
-		'tests/protocols/test_websocket.py::test_send_binary_data_to_server_bigger_than_default_on_websockets[httptools-max=defaults sent=defaults+1]'
-		'tests/protocols/test_websocket.py::test_send_binary_data_to_server_bigger_than_default_on_websockets[h11-max=defaults sent=defaults+1]'
-	)
-	case ${EPYTHON} in
-		pypy3*)
-			# TODO
-			EPYTEST_DESELECT+=(
-				tests/middleware/test_logging.py::test_running_log_using_fd
-			)
-			;;
-		python3.14*)
-			EPYTEST_DESELECT+=(
-				# TODO
-				tests/test_auto_detection.py::test_loop_auto
-				# changed exception type
-				tests/test_compat.py::test_asyncio_run__passing_a_non_awaitable_callback_should_throw_error
-			)
-			;;
-	esac
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "auto reload on file changes" dev-python/watchfiles
-}
diff --git a/dev-python/uvicorn/uvicorn-0.36.0.ebuild b/dev-python/uvicorn/uvicorn-0.40.0.ebuild
index a220c4e838d4..8dd2eff87e3e 100644
--- a/dev-python/uvicorn/uvicorn-0.36.0.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.40.0.ebuild
@@ -4,9 +4,10 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
+PYPI_VERIFY_REPO=https://github.com/Kludex/uvicorn
 PYTHON_COMPAT=( python3_{10..14} )
 
-inherit distutils-r1 optfeature
+inherit distutils-r1 optfeature pypi
 
 DESCRIPTION="Lightning-fast ASGI server implementation"
 HOMEPAGE="
@@ -14,15 +15,10 @@ HOMEPAGE="
 	https://github.com/Kludex/uvicorn/
 	https://pypi.org/project/uvicorn/
 "
-# as of 0.28.0, no tests in sdist
-SRC_URI="
-	https://github.com/Kludex/uvicorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test-rust"
 
 RDEPEND="
@@ -69,14 +65,6 @@ python_test() {
 				tests/middleware/test_logging.py::test_running_log_using_fd
 			)
 			;;
-		python3.14*)
-			EPYTEST_DESELECT+=(
-				# TODO
-				tests/test_auto_detection.py::test_loop_auto
-				# changed exception type
-				tests/test_compat.py::test_asyncio_run__passing_a_non_awaitable_callback_should_throw_error
-			)
-			;;
 	esac
 
 	epytest