gentoo auto-resync : 30:09:2023 - 11:39:43

author: V3n3RiX <venerix@koprulu.sector> 2023-09-30 11:39:43 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-09-30 11:39:43 +0100
commit: c417025a2ab386cddabb71ad598a9b75b47af313 (patch)
tree: 65963e1f2e99ed22f278cdb819bb1d0892062731 /dev-python
parent: 49fadb6686800eac5ce039896df6437ac7240c8c (diff)
127 files changed, 1713 insertions, 3891 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 78b41d4859e7..d8dfaca7ee25 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 23c7cbff76eb..794e303121d2 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,3 +1,5 @@
 DIST PyGithub-1.59.1.tar.gz 3295328 BLAKE2B 7a7dcfa49261aa7c6d7d3b252c77cc93bd24440858989ef2a8b257235ed7b101647c08532860f0fa21d1b8f2ac35541341df49a94c3495c7d9666fe7367738c1 SHA512 795c104253b250b11b539b526944776f70e947e23dc4b26fcdadb5de3dd3208a9b27c08ffdd14cade220fde3360b6993be7a028f0069ff60d99331048560faed
+DIST PyGithub-2.1.1.tar.gz 3330531 BLAKE2B 9b288266379d7b1d85be91a7261596f9c98b97bdb5f17c4f8bb43b4765f07e2088f1130c802a623c875c8ddd7d31bdf3cad2a7fc6672ca50bb9a69c80bf4c907 SHA512 f5a0186c1a206cef070c6c19ae0cca5ab19993dd16b9df9997ba01a3fa02baee3425cef51588f7ac38636a165e36d9a5a2c4014e59482b583001c75efa7afc40
 EBUILD PyGithub-1.59.1.ebuild 872 BLAKE2B 73a115f6ae666e6d6ccc1008acc426c0912e01375172df2ece5111303fb2aa39f921dd56aaeb9cfd1b473402df80fdea8537c8c6d4537a4e957029f3c770c824 SHA512 ad384dd73b113623bde205dcb52429b6da5b43b44f4f346d95e24a71b975e72d640033b89c0a5c9b3297b6446bafb6c930313f36d52f75570573f3374b32cfd8
+EBUILD PyGithub-2.1.1.ebuild 1023 BLAKE2B d979fbb5dd81607177c791f74aa2ae23a16b8f28f6897b022afbb65f02db82ed09989d3f060fa773c9360a1f0d02c339a0d5274d6725e9ded91b452049a17850 SHA512 7a1baeb3e4f5388aa47f380814fb3a43e54cd37bb6f06d4fe3b3c837e702f9c9a2e97fd34997c1f0dff89b933a53974a4ad8f4f6b1566e8582942f3fa2cd6e0c
 MISC metadata.xml 501 BLAKE2B 1692287021b81416f18386da2b1dffd1c358d4dbfa3aacf7d5f773db0889ba966408c35fdbb7ea7f741923d542ea4e825039ab124a64168ad2d5264d1718dc5b SHA512 e1f2c16e725e96e8d576ff6b87a79d39f1b8169c6f419eadcd18a8a266fd188dc08fc9efa236f2c696449a083b000086b153da559cd819fcb73ddf2518500813
diff --git a/dev-python/PyGithub/PyGithub-2.1.1.ebuild b/dev-python/PyGithub/PyGithub-2.1.1.ebuild
new file mode 100644
index 000000000000..27780cfb190a
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-2.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python library to access the Github API v3"
+HOMEPAGE="
+	https://github.com/PyGithub/PyGithub/
+	https://pypi.org/project/PyGithub/
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# cryptography via pyjwt[crypto]
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/deprecated[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/httpretty-1.0.3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index dd5ca9890a95..ea73ec9ece46 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,7 +1,5 @@
 AUX aesara-2.6.5-compiledir-tid.patch 1707 BLAKE2B 77f8fa3618f930dddad8e864dee3e73fc0b965018d508be5877d5bcae4430024c4e4f90e905ac912da22a4d4934d6fc71acf4ebd49b7e8efb12c90dfaa072ed2 SHA512 9b6bbd8bc56f61c89dfd85cb18251ff8d73d717d91178efa9309e6b897dbda28937dea84f1d7d1a917c285219d51c0adcee1233112f2dcdb9f8c7b714a6c6c12
 AUX aesara-2.8.10-fix-tuple.patch 649 BLAKE2B bfc2b2971fdaa452c5d14d75f68af5931b979dcb2951baf8bb1cf759058b4c0f341233b33d907722302ea8374cbd965e4d09e87f069ee2b1a558bf4e9a7309c9 SHA512 2c5846c723f214a8f623593f518194edb113f0d7c64ab1d69d6e4c5278125910f1c775cffdb46871d23ddf5332bbd84f252ed58e2560663c0c36520f1fb72372
-DIST aesara-2.9.1.tar.gz 4423120 BLAKE2B 7a9b789cf455a85baa48be20112e42a5449c955a57327125356968cbc8a9657d083a7aaa47048d322be05a822250f6c5cb50ff838b957595814d19499166e555 SHA512 17aa8f901a3194f82e4e47c78f23c91bb07ccfed7664e807537cd9db8d92f892357b1a7219b58881c16308b13689d088eaadcf113e17389e3f1297fc1d5e9381
 DIST aesara-2.9.2.tar.gz 4424417 BLAKE2B d5e40ecdba51d32ee160efe287d11ee96cf00fbea2882a5bfbba08099edf12e449f56eb3af636cb50b675d6aacc4270ee57c30d3c6848abd9a925285a91df7ae SHA512 91cf78fe4ee107895f91365adce6b4446c0a6908e36ebba407a9ad896af9dd38d035c0cd08515ca7789a052ad1c1f34930b46e8196768ebbcf27e8f37c1053a3
-EBUILD aesara-2.9.1.ebuild 3307 BLAKE2B 24d0c7f2d84587138e85273bbbf7e6e1f53da7b68dd42c58e920f5da42e838960fd7a8e886e32f2c1b334369ff86e5aa1dafa7cfaf732c40b46bf59187f1ab46 SHA512 85b17b6d90f6d95a5f20305a8c44b58936e9a81816c909de65bb9ad5573cf58cbefa54538635ad56cf86751ab9ffde577e48dae731daba55c9bfa5447bf0928f
-EBUILD aesara-2.9.2.ebuild 3388 BLAKE2B 3fc4868d49508494221d4bddda5f587601784b1e30a0e002a8cbc395c3a991d5d905941f87ebaf57b40de9bd7d61e22cd7b5678fa85ddc43177dad23609cbcca SHA512 2d5becc8413e8cbbb7a29dd0914211aa26f6d1eaff1161e1f73e0495eea8e0b119abe68a50f7d1f873bb54bff884ad415d2ebc660a96f54ea30c29f6b8ae119d
+EBUILD aesara-2.9.2.ebuild 3386 BLAKE2B eaccb85889d3c7fcf5e0ecbfc333bef692bc556af0735f83ea833811e372ba5d80f42aa975cc72c999f648d39066acf8a14296805132ae355636f21d3348dbdb SHA512 3ceeef6003edc79603971a1efca5d55968829f33f8493de6ac2a45bcd0abdcbe27da78a1581826745f9e9a4124501fe908a5fbbe91a9037cffc089c161e2c30f
 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.9.1.ebuild b/dev-python/aesara/aesara-2.9.1.ebuild
deleted file mode 100644
index 04cfcd712e77..000000000000
--- a/dev-python/aesara/aesara-2.9.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing optfeature pypi
-
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="
-	https://github.com/aesara-devs/aesara/
-	https://pypi.org/project/aesara/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cons[${PYTHON_USEDEP}]
-	dev-python/etuples[${PYTHON_USEDEP}]
-	dev-python/logical-unification[${PYTHON_USEDEP}]
-	dev-python/minikanren[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	<dev-python/numpy-1.25[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
-	"${FILESDIR}"/aesara-2.8.10-fix-tuple.patch
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not claim "bin" package (sic!)
-	rm bin/__init__.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-
-		# rounding problem?
-		# https://github.com/aesara-devs/aesara/issues/477
-		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
-		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
-
-		# Deprecation warning causes unexpected additional output
-		tests/tensor/test_basic.py::TestLongTensor::test_fit_int64
-
-		# dunno
-		tests/tensor/test_elemwise.py::TestDimShuffle::test_memory_leak
-		tests/tensor/signal/test_pool.py::TestDownsampleFactorMax::test_DownsampleFactorMaxGradGrad_grad
-
-		# TODO
-		tests/link/c/test_op.py::test_ExternalCOp_c_code_cache_version
-		tests/sparse/sandbox/test_sp.py::TestSP::test_multilayer_conv
-		tests/sparse/sandbox/test_sp.py::TestSP::test_maxpool
-
-		# TODO: Package pytest-benchmark
-		tests/scan/test_basic.py::TestExamples::test_reordering
-		tests/scan/test_basic.py::TestExamples::test_scan_as_tensor_on_gradients
-		tests/scan/test_basic.py::TestExamples::test_multiple_outs_taps
-		tests/scan/test_rewriting.py::TestPushOutAddScan::test_pregreedy_optimizer
-		tests/scan/test_rewriting.py::TestSaveMem::test_savemem_opt
-		tests/scan/test_basic.py::test_cython_performance
-	)
-	local EPYTEST_IGNORE=(
-		# we do not package jax or numba
-		tests/link/jax
-		tests/link/numba
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x AESARA_FLAGS="cxx=${CXX}"
-	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
-	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
-
-	epytest -p xdist.plugin -n "$(makeopts_jobs)" --dist=worksteal
-	# clean up the compiledir, as it can grow pretty large
-	rm -r "${HOME}"/.aesara || die
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/aesara/aesara-2.9.2.ebuild b/dev-python/aesara/aesara-2.9.2.ebuild
index 48e4fe94d96f..583144510d5c 100644
--- a/dev-python/aesara/aesara-2.9.2.ebuild
+++ b/dev-python/aesara/aesara-2.9.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cons[${PYTHON_USEDEP}]
diff --git a/dev-python/async-lru/Manifest b/dev-python/async-lru/Manifest
index 8a43ce4dd316..7c23840d1c5d 100644
--- a/dev-python/async-lru/Manifest
+++ b/dev-python/async-lru/Manifest
@@ -1,5 +1,3 @@
-DIST async-lru-2.0.3.gh.tar.gz 12592 BLAKE2B 3b434ebcb5f4db754ca93dae3e597490b07ce6d84d573529343a540b77fc9116f329f641fb97639dce6903384e52433dc48aabb7927266e8bcc18ce9fbaa85ac SHA512 8a3685bccb09ae268a713b3796f1f945bc9f9beff14530eb997722c6a0546bb39860492eadc1a46fca6ed549352e20cd9983396127ee9edfbd50657b5e5dd58f
 DIST async-lru-2.0.4.gh.tar.gz 13084 BLAKE2B dc3316e63783f36a446fc0d3565e018340787822b4a2663b9759d8bf5222277526b9a1285a34c3d84ccd245f75c6a53d9a693cc13c2b101bcb4bc97fa31835bf SHA512 aed4a043bfb323c1fc01f93def11fe597141778bd8437bd90189e2b6da26b0bb412fa72fb0d12a40b771571f3cb5f06fed8302379aec2e8e0318eab179b64912
-EBUILD async-lru-2.0.3.ebuild 867 BLAKE2B 5c334601970cc71b69d3c2fc9d1d8697de2d896bfac899d6c3bf33310b8163e104f50847355b6b88049857606cc5e043ab4a39fbb082183a6dcef2a3e6ca9d5c SHA512 c9d9c40026c39ec208dba5deb8f4cdb915fee9fb487292946b1686366ed6f557cbf52d29a6564f1f28c2191c05f3a39116d1994b51a4877919c310d4437b8184
 EBUILD async-lru-2.0.4.ebuild 760 BLAKE2B 9ed5ab590bc5b67f08d887b9ff9e76f07a9fb59d342a288033bd16dfefc4e8bd51c94d52ac3195bbe9daab1858dedb8932e7f71b0c95bd6d317d7408e4479809 SHA512 854e4244f7c1fc4b3c1f007706bd56d2fff7cbe6904a40ab01f2bf2166f8c72db47d49b90404e4aa1492a4fe2fa48a7696154a2ff4224651c03bf1c37ddfcb27
 MISC metadata.xml 373 BLAKE2B bb8b67d9df0a86ac3a7d834e79bbc8a907d467e567f353b29427c9a36b11cc79eaa4d1b6f8cef9a43e632f7d333af72dcc1bc579922a1aabfc47cdffc7bd922a SHA512 c6c089b381a5c572b6ecc2907f2e90ee2f581516ac66a6f901d32990db5c8086eefcc97f80a90c9b83504934489c3440cac86ebbc0cbd76801510fba1a9f0ed3
diff --git a/dev-python/async-lru/async-lru-2.0.3.ebuild b/dev-python/async-lru/async-lru-2.0.3.ebuild
deleted file mode 100644
index ad3398fd3cb0..000000000000
--- a/dev-python/async-lru/async-lru-2.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple lru_cache for asyncio"
-HOMEPAGE="
-	https://github.com/aio-libs/async-lru/
-	https://pypi.org/project/async-lru/
-"
-SRC_URI="
-	https://github.com/aio-libs/async-lru/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e 's:--cache-clear::' \
-		-e 's:--no-cov-on-fail --cov=async_lru --cov-report=term --cov-report=html::' \
-		-i setup.cfg || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 22c86908cf3e..f6f32e8e40ab 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,7 +1,5 @@
-DIST Chameleon-4.0.1.tar.gz 173650 BLAKE2B f5457ad7749ec98a0d80fd54b5b867d47f74bbf672abc1b4ad0e8c1bed5eaac93ea135801565a1a3fc72a8b930e67fa23d81c32bf866516bf9a16d1ef3b76ad7 SHA512 1cad12e13e5b90150c0d801951398fb68c2c05b9c7264697629fb21b0bb16325bfbf23f911c320c1464e78d6d275a565f0555474ac6d8e36b706b0eb7248d731
 DIST Chameleon-4.1.0.tar.gz 174877 BLAKE2B 00f0d6964f01ec375a18954a8f8f1f5f11da3a4af75b3d575a81d0458b25f98b1e8a399203147da90e60fad85d2a9df8da4123a86f0fda0e63a1c106a720bfc0 SHA512 7dc83ebf838ce9cc38093a08750145135e768352f74afd57f16e6f1c5dc5d24b482e56d40d088a204d72d8689aa978196fa2dd6e4cf89c872597286d85dc7594
 DIST Chameleon-4.2.0.tar.gz 176515 BLAKE2B 6be07b88e962ca155d390e9f4d5070ca4116993568840c50fd94b0569721983084065bdc2dbebf4d573ff511f41456fc54d40442a505ea891be6eee947b9b690 SHA512 bedbf6bad35370ccb449151098d04e6f8fee917128bcd18a6694ae7df57c15e005c34696c50da43ede2b42d593a2772c55691978982d8a2d83380df29ff7406b
-EBUILD chameleon-4.0.1.ebuild 529 BLAKE2B a72f7c3fe8881772dc458845b11986ef1390a101694be016f584ebcdbf385b1dcf84832f40fd19bbc29f442ff80a9d3c2d2923dea78319d7aae199bf0d7c8ea5 SHA512 8f4e9b13ff50a4f638390982a27c15a1c81219e19a7a259f091d403a594ff63857a0657debb371293aa5a56cc85d8677c305c1bfb81f371fc545e818fe2fd59d
-EBUILD chameleon-4.1.0.ebuild 531 BLAKE2B 7a6cd77a399c07559a8f4f700301e28afc68448fc03d37710487c1210d1b070ed0717a5eda197da037410100681b5528502ae00b66a0d2cc7ef7f6cb52d1503e SHA512 3d2fae4107df611ca4df0a535b0f43f8962dcfbd06384b59b0a37d0786257053b20f5bbdb6a623155ac9d2c25d88855b63f69aa0edb48aa4ed0675f9081d9f1b
+EBUILD chameleon-4.1.0.ebuild 529 BLAKE2B a72f7c3fe8881772dc458845b11986ef1390a101694be016f584ebcdbf385b1dcf84832f40fd19bbc29f442ff80a9d3c2d2923dea78319d7aae199bf0d7c8ea5 SHA512 8f4e9b13ff50a4f638390982a27c15a1c81219e19a7a259f091d403a594ff63857a0657debb371293aa5a56cc85d8677c305c1bfb81f371fc545e818fe2fd59d
 EBUILD chameleon-4.2.0.ebuild 531 BLAKE2B 7a6cd77a399c07559a8f4f700301e28afc68448fc03d37710487c1210d1b070ed0717a5eda197da037410100681b5528502ae00b66a0d2cc7ef7f6cb52d1503e SHA512 3d2fae4107df611ca4df0a535b0f43f8962dcfbd06384b59b0a37d0786257053b20f5bbdb6a623155ac9d2c25d88855b63f69aa0edb48aa4ed0675f9081d9f1b
 MISC metadata.xml 393 BLAKE2B da75a225bf4e4b27bdcfeec93eb41d2e20b2498bd28624d5728bc0aaa915a312376e85252258f7195ef77f4d089b8a94097b5d5762472e8a686df8e8901c7d15 SHA512 715ba1cb0190a925747a0c8d5529aa5e61202fba701cb2238ebe16643607918560373d34079e7ccd3e097e988b1ce2f6e6bf5eb3d090fd3f384bc7e651cb331c
diff --git a/dev-python/chameleon/chameleon-4.0.1.ebuild b/dev-python/chameleon/chameleon-4.0.1.ebuild
deleted file mode 100644
index 16210445066e..000000000000
--- a/dev-python/chameleon/chameleon-4.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fast HTML/XML template compiler for Python"
-HOMEPAGE="
-	https://github.com/malthe/chameleon/
-	https://pypi.org/project/Chameleon/
-"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd src || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/chameleon/chameleon-4.1.0.ebuild b/dev-python/chameleon/chameleon-4.1.0.ebuild
index aef73bc7e9f2..16210445066e 100644
--- a/dev-python/chameleon/chameleon-4.1.0.ebuild
+++ b/dev-python/chameleon/chameleon-4.1.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 4b1fe6351f2f..485d2ffb504e 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -9,6 +9,6 @@ DIST cython-3.0.0.gh.tar.gz 2713478 BLAKE2B 16be50b463cf155417fee02b4529bbde8c44
 DIST cython-3.0.2.gh.tar.gz 2744583 BLAKE2B f631891870a6ce24acf2bcde75ebcb9775cf0df7840fe9d7b138cfdea64d54e9253a53d35d892a9086f251c1294d9414eec8521218d031840a3cd06903fefb86 SHA512 f55be138efdca6ca61bd39c6f2fab736244328a170a6f6c9bda87036e022c846930b209e9e9101fad889cb179d6e60034ba6f299f14b3056536d46235b438eb7
 EBUILD cython-0.29.36.ebuild 2232 BLAKE2B 437729f1c61680b7d7f4d6cba1bbfd85e8ae6f70e4da47d8ff30aa84cf5ec50e7049671d75d6b7921e02236ffd47c3451e6f01bebc9e55e1ee834879e62f8b56 SHA512 dfd4d1f7c1907f27ff38a2e2dbcf27de4c5435920cbd19874430827e3089ca6285d225ae594f6c1566d84880fbcc541a7f78f3709c960822590b2e4fba5765a8
 EBUILD cython-3.0.0-r1.ebuild 2053 BLAKE2B c5c1e79c8578269ce5fd54690a000407bcdde55b0b377c40caba9450c592ae9bcbcb5ef01ad52855478e7cda812439c4eb45e8a165c441bdbc85812793c3f551 SHA512 0e86a64f3a4173a5bd17e04c94dff2258567d70f693f2657815bcc1c7d762a86c564bd6da3bb4bba50b83b3272a736d74b9293d6f384f9401e7e060010e52bdd
-EBUILD cython-3.0.2-r1.ebuild 2093 BLAKE2B 7b44884e96ef0170e3a6e2faa56ecbb9b9fe2958648343f789b767b633d928976f651faf4df53312ec67b5b6430a20f89cb25fef01f3e0c88bacf33c942b548f SHA512 740e2cabb33f2baf16b9a5233747d49005008ca9d821a51650c43872750241ea7934dba60bb367ba1770d68e52b7eef879220e4709f7984e1bedfb2401da9246
+EBUILD cython-3.0.2-r1.ebuild 2091 BLAKE2B a95e33ee56a1ccb25d9ee8d316d8bb682a39a92819fb35c472ca7a89bd8986d2f6b8b7e0cfcaf3360efa2ccfb5096170ee9dd93ed71d845b88ce3e196f2e1aca SHA512 8311d8870ddac573e50090d7ee828ddb552399a36b5ffbf323374ff2f2cf04ad84b74daf5b83b1d9e761a6daa64b0a3b858ed3a78cecd384c1ef6d9367bc13f3
 EBUILD cython-3.0.2.ebuild 2012 BLAKE2B 528ac18c3d91d15aad03d5ec6449957d0d0c3af98dedf11ed8f8c6762245811b1b16e6f443e7a1904eb32c93cdf7d222ab373751543dead367399767f75b6bd9 SHA512 eb5bb85611f0490e8d2d80b2c97404f9a9029ff9575241384a21b58010e3241bb90a138fec7fd5aaf0e9611fca1d2bcd429ad45f6e3fdcb703c5f8dead0b8265
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-3.0.2-r1.ebuild b/dev-python/cython/cython-3.0.2-r1.ebuild
index 444c115bf846..2333ef3217fa 100644
--- a/dev-python/cython/cython-3.0.2-r1.ebuild
+++ b/dev-python/cython/cython-3.0.2-r1.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 15ec652d4a78..2ce7449c8cc1 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,5 +1,7 @@
 DIST dask-2023.9.1.gh.tar.gz 8544717 BLAKE2B 786ca3bda6b356acdeb56070964aa25e136f9976322ae5dbaf5895eb181fc1b7582ae4731de12e7881287433d4f502dbbc5002840ebc443403a9fa76df438693 SHA512 1bf0a028059dfba70a131648f4884a6c9a091cd2d550dc7968cb2a8728ce5ef405c351f100001ab2ce48470634577104924fdf4b6dadda32308b4b5a62b3200e
 DIST dask-2023.9.2.gh.tar.gz 8544631 BLAKE2B bd0168d1ea86921235e7bd9ae3e6b9dc2abed3c3e300afea84fb3f2d462970ca5fa4d82f5479bc2c036d4f1a1ec9f63ff98151d8f339db2b14533be765b0f25f SHA512 ae7d289882d7e2e2ef46af3256cf69d8e443f5350f32088e33b46f37377fe8c8328de609d16d0a2abf4df5bc7671d88288968d3d18a535eaec1bfbf0a5adbcba
+DIST dask-2023.9.3.gh.tar.gz 8544054 BLAKE2B 4b1fc7d3b6f91fd6db0836a0fede0304e9c5e04e2aacd573eb06cf96ddf67ecbb198a185076ff94ca34216732673113e7e268482992b781777b3757d43a11773 SHA512 d91840f8a339ff0a21734726b1674c4dbc1332270fb160e01fd342b1ce1ba2fd5cea34c501c7a61e6b34e121da937701932a93ab85dc85618f5b5fc52cd960cd
 EBUILD dask-2023.9.1.ebuild 2744 BLAKE2B 884fc6c815bbffac1bb368eb74efee3ecdfb13eb0d99115d41ce52581d44e748855701c3fe3927fe4b087c56cd090c4760e0547a8a93ebf854a11fd93fae6272 SHA512 3313fb9a15aca7b867bf8bc198a6aa963c8f52214a92b89744e582fcc4ca6587213c0d19ea83b3919a3e64c7668ae088eb63c1f56e881047ef5f9b561e3e3878
 EBUILD dask-2023.9.2.ebuild 2745 BLAKE2B 16fc9fa5481e2d5a6578bd1e413a9f2d9325a70bdcb3cf27a67bf04a125b8f25c408caa7c8b03886c6da7df85a472918035caac495ac8a097fa9435bcec07836 SHA512 d41be063c2a4389045d5ae61ae82b43964791ae142232aad716e7938900670afa21a1a425721682e3799a6a308653838777452bedad150c2ce997b7c1217a977
+EBUILD dask-2023.9.3.ebuild 2840 BLAKE2B d21d219ebb8d6219bbcb9e3257de06b9539b86037410956d58c4fc1e33c3b2e724393ef9d79d660ba58c10ccc0f4cde6648be4620803db75f2e9e0aaa8c1223d SHA512 2e48cf018c518b4403b14009e3a5aa358a627a08e67fe600a20366019df4669628d500212e864f26d88b5f85178e5dfa007fed8e287a4c0e2090fc053196050a
 MISC metadata.xml 724 BLAKE2B 9af7553cec2b66228a21f146372d86b8d620048d68f94c1fd09006c8ee7ddaa4e212c2a359b937a5ee37ac23df01e10af0796e8b4cf952237cb4c73a2dff7ca0 SHA512 89b83402c13b06f7adf10cd1cc08b96b90dbc2ca3b5c0c6c422b6e2394e03fd51346306479557c11fcfdbd4a81a574890f2367228ea38531b5f05c02a30b8dcb
diff --git a/dev-python/dask/dask-2023.9.3.ebuild b/dev-python/dask/dask-2023.9.3.ebuild
new file mode 100644
index 000000000000..532c80da9d4b
--- /dev/null
+++ b/dev-python/dask/dask-2023.9.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="
+	https://www.dask.org/
+	https://github.com/dask/dask/
+	https://pypi.org/project/dask/
+"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
+	>=dev-python/cloudpickle-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-2021.9.0[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-4.13.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-1.2.0[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	>=dev-python/versioneer-0.28[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# fails with sqlalchemy-2.0, even though we don't use it x_x
+	sed -i -e '/RemovedIn20Warning/d' pyproject.toml || die
+	sed -i -e 's:--cov-config=pyproject.toml::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# more tests relying on -Werror
+		"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
+		dask/array/tests/test_random.py::test_RandomState_only_funcs
+		# TODO
+		dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
+		dask/tests/test_config.py::test__get_paths
+		dask/array/tests/test_linalg.py::test_solve_assume_a
+		"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
+		"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
+		dask/array/tests/test_image.py::test_preprocess
+		dask/tests/test_system.py::test_cpu_count_cgroups_v2
+		# require sqlalchemy<2.0
+		dask/dataframe/io/tests/test_sql.py
+	)
+
+	if ! has_version -b "dev-python/pyarrow[parquet,${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			# fails if pyarrow is installed without USE=parquet
+			# (optional dep, skipped if it's not installed at all)
+			dask/dataframe/io/tests/test_parquet.py::test_pyarrow_filter_divisions
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_rerunfailures -m "not network" \
+		-p xdist -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 85d87e1c0141..1d9ece877cdc 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,7 +1,3 @@
-DIST filelock-3.12.2.tar.gz 12441 BLAKE2B a54eb7841bd037caf537144829818ab25acf7b5a916c6fc2a296a937f36a36b7846cce3b35e751041ccc1dfc5c5c4be1b6031a261927c152657f968bb465915b SHA512 0753743338c4937f57176ef2291f44a919d949c7b3aa73e3210572d670949a60a9ad3efaaaeff198704e1308c169807655bb90d399c1158e4f5c9aae4adcd486
-DIST filelock-3.12.3.tar.gz 13746 BLAKE2B 59c66cbbd8e48b262abe3a95232ba873d4402429c79cf1eb985d08ee27f54ee4991a2e81e328378b800fecfbb359fa445979f97c953232f17fe8f4169b376eb7 SHA512 b759ea6dd943da0bfd8eb375dadc277fe83ebdca8b46989bb96fe5dea1ea5637a66729ce3f283b6858db81c9998655bd9efcc6bbe36a998f18bed5bdf9219c88
 DIST filelock-3.12.4.tar.gz 13758 BLAKE2B b1898870928fcc40055274ef2cbe58b818f5aca30dc3864bd8b00c1f88b50050e1aac4380c5b0ba850b52aed4862a3c5ad2090f1d786df3cfe70d10116e4f1b2 SHA512 1ea0769afdbddc030f078a87a669b17425389526a6ba7f7577b350e0206efa6a54b284f1dbd7dfba0bda6e2450a181f5e4ab7cec2ca6ba09830bafad52128e86
-EBUILD filelock-3.12.2.ebuild 684 BLAKE2B 4973e9b4006bcf815b56383307016af2ea9c751777311a9a44847fc48d1906cd0846c6fc1404ef85845c1b96f57c2d12bd630e9545ef99fb865bdd73431f1be2 SHA512 e565303bfbf924e9a601fd251eee43b93447dbc61182b3fad16d045c603d27c74ab9aa9f6ccfc6ee26175fbfd5d6d140772c35d1932b8e4af4ba9df15b3ae446
-EBUILD filelock-3.12.3.ebuild 792 BLAKE2B 05b1bb3388c788c08478fd21555c057cd74bf67c7feb965afdb1fd4578feb9fa0a7fe00b98518911f791faffb7ef3bda8a86a058a212860cbe06f2ff63e7c0d0 SHA512 5c0153257f59dd0acd77de86a7fbbe50c45e1c8cc81082fb144e298ec5bbf09e853496d9ba7781d04be8f2522688f388af81a4879e059a11fa793a8d66861dca
-EBUILD filelock-3.12.4.ebuild 689 BLAKE2B 5513fd98a702bb4e4cb39e2ccc8bf694dd52fee35ed05c5048e8df78c5a27c6900a0ebf38a547830c7c7a669540870650cdc68d0e19c5716c67eaf9ebf6504b5 SHA512 4e0313dfd92678967160e98a288729aac4fa258f8b196b020a76a9f06dd5448a7019390beccc31f90ab072b2dac020a4b7e1d5f174aa37b8b1fd6566236ce5b5
+EBUILD filelock-3.12.4.ebuild 681 BLAKE2B cbe37620c60010c4cd66941eee83f97c607134e3a252c43f392f5dca9ab73ee786893a8cfae0a2647c05f47388b5ad6157f7ac39961287045da2ab5e7cc41a7f SHA512 f766968836c907b386ba1d3cb045093b7c92d6d17677ad0be7ef450856a7c2a3d602e539db982b086ef5ce89dc23d832ca3a874844e75bfd7ccd2420ac4d920d
 MISC metadata.xml 370 BLAKE2B 91fee1713e0ae7d6ad39c05769e769b05d0ddbdc514b9ea19ec9144e0452ce411ed08f45d4b3123dd8accb67077fe1113809512c8a3ec460fd70a2126b841899 SHA512 62afbe350d894dc05533ff9e532f24f351315a9fba3f2cb8a580fc056cc868592140ffa04ea08fde3ca594e6d398962343e18a0c4614d9e6d2211e07a1152117
diff --git a/dev-python/filelock/filelock-3.12.2.ebuild b/dev-python/filelock/filelock-3.12.2.ebuild
deleted file mode 100644
index 3c3133872209..000000000000
--- a/dev-python/filelock/filelock-3.12.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="
-	https://github.com/tox-dev/py-filelock/
-	https://pypi.org/project/filelock/
-"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/filelock/filelock-3.12.3.ebuild b/dev-python/filelock/filelock-3.12.3.ebuild
deleted file mode 100644
index 3e8cbe92bc17..000000000000
--- a/dev-python/filelock/filelock-3.12.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="
-	https://github.com/tox-dev/filelock/
-	https://pypi.org/project/filelock/
-"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/filelock/filelock-3.12.4.ebuild b/dev-python/filelock/filelock-3.12.4.ebuild
index b56b00caed98..c2914f48e0de 100644
--- a/dev-python/filelock/filelock-3.12.4.ebuild
+++ b/dev-python/filelock/filelock-3.12.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/gssapi/Manifest b/dev-python/gssapi/Manifest
index 57457d92d884..45800daded1d 100644
--- a/dev-python/gssapi/Manifest
+++ b/dev-python/gssapi/Manifest
@@ -1,6 +1,6 @@
 DIST gssapi-1.8.2.gh.tar.gz 112521 BLAKE2B d7e14c73c346066a58ae3b3cf1faeec2ef7df3d4da3f2c9e3198928225d81d99466185a9dfa06a59ae50beeeed58d4e73f8a668e1ac605e5b9806ed7a0019831 SHA512 6587f1947dc396bf608ba71e77388e6f7d161753005b9b82ea9f3b174c898bb18409a27e9aa035fc782e15fcd2efe7ca5c497d4687d69023034cea59d6a003df
 DIST gssapi-1.8.3.gh.tar.gz 113958 BLAKE2B e830ae4ee0f22ef85c4ae193cb62ad3ebec222cd4ea9c9b9531b621b358bc71a9e46440ed673f888837a5d42746a6c9d4033fed1db5f1dc044e982cd5d63e3d8 SHA512 f08a318beac4b2807f33f5c30ccdafeafed0971537456a477138fe783f7fd9f05ab59cff74030c3041504302b0922307e5c391cd5d0e8b4f370f0036a5ef45b8
 EBUILD gssapi-1.8.2-r1.ebuild 1025 BLAKE2B 682b90ce6e66eae4a6f32d3ede2564aab55c4bef17bd89f8a45b5da228c07887dce94a04ed42b7dca517ff4bda83543fb9e80644f3fe5dbc585699d962dfa1a4 SHA512 d2f087ed17bb07b375de0b3ae7fdd90c6ced0bcb5c906a9184cd0765c5c505293816ffcf617d9a0916efe8f3500ca898ae9b29ee5dcb465f3d0ab7e66365726a
-EBUILD gssapi-1.8.3-r1.ebuild 983 BLAKE2B caa4f0253a99686e3a342868faf00353f8cfa6193705937e254af4064f9d3d39ed33f2548e459540ec554600af2ab6875c2cb4b013e9df549c9f8a0658f231f3 SHA512 3639eaa3a56f1e4d386d2482aecdf7946bf42d25be8a78209080122bff180687ef15d9fda2b31271180937dd336dc2a6cea3e07940f35a0acfb0b9a95a55635e
+EBUILD gssapi-1.8.3-r1.ebuild 980 BLAKE2B 0fe2dc8fd1903ea3fcb5cae97eed43ff1402f9c3e6a42fc92d5e730078662c2dfea8bd92c418aade82579b9f51fba153b1aac55540b400d80546cdc34dcf167d SHA512 f2e2730e06f4d04ac202937afb751484d268c8a5ce2b9bab09ce48783a7dd5aaef5d0d1db025fe866b6b33722e18eeb2fb17bcb4d65f43692c5a6008c76610d1
 EBUILD gssapi-1.8.3.ebuild 1028 BLAKE2B 7ebad286b98bfac35f421a2073cf24b3ee9d5e6ce688d73f6916acfa62636abb1f830b6c1803b6d96c9e970141a79c8198581d02a8a645fbef329680c9b28428 SHA512 a405de1e924933621a326cb577c6460cd5f6237e944831aef7b11c455fea65b62460bf0074c98eec84afde0af22c4653ca15286f1deb6cddc7e87c8a1ca3d98d
 MISC metadata.xml 508 BLAKE2B 546d1ff6df79f22a0cde8d19a5718f834301630cda7700c73f2e6943c1634662bb216f79e290d6efe681e96f24f791785e104a2fbfe4af4d7632899db33edde4 SHA512 3ed7272bbd046d2ca4f8e0b67d005a7a676e4998acba2f7fe70d8f9022d3bb0bdc3c845ed666db3c23e4bd118fb4d762af21d94b47ae664de568fb277b7da033
diff --git a/dev-python/gssapi/gssapi-1.8.3-r1.ebuild b/dev-python/gssapi/gssapi-1.8.3-r1.ebuild
index d666e9ace6d9..544bf665fd25 100644
--- a/dev-python/gssapi/gssapi-1.8.3-r1.ebuild
+++ b/dev-python/gssapi/gssapi-1.8.3-r1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}"/python-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 42e31ab56764..35ef91b0d0c9 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,17 +1,5 @@
 DIST jsonschema-4.17.3.tar.gz 297785 BLAKE2B a0383bf5612ae50e94c95dbc1774d796b62c74a7aae3056a40edb7e042ad07fd7885e61d86220120a906a4017afe30d8ee8edbbf0cf01a6dec1f212984ff1c1e SHA512 626fc913c37d2e49e4b47c9e058aab4a96c1dc50c35d8def0b2ea0ca464dc25e3318d4fde4927c11ca38068743cd81779d5189464b821407ac1de1788bad30e2
-DIST jsonschema-4.18.0.tar.gz 315551 BLAKE2B 0f885362b6c1af6385be88770b1f332f38e270ea48c81d2ab6ab37503b007bf2d7a3419c9d435e919fea7c6f6d4b3d1c84a5fd4f196237507c9803473a879f4d SHA512 83eee5a752f14475b32405a916790f033eaeb4cc4b69625abb4915972e5832878a0aa2c51c5c782169bfef5537f3072bd41682e2752380435f7de1162e66f4c1
-DIST jsonschema-4.18.2.tar.gz 314916 BLAKE2B 4e63e56ea34b0f315e0ee6e506157c294030e181aa6f06d523d70b24060618f9cf7cfaf6d3c6ef4fc93950dd42b628f62a488c3636cbe636e463b8a31b661a3a SHA512 38e2fb03836b8021c5f3a4db4e8d98922d565ae8bb2843cbb9b93b8be26f003b356c635d6b00d9881fcd438ed5a5304536fcad4acbc69d1de51c838cc3cd217a
-DIST jsonschema-4.18.3.tar.gz 315165 BLAKE2B 486e36cab882628a9f720c098f91f1bafbc34f6e91391f3b4d2c1895e38c6dc8b4c554e37acab23da743c29fe6fefe28243aa6e32da7322a4e2ed1b1f490fad6 SHA512 ae8c18a102b778fe99030082ec0343af0d1c5bead923c431d3242687bf8406bff0d1c7ee6c8dfce56b41bddbfdd47af67129d229903bde051920c900229a4c58
-DIST jsonschema-4.18.4.tar.gz 315212 BLAKE2B f931a5469653cb9ecba50b8e79ddf70b1f2b730db6bce3a91a374ae177dfb812f4492fd53a16f2a563787682c2c34618cac16adbc891d59089eb03fcdb8a46a4 SHA512 b7c3805460d5d49c48039f50e616ee35204cb3222384cd1f57029a04fd19c4dcab5a700770ad36c3616cce85cce902abddf4361f7a7fa044318255967ecbfcf5
-DIST jsonschema-4.18.6.tar.gz 316619 BLAKE2B 1036a340b5605107855565ce68403acbfee85f736c8ded4debfa3bd680014f69308f86ee1514907dc67683658cf23d298cf506cf23ec19d5a4eb2816c034a050 SHA512 92a3b6b06c94426d7851547c4ea6d3c6e4eb12fb45b58030f10cc5772d1ec2ca332d443e82bd7f448e83fabaebbe0be7e3c0266569bcd815d1e36970f6966fe9
-DIST jsonschema-4.19.0.tar.gz 317546 BLAKE2B a554e5c26fe13c09f6e050c193c6608e9286660e75d555dad574b16b32a24667b5450d452079b714dace657f2aade7621c0c79b4585c4a8ac659f9242ed528f0 SHA512 95cc156fe0505da469600cdbaaf921853a983d45f6b8570e5bbffe9ee41abbf5757b2ccddde443b0d833a3ebdcbff321bda54b136b47d7650d3a40f6402338fb
 DIST jsonschema-4.19.1.tar.gz 318089 BLAKE2B 63ddd573ec47bc1c58c2b1bc4a20dd833c4c041de69b8c2e3cfa24c3494d3879fb09914491758ef38e8ae775b347f68d1d9c2e4d3cfc087dbd8c55d381cccd66 SHA512 60fa769faf6e3fc2c14eb9acd189c86e9d366b157230a5681d36552af0c159cb1ad33fd920668a36afdab98bc97253f91501704c5c07b5009fdaf9d29b52060d
 EBUILD jsonschema-4.17.3.ebuild 1467 BLAKE2B 3c5bd830b45ae3b82787c4a84f3853174bdfff7157db626b41804831214b1f2abf617c97a536d694f4f504a3e42a252eb4aadd4edeff9367a8a8e041896d8f61 SHA512 4c29c203e619ead4a220f3f3ded2b92f24292890c110caa0ffa5dd901d9d4ef4a8133533d85a2829304a20ab3825f85a70fd98517fe5dabf56a15a4be058a308
-EBUILD jsonschema-4.18.0.ebuild 1503 BLAKE2B 6227062047706807b8de72b895e581b84139746f366816f21c9d289042441a7d65decc168d5f581ead896edbe9da8d409be774065e22a42101d5738f627c4748 SHA512 8db0353c1d2e7d4ad2906f84f69cf39700a3fd9e145a0a549105872a85fd5ea8fb02088bf8e55e0c5c19dac6acf635b1927c1c929cff2eaf16c2f9c3f8fc3123
-EBUILD jsonschema-4.18.2.ebuild 1503 BLAKE2B 6227062047706807b8de72b895e581b84139746f366816f21c9d289042441a7d65decc168d5f581ead896edbe9da8d409be774065e22a42101d5738f627c4748 SHA512 8db0353c1d2e7d4ad2906f84f69cf39700a3fd9e145a0a549105872a85fd5ea8fb02088bf8e55e0c5c19dac6acf635b1927c1c929cff2eaf16c2f9c3f8fc3123
-EBUILD jsonschema-4.18.3.ebuild 1503 BLAKE2B 6227062047706807b8de72b895e581b84139746f366816f21c9d289042441a7d65decc168d5f581ead896edbe9da8d409be774065e22a42101d5738f627c4748 SHA512 8db0353c1d2e7d4ad2906f84f69cf39700a3fd9e145a0a549105872a85fd5ea8fb02088bf8e55e0c5c19dac6acf635b1927c1c929cff2eaf16c2f9c3f8fc3123
-EBUILD jsonschema-4.18.4.ebuild 1510 BLAKE2B 8d1a81761000be3e401b7f1972a8872dd8644607065d4ee165ffa5ae94fe63aec96c89dca9c1e4c5339d9e1bfc034d7c9a1657ce377a27c402471f0816187e66 SHA512 89993400cc0aba9019dfc4266e83ab785b3f77290142a540c0f11d4a8639167e008517de5cf49661f46e550cf079fce4d1d85a0ebfaf50a53389fd4a6464574b
-EBUILD jsonschema-4.18.6.ebuild 1535 BLAKE2B e0ecf16183afa56b6872103050f00a12355b264baf6d26b85a39b1dfa97ddc695095a996814e85945259ba1b421b21404711b23bcef9ba8afda68c73d87d3fb2 SHA512 30a3b652fb1d1947117dad5df73372a5f4be6b54c466c8e510b0dcaefc6162f884f89cdde8aa669fff80dcd4b7d621deb92aa4d79443c65d520e6b22e3990d4e
-EBUILD jsonschema-4.19.0.ebuild 1535 BLAKE2B e0ecf16183afa56b6872103050f00a12355b264baf6d26b85a39b1dfa97ddc695095a996814e85945259ba1b421b21404711b23bcef9ba8afda68c73d87d3fb2 SHA512 30a3b652fb1d1947117dad5df73372a5f4be6b54c466c8e510b0dcaefc6162f884f89cdde8aa669fff80dcd4b7d621deb92aa4d79443c65d520e6b22e3990d4e
 EBUILD jsonschema-4.19.1.ebuild 1572 BLAKE2B 80850188eae0de8054bdcb9b5e876862f49d91fd938566a8144bed62e24ca0e877a930d8b4bc873413b9c4f107ed9016f7a3bdec46dfdca3528c5891aee6938a SHA512 e434f8c47ae453a9bed29e1120fb6e00d99708736270b5ddcb0c2861efa0577a2737a5864f2e6018a56b9ca21b1fe929240afec31e75a9100afa691c37b2ca3c
 MISC metadata.xml 705 BLAKE2B 731159cc340e6cbb15fe5a8d374188c8df685e8f8294d19af54ca3d209beb8c273b6e901b6b7fe75401324b8512ffb7f1870aefa8d4a139d1e3b84147d993af6 SHA512 1069fb33b2cf47d3dfd5e825b23ba1efa7d764d0d23aa009db522d04bc08362f5ca646411ec405cd33152a65ea8de2ea90d3dd6d4d4bf1a947ae7943e9d4c727
diff --git a/dev-python/jsonschema/jsonschema-4.18.0.ebuild b/dev-python/jsonschema/jsonschema-4.18.0.ebuild
deleted file mode 100644
index ce0e2d41a238..000000000000
--- a/dev-python/jsonschema/jsonschema-4.18.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-specifications-2023.03.6[${PYTHON_USEDEP}]
-	>=dev-python/referencing-0.28.4[${PYTHON_USEDEP}]
-	>=dev-python/rpds-py-0.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri-template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# fragile warning tests
-	jsonschema/tests/test_deprecations.py
-	# wtf?
-	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
-)
diff --git a/dev-python/jsonschema/jsonschema-4.18.2.ebuild b/dev-python/jsonschema/jsonschema-4.18.2.ebuild
deleted file mode 100644
index ce0e2d41a238..000000000000
--- a/dev-python/jsonschema/jsonschema-4.18.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-specifications-2023.03.6[${PYTHON_USEDEP}]
-	>=dev-python/referencing-0.28.4[${PYTHON_USEDEP}]
-	>=dev-python/rpds-py-0.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri-template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# fragile warning tests
-	jsonschema/tests/test_deprecations.py
-	# wtf?
-	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
-)
diff --git a/dev-python/jsonschema/jsonschema-4.18.3.ebuild b/dev-python/jsonschema/jsonschema-4.18.3.ebuild
deleted file mode 100644
index ce0e2d41a238..000000000000
--- a/dev-python/jsonschema/jsonschema-4.18.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-specifications-2023.03.6[${PYTHON_USEDEP}]
-	>=dev-python/referencing-0.28.4[${PYTHON_USEDEP}]
-	>=dev-python/rpds-py-0.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri-template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# fragile warning tests
-	jsonschema/tests/test_deprecations.py
-	# wtf?
-	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
-)
diff --git a/dev-python/jsonschema/jsonschema-4.18.4.ebuild b/dev-python/jsonschema/jsonschema-4.18.4.ebuild
deleted file mode 100644
index 4a573c7e9bca..000000000000
--- a/dev-python/jsonschema/jsonschema-4.18.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-specifications-2023.03.6[${PYTHON_USEDEP}]
-	>=dev-python/referencing-0.28.4[${PYTHON_USEDEP}]
-	>=dev-python/rpds-py-0.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri-template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# fragile warning tests
-	jsonschema/tests/test_deprecations.py
-	# wtf?
-	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
-)
diff --git a/dev-python/jsonschema/jsonschema-4.18.6.ebuild b/dev-python/jsonschema/jsonschema-4.18.6.ebuild
deleted file mode 100644
index 056e09ae1969..000000000000
--- a/dev-python/jsonschema/jsonschema-4.18.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-specifications-2023.03.6[${PYTHON_USEDEP}]
-	>=dev-python/referencing-0.28.4[${PYTHON_USEDEP}]
-	>=dev-python/rpds-py-0.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri-template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# fragile warning tests
-	jsonschema/tests/test_deprecations.py
-	# wtf?
-	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
-)
diff --git a/dev-python/jsonschema/jsonschema-4.19.0.ebuild b/dev-python/jsonschema/jsonschema-4.19.0.ebuild
deleted file mode 100644
index 056e09ae1969..000000000000
--- a/dev-python/jsonschema/jsonschema-4.19.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-specifications-2023.03.6[${PYTHON_USEDEP}]
-	>=dev-python/referencing-0.28.4[${PYTHON_USEDEP}]
-	>=dev-python/rpds-py-0.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri-template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# fragile warning tests
-	jsonschema/tests/test_deprecations.py
-	# wtf?
-	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
-)
diff --git a/dev-python/jupyter-client/Manifest b/dev-python/jupyter-client/Manifest
index 741cd9facbc9..8f036e4bef10 100644
--- a/dev-python/jupyter-client/Manifest
+++ b/dev-python/jupyter-client/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter_client-8.3.0.tar.gz 335973 BLAKE2B dd4b60994f5c2ba19d41f87dbbee1291e85595908e5b1fce77876d8164bc21bd65b257a65b333e2e3277fff66869d445fcd87c3c1a16166fa71da24d26b1e96e SHA512 2348cf67344cb9bbb9b020ef5570f5ca354c8acb00b9fb0d148b9419ec2efb922b1364ed3c2c2429ad66548af5dd90f232be1d56728ef09bd833312f13c07f77
 DIST jupyter_client-8.3.1.tar.gz 337007 BLAKE2B fdb0535ccda1ca13e2ead09c6df9f30c8c7d258dbfa4882a758b3923fd5bdf6afa80859f941bcc3e1a602de31c6ceef06b7a5d360d64ceab34e40de65dc65174 SHA512 ce600985ed9d36d4a96bbed6142b46988d46ea468d8f266fd3c9a7357f60d5e2a9bddb11c912a3c137079322e4363b975c4b43b1a53e65b5d649d367a098a52d
