Adding metadata

121 files changed, 926 insertions, 905 deletions

diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index a414cbb67a01..1406115d720d 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,4 +1,5 @@
 DIST aiohttp-3.10.10.tar.gz 7542993 BLAKE2B edc9808937892e2915b591a3d5b9e2be8401a67e6421ada8c49e27cfa1ee67283465d17e3c3a77f7579d4ed45df39884a2f9e336429ef7d64adf351ce7507a85 SHA512 c6928d989c110c323347b6f5b0a90c42e17924b4121455a240f5a15d87f939580640ba0f8d576f8254e484e5b631ec4562a2fb4e6c86402924b1892a6d72aff8
+DIST aiohttp-3.11.0.tar.gz 7656057 BLAKE2B b100001a4af53baa3698e1cef11a7f3d4c6938443826eefede7753f903e14cc14f869152b0250af008187ecf578336c4ae73195595a718fea963c5a7cf3a4683 SHA512 99c77f12d72a8c526d345e44ab4e66f33061375c23e9178cb3517f421c965d6a5d38a5401aa3d722868ffa862bfcd4bf8b52884169a2a0f9b5dbc447cd10343f
 DIST aiohttp-3.11.0rc0.tar.gz 7621610 BLAKE2B a7ef4a7d373bd87155519bd71c396e24224120efeb07dbb173081e034411f4d1e694015d3599d30856e0a80a4d5d43b8d8ee6cdec1d6d19f2dc2940f7271c910 SHA512 3f34c54683b75a0727dd541a1a01a0621aba52f235b32490ccec6656ffbde39224b38b99e58cd62d4e64e43b378e87424a2f9c146f8c6f158ecb226f0e91aae1
 DIST aiohttp-3.11.0rc1.tar.gz 7653785 BLAKE2B 070dba6f84b7924f5129b9a022de98ef9586d35cc188a38229d77d5598cf322931687c5295f322f8aca28a8fcf7da1d30e021d4dd2b8aa9327c1c60084423480 SHA512 3ed987c6f0fe53373b5f3cb0b3858fdc216d029f8b6f205ed3fc234e2474b77fd245ad39a86f607616878499d88b607b72f68cae02f95b2073f3dc1ac3fe8d5b
 DIST aiohttp-3.11.0rc2.tar.gz 7655719 BLAKE2B 3fc553c3ff927861bd280401cc6741c6bd720c4ac0827db40230270cf3bf2f30a0bfdb3d933227ffb2b22800ddc6e2d6b045277c1c8bf9fb8467b1582a3dcedb SHA512 d6f5c6ef50ce333106071dbd33d57e49be638e9d6855a9c5dc6f9b7e87063319d314f70186d7df0e09f3e7ecf4bee40da44af0dccf9124d6c6c16c5f98e9fee8
diff --git a/dev-python/aiohttp/aiohttp-3.11.0.ebuild b/dev-python/aiohttp/aiohttp-3.11.0.ebuild
new file mode 100644
index 000000000000..4a10c19005b4
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.11.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="HTTP client/server for asyncio"
+HOMEPAGE="
+	https://github.com/aio-libs/aiohttp/
+	https://pypi.org/project/aiohttp/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+native-extensions test-rust"
+
+RDEPEND="
+	>=dev-python/aiodns-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohappyeyeballs-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	dev-python/brotlicffi[${PYTHON_USEDEP}]
+	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/propcache-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.17.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		<dev-python/async-timeout-6[${PYTHON_USEDEP}]
+		>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	native-extensions? (
+		dev-python/cython[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python3*')
+		test-rust? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# increase the timeout a little
+	sed -e '/abs=/s/0.001/0.01/' -i tests/test_helpers.py || die
+	# xfail_strict fails on py3.10
+	sed -i -e '/--cov/d' -e '/pytest_cov/d' -e '/xfail_strict/d' setup.cfg || die
+	sed -i -e 's:-Werror::' Makefile || die
+
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	if [[ ! -d tools && ${EPYTHON} != pypy3 ]] && use native-extensions
+	then
+		# workaround missing files
+		mkdir tools || die
+		> requirements/cython.txt || die
+		> tools/gen.py || die
+		chmod +x tools/gen.py || die
+		# force rehashing first
+		emake requirements/.hash/cython.txt.hash
+		> .update-pip || die
+		> .install-cython || die
+		emake cythonize
+	fi
+}
+
+python_compile() {
+	# implicitly disabled for pypy3
+	if ! use native-extensions; then
+		local -x AIOHTTP_NO_EXTENSIONS=1
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# proxy is not packaged
+		tests/test_proxy_functional.py
+		# python_on_whales is not packaged
+		tests/autobahn/test_autobahn.py
+		# benchmarks
+		tests/test_benchmarks_client.py
+		tests/test_benchmarks_client_request.py
+		tests/test_benchmarks_client_ws.py
+		tests/test_benchmarks_cookiejar.py
+		tests/test_benchmarks_http_websocket.py
+		tests/test_benchmarks_http_writer.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_client_session.py::test_client_session_timeout_zero
+		# broken by irrelevant deprecation warnings
+		tests/test_circular_imports.py::test_no_warnings
+	)
+
+	# upstream unconditionally blocks building C extensions
+	# on PyPy3 but the test suite needs an explicit switch
+	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
+		local -x AIOHTTP_NO_EXTENSIONS=1
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin
+	rm -rf aiohttp || die
+	epytest -m "not internal and not dev_mode" \
+		-p rerunfailures --reruns=5
+}
diff --git a/dev-python/bareos/Manifest b/dev-python/bareos/Manifest
index 1cc5c4c21723..bbcf7232ded2 100644
--- a/dev-python/bareos/Manifest
+++ b/dev-python/bareos/Manifest
@@ -1,4 +1,4 @@
 DIST bareos-22.1.5.tar.gz 14747894 BLAKE2B 560bc1ceb34fccfb370e8643d24917e24b2440158dd267532c2cb7e4a543d29b81b033e7a34c46eda4c6d71165e48da9332605c3bcd073fbafa38f3ba8be69a2 SHA512 8138f2142f705e2448f8bc2e00f39fe4f734ce8fe687e3cf00c9ff9bda9a3df73ebd7fb86d850ba755588cdaca324e1ba9034987ecb975ce47dd279395ee03b4
 DIST bareos-22.1.6.tar.gz 14758055 BLAKE2B e49c2f6b38394b71a15e4826286a761e78b8c301429843630bbf024a76505381a84581296e7bcdd537bf04194e10abc3c8b4f358234ae968a10163993c9451bc SHA512 6fda879ed6ac05843d9c8c0da16228e2b009ee094230ce7cec0deb9125723f1bd8964517c355f61fda34ee5664ebaf4e76b3c6ce2b0e9b88c66788abf5d9b93e
-DIST bareos-23.0.3.tar.gz 14744648 BLAKE2B be31a4284ff2ff97ace51f895637cfafac666d4e9d95524e5e03d22798427ff551419422fb41783d3fda7288a0cd982c8dde751a15428346c61e3fa64bfa80c0 SHA512 42ede6976c894f89836ae272598edce8b3dadbdceb3b429724ea4c01a980470c161f03e54b58b17bd3fa3a7f750b4a79e5f96070fee5aae4b4fe73e79b2d8b61
 DIST bareos-23.0.4.tar.gz 13954430 BLAKE2B dfeea6ca63be1cb376507a1270cc835d8f6ea336a8cf9c07ac74a2817d84f044da7ac974b11a34b3d6c8a66ed4cb27a1e9ba06b4dad697937e6068181f42eb03 SHA512 50686548cb2bb398d524fa208db97a68e30f40e53ac8a8f57182157e713d743baf8a3177453327943b17de128f6dd6c5b5de0fe65ddcedf7cbca715e7ae05bd5
+DIST bareos-23.1.0.tar.gz 14002357 BLAKE2B f063bf0d4ce422766f8d71133e69ed39bf914672f2ff3321d792cd28bf58d6e2daac53a1fe48586e4accd6a895e9ef83b17e51e3f6b4dabccf7c54bf02fb2680 SHA512 480a7f420c7f0a626f5261e0b9c136f3ed71f08ee09ce9d493b66645e0f2c5dc00455719a3ce06a57a5424206b1c0f62cd19904f83bcaaa45066726a6b223281
diff --git a/dev-python/bareos/bareos-23.0.3.ebuild b/dev-python/bareos/bareos-23.1.0.ebuild
index dd7bb7f1d6b8..dd7bb7f1d6b8 100644
--- a/dev-python/bareos/bareos-23.0.3.ebuild
+++ b/dev-python/bareos/bareos-23.1.0.ebuild
diff --git a/dev-python/beautifulsoup4/beautifulsoup4-4.12.3.ebuild b/dev-python/beautifulsoup4/beautifulsoup4-4.12.3.ebuild
index 51c4e6debe60..5126e8214519 100644
--- a/dev-python/beautifulsoup4/beautifulsoup4-4.12.3.ebuild
+++ b/dev-python/beautifulsoup4/beautifulsoup4-4.12.3.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		|| (
-			dev-python/cchardet[${PYTHON_USEDEP}]
+			dev-python/faust-cchardet[${PYTHON_USEDEP}]
 			dev-python/chardet[${PYTHON_USEDEP}]
 		)
 	)
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index a9f886eb6f4f..cc7792e7d43e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,3 +3,4 @@ DIST boto3-1.35.54.gh.tar.gz 882727 BLAKE2B 398e7743d30700856b15440c217d40e88aec
 DIST boto3-1.35.57.gh.tar.gz 885077 BLAKE2B 4f3a29db5e76c706fbfd0afb3ec05d5518e69f3fd26d15e79024fb898d874818fa21031187d66078a4ebd107cce9461000e37506886f337049bd821e20933563 SHA512 19f951c04452203c070243bd8c944183221b51d9853efc19d33002af57c7d59c1967e8a7b606e56f772f35576ec6e1b52e2037138ba01a28f13685a49458c7d4
 DIST boto3-1.35.58.gh.tar.gz 885941 BLAKE2B d561cf27dba3177789047cf8ac9cc3e5b7a669f26cae948c5d0c458464518eb16ea2525ef0b1c2118acaaeb348e7435947eca69f37d42affe3b3b8dfd199ddbc SHA512 9988693c33dab2294f302e9e9434fd9c681fc43042ba6772a36d36df9ba60f5884eeecaa60a17e6087a07d35c9691ecb16ee3920c3859335817e49b5f97247ee
 DIST boto3-1.35.59.gh.tar.gz 886122 BLAKE2B 2eb1378f810bada55c5c6c1a6c70c16c073ddc68d30850ff50b5f604dd15b386bcd0985b81b39fc79801f552eab7f289aaf4ca5377b958b2d28ad0b193e7886d SHA512 ab771736bd88419d50bb11db36f7c308da4816222379d45dfa97557a3c3c43ffb9a9521bc92cf0a4dd2631d01c94f6f9c728517c02a9787e49d98dd860f7e128
+DIST boto3-1.35.60.gh.tar.gz 888293 BLAKE2B a6fac2065a5dfa70f99112f1ff0c98fcc429800a0a88fa011a78f7f8fbb609d27d879ce1a374d977c1bf5407cf2f7052c7560ce6531b4bdbf691ffd18c06d897 SHA512 bdec30b276c001f59d73180b536848466f585bbece2938632ebdbc9087bed59e6cedf4936192fe7a0c97cdbe132072a20d7cc92fc6a538fa4a1fc12baae16403
diff --git a/dev-python/boto3/boto3-1.35.60.ebuild b/dev-python/boto3/boto3-1.35.60.ebuild
new file mode 100644
index 000000000000..d91ce27598cf
--- /dev/null
+++ b/dev-python/boto3/boto3-1.35.60.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+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() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index e1532b527ae1..f0678c7a26ca 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,3 +3,4 @@ DIST botocore-1.35.54.gh.tar.gz 13569174 BLAKE2B 1f4cb326d27ef028e16b20838fe1f7b
 DIST botocore-1.35.57.gh.tar.gz 13603794 BLAKE2B 23a4dc82e1d9667e75494c2fb651b883c7fbaf689679a1b40c3f277c33760fbaacd6843e6630876fe75597c6e6dc892726c609a97efcff0d46533460c379c43f SHA512 f20eccdcd0c027e3c1d6c631988c8913f3150b1b6da679fc18ea75824d0ef61b999ee9cad4f0d74edbb639cf52daf188fd7e256664e57fc89be09f33ed78d65e
 DIST botocore-1.35.58.gh.tar.gz 13608279 BLAKE2B 6f67c155f7b87c827b07f3bceb29836f59cf38479911cff8c92970e25b82baf920d673c8766e61c5db05e5dcbf1f46acc3aff2ebe32498d4ec733ea0a02a1718 SHA512 5db5c1832936a95ee11b80e872ece61f034ad61eb5c0d307deea047bca8785e9ca211d2f38349b234d7c5aa13ba363f4908520fa211be16924d3552d1bed27a7
 DIST botocore-1.35.59.gh.tar.gz 13619172 BLAKE2B 593bae8b31935cabd5ca44e48bc85d1638d03a34d58ac209f9f0aa51ddc55c72f88b383fe422a10e0045a84e287da0c417ee388acdc72ebf982665532657aee0 SHA512 ced4d9c149924f09c6cb3fb62f348225f7df4a07be383b5f523d7284fefd2de0e60f4c302a71eaf81d56051a31e78d962e75eda28afb6624db0b0bac7fef9140
