gentoo auto-resync : 21:01:2024 - 08:09:25

author: V3n3RiX <venerix@koprulu.sector> 2024-01-21 08:09:25 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2024-01-21 08:09:25 +0000
commit: 5adb1b3ff590f0911922679849a7fdacc8b4f217 (patch)
tree: 8a471fe02dd3498487715d39f928b42017f24c99 /dev-python
parent: afcb9236a72cf602364c28b9bde6648e4a7f1ca5 (diff)
45 files changed, 446 insertions, 1348 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 65e751ca0ac8..bf58fa38bf3b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index b57f93db4d8e..c9f97fffc0f6 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,3 +1,5 @@
 DIST dnspython-2.4.2.gh.tar.gz 357675 BLAKE2B ceb2f4a824a1c2b834401d2eb7943e62a5fb28a19be64cea8071d7e294d1a6aa80dc82266586d050fcb1c0eff881d9e139be335313d2098b6c3c6cf690f398ab SHA512 6a76331fc8bc282bb8ef61509317b1956bec6fb516a57409b1df38c8f5094e5ddfcaabc951f7678f1be75e735962c94f225b6e78eb4abe56b27e075180c62576
+DIST dnspython-2.5.0.gh.tar.gz 366093 BLAKE2B f8e3d8632a74b0421f7c77316dc80e01936277d701c282239ed60e79952755d34c673f15e19d4da812883e33d5f2cb54a8faa419185d8d198de923a2f3861095 SHA512 8ed207f9cee88dc1deb626d727c510dabace327586911e340df435c8cce5936efee51937b52881b4b4452d9c8c5bd903044bfef5a4effa95aaf05f24c0213b07
 EBUILD dnspython-2.4.2.ebuild 1036 BLAKE2B 09065dc34e1d6c65eaa2efaeb7432a74ee004070a5e49ced70e2ad0aee9a7e38ef14decc18286410fa3aa2640c503d815e3c3fd870a2148a6376c0676130b6bd SHA512 dba146f266a31de5bace5606a4df9d7adce10cebf951fcb2e14d764216efaaed094f0a0b2ac2d2bd9dfbe7f837756789175629c5b251fe9ac72c2ec73f83388b
+EBUILD dnspython-2.5.0.ebuild 1027 BLAKE2B 0575a64e02ae1f60d17083e87b30b3a7a90735c2fcd0014c16a52662dd5dd5017ce683ba03c8d936bc9ea02c7529ca584612201fff2301a295c362c6d63a06e2 SHA512 3c8798e6fe0fa22fab1de512b4b2c5e4b46493598f0a0bc5bdd87a8a7a8ebd01bc8624728ed2a8b450aa844f626c439aaa85aff92e52ba2c41db2bafa5f5c13f
 MISC metadata.xml 1709 BLAKE2B abd502753325fedca3f1ca94818258c9d1b82f88766f9e005b35b3e79aff71ca2efaf06188e73ea30830f80ec011cdf5c42df320130c9295e13d3c427a148f8c SHA512 8c25d579a4a2a7c5ff34c21643a1386a434545f6b9b465f4aa8e07f7da3aee203bbc0341e930ddb767af431f64e8024ddd6cc8513cfce862c5900da4637bb1c8