-EBUILD jupyter-client-8.3.0.ebuild 1326 BLAKE2B 64579f9923761f42a5c0a546b8b90cf3c12075956eab84968c47fa851443553799f3bd33078de252990b4c3665477b97a77a74957a99177729f3df3d0dbc7f3c SHA512 77d6db275a4bcf909c0f524cb966541d3c871b805fc63d61bb88d905b6db5603aa202a965847527b677845eecc2a219b7d35bdd8985fe61548a2fbf40c2f8e22
-EBUILD jupyter-client-8.3.1.ebuild 1334 BLAKE2B 683388fd55eafc26e6c60fdf1c963da29804bc1fd0716d5ca2de48fed2193693dcb9eb285b3029e9fde2ec1b7485b2f7477ebf6765a601c6681076ef7fb8c639 SHA512 966f2fbe3436dadd32036c366e63891fb8bd48ca9d636317c2598c9ec3ca32a2ea4048d0722703333cdc604efd9352eb14a38edcf56bd28d564a43e564f5a68f
+EBUILD jupyter-client-8.3.1.ebuild 1326 BLAKE2B 64579f9923761f42a5c0a546b8b90cf3c12075956eab84968c47fa851443553799f3bd33078de252990b4c3665477b97a77a74957a99177729f3df3d0dbc7f3c SHA512 77d6db275a4bcf909c0f524cb966541d3c871b805fc63d61bb88d905b6db5603aa202a965847527b677845eecc2a219b7d35bdd8985fe61548a2fbf40c2f8e22
 MISC metadata.xml 844 BLAKE2B 8beea01f144f8e28b58b1bd4d0d2a32eda4b5e50e479c83ed940cd6894d581aa22418bc2733910465cb6980134c3a29b63a6e31f595d037b9492337285837ac6 SHA512 73f427cc561e728c6f941052a4b6f9c6ec5c9d6ba3bb601bc58313687dfc8d6ed3602e1fb2f7f0ea00aec4360c8c1200334675917d22092ed79585b117865ebd
diff --git a/dev-python/jupyter-client/jupyter-client-8.3.0.ebuild b/dev-python/jupyter-client/jupyter-client-8.3.0.ebuild
deleted file mode 100644
index 33b3a44b6cbf..000000000000
--- a/dev-python/jupyter-client/jupyter-client-8.3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/jupyter_client/
-	https://pypi.org/project/jupyter-client/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jupyter-core-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
-	' 3.{8,9})
-"
-BDEPEND="
-	test? (
-		>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.4.1[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO: times out
-	tests/test_client.py::TestAsyncKernelClient::test_input_request
-	# TODO
-	tests/test_multikernelmanager.py::TestKernelManager::test_tcp_cinfo
-)
diff --git a/dev-python/jupyter-client/jupyter-client-8.3.1.ebuild b/dev-python/jupyter-client/jupyter-client-8.3.1.ebuild
index 13fe78be87b6..33b3a44b6cbf 100644
--- a/dev-python/jupyter-client/jupyter-client-8.3.1.ebuild
+++ b/dev-python/jupyter-client/jupyter-client-8.3.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jupyter-core-5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index e0763b8d7459..d2d65b8b5d64 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,11 +1,5 @@
 DIST jupyterlab-3.6.3.tar.gz 16847186 BLAKE2B 6916722469ab100a1a240b8a565c9800f35535b2a9b2c39a6bfd275b078d88df9faa1f12d4ce3819155af7b0ed22282836f9b233534bd3e63d8a330d1cd7cd21 SHA512 3d6b4781f9fab02504b2c0223a4d060d80c3442fa6ac53ae326296d69942d68f8545450f671f6ba65c7c4e218aad62ef4f4ceb658899c21aaff3640c3055d364
-DIST jupyterlab-4.0.3.tar.gz 18222352 BLAKE2B 7dee4109e94173d35794c2b3a05de5cbab145fc031b22628ca4b5c1d97497658807b0a9b713d58a7aae3a38a64a37e04e535988d727cab6ba3c3aebe2ff6c0a2 SHA512 cb7694c1398cbf1b061d385518d08d5ff4411bc7f53828d99edd3cf8420d39c09d99e1ee061d60a86d83e640c37777bfd4f98ce71276366f291f784f23740d4d
-DIST jupyterlab-4.0.4.tar.gz 18223782 BLAKE2B 8f2b157d27c68fba62fcfdeeb055b0c9b646987d2f31447b87720110ec2331ddad90c0288ad7554faa26674bf810d92d99f1924e2d34f81d2303a4ab6b213cd9 SHA512 23479cee2405ddc42a11c477cb93fad6cb5481a70766d48c1f7f1e498481c36a0dca47c5523ff3fc97aacfd86a37debd53cc3570e3e0916cc0a6cb526d99a574
-DIST jupyterlab-4.0.5.tar.gz 18235811 BLAKE2B c1847bc3b9cb420d987c1ffd6d00951946c7312dbc94f49e3a4fadc85f4059c6d76294e78be4a629a4d2565bac5b569d957521aa26b4bd2365528cae7548b074 SHA512 befb13b653037511651387e339b8e41c17989c146080ad41c68b60f415a4c3c539d666719ba3256b341998fa13fe414c28c78159429d26f7000d0e01bba41ecc
 DIST jupyterlab-4.0.6.tar.gz 18236816 BLAKE2B e39e7cb6fbdecfee0b5e592091f989fe94907369d057457130f8bc2f391ca4c83cc09542bc9da766413821eb4c4e9eaaca3adfeccf26b0b2f61ab5e65dac9e45 SHA512 fc4acde65f2bb24adbf95e5cde17e0225390a0c8aca10e04b7c9cf5b2bcebe529608b53ce259f081508b86216b94c71fb260c857b9fe3a2bef16cb4e7af3dcda
 EBUILD jupyterlab-3.6.3.ebuild 2744 BLAKE2B 9cfdab0afb8feff32c1eb0d4f1e641860ff59e72080448805cfc11cfe3a565a7c8fc18b4013f5b78ff83304b21df03ad939d81eac8d9afbbf2bd59ab75f778b2 SHA512 a5ff778dee692241083a51d970ce5025db0976b6abc4c14e15fe39b48427a5a27aee5f91bc6989b3a109ae11590d89e66f15b3dd573cc79caf90118d022ec71c
-EBUILD jupyterlab-4.0.3.ebuild 2571 BLAKE2B 4afda064ba9209bb9aad9fb11467d46a5b0740c8f2dbb05edd6d74274fb2ce65651a35713f24115a58bb24327705f486f61d85a2168a61d8414699d479582ce2 SHA512 2cb0315f4f5069465d3b7bec38121b85de8c8eaa7cb3aac47e028aae6b885262d4fd72f00869a5fd1db07381036dd929609b8b98661d007184e16cd69fc025fd
-EBUILD jupyterlab-4.0.4.ebuild 2595 BLAKE2B 10fd556791199de87445fad9ae5464a163e985b4a9a01e90416af5a0b7339f040ed72a3eb24f2784d8e96ddf97cf4bc56f026677de0efd901551adfdd59558f2 SHA512 acee9c5419ec876057bd4c39bbb02b9450bbf60a2620fcd31d40fe728beff2ed5b64fb1bc85a6c9c52c3b40bebcb258645ebc1a5fd11ae32096706cd264d729e
-EBUILD jupyterlab-4.0.5.ebuild 2609 BLAKE2B a982cb28bc732374978536544bbf96d7dffe77c6bde34de40c4a78ab95720a83414e6f6b8443ddcd0151801709b5bacff8f32c68a4a4ef5c9ad66fb5ca93de76 SHA512 f66532ec44d14062b56911de35b3ca168f88debd3c0ed424d955a81052b05a676aabb626786ded8667427d307863766d4fb912e2db7d858f59bd8dc69cef8433
 EBUILD jupyterlab-4.0.6.ebuild 2609 BLAKE2B a982cb28bc732374978536544bbf96d7dffe77c6bde34de40c4a78ab95720a83414e6f6b8443ddcd0151801709b5bacff8f32c68a4a4ef5c9ad66fb5ca93de76 SHA512 f66532ec44d14062b56911de35b3ca168f88debd3c0ed424d955a81052b05a676aabb626786ded8667427d307863766d4fb912e2db7d858f59bd8dc69cef8433
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.3.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.3.ebuild
deleted file mode 100644
index 01ca307b6a24..000000000000
--- a/dev-python/jupyterlab/jupyterlab-4.0.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=hatchling
-
-inherit distutils-r1 pypi xdg
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab/
-	https://pypi.org/project/jupyterlab/
-"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/async-lru[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-cache[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# These tests call npm and want internet
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
-)
-
-EPYTEST_IGNORE=(
-	jupyterlab/tests/test_announcements.py
-)
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.4.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.4.ebuild
deleted file mode 100644
index f30a5abdaa2d..000000000000
--- a/dev-python/jupyterlab/jupyterlab-4.0.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=hatchling
-
-inherit distutils-r1 pypi xdg
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab/
-	https://pypi.org/project/jupyterlab/
-"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/async-lru[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-cache[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# These tests call npm and want internet
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
-)
-
-EPYTEST_IGNORE=(
-	jupyterlab/tests/test_announcements.py
-)
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.5.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.5.ebuild
deleted file mode 100644
index a329291d6048..000000000000
--- a/dev-python/jupyterlab/jupyterlab-4.0.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=hatchling
-
-inherit distutils-r1 pypi xdg
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab/
-	https://pypi.org/project/jupyterlab/
-"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/async-lru[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-cache[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# These tests call npm and want internet
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
-)
-
-EPYTEST_IGNORE=(
-	jupyterlab/tests/test_announcements.py
-)
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/kaptan/Manifest b/dev-python/kaptan/Manifest
index 8da83503e8cf..c267d0b8e49d 100644
--- a/dev-python/kaptan/Manifest
+++ b/dev-python/kaptan/Manifest
@@ -1,5 +1,5 @@
 DIST kaptan-0.5.12.tar.gz 10539 BLAKE2B 678e1aae6053a7075218a0fd9ef928685e7ce9ebf385c6953275b06d1bbf67d4c8434838a7a8f0b0ec8b02e7bef434d7f68698060bea2b4232cd5ef7fa83f0b3 SHA512 fccf767749e9473947bd7cb493ddb30f7dc1b2e10ce932ca327ae3423bc023fa9c76910ac249269ee546eb9162e4ce151e2ad0b9685d888854a7185c855ae143
 DIST kaptan-0.6.0.tar.gz 11861 BLAKE2B e2ce4775716fd3bdd286c3edf0f04ee842cbcd7b1347b6ccf6590ede024769561e2302c685afe9148a8141ce24aa14fdd5037354b548069ec91fcac427a6de78 SHA512 8c65ef67069178ff5480e68c5247e19a4700f26b0f8fa9030631f4103ea235491b238bd673e01c09c7cac7133689940236cbc9b21a92bb4536b902ca239cf7df
 EBUILD kaptan-0.5.12-r4.ebuild 596 BLAKE2B bb6f0e71afa9001e839cfcdfa8b8452f1438d38ade7b82d0ef9387cbe0ecf7a7a8cb56fe6cfb8353816245d79457a6086eb5d9e3dce1bff5c009667bfeec3e2a SHA512 4fc377502915e2793cdcde5ef94d0b90e3178ee5f70c5ac0514dbecbddfc506bbf838ecf2e248155587b47e7bd4f4af42970dd61db8a56c9183ce4214885892b
-EBUILD kaptan-0.6.0.ebuild 499 BLAKE2B 942ee07c8951688d8a33f538fb7ba43ccc8b0a139713f0453a9ec529a4770f3a7751bb3d2462f7ece47ea50718dd22986833a7eb0db72c78fa86d3517865295d SHA512 0855331ab8fc1dbbfda6fab79face1c0921f7a6de93f438145516d5f6b71c0d0c6065bc82548a9f38fa2fe38e186e80009245ad5e9aeaf933e1ee17f0ea4d727
+EBUILD kaptan-0.6.0.ebuild 497 BLAKE2B b2b249e5ab17b40eced9e43d28a7d048bbb508d4e29bde6a338ddf13b217e6c6788fb74ad651c27d1f7ddf0fb7b23bbc59db3bf75ab56deb6aa7059476aaeb2a SHA512 d7d4866a18e86a47ca6b1b219774da86c31f6cf879a1f69cd574d5b1872de74660a8f916911e3275fe7791e5293c4aa4bb3b1b9f4c74ca32c3902b6259c84086
 MISC metadata.xml 471 BLAKE2B b82e958c2a8c137af25e3a3fc7f34b35d4d2423ceb6faa63adcfc5f578d0fa2550c1f6ed0256600af03fb697992e735ce3f1315ca18215aeb173bd26aa0a4be9 SHA512 41876de2e76c8f2f5e87b714bb7a36eb5d07435750851fb285df30430a48a3b0b4267a30cef0ca96e7abd0a0025b9247b11973e1c2f156a45d90ce9a2cc59a8f
diff --git a/dev-python/kaptan/kaptan-0.6.0.ebuild b/dev-python/kaptan/kaptan-0.6.0.ebuild
index d30801bd88c9..4bd5dac5511c 100644
--- a/dev-python/kaptan/kaptan-0.6.0.ebuild
+++ b/dev-python/kaptan/kaptan-0.6.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
diff --git a/dev-python/krb5/Manifest b/dev-python/krb5/Manifest
index fd3e7ce886d3..87b9884264f5 100644
--- a/dev-python/krb5/Manifest
+++ b/dev-python/krb5/Manifest
@@ -2,5 +2,5 @@ AUX krb5-0.5.0-cython-3.patch 800 BLAKE2B 215b97c42aedbeb321cff89c912e6e071f3598
 DIST krb5-0.5.0.tar.gz 220969 BLAKE2B e492220906afff138a35e0545a9fec4d802e37e17d776fa5448361f1d62a93500063f783e638bbf903165a1998f9d2eaa1444d3bf5ce8446b781c69596c53080 SHA512 a5e8dc16026602373a00aae9188256b586a9f02cee7a413b7bc8ff0525660c416256179b56795cb9a69ca9dab0afff258f803a810220472e086c1c497d044567
 DIST krb5-0.5.1.tar.gz 221059 BLAKE2B ca7bff0caa192af0493b58e5254bcc45f43aece32ae2d57950d6293506ff8261a53d5990905d4d3a974c9843f6435dd6526c3d3210b9ebe8cda76d640410f213 SHA512 474484d2ffcf94e9855b017a7f8ca29894c4e3c1f4c0d872952bb1b7c1772b319b7a358c5e44cb3be036ea707a58fc1c526f8abb2c3d1d9b8af8525bb769923f
 EBUILD krb5-0.5.0.ebuild 669 BLAKE2B 88ac7f97d73e549000585abb99a6edef20c0f91c39a1474292c6f4f8f22d9b2f235f786662d45101ea4c38a5a9e45b6496f8d97c206d427373f862bad5a69725 SHA512 cfc82e1e693e700b305f4635a450f97f17361fdcb585019bc45d4c7141f38a92aad800fa97989334d0715e9d56fdc57b2bc6b86fd8f976e50449d2b5ffb2e8ae
-EBUILD krb5-0.5.1.ebuild 577 BLAKE2B 505c18b62c1b6049a945176c61b14c38fc5d09f266a230bbd206f4ccd11028fa8c84445c339482e71e5ee08a2d3fa6df61a7242440554991ec59f8f346b6cf5b SHA512 ed45142a98c29376cc28a1a1251e08004f4492063a4f051afe58cf7551a8185b3dfb57bebae8faa02af25a9c3126345337d2d00ae1feaebc9a9bac1886e1e2d2
+EBUILD krb5-0.5.1.ebuild 574 BLAKE2B 49fddd4e514a97e800eb8cf3437b8894a410d90bf830fbc8998dfa7e1b3e174b44b1b741c2d365766c3da92c8b846cbb593eb5723056a0fdac7b79fd66019e7f SHA512 76cf84b7aa1a03fad214cee5121567ad4a28b326337b1a00da015a18b25930ef1a5e65733066d6eccd0a280d2482938fb45bb69e1ee3489330e9d329bd5991cc
 MISC metadata.xml 364 BLAKE2B e69a14082c08f32db33234a5738190f54374c13a2f114d65e26a8e224c96f23be90e0cf602830b757fdadfaa058d723ab2cd51e6980f08fb090ca7b014416935 SHA512 f65eb368468d221f55e0701f8ae3790dbf083be2d3f210e9688b27db892b6d3e566a0cea3912d45a4e1e6da7aa092bc82eb6a4b861b459bb8decf914c5192d6a