+DIST botocore-1.35.60.gh.tar.gz 13625896 BLAKE2B 3e1337713f2a96430eaac399db7d6ad468e991ac1c777fff6761dfc377104833ddbe711b8384e08086862a60e5e558c2aae48bb87bd399b2dbd00cb032b696fc SHA512 4e05899948f5ece08f51c4eda2e124f743ee5e5fa82e849585bb8065850e08e190d3b04b720af4ca651165e9b209d2dfab597ca7118cc2a18ce4badf72688dc9
diff --git a/dev-python/botocore/botocore-1.35.60.ebuild b/dev-python/botocore/botocore-1.35.60.ebuild
new file mode 100644
index 000000000000..7816e9efeb52
--- /dev/null
+++ b/dev-python/botocore/botocore-1.35.60.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+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
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/cchardet/Manifest b/dev-python/cchardet/Manifest
deleted file mode 100644
index a65142331148..000000000000
--- a/dev-python/cchardet/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST faust-cchardet-2.1.19.tar.gz 678871 BLAKE2B e87389ef602bc5e69ae2037aff1000b9caacfd91a44c5eb8fb2084d4ac33772eb8e480b05109ff83ebfcb2b9a57e215b4bc9cc5558f4f7e1a19b58dd1dfca8b5 SHA512 bd75ddf8b2e9891fe6ecdfd687a6903342a24b93f35a3d9a1b20da9abc77684e73840db73da97689636e3412e33da25b68cfafad114186681d0dec98880ffe95
diff --git a/dev-python/cchardet/cchardet-2.1.19.ebuild b/dev-python/cchardet/cchardet-2.1.19.ebuild
deleted file mode 100644
index e1ab4a55c627..000000000000
--- a/dev-python/cchardet/cchardet-2.1.19.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=faust-cchardet
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="High speed universal character encoding detector"
-HOMEPAGE="
-	https://github.com/faust-streaming/cChardet/
-	https://pypi.org/project/faust-cchardet/
-"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cchardet/metadata.xml b/dev-python/cchardet/metadata.xml
deleted file mode 100644
index 3b39e33fc13c..000000000000
--- a/dev-python/cchardet/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>zmedico@gentoo.org</email>
- </maintainer>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 0e2a32e0bbc9..b12955b6eb22 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -10,3 +10,4 @@ DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b8577
 DIST llvm-project-19.1.3.src.tar.xz 141247864 BLAKE2B 4ccb30accd632a7d54eb065b724ff81ec8a50380fa527111d58acd728eecb798d42f680119b6d1cbc980523e2f39220921ca1f530daa7afea05ab27436dedb7e SHA512 0abaf158b373892d5afc184158600df17a0797547ad7238ca9018d6fcdd7310b0db803d158daa82a2e04bd42d9daebaa2c3e4b9024c0fa2df72a88596575df5c
 DIST llvm-project-19.1.3.src.tar.xz.sig 438 BLAKE2B 44717741ae13bb0c52382647352e52273d8401728dc5cc1cf0c11a8f08cd74b6e3d789e788793aad767030b36fdec62e3a05bdc0b7ff60556cec7ceac17fc239 SHA512 84ef22ee78dbaad4710becbcb02119d06063099f9102bb86f3cd44fbb7e2d87bafe239d8e0cbf22ab5a479f99a11a77125f22394d5006ed86262076ccbf1634d
 DIST llvm-project-3f4468faaa9525ad615118675c3c68938f4a8d5f.tar.gz 221860252 BLAKE2B 6c531df34163dc0879c79b029a13215d1bef2cd95bbaf4a6d5e10b81a8352236283d40f14b62e23a57cc1cf8edce138fb6e2720ced2397d6469c5863564c626d SHA512 4aa485f4547e210cf8f6f8147c4adab3e75afe77f1e4e1bc4718fe681b64bdcf8937f843964542f8ead90ceef52cc0fd4bd8275824d1a4c6961eddafc7d35115
+DIST llvm-project-c7df10643bda4acdc9a02406a2eee8aa4ced747f.tar.gz 222622409 BLAKE2B 8b6b53e0d51a681ec2e3ea1c873df95357e1333a598d26921c72f4ce05872aa5fe00a046bfe8811e2c8c1a2ffced7a325a0399bd931e54cf2aeb23abe887bde7 SHA512 e78219c87f001c813844ff652bf065f7c1d1bbf09af801ed1e99e9f40b981896bcee699d2ab15c71478388987c4030750a7958265d374b9f568fdf7af3dd3a21
diff --git a/dev-python/clang-python/clang-python-20.0.0_pre20241113.ebuild b/dev-python/clang-python/clang-python-20.0.0_pre20241113.ebuild
new file mode 100644
index 000000000000..0cb38ead605a
--- /dev/null
+++ b/dev-python/clang-python/clang-python-20.0.0_pre20241113.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 6dd9418e37f5..262b3fe4e0da 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -2,3 +2,4 @@ DIST cmd2-2.4.3.tar.gz 678661 BLAKE2B 806fbd6abc26737032dd6330ebabc1e5308e9082f9
 DIST cmd2-2.5.2.tar.gz 984695 BLAKE2B b85b1f0732897491c9f391a56018c5258a8916299003c565e4f2f42866ce1ff48d86e03b54aa0bf7a582e8e51cf41b079d0fabe418b4e9a855a8e850e7bc02cb SHA512 565c64030f4ea15e29a8350ed625b56a3e18c442930a8c4216c334431ab220895e0dd21ff079c5a888c693f43fec4b69da4dcf14c84ec3a089cfc27ff4c298f8
 DIST cmd2-2.5.3.tar.gz 689714 BLAKE2B 20dd6aff4b2c520d5f82e6273a853571d03d8c5b1d464c0225270757e6e8f4a36ced09c2311bbdc132603d92ff80bb7047502aef445974fb9908b7088f92a8b4 SHA512 eb5da50a543f485a15a768cca72cfaa32608e20d8afc07712baa7c2105eefd8496a9ad2a123097dd7dac236de6e2cf725539a36dd7902bd909668e41f304b646
 DIST cmd2-2.5.4.tar.gz 690076 BLAKE2B 4148b8a6a8df56e75f4c8c204c7524a9eb47f91950b72fae25f751bde6f6575e3a4d6d389897b9b1eb7186bd3e42de6636b50babb5ae77ee038e950c1d9568e2 SHA512 c63530ac39655b0ecfe3b690115bdde75b661650a2ef6d8766f5dbee653565d02aab64d620b46109400bf8bf0df29a91c36ac7f4a7df7ab2d84ee688b00054fd