diff --git a/dev-python/dnspython/dnspython-2.5.0.ebuild b/dev-python/dnspython/dnspython-2.5.0.ebuild
new file mode 100644
index 000000000000..fa76df91c401
--- /dev/null
+++ b/dev-python/dnspython/dnspython-2.5.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="DNS toolkit for Python"
+HOMEPAGE="
+	https://www.dnspython.org/
+	https://github.com/rthalley/dnspython/
+	https://pypi.org/project/dnspython/
+"
+SRC_URI="
+	https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ISC"
+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"
+IUSE="dnssec examples"
+
+RDEPEND="
+	dnssec? (
+		>=dev-python/cryptography-41[${PYTHON_USEDEP}]
+	)
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/cryptography-41[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/hypercorn/Manifest b/dev-python/hypercorn/Manifest
index e8867aeedce8..0d2c5cad3323 100644
--- a/dev-python/hypercorn/Manifest
+++ b/dev-python/hypercorn/Manifest
@@ -3,5 +3,5 @@ DIST hypercorn-0.15.0.gh.tar.gz 156271 BLAKE2B 906b1b9c90c8150498ce6b8ac6f5de503
 DIST hypercorn-0.16.0.gh.tar.gz 159038 BLAKE2B d17fde74af7f3a0157af22465f52a46967b8c4297eb5f602614d5337ca511d365e391630495535b56650fc4bfac864d30c5b281c04beddb0fec9bfcecd0f0c00 SHA512 75d75f0a0c1726b83d8ee38d5a15f4241130369904c9925cc3b87d1bf92f0d6a59ae7e7c83434c60ceae4bb628f6a51a42eda00c68a226c0bea6ef1c6fb8cb2c
 EBUILD hypercorn-0.14.4.ebuild 1159 BLAKE2B 3b1e86f45579c7293aa5e96a52e3929f261cd00f8aea4306202083597e4b2c2dd5cabb6d48a5cd0f12499bc3f231ea9c1a650a394e1f6f9feb40c2e1dee750c3 SHA512 bcc900808c8efa5926d1c4dabcc29695ca9f8185f6f0b183128ed20eb5808ab15b24ef1d89491d39e6ce210d1619be6b741ce3069a4cb8629d766998030c8e3c
 EBUILD hypercorn-0.15.0.ebuild 1197 BLAKE2B a03f5bf566a5bdd2c7317dbfc956a4614cad3eded6684904282a1adff180fba388ef01d4f2542476599b24d5acdb975ab4b7426e648731bbbfd60f76c976ee1d SHA512 6137a4f1923f441b8663694428d5f07d72b70c9d5e88be285482eb3ea05ca33ce7fd3040693f05d74e533fbafacf9ad117eeca90e609f4a28e52cd9da309cb5c
-EBUILD hypercorn-0.16.0.ebuild 1199 BLAKE2B 99eb07868aaefe5659f406d60c8c2ab8354673b122ed0240bdb5f78aaef8143eaa01b5c6573c921f7ebb15856dcf5f181ac8b96e1ce66ee517cdc76a6b2fd664 SHA512 93e57493d1ba8730beefe1431f161cd5a23f0642be75b8a831efb1efcbe9b3f5a8bfe8851650dbd15718cb24b468e39cf5654302053f3112f861c24de5c317ad
+EBUILD hypercorn-0.16.0.ebuild 1197 BLAKE2B 783c02eae9f09fff0c7e0c2d6023b956d550f5339a8b6435955405fd5678552c8683c05f84e2145c47369de534cc481187a3a6dd6aa8720a9f03560562ed2b79 SHA512 127046bc213a5c4c19db397e391e94810be7d7d3df0e63281eeaf34049615600a6fdd17ddb43c0c906f2052cb99f17b0cebbe88731e2fc8c1345bcdba6a3c543
 MISC metadata.xml 394 BLAKE2B ebdd676a74e00f1952cd6bd0fec099f8a1b0e4f8d6b4a0ceb671dcb294138312d5320e10ae8b9033307b47349a0668bc5d3299ab1d603bf34e95df7c8fc955df SHA512 d8d4a3952b536c5e35e2f68096c4707ec4634d7db70f179e01e8b4ca57983062584c8d4a81d833b9d9a6ebcd83cf8b7389ca1d19e2e656b00da72b74ac87146f
diff --git a/dev-python/hypercorn/hypercorn-0.16.0.ebuild b/dev-python/hypercorn/hypercorn-0.16.0.ebuild
index 8ed578cdfeea..d3cc6edadb12 100644
--- a/dev-python/hypercorn/hypercorn-0.16.0.ebuild
+++ b/dev-python/hypercorn/hypercorn-0.16.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 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/exceptiongroup-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 9b47de0d3069..bb0897785779 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1,6 +1,5 @@
 AUX netifaces-0.10.4-remove-osx-fix.patch 353 BLAKE2B 49b66642156ada3e01e7a7fa28b6e12a36b5bacd38676972b1685a2c2710bcdb531849d3c27ce5279feafa1048d060eb227a79ddd5569c5d48accba600f32e69 SHA512 0c47d026e1be42fdae860aade01762d0c7e27083fbe17dbed76526e72852f0444e56617431d081de9e4e86c7ce65293d83e704e56a3219face4d07106730255c
 AUX netifaces-0.11.0-musl-clang16-null.patch 517 BLAKE2B 99607ae0966aa10f40fff8be8fcd325be9c9ec72da8f89ba3258ffa193fd5bf8434f2b1fda3becc0220ad13771da84ef9568cb0a8deda1fe86f1c9a4f564c7fd SHA512 1457d24587d32d2809910c7acfd3e5e1551aff084d625d3ea5555febd9de7dac8d48efb68d8b8bffd89458cba8d8714b58da7cb5786619390d9bc84df24b8884
 DIST netifaces-0.11.0.tar.gz 30106 BLAKE2B d531cec80142d005548ad30f4d13b23d0a7aa85f6907998bdc6d6081567234b169774b25d2e274d14e68564b16e96ff016c429c0a7aefabd6abae6994f1e7c5c SHA512 a53110efb78c89c4d72d002104866253a4c085dd27ff9f41d4cfe3811cc5619e7585ceda4e91e83cdd0645c40c745c61d205708ee9a34427b35f437a48f148e5
-EBUILD netifaces-0.11.0-r1.ebuild 653 BLAKE2B f6a337b89c9243013b69b923e21565c9da22b09b2e6e9fd892f7c9aa7208c6035ac2c990de49c43c690888636591c4aca2ff69a961b81951495f9841fdcf2897 SHA512 4e25ae1ca047d8f82e98c4d8104b580cf620d2aabf8607936296c99164edacbc53849f368897580479d13b6814b20d2d3370cfc158572f1700a97afd197b003a
-EBUILD netifaces-0.11.0-r2.ebuild 709 BLAKE2B 656e961205e8e560b54389b99f8d8654dd197fad488f6c50e73b935afa9a251cca454ef9f5fdab230bdc5a9bad725e9b2ad36c95be670501b761bdca55204db9 SHA512 058b88203ffd6f6e808315cc4661701ab6d35ea66cb447d6009cee6d3bba468f539284919ed13edb2c9324dba939c0209df3609454971dd6e6bba90d4130fd39
+EBUILD netifaces-0.11.0-r2.ebuild 707 BLAKE2B 845b1c9a05884d64d0bb62c2c5ba3db2f6e2e734843fb6581dc75361ca7013a3eb0c5813effbd0681589450115e71ccb7a3172175be4a674079274c55ef10c27 SHA512 98b1a56f563e77612ff9fc8d41235b0119b288382ced171cfb1e231d0a70431910fdb769ebe571b41a70924b1108cf99a6e7482184d366f6eb650a3021a4fcbf
 MISC metadata.xml 451 BLAKE2B 4d43f77c5e911cad7a8bdfa7cee80c553a645abfce7c551f1d819a62193e1263bf28d70c47d14f05ccbe9155ab08dae49c18cfdafdbd6c5705eab28e5c717258 SHA512 abf26a0026b93acfb3d81979694c13b2298bf09d410fa85994c9406a4e0219c1ee8d83b4814323cde287d27fab2526682df48238fe5db35ef93c4c3e0c0e068f
diff --git a/dev-python/netifaces/netifaces-0.11.0-r1.ebuild b/dev-python/netifaces/netifaces-0.11.0-r1.ebuild
deleted file mode 100644
index 46e323797705..000000000000
--- a/dev-python/netifaces/netifaces-0.11.0-r1.ebuild
+++ /dev/null
@@ -1,27 +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=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Portable network interface information"
-HOMEPAGE="
-	https://pypi.org/project/netifaces/
-	https://alastairs-place.net/projects/netifaces/
-	https://github.com/al45tair/netifaces
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
-
-python_test() {
-	"${EPYTHON}" test.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/netifaces/netifaces-0.11.0-r2.ebuild b/dev-python/netifaces/netifaces-0.11.0-r2.ebuild
index d9b1df98e107..0ca6da32cd7d 100644
--- a/dev-python/netifaces/netifaces-0.11.0-r2.ebuild
+++ b/dev-python/netifaces/netifaces-0.11.0-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch
diff --git a/dev-python/overrides/Manifest b/dev-python/overrides/Manifest
index c25ccb8e3bdb..d99ab961ae67 100644
--- a/dev-python/overrides/Manifest
+++ b/dev-python/overrides/Manifest
@@ -1,3 +1,5 @@
 DIST overrides-7.4.0.tar.gz 24804 BLAKE2B 9a9657d15ad835695d116559f1e6f51e14d1a0a9b5a237b2d468d9c6fd8d86368af53871490c257d7e6843fe02113a874524b8e55f4b3c9bcc7c827714cd5f44 SHA512 6ffd3b38997fd207d8ef9876ba9c328ef244b39300d22ae8c8bf63862f160b485d82b99d36d24abd1676fdddd39e5324eb0f1cf8629a0e17ac96956d165b6afd
+DIST overrides-7.6.0.tar.gz 22773 BLAKE2B 159f68670f897a37ee12023dbe0f88ea59c8c41412054fa1124e39916b665a590ff83ded0ca11d49a67071358ebc9d0c1fc6e46b7b8de19bee379c8d786ab48e SHA512 1d72da8738b2faacd8fd5698f86cd878d23ade607f89dabbd47b6d808c06732ad6eedc4f2547ba5f0aee321ced490ff16566c47e732048743506ec4261dcc6d2
 EBUILD overrides-7.4.0.ebuild 992 BLAKE2B b410e16c4058e632488fdf2ae1f2dcfd9de8ab32cc8f0436ec0f360d1a218c848899926bdd0b6b55fffb9920cdef965e522329484840a060b162433001cff38b SHA512 f685c79afd01b10e4c217a186519895e642adef6efc09892f79ab8aa1e247b8052d85ecfe139d17daf8ea015a6302a2648d719baf874dd2662680e8eae1329e7
+EBUILD overrides-7.6.0.ebuild 537 BLAKE2B 8b771e229003cffd493a9230b6eb244c712b33ccc3b772e27cc978c2dd7c16604d6aa755f250e65124ed9841f0e9bec30f016eedd7bff1104db9b7789c3f24cd SHA512 7fe42274f6139a4f1a77541393ccf4afe0730de63efa228bd37a874fe5a3a4f56557921a227e390c431de7d47c7b689ddeab2222c24c754b969a10e0549ea325
 MISC metadata.xml 408 BLAKE2B 3f011749f3b0b2cd3283ed70623fcbe6211cd33f7e5d59c7f02f677d7952e3aa49b8b9d4b6b8608c75028239ed7e2dd1226ed3692adfec7d2772e6bf37366fa5 SHA512 669a884bce1d2a97b2d61ca7e05ee134b7636a485435a0e22dbbe11f2e1e330e3be36146ddd115ad362f6b5b717d3f17f119f6b7e036e20085bdfce538183e3d
diff --git a/dev-python/overrides/overrides-7.6.0.ebuild b/dev-python/overrides/overrides-7.6.0.ebuild
new file mode 100644
index 000000000000..cf709f086235
--- /dev/null
+++ b/dev-python/overrides/overrides-7.6.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A decorator to automatically detect mismatch when overriding a method."
+HOMEPAGE="
+	https://pypi.org/project/overrides/
+	https://github.com/mkorpela/overrides/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index 85ba1e648561..4636222eac9e 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,5 +1,3 @@
-DIST patsy-0.5.5.tar.gz 398073 BLAKE2B 39f2f0d7d855fc3a4ae4a8930847c859aeacd74232fbc46c5455d10fe9cf0940ce5dea5322927df7b6aed61799e9ecbb6156cd2d142e0e965dc3b208896b1f7d SHA512 9df823094223e4929ece2d35696288cfb1ce0395cc3a322b88b582439dbe85ae69d81c876deef2cedebcd4763a57cc7289bdc74f77cb6a514d1f2c3a9332a7f4
 DIST patsy-0.5.6.tar.gz 398011 BLAKE2B c5fb15c57e270e3545cfdc8c13f8e745c94822be6684aa6703bdbc1da15ea63eb7a21d1e0bd1aaed2a4d919f4848fd9089dbcd3c304676e0a9512d13f94302bb SHA512 df73ddfa0e66088cb50133240e2d67e2a833d8f691e17b443cdc0661adf580eb8908b1e1082e8debd91439bbe7b990a9a455f16bd6773173c7e86273f2c1051b
-EBUILD patsy-0.5.5.ebuild 711 BLAKE2B 504fe662c3bf244ecf2cd223d364f07be74873b708a3f911b914b7593044d19959dcc1350254e6f2fd23aaae06ac61f36771206ce71b6fa8eba69817a53ef286 SHA512 f10fc540190ed34b92575e359f9eb60760466d516992ef67649618284713420e15da03f4b19116a70a164a036374dda0826363ea171e66033d90b2e1b2069c12
-EBUILD patsy-0.5.6.ebuild 714 BLAKE2B 94bd9023e48f6d6afcb1df367740588ea453c8561008f0e61efcc0aacf10b207fe62de833401ca5381aa7076e9ca78d7bb9c5f3b4efaef329dd7b99e12480817 SHA512 4ee6224c7db8738283bf928f109ff504f668768da97425a8319d79a0bd3ed1f2fcede6bfb2b84e91946c04e7a46c6c3e9c9616a9e68af19a48563402a9a6236b
+EBUILD patsy-0.5.6.ebuild 711 BLAKE2B 504fe662c3bf244ecf2cd223d364f07be74873b708a3f911b914b7593044d19959dcc1350254e6f2fd23aaae06ac61f36771206ce71b6fa8eba69817a53ef286 SHA512 f10fc540190ed34b92575e359f9eb60760466d516992ef67649618284713420e15da03f4b19116a70a164a036374dda0826363ea171e66033d90b2e1b2069c12
 MISC metadata.xml 732 BLAKE2B cf0e18d97605d69bae87a3553b89d551c03b908ec5a41da2ca11490cce6abd9aa6533d9155b7c19e3e12e5996aa8d5c3ea1f4cfb15e6c70916a4e2119fa54399 SHA512 f68d1e8645fee5af27d72062cc36b3700bff6c9f9eb6cb38a3b6c085211fb1b8502257d5d09edbd858e10ff4ef9f6661c577e336c3881e3c88e54d0db889a2b4
diff --git a/dev-python/patsy/patsy-0.5.5.ebuild b/dev-python/patsy/patsy-0.5.5.ebuild
deleted file mode 100644
index 6643571e86f2..000000000000
--- a/dev-python/patsy/patsy-0.5.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module to describe statistical models and design matrices"
-HOMEPAGE="
-	https://patsy.readthedocs.io/en/latest/index.html
-	https://github.com/pydata/patsy/
-	https://pypi.org/project/patsy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!hppa? (
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/patsy/patsy-0.5.6.ebuild b/dev-python/patsy/patsy-0.5.6.ebuild
index 99059543e2ea..6643571e86f2 100644
--- a/dev-python/patsy/patsy-0.5.6.ebuild
+++ b/dev-python/patsy/patsy-0.5.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pdm/Manifest b/dev-python/pdm/Manifest
index 5188b68eb10d..ce29e6901304 100644
--- a/dev-python/pdm/Manifest
+++ b/dev-python/pdm/Manifest
@@ -1,7 +1,9 @@
 DIST pdm-2.11.1.tar.gz 2595425 BLAKE2B cebaf5a86045a9826a8d6a77985a064fe3e05af403818a4629f7a978a58a4fd07e4d12ba4a69542cd4cf2a090d28a826ebadf0d703543b0551f49b61039d6d38 SHA512 e62bd64b1b302bffe0f7f18a68244b108a10969108ce98df028bd56662b336db8bf019fb1d516cc1dc579b838c674ef8601b8f7056e8547a89c5d3311cd037d9
 DIST pdm-2.11.2.tar.gz 2595716 BLAKE2B 10d1c78160f45099cdbbac6f6ef402b4c9f892e229fe56e54f164b4d7c3317cc8808639b97990e9fefda879d693cba32b48fc7b4c787704e7893c0844351227f SHA512 f27c1b5704469cc846b21a090f2098dacd486b833093af661644717a6dd6cdc627b086027b1c71037d5f3b179e72eac6dde3a98320eaff4f033ae9c96b37ab2c
 DIST pdm-2.12.1.tar.gz 2598220 BLAKE2B 3aa7ea827b4f38398c8e20ea06d887add3c87c5df26acf627580278eb87ddf508fe7eb03a83ea726541f1233168eb7975dc03715673dffb8d9f30d2843765c6f SHA512 2837f96de13e4d91f0cfe1b632c1fa08d27ce44230c43933e2cf2af2f4b9f3986719104ebc8e3f250f6a005e2a97428d580af0626b55b1e6c2f8f72c14ef67cf
+DIST pdm-2.12.2.tar.gz 2598826 BLAKE2B ea3d8dad2593cecfffe070f31998498b3559869bb66513816eee9fb01b4f42f24d33b85380ee95513eff56138a867ed1b80d0e05a32c52d9b8b22d15aad0d8fa SHA512 a0e3332288891f8705f8b4a6b1a08a9784d1e495c938d87294e20ebe3bf62e9802594e1090651742052c1790a6d0b2e498d6b47d0e6743afe37a9054ad8cdb60
 EBUILD pdm-2.11.1.ebuild 2712 BLAKE2B d47e697c77ce58da6f7d628694a96ec7534b36cab5974be6613be4d515c8e847a44be31df074288b28318bbc0228503beb86ae0227ad4ce740930a003f3e60a6 SHA512 809ac800f8231d092a52c0a6a98327839ce8a471a3cd5af2932b3e7a16951a1e43bed43453e38746ea59c9de43fff2b02269776f7c2f0d685531df43667fe850
 EBUILD pdm-2.11.2.ebuild 2701 BLAKE2B 3fb9bd26ddf5a8b28bcc87f3bde500b9301bbb5f3782bb04ab309cf3107b188566f16c7c12cba6e8f833f4f10a8413cf9ede13f8d3b8d34c0e0cc363868171ee SHA512 e6fa3ba598008e041f293fba99cf9b9cfb1e060cd2d5693c384e0c331484e3eb1679d834c88a8451b7d3b55a6593f6682a4f521f3c3bec08bffb18c0b1d86d62
 EBUILD pdm-2.12.1.ebuild 2701 BLAKE2B 3fb9bd26ddf5a8b28bcc87f3bde500b9301bbb5f3782bb04ab309cf3107b188566f16c7c12cba6e8f833f4f10a8413cf9ede13f8d3b8d34c0e0cc363868171ee SHA512 e6fa3ba598008e041f293fba99cf9b9cfb1e060cd2d5693c384e0c331484e3eb1679d834c88a8451b7d3b55a6593f6682a4f521f3c3bec08bffb18c0b1d86d62
+EBUILD pdm-2.12.2.ebuild 2701 BLAKE2B 3fb9bd26ddf5a8b28bcc87f3bde500b9301bbb5f3782bb04ab309cf3107b188566f16c7c12cba6e8f833f4f10a8413cf9ede13f8d3b8d34c0e0cc363868171ee SHA512 e6fa3ba598008e041f293fba99cf9b9cfb1e060cd2d5693c384e0c331484e3eb1679d834c88a8451b7d3b55a6593f6682a4f521f3c3bec08bffb18c0b1d86d62
 MISC metadata.xml 474 BLAKE2B c1471e124a955920e30f73dfa43a87999c30c2bb9615590f601befcc07f7d939ec68908e67c7345fca4cb0f0524d33507aeac9936fa30d449d1dde17094048d3 SHA512 a07256061dda5a8cf8b0e15205ac36651a4e5b594fdedbfe16d1d3264e1ac42847d1dc222d2857232ac5206d67feda432751695d85d0c4c7b03fd7228db8b1ab
diff --git a/dev-python/pdm/pdm-2.12.2.ebuild b/dev-python/pdm/pdm-2.12.2.ebuild
new file mode 100644
index 000000000000..170c13d740d0
--- /dev/null
+++ b/dev-python/pdm/pdm-2.12.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python package and dependency manager supporting the latest PEP standards"
+HOMEPAGE="
+	https://pdm-project.org/
+	https://github.com/pdm-project/pdm/
+	https://pypi.org/project/pdm/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	<dev-python/dep-logic-1.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/platformdirs[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	dev-python/truststore[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
+	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+	>=dev-python/unearth-0.12.1[${PYTHON_USEDEP}]
+	<dev-python/findpython-1[${PYTHON_USEDEP}]
+	>=dev-python/findpython-0.4.0[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	dev-python/shellingham[${PYTHON_USEDEP}]
+	dev-python/python-dotenv[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-1.0.1[${PYTHON_USEDEP}]
+	dev-python/installer[${PYTHON_USEDEP}]
+	dev-python/cachecontrol[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		'tests/cli/test_build.py::test_build_with_no_isolation[False]'
+		tests/test_project.py::test_access_index_with_auth
+		tests/cli/test_others.py::test_build_distributions
+		'tests/models/test_candidates.py::test_expand_project_root_in_url[demo @ file:///${PROJECT_ROOT}/tests/fixtures/artifacts/demo-0.0.1.tar.gz]'
+		'tests/models/test_candidates.py::test_expand_project_root_in_url[-e file:///${PROJECT_ROOT}/tests/fixtures/projects/demo-#-with-hash#egg=demo]'
+		# hangs on interactive keyring prompts
+		tests/cli/test_config.py::test_repository_overwrite_default
+		tests/cli/test_config.py::test_hide_password_in_output_repository
+		tests/cli/test_config.py::test_hide_password_in_output_pypi
+		# junk output, sigh
+		tests/cli/test_others.py::test_info_command_json
+		# why does it try to use python 2.7?!
+		tests/cli/test_run.py::test_import_another_sitecustomize
+	)
+	[[ ${EPYTHON} != python3.10 ]] && EPYTEST_DESELECT+=(
+		# test seems hardcoded to 3.10
+		tests/test_project.py::test_project_packages_path
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest  -m "not network and not integration and not path" \
+		-p pytest_mock
+}
diff --git a/dev-python/pip-run/Manifest b/dev-python/pip-run/Manifest
index 1c3396606f27..312173e8ddbb 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -1,3 +1,5 @@
 DIST pip-run-12.4.0.tar.gz 37749 BLAKE2B 76e6708cbcb9329b42ac031ee8f2253f04f898a8d6c83ae687f3a7f6e13f33076fdadad641562f379a5cdad1386cb71bf1b40f494c484f86286d1188f86c04ad SHA512 4e6709b2e22b49a3486f4d1caa07ae3d664b09bf76c9338ef8c9fb80024700fcd58c135d3cf3b69e7fcbf1ce20c996436fa87be03fbe9f5801b274ff72a4a790
+DIST pip-run-12.5.0.tar.gz 38695 BLAKE2B a44d35752586bd6d27a2d7e7feebbf904f8552e11becd821e693716b1ef74bfb490a17aacf3b7c19656bbc21fde38e40d29c79a611b2f510c02d199afc8f5cb1 SHA512 b641633c1863745d31637b1ef2a9151c79cc0c647b1bc246dbea5e834ec928b11b29b9cee1952513340bacb1ead610c2b34426b54d76345b57c887b1fe4b68d6
 EBUILD pip-run-12.4.0.ebuild 1434 BLAKE2B 74de1275c7bd3747fb6afc84d4b8e22c313538067db3e46be02ff173ec256f91eb3f07d34e0bb14d5530d57b62052056f6c6b072875c537f8fb3ef52d8a543c7 SHA512 a5369bfa54d1fc74c618d1615dae324681f4e8eb90690eb76d20e7290efcf6debaddd04de55edf7780a3a0d6d28be899b503b1d7f5096d54a87201c4b52d77d1
+EBUILD pip-run-12.5.0.ebuild 1320 BLAKE2B 3d23fcf884bafde2fea340c957509360c0a5cc477631735c786634eed96537dd5d5052a2cea6912792e538fd6a10c956b61ecb9f090dd354186c2623f4138454 SHA512 61151bf19a99a40809b51d9a8c8d19ca8fb08ae9f91cab3cb51fec564e848a0a9f26586bb4e7d08e40032aa534db69572f07ab6c93816e61c195af3f7b17f7fc
 MISC metadata.xml 389 BLAKE2B bc573b4f57b4f8371ecef97266b8441d47e66d551f7088a7f312ca049f7debd90e989d24d59d7aff182795ae27e553d131f3875c789dc793532ff9c812bcaf20 SHA512 00b81cba684e7118a3ce79ec5cb6a27d6ad67064a2745ffead8dec51c7786c9441139b800868cad8854ff39d7e38163ab2c8fa5c7d3f328390b628f8342fb0ca
diff --git a/dev-python/pip-run/pip-run-12.5.0.ebuild b/dev-python/pip-run/pip-run-12.5.0.ebuild
new file mode 100644
index 000000000000..18908d5d7407
--- /dev/null
+++ b/dev-python/pip-run/pip-run-12.5.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022-2024 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Install packages and run Python with them"
+HOMEPAGE="
+	https://github.com/jaraco/pip-run/
+	https://pypi.org/project/pip-run/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/autocommand[${PYTHON_USEDEP}]
+	dev-python/jaraco-context[${PYTHON_USEDEP}]
+	dev-python/jaraco-env[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-3.7[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.3[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/path[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/platformdirs[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		dev-python/flit-core[${PYTHON_USEDEP}]
+		dev-python/jaraco-path[${PYTHON_USEDEP}]
+		>=dev-python/jaraco-test-5.3[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -m "not network"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index ebac06ee8bb6..194991e908c0 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,6 +1,3 @@
-EBUILD pypy3-7.3.13.ebuild 583 BLAKE2B 9308115fd68cc96beed284dcd1eec6f3a404254b422cd7f88dbf6ffbc30e69050d3613bcc34151a4fd64375d1901b0899e32f42d843c68ab281c7ed10c5b9611 SHA512 df2c8d9903a9e772bce5c5d93203a31b68ee8e413ce5b721d6c59d9542f65ff13c9676ee22080cf1b361cb5762dfc22d1a5ee3a498c6aa2ba6d13731e9cd09de
-EBUILD pypy3-7.3.14.ebuild 585 BLAKE2B 5c5704a58e65e6d2bc4272988aaf0ca2e4b2bb21aa316c629ebb8594500743add0a901704f0a2ded2aa803841d4ec16a754884f435ece9a8682da1a70a1a2bff SHA512 3513a60f7264acf12d10d9b1921e843460db4aadaca2b0137a624a870a2ee31a44c52ed065d0cab4a9c35c1c24fbaaffbfd1dab838d1e12117ee53e528e8e481
-EBUILD pypy3-7.3.14_p1.ebuild 585 BLAKE2B ee89e4b7c3d3abf4c149145605d6dddbbd27d68f5bacf36a5a5e07aa4b1c6e4cde77e5a9f6599777674d1e6a0c0738edd3c25c979765ab045c886110e04e3a65 SHA512 f4281ec2cfe94d7997d5f15dbc01e7b113073b9fbc589b42926eee397771eed9fd66198c463b14fce7e74d25650098b3fe4b85b62ea9ef3595f0152befb9ff23
-EBUILD pypy3-7.3.14_p2.ebuild 585 BLAKE2B ee89e4b7c3d3abf4c149145605d6dddbbd27d68f5bacf36a5a5e07aa4b1c6e4cde77e5a9f6599777674d1e6a0c0738edd3c25c979765ab045c886110e04e3a65 SHA512 f4281ec2cfe94d7997d5f15dbc01e7b113073b9fbc589b42926eee397771eed9fd66198c463b14fce7e74d25650098b3fe4b85b62ea9ef3595f0152befb9ff23
+EBUILD pypy3-7.3.14_p2.ebuild 583 BLAKE2B 5ba38cc1ca041e6f7cbcb152c0673ee3566d4a1eb708d5277b4ffb621c2c082fa6b3bd0f2620b6cfb310584abaafa84c84722bca7a6ec3567a4b8c4d6b8221f9 SHA512 f67c2c9d20329ca2bcd5c3044bf71b4bfac7628f21829ac7c4d9929f44aa1e849b0b418b445e35985d4e28872596971624ddebb9fc2fc16308c421faa38fd5dc
 EBUILD pypy3-7.3.15.ebuild 585 BLAKE2B ee89e4b7c3d3abf4c149145605d6dddbbd27d68f5bacf36a5a5e07aa4b1c6e4cde77e5a9f6599777674d1e6a0c0738edd3c25c979765ab045c886110e04e3a65 SHA512 f4281ec2cfe94d7997d5f15dbc01e7b113073b9fbc589b42926eee397771eed9fd66198c463b14fce7e74d25650098b3fe4b85b62ea9ef3595f0152befb9ff23
 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
deleted file mode 100644
index 7626af9e7fbf..000000000000
--- a/dev-python/pypy3/pypy3-7.3.13.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
-
-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/pypy3-7.3.14.ebuild b/dev-python/pypy3/pypy3-7.3.14.ebuild
deleted file mode 100644
index ecf195f8f782..000000000000
--- a/dev-python/pypy3/pypy3-7.3.14.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
-
-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/pypy3-7.3.14_p1.ebuild b/dev-python/pypy3/pypy3-7.3.14_p1.ebuild
deleted file mode 100644
index c8a1509c574f..000000000000
--- a/dev-python/pypy3/pypy3-7.3.14_p1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 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/pypy3-7.3.14_p2.ebuild b/dev-python/pypy3/pypy3-7.3.14_p2.ebuild
index c8a1509c574f..ba301054faf0 100644
--- a/dev-python/pypy3/pypy3-7.3.14_p2.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.14_p2.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}
 
 LICENSE="MIT"
 SLOT="0/pypy310-pp73-384"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+gdbm ncurses sqlite tk"
 
 RDEPEND="
diff --git a/dev-python/pypy3_10-exe-bin/Manifest b/dev-python/pypy3_10-exe-bin/Manifest
index 3849d3180682..3f2d756a2166 100644
--- a/dev-python/pypy3_10-exe-bin/Manifest
+++ b/dev-python/pypy3_10-exe-bin/Manifest
@@ -1,19 +1,3 @@
-DIST pypy3_10-exe-7.3.13_p3-1.amd64-musl.gpkg.tar 11878400 BLAKE2B ecd7e8d829644b9f582c594cfb84a4e1e7fcce802d168b2acb16cb36664100278534894347f5c74656d1cfd8ca76350d37772072820a12a8f22e1e33adba62e3 SHA512 319c5aa343d8a2bd38ac9fbeb2b3c775acfa07960da0ea1f5cd0ff6bec9f6b89f39de918520322006cc9605dc65a1776b3fcac3c99febcaf6a3afe0984508b02
-DIST pypy3_10-exe-7.3.13_p3-1.amd64.gpkg.tar 11888640 BLAKE2B fcc2710b56853a6bf939812ebf30563c785f4c4228d226ecbfaba02ed2a1ab42636608db2595ac60e8bae7f49e2695abf6ead952d99ff0be15be438c25fd9375 SHA512 109af4ca4ac9c867050898a646a4a301d4daeb00abe2c649a23537260479531572a509984bd6f1fcc1126ba6128f4873ac4cda610be9d17baf789475ad8c5c0a
-DIST pypy3_10-exe-7.3.13_p3-1.arm64-musl.gpkg.tar 9871360 BLAKE2B 781de288a435b9be9caceba4890a3bd1ff04f8787ea6b2ae1168a4eb5ae5d01ee834dbafc4b145024256736dcedf167b5f45cb6ca7110b2e5f3a692a335249ac SHA512 75af9f81e2da09f6d91fe87c744c88fe1cf944b557d1f8eabb813ea847f3282a5d3f49c1fc0b94f9a0fd391cb8238cb0e57b2817cef46dce3677aaa97219f858
-DIST pypy3_10-exe-7.3.13_p3-1.arm64.gpkg.tar 9871360 BLAKE2B 9d2b3211d2d576bb42447ddbc71ae8d8f5a25ebefa40b8217f6d2cfc5748090b3ee7075a9b40d763910c0f02b98ef7943911ed744a50a7b7a555e3f546facd39 SHA512 e52fed5d0805cb875573c9c9d1ef33bb0be8c851ae11b0770fb7a9ca8414ba61bdae359db541dba69f943c8f8a78e64e5609e4a230336b20c77dbd4c68d44505
-DIST pypy3_10-exe-7.3.13_p3-1.ppc64le-musl.gpkg.tar 6522880 BLAKE2B 6c1a9c390e35478b1819e8f00ab01a5c25a0b5153f2236a8f33b78a63c5857ed0188df025b08cc8ab8a404cb33f6cf8ec34d4fe2b5a07a97732db727f039dbf5 SHA512 a938fe4fdf27b895106b0bb255de9c615d7f44d2192739b4a47066e4336d14c2128b280594ad360ae8e58b010122bfc538fe669b8eac3bbc41575a3d333af681
-DIST pypy3_10-exe-7.3.13_p3-1.ppc64le.gpkg.tar 10065920 BLAKE2B 951899b54a4fd248643625df6fa6926ed831b7b43d3020c62b109101877a06f5413ed41e1bf165b23bb66e2bfc4b910f84d6a3a9ad67cfaee2e8fbe5dec96bac SHA512 24b72ddedadce461b8dbaedc25dc582e8f215b194431a9a946b3d21725506730564e3ec64e640ae29baee0fae132e7b756b781444a6c0080890953234afb509f
-DIST pypy3_10-exe-7.3.13_p3-1.x86-musl.gpkg.tar 8806400 BLAKE2B 92152ea6f9c7a75934cb3a507d2c1ec17f91465aa3d5fb8f2cf8add2708d721a90d90c15656ada1c2ee0bf2290891cce090fed2b8ea4c8b9a17bccf3239ba1e9 SHA512 73292601e8ffb2c977a1b1253878d17bdf686d8a3b5ef7a737319aabfafe342c1b210f0773765203a41b55359a7c4fbe4958cc9813fc6849bf78ff5c5aaca7b0
-DIST pypy3_10-exe-7.3.13_p3-1.x86.gpkg.tar 8765440 BLAKE2B 1ea5c757b5f87846000ed010ef9eecb40ff278b3bf97211037e184a0c96f643f17656a0801ae0fc8ff45f7fc20372474439d1e3a7ba38755a1f64cc56d5670c3 SHA512 88a7ab0d960f89d38ef1703eaf8afdfad18b9b1ee046295914bb4968f719759e3dd9a604930348568feb60afd466258705bd9c6e26f6c760f56ffb0ddf1038e7
-DIST pypy3_10-exe-7.3.14-1.amd64-musl.gpkg.tar 12001280 BLAKE2B 9f0507d48bea2773b0d648bf2817f3228c6cd985e2c5229456887af00a0d4b8e9f4d0f8a2c0dabd73880c06ab93c89ca7ddc5aa5cec8720407d14ed40303604b SHA512 7f2740e94100ff64b2e492d30d4f4ca7f313586b29eb2edbd6c405fcbee1712f253205d09a010cf6992c593b3bdc593732ab76eb41b154aaf170cfa46e2da800
-DIST pypy3_10-exe-7.3.14-1.amd64.gpkg.tar 12011520 BLAKE2B 256a561cc40aa2fa980766e19f253bfca5d301a0e79de419d18d13b23b038db593835cfcb5faa3089cec9e86fcee98b09498d951d549a66aac1545c5c7e39a47 SHA512 e250e7f2d7acdd7dd521cae9ed12b344759970280da4c4c8ee3f3d667449c31fd3762be9ae44093b7d0b7a963a1a3c82586ee298a6bea425e77638162c3662ea
-DIST pypy3_10-exe-7.3.14-1.arm64-musl.gpkg.tar 10199040 BLAKE2B 782501fb169ad7ab0c22d10b58a559b3063d8c67db707c66147864b69d16dbde55027c841ad8548aaf574e20df95d87af7fdd7fb52030c9a2d71fc6a16ecda4e SHA512 9c353521198b6ff35213075177a5cea4d1f76d8148823077221f8fb2e32fc55cbe89590a69e36e670d97700c888f705cc26dd237ea137759cb44c311dbf89a49
-DIST pypy3_10-exe-7.3.14-1.arm64.gpkg.tar 10117120 BLAKE2B 4135a346b1d6e34ae90e5bfb255d3ca840fcfd13cd848b3b6562a650b364a9ff1f91a5eb81070252297bef87bc511cefeecf30e274be1c06b731eb33a88fbc33 SHA512 b60eade588eafbdea5285c31cda25c1f735da586ef56e7c81f98b883c481d866837680b86d5fdafa847282d1a83e1b7da9b4a95096041f7932ec6f77c74b897d
-DIST pypy3_10-exe-7.3.14-1.ppc64le-musl.gpkg.tar 6737920 BLAKE2B 3578757c8fc2da1079808107272cff3b49ae295d8fea1009d9787faab68e8f32c6e633093394d83feb629b39a4c149d083cb80a1e48b2e892570f0ee43f72ba3 SHA512 f5c66d9f96d4ba94c54739812d315b92a99ca2f85c777c6fd8b704405ba8d2fc9f28e4ced24fab0548ceadee3e2b60288dafb9b023653439c2a0596d05b45d3b
-DIST pypy3_10-exe-7.3.14-1.ppc64le.gpkg.tar 10362880 BLAKE2B f9422fb581ea1196d97ad420ebf192a6de343cd9024a030e987267a0c51b1a7070783ddd123c862cca7338c99011368bc5a8b6e603b15ae8e70358dd13275e97 SHA512 e9b55117a13767a855b4f25e0c3550370d9d4e4110aa7e685b4131e07dfaef9a68a01e3e18620aee40d9152a37e01271ada0e112d71dc92cafcc1ba240bf03a5
-DIST pypy3_10-exe-7.3.14-1.x86-musl.gpkg.tar 9031680 BLAKE2B ebd345010960b2c30e8ba68b79b5986c88c3657577c4cab36f8edd28e7df6f7e0f37a42a696cd6e6b17a2bc40896cab4280b1da9c0883925711d5eb46f827dda SHA512 ae2974c7c792900152d65114fd08c81ace540d13ab428de2fa8018bd8a1f279b13cac7c0b7b75b77335feb1463c537f2e7009d362ef42a1c54af7b5097d27d5b
-DIST pypy3_10-exe-7.3.14-1.x86.gpkg.tar 9021440 BLAKE2B 48a724bcfc5751413abcdf7adfe906a221e3541bdb8c550ad3711be0a8420b60c7716372eac6cbbadcae496fa135864507293fb9d3c287fa82eb921bf9107726 SHA512 7499e54bf34d9786b414bde6cc6265fc9c7372136461577af9af3a74a1775144168ce8100a3c9dc090491b24a863442bec29db4117bb326dd1c878925794575f
 DIST pypy3_10-exe-7.3.14_p1-1.amd64-musl.gpkg.tar 12011520 BLAKE2B 9e66f952e4d36dd35d8f3499fb0177b53bceb7e17a23e3393a7ebd97d1e6c4def8aeec414b4cb52fc9ec8b212187d8ff9a8257bc7ee558451e38cde03d00d49a SHA512 c013b3f69cfbe43709c46387c7f4c2991700aa4b270977e3797e2153bdd15c99758bc1787d9150a4e8cd5ede7d877371e5f626843316013d09031c5e60fdc765
 DIST pypy3_10-exe-7.3.14_p1-1.amd64.gpkg.tar 12011520 BLAKE2B 349cc839f6af09b2b0cdc66c2ec72c9007df27fc7db405d246320537dc377068c3866624daf6599452a68049d79457e6fc6acd6ba8663f1eea3e44d7c5e193e2 SHA512 463e71e41e7c8951e595bea9e0a0f0fd08177b8c26f8a298684494cfac6c5c8f53b7b15dcc97bcbef1d12c6457f38d751f7aea19e8bd5970990dea2cd0a7e3b3
 DIST pypy3_10-exe-7.3.14_p1-1.arm64-musl.gpkg.tar 10158080 BLAKE2B e29d4a41b9c96d1164053c31eaafbf568f791382db8b5fa20daa84bd182f3a595471f2a821a71eff8f1aa3aeefcfcba027fba37ca4eec1eae14aa76331568096 SHA512 58da7cadc5e3a444a071a0786894d5c78b5d8f50a4814b91111d7b67057af5c0c8101c00ee6bb259246ed2b5c13935aa631328c17ff3a71580f547efdcf20caa
@@ -30,8 +14,6 @@ DIST pypy3_10-exe-7.3.15-1.ppc64le-musl.gpkg.tar 6758400 BLAKE2B 737a1a6779e65e6
 DIST pypy3_10-exe-7.3.15-1.ppc64le.gpkg.tar 10465280 BLAKE2B b7af5d3f89e6881f697cdd16e7b8f3a7f3dd574125c0559b21f2ae5bb7ef1f948c1149c1a891ad5815461ed03e224086ab810fe45071dd2cbef9b35fe1c8cc00 SHA512 90f610253833c31d10e09e81e2ada135f5ad7486816cbc5421087cf386d1281901cfde13331c440df726d8bd2b703cf068f7effa7a13cafde48af0833027c1f0
 DIST pypy3_10-exe-7.3.15-1.x86-musl.gpkg.tar 9062400 BLAKE2B 14e371118171709a7a88cad1cc6877a486269819758f27f86083f37635d1d148ae1cdcac0f25eb0db241c199341f34f709dcaffe8292ec8c34332ddba2477f75 SHA512 833f915fd2b873ae038844bf594863fedef2bb534e81af599f356b6f9287584bde8748b066d54ad972f2a77df41fe4e61ad1a51d48e8b60c3e91cb29d1e7e210
 DIST pypy3_10-exe-7.3.15-1.x86.gpkg.tar 9011200 BLAKE2B 6d6766f1e343dfde5627d9a1ca33a27c1df39377dbf3e42c969298e20586c4430fd81ba7b9332d4258fce01167ec2c95783c65496262a1fc56bbcd07a57c1c5e SHA512 f4804bf874389eb8493a692d238e354dac3e52e6a7888c34a2bf3801429121e337e6008b0da8c9c36a15d579a3fa04e617339aab7e82e3c83ebbc0747345bf33
-EBUILD pypy3_10-exe-bin-7.3.13_p3.ebuild 2034 BLAKE2B 2929a8321810f24f9acdf39df73ac574f6f251f527aca9f88c9391672ea1f20f7b0a63ca9ec253b5eed2ced2157390b90f5ba085bf823dca0fb468909c279c48 SHA512 b08ceef463a43a3a3945129844f489763df275d84ac6d96a84f9817b3940ffb65a9956919e3d3e8d61e932585b395b55d6b5401ce307dc92761b710c10fe05b6
-EBUILD pypy3_10-exe-bin-7.3.14.ebuild 2036 BLAKE2B de1e4d8df35611557315fa2a5502e9eb4bbf5c6870fab8cc9187839dfd2c80400f8c24cde3078b06a3080ba7d7508582b32479d7a1ef59e22066dbf04f522282 SHA512 3842581febdaa65140fda3fb96db5f127c63e0956aa089f5cc152f453baa5edf64f2248a09a7e69717be95bed6141e3cb8395e86fce9b465c7695678f2071a96
-EBUILD pypy3_10-exe-bin-7.3.14_p1.ebuild 2036 BLAKE2B 2f882e7f8fc759216be500424717cf0a0f330720d0850c27076b1576686b3449ce64df358e520c58eab35187f9a684f69c0f56c7e348342f74197193f4e86558 SHA512 4cde3d8f21851d6082649a6ce41c24c28cc6ceb428ed1c5b834fc7de873cb4627901ba23dd7dee7a0554ef4231da727943c3f02e5b3cea75707c1dcd14d08d92
+EBUILD pypy3_10-exe-bin-7.3.14_p1.ebuild 2034 BLAKE2B a4b48d2c984497be2f071919587ce9ae272187994ff89e84d200eab9e4de60017c923a3b523cee4c10ee15874bf0941223371da8c83d0446c2def9ab540e1a5d SHA512 eb215c342002129012fd9aa57fbda9795eacbbda48f4d81c6bbf0c400760631d006d1ed63634b15161055c1792b7054d3d12896e7f3382151a61148e36478747
 EBUILD pypy3_10-exe-bin-7.3.15.ebuild 2070 BLAKE2B d1620a179878d11cbb3e3c9b14d0d6d33ca45f68b53edb0c612fa3df3ec6241b1b35a630234b4810c339fd1144a0ed614fd1c344b92ba6240c83bb7a7339219f SHA512 f44b89ab0ffb78d5db91b347d296809397360c2ad62daf2c44ad562758d682d8c7e14fb971a3a8f3e04e70a03d8c78878cdf04113f9f33c746c4ba60eb726f93
 MISC metadata.xml 315 BLAKE2B da5ed341c55250028587ffb479a27b7ec31eb0f8bd0e11b8a98a374e23d989f7d5bcce647ca9c78cd12f64b6b83dd0568c4f3a992a6c8c5089c52cef9de87441 SHA512 ebe1c4d655c49fd20127dd240b603f1b99d67c0a6d21c7eb37bee48f4ec6bba50648816ea2b1b746af58fcf8de576d24fe355ecfa2de07ebaa0265ade2ea38ba
diff --git a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.13_p3.ebuild b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.13_p3.ebuild
deleted file mode 100644
index 227f91e2f20b..000000000000
--- a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.13_p3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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.10 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-bin/pypy3_10-exe-bin-7.3.14.ebuild b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.14.ebuild
deleted file mode 100644
index 3933dcac88c9..000000000000
--- a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.14.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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.10 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-bin/pypy3_10-exe-bin-7.3.14_p1.ebuild b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.14_p1.ebuild
index 39eaf7e98acb..aec9d2ecef61 100644
--- a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.14_p1.ebuild
+++ b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.14_p1.ebuild
@@ -52,7 +52,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # sys-devel/gcc for libgcc_s.so
 RDEPEND="
diff --git a/dev-python/pypy3_10-exe/Manifest b/dev-python/pypy3_10-exe/Manifest
index 8366fc8c4a0b..26338b673814 100644
--- a/dev-python/pypy3_10-exe/Manifest
+++ b/dev-python/pypy3_10-exe/Manifest
@@ -1,12 +1,7 @@
-DIST pypy3.10-gentoo-patches-7.3.13_p3.tar.xz 9780 BLAKE2B a72cfc6723ad914f012309eac7606a37f2e6dd2c5f83c049c0d68466dae45a366536f2065c1ccdc9516339cb8949b146e410ab04b1cbbff3b9d62620a039040d SHA512 c1beb5c661dd0c0d94bebb23b82972ac9442caf777c377923c31b3f82b007396d0c3ef9874fc01cf765986cc7c6a941628f7e377a732a0706e99e3acb6fc5db6
-DIST pypy3.10-gentoo-patches-7.3.14.tar.xz 4772 BLAKE2B 3866dd6a86f88bf10d5a9a639defea0dbe3cb301ccb23d015b147a220f0e32041dc46497e43ad03c1c486291bb56752d77eaa2703e164e58f4f6af3e6b1e2433 SHA512 5da998beefaabe1307a16f1d9d4239453b9017aaabefbdb34d70ce339bfb9f8b7a258cdfcba74e0241bf140b3d2aae500710309d1dddb667154be7c482e88daa
 DIST pypy3.10-gentoo-patches-7.3.14_p1.tar.xz 5176 BLAKE2B 9cc684a9257a2855e44bed01d01020c0009dc966ff6fee7a789439e19814b1bfacc5fa0da166c8cb886f0dbadba365f6c6e2c520a4f5116e90ac637748e31e73 SHA512 11e468c2cab5e2234ffc68d98407bf7a676ea3b495a7e9ad7481f47fd39e2b1868b695da81b4edcee74cb8f01e997b72e994f18826331695427d80b2e43e926b
 DIST pypy3.10-gentoo-patches-7.3.15.tar.xz 4760 BLAKE2B 9131794293aa15cbafbc245727b5b60183606bb0273b05f4ebf8d24b525c3d6a39c8fe6f2c38487cda4a47d5defbdbb494c7786ee25a9ddc23cc9f209e5fc3cd SHA512 d2780be7ce91524bb71a47d51d9e9ad9a6aa5bd6c19903c90391cf7e6d4c9a96a98f414d22e9da7af67960ab9639f9a0f58f103c90ca9d694dcdfc4f0982bd6b
-DIST pypy3.10-v7.3.13-src.tar.bz2 23067819 BLAKE2B 6e2bfd83bcf16feef006dad39ab6d8f452418ee6bc4043edaa590db702f39275e775004bdba762736a901da94cb5274cd34f2811461048d46ac0f4af04158702 SHA512 16fbc76558152b3eadca999d56197a6bf906cbb7bb75035ccd3501372af0f0c22533d22ba231a40b7c02afa11f0d692a6ae85ba6d5e1607b737b8c68209b7c43
 DIST pypy3.10-v7.3.14-src.tar.bz2 23828709 BLAKE2B 15b3197953ff6271ddc9aad317f06094e1744111b7236447f029299dcc8a8ee089a8d91eec46d634489e0e89c94c0b18fda97dee51b3030ac62b0beeea7d6413 SHA512 4162d60d3869cfc87b1850266b9c7147413d3a7184a3c0c2edf1d1270ba3dff2db8047c7f2b5bbdd4c4d5136823adc078a5d45d575715984bab6633d1462f694
 DIST pypy3.10-v7.3.15-src.tar.bz2 23934723 BLAKE2B 12b438729547faa81bc31c429e166d4bfab2b4e76cb16a687886903ad83e3369e0532297222eafbc8b0f4ae006d87cbe15b2c360ad828fd9a44124067aa788ff SHA512 84f9a30484cf0b0bcf3ef1f71ce2ecae02a51b6609acc4f6edd4096302c9940541dc947f3f0767216d83d261f8db85ea43760af8ce3c9137c70aabe5571d1249
-EBUILD pypy3_10-exe-7.3.13_p3.ebuild 2859 BLAKE2B d25fd1d2fe4db8b14b32822743d303e1fe164d4236af519bc231a0db118cd32f950582bcd2e1c6de0522c10ff8d26d383bd0c8c2bb4ab0c4376066354a9ef624 SHA512 8e89ddb61bb26cf58e290ad7488b9cddc9698a2aadeb88897a5b901997b93806bc54cd50ce66a109613d919d6c55b29548e23396442974f8924bef248c1e051d
-EBUILD pypy3_10-exe-7.3.14.ebuild 2861 BLAKE2B aa9e25b2a21232e0c5ac08939cf4376911920c7c7dba220f810be9b3b1c544395315b5e9a066d3e2a4b797ac19aff419d696cac554322483a9c308a45d389a89 SHA512 482398a63227ae2eaac531825b4e3c4bab022c729b64cfb29747bbb80d2eff9d7b576a06ab04902868fc4d27e6716afd9dcfc3b7532ea9c74c8082de8aff0747
-EBUILD pypy3_10-exe-7.3.14_p1.ebuild 2861 BLAKE2B f98a1f1266c4e4689bb69ca67fa680b16948cb6fd75a113c18c0d3b4da612bc288e1aaef7db28f32967e5bd60c42ac666cdc572c0752aec4d97a93324ff1a1ec SHA512 2a136c3356bf33711cc940a3a9d60abda0d811c5160502a449ec20ca2903afb950d38e794b68a749e3fe0d184737327427afb0b4f916198470090cb79440eef0
+EBUILD pypy3_10-exe-7.3.14_p1.ebuild 2859 BLAKE2B 865ec9b33452355455ad7bbf50f923ee18a58d45fb0865f4c8e625c89d9af17bced48a512489278c5058504eace6b2059c7768cbe64be8786f30d00d1a6d0307 SHA512 c4631848917b9e5ca229b5ea50d49133c7f25fd8023e2cc6b6ed11997e90ec9d1ef6d5fe53c90934cd9ec15d650ac5c0f70db42d06e2e6c33505a192bb564e78
 EBUILD pypy3_10-exe-7.3.15.ebuild 2950 BLAKE2B e4bd943f4445acfcad14adf26bd5056bc1000bc7242a1f358173b6a95bbfab30911ad1d3aac0bb51feeba5f6be775754d124fc2481c2895f49892c3c64a6f77e SHA512 2d4d234105b20b28b8293fe9bc93aae330a40f05845371ab7dc73efc6defafb727b6e33c3a14df73b32067d2da9771831afdd213424bb3bae407cbf9f58d3a12
 MISC metadata.xml 572 BLAKE2B cfcd1422ec312338fd876bc4747a962ac3c4bd06e28a3891489b065fba4c7be2daa6955f51e8136d9b8cf7b68bb7eb887b6f419ee9fd626ebd6db204acb7995d SHA512 c79250d47e3d5c99c2c903bfc185449cc41f88e2b923b8eae1401e83c0f23fa1a12ad85f50b6e25844e805e543ae897ccf43185a1bdf9f992dff765249e55bc1
diff --git a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.13_p3.ebuild b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.13_p3.ebuild
deleted file mode 100644
index f92799a2e6b8..000000000000
--- a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.13_p3.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs flag-o-matic 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.10 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
-	virtual/pkgconfig
-"
-
-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
-
-	# Yes, yuck, but it's being worked on upstream (bug #918971).
-	# https://foss.heptapod.net/pypy/pypy/-/issues/4042
-	append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types)
-
-	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-exe/pypy3_10-exe-7.3.14.ebuild b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14.ebuild
deleted file mode 100644
index 9eec2da0971d..000000000000
--- a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs flag-o-matic 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.10 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
-	virtual/pkgconfig
-"
-
-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
-
-	# Yes, yuck, but it's being worked on upstream (bug #918971).
-	# https://foss.heptapod.net/pypy/pypy/-/issues/4042
-	append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types)
-
-	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-exe/pypy3_10-exe-7.3.14_p1.ebuild b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14_p1.ebuild
index 13aae0a0055f..33ead6eab113 100644
--- a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14_p1.ebuild
+++ b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14_p1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PYPY_PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND="
diff --git a/dev-python/pypy3_10/Manifest b/dev-python/pypy3_10/Manifest
index 2b9a31c845d1..6fa4051f3290 100644
--- a/dev-python/pypy3_10/Manifest
+++ b/dev-python/pypy3_10/Manifest
@@ -1,14 +1,7 @@
-DIST pypy3.10-gentoo-patches-7.3.13_p3.tar.xz 9780 BLAKE2B a72cfc6723ad914f012309eac7606a37f2e6dd2c5f83c049c0d68466dae45a366536f2065c1ccdc9516339cb8949b146e410ab04b1cbbff3b9d62620a039040d SHA512 c1beb5c661dd0c0d94bebb23b82972ac9442caf777c377923c31b3f82b007396d0c3ef9874fc01cf765986cc7c6a941628f7e377a732a0706e99e3acb6fc5db6
-DIST pypy3.10-gentoo-patches-7.3.14.tar.xz 4772 BLAKE2B 3866dd6a86f88bf10d5a9a639defea0dbe3cb301ccb23d015b147a220f0e32041dc46497e43ad03c1c486291bb56752d77eaa2703e164e58f4f6af3e6b1e2433 SHA512 5da998beefaabe1307a16f1d9d4239453b9017aaabefbdb34d70ce339bfb9f8b7a258cdfcba74e0241bf140b3d2aae500710309d1dddb667154be7c482e88daa
-DIST pypy3.10-gentoo-patches-7.3.14_p1.tar.xz 5176 BLAKE2B 9cc684a9257a2855e44bed01d01020c0009dc966ff6fee7a789439e19814b1bfacc5fa0da166c8cb886f0dbadba365f6c6e2c520a4f5116e90ac637748e31e73 SHA512 11e468c2cab5e2234ffc68d98407bf7a676ea3b495a7e9ad7481f47fd39e2b1868b695da81b4edcee74cb8f01e997b72e994f18826331695427d80b2e43e926b
 DIST pypy3.10-gentoo-patches-7.3.14_p2.tar.xz 5660 BLAKE2B 0381c95df65d7b77e9bbe53f4a714737736bc766ccdfac826a98abb7f5477797394e52e301baf29e9ab94575b243c4c62fc04744b2a1d8df75ac722514a019ff SHA512 5dd6ff6d546b1107ff1af29b36d0ff4b2787aeb805f4dd9787731935238f614acc123addc6d0a27cb7d4858f9935be41790152d1690871b681eba19e311ea4d8
 DIST pypy3.10-gentoo-patches-7.3.15.tar.xz 4760 BLAKE2B 9131794293aa15cbafbc245727b5b60183606bb0273b05f4ebf8d24b525c3d6a39c8fe6f2c38487cda4a47d5defbdbb494c7786ee25a9ddc23cc9f209e5fc3cd SHA512 d2780be7ce91524bb71a47d51d9e9ad9a6aa5bd6c19903c90391cf7e6d4c9a96a98f414d22e9da7af67960ab9639f9a0f58f103c90ca9d694dcdfc4f0982bd6b
-DIST pypy3.10-v7.3.13-src.tar.bz2 23067819 BLAKE2B 6e2bfd83bcf16feef006dad39ab6d8f452418ee6bc4043edaa590db702f39275e775004bdba762736a901da94cb5274cd34f2811461048d46ac0f4af04158702 SHA512 16fbc76558152b3eadca999d56197a6bf906cbb7bb75035ccd3501372af0f0c22533d22ba231a40b7c02afa11f0d692a6ae85ba6d5e1607b737b8c68209b7c43
 DIST pypy3.10-v7.3.14-src.tar.bz2 23828709 BLAKE2B 15b3197953ff6271ddc9aad317f06094e1744111b7236447f029299dcc8a8ee089a8d91eec46d634489e0e89c94c0b18fda97dee51b3030ac62b0beeea7d6413 SHA512 4162d60d3869cfc87b1850266b9c7147413d3a7184a3c0c2edf1d1270ba3dff2db8047c7f2b5bbdd4c4d5136823adc078a5d45d575715984bab6633d1462f694
 DIST pypy3.10-v7.3.15-src.tar.bz2 23934723 BLAKE2B 12b438729547faa81bc31c429e166d4bfab2b4e76cb16a687886903ad83e3369e0532297222eafbc8b0f4ae006d87cbe15b2c360ad828fd9a44124067aa788ff SHA512 84f9a30484cf0b0bcf3ef1f71ce2ecae02a51b6609acc4f6edd4096302c9940541dc947f3f0767216d83d261f8db85ea43760af8ce3c9137c70aabe5571d1249
-EBUILD pypy3_10-7.3.13_p3.ebuild 6312 BLAKE2B eaf56803de815ba2b66ce1f41c545589e0db710337c3635c939dc606465c5754fffeb97069c08b8dd4522bc6431009bc17d527362e3a1de0c4aa69b198abddce SHA512 c92b97d4257cae186b013bdae4caa8ae7bf1045567ebfeb8432c39179693e6a3c2122ba9c8f98d173f3e9043d373e930ccc486190c5db4483071c5834d6ecdc1
-EBUILD pypy3_10-7.3.14-r1.ebuild 6370 BLAKE2B a8c2b8b86fc0d4613fac21eb9356fb43fea4a52035443e6c669529588e56d4ca73772a133a850c3c746ea0d4935a9667d53574c08822ad4d73b112e86560d29d SHA512 69e9380deeaae1c1dddec1b92abd0e546be53763c33991b231cd48b955225162ad7451c1a83a426a89d971b16d8a7e1154e558a447c54b878ca3adbb7daae80f
-EBUILD pypy3_10-7.3.14_p1.ebuild 6370 BLAKE2B 5c6b341c6a9a02ad994b1cf83838a8b189ea401624eae24ad77ee32dbfb3955b52f264fd5bb963747a16eca89c9a30984da2b7d41ef4e6a67b717918cb834cde SHA512 8df647fbf918fa27f2ba2c0fe3b3ffd8ee2d259b9518025614be1bb4aed2e1b0bce63938ac86744180631a16f9ff509b89919457aba38790d75034cb365aceb6
-EBUILD pypy3_10-7.3.14_p2.ebuild 6370 BLAKE2B 5c6b341c6a9a02ad994b1cf83838a8b189ea401624eae24ad77ee32dbfb3955b52f264fd5bb963747a16eca89c9a30984da2b7d41ef4e6a67b717918cb834cde SHA512 8df647fbf918fa27f2ba2c0fe3b3ffd8ee2d259b9518025614be1bb4aed2e1b0bce63938ac86744180631a16f9ff509b89919457aba38790d75034cb365aceb6
+EBUILD pypy3_10-7.3.14_p2.ebuild 6368 BLAKE2B 28affbdfe3a4516f34daa4130541bedc9aeefdc980d45caf4871fdf2a1cd4fbf6a8f62172594185e996666547306e3e9a0defea0477d08ad0d50d6fc5f386976 SHA512 13eb11c393b709aeb8fafc3f1aedc77567418ccd1f6a8464caf70d1607ed7696944ed683844490933675411c287c3dac71673c5e4f7abead001a0663da2f3049
 EBUILD pypy3_10-7.3.15.ebuild 6332 BLAKE2B a762d6c7db414bbcaf3db73b04f1e5f2b130293f9c4752410a054157e76716c5d42d95e9e2a80591fef2606c58a452b819bb1db11fc5e2262a4eeb04a350ea9e SHA512 50cf5d33e0b5f4a1f239efddfcc62338375b8db06a35e1ff8cc398179b2672891e8f152f52dc6ed9233d86f20c9a7e493396882e2ff7cc40b2be2d8bfc3ea82c
 MISC metadata.xml 529 BLAKE2B 4121978ab7ed8811781be50eb702082b54ce8e2da22b1cf24f009a64d14b1c644f1420467e7f74d48b65e9644b9100d6e55bd5da0907565a4dd0ba6fc4d029ee SHA512 c862efc8092df86bcf1399abb86081709829b9d3ce9564f8a4d0d8d5d59a4089f79a70156efc093fdf08a2b563cffc8c5aa3f51e33c87456369ae75a5cef3f1a
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.13_p3.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.13_p3.ebuild
deleted file mode 100644
index 409ff106d0a3..000000000000
--- a/dev-python/pypy3_10/pypy3_10-7.3.13_p3.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing pax-utils 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
-}
-
-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
-		ctypes_test 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
-	# testcapi does not have a "build" script
-	../pypy${PYVER}-c -c "import _testcapi" || die
-
-	# 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.c" -o -name '*.o' \) -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 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..."
-	# exclude list from CPython Makefile.pre.in
-	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.14-r1.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.14-r1.ebuild
deleted file mode 100644
index 8bc0e2eb6b6d..000000000000
--- a/dev-python/pypy3_10/pypy3_10-7.3.14-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing pax-utils 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}"
-	)
-
-	# typo
-	mv lib_pypy/cffi{.,-}1.16.0.dist-info || die
-
-	default
-}
-
-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
-		ctypes_test 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
-	# testcapi does not have a "build" script
-	../pypy${PYVER}-c -c "import _testcapi" || die
-
-	# Verify that CFFI module list is up-to-date
-	local expected_cksum=a4138e48
-	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.c" -o -name '*.o' \) -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 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..."
-	# exclude list from CPython Makefile.pre.in
-	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.14_p1.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.14_p1.ebuild
deleted file mode 100644
index a52369d1f04c..000000000000
--- a/dev-python/pypy3_10/pypy3_10-7.3.14_p1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing pax-utils 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}"
-	)
-
-	# typo
-	mv lib_pypy/cffi{.,-}1.16.0.dist-info || die
-
-	default
-}
-
-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
-		ctypes_test 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
-	# testcapi does not have a "build" script
-	../pypy${PYVER}-c -c "import _testcapi" || die
-
-	# Verify that CFFI module list is up-to-date
-	local expected_cksum=a4138e48
-	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.c" -o -name '*.o' \) -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 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..."
-	# exclude list from CPython Makefile.pre.in
-	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.14_p2.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.14_p2.ebuild
index a52369d1f04c..aa52589fefc9 100644
--- a/dev-python/pypy3_10/pypy3_10-7.3.14_p2.ebuild
+++ b/dev-python/pypy3_10/pypy3_10-7.3.14_p2.ebuild
@@ -25,7 +25,7 @@ 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"
+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}
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index 5974faa93b80..70547a98d5f9 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,5 +1,3 @@
 DIST pyroute2-0.7.10.tar.gz 422192 BLAKE2B ee3eb0961537427aa8ec22d38b0e7e2f53f0ce0fe6802ded685fff1b91616b712b014d64b418122d98a29c030021a7414d2a0f71eff7afaa6e15cc432772c503 SHA512 834beeffb7d5436db6668217d3c3593798727996858211ff5a582446be095372a0c979c328ac97fd1485c27b0b56aedf256fc9ff5c74d2ef9665dce09fbd042d