diff --git a/dev-python/krb5/krb5-0.5.1.ebuild b/dev-python/krb5/krb5-0.5.1.ebuild
index 82ce2069a68b..4a3bacb22774 100644
--- a/dev-python/krb5/krb5-0.5.1.ebuild
+++ b/dev-python/krb5/krb5-0.5.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	virtual/krb5
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 828cb991d4b5..f5785b6b5747 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -12,5 +12,5 @@ EBUILD matplotlib-3.7.1.ebuild 10081 BLAKE2B 20a93311d408f379c381bf4412481b55814
 EBUILD matplotlib-3.7.2-r1.ebuild 10221 BLAKE2B e9e08c3c43f9fb7c3cc352f2e46e257127dd8cf83844b6c963402f6c7e0534b389bb2c5bd65086c70fafb4188f05a89b286ec49ad637a317c745963b9720fa7e SHA512 9e3a4f710da8f822eee9e457b8fcbdd4432fbb17375ffab36fcb8597552f4f633e75caaaefb44c3ac5a7d49d5aa6a6dfaaf82347839020048ddd2d877b832711
 EBUILD matplotlib-3.7.2.ebuild 10290 BLAKE2B f429909f7dceaf77aa96e921e426a6fbb2d67b96f450dfebbf12a09df23d35902abe25b425eb3ea8e331d4c252a0ef74a6eae83b46d9f3ef73e302b711a5fdf6 SHA512 dba873d255fbbd4d4cde4afca61150b600466cdcf597e9a25cd1ed9c6da2fcb928b824496c8e3f315463fc3d1651b49b32983ebdfaa8c887c93949dcee7fd1e8
 EBUILD matplotlib-3.7.3.ebuild 10008 BLAKE2B ca25579dc5c3f41a890c38e2889fbbbd99e51d5defabe926a172aec975415563225b84499fad053cc41f737da6d66506e1185e102259df5700985fd18420a04c SHA512 0da8c030af4744a84709f7baa7fd52052eb36731621cf20251620b2d29a9897c36ad136a2523ae03a6a1db7a81dab16f754d1120a9d4d3db3b8227d0caf54f4a
-EBUILD matplotlib-3.8.0.ebuild 9913 BLAKE2B 38ffefd5c898d4d17324497937bf13c137d17b03e566010f3a31ca6b188e9259ecfa0a38259cb786d18d9c800e734754916b9ab24a53c7570eeafb95658d9bd8 SHA512 4b76a921ff756087523b78460bce9d4aec5dc843f1b09ea7539be68acdb58e2b7a02e2447c1a5fcdac2a9322a9a242b3fb93be4f6a5b884462dcc1ffe9efdffd
+EBUILD matplotlib-3.8.0.ebuild 9912 BLAKE2B 862c60db3f17f1ba4e9b7e275a214e10d50e4f353597097958d26fd9c37be9c3f504488e51d43efe8a4f04d816ef3e99a0993ce4b7829201bf0cf1180218a583 SHA512 603d774637a3ebbe9efb375318e1004952448fee235e74442a63be8df249d9f1140c779c43ce65cae6f386a3cb6d599d9545521afeb131026111fbc7019a4428
 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/matplotlib-3.8.0.ebuild b/dev-python/matplotlib/matplotlib-3.8.0.ebuild
index 171e2fb74336..cd15a0528db1 100644
--- a/dev-python/matplotlib/matplotlib-3.8.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.8.0.ebuild
@@ -30,7 +30,7 @@ SRC_URI+="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="cairo doc excel gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index 71e8a51b892b..1cb6438b152c 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,3 +1,5 @@
 DIST mistune-3.0.1.tar.gz 91271 BLAKE2B 42c0e76a95ede80a09a9f4748bdf9a737a7b149c15d8c52159cedd1522cebd4085cd1ec03a0ac516ff522b2c513553587cd3e93f2e9ca4388b3ad0671a8c3cb8 SHA512 280c1baf87a5dac7aafc8181f3098c556c36017a97de6c75576858ff2a318103c9086c811d61faef43453160020bd4a1db2a3007d6afb26e6cfc701df40d435f
+DIST mistune-3.0.2.tar.gz 90840 BLAKE2B bc4f477b24c8244d2fb7032835b3dc3bfc0bda8948fabbfa78660f77c861df76f9e01abcb58f8643efd689482fe3a187995cc92dd7cd0b7817ad799237d9b72d SHA512 9a7e0e2886afddb8a6e314af1e4ed6e41f886f64823713f941b6a713a29986044ac66c437c4029e0fbf20224d106ce445a46906825b20b17b9e2ff6173476d28
 EBUILD mistune-3.0.1.ebuild 543 BLAKE2B 947ca3a2b21f43cbd88acff8fbf1173dc6db05b9275d33f491227a8e23b1ce92c5570071d98f04c15ca47ab8e0199ba3ebbdfaa10fb7f5da8dabce6dde6ae45b SHA512 e52e5c09cdc52e653bbe98dd3698475f7284c17d46bd3ee0365a562d55e6cdf77398155c279fbe60fa914e6daace71b8eaa68e3dab0d5425b3878d1adbc48b59
+EBUILD mistune-3.0.2.ebuild 551 BLAKE2B ebe372a9e6098f7692a28c09f96659521bcccc6b40acf6ad34c93e65b7ec3be2cb6d2d8ebc478c3b87a15b3f24ab15d79351da5c290d7c8f20cf7c2accf75df2 SHA512 90594c5a65d6e6be338d462d62d90a680e53356d9ead9733f0705a9116af15569048f612cac3d7376feb23f7a6031e7f1aa9f3752db3c9599e50c6ede15149fc
 MISC metadata.xml 403 BLAKE2B ed684a2a6de8b40c202467abc3277bfd280cff4441bd265b2ceb36105a4d3315a5147db7ec555a01c7cdd5c2ed26521254c75586cd44edbeaf0c59766800fc71 SHA512 a14b77e8fca2f7c7c51803f15a53ab82198d5a0682f7ebc53d5565e5b50d22c2ae196607da6fc67ef2c07c11a5469d394b1753546c270735dfa56a99bffc0f28
diff --git a/dev-python/mistune/mistune-3.0.2.ebuild b/dev-python/mistune/mistune-3.0.2.ebuild
new file mode 100644
index 000000000000..cebb95e81025
--- /dev/null
+++ b/dev-python/mistune/mistune-3.0.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="The fastest markdown parser in pure Python"
+HOMEPAGE="
+	https://github.com/lepture/mistune/
+	https://pypi.org/project/mistune/
+"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_tests pytest
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 7002616698c9..cf7e86fc0537 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,5 +1,3 @@
-DIST nbsphinx-0.9.2.tar.gz 171754 BLAKE2B 6bb73034b7f24c39c2d79e9beab623c46c07d9dd583a71920b83a6561e7f2899474db3edbb7b64386f4f41e1fb7960e942ea8327387ef2e0f1d3745627a3ade4 SHA512 b5e371e3177f03e72d87059d0c06cb4787afe255926e9f2440ea0c753f5457974535f42c98bd5bb289752151400612f28de98e1b36e6865b26790e56d1f78b80
 DIST nbsphinx-0.9.3.tar.gz 171956 BLAKE2B 404e1692259b963f5ad9ad1ad370da1ff21ad93ac6b1081256d18cd66e2057eba8b4fec5e6ea987f73c3dea2a197108de6388e26b22eef46a8dd29800db4554d SHA512 a1dd3f96b1a7ad38cbe860eab620dda859fdad3bc22d07ddd4fc1bb9a3c7e9f66d24412370cb7701182d31870153e6388381574359356a1f0a0055111b404a7a
-EBUILD nbsphinx-0.9.2.ebuild 697 BLAKE2B 3f20f24efe62b9342c044efec1dedc5346b1925acaad8edda4823b0229dfe3bd283729bc231a1cd8b8a78f9cf613acf6ef0a44fa1584497fda7332427a23805b SHA512 e906ec6aaac347ea0d3d3533fdd631cf3d004b3496c9acbf143577bd1455e596de71248da9067b12e0de71bbdcde5ee5e4f388f5dd337f585f7681e8189cc829
-EBUILD nbsphinx-0.9.3.ebuild 699 BLAKE2B 7962b89be246fa864b5a903b329a9c9a50a5d0ba641989965a9b8bf5da2fe77a99d501603d1ebcee880d9f7a6d8ab05cf310cdfe27e70115d48f15b222c6b443 SHA512 e2b76cbc91db72143d175b4cff1c9206712fb1257058df857dbe86f44fedd0d3f00a1b84a6898622bf9bcebe9e01dd28b66d3ebc025a6253a9a5b176e9bd1b2d
+EBUILD nbsphinx-0.9.3.ebuild 697 BLAKE2B 3f20f24efe62b9342c044efec1dedc5346b1925acaad8edda4823b0229dfe3bd283729bc231a1cd8b8a78f9cf613acf6ef0a44fa1584497fda7332427a23805b SHA512 e906ec6aaac347ea0d3d3533fdd631cf3d004b3496c9acbf143577bd1455e596de71248da9067b12e0de71bbdcde5ee5e4f388f5dd337f585f7681e8189cc829
 MISC metadata.xml 835 BLAKE2B a3a10c9fb26688d90ad6f4e2ddb8b174eae9fdc2637d4aabdb86f63093982c7c9a42c4eaa3b2adee6ddb12ba2d537aec79d324c0a3c7355424a4255cea90eda6 SHA512 9ac5cebe164b19f80e0eb07f7c4fb5cb2cf5251af1f81290931f8fd01223261cb6224500387c131c7bc8738d7bb07eb790fd9ea426a295d0688489510e58d55c
diff --git a/dev-python/nbsphinx/nbsphinx-0.9.2.ebuild b/dev-python/nbsphinx/nbsphinx-0.9.2.ebuild
deleted file mode 100644
index 891f3016b21b..000000000000
--- a/dev-python/nbsphinx/nbsphinx-0.9.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Jupyter Notebook Tools for Sphinx"
-HOMEPAGE="
-	https://github.com/spatialaudio/nbsphinx/
-	https://pypi.org/project/nbsphinx/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/nbsphinx/nbsphinx-0.9.3.ebuild b/dev-python/nbsphinx/nbsphinx-0.9.3.ebuild
index a29963c7e93e..891f3016b21b 100644
--- a/dev-python/nbsphinx/nbsphinx-0.9.3.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.9.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 4c5274e48ba4..46d147b57c29 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,27 +1,6 @@
-AUX numpy-1.22.0-no-hardcode-blasv2.patch 2710 BLAKE2B 71da07805e25acc58120da2b8d8692ec5893040eee3c2842620e2a9186062936082f34610d3056c44e44a921116f99158dfb7481c4eccc82d33b3b18a63b379e SHA512 87bcecee3435dedcd87128c81d0002a786b4b23928973216f32c8d12b797d6a9948c3e7b41142235abe35734683e6ef84c02ffe255ba492a0ad43626071dc5a9
-AUX numpy-1.24.3-fix-c++-linkage.patch 993 BLAKE2B 9ad31b995b209ea0674ee144a72dfa6b6bf5e10e3676a8c3dda9327ff9befed5cbdcfc0819a9053e1d281862ea8df40514e8e0fc05fee8c4a743faf8f56f5e72 SHA512 29a1e287f04a68785284005d8d2ee56e26f5180e42bc4a7ba0dc06f5523c91447a5a749bd4492ecf7ba5c916f80f03e619429f75ae3636cef24c4f11f29a6d23
-AUX numpy-1.25.0-skip-python3.12-irrelevant-tests.patch 7363 BLAKE2B ca4581f61fb1350803915bcc8e3198bd13c75e0c7e178c86e72682222cbafff396f23afad9d7427d9d2a4be625f84626c899493045a0b8cc7ee3d031d36712c3 SHA512 cce36c856beb2254436f2753ed94b7a933d1e4c06fe0a96c2be70d944f91bb13f3358f50981398d0b9169c0e01b64695c3adb797db15cb6b695488318e276886
-AUX numpy-1.25.0_rc1-meson-pyproject.toml.patch 16917 BLAKE2B 6cdda647c1c4f003adcaff3d634cbaa2f6c1624f2e44bfff1b6542189693a1dc99bf8a3da38d5e9a5dd2b3a6382d0430f03eb3c39811cf3b72e85a1bbae9ea0e SHA512 0a51b1c84356704f373ba1188dc63152e45fdb7bc71881e8ab08b67bfbf2e8f1e9b5544eedf6e3d8b4b872e294e28233e9f059dfdad42ff835bba22ee66d0d93
-AUX numpy-1.25.1-fix-scalartypes.patch 2745 BLAKE2B 97b80e877bf6d9036c0911b135869e2f3d0eab6828b4b1acdc957581d5a32063981b1aa688c46627cdb6f8be7fb839aadeb66012157e0f8f5e623e6d572441eb SHA512 144fd807dee3a844f8279cb7443ecd400862b257d36c42d6197c90514b8405c60466473436509983ed13ce9d23a137ef953ce21e3f4a2a2e16cb27a0fecb174a
-AUX numpy-1.26.0_beta1-npy_cast_info.patch 1783 BLAKE2B 2ac4c46a9a522b85796d9607b51806f13d529eeaf63bc04b7b5d1ad77c0743718933d0ac160e719900349f5a793be9c2f85b70ef82f9adb0c4c71300b27bc83b SHA512 cbf4556c608bd2f444233dc0622c4213cbf7b3b940ced45e2a418a3c0f5cc86c4d6f82e474c3527fad6fcd721d872b82fa24a6aa4c29e6bb4fb8660c881a7790
-AUX replace_cpuflags.awk 405 BLAKE2B 1ac5f362a174793274a2e63fad73a7cf260b1fb139c479279c8cad7f400a376712b17312ee41defb785a7a2c84ec8e679aae48b41e88394a816f12f1cd366e56 SHA512 cce2253e00e2e56f3038782ff989703a9ef3d5f97d1b1f2570f6e23396d7abb7cff7f34588b67ec6c395cb192d7e3bfa6a8262ddf45193a2d0c91c2063efcf6d
-DIST numpy-1.24.0.tar.gz 10897101 BLAKE2B 59e2b913f90de76589d8fbb2f07e2d389012c7f6ce9bd641bc4837776465ce9c41c34f19f92bee55d4bae6245c1d2c84315b359ef0b089fd68d31cd7e7ec44b1 SHA512 3b4e6255b8d39e8504a50ecd3c2ba09d5b16d3f6c70b23b67e4dbf03d1fe390c55030f46090341d39a1ee8228c61ad6212fdc6e4579fcec9e26b4dbe70268661
-DIST numpy-1.24.2.tar.gz 10906862 BLAKE2B e48f65eab709f0c57ec378d813a7b65bcaca6d5960b559d6db1c60726e5cf12517f4b2e1636b0ff815a2109925edccba200270db5170fd0aff5fd635919165ac SHA512 145fd7fb3919a185f75076d51b92c54a7fb1b776b637752ca15fdee15b239d6a517ef1bb8cded7c92e059cf6cda0146c24943c042d19b791e81125bc0ad4b820
-DIST numpy-1.24.4.tar.gz 10911229 BLAKE2B 2f054b4ede249653707c3df8ccf6df31b747c0625891ae6e01134f84b02d1300e1d7a88b5741e0e0f05218673d95374f263e5bfddbf17c9510aa93bac002eafc SHA512 89eb90548ad4f38cfe0a5077eef426058eed08ca17633024887e4d0ff5bdfe98736b1ad6850fe643bc0035d55ac4cd39b5971895eea9dcf247b5ff186654ed68
-DIST numpy-1.25.1.tar.gz 10428993 BLAKE2B ee3edaf5416ac858b995f0cb8df75962af01619969a2c70fa10b4e0d0a1c96a3b441ee470a463cdb7c60910d8823af1c41d37933f87bcaa0a724655d052ed20a SHA512 69cc5426f657a21a6a1fb3bb043b8acec90b87969f90177abb6d7294ca96d04f723ddf90fa40822704b16147a390abafbcda9702e40405ea6b6e22377aade71d
 DIST numpy-1.25.2-patches.tar.xz 7212 BLAKE2B 718331b2d9f8380df239bf2ad9c24d79924e08797825d7c8655124a55e059790f96641633cdb42c597646764ca9efcaf277d5f5b75f042f533c28f2a81d5a5a8 SHA512 bcc0c55710b8d874e1dd9a57fad5698e09e3c96254922db32a8beeae9a5a54532cb0660d3ce43ca68e70fa7227bca9e0d12a0298aa6972ad2cbcecfe4aee3e85
 DIST numpy-1.25.2.tar.gz 10805282 BLAKE2B f138eaf237f3e8052cafbe9fc98b4b62fb0748079df8599fc0950624c856294157410a2ec6fe381eaa8386b1530a39f7037ae1887c9fcfe2e77a3d7ad1ca0171 SHA512 6846d558c227329b6e700965ffa4c7886a7ca5f35234a56d734bc8201d19f7ac87d8ea081094bca13685130dce7bfb98ee4aa3a9dbd538288f10f1d9d82fb699
 DIST numpy-1.26.0.tar.gz 15633455 BLAKE2B 9cd8693d1303bc9ac6d95a6cd57440839adbd648efae7052cf9b73f833eb8ebb2a0ad09fcc638e51b481b4c049a02304eeef34a7566609ae2cbab3278d033a97 SHA512 0d500c623b274a219740c78ae2febb32a2f167016a9ff529678526e6b3e89a5b732c41defa23460a5da6f7f89d4a7d827f44fa9a1334c78e204b00ce164fb40c
-DIST numpy-1.26.0b1.tar.gz 15632046 BLAKE2B 72991e0a1a9b63ac9a3014b78348aa0bc512c2e22c3959d5466f92e2df8649aea56dd949e8954921fc29302f84e38748665597319fa9baa8154a85b34527e12f SHA512 c099a61ad58e142b29eac891b746c93425a337912df8da5e5a6b36c53f9069f56dd7ee0807b1773eca23a7e39b355e6c13d419cbdd36d35c2ab0a77cb14bb5b5
-DIST numpy-1.26.0rc1.tar.gz 15634820 BLAKE2B db9d9d6288681c1a49d612599c206c6f0964010222f24e0507e500cdb34a504b07202b561d14cd7b06c587668b2ad46c8bb72ecfe0e64a86cd3bbb498c9c2b5a SHA512 1c0e3009d2a45b0cf65aa95e317510a200e7cf9a5b985bed428ad1d65180b6df37cc3a597039335c5147cad23770e56e0bfef8ebb920b7e62c4b75664189a234
-EBUILD numpy-1.24.0.ebuild 4196 BLAKE2B a7359b00b007339381f458502457b2d2f9f07daf4f9affa239944de9ef3afef4318d063d7a934da394707d3ba5d53b043f68bb59f903ded5847122f0fce35567 SHA512 90500a1ee3a0a5a9ebd741dd9c870e6d57ec27e5da7dc4fc4dcac46f59212cabd777f806110180c11a55c4ffccbfdcaf0d0b5d1598beb5359779b6d6ba6a1c00
-EBUILD numpy-1.24.2.ebuild 4366 BLAKE2B a7a396b29efaf6a07bd68f76e0cae0d069f530a4d4d915b89cf5a47a42a4e9cf29215089f0a8f819fd24961280fe83f103f28b6be90758eb78f3f408ab5eb23b SHA512 b1186214bf08642b6ca267d0a84ec03c8f4b6256e728eb17d789eb34a43760bf87ea18696ef30b12494bff23a3b8b6f1980085c900c5341c8d43b8da468549f5
-EBUILD numpy-1.24.4-r1.ebuild 5214 BLAKE2B 87986c0f034dcdbeffcb51ca3c90546b16fd1ded2a43744f29ca0210a2b496b8e85e6bd8dfd229b72c496d7cdbb0cfbf4d4ceb81a290786ac55fdb1bcfd18cea SHA512 5932b2c7f0ca7cb5774b9fba9282579384b563bacef63bbf84f69e15c5b86ba72f058660fd44f8a46fdc7088dca8646ff264378da69de017044bd2aaf0e642b9
-EBUILD numpy-1.24.4.ebuild 4625 BLAKE2B c0fdf22a1accd3649917ea62e5d0f3d727c2225341ac9955bc581428e8d49df2d9d3a026626ebb88d0a099b2e10863b3c1e1173c03298a4d7ab74c38b0eb63d2 SHA512 a60ffab9872388691c79cce9478ee95a56e355498ea93d80cf6a0e07f1f46f4f6eaa1c5a33a447739d1b2000240c08da74376e924140b6eeac49695edf699704
-EBUILD numpy-1.25.1-r3.ebuild 4444 BLAKE2B bc98460d27c6acd233ed219af855f93da93e6dd43db721195fd7e318256509145907136a1336f5d21c7252d05330eaf6b8f83f3f2bd4e4915d92ff447c57b564 SHA512 8dd4d5a3367d1260aa242558048d02da616695aa54f4b666b494d24aac7bef306bf7467fb73e6a7138f67086af51d3d191830a47c14b73062bf0836c345f4397
-EBUILD numpy-1.25.2.ebuild 4985 BLAKE2B e1198966b4a4089d9d186e43642583584ec9b1b940bb95645f6e9af0157426dc7ee32b8e12539577e4b83b3ed75843fce390f43460d172fe5c0aadf72bf05075 SHA512 32eb023e960217fe71be663ee0f62952eb9c7c36b8779e53007c848dda5b42823faad8066e3127458ce854d1000c8db244348a570a19e297ea32ec68015bcb03
+EBUILD numpy-1.25.2.ebuild 4983 BLAKE2B bbd49b1e59069f89376c22aee74e89a304bef19b652340dfd998a7bd1dcf24630039c9b217ca8ef16a079a7829b4e8118cb58623e82af0a277cbae4ebcb92f16 SHA512 051afd8214186fe20fe2a66b3998251ea1bd17f4603314b392c4fa6956c0e7aee127c1476ef38da6a41ae8f45406f6462638b2714c37d5d7c1a7fd0749da6743
 EBUILD numpy-1.26.0.ebuild 4288 BLAKE2B 4e105da37d6ac0e318fa1b35572fe063dbe3737be4e01b6a3d15b2458e345b21472967ea1b98f100dea1f72e7ae9e47a4995705148cb3983219fa7d13dc8478f SHA512 502f5c289d0eec41de0dafe5fa37ce6e6678b2a870e706955b108dd304852d20e0ff866e200f0d40ab8edfec6aff5629e1aa60830a0b4222022725b7d0483520
