Adding metadata

60 files changed, 1294 insertions, 911 deletions

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 3bce1b415a70..0faf09e520e4 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,3 +4,4 @@ DIST boto3-1.38.27.gh.tar.gz 948453 BLAKE2B 4f775c14a439b4ca204d6728a7b077ed901e
 DIST boto3-1.38.28.gh.tar.gz 949891 BLAKE2B 5368b9f38df2f07aa27ee04a499e30ddf8ee45fdbcb0d4a2f24ea16ea55e7e6f30c35877521c5fd45fd9e17aed0d4c1998c470d64e68221ce18ea3b26818e367 SHA512 8929582df636c5a78d4ed84ad99d4b5803c4ca65842ec19aac59cb7400cc1c2f004e85a1cb422c2ebb44db2168632b7d1ed5c794be8b74207394ab929d64e49b
 DIST boto3-1.38.29.gh.tar.gz 950266 BLAKE2B b75f999ab08f9619fda4e3365eecea5f2ef19f4ea6676c86126f71782be97472479bddf6c6ec1dffd15b0cbb22d727cc570917945d10d4e4a1b03ac516e419fe SHA512 cfa2cc23aa9f79e21311ee99fed8fc75dfbea94ffcb66bbd1f08e30b186758d9ef0f3a6448e746f767b7ef22bd25bd73f24dda0fc77c0ecc09135f4b98a82837
 DIST boto3-1.38.30.gh.tar.gz 951105 BLAKE2B 448432b4154d08d1773079a4539910be900c7712adebf72ebd7f4023a228466864037e9a4afbcd36d2d33b14fe85351048ddddd6f20c5b8d4f37c21394cd6f88 SHA512 5d1ee430bfa92367fbf3f9e40bb61f314c8be5210a08d8ef21de8e0195ca796e1b7fc8b9de0fd3ad581cb93ccbb6804f9365ddf181b3baf9dfbff01344e518db