-DIST pyroute2-0.7.9.tar.gz 418877 BLAKE2B 0585af297a58d53ba8698f706e50860eba39ab3334e5d2de9b94d15485399f4429da234e0bc22695097fb90782d482283da304af9bd471749039741cde294734 SHA512 23fea1206a1b6345d05e338449414f3757021ec5cc739aed16cc390e48c62f42f6246838942dc1e3015462aba2ac8051936aad4ce6e76d57ff956046396ecd91
-EBUILD pyroute2-0.7.10.ebuild 628 BLAKE2B 33d2ede89b06ba2a95678e40c7f78f830385bea4f2a65e4a820433592b8fdedb1f691cc23e84342a2174b5d65675f0d6d8e694bf7fa0e14a006575e462aab6c3 SHA512 c8e7ae468c4d47512400a537e3af8c27e46cb6282d5249f26c9ad0d5443dbc2a0dfcc095f7081430a36fc4bada3c35fe6f2ea3578a842957d05966f9ecd9918d
-EBUILD pyroute2-0.7.9.ebuild 624 BLAKE2B 741dc502d791d5e86576159a63fede51c390ac5914bcd5ff605ac0501ffeb2091707a27de792ddb1d028350977a2c95860ab4d5fcd9b0300a4879b1490f0b231 SHA512 4eca4f646458b4362b277c50a0e1cc40796fc28d84046414174a7273ec61f050031f76f96e4c2aa449c2477a0b7954f58b7685bca949a74563dd8e3920f46d81
+EBUILD pyroute2-0.7.10.ebuild 626 BLAKE2B 4f779cb907cd8e08444bb0ed561313d7358a8829509ac1d06d2281b3c23c7db1f88fced2446ca185517e446002aa7d6ba3dbbbc6734cc14607f15e4e8ee44e6d SHA512 a2e1f56eb6b74963df576174b8b68f5469104059f13f802ddd7536b68f6ab6a400eccbfdf6be95a60472d466f25efec5fa3c54b3636b4813d8661c56e644752e
 MISC metadata.xml 547 BLAKE2B 1d256c8d9bb8cc039853ff12c15d7c2747822ff95e3ae7f3e7c1600498c7b886a341a03327992e3a7933592eba0094eec6fba519b0d9f2b2f0ece57eb515ea4a SHA512 e845b3e319e9d60b1dcbf9ab66681b886b0c517a5a72288aaf9ccb97d5018dc3b01b8d921b8a9fcd3538cec96e9a7e1c452a704c8c422ef6e6fa6069a7ae56ef