-EBUILD numpy-1.26.0_beta1-r1.ebuild 4224 BLAKE2B 90904364e576538fdb9e0b1818fbe523968eb92d94a670578e3a6ce2caef497f18d4f22abd5bfd437045a662e69a88cd5406efeb6f624607f227906975a55b38 SHA512 8f7966d86f514cf054798d2f7713dde10d3cdcac56fcb1553821793b1f08a4d898463808bceb6db963a104a22ad6a98af096f2f3ea66c9f17339b6023ee383f4
-EBUILD numpy-1.26.0_beta1.ebuild 4116 BLAKE2B 2e5c723691678ce26459c9e4bacb8530f7694a7fab2255fb8c828cf8f1772e2bc26a98d3c2b6ceab535d8d80f9224f4b4b081d2a223aa82d01e6436589fde14e SHA512 d42ec9bcaeefb4b02ab7cae81e9d817bb418ab36252eb44cb327860a1982cf06dbd2132932fb1030f46c2eddc94f95717fdf6c87d19d93591bcce3234d7dd8e6
-EBUILD numpy-1.26.0_rc1.ebuild 4116 BLAKE2B 2e5c723691678ce26459c9e4bacb8530f7694a7fab2255fb8c828cf8f1772e2bc26a98d3c2b6ceab535d8d80f9224f4b4b081d2a223aa82d01e6436589fde14e SHA512 d42ec9bcaeefb4b02ab7cae81e9d817bb418ab36252eb44cb327860a1982cf06dbd2132932fb1030f46c2eddc94f95717fdf6c87d19d93591bcce3234d7dd8e6
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/files/numpy-1.22.0-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.22.0-no-hardcode-blasv2.patch
deleted file mode 100644
index d87a16a4b6c9..000000000000
--- a/dev-python/numpy/files/numpy-1.22.0-no-hardcode-blasv2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Originally added in: https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-python/numpy/files?id=e5ce90a04e79f6413604e96e4803cb95ada7c859
-https://bugs.gentoo.org/567938
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -505,33 +505,7 @@ def get_info(name, notfound_action=0):
-           'blas_armpl': blas_armpl_info,
-           'lapack_armpl': lapack_armpl_info,
-           'fftw3_armpl': fftw3_armpl_info,
--          'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--          'atlas_threads': atlas_threads_info,                # ditto
--          'atlas_blas': atlas_blas_info,
--          'atlas_blas_threads': atlas_blas_threads_info,
--          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
--          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
--          'atlas_3_10_blas': atlas_3_10_blas_info,
--          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
--          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
--          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
--          'flame': flame_info,          # use lapack_opt instead
--          'mkl': mkl_info,
--          # openblas which may or may not have embedded lapack
--          'openblas': openblas_info,          # use blas_opt instead
--          # openblas with embedded lapack
--          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
--          'openblas_clapack': openblas_clapack_info, # use blas_opt instead
--          'blis': blis_info,                  # use blas_opt instead
--          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
--          'blas_mkl': blas_mkl_info,          # use blas_opt instead
-           'accelerate': accelerate_info,      # use blas_opt instead
--          'openblas64_': openblas64__info,
--          'openblas64__lapack': openblas64__lapack_info,
--          'openblas_ilp64': openblas_ilp64_info,
--          'openblas_ilp64_lapack': openblas_ilp64_lapack_info,
-           'x11': x11_info,
-           'fft_opt': fft_opt_info,
-           'fftw': fftw_info,
-@@ -951,10 +925,7 @@ class system_info:
-         return [b for b in [a.strip() for a in libs.split(',')] if b]
- 
-     def get_libraries(self, key='libraries'):
--        if hasattr(self, '_lib_names'):
--            return self.get_libs(key, default=self._lib_names)
--        else:
--            return self.get_libs(key, '')
-+      return self.get_libs(key, '')
- 
-     def library_extensions(self):
-         c = customized_ccompiler()
diff --git a/dev-python/numpy/files/numpy-1.24.3-fix-c++-linkage.patch b/dev-python/numpy/files/numpy-1.24.3-fix-c++-linkage.patch
deleted file mode 100644
index ae7d5ba0ea49..000000000000
--- a/dev-python/numpy/files/numpy-1.24.3-fix-c++-linkage.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/893962
-https://github.com/numpy/numpy/issues/23122
-https://github.com/numpy/numpy/pull/23601
-
-From 0a0240bcdad5daa0b84781719b3f8a002ef0f82b Mon Sep 17 00:00:00 2001
-From: Ralf Gommers <ralf.gommers@gmail.com>
-Date: Sun, 16 Apr 2023 22:23:38 +0100
-Subject: [PATCH] BLD: use the C++ linker to link `_multiarray_umath.so`
-
-This gets rid of undefined symbol issues for `assert`.
-
-Closes gh-23122
-Closes gh-23595
---- a/numpy/core/setup.py
-+++ b/numpy/core/setup.py
-@@ -1010,9 +1010,6 @@ def generate_umath_doc_header(ext, build_dir):
-         svml_objs.sort()
- 
-     config.add_extension('_multiarray_umath',
--                         # Forcing C language even though we have C++ sources.
--                         # It forces the C linker and don't link C++ runtime.
--                         language = 'c',
-                          sources=multiarray_src + umath_src +
-                                  common_src +
-                                  [generate_config_h,
diff --git a/dev-python/numpy/files/numpy-1.25.0-skip-python3.12-irrelevant-tests.patch b/dev-python/numpy/files/numpy-1.25.0-skip-python3.12-irrelevant-tests.patch
deleted file mode 100644
index cd829c5ef08e..000000000000
--- a/dev-python/numpy/files/numpy-1.25.0-skip-python3.12-irrelevant-tests.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-https://github.com/numpy/numpy/commit/515403f2c637cb58f8dc326d88dd6f768f027cf4
-https://github.com/numpy/numpy/commit/b0872b858e2e6ebc394e95c81a024dcf1573c690
-https://github.com/numpy/numpy/commit/e42fc93b54a6d41dab72d86921f96e5ebc4c4198
-https://github.com/numpy/numpy/commit/4552b6cb0083502f731794e961cd30b9b62ba2e3
-
-From 515403f2c637cb58f8dc326d88dd6f768f027cf4 Mon Sep 17 00:00:00 2001
-From: Ralf Gommers <ralf.gommers@gmail.com>
-Date: Sun, 18 Jun 2023 15:56:23 +0200
-Subject: [PATCH] TST: disable `test_new_policy` test for memory allocator.
-
-This is way too slow, running a large part of the test suite twice.
-Issue 23975 tracks changing how this feature is tested.
----
- numpy/core/tests/test_mem_policy.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/numpy/core/tests/test_mem_policy.py b/numpy/core/tests/test_mem_policy.py
-index b4e2f65916c..0855d60771a 100644
---- a/numpy/core/tests/test_mem_policy.py
-+++ b/numpy/core/tests/test_mem_policy.py
-@@ -359,7 +359,7 @@ def test_thread_locality(get_module):
-     assert np.core.multiarray.get_handler_name() == orig_policy_name
- 
- 
--@pytest.mark.slow
-+@pytest.mark.skip(reason="too slow, see gh-23975")
- def test_new_policy(get_module):
-     a = np.arange(10)
-     orig_policy_name = np.core.multiarray.get_handler_name(a)
-
-From b0872b858e2e6ebc394e95c81a024dcf1573c690 Mon Sep 17 00:00:00 2001
-From: Ralf Gommers <ralf.gommers@gmail.com>
-Date: Mon, 19 Jun 2023 11:07:19 +0200
-Subject: [PATCH] TST: skip refcount related tests on py312
-
-Python 3.12 has immortal refcounts; the initial and final
-values will be the same when accessing `sys.getrefcount` inside a
-test.
-
-Closes gh-23986
---- a/numpy/core/tests/test_dtype.py
-+++ b/numpy/core/tests/test_dtype.py
-@@ -755,6 +755,11 @@ def iter_struct_object_dtypes():
-     yield pytest.param(dt, p, 12, obj, id="<structured subarray 2>")
- 
- 
-+@pytest.mark.skipif(
-+    sys.version_info >= (3, 12),
-+    reason="Python 3.12 has immortal refcounts, this test will no longer "
-+           "work. See gh-23986"
-+)
- @pytest.mark.skipif(not HAS_REFCOUNT, reason="Python lacks refcounts")
- class TestStructuredObjectRefcounting:
-     """These tests cover various uses of complicated structured types which
---- a/numpy/core/tests/test_regression.py
-+++ b/numpy/core/tests/test_regression.py
-@@ -1465,6 +1465,10 @@ def test_structured_arrays_with_objects1(self):
-         x[x.nonzero()] = x.ravel()[:1]
-         assert_(x[0, 1] == x[0, 0])
- 
-+    @pytest.mark.skipif(
-+        sys.version_info >= (3, 12),
-+        reason="Python 3.12 has immortal refcounts, this test no longer works."
-+    )
-     @pytest.mark.skipif(not HAS_REFCOUNT, reason="Python lacks refcounts")
-     def test_structured_arrays_with_objects2(self):
-         # Ticket #1299 second test
-
-From e42fc93b54a6d41dab72d86921f96e5ebc4c4198 Mon Sep 17 00:00:00 2001
-From: Ralf Gommers <ralf.gommers@gmail.com>
-Date: Mon, 19 Jun 2023 11:14:38 +0200
-Subject: [PATCH] TST: skip memory allocator and `array_interface` tests on
- py312
-
-They require numpy.distutils, which isn't available on >=3.12
-The `numpy.testing.extbuild` utility will need changing to make this
-work again. Could either use plain `setuptools` or `meson`.
---- a/numpy/core/tests/test_array_interface.py
-+++ b/numpy/core/tests/test_array_interface.py
-@@ -128,6 +128,9 @@ def get_module(tmp_path):
-                                                more_init=more_init)
- 
- 
-+# FIXME: numpy.testing.extbuild uses `numpy.distutils`, so this won't work on
-+# Python 3.12 and up.
-+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="no numpy.distutils")
- @pytest.mark.slow
- def test_cstruct(get_module):
- 
---- a/numpy/core/tests/test_mem_policy.py
-+++ b/numpy/core/tests/test_mem_policy.py
-@@ -9,6 +9,11 @@
- import sys
- 
- 
-+# FIXME: numpy.testing.extbuild uses `numpy.distutils`, so this won't work on
-+# Python 3.12 and up. It's an internal test utility, so for now we just skip
-+# these tests.
-+
-+
- @pytest.fixture
- def get_module(tmp_path):
-     """ Add a memory policy that returns a false pointer 64 bytes into the
-@@ -213,6 +218,7 @@ def get_module(tmp_path):
-                                                more_init=more_init)
- 
- 
-+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="no numpy.distutils")
- def test_set_policy(get_module):
- 
-     get_handler_name = np.core.multiarray.get_handler_name
-@@ -241,6 +247,7 @@ def test_set_policy(get_module):
-         assert get_handler_name() == orig_policy_name
- 
- 
-+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="no numpy.distutils")
- def test_default_policy_singleton(get_module):
-     get_handler_name = np.core.multiarray.get_handler_name
- 
-@@ -262,6 +269,7 @@ def test_default_policy_singleton(get_module):
-     assert def_policy_1 is def_policy_2 is get_module.get_default_policy()
- 
- 
-+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="no numpy.distutils")
- def test_policy_propagation(get_module):
-     # The memory policy goes hand-in-hand with flags.owndata
- 
-@@ -320,6 +328,7 @@ async def async_test_context_locality(get_module):
-     assert np.core.multiarray.get_handler_name() == orig_policy_name
- 
- 
-+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="no numpy.distutils")
- def test_context_locality(get_module):
-     if (sys.implementation.name == 'pypy'
-             and sys.pypy_version_info[:3] < (7, 3, 6)):
-@@ -341,6 +350,7 @@ def concurrent_thread2(get_module, event):
-     get_module.set_secret_data_policy()
- 
- 
-+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="no numpy.distutils")
- def test_thread_locality(get_module):
-     orig_policy_name = np.core.multiarray.get_handler_name()
- 
-@@ -359,6 +369,7 @@ def test_thread_locality(get_module):
-     assert np.core.multiarray.get_handler_name() == orig_policy_name
- 
- 
-+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="no numpy.distutils")
- @pytest.mark.skip(reason="too slow, see gh-23975")
- def test_new_policy(get_module):
-     a = np.arange(10)
-@@ -388,6 +399,8 @@ def test_new_policy(get_module):
-     c = np.arange(10)
-     assert np.core.multiarray.get_handler_name(c) == orig_policy_name
- 
-+
-+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="no numpy.distutils")
- @pytest.mark.xfail(sys.implementation.name == "pypy",
-                    reason=("bad interaction between getenv and "
-                            "os.environ inside pytest"))
-@@ -420,6 +433,8 @@ def test_switch_owner(get_module, policy):
-         else:
-             os.environ['NUMPY_WARN_IF_NO_MEM_POLICY'] = oldval
- 
-+
-+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="no numpy.distutils")
- def test_owner_is_base(get_module):
-     a = get_module.get_array_with_base()
-     with pytest.warns(UserWarning, match='warn_on_free'):
-
-
-From 4552b6cb0083502f731794e961cd30b9b62ba2e3 Mon Sep 17 00:00:00 2001
-From: Ralf Gommers <ralf.gommers@gmail.com>
-Date: Mon, 19 Jun 2023 12:07:32 +0200
-Subject: [PATCH] TST: skip test using `np.load` on py2-saved .npy file on
- py312
-
---- a/numpy/lib/tests/test_format.py
-+++ b/numpy/lib/tests/test_format.py
-@@ -527,6 +527,7 @@ def test_load_padded_dtype(tmpdir, dt):
-     assert_array_equal(arr, arr1)
- 
- 
-+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="see gh-23988")
- @pytest.mark.xfail(IS_WASM, reason="Emscripten NODEFS has a buggy dup")
- def test_python2_python3_interoperability():
-     fname = 'win64python2.npy'
diff --git a/dev-python/numpy/files/numpy-1.25.0_rc1-meson-pyproject.toml.patch b/dev-python/numpy/files/numpy-1.25.0_rc1-meson-pyproject.toml.patch
deleted file mode 100644
index b42e6cec1c73..000000000000
--- a/dev-python/numpy/files/numpy-1.25.0_rc1-meson-pyproject.toml.patch
+++ /dev/null
@@ -1,392 +0,0 @@
-https://github.com/numpy/numpy/pull/23838
-
-From 669c1a16f9e905b5b33017aa1a17cc59716ccfc7 Mon Sep 17 00:00:00 2001
-From: Ralf Gommers <ralf.gommers@gmail.com>
-Date: Mon, 29 May 2023 16:16:41 +0200
-Subject: [PATCH 01/11] BLD: default to using meson-python as build backend
-
----
- pyproject.toml                 | 137 ++++++++++++++++-----------------
- 3 files changed, 66 insertions(+), 77 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 759b538fb6e..9f03fa8d0e5 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,79 +1,72 @@
- [build-system]
--# Uncomment this line, the `meson-python` requires line, and the [project] and
--# [project.urls] tables below in order to build with Meson by default
--#build-backend = "mesonpy"
-+build-backend = "mesonpy"
- requires = [
--    # setuptools, wheel and Cython are needed for the setup.py based build
--    "setuptools==59.2.0",
--    # `wheel` is needed for non-isolated builds, given that `meson-python`
--    # doesn't list it as a runtime requirement (at least in 0.11.0) - it's
--    # likely to be removed as a dependency in meson-python 0.12.0.
--    "wheel==0.38.1",
--    "Cython>=0.29.34,<3.0",
--#    "meson-python>=0.10.0",
-+    "Cython>=0.29.34",
-+    "meson-python>=0.13.1",
- ]
- 
--#[project]
--#name = "numpy"
--#
--## Using https://peps.python.org/pep-0639/
--## which is still in draft
--#license = {text = "BSD-3-Clause"}
--## Note: needed for Meson, but setuptools errors on it. Uncomment once Meson is default.
--##license-files.paths = [
--##    "LICENSE.txt",
--##    "LICENSES_bundles.txt"
--##]
--#
--#description = "Fundamental package for array computing in Python"
--#authors = [{name = "Travis E. Oliphant et al."}]
--#maintainers = [
--#    {name = "NumPy Developers", email="numpy-discussion@python.org"},
--#]
--#requires-python = ">=3.9"
--#readme = "README.md"
--#classifiers = [
--#    'Development Status :: 5 - Production/Stable',
--#    'Intended Audience :: Science/Research',
--#    'Intended Audience :: Developers',
--#    'License :: OSI Approved :: BSD License',
--#    'Programming Language :: C',
--#    'Programming Language :: Python',
--#    'Programming Language :: Python :: 3',
--#    'Programming Language :: Python :: 3.9',
--#    'Programming Language :: Python :: 3.10',
--#    'Programming Language :: Python :: 3.11',
--#    'Programming Language :: Python :: 3 :: Only',
--#    'Programming Language :: Python :: Implementation :: CPython',
--#    'Topic :: Software Development',
--#    'Topic :: Scientific/Engineering',
--#    'Typing :: Typed',
--#    'Operating System :: Microsoft :: Windows',
--#    'Operating System :: POSIX',
--#    'Operating System :: Unix',
--#    'Operating System :: MacOS',
--#]
--#dynamic = ["version", "scripts"]
--#
--#[project.scripts]
--## Note: this is currently dynamic, see setup.py. Can we get rid of that?
--##       see commit f22a33b71 for rationale for dynamic behavior
--#'f2py = numpy.f2py.f2py2e:main'
--#'f2py3 = numpy.f2py.f2py2e:main'
--#'f2py3.MINOR_VERSION = numpy.f2py.f2py2e:main'
--#
--# When enabling this stanza, make sure to remove the meson-specific xfail from
--# numpy/tests/test_public_api.py
--#[project.entry-points]
--#'array_api': 'numpy = numpy.array_api'
--#'pyinstaller40': 'hook-dirs = numpy:_pyinstaller_hooks_dir'
--#
--#[project.urls]
--#homepage = "https://numpy.org"
--#documentation = "https://numpy.org/doc/"
--#source = "https://github.com/numpy/numpy"
--#download = "https://pypi.org/project/numpy/#files"
--#tracker = "https://github.com/numpy/numpy/issues"
-+[project]
-+name = "numpy"
-+version = "2.0.0.dev0"
-+
-+# Using https://peps.python.org/pep-0639/ which is still in draft
-+license = {text = "BSD-3-Clause"}
-+license-files.paths = [
-+    "LICENSE.txt",
-+    "LICENSES_bundles.txt"
-+]
-+
-+description = "Fundamental package for array computing in Python"
-+authors = [{name = "Travis E. Oliphant et al."}]
-+maintainers = [
-+    {name = "NumPy Developers", email="numpy-discussion@python.org"},
-+]
-+requires-python = ">=3.9"
-+readme = "README.md"
-+classifiers = [
-+    'Development Status :: 5 - Production/Stable',
-+    'Intended Audience :: Science/Research',
-+    'Intended Audience :: Developers',
-+    'License :: OSI Approved :: BSD License',
-+    'Programming Language :: C',
-+    'Programming Language :: Python',
-+    'Programming Language :: Python :: 3',
-+    'Programming Language :: Python :: 3.9',
-+    'Programming Language :: Python :: 3.10',
-+    'Programming Language :: Python :: 3.11',
-+    'Programming Language :: Python :: 3.12',
-+    'Programming Language :: Python :: 3 :: Only',
-+    'Programming Language :: Python :: Implementation :: CPython',
-+    'Topic :: Software Development',
-+    'Topic :: Scientific/Engineering',
-+    'Typing :: Typed',
-+    'Operating System :: Microsoft :: Windows',
-+    'Operating System :: POSIX',
-+    'Operating System :: Unix',
-+    'Operating System :: MacOS',
-+]
-+#dynamic = ["scripts"]
-+
-+[project.scripts]
-+# TODO: this is currently dynamic for minor version support. See also the same
-+# thing in setup.py. Can we get rid of that? see commit f22a33b71 for rationale
-+# for dynamic behavior.
-+f2py = 'numpy.f2py.f2py2e:main'
-+f2py3 = 'numpy.f2py.f2py2e:main'
-+#f2py3.MINOR_VERSION = 'numpy.f2py.f2py2e:main'
-+
-+[project.entry-points.array_api]
-+numpy = 'numpy.array_api'
-+
-+[project.entry-points.pyinstaller40]
-+hook-dirs = 'numpy:_pyinstaller_hooks_dir'
-+
-+[project.urls]
-+homepage = "https://numpy.org"
-+documentation = "https://numpy.org/doc/"
-+source = "https://github.com/numpy/numpy"
-+download = "https://pypi.org/project/numpy/#files"
-+tracker = "https://github.com/numpy/numpy/issues"
- 
- [tool.towncrier]
-     # Do no set this since it is hard to import numpy inside the source directory
-
-From 02cae331443d6955dba8ce5e981c24a7b6c01ec6 Mon Sep 17 00:00:00 2001
-From: Ralf Gommers <ralf.gommers@gmail.com>
-Date: Mon, 29 May 2023 18:51:54 +0200
-Subject: [PATCH 04/11] BLD: fix bug with CMake fallback detection of
- BLAS/LAPACK
-
----
- numpy/meson.build | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/numpy/meson.build b/numpy/meson.build
-index 7b85d8e92f5..ad1829a78db 100644
---- a/numpy/meson.build
-+++ b/numpy/meson.build
-@@ -198,10 +198,13 @@ foreach name, dep : dependency_map
-   if dep.found()
-     conf_data.set(name + '_VERSION', dep.version())
-     conf_data.set(name + '_TYPE_NAME', dep.type_name())
--    conf_data.set(name + '_INCLUDEDIR', dep.get_variable('includedir'))
--    conf_data.set(name + '_LIBDIR', dep.get_variable('libdir'))
--    conf_data.set(name + '_OPENBLAS_CONFIG', dep.get_variable('openblas_config'))
--    conf_data.set(name + '_PCFILEDIR', dep.get_variable('pcfiledir'))
-+    if dep.type_name() == 'pkgconfig'
-+      # CMake detection yields less info, so we need to leave it blank there
-+      conf_data.set(name + '_INCLUDEDIR', dep.get_variable('includedir'))
-+      conf_data.set(name + '_LIBDIR', dep.get_variable('libdir'))
-+      conf_data.set(name + '_OPENBLAS_CONFIG', dep.get_variable('openblas_config'))
-+      conf_data.set(name + '_PCFILEDIR', dep.get_variable('pcfiledir'))
-+    endif
-   endif
- endforeach
- 
-
-From 84bea46fab251edd31bee8d8eae174cf2cb9315b Mon Sep 17 00:00:00 2001
-From: Ralf Gommers <ralf.gommers@gmail.com>
-Date: Mon, 29 May 2023 19:15:29 +0200
-Subject: [PATCH 06/11] CI: keep the Emscripten/Pyodide job on a setup.py-based
- build
-
----
- pyproject.toml.setuppy           | 9 +++++++++
- 2 files changed, 14 insertions(+), 1 deletion(-)
- create mode 100644 pyproject.toml.setuppy
-
-diff --git a/pyproject.toml.setuppy b/pyproject.toml.setuppy
-new file mode 100644
-index 00000000000..b28d93c8d52
---- /dev/null
-+++ b/pyproject.toml.setuppy
-@@ -0,0 +1,9 @@
-+# pyproject.toml needed to build with setup.py
-+# This file is used temporarily to replace the main pyproject.toml when needing
-+# to avoid building with Meson (e.g., in the Emscripten/Pyodide CI job)
-+[build-system]
-+requires = [
-+    "setuptools==59.2.0",
-+    "wheel==0.38.1",
-+    "Cython>=0.29.34,<3.0",
-+]
-
-From 027de0ab6d24e6336682ef6fa150ae09f007a5da Mon Sep 17 00:00:00 2001
-From: mattip <matti.picus@gmail.com>
-Date: Sun, 11 Jun 2023 16:11:34 +0300
-Subject: [PATCH 07/11] use MSVC and force 64-bit OpenBLAS interfaces
-
----
- pyproject.toml | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 9f03fa8d0e5..6cef90c6962 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -167,6 +167,11 @@ environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFL
- select = "*-win32"
- environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32" }
- 
-+[tool.meson-python.args]
-+setup = ['--vsenv']
-+# This should not be set on 32-bit builds...
-+compile = ['-DBLAS_SYMBOL_SUFFIX=64_']
-+
- [tool.spin]
- package = 'numpy'
- 
-
-From 9ce0d806a881c87a203efccf106cf5d3d6bb46e0 Mon Sep 17 00:00:00 2001
-From: mattip <matti.picus@gmail.com>
-Date: Sun, 11 Jun 2023 16:28:35 +0300
-Subject: [PATCH 08/11] drop rtools in wheel builds, do
- -DDBLAS_SYMBOL_SUFFIX=64_ differently
-
----
- pyproject.toml               |  8 +++-----
- 2 files changed, 3 insertions(+), 16 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 6cef90c6962..a9d7f87b2b5 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -147,7 +147,7 @@ test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
- manylinux-x86_64-image = "manylinux2014"
- manylinux-aarch64-image = "manylinux2014"
- musllinux-x86_64-image = "musllinux_1_1"
--environment = { CFLAGS="-std=c99 -fno-strict-aliasing", LDFLAGS="-Wl,--strip-debug", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux" }
-+environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DDBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="-Wl,--strip-debug", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux" }
- 
- [tool.cibuildwheel.macos]
- # For universal2 wheels, we will need to fuse them manually
-@@ -158,10 +158,10 @@ environment = { CFLAGS="-std=c99 -fno-strict-aliasing", LDFLAGS="-Wl,--strip-deb
- archs = "x86_64 arm64"
- test-skip = "*_universal2:arm64"
- # MACOS linker doesn't support stripping symbols
--environment = { CFLAGS="-std=c99 -fno-strict-aliasing", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS" }
-+environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DDBLAS_SYMBOL_SUFFIX=64_", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS" }
- 
- [tool.cibuildwheel.windows]
--environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="", LDFLAGS="" }
-+environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DDBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="" }
- 
- [[tool.cibuildwheel.overrides]]
- select = "*-win32"
-@@ -169,8 +169,6 @@ environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFL
- 
- [tool.meson-python.args]
- setup = ['--vsenv']
--# This should not be set on 32-bit builds...
--compile = ['-DBLAS_SYMBOL_SUFFIX=64_']
- 
- [tool.spin]
- package = 'numpy'
-
-From 067e51454eeff3ce302144803baef92add308668 Mon Sep 17 00:00:00 2001
-From: mattip <matti.picus@gmail.com>
-Date: Sun, 11 Jun 2023 17:05:02 +0300
-Subject: [PATCH 09/11] typo, install pkg-config on windows
-
----
- pyproject.toml               | 6 +++---
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index a9d7f87b2b5..a0b645938d1 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -147,7 +147,7 @@ test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
- manylinux-x86_64-image = "manylinux2014"
- manylinux-aarch64-image = "manylinux2014"
- musllinux-x86_64-image = "musllinux_1_1"
--environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DDBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="-Wl,--strip-debug", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux" }
-+environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="-Wl,--strip-debug", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux" }
- 
- [tool.cibuildwheel.macos]
- # For universal2 wheels, we will need to fuse them manually
-@@ -158,10 +158,10 @@ environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DDBLAS_SYMBOL_SUFFIX=64_"
- archs = "x86_64 arm64"
- test-skip = "*_universal2:arm64"
- # MACOS linker doesn't support stripping symbols
--environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DDBLAS_SYMBOL_SUFFIX=64_", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS" }
-+environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS" }
- 
- [tool.cibuildwheel.windows]
--environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DDBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="" }
-+environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="" }
- 
- [[tool.cibuildwheel.overrides]]
- select = "*-win32"
-
-From 9999c3f3a8c7facef77dc9859a8a25f39f14f7fd Mon Sep 17 00:00:00 2001
-From: mattip <matti.picus@gmail.com>
-Date: Sun, 11 Jun 2023 22:18:57 +0300
-Subject: [PATCH 10/11] set PKG_CONFIG_PATH for windows, add CXXFLAGS
-
----
- pyproject.toml                    | 6 +++---
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index a0b645938d1..32bde348d7d 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -147,7 +147,7 @@ test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
- manylinux-x86_64-image = "manylinux2014"
- manylinux-aarch64-image = "manylinux2014"
- musllinux-x86_64-image = "musllinux_1_1"
--environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="-Wl,--strip-debug", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux" }
-+environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="-Wl,--strip-debug", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", RUNNER_OS="Linux"}
- 
- [tool.cibuildwheel.macos]
- # For universal2 wheels, we will need to fuse them manually
-@@ -158,10 +158,10 @@ environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_",
- archs = "x86_64 arm64"
- test-skip = "*_universal2:arm64"
- # MACOS linker doesn't support stripping symbols
--environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS" }
-+environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS"}
- 
- [tool.cibuildwheel.windows]
--environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_", LDFLAGS="" }
-+environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS=""}
- 
- [[tool.cibuildwheel.overrides]]
- select = "*-win32"
-
-From ffcd334bd9da7ce4779e79636ecd047e2f20dd5b Mon Sep 17 00:00:00 2001
-From: mattip <matti.picus@gmail.com>
-Date: Sun, 11 Jun 2023 23:17:00 +0300
-Subject: [PATCH 11/11] disable pypy builds, move PKG_CONFIG_PATH for windows
-
----
- pyproject.toml                    | 4 ++--
- 3 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 32bde348d7d..55065d1362f 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -161,11 +161,11 @@ test-skip = "*_universal2:arm64"
- environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS"}
- 
- [tool.cibuildwheel.windows]
--environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS=""}
-+environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="", PKG_CONFIG_PATH="D:\\a\\numpy\\numpy\\openblas\\lib\\pkgconfig;"}
- 
- [[tool.cibuildwheel.overrides]]
- select = "*-win32"
--environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32" }
-+environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32", PKG_CONFIG_PATH="D:\\a\\numpy\\numpy\\openblas\\lib\\pkgconfig;"}
- 
- [tool.meson-python.args]
- setup = ['--vsenv']
diff --git a/dev-python/numpy/files/numpy-1.25.1-fix-scalartypes.patch b/dev-python/numpy/files/numpy-1.25.1-fix-scalartypes.patch
deleted file mode 100644
index aa381d243d88..000000000000
--- a/dev-python/numpy/files/numpy-1.25.1-fix-scalartypes.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-https://bugs.gentoo.org/910739
-https://github.com/numpy/numpy/issues/24239
-https://github.com/numpy/numpy/pull/24240
-https://github.com/numpy/numpy/commit/d9c0c96582373de0990908c89ed75ae16279e8e5
-
-From d9c0c96582373de0990908c89ed75ae16279e8e5 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 23 Jul 2023 21:31:08 +0100
-Subject: [PATCH] BUG: Fix C types in scalartypes
-
-https://github.com/numpy/numpy/pull/23746 introduced a fast path for scalar
-int conversions, but the map between Python types and C types was subtly
-wrong.
-
-This fixes tests on at least ppc32 (big-endian).
-
-Many thanks to Sebastian Berg for debugging this with me and pointing out
-what needed to be fixed.
-
-Closes #24239.
-
-Fixes: 81caed6e3c34c4bf4b22b4f6167e816ba2a3f73c
---- a/numpy/core/src/multiarray/scalartypes.c.src
-+++ b/numpy/core/src/multiarray/scalartypes.c.src
-@@ -283,34 +283,34 @@ genint_type_str(PyObject *self)
-     void *val = scalar_value(self, descr);
-     switch (descr->type_num) {
-         case NPY_BYTE:
--            item = PyLong_FromLong(*(int8_t *)val);
-+            item = PyLong_FromLong(*(npy_byte *)val);
-             break;
-         case NPY_UBYTE:
--            item = PyLong_FromUnsignedLong(*(uint8_t *)val);
-+            item = PyLong_FromUnsignedLong(*(npy_ubyte *)val);
-             break;
-         case NPY_SHORT:
--            item = PyLong_FromLong(*(int16_t *)val);
-+            item = PyLong_FromLong(*(npy_short *)val);
-             break;
-         case NPY_USHORT:
--            item = PyLong_FromUnsignedLong(*(uint16_t *)val);
-+            item = PyLong_FromUnsignedLong(*(npy_ushort *)val);
-             break;
-         case NPY_INT:
--            item = PyLong_FromLong(*(int32_t *)val);
-+            item = PyLong_FromLong(*(npy_int *)val);
-             break;
-         case NPY_UINT:
--            item = PyLong_FromUnsignedLong(*(uint32_t *)val);
-+            item = PyLong_FromUnsignedLong(*(npy_uint *)val);
-             break;
-         case NPY_LONG:
--            item = PyLong_FromLong(*(int64_t *)val);
-+            item = PyLong_FromLong(*(npy_long *)val);
-             break;
-         case NPY_ULONG:
--            item = PyLong_FromUnsignedLong(*(uint64_t *)val);
-+            item = PyLong_FromUnsignedLong(*(npy_ulong *)val);
-             break;
-         case NPY_LONGLONG:
--            item = PyLong_FromLongLong(*(long long *)val);
-+            item = PyLong_FromLongLong(*(npy_longlong *)val);
-             break;
-         case NPY_ULONGLONG:
--            item = PyLong_FromUnsignedLongLong(*(unsigned long long *)val);
-+            item = PyLong_FromUnsignedLongLong(*(npy_ulonglong *)val);
-             break;
-         default:
-             item = gentype_generic_method(self, NULL, NULL, "item");
diff --git a/dev-python/numpy/files/numpy-1.26.0_beta1-npy_cast_info.patch b/dev-python/numpy/files/numpy-1.26.0_beta1-npy_cast_info.patch
deleted file mode 100644
index cd09573deb7f..000000000000
--- a/dev-python/numpy/files/numpy-1.26.0_beta1-npy_cast_info.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9cfb416aad45260e1cc837029638d6b39cea9e38 Mon Sep 17 00:00:00 2001
-From: Nathan Goldbaum <nathan.goldbaum@gmail.com>
-Date: Mon, 21 Aug 2023 15:45:11 -0600
-Subject: [PATCH] BUG: fix NPY_cast_info error handling in choose
-
----
- numpy/core/src/multiarray/item_selection.c | 2 +-
- numpy/core/tests/test_multiarray.py        | 6 ++++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/numpy/core/src/multiarray/item_selection.c b/numpy/core/src/multiarray/item_selection.c
-index e935a27edb6..c1d4a950815 100644
---- a/numpy/core/src/multiarray/item_selection.c
-+++ b/numpy/core/src/multiarray/item_selection.c
-@@ -968,6 +968,7 @@ PyArray_Choose(PyArrayObject *ip, PyObject *op, PyArrayObject *out,
-     PyArrayObject **mps, *ap;
-     PyArrayMultiIterObject *multi = NULL;
-     npy_intp mi;
-+    NPY_cast_info cast_info = {.func = NULL};
-     ap = NULL;
- 
-     /*
-@@ -1045,7 +1046,6 @@ PyArray_Choose(PyArrayObject *ip, PyObject *op, PyArrayObject *out,
-     npy_intp transfer_strides[2] = {elsize, elsize};
-     npy_intp one = 1;
-     NPY_ARRAYMETHOD_FLAGS transfer_flags = 0;
--    NPY_cast_info cast_info = {.func = NULL};
-     if (PyDataType_REFCHK(dtype)) {
-         int is_aligned = IsUintAligned(obj);
-         PyArray_GetDTypeTransferFunction(
-diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
-index 966b75cc122..2836c8985c9 100644
---- a/numpy/core/tests/test_multiarray.py
-+++ b/numpy/core/tests/test_multiarray.py
-@@ -10043,3 +10043,9 @@ def test_gh_22683():
-     np.choose(np.zeros(10000, dtype=int), [a], out=a)
-     refc_end = sys.getrefcount(b)
-     assert refc_end - refc_start < 10
-+
-+
-+def test_gh_24459():
-+    a = np.zeros((50, 3), dtype=np.float64)
-+    with pytest.raises(TypeError):
-+        np.choose(a, [3, -1])
diff --git a/dev-python/numpy/files/replace_cpuflags.awk b/dev-python/numpy/files/replace_cpuflags.awk
deleted file mode 100644
index 11b8bd53b2c3..000000000000
--- a/dev-python/numpy/files/replace_cpuflags.awk
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/awk -f
-
-{
-    GENTOO_ENABLE=1;
-    if (match($0, /flags="([^"=]*)"/, cflags)) {
-        split(cflags[1], fields);
-        for (i in fields) {
-            if (match(fields[i], /-m([[:graph:]]*)/, inst)) {
-                if (!index(enabled_flags, inst[1])) {
-                    GENTOO_ENABLE=0;
-                }}}}
-    if (!GENTOO_ENABLE) { sub(cflags[1], "-mGENTOO_DISABLE"); }
-    print; 
-}
diff --git a/dev-python/numpy/numpy-1.24.0.ebuild b/dev-python/numpy/numpy-1.24.0.ebuild
deleted file mode 100644
index c1c0e7b5f49e..000000000000
--- a/dev-python/numpy/numpy-1.24.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 pypi toolchain-funcs
-
-DOC_PV=${PV}
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Allow use with setuptools 60.x
-	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very disk- and memory-hungry
-		numpy/lib/tests/test_io.py::test_large_zip
-
-		# precision problems
-		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# runs the whole test suite recursively, that's just crazy
-		numpy/core/tests/test_mem_policy.py::test_new_policy
-
-		# very slow, unlikely to be practically useful
-		numpy/typing/tests/test_typing.py
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
-		EPYTEST_DESELECT+=(
-			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-	if use arm || use x86 ; then
-		EPYTEST_DESELECT+=(
-			# too large for 32-bit platforms
-			numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-		)
-	fi
-
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest -k "not _fuzz"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.24.2.ebuild b/dev-python/numpy/numpy-1.24.2.ebuild
deleted file mode 100644
index 787da4ab6555..000000000000
--- a/dev-python/numpy/numpy-1.24.2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 pypi toolchain-funcs
-
-DOC_PV=${PV}
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Allow use with setuptools 60.x
-	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very disk- and memory-hungry
-		numpy/lib/tests/test_histograms.py::TestHistogram::test_big_arrays
-		numpy/lib/tests/test_io.py::test_large_zip
-
-		# precision problems
-		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# runs the whole test suite recursively, that's just crazy
-		numpy/core/tests/test_mem_policy.py::test_new_policy
-
-		# very slow, unlikely to be practically useful
-		numpy/typing/tests/test_typing.py
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
-		EPYTEST_DESELECT+=(
-			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-	if use arm || use x86 ; then
-		EPYTEST_DESELECT+=(
-			# too large for 32-bit platforms
-			numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-		)
-	fi
-
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest -k "not _fuzz"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.24.4-r1.ebuild b/dev-python/numpy/numpy-1.24.4-r1.ebuild
deleted file mode 100644
index 5db2ffe20ea8..000000000000
--- a/dev-python/numpy/numpy-1.24.4-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi
-inherit toolchain-funcs
-
-DOC_PV=${PV}
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-CPU_FLAGS_X86=( avx avx2 avx512dq avx512f avx512vl f16c fma4 popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3 xop )
-IUSE="lapack $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	<dev-python/cython-3[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
-	"${FILESDIR}"/numpy-1.24.3-fix-c++-linkage.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Allow use with setuptools 60.x
-	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# The following has no effect on architectures other than x86 and amd64.
-	local flag enabled_flags=()
-	for flag in "${CPU_FLAGS_X86[@]}"; do
-		use cpu_flags_x86_${flag} && enabled_flags+=( ${flag/_/.} )
-	done
-	gawk -i inplace -v "enabled_flags=${enabled_flags[*]}" \
-		-f "${FILESDIR}"/replace_cpuflags.awk \
-		numpy/distutils/ccompiler_opt.py || die
-	rm -f numpy/distutils/tests/test_ccompiler_opt.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local -x MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very disk- and memory-hungry
-		numpy/lib/tests/test_histograms.py::TestHistogram::test_big_arrays
-		numpy/lib/tests/test_io.py::test_large_zip
-
-		# precision problems
-		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# runs the whole test suite recursively, that's just crazy
-		numpy/core/tests/test_mem_policy.py::test_new_policy
-
-		# very slow, unlikely to be practically useful
-		numpy/typing/tests/test_typing.py
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
-		EPYTEST_DESELECT+=(
-			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-			)
-			;;
-		*)
-			;;
-	esac
-
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest -k "not _fuzz" -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.24.4.ebuild b/dev-python/numpy/numpy-1.24.4.ebuild
deleted file mode 100644
index 91c4a9011068..000000000000
--- a/dev-python/numpy/numpy-1.24.4.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi
-inherit toolchain-funcs
-
-DOC_PV=${PV}
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	<dev-python/cython-3[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
-	"${FILESDIR}"/numpy-1.24.3-fix-c++-linkage.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Allow use with setuptools 60.x
-	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local -x MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very disk- and memory-hungry
-		numpy/lib/tests/test_histograms.py::TestHistogram::test_big_arrays
-		numpy/lib/tests/test_io.py::test_large_zip
-
-		# precision problems
-		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# runs the whole test suite recursively, that's just crazy
-		numpy/core/tests/test_mem_policy.py::test_new_policy
-
-		# very slow, unlikely to be practically useful
-		numpy/typing/tests/test_typing.py
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
-		EPYTEST_DESELECT+=(
-			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-			)
-			;;
-		*)
-			;;
-	esac
-
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest -k "not _fuzz" -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.25.1-r3.ebuild b/dev-python/numpy/numpy-1.25.1-r3.ebuild
deleted file mode 100644
index 1b46bf5e470b..000000000000
--- a/dev-python/numpy/numpy-1.25.1-r3.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2023 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_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi toolchain-funcs
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="lapack"
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-util/meson-1.1.0
-	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.25.0_rc1-meson-pyproject.toml.patch
-	"${FILESDIR}"/${PN}-1.25.0-skip-python3.12-irrelevant-tests.patch
-	"${FILESDIR}"/${PN}-1.25.1-fix-scalartypes.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	append-flags -fno-strict-aliasing
-
-	distutils-r1_python_prepare_all
-
-	# TODO: Please drop once 1.25.0_rc1-meson-pyproject.toml.patch is gone
-	sed -i -e "s:version = \"2.0.0.dev0\":version = \"${PV}\":" pyproject.toml || die
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=(
-		-Dblas=$(usev lapack cblas)
-		-Dlapack=$(usev lapack lapack)
-	)
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very disk-and-memory-hungry
-		lib/tests/test_io.py::test_large_zip
-
-		# precision problems
-		core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# runs the whole test suite recursively, that's just crazy
-		core/tests/test_mem_policy.py::test_new_policy
-
-		# XXX: I've no idea why this ends up being needed in deselect and not ignore
-		typing/tests/test_typing.py
-	)
-
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		EPYTEST_DESELECT+=(
-			# TODO: crashed
-			lib/tests/test_histograms.py::TestHistogram::test_big_arrays
-		)
-	fi
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case of arm32 chroot on arm64, bug #774108
-		EPYTEST_DESELECT+=(
-			core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-
-	if use hppa ; then
-		EPYTEST_DESELECT+=(
-			# TODO: Get selectedrealkind updated!
-			# bug #907228
-			# https://github.com/numpy/numpy/issues/3424 (https://github.com/numpy/numpy/issues/3424#issuecomment-412369029)
-			# https://github.com/numpy/numpy/pull/21785
-			f2py/tests/test_kind.py::TestKind::test_real
-			f2py/tests/test_kind.py::TestKind::test_quad_precision
-		)
-	fi
-
-	if [[ $(tc-endian) == "big" ]] ; then
-		# https://github.com/numpy/numpy/issues/11831 and bug #707116
-		EPYTEST_DESELECT+=(
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[s1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[t1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[s1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[t1]'
-			f2py/tests/test_kind.py::TestKind::test_int
-		)
-	fi
-
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-				'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]'
-				'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
-				lib/tests/test_histograms.py::TestHistogram::test_big_arrays
-			)
-			;;
-		*)
-			;;
-	esac
-
-	rm -rf numpy || die
-	epytest -n "$(makeopts_jobs)" --pyargs numpy
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.25.2.ebuild b/dev-python/numpy/numpy-1.25.2.ebuild
index 1493b6f36e70..ee2956f8200c 100644
--- a/dev-python/numpy/numpy-1.25.2.ebuild
+++ b/dev-python/numpy/numpy-1.25.2.ebuild
@@ -23,7 +23,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="lapack"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 RDEPEND="
diff --git a/dev-python/numpy/numpy-1.26.0_beta1-r1.ebuild b/dev-python/numpy/numpy-1.26.0_beta1-r1.ebuild
deleted file mode 100644
index 1072d42ba823..000000000000
--- a/dev-python/numpy/numpy-1.26.0_beta1-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2023 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_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi toolchain-funcs
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="lapack"
-if [[ ${PV} != *_[rab]* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-util/meson-1.1.0
-	>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		# https://github.com/numpy/numpy/pull/24484
-		"${FILESDIR}/${P}-npy_cast_info.patch"
-	)
-
-	append-flags -fno-strict-aliasing
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=(
-		-Dblas=$(usev lapack cblas)
-		-Dlapack=$(usev lapack lapack)
-		# TODO: cpu-* options
-	)
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Very disk-and-memory-hungry
-		lib/tests/test_io.py::TestSaveTxt::test_large_zip
-		lib/tests/test_io.py::TestSavezLoad::test_closing_fid
-		lib/tests/test_io.py::TestSavezLoad::test_closing_zipfile_after_load
-
-		# Precision problems
-		core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# Runs the whole test suite recursively, that's just crazy
-		core/tests/test_mem_policy.py::test_new_policy
-
-		typing/tests/test_typing.py
-		# Uses huge amount of memory
-		core/tests/test_mem_overlap.py
-
-		# TODO: crashes
-		lib/tests/test_histograms.py::TestHistogram::test_big_arrays
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case of arm32 chroot on arm64, bug #774108
-		EPYTEST_DESELECT+=(
-			core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-
-	if use hppa ; then
-		EPYTEST_DESELECT+=(
-			# TODO: Get selectedrealkind updated!
-			# bug #907228
-			# https://github.com/numpy/numpy/issues/3424 (https://github.com/numpy/numpy/issues/3424#issuecomment-412369029)
-			# https://github.com/numpy/numpy/pull/21785
-			f2py/tests/test_kind.py::TestKind::test_real
-			f2py/tests/test_kind.py::TestKind::test_quad_precision
-		)
-	fi
-
-	if [[ $(tc-endian) == "big" ]] ; then
-		# https://github.com/numpy/numpy/issues/11831 and bug #707116
-		EPYTEST_DESELECT+=(
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[s1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[t1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[s1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[t1]'
-			f2py/tests/test_kind.py::TestKind::test_int
-		)
-	fi
-
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-				'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]'
-				'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
-			)
-			;;
-		*)
-			;;
-	esac
-
-	rm -rf numpy || die
-	epytest -n "$(makeopts_jobs)" --pyargs numpy
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.26.0_beta1.ebuild b/dev-python/numpy/numpy-1.26.0_beta1.ebuild
deleted file mode 100644
index bc6646bd3079..000000000000
--- a/dev-python/numpy/numpy-1.26.0_beta1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 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_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi toolchain-funcs
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="lapack"
-if [[ ${PV} != *_[rab]* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-util/meson-1.1.0
-	>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	append-flags -fno-strict-aliasing
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=(
-		-Dblas=$(usev lapack cblas)
-		-Dlapack=$(usev lapack lapack)
-		# TODO: cpu-* options
-	)
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Very disk-and-memory-hungry
-		lib/tests/test_io.py::TestSaveTxt::test_large_zip
-		lib/tests/test_io.py::TestSavezLoad::test_closing_fid
-		lib/tests/test_io.py::TestSavezLoad::test_closing_zipfile_after_load
-
-		# Precision problems
-		core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# Runs the whole test suite recursively, that's just crazy
-		core/tests/test_mem_policy.py::test_new_policy
-
-		typing/tests/test_typing.py
-		# Uses huge amount of memory
-		core/tests/test_mem_overlap.py
-
-		# TODO: crashes
-		lib/tests/test_histograms.py::TestHistogram::test_big_arrays
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case of arm32 chroot on arm64, bug #774108
-		EPYTEST_DESELECT+=(
-			core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-
-	if use hppa ; then
-		EPYTEST_DESELECT+=(
-			# TODO: Get selectedrealkind updated!
-			# bug #907228
-			# https://github.com/numpy/numpy/issues/3424 (https://github.com/numpy/numpy/issues/3424#issuecomment-412369029)
-			# https://github.com/numpy/numpy/pull/21785
-			f2py/tests/test_kind.py::TestKind::test_real
-			f2py/tests/test_kind.py::TestKind::test_quad_precision
-		)
-	fi
-
-	if [[ $(tc-endian) == "big" ]] ; then
-		# https://github.com/numpy/numpy/issues/11831 and bug #707116
-		EPYTEST_DESELECT+=(
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[s1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[t1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[s1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[t1]'
-			f2py/tests/test_kind.py::TestKind::test_int
-		)
-	fi
-
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-				'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]'
-				'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
-			)
-			;;
-		*)
-			;;
-	esac
-
-	rm -rf numpy || die
-	epytest -n "$(makeopts_jobs)" --pyargs numpy
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.26.0_rc1.ebuild b/dev-python/numpy/numpy-1.26.0_rc1.ebuild
deleted file mode 100644
index bc6646bd3079..000000000000
--- a/dev-python/numpy/numpy-1.26.0_rc1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 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_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi toolchain-funcs
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="lapack"
-if [[ ${PV} != *_[rab]* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-util/meson-1.1.0
-	>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	append-flags -fno-strict-aliasing
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=(
-		-Dblas=$(usev lapack cblas)
-		-Dlapack=$(usev lapack lapack)
-		# TODO: cpu-* options
-	)
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Very disk-and-memory-hungry
-		lib/tests/test_io.py::TestSaveTxt::test_large_zip
-		lib/tests/test_io.py::TestSavezLoad::test_closing_fid
-		lib/tests/test_io.py::TestSavezLoad::test_closing_zipfile_after_load
-
-		# Precision problems
-		core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# Runs the whole test suite recursively, that's just crazy
-		core/tests/test_mem_policy.py::test_new_policy
-
-		typing/tests/test_typing.py
-		# Uses huge amount of memory
-		core/tests/test_mem_overlap.py
-
-		# TODO: crashes
-		lib/tests/test_histograms.py::TestHistogram::test_big_arrays
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case of arm32 chroot on arm64, bug #774108
-		EPYTEST_DESELECT+=(
-			core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-
-	if use hppa ; then
-		EPYTEST_DESELECT+=(
-			# TODO: Get selectedrealkind updated!
-			# bug #907228
-			# https://github.com/numpy/numpy/issues/3424 (https://github.com/numpy/numpy/issues/3424#issuecomment-412369029)
-			# https://github.com/numpy/numpy/pull/21785
-			f2py/tests/test_kind.py::TestKind::test_real
-			f2py/tests/test_kind.py::TestKind::test_quad_precision
-		)
-	fi
-
-	if [[ $(tc-endian) == "big" ]] ; then
-		# https://github.com/numpy/numpy/issues/11831 and bug #707116
-		EPYTEST_DESELECT+=(
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[s1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[t1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[s1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[t1]'
-			f2py/tests/test_kind.py::TestKind::test_int
-		)
-	fi
-
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-				'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]'
-				'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
-			)
-			;;
-		*)
-			;;
-	esac
-
-	rm -rf numpy || die
-	epytest -n "$(makeopts_jobs)" --pyargs numpy
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index bc31775dc408..5f82433bb594 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,5 +1,3 @@
-DIST openstackdocstheme-3.1.1.tar.gz 1256245 BLAKE2B e0f1a9b13fe7e28e851eddcbf73a87b28509b9ea3d597a4680b3c8b39d309700f7fde8cf9fe9a63d6ec7210e505d24d541e1592553b8a8c9cd85b38de09a4442 SHA512 b620486617f5ab2e5ce149030a9bd79408a856709603725b2e17400253aaadee732c2ea5954d80c9ab384ac266d85e7e6698f3b525115183b38693718b3f195b
 DIST openstackdocstheme-3.2.0.tar.gz 1256119 BLAKE2B b4e0536d9846270597f9456998a9e38d728acee1f992793354dd814596dbc8b189e7e86d1aab4d85b97abdf9a0a502cdef884447fe66b8b57836cf07bec26f67 SHA512 8a9cff0ef68c78917a8a18653567683dda269ea1c4c915d183324ad28ecdfc111083c94082b4e47a88f46f8990a20e3d277478ac02febb3ea0c31067069f315b
-EBUILD openstackdocstheme-3.1.1.ebuild 711 BLAKE2B 5c409cbf60321c9f084ebebf27bce9f996ae763be1abcad15836e2796941041967c711db9d549ad4d5fd5cd8c73f9a741b7f62a5dfe9cab9ae65b465e2c7efc7 SHA512 fdfb14c93ec7ffa96c2ad1d5dfeed72d4f81ff68de164fa399baf1a5b919712476f0e940a80728fb11f73925121715ffbf36d6ba18741eddae8e4c660876e326
-EBUILD openstackdocstheme-3.2.0.ebuild 714 BLAKE2B e09da7799f2352fbf92e765121440b6dd48a08d1060bf017e66e41759dc4a41d9bbbab0e72d7cb2036a3d3fb0fb37970f700fc8aaf1ace39c9dbdc55005bf6f8 SHA512 4c83d8f255fdf20fd6c32541bef942b33244ff6d3786bee183b72e8f82e70550460477b0f55a871aaa2e69622cc93bccf4c6eeb42faf648fe28121d65baf9f58
+EBUILD openstackdocstheme-3.2.0.ebuild 711 BLAKE2B 869d38227a9994060b716ae629c24f1baee5b5da6b6ec9014ffcdac6c52408635e1dda4cea40c1fe7a664361d81d4fb7350db42145e2ce0ae4186d04804c338e SHA512 49bf806fd0045e99aa989fbe8cf6345e57c5d71edfce548d20c2810bb7ab76fef5a4a4acd2f2affb7def98a8105e9a67a31e0bb5d0fdb47a4f50456c38c3d08a
 MISC metadata.xml 747 BLAKE2B 17de68317b0cfdeea5d574db89402a0fd4bb335fa78a4050053585e7914e232a2679693a05a6ca260d84f7f82c2fff7c0af1b82183dd33e6ff96d947ed1ffab5 SHA512 3e132316c7623ae609f8f1035fa719960cea7448c3437f0b5456984cf3e60b62867ce0a8de3a7681315472984d2a8d317f5f06e68e2b0b8343c429cc55eff1d2
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.1.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.1.1.ebuild
deleted file mode 100644
index a8c581437a29..000000000000
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Theme and extension support for Sphinx documentation"
-HOMEPAGE="
-	https://docs.openstack.org/openstackdocstheme/latest/
-	https://opendev.org/openstack/openstackdocstheme/
-	https://github.com/openstack/openstackdocstheme/
-	https://pypi.org/project/openstackdocstheme/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv ~s390 x86"
-
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${BDEPEND}
-	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.2.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.2.0.ebuild
index b6cec53a5c5a..4313a340bd14 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.2.0.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-3.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
 
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv ~s390 x86"
 
 BDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index a0c460b4e7d6..71ee9e5536c0 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.concurrency-5.1.1.tar.gz 59787 BLAKE2B 630e5bef3a4a49d0f7b8b7f79643ef5f737248ec45de0e801107142b898a252fe7c67be6e0f6db4b968e5a163a47d63bc5f756c592d4f729f62c24aa9aeca172 SHA512 2eac13529f1635d39b5866d20d1f077ddcb2a676e78f4f50abe1df13c2fbf9f85aea1b360fde01e983459dcdc4958783477a87eb8fad106362e81e0f77b36561
 DIST oslo.concurrency-5.2.0.tar.gz 60052 BLAKE2B 9f45af8beaa5fc145963e3e12818325dff2a00178c3154a4cf7ce2950ca90d9771be590593cc195c2909930416501da1042768da9ba653c0126437bb518a338e SHA512 9f645aa611882e1b7218a7fbf65b54fef523d9cf067f894e9441c0a8de3ab80495ec8a167604412385edf12fc7a53b73ac0ef63e977889db7021dd5b93b0d72f
-EBUILD oslo-concurrency-5.1.1.ebuild 1171 BLAKE2B 1cbc6e3efd50d53fae0208dc7f2148879c62cf9233af7d2fa84f563291710819c3981a206abf76cbcf11bd4759167613b896160a3bf336509b546cecea8117af SHA512 28a2ca2eca29fcd1fa05e20d84fef1ccf0ed5202c6818aee3e470a8ad223d7972067247859c2b955dc2691e30c1248f757db620ed250b3cf32f12082baef6f05
-EBUILD oslo-concurrency-5.2.0.ebuild 1175 BLAKE2B 1056b767dff05ab25a26698d2e754ed1a2a2f20d93d8eb0e757394c20e919a47eff82aa6cafdbaf4792dd702d6878088dbaa66b3c8567f7b05ad5e10e88b2ed9 SHA512 696a6f736962bb88b3696008dc9e900089d12a9c63742ab47e0cd68543b796262a08457bc1a11edc85f0d8571a143ec1e8c620e6d93621a9c93e4daaee44bb25
+EBUILD oslo-concurrency-5.2.0.ebuild 1172 BLAKE2B 1fe09988827554f601ee8959d1973575ddc8749acf1f60267873b022a0df55d678394d62fb2f0715f5cf8e8b6267991b793deb5ec0bdc7a35d2bbfb5876e850e SHA512 4666e908a4e990a5e84b879112b58ceb6fe5d29f0cdf0bf76c856fba76a2d23b0ed99ae34e2cdec682d1c10606cfcc80cbef2d9e524e253f5c0ad108e8ff48ea
 MISC metadata.xml 423 BLAKE2B 965b9f3a9b25cd0f93f13bc12af982b8435e946c1317b6c3a013d016ac6ac3df39f94e1a69f6ef28355459cc5d59fa32c2004727e6772696dab755aee6ad46f4 SHA512 ffc8e1547e6f8356071744a4cf2d5f88d02f2a34322857245c68057699f0b87ea351a7821682ab3d72b777260c8887524467a201fe931787fa1b2ad67eb022a3
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-5.1.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-5.1.1.ebuild
deleted file mode 100644
index cb1cd4f30dee..000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-5.1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Concurrency library"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.concurrency/
-	https://github.com/openstack/oslo.concurrency/
-	https://pypi.org/project/oslo.concurrency/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# fails, then hangs
-	rm oslo_concurrency/tests/unit/test_lockutils_eventlet.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	eunittest
-}
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-5.2.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-5.2.0.ebuild
index 632157759d9d..d9fecdf1dd7c 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-5.2.0.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-5.2.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 1e9c6e2c7a37..0f460818a294 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.config-9.1.1.tar.gz 160964 BLAKE2B 180b76d9425b9be72dac22379618b69265ab7016044ac81ed826134036aa988d867882116a50597df62b702bfff4460ac17e7c1d435ff9a1f0028a2ff64b7a2f SHA512 820da069642a663cad0787ee4e100720dcc9870faeaa208c8aa5be5f3c6bbbf1e5e3d2cb8c5d86765fd4114744e2fd1a00902d79200ddeba5fcec2ed61405e4e
 DIST oslo.config-9.2.0.tar.gz 161235 BLAKE2B 186b79bab199db9369dd53952a9c6f54fafe17f950d7b66ed753f173a24726a6dbd06b794c73387f5ea6e77aa54a4d5bd0ef4752a5c564dfeea4e729fdf151e7 SHA512 69d8461f4ed5d4988fe527e4022c528244e9ecf76913a7af572e8073c0218987a69e6094edc56ff14eaf1b05fc5ffe7d81bb26ff17f87e4bd29a78d7959a3935
-EBUILD oslo-config-9.1.1.ebuild 1567 BLAKE2B 43033d56a25f3489f8137fbaa3e8ef48414984d3afb556f7c66d0e8e210fd2ad335bfe908304185ad66730fe13b7ed97d18288162ad4f63ab753f2c34a8280d1 SHA512 f00dd9e72666cc21b6a7f658e9a1fa9400945072b550ed0b9715013d1b900868e82acf79ac51b0a45193ee20a6a9b8331b6c1bfbf7e829c5695111d68ded4966
-EBUILD oslo-config-9.2.0.ebuild 1571 BLAKE2B 3b8229636871d221831760454d422e27c2dbebd3221c2e93817e1c80c0a225298b4a094eaf6251a506a7b3a8c07db13b229fa542f1749b3a282205f9194454e5 SHA512 958c076659c786c7a4cfb71dbc25a6f28b017e83e96c9679e62010d0c6d4c9dc6d077f456e2e605df0bb6d7b6ceb2c1de0130263d7f2cbb8444e2ee776ee5c4d
+EBUILD oslo-config-9.2.0.ebuild 1568 BLAKE2B 77e91f5955d9cee1a1be0a87c380944470262afe88beb1b02ae99795234e1b14d06e048ca8f71a883f9f85b5e697b994f4048d71f87e39619e5402aa753278e0 SHA512 e07e93f7df90b245ecdeddc5107dbd895ca317192a0dd7ff5e29d7471637ba38e6c1dfd99c6c237dce6ab00bf2620cd23678ea5b3710f71f3a9dc2248d1e03d1
 MISC metadata.xml 759 BLAKE2B 88d0bbdc03286429f96554d184f664fbbdb4e067ed137f95a96a573c09b4573de90e50b2d5875d627c8b9ed03a0aec7233bdc8684b721e16085157480568c330 SHA512 a29b5a534042e949f780cfb000bd9ce9cde81ae1c5e6b429bd7854598a2d0f0c8b5358dc645135ba9016065460ff5b858e48e02cdbd12ade2b1fea9d0b407410
diff --git a/dev-python/oslo-config/oslo-config-9.1.1.ebuild b/dev-python/oslo-config/oslo-config-9.1.1.ebuild
deleted file mode 100644
index fcb6357ac116..000000000000
--- a/dev-python/oslo-config/oslo-config-9.1.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.config/
-	https://github.com/openstack/oslo.config/
-	https://pypi.org/project/oslo.config/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	dev-python/importlib-metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# broken by some dep upgrade
-	sed -i -e '/DeprecationWarningTestsNoOsloLog/,$d' \
-		oslo_config/tests/test_cfg.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x COLUMNS=80
-	eunittest -b
-}
diff --git a/dev-python/oslo-config/oslo-config-9.2.0.ebuild b/dev-python/oslo-config/oslo-config-9.2.0.ebuild
index 5aba0168545d..88d2e3ce81fc 100644
--- a/dev-python/oslo-config/oslo-config-9.2.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-9.2.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index c398fb25654d..037d72f962f4 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.context-5.1.1.tar.gz 33596 BLAKE2B ec16afb8af4c8532ee865a2184ff7d85845d826146482113d1c3e2e7ec43bb26d4e23b73f0de7589b9e1c82f6ef6f441bbff6c153f6c2dc4a1f81efe1ced6de1 SHA512 49e411b33dbe66ed20851a830db3fb52dc19ace786f7ba9b07be772390791d914eb7dd8424d38d48540c82a8cdccaf6a5eb70f8d2ca6f81ce24dfa72e6a8fa3a
 DIST oslo.context-5.2.0.tar.gz 33729 BLAKE2B 3ad22132b4951d00e5e884e77fc3e5acc122c43a09176886a7ef1f7aba3ed8bd0df562295fd2107edc8178b791101ef45bf1b44681dfbc6de49a06661a44ebd4 SHA512 d79c34a5f30a2e8ef2d44678f2e8200ab96aa5ceca501152461ea0d9e9eedcfccc563a075bbc7b85a5deba9165890d29e8e604f278a374b0f90c973ee4265c3e
-EBUILD oslo-context-5.1.1.ebuild 903 BLAKE2B 570ea1c5d8c0309de946db784897c79fd78acb7699df76021579412c293128bcfd99198ab066fdbd26a27db9f9b57117b26228e0a56f52e10ad226e88c853a97 SHA512 2d1c056b9b206ff5de2267b440901fc1b2284a58ac609ccf5268f6e7fe5e57006ea9d4a2fed1c7f90d68c60a5dbc9636877006640dc88d949d505fae77760fd7
-EBUILD oslo-context-5.2.0.ebuild 906 BLAKE2B 9c9faf134fb3becd54198705676f143a62ee023910f05b9e33640ed7a98185afe6bfe6a0d7ba83942432089e96e7b151454aaf044871f24d804b5c2127b70eb8 SHA512 cfd074e0407aff8f4824d7f912d992b9ad3984521faefac0801575eb8779c28369507d83daa17059bad4d5047d73a69ec93d42be9ee3adb9942d77f172b062f6
+EBUILD oslo-context-5.2.0.ebuild 903 BLAKE2B 570ea1c5d8c0309de946db784897c79fd78acb7699df76021579412c293128bcfd99198ab066fdbd26a27db9f9b57117b26228e0a56f52e10ad226e88c853a97 SHA512 2d1c056b9b206ff5de2267b440901fc1b2284a58ac609ccf5268f6e7fe5e57006ea9d4a2fed1c7f90d68c60a5dbc9636877006640dc88d949d505fae77760fd7
 MISC metadata.xml 790 BLAKE2B b75e2d3cb436d1245e9ec756f17e5e759d98b4704652c46269f95c284318111e1cadeb389445851719c4bee57d04593ef21f9b21c7b3c8395eb937cc78782f71 SHA512 3b7edb7e029b009e861282ac5c8fd71a4a4e968935c3e91bdf11dbaac1eaa2d434003dbc4b0acef53187ca6c42a3f9908124b6dcf9a50d444068f49ad1c5d42b
diff --git a/dev-python/oslo-context/oslo-context-5.1.1.ebuild b/dev-python/oslo-context/oslo-context-5.1.1.ebuild
deleted file mode 100644
index db454ce1d571..000000000000
--- a/dev-python/oslo-context/oslo-context-5.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.context/
-	https://github.com/openstack/oslo.context/
-	https://pypi.org/project/oslo.context/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme
diff --git a/dev-python/oslo-context/oslo-context-5.2.0.ebuild b/dev-python/oslo-context/oslo-context-5.2.0.ebuild
index 5c3230db8562..db454ce1d571 100644
--- a/dev-python/oslo-context/oslo-context-5.2.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-5.2.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 2e73992af26b..f16b1f7ebb58 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,6 +1,4 @@
 AUX oslo-i18n-5.1.0-fix-py3.11.patch 1196 BLAKE2B 08d78934986b45d23095e73cd1f465c371372de3fe3f2681bd087a00556fda60b719a40471638423df109be55929c34602bdc589c256421bc89d5c2a0dfcbcfd SHA512 214f367932692c4910b4285df1c05ceb7389bdbf9821e6287df33c9a07e81990a00ce9514e6b53e9f562ae3647aa198247808a2e10f1a746ebdeff169b6c4749
-DIST oslo.i18n-6.0.0.tar.gz 47479 BLAKE2B c49b3b1e79a5f72d6ebaeafa3024f891c72da4058eca711400d581eb5bf0a0dfd5f87ce0685f96a54aa06140fc4a5fa213220017b26a55a8d3ef72c3db397226 SHA512 50179ada0449e216ec0a269ed928ca196158fc576a4ee9e0ab4e916fea595bec261cdba90b0adcd3cd089ada4ee47d24c756e9142ebf49e3a446472141db1638
 DIST oslo.i18n-6.1.0.tar.gz 48031 BLAKE2B da2a03eb382154be31dfc09636395cc5f1c816972e81829181b7745b5f35693069fbe68b6b6223d9188d08a0e1ba277a137290810da9aebf3af49a9b4f2069ea SHA512 6ac6a4c7ea5e43d57c04765f0b0ae90047042ead81c086aa3229d8ffe5402a836e82238f6689d6f6d1a503d8abf147605dc1aab8b8bb4d738e575fb7948fd7e3
-EBUILD oslo-i18n-6.0.0.ebuild 761 BLAKE2B 7cab1ada992dc451adb90d773d7b1271ef061218cdd37cdc65efcb57892db868b690644f98ff35c2183ac3c9509d46a8f2e26a4edf047aa30d792b38e9bde4c4 SHA512 9df372087171183a8993cb59b949f78f7b7e6896c9503d6b138df1c1a44066a805e382a3d72acc1dd22f60d84a6a693ba648e236c8385a69001b0c7a6d180a4f
-EBUILD oslo-i18n-6.1.0.ebuild 764 BLAKE2B c92eea6cf1cac44fdc020e8174b886fbb672cbfa7c3c9d98c9268678210a84628788d7703516b45bf9839bc9ad943c0e1393f25197bf673c9b378318ee1d0f20 SHA512 9ec5b1fa66b39c0d6168df741346046a52ba1c935c4fa7416d02849fecc2fc07a52295a234340b694fefffd664e47452c1845fd6ea088f8696bedfba8f5f410c
+EBUILD oslo-i18n-6.1.0.ebuild 761 BLAKE2B 7cab1ada992dc451adb90d773d7b1271ef061218cdd37cdc65efcb57892db868b690644f98ff35c2183ac3c9509d46a8f2e26a4edf047aa30d792b38e9bde4c4 SHA512 9df372087171183a8993cb59b949f78f7b7e6896c9503d6b138df1c1a44066a805e382a3d72acc1dd22f60d84a6a693ba648e236c8385a69001b0c7a6d180a4f
 MISC metadata.xml 665 BLAKE2B 8890b37ab4cb0fce66a2e6f8be6da304a0c28d75d203a4413d6c8062a984a52b4c6004145992d3e00dd156ffd64a2bbb6b75eba85954de9fabcd88d24e925cc6 SHA512 b4a5778815e857a638e0ca9c9d228e9c941f9b541d667c7e4fcf6ef4814c8b24cbf0c8d24317ffbc7e65e25326f5043a546f42b7982f355551d1b0d0351472b0
diff --git a/dev-python/oslo-i18n/oslo-i18n-6.0.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-6.0.0.ebuild
deleted file mode 100644
index d04a8195ae42..000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-6.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo i18n library"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.i18n/
-	https://github.com/openstack/oslo.i18n/
-	https://pypi.org/project/oslo.i18n/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.0-fix-py3.11.patch"
-)
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/oslo-i18n/oslo-i18n-6.1.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-6.1.0.ebuild
index a228c1b29aec..d04a8195ae42 100644
--- a/dev-python/oslo-i18n/oslo-i18n-6.1.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-6.1.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.1.0-fix-py3.11.patch"
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 7b95febcd6aa..8887e1db89d8 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.log-5.2.0.tar.gz 93528 BLAKE2B d52ee82e9e2d422649e9bc0baab77c8f72e3640cfba44d326daa759e746d8f83aa04fd5f3f6b7b9e2ffcced910706b85407f3f3f4f83755b48f7883d2150ac61 SHA512 171606a0e93f2a354c8b4369e6674d25b4f2e25a5c91ca3760beb753d7cc9b0d64754ec4ccb10785db3e5b40655be5f0c5f17bf5a3095af6077771a9cd7c2f4b
 DIST oslo.log-5.3.0.tar.gz 96999 BLAKE2B de8e6173bbea2bf30eb0da056144b25f7da74cfcaf2f6ce70619da86ec3babeda5c5c4784c055950bbfef724a807db6e25cb9792eecdf242ae2bcca00e3810fb SHA512 7db802c9c753562351c34feb63ebdff1306911ef392e4742fb08cfda08d8b09a81cb0e3ff85162ecd54a164a9c38a3a6f5a4d7cfc26bbd9ee84fefd172ca2fbd
-EBUILD oslo-log-5.2.0.ebuild 1374 BLAKE2B 2f5884387c43dbe0f05d8a651859e9f4b07bee968eb4d15a97198b1e4c59ce6b4bba1a32adf50bf5fe00205d40809ff7b66070d460da6583cc33187dc9f437fe SHA512 b118d8df46fe94ed1d7c531129dab76363bf8b59e31bb78ae932a4051d0821216c8f84f907cd472098e50f44e7921593e9b4c48eb4ecce9865c825bf0617a13e
-EBUILD oslo-log-5.3.0.ebuild 1842 BLAKE2B 817f0bbd5425fc558cc87b8f415b3ab1653258e84d30d28363c987c7bf5491134cc42d35613e843dce26de5731de593644358cfc892f11a678b84c56da8c9dbe SHA512 d1d33a071e326125c0a76097446fdbc18309a330f53e8df7614cc3872d1de602e96086d6b14f7baa95028676f7f1f931d314a6649d42e3e95e3c061c97f50d51
+EBUILD oslo-log-5.3.0.ebuild 1839 BLAKE2B c90f8b53ebe5810069f9d4d6819821dbc2c8b97d435a2d8932f028e3dc4af082cadb32372132ab22ebd63f64a55aef315adf7d5e9c2be6d9b0b9df3f310cb105 SHA512 6ba30b55e6e8963e83b6368e71fca08db534340d3960bc496d7795b2246c7fcb66dd81b3b931164c5f9c8555fdf27ae00408a7e6848611a37f2230cfaa0bd7e3
 MISC metadata.xml 914 BLAKE2B 47a0937cefc2cc4c8c4300f4aae699a42c5d659cb6017aa01b87aca14bdcb9f47256c3417cc0178999c452a35ebccd915b020b537a4d688d1d00664b7be1332d SHA512 dfeb43d43608a56c60e62046f1fbef6c6cc794431917d7734caf0b3afb5d1b761c1a04ee01ab0fc4d6051c39a984d6edb25663dae2cf94354192d5f2b8abd6e7
diff --git a/dev-python/oslo-log/oslo-log-5.2.0.ebuild b/dev-python/oslo-log/oslo-log-5.2.0.ebuild
deleted file mode 100644
index 78f7cd66c4d6..000000000000
--- a/dev-python/oslo-log/oslo-log-5.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="OpenStack logging config library, configuration for all openstack projects"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.log/
-	https://github.com/openstack/oslo.log/
-	https://pypi.org/project/oslo.log/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme \
-	dev-python/oslo-config
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/oslo-log/oslo-log-5.3.0.ebuild b/dev-python/oslo-log/oslo-log-5.3.0.ebuild
index 9166896935aa..8a71c132ea1b 100644
--- a/dev-python/oslo-log/oslo-log-5.3.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-5.3.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index 1e460393aea4..53e3299ba20b 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,5 +1,3 @@
-DIST pluggy-1.2.0.tar.gz 61613 BLAKE2B f1c9d7ca593cd3eaae2f035c8e2d2da09b179991a134e0c0be17642940a853194124b638e208c32b7f8e5250d30d138f4bb79cb414573c0103e6b5024f52abc9 SHA512 b2b6a80737c06e1507eb12513ed7f5ce508fd4a139c559a3a15d9f173f4455ef3847783efb91c32eca6e26cbe37b0336467d50c5db0563d8dbd17bd825cd7407
 DIST pluggy-1.3.0.tar.gz 63670 BLAKE2B afa28641ec0a93e97fed2a03655c76077d046b05f49c4e584df3486dd007fb20296f61b001664d8cbb50d4400f1132f75d5de932caa1d3f92e349f78158d7ade SHA512 d4dbb449f533649da161d7e49f82da5800dabdace4f7aa239c412290470612a45a3ba3c50cafd7bd9ed26cb3aa14648bfa3ed3f41fc0db9ae9399fd7f5933d5f
-EBUILD pluggy-1.2.0.ebuild 674 BLAKE2B 89b0af4ba9c26d2939aaedb99af9dc090cdb131029e604e10984c359a27b09905766d102c0592d8cb9f50c90f2b3186cbb353644510b8fac04aebf05a02e4d76 SHA512 8753fbc9681071a4403546b4bc8047df53d91d3ff12479ad354fc07e221c0f09060998fd248da4f1046684f18f00c371da0d50a15819d114a82031ee5e425522
-EBUILD pluggy-1.3.0.ebuild 682 BLAKE2B 5bc15ec81ba1959c8d14b46d9fa1a75fafe345a640f2a15c4681c4373bf061bece09d48bd9d5e7faa9f117cb1beb3e210c28bd31e5056e87ede31c4f166e3588 SHA512 c919d981baa92100d7d07974426b4b9b0b2d90113fd653e1a9169c4d4311f6e9d4b62bf9b538325a1da97d5119ac598673a563ee555b29e5fe2b2572a616ee9c
+EBUILD pluggy-1.3.0.ebuild 674 BLAKE2B 89b0af4ba9c26d2939aaedb99af9dc090cdb131029e604e10984c359a27b09905766d102c0592d8cb9f50c90f2b3186cbb353644510b8fac04aebf05a02e4d76 SHA512 8753fbc9681071a4403546b4bc8047df53d91d3ff12479ad354fc07e221c0f09060998fd248da4f1046684f18f00c371da0d50a15819d114a82031ee5e425522
 MISC metadata.xml 506 BLAKE2B cdc1c868281f0140baf75a407eeea26276d7b8f8f0bcafee6393fa144fc054ecf58a812b055d7b48b7d5ab4aa5bc504d6dc567acf4336bb363c9854292d9926b SHA512 5fc4f019e2a518c815662db23bc44920558193cf639c093ec365ba120c113929bcbd9b611d6b2cb7e6057c0bd9d50dc5d1479840a6d379c4610b3ac8aa3ea1d3
diff --git a/dev-python/pluggy/pluggy-1.2.0.ebuild b/dev-python/pluggy/pluggy-1.2.0.ebuild
deleted file mode 100644
index 34e44f9f3770..000000000000
--- a/dev-python/pluggy/pluggy-1.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Plugin and hook calling mechanisms for Python"
-HOMEPAGE="
-	https://pluggy.readthedocs.io/
-	https://github.com/pytest-dev/pluggy/
-	https://pypi.org/project/pluggy/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pluggy/pluggy-1.3.0.ebuild b/dev-python/pluggy/pluggy-1.3.0.ebuild
index dd354f8f296d..34e44f9f3770 100644
--- a/dev-python/pluggy/pluggy-1.3.0.ebuild
+++ b/dev-python/pluggy/pluggy-1.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 27dc8f287f1b..f8d6c7423d0e 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,9 +1,3 @@
-DIST pymdown_extensions-10.1.tar.gz 783894 BLAKE2B debe9415329ac5eb663924697529f456fddbc2870188864741003a5f9a3e6c44741188c90db5147d65fe8570f8a2acfc70ef8e12cf7ecfce7f3f051f25ac8c02 SHA512 c7692c7688b7d9764460b274a5cf609c3638a171f8ebb10d265a0e78d1f3b7b418f9712e6d7597e091181caa82e7fca9120e388f2ee80bd9299e9b70492084af
-DIST pymdown_extensions-10.2.1.tar.gz 784912 BLAKE2B 73752d7a064d209dd107a61428b22fe00b12874e2d40f05c9f3361d83f26728b175aaa1936ae33793068d9ec56b6e54df2f9f587316a5549e86f581b420b1a95 SHA512 35a6b8b47209621982016174ee12cd59a9161f064212784c811c9a02d46e514a5bae4d830484f1e44dd6fd76dc16d21804e5e135905980c310ef496a9c8d4f18
-DIST pymdown_extensions-10.2.tar.gz 784781 BLAKE2B eb91408b0005ae417bdb781a82f2611569a5a33452eee03baf1ce22af45c502b45c3c3d034c6ba4d9b56c330fee38742ea5f08f4d1b584e6a4dcf447c719252a SHA512 37798e0d5df8c06be3f9a9d523af50f252eaf90b21332ed0c73641af5e41a4794c643ffc181513aa783544a227eaec3cb3f2d8face3a7d3dba8122de0ac9d436
 DIST pymdown_extensions-10.3.tar.gz 784920 BLAKE2B 25b859dcba00d690bea3c9830542af52391f4941e8470d541e9bc0fdad12b6f20cf7350df237962fba502dbe72c8e4934446e3e5fdb6712ef9701f3654a4fda5 SHA512 28f1942baf0ed67b4d6bf80d1ac095a034d0afecd508ce13c8a8deabde4c7f6f89895c1a0509c576fa4884fc04f8800839b4a9a622910d3ed8914e0ac7f0ca27
-EBUILD pymdown-extensions-10.1.ebuild 640 BLAKE2B 804f63296878b5a901189b5d27919da2994c00f8999fbe2b5515b6a356e629838fce8e03210bc2024dde140641812ce079724376308e91538406c728c3d5341a SHA512 3221a9dfdbf6e6d4ebe23d9132b2f5718a0515cf9d7818fdc42a413f739f1173cb3ae2cb721f427c6d13f7ee0a505e053b4203f044439382b9049c091eb68e8e
-EBUILD pymdown-extensions-10.2.1.ebuild 642 BLAKE2B 5a878c454af0f5cb0f0217db1ce029ee5b1441661605679bbcc9983f4fa72db6f144372811bc0db0d1822d8bf7fc3c02499e4244f3b0d1679ab8e13ed895b639 SHA512 5ee2e2d766f37c6f64e28971818c83d9475ceda1eba3fadd190ad5312ef67ed5a16a6ae8c15bdbccc9e0f600e763a0995c1c4beddaeede484da65eaa1b533a31
-EBUILD pymdown-extensions-10.2.ebuild 642 BLAKE2B 5a878c454af0f5cb0f0217db1ce029ee5b1441661605679bbcc9983f4fa72db6f144372811bc0db0d1822d8bf7fc3c02499e4244f3b0d1679ab8e13ed895b639 SHA512 5ee2e2d766f37c6f64e28971818c83d9475ceda1eba3fadd190ad5312ef67ed5a16a6ae8c15bdbccc9e0f600e763a0995c1c4beddaeede484da65eaa1b533a31
-EBUILD pymdown-extensions-10.3.ebuild 642 BLAKE2B 5a878c454af0f5cb0f0217db1ce029ee5b1441661605679bbcc9983f4fa72db6f144372811bc0db0d1822d8bf7fc3c02499e4244f3b0d1679ab8e13ed895b639 SHA512 5ee2e2d766f37c6f64e28971818c83d9475ceda1eba3fadd190ad5312ef67ed5a16a6ae8c15bdbccc9e0f600e763a0995c1c4beddaeede484da65eaa1b533a31
+EBUILD pymdown-extensions-10.3.ebuild 640 BLAKE2B 804f63296878b5a901189b5d27919da2994c00f8999fbe2b5515b6a356e629838fce8e03210bc2024dde140641812ce079724376308e91538406c728c3d5341a SHA512 3221a9dfdbf6e6d4ebe23d9132b2f5718a0515cf9d7818fdc42a413f739f1173cb3ae2cb721f427c6d13f7ee0a505e053b4203f044439382b9049c091eb68e8e
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.1.ebuild
deleted file mode 100644
index 9129aa82ebda..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.2.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.2.1.ebuild
deleted file mode 100644
index 4ed08497d644..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.2.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.2.ebuild
deleted file mode 100644
index 4ed08497d644..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.3.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.3.ebuild
index 4ed08497d644..9129aa82ebda 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.3.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-10.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index e22fcebb9d40..d158198b962c 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -6,5 +6,14 @@ DIST pypy-exe-7.3.12-1.ppc64le-musl.gpkg.tar 6604800 BLAKE2B 221372df3496c615472
 DIST pypy-exe-7.3.12-1.ppc64le.gpkg.tar 10967040 BLAKE2B 36e3ac01761215ea3fc189397d68ebc44e36e7e26321b4ee63523cd444b8266691ce91237a9baa6b2a658036bd4083a99b99e9937298f1a823d9cd9346ccacba SHA512 f6b9b1ff1a5bf9da56c76df4e7f1348bc09db91cdc8e981cc48dde46fa3583d2f1aba04931fa46e61c237ea76f85db0eb18537ec44b12d02a1952ea42e0991b3
 DIST pypy-exe-7.3.12-1.x86-musl.gpkg.tar 9758720 BLAKE2B 188951a20efc67031969755530edcf8a3e68711e05f37563420419b3f90f4a04ce3692ab8640693121c8ffcc507e6cfed196b261dfd34a751263203f0b602e5f SHA512 c5683f03ed4620ddf370583da3395ef691afc29cd71ece934ccf004ecac5800c29dcea7ee5b0dd1d88cea7283fc6d8efa2989d56af4fe8ab376de66e8b7569e4
 DIST pypy-exe-7.3.12-1.x86.gpkg.tar 9615360 BLAKE2B 0496855e1b745ca78692459c2287d4c69116c84ff60dff8e91eb6a8d29845201946845ec9e8431764986c6bbf58be46195091ff8aced8fe5928e3015b91ec800 SHA512 36b322d8548600b531ecbc9fb256ed068852d2a24d376a61b317fefd16b23c22ba875f4debf591516717fbcd5217ac6b9251d30027ba690fd7ec1e2dee42210b
+DIST pypy-exe-7.3.13-1.amd64-musl.gpkg.tar 12922880 BLAKE2B 8dce9b4f2e86ca93d92aac337f29aad79cb0f494cc4639cabedb5ee3b91963b127a62ec43466e41b5f443a0bd14427f60cbe7f3d70410143a6cb7bebc543f2f6 SHA512 7b8baf7fcc36b13c97a2e9e4f3e0d101537069c2685b1ecde8dce27281f7b36db49adc3cc8007caebad09f5106f42f4c840bb1f66b46ad5bf1543aad45cbca9c
+DIST pypy-exe-7.3.13-1.amd64.gpkg.tar 12871680 BLAKE2B 539d3025c42a7feec95f62ce005da7eeab05159b9750b6009230b6830a13579be336d41def05b20aacbdaef6ae585f8e0ee1f063e10e4c2c6adc55fcb12a6311 SHA512 977033104d086611452c98fe4b12b51fc6abcc49af282bc1a966a0fe92a42d04e89073f49660e032e5a7092603d8049243987a4ed10528a110cdf333dad687ab
+DIST pypy-exe-7.3.13-1.arm64-musl.gpkg.tar 10782720 BLAKE2B 90398b3859831a2bafa6a25ed18ee05e27b91c3c4b7d54e153a0dfb04e0ca4ed8e035da14d9e8743dee23c1925ec118b6b8985a64649b4ad56e46a54d70f3137 SHA512 d36e53174dcb00bd6feab4ce168dfeb8d688874a5a5fc45049cf32e89095d532635bb23cdf34a9a70f471e70003564f7117a6fcd6ab17584a72da4ec2848f4d6
+DIST pypy-exe-7.3.13-1.arm64.gpkg.tar 10752000 BLAKE2B 7dbe18bf22b503c585e4fccce8661ec3057d01aa614b806164bd1d418c0ddceb3bc7b629d3efb619b55259e5408dcf42b05c29ebffcb0b75acf845a369d80ffd SHA512 0ee6dc95200cef8d0dfc6bde77d55d548d557ca2ef27b0061c5909a964395aa5870bf3cfa689d2e696dc43c5c19fdd3d55975cd0630189a2ba3f390872dde9ba
+DIST pypy-exe-7.3.13-1.ppc64le-musl.gpkg.tar 6563840 BLAKE2B cc7938c4a9f3b80a9b7eb51402e22cca6d786d1098ecd1fe459623881822036b811d63c7b964e0360a40a8628265e2e3a88f170ac254502febf76158d41b31d4 SHA512 cef5e8fb7474a30682b4890be58ab01b7432701706982452891bfbcd67a5ba94f7a2ca5b21c6adc9ea7570a3875964e8198685d6e4aceff4871195d392a6ca11
+DIST pypy-exe-7.3.13-1.ppc64le.gpkg.tar 10936320 BLAKE2B eaacb2af2c5f62fd487893e4d97ab288ead1c81a0b3ba99782f11ab95ac525c81bc37af5093e76843a17c8ce792aa601befe51b6774908a5328fd4ad449651f8 SHA512 733ec08aa5ab055ec4983e677c8261a4b62006c88a01f0e9ff9abed45781da5144eb4acd41ed7203f74622cd35cbb89c1384ec113c915e38a8d9d81288952b19
+DIST pypy-exe-7.3.13-1.x86-musl.gpkg.tar 9656320 BLAKE2B 61f608aaaa316a64de7445fd856aedf34e11bb08d5f1d7819faa198c7014d397244acd54eb35fe95fc79ef53c5ff770f6e608a0868508422386f110c4357fb69 SHA512 0c3799d15688496ff67007323e0398e7b82becb83d77db4585b5439107f3b4244cff658b908d125d1615391265cc5add2ba5116027bf67c7603c49de54b73f02
+DIST pypy-exe-7.3.13-1.x86.gpkg.tar 9574400 BLAKE2B 29b9d82995b503f5fa933c0ab3ea988b0321768692974d232040afc1b24fb45905f1ae526f57e443110e7341ed310753e4a0ffd161979b0bdc8e6cf1374ca540 SHA512 9046ae99f4996188c04a098e5d716e885545437f5e31e1c75268b45f80d4743b1c431a2aeed990746530ce3c6077a985ff535f813fabcf2ccac91ed8dbc4f2ef
 EBUILD pypy-exe-bin-7.3.12.ebuild 1947 BLAKE2B ced9c32c68bc0d6991a3c023c5ac6f3952cae5be14c39bbaf498c2efa249715235747526090d59f6a39da4645c83551ebfebabb2a2c7a25343c5acb64d9a1d6e SHA512 3ca0ae4098385dbd208bb3d069b17f9654b2b61b8d85fc822776a91e69341a60492c101310c24fc10a7d0e68b080ce28976d1bc9d5c120dbb40d4af04a7215ae
+EBUILD pypy-exe-bin-7.3.13.ebuild 1949 BLAKE2B 144e22713546812ee4664e6c7f092188d521a4c5788f2b1473d2e0fe7ad3b49a16f6965ac4ee194e51d5b64e599b5d80f84fce2cc13b1c667f245f6f75e16847 SHA512 a6905d688350e83368fb1ab2ba273b730adf4be279b45ee3d78d2721532cfd0a1919b694be446df9c7cd2c2fbdf023614dcbd9ef5554c006b9fad0fc4f5cdd87
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.13.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.13.ebuild
new file mode 100644
index 000000000000..577201cf8c2d
--- /dev/null
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.13.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils unpacker
+
+MY_P=pypy-exe-${PV}-1
+DESCRIPTION="PyPy executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	elibc_glibc? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86.gpkg.tar
+		)
+	)
+	elibc_musl? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64-musl.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64-musl.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le-musl.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86-musl.gpkg.tar
+		)
+	)
+"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# sys-devel/gcc for libgcc_s.so
+RDEPEND="
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/8
+	sys-libs/ncurses:0/6
+	>=sys-libs/zlib-1.1.3:0/1
+	virtual/libintl:0/0
+	elibc_glibc? (
+		sys-devel/gcc
+		>=sys-libs/glibc-2.35
+	)
+	!dev-python/pypy-exe:${SLOT}
+"
+
+QA_PREBUILT="
+	usr/lib/pypy2.7/pypy-c-${SLOT}
+"
+
+src_install() {
+	insinto /
+	doins -r */image/usr
+	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
+}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 3e35c855d621..25a5a9049552 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,4 +1,7 @@
 DIST pypy2.7-gentoo-patches-7.3.12.tar.xz 5340 BLAKE2B 1a7375412087e8df02e69c80cee6d8246cc444a352323e6a49c1e1a0e6f5d662584c4cce194f03fc139f29de4ecf5d9f68cea5a8c19a720f1a51c1563804e19a SHA512 026a435377f0f04a526d4e0bef1ac832543f24ff2b39579e2cc7ca2cb3eae0415fcdb3c701fc4b85b0659a2ab17180a45469d79920262ed6dfd68d401df85fa1
+DIST pypy2.7-gentoo-patches-7.3.13.tar.xz 5340 BLAKE2B 843a7a5e4c2fd56fc4db51ba388736c0aa6593d45b145503f6428783a9fd815a77e2a06809077effced6fccf75c0dd38527a0695211852fd2a4c61b34e40c15c SHA512 cc8f6fc69f00030609a8d79f05a60b2e185141e9fc70a53b476b60a183dd0500627023658c6a57c2412f32af1db6fae91a361a4992d84e7dfbadb7eb4a98b8a1
 DIST pypy2.7-v7.3.12-src.tar.bz2 19904555 BLAKE2B be8677c0632ef331db285938ad6ffbcb1aa70f44422a1ce5ed09b5a557e68d9185a11d1c20a4a3c6cf32ab41e623a2bc7b3ab7485bf270a9a604fb8a5769bf3f SHA512 35ec35376f1e7c1a5dea9dc5bce6819a94c2df2645806c83185487587470b47ab529c25ecb8ca200505319f40789859a2919c61902b693421e2001313b46e5f4
+DIST pypy2.7-v7.3.13-src.tar.bz2 19907651 BLAKE2B ce80db193afadbc721e781cbfe3d72bfe420eef3ede408f23213ab5d87a9a42c025d3c31c742dcb55a039b618930ebc4899d704f060d294f2e492d4d754effba SHA512 deeca234abbe526102cec637dc88399f462f64ae66c38782e6f3372b484d25fa4e88b906f783ba515bed17d2e82626d1c94fd6ee9b8b64e393f9bc0f5ee2b07b
 EBUILD pypy-exe-7.3.12.ebuild 4060 BLAKE2B 5c6883e608eba8f972af83966b23dfd3e13edfeeb511d1a47f303b60746d5cb08ab9bdb9914b5b7dd2ff6ef630e15a0fca3a3c3f253e4f76aca7145ff72cf35c SHA512 d5dc8433dd88b0ae58b3283ad233dd7524acf31763e917e46ab8f837623d340f4d487a06fce679a7e91fa96cf89acf98171a423acf4b0251776f1e2abdf41c0c
+EBUILD pypy-exe-7.3.13.ebuild 4062 BLAKE2B b9437200b3738b7e2d76cc05aee4847d4b4e4757ce3631391f345a66d7dc5ed587bcff75d4c8d2d158181578800dc0aaaca794107170ead0ee0072855164cb1a SHA512 e89eea8f316311d8b84b3e493029579d66774e4f41fb6af9d6ce1696470a8d22c967375bba37cfafa1e6288a04f55f2c199311ad8cc0e5073bc915601193affa
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.13.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.13.ebuild
new file mode 100644
index 000000000000..6f7eef22f3b8
--- /dev/null
+++ b/dev-python/pypy-exe/pypy-exe-7.3.13.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs pax-utils toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+DEPEND="
+	>=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+"
+RDEPEND="
+	${DEPEND}
+	!dev-python/pypy-exe-bin:${PYPY_PV}
+"
+# don't enforce the dep on dev-python/pypy with USE=low-memory
+# since it's going to cause circular dep with unhelpful error message
+BDEPEND="
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)
+"
+
+check_env() {
+	if ! has_version -b dev-python/pypy; then
+		if use low-memory; then
+			eerror "USE=low-memory requires (a prior version of) dev-python/pypy"
+			eerror "installed."
+		else
+			ewarn "CPython 2.7 will be used to perform the translation.  Upstream"
+			ewarn "recommends using (a prior version of) dev-python/pypy instead."
+		fi
+		elog "You can install a prebuilt version of PyPy first using e.g.:"
+		elog "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+
+		if use low-memory; then
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+	fi
+
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp
+	if use low-memory || has_version -b dev-python/pypy; then
+		einfo "Using already-installed PyPy to perform the translation."
+		interp=( pypy )
+		if use low-memory; then
+			local -x PYPY_GC_MAX_DELTA=200MB
+			interp+=( --jit loop_longevity=300 )
+		fi
+	else
+		einfo "Using CPython 2.7 to perform the translation."
+		interp=( python2.7 )
+
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
+	insinto "${dest}"/include/${PYPY_PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 858e89bc0e8d..eae2b477dd95 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,4 +1,7 @@
 DIST pypy2.7-gentoo-patches-7.3.12.tar.xz 5340 BLAKE2B 1a7375412087e8df02e69c80cee6d8246cc444a352323e6a49c1e1a0e6f5d662584c4cce194f03fc139f29de4ecf5d9f68cea5a8c19a720f1a51c1563804e19a SHA512 026a435377f0f04a526d4e0bef1ac832543f24ff2b39579e2cc7ca2cb3eae0415fcdb3c701fc4b85b0659a2ab17180a45469d79920262ed6dfd68d401df85fa1
+DIST pypy2.7-gentoo-patches-7.3.13.tar.xz 5340 BLAKE2B 843a7a5e4c2fd56fc4db51ba388736c0aa6593d45b145503f6428783a9fd815a77e2a06809077effced6fccf75c0dd38527a0695211852fd2a4c61b34e40c15c SHA512 cc8f6fc69f00030609a8d79f05a60b2e185141e9fc70a53b476b60a183dd0500627023658c6a57c2412f32af1db6fae91a361a4992d84e7dfbadb7eb4a98b8a1
 DIST pypy2.7-v7.3.12-src.tar.bz2 19904555 BLAKE2B be8677c0632ef331db285938ad6ffbcb1aa70f44422a1ce5ed09b5a557e68d9185a11d1c20a4a3c6cf32ab41e623a2bc7b3ab7485bf270a9a604fb8a5769bf3f SHA512 35ec35376f1e7c1a5dea9dc5bce6819a94c2df2645806c83185487587470b47ab529c25ecb8ca200505319f40789859a2919c61902b693421e2001313b46e5f4
+DIST pypy2.7-v7.3.13-src.tar.bz2 19907651 BLAKE2B ce80db193afadbc721e781cbfe3d72bfe420eef3ede408f23213ab5d87a9a42c025d3c31c742dcb55a039b618930ebc4899d704f060d294f2e492d4d754effba SHA512 deeca234abbe526102cec637dc88399f462f64ae66c38782e6f3372b484d25fa4e88b906f783ba515bed17d2e82626d1c94fd6ee9b8b64e393f9bc0f5ee2b07b
 EBUILD pypy-7.3.12.ebuild 6979 BLAKE2B 686a1e5b5821a0c9552345736bb20bc508840934979c66c3d2199c17f1fd7066dbfabaf1f11925f38cc508efe2390690306fecc967088a187c4ff470fa0f28bc SHA512 1dc67d9882f9a007053b75e39bda286c86aa8a4f3cd010939da3ea056a0c343f04b3958ffbe55d0faeff6f4499bf53ab12097a9fbfae9c079ce687675032529b
+EBUILD pypy-7.3.13.ebuild 6981 BLAKE2B 08b2bbdf962d3d7daf534b56da6f0f85de7846c785fde3c69a61cfcbefde073f9f5ea28bf1aa57c80f9c8c91d757a59a652584a0e8fd816279fbf5a09f461f78 SHA512 4b6205c8aa6b27fdbcd117ff24cad1bc447d8821b0ca78befdfa6e06758f36e1f30c1dd1f2daf1bbeb53841255d36c3ab261162afc7e1bf0049c8a11d0bb9fde
 MISC metadata.xml 565 BLAKE2B 956a62e9d3632a7ab9ade67527bae54fe0b58d79a6c2f26dc7017a6b8d337f7e5a155b747f24b98f345eb9e1d15c3f38d8530212ad16cfa5292d6cb1ecbf3e91 SHA512 6dd5bc7712533a926b7efdba10c3bea32c813d703916f6bf152ff14f7561cdc466354c8fdbb9640afe415daa3cf2d9365351261e89b8aadfae7b74afd48ae061
diff --git a/dev-python/pypy/pypy-7.3.13.ebuild b/dev-python/pypy/pypy-7.3.13.ebuild
new file mode 100644
index 000000000000..a5164317e321
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.13.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils python-utils-r1
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 full-stdlib gdbm +jit ncurses sqlite tk"
+RESTRICT="!full-stdlib? ( test )"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
+		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+	)
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy-c - <<-EOF
+			import sysconfig
+			print sysconfig.get_config_var("SOABI")
+		EOF
+	)
+	[[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	einfo "Generating caches and CFFI modules ..."
+
+	if use full-stdlib; then
+		# Generate Grammar and PatternGrammar pickles.
+		./pypy-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+			import lib2to3.pygram
+			import lib2to3.patcomp
+			lib2to3.patcomp.PatternCompiler()
+		EOF
+
+		# Generate cffi modules
+		# Please keep in sync with pypy/tool/build_cffi_imports.py!
+		cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource )
+		use gdbm && cffi_targets+=( gdbm )
+		use ncurses && cffi_targets+=( curses )
+		use sqlite && cffi_targets+=( sqlite3 )
+		use tk && cffi_targets+=( tkinter/tklib )
+
+		local t
+		# all modules except tkinter output to .
+		# tkinter outputs to the correct dir ...
+		cd lib_pypy || die
+		for t in "${cffi_targets[@]}"; do
+			# tkinter doesn't work via -m
+			../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+		done
+
+		# Verify that CFFI module list is up-to-date
+		local expected_cksum=2d3acf18
+		local local_cksum=$(
+			../pypy-c - <<-EOF
+				import binascii
+				import json
+				from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+				print("%08x" % (binascii.crc32(json.dumps(x)),))
+			EOF
+		)
+		if [[ ${local_cksum} != ${expected_cksum} ]]; then
+			die "Please verify cffi_targets and update checksum to ${local_cksum}"
+		fi
+
+		# Cleanup temporary objects
+		find -name "_cffi_*.[co]" -delete || die
+		find -type d -empty -delete || die
+	fi
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+
+		# broken by expat-2.4.5
+		--ignore=lib-python/2.7/test/test_minidom.py
+		--ignore=lib-python/2.7/test/test_xml_etree.py
+		--ignore=lib-python/2.7/test/test_xml_etree_c.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	if use full-stdlib; then
+		doins -r include lib_pypy lib-python
+
+		# replace copied headers with symlinks
+		for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
+			dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+		done
+
+		if ! use gdbm; then
+			rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+				"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+		fi
+		if ! use sqlite; then
+			rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+				"${ED}${dest}"/lib_pypy/_sqlite3.py \
+				"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+		fi
+		if ! use tk; then
+			rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+				"${ED}${dest}"/lib_pypy/_tkinter \
+				"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+		fi
+	else
+		# install only the absolutely minimal subset of modules needed
+		# for pypy3 build
+		local lib_py_modules=(
+			# base modules needed to even start pypy (and import site)
+			codecs.py
+			copy_reg.py
+			encodings
+			genericpath.py
+			linecache.py
+			os.py
+			pkgutil.py
+			posixpath.py
+			re.py
+			runpy.py
+			site.py
+			sre_compile.py
+			sre_constants.py
+			sre_parse.py
+			stat.py
+			string.py
+			sysconfig.py
+			traceback.py
+			warnings.py
+			UserDict.py
+
+			# needed for python_optimize
+			compileall.py
+			getopt.py
+			py_compile.py
+			struct.py
+
+			# needed for rpython
+			argparse.py
+			atexit.py
+			base64.py
+			bdb.py
+			bisect.py
+			cmd.py
+			code.py
+			codeop.py
+			collections.py
+			colorsys.py
+			contextlib.py
+			copy.py
+			ctypes
+			dis.py
+			fnmatch.py
+			functools.py
+			gettext.py
+			hashlib.py
+			heapq.py
+			inspect.py
+			io.py
+			json
+			keyword.py
+			locale.py
+			logging
+			new.py
+			opcode.py
+			optparse.py
+			pdb.py
+			pickle.py
+			platform.py
+			pprint.py
+			random.py
+			repr.py
+			shlex.py
+			shutil.py
+			StringIO.py
+			subprocess.py
+			tempfile.py
+			textwrap.py
+			threading.py
+			tokenize.py
+			weakref.py
+			zipfile.py
+		)
+
+		local distutils_modules=(
+			# needed by site
+			__init__.py
+			errors.py
+			sysconfig.py
+			sysconfig_cpython.py
+			sysconfig_pypy.py
+		)
+
+		local lib_pypy_modules=(
+			# needed by site
+			_sysconfigdata.py
+
+			# needed by rpython
+			cffi
+			_ctypes
+			_ffi.py
+			_functools.py
+			_sha.py
+			_sha256.py
+			_sha512.py
+
+			# NB: we're deliberately skipping _hashlib to avoid some deps
+		)
+
+		cd lib-python/2.7 || die
+		insinto "${dest}/lib-python/2.7"
+		doins -r "${lib_py_modules[@]}"
+		cd - >/dev/null || die
+
+		cd lib-python/2.7/distutils || die
+		insinto "${dest}/lib-python/2.7/distutils"
+		doins -r "${distutils_modules[@]}"
+		cd - >/dev/null || die
+
+		cd lib_pypy || die
+		insinto "${dest}/lib_pypy"
+		doins -r "${lib_pypy_modules[@]}"
+		cd - >/dev/null || die
+	fi
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	local -x EPYTHON=pypy
+	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index bbb7a7144357..853df1144e37 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,2 +1,3 @@
 EBUILD pypy3-7.3.12.ebuild 583 BLAKE2B 9308115fd68cc96beed284dcd1eec6f3a404254b422cd7f88dbf6ffbc30e69050d3613bcc34151a4fd64375d1901b0899e32f42d843c68ab281c7ed10c5b9611 SHA512 df2c8d9903a9e772bce5c5d93203a31b68ee8e413ce5b721d6c59d9542f65ff13c9676ee22080cf1b361cb5762dfc22d1a5ee3a498c6aa2ba6d13731e9cd09de
+EBUILD pypy3-7.3.13.ebuild 585 BLAKE2B 5c5704a58e65e6d2bc4272988aaf0ca2e4b2bb21aa316c629ebb8594500743add0a901704f0a2ded2aa803841d4ec16a754884f435ece9a8682da1a70a1a2bff SHA512 3513a60f7264acf12d10d9b1921e843460db4aadaca2b0137a624a870a2ee31a44c52ed065d0cab4a9c35c1c24fbaaffbfd1dab838d1e12117ee53e528e8e481
 MISC metadata.xml 317 BLAKE2B 9da451fe362dc5c1f6b3412b33065ab6e316e5ae49fd8e6a8e7485cd5cb7440c316c7c5c9b504a69c4f21a6370317edfe11f388238665133b8557a26acbfe1eb SHA512 96039ea2033b920e595e05c8749ee7e316e951bc6ff544a2f4d175d862cf7537401cbba1d4535f20245bbcac32d5ce1261d04aee412953401b513ecc5e7217bc
diff --git a/dev-python/pypy3/pypy3-7.3.13.ebuild b/dev-python/pypy3/pypy3-7.3.13.ebuild
new file mode 100644
index 000000000000..ecf195f8f782
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.13.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYVER=3.10
+DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
+HOMEPAGE="
+	https://www.pypy.org/
+	https://foss.heptapod.net/pypy/pypy/
+"
+S=${WORKDIR}
+
+LICENSE="MIT"
+SLOT="0/pypy310-pp73-384"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+gdbm ncurses sqlite tk"
+
+RDEPEND="
+	=dev-python/pypy3_10-${PV}*:${SLOT}[gdbm?,ncurses?,sqlite?,tk?]
+"
+
+src_install() {
+	dodir /usr/bin
+	dosym pypy${PYVER} /usr/bin/pypy3
+}
diff --git a/dev-python/pypy3_10-exe-bin/Manifest b/dev-python/pypy3_10-exe-bin/Manifest
index 43bcc316b968..593eec9684f5 100644
--- a/dev-python/pypy3_10-exe-bin/Manifest
+++ b/dev-python/pypy3_10-exe-bin/Manifest
@@ -6,5 +6,14 @@ DIST pypy3_10-exe-7.3.12_p2-1.ppc64le-musl.gpkg.tar 6502400 BLAKE2B fb3c6cf03114
 DIST pypy3_10-exe-7.3.12_p2-1.ppc64le.gpkg.tar 10250240 BLAKE2B 277add3cb777d2eb75538ddd73da80108bde6f2f6fc5fa3574c4f62a6bce4916e1f04bcb03407d946db90e09a0e873ee8d7d11e853fac2a0db9651d8ec0b0855 SHA512 44e6c2f38e31b34b9d74492464cdf56e0be5e3df06b7c247411668c04519d9c17fa7f8d49784e53484a3e59dc20b1ded4a0ae81f9bdcb87654d8107e798e1597
 DIST pypy3_10-exe-7.3.12_p2-1.x86-musl.gpkg.tar 8826880 BLAKE2B 1e4e8cf6448410d256f625e68db6c7d82d99bd7f64bfec6572c4bc99b55e78fd0ca4af9eddddfd872837dfa971d065d4f52f792d4c12ab3ca3c44fdb732e7452 SHA512 cd22319feb39f3a2f8e5d8796f9dae82dc9ca808ea5579bdb1f12a6daf9f9a7adc2e33accf6814a4e0e762bc03569f0c0539b99d4eba3e6cec085e45e5d3d702
 DIST pypy3_10-exe-7.3.12_p2-1.x86.gpkg.tar 8826880 BLAKE2B 7fb7af7e5bd07a91312a21f443a1c58ad828d66a29e67af2b39162e2d7c74965b1f8dfb52169fd71b6b6466aa20ea579723d27520c019bb46211f34e74c4abc2 SHA512 fa7f5cd600efd4f26a7abe27b482b0277a10de7bceaf12d781a96e9916cb37d7166f5afc6c13d941aecda51783e9e2ad853076545575daec14fba50b10fca3ab
+DIST pypy3_10-exe-7.3.13-1.amd64-musl.gpkg.tar 11898880 BLAKE2B ac08e64b7a3a3d1b9c6f4242e373a3c836933c46619f17ee584fb2d1f9b2ea59934d143418c0a410cd3d3cd74621f82ee941fc6ba5e9f54aab94159b2dc43424 SHA512 5b058142664ac7c5cce09eaf3e6e052190336f4a7ef991fb02f6da03258a01f2d8f351aafeed7d49113bed263e2950f03e91c1c41c0c755b7c7c92daa1dbd2d0
+DIST pypy3_10-exe-7.3.13-1.amd64.gpkg.tar 11898880 BLAKE2B c218dcddfd5e532ed25f49c90ada70352af93ba4cd5ccb99d8b79b6cd006e3848cda6d282f4581b64b239c9f298a334ce54ca51e529fab7313caa09ec5a58f02 SHA512 4c64d9187bfc9cba096401ee4e2acae61d8ccf661c34ba43ced66bd1778abc60496626082d4ab57aa4ad16360692f9c2469124741290294754a0607849885ffe
+DIST pypy3_10-exe-7.3.13-1.arm64-musl.gpkg.tar 9891840 BLAKE2B 36eb4e1d801da9dc47335e8202d83088c1f06db0c9627e04724bb9e10cd12335d103fa27ada7151d687988320160466b2c7733f48875e76e50204dbd1dd54e3b SHA512 eb526efe6a4d54bd39455baf412cf8bf63c73f48b15813d176f51395b120e9b89c6f2914204e6ffd4658c1e232f1c07b6b4276cb0918c498cd8d03ab3410ba4a
+DIST pypy3_10-exe-7.3.13-1.arm64.gpkg.tar 9871360 BLAKE2B ac8f2e53f315e2b393698cad78d7a544cbce20294b47e7aba5dee9328f18177cfb77b7e7a99a25502399e354cdf8a68d003c9b54a82b1fe6d7e80b0977357c51 SHA512 ec0e95ed428f80ef1c39efa2c22c0cc34996df8d5bcf924d843ac6b876cb22fe3b3e89bb86d520f08b9da9e28c66c9a9c6bffa5c6cb0aeb827186455ca121bb2
+DIST pypy3_10-exe-7.3.13-1.ppc64le-musl.gpkg.tar 6512640 BLAKE2B 9611d47f890ccd237fa441aa6c741566cec70b2bbe0c7921530b39cfbba8eb918fb68d89274bf1b3dacd2bcc4d44ff56b851b78fa4e96f446e4f64cf3ea58d1e SHA512 2c06eb7a0795167a292fc5729bf2602c9ec1c166d2bb3b6c63dbb588be736cd900ab03bf1339f0b3e555e7c67b3b6d43d53028961606e1a346662e9f37cc405a
+DIST pypy3_10-exe-7.3.13-1.ppc64le.gpkg.tar 10219520 BLAKE2B 95ccc9bf239e77e6cd8821ba45fa1df36f4986b8b9dbe5b3291173a5a1c421eb57c9b7070b63be494e054c76ed233cd87f163a21368b404a853375d14404efa5 SHA512 0f43fe01ce92ee6d714067fe60035e3f9595f18b695004e7a0ad7ef82af9bfb46c96978b45eb5e85424b0c700a2d3672dfd8c63215dc98acf7471f0c174f4898
+DIST pypy3_10-exe-7.3.13-1.x86-musl.gpkg.tar 8744960 BLAKE2B 362a7b6d3ed33623bb3adb94e62498b8c8794cef1354a3fd5579b2e647a8a74f38b44d470598d06a1a2645fee7b70a711f50f8c5e7648eae7e3a97b105fed632 SHA512 8f0109ed58a1344f44cb94aa360b2be82bff885a3fb1984c816d12069d9517e6a49c675d7eeb36d8f6c6869db13d4ec002a12795e72977e296122bf62f21f53f
+DIST pypy3_10-exe-7.3.13-1.x86.gpkg.tar 8796160 BLAKE2B 9a838af1cd63249a55cc7f0849ddd783bd425d4c3a253583b590162ba1dccc5a8811222fb45121999a08a0935f9d61142efb6bbbf71a30e574f21a7b2e1e51b7 SHA512 3d67657e5ba8628ea6049bf74d5da29b32690e997993c37c7bd1166d6460bea8153c52bfea25066a38e7fe97b4612d64fd98b70c3b958a3862603299719bcbda
 EBUILD pypy3_10-exe-bin-7.3.12_p2.ebuild 2031 BLAKE2B 65ea2b8a8f54c548f634ddbafb197a3ed57171b0b1771374d9051b5dfd6812e5a02e4c4183880eaa3db12dee1f801359c5172273a71efbf6a4d6da5ebea45625 SHA512 90e0593f4fe6afb7ee92b43868db99fdd6793fe406dd135dab16862c772d6a152d7d1d9992db69d5d50698f559dbd8f2e70659acf7e7bd2c5051182d0f6400c0
+EBUILD pypy3_10-exe-bin-7.3.13.ebuild 2033 BLAKE2B 0fdf8bd677b59278990ec771a932c461d1a425717173cbf780b9496510b774be8fcabffb6ea732d772b7b5ce0960242680c373ae73f225cc1daea9a022262c93 SHA512 f9b07b1249a97f2bdb96fcb4193049a915b3e769dec9a7c0b6755e48d726cb7ff0e8bf9c8bef2c6418365d9279251a82c2ed8fab59cc54de42eaff169dfe3534
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.13.ebuild b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.13.ebuild
new file mode 100644
index 000000000000..77878f3bc763
--- /dev/null
+++ b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.13.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils unpacker
+
+PYVER=3.10
+MY_P=pypy3_10-exe-${PV}-1
+
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	elibc_glibc? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86.gpkg.tar
+		)
+	)
+	elibc_musl? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64-musl.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64-musl.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le-musl.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86-musl.gpkg.tar
+		)
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# sys-devel/gcc for libgcc_s.so
+RDEPEND="
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/8
+	sys-libs/ncurses:0/6
+	>=sys-libs/zlib-1.1.3:0/1
+	virtual/libintl:0/0
+	elibc_glibc? (
+		sys-devel/gcc
+		>=sys-libs/glibc-2.35
+	)
+	!dev-python/pypy3_10-exe:${SLOT}
+"
+
+PYPY_PV=${PV%_p*}
+QA_PREBUILT="
+	usr/bin/pypy${PYVER}-c-${PYPY_PV}
+"
+
+src_install() {
+	insinto /
+	doins -r image/usr
+	fperms +x "/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3_10-exe/Manifest b/dev-python/pypy3_10-exe/Manifest
index 9b3fb5f055c7..e8f6da51dc52 100644
--- a/dev-python/pypy3_10-exe/Manifest
+++ b/dev-python/pypy3_10-exe/Manifest
@@ -1,4 +1,7 @@
 DIST pypy3.10-gentoo-patches-7.3.12_p2.tar.xz 7184 BLAKE2B dae373bee65ede20c1e8bc29faedd5413c832bd105045d6953c8c1eca99955de1bab5dfcddacc612874616dabbb58921bebddc2a62177edc822247e6c2eba9c7 SHA512 b4476dc96dfd79a15218e2b7b60f289abeb10605e01a96746c04b9449c201aa8ee032dc3145c36b0b64d07e3948e828b49a874132d595b26e4dd95140d428942
+DIST pypy3.10-gentoo-patches-7.3.13.tar.xz 4776 BLAKE2B 9f0ef159c8aa2d3edb5ee0e14be694c4a7c1165d70b16e9b13b6e59da7334354cc8593186a2ff47d4a0ce8c76abdf4a3c12ec3ffdd7a90cc4f30b39c259c3ee7 SHA512 86bfbf7f26f259c0850074c9062544ee091f7a65359cb17dae3ec287841e7a812d7185cb552f3546acdde3965efe0e6c0fb728c30b64779fca10be2f7c4d634f
 DIST pypy3.10-v7.3.12-src.tar.bz2 23009064 BLAKE2B ad45d90de9ae51803ebcfa202763889f92f7e5c2939331433a496e53ca67dd6eeaf9c61e16cb648945409dff3c6dd6b8a2a01dfe1bed6cd6a9df98f112bff181 SHA512 080520c7de267e17a2823f06cd0a15c108a2c32fc296d6e24782050eb546fa74852d948ede2c381dba110774121b20efc3a07b553acd0ac0db4a844dfc09069e
+DIST pypy3.10-v7.3.13-src.tar.bz2 23067819 BLAKE2B 6e2bfd83bcf16feef006dad39ab6d8f452418ee6bc4043edaa590db702f39275e775004bdba762736a901da94cb5274cd34f2811461048d46ac0f4af04158702 SHA512 16fbc76558152b3eadca999d56197a6bf906cbb7bb75035ccd3501372af0f0c22533d22ba231a40b7c02afa11f0d692a6ae85ba6d5e1607b737b8c68209b7c43
 EBUILD pypy3_10-exe-7.3.12_p2.ebuild 2638 BLAKE2B a6b9999c39184fa147bba761c6ac332faac94aee06063a9c042c6e8c8bd0a118fe5f617686878bfb334a713dc6eae2052b453d7a936a9c015f130785e0a040d0 SHA512 b02f3c5dfa9ec42443ca971c585a7b3525df8ca04af957e939f8032d5e35492aa8b45de179ebdfdcb691a9fbeedc8bb927f12f44cfbd13ce0317ee2a39cc490c
+EBUILD pypy3_10-exe-7.3.13.ebuild 2640 BLAKE2B c07cd82f2347246b4a9932f1579ff97ba8bfbe352eaad0de73060484d9c1e9c8e3dfdf5bb4db72a6dc965050cef95561deb217b5bfb34bd9f3efa93da89e6a83 SHA512 030317b7de10bd8b5efad925e9cabaeab1cb8b02e0e5b3cda5b743836247c8b7612e521b8e7349a09d183b6b2e3260713920391532625bfb097f067ebcc43fbb
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.13.ebuild b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.13.ebuild
new file mode 100644
index 000000000000..a9b71592d810
--- /dev/null
+++ b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.13.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs pax-utils toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+PYVER=3.10
+MY_P="pypy${PYVER}-v${PYPY_PV/_}"
+PATCHSET="pypy${PYVER}-gentoo-patches-${PV}"
+
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/expat:0=
+	dev-libs/libffi:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libintl:0=
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${SLOT}
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-python/pypy
+"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+		--withmod-bz2
+		$(usex ncurses --with{,out}mod-_minimal_curses)
+	)
+
+	local interp=( pypy )
+	if use low-memory; then
+		local -x PYPY_GC_MAX_DELTA=200MB
+		interp+=( --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	cd "${T}"/usession*-0 || die
+	newbin "testing_1/pypy${PYVER}-c" "pypy${PYVER}-c-${PYPY_PV}"
+	insinto "/usr/include/pypy${PYVER}/${PYPY_PV}"
+	doins *.h
+	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3_10/Manifest b/dev-python/pypy3_10/Manifest
index 4d8a2ac1f718..a8f940e27ce0 100644
--- a/dev-python/pypy3_10/Manifest
+++ b/dev-python/pypy3_10/Manifest
@@ -1,4 +1,7 @@
 DIST pypy3.10-gentoo-patches-7.3.12_p5.tar.xz 15404 BLAKE2B d9aa579b82f6bfafc3bdbd1f818d9cc85e3d33e6e72ec8dd65486e6239184dbd6720af1819493016c03e0898dec0c4f4fe361ef4ecdc63a365bc37a9452f1d2a SHA512 a705dd608d2a0027979d20301ec23aebc4a1ff20a826f2572fbdd702b079303797926e3908fd2afd7d4b0d165ffc1f4988a1c5181dd0f8ce7a7a2cc725630e23
+DIST pypy3.10-gentoo-patches-7.3.13.tar.xz 4776 BLAKE2B 9f0ef159c8aa2d3edb5ee0e14be694c4a7c1165d70b16e9b13b6e59da7334354cc8593186a2ff47d4a0ce8c76abdf4a3c12ec3ffdd7a90cc4f30b39c259c3ee7 SHA512 86bfbf7f26f259c0850074c9062544ee091f7a65359cb17dae3ec287841e7a812d7185cb552f3546acdde3965efe0e6c0fb728c30b64779fca10be2f7c4d634f
 DIST pypy3.10-v7.3.12-src.tar.bz2 23009064 BLAKE2B ad45d90de9ae51803ebcfa202763889f92f7e5c2939331433a496e53ca67dd6eeaf9c61e16cb648945409dff3c6dd6b8a2a01dfe1bed6cd6a9df98f112bff181 SHA512 080520c7de267e17a2823f06cd0a15c108a2c32fc296d6e24782050eb546fa74852d948ede2c381dba110774121b20efc3a07b553acd0ac0db4a844dfc09069e
+DIST pypy3.10-v7.3.13-src.tar.bz2 23067819 BLAKE2B 6e2bfd83bcf16feef006dad39ab6d8f452418ee6bc4043edaa590db702f39275e775004bdba762736a901da94cb5274cd34f2811461048d46ac0f4af04158702 SHA512 16fbc76558152b3eadca999d56197a6bf906cbb7bb75035ccd3501372af0f0c22533d22ba231a40b7c02afa11f0d692a6ae85ba6d5e1607b737b8c68209b7c43
 EBUILD pypy3_10-7.3.12_p5.ebuild 6027 BLAKE2B 9f9310a65a17ed5cf3cb74c4158ab922a6a3b582b582ccf354f771491ebb28c632cf71744fcc2a783ba153438b11faadf5f48f1fbba44a01d0da433b728491cf SHA512 638cc9f939341d93489fcce30acec54ef8a03b3af0c6418bd6ef353e901270cba10cc9c36268042fb331b8e1dfb94b49e1ef544b5719e954b0146064e1573c86
+EBUILD pypy3_10-7.3.13.ebuild 6029 BLAKE2B 3e45315cb8f22bf5304ee3a75c672a72f85824023ef6c9c7bbd6354ce7484abe142e2cf79a4291876c1e1e20df95d6571021d2655913ff0ffe771ca7d31ce2cf SHA512 416cbc568f2d0d9acdd9efd39843a6e451fdc8a11448b527eb1a6a700a06f745e7815122226fded2ea0837bd988b1c4786ba7bc5ef8a60ec8e01244b14d8ce4e
 MISC metadata.xml 531 BLAKE2B 0f727c7ced9fb24ba0dc0b41d51c177b3711de33b838bf46cfdde5d8b751de9694873c13fe8153747f2cb533c078c54f004ee84b1c3c57b6f8d62128ffb9dba2 SHA512 331b66647a58047ded4bcf1529e3ca16b21cbb37afa82d8be0a4b6ad605e17bf3f1478fad1ea3b9c970bdf5162cb41e6adcb029a261fcbf894e807998b9219f6
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.13.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.13.ebuild
new file mode 100644
index 000000000000..c3cd1b2bb121
--- /dev/null
+++ b/dev-python/pypy3_10/pypy3_10-7.3.13.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils python-utils-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+PYVER=3.10
+MY_P="pypy${PYVER}-v${PYPY_PV/_}"
+PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
+HOMEPAGE="
+	https://www.pypy.org/
+	https://foss.heptapod.net/pypy/pypy/
+"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy310-pp73-384"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
+# many tests are failing upstream
+# see https://buildbot.pypy.org/summary?branch=py${PYVER}
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
+		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-lang/python-exec[python_targets_pypy3(-)]
+	dev-libs/openssl:0=
+	dev-python/gentoo-common
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!~dev-python/pypy3-7.3.12_rc1
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	mkdir bin || die
+	# switch to the layout expected for cffi module builds
+	mkdir include/pypy${PYVER} || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
+	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
+	pax-mark m pypy${PYVER}-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy${PYVER}-c - <<-EOF
+			import importlib.util
+			import sysconfig
+			soabi = sysconfig.get_config_var("SOABI")
+			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
+			print(f"{soabi}-{magic}")
+		EOF
+	)
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	# Add epython.py to the distribution
+	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate sysconfig data
+	local host_gnu_type=$(sh pypy/tool/release/config.guess)
+	local overrides=(
+		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
+		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
+		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
+		TZPATH "${EPREFIX}/usr/share/zoneinfo"
+		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
+	)
+	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
+	local outdir
+	outdir=$(<pybuilddir.txt) || die
+	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+		import lib2to3.pygram
+		import lib2to3.patcomp
+		lib2to3.patcomp.PatternCompiler()
+	EOF
+
+	# Generate cffi modules
+	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
+	# (NB: we build CFFI modules first to avoid error log when importing
+	# build_cffi_imports).
+	cffi_targets=(
+		pypy_util blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma posixshmem
+		testmultiphase
+	)
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Verify that CFFI module list is up-to-date
+	local expected_cksum=63d4659f
+	local local_cksum=$(
+		../pypy${PYVER}-c - <<-EOF
+			import binascii
+			import json
+			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
+		EOF
+	)
+	if [[ ${local_cksum} != ${expected_cksum} ]]; then
+		die "Please verify cffi_targets and update checksum to ${local_cksum}"
+	fi
+
+	# Cleanup temporary objects
+	find -name "*_cffi.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
+	insinto /usr/lib/pypy${PYVER}
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy${PYVER}
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy${PYVER}
+	rm -r "${ED}${dest}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${ED}${dest}"/ensurepip || die
+	fi
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/sqlite3 \
+			"${ED}${dest}"/_sqlite3* \
+			"${ED}${dest}"/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/{idlelib,tkinter} \
+			"${ED}${dest}"/_tkinter \
+			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
+	fi
+	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3_9-exe-bin/Manifest b/dev-python/pypy3_9-exe-bin/Manifest
index dcfabcbff5b7..e3f61ba6f7ce 100644
--- a/dev-python/pypy3_9-exe-bin/Manifest
+++ b/dev-python/pypy3_9-exe-bin/Manifest
@@ -6,5 +6,14 @@ DIST pypy3_9-exe-7.3.12-1.ppc64le-musl.gpkg.tar 6359040 BLAKE2B 44c5c98a1b21e136
 DIST pypy3_9-exe-7.3.12-1.ppc64le.gpkg.tar 10106880 BLAKE2B fb6b6520b30ef7db9be1737b4b09a793f6312e37a26aff40e60b509c9b90356dbe376da2679891c4e6a1e469e2877ff5791b25955f25f39d1ad698760d288662 SHA512 3ef689bce8b30e50eef81da6ce6989540d2008b214074933d71bfcb9622ab2d233dc24d36db4b94a4940546b5c398cfd726bec9d82515326cf18507ed9a4c1a5
 DIST pypy3_9-exe-7.3.12-1.x86-musl.gpkg.tar 8775680 BLAKE2B 159b68f1ff2b27ec172dd3feb2eb1e44e30ab16e9bfe0dce887e79eb8cc2ceb438735614f9b1681976fc6304fef798cac23cc81379edd84bfcbbcb65280aada7 SHA512 86b91e6323b8e25af30bc237eeda24f213592b5d2a6f52a89e71cdcb6b83a2b1b9ff35f46ee5e4a50d74852f1a2075749f775ff1a3ce02cd05f8e9e13f14a03e
 DIST pypy3_9-exe-7.3.12-1.x86.gpkg.tar 8714240 BLAKE2B 60847cfad5d5c8d988ab3b4f79c508e47445ab8321fa4700c3bfc3727a57d55a201bff0d74740e9ffc5d2e679bb1653b81ab22a35f8fb71bfb43c2d1add5e4c9 SHA512 bc04225b35b82b917d8186c1ed7fa892beaedcafb831f1eb6a134f54778ff973888d51f9107a892c7d6a3fbfc7c792f4089ba9e76fcdb18b6f1d53d98b9037d3