+DIST boto3-1.38.31.gh.tar.gz 951526 BLAKE2B 49ad57e422e9937aefab7c20dd6c2cb75b6b637e9cc252af9aef73a4fb29a2e743ce3555ed88ec497c4eb9f9cf4cf3dac72fdb6987ac2468631cb212ffae1696 SHA512 82bbdb103ad20ba5a650d5665bd94bc7bd5f812b2690057d4ce9a23cb0b75fc03cbbf2c2f9b27cd8c9cb9685324c4478559c221e1ee1f60ca875c629bb8d0f17
diff --git a/dev-python/boto3/boto3-1.38.31.ebuild b/dev-python/boto3/boto3-1.38.31.ebuild
new file mode 100644
index 000000000000..2557a5f5330a
--- /dev/null
+++ b/dev-python/boto3/boto3-1.38.31.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{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 ~loong ~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.13.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 dc0952caebed..2506f46ad8f9 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,3 +4,4 @@ DIST botocore-1.38.27.gh.tar.gz 14666017 BLAKE2B 7527044c1b9586ac39b7cdaf1c51e6e
 DIST botocore-1.38.28.gh.tar.gz 14672858 BLAKE2B a51891512f7df3ee1ceab3b9be2ad3a5e4bf8e976d58771268541b93df790c63523201f3c70caed22bd3baaff66980821811b9496620087c588385e14d089c04 SHA512 af48bfce6666c9a1f2175141b1efa7a17dd4dedfa8f1bd68bc3244035a62041eeefac95942ea142928c485912a2a1f25b2f093f1f5993171f9cc232234c5046e
 DIST botocore-1.38.29.gh.tar.gz 14676693 BLAKE2B ef5e5c79505f76ad5f55a8bfdf4f9e714a6b028cb8b719ed00ee895923af0495c1b03cb4da0e742e0f4625a978bb235614e58c155f7f050e0ecda396bd7977c1 SHA512 62cb907747a6cdc237dcf86d6bc6e99ecca8ca6650bde2c0d32b83ad9c497bd3bd55913f63127d348ccf75f68ad0a2c5acf85d540a6c7b8ba3cf57751c7c8bbc
 DIST botocore-1.38.30.gh.tar.gz 14692617 BLAKE2B de227cdf7c179de0607b4fc136d017d53ece2bf3e7d438707156b244a5168f3cfde8b6655732524e6bd4d1842b93b181515aee6c673c4ee3f02c0e2a3aa36a22 SHA512 106544c97f0da0d32584d0c30208b68061f0053ba17dd5ed99ec1e3146c58202196d3e67e10eceae031810562429e4b8573fc41e4375334aed9b7f317ec1dc3a
+DIST botocore-1.38.31.gh.tar.gz 14696507 BLAKE2B fc20321e6c4fda3de21dffdd22147255ee436241891c40ddc35a194e1f01ef622a1155b9b9955e64f60bb1f5aee89fe5632d094e503d65be2e6ff861a4e1aaf5 SHA512 36874ae7463a8b2e4fe037718224baa108df4c80a3d140a955eb9c245c1d05cbe8176b6b25050928516d51f06d69592dcf5781fcae938c6dab24b5489e534a2e
diff --git a/dev-python/botocore/botocore-1.38.31.ebuild b/dev-python/botocore/botocore-1.38.31.ebuild
new file mode 100644
index 000000000000..535354aa3035
--- /dev/null
+++ b/dev-python/botocore/botocore-1.38.31.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..14} )
+
+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 ~loong ~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
+	)
+
+	case ${EPYTHON} in
+		python3.14)
+			EPYTEST_DESELECT+=(
+				tests/unit/test_utils.py::test_lru_cache_weakref
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index f8597afe82a3..b11afae32e43 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1 +1,2 @@
 DIST curtsies-0.4.2.tar.gz 53559 BLAKE2B b1e6a0b736615c890a35fba0dae2914e51123976c884d253e61e2e4f04cff9398fa9668387b9503a064aa76664c339d5be000e8e172c23a82cafbf3b7523beb3 SHA512 0740b50001a65da7afcb634d99ab03612be0c379035bc15f591a70dc006b46476d38a1c4b107ff17a12d696ce127027c3e13763dfd16dc223628a27611e071e3
+DIST curtsies-0.4.3.tar.gz 53401 BLAKE2B 4c5f7bf6041b3585dcb9288d36e9bf7d6ec2354dc115fe696124df354529a33bff3702071ca56bad8fec0222b6d1b8023d1e16027257af29fdc47862c1d1f44f SHA512 db157b9f32a13b8086df1909c363ff669fcb6053bb205e0b9ede3aa21a4afbe9f4e08371ede9bbb6af31cdf1cd96166938a35af04e695b6c0a7d01a12d6ce158
diff --git a/dev-python/curtsies/curtsies-0.4.3.ebuild b/dev-python/curtsies/curtsies-0.4.3.ebuild
new file mode 100644
index 000000000000..65e4f5cb05b3
--- /dev/null
+++ b/dev-python/curtsies/curtsies-0.4.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Curses-like terminal wrapper, with colored strings"
+HOMEPAGE="
+	https://github.com/bpython/curtsies/
+	https://pypi.org/project/curtsies/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/blessed-1.5[${PYTHON_USEDEP}]
+	dev-python/cwcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyte[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/django/django-5.1.10.ebuild b/dev-python/django/django-5.1.10.ebuild
index 2dca97580558..1413c36072db 100644
--- a/dev-python/django/django-5.1.10.ebuild
+++ b/dev-python/django/django-5.1.10.ebuild
@@ -26,7 +26,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-5.2.2.ebuild b/dev-python/django/django-5.2.2.ebuild
index 2dca97580558..1413c36072db 100644
--- a/dev-python/django/django-5.2.2.ebuild
+++ b/dev-python/django/django-5.2.2.ebuild
@@ -26,7 +26,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/elasticsearch/Manifest b/dev-python/elasticsearch/Manifest
index 4004f007c023..efbecbfb9ae5 100644
--- a/dev-python/elasticsearch/Manifest
+++ b/dev-python/elasticsearch/Manifest
@@ -1 +1,2 @@
 DIST elasticsearch-py-9.0.1.gh.tar.gz 2189309 BLAKE2B 31f2e9541efdc90e85d40a462b45cd34ae4ffd8f44bb95af8c96cca44eb1b50cc0525b0d38ae3234a23ed986377ed3bd64325a46799d25c21214267cacf9279e SHA512 38ec30b85cc2d3ebef8dfde2bc7e07082240fcca6f98d9285a2d72876369f6a8233f973794c825f5564a99ca2c9a83f35c8eb954e123431c153309eb02f1f04c
+DIST elasticsearch-py-9.0.2.gh.tar.gz 2192777 BLAKE2B d7fc3c9fe94b954d0522be03335c7639e38a67fa30949f19a1004b368750ae87da5fd3ea87e048f6cc36c19a42883821ff3f986879ab6f61f4128add73a62c83 SHA512 b2473dae673051be4e6477947b9faddb11d1ac563a971c0b4eb14748ffdf3ab7eef89dbbdca27b486e631f575f7558341e46d22d551b1d20f100260d41c3b2c7
diff --git a/dev-python/elasticsearch/elasticsearch-9.0.2.ebuild b/dev-python/elasticsearch/elasticsearch-9.0.2.ebuild
new file mode 100644
index 000000000000..e6c7574b70df
--- /dev/null
+++ b/dev-python/elasticsearch/elasticsearch-9.0.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2025 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} )
+
+inherit distutils-r1
+
+MY_P="elasticsearch-py-${PV}"
+DESCRIPTION="Official Elasticsearch client library for Python"
+HOMEPAGE="
+	https://ela.st/es-python
+	https://github.com/elastic/elasticsearch-py/
+	https://pypi.org/project/elasticsearch/
+"
+SRC_URI="
+	https://github.com/elastic/elasticsearch-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3[${PYTHON_USEDEP}]
+	<dev-python/elastic-transport-9[${PYTHON_USEDEP}]
+	>=dev-python/elastic-transport-8.15.1[${PYTHON_USEDEP}]
+	>=dev-python/orjson-3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mapbox-vector-tile[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/opentelemetry-api[${PYTHON_USEDEP}]
+		dev-python/opentelemetry-sdk[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pyarrow[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+		dev-python/unasync[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/sphinx \
+	dev-python/sphinx-autodoc-typehints \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# REST api tests are a black hole for effort. It downloads the tests
+		# so its an ever moving target. It also requires effort to blacklist
+		# tests for apis which are license restricted.
+		"test_elasticsearch/test_server/test_rest_api_spec.py"
+		# Counting deprecation warnings from python is bound to fail even
+		# if all are fixed in this package. Not worth it.
+		"test_elasticsearch/test_client/test_deprecated_options.py"
+		# Running daemon for tests is finicky and upstream CI fails at it
+		# as well.
+		"test_elasticsearch/test_server/"
+		"test_elasticsearch/test_async/test_server/"
+		# require nltk
+		test_elasticsearch/test_dsl/test_integration/test_examples/_async/test_vectors.py
+		test_elasticsearch/test_dsl/test_integration/test_examples/_sync/test_vectors.py
+	)
+
+	local -x TEST_WITH_OTEL=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o addopts= -p asyncio
+}
diff --git a/dev-python/google-auth/google-auth-2.39.0.ebuild b/dev-python/google-auth/google-auth-2.39.0.ebuild
index 8d71d16fe489..1081feaf30b4 100644
--- a/dev-python/google-auth/google-auth-2.39.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.39.0.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
 		dev-python/flask[${PYTHON_USEDEP}]
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
 		>=dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-2.40.0.ebuild b/dev-python/google-auth/google-auth-2.40.0.ebuild
index 380871c78686..2a75d669830b 100644
--- a/dev-python/google-auth/google-auth-2.40.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.40.0.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
 		dev-python/flask[${PYTHON_USEDEP}]
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
 		>=dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-2.40.1.ebuild b/dev-python/google-auth/google-auth-2.40.1.ebuild
index 380871c78686..2a75d669830b 100644
--- a/dev-python/google-auth/google-auth-2.40.1.ebuild
+++ b/dev-python/google-auth/google-auth-2.40.1.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
 		dev-python/flask[${PYTHON_USEDEP}]
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
 		>=dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-2.40.2-r1.ebuild b/dev-python/google-auth/google-auth-2.40.2-r1.ebuild
index 74adcd8315ca..b9306a877fb9 100644
--- a/dev-python/google-auth/google-auth-2.40.2-r1.ebuild
+++ b/dev-python/google-auth/google-auth-2.40.2-r1.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
 		dev-python/flask[${PYTHON_USEDEP}]
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
 		>=dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-2.40.3.ebuild b/dev-python/google-auth/google-auth-2.40.3.ebuild
index 74adcd8315ca..b9306a877fb9 100644
--- a/dev-python/google-auth/google-auth-2.40.3.ebuild
+++ b/dev-python/google-auth/google-auth-2.40.3.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
 		dev-python/flask[${PYTHON_USEDEP}]
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
 		>=dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index a8d10b7bc031..90b387f17201 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,4 +1,3 @@
 DIST greenlet-3.1.1.tar.gz 186022 BLAKE2B 1d73f63d3bf881534bd64eca6510f32d1596261bd42176d396c7a0442494c73f8b03e57621bd11fc1bc67db550514c26a94926eaba8c53e08eecb3f999c9ba16 SHA512 915a6e22c20b235de472c61c7bc4cb60a08b79e29127c4fb817c362cee37f589bc362f12ed31bdc7dda91f49976d4e2784c8d13202bf598156a0aacacdb7f6fb
-DIST greenlet-3.2.0.tar.gz 183685 BLAKE2B d750f9f0639003448b95cc0db5046617da0d9c40976c851d4f23f5e26f54fba29da6867304d7569ea171d497047442e85c35aeedd479cdcc8d57af51fd5a76ed SHA512 0a13142bbb9b043a8b6047fdb182b1091dfc8c6da517092ab382b6ae42fbc8d5e4b9d8593d353d1c95dbf7337aa1e4cc946c2638e50e49af4813aee94b07d214
-DIST greenlet-3.2.1.tar.gz 184475 BLAKE2B ff36fafef74ff1c0d9a9c2f5929017afe7f083d31830aebf4f068c84df7312352cd43f9ba1d42b4562921b869df3afd8210d71f318bf2f8f6f7ea441d934ae04 SHA512 75fd697d0bde99c60d4c741c61c1010e2bae659e93661e8ea37f6683c1223422a7f862aa770b80bc3299593a9791ec515fd31797fd36216ed784f4e2f4103420
 DIST greenlet-3.2.2.tar.gz 185797 BLAKE2B 8df91b479ea530bb8f5d3069fd4be507583e6ec5268e840c09620577fb8cf4ee3fd9266b0906d35679be61814b193eac1be78f1ccee447a15b99973ee3ce6493 SHA512 ed7b5adec413debc89d01a03768d14f2e29a4fe6ad72ac79d47baa09a556138e27c8f80771d567bf727c19ea67cc1e012fc8f031a910e5551969eb98c9dbbaa6
+DIST greenlet-3.2.3.tar.gz 185752 BLAKE2B 4e5ea7c83622a954d9cab3da524c88970cc8a22759c3cdfdca1a718c5e630d895d844679292b48a4ebda93bcbbad1da0665c78bbf132cf1215456d742190a3ac SHA512 3153123855b4900387454fa1d4223b321980e3462e1e139b9f90b4eb2d0772102e06375055c6eb612530d7037169ff6e28166f95efe09073ea331db76284d39d
diff --git a/dev-python/greenlet/greenlet-3.2.1.ebuild b/dev-python/greenlet/greenlet-3.2.1.ebuild
deleted file mode 100644
index 54f679c67853..000000000000
--- a/dev-python/greenlet/greenlet-3.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-# Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="
-	https://greenlet.readthedocs.io/en/latest/
-	https://github.com/python-greenlet/greenlet/
-	https://pypi.org/project/greenlet/
-"
-
-LICENSE="MIT PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa ~m68k ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/objgraph[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/furo
-distutils_enable_tests unittest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# patch cflag manipulations out
-	sed -i -e 's:global_compile_args[.]append.*:pass:' setup.py || die
-	# broken assertions on py3.12+
-	# https://github.com/python-greenlet/greenlet/issues/368
-	sed -e 's:test_trace_events_multiple_greenlets_switching:_&: ' \
-		-i src/greenlet/tests/test_tracing.py || die
-}
-
-python_test() {
-	eunittest greenlet.tests
-}
diff --git a/dev-python/greenlet/greenlet-3.2.0.ebuild b/dev-python/greenlet/greenlet-3.2.3.ebuild
index ac6de7027873..6cecdbf77ff2 100644
--- a/dev-python/greenlet/greenlet-3.2.0.ebuild
+++ b/dev-python/greenlet/greenlet-3.2.3.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 # Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+PYTHON_COMPAT=( python3_{11..14} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 2a777681ac10..ae23561f3358 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,3 +3,4 @@ DIST hypothesis-6.131.24.gh.tar.gz 9554685 BLAKE2B 9f1216facfffb33ac084b036166c5
 DIST hypothesis-6.131.27.gh.tar.gz 9555908 BLAKE2B 3a5d9c31a6ccd6bab640fcb63412100dfe996ca1f5f645d3cf5c15366dba510f997620ceb942a292f14b93ffa2915d6061f069d9daffe9550aad4b376dfd1e61 SHA512 447520bac874536a35d2107a4c382993a5293840c7adfcac6d177c31401cdaaf2a4159a193e8079726d71c285009649c17c4a3ce05aceea11303b8b8a490dcb2
 DIST hypothesis-6.131.32.gh.tar.gz 9562669 BLAKE2B 28e2f15db216bafc545a262e47c43aa7594c54d3066b08910de1695945de07508b5bef24fea9139736a7e429afa6232c75e3a8e0bb2eb349fb23eb7d318bd03d SHA512 f51cf27fa60756d28416699292b6a6dc4a5cd89bccc7acbd3de65fd83222907e57d7b601544b9965f1646979d6aa9220cd5ed2f44760507af362bb3806630706
 DIST hypothesis-6.132.0.gh.tar.gz 9563870 BLAKE2B de088f7d632a8ada158f5c11b6eb8bce009b544b0cde1d4f1398b059956d17fc8fbad3abbc9033d4c9544ccbf13782c7e0ed63e366665f362c3b651490bca5f1 SHA512 b43e661610e2491abad4f20cbf455b45be995ee927106ef17a0ecfdd2090a64b0f2588e3a3466fd22304c20d0371ec0ed15505a8f57d32a3b4a44c2ef24fa203
+DIST hypothesis-6.135.1.gh.tar.gz 9569007 BLAKE2B ceebfcbc7ae66c73251a5196f304a1a4e51cd3db27e7815db248ee014bbae7ca921c95a6962174f69c755c715a51b5fc041dbd11a2e0b6f7e2a97c669ae033e0 SHA512 be50f86dee60b5a6c8e8680652e6f76a30d4402e62346e7536a83dec2598cc320e56496e93363e8207f9086061c9e19ab7d4ea684405eb1ebeb3ef5f9dd29ecd
diff --git a/dev-python/hypothesis/hypothesis-6.135.1.ebuild b/dev-python/hypothesis/hypothesis-6.135.1.ebuild
new file mode 100644
index 000000000000..e23d3543d705
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.135.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=(
+		# broken with >=pytest-8.4.0
+		# https://github.com/HypothesisWorks/hypothesis/issues/4432
+		tests/pytest/test_capture.py::test_healthcheck_traceback_is_hidden
+		tests/pytest/test_fixtures.py::test_given_fails_if_already_decorated_with_fixture
+	)
+
+	case ${EPYTHON} in
+		python3.13t)
+			EPYTEST_DESELECT+=(
+				# TODO: missing warning
+				'hypothesis-python/tests/cover/test_random_module.py::test_passing_referenced_instance_within_function_scope_warns'
+			)
+			;;
+		python3.14*)
+			EPYTEST_DESELECT+=(
+				'hypothesis-python/tests/cover/test_compat.py::test_resolve_fwd_refs[Foo-Union]'
+				'hypothesis-python/tests/cover/test_lookup.py::test_builds_suggests_from_type[Union]'
+				hypothesis-python/tests/cover/test_attrs_inference.py::test_attrs_inference_builds
+				hypothesis-python/tests/cover/test_lookup.py::test_bytestring_not_treated_as_generic_sequence
+				hypothesis-python/tests/cover/test_lookup.py::test_issue_4194_regression
+				hypothesis-python/tests/cover/test_lookup.py::test_resolves_forwardrefs_to_builtin_types
+				hypothesis-python/tests/cover/test_lookup.py::test_specialised_collection_types
+				hypothesis-python/tests/cover/test_lookup_py37.py::test_resolving_standard_collection_as_generic
+				hypothesis-python/tests/cover/test_lookup_py37.py::test_resolving_standard_container_as_generic
+				hypothesis-python/tests/cover/test_lookup_py37.py::test_resolving_standard_contextmanager_as_generic
+				hypothesis-python/tests/cover/test_lookup_py37.py::test_resolving_standard_iterable_as_generic
+				hypothesis-python/tests/cover/test_lookup_py37.py::test_resolving_standard_reversible_as_generic
+				hypothesis-python/tests/cover/test_lookup_py37.py::test_resolving_standard_sequence_as_generic
+				hypothesis-python/tests/cover/test_random_module.py::test_evil_prng_registration_nonsense
+				hypothesis-python/tests/cover/test_random_module.py::test_passing_referenced_instance_within_function_scope_warns
+				hypothesis-python/tests/cover/test_random_module.py::test_register_random_within_nested_function_scope
+				hypothesis-python/tests/cover/test_random_module.py::test_registering_a_Random_is_idempotent
+				hypothesis-python/tests/cover/test_type_lookup_forward_ref.py::test_bound_missing_dot_access_forward_ref
+				hypothesis-python/tests/cover/test_type_lookup_forward_ref.py::test_bound_missing_forward_ref
+				hypothesis-python/tests/cover/test_type_lookup_forward_ref.py::test_bound_type_checking_only_forward_ref_wrong_type
+				hypothesis-python/tests/cover/test_type_lookup_forward_ref.py::test_bound_type_cheking_only_forward_ref
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
+		tests/cover tests/pytest tests/quality
+}
+
+src_install() {
+	local HAD_CLI=
+
+	distutils-r1_src_install
+
+	if [[ ! ${HAD_CLI} ]]; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		HAD_CLI=1
+	else
+		rm -r "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/id/id-1.5.0.ebuild b/dev-python/id/id-1.5.0.ebuild
index 9d1ec6e278fd..3787d9323b24 100644
--- a/dev-python/id/id-1.5.0.ebuild
+++ b/dev-python/id/id-1.5.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/libtmux/libtmux-0.46.1.ebuild b/dev-python/libtmux/libtmux-0.46.1.ebuild
index a96cba189ffe..191e5357764f 100644
--- a/dev-python/libtmux/libtmux-0.46.1.ebuild
+++ b/dev-python/libtmux/libtmux-0.46.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=app-misc/tmux-3.0a
diff --git a/dev-python/mkdocs-monorepo-plugin/Manifest b/dev-python/mkdocs-monorepo-plugin/Manifest
index c9a507cd5ba5..50c0fc55f324 100644
--- a/dev-python/mkdocs-monorepo-plugin/Manifest
+++ b/dev-python/mkdocs-monorepo-plugin/Manifest
@@ -1 +1,2 @@
 DIST mkdocs-monorepo-plugin-1.1.0.tar.gz 13435 BLAKE2B 5e3b0af987f0125595c32e9a68fbc5d41936081fff17a69f381789df03870cfc7efcca768de4de5663998e5437d25d24b91ab60a32106e027c5c76204aaeeaaa SHA512 8820bea9dc7e8754832c85e8b8a5e369f5ab28d388d6386912b0903739dd8bafc7dfda59bf7e4b98938ac171c7d76c9bd2e836a9c0fd05f0a61e1787e959f5da
+DIST mkdocs-monorepo-plugin-1.1.2.tar.gz 13723 BLAKE2B b0cbe141b2077380e8d1b19e5925aee0a3e510cb26b2dbd2c8d1be4a70afa0c2976179cadb644c3a3a6504cc86d70a2d6d8869074a47c00039188b1601d8e805 SHA512 87af8b4fe1a0ac707a9ce8b888520a8d09fefaca05a2e0aabc521025659afddb76eaba74629e7f638393e6776220be527cdcd8f4e558066cd5d204db9ab0c419
diff --git a/dev-python/mkdocs-monorepo-plugin/mkdocs-monorepo-plugin-1.1.2.ebuild b/dev-python/mkdocs-monorepo-plugin/mkdocs-monorepo-plugin-1.1.2.ebuild
new file mode 100644
index 000000000000..c0bc6ca58003
--- /dev/null
+++ b/dev-python/mkdocs-monorepo-plugin/mkdocs-monorepo-plugin-1.1.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Build multiple documentation folders in a single Mkdocs"
+HOMEPAGE="
+	https://backstage.github.io/mkdocs-monorepo-plugin/
+	https://pypi.org/project/mkdocs-monorepo-plugin/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/python-slugify-4.0.1[${PYTHON_USEDEP}]
+"
+
+# Data files required by this test are not included in PyPI tarballs,
+# and upstream has not tagged any releases in their GitHub repository since 2019.
+EPYTEST_DESELECT=(
+	mkdocs_monorepo_plugin/tests/test_plugin.py::TestMonorepoPlugin::test_plugin_on_config_with_nav
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 77955ae70f44..612532ac5969 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,4 +1,3 @@
 DIST moto-4.2.14.tar.gz 4933741 BLAKE2B 4c50a808dc8f27cfbcd0ba234d268084ee9a32f36cb5d6af61aacc4ee79f7bf5cf1045147c4642472129eee37bef8bc2c1953d140260d39d7f333ae0f5e5cf95 SHA512 d4079118ed1d2eef9134575e33dc0ed749bff0293d753baa63a630dbb987914b9933445027abdc344bb93fa1d6e483baf8a337a444c9dd055dda50b095ff9937
-DIST moto-5.1.3.tar.gz 6765413 BLAKE2B 3a56d683b0818d09f98509afb94d4b6fb975f563d7f08ba225cac9f447b710c19a3af66c4c602369392190e2bde5b6970e0b64fd684bf361b7fc6a41b79da6ff SHA512 23e1abe55f9686b2b928886a7d31024fc98b70ffff1680611b3794027e568c1e3349857e1ea42891f3649cb87bf2a2376765ac10e480e29ec6fcf3c4e26f628b
 DIST moto-5.1.4.tar.gz 6796440 BLAKE2B 179566c4299e88079a4f0f15ffad32a7d118095c00058e0df5aacf50a84dd0c2b2cb0950b23cb228bff2b197f62f50a8958c5b43a885599e7332f4cad5c94100 SHA512 f16b16580ae8c8d39a755024b8ee507b84b8b3932976d84110c96f646c7b71869a762d2e84c0fd19cfe2443649b83191ba5a03e43b6b3dfb59f5fa127e498ecd
 DIST moto-5.1.5.tar.gz 6893155 BLAKE2B d0ede9c48c356e879ebd78e7bd793a9d8534edc15430e7d1c357f25fd9468d64917fbc51fc501333485cadb61c661d12c36b48bd26bdd06bcb53f45010d072e5 SHA512 45c38c896d11366d887cda75fc20c3b7a5bb511e794e29a904687cfd59b90a30571d21f0c91d3bb90e42275148477056b3fe5a67d75878e40bd26d4fcf94999c
diff --git a/dev-python/moto/moto-4.2.14.ebuild b/dev-python/moto/moto-4.2.14.ebuild
index f80eef9ac521..948ca0e34cb5 100644
--- a/dev-python/moto/moto-4.2.14.ebuild
+++ b/dev-python/moto/moto-4.2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-5.1.3.ebuild b/dev-python/moto/moto-5.1.3.ebuild
deleted file mode 100644
index 439c5ba43195..000000000000
--- a/dev-python/moto/moto-5.1.3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi toolchain-funcs
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="
-	https://github.com/getmoto/moto/
-	https://pypi.org/project/moto/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.35.47[${PYTHON_USEDEP}]
-	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-35.0.0[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-2.10.1[${PYTHON_USEDEP}]
-	dev-python/jsonpath-ng[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.5.0[${PYTHON_USEDEP}]
-	dev-python/pyaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.25.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/sshpubkeys[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/antlr4-python3-runtime[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-	)
-"
-
-: "${EPYTEST_TIMEOUT:=180}"
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_dynamodb/test_dynamodb_import_table.py
-		# require joserfc
-		tests/test_apigateway/test_apigateway.py::test_create_authorizer
-		tests/test_apigateway/test_apigateway.py::test_delete_authorizer
-		tests/test_apigateway/test_apigateway.py::test_update_authorizer_configuration
-		tests/test_cognitoidp/test_cognitoidp_exceptions.py::TestCognitoUserDeleter::test_authenticate_with_signed_out_user
-		tests/test_cognitoidp/test_cognitoidp_exceptions.py::TestCognitoUserPoolDuplidateEmails::test_use_existing_email__when_email_is_
-		tests/test_cognitoidp/test_cognitoidp_exceptions.py::TestCognitoUserPoolDuplidateEmails::test_use_existing_email__when_username_
-		tests/test_cognitoidp/test_cognitoidp_replay.py::TestCreateUserPoolWithPredeterminedID::test_different_seed
-		tests/test_cognitoidp/test_cognitoidp_replay.py::TestCreateUserPoolWithPredeterminedID::test_same_seed
-		tests/test_cognitoidp/test_server.py::test_admin_create_user_without_authentication
-		tests/test_cognitoidp/test_server.py::test_associate_software_token
-		tests/test_cognitoidp/test_server.py::test_sign_up_user_without_authentication
-		# require py_partiql_parser
-		tests/test_dynamodb/test_dynamodb_statements.py
-		tests/test_s3/test_s3_select.py
-		# require graphql
-		tests/test_appsync/test_appsync_schema.py
-		# Internet
-		tests/test_core/test_request_passthrough.py::test_passthrough_calls_for_entire_service
-		tests/test_core/test_request_passthrough.py::test_passthrough_calls_for_specific_url
-		tests/test_core/test_request_passthrough.py::test_passthrough_calls_for_wildcard_urls
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-	)
-	local EPYTEST_IGNORE=(
-		# require joserfc
-		tests/test_cognitoidp/test_cognitoidp.py
-	)
-
-	if ! tc-has-64bit-time_t; then
-		einfo "time_t is smaller than 64 bits, will skip broken tests"
-		EPYTEST_DESELECT+=(
-			tests/test_acm/test_acm.py::test_request_certificate_with_optional_arguments
-			tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header
-			tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins
-		)
-		EPYTEST_IGNORE+=(
-			tests/test_route53domains/test_route53domains_domain.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local -x AWS_DEFAULT_REGION=us-east-1
-
-	rm -rf moto || die
-	epytest -m 'not network and not requires_docker' \
-		-p rerunfailures --reruns=5
-}
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index a473d0b0ab38..553e551ceea3 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1 +1,2 @@
 DIST msgpack-1.1.0.tar.gz 167260 BLAKE2B fd6497ce248fabae481de41cb27bccf001e75425564f16caff9f5dceb52d82949481589a92635f4c25178f03002daf604073fc2bb07c8133e81a8ee2f1ccb7c4 SHA512 2af3a6ae9a68a0261bf1cbb5ca6925004b421241c445d17023976fe38738049458937a578828cdf3c1f2fd19dfbbcceb21762957bfd459d6862adb110cad3faa
+DIST msgpack-1.1.1rc1.tar.gz 172690 BLAKE2B cb64398a412efb0567a69c62bbc3c9e268b1aea8718c6c690e894a238a7a0cdd7bc3b6c78329140a8073a0aad74fa5f16c7dcb5673a806fe1fec483bc2e1f6ed SHA512 5916bb4af272c2eb9169569ae75b6108b4567094db3645dd0d3d5d554d1e3cb71fa6c3c1ca6facbf2dfb3b0ca9b08cf21721cf2c5b6ed0d9b8f08db25df1c91a
diff --git a/dev-python/msgpack/msgpack-1.1.1_rc1.ebuild b/dev-python/msgpack/msgpack-1.1.1_rc1.ebuild
new file mode 100644
index 000000000000..76fda2f9fda7
--- /dev/null
+++ b/dev-python/msgpack/msgpack-1.1.1_rc1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="MessagePack (de)serializer for Python"
+HOMEPAGE="
+	https://msgpack.org/
+	https://github.com/msgpack/msgpack-python/
+	https://pypi.org/project/msgpack/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+native-extensions"
+
+# extension code is relying on CPython implementation details
+BDEPEND="
+	native-extensions? (
+		$(python_gen_cond_dep '
+			>=dev-python/cython-3.0.8[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove pre-generated cython files
+	rm msgpack/_cmsgpack.c || die
+
+	# native-extensions are always disabled on PyPy
+	# https://github.com/msgpack/msgpack-python/blob/main/setup.py#L76
+	if ! use native-extensions; then
+		export MSGPACK_PUREPYTHON=1
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	if [[ ${EPYTHON} == python* && ! -f msgpack/_cmsgpack.c ]] &&
+		use native-extensions
+	then
+		cython -v msgpack/_cmsgpack.pyx || die
+	fi
+}
+
+python_test() {
+	rm -rf msgpack || die
+	epytest
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 326ecb2a171b..5e686561d359 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1 +1,2 @@
 DIST pandas-2.2.3.tar.gz 4399213 BLAKE2B eca6d31b21f6385c606b3c6f8f4eedc5871719ad5e039e99c01cc16e335a493c2159d208c2d88b573b661adbeaf1172ea1296d13d51b60602966cbc344dc367b SHA512 9bbff5cf51d7fe5e53b207b3593ba92560dabb15294d6509c5be55e0c2a737fad156ca46e56a7e0bfba7d791edfbcbdf885d6f82e2e1a48b2d5e0fc0ef5e56f5
+DIST pandas-2.3.0.tar.gz 4484490 BLAKE2B 4fa8ad780e47bb9cfd6dfe3ea89d7c217d2d9bfce66b7cbf81e061309b60fb938b70ea98088c97f37c364abec261e68ec4d40f826265a3d7cb964160eac120b1 SHA512 f7c61b7ab30a67343c11a174209c88f24e6aef4224a0649a31be294e102dbe02fe38be4c5b3050d6c175c780d33da8c582491d7b6832eb212daa2c651bf691a3
diff --git a/dev-python/pandas/files/pandas-2.3.0-xarray-test.patch b/dev-python/pandas/files/pandas-2.3.0-xarray-test.patch
new file mode 100644
index 000000000000..ade3ba185ebf
--- /dev/null
+++ b/dev-python/pandas/files/pandas-2.3.0-xarray-test.patch
@@ -0,0 +1,48 @@
+From 12b1d00622ffc8b99986da2f4478cc2df4da213a Mon Sep 17 00:00:00 2001
+From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
+Date: Mon, 5 May 2025 10:55:36 -0700
+Subject: [PATCH] Fix xarray failures post xarray unpin
+
+---
+ pandas/tests/generic/test_to_xarray.py | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/pandas/tests/generic/test_to_xarray.py b/pandas/tests/generic/test_to_xarray.py
+index 9fe9bca8abdc9..96b2936aadd83 100644
+--- a/pandas/tests/generic/test_to_xarray.py
++++ b/pandas/tests/generic/test_to_xarray.py
+@@ -6,6 +6,7 @@
+     DataFrame,
+     MultiIndex,
+     Series,
++    StringDtype,
+     date_range,
+ )
+ import pandas._testing as tm
+@@ -51,9 +52,6 @@ def test_to_xarray_index_types(self, index_flat, df, using_infer_string):
+         # datetimes w/tz are preserved
+         # column names are lost
+         expected = df.copy()
+-        expected["f"] = expected["f"].astype(
+-            object if not using_infer_string else "str"
+-        )
+         expected.columns.name = None
+         tm.assert_frame_equal(result.to_dataframe(), expected)
+ 
+@@ -88,8 +86,15 @@ def test_to_xarray_with_multiindex(self, df, using_infer_string):
+ 
+ 
+ class TestSeriesToXArray:
+-    def test_to_xarray_index_types(self, index_flat):
++    def test_to_xarray_index_types(self, index_flat, request):
+         index = index_flat
++        if isinstance(index.dtype, StringDtype) and index.dtype.storage == "pyarrow":
++            request.applymarker(
++                pytest.mark.xfail(
++                    reason="xarray calling reshape of ArrowExtensionArray",
++                    raises=NotImplementedError,
++                )
++            )
+         # MultiIndex is tested in test_to_xarray_with_multiindex
+ 
+         from xarray import DataArray
diff --git a/dev-python/pandas/pandas-2.3.0.ebuild b/dev-python/pandas/pandas-2.3.0.ebuild
new file mode 100644
index 000000000000..fd207379247e
--- /dev/null
+++ b/dev-python/pandas/pandas-2.3.0.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 optfeature pypi toolchain-funcs virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="
+	https://pandas.pydata.org/
+	https://github.com/pandas-dev/pandas/
+	https://pypi.org/project/pandas/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="big-endian full-support minimal test X"
+RESTRICT="!test? ( test )"
+
+RECOMMENDED_DEPEND="
+	>=dev-python/bottleneck-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.8.0[${PYTHON_USEDEP}]
+"
+
+# TODO: add pandas-gbq to the tree
+# TODO: Re-add dev-python/statsmodel[python3_11] dep once it supports python3_11
+# https://github.com/statsmodels/statsmodels/issues/8287
+OPTIONAL_DEPEND="
+	>=dev-python/beautifulsoup4-4.11.1[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.1.2[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.8.0[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-3.6.1[${PYTHON_USEDEP}]
+	>=dev-python/openpyxl-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.4.36[${PYTHON_USEDEP}]
+	>=dev-python/tabulate-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/xarray-2022.3.0[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/xlsxwriter-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/xlwt-1.3.0[${PYTHON_USEDEP}]
+	!arm? ( !hppa? ( !ppc? ( !x86? (
+		>=dev-python/scipy-1.8.1[${PYTHON_USEDEP}]
+		dev-python/statsmodels[${PYTHON_USEDEP}]
+	) ) ) )
+	!big-endian? (
+		>=dev-python/tables-3.7.0[${PYTHON_USEDEP}]
+	)
+	X? (
+		|| (
+			>=dev-python/pyqt5-5.15.6[${PYTHON_USEDEP}]
+			>=dev-python/qtpy-2.2.0[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+DEPEND="
+	>=dev-python/numpy-1.23.2:=[${PYTHON_USEDEP}]
+"
+COMMON_DEPEND="
+	${DEPEND}
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	>=dev-build/meson-1.2.1
+	>=dev-python/cython-3.0.5[${PYTHON_USEDEP}]
+	>=dev-python/versioneer-0.28[${PYTHON_USEDEP}]
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-libs/apache-arrow[brotli,parquet,snappy]
+		>=dev-python/beautifulsoup4-4.11.1[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.46.1[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-3.0.10[${PYTHON_USEDEP}]
+		>=dev-python/pyarrow-10.0.1[parquet,${PYTHON_USEDEP}]
+		>=dev-python/pymysql-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/xlsxwriter-3.0.3[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-python/tzdata[${PYTHON_USEDEP}]
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/pandas-dev/pandas/pull/61331/commits/12b1d00622ffc8b99986da2f4478cc2df4da213a
+	"${FILESDIR}/${P}-xarray-test.patch"
+)
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
+		# https://github.com/pandas-dev/pandas/issues/38921
+		tests/window/test_rolling.py::test_rolling_var_numerical_issues
+
+		# TODO: missing data not covered by --no-strict-data-files?
+		tests/io/xml/test_xml.py::test_empty_stylesheet
+		tests/io/xml/test_xml.py::test_wrong_file_path
+
+		# deprecation warning
+		'tests/computation/test_eval.py::TestEval::test_scalar_unary[numexpr-pandas]'
+
+		# requires -Werror
+		tests/tslibs/test_to_offset.py::test_to_offset_lowercase_frequency_deprecated
+		tests/tslibs/test_to_offset.py::test_to_offset_uppercase_frequency_deprecated
+		tests/copy_view/test_array.py::test_dataframe_multiple_numpy_dtypes
+
+		# probably pytz, doesn't happen on main (where zoneinfo is used)
+		'tests/arrays/test_array.py::test_array_inference[data7-expected7]'
+	)
+
+	if ! tc-has-64bit-time_t; then
+		EPYTEST_DESELECT+=(
+			# Needs 64-bit time_t (TODO: split into 32-bit arch only section)
+			tests/tseries/offsets/test_year.py::test_add_out_of_pydatetime_range
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-BusinessDay]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-BusinessHour]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-BusinessMonthEnd]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-BusinessMonthBegin]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-BQuarterEnd]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-BQuarterBegin]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-CustomBusinessDay]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-CustomBusinessHour]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-CustomBusinessMonthEnd]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-CustomBusinessMonthBegin]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-MonthEnd]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-MonthBegin]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-SemiMonthBegin]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-SemiMonthEnd]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-QuarterEnd]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-LastWeekOfMonth]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-WeekOfMonth]'
+			'tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-Week]'
+		)
+	fi
+
+	if ! has_version "dev-python/scipy[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/plotting/test_misc.py::test_savefig
+		)
+	fi
+
+	local -x LC_ALL=C.UTF-8
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	# --no-strict-data-files is necessary since upstream prevents data
+	# files from even being included in GitHub archives, sigh
+	# https://github.com/pandas-dev/pandas/issues/54907
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest pandas/tests \
+		--no-strict-data-files -o xfail_strict=false \
+		-m "not single_cpu and not slow and not network and not db" ||
+		die "Tests failed with ${EPYTHON}"
+	rm test-data.xml test_stata.dta || die
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja2
+	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/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
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/pyqt5 dev-python/qtpy dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 47c2bf6299f9..7fda282cb085 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,3 +1,4 @@
 DIST pybind11-2.13.6.gh.tar.gz 800804 BLAKE2B 1f2efa05727ebbcd8e439b83bacfebb21d26a6f8f719e0a627633abdcae59837936e37e6441196e097e0075c9f922048d4e88146bb627d97ada28c48165bddb7 SHA512 497c25b33b09a9c42f67131ab82e35d689e8ce089dd7639be997305ff9a6d502447b79c824508c455d559e61f0186335b54dd2771d903a7c1621833930622d1a
 DIST pybind11-3.0.0rc1.gh.tar.gz 902027 BLAKE2B 9ddc7a5307b8e2fd53d99b8f93afd960ba73c9a04dd1b89f4b53b4e80f4bede74a823643c6e40d43741321b5b73752738782c1f601158cb77a4d6f58485cb002 SHA512 e05369a1082e3980055970d8fa9dddb54f2d1d75ef1e9968f62a02d9d00b9d22109359f97fd8cc0a2a8881c8126f5820c08cd41dd29c998a1c60c6a69c9a3983
 DIST pybind11-3.0.0rc2.gh.tar.gz 904127 BLAKE2B 7d64cece4672c0c46d5a9114e06f4d877382e501cc3a926f7ed9aa2909bbb49ba8a2e7a6516ffde7f483aa6c0dbd43c4114e9fb4c05bf361fc87e65bd7bd9788 SHA512 ed36f00bbcdf4f52962eb2a52eb6ba1a7be7e9a3c81556676e8b8d52ce2a79c8e59c5e21da6acc149ba5a5d0e7ed60dbb2e80647d4228f46993c4c20ac3eae31