diff --git a/dev-python/pyroute2/pyroute2-0.7.10.ebuild b/dev-python/pyroute2/pyroute2-0.7.10.ebuild
index 58c1cf80ba9a..0802e4c06c3b 100644
--- a/dev-python/pyroute2/pyroute2-0.7.10.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.7.10.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="|| ( GPL-2+ Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 # tests need root access
 RESTRICT="test"
 
diff --git a/dev-python/pyroute2/pyroute2-0.7.9.ebuild b/dev-python/pyroute2/pyroute2-0.7.9.ebuild
deleted file mode 100644
index 2e7b56ef6b06..000000000000
--- a/dev-python/pyroute2/pyroute2-0.7.9.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_{9..11} pypy3 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A pure Python netlink and Linux network configuration library"
-HOMEPAGE="
-	https://github.com/svinota/pyroute2
-	https://pypi.org/project/pyroute2/
-"
-
-LICENSE="|| ( GPL-2+ Apache-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-# tests need root access
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index dba1d48952de..287b7ed1fd6e 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,7 +1,9 @@
 DIST scipy-1.11.3.tar.gz 56335652 BLAKE2B 2b35c24522b2bd498b4ebe84a854c8ec1e62917e7b899b3e3526abb9780c1e56f8e776a3bb1eab1bedb17a273fac881e5ffdaac808084a4f5a5f97428bff1029 SHA512 6491c4e479d9f4f02e677396a25ddca947a0dc6c009fc2ec34c658012a6224c0b535f14045bb011fbde9973ea987d184574ed64e6760c31798ec860eb0896fcf
 DIST scipy-1.11.4.tar.gz 56336202 BLAKE2B a2091a1edb54eb73c2de6ed8c62a7e571f37b247c9af50947aa97b739342c96b87b20a82b1a238c859fa532c84249cbadde228366dcea3555e9a506c1ae55031 SHA512 2eb403f6de9723b411d948b8e1b5457078704c605b8e760d42362c82d802e167eaaf701ddb8b480af2bdf2efe4dbf66fcc4e97321519bb8dab19b0e2a8976beb