+DIST pypy3_9-exe-7.3.13-1.amd64-musl.gpkg.tar 11765760 BLAKE2B da943b5076815132a99de6d7a4a5f7c0ddb468802fa53a9c5348ac9447562e1716c171dd0cddba6445e6e284562bf662e069444b85054a6d98b5d15c48d6a1ee SHA512 a26e835001728b31128a9cb485575a179de040ac0a6f77ac7fc80520c74c902b98011433aad49834cd86ad877917b9a5ad057dee328b9e15a8a2d68054e243ac
+DIST pypy3_9-exe-7.3.13-1.amd64.gpkg.tar 11745280 BLAKE2B 2bfeec0f00e099b1ce41436943dba305f12d39802237b9da6749c06a82f5dfab52b06286fa7cdc6314b0c48c5bacd458dd304386a16c4061d40120c2ceac8f93 SHA512 1dbff0d9ba0e5309e50d7d6c6d0fc043c6ddad55a2eb4d8fa4c12146c3577d8f5d3046949434c4bea03c654fe1a435133add567a1adf8bfa30e1519a739fa8eb
+DIST pypy3_9-exe-7.3.13-1.arm64-musl.gpkg.tar 9779200 BLAKE2B 3f0e43c0a5e948fece7b3a338d2ce5d326efbeabef4a876678ee37317c022b156d59bb2f3eb7909476abc869616806b0c0da0a6170d9fe2bfa00a689b315779e SHA512 539284698c256d60e3f34190d5cfd54999574e7d5ccb37a3695a7e08dc5018f680215fbad4b6118c11d9606ec65e5d79bcbcd1e02264b989bde4b85d683aaff6
+DIST pypy3_9-exe-7.3.13-1.arm64.gpkg.tar 9799680 BLAKE2B bd32484e9a576bcf2c36df0558a08eddde37b89d7f4e9aa86db61db7646a3adb4a5984f8dcbdef0135c8507a92b367047c77fdf90a5df438ee3c740aee9c2125 SHA512 cbb6a64452ffa80e2cb9d3c9a24f24ee4b7f0718e48ae03bbbe7a2dffbc200fff83c43b11c2b226392850c898ca7ce6427256354eceb9a4260d6633815a84319
+DIST pypy3_9-exe-7.3.13-1.ppc64le-musl.gpkg.tar 6389760 BLAKE2B 1eb0a9aed7e282277fc8afaee1cb3db20f93363fb93c16b69c1398b6a859bcddaab1e219eccfee466bff657ef253f826886bc13cbc034b885314200d9b9ec9be SHA512 48f1655a610b3a1fac8b8d559659ae524e57535e1a72c0daa4d2742119de6172f2d81c4f28cee90bbf7c43b1de3350dfff74b0d50107afd17009cd10c7223632
+DIST pypy3_9-exe-7.3.13-1.ppc64le.gpkg.tar 9963520 BLAKE2B 07e02711f40e336077162887f1e39e761c295ef13300be46871082a4ecc998bedabbca38aba2a22d76899dd367d25194cf60f5ebe75fd89306c6661beaf4383e SHA512 939850b6d1c4acf634e9fb7eacabefb4888938fda2e333dd658e46304b281619b737cf3b5c1969c4114269a5a2ad90a193a1e7ca3bf57d67c4b777d308997cdf
+DIST pypy3_9-exe-7.3.13-1.x86-musl.gpkg.tar 8704000 BLAKE2B 22e5b403fe30d147d4eeff43b4ff010f5234a759a4383d2131a04e871039ac19f0c9918f43d2958554c0d25c2a1ad5532ab90a11bb2b401ec00f804b8a4f0b58 SHA512 3e9f5f3529473beaa13e1c473743449d08eb636f45fe6f94ecd5dc3560f2b48bd46ba9dc7aef9fbb54c94fd822e1835f0b58b611522a5349d54e5c509a5c1384
+DIST pypy3_9-exe-7.3.13-1.x86.gpkg.tar 8642560 BLAKE2B c5f481f79ba67c5250d6d72d3582ff72be3f55516f14acbfe6720b65d7d6b1464c9a2703f7bb75e9479c5a1e83b07f0c6fa628a55a019eeb9ac939cb68275e99 SHA512 0eadc7cf710c2c02ef9c0ba7ae0c45a9055bb65f0f341d5039e41934d3217b0cd92ee169569205a7b14217f92e91da9b8d376b0dfb25c6c41be150771711ba36
 EBUILD pypy3_9-exe-bin-7.3.12.ebuild 2022 BLAKE2B 5e49d281eb806dcf898d160fc9c9ad689b56c09b1c112cbd2e45515bbe83d189653ca4be70fc806d1a46ada3a87199f9aac3905dab8c238361bdd98f62c4cfc3 SHA512 534720a8d7226460559d01a43c9301b19010b6a54560bba0068fdf753256ce68f8b755c12969fcfde426dce9c3d2a79d5d38db5777f0e53c9ed4c407e4ccb43f