+DIST pybind11-3.0.0rc3.gh.tar.gz 910739 BLAKE2B f82d93b400e39818cba2e293be055fc5f322103f5142f1e60fffb66431149e8d064d956386fa4f255981d17c291ac33649009d41a48b8b81a3bce42c069c5e86 SHA512 fa04c5f63ff42b89ad5d13368f2b9680d6601b79d1365b3c52b721be6949537f1217453dec0b99e7e9f9f2673af305d547f050fff9365840fad5cd3813b21c48
diff --git a/dev-python/pybind11/pybind11-3.0.0_rc3.ebuild b/dev-python/pybind11/pybind11-3.0.0_rc3.ebuild
new file mode 100644
index 000000000000..6ab744eced63
--- /dev/null
+++ b/dev-python/pybind11/pybind11-3.0.0_rc3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=scikit-build-core
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit cmake distutils-r1
+
+MY_P=${P/_}
+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
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	dev-cpp/eigen:3
+"
+BDEPEND="
+	test? (
+		<dev-cpp/catch-3:0
+		>=dev-cpp/catch-2.13.9:0
+		dev-libs/boost
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/tomlkit[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	cmake_src_prepare
+	distutils-r1_src_prepare
+
+	# https://github.com/scikit-build/scikit-build-core/issues/912
+	sed -i -e '/scikit-build-core/s:0\.11\.2:0.8:' pyproject.toml || die
+}
+
+python_configure() {
+	DISTUTILS_ARGS=(
+		# disable forced lto
+		-DHAS_FLTO=OFF
+		# https://github.com/pybind/pybind11/issues/5087
+		-DPYBIND11_FINDPYTHON=OFF
+		-DPYBIND11_INSTALL=ON
+		-DPYBIND11_TEST=OFF
+	)
+
+	local mycmakeargs=(
+		"${DISTUTILS_ARGS[@]}"
+		-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 -p rerunfailures --reruns=5 "${S}/tests"
+}
+
+python_install() {
+	distutils-r1_python_install
+	cmake_src_install
+}
diff --git a/dev-python/pyqt6/Manifest b/dev-python/pyqt6/Manifest
index 92c57c9b7244..ffb24a632fe9 100644
--- a/dev-python/pyqt6/Manifest
+++ b/dev-python/pyqt6/Manifest
@@ -1,2 +1,3 @@
 DIST pyqt6-6.8.1.tar.gz 1064723 BLAKE2B 99ac44fe250b6ff7a1762df5d668b69ad424dc1b563147be7ba94ce7f00729c29ce17be4cd7c39b276549199b66d877dec69e9eeb6b394ed42f944f9155825fa SHA512 87727369168fde6e3edc488f96dd13d537f026e207e4b4ab1c95d09bf85859512a117dfc801249e0891425a6b5579830724e4145f370e2ef9909788f56eb4df6
 DIST pyqt6-6.9.0.tar.gz 1066831 BLAKE2B bdcac0c5b516ce8d299562e69b6fb66190343ba0153734bd75c174e690e42d85dae52154ed29c345b9706333c41beea1998a4cbaece9b66e27bb3167ec1b1c45 SHA512 a6e5c054d4b7ddf93e371e28265a7026f28237f62d0b92b121fb7508269be4ed4917661e035142036a82cd9f9527717e157297525cebc842793e2cbef8873c25
+DIST pyqt6-6.9.1.tar.gz 1067230 BLAKE2B 93b301fca3a7d97f872ca96f00eb27d434378f49dd19da6ffd5c26dbce378a7ea01786c0e7de34ce24620a14fa036b2187c5f7b0a4efa5a908ceaf557f748e9d SHA512 e2f10d6dc1ea9f420857abe248bfd488f8945e9c6c84887745f072815875ce7e806788a9048a57215266fa561b1489c3b092c276816062323262e6911271c552
diff --git a/dev-python/pyqt6/pyqt6-6.9.1.ebuild b/dev-python/pyqt6/pyqt6-6.9.1.ebuild
new file mode 100644
index 000000000000..70f19cf040c9
--- /dev/null
+++ b/dev-python/pyqt6/pyqt6-6.9.1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=sip
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+inherit distutils-r1 flag-o-matic multiprocessing pypi qmake-utils
+
+# can work with older Qt depending on the features the ebuild enables,
+# but a same major.minor version lower bound is simpler to manage/test
+QT_PV=$(ver_cut 1-2):6
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+# defaults match what is provided with qtbase by default (except testlib),
+# reduces the need to set flags but does increase build time a fair amount
+IUSE="
+	bluetooth +dbus debug designer examples gles2-only +gui help
+	multimedia +network nfc opengl pdfium positioning +printsupport
+	qml quick quick3d remoteobjects scxml serialport sensors
+	spatialaudio speech +sql +ssl svg testlib webchannel websockets
+	vulkan +widgets +xml
+"
+# see `grep -r "%Import " sip` and `grep qmake_QT project.py`
+REQUIRED_USE="
+	designer? ( gui widgets )
+	help? ( gui widgets )
+	multimedia? ( gui network )
+	opengl? ( gui )
+	pdfium? ( gui )
+	printsupport? ( gui widgets )
+	qml? ( network )
+	quick3d? ( gui qml )
+	quick? ( gui qml )
+	remoteobjects? ( network )
+	scxml? ( gui )
+	spatialaudio? ( multimedia )
+	sql? ( widgets )
+	svg? ( gui )
+	testlib? ( gui widgets )
+	vulkan? ( gui )
+	webchannel? ( network )
+	websockets? ( network )
+	widgets? ( gui )
+"
+
+# may use qt private symbols wrt qtbase's :=
+# non-trivially broken with Qt6.8 wrt upper bound, waiting for PyQt6-6.8.0
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QT_PV}=[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,vulkan?,widgets?,xml?]
+	bluetooth? ( >=dev-qt/qtconnectivity-${QT_PV}[bluetooth] )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		sys-apps/dbus
+	)
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
+	nfc? ( >=dev-qt/qtconnectivity-${QT_PV}[nfc] )
+	opengl? (
+		gles2-only? ( media-libs/libglvnd )
+	)
+	pdfium? ( >=dev-qt/qtwebengine-${QT_PV}[pdfium,widgets?] )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
+	quick? ( >=dev-qt/qtdeclarative-${QT_PV}[opengl] )
+	remoteobjects? ( >=dev-qt/qtremoteobjects-${QT_PV} )
+	scxml? ( >=dev-qt/qtscxml-${QT_PV} )
+	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	speech? (
+		>=dev-qt/qtdeclarative-${QT_PV}
+		>=dev-qt/qtspeech-${QT_PV}
+	)
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	>=dev-python/pyqt6-sip-13.8[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${COMMON_DEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="
+	>=dev-python/pyqt-builder-1.17[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.12[${PYTHON_USEDEP}]
+	>=dev-qt/qtbase-${QT_PV}
+	dbus? ( virtual/pkgconfig )
+"
+
+src_prepare() {
+	default
+
+	# hack: PyQt-builder runs qmake without our arguments and calls g++
+	# or clang++ depending on what qtbase was built with, not used for
+	# building but fails with -native-symlinks
+	mkdir "${T}"/cxx || die
+	local cxx
+	! cxx=$(type -P "${CHOST}"-g++) || ln -s -- "${cxx}" "${T}"/cxx/g++ || die
+	! cxx=$(type -P "${CHOST}"-clang++) || ln -s -- "${cxx}" "${T}"/cxx/clang++ || die
+	PATH=${T}/cxx:${PATH}
+}
+
+python_configure_all() {
+	append-cxxflags -std=c++17 # for old gcc / clang that use <17 (bug #892331)
+	append-cxxflags ${CPPFLAGS} # respect CPPFLAGS notably for DISTUTILS_EXT=1
+
+	pyqt_use_enable() {
+		local state=$(usex ${1} --enable= --disable=)
+		shift
+		echo ${*/#/${state}}
+	}
+
+	DISTUTILS_ARGS=(
+		--jobs="$(makeopts_jobs)"
+		--qmake="$(qt6_get_bindir)"/qmake
+		--qmake-setting="$(qt6_get_qmake_args)"
+		--verbose
+		--confirm-license
+
+		--enable=QtCore
+
+		$(pyqt_use_enable bluetooth QtBluetooth)
+		$(pyqt_use_enable dbus QtDBus)
+		$(pyqt_use_enable designer QtDesigner)
+		$(pyqt_use_enable help QtHelp)
+		$(pyqt_use_enable gui QtGui)
+		#--disable=QtLocation # force-disabled in project.py
+		$(pyqt_use_enable multimedia QtMultimedia \
+			$(usev widgets QtMultimediaWidgets))
+		$(pyqt_use_enable network QtNetwork)
+		$(pyqt_use_enable nfc QtNfc)
+		$(pyqt_use_enable opengl QtOpenGL \
+			$(usev widgets QtOpenGLWidgets))
+		$(pyqt_use_enable pdfium QtPdf \
+			$(usev widgets QtPdfWidgets))
+		$(pyqt_use_enable positioning QtPositioning)
+		$(pyqt_use_enable printsupport QtPrintSupport)
+		$(pyqt_use_enable qml QtQml)
+		$(pyqt_use_enable quick QtQuick \
+			$(usev widgets QtQuickWidgets))
+		$(pyqt_use_enable quick3d QtQuick3D)
+		$(pyqt_use_enable remoteobjects QtRemoteObjects)
+		$(pyqt_use_enable scxml QtStateMachine)
+		$(pyqt_use_enable sensors QtSensors)
+		$(pyqt_use_enable serialport QtSerialPort)
+		$(pyqt_use_enable spatialaudio QtSpatialAudio)
+		$(pyqt_use_enable sql QtSql)
+		$(pyqt_use_enable svg QtSvg \
+			$(usev widgets QtSvgWidgets))
+		$(pyqt_use_enable testlib QtTest)
+		$(pyqt_use_enable speech QtTextToSpeech)
+		$(pyqt_use_enable webchannel QtWebChannel)
+		$(pyqt_use_enable websockets QtWebSockets)
+		$(pyqt_use_enable widgets QtWidgets)
+		$(pyqt_use_enable xml QtXml)
+
+		$(usev debug '--debug --qml-debug --tracing')
+
+		$(usev !dbus --no-dbus-python)
+		# note: upstream currently intentionally skips installing these two
+		# plugins when using wheels w/ pep517 so, *if* something does need
+		# them, it will need to be handled manually
+		$(usev !designer --no-designer-plugin)
+		$(usev !qml --no-qml-plugin)
+
+		$(usev !gles2-only --disabled-feature=PyQt_OpenGL_ES2)
+		$(usev !opengl --disabled-feature=PyQt_OpenGL)
+		$(usev !ssl --disabled-feature=PyQt_SSL)
+		$(usev !vulkan --disabled-feature=PyQt_Vulkan)
+
+		# intended for Windows / Android or others
+		--disable=QAxContainer
+		--disabled-feature=PyQt_Permissions
+	)
+}
+
+python_install_all() {
+	einstalldocs
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.1.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.1.ebuild
index 89736d9c5114..7a21b7ffa821 100644
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.1.ebuild
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ S=${WORKDIR}/${P//_/}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/python-tests/Manifest b/dev-python/python-tests/Manifest
index 29c33d6aae75..9d06e7b8c4a6 100644
--- a/dev-python/python-tests/Manifest
+++ b/dev-python/python-tests/Manifest
@@ -13,18 +13,13 @@ DIST Python-3.13.4.tar.xz.asc 963 BLAKE2B 5c594f95a7b74c2191b553f50020cd6db9b400
 DIST Python-3.14.0b2.tar.xz 23579860 BLAKE2B bf5ebac54531a7c837e7650754264b4be28e28613d488d1c7546db77e2ef3b501ff646d7fb505c6ac0fa1381c3230d1c1899bc82144f369339c89687b5dc7f5c SHA512 cdd37f8a982e6194d5afa80a2eb94c899080809749d59a50a2ce3eed37f720a1fd9a7977f0dd3992650d173a7070b15610077d97cb499bd16a7500c56ef1f8dd
 DIST Python-3.14.0b2.tar.xz.sigstore 5131 BLAKE2B 04cab57a4da63f5abf28db94e5fd952206124ce37ef5a5d981839a0790881c9c4ea6d186f233eaaf6e82350bdfdbb0048d761b816d81eaba71c707bd9714a9d9 SHA512 a356037824fbde5950f197cf04f0d71ddaf4b68006b2ab9951f9b4c2df508e84bd0bec7d72051e75d22c17eee767e46e5d2c167e853fb941b0831cb26d518fdc
 DIST python-gentoo-patches-3.11.11.tar.xz 10604 BLAKE2B 6be4c66b0458f7a7085aef976cff3dcb4d114ac0b64fb27327a5693e8d41a77f7eeed718b9c5a1b1961278235ee4cd43497aa3dc27e6e6bed65804b95f667a15 SHA512 ab8113a94949cead34d976179f80c3e0a6686bf2476079a74f97b4d08c24a237500dc7ee09dc3b0ec98d2fbcb138397c73d7e2252e617a957a13999e59115158
-DIST python-gentoo-patches-3.11.12.tar.xz 15616 BLAKE2B 5d4a47058fc35c4ae966e3dff823f91129852bf81cd586d5b3a34a6daf672732918daf00199394f2f982411ec30a291f45bba55b3ffa3d96a179ecd600ea4647 SHA512 77973ef88403f94d55162e0138cd29b4d8959a8fcf4cec730daf7ddd8fb4a3acfcd0dd1fdaacbdd2b218bd15f6c6715ce339df4eba48227d17520243d96eeb39
-DIST python-gentoo-patches-3.11.12_p1.tar.xz 22192 BLAKE2B 2d7f39d1d55428e5dc617a796a3147046c0549bd8fc26a1d3b2701ca2ab17a4cc990b8fed925a7b8d7c410b12f4c22e14f9e64d7ea4b2c387c919570abad259f SHA512 363b049824b520b92541569d315e4e67192f3bd915f44f600acc51858ae3960b0060222cab2612f9aef53c7b2a0e323d197e107c9bcbdc4625572303d6393a5c
 DIST python-gentoo-patches-3.11.12_p2.tar.xz 37360 BLAKE2B 0f8a3b260e4f1d1c824fd962f8ed0fd7e50cb3384795b3bc03f83511dce73235aa4c43a51a5e2198aedc06467b35962b9e55a97eb58d569844d6298b3bee1c15 SHA512 48fbabd1f82c5a6ecc75067e007c62cbefa5efd3276c7aadb802892c3ebe5bdaaad01ad8bff92cec6bfc6f5212c842105540f3bf7c679cb31dee36013a99ee8f
 DIST python-gentoo-patches-3.11.13.tar.xz 16492 BLAKE2B 8b188742dd3f25974cead290e5793c31f02741a901dce65137c596045fa2fbd5baaef332204af90f95ddcd864ee542b252c00b190e15c25af60a7bda771b116f SHA512 b5abad341d2eede81df445b56a98720466ec23df40a8a2e99a04dba5a106205655c8e2b64df0ca2630f036c8fe457ba64524280d137bbc99f52e4fd8e6bbd5ae
 DIST python-gentoo-patches-3.12.10.tar.xz 10744 BLAKE2B 2abf4874018156d6735cf8604c410dc4726ac9365bc7500abe6b82472aad100aac7268957256692f4275b02965773e58178519ed8038e121f1ffa3c53770d238 SHA512 62066405aa00f46f9645e9c747d53bb93bf510fc791d14d49e00edfd79981778e6c8e07bfa7bac88d76407a0ffd8f7321dea89f81d90b01dbf13f4d381b6a1a3
-DIST python-gentoo-patches-3.12.10_p1.tar.xz 17356 BLAKE2B 9a87b3a6f04977067cb0ce126e45c9d584145bc9cf1d43e46e7ae5e295a14d69b07b6e20c18bff74d02f0e6c3617e8c1ff015097be32cb7dc76ae45ab71d1a41 SHA512 d98f27176d3ea2532c2f8c0a2eadf23f1f0b305e08bbbfd12acfae7308070d70a8d3c3eb60fe157f4ff51cb6302bea5882d75f6a8028310c95309aed3bdaddb5
 DIST python-gentoo-patches-3.12.10_p2.tar.xz 33236 BLAKE2B e73edf8caf53799f4407ebd08211e86e6c8850441c3c845264b7d250b9fd1630865ff9dfa184ab6f0a4ac2f56326f88af24a006c68d62e2f57c027f93ec6cd31 SHA512 36e2bf3d288a06e60f412e4335563d8633ee2a5c4c798d6a90133d7dcbd3cbc4d9a9c8f1167e10f52740f34cb2ea510981166c6b7a333587118c4da85a1ef354
 DIST python-gentoo-patches-3.12.11.tar.xz 12020 BLAKE2B b419d32b1d7bef9408027edda7eac9a920a877e1b8f521483df595199bad1bbadd9dd9500079c09beab63286a801bfb25da5f93a5d31462ed3e457a6e40ad6af SHA512 1b0eaff4c0df06554525a50576da7eadb4067c4f2970851e5c9e3e527a9ccc4216cbd65c45fd562af4a1cedc2c66278a74bee5cf5c1a65df8feb22f34f5a19e4
 DIST python-gentoo-patches-3.13.3.tar.xz 8336 BLAKE2B 66393886fbd034eb14732e4f81f5798e77650ea3fe1c4f8176bd93808b711c8977a53c3f52be6c9b97a368299258b851d9bdb6d4c8e0c75695c6aea784d48b44 SHA512 c1ed31d6aaef81addf786c2ccc1013309b122b791c42fe10e467a677d0db8f149e8b1cc21928c146298918c7ceb851b4b19d1e59f491cb161004e1c9386db289
-DIST python-gentoo-patches-3.13.3_p1.tar.xz 15164 BLAKE2B 56420b8d051fbf3eb47f2bce08c79f167b9fbaa89f8ee932e3db27ea08a191f042e1f0114c1377c8210060332141b36eb1d582507185c983297a1d61573aa435 SHA512 1e138be3ef5c03e4d0b520aa736cdec44daf2956a931f4080e53b0652ebefa48095cad837e7bae4cc90bd42fbb7aba6f25c61e3c880ca1a581a745744b011fa3
 DIST python-gentoo-patches-3.13.3_p2.tar.xz 36284 BLAKE2B c1f62268013a055ac477e3e7b49c313d8a41e1fdbd806bb9ddb3a57926297ba7d67e20dadc47ab21ec35f1b0bc504ffd4f039846d8588d143f4e379d8bdc5a12 SHA512 d80856c60c519f28660d6ac5c3df0446759df4c962ab5c989dca1147e92e53e07ed19c75f75a7fdce8e85e919bc77c6ad06a25a611c09764b3eafd61f7d8b63d
 DIST python-gentoo-patches-3.13.4.tar.xz 8912 BLAKE2B e3d9f2a12f801dc75e09c5301757f35216d712b5e5394f2ec3ce1d79d0cb57571dbca525e3d5c35b90fa059c2b78ee24341b6a51cbe9691deac84c9ee0578824 SHA512 1a7141accb7aa70c7bd8dd12528f7de031dfeab9ff089f3d044da0b7b52461e2d6d7d1467161e0fe1e259d9fa06d70bcf107d86ad3590e8cf73aa1132ef3aaf9
 DIST python-gentoo-patches-3.14.0b1.tar.xz 5680 BLAKE2B 514b3edc3025e5bf675d371b5ada17dea426856edf1fb6095c2ee400eae95bd4265ef81fe593ae9338e801e7d0a25b1d5ba2d05ca563fd9dd020114b13575746 SHA512 74289e42cf532b54bb1b66a283ec19156f8a36ba38764209c133842314c9efb2ce2ebcba5aa9213bcf7fc0c8a5ca9b6e7adbd5dbfa4397233136d7cd55f53ee7
-DIST python-gentoo-patches-3.14.0b2.tar.xz 6168 BLAKE2B ecf2fd981efc289fbc16d615c6e69ad7a797bd6906e6f974ece47eace582d7c4b3ea0217b0df9575e522416df2749125ff3658d8aca6a53bf977d5f155dd6b90 SHA512 552ff5306ca43c89e65b1df42cb71753c7e900efc4be7e35150c187184a5e94241fea78bb9084831508fd4a7e71323be59c1565901560ec53fc076c3697baf34
 DIST python-gentoo-patches-3.14.0b2_p1.tar.xz 23992 BLAKE2B 65346fe06b2f03251882542b90821c28bd16d9f1c81d1e594bf78403689b444688a9cffa1d52faf63dd9c4db301a9b2a1e6729026e73525fe2f0622f896b6a46 SHA512 c98600da507541c0ba3a03dcaa6d344596fd8f5ef8169eff276318ed33a38ba4794ea346b25b9d11f9a277334bdcc1105e6332bb212602c3c993866340aa8482
diff --git a/dev-python/python-tests/python-tests-3.11.12.ebuild b/dev-python/python-tests/python-tests-3.11.12.ebuild
deleted file mode 100644
index 1d3b71369371..000000000000
--- a/dev-python/python-tests/python-tests-3.11.12.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-# enable by default to help CI handle it (we have no additional deps)
-IUSE="+python_targets_${PYTHON_COMPAT[0]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-	!<dev-lang/python-3.11.9_p2-r1:${PYVER}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	local dirs=(
-		ctypes/test distutils/tests idlelib/idle_test lib2to3/tests
-		./test tkinter/test unittest/test
-	)
-	local dir
-	for dir in "${dirs[@]}"; do
-		python_moduleinto "/usr/lib/python${PYVER}/${dir%/*}"
-		python_domodule "${dir}"
-	done
-}
diff --git a/dev-python/python-tests/python-tests-3.11.12_p1.ebuild b/dev-python/python-tests/python-tests-3.11.12_p1.ebuild
deleted file mode 100644
index feea42f6a26d..000000000000
--- a/dev-python/python-tests/python-tests-3.11.12_p1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
-# enable by default to help CI handle it (we have no additional deps)
-IUSE="+python_targets_${PYTHON_COMPAT[0]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-	!<dev-lang/python-3.11.9_p2-r1:${PYVER}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	local dirs=(
-		ctypes/test distutils/tests idlelib/idle_test lib2to3/tests
-		./test tkinter/test unittest/test
-	)
-	local dir
-	for dir in "${dirs[@]}"; do
-		python_moduleinto "/usr/lib/python${PYVER}/${dir%/*}"
-		python_domodule "${dir}"
-	done
-}
diff --git a/dev-python/python-tests/python-tests-3.11.12_p2.ebuild b/dev-python/python-tests/python-tests-3.11.12_p2.ebuild
index 3b7b848459f6..1d3b71369371 100644
--- a/dev-python/python-tests/python-tests-3.11.12_p2.ebuild
+++ b/dev-python/python-tests/python-tests-3.11.12_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 # enable by default to help CI handle it (we have no additional deps)
 IUSE="+python_targets_${PYTHON_COMPAT[0]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/python-tests/python-tests-3.12.10.ebuild b/dev-python/python-tests/python-tests-3.12.10.ebuild
deleted file mode 100644
index d23e0d912367..000000000000
--- a/dev-python/python-tests/python-tests-3.12.10.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-# enable by default to help CI handle it (we have no additional deps)
-IUSE="+python_targets_${PYTHON_COMPAT[0]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-	!<dev-lang/python-3.12.5_p1-r1:${PYVER}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	python_moduleinto "/usr/lib/python${PYVER}"
-	python_domodule test
-	python_moduleinto "/usr/lib/python${PYVER}/idlelib"
-	python_domodule idlelib/idle_test
-}
diff --git a/dev-python/python-tests/python-tests-3.12.10_p1.ebuild b/dev-python/python-tests/python-tests-3.12.10_p1.ebuild
deleted file mode 100644
index e0939ea6e83c..000000000000
--- a/dev-python/python-tests/python-tests-3.12.10_p1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-# enable by default to help CI handle it (we have no additional deps)
-IUSE="+python_targets_${PYTHON_COMPAT[0]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-	!<dev-lang/python-3.12.5_p1-r1:${PYVER}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	python_moduleinto "/usr/lib/python${PYVER}"
-	python_domodule test
-	python_moduleinto "/usr/lib/python${PYVER}/idlelib"
-	python_domodule idlelib/idle_test
-}
diff --git a/dev-python/python-tests/python-tests-3.12.10_p2.ebuild b/dev-python/python-tests/python-tests-3.12.10_p2.ebuild
index 5a8fcf17b294..d23e0d912367 100644
--- a/dev-python/python-tests/python-tests-3.12.10_p2.ebuild
+++ b/dev-python/python-tests/python-tests-3.12.10_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 # enable by default to help CI handle it (we have no additional deps)
 IUSE="+python_targets_${PYTHON_COMPAT[0]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/python-tests/python-tests-3.13.3-r100.ebuild b/dev-python/python-tests/python-tests-3.13.3-r100.ebuild