+DIST cmd2-2.5.5.tar.gz 689948 BLAKE2B 60ffb516b4b410541281a34647b904a41e2fbbff96dfd6d896fd11a66385469606c3f7c27cbd7aa22c0b84af3c9db8e5facd2fe394608ab4294b2c95965837bc SHA512 b83e76ddb101b1f30239ad60bd00c75f9fbe67ff70b5758f7e9c9d4519f7916667b0eb87c75dda9c06295de74b6827e5dd218f5fb124893c32b43dca3fb1ef42
diff --git a/dev-python/cmd2/cmd2-2.5.5.ebuild b/dev-python/cmd2/cmd2-2.5.5.ebuild
new file mode 100644
index 000000000000..c2aa8ea01106
--- /dev/null
+++ b/dev-python/cmd2/cmd2-2.5.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 virtualx pypi
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="
+	https://github.com/python-cmd2/cmd2/
+	https://pypi.org/project/cmd2/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pyperclip[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+# pyperclip uses clipboard backends in the following preference order:
+# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
+# klipper is known to be broken in Xvfb, and therefore causes test
+# failures.  to avoid them, we must ensure that one of the backends
+# preferred to it is available (i.e. xclip or xsel).
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# TODO: tests_isolated?
+	epytest -o addopts= -p pytest_mock tests || die
+}
diff --git a/dev-python/consonance/consonance-0.1.5-r1.ebuild b/dev-python/consonance/consonance-0.1.5-r1.ebuild
index 8a5e9cb8ae89..c895d4fcfe28 100644
--- a/dev-python/consonance/consonance-0.1.5-r1.ebuild
+++ b/dev-python/consonance/consonance-0.1.5-r1.ebuild
@@ -23,7 +23,7 @@ PROPERTIES="test_network"
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/dissononce[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/protobuf[${PYTHON_USEDEP}]
 	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
 	dev-python/transitions[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/dbus-python/dbus-python-1.3.2.ebuild b/dev-python/dbus-python/dbus-python-1.3.2.ebuild
index 6a27b8fe6daa..6e4e659b0a67 100644
--- a/dev-python/dbus-python/dbus-python-1.3.2.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.3.2.ebuild
@@ -37,7 +37,7 @@ BDEPEND="
 	)
 	test? (
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/tappy[${PYTHON_USEDEP}]
+		dev-python/tap-py[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 9e6fcf96e2f6..2e9b00d9507d 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,4 +1,2 @@
 DIST setuptools-74.1.3-py3-none-any.whl 1262070 BLAKE2B 967e581556dee96b068a762605e340a7dbdb7eedb62fc2224fa3cbff8c29c6dd8966831bf4d2c4714401c8beca6ff81ba64823ec55ce592ff3bf10ddee370975 SHA512 8dd7f782ccbfcef04462904f3211569a2ca0be7f370a75cd1d77b77c1f38fcfbea8fd401646bbf436c093ad4573e32f0a0eef030644df48817fde43ae59ce0aa
-DIST setuptools-75.2.0-py3-none-any.whl 1249825 BLAKE2B 10a48572cc684a39fe83ed47115e9e2cf7596421f1b5b9599b0472e3081b2d843b288dff85ad5d35133e80ac29db98856a03a7c8828a7394bcccf928e5b7d26d SHA512 5b30d02ee23ccd4615a2c63f9dc73b80453fa37b905b5c0d1aa18beb3688c24776d02e524db5ab6033ad4ba872ea04601970c1578235f38e0ec8d54597deaca3
-DIST setuptools-75.3.0-py3-none-any.whl 1251070 BLAKE2B 96cb4af06ae6f73f4cf86196d71c4ae3084f4f3ca945cf9873f1f466b0682fbc0816308fc0dff77c70d72966e65052939630c1551d7d04b879aa33319dddf601 SHA512 c3bdd2f5ebd5aaaeba190c847b04a2d789a17bd49cc277e1f5ca9613c17696b934560d64f9f194708ac655f5a4f478519550c3034f980bea1866d38c0d173659
-DIST setuptools-75.4.0-py3-none-any.whl 1223131 BLAKE2B 8011679620e26623c6cef3e4fa40a56a497bcb49c5a3ec744a46a4f8a46ee592d1c8773e10a1f2d8b5d92a3998fff6e6288b3e2b5f4623fa78a35ebe42ef5d60 SHA512 052f42a4f9ed3716fd20f61f011507f8d1313d3ee6c3612d5bd8e404e297a8efb9ad84058dd926d3354feefd62c2cf837294f2c1d9efea6831b9660cdf6bc567
+DIST setuptools-75.5.0-py3-none-any.whl 1222710 BLAKE2B 40359574a10a14fb6fdef3a5f5a1febe61446ae1510a96236f0cf93d7cd4dbf3c3904bd77729d0877bcceed3d4fc55bad6e1a6eba9800cd4bbe9a394a829b81f SHA512 3caee919ed5f352d6ca92d648f438c4a18a42cc3f4e1bbfe58dfa43e86ebcc9345476c2119c165d0aa07353e1a4e6c9fbc296d2e41d089084395f13678e80096
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.3.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.3.0.ebuild
deleted file mode 100644
index c48c6a133f1f..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.4.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.4.0.ebuild
deleted file mode 100644
index c48c6a133f1f..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.2.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.5.0.ebuild
index c48c6a133f1f..c48c6a133f1f 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.2.0.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.5.0.ebuild
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 31db193f2be0..d3c9bb696bc9 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1 +1,2 @@
 DIST flask-3.0.3.tar.gz 676315 BLAKE2B 19013ff4588dc057febe2720eadcfcadb0e1854731c2c9e391449696549106da930c11f94782610424ea40c1377e9b8aa52ca39fedc6ad0c98c9a70a56d01514 SHA512 977c0e5fd2d496fae8e34a035f211118642dc6518a14dc5f6c175b72c6a76407aeb9ff0ed1f5db636370a9aa7e0d36baa783713ea7bdabd7f28c8c2b94643cd1
+DIST flask-3.1.0.tar.gz 680824 BLAKE2B 2897fb3cc7631341001c955119bf0a697db1a9dfd6ff0e1078f882fb030779eb0d15c64d4e9626d6a54bc50627c463f73d58b34e449b149106ac76ff878cd506 SHA512 dd1d9113f57d62cd8fb5d33a6fb6258761a39c3df41d174e52f454abfbfc2da4b6a88b142196bd0681637fe53982d95762b023acddbed00f10805c4266194e24
diff --git a/dev-python/flask/flask-3.1.0.ebuild b/dev-python/flask/flask-3.1.0.ebuild
new file mode 100644
index 000000000000..7d43eeafbd5d
--- /dev/null
+++ b/dev-python/flask/flask-3.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="
+	https://palletsprojects.com/p/flask/
+	https://github.com/pallets/flask/
+	https://pypi.org/project/Flask/
+"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+	inherit git-r3
+else
+	inherit pypi
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/blinker-1.9[${PYTHON_USEDEP}]
+	>=dev-python/click-8.1.3[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-2.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.1.2[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-3.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+		!!dev-python/shiboken2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/pallets-sphinx-themes \
+	dev-python/sphinx-issues \
+	dev-python/sphinx-tabs \
+	dev-python/sphinxcontrib-log-cabinet
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/google-api-core/google-api-core-2.22.0.ebuild b/dev-python/google-api-core/google-api-core-2.22.0.ebuild
index b0755012a2e1..a1f159b2f9a3 100644
--- a/dev-python/google-api-core/google-api-core-2.22.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.22.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
 	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
 	>=dev-python/proto-plus-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.19.5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-3.19.5[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
 	<dev-python/requests-3[${PYTHON_USEDEP}]
 	grpc? (
diff --git a/dev-python/google-api-core/google-api-core-2.23.0.ebuild b/dev-python/google-api-core/google-api-core-2.23.0.ebuild
index 5f73f8b10af0..36c0ecc76be4 100644
--- a/dev-python/google-api-core/google-api-core-2.23.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.23.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
 	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
 	>=dev-python/proto-plus-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.19.5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-3.19.5[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
 	<dev-python/requests-3[${PYTHON_USEDEP}]
 	grpc? (
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 529afa116b86..9c797252413d 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,3 +1,4 @@
 DIST google_api_python_client-2.149.0.tar.gz 11791789 BLAKE2B b4397d1e0a6b064b9c7aa7b4ada816a76871de089776f6aab4cc1f962171a427ecd1e4c1ba9e43455becaddd31cfa50082aa498a1443d2116f0acb678d221549 SHA512 3602a9d5f9fd5e00605a2b12114a81770662ac1ad168c65160d6c64340d8ea3f3da2765a5cc5959ef09f5b72725baa493a0686d976e3d22add49bb86b21626e7
 DIST google_api_python_client-2.151.0.tar.gz 12030480 BLAKE2B afbe2cb25e789aaa1aa5cf94e0b2a8e910cb097a885d6dc479af27e7836ac96a2a3db7b54b3fe5e060bdd4c0bdfa86dab3f0cab2e0ea176a6802d455ec7eda77 SHA512 3a8f55f457106779798e0bdf544c9bb9482967dcf0329a9a85f390a4acf8b9946ee56e43af798966c0958ae934426081bbf29cbb344071f2589b84937e85ed37
 DIST google_api_python_client-2.152.0.tar.gz 12046554 BLAKE2B 019bf46e4c876cf77028e1c8d71983a1b37abe95001c713d3b9a5063781c4fb329ecd4137c1ce706a5266b8445f757261c31964b5a9defe0433e94573453091b SHA512 4dc7e551c4defa6a6607a5838e2f282a5a669f0bc6d8bfc676d90fb4394a898667e023c042ffab56c9ea9638256a6671d095d3a5b8c5af1e49f60d1b6d416790
+DIST google_api_python_client-2.153.0.tar.gz 12059322 BLAKE2B dec9affc093262984d9f050dbc55a746d9747c6069b54a85edf14ad037b732ba614e4f0c3dfd0ef678f79aec598625ccd5ce80e942870999f5f0c147337e261a SHA512 c4066807e2e6096b90f6cbe51c20919429abd7c9b25fcefbdd849e290335d926e2b190ad3e61531681589176bbbb72c77f53858687bfee040b1dda36f92ffef3
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.153.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.153.0.ebuild
new file mode 100644
index 000000000000..595a1e3cbd88
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.153.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
+		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
+	)
+
+	epytest tests
+}
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.65.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.65.0.ebuild
index 2d65d763849c..a3ccff0b5d1b 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.65.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.65.0.ebuild
@@ -19,8 +19,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
-	<dev-python/protobuf-python-6[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
+	<dev-python/protobuf-6[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-3.15.0[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.66.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.66.0.ebuild
index ae56852efe67..13f6596d362d 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.66.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.66.0.ebuild
@@ -19,8 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
-	<dev-python/protobuf-python-6[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
+	<dev-python/protobuf-6[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-3.15.0[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/grpcio-status/grpcio-status-1.67.0.ebuild b/dev-python/grpcio-status/grpcio-status-1.67.0.ebuild
index 8f778fcc0436..a0e8ae54095d 100644
--- a/dev-python/grpcio-status/grpcio-status-1.67.0.ebuild
+++ b/dev-python/grpcio-status/grpcio-status-1.67.0.ebuild
@@ -28,8 +28,8 @@ KEYWORDS="amd64 arm64 x86"
 RDEPEND="
 	>=dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
 	>=dev-python/googleapis-common-protos-1.5.5[${PYTHON_USEDEP}]
-	<dev-python/protobuf-python-6[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-5.26.1[${PYTHON_USEDEP}]
+	<dev-python/protobuf-6[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-5.26.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/grpclib/grpclib-0.4.7-r1.ebuild b/dev-python/grpclib/grpclib-0.4.7-r1.ebuild
index cb8131ee26df..e06b8c35055b 100644
--- a/dev-python/grpclib/grpclib-0.4.7-r1.ebuild
+++ b/dev-python/grpclib/grpclib-0.4.7-r1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
 	dev-python/h2[${PYTHON_USEDEP}]
 	dev-python/multidict[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/protobuf[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index 8acbde51d218..d0c3a42d0819 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1,2 +1,2 @@
-DIST gsd-3.4.0.tar.gz 109605 BLAKE2B ae0b107a143fefe738a08928874eb007d4f03a13a53c8cdb542b3303f96583ddb5982e49bf797658547735679c98cebcb33c77e6f26273b505c9032fb2e0c873 SHA512 7176d546636488e402a76b02273e6dec0debdcad487b4b54bdeddbaf0a41148e031f4fd6c4bde974035c61b65d7877864318456969a3ee403ff8a0597af13e38
 DIST gsd-3.4.1.tar.gz 109640 BLAKE2B 92584927ed01808b8c116ef3fe446336f4adc9fb8eaa26ca0c8739493dd92f7fb0de39b4fda59a19e12051630837f4e5e40d10335adc84a89690acda50c26bea SHA512 802340f98f40dee8d583e92ab0043c88c822f00d9de3e83233916b0c6686dc973cddd569e9de01d515fe339b11c6651ecbfd551f5376d01922e71d217d9e74ba
+DIST gsd-3.4.2.tar.gz 109691 BLAKE2B 160b53d465607c8248ee9b2cecf1c2aafb55a89317e294b613615c1f12e19988841d024823ec27ad7b6c9003a1be26aa9941f509467eded87fb72baeaf229bce SHA512 e1e8310873c81473a6e718295da47b435a765428f42b885c577ef9d509bae76f54c9e99ee9d5f74dd5cf0848817e27dadc21e9717004065b63ed1f6cf6853cfb
diff --git a/dev-python/gsd/gsd-3.4.0.ebuild b/dev-python/gsd/gsd-3.4.2.ebuild
index be01f489bb3a..3ca957751067 100644
--- a/dev-python/gsd/gsd-3.4.0.ebuild
+++ b/dev-python/gsd/gsd-3.4.2.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	>=dev-python/numpy-2.0.0[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
 "
 RDEPEND="
 	${DEPEND}
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index 37a64204a00a..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 9b3521c5721afa49a58e0c35267f7d82bb56bd7e1d6d3152be0d36cd220180a526cb20b90b1113fbf0fff4a512137570f0b3bcf864498b7b7cc00403cb61ca27 SHA512 16d311400bf84a5f04e15f3da4b68b2810e4b005009f4d03dc8a487176dfc294403c976c412c83dcfa8084a49ef7b7d5389b43fb2ba446ce107ce4595e3558c6
-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 56733bbffc48..eb2586280d80 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-2024 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/python-lhafile/Manifest b/dev-python/lhafile/Manifest
index a62188ec86f9..a62188ec86f9 100644
--- a/dev-python/python-lhafile/Manifest
+++ b/dev-python/lhafile/Manifest
diff --git a/dev-python/python-lhafile/python-lhafile-0.3.0-r1.ebuild b/dev-python/lhafile/lhafile-0.3.0-r1.ebuild
index b12d73bbe1cb..69ccfca0533e 100644
--- a/dev-python/python-lhafile/python-lhafile-0.3.0-r1.ebuild
+++ b/dev-python/lhafile/lhafile-0.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,9 +9,17 @@ PYTHON_COMPAT=( python3_{9,10,11,12,13} )
 
 inherit distutils-r1
 
+MY_P=python-lhafile-${PV}
 DESCRIPTION="LHA archive support for Python"
-HOMEPAGE="https://github.com/FrodeSolheim/python-lhafile"
-SRC_URI="https://github.com/FrodeSolheim/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://github.com/FrodeSolheim/python-lhafile/
+	https://pypi.org/project/lhafile/
+"
+SRC_URI="
+	https://github.com/FrodeSolheim/python-lhafile/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/python-lhafile/metadata.xml b/dev-python/lhafile/metadata.xml
index 6ad3061728be..6ad3061728be 100644
--- a/dev-python/python-lhafile/metadata.xml
+++ b/dev-python/lhafile/metadata.xml
diff --git a/dev-python/libpillowfight/Manifest b/dev-python/libpillowfight/Manifest
deleted file mode 100644
index 04463c8cbe87..000000000000
--- a/dev-python/libpillowfight/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libpillowfight-0.3.0_p20210816.tar.bz2 87826271 BLAKE2B aa0a9c2800992b671940f0ed0c8d808c5ad870c724fbf0f4dad336d224e6d510b135052f2697a6a1d05bafb9f1969278962c625d5d0ffd997b2548e60b1dec2b SHA512 76b05d49e2ee9fc9dcc2c9342d312841c8d1520d8d2027bd12b6921f85bd92645f698a811ccf7bdeceba64f0b706d5fd2975f91c51db8ce87f1261793aee83cb
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 0e2a32e0bbc9..b12955b6eb22 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -10,3 +10,4 @@ DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b8577
 DIST llvm-project-19.1.3.src.tar.xz 141247864 BLAKE2B 4ccb30accd632a7d54eb065b724ff81ec8a50380fa527111d58acd728eecb798d42f680119b6d1cbc980523e2f39220921ca1f530daa7afea05ab27436dedb7e SHA512 0abaf158b373892d5afc184158600df17a0797547ad7238ca9018d6fcdd7310b0db803d158daa82a2e04bd42d9daebaa2c3e4b9024c0fa2df72a88596575df5c
 DIST llvm-project-19.1.3.src.tar.xz.sig 438 BLAKE2B 44717741ae13bb0c52382647352e52273d8401728dc5cc1cf0c11a8f08cd74b6e3d789e788793aad767030b36fdec62e3a05bdc0b7ff60556cec7ceac17fc239 SHA512 84ef22ee78dbaad4710becbcb02119d06063099f9102bb86f3cd44fbb7e2d87bafe239d8e0cbf22ab5a479f99a11a77125f22394d5006ed86262076ccbf1634d
 DIST llvm-project-3f4468faaa9525ad615118675c3c68938f4a8d5f.tar.gz 221860252 BLAKE2B 6c531df34163dc0879c79b029a13215d1bef2cd95bbaf4a6d5e10b81a8352236283d40f14b62e23a57cc1cf8edce138fb6e2720ced2397d6469c5863564c626d SHA512 4aa485f4547e210cf8f6f8147c4adab3e75afe77f1e4e1bc4718fe681b64bdcf8937f843964542f8ead90ceef52cc0fd4bd8275824d1a4c6961eddafc7d35115
+DIST llvm-project-c7df10643bda4acdc9a02406a2eee8aa4ced747f.tar.gz 222622409 BLAKE2B 8b6b53e0d51a681ec2e3ea1c873df95357e1333a598d26921c72f4ce05872aa5fe00a046bfe8811e2c8c1a2ffced7a325a0399bd931e54cf2aeb23abe887bde7 SHA512 e78219c87f001c813844ff652bf065f7c1d1bbf09af801ed1e99e9f40b981896bcee699d2ab15c71478388987c4030750a7958265d374b9f568fdf7af3dd3a21
diff --git a/dev-python/lit/lit-20.0.0_pre20241113.ebuild b/dev-python/lit/lit-20.0.0_pre20241113.ebuild
new file mode 100644
index 000000000000..ab099932bcf2
--- /dev/null
+++ b/dev-python/lit/lit-20.0.0_pre20241113.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	# flaky test
+	# https://github.com/llvm/llvm-project/issues/72022
+	rm tests/progress-bar.py || die
+
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.1.0.ebuild b/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.1.0.ebuild
index 338152240f7e..b4bdcb453eec 100644
--- a/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.1.0.ebuild
+++ b/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.1.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/protobuf[${PYTHON_USEDEP}]
 	>=dev-python/pyclipper-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pyproj-3.4.1[${PYTHON_USEDEP}]
 	>=dev-python/shapely-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-netlink/Manifest b/dev-python/netlink/Manifest
index 7c709d85bfe2..7c709d85bfe2 100644
--- a/dev-python/python-netlink/Manifest
+++ b/dev-python/netlink/Manifest
diff --git a/dev-python/python-netlink/metadata.xml b/dev-python/netlink/metadata.xml
index 68cdc2f1d952..68cdc2f1d952 100644
--- a/dev-python/python-netlink/metadata.xml
+++ b/dev-python/netlink/metadata.xml
diff --git a/dev-python/python-netlink/python-netlink-0.1.ebuild b/dev-python/netlink/netlink-0.1.ebuild
index 48799167ecbd..98850e563139 100644
--- a/dev-python/python-netlink/python-netlink-0.1.ebuild
+++ b/dev-python/netlink/netlink-0.1.ebuild
@@ -11,7 +11,7 @@ PYPI_PN="NetLink"
 inherit distutils-r1 pypi
 
 DESCRIPTION="Pure-Python client for the Linux NetLink interface"
-HOMEPAGE="https://pypi.org/project/NetLink/"
+HOMEPAGE="https://pypi.org/project/NetLink/ https://xmine128.tk/Software/Python/netlink/docs/"
 
 LICENSE="LGPL-3+"
 SLOT="0"
diff --git a/dev-python/omemo-dr/omemo-dr-1.0.1.ebuild b/dev-python/omemo-dr/omemo-dr-1.0.1.ebuild
index e2e7219b3359..a4b606052fcb 100644
--- a/dev-python/omemo-dr/omemo-dr-1.0.1.ebuild
+++ b/dev-python/omemo-dr/omemo-dr-1.0.1.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/protobuf[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild b/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
index a90cb013e2e8..c95d8fa50101 100644
--- a/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
+++ b/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 		dev-python/python-glanceclient[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		dev-python/subunit[${PYTHON_USEDEP}]
+		dev-python/python-subunit[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/pandas/pandas-2.2.3.ebuild b/dev-python/pandas/pandas-2.2.3.ebuild
index d35e2c55121f..594386f93411 100644
--- a/dev-python/pandas/pandas-2.2.3.ebuild
+++ b/dev-python/pandas/pandas-2.2.3.ebuild
@@ -222,7 +222,7 @@ pkg_postinst() {
 	optfeature "Plotting support" dev-python/matplotlib
 	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.10" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
 	optfeature "necessary for HDF5-based storage" ">=dev-python/tables-3.7.0"
-	optfeature "R I/O support" dev-python/rpy
+	optfeature "R I/O support" dev-python/rpy2
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
 	optfeature "SQL database support" ">=dev-python/sqlalchemy-1.4.36"
 	optfeature "miscellaneous statistical functions" dev-python/scipy
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.49.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.49.ebuild
index 38c93191bc76..bc08ce78c87e 100644
--- a/dev-python/phonenumbers/phonenumbers-8.13.49.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.13.49.ebuild
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-python/protobuf[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index e0163ad71116..e3f1e2f8da2a 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -3,3 +3,4 @@ DIST pikepdf-9.1.2.tar.gz 2869865 BLAKE2B 74b64d628f12a5335a9dfbe2e15fbbd0a39e26
 DIST pikepdf-9.2.1.tar.gz 2905740 BLAKE2B cee801fcb231f2537ce75555b10d68de9acc62e7824c26a00960293d056ae08dfd79607115ca110204af95bee99b57040ba408d47453636413c1291ba4e8e7cf SHA512 5b99272c3a98499770bb3120ead62ebdda731210e0305ec143809fcea7f978bf5dd4f4f7b90b6392af40b1e2c6e79a83e6a67d54a238fc398e38cf2bd675bc30
 DIST pikepdf-9.3.0.tar.gz 2905550 BLAKE2B 62b3a1d655fb5b3e4d315a3feaeb14a043048c5985f5cf99812c07e1d248ae52cb1734dbd091103f36a3fd5a981c89b57208fb50f5c1081e08e3c20ec728ff9c SHA512 3325ab06c285f8f51c66c3815b15f96b0730e38f8023ce5c1e46818c581c38ab3bd89875e5de6ce1064a5929a8c386740d76e662c82d00d9c46961c56da4f0c0
 DIST pikepdf-9.4.0.tar.gz 2905478 BLAKE2B fea41290e14c9c3254993f5885270cee8b896f830b6c4a9297843f2754b189ca9d095d33564a95686ff381dc1151d078c587a9fef681fc29f0ede1ec5b61e1e4 SHA512 53be3ca19c3daff564aef4e07b025741d1d8ab6196bf14299059263d432ab5906d73e35b88d940b8429f44f5e595f30d70276f388687b9200d4b561fe1183b29
+DIST pikepdf-9.4.1.tar.gz 2905720 BLAKE2B 5292f4a0af9496ac6ea9db6c3a1d44d1d84d0724c5dea08995bb097bed1eeb26476593a3e9d19b594aed24031f24523271830f21fc9ce7b95ad949da35e236e5 SHA512 d9a4b5e38f62b19c4f989899b851e7155df0be2ea02ffbd06e4fbabab66d5cb76d45a89ec3bca3e6aac3c85ab9d16699c38a4262b52f1b23edd8e3b4b0e0343b
diff --git a/dev-python/pikepdf/pikepdf-9.4.1.ebuild b/dev-python/pikepdf/pikepdf-9.4.1.ebuild
new file mode 100644
index 000000000000..c0d7b6df04aa
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-9.4.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="
+	https://github.com/pikepdf/pikepdf/
+	https://pypi.org/project/pikepdf/
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="big-endian"
+
+# Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
+# https://qpdf.readthedocs.io/en/stable/release-notes.html.
+DEPEND="
+	>=app-text/qpdf-11.5.0:0=
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/deprecated[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pillow-10.0.1[lcms,${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pybind11-2.12.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.36[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+		!big-endian? (
+			>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+		)
+		$(python_gen_cond_dep '
+			dev-python/tomli[${PYTHON_USEDEP}]
+		' 3.10)
+		media-libs/tiff[zlib]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	sed -e '/-n auto/d' -i pyproject.toml || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# fragile to system load
+		tests/test_image_access.py::test_random_image
+		tests/test_image_access.py::test_image_save_compare
+		tests/test_image_access.py::test_palette_nonrgb
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p timeout
+}
diff --git a/dev-python/proto-plus/proto-plus-1.25.0.ebuild b/dev-python/proto-plus/proto-plus-1.25.0.ebuild
index 2528bcce9dcf..7b27ea2058c1 100644
--- a/dev-python/proto-plus/proto-plus-1.25.0.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.25.0.ebuild
@@ -25,8 +25,8 @@ SLOT="0"
 KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
-	<dev-python/protobuf-python-6[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.19.0[${PYTHON_USEDEP}]
+	<dev-python/protobuf-6[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-3.19.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf/Manifest
index fb851d0bf1d3..f9b19611784d 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf/Manifest
@@ -2,7 +2,7 @@ DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f8
 DIST protobuf-21.9.tar.gz 5110670 BLAKE2B a4f5b7f58e1c5904ca990b100a72992f6f56177b28773f8de8c99e4158391d33cfb8aa8575915887fc9ae4294faf81d4ff6b470bc07b394bfd5885a09ba0fafe SHA512 6954b42d21921e630173b7848c056ab95635627d8eddec960f3db2ddda13eedde00520a9b350722e76e2998649eb8ebe10758e1db938b6a91e38ff3295b1b7c1
 DIST protobuf-22.5.tar.gz 4924661 BLAKE2B d69c73f4ebfddf45fd94b4f5f898faf00256fe674f2cbc0443c60a88d7a0f47fb96f2f6262879927c6da88095b4ea3ee7fd4c471c100bf42a2bae9edf48c07f1 SHA512 058ab2fec5b11007972e6043071056d1944c3b6fe1d31246cddba8eb57686e3b5280f6ad3d58e78940ca63005e74a8de3c72237f9f7c5066548c5a2513ddc584
 DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b
+DIST protobuf-5.28.0.py.tar.gz 422388 BLAKE2B 208f92bdb2bc0b92dca76de4d13eda0c98bc4784cb2ce9d57690682d9327fb2a66646241ecc02e96be602b6763b177b3192ca457732540d1fa8c33afecd8d76f SHA512 91f05915ace778ee76a07856049410c48c02a665f6c4665df9ac3e32992a67235a93fb4e19c9f991821652f236b87749c3d79cfabd8c6508fdc17a2ee612cee5
 DIST protobuf-python-4.25.4.tar.gz 380283 BLAKE2B 3ded7b654fa4db54b0dff2309f096bcab634b9d587bd94dae4ab49fb2fe9dc8f821c52deed43b026e06189b3b7a1a6697074942c1fa732ec82257233bf1b2f90 SHA512 7b91a9473fafe62b723741faec8e8531c604b025a49ef8be79778f8a48c84c475518447b24f5a08a0a8a8ecb1ff22e2106a3183197b76be3b2b8c6c994d93920
 DIST protobuf-python-5.27.2.tar.gz 401640 BLAKE2B 9d3420b75536ffd452cc2a3317a6ad1e16a62df36085f1e329f0178026032f5533e1a96f7b613f91093ac12a44d7ad4059ebededea636f38ded29da563afd075 SHA512 b3afcf13e223d7e855ac0aa000cc395e3ea1301b2e3dfe3c0d5435d8031be3726e6aec1fb6228c572aa1685f75aba2d97d2c9dfdb6d9e058a2e88321d6ba9180
 DIST protobuf-python-5.27.4.tar.gz 401622 BLAKE2B 4a7f211a4f4b3e7a338f8be6a7c6cdec2df629d6f9b62dfc276d6029864dfb541468a5e4d221f4540ae9281e5fc622ee898daeb178f9d98bac9932af0c8625db SHA512 2b817947363ab8d31bd484c18d33234004c7f5e6cb7bff55657cc33e1f325e22c7ccf83c19e255e839d6061fc62d632af9b36bc4fef0d4b33623b278239043b2
-DIST protobuf-python-5.28.0.tar.gz 422388 BLAKE2B 208f92bdb2bc0b92dca76de4d13eda0c98bc4784cb2ce9d57690682d9327fb2a66646241ecc02e96be602b6763b177b3192ca457732540d1fa8c33afecd8d76f SHA512 91f05915ace778ee76a07856049410c48c02a665f6c4665df9ac3e32992a67235a93fb4e19c9f991821652f236b87749c3d79cfabd8c6508fdc17a2ee612cee5
diff --git a/dev-python/protobuf-python/files/protobuf-python-3.20.3-python311.patch b/dev-python/protobuf/files/protobuf-3.20.3-python311.patch
index b9aca40776c5..b9aca40776c5 100644
--- a/dev-python/protobuf-python/files/protobuf-python-3.20.3-python311.patch
+++ b/dev-python/protobuf/files/protobuf-3.20.3-python311.patch
diff --git a/dev-python/protobuf-python/files/protobuf-python-4.22.5-c++-17.patch b/dev-python/protobuf/files/protobuf-4.22.5-c++-17.patch
index 3ca6a5776d04..3ca6a5776d04 100644
--- a/dev-python/protobuf-python/files/protobuf-python-4.22.5-c++-17.patch
+++ b/dev-python/protobuf/files/protobuf-4.22.5-c++-17.patch
diff --git a/dev-python/protobuf-python/files/protobuf-python-4.22.5-python.patch b/dev-python/protobuf/files/protobuf-4.22.5-python.patch
index 65cb22d5f653..65cb22d5f653 100644
--- a/dev-python/protobuf-python/files/protobuf-python-4.22.5-python.patch
+++ b/dev-python/protobuf/files/protobuf-4.22.5-python.patch
diff --git a/dev-python/protobuf-python/metadata.xml b/dev-python/protobuf/metadata.xml
index af249ed82217..af249ed82217 100644
--- a/dev-python/protobuf-python/metadata.xml
+++ b/dev-python/protobuf/metadata.xml
diff --git a/dev-python/protobuf-python/protobuf-python-4.21.12.ebuild b/dev-python/protobuf/protobuf-4.21.12.ebuild
index b07675a11987..b07675a11987 100644
--- a/dev-python/protobuf-python/protobuf-python-4.21.12.ebuild
+++ b/dev-python/protobuf/protobuf-4.21.12.ebuild
diff --git a/dev-python/protobuf-python/protobuf-python-4.21.9.ebuild b/dev-python/protobuf/protobuf-4.21.9.ebuild
index 6b71d4b6b5dc..a1f399894635 100644
--- a/dev-python/protobuf-python/protobuf-python-4.21.9.ebuild
+++ b/dev-python/protobuf/protobuf-4.21.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2023 Gentoo Authors
+# Copyright 2008-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/protobuf-python/protobuf-python-4.22.5.ebuild b/dev-python/protobuf/protobuf-4.22.5.ebuild
index 13c2c738c575..13c2c738c575 100644
--- a/dev-python/protobuf-python/protobuf-python-4.22.5.ebuild
+++ b/dev-python/protobuf/protobuf-4.22.5.ebuild
diff --git a/dev-python/protobuf-python/protobuf-python-4.23.3.ebuild b/dev-python/protobuf/protobuf-4.23.3.ebuild
index 450a188d79cb..450a188d79cb 100644
--- a/dev-python/protobuf-python/protobuf-python-4.23.3.ebuild
+++ b/dev-python/protobuf/protobuf-4.23.3.ebuild
diff --git a/dev-python/protobuf-python/protobuf-python-4.25.4.ebuild b/dev-python/protobuf/protobuf-4.25.4.ebuild
index 6299c70742ef..a663907d6f50 100644
--- a/dev-python/protobuf-python/protobuf-python-4.25.4.ebuild
+++ b/dev-python/protobuf/protobuf-4.25.4.ebuild
@@ -21,8 +21,7 @@ HOMEPAGE="
 
 # Rename sdist to avoid conflicts with dev-libs/protobuf
 SRC_URI="
-	$(pypi_sdist_url)
-		-> ${P}.tar.gz
+	$(pypi_sdist_url) -> protobuf-python-${PV}.tar.gz
 "
 
 LICENSE="BSD"
diff --git a/dev-python/protobuf-python/protobuf-python-5.28.0.ebuild b/dev-python/protobuf/protobuf-5.27.2.ebuild
index bc23e34a5c09..71af07a030e0 100644
--- a/dev-python/protobuf-python/protobuf-python-5.28.0.ebuild
+++ b/dev-python/protobuf/protobuf-5.27.2.ebuild
@@ -21,8 +21,7 @@ HOMEPAGE="
 
 # Rename sdist to avoid conflicts with dev-libs/protobuf
 SRC_URI="
-	$(pypi_sdist_url)
-		-> ${P}.tar.gz
+	$(pypi_sdist_url) -> protobuf-python-${PV}.tar.gz
 "
 
 LICENSE="BSD"
diff --git a/dev-python/protobuf-python/protobuf-python-5.27.4.ebuild b/dev-python/protobuf/protobuf-5.27.4.ebuild
index bc23e34a5c09..71af07a030e0 100644
--- a/dev-python/protobuf-python/protobuf-python-5.27.4.ebuild
+++ b/dev-python/protobuf/protobuf-5.27.4.ebuild
@@ -21,8 +21,7 @@ HOMEPAGE="
 
 # Rename sdist to avoid conflicts with dev-libs/protobuf
 SRC_URI="
-	$(pypi_sdist_url)
-		-> ${P}.tar.gz
+	$(pypi_sdist_url) -> protobuf-python-${PV}.tar.gz
 "
 
 LICENSE="BSD"
diff --git a/dev-python/protobuf-python/protobuf-python-5.27.2.ebuild b/dev-python/protobuf/protobuf-5.28.0.ebuild
index bc23e34a5c09..72b05b749ba4 100644
--- a/dev-python/protobuf-python/protobuf-python-5.27.2.ebuild
+++ b/dev-python/protobuf/protobuf-5.28.0.ebuild
@@ -21,8 +21,7 @@ HOMEPAGE="
 
 # Rename sdist to avoid conflicts with dev-libs/protobuf
 SRC_URI="
-	$(pypi_sdist_url)
-		-> ${P}.tar.gz
+	$(pypi_sdist_url) -> ${P}.py.tar.gz
 "
 
 LICENSE="BSD"
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index a8bd5464ab6f..2364e72b8fcb 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,3 +1 @@
-DIST pybind11-2.11.1.gh.tar.gz 756445 BLAKE2B 66ad933ffcd7fd475121f0b7488e13b914cb090d0ed511b96070e2849dcc537fb55e865b72fe06da6c5d1e3ed8e438799c5b0b60cbdc71e5713530174bff3be9 SHA512 ed1512ff0bca3bc0a45edc2eb8c77f8286ab9389f6ff1d5cb309be24bc608abbe0df6a7f5cb18c8f80a3bfa509058547c13551c3cd6a759af708fd0cdcdd9e95
-DIST pybind11-2.12.0.gh.tar.gz 771004 BLAKE2B df95d12cd005c85434ba8a4d80740f437f3f9433b0fbc9e6e1e5bf840281d5cb8295500b6510474a91b45201323b19079743ca927f7d1be2c1dc0dca89833e9c SHA512 c20247a4dccec310307174a26a79f9a98dd7ae7c84a48ad61c61589b02ef74caac26c2945de602cbe38b0bea65fc9985f1cc37f9e2322cae2f824dee98d602f1
 DIST pybind11-2.13.6.gh.tar.gz 800804 BLAKE2B 1f2efa05727ebbcd8e439b83bacfebb21d26a6f8f719e0a627633abdcae59837936e37e6441196e097e0075c9f922048d4e88146bb627d97ada28c48165bddb7 SHA512 497c25b33b09a9c42f67131ab82e35d689e8ce089dd7639be997305ff9a6d502447b79c824508c455d559e61f0186335b54dd2771d903a7c1621833930622d1a
diff --git a/dev-python/pybind11/pybind11-2.11.1.ebuild b/dev-python/pybind11/pybind11-2.11.1.ebuild
deleted file mode 100644
index 1e1cfa5be294..000000000000
--- a/dev-python/pybind11/pybind11-2.11.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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_{9,10,11,12,13} pypy3 )
-
-inherit cmake distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="
-	https://pybind11.readthedocs.io/en/stable/
-	https://github.com/pybind/pybind11/
-	https://pypi.org/project/pybind11/
-"
-SRC_URI="
-	https://github.com/pybind/pybind11/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-cpp/eigen:3
-"
-BDEPEND="
-	test? (
-		>=dev-cpp/catch-2.13.5
-		dev-libs/boost
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	export PYBIND11_USE_CMAKE=1
-	cmake_src_prepare
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local mycmakeargs=(
-		# disable forced lto
-		-DPYBIND11_LTO_CXX_FLAGS=
-		-DPYBIND11_INSTALL=ON
-		-DPYBIND11_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Compilation only does anything for tests
-	use test && cmake_src_compile
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	cmake_build check
-}
-
-python_install() {
-	distutils-r1_python_install
-	cmake_src_install
-}
diff --git a/dev-python/pybind11/pybind11-2.12.0.ebuild b/dev-python/pybind11/pybind11-2.12.0.ebuild
deleted file mode 100644
index 2d2489406dc8..000000000000
--- a/dev-python/pybind11/pybind11-2.12.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit cmake distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="
-	https://pybind11.readthedocs.io/en/stable/
-	https://github.com/pybind/pybind11/
-	https://pypi.org/project/pybind11/
-"
-SRC_URI="
-	https://github.com/pybind/pybind11/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-cpp/eigen:3
-"
-BDEPEND="
-	test? (
-		<dev-cpp/catch-3:0
-		>=dev-cpp/catch-2.13.9:0
-		dev-libs/boost
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	cmake_src_prepare
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local mycmakeargs=(
-		# disable forced lto
-		-DHAS_FLTO=OFF
-		# https://github.com/pybind/pybind11/issues/5087
-		-DPYBIND11_FINDPYTHON=OFF
-		-DPYBIND11_INSTALL=ON
-		-DPYBIND11_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Compilation only does anything for tests
-	use test && cmake_src_compile
-}
-
-python_test() {
-	cmake_build cpptest test_cmake_build
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	cd "${BUILD_DIR}/tests" || die
-	epytest "${S}/tests"
-}
-
-python_install() {
-	distutils-r1_python_install
-	cmake_src_install
-}
diff --git a/dev-python/pybind11/pybind11-2.13.6.ebuild b/dev-python/pybind11/pybind11-2.13.6.ebuild
index 7276ed016f76..f8929c99947a 100644
--- a/dev-python/pybind11/pybind11-2.13.6.ebuild
+++ b/dev-python/pybind11/pybind11-2.13.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pychromecast/pychromecast-13.0.7.ebuild b/dev-python/pychromecast/pychromecast-13.0.7.ebuild
index 939368550d60..6ef4832c4110 100644
--- a/dev-python/pychromecast/pychromecast-13.0.7.ebuild
+++ b/dev-python/pychromecast/pychromecast-13.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,6 +22,6 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/casttube-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.19.1[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-3.19.1[${PYTHON_USEDEP}]
 	>=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/pychromecast/pychromecast-13.1.0.ebuild b/dev-python/pychromecast/pychromecast-13.1.0.ebuild
index 2fb056017b05..2c452822e800 100644
--- a/dev-python/pychromecast/pychromecast-13.1.0.ebuild
+++ b/dev-python/pychromecast/pychromecast-13.1.0.ebuild
@@ -22,6 +22,6 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/casttube-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.19.1[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-3.19.1[${PYTHON_USEDEP}]
 	>=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/pychromecast/pychromecast-14.0.1.ebuild b/dev-python/pychromecast/pychromecast-14.0.1.ebuild
index c93bfac7c970..6ef4832c4110 100644
--- a/dev-python/pychromecast/pychromecast-14.0.1.ebuild
+++ b/dev-python/pychromecast/pychromecast-14.0.1.ebuild
@@ -22,6 +22,6 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/casttube-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.19.1[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-3.19.1[${PYTHON_USEDEP}]
 	>=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest
index 143a555657ae..410ba95d92ed 100644
--- a/dev-python/pydantic-core/Manifest
+++ b/dev-python/pydantic-core/Manifest
@@ -30,7 +30,6 @@ DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efea
 DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST jiter-0.5.0.crate 141152 BLAKE2B 5ab42f40c3a1fa5717447085cc289d89c649570022dde6c628f24f7dcce1c40cbdc5e4f6dc92afeabc3645683636fe7762ccf70665a1139bb39e2bdf481074da SHA512 79e1aaf52bbfccf010124325f7010839a9d5c4ce89cf0a6f68f8d6107af3e95dc4ed21ef341f92e71cf2e88119c911289af0cbea3aafdb5f5d49a45f103f26d7
-DIST jiter-0.6.1.crate 142818 BLAKE2B b0c281cc32ef6adac09cc38b7c0fcd9118b2e0abb860a9020f2d30ec23ef6a8e4b579cfbd89de949f446dd6f9215240ceda7876f25cd010a6cd0a4e0091c65ad SHA512 7d70e9985b4cfc72f15b2307a1522d8937f702a816f3f0e99f305bb66fa5965e181809ce795506472301f221e583a4d9a0844c8218898787c47962c01f6b8fda
 DIST jiter-0.7.0.crate 143599 BLAKE2B c0537ccab324a624195adbad8238cc238134a77fd4fc004072ac4704d10b3037dee2b7404ef9724baf29bcc1e1d191e3259149fb27ccc6a91e41e5f1a5e8b4fa SHA512 c3f3bc39c87a59bd017b60791b5f40534ed2e9995be9da43ca2c031f55b8505cfb3f01b7c595c2b34aa337f75566a55fdd8b4c5486f30de2ae1031966d4e2edf
 DIST jiter-0.7.1.crate 143767 BLAKE2B 314bca16d68483e90cae65138c2e1cb6066acc024cc2cd0fa7e838247b559b4372b63d17d23b7b14e031ffd4318f28c6b810890bd00718def7262c5c0ffd98da SHA512 b5377a8e6ca9e948fafd8c257bdd5bdceed3b76b7a6492065c7feb0deaac7b24851c2aa0440b23707cc86ba485065677bd563ee43819cf0f385362782c4afd69
 DIST lexical-parse-float-0.8.5.crate 180161 BLAKE2B 881e4db32a21c26a1919fd1373aef1ea16a6fca3d799edb18ff0c9e4a79d481f8ade7a93f9ded2a660ad10cf815eb757f6eec7887945f8203c467e700af7a9a3 SHA512 ef012cbf18f2e306724dd700ac259aaa73b44f6c4531377deb9979c80d31ae66fc1a8b2671bd677e0ebfad8f77e9a5cf25707c67a1c5b1f554953c036cb39d46
@@ -48,8 +47,6 @@ DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7
 DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST pydantic_core-2.23.4.tar.gz 402156 BLAKE2B af899e149693907542296b5b4fa5f982d2dca5c090331703212aabbbce0a8e0badca3947affa9e42998949ebd18b1ffc2ad9904b47e130bbe7e90150c32bc527 SHA512 c7c9a303ff3c751108622f804f812f3793ad93a95e560b0d6b0a866c3bd41ed7bfdbcd87483f37ad3849969c72adde24083d1a9015ebd610847a7fa6d4068e24
-DIST pydantic_core-2.25.0.tar.gz 407498 BLAKE2B 2f729013d1da81bdedc61ae67c2c11c31edec97c6de141255cd642255c3447523e13c25d2dff034e8229f86067388109237358c76dfafea2bf938a34668d9938 SHA512 2c3bf8818ba8b7cea4eb580709b38860465c774381170c6a52a771a97a5b9f9accf86bcf3d1131b5cb40fcf805f2cdc7bdf54541da50d9bf5b02644e674ae8a9
-DIST pydantic_core-2.25.1.tar.gz 408040 BLAKE2B a64beeb9b8cb2d71aa4d30000361f863c3bb5d3964c0fe657bea60f370eca6a289279a8685983cfc5a0623f2f2609659b5ba9274cdf002b18431b2a0d965025c SHA512 9b7cfb297295f0d64147b2b4bcdc07c10f8aca03c8c7223bd2302319384b6ebfebe6196bd15673c69c961e2b8096199b5741d9e1bf77a72004e471823bbd514c
 DIST pydantic_core-2.26.0.tar.gz 411154 BLAKE2B 98206a7dad82d8908102b787cf4c0366a4abdb36bdd6129dc684b810aa22372cef681b49b42453df0b535361bf5232b2d6e1fea583090b2b282a915ca8d2e87d SHA512 08d38844f216994af6842038ada324fb4bddd63e07bc79ce44ac44acf12981aaf8400dd1da53be74cd9d748d8562ba9cc7814a3df79be5995302256bd9d0793c
 DIST pydantic_core-2.27.0.tar.gz 412675 BLAKE2B ee50fa4bc04033f5bca04b92acaf0542e22af73fabe522377cc9e76837945e55045700d6fbe1df8e63dda331e85db8b414cacd5dcfced2ade807ce877294f925 SHA512 55f3eb1b243800dd9d932643c1be5d4b09a86305b1f30fc21b9b73ea073f046fbc28c41158cba9f03ccbd396cb2ee0fc5eb87c19783b7db62785b50f4b95ac6b
 DIST pyo3-0.22.2.crate 538342 BLAKE2B faf347695117f9fe0ebe5cd7f6aa1b0dcfe718343875d6c06438046deccc1075f104d2a2413dcda41ae9827bc363aa147057b45968f6634f577a6a4510a4bb8e SHA512 e8bae09059f50ffe477dad44499cedeaf3a734665f0fd8e8bd4b44f48578d21e4bdb8d55ceea00c5a27da750761842ddf89cfcecdecb2e7a4a17ab192259be9c
@@ -66,7 +63,6 @@ DIST python3-dll-a-0.2.10.crate 74573 BLAKE2B 770c5b070f4dd1b9639b8aff59bb733575
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 DIST radium-0.7.0.crate 10906 BLAKE2B d576e0ea5c5287bcb6740cee3a3838b6ae4dfdef0ef05d34634b96dba5159e48260233db57a767c9e032fa5d9a5798361335cb19f7844f450113ece30ffbc51d SHA512 51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0
 DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
-DIST regex-1.11.0.crate 254059 BLAKE2B 9450e54b522c3f12e4f1d814025c3037f8373b9e1feaf2028756b573335cb7f22400b0925e3ceb0716d72aeb19b02b4bcf70b0b435a0252d0d52a7028d95308c SHA512 16c066664ae87497f9880a52222301fb0d44053ae2d6861ea21dc59cab82bd1ab8ac407f9e77228a21a586ee745b02f9eb10e7b9b30df2f3aad73633270bf73d
 DIST regex-1.11.1.crate 254170 BLAKE2B 5cf41012fc2ba8a006c0eb4a922cbbf1614bf300be361c9e2d98956a9a5e9b140e37bea09132fab7bfb633d4439158723624bcf45e8c619c4061b399253c1b82 SHA512 d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8
 DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
 DIST regex-automata-0.4.8.crate 617784 BLAKE2B 7535c79f6ddf1b1225e21171921594dcf32fc3afd47519d2067b2047b19070cb7e6fdfd1563b884fec6f91dd568522fc95d85bf095c11f8c02daeac128c45020 SHA512 278e3e2ab230ed5fa7d4837e8ea879fae68ebf35c2da5cc3a67f46b7d593abbcf71e6326a0cf34e38edc0f3f2166ff42a4fcc17a400d9604429aa5b4be075a3f
@@ -75,10 +71,8 @@ DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff
 DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST serde-1.0.209.crate 78364 BLAKE2B f6b4c2bd931a8067482ca033211c4e85c0dfd6084cb599c38a9ba666cce30489685a3a6a8a539eb6e41141a52328943dccbfe25dbd857af16665094fdf7c3f45 SHA512 25d2236eedc08fa3b9d078a1971df705c4f428b7a4e6a2d28d9f0f9893c19de745bffffe3fa9f3c08074bf4359aaf09cc28770e4b14c21c66d6a0b9411738f7b
-DIST serde-1.0.213.crate 78349 BLAKE2B 0426dcc9a6a3f7a2f35ace4ac9e023ea7607e5677ec71cd63884cdfd1280ddfebf0d1c38843ea8a076c3371b0b4d524eddd80f5cdc0c8799d7d7099a682c38f2 SHA512 94b3f1ee0008dbb434bec1b19e87202cc2791c1b0948aa71f3ec71a66693a00bc7fd2218c4bfb361b71922db18f0e0a89fbb605e68e91c38376e2d4e3f3ffdfc
 DIST serde-1.0.214.crate 78523 BLAKE2B c701f316a3204625d475668d2722991d75c8d9c573ae32e9175ccf99780fbe0c9c9d1dd0b4bac35f2cc91aca888c7f3dc41af2842dd833ab82776a38c2a2f6c0 SHA512 100eac65a39b9b9c32c1671d36fa9cf8aca84a2673e24c2521fdbdb3ed9f932c71548f3f1a26b1e73dd7c92a34ffa8ed1c76eb173fa20d6e85736cdf8dc9a8ee
 DIST serde_derive-1.0.209.crate 56023 BLAKE2B 752bc9f46b880d0ed8a4f7e29ffde1343c63c4be1e9740afb1a28dcbff5bedfe077eb51c7052adecfbdbd9942c30b63a27914deb6401a2ecaf70fef0f64cd80a SHA512 22c4eb76412bd73814d0b86209b110b9e59626f64b41cbc250755144e545ff30fa69972ac93d74f988a3a6a239d9138f4e8a23b283c746a0aa5fcddfbe077cd6
-DIST serde_derive-1.0.213.crate 56625 BLAKE2B 0ebf7b11793c0f5368c363ab37a40d954d6b91dd0db15f16e5f2db7d1f2f747abcce7f1e562cc7323d1e837f1d3aa51978229f278c20af7a90c748d659b1c917 SHA512 38aa6b70234c780534b4c45056dec71224cb993aea82866b5a3e9be1830ac8ad56b2618a1db51e1b350a6534ddde8eb9e49b8a74569c0c4081a56d5cbe296477
 DIST serde_derive-1.0.214.crate 56630 BLAKE2B c284561109e5d60e103f1bb421e4da48f35c5046aa52359177e286449cf8fe51a92f6295f5bec3dc4cd737025e8d0bc618436e2f7640873f66bc5b77bb4f450a SHA512 70bc0a31d344cfec8d30f2034beab25097ef76ab8d89947b21753f737759e5d4e60e5596e0c7994a7cc35993bae01148120f6cdf5239be25fb243056effa27f0
 DIST serde_json-1.0.128.crate 149520 BLAKE2B 246eb865f64a0f161b79f3d4f783dbadbc930c4a19edb6c0fe8f0c6145c7c47be4b692d3e084b1b500820ece8e94214820978cf898926dd805bd431fb411bbc9 SHA512 9e6290d3a6a971b3c37bbc97097b8179e64c655779b43c7b75303a35ef7030f5401b3a5f62cbc95a7bd5f42ecbefb0b469234d78a76c8c1597726d8e08908a7d
 DIST serde_json-1.0.132.crate 150549 BLAKE2B a49aef7737fad2e6f6ec79cb6da00c734e7de7ef16be321846d1f6229534b58e15ceb0f6306eeae6f85bf07431d82959c0a56ed1394d21a67b65c8c48e971f3f SHA512 9d157ce7d705fee8245569e7c577310782b69675a6e459f21904544b824a1ca5c9b445d17419fee438dfeb6fcc35343ba14e022043fffade0210b6d2c1b5795e
diff --git a/dev-python/pydantic-core/pydantic-core-2.25.0-r1.ebuild b/dev-python/pydantic-core/pydantic-core-2.25.0-r1.ebuild
deleted file mode 100644
index 17af2c2e3698..000000000000
--- a/dev-python/pydantic-core/pydantic-core-2.25.0-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-CRATES="
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	autocfg@1.3.0
-	base64@0.22.1
-	bitvec@1.0.1
-	cc@1.0.101
-	cfg-if@1.0.0
-	displaydoc@0.2.5
-	enum_dispatch@0.3.13
-	equivalent@1.0.1
-	form_urlencoded@1.2.1
-	funty@2.0.0
-	getrandom@0.2.15
-	hashbrown@0.14.5
-	heck@0.5.0
-	hex@0.4.3
-	icu_collections@1.5.0
-	icu_locid@1.5.0
-	icu_locid_transform@1.5.0
-	icu_locid_transform_data@1.5.0
-	icu_normalizer@1.5.0
-	icu_normalizer_data@1.5.0
-	icu_properties@1.5.1
-	icu_properties_data@1.5.0
-	icu_provider@1.5.0
-	icu_provider_macros@1.5.0
-	idna@0.5.0
-	idna@1.0.2
-	indexmap@2.2.6
-	indoc@2.0.5
-	itoa@1.0.11
-	jiter@0.5.0
-	lexical-parse-float@0.8.5
-	lexical-parse-integer@0.8.6
-	lexical-util@0.8.5
-	libc@0.2.155
-	litemap@0.7.3
-	memchr@2.7.4
-	memoffset@0.9.1
-	num-bigint@0.4.6
-	num-integer@0.1.46
-	num-traits@0.2.19
-	once_cell@1.19.0
-	percent-encoding@2.3.1
-	portable-atomic@1.6.0
-	proc-macro2@1.0.86
-	pyo3-build-config@0.22.5
-	pyo3-ffi@0.22.5
-	pyo3-macros-backend@0.22.5
-	pyo3-macros@0.22.5
-	pyo3@0.22.5
-	python3-dll-a@0.2.10
-	quote@1.0.36
-	radium@0.7.0
-	regex-automata@0.4.8
-	regex-syntax@0.8.5
-	regex@1.11.0
-	rustversion@1.0.17
-	ryu@1.0.18
-	serde@1.0.213
-	serde_derive@1.0.213
-	serde_json@1.0.132
-	smallvec@1.13.2
-	speedate@0.14.4
-	stable_deref_trait@1.2.0
-	static_assertions@1.1.0
-	strum@0.26.3
-	strum_macros@0.26.4
-	syn@2.0.82
-	synstructure@0.13.1
-	tap@1.0.1
-	target-lexicon@0.12.14
-	tinystr@0.7.6
-	tinyvec@1.6.1
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	unindent@0.2.3
-	url@2.5.2
-	utf16_iter@1.0.5
-	utf8_iter@1.0.4
-	uuid@1.11.0
-	version_check@0.9.5
-	wasi@0.11.0+wasi-snapshot-preview1
-	write16@1.0.0
-	writeable@0.5.5
-	wyz@0.5.1
-	yoke-derive@0.7.4
-	yoke@0.7.4
-	zerocopy-derive@0.7.34
-	zerocopy@0.7.34
-	zerofrom-derive@0.1.4
-	zerofrom@0.1.4
-	zerovec-derive@0.10.3
-	zerovec@0.10.4
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Core validation logic for pydantic written in Rust"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic-core/
-	https://pypi.org/project/pydantic-core/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0 Unicode-DFS-2016
-	|| ( Apache-2.0 Boost-1.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
-
-src_prepare() {
-	sed -i -e '/--benchmark/d' pyproject.toml || die
-	sed -i -e '/^strip/d' Cargo.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/benchmarks
-	)
-	local EPYTEST_DESELECT=(
-		# TODO: recursion till segfault
-		tests/serializers/test_functions.py::test_recursive_call
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	rm -rf pydantic_core || die
-	# tests link to libpython, so they fail to link on pypy3
-	[[ ${EPYTHON} != pypy3 ]] && cargo_src_test
-	epytest -p pytest_mock -p timeout -o xfail_strict=False
-}
diff --git a/dev-python/pydantic-core/pydantic-core-2.25.1-r1.ebuild b/dev-python/pydantic-core/pydantic-core-2.25.1-r1.ebuild
deleted file mode 100644
index 3333fb7ffd51..000000000000
--- a/dev-python/pydantic-core/pydantic-core-2.25.1-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-CRATES="
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	autocfg@1.3.0
-	base64@0.22.1
-	bitvec@1.0.1
-	cc@1.0.101
-	cfg-if@1.0.0
-	displaydoc@0.2.5
-	enum_dispatch@0.3.13
-	equivalent@1.0.1
-	form_urlencoded@1.2.1
-	funty@2.0.0
-	getrandom@0.2.15
-	hashbrown@0.14.5
-	heck@0.5.0
-	hex@0.4.3
-	icu_collections@1.5.0
-	icu_locid@1.5.0
-	icu_locid_transform@1.5.0
-	icu_locid_transform_data@1.5.0
-	icu_normalizer@1.5.0
-	icu_normalizer_data@1.5.0
-	icu_properties@1.5.1
-	icu_properties_data@1.5.0
-	icu_provider@1.5.0
-	icu_provider_macros@1.5.0
-	idna@0.5.0
-	idna@1.0.2
-	indexmap@2.2.6
-	indoc@2.0.5
-	itoa@1.0.11
-	jiter@0.6.1
-	lexical-parse-float@0.8.5
-	lexical-parse-integer@0.8.6
-	lexical-util@0.8.5
-	libc@0.2.155
-	litemap@0.7.3
-	memchr@2.7.4
-	memoffset@0.9.1
-	num-bigint@0.4.6
-	num-integer@0.1.46
-	num-traits@0.2.19
-	once_cell@1.19.0
-	percent-encoding@2.3.1
-	portable-atomic@1.6.0
-	proc-macro2@1.0.86
-	pyo3-build-config@0.22.5
-	pyo3-ffi@0.22.5
-	pyo3-macros-backend@0.22.5
-	pyo3-macros@0.22.5
-	pyo3@0.22.5
-	python3-dll-a@0.2.10
-	quote@1.0.36
-	radium@0.7.0
-	regex-automata@0.4.8
-	regex-syntax@0.8.5
-	regex@1.11.0
-	rustversion@1.0.17
-	ryu@1.0.18
-	serde@1.0.213
-	serde_derive@1.0.213
-	serde_json@1.0.132
-	smallvec@1.13.2
-	speedate@0.14.4
-	stable_deref_trait@1.2.0
-	static_assertions@1.1.0
-	strum@0.26.3
-	strum_macros@0.26.4
-	syn@2.0.82
-	synstructure@0.13.1
-	tap@1.0.1
-	target-lexicon@0.12.14
-	tinystr@0.7.6
-	tinyvec@1.6.1
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	unindent@0.2.3
-	url@2.5.2
-	utf16_iter@1.0.5
-	utf8_iter@1.0.4
-	uuid@1.11.0
-	version_check@0.9.5
-	wasi@0.11.0+wasi-snapshot-preview1
-	write16@1.0.0
-	writeable@0.5.5
-	wyz@0.5.1
-	yoke-derive@0.7.4
-	yoke@0.7.4
-	zerocopy-derive@0.7.34
-	zerocopy@0.7.34
-	zerofrom-derive@0.1.4
-	zerofrom@0.1.4
-	zerovec-derive@0.10.3
-	zerovec@0.10.4
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Core validation logic for pydantic written in Rust"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic-core/
-	https://pypi.org/project/pydantic-core/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0 Unicode-DFS-2016
-	|| ( Apache-2.0 Boost-1.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
-
-src_prepare() {
-	sed -i -e '/--benchmark/d' pyproject.toml || die
-	sed -i -e '/^strip/d' Cargo.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/benchmarks
-	)
-	local EPYTEST_DESELECT=(
-		# TODO: recursion till segfault
-		tests/serializers/test_functions.py::test_recursive_call
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	rm -rf pydantic_core || die
-	# tests link to libpython, so they fail to link on pypy3
-	[[ ${EPYTHON} != pypy3 ]] && cargo_src_test
-	epytest -p pytest_mock -p timeout -o xfail_strict=False
-}
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index b34872ff31b7..2d7a620bec8b 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,2 +1,3 @@
 DIST pydantic-2.10.0b1.tar.gz 777569 BLAKE2B 6fdde0673b28feb51921417b501b8a9fb43b36d94f5e564f96d04d09bacc34710be7a7d1b72d8a4e17fad493824b5fc556553d5508bff3942303191dc8501e49 SHA512 ef1fb40fb3601949455901b645d9333b37bc7fd9b53b7882ba81e1824a4f123981a3e32e9654e45b29695257c7bcfc19eedde30263862769d8e1c887d9b11d43
+DIST pydantic-2.10.0b2.tar.gz 781700 BLAKE2B 82a3d8e4ab99113ca3e5ac46e058d1844d0870ce4fd5d6ada2ef23cebfc19cb040c4af553088b07904b857609e872caa7d20946536c5ed77fe4a452093e52cf3 SHA512 93ffa34b34ced16746b1f3e53218b863284f08cb1ec2f966cd024826926305c69b8b3bdfb389b9f1a2f26e5b678b054c20cd15bb2849cd665457977e9338b5e8
 DIST pydantic-2.9.2.tar.gz 769917 BLAKE2B 4e34fda6a9e8e8331278d0b7d0c2dfd61bde637c126fa6dabf78a09c6ef993f84dc8df6af421c8fb6d69c8e1c387a40e4bcd38cbe02f5ac521c6c70821735763 SHA512 2aace9e79a98bd94e5dc626736a245051912a11fdce36013d2ad2f96b266052386a3e12b259dca30ddc38b63c6b00b5bcc9cd5e80f7805de4d8701064f0982aa
diff --git a/dev-python/pydantic/pydantic-2.10.0_beta2.ebuild b/dev-python/pydantic/pydantic-2.10.0_beta2.ebuild
new file mode 100644
index 000000000000..a2e2af698c33
--- /dev/null
+++ b/dev-python/pydantic/pydantic-2.10.0_beta2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Data parsing and validation using Python type hints"
+HOMEPAGE="
+	https://github.com/pydantic/pydantic/
+	https://pypi.org/project/pydantic/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/annotated-types-0.6.0[${PYTHON_USEDEP}]
+	~dev-python/pydantic-core-2.27.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.12.2[${PYTHON_USEDEP}]
+	dev-python/tzdata[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/cloudpickle[${PYTHON_USEDEP}]
+		dev-python/dirty-equals[${PYTHON_USEDEP}]
+		>=dev-python/email-validator-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/Faker-18.13.0[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-4.23.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/benchmark/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	local EPYTEST_IGNORE=(
+		# require pytest-examples
+		tests/test_docs.py
+		# benchmarks
+		tests/benchmarks
+	)
+
+	if ! has_version "dev-python/cloudpickle[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/test_pickle.py
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock
+}
diff --git a/dev-python/pypillowfight/Manifest b/dev-python/pypillowfight/Manifest
new file mode 100644
index 000000000000..db1166f2ad8b
--- /dev/null
+++ b/dev-python/pypillowfight/Manifest
@@ -0,0 +1 @@
+DIST libpillowfight-50d965879eb89fdef9be09d6e934329486ff585d.tar.bz2 87826271 BLAKE2B aa0a9c2800992b671940f0ed0c8d808c5ad870c724fbf0f4dad336d224e6d510b135052f2697a6a1d05bafb9f1969278962c625d5d0ffd997b2548e60b1dec2b SHA512 76b05d49e2ee9fc9dcc2c9342d312841c8d1520d8d2027bd12b6921f85bd92645f698a811ccf7bdeceba64f0b706d5fd2975f91c51db8ce87f1261793aee83cb
diff --git a/dev-python/libpillowfight/metadata.xml b/dev-python/pypillowfight/metadata.xml
index e38ff9f9adad..e38ff9f9adad 100644
--- a/dev-python/libpillowfight/metadata.xml
+++ b/dev-python/pypillowfight/metadata.xml
diff --git a/dev-python/libpillowfight/libpillowfight-0.3.0_p20210816-r1.ebuild b/dev-python/pypillowfight/pypillowfight-0.3.0_p20210816-r1.ebuild
index 01de0b979001..90ad3e3487fb 100644
--- a/dev-python/libpillowfight/libpillowfight-0.3.0_p20210816-r1.ebuild
+++ b/dev-python/pypillowfight/pypillowfight-0.3.0_p20210816-r1.ebuild
@@ -10,11 +10,16 @@ PYTHON_COMPAT=( python3_{9,10,11,12,13} )
 inherit distutils-r1
 
 COMMIT="50d965879eb89fdef9be09d6e934329486ff585d"
-
+MY_P=libpillowfight-${COMMIT}
 DESCRIPTION="Small library containing various image processing algorithms"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libpillowfight"
-SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/${PN}/-/archive/${COMMIT}/${P}.tar.bz2"
-S="${WORKDIR}/${PN}-${COMMIT}"
+HOMEPAGE="
+	https://gitlab.gnome.org/World/OpenPaperwork/libpillowfight/
+	https://pypi.org/project/pypillowfight/
+"
+SRC_URI="
+	https://gitlab.gnome.org/World/OpenPaperwork/libpillowfight/-/archive/${COMMIT}/${MY_P}.tar.bz2
+"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-python/pyspectrum2/pyspectrum2-0.2.0-r2.ebuild b/dev-python/pyspectrum2/pyspectrum2-0.2.0-r2.ebuild
index 8b3d8813e8d8..e621f891aeb7 100644
--- a/dev-python/pyspectrum2/pyspectrum2-0.2.0-r2.ebuild
+++ b/dev-python/pyspectrum2/pyspectrum2-0.2.0-r2.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RDEPEND="dev-python/protobuf-python[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/protobuf[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 python_install_all() {
diff --git a/dev-python/pysvg/Manifest b/dev-python/pysvg-py3/Manifest
index 87c3ca7af8ae..87c3ca7af8ae 100644
--- a/dev-python/pysvg/Manifest
+++ b/dev-python/pysvg-py3/Manifest
diff --git a/dev-python/pysvg/metadata.xml b/dev-python/pysvg-py3/metadata.xml
index 853174b8f2ab..853174b8f2ab 100644
--- a/dev-python/pysvg/metadata.xml
+++ b/dev-python/pysvg-py3/metadata.xml
diff --git a/dev-python/pysvg/pysvg-0.2.2_p3-r1.ebuild b/dev-python/pysvg-py3/pysvg-py3-0.2.2_p3-r1.ebuild
index 894166571303..e4ac0c9d1338 100644
--- a/dev-python/pysvg/pysvg-0.2.2_p3-r1.ebuild
+++ b/dev-python/pysvg-py3/pysvg-py3-0.2.2_p3-r1.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-PYPI_PN="pysvg-py3"
 PYTHON_COMPAT=( python3_{9,10,11,12,13} )
 
 inherit distutils-r1 pypi
 
 DESCRIPTION="Python SVG document creation library"
-HOMEPAGE="https://github.com/alorence/pysvg-py3"
+HOMEPAGE="
+	https://github.com/alorence/pysvg-py3/
+	https://pypi.org/project/pysvg-py3/
+"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/python-axolotl/python-axolotl-0.2.3-r3.ebuild b/dev-python/python-axolotl/python-axolotl-0.2.3-r3.ebuild
index 035d7e98f2dd..c815f5d4edb1 100644
--- a/dev-python/python-axolotl/python-axolotl-0.2.3-r3.ebuild
+++ b/dev-python/python-axolotl/python-axolotl-0.2.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/protobuf[${PYTHON_USEDEP}]
 	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/python-neutronclient/python-neutronclient-11.3.1.ebuild b/dev-python/python-neutronclient/python-neutronclient-11.3.1.ebuild
index fdb66457477a..4050fb85e06b 100644
--- a/dev-python/python-neutronclient/python-neutronclient-11.3.1.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-11.3.1.ebuild
@@ -44,7 +44,7 @@ BDEPEND="
 		dev-python/fixtures[${PYTHON_USEDEP}]
 		dev-python/oslotest[${PYTHON_USEDEP}]
 		dev-python/python-openstackclient[${PYTHON_USEDEP}]
-		dev-python/subunit[${PYTHON_USEDEP}]
+		dev-python/python-subunit[${PYTHON_USEDEP}]
 		dev-python/requests-mock[${PYTHON_USEDEP}]
 		dev-python/testtools[${PYTHON_USEDEP}]
 		dev-python/testscenarios[${PYTHON_USEDEP}]
diff --git a/dev-python/subunit/Manifest b/dev-python/python-subunit/Manifest
index fc68f55c9485..fc68f55c9485 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/python-subunit/Manifest
diff --git a/dev-python/subunit/files/subunit-1.4.0-werror.patch b/dev-python/python-subunit/files/subunit-1.4.0-werror.patch
index e64f74a655ef..e64f74a655ef 100644
--- a/dev-python/subunit/files/subunit-1.4.0-werror.patch
+++ b/dev-python/python-subunit/files/subunit-1.4.0-werror.patch
diff --git a/dev-python/subunit/metadata.xml b/dev-python/python-subunit/metadata.xml
index e99873a6ae7d..e99873a6ae7d 100644
--- a/dev-python/subunit/metadata.xml
+++ b/dev-python/python-subunit/metadata.xml
diff --git a/dev-python/subunit/subunit-1.4.4.ebuild b/dev-python/python-subunit/python-subunit-1.4.4.ebuild
index d383fbfa088e..31f77f2717e6 100644
--- a/dev-python/subunit/subunit-1.4.4.ebuild
+++ b/dev-python/python-subunit/python-subunit-1.4.4.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
 
 inherit distutils-r1 multilib-minimal autotools
 
+MY_P=subunit-${PV}
 DESCRIPTION="A streaming protocol for test results"
 HOMEPAGE="
 	https://launchpad.net/subunit/
@@ -15,8 +16,9 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/testing-cabal/subunit/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
+S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
diff --git a/dev-python/tlsh/Manifest b/dev-python/python-tlsh/Manifest
index 6fc86ca17aeb..6fc86ca17aeb 100644
--- a/dev-python/tlsh/Manifest
+++ b/dev-python/python-tlsh/Manifest
diff --git a/dev-python/tlsh/files/tlsh-4.8.2-r1-py312.patch b/dev-python/python-tlsh/files/python-tlsh-4.8.2-r1-py312.patch
index 56c4766bd711..56c4766bd711 100644
--- a/dev-python/tlsh/files/tlsh-4.8.2-r1-py312.patch
+++ b/dev-python/python-tlsh/files/python-tlsh-4.8.2-r1-py312.patch
diff --git a/dev-python/tlsh/files/tlsh-4.8.2-setup-sources.patch b/dev-python/python-tlsh/files/python-tlsh-4.8.2-setup-sources.patch
index 4cdb0f864b5b..4cdb0f864b5b 100644
--- a/dev-python/tlsh/files/tlsh-4.8.2-setup-sources.patch
+++ b/dev-python/python-tlsh/files/python-tlsh-4.8.2-setup-sources.patch
diff --git a/dev-python/tlsh/metadata.xml b/dev-python/python-tlsh/metadata.xml
index dfce1e34fd0b..dfce1e34fd0b 100644
--- a/dev-python/tlsh/metadata.xml
+++ b/dev-python/python-tlsh/metadata.xml
diff --git a/dev-python/tlsh/tlsh-4.8.2-r1.ebuild b/dev-python/python-tlsh/python-tlsh-4.8.2-r1.ebuild
index de7e30e5750a..a54694a6ff6f 100644
--- a/dev-python/tlsh/tlsh-4.8.2-r1.ebuild
+++ b/dev-python/python-tlsh/python-tlsh-4.8.2-r1.ebuild
@@ -3,15 +3,23 @@
 
 EAPI=8
 
+DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-DISTUTILS_EXT=1
+
 inherit distutils-r1
 
+MY_P=tlsh-${PV}
 DESCRIPTION="Fuzzy matching library - C++ extension for Python"
-HOMEPAGE="https://pypi.org/project/python-tlsh/"
-SRC_URI="https://github.com/trendmicro/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S=${WORKDIR}/${P}/py_ext
+HOMEPAGE="
+	https://github.com/trendmicro/tlsh/
+	https://pypi.org/project/python-tlsh/
+"
+SRC_URI="
+	https://github.com/trendmicro/tlsh/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/py_ext
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla/Manifest
index 96cf9c1d21e4..96cf9c1d21e4 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla/Manifest
diff --git a/dev-python/qscintilla-python/metadata.xml b/dev-python/qscintilla/metadata.xml
index 41ee96233241..41ee96233241 100644
--- a/dev-python/qscintilla-python/metadata.xml
+++ b/dev-python/qscintilla/metadata.xml
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.14.1-r2.ebuild b/dev-python/qscintilla/qscintilla-2.14.1-r2.ebuild
index 6103ba9080da..6103ba9080da 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.14.1-r2.ebuild
+++ b/dev-python/qscintilla/qscintilla-2.14.1-r2.ebuild
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy2/Manifest
index 4b05cc402c2c..4b05cc402c2c 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy2/Manifest
diff --git a/dev-python/rpy/metadata.xml b/dev-python/rpy2/metadata.xml
index 3bf64315257b..3bf64315257b 100644
--- a/dev-python/rpy/metadata.xml
+++ b/dev-python/rpy2/metadata.xml
diff --git a/dev-python/rpy/rpy-3.5.14.ebuild b/dev-python/rpy2/rpy2-3.5.14.ebuild
index ef0effaa5e22..68507c8d3220 100644
--- a/dev-python/rpy/rpy-3.5.14.ebuild
+++ b/dev-python/rpy2/rpy2-3.5.14.ebuild
@@ -16,8 +16,6 @@ HOMEPAGE="
 	https://github.com/rpy2/rpy2
 	https://pypi.org/project/rpy/
 "
-SRC_URI="$(pypi_sdist_url rpy2)"
-S="${WORKDIR}/rpy2-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index c0ce6181afb2..65c5a6088e18 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,4 +1,2 @@
 DIST setuptools-74.1.3.tar.gz 1356471 BLAKE2B c59476710f10aae77f8b466ce2b072966a889b13c3e2e2a9524497ce43893bcd296412f8e0be8a3ccaa9be46b429680c11fe291095a65a185243701fa667be6c SHA512 7892d1ff0a1cd90f6cd367536392bf2933d354eb61d5177a01218b253bc254b51e74c040601adf35aff1652f1e1c6dbffca3cdce3f4fc32b8bd23c36cd885ddc
-DIST setuptools-75.2.0.tar.gz 1350308 BLAKE2B ec4e91f12a76075c26f14c82109258d285840a5ac49a57f3b7e96160ef126e477ba969483d8afc3d35874e14d9d3804f5009d62cb2e1a5245d24d31800d48a4a SHA512 1c508ae3028ae991215b1953398aee5fcf6df0ae2294cc2e31bf8f3c67a306b6cbe2b78e4d855271be8df8a82135fccc8baa05df905fe964d45e5888abf51add
-DIST setuptools-75.3.0.tar.gz 1351577 BLAKE2B 1f3812a3b6dea6df6a8b3bec2d570405075dc3ed386d8e4fec0d37f2a3c39e93149b8f01b6044a7fa85578e8d39151f1fe1b896d09a87cde9574b98641b8d510 SHA512 281f5cce6fd4aa51b3642a6aae3dce29551ccef083994f0bd267367d3f8b1f81c92cb8f858d7d052ebd7197295316918b3d16a58c6986bdf59bc1d32c7b6277a
-DIST setuptools-75.4.0.tar.gz 1336593 BLAKE2B c784244ca3bfe2e0cab48a8debd921532a154bd860b53cf6f3b9fee401f2cebc9befcdabb8a5cb9f3a41744870485380f3172af29ce53e2df185038895813d8e SHA512 8a25106010cda63b28d982f8258eed5dcebd027c1766fff6e3e6d1fec9422723d1da0acc78a05d3c2432edc7dfd8bbe28fdd87226d8ac47d32404ec4d9d1caaf
+DIST setuptools-75.5.0.tar.gz 1336032 BLAKE2B 3e06713c45212ef64b0f041089aa0621f3c12b850c9716e21181e91192378bb0596f81cfd6c484c3ec2d6f7e29ea7967fb17a7e5bbc2de996968be4fc47c2c32 SHA512 353ad99bb946d5ed07139f3a6d5f0efc9a4ca9721b060fce9095ee6fc74ac0e832fd0ebf7b2d1d68c71021db30561c5fea6abdde42174981f26002390a1e0e67
diff --git a/dev-python/setuptools/setuptools-75.2.0.ebuild b/dev-python/setuptools/setuptools-75.2.0.ebuild
deleted file mode 100644
index 6efa09b9b78b..000000000000
--- a/dev-python/setuptools/setuptools-75.2.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 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
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!<dev-python/setuptools-rust-1.8.0
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.44.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-	!<=dev-libs/gobject-introspection-1.76.1-r0
-	!=dev-libs/gobject-introspection-1.78.1-r0
-	!=dev-libs/gobject-introspection-1.80.1-r1
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.14[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/jaraco-test[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			>=dev-python/pytest-home-0.5[${PYTHON_USEDEP}]
-			dev-python/pytest-subprocess[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-# setuptools-scm is here because installing plugins apparently breaks stuff at
-# runtime, so let's pull it early. See bug #663324.
-#
-# trove-classifiers are optionally used in validation, if they are
-# installed.  Since we really oughtn't block them, let's always enforce
-# the newest version for the time being to avoid errors.
-# https://github.com/pypa/setuptools/issues/4459
-PDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# breaks tests
-	sed -i -e '/--import-mode/d' pytest.ini || die
-
-	# remove bundled dependencies
-	rm -r */_vendor || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# TODO, probably some random package
-		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
-		# broken by unbundling
-		setuptools/tests/test_setuptools.py::test_wheel_includes_vendored_metadata
-		# fails on normalized metadata, perhaps different dep version?
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_with_pyproject_config
-		# TODO
-		setuptools/tests/test_sdist.py::test_sanity_check_setuptools_own_sdist
-	)
-
-	local EPYTEST_XDIST=1
-	local -x PRE_BUILT_SETUPTOOLS_WHEEL=${DISTUTILS_WHEEL_PATH}
-	epytest -o tmp_path_retention_policy=all \
-		-m "not uses_network" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-75.3.0.ebuild b/dev-python/setuptools/setuptools-75.3.0.ebuild
deleted file mode 100644
index 332dd0bcec8f..000000000000
--- a/dev-python/setuptools/setuptools-75.3.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 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
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!<dev-python/setuptools-rust-1.8.0
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-4.2.2[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.44.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-	!<=dev-libs/gobject-introspection-1.76.1-r0
-	!=dev-libs/gobject-introspection-1.78.1-r0
-	!=dev-libs/gobject-introspection-1.80.1-r1
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.14[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-test-5.5[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			>=dev-python/pytest-home-0.5[${PYTHON_USEDEP}]
-			dev-python/pytest-subprocess[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-# setuptools-scm is here because installing plugins apparently breaks stuff at
-# runtime, so let's pull it early. See bug #663324.
-#
-# trove-classifiers are optionally used in validation, if they are
-# installed.  Since we really oughtn't block them, let's always enforce
-# the newest version for the time being to avoid errors.
-# https://github.com/pypa/setuptools/issues/4459
-PDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# breaks tests
-	sed -i -e '/--import-mode/d' pytest.ini || die
-
-	# remove bundled dependencies
-	rm -r */_vendor || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# TODO, probably some random package
-		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
-		# broken by unbundling
-		setuptools/tests/test_setuptools.py::test_wheel_includes_vendored_metadata
-		# fails on normalized metadata, perhaps different dep version?
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_with_pyproject_config
-		# TODO
-		setuptools/tests/test_sdist.py::test_sanity_check_setuptools_own_sdist
-	)
-
-	local EPYTEST_XDIST=1
-	local -x PRE_BUILT_SETUPTOOLS_WHEEL=${DISTUTILS_WHEEL_PATH}
-	epytest -o tmp_path_retention_policy=all \
-		-m "not uses_network" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-75.4.0.ebuild b/dev-python/setuptools/setuptools-75.5.0.ebuild
index d8a66522a526..d8a66522a526 100644
--- a/dev-python/setuptools/setuptools-75.4.0.ebuild
+++ b/dev-python/setuptools/setuptools-75.5.0.ebuild
diff --git a/dev-python/sigstore-rekor-types/Manifest b/dev-python/sigstore-rekor-types/Manifest
index c52374944004..d77e630ba438 100644
--- a/dev-python/sigstore-rekor-types/Manifest
+++ b/dev-python/sigstore-rekor-types/Manifest
@@ -1 +1,2 @@
 DIST sigstore_rekor_types-0.0.13.tar.gz 10238 BLAKE2B 3fec03abd18b7db3d85e52c6938fcab183be8c8b3121a699c781e16effa692e6acb53a921b80c7bb25decc8706bb4f680f5ccd862808264f5a77ea4d8cb67037 SHA512 1dd8cbf7980c1946877bbadd1074cbc058f4fc077d6405b5e9464a431c4de42dc7798cf0b45538ee6e9e6768dd841aaff3102dfabe8d7591e63e63ce10404c42
+DIST sigstore_rekor_types-0.0.17.tar.gz 15690 BLAKE2B ca07e4cf0fc3c12397bb046f12e71196be51f3daac48cfd97d9bd164a597cf89103a41a0b448813f73447c3f24b1dcd8de65e20fdbac99bd0052f97a9c6b1320 SHA512 e9c5cfde7d59cf1f9e67339f992734f841c78343a751fa54ed08aa6107226f4b0aee6c0c20946e93513fa08732c236a0413764127db37898fff64ab98d2f1a42
diff --git a/dev-python/sigstore-rekor-types/sigstore-rekor-types-0.0.17.ebuild b/dev-python/sigstore-rekor-types/sigstore-rekor-types-0.0.17.ebuild
new file mode 100644
index 000000000000..2c3c606f3296
--- /dev/null
+++ b/dev-python/sigstore-rekor-types/sigstore-rekor-types-0.0.17.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python models for Rekor's API types"
+HOMEPAGE="
+	https://github.com/trailofbits/sigstore-rekor-types/
+	https://pypi.org/project/sigstore-rekor-types/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/email-validator-2[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/sphinx-rtd-theme/Manifest b/dev-python/sphinx-rtd-theme/Manifest
index 7b903724388d..1a6d9efc63a4 100644
--- a/dev-python/sphinx-rtd-theme/Manifest
+++ b/dev-python/sphinx-rtd-theme/Manifest
@@ -1 +1,2 @@
 DIST sphinx_rtd_theme-3.0.1.tar.gz 7620352 BLAKE2B 80f8ee14364dde84423ea1fff2a33216d72e878b911d9c28e6fdb2a032fa7b17161fa0e4f6b1e7b9db6b3ac015949fb357cfb546b1f3fc38eacc88c81f4e084e SHA512 38fddf75ec2ee9622427fa88b868241f0da05214783e69af042137d892c9289960f75a10e35bf3a304c1ba9023f1a18d0b82257449febeb5b41c06e7482a02b3
+DIST sphinx_rtd_theme-3.0.2.tar.gz 7620463 BLAKE2B abaf32689ae96cf0f297bd23381f8a1f4b519f65129b1b91a18c41a629a8df975bbaba290f7b0983410601de91e93608349333b8fdd3e72704a9501442e9c16b SHA512 280a2d80ce00df84cf2484e07da95040b62bd2d6dfc8d90222af1f86842a7a3921fb8f7e0677d03677a1376e879ef6ae43daef4c90076b266001a0f4c25b4848
diff --git a/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-3.0.2.ebuild b/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-3.0.2.ebuild
new file mode 100644
index 000000000000..26d1c51b5832
--- /dev/null
+++ b/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-3.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="ReadTheDocs.org theme for Sphinx"
+HOMEPAGE="
+	https://github.com/readthedocs/sphinx_rtd_theme/
+	https://pypi.org/project/sphinx-rtd-theme/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/docutils-0.18[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-6[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-jquery-4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/readthedocs-sphinx-ext[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove upper bounds
+	sed -i -e 's:,\?<[0-9.]*::' setup.cfg || die
+	distutils-r1_src_prepare
+
+	# CI=1 disables rebuilding webpack that requires npm use
+	# yes, that surely makes sense
+	export CI=1
+}
diff --git a/dev-python/stestr/stestr-4.1.0.ebuild b/dev-python/stestr/stestr-4.1.0.ebuild
index 32bfddc83c0e..e6b029985052 100644
--- a/dev-python/stestr/stestr-4.1.0.ebuild
+++ b/dev-python/stestr/stestr-4.1.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-subunit-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
 	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]
diff --git a/dev-python/tappy/Manifest b/dev-python/tap-py/Manifest
index ce381cbd9bc1..ce381cbd9bc1 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tap-py/Manifest
diff --git a/dev-python/tappy/metadata.xml b/dev-python/tap-py/metadata.xml
index a0d4c5913ba0..a0d4c5913ba0 100644
--- a/dev-python/tappy/metadata.xml
+++ b/dev-python/tap-py/metadata.xml
diff --git a/dev-python/tappy/tappy-3.1-r1.ebuild b/dev-python/tap-py/tap-py-3.1-r1.ebuild
index d284d8d69a3a..d284d8d69a3a 100644
--- a/dev-python/tappy/tappy-3.1-r1.ebuild
+++ b/dev-python/tap-py/tap-py-3.1-r1.ebuild
diff --git a/dev-python/tempest/tempest-41.0.0.ebuild b/dev-python/tempest/tempest-41.0.0.ebuild
index 80c9a74787dc..9b93adcc55a0 100644
--- a/dev-python/tempest/tempest-41.0.0.ebuild
+++ b/dev-python/tempest/tempest-41.0.0.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
 	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-subunit-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
 	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 44ab2aeca7de..d4e198b3256e 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -3,3 +3,4 @@ DIST websockets-12.0.gh.tar.gz 352120 BLAKE2B cab704e0ee44a7012ee58d515a5ea7380a
 DIST websockets-13.0.1.gh.tar.gz 400436 BLAKE2B 3387cdc72117d2b1b0d1a5d3bc2444a243de2536b3937459221095b539172fab60972f4b1d0371c9c88222f8dcdf604a0371de1519728b40889a51ad6dd32029 SHA512 b187e7c443b9c6abbc7993f9c45dbd4fe83784d3ceb339b6e7d104cfa4da03450c25a8bf9dfa9c8626c3c91f2fe44c0dec6579ba830e0e20116a3e1e01be3bf1
 DIST websockets-13.1.gh.tar.gz 414934 BLAKE2B ac6ec67c360e88a7091c28e582b8a0e58fffb37b91f6cfe2b62fa91e1de10f94ba66b644e22f3ce34db698ec25c1685f682e3557058e30f162e1a6a39c19451e SHA512 f66c25c8c2a327840e424e1db3742f1e303df562fe59e91d44c15731d9e43d3d9b126253f2ffb2efeada63d3fd8b404480506554f263846d8d0d86da02f4d8aa
 DIST websockets-14.0.gh.tar.gz 424033 BLAKE2B c0181fee4dfc4c2b929d3b51edcdf1602e8c5e5c8595cd7b8df13b2f633434fd5a9ec3ac0a87e456eacd432fd1650ae4470ce5f5337b0391ccda57f38d5f58f4 SHA512 a32d6338ed70de0b99298e9b26c6a3f18a3b517633754c8b1fdbebfb407023f73d212e98db909a276c58aab6487db501540db0c8237280c1a311d8b0e7c1e4be
+DIST websockets-14.1.gh.tar.gz 425408 BLAKE2B ebedf5bf27373cc05b6b82675bf7ff32b63f025e9bcee405a224c44d54e93b6a10d86a1deb1773e232fe1bb1680642e4553b9f5be999cb7523823b180a899840 SHA512 771c7d2e55f90de1307d8d662c2066397c0e2299f321dd3621df99cdf105f8d9d7583b70e7d1c51465174e9d35ba8db51eda559ca9bbd7ce74c90d1759df2e5d
diff --git a/dev-python/websockets/websockets-14.1.ebuild b/dev-python/websockets/websockets-14.1.ebuild
new file mode 100644
index 000000000000..144a2994fb74
--- /dev/null
+++ b/dev-python/websockets/websockets-14.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for building WebSocket servers and clients in Python"
+HOMEPAGE="
+	https://websockets.readthedocs.io/
+	https://github.com/python-websockets/websockets/
+	https://pypi.org/project/websockets/
+"
+# tests are missing pypi sdist, as of 11.0
+SRC_URI="
+	https://github.com/python-websockets/websockets/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-11.0.3-python3.12.patch.xz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+native-extensions"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	if use native-extensions && [[ ${EPYTHON} != pypy3 ]] ; then
+		local -x BUILD_EXTENSION=yes
+	else
+		local -x BUILD_EXTENSION=no
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires DNS access
+		# https://bugs.gentoo.org/909567
+		tests/legacy/test_client_server.py::ClientServerTests::test_explicit_host_port
+		tests/legacy/test_client_server.py::SecureClientServerTests::test_explicit_host_port
+		# TODO
+		tests/asyncio/test_server.py::ServerTests::test_close_server_keeps_handlers_running
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests -p rerunfailures --reruns=10 --reruns-delay=2
+}
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index 9798bd2314b6..d0f5bfe279c1 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1 +1,2 @@
 DIST yapf-0.40.2.gh.tar.gz 229593 BLAKE2B a3e614eb10577af5a627f7ddd916eee5792c02cdda3dfab7008cfec91a4ad8588be8ee6cbdb82fb5967dba21ed2760dcf2d4d99783749ec5df025bd189111fd5 SHA512 be71b622efde162d64e5143c2a27de254a3791c229046309a083fa0df00afb4170cf0427c4402d3c621ca2120210ba15aa6d124ef7b8790c4b72705f5c5342e3
+DIST yapf-0.43.0.gh.tar.gz 231930 BLAKE2B 71a18e2c55505fe623230ab2426e62545d19ee2e945264332e4652694cb388d4b7c71252c10768be0a3b5e7234f3c72595b37addb526d2dccd32647ff1544b58 SHA512 a261d9e5205c783b1bc77ed29970b916296b151c8cf2c549fbe326e5853e20199244c17444c49432c2dc995dc5905c5b2a591bc6a74b95dc2faf3616851f867b
diff --git a/dev-python/yapf/yapf-0.43.0.ebuild b/dev-python/yapf/yapf-0.43.0.ebuild
new file mode 100644
index 000000000000..40db0386920f
--- /dev/null
+++ b/dev-python/yapf/yapf-0.43.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2018-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A formatter for Python files"
+HOMEPAGE="
+	https://github.com/google/yapf/
+	https://pypi.org/project/yapf/
+"
+SRC_URI="
+	https://github.com/google/yapf/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/platformdirs-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v -p '*_test.py' ||
+		die "Tests failed with ${EPYTHON}"
+}