+EBUILD pypy3_9-exe-bin-7.3.13.ebuild 2022 BLAKE2B 5e49d281eb806dcf898d160fc9c9ad689b56c09b1c112cbd2e45515bbe83d189653ca4be70fc806d1a46ada3a87199f9aac3905dab8c238361bdd98f62c4cfc3 SHA512 534720a8d7226460559d01a43c9301b19010b6a54560bba0068fdf753256ce68f8b755c12969fcfde426dce9c3d2a79d5d38db5777f0e53c9ed4c407e4ccb43f
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3_9-exe-bin/pypy3_9-exe-bin-7.3.13.ebuild b/dev-python/pypy3_9-exe-bin/pypy3_9-exe-bin-7.3.13.ebuild
new file mode 100644
index 000000000000..cb99c4b6d977
--- /dev/null
+++ b/dev-python/pypy3_9-exe-bin/pypy3_9-exe-bin-7.3.13.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils unpacker
+
+PYVER=3.9
+MY_P=pypy3_9-exe-${PV}-1
+
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	elibc_glibc? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86.gpkg.tar
+		)
+	)
+	elibc_musl? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64-musl.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64-musl.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le-musl.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86-musl.gpkg.tar
+		)
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# sys-devel/gcc for libgcc_s.so
+RDEPEND="
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/8
+	sys-libs/ncurses:0/6
+	>=sys-libs/zlib-1.1.3:0/1
+	virtual/libintl:0/0
+	elibc_glibc? (
+		sys-devel/gcc
+		>=sys-libs/glibc-2.35
+	)
+	!dev-python/pypy3_9-exe:${SLOT}
+"
+
+PYPY_PV=${PV%_p*}
+QA_PREBUILT="
+	usr/bin/pypy${PYVER}-c-${PYPY_PV}
+"
+
+src_install() {
+	insinto /
+	doins -r image/usr
+	fperms +x "/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3_9-exe/Manifest b/dev-python/pypy3_9-exe/Manifest
index 75e2bfdb0fa6..7a06d699b4a6 100644
--- a/dev-python/pypy3_9-exe/Manifest
+++ b/dev-python/pypy3_9-exe/Manifest
@@ -1,4 +1,7 @@
 DIST pypy3.9-gentoo-patches-7.3.12.tar.xz 7472 BLAKE2B 3948dc62af0b48c77e86cf25113363984ffcf118ca0ea797807a34d509223c6449edc66a835bd550cbdbb41c2c7386f2c56479b26e60effcf1c3a315ed113d0e SHA512 37f935d02a08c88aeab0337eb48a543c02cae37af5c0e692dda899f1b7acb811cf7d6c4d162829d6876d926d9cf376c522ec28ea7fb8957ca9a3ea7654262302
+DIST pypy3.9-gentoo-patches-7.3.13.tar.xz 7476 BLAKE2B 70f80c489686e92e933a200d2e92a095a80e2300814ec4e1f3cb31ec5f5500a45667f7bfe9570ea5eef3933fdda33a9930bdf2cf683c28e3ddb610bebeeca6dd SHA512 5170f5141beb93b3b37cc94f85324c88182967eaff2f8ca26b81d63d5b0d20414a139ca44c250c07b46c747e27c97fd0fe5a2365f6636aba2dd28df3bc55cdca
 DIST pypy3.9-v7.3.12-src.tar.bz2 23528145 BLAKE2B 28cc42b10d6a84c441af673e1a0dc6d19e09daa1da9249a7fec39a9aaccbe5010a3586068ae0b10cd402b72e5acc58998469d5c99019caa41399951c2a221e26 SHA512 8e819a1ec3f3ce7fc5f901fb554660288a57e2a4834a3da35c1a57faf88ef4129240628a58334d2e0c2b1dda412da5d85ec943abe8046c0ce5d0cd0a0f7fc42a
+DIST pypy3.9-v7.3.13-src.tar.bz2 23452374 BLAKE2B b5ce8dd78e4851b5c7fa6aa0c6f2f5c198a3b2d1e4691ccb20d1b229397d60ac41eaecef37f7c76e4de837876bdd6c1e4276302afc292080e0a38f1a58869580 SHA512 04b184050625f06d2acaa836a786db788c4f658f3384ebde176d0acc95044ee83dbf7193ebab1e4fd6275bed7a590d3945482294be32d8f94e8c541e053dce59
 EBUILD pypy3_9-exe-7.3.12.ebuild 2641 BLAKE2B 6d51f81fa21178cc50f0acccf3fcd5dec9afcde32d797f327c37d80196f6b3935b85e52cadf75b077ac995786f87a7bd54fc40c18cbf4a32d99b01123e0a5101 SHA512 03333393dab6347e5246ae95265ac3061a3e56d524098e332a416b83a05dd5362d51d193951b5555c42a30ef29b08fcd8ee28317230520cbddfea57bd574d7de
+EBUILD pypy3_9-exe-7.3.13.ebuild 2641 BLAKE2B 6d51f81fa21178cc50f0acccf3fcd5dec9afcde32d797f327c37d80196f6b3935b85e52cadf75b077ac995786f87a7bd54fc40c18cbf4a32d99b01123e0a5101 SHA512 03333393dab6347e5246ae95265ac3061a3e56d524098e332a416b83a05dd5362d51d193951b5555c42a30ef29b08fcd8ee28317230520cbddfea57bd574d7de
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.13.ebuild b/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.13.ebuild
new file mode 100644
index 000000000000..b9174fee3c95
--- /dev/null
+++ b/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.13.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs pax-utils toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+PYVER=3.9
+MY_P="pypy${PYVER}-v${PYPY_PV/_}"
+PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/expat:0=
+	dev-libs/libffi:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libintl:0=
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${SLOT}
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-python/pypy
+"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+		--withmod-bz2
+		$(usex ncurses --with{,out}mod-_minimal_curses)
+	)
+
+	local interp=( pypy )
+	if use low-memory; then
+		local -x PYPY_GC_MAX_DELTA=200MB
+		interp+=( --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	cd "${T}"/usession*-0 || die
+	newbin "testing_1/pypy${PYVER}-c" "pypy${PYVER}-c-${PYPY_PV}"
+	insinto "/usr/include/pypy${PYVER}/${PYPY_PV}"
+	doins *.h
+	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3_9/Manifest b/dev-python/pypy3_9/Manifest
index 59e636ff27e6..026c16152c34 100644
--- a/dev-python/pypy3_9/Manifest
+++ b/dev-python/pypy3_9/Manifest
@@ -1,4 +1,7 @@
 DIST pypy3.9-gentoo-patches-7.3.12_p2.tar.xz 14832 BLAKE2B e142221967f501dea771c8e02b7e57f704945b9c2a4fa7f84d2a702f911cc798ffafafc88bbe04ef89a71d218d28ad98b4cbee9fe822e81199d55c9891292967 SHA512 2e3a1a972775a89e9cf42d8177f607fe4aa4f245261dd9e3e8256697ddaf5271a2aa3d73bdb62e93de9c62fa4e6969d517e812507e865947fd1b649ec0f1d426
+DIST pypy3.9-gentoo-patches-7.3.13.tar.xz 7476 BLAKE2B 70f80c489686e92e933a200d2e92a095a80e2300814ec4e1f3cb31ec5f5500a45667f7bfe9570ea5eef3933fdda33a9930bdf2cf683c28e3ddb610bebeeca6dd SHA512 5170f5141beb93b3b37cc94f85324c88182967eaff2f8ca26b81d63d5b0d20414a139ca44c250c07b46c747e27c97fd0fe5a2365f6636aba2dd28df3bc55cdca
 DIST pypy3.9-v7.3.12-src.tar.bz2 23528145 BLAKE2B 28cc42b10d6a84c441af673e1a0dc6d19e09daa1da9249a7fec39a9aaccbe5010a3586068ae0b10cd402b72e5acc58998469d5c99019caa41399951c2a221e26 SHA512 8e819a1ec3f3ce7fc5f901fb554660288a57e2a4834a3da35c1a57faf88ef4129240628a58334d2e0c2b1dda412da5d85ec943abe8046c0ce5d0cd0a0f7fc42a
+DIST pypy3.9-v7.3.13-src.tar.bz2 23452374 BLAKE2B b5ce8dd78e4851b5c7fa6aa0c6f2f5c198a3b2d1e4691ccb20d1b229397d60ac41eaecef37f7c76e4de837876bdd6c1e4276302afc292080e0a38f1a58869580 SHA512 04b184050625f06d2acaa836a786db788c4f658f3384ebde176d0acc95044ee83dbf7193ebab1e4fd6275bed7a590d3945482294be32d8f94e8c541e053dce59
 EBUILD pypy3_9-7.3.12_p2.ebuild 6026 BLAKE2B f81b5ab91eb3472e35832085637bc34b3051e397691c24f5ea48ed47f92d301cc67561352e0fb106a0eca43a44b11424672a378f2021257cfb5a940caec32a82 SHA512 1a4ee02044e077db4c4bc9a9845c362c932c6766bfad0498745d7f7834c6b9a8ff9087c291a42580c824bd3910164f83979c627707175ff646105caea8352231
+EBUILD pypy3_9-7.3.13.ebuild 6026 BLAKE2B f81b5ab91eb3472e35832085637bc34b3051e397691c24f5ea48ed47f92d301cc67561352e0fb106a0eca43a44b11424672a378f2021257cfb5a940caec32a82 SHA512 1a4ee02044e077db4c4bc9a9845c362c932c6766bfad0498745d7f7834c6b9a8ff9087c291a42580c824bd3910164f83979c627707175ff646105caea8352231
 MISC metadata.xml 531 BLAKE2B 0f727c7ced9fb24ba0dc0b41d51c177b3711de33b838bf46cfdde5d8b751de9694873c13fe8153747f2cb533c078c54f004ee84b1c3c57b6f8d62128ffb9dba2 SHA512 331b66647a58047ded4bcf1529e3ca16b21cbb37afa82d8be0a4b6ad605e17bf3f1478fad1ea3b9c970bdf5162cb41e6adcb029a261fcbf894e807998b9219f6
diff --git a/dev-python/pypy3_9/pypy3_9-7.3.13.ebuild b/dev-python/pypy3_9/pypy3_9-7.3.13.ebuild
new file mode 100644
index 000000000000..1c6eec918ff3
--- /dev/null
+++ b/dev-python/pypy3_9/pypy3_9-7.3.13.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils python-utils-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+PYVER=3.9
+MY_P="pypy${PYVER}-v${PYPY_PV/_}"
+PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
+HOMEPAGE="
+	https://www.pypy.org/
+	https://foss.heptapod.net/pypy/pypy/
+"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy39-pp73-336"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
+# many tests are failing upstream
+# see https://buildbot.pypy.org/summary?branch=py${PYVER}
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
+		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-lang/python-exec[python_targets_pypy3(-)]
+	dev-libs/openssl:0=
+	dev-python/gentoo-common
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-7.3.12_rc
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	mkdir bin || die
+	# switch to the layout expected for cffi module builds
+	mkdir include/pypy${PYVER} || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
+	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
+	pax-mark m pypy${PYVER}-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy${PYVER}-c - <<-EOF
+			import importlib.util
+			import sysconfig
+			soabi = sysconfig.get_config_var("SOABI")
+			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
+			print(f"{soabi}-{magic}")
+		EOF
+	)
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	# Add epython.py to the distribution
+	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate sysconfig data
+	local host_gnu_type=$(sh pypy/tool/release/config.guess)
+	local overrides=(
+		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
+		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
+		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
+		TZPATH "${EPREFIX}/usr/share/zoneinfo"
+		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
+	)
+	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
+	local outdir
+	outdir=$(<pybuilddir.txt) || die
+	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+		import lib2to3.pygram
+		import lib2to3.patcomp
+		lib2to3.patcomp.PatternCompiler()
+	EOF
+
+	# Generate cffi modules
+	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
+	# (NB: we build CFFI modules first to avoid error log when importing
+	# build_cffi_imports).
+	cffi_targets=(
+		pypy_util blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma posixshmem
+		testmultiphase
+	)
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Verify that CFFI module list is up-to-date
+	local expected_cksum=63d4659f
+	local local_cksum=$(
+		../pypy${PYVER}-c - <<-EOF
+			import binascii
+			import json
+			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
+		EOF
+	)
+	if [[ ${local_cksum} != ${expected_cksum} ]]; then
+		die "Please verify cffi_targets and update checksum to ${local_cksum}"
+	fi
+
+	# Cleanup temporary objects
+	find -name "*_cffi.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
+	insinto /usr/lib/pypy${PYVER}
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy${PYVER}
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy${PYVER}
+	rm -r "${ED}${dest}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${ED}${dest}"/ensurepip || die
+	fi
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/sqlite3 \
+			"${ED}${dest}"/_sqlite3* \
+			"${ED}${dest}"/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/{idlelib,tkinter} \
+			"${ED}${dest}"/_tkinter \
+			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
+	fi
+	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index 55d3ad7ab168..0c90c4420308 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,9 +1,5 @@
 DIST pyspnego-0.10.0.tar.gz 221948 BLAKE2B b98ec74c4e0896a27ef718a426bd030113b57397b5fc8337d826a71dc3ff5068b95c8ee439615c7ab067ed4caf8f5801f3430bd3dce67286a14952e7797c2941 SHA512 4ab2c1e51c1e79a9b241600aa40d4a0ed70958d4cd9c2dba0f11e02e980810c0bc67cdb89b10eea3c42c84dcb8f98e284c108cfee75ae87a3107870cab854209
 DIST pyspnego-0.10.1.tar.gz 222011 BLAKE2B d7089023cf968029d6ec29216bda154824f19a504ab76ad9f3032fcb6c821ca67435bff7c54a86a881fd802787433e61530a458b797d8c91d19ae25b8766b016 SHA512 881291d3d5f81d0970f1b2cea201c055baf3973aae84cf15995e6f2c5a0ac8a23686e49b163f7d85b8fd0226f98de59bafc939c6983d1a81e954a3f22b34714e