+DIST scipy-1.12.0.tar.gz 56811768 BLAKE2B 03c142274f1466747935fa54fab427f3a48c1642406211fa1a0f8ad5e0f194baecf76182e0448a0fb647063871483239cd876ce431cd9406e396e6170912ab64 SHA512 376ed94c4caaf782814bb07047fff0b363f7b608a0399697c6e862432333cbe6d3abb351730a574a3f077b3cdd9cb7474090a460baffcfbd5546bcfee309b6e7
 DIST scipy-html-1.11.0.zip 50421508 BLAKE2B cb5e4a4f8817a80f54ae73b4a47ba22d2438df46ebfe27ef5fdc2695fdd983226f4ccae925bf82b15d01ced4f4b6807384ecadac5e1aa7700aa887ad06b7d065 SHA512 33718bbd5e828687d93fccc441a53b6a2e8f54ac4952d3b69d4c4668f55cb6ef5aba33df9acda20b2400effa5ae71767b2a5602a365ad2045a6edd24ff89c253
 DIST scipy-html-1.11.2.zip 50435722 BLAKE2B 460c67509a8bf50986f866ee2f90e634af21ddd71508efeef5681c2ee2130c3f79b4b428bc21277bfb310bb45ccad1fb38221ada43620055377cdc4839b9d1e5 SHA512 986a6e37f9e01dc4925ef22af6ff660bae1e4b66e57270262974c207dfb70285e3f8f548774d6e81d5f457b9198c0ba1c06e6d689fe5d54fdea878c1e5a7f797
 EBUILD scipy-1.11.3-r1.ebuild 3646 BLAKE2B 4b1ad2969bce3110bb1734c3ed19393c6aa381205924c1f4a914ef31c63ee267660f67503b20f739fe8012d9dd4755f8ba11637bab7c41e2bb86c47098bf9f4c SHA512 b2cbf391998945662d69515dfb275837067bd9e011e038c0f63ae9314e4d3b2d22f9658f70a61a7b493e99cfdc3454e16367b7793d05f2c02b53943f6cc70fe4
 EBUILD scipy-1.11.4.ebuild 3658 BLAKE2B b7c48e8a930fb4316e872fc79674dc01e4d108f96eed892996b2b2ce3f1bc935a50cd21a1b9a17e72ac7e23ae5fdff202d3b9c24bf0d883516381225939ba326 SHA512 d5382769130b623ce7e80f16074bc6bff21078c1431d53081c4a2ff6372950c7123850ac9e464f1697047e76fdbf5e31c4317ce4ce50e0a8d78d082ec279cc71