deleted file mode 100644
index c8629e28ebac..000000000000
--- a/dev-python/python-tests/python-tests-3.13.3-r100.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV/_}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)t
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# enable by default to help CI handle it (we have no additional deps)
-IUSE="+python_targets_${PYTHON_COMPAT[0]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	python_moduleinto "/usr/lib/python${PYVER}"
-	python_domodule test
-	python_moduleinto "/usr/lib/python${PYVER}/idlelib"
-	python_domodule idlelib/idle_test
-}
diff --git a/dev-python/python-tests/python-tests-3.13.3.ebuild b/dev-python/python-tests/python-tests-3.13.3.ebuild
deleted file mode 100644
index b2ccdea5ecd5..000000000000
--- a/dev-python/python-tests/python-tests-3.13.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV/_}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-# enable by default to help CI handle it (we have no additional deps)
-IUSE="+python_targets_${PYTHON_COMPAT[0]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-	!<dev-lang/python-3.13.0_rc1_p3-r1:${PYVER}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	python_moduleinto "/usr/lib/python${PYVER}"
-	python_domodule test
-	python_moduleinto "/usr/lib/python${PYVER}/idlelib"
-	python_domodule idlelib/idle_test
-}
diff --git a/dev-python/python-tests/python-tests-3.13.3_p1-r100.ebuild b/dev-python/python-tests/python-tests-3.13.3_p1-r100.ebuild
deleted file mode 100644
index 25edd5462511..000000000000
--- a/dev-python/python-tests/python-tests-3.13.3_p1-r100.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)t
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# enable by default to help CI handle it (we have no additional deps)
-IUSE="+python_targets_${PYTHON_COMPAT[0]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	python_moduleinto "/usr/lib/python${PYVER}"
-	python_domodule test
-	python_moduleinto "/usr/lib/python${PYVER}/idlelib"
-	python_domodule idlelib/idle_test
-}
diff --git a/dev-python/python-tests/python-tests-3.13.3_p1.ebuild b/dev-python/python-tests/python-tests-3.13.3_p1.ebuild
deleted file mode 100644
index 1641a285b2af..000000000000
--- a/dev-python/python-tests/python-tests-3.13.3_p1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-# enable by default to help CI handle it (we have no additional deps)
-IUSE="+python_targets_${PYTHON_COMPAT[0]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-	!<dev-lang/python-3.13.0_rc1_p3-r1:${PYVER}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	python_moduleinto "/usr/lib/python${PYVER}"
-	python_domodule test
-	python_moduleinto "/usr/lib/python${PYVER}/idlelib"
-	python_domodule idlelib/idle_test
-}
diff --git a/dev-python/python-tests/python-tests-3.13.3_p2.ebuild b/dev-python/python-tests/python-tests-3.13.3_p2.ebuild
index 6ec6bb7f3ef5..d1f1977b8fe7 100644
--- a/dev-python/python-tests/python-tests-3.13.3_p2.ebuild
+++ b/dev-python/python-tests/python-tests-3.13.3_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 # enable by default to help CI handle it (we have no additional deps)
 IUSE="+python_targets_${PYTHON_COMPAT[0]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/python-tests/python-tests-3.14.0_beta2-r100.ebuild b/dev-python/python-tests/python-tests-3.14.0_beta2-r100.ebuild