-DIST pyspnego-0.9.1.tar.gz 233824 BLAKE2B c36d2ee697ed9dcb7a3c7d3a3ec2bc58b88ac6ba5a020c852b4ba7d0a01d3dd4a3801d91a9456f3f4710684df16a3a4c7d449cfa58e141ae5085bef0f0fe6f21 SHA512 6c516cae43bff523ec19b6ef52e7691a688bada027a183b98e0121bdd4f44f887a5fa87f3ab173dff1e18d84a7886a2a04de80dbd6873cc1dafb1d7369a9d932
-DIST pyspnego-0.9.2.tar.gz 233819 BLAKE2B e4fc4b8cd760210c2e4dd188a651725fa6579fe429ca227e8a5cc1f46111e3e8e6cb07bc4256f60560d86bcd0a2b2e621efbd0dc193d3f67f66a1fdb79ef8f9e SHA512 6775efa12b1f93addf9257145d020e5fcb5139edf8ffcbdca03cd55de7ee992b47af5278206de85e50a824abbf0a037a50dc7e47ca5b6f79b2f4e854d926a8f3
-EBUILD pyspnego-0.10.0.ebuild 880 BLAKE2B 080579e2e9c509c1785723b7a26b7a73d6019bdabc7db2ec2a4d683b0b5a80b1f50fb51b4862450414a723f0502d95731c1d5b32c725530e6b75a8a006ba6b13 SHA512 edad69f2123b33d17a09c0556c4f21c14a15c9b23cec5d65ee8ef731bf8ac6d84c8cfc88ed1fad49ac1751435131d86563b16470ab93f0595e0e8367d0de5c73
+EBUILD pyspnego-0.10.0.ebuild 877 BLAKE2B ceb5577f2bce2c3b2e310e142dc8417d16453b210127949d97941ed53db513eefb8e38165a90c5c16e8e10ecdf573f94a830b72ec68717916acb5dd60d373d1f SHA512 4407f31c8f97aca13562bb2ec1052266a336c2d880a4dad3ed459cceed8c2985c820da4fdc3636030af5e93d39e497ce9323b36823f8cd6dc6b3f0f7e65ef493
 EBUILD pyspnego-0.10.1.ebuild 880 BLAKE2B 080579e2e9c509c1785723b7a26b7a73d6019bdabc7db2ec2a4d683b0b5a80b1f50fb51b4862450414a723f0502d95731c1d5b32c725530e6b75a8a006ba6b13 SHA512 edad69f2123b33d17a09c0556c4f21c14a15c9b23cec5d65ee8ef731bf8ac6d84c8cfc88ed1fad49ac1751435131d86563b16470ab93f0595e0e8367d0de5c73