+EBUILD scipy-1.12.0.ebuild 3621 BLAKE2B ff96f550275f3a4a34548977a2d260c7fbd8126a41a7a3a75cff528f35d048db3aa7be83e26d47b814e61c7543332f168b0e3d2c97359ab55a9fb33d0dd6111f SHA512 4a0742d8e5547db2599c052e6964a4ebef08fb4b92528c5344d746319044b1de75c40a973056e1ca3b35b1aad0ef289e7482690c1ceedc9b8f20a2cc1352fd35
 MISC metadata.xml 953 BLAKE2B a09ea1325a175e349fbc3ca77c5e7b373538ea01147e8544f44b7d4e0c55fbbc2012431fcfe9a3457e82d295e4b5630df1ed69c48ef3462ed9b157af30a1e09a SHA512 74a21c6e1a9bef95b3d74a9513c59d302f473725c04fa32a9991b6108113c0f4b78179ce4a628140e7aa870c24ca60bddf7a00063b6b73dd45110112311371d8
diff --git a/dev-python/scipy/scipy-1.12.0.ebuild b/dev-python/scipy/scipy-1.12.0.ebuild
new file mode 100644
index 000000000000..2a9cb0843716
--- /dev/null
+++ b/dev-python/scipy/scipy-1.12.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic fortran-2 distutils-r1
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	# Need submodules, so git for now.
+	EGIT_REPO_URI="https://github.com/scipy/scipy"
+	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
+	EGIT_SUBMODULES=( '*' )
+else
+	inherit pypi
+
+	# Upstream is often behind with doc updates
+	#DOC_PV=${PV}
+	DOC_PV=1.11.2
+
+	SRC_URI+="
+		doc? (
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+		)"
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc +fortran test-rust"
+
+# umfpack is technically optional but it's preferred to have it available.
+DEPEND="
+	>=dev-python/numpy-1.21.6[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:=
+	sci-libs/umfpack
+	virtual/cblas
+	>=virtual/lapack-3.8
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.35[${PYTHON_USEDEP}]
+	>=dev-python/meson-python-0.12.1[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.10.4[${PYTHON_USEDEP}]
+	>=dev-build/meson-1.1.0
+	!kernel_Darwin? ( dev-util/patchelf )
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	fortran? ( dev-python/pythran[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+	test-rust? (
+		dev-python/pooch[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_configure_all() {
+	# https://github.com/scipy/scipy/pull/19857
+	# Fixed in 1.13.0
+	filter-lto
+	DISTUTILS_ARGS=(
+		-Dblas=blas
+		-Dlapack=lapack
+		-Duse-pythran=$(usex fortran true false)
+	)
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+
+	local EPYTEST_DESELECT=(
+		# Network
+		scipy/datasets/tests/test_data.py::TestDatasets::test_existence_all
+		scipy/datasets/tests/test_data.py::TestDatasets::test_ascent
+		scipy/datasets/tests/test_data.py::TestDatasets::test_face
+		scipy/datasets/tests/test_data.py::TestDatasets::test_electrocardiogram
+
+		# Precision issue with diff. blas?
+		scipy/optimize/tests/test__basinhopping.py::Test_Metropolis::test_gh7799
+
+		# Crashes with assertion, not a regression
+		# https://github.com/scipy/scipy/issues/19321
+		scipy/signal/tests/test_signaltools.py::test_lfilter_bad_object
+
+		# timeouts
+		scipy/sparse/linalg/tests/test_propack.py::test_examples
+		# hang or incredibly slow
+		scipy/optimize/tests/test_lsq_linear.py::TestBVLS::test_large_rank_deficient
+		scipy/optimize/tests/test_lsq_linear.py::TestTRF::test_large_rank_deficient
+	)
+	local EPYTEST_IGNORE=()
+
+	if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then
+		EPYTEST_IGNORE+=(
+			scipy/datasets/tests/test_data.py
+		)
+	fi
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# fd leaks in tests
+				# https://github.com/scipy/scipy/issues/19553
+				scipy/fft/_pocketfft/tests/test_real_transforms.py
+				# TODO
+				'scipy/special/tests/test_data.py::test_boost[<Data for expi: expinti_data_long_ipp-expinti_data_long>]'
+			)
+			;;
+	esac
+
+	epytest scipy
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${WORKDIR}"/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tavern/Manifest b/dev-python/tavern/Manifest
index 106fa3f0e9b1..3f0071143d7c 100644
--- a/dev-python/tavern/Manifest
+++ b/dev-python/tavern/Manifest
@@ -1,3 +1,5 @@
 DIST tavern-2.7.1.gh.tar.gz 220388 BLAKE2B 3e689ff0c29ddf2e53e018f86c79ea7e4e89e586d5f28b79c93263a10c4e7738fbf4c66df81fd55bc13a812223e538726f3f9b9f8bdbb94e7f043e90c70af2ce SHA512 de2822ec746c2ccb27a401c07bc5618539e4ad309e56437d0c66669612f48658fc352e42a0b4db94f9c183a159bbdcbeabdf30bebeac03c5f6a9f51bc7014b76
+DIST tavern-2.8.0.gh.tar.gz 246475 BLAKE2B 373d58205462bbe34deffdcb1f87700e121e9fceee77700bda7ef76787d3c1b4ce2fdba8eb4a4e1369814665ed0c6562268f8acfe3b85eb92ff260dd413caaee SHA512 b54ba992f328623b8bddbafd67eb7e124718aa7e01435ac3c1132451b450e7a8af49618fec16c0d47d0300c5cafe78ffab6991abde880986d7381c8b885e22ad
 EBUILD tavern-2.7.1.ebuild 1334 BLAKE2B 7a289d1045c8f077e167aea5c61fec771473b1062264311e8d5e1962cd2aa5c3cb68e906380a4e3870deb38d7147b9ff7fe41289cbfb7a5e4a2d54fe28ebc778 SHA512 f60ed2ae2877a0aa2ed3b4edc7d3c84cd9661ea65fed501c33b3269148e91e266de8eab16222bcf8980f90dfd9d3096114b2bd973ba45f60ad9d53f12cc1d19f
+EBUILD tavern-2.8.0.ebuild 1523 BLAKE2B 80bf33e5aca508d51c0fa7cd8288bdc85d1766bbad42752b9b80e34faccb87e4f683940114ca34704dd854809d56f25c988c9ff68b5f127fcc736f3266002668 SHA512 cd9a018d27fbd42f3ece8a63d8f7d97deacda88d5c938406397b23d15708b88a9332cc2aff5b2ab26b3646ebeb91c2771ab904115aac82ffc00f301b6cb5f381
 MISC metadata.xml 722 BLAKE2B 0ed7dd19f49aae7940de52b0df249979458b3950422e1089886929499d7a92d16a3a6e101b52313569900af6aec4e26388ae6d0673d5b1acef1e1615ed87d34a SHA512 3c30524ee5129700db664b5dab8635463ee17d4a45295583d79755c1f5b1dbba9ac611fcec3e9584028bfe96cf913f4f4b9d8da67a0e8ff6cde1ebedbf57c15a
diff --git a/dev-python/tavern/tavern-2.8.0.ebuild b/dev-python/tavern/tavern-2.8.0.ebuild
new file mode 100644
index 000000000000..74fcee9d1337
--- /dev/null
+++ b/dev-python/tavern/tavern-2.8.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool, library, and Pytest plugin for testing RESTful APIs"
+HOMEPAGE="
+	https://github.com/taverntesting/tavern/
+	https://pypi.org/project/tavern/
+"
+SRC_URI="
+	https://github.com/taverntesting/tavern/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/jmespath-1[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4[${PYTHON_USEDEP}]
+	>=dev-python/paho-mqtt-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pykwalify-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pytest-7[${PYTHON_USEDEP}]
+	>=dev-python/python-box-6[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/colorlog[${PYTHON_USEDEP}]
+		dev-python/Faker[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# strip unnecessary pins, upstream doesn't update them a lot
+	sed -i -E -e 's:,?<=?[0-9.]+::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires grpc
+		tests/unit/test_extensions.py::TestGrpcCodes
+	)
+	local EPYTEST_IGNORE=(
+		# require grpc*
+		tavern/_plugins/grpc
+		tests/unit/tavern_grpc
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p tavern
+}
diff --git a/dev-python/xmlsec/Manifest b/dev-python/xmlsec/Manifest
index 253f447448d9..44bf209392a4 100644
--- a/dev-python/xmlsec/Manifest
+++ b/dev-python/xmlsec/Manifest
@@ -1,5 +1,4 @@
 AUX xmlsec-1.3.11-fix-xml-testfail.patch 879 BLAKE2B 3d655b40a67b44a4abd65188c6d719e12063e857942fdb112b47da38977864252e3d250e0bbaf5c86f4688bb7701aae89df444c4fef0e3f0eaffc98fe5b6b856 SHA512 8c8f9af415dc9207e5c0599ee958dff6558618f94a9cb3c583b1c9eb6d1de251d714edf1afdee581cb33c7543f88c54d36af9b6f903fe31994a86f1b602e4c75
 DIST python-xmlsec-1.3.12.gh.tar.gz 77722 BLAKE2B b5ecece8063b823cdbe4d58967d10026bdc6f3774954021a3739d579ba3c5a08130af1792921c7892e6bc3d00f88ac83ab30e862775e419e0dad40b990b10cbe SHA512 19c5e3bf58b4b0f8a1cca3e60c08348b02ae298620f8c02b8cfb325aecf0313cb2bd1af89507b754ebe4c35af3b031e232d15ddcd42deae0821c9c0d7571aa7c
-EBUILD xmlsec-1.3.12-r2.ebuild 1334 BLAKE2B eca3a3bff75e170a4b06b849506524d4d7203feba48cf95b35315f9eb496a0fa04027501de9294254a510bcd914276ed27d995ced9a445a62a242194cb1753bd SHA512 9bcde471fdbfcc323f1e696907c20ede30305768f1f0e8ffcea494e45189d2e422275e39950cc2ed569dc4b9de76ddab15c60f034d034e723ffabe003ccbd2d5
-EBUILD xmlsec-1.3.12-r3.ebuild 1420 BLAKE2B 2c544d56c85456c9d7fdc0b4837298a949fa7f9bb5bc6fa101fc361b1f28b582940760421e4cc7a08b86d0d58dad49ea0d1ea9d75a3ed52fad4068646be7ef45 SHA512 6ce9dc5e291c03f92e8ff34f355798570f2ec625f1ea6a5886b0edc056a2b1303697147408dc0f3106f587a50a34fe96817337ec44c298c088e22d0e4c29678a
+EBUILD xmlsec-1.3.12-r3.ebuild 1418 BLAKE2B 2a2e1ac925f431fb9fcad96147f75b6fc94090e0e6905e3dee9ca522a92be64dbeae3fa2cda79db6968f92354f726fe4b4b6dc93884f00e692dd8a5f421c3547 SHA512 90e424de50b8151f1258671eb7ffcfd3618af94dbee27acbb838a566dce4223e2f5fe0182b47b0585b226f92131e92eb6a3c21a555e79fca67b2d6e445129a55
 MISC metadata.xml 480 BLAKE2B 17abd324963ad808438f7c04a5785ab72e280a5ba8b132737d89c06fd17fc20e96478b4684ae84864bd03690bda6e865200a8eacf3bd0c23ceca4f0230bef1a5 SHA512 82d2b54886ba9d2eeba17aa04e2946c9dda8d30a5bea9a9ba7a5041b559971466c33ceb67ed35c9f865c052df09fb9fd057b46efd4d3d4314f456c8b1c0aaac7
diff --git a/dev-python/xmlsec/xmlsec-1.3.12-r2.ebuild b/dev-python/xmlsec/xmlsec-1.3.12-r2.ebuild
deleted file mode 100644
index bb49f81c3b00..000000000000
--- a/dev-python/xmlsec/xmlsec-1.3.12-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=python-xmlsec-${PV}
-DESCRIPTION="Python bindings for the XML Security Library"
-HOMEPAGE="
-	https://github.com/xmlsec/python-xmlsec/
-	https://pypi.org/project/xmlsec/
-"
-SRC_URI="
-	https://github.com/xmlsec/python-xmlsec/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-# Doesn't yet support xmlsec-1.3.0: https://github.com/xmlsec/python-xmlsec/issues/252
-RDEPEND="
-	<dev-libs/xmlsec-1.3.0:=[openssl]
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.11-fix-xml-testfail.patch"
-)
-
-EPYTEST_DESELECT=(
-	# Fragile based on black version?
-	tests/test_type_stubs.py::test_xmlsec_constants_stub
-
-	# Broken with xmlsec-1.2.36+.
-	# https://github.com/xmlsec/python-xmlsec/issues/244
-	tests/test_ds.py::TestSignContext::test_sign_case5
-)
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/xmlsec/xmlsec-1.3.12-r3.ebuild b/dev-python/xmlsec/xmlsec-1.3.12-r3.ebuild
index e5b29d345193..03cc95cdf32d 100644
--- a/dev-python/xmlsec/xmlsec-1.3.12-r3.ebuild
+++ b/dev-python/xmlsec/xmlsec-1.3.12-r3.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 # Doesn't yet support xmlsec-1.3.0: https://github.com/xmlsec/python-xmlsec/issues/252
 # Doesn't yet support lxml-5: https://github.com/xmlsec/python-xmlsec/issues/277
author	V3n3RiX <venerix@koprulu.sector>	2024-01-21 08:09:25 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2024-01-21 08:09:25 +0000
commit	5adb1b3ff590f0911922679849a7fdacc8b4f217 (patch)
tree	8a471fe02dd3498487715d39f928b42017f24c99 /dev-python
parent	afcb9236a72cf602364c28b9bde6648e4a7f1ca5 (diff)