deleted file mode 100644
index a9d84cc6f11e..000000000000
--- a/dev-python/python-tests/python-tests-3.14.0_beta2-r100.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-VERIFY_SIG_METHOD=sigstore
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV/_beta/b}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)t
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.sigstore
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# enable by default to help CI handle it (we have no additional deps)
-IUSE="+python_targets_${PYTHON_COMPAT[0]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-"
-
-# https://www.python.org/downloads/metadata/sigstore/
-VERIFY_SIG_CERT_IDENTITY=hugo@python.org
-VERIFY_SIG_CERT_OIDC_ISSUER=https://github.com/login/oauth
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sigstore}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	python_moduleinto "/usr/lib/python${PYVER}"
-	python_domodule test
-	python_moduleinto "/usr/lib/python${PYVER}/idlelib"
-	python_domodule idlelib/idle_test
-}
diff --git a/dev-python/python-tests/python-tests-3.14.0_beta2.ebuild b/dev-python/python-tests/python-tests-3.14.0_beta2.ebuild
deleted file mode 100644
index 3dbc65e132eb..000000000000
--- a/dev-python/python-tests/python-tests-3.14.0_beta2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-VERIFY_SIG_METHOD=sigstore
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV/_beta/b}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.sigstore
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# enable by default to help CI handle it (we have no additional deps)
-IUSE="+python_targets_${PYTHON_COMPAT[0]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-"
-
-# https://www.python.org/downloads/metadata/sigstore/
-VERIFY_SIG_CERT_IDENTITY=hugo@python.org
-VERIFY_SIG_CERT_OIDC_ISSUER=https://github.com/login/oauth
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sigstore}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	python_moduleinto "/usr/lib/python${PYVER}"
-	python_domodule test
-	python_moduleinto "/usr/lib/python${PYVER}/idlelib"
-	python_domodule idlelib/idle_test
-}
diff --git a/dev-python/qiskit/Manifest b/dev-python/qiskit/Manifest
index ab5b0aead8bc..b2bc6739a1de 100644
--- a/dev-python/qiskit/Manifest
+++ b/dev-python/qiskit/Manifest
@@ -115,6 +115,8 @@ DIST qiskit-2.0.1-crates.tar.xz 14987108 BLAKE2B 987eddead98df577acaef512e911f60
 DIST qiskit-2.0.1.gh.tar.gz 7918667 BLAKE2B b1749ebb872ec5272253bec318c6092f1c799fe4b7715be3651d23a46415a210096545fe6422526e80acd429077351e7007e29aff3c47f212ba8016d3d21ec5b SHA512 5ccca96809f28f64276d12a2343ef8990b13a80ed2adf6a6e0dd3fc7ec2e222dc6395d71bc17a9fbb27380f9152b4ae5b5113a0a8bd6359b63950aab514a5a7d
 DIST qiskit-2.0.2-crates.tar.xz 14987108 BLAKE2B 987eddead98df577acaef512e911f608962553a172029c262cf3a20bfc148a4b6caa3a8f8869a15a59c818214bbf41f827a28651de71aa9fb47a631a686c497c SHA512 06c8effaae0dfbfc5a1b856a3db7a15f5e59f40c6a9862326f6f89607688bd070ca7bdf6b87ee6445e44e3a5af8745429c3495061c88b0d37cc421c14e03047c
 DIST qiskit-2.0.2.gh.tar.gz 7920194 BLAKE2B 21f3df0864cf0b14cd3949dad1e3cbc5c856d3eae8235441feb8ace57e0f1e690ba4649ab24343b6c149848c7c0701f0adb8a7a6f7993b1e3137cf0ed6653bf1 SHA512 090eff5c1d6f1de42d204986107afe1db92f15788a468d1376619369ecea6e26523a417ef0e8a8d62ccfe8431eb890f63dd6eba64ed2889e87f60b49afc253da