-EBUILD pyspnego-0.9.1.ebuild 914 BLAKE2B f23a5faeae4b1c5d6103b1160c59c115d83660a69c1af73326a557b453c43942b3a89711a5c55636c3d1ba8cd0bff8ffa435925510ddfd23502763675089a0ec SHA512 32e6f6e5a43a16c981fc3d2a129619a424ce35b52819a50abbc838a04b5be440834adc5d3663400b3c9018d7adff13b87c51d250e71443510f680d13844ad045
-EBUILD pyspnego-0.9.2.ebuild 917 BLAKE2B 18123ad603638f00f9cc2238b73368a4b3877999e98ea7ec0822e589e3f6c6b3841b2702e892affa337b10f88b24dd8455f3c70ac60419a7dc3419b43b8f67b6 SHA512 dbeab118664219364f95d2e97958731ffeb0428088a7ec0a58870514b42374aab277bf62befaa899aa171b661f8c64e40bc71b1d0534b2bb968f0283880bec57
 MISC metadata.xml 445 BLAKE2B 2d30af32987aa7118331cb4c199b44069f6a6efc62d73eab62a31b29308848b7f7e56e026327af6c2197ee31c05fbe1885524bba7b6a84cdc0d97cc58c5fb43b SHA512 c7bbe6f161ce61409f6865f998fb4c8bd77c39011f5bbd148379912e31805773a41451163517cb7ebef99a57d6abe8f13dcdc568408ce182c0def6adf35afc9c
diff --git a/dev-python/pyspnego/pyspnego-0.10.0.ebuild b/dev-python/pyspnego/pyspnego-0.10.0.ebuild
index 408e9482cad6..2ead729c77d5 100644
--- a/dev-python/pyspnego/pyspnego-0.10.0.ebuild
+++ b/dev-python/pyspnego/pyspnego-0.10.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/pyspnego/pyspnego-0.9.1.ebuild b/dev-python/pyspnego/pyspnego-0.9.1.ebuild
deleted file mode 100644
index 9daf3600c887..000000000000
--- a/dev-python/pyspnego/pyspnego-0.9.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
-HOMEPAGE="
-	https://github.com/jborean93/pyspnego/
-	https://pypi.org/project/pyspnego/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/gssapi[${PYTHON_USEDEP}]
-		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
-	optfeature "YAML output support" "dev-python/ruamel-yaml"
-}
diff --git a/dev-python/pyspnego/pyspnego-0.9.2.ebuild b/dev-python/pyspnego/pyspnego-0.9.2.ebuild
deleted file mode 100644
index 814c28e01ada..000000000000
--- a/dev-python/pyspnego/pyspnego-0.9.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
-HOMEPAGE="
-	https://github.com/jborean93/pyspnego/
-	https://pypi.org/project/pyspnego/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/gssapi[${PYTHON_USEDEP}]
-		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
-	optfeature "YAML output support" "dev-python/ruamel-yaml"
-}
diff --git a/dev-python/python-box/Manifest b/dev-python/python-box/Manifest
index aef81b0cdfd9..513c9d6a16bf 100644
--- a/dev-python/python-box/Manifest
+++ b/dev-python/python-box/Manifest
@@ -1,5 +1,3 @@
-DIST Box-7.0.1.gh.tar.gz 86746 BLAKE2B 33288c89d1b285d1c04ebb00d56a26d451f7b22eefbcef12219108975aa610054af67f69153436033a183c7b26cf216649ddc75b4354f2ff4f02f2a6fc2903bd SHA512 fe08fbca79fa02e53bc4208387162e49917f302e1595d924d4290d690092a9f7fae3f0cac66de1fd48ef16e627c4fbc2b2babed52b04381b24dab9b083040cf7
 DIST Box-7.1.1.gh.tar.gz 87515 BLAKE2B 388944c3a577105ce1e12e9abff7da148d028db88d8070a09e6abe190882acdbfa4cf9d773af6cbae7e945603dc13d3d853253dc18b0d2d2b17c678293583b8a SHA512 60e44eda013a5ab1de2215d156caf2567a24b0471ee20e52096137ad761e92c3ca20d9f3967a21e38ac924488a2b76399c4ea1bc86b652dd72d7494ce22effee
-EBUILD python-box-7.0.1.ebuild 1102 BLAKE2B 1be5f98916a5bdcb0709b7c671c9bd28549aeaca9831f9eb33b06c94a29765d8f00843b8b7beaa44824ded175bb675a60858ee23d9f112929488cfbc8db103ad SHA512 e7bdfd202754c628a8b89cb506d98aca97408588c3931b405b25dd3d629387443a8a222dca2a2037afc76dc77ff3fc06554c31430540fd159f2e17038024342b
-EBUILD python-box-7.1.1.ebuild 1122 BLAKE2B 784cf3863b946885df1e9b09052a185f8167bded7b073b351a3c2510f599ada97745be20a54b8a9077671d71f0882f7144dd81f58efce3888ffbde09554fac20 SHA512 60da5b46cd66c2c36271af95a6f033ae91092b19ac321f722b4620071878aaffc79ce18ecd62b3e49401982c6e01516c5f1d3c5ebdad2008bc5e8de1f0d6248e
+EBUILD python-box-7.1.1.ebuild 1121 BLAKE2B 4b9bd63fac93125fb31f117794e2588dc6d453540729ad76bbba5facdeff48511818afabce730715870d9c9a71ac9f4f38a1ebba348dbd4352f43738057d45a2 SHA512 74f02a1c700af0836c534725fb993ed55ad9af4ae1b3f1864245c2a51dd4034f1bc16ab406625dd85f67d21bc8fdb142466ba88a18f6c6b6efd15483c07c7a39
 MISC metadata.xml 610 BLAKE2B 7adbfb9b5d5fafa5e1b943fb3321d9b115586388c4480d3f27d1239b04391bae8a4551aee5b7109b1ee3d44e8f260cabf6ce4c42df4b99d8db9d3a258ce23466 SHA512 83bd215e4350c1d7a9ac4f36a485e7dbb4382b585634245d8fe4f6f31dcc2fbc8ab78488ccac6d7ffa693b8e261fe094de6808e10787cf73f169e6c3f83875f2
diff --git a/dev-python/python-box/python-box-7.0.1.ebuild b/dev-python/python-box/python-box-7.0.1.ebuild
deleted file mode 100644
index c300e79fa62f..000000000000
--- a/dev-python/python-box/python-box-7.0.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 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_{10..11} )
-
-inherit distutils-r1
-
-MY_P=Box-${PV}
-DESCRIPTION="Python dictionaries with advanced dot notation access"
-HOMEPAGE="
-	https://github.com/cdgriffith/Box/
-	https://pypi.org/project/python-box/
-"
-SRC_URI="
-	https://github.com/cdgriffith/Box/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# looks like broken tests
-		# https://github.com/cdgriffith/Box/issues/257
-		test/test_box.py::TestBox::test_box_kwargs_should_not_be_included
-		test/test_box.py::TestBox::test_box_namespace
-	)
-
-	rm -rf box || die
-	epytest
-}
diff --git a/dev-python/python-box/python-box-7.1.1.ebuild b/dev-python/python-box/python-box-7.1.1.ebuild
index a71c7fcf6444..9229c71b3a4b 100644
--- a/dev-python/python-box/python-box-7.1.1.ebuild
+++ b/dev-python/python-box/python-box-7.1.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/seaborn/Manifest b/dev-python/seaborn/Manifest
index 544dd6805296..5c4c11756aa8 100644
--- a/dev-python/seaborn/Manifest
+++ b/dev-python/seaborn/Manifest
@@ -1,4 +1,6 @@
 AUX seaborn-0.12.2-matplotlib-3.7.patch 753 BLAKE2B c4015d94eb336b8dadb29a1e56d3b1ba6e5f2134774b2bd99ed09a00025394adaa52093373578e27c4db08f28a62f4eac0a8b89b73dc7cdf818155c037b682ee SHA512 3dd36909ab7c933e4dbaee0f73a1b1e29b1b57057e59ade7fccadf4324b307c90578f018ce56b9a1294c067f367298819e4d397fdcb794f1e40cd2eb7b2057b1
 DIST seaborn-0.12.2.tar.gz 1439798 BLAKE2B cf6903b1a2d27516bcafe46cabc81ea9fac80666394a6a82516630f9ac60afc7e9d31817e029cda9a08da04c0a37ce0244ad23acda16bca3283532ddb0fbdb71 SHA512 988a9922ee301b655911efa38905674b7dd15e7f7b157ad67f5befaeb02db492553f8bd6133b54d2dd7970b8dbbfd92d81d1faea3fa618247ebcaeb98620a060
+DIST seaborn-0.13.0.tar.gz 1455480 BLAKE2B 9f7383715366889ffd80788f901c574d9330285da2098e5695e944f1c6b92d4e417163a82378dd75c03233fc6485158401a1aaa461f2fa8e71a4cbc3ebf957cb SHA512 d603e880c29e05ab68f86d285c5c5ee9cf2da1d45265ed609f7bc87650fe20e80c026af487f63f9492a268f51ba5bab0cae4fd8fdeaf28125d16d317f9c937c8
 EBUILD seaborn-0.12.2.ebuild 905 BLAKE2B cdcffdb6285be669c07f2140fb071f4f1306f9d8e58acccfc436acd874c60f8b1cb34d80280f592cbec350f1b80340dbd6f6fe28a3208b0ba1c7bd38ab124d36 SHA512 ff5aa6126a4f78b668e2bd0694a809bb9e9e294faf5613d507705da606a485235a28aa2a20a0ec05448b09dbfd652eb25a131762df851b2789fb63421bdb1ef4
+EBUILD seaborn-0.13.0.ebuild 888 BLAKE2B 3fc776c2cf9eb6e7e3e010b8409e72f2feec3e7c3595dfbbcc5ec8d17624b84d50301d3fb808c53c6f27d8043ffea708c986dcbb17905a7113d393f20218e2c3 SHA512 7c945d2a7c5ff10731b402c64e9f5c1657faabe4cf2e5fd8707b85b8d26f7ba3cd97c12f4905477b94f0d641e58f7e09ec4f5365973969ec23508e2978ea5962
 MISC metadata.xml 1510 BLAKE2B 897785b5160185a2e2566495abb52d7a9136def9ea267601ea3719e0c5246c48ef09c4485674fa7c50202def865fe032df42a61396d95a097aafa82bfdeec05d SHA512 54374e04284143b80c0e97968ca9f31dc763ff4e14800a3ced4ed852722144cf89ebe5867b044597c8566a47d4e5e63359b7976bf6681cd4cf67aabcee7cf8a4
diff --git a/dev-python/seaborn/seaborn-0.13.0.ebuild b/dev-python/seaborn/seaborn-0.13.0.ebuild
new file mode 100644
index 000000000000..c18b4b771b97
--- /dev/null
+++ b/dev-python/seaborn/seaborn-0.13.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="Statistical data visualization"
+HOMEPAGE="https://seaborn.pydata.org https://github.com/mwaskom/seaborn"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.2[${PYTHON_USEDEP}]
+	>=dev-python/statsmodels-0.12[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	cat > matplotlibrc <<- EOF || die
+		backend : Agg
+	EOF
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index e4a3f965adf8..1cf26365df69 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,8 +1,4 @@
 AUX sentry-sdk-1.21.0-ignore-warnings.patch 329 BLAKE2B cdb4295e600d868feb11b4a0af534bca90a1fa777344d56c945ddcfe71b3db10848df4032df06b9acf84cf574bec04dce4dc8935dd7421a6d0a2a011db337d6f SHA512 d1b5c50c78d1bb299280c4937fc8a8fdfc7d174d41061a32b57178c4dee58ab4b4b7afe8566a6b79244e53be8714b3ee7fdc9bf3401835d6d743e9fdc5a0aa05
-DIST sentry-python-1.29.2.gh.tar.gz 382177 BLAKE2B 1fa42e53ed1115fb50b3a5d4a49ca7f851cc487ecb638b7add2d261ed207c9c8d4ccc1ca20760516e82e5a5cd52b1582271b81e52977b87944b0df55365a9800 SHA512 56fd53f3a43acc1c2fe5bd6f44c7a5a63b4ab944919fa5a4539239230c3c64eb75e75414e26809d12bcb601a779b661d6dec73dededa07e10f120438ea3ad5c7
-DIST sentry-python-1.30.0.gh.tar.gz 387394 BLAKE2B 2b3e41e209d162406b3c2d216ca65616b88db137f51bda8b22fb8be730deb07ffa05d75e674e86a94b772e739ec5b8d1c0c96efe20cb49355d8d96271af3169d SHA512 50590b0553b803b0555b9e562eda4d84edc8bfd02a7beaf9e0a17dec76ff5c22b4d618a7dfc4fc05ad9c2c0d14f8e34f9c5a39795aacb9e8872c1a3e3f9a0219
 DIST sentry-python-1.31.0.gh.tar.gz 399341 BLAKE2B e5162a619335bd7e089ed01c938d29233b5a19315f11e414a1e51d4539ea3a371a3dd743ad0dafedaff7bf8ca801855e016ea62d38a02fcab8702c8fbf879e0b SHA512 29504e3f94d994512e52c18df7dc156fcf86a67e68c2f11f0be007577b61e4a3b606cf7b58ef0488c3b764fa9193d8f7672e2c9515c0099a9a44574fd8c5c07e
-EBUILD sentry-sdk-1.29.2.ebuild 4166 BLAKE2B 7e72178c20ab82082c4f59f9f407f8b217064457449967bfeec95725e9cf85d173abadc094cbd4c5a91858dd90645d701aad8273a8d0a6148d65b1711fb9a62a SHA512 2d208dbcb9e0f6c0e5f3c259e8a3737a5090ff0b4324c78d6c2b94b7824946096325cc1e5cb28b3e79700992a5190755a0843801e0dbbe88bbde3a84853e0b9e
-EBUILD sentry-sdk-1.30.0.ebuild 4170 BLAKE2B b9ab88af5992582b939280c483bfdc2ac2c2a72f14fa398023ba94700d2be4e6c23734850430fdd5ba77ffeeeb913bd492d84b0ff0a1ecd6bb5ce3b72a76b93c SHA512 314e5bb7acdd79b8ad8d119aa7e96aeb14e06d2d95073efc97a1dc471123632300479d79d261f8f34a13cffa3266f34cabaca7e0d31b6915e4f0b6f74c5e4f00
-EBUILD sentry-sdk-1.31.0.ebuild 4352 BLAKE2B 308874c91fbe8a21f3b3148c8ddc04917d50ac6e71e6b414342f7f3ce288d98b44c56da27a928fa8a7940fc2d7aa78a5204fa02e458258b01ec853119a5daee8 SHA512 1afe61dead108d2891db32236fb907b7afa9bfafdfc6c2fc4cd063a1dada6d63f8af0729f72c951de4cc38320d383badc1337b4cd02fb74121dfb1f43921a191
+EBUILD sentry-sdk-1.31.0.ebuild 4348 BLAKE2B 4a7f6417cd2137c434fdc7ec210804a37d1454975fb1f30d7787f617c419be806d65d702a87c23eca48daefd1a9e0f3e71f5d14121b5bf440f5a85802879309f SHA512 bf4332c886134c9424698cb5498ea7c7e61ad5eb632f6ded2ee93bcd07accd2086507f91e7734458f7199d51582c7e37ac0435d6e2fd5586718a7ac0ad96a1aa
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.29.2.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.29.2.ebuild
deleted file mode 100644
index c84bd07acef0..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.29.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_11 )
-
-inherit distutils-r1
-
-MY_P=sentry-python-${PV}
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/python-socks[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	tests/integrations/socket/test_socket.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-	# this is not even funny
-	tests/integrations/modules/test_modules.py::test_installed_modules
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.30.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.30.0.ebuild
deleted file mode 100644
index 1335788113ac..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.30.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_11 )
-
-inherit distutils-r1
-
-MY_P=sentry-python-${PV}
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/python-socks[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	tests/integrations/socket/test_socket.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-	# this is not even funny
-	tests/integrations/modules/test_modules.py::test_installed_modules
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.31.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.31.0.ebuild
index ef45202f1d71..09349cc49dba 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.31.0.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.31.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index a8e6c26953e3..2a374328189b 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,5 +1,3 @@
-DIST starlette-0.30.0.gh.tar.gz 2844387 BLAKE2B 00457d4913bd1c99fc6972baae56c5ebe84ba8215c6dd4f7875f6d93856ba40454d8a72828e715624bb945dce4abfbe407ed16e289a393af7be980f36389f9ae SHA512 751077fcfe3d344584d8986f3fc2bc25208716ca215db8ce62dfc752008dacd95f4834367f0921ceacaafa6b20409a9912f49ceabc23d7e9e5f636c6fb3646b2
 DIST starlette-0.31.1.gh.tar.gz 2846196 BLAKE2B 08ebe13d4b9716c6ff74a4f9ca6333f5e6dc31c6ce359b39cbf8e9822fad2e8c8a111788a37893ad687f4d3ffb3bef1e21146f3769b3ac07f083b1c454c07fa3 SHA512 8501b1f40fea9351eba8366dfe1adcb27d19a64a2f547153f3106f8d6828a47c850d6ffb634d6ce60e74fc02d510afda22bca33e07631b72f9a5558e977ea0f6
-EBUILD starlette-0.30.0.ebuild 1137 BLAKE2B 35b6093daf96407877ee3b705e67fb9a5ecabcd12f652efdab990618f99e071ba218231d24760de4904fd4da46adc862d7022ddd256e1510b195454a8367c7ee SHA512 a6914801c50ae27c0195dd6fa3e792a464b46a94b3f2e372ca9a78b88cccfa4a777c9a2ee87e9d6dab9a1fe2c134a526f0417cd48bf9ccc3e794369927783083
-EBUILD starlette-0.31.1.ebuild 1145 BLAKE2B 96a1b0e3328e0d0d31cf2f30bdfeb11759f30be9a861844e13eb40f375a95fbc2b6cec2c54734ca300bf256b865d98f2f77c0e0065f7dcddbe3bb67a5fb4d856 SHA512 d3735cee3c781dce763dcbb49fc60ecc980372d9ed20e8d8c2d05c4d50b9df46909632b73b3ec4f02617878e5f4445840c8b8c9fdc54bdd1fc24c42f77c20120
+EBUILD starlette-0.31.1.ebuild 1137 BLAKE2B 35b6093daf96407877ee3b705e67fb9a5ecabcd12f652efdab990618f99e071ba218231d24760de4904fd4da46adc862d7022ddd256e1510b195454a8367c7ee SHA512 a6914801c50ae27c0195dd6fa3e792a464b46a94b3f2e372ca9a78b88cccfa4a777c9a2ee87e9d6dab9a1fe2c134a526f0417cd48bf9ccc3e794369927783083
 MISC metadata.xml 371 BLAKE2B 0ccaa4659e63162b565359a1cae05764bea66d708a5f4af1a4716ba9ba23faa39ab4f5a806c0a9783f3f42282ee9b98e22a92f2b308b8dfe97bbf9c770a8add1 SHA512 0fc326941861260becd4129c8a351e89ba0f98f9a3ce9b5d50812f0eaf667743ab0d403889aa1b0a2d9fcedbe0212ba879d165ec8edd115686d4768e6b1326ca
diff --git a/dev-python/starlette/starlette-0.30.0.ebuild b/dev-python/starlette/starlette-0.30.0.ebuild
deleted file mode 100644
index e26ea3f5cc28..000000000000
--- a/dev-python/starlette/starlette-0.30.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/python-multipart[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/starlette/starlette-0.31.1.ebuild b/dev-python/starlette/starlette-0.31.1.ebuild
index 5157f33105ee..e26ea3f5cc28 100644
--- a/dev-python/starlette/starlette-0.31.1.ebuild
+++ b/dev-python/starlette/starlette-0.31.1.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/typeguard/Manifest b/dev-python/typeguard/Manifest
index fa26f245b96a..20364c10011e 100644
--- a/dev-python/typeguard/Manifest
+++ b/dev-python/typeguard/Manifest
@@ -4,6 +4,6 @@ DIST typeguard-4.1.4.tar.gz 68958 BLAKE2B 92147b2d8e2c444d4e8085ebe337aee4e1be77
 DIST typeguard-4.1.5.tar.gz 69228 BLAKE2B 2af39b1cb179483e167b8cfbf053e633f5947b3a17c496aaa2bdf22f3a69f7b41e2c9f317534eb12ffb781364cf81d117ced9fafd389aadd85d16d05e42bff0b SHA512 50bf3760246dba5de2e98038c78acbd6f2fd2d69ae8c688c3efeface5ef6cc4c2521f82d6084dabc1258286ac589ff94f1b9e3c9b67e9b019d725bf13884fce2
 EBUILD typeguard-4.1.0.ebuild 942 BLAKE2B 51d767682bdbea3e1b694fb3f2c816d145c815e157d8df1858cc73d992af74423a248b2a0038f06e653e4f21dbe9526f542d0c8c9d4597d1188da795de12f7ad SHA512 61cbfd90af8325f3cac03b2fe49cf69475f682be54783f88f8d04298ee12e6cee5d8e61cbd6cb7f0007756b4e259c363805169e96aab3cb3738abb557647b255
 EBUILD typeguard-4.1.3.ebuild 950 BLAKE2B 2b2d2fa0e9280109e759a645654171a5c0ad33f833d34723a0a4d3b789db33a1f9a941a8978757b5a77219422b0539589e6ce70bb1d4ca977bcd7641a9b0d21f SHA512 d85725b17e1e1ccfdfb586d6c3a453822684f15697977e6795c75bf786283c5c22f224d5cb7b4deb1ef2fc70d00a3b5cb8cedb3f555f1695af0f3ba019b13b9c
-EBUILD typeguard-4.1.4.ebuild 950 BLAKE2B 2b2d2fa0e9280109e759a645654171a5c0ad33f833d34723a0a4d3b789db33a1f9a941a8978757b5a77219422b0539589e6ce70bb1d4ca977bcd7641a9b0d21f SHA512 d85725b17e1e1ccfdfb586d6c3a453822684f15697977e6795c75bf786283c5c22f224d5cb7b4deb1ef2fc70d00a3b5cb8cedb3f555f1695af0f3ba019b13b9c
+EBUILD typeguard-4.1.4.ebuild 944 BLAKE2B 0642e7e0fcade3034dc25b33a7b986692087e90c98a61a17cfe899ec05679d52ed2a7b8c2f2553dfc902ee9ab9184a9aac85ebf64e619516b712ef169d14cceb SHA512 9f9e67899bcc1565aa0e21d36f19ac4d1972c3779cee569a41e977c3e71c414e7463be502b94027183124a7e56c71a2eb7660c17e918e0dbb9c3c77ba20852f5
 EBUILD typeguard-4.1.5.ebuild 950 BLAKE2B 2b2d2fa0e9280109e759a645654171a5c0ad33f833d34723a0a4d3b789db33a1f9a941a8978757b5a77219422b0539589e6ce70bb1d4ca977bcd7641a9b0d21f SHA512 d85725b17e1e1ccfdfb586d6c3a453822684f15697977e6795c75bf786283c5c22f224d5cb7b4deb1ef2fc70d00a3b5cb8cedb3f555f1695af0f3ba019b13b9c
 MISC metadata.xml 350 BLAKE2B 78dc7293e08dae7974b38d84ce457ceddc5888a7278c1b149b8ba3057f07130b2e002dd78a9df91fd09d85b7ebc26272b4c78dd96c6cdd3938cff67b9c451366 SHA512 1fe4c4164b0732bd294815dacdd46a70ace6e8886343491232fb59b6b3697316c3eac5dd72e2e4758d87fd093d845f4453b8f278009be640ca1555413f47e869
diff --git a/dev-python/typeguard/typeguard-4.1.4.ebuild b/dev-python/typeguard/typeguard-4.1.4.ebuild
index 2d5d1842fcbf..eb44801aafb3 100644
--- a/dev-python/typeguard/typeguard-4.1.4.ebuild
+++ b/dev-python/typeguard/typeguard-4.1.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
author	V3n3RiX <venerix@koprulu.sector>	2023-09-30 11:39:43 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-09-30 11:39:43 +0100
commit	c417025a2ab386cddabb71ad598a9b75b47af313 (patch)
tree	65963e1f2e99ed22f278cdb819bb1d0892062731 /dev-python
parent	49fadb6686800eac5ce039896df6437ac7240c8c (diff)