+DIST qiskit-2.1.0rc1-crates.tar.xz 15412164 BLAKE2B 24a65f0ec256c2f848102c039106ef0fecb33be0fb00494f0ca707285e224ade0efd1a4a6a557dc5dd7d2224924e2b94a4a4585d8a9030a310f0f1a999ac0713 SHA512 779aca54c2da20f2558f5fab2de0ee22c861f2edd88dea17e79d1f7f796eda9612bcf45a08a0647032049e67e9c467236b493cb02efcf199e2951109c316e53a
+DIST qiskit-2.1.0rc1.gh.tar.gz 7089079 BLAKE2B 578e1162b4100b53a17f58781664066435d8ece9b8acd5fde9e0b959f0e1afd8a19fe1442d41bff78445d046850b80623ab8732b7f8754c102e3564b33090833 SHA512 2ddcb782665c1dcdad2b8422907547dd0bb017386bbff442b7f9805439244145e6a9a6809cb3117d3eb065d0da550919b6e31f1037447e34106e9cb947f90817
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
 DIST ra_ap_limit-0.0.188.crate 1283 BLAKE2B 265a70d088ed76500cdbefa04d1b2778d54985aa978b806e9ebb016348556559799b8ac889c00aeff51d4ff08f3fa86cd3be3742f5896916edbbda49bca1946e SHA512 01d56844fb4437959e93fc3394d674848eaae3365d271c01ba5ff12fc05d4a1d11eb4145ee89a65eb5ba12db4075e8102ee31df55c569c8ee5ad6d383f9f451a
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
diff --git a/dev-python/qiskit/qiskit-2.1.0_rc1.ebuild b/dev-python/qiskit/qiskit-2.1.0_rc1.ebuild
new file mode 100644
index 000000000000..435455ccba44
--- /dev/null
+++ b/dev-python/qiskit/qiskit-2.1.0_rc1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2022-2025 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} )
+
+CRATES="
+"
+
+inherit cargo distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="An open-source SDK for working with quantum computers"
+HOMEPAGE="
+	https://github.com/Qiskit/qiskit/
+	https://pypi.org/project/qiskit/
+"
+SRC_URI="
+	https://github.com/Qiskit/qiskit/archive/${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+	https://github.com/gentoo-crate-dist/qiskit/releases/download/${PV/_}/${MY_P}-crates.tar.xz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT MPL-2.0
+	Unicode-3.0 ZLIB
+"
+SLOT="0"
+IUSE="+visualization"
+
+RDEPEND="
+	>=dev-python/dill-0.3[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	>=dev-python/python-constraint-1.4[${PYTHON_USEDEP}]
+	>=dev-python/rustworkx-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.5[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+	visualization? (
+		>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
+		dev-python/pydot[${PYTHON_USEDEP}]
+		>=dev-python/pillow-4.2.1[${PYTHON_USEDEP}]
+		>=dev-python/pylatexenc-1.4[${PYTHON_USEDEP}]
+		>=dev-python/seaborn-0.9.0[${PYTHON_USEDEP}]
+		<dev-python/symengine-0.14[${PYTHON_USEDEP}]
+		>=dev-python/symengine-0.11.0[${PYTHON_USEDEP}]
+		>=dev-python/sympy-1.3[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/cython-0.27.1[${PYTHON_USEDEP}]
+	test? (
+		app-text/poppler[png]
+		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
+		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
+		>=dev-python/qiskit-aer-0.14[${PYTHON_USEDEP}]
+		>=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="
+	usr/lib.*/py.*/site-packages/qiskit/_accelerate.*.so
+	usr/lib.*/py.*/site-packages/qiskit/_qasm2.*.so
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# strip forcing -Werror from tests that also leaks to other packages
+	sed -i -e '/filterwarnings.*error/d' test/utils/base.py || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/python/circuit/test_equivalence.py::TestEquivalenceLibraryVisualization::test_equivalence_draw
+		test/python/transpiler/test_unitary_synthesis_plugin.py::TestUnitarySynthesisPlugin
+		test/python/visualization/test_dag_drawer.py::TestDagDrawer::test_dag_drawer_no_register
+		# tiny image differences, sigh
+		test/python/visualization/test_gate_map.py::TestGateMap::test_plot_error_map_over_100_qubit
+		# TODO: failures from dill
+		test/python/circuit/test_parameters.py::TestParameters::test_transpiling_multiple_parameterized_circuits
+		test/python/compiler/test_transpiler.py::TestTranspile::test_delay_converts_expr_to_dt
+		test/python/compiler/test_transpiler.py::TestTranspile::test_transpile_two
+		test/python/transpiler/test_naming_transpiled_circuits.py::TestNamingTranspiledCircuits::test_multiple_circuits_name_list
+	)
+
+	local EPYTEST_IGNORE=(
+		# Breaks xdist
+		test/python/qasm2/test_parse_errors.py
+		test/python/transpiler/test_preset_passmanagers.py
+	)
+
+	rm -rf qiskit || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# Run the Python test suite rather than everything under test/ which
+	# includes the 'randomized' suite. Upstream run that in a separate CI job.
+	epytest test/python
+}
diff --git a/dev-python/scikit-learn/Manifest b/dev-python/scikit-learn/Manifest
index 195645bbba36..e961187ce505 100644
--- a/dev-python/scikit-learn/Manifest
+++ b/dev-python/scikit-learn/Manifest
@@ -1,2 +1,3 @@
 DIST scikit-learn-1.6.1.gh.tar.gz 7046495 BLAKE2B 83292549cc12e44033451345fe6deac17fa4f3d013f9755839d4d7f1c7de9690c089a754493d0d3879ef44ed8523400d617fa4d135ce8500dab608552777cdf6 SHA512 ad91d7bd67884851334fed9b0f3b6f3bfacb6b1521b89acbe22e9428a88009579373118bbd3a55358ea60c997e98609062fc4eac8b1def1d0ad18026c0491074
+DIST scikit-learn-1.7.0.gh.tar.gz 7155945 BLAKE2B bd95523f81d64c1eca8bb162372344a91331007a0a0c9764d84fd6e92ce5ae4f72f9595598e8ea806b7bcfcff1f97e020bb6976a738fcca8c0f22ae348355207 SHA512 9093af3df99bdb9dc3961e4ba576ec53a2fd27c9a6dbe49b24a9cc9de9ae33536dff7c68c4430ff0c29bd4e0e2ee05f937c94b048a2443aa92c7258a82011fca
 DIST scikit-learn-1.7.0rc1.gh.tar.gz 7160017 BLAKE2B 15534eeef26f8f7ee335f14cb193be3742c1fe215093f2852e7ad6a00e23237fae2b6af820632bc07630c51a54f6cc5bdd8e4a7b40834c2b1ddf6b385c55eb06 SHA512 103dda41a312dad7a9586ffcc3d2e95594de566dfa33cce5e06b34b30bd62eceae762af4ecfc5094313a28502db2c22aafd1bd69bffe5347ccb651fa589ebe9d
diff --git a/dev-python/scikit-learn/scikit-learn-1.7.0.ebuild b/dev-python/scikit-learn/scikit-learn-1.7.0.ebuild
new file mode 100644
index 000000000000..43f10c5f3cf8
--- /dev/null
+++ b/dev-python/scikit-learn/scikit-learn-1.7.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Machine learning library for Python"
+HOMEPAGE="
+	https://scikit-learn.org/stable/
+	https://github.com/scikit-learn/scikit-learn/
+	https://pypi.org/project/scikit-learn/
+"
+SRC_URI="
+	https://github.com/scikit-learn/scikit-learn/archive/${PV/_}.tar.gz
+		-> ${P/_}.gh.tar.gz
+"
+S=${WORKDIR}/${P/_}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
+IUSE="examples"
+
+DEPEND="
+	virtual/blas:=
+	virtual/cblas:=
+	>=dev-python/numpy-1.22.0:=[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/joblib-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/threadpoolctl-3.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pythran-0.14.0[${PYTHON_USEDEP}]
+	>=dev-python/cython-3.0.10[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+# For some reason this wants to use urllib to fetch things from the internet
+# distutils_enable_sphinx doc \
+# 	dev-python/matplotlib \
+# 	dev-python/memory-profiler \
+# 	dev-python/numpydoc \
+# 	dev-python/pandas \
+# 	dev-python/pillow \
+# 	dev-python/seaborn \
+# 	dev-python/sphinx-gallery \
+# 	dev-python/sphinx-prompt \
+# 	dev-python/scikit-image
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO: floating-point problems
+		gaussian_process/kernels.py::sklearn.gaussian_process.kernels.ExpSineSquared
+	)
+
+	case ${ARCH} in
+		ppc64)
+			EPYTEST_DESELECT+=(
+				# TODO
+				ensemble/_weight_boosting.py::sklearn.ensemble._weight_boosting.AdaBoostRegressor
+			)
+	esac
+
+	rm -rf sklearn || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest --pyargs sklearn
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete || die
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index 59800bcee3bb..ff95e1151ea4 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1 +1,2 @@
 DIST tomlkit-0.13.2.tar.gz 192885 BLAKE2B c95d24e0ec61cb90dfdd3fe7a07f8187fdfdee1b60d6d3e5a1af08e6d319e24c2447107cd3e49455a3f1cd29a50bde2e09f3a57708ce7349d1e9bd6957e46c9d SHA512 65b45468de25a6b9f22c3fe3468301902e1e439de580e74f15f5a24985546a4bfe47642b6014a25590eb176fedbe468828d7bc84c9c3b65ab418c071f0902957
+DIST tomlkit-0.13.3.tar.gz 185207 BLAKE2B e4248dd22357295b4315abb28abb1e2949499fcc2f451058205876ffd67b4f45e0a773de9f73f07ec3a44dd8d066d7ee6bb2ea9d2067db2b76adba9b5391982b SHA512 bdb679d64ad09f89b8ae8c6b8406d24b805562e4d80a1a0644a533b15eafe8bf5b3451754d71d453ca581d43bcc598473499dab29176d52b2ff0589ff59bbec9
diff --git a/dev-python/tomlkit/tomlkit-0.13.3.ebuild b/dev-python/tomlkit/tomlkit-0.13.3.ebuild
new file mode 100644
index 000000000000..5aa2fb057ade
--- /dev/null
+++ b/dev-python/tomlkit/tomlkit-0.13.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Style preserving TOML library"
+HOMEPAGE="
+	https://github.com/python-poetry/tomlkit/
+	https://pypi.org/project/tomlkit/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "poetry' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "tomlkit"
+		version = "${PV}"
+		description = "Style preserving TOML library"
+	EOF
+
+	# some brilliant idea about forcing 1970 dates in sdist
+	# which are older than what zip can handle...
+	find -exec touch {} + || die
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/twine/twine-6.1.0.ebuild b/dev-python/twine/twine-6.1.0.ebuild
index 3d54b717f56f..43b30b4e46ad 100644
--- a/dev-python/twine/twine-6.1.0.ebuild
+++ b/dev-python/twine/twine-6.1.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 889211dac3df..cf38e19a5d12 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1 +1,2 @@
 DIST xmlschema-4.0.1.tar.gz 625283 BLAKE2B 750f151a6e10a01732cd9ff4a66f5499e3f8ed0ba2c07faf98bb85fab1c7a28bd3677f4b7ab12ab31235b1b23ca9127d8fa2a67bec7d5d4386bd3be26227fb6e SHA512 b1c08b9feabc40f1f299f005f765fa9d46780e3bc2173ee305d71c40e403a6f67b3a7558214fc663e54abd9a68ae28465044c7bc0113999cf18d2f4b95bfcec8
+DIST xmlschema-4.1.0.tar.gz 633811 BLAKE2B d4a0281f5d8bac3f5935b41bfcff37dbf355370ec8f09dbc356c86695c75546fb34b5870bc4a5a390be9bcf4025f1165b0768cb3b8f19c180a5f2a439bf89b00 SHA512 14884a7d6f804de08ff3cb35d06bd647bfefaa588d04b4128d0b8f71adac94b314b90ec2a0f6d3eb42bf8b4b3054c57adcbc218ce7b0ad822dc24906eac8f591
diff --git a/dev-python/xmlschema/xmlschema-4.1.0.ebuild b/dev-python/xmlschema/xmlschema-4.1.0.ebuild
new file mode 100644
index 000000000000..7f2327f15c70
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-4.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2025 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="An XML Schema validator and decoder"
+HOMEPAGE="
+	https://github.com/sissaschool/xmlschema/
+	https://pypi.org/project/xmlschema/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/elementpath-6[${PYTHON_USEDEP}]
+	>=dev-python/elementpath-5.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-77[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/jinja2[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	"${EPYTHON}" tests/run_all_tests.py -v || die "Tests fail with ${EPYTHON}"
+}