gentoo auto-resync : 02:05:2023 - 23:23:39

55 files changed, 325 insertions, 824 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c348997920a9..c82bb9c99470 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/cheetah3/Manifest b/dev-python/cheetah3/Manifest
index 72b067959ca5..0ae11fec0350 100644
--- a/dev-python/cheetah3/Manifest
+++ b/dev-python/cheetah3/Manifest
@@ -1,5 +1,5 @@
 DIST cheetah3-3.2.6.post2.tar.gz 316291 BLAKE2B d5dfaa958bc0cc41097d4a75abfe092d51379efd644daa01caac6ba1b789c21334a662904166b6069a0204e302c1d9e7bea74aa9f11082b9c8fce1c1c509f888 SHA512 b10d2569ce92181029b8f95d23602ec7b002400c8fdf4f6bb095ff40201154b97418fec19c9920f2f212f545633571aa32dc50a16a9ba81a9427303ca7938f29
 DIST cheetah3-3.3.1.gh.tar.gz 315007 BLAKE2B 627cb435db1cf274861a29b993f49457c1ba4147b6e1514b5d5961a2fd565c39ff9cae3bcd9665379c5206dc2cef98a6bf159781e664d75d87fa8c4244ec4e43 SHA512 057d3772390076157a0e09e6b5e60ad0ec3b1669aa62741bcfd314f846bba091884d361382d6399e73bce06aaf49366ee3cbeb040c6f5b3e00423eefd440c300
 EBUILD cheetah3-3.2.6_p2.ebuild 927 BLAKE2B 26bcaee842611be037bfc0e655809f328326a6669099f4a9d8d4b88c60e7382f2cc29d21e674941a9f5e815665f593e1400dbd596b7c7c9a186066138dd9714d SHA512 6e8c26120d88915c46b23b492caa94cdb0aad2b105eea30437f94671ea3966808dbcb4bff3496328621012574d16e8be39070be9eb6ed845277489efb5d2d3d3
-EBUILD cheetah3-3.3.1.ebuild 958 BLAKE2B a71c83a178f1877403a630948ae9dd77fd0a3f76519a17156755522ffc8cc9e37ae751a9ffe7a30dd00b5e5fa141e2078f3a7355bfb961570d5b1e3ff1a92fb6 SHA512 ae5d284d1f4cd12eec71705cb48a3b6c430548e0eaff1990ab58bc27a1d70363c1d711a628166ef45f532cf50d2e61466a37dad9421a5268a3e0cf9fc0232a1c
+EBUILD cheetah3-3.3.1.ebuild 955 BLAKE2B 22556ccce3837a79495e593a7bb284c2e506896a2ff38ef0267b98c14cdbb647196cead88522f38bb2fdb7344461eec393d25cd72330ef2b7ced200cad579139 SHA512 b1b825b85d13dda30ce89192e882c4d55d7dcb59bfb9bf789c55d84927c50946a8be4c6b0eea07d26884b3175bda492bc3fb3c691d15f3514b9971b025bb411c
 MISC metadata.xml 728 BLAKE2B eed475bf99f19abf5f934cc9e9f0ed10c3a29536767133a628dc3f23e95a37a0feaa82e4f080ac8f6d541cc6d802a084d670e64049149937b061e5f20bac317b SHA512 52b5eb46efb8d6e750823775ef459eec200e617e9232867cdfa229e2d7b6a41feee15441ac1a7c1ad2871f0fd19fb91fd6c36719eee2592c41e27ad8ec5fd162
diff --git a/dev-python/cheetah3/cheetah3-3.3.1.ebuild b/dev-python/cheetah3/cheetah3-3.3.1.ebuild
index 8ac112ebae33..6a7206d0dc58 100644
--- a/dev-python/cheetah3/cheetah3-3.3.1.ebuild
+++ b/dev-python/cheetah3/cheetah3-3.3.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index e1eba5b495b1..95c9966417df 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -7,6 +7,7 @@ DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03f
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
 DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
 DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
+DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 DIST llvm-project-5ea158077ec9ca50857ede5cbb0b27c61663fd55.tar.gz 182543024 BLAKE2B 32f5a9ddaa6c7e283d97256d7bd68634f2f8ed6d7167e743ba8076809ea1a3a7159f9ccc56a6e5a8838481cade07389669d8a35b17b5922da0cbef04c80131f8 SHA512 3d180c04ef39adbc9c6ee485e21cdf63fde362f0a22026b00a6d3eba6243e4c8e96fc088335f31051e54f4546d62569131a671d2e655ea735d597361f5732827
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 0452806a0baf8641d44d86c91b95958fe3bdef74fe62c32e6cb90c90ee8718c61fe9649d2f9ac17b127d65c64cba9093adee742f455be720ca2bf558131cee05 SHA512 5179df9990802cfcedcd59b8a38a6198cdfddb511fb872872c2e4cfc95531f114acb6bb43395c74659c6b46a42da32213e8312e2ed71b6e317a7270a12cfa214
@@ -18,4 +19,5 @@ EBUILD clang-python-17.0.0.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294
 EBUILD clang-python-17.0.0_pre20230325.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0_pre20230414.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0_pre20230421.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
+EBUILD clang-python-17.0.0_pre20230502.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-17.0.0_pre20230502.ebuild b/dev-python/clang-python/clang-python-17.0.0_pre20230502.ebuild
new file mode 100644
index 000000000000..5ec556a2ca20
--- /dev/null
+++ b/dev-python/clang-python/clang-python-17.0.0_pre20230502.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 6f6f618aa16a..1c565a52ed70 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -7,6 +7,6 @@ DIST cython-0.29.34.gh.tar.gz 2114639 BLAKE2B c5f70fd3e6074d9030a1035bc98d71b703
 DIST cython-3.0.0b2.gh.tar.gz 2669448 BLAKE2B 87602a43f77f8005adfc71ec0598a12212db917071dd2ae9a7d0d909411e38525290d860a8606600a5e1b07b014da65d2398f04818837fb15f66bcdba0cad965 SHA512 2095a556bc83669a89902a71da2164fbfab2b75cec2de95c91f95b6b3639bc5802b09808059896ed564b0d6e0539e497051614572bc8ba5d678d0410ccc3914f
 EBUILD cython-0.29.33-r1.ebuild 2070 BLAKE2B 660a94dc04f0c3a564ba055309c4f88f31a073b602469f1276169533c8fc1816ef9dcffbaed6f55cdb99e129b06ea3b05509c2112fd40f89b3a2846f256a261d SHA512 d715ae047c50360412737d0b7f082085799c6ffffb640db04abbc3d3d232c1fcf32eac29d08fee3f4171d60ea79161acfad017614bfc25eb8fda904a83caa303
 EBUILD cython-0.29.33.ebuild 2002 BLAKE2B e4d3f1c0000221bb0577726be3f7b47c00c2f474a307e6f083dda03a1aafc158b948ce23d8cb0255cc456cbba851e5febe2f890a6cca2ed96f371c150e9ce92f SHA512 f8b4196630075729eb5d8d8bfac9f6e079bd4036fa663ee9df8f3497bd6c502e47d336895351623651db0c276aaa85ba031d6f0e2a12ddeddabc7d2c6a1c7556
-EBUILD cython-0.29.34.ebuild 2070 BLAKE2B 660a94dc04f0c3a564ba055309c4f88f31a073b602469f1276169533c8fc1816ef9dcffbaed6f55cdb99e129b06ea3b05509c2112fd40f89b3a2846f256a261d SHA512 d715ae047c50360412737d0b7f082085799c6ffffb640db04abbc3d3d232c1fcf32eac29d08fee3f4171d60ea79161acfad017614bfc25eb8fda904a83caa303
-EBUILD cython-3.0.0_beta2.ebuild 1801 BLAKE2B bcb8f092d3e2fb042f7186adb71c728229067e34d68cae2f83ac2ba015cd893f2f984f668860f4dc09fd808eba255271b89c4ae023611aec8ee09fa87a3cae0a SHA512 5c6dc5ce66c2ac53572f5eba6f86090023c80249294388a59a3cf665e5f91a9f559cf33913f53fb6d1a86b9af03b828d73270c7ecf65296a773d08ed71a7d392
+EBUILD cython-0.29.34.ebuild 2086 BLAKE2B dd286c95a8084c2966aa38c9147609ab7bdd2a6159738993f0991620ac57dd53816081f7512a68c109bbb6499ff7a16dab1a3ba01bc93ab4db18fda2bb82489b SHA512 cae9a4ce2102b1d53dfa07245cfbb6ffcb8c1b52050b7454d6e0f86352766fdd96ae9591e1326a8d0210970ed4884d99afc967f96501e624c13791c53b80e5ca
+EBUILD cython-3.0.0_beta2.ebuild 1817 BLAKE2B 85e3c4d1731fe3b9c3f24bb56fcaa9cb1ee0021010e83361a2b28002597e3fd1f202dfa3b021f07937eacf12939a117aba5d7e36748cafdbaee9bb561a336807 SHA512 3af4393fd90c483086b3f65f0ed007549a6686e9253188be58b22560eae045bcd80a68469eff487f050065a047174009c0c6dd654025ef9015b6c3434ba1bb8b
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-0.29.34.ebuild b/dev-python/cython/cython-0.29.34.ebuild
index 1c030e3fcaca..72900e9aaff5 100644
--- a/dev-python/cython/cython-0.29.34.ebuild
+++ b/dev-python/cython/cython-0.29.34.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
diff --git a/dev-python/cython/cython-3.0.0_beta2.ebuild b/dev-python/cython/cython-3.0.0_beta2.ebuild
index 7837d43a0eb2..a662c305960b 100644
--- a/dev-python/cython/cython-3.0.0_beta2.ebuild
+++ b/dev-python/cython/cython-3.0.0_beta2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 090b884f3cb5..0773dad2d6e2 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,4 +1,7 @@
 DIST elasticsearch-8.6.2-linux-x86_64.tar.gz 581745209 BLAKE2B c5d76e8fd2b7b28d50a0b81950c5d824f5000d3239efef9c3312e153829f09d98ba1394dceff2f147c29e2cd24be2ea4aaf0e0dc830e51989b87c8c7b48e3b3c SHA512 4c5ea98af53861d6c7f06f855f3bd4f4f52136d8149347e43f633a23ba56d3237f6ff7346bf849090f4e52b28fc21c98df8d9b0f0f845a330834367705cd366a
+DIST elasticsearch-8.7.0-linux-x86_64.tar.gz 596104472 BLAKE2B bf2d6d6f810abd6e586681882f7eb01728167c6fd56ff927b08388bc3f4f5d342f0d903db1306880d70efc27c1ed7c53ba25d9517c55f4fa228744fdb7e3695b SHA512 7ac6ee5e2e2ccee1ebb20a1c94992b90e879b8b37273d59ae1496b1e8ae5499ae1b6ddce8cea7dda3b63e7e45352735b2bd3328ad0fdd6d6aadb020de21eb894
 DIST elasticsearch-py-8.6.2.gh.tar.gz 517674 BLAKE2B c498f1e1efaea4c24f595f7e496f576372d6075da107b2f84a7d4a42c02de4e00d1459df6f965384f5880b4d8f910c4a7a49a773cb38361618ca7a74e5c4ec5a SHA512 53c03c9c8da4eb303e8f9cd5752bbef5a360d1e1a6fea4e98a8d576299f2ae4175c1da09429049cedf53a78bf86a4647fe4f4f9c7735a5a29977ada7db49e5fb
-EBUILD elasticsearch-py-8.6.2.ebuild 4846 BLAKE2B 8ae2c02f8a3a0afac8f282df673d2f5e8e35baad2f99c207ada9b2239f7f333b0f3331c94e01883f5e6d42a6eaf02b0ede00cdfb725af0d377f5ddd43f8614f0 SHA512 d2beccbec9786ac1f4ec257b45c50da4814b71f3c01a07f1e6b87c933e39f8c29d17f764e3b90e12b09979071f351c64be1067d878a85c9379494814c7ce676d
-MISC metadata.xml 540 BLAKE2B c44bd89e7a0e35b3ee5bc0a5899f32ed6309744a4c78bf63e5e0a78f073adec776cec810aff6757d4cf70381b954ddf0b7aed5420b5b085846f27b26ff7240cb SHA512 3f73bb387d67a7fd55271819d75f024e6ffdcb601542a779855b95f44cdb9e78b77d6fb059c69969e135caea7d1db2ed8a4ca2786c78faab5f8574973e2f02f9
+DIST elasticsearch-py-8.7.0.gh.tar.gz 523141 BLAKE2B bbc6c59e921c5e8db3b7815a3086abe42690733d6719dcf3e167a521b1e7b38e68bf29ff2b1e0e48839be36c11feb9cb5bd9da507c35f508063ccfe9f3c24c59 SHA512 8f28d51cde600069692c8bef810e7949165a5f7a3ec440513a5f69e5c392ecb928dbd0317a9424d1845f523230a421e7d53db41a03b1bd3cc232c4b04ee0c894
+EBUILD elasticsearch-py-8.6.2.ebuild 4273 BLAKE2B 1e006266e0925dc456e7bb55a61bc27cc0dd0e80808d65936a8063e6a7b3ae33d6802d941df070e1a6d15e66647f06e73549a486da070053010d195e5123cb76 SHA512 28be9efe0dff0c0045af802dae8bb0cf77478c6eb60e107d59613ac0608b3f5bd89725a9738d14f9cd04e8ce2baa3859a1637620cd5187a2218630fd617b8207
+EBUILD elasticsearch-py-8.7.0.ebuild 4275 BLAKE2B c3872d6b7a21fc0834c8850ede2976e97618df6119c73be96d6c1d3cc69681f04c4cde4568bdc2875a07f890d0fd64b72d0cb00f506d51dc1db4f7681b3a9d0f SHA512 05a9e647b382f54ba56845b95b56e502c46d4d6e9b504b81d972d4aa63aaf3f66a988c783e18b608dc2cc170f45c9e760656864b9b19ba33dde4417df423c00b
+MISC metadata.xml 539 BLAKE2B b15f1ab67ea9d0f0d9c3f980751c01196eac3a7b33c14425710d061112c5cb58c5b9c3c5a9b45f6b40189f58a6f708afc5d038c374ac679b5b4c485a60333c12 SHA512 b8730bb4338ea38108cca19919cbd2f2e03ffa0db9c7f8070bf04053ffdebc7fdebcf6460d10f5fed29e6f317f88854bca1a7c5fdb194d643cb8124848668e14
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-8.6.2.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-8.6.2.ebuild
index 9ac55cbfa46b..f39c589bce66 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-8.6.2.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-8.6.2.ebuild
@@ -81,8 +81,6 @@ src_test() {
 	# So lets add a reasonable limit
 	export ES_JAVA_OPTS="-Xmx4g"
 
-	cp -r "${S}/.ci/certs" "${ES_DIR}/config" || die
-
 	cat > "${ES_DIR}/config/elasticsearch.yml" <<-EOF || die
 		# Run elasticsearch on custom port
 		http.port: ${es_port}
@@ -95,16 +93,7 @@ src_test() {
 
 		xpack.license.self_generated.type: basic
 		xpack.security.enabled: true
-		xpack.security.http.ssl.enabled: true
-		xpack.security.http.ssl.verification_mode: certificate
-		xpack.security.http.ssl.key: certs/testnode.key
-		xpack.security.http.ssl.certificate: certs/testnode.crt
-		xpack.security.http.ssl.certificate_authorities: certs/ca.crt
-		xpack.security.transport.ssl.enabled: true
-		xpack.security.transport.ssl.verification_mode: certificate
-		xpack.security.transport.ssl.key: certs/testnode.key
-		xpack.security.transport.ssl.certificate: certs/testnode.crt
-		xpack.security.transport.ssl.certificate_authorities: certs/ca.crt
+		xpack.security.http.ssl.enabled: false
 	EOF
 
 	# Set password in keystore
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-8.7.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-8.7.0.ebuild
new file mode 100644
index 000000000000..007cbecd25a8
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-8.7.0.ebuild
@@ -0,0 +1,139 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Official Elasticsearch client library for Python"
+HOMEPAGE="
+	https://ela.st/es-python
+	https://github.com/elastic/elasticsearch-py
+	https://pypi.org/project/elasticsearch/
+"
+# Use bundled jdk for the test elasticsearch as there is no convenient way to ensure system jdk17 is used
+SRC_URI="
+	https://github.com/elastic/elasticsearch-py/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? (
+		  amd64? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${PV}-linux-x86_64.tar.gz )
+	)
+"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="
+	!amd64? ( test )
+	!test? ( test )
+"
+
+RDEPEND="
+	>=dev-python/aiohttp-3[${PYTHON_USEDEP}] <dev-python/aiohttp-4[${PYTHON_USEDEP}]
+	>=dev-python/elastic-transport-8[${PYTHON_USEDEP}] <dev-python/elastic-transport-9[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4[${PYTHON_USEDEP}] <dev-python/requests-3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		  ${RDEPEND}
+		  dev-python/mapbox-vector-tile[${PYTHON_USEDEP}]
+		  dev-python/numpy[${PYTHON_USEDEP}]
+		  dev-python/pandas[${PYTHON_USEDEP}]
+		  dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		  dev-python/python-dateutil[${PYTHON_USEDEP}]
+		  >=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+		  dev-python/unasync[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# REST api tests are a black hole for effort. It downloads the tests so its an ever moving target
+	# It also requires effort to blacklist tests for apis which are license restricted.
+	"test_elasticsearch/test_server/test_rest_api_spec.py"
+	# Counting deprecation warnings from python is bound to fail even if all are fixed in this package
+	# Not worth it
+	"test_elasticsearch/test_client/test_deprecated_options.py"
+)
+
+distutils_enable_sphinx docs/sphinx dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Replace added pytest options with setting asyncio_mode to auto.
+	# Test suite hasnt set asyncio parameters so its needed here.
+	sed -i '/[tool:pytest]/,/^$/ { s/addopts.*/asyncio_mode = auto/ }' setup.cfg || die
+
+	default
+}
+
+src_test() {
+	local es_port="25124"
+
+	export ES_DIR="${WORKDIR}/elasticsearch-${PV}"
+	export ES_INSTANCE="gentoo-es-py-test"
+	export ELASTIC_PASSWORD="changeme"
+	export ELASTICSEARCH_URL="https://elastic:${ELASTIC_PASSWORD}@localhost:${es_port}"
+
+	# Default behavior sets these depending on available memory.
+	# On my system its not reliable and leads to an instant OOM :D
+	# So lets add a reasonable limit
+	export ES_JAVA_OPTS="-Xmx4g"
+
+	cat > "${ES_DIR}/config/elasticsearch.yml" <<-EOF || die
+		# Run elasticsearch on custom port
+		http.port: ${es_port}
+		cluster.routing.allocation.disk.threshold_enabled: false
+		bootstrap.memory_lock: true
+		node.attr.testattr: test
+		repositories.url.allowed_urls: http://snapshot.test*
+		action.destructive_requires_name: false
+		ingest.geoip.downloader.enabled: false
+
+		xpack.license.self_generated.type: basic
+		xpack.security.enabled: true
+		xpack.security.http.ssl.enabled: false
+	EOF
+
+	# Set password in keystore
+	printf "y\n${ELASTIC_PASSWORD}\n" | ${ES_DIR}/bin/elasticsearch-keystore add "bootstrap.password" || die
+
+	local es_instance="gentoo-py-test"
+	local es_log="${ES_DIR}/logs/${es_instance}.log"
+	local es_temp="${T}/es_temp"
+	local pid="${ES_DIR}/elasticsearch.pid"
+
+	mkdir ${es_temp} || die
+
+	ebegin "Starting Elasticsearch for ${EPYTHON}"
+
+	# start local instance of elasticsearch
+	"${ES_DIR}"/bin/elasticsearch -d -p "${pid}" \
+			   -Ecluster.name="${es_instance}" -Epath.repo="${es_temp}" || die
+
+	local i es_started=0
+	for i in {1..20}; do
+		grep -q "started" ${es_log} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${es_log}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ ${es_started} -eq 0 ]] && die "Elasticsearch failed to start"
+
+	distutils-r1_src_test
+
+	pkill -F ${pid} || die
+}
diff --git a/dev-python/elasticsearch-py/metadata.xml b/dev-python/elasticsearch-py/metadata.xml
index f5713ff4cfba..5e08a8961122 100644
--- a/dev-python/elasticsearch-py/metadata.xml
+++ b/dev-python/elasticsearch-py/metadata.xml
@@ -11,6 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">elastic/elasticsearch-py</remote-id>
-		<remote-id type="pypi">elasticsearch7</remote-id>
+		<remote-id type="pypi">elasticsearch</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index a9afecf7381d..dfa013019667 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,3 +1,3 @@
 DIST flexmock-0.11.3.tar.gz 52509 BLAKE2B 5246cedb3cae7aeb4ddee9158bc365be13bf81443711456a84abd3dfb30c8ea7cbca8fbce618efe26d33bc8185a9d7a52f1532934f7aad5fa11296ef21731963 SHA512 38387529d8b7e359cf6e578c9be8ae028cd28929567267bce1bb7f44032c00480520335315bb1c510229728e1101aa379b809fb89aeddafd19590e38e7ebdcf2
-EBUILD flexmock-0.11.3.ebuild 629 BLAKE2B 6c46bf24f9ae99e08d3f2b23f6849f38ceca44d94999819539fe719553d42369dc149a5b50241edc3c3266d58f8a33fe6bdb79375d7a229a1c9c791a3f9f6f85 SHA512 1f261d47fbd64eb1fddde504a57a80db257b721d66aad864a40227f763039a9d81f7199dcd702bf840366f7392411d093e333d3929663f43abb60054d83c8bac
+EBUILD flexmock-0.11.3.ebuild 628 BLAKE2B 275bc588bf7ff0348cab3119810c8cae87cfbdb59183451dc9f5ca67e29d19549f3f705c72f1875fc2f91eeb5a00e7f7a5e82c25ac01f81adfe2710113da6976 SHA512 e6152b0babe3cac02999f64c876cfafc871679de25ee32b407627f4063a64d4ede599f1482fd55ef53fa19e56dc17f2b6c8bed2f21189993635c59172f2a7a79
 MISC metadata.xml 499 BLAKE2B 233b9735fa88296bfaeaef1ec20d999cb9f1e7f91e2943ac14d818d2e0d2bd07b7fac2e3ce5659510d5ef830a83d841ccacf738761ac625ef2b124185b5c90f6 SHA512 889ce006fdf12b653a3444faebc8e443bd56b0870aecc40d86299d56375d12844b5e0b904e025141caef8e52543a94909cdb2163c2fcfc5f2660400e8d7559d9
diff --git a/dev-python/flexmock/flexmock-0.11.3.ebuild b/dev-python/flexmock/flexmock-0.11.3.ebuild
index 2eebd3e04ce6..5b989af172bb 100644
--- a/dev-python/flexmock/flexmock-0.11.3.ebuild
+++ b/dev-python/flexmock/flexmock-0.11.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://flexmock.readthedocs.io/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 43464a250803..0843672dbd08 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -7,6 +7,7 @@ DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03f
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
 DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
 DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
+DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 DIST llvm-project-5ea158077ec9ca50857ede5cbb0b27c61663fd55.tar.gz 182543024 BLAKE2B 32f5a9ddaa6c7e283d97256d7bd68634f2f8ed6d7167e743ba8076809ea1a3a7159f9ccc56a6e5a8838481cade07389669d8a35b17b5922da0cbef04c80131f8 SHA512 3d180c04ef39adbc9c6ee485e21cdf63fde362f0a22026b00a6d3eba6243e4c8e96fc088335f31051e54f4546d62569131a671d2e655ea735d597361f5732827
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B ff939004df0d10a698e942c99ecf3bb11fe8e0c035e3dfb0ac495f2368d83bb89cccb11de0878b3555c4047b8d0e4b969e5cec8aef8891aabf2d16a550696870 SHA512 7be9e5f983bffabf30c954e45ede8fb6b30013b84cbd50f66fa3a2185b0223b4ede7466d40376453283e9ca806da1ae80afe6e6fee001ede95b78226bcc7267d
@@ -18,4 +19,5 @@ EBUILD lit-17.0.0.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622
 EBUILD lit-17.0.0_pre20230325.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-17.0.0_pre20230414.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-17.0.0_pre20230421.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
+EBUILD lit-17.0.0_pre20230502.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-17.0.0_pre20230502.ebuild b/dev-python/lit/lit-17.0.0_pre20230502.ebuild
new file mode 100644
index 000000000000..f4b401a77373
--- /dev/null
+++ b/dev-python/lit/lit-17.0.0_pre20230502.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/mrcfile/Manifest b/dev-python/mrcfile/Manifest
index 6d0494afe418..cffc2e4ab581 100644
--- a/dev-python/mrcfile/Manifest
+++ b/dev-python/mrcfile/Manifest
@@ -1,3 +1,4 @@
+AUX mrcfile-1.4.3-test-assertion-error.patch 1046 BLAKE2B 87a3c16f27c7b11ccc71655570c17c3fd37e1fec396d82a1fd3ca98ff5527167794cb1cf5dabeb680bdbe80c8da6ce56b707416c571702685fb6e2ac20c72a83 SHA512 432b3743e2c1e2c8820a02fd51b681ea1a3ca30573b8f110fbdcac723cc90c2edb939186c1bbbdbf82b3110693a64361a1a4b2cb87cf019938fb50a65edae329
 DIST mrcfile-1.4.3.gh.tar.gz 148147024 BLAKE2B aa604965e6e40a25f57ec61bb3a3fc2fc6a83827db11620678138bec893539502a8e00e6e279e3bb86805773201338f430cc4d7d4b60efaee2d36933f071132e SHA512 e4bdc9b03ea55ae6bcaf29d8f8154e941f7e8b780f924a3265156a25bfa7f7a6f88abb3ce4374208104a4a3eea8d18724a248aae9fea2018a24ae559680ac2b7
-EBUILD mrcfile-1.4.3.ebuild 552 BLAKE2B 7aa114f696eb59bd8c4836efe6be9cdea1cadb125ade6817bc7c82fd2f17a807550fa292be250e4be85509a800ae113897a71ffaab624c599475cf5e16cc05a0 SHA512 603d410132ab9781401e2e1274293b9908ea01502048d67b857d869ff8572b330619a68efb6160ee8abd5990c302e741481ca0040bdcdd09877306404b6604fb
+EBUILD mrcfile-1.4.3.ebuild 658 BLAKE2B 35a22644e62d8e9d22f6297c688c2a8b6a8d63f53a9b477664ac770aaee4b9bd419fe3af136bf18e673b433e6ee983beeff9d62009647c3e2883fb771fa60cb9 SHA512 8008671418ae99b012e41002992fb43643de0093447496a2c6bb809e15cbe2653062c1762b7319648163aad6ff9c897d0e8ba3a0fc4ce18297a4c84e3f09bf62
 MISC metadata.xml 388 BLAKE2B 7327577122145fab2e580fa79005b7be4a61c6e65c68433230b737f5bd3e988150999bab5b9f4ee7878a9757a40133796a7b15b80c023f585f0c6c1fb30af730 SHA512 55efedf64a9fdf287874eb9345b3bfad5a4281c98e46b4fd43a4ba2f1a3ca5af68c1047779bf811679ff953e54adb4b3bc32fd97f137287ed291e89fafb2ffd6
diff --git a/dev-python/mrcfile/files/mrcfile-1.4.3-test-assertion-error.patch b/dev-python/mrcfile/files/mrcfile-1.4.3-test-assertion-error.patch
new file mode 100644
index 000000000000..a68ffa562260
--- /dev/null
+++ b/dev-python/mrcfile/files/mrcfile-1.4.3-test-assertion-error.patch
@@ -0,0 +1,25 @@
+From: Roland Mas <lolando@debian.org>
+Date: Tue, 14 Feb 2023 15:49:05 +0100
+Subject: Comment out a failing test
+
+---
+ tests/test_mrcobject.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_mrcobject.py b/tests/test_mrcobject.py
+index 276e9af..95b5591 100644
+--- a/tests/test_mrcobject.py
++++ b/tests/test_mrcobject.py
+@@ -338,7 +338,11 @@ class MrcObjectTest(AssertRaisesRegexMixin, unittest.TestCase):
+     def test_data_is_not_copied_unnecessarily(self):
+         data = np.arange(6, dtype=np.int16).reshape(1, 2, 3)
+         self.mrcobject.set_data(data)
+-        assert self.mrcobject.data is data
++        # Identity assertion fails with python3-numpy 1.24.2, so
++        # replace with an equality assertion assert
++        # This should be reverted eventually
++        # self.mrcobject.data is data
++        assert np.array_equal(self.mrcobject.data, data)
+     
+     def test_header_byte_order_is_unchanged_by_data_with_native_order(self):
+         data = np.arange(6, dtype=np.float32).reshape(3, 2)
diff --git a/dev-python/mrcfile/mrcfile-1.4.3.ebuild b/dev-python/mrcfile/mrcfile-1.4.3.ebuild
index 48c609b6c9c9..527f6481961d 100644
--- a/dev-python/mrcfile/mrcfile-1.4.3.ebuild
+++ b/dev-python/mrcfile/mrcfile-1.4.3.ebuild
@@ -27,3 +27,8 @@ RDEPEND="
 "
 
 distutils_enable_tests unittest
+
+PATCHES=(
+	# https://github.com/ccpem/mrcfile/issues/49
+	"${FILESDIR}/${P}-test-assertion-error.patch"
+)
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 46a0eefaf250..5f3ed88476b5 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -5,5 +5,5 @@ DIST nbconvert-7.3.1.tar.gz 880064 BLAKE2B 0bde4a65f27a880fdbf694dc6501ad1d0f78b
 EBUILD nbconvert-7.2.10-r1.ebuild 3045 BLAKE2B 0b8f02f5d55b8b9576fe42f60b19c6f6c0034e0c6beb362b05c74983eccb8c21ef84463b5858ffa3be824c7b00953484568a6d4fb49f7dd288f447c6ae8a118d SHA512 d262250d0c3c8fd474d9aefa7c9dd3bc5f641cb45f349d144fdc58ad4a943dfff2f9c77e6faa8246e136ef9d481572b38eaeb2538bc78fa45f9984e6a18f0645
 EBUILD nbconvert-7.2.9.ebuild 2772 BLAKE2B ae75fd9fdb5c4b98fed9dd0d7d5d4120c26a1c38f33f751520f03e84bf2b6f00c1f8944afb2a6e2ebd12cb387b4b48e894499d6d249d4261324b6358a42cab54 SHA512 d11e67fa0b8de167b86a0d4f850e6fa805631fe47a4ae40498e6eba6a8b10c5c8ccd8904a7236801b39d9d41b0c021cd534e630076e3954fb8acfc1fca44769d
 EBUILD nbconvert-7.3.0.ebuild 3052 BLAKE2B 449b005463d8b9fdf5fbf632b902ebdc07e0f1335f711b18f00e1208d4640010d171b6b7bf0bd0517ec22d5568e3ca29e25e99085975a4a78f4e6b1a5053bf62 SHA512 cad8084c5da7e143bd6611b0e9f0a4b16d09c6bb459cac212bef0d5ba17dbc193c8826b1b4ac6daadbab96a556ce852302920d48bde8e1af879e81d598e5a411
-EBUILD nbconvert-7.3.1.ebuild 3078 BLAKE2B 4d60aaaf725333090fbe23c9bbb7a4a79aa3a6b74c1b70cb494130afdbed0fe467de62d7a3f55582a8dba5fd871edcaafe5dc563c69359e661e10e5ce6f439cd SHA512 5de5daba25020356d0e10d1d1120fb55b8281d7f8bbd61e0ace4ca0706d6cc8d208c914fbad0b80b3f77fa61c59c071fc09e9640c2a610dc581c28b30d45cff6
+EBUILD nbconvert-7.3.1.ebuild 3070 BLAKE2B 4bb79d9f4cc2f96baeacb8264761df1fc7acde08cca1ef9e3327b11d2e0837112ca224545935129caa5eeb9bda7d3b396db1ac0b0ecaa614679a8ed86f08733d SHA512 36c433c88aa5751cb0951a70f0917bd953131957a367dc3057ca21bbfada9248411a8f947366f0cbfdf94e25f6f6c4a523132f7ef14128c3af77dd003e62d88b
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-7.3.1.ebuild b/dev-python/nbconvert/nbconvert-7.3.1.ebuild
index 878ddafff96d..4e91a60187ac 100644
--- a/dev-python/nbconvert/nbconvert-7.3.1.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.3.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index c59040c3f34d..7e021d5ad9e0 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,5 +1,5 @@
 DIST pgspecial-2.0.1.gh.tar.gz 50181 BLAKE2B 6f3f9f8feba717c18d3985d80a432eb7d127c65f7436bfc792a44cb5d7aad08e6e3b931cc289a051fbfea43cd5d8d7db44ede6de89683d462d51635c5caf2e04 SHA512 e89e7cd0f7e849fe93b8e8e79e409ee73ba6c22f3d76279415f236184f732d12cdd8b6bb7722b24ec2bd665f3429c0bf4e6905cd24c9739aa78906b12f841f13
 DIST pgspecial-2.1.0.tar.gz 50495 BLAKE2B 981f5a01ef32090eae7d477d23476fd8dd2a5bd3a5f3781e990cdbd28ebb24e5176653b7c8f9a1b7f1f01888a5c8278568257a709a5337f8b0d9838bfba8a21a SHA512 5bbd53d21ad89698b6ca04c989aa1ed59f3b8adc9b876b5b7db35bca03b964f645df2af96d3ddf6e7718c8ee06953fcf8f3ca548e65d722eaf4ea0098fa126ad
 EBUILD pgspecial-2.0.1.ebuild 1220 BLAKE2B 4fb5388e34e5c7acb4ab8d6bad9160fc918286654849116d8e4bc0d3fb2d02d681ce1ed2ccde01ac9f9b56cf725d2216c2b9920a6478de1e3804aa03f792caf4 SHA512 f2014ddebe6d32346c8ec4d4641d7fbd13b2cb15bd23346adf24082963bf4e6985a544abf43121a34f9e19e66d603050466b0a1c7f463c9ea15b1adeccee5f5c
-EBUILD pgspecial-2.1.0.ebuild 1277 BLAKE2B 607f95f866ed0ab7305f52677db5341247344c047b8bb6d7f582c454bb6edeb14de105b655bbe3b2a29198564ba4b24580da08b73f38eefb9adbdde3a6af8641 SHA512 b323e895bc6289412a2fa1173a6539f17771e7887159cf477bfcd22e43bb45dc65c2aa7cd9322267e69841917f8317a35d3f83e3fd7338dfdbb25b7c59f0800c
+EBUILD pgspecial-2.1.0.ebuild 1275 BLAKE2B c27111818e4b468796f7b56b609316337137d8b3c81c838a3cf9a12450c4e06cc28c6b2fdd13507024cc3fe2853bb3ba409f71591e70a0862f111528dfff183e SHA512 12749c1301145798ba2429685ec2a1c7e3e99ede09230534e60c2e8c999ed8d97f37b69f73a5f93402eaca25d3cd0db57ecea46d0ed44fbcaa6e15b45f09125b
 MISC metadata.xml 542 BLAKE2B f7c36257d672854f57623ce68e09e17b8bc734e0a2afa70308ff3c3dfee23274750a8d98034527e14c757546eb78b84f170b9a4d180e02cf491301ae34127c79 SHA512 cb1eac0516db3ff5f32efb6adcf2c39e5479f7bb2a44f3d7c75f4e38e07812db21fd8e8af94e97c613b54606c2660317b5dbb0221c88cc926968404898f19602
diff --git a/dev-python/pgspecial/pgspecial-2.1.0.ebuild b/dev-python/pgspecial/pgspecial-2.1.0.ebuild
index 3f8eac9c4b2d..20d5d8a54dcc 100644
--- a/dev-python/pgspecial/pgspecial-2.1.0.ebuild
+++ b/dev-python/pgspecial/pgspecial-2.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/click-4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/picobox/Manifest b/dev-python/picobox/Manifest
index 3fa25abd27df..e0ca29bd12e5 100644
--- a/dev-python/picobox/Manifest
+++ b/dev-python/picobox/Manifest
@@ -2,5 +2,5 @@ AUX picobox-2.2.0-fix-py3.10.patch 974 BLAKE2B 54ff67012b6ec6ba6343c955fb2b7172c
 DIST picobox-2.2.0.tar.gz 30231 BLAKE2B 9911e2e41a850b57d4a642aa454e55703e0546bdb3a5b95aa4a15747388413babaec7dc3a3f7fcb7ecae7ecd0f81dc203161975ca393f87353987825e0413355 SHA512 d127ea71637105285701ae5252e59e0c940077fbbe044ba1f42f80134ea08291344ebb6bc8bce240112a7efe0be8561c8040b43d20912f1fbd121098578a1795
 DIST picobox-3.0.0.tar.gz 28599 BLAKE2B e29dd7b0b5b23175a21f8fe6efe83adc6edfb0302c7a27f92f518deeba8f74f8e2d481a8eef6a1363fa0fb02ffc00b462181bab09872f6da5c1c9063c4d274e6 SHA512 ac8cecba10527e7dc096eb66f3b6743b523c305bd9725d5be8ec2822857a65ef8e9cc0ddcb85b8c656c557e7dc6cf0903035753bf8fe8cc2616b463e0a82bb5d
 EBUILD picobox-2.2.0.ebuild 648 BLAKE2B bb80cfb1fb604c5c59b88a675939675b3f5194564b6a24dd44fd5bb6cee853416995339a12de77f0642e79ad015035250ff0dabc57d23efce86a6d67cc4565bb SHA512 156388f90c588029739d4b0559c91f797c721736f17eef294d9156891bd581eb52141b87efc56a75172a132df19b44e86d85a96f2660b210788d58f62c979b81
-EBUILD picobox-3.0.0.ebuild 605 BLAKE2B 4a75fc5e943140e851e696b65b12e20a9a1d8d89dc5b9426b4994625c0146ea733d27b935a02b5a27c648c45c77e2b765355174f668877d63458d6b9a5b61abf SHA512 31d6750f779516472eb6d4932f11bffa0c0cef1c3fbc577bd97ca46cbf0d507cf18e3c8c40f4f88cfd7a6a2f47a98e03a58fbd3f4b96dbe5c03b0efd2eb594d2
+EBUILD picobox-3.0.0.ebuild 597 BLAKE2B fded3e028ad13a1267fe2a9e9753ce63ef94668bb880d6ed0ebc5ca85b29e18be34a5bb75a116c633d18b781dcb4e04473df3d5c8e672d6a49f0c4723c5980cd SHA512 38524215f839405c3500f6913bc866ef89da0da1a1f332fa7054503a92556173bb4bd3056bafee73267e3f52d6ff53e23e4e8831345d2886ead6acdd5c724097
 MISC metadata.xml 394 BLAKE2B 9d5aab4a31fd6c669ed0b207281b1a5df9b48cd593efd6095353b74edba985aa2beabab3a83db01a93ecb97dabac9a06e62f82e316989d461d98897d074f6501 SHA512 fead3589983a0e6e497a67c3700f4611a5c45e17aaa3659b0ee45e5cbcd1a02b8929f373b86b43a25ce51493f6b888833fe7b64168c7eb795ce503ef1775c0ef
diff --git a/dev-python/picobox/picobox-3.0.0.ebuild b/dev-python/picobox/picobox-3.0.0.ebuild
index cfe660631bd3..269c9790a89c 100644
--- a/dev-python/picobox/picobox-3.0.0.ebuild
+++ b/dev-python/picobox/picobox-3.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/pkgcraft/Manifest b/dev-python/pkgcraft/Manifest
index 95beee6ff348..d38a4dad1846 100644
--- a/dev-python/pkgcraft/Manifest
+++ b/dev-python/pkgcraft/Manifest
@@ -1,4 +1,4 @@
 DIST pkgcraft-0.0.5.tar.gz 400237 BLAKE2B de78c1570ce8080742d3afbff2c9078b56fb14e7b097bd09b47c5b21a5de1062989835c9c12e4efd9d4be4aef7e9dec1350606700d80c5482cf81d1d2c4febc0 SHA512 2366180189314cafa4be8a180eed62a8c994bfd862ebc5292e01d9cd2585b9eca082535e405924ad758d6f89309c5e64727242a52f95f6e71aa6aff3495edd57
 EBUILD pkgcraft-0.0.5.ebuild 1892 BLAKE2B 13713a1d09b9a72baa53085b22d41f05cc5181aed2a944961cf7b94a5aedd371b4a82d390489cb8a51b896da64287ddcb83fae3b05d1d1bb2bb0498c754c3f85 SHA512 d6fe89e517c85881d465724965e19f2e8a2c8aed188161383d6d65314a88a0724946d3d8dc88022832b74cd3e804a7906eeaad83d9ec0871cfc429260f68cca1
-EBUILD pkgcraft-9999.ebuild 1899 BLAKE2B e64fc307d14f8cb57082dce42948b047156140dcc78554491c491bf9c44afc894bb35a5fe6aca42462de098183c3d9f8f4128d344e68adf231d50b4a075a6f8e SHA512 8869dbf8d110e92b46da9a8272ec60cab686fae926b69c0b98f32b9a0429f4df7b755f3a056bd1f78140db2ae6e6d24a3f382d73fa8fb7bb99edd85ccff96ca5
+EBUILD pkgcraft-9999.ebuild 1900 BLAKE2B d19ad6e7d3362cc7a76c71584931083f03d214aa2bb847951750d83803c0d3754970b11068959821605497b43acc55ff0f95fd2e54c10b84f191c18f8f2e7125 SHA512 a29c5560e9a1941bac0a32415b4c80e68bce7e92c1a10e6de57559ba8d55ea3aec410a0576286206ba7aca7c28886a81ba6727f06ef95c5048c9299c71fc50e9
 MISC metadata.xml 454 BLAKE2B 5085311aaebe3c2cc696fee5da4ee272e47936a4f729c2007efce94097087a987985fb972df477fb72eead3402555924ca8b8f183b69af357453ad93daeb946e SHA512 ba7457ec4b43f1664042599d4e23506e496d1f2212ea7aa02c58fd9d796915dace2817bfb1c71e6f022e9490215248e2a705b223a087d91255b97b23f82f9c23
diff --git a/dev-python/pkgcraft/pkgcraft-9999.ebuild b/dev-python/pkgcraft/pkgcraft-9999.ebuild
index 8ffd087568b0..5a3929c9bc02 100644
--- a/dev-python/pkgcraft/pkgcraft-9999.ebuild
+++ b/dev-python/pkgcraft/pkgcraft-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft-python"
 	inherit git-r3
 
-	PKGCRAFT_VERSION_MAX="9999"
+	PKGCRAFT_VERSION_MAX="99999"
 	PKGCRAFT_VERSION_MIN="9999"
 else
 	SRC_URI="https://github.com/pkgcraft/pkgcraft-python/releases/download/v${PV}/${P/-python}.tar.gz"
diff --git a/dev-python/pmw/Manifest b/dev-python/pmw/Manifest
index 1515e02aa7d4..cf9d0602d643 100644
--- a/dev-python/pmw/Manifest
+++ b/dev-python/pmw/Manifest
@@ -1,3 +1,3 @@
 DIST Pmw-2.0.1.tar.gz 830448 BLAKE2B c78fef1570a34b9784f936f16856c4450164d8a232770e59cc084c1113888af8ee002cd1c7ddeadcddaacb5eae9ff58fcbfc270fc066875523e31a9d26770cd3 SHA512 99654e961aa40a64eebc08fe473e94da0ce431e6465255c68c251dfd544a51edef1a5d97dfd89ce756eb5f7fcf917dbef27f646ba9451ab72f3d460daa09a556
-EBUILD pmw-2.0.1-r3.ebuild 1031 BLAKE2B 73ad708f597f44df5bdd4969295a0aab8379ee665135fe78b07c73b2d0aba051c7627932612631de61bc26177f465b6688fa4a540353f7bba8b32282000acc92 SHA512 4d90df3d00a3dc9c9f47dc5948dd438b36f36a05845ff30f83748b7e543f47d211a1003e83d60f7d9c1e4b54839699b7147330cc4b73ef8893bae1e45939c7c1
+EBUILD pmw-2.0.1-r3.ebuild 1031 BLAKE2B 21c04c2345a53f977c94ba651b3b7485d29d2ef79fe66199b11e73876f9267ae13583acb7b196dd107a5ff2c9ef45f5744914e29d3913afb496acd3ddd6a77e1 SHA512 86165b9d6dd3f4114734f31d3263b40b31455abc9624bd53d5a066d145f90ba33bfb9d3b8bb494a61395c96710bf9074e1699ba9ab1dda42d7bcc5fff3fbaf25
 MISC metadata.xml 387 BLAKE2B 5bb8b4e7edcc726c2347a5007c42a9cda4bec776e1f3cea934b0489ce3559e4f2ddc6c10b49f707433a80c0103aa77a6128263d66bc0334de4cacba5374a64da SHA512 9b6357e3ce690bdb369c394b7aa82034300cb9f4df2357ac0a837e1bf22cbd04b074ca5a75bdd8a2fb27292de40e2f63939e65fdf747a08d6172c507f3696bbc
diff --git a/dev-python/pmw/pmw-2.0.1-r3.ebuild b/dev-python/pmw/pmw-2.0.1-r3.ebuild
index ec893763e12c..0873e357ce2a 100644
--- a/dev-python/pmw/pmw-2.0.1-r3.ebuild
+++ b/dev-python/pmw/pmw-2.0.1-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="tk"
 
 inherit distutils-r1 virtualx pypi
diff --git a/dev-python/pyGPG/Manifest b/dev-python/pyGPG/Manifest
index 522c289a2265..2597b773ba15 100644
--- a/dev-python/pyGPG/Manifest
+++ b/dev-python/pyGPG/Manifest
@@ -1,6 +1,6 @@
 DIST pyGPG-0.2.tar.gz 15439 BLAKE2B 92c82b8b23c279461a872f118c636fa9cdae3f44910fc34a357983b0b4afea2a7b13c6400499a0fdbb4365357ade64294642178ca07a79ab3b7df89e60146e73 SHA512 93d892a57a27b254bfdc9778b73d341dfec654c2104c578014628df78c43beaf93eafb571ac544d52f334e63f6e5b8c0cfad7c8a0d585ee7211e8649efce8c67
 DIST pyGPG-0.2_p20220808.gh.tar.gz 31955 BLAKE2B ae671b7bf685b1072364dbfcf79bca8fa2dadd034fbdf7a721d7a2cfec44e8d8ffa22b08c14414c8774422b6a62af8d511bd31bd15bd68d89632cde031ec0906 SHA512 85c8d67e71e91cfb26b1e0087889d7cd4fccae9ddcffcd3e3f9d208da7fd352c3273c580e3b7c284c5ab4c2a53c56f4530e5587dc22869098a408a1dfcd1e257
 EBUILD pyGPG-0.2-r1.ebuild 1112 BLAKE2B dca46b2d5c8e440eb6df37f6c113af181185d9b0e8474301ffe6bb05b09c3d67299ac63ba7b22f1511f8c5538c2b5889d044928a51d2d1de829e910a6ec7f50b SHA512 8870481c0e65f4bf0cd9130134fb8a432cff247e1e3217e2574e3ffaff371ff8331b2733f90dcf5c3afbcab5ceda9c2ae9550595d6361416a4bb72f63ce5afa4
-EBUILD pyGPG-0.2_p20220808.ebuild 1594 BLAKE2B c12bb0c6ea350e5deb24ddca51d0ba9e5201fbb626a49aafdae399a68395199092ebf1cc73c01a06dc18ba0e401454f48e2c5bc2f172d5a6e60dfc6cd80bfe0b SHA512 19881e78c5a585672ee54a916458c4d824a63d1e52ece5226ea2a94487ca009b789b046942a86db9a038254d16d1266593f033a11f0307eee1d0901390523c7a
+EBUILD pyGPG-0.2_p20220808.ebuild 1591 BLAKE2B 56f02f6e23589f61b39e42e2a96958c34fdafd9a55a6ec3ea8624b9f45c92b3e40256be0907610e51f9b76ea2252874099ff991e830ffa758b32ea15a3d3680a SHA512 d2d07854833e05ac154f23c7f91e58121e3cbe1d4e010f8194242162dae60a74e1bf5b257f030d39270b0474b8714ff1eae57cd01bf709e2dbec2166da854d68
 EBUILD pyGPG-9999.ebuild 1594 BLAKE2B c12bb0c6ea350e5deb24ddca51d0ba9e5201fbb626a49aafdae399a68395199092ebf1cc73c01a06dc18ba0e401454f48e2c5bc2f172d5a6e60dfc6cd80bfe0b SHA512 19881e78c5a585672ee54a916458c4d824a63d1e52ece5226ea2a94487ca009b789b046942a86db9a038254d16d1266593f033a11f0307eee1d0901390523c7a
 MISC metadata.xml 567 BLAKE2B e0c99fa711e08f9ae227c71f685083871aed97c2b8e07ea67e02bd9685f0b1c05a7cb5cca4b9b7405b3c6af49659bb7d79bad1128a3696d7b918c9ff93ccd13a SHA512 ce22011a182f373d6507ddc8eb2658d0f0e74e5f2d281a6dc4326b5c04a34320ccb294c4606da641c1a24d0563a612931cb4a1acdda61db02a723b4111d89b77
diff --git a/dev-python/pyGPG/pyGPG-0.2_p20220808.ebuild b/dev-python/pyGPG/pyGPG-0.2_p20220808.ebuild
index 6749e63d1904..a36ee0cbe0ff 100644
--- a/dev-python/pyGPG/pyGPG-0.2_p20220808.ebuild
+++ b/dev-python/pyGPG/pyGPG-0.2_p20220808.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="https://github.com/dol-sen/pyGPG"
 LICENSE="BSD"
 SLOT="0"
 if [[ ${PV} != *9999 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 RDEPEND="app-crypt/gnupg"
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 4ae3b0c1f522..1cf29e9b1ece 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -5,5 +5,5 @@ DIST pyfakefs-5.2.2.gh.tar.gz 219768 BLAKE2B be22ad269dcb8777c2fc6d8aed5079b8408
 EBUILD pyfakefs-5.1.0.ebuild 734 BLAKE2B 0dff21e1a038069b56f9088e97fc85ee5f34d42cd4a63fbb6f8791a15fcb895734c9093e2b2dc131e8927c6121860f278ecea21ee51724d6a19db002e217050e SHA512 c9b6a23913f610c7afaea2d3471043e9598a017c2376e9f48a646c7fe94e3cb2bf4dcd3a57122fa9f272c94ff36c94d735b66d47eef43f1c4d995ae5ba3a9274
 EBUILD pyfakefs-5.2.0.ebuild 742 BLAKE2B 66bf0ebda428800e18ba6b557337045245343b67faf87e360525582e0ec3a0bff8cfb84905b480eb64c5a954bbae0606490cd0a6e303ba29a6314d4826ce9589 SHA512 2e0c58959234755a3ba31430ff0baf84bd997f530df7b6c133761eb8aa37e8ee4d198ece1e89a49a53a88310e94d610148840999c12a6baf13ecfff2fcc3d206
 EBUILD pyfakefs-5.2.1.ebuild 742 BLAKE2B 66bf0ebda428800e18ba6b557337045245343b67faf87e360525582e0ec3a0bff8cfb84905b480eb64c5a954bbae0606490cd0a6e303ba29a6314d4826ce9589 SHA512 2e0c58959234755a3ba31430ff0baf84bd997f530df7b6c133761eb8aa37e8ee4d198ece1e89a49a53a88310e94d610148840999c12a6baf13ecfff2fcc3d206
-EBUILD pyfakefs-5.2.2.ebuild 742 BLAKE2B 66bf0ebda428800e18ba6b557337045245343b67faf87e360525582e0ec3a0bff8cfb84905b480eb64c5a954bbae0606490cd0a6e303ba29a6314d4826ce9589 SHA512 2e0c58959234755a3ba31430ff0baf84bd997f530df7b6c133761eb8aa37e8ee4d198ece1e89a49a53a88310e94d610148840999c12a6baf13ecfff2fcc3d206
+EBUILD pyfakefs-5.2.2.ebuild 734 BLAKE2B 0dff21e1a038069b56f9088e97fc85ee5f34d42cd4a63fbb6f8791a15fcb895734c9093e2b2dc131e8927c6121860f278ecea21ee51724d6a19db002e217050e SHA512 c9b6a23913f610c7afaea2d3471043e9598a017c2376e9f48a646c7fe94e3cb2bf4dcd3a57122fa9f272c94ff36c94d735b66d47eef43f1c4d995ae5ba3a9274
 MISC metadata.xml 395 BLAKE2B add696dab9f93cad522087325d7cea08bb0d6905a093c0dd721b8ee0cc5f06a97e8b29663920e5131fd1cfaf38a1fb1c22908daa155025713ffbf18d87a2d5ec SHA512 454f9cf42ae315bb9d4b7c9a2a8b9a690163befc8f738b1fe4a145f1f3a9a5f59693e4cd1ebd4c501005cac1ab81c8b57b2316ac50739dfa96919b6de4850b9a
diff --git a/dev-python/pyfakefs/pyfakefs-5.2.2.ebuild b/dev-python/pyfakefs/pyfakefs-5.2.2.ebuild
index 876026d4079f..bd296d0b3f4b 100644
--- a/dev-python/pyfakefs/pyfakefs-5.2.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-5.2.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index f29a61681624..18e23a111f34 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,5 +1,5 @@
 DIST pyscard-2.0.5.tar.gz 150803 BLAKE2B c7d5ab17c3471b050a321c687e5faf33b5faad5a1afc60462b759280cff31bc55d86decdcb16dda9a4afe47848bc06f303c9697941dc212f01b28db6a8469a5e SHA512 bb2ef725e7dccefa640fe1568d1fee016bc5c639769d1b0d099067108e1369b8f7ccd3e48f985d657c5c7c33730eae891624f2c0ee2deaed491826b8c0eae2a5
 DIST pyscard-2.0.7.tar.gz 152304 BLAKE2B 8be34283b85b830597f051fedcdbe4437b81ad6ecf9dc0304e5bbb74f9af4fec36acc8d843802d59a204d75a4792f74827b5f422a9452cb0d84fe0ed51e4c2b3 SHA512 d30a2d0fe9b410f277a4a1e45ae88a30eb3aa7ef6cac683a80d2bb3cfe38aeafe6a483dfd42c50017c46ee0d26da13f7226e25e783176587eafce1988127bb67
 EBUILD pyscard-2.0.5.ebuild 801 BLAKE2B 4b28e4f26020e68678cb67fefda84ba7c4a9610f66e633eb6552ea95ffaa241c021a506e0286ec5db4ac012a62045c6febeab7665dd655c1f9e79649ad46a551 SHA512 09a8aae09b268081c1c2cc9aa00b5a6a300356afa72b1f1cc082ce7e3dbfa85349374cc097aafe27e0fbd1dd374d00b9f4c2aeeb59394413632f4f1565efc346
-EBUILD pyscard-2.0.7.ebuild 853 BLAKE2B 5526713d662749a085d4750d83a8233ec91293a86734fbedca93c7dcfdc3b6d9c6e6688b56dce4c0fd749151f00241104e56bbc622bce4c526495277971a1d15 SHA512 e9f3562b06bf297338514e59a2d27b68f987e42f0b82c4176417b8d3e42d46ee40cb2b54afd8851f6e236b0c16682ef7115c76152297c12bc7face2c1fa0b7f8
+EBUILD pyscard-2.0.7.ebuild 852 BLAKE2B bd04949b75378a99cedecca9b9eb11ae920e9c000f33aec7961d9108ab8c67961d896e81054d72e9aa7191c326a4e6bd64fac851bba580155e275d29feb5bcba SHA512 2953b0b63e6fc787a9bf436b914a7d756f7787e2c27dda5095c80ec1e44bf2858664471c72ecb4df87d2912e2940b6c3c1e04f0fb3c31452d8c113c66e270eda
 MISC metadata.xml 426 BLAKE2B a4819bd37d610cf785d4b0e5ba2a709c941000d5cea8e20c8d49e513e7167b55e8e149da9e318281dce7b4eb92cb61e355054c273e3758262c6c25a0757ffba3 SHA512 82e759791154362704f4d7a1a1c72d53710e405c21bf791d0ec609ddfee4b8c04e3490a3f33f8d0e6e295f3b8433520f328dd71bc91cde2926a89a76803fd63d
diff --git a/dev-python/pyscard/pyscard-2.0.7.ebuild b/dev-python/pyscard/pyscard-2.0.7.ebuild
index 9fc120662e2d..5b1ddeb209b6 100644
--- a/dev-python/pyscard/pyscard-2.0.7.ebuild
+++ b/dev-python/pyscard/pyscard-2.0.7.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	sys-apps/pcsc-lite
diff --git a/dev-python/pytest-jupyter/Manifest b/dev-python/pytest-jupyter/Manifest
index 7940f2030d68..e3304e7d3033 100644
--- a/dev-python/pytest-jupyter/Manifest
+++ b/dev-python/pytest-jupyter/Manifest
@@ -1,5 +1,5 @@
 DIST pytest_jupyter-0.6.2.tar.gz 15174 BLAKE2B b6c536383ab1b8e375e4250b4922ac6372f850ee4993643122896092109d3f711f91ccc7b159b7330de18f7876df818dc01d31c05e3c18d97488255e063db4d4 SHA512 396f7a7c978097e6dee37ead92bb3c8cef2a8100a7cc85b0b1eab19e20bdaed3332391c17568a6a279ab6ddeea1fbb2fa8dafe24ba4500982ba52cfcda2b1052
 DIST pytest_jupyter-0.7.0.tar.gz 15507 BLAKE2B b4b580668083e46830d06908f484f221e511a9dc5b32285de25e8e83268a1cb4a110ab5bc92c4652033bd658332c6aef8560313e041d39ceeec6d7339c67b24d SHA512 5bd44d1cc927281823ab92f5e1dbb4fa66e917fb9ba098c63001bb9edf60d4eb7842d4178c1dce1772e156d871def2319d511187185fbfd81ee9128c7c23ea2a
 EBUILD pytest-jupyter-0.6.2.ebuild 723 BLAKE2B add791a2b4617589caa2cad74f72229c0cd7e6589723f4200ec2ff48c76fe8230b95b78322472a3fdc06a4d0b439b6dc52e359033e38139748c5fba4e8ebe885 SHA512 4f4e7f6d00d1acb0871e4ada59e36fcd450626326e05460c50675b699609390448ce73335af550517a64f8cccc4ab398b19590d171f7afe38e9babed03427358
-EBUILD pytest-jupyter-0.7.0.ebuild 828 BLAKE2B 748233964f7a46bee1a52423208806aca5139521ee7b0d7c07579a6358c0916d67f16c7975586813b76162319013f5cfa71292dd7fe7a580df52220f8f251766 SHA512 4421fbe5a44bdd43b8e3ab76a8bd8dbd07cd0b7ebbd0a88ccf660b86f0879bf7ed68ab8d1e13a05bbafe6dad7486ad5b1c164898273789141b48e278fbb6310c
+EBUILD pytest-jupyter-0.7.0.ebuild 820 BLAKE2B af47a48e2b470a4eb6299e0af80588da7a3dd3cd301bf60bb95adc65a0918c2f77ac7fb9434a30c8d38363f099bfa160ca03063fc51fb36674cbde216b4e435c SHA512 f802d8b24f39154d12184dba6bc728d85af0851b4bef50b184a69f825b36afdccb8008f70fc4fa07567b8e97fb954225f010e919a6d3744545b0410cc17c1234
 MISC metadata.xml 544 BLAKE2B 2774989bbb5ea75c4254ec2c9f3daf04a48bdec28698d62afd2471abb4031273bea581c09151efa643fc691a3fda2e1a4211dca66882fe2c5a24d7a6bef7c1a1 SHA512 e3751515a8baf2b422cb680870adbe9393d37ecf2e8b01212bcfa7d0b62ca368c34a9140945e1af4d7c7f0c5443b996ac7cbd4394833aa13b4e937b05bfe0e6b
diff --git a/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild b/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
index c6cef7224495..ac6e494d367a 100644
--- a/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
+++ b/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter-client-7.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-poppler-qt5/Manifest b/dev-python/python-poppler-qt5/Manifest
index 1ac7cf5ded42..f0f95dd70d94 100644
--- a/dev-python/python-poppler-qt5/Manifest
+++ b/dev-python/python-poppler-qt5/Manifest
@@ -1,3 +1,3 @@
 DIST python-poppler-qt5-21.3.0.tar.gz 25641 BLAKE2B 5937f1ddc1493bb1ef1d98b91dd8ccec4bd8c835956d84c8d7ce7a1cedcbe16854861e1f13825812e0f74c335020f0d74aad2d2bbc7a5780c6eb3ac77437f13b SHA512 cc942a860c2c999ff04fb0468b1556b0e23e7aa19a0185a39c5e903e717dca64bcbd51b8fe34b6885bd789cbf5cc1080c2ca1dcee30b3e69fa1721618e8db278
-EBUILD python-poppler-qt5-21.3.0.ebuild 726 BLAKE2B be21f70886da6033ca1f5914040fcf0ce2bdd9db635692e17b541fb827f7755471e8cf638048be7381deed0f12aa359dd5ef1de08b1527e525149df5d8d35695 SHA512 aa1a810f4181cd96192336d88ae597680ede2445c583e82c1a60115a825365e41ea57341bbe2ddd6617cf9ffcfdf962ed046fc74e8fd170dc185b0a5a232b35b
+EBUILD python-poppler-qt5-21.3.0.ebuild 728 BLAKE2B 105e79b915e6bc11102dfeceb440f64371fb7e54c7a933d39c083a4b05697f5ce3f7de9c4e80f6574ba7e7fa5ec1407ec6ec291662bb7dc13c18918b2a0c94bb SHA512 46ff4c54f4b0e6abf0b4eec11f460ebf5f60bf6abbd8a7d873db7c1e0aa4e42ad20fb59762bf9d1d7d8b75d4bb107ff7355bd303a10e3fc4a185183da9db94db
 MISC metadata.xml 392 BLAKE2B 51992d04b5914b5248871f36659a45176628fe6e45f78b75ad1f64dadcbc5e2606a022498125cefcad2526a43b88e92dd115592b413b86245083fca038611fcb SHA512 6b356062a520973b99990be8f40ff7a5f705089988ebe889a09829fad92ff42d6ec4cddc406f39c6bb19bbf0d6c231557fd350348721c2d9feeb0d4808fc27fd
diff --git a/dev-python/python-poppler-qt5/python-poppler-qt5-21.3.0.ebuild b/dev-python/python-poppler-qt5/python-poppler-qt5-21.3.0.ebuild
index 46afb94249a4..672c9ecf7060 100644
--- a/dev-python/python-poppler-qt5/python-poppler-qt5-21.3.0.ebuild
+++ b/dev-python/python-poppler-qt5/python-poppler-qt5-21.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=sip
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9,10,11} )
 
 inherit distutils-r1 multiprocessing qmake-utils
 
diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index 4f39a59c8c3f..16c4e7d10f4d 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -6,6 +6,6 @@ DIST rapidfuzz-3.0.0.tar.gz 1230857 BLAKE2B b15bcca17288cc428b485b0c6e1d322027ee
 EBUILD rapidfuzz-2.13.7.ebuild 1071 BLAKE2B 9a3adef0003a472350e6dfe631560f9e600a29f09a4c8c0b2342d6af91a986fe5b66874b183c1e4aa8be8fddb79e8a3f76edf05128011aa85f0eebebdde366a1 SHA512 a43bc3856e5364f63d7586c951596a7dd512dc5d2b9c665b7c1b998e53757590c29ce982858d786870f928537d2872bc814da04d33336f4972bcbb3f572195a8
 EBUILD rapidfuzz-2.14.0.ebuild 1078 BLAKE2B e13755f23b49f18153148c38dcb0dceda22e2ab7b5e83d9a2a4d0655b3aa9fb1d67462cdef04f30f0922e7ffbfa04a4336bab8d11e3b5a949de63c0ef967ee44 SHA512 638e5c4f3248443a7854fe28cf188fdbf7a7dd24cff170568104dfe5710271c86e051ce36ac05b040ce99f49a29be21e30bb481b0aab185450d48e344461415f
 EBUILD rapidfuzz-2.15.0.ebuild 1078 BLAKE2B e13755f23b49f18153148c38dcb0dceda22e2ab7b5e83d9a2a4d0655b3aa9fb1d67462cdef04f30f0922e7ffbfa04a4336bab8d11e3b5a949de63c0ef967ee44 SHA512 638e5c4f3248443a7854fe28cf188fdbf7a7dd24cff170568104dfe5710271c86e051ce36ac05b040ce99f49a29be21e30bb481b0aab185450d48e344461415f
-EBUILD rapidfuzz-2.15.1.ebuild 1133 BLAKE2B 60710fb62fc27bb2c188796deedbd27b5d9e19d1b500a20887ddf89b3b0cae2aed899707b51b93d33e1c67dc772c198f85c94fb02d1552ab4ff8a8c0300425ca SHA512 dba522b5b841e59a8d85a4a071abc8544094260e29dc253ba4b043a6f3571740fccd549f1cf393c960f281bdd8452c0e7965da6ea3de07da0e73d616c66982e4
+EBUILD rapidfuzz-2.15.1.ebuild 1130 BLAKE2B a5fe9d7af63eefe597deb8687ac22c121c0f1d3338b16c4de71ff6ca94b0910eb1c4383592316b6305ab72468b5a5e0c94689c6a89f86fe6c6ae394e9341f6f0 SHA512 0c7fc3bfd781a86b127f5b2ca896e6e107ad356936b29caab174ae329e205dabaa8bfb268dd5ed77a48d7aaf38834eee625e9a2c4d9d2f1b076bce74e16dedcb
 EBUILD rapidfuzz-3.0.0.ebuild 1133 BLAKE2B 2eac2c7fe0526a9a185297a80e450d70dc601ffd34ba78d95bf37bb877e5f5d2f925ae78649d70894bd18d25cb8be05102219213dedb6cab2b52a659f8c659b7 SHA512 2495097af595052f251f706e7d649484f3168ae7f11ca265abc1f6bcceb4b5e5af26fa2799a5126352b3f31c57da9b374130a0114dcaf7cfa7a5e62f019dca2a
 MISC metadata.xml 374 BLAKE2B e6ee89a9850276b8c22c9bc851ebea2cde2ea696d122d70c6465e09a9371c59f81d1976b3253e8ee90afae5e3e30e993481b402058bac0c58ec01f71a0b7c3b4 SHA512 9a39c4bcf8e8de0a6d6a356a9aeb415f8f49667caf5716eee50bf251f1fd53bb076e817fac0b15bf64e65c1b9625c78810da61a5d96b273a20b2669a18084d6e
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.15.1.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.15.1.ebuild
index ab6017b3d088..e5e14c3890a9 100644
--- a/dev-python/rapidfuzz/rapidfuzz-2.15.1.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-2.15.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 # all these are header-only libraries
 DEPEND="
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index 8351c649bb45..dc6a0a4b68d4 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1,4 +1,4 @@
 AUX ruamel-yaml-clib-0.2.7-clang-16.patch 1848 BLAKE2B 35f64bb3d23e6724e997962f3cc485ea4bcba504228c36bc417069bab2f2efa2ffcaebc1b68471f543284a750cf94944bbda922cffa480406d274f211029a985 SHA512 5a0c62255d148fd3ff083e7c2735ca11c46863c8a6c0f3eddeaf338295e3cfeb69827c4cb5b00dbaa8ceb3bfd15cadedd3e96046c397c2450762e15213030df5
 DIST ruamel.yaml.clib-0.2.7.tar.xz 141668 BLAKE2B be731f7e11dbb7b94bc27e900c70fed8ae53b788cd8827425d442baac795a73426cb8c133aedbab876f111bf8e99a8fdafc6151a5de334b1b8b409792b6895bc SHA512 e9413cca5f00fe4896a0185a85494ee9ba8ed955285bd93de9cf6e0f9eed2ff569be1ee70cf974af0eaf58f4671b9ac7ae85b461652eb9abd5bf34d593052f07
-EBUILD ruamel-yaml-clib-0.2.7.ebuild 896 BLAKE2B 3806579641bb05a02d1233d77c33b4fc29c98d789013412c0f85f36f20669e3c3ab1caad025aeda4a2f3756b48a0bf126d99ae25d65612c635d6236b345d43ef SHA512 9ddc665f0062fc073ebd6f36155f708cd385c2423a9b961c79d943f81be87d64168daf6bfc5fbd0a8c3a85ae7860d9d2dee0fcda1661f274933466fa8808f7de
+EBUILD ruamel-yaml-clib-0.2.7.ebuild 957 BLAKE2B 6872b0e041c346ccacc807bffa3c82305d03a56cfdac5a870de3027cbd5d289e11a1f5f98a1f655ab2617de4f433aa22152cd23a8cb2d95c5d7de108b46d6eff SHA512 40bced13abf452fc17d4dd227b7fe81bc0417aa54b33455cc6116250711fc7d3e8c1c732fa0a6439089707fab0cbb4be44e20d3dfd052aa290dbebba6ec7cbae
 MISC metadata.xml 1173 BLAKE2B 349bfd2a189aa2761278b5083ced8eb48997128fc75e44d28cf2f64f73c8b8cdf2ee69758b05b3c0fbc80aaae9d03a4dcf2d6cb6d831a9f6fced7cd360ed04ec SHA512 61d55bada715046285892d29ce9779885a5fe3f808c9804da1246c39e7ecb32029ebf030686380305f24bea62b1e767edf882d60b9377eea38b5dc25f517d081
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.7.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.7.ebuild
index f5d49c897fdc..09586400fb40 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.7.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.7.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( pypy3 python3_{9..11} )
 
@@ -16,23 +17,28 @@ HOMEPAGE="
 	https://pypi.org/project/ruamel.yaml.clib/
 	https://sourceforge.net/projects/ruamel-yaml-clib/
 "
-# Lacks .pyx files for cythonizing for py3.11
-#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+# sdist lacks .pyx files for cythonizing
 SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-S=${WORKDIR}/${MY_P}
+# workaround https://bugs.gentoo.org/898716
+S=${WORKDIR}/ruamel_yaml_clib
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="
-	<dev-python/cython-2.99[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
 "
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.7-clang-16.patch
 )
 
+src_unpack() {
+	default
+	mv "${MY_P}" ruamel_yaml_clib || die
+}
+
 src_configure() {
 	cythonize -3 _ruamel_yaml.pyx || die
 }
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 325e2354399c..e25db40832ac 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,19 +1,5 @@
-DIST SQLAlchemy-1.4.47.tar.gz 8559530 BLAKE2B 051e6f0114162f5525e756d8762281464020a3c4e1751df8432f76ce3281ea1004fbf842e92bdd310e3a736fc87d25db12a1566720c76bde7960d51c22a483da SHA512 702cbae848bc662b686db43b2d2dbd18b503b3aacac6f5960bcd260cc5bd7058536ff2207f1780cb8425c228a82796490088c3ec32f24637edd2cf1cdac7a8bb
 DIST SQLAlchemy-1.4.48.tar.gz 8448993 BLAKE2B 02c5457e099a0f0bb0e5427a95d3ea35d504d0b5f1d10003b59c8dc76f92ea7b4720512d934fae64b12d95c5de5230139f3af9f5bd6e372fc07228b432995bd9 SHA512 f948e79c92889f2462b117ca49ccb8e82d5f8da0027c65488a3f6c64a802dc0bca96cc84c4e77bb3b8d434dfd66b621ef4d69c5d417ad781d1dc7136bcf6dea1
-DIST SQLAlchemy-2.0.10.tar.gz 9364115 BLAKE2B 0a058eb179e08fa04083eb75aeffff7a50b6e379ea9b5b31d568a88c8ceaa208c0df613d5b3054d477af25e65566b8d413a3be694744e96609f74ab5ac102365 SHA512 f672eec34851e85f1ba41778104a379a37f833804e549ed12cd5b2d5e3cdfb5578e05aa61a61264aee1985d03af19c81b950977ae2b458161dfc8320db371b69
-DIST SQLAlchemy-2.0.11.tar.gz 9260972 BLAKE2B a23f65e9014884d8edaa9285a9749bc02ba412e33fc648da2eff611829931a951107f941a77b00352226be5b3e62f4e6b99434a5657793ca462d1094b6a34788 SHA512 8ca9b3dd1a825b8adb788e0110fe65cf14808de8554fb9b733e27e83f77da148a36f4ebb845a81d9260d464827b5deece657d58cd34bc08262808d7964b2b11e
 DIST SQLAlchemy-2.0.12.tar.gz 9264506 BLAKE2B 83a3aa719e2809b5b48ef5332cf6cbc0e973089dad142dbbe952d14b2e4f3e5a1cf67c7a7240017fbddfafe1c57d6acb974d9c61e72970d8a8c49b7a57f52a91 SHA512 0e4bbc7d4729b2667ca1e8a0c88293e44698346415e3742ad3c686495c9855b5714dab161590605d5ee60523a2544f590f67ac7d01f7f2756ddc7156688db902
-DIST SQLAlchemy-2.0.4.tar.gz 9250723 BLAKE2B c3cec648a527e7beb349b2bbb6924a4e794a1fe4d1563ba7573afdc28ed24fce149c5b3c08fa419e85713b68080b2a805e1999e312f59ed7fae55f9aee6a966e SHA512 098004c594ff00a47a66850b0661f673e4d7a6f168fce72ca37a65ecfe04b3d291b9a6fb9393f7671c9a7c5c128ab6ba2035d18cef28736df1207e689cd8c412
-DIST SQLAlchemy-2.0.7.tar.gz 9298301 BLAKE2B abedb2805cad489e68fdec383eaf1bc65ef92777230317911a9351fce7c9159f746629197f7443a37495c23cd8d3cdd1015d8417f00227f28b8af1468a8327ef SHA512 94f5c4262741986456a9de435a81d9df8d5eed16417cc8c07321cb28030c99ea347c33a2054f2961e3b794bd5f75da19b0879675e2c1106fc5030382895caf75
-DIST SQLAlchemy-2.0.8.tar.gz 9314926 BLAKE2B bc54ba9be9f68cc2995bf5328cc5268e0890262efb162a94bd36713f3f3d2f1ddffa95b4d1d8ab140f865c2788d1a913f6c104f21809a695faa132686d77cf3c SHA512 66408768ff702b16ad1365931b254d72976313a3369a74e5a81326d83540ee274805b01d449010ea8e8750312e26dc91aad3b724c4cbdf037e7314b204f6908a
-DIST SQLAlchemy-2.0.9.tar.gz 9318327 BLAKE2B 6fd734aad4a7c281164a6a4188066d5e14996a80c849cc18b979d2acaa4bd24ed66c8ddc37de2c08759e8c0a9b36a0009bdb48123c6a50fc5c8c382a1e5df4ae SHA512 e81193ac254280feee542ad61a28540d62441d0471bdcf00cce20d3730ad956414de23ccce6d3bf8781c0970c3c825407b909d645d58c9657c38ba68716dfe54
-EBUILD sqlalchemy-1.4.47.ebuild 2835 BLAKE2B c2ed746fa742a1a59acec80bf6c7b0342c28226e3235fb3a7ae46a2d8b260cabc05840ce58d091bfaa16b7601b24c4da0f3ef32364d8817258af0551f560d787 SHA512 a326e8a93a6b6567314833c9b1b2f3da08cdab0176166e7faf7e19fb5ba65bbf0a54ab8ab1772fc7394157af02eddfcf40055292ab05431af6210adda30bdb3f
-EBUILD sqlalchemy-1.4.48.ebuild 3012 BLAKE2B 3c5761b887f620a1d98d9f967d23ada2ef1647cd2ba94d71ae686256a03764f06a26c46b852f5938e0fb2dec2a8b2db9bfaf3db6c2a6325bda510ae8c0f97754 SHA512 b56c88ed4d09afb12793317826f49c9ddc255cb67df5d5d56bac47423320518e585e1c02b37b0e9d355bb66728834d47dc3c5567ef164ced9eac0b95d258b697
-EBUILD sqlalchemy-2.0.10.ebuild 4032 BLAKE2B 267a19fdb4f18fc6e14fcf998e9cb4e6d175c5745984628ea5dc77a1e560ffb65a7c9966e9d7fddaf46e41c96a70ddfc689c429424348f310eac2781ccad5f2b SHA512 c6e2b953fb7cce4a4da29be84ff46e47d0420ee3ae31c8f6253edf4d546c4652338e7caceeb4743efece8c81ed6f8ff3c6d43cb059b19b0061305dea8be82317
-EBUILD sqlalchemy-2.0.11.ebuild 4218 BLAKE2B 484419ab7ab8b68c715b3105ec75364823c302c48f260a492d938a9355ee74b036a4db5948b3f7c718592c68e8765869ca48f754a589b184b0cb61b36de489d1 SHA512 f56ea79fe3a67df5a976219e9318431042ad1989d5642f193afaa4d23d86b5c238e40c751e7213ac216d3f524913509720f0c8eeaf9ec6b0b76fa49a4b500b52
-EBUILD sqlalchemy-2.0.12.ebuild 4280 BLAKE2B ee4f389ccec27726402b65e4d9c659a0e6c01689dbf60c566efe37865a05062fe7c7021e0a6e48e8e4c23a11573a07cb2b05674ac89ed610f3d787b6d0dc5cda SHA512 16bb11dbbf733bdb0f5817ed6aa653f7da50c58cfe5cdade5c5005169eaf8a36a8154c1ad8fde8f12fc6399a81902214a6aa92ebe2ea150a2dc759cad4bee0e4
-EBUILD sqlalchemy-2.0.4.ebuild 3765 BLAKE2B 0250e7fada00dfd9043367270cc40a7e4ffaafe587859fe7dd938dc4f7714f6a016779c928856ac35f64a430ae6f6c5629f2458dc85beb0388820fba69f81dce SHA512 565ff18cae76c9383848b569d78a4c61a5ccf1b760c363eaaa80ef489daee95f210a589a710fa273ae35ef99e768fbd17d72f2a221d31546cd43e298f41fe602
-EBUILD sqlalchemy-2.0.7.ebuild 4077 BLAKE2B 463a7310c961804ef0f7e8dcb66608c4eaa5ac0f249733c037f59098deea22fea7e6e8f53c86c98f5b703a330c09c4994bbcfabecce8342d2d36bf36acb2b390 SHA512 f20898aadcf1796b39bab2a5d66d43eb6827ab5eccc529301496803b86b444441a6ef3f21b980f79a9bee79a22b30b050aedbfa91eb870ed1afb5a94f8f996dc
-EBUILD sqlalchemy-2.0.8.ebuild 4080 BLAKE2B 1659a397b7511fbab71a9a11b1f9d900175e22c6653c7d7b81bcb59fc52041310369786f922266a45a2e1a3ad6bc699403f453eea30f2ae09b6068b93879a8c0 SHA512 22cf24bf6905986c2d0a17ca3b361498599700bb23b9da7f7e00131e92293dc93984e44558cbfc9ea5ab8d19477019fef99a4e91206f4cf5ac6a222d08b45578
-EBUILD sqlalchemy-2.0.9.ebuild 4080 BLAKE2B 1659a397b7511fbab71a9a11b1f9d900175e22c6653c7d7b81bcb59fc52041310369786f922266a45a2e1a3ad6bc699403f453eea30f2ae09b6068b93879a8c0 SHA512 22cf24bf6905986c2d0a17ca3b361498599700bb23b9da7f7e00131e92293dc93984e44558cbfc9ea5ab8d19477019fef99a4e91206f4cf5ac6a222d08b45578
+EBUILD sqlalchemy-1.4.48.ebuild 3011 BLAKE2B 927f8ccd0d4d29014dc78e5edf9a12c55f68f368facb6da3bbb44bf16ff7f8b17f379638fa45f42fb69cf9662a67ff88b76830e009ec3574f278d4bd64b1207e SHA512 8323e28bcb86267ec2e6914324238ec0f5640f2434cdd1bb7bde8986d837e53ae42d5dcff1c58cfae30e9064c8b436db53847b8103f121fff2f02271738a5eb4
+EBUILD sqlalchemy-2.0.12.ebuild 4279 BLAKE2B 918997ed54427c9eb4c4e93c134ab1c3d0a9aacfa812fe78f3d05d7697ffedf344610a69c1fe2b1775ec4d661ac320962937a02ee4795670324d6eed34ba5405 SHA512 cb5e3da91d49320229f34208157a3762d5a9a6ed96402b44191e5e9f2eaebec69b71be51e25489fd30ed2931aa9d1e326813c0420b71728403fb8a56f4a9c003
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.47.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.47.ebuild
deleted file mode 100644
index d2ddfa92c545..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.47.ebuild
+++ /dev/null
@@ -1,94 +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=( pypy3 python3_{9..11} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# hardcode call counts specific to Python versions
-	test/aaa_profiling
-)
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-		# https://github.com/sqlalchemy/sqlalchemy/issues/8762
-		test/orm/test_query.py::YieldTest_sqlite+pysqlite_3_39_4::test_yield_per_close_on_interrupted_iteration_legacy
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.48.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.48.ebuild
index a2201b33d92f..21257722ba25 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.48.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.48.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.10.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.10.ebuild
deleted file mode 100644
index c5a01ac5dd42..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.10.ebuild
+++ /dev/null
@@ -1,108 +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_{9..11} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		test/ext/mypy/test_mypy_plugin_py3k.py
-		# hardcode call counts specific to Python versions
-		test/aaa_profiling
-	)
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-		# TODO
-		test/orm/test_versioning.py::ServerVersioningTest_sqlite+pysqlite_3_40_1::test_sql_expr_w_mods_bump
-		test/sql/test_resultset.py::CursorResultTest_sqlite+pysqlite_3_41_0::test_pickle_rows_other_process
-	)
-	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
-		test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
-		"test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_${sqlite_version//./_}::test_cant_parse_datetime_message"
-		"test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_${sqlite_version//./_}"::test_{delete,insert,update}_single
-		test/base/test_utils.py::ImmutableDictTest::test_pep584
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[not_has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p xdist -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.11.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.11.ebuild
deleted file mode 100644
index 0aa613cc960e..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.11.ebuild
+++ /dev/null
@@ -1,114 +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_{9..11} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		test/ext/mypy/test_mypy_plugin_py3k.py
-		# hardcode call counts specific to Python versions
-		test/aaa_profiling
-	)
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-		# TODO
-		test/orm/test_versioning.py::ServerVersioningTest_sqlite+pysqlite_3_40_1::test_sql_expr_w_mods_bump
-		test/sql/test_resultset.py::CursorResultTest_sqlite+pysqlite_3_41_0::test_pickle_rows_other_process
-	)
-	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
-		test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
-		"test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_${sqlite_version//./_}::test_cant_parse_datetime_message"
-		"test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_${sqlite_version//./_}"::test_{delete,insert,update}_single
-		test/base/test_utils.py::ImmutableDictTest::test_pep584
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[not_has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	# note that we can't use xdist because it causes nodes to randomly
-	# crash on init
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.12.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.12.ebuild
index ef611a252cb7..1c36e83b76cf 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.12.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.12.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.4.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.4.ebuild
deleted file mode 100644
index 78c099c9bce5..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.4.ebuild
+++ /dev/null
@@ -1,110 +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=( pypy3 python3_{9..11} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# hardcode call counts specific to Python versions
-	test/aaa_profiling
-)
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		test/ext/mypy/test_mypy_plugin_py3k.py
-	)
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-		# TODO
-		test/orm/test_versioning.py::ServerVersioningTest_sqlite+pysqlite_3_40_1::test_sql_expr_w_mods_bump
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
-		test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
-		test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_3_40_1::test_cant_parse_datetime_message
-		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_40_1::test_delete_single
-		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_40_1::test_insert_single
-		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_40_1::test_update_single
-		test/base/test_utils.py::ImmutableDictTest::test_pep584
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.7.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.7.ebuild
deleted file mode 100644
index fa6d44b516ea..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.7.ebuild
+++ /dev/null
@@ -1,110 +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=( pypy3 python3_{9..11} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		test/ext/mypy/test_mypy_plugin_py3k.py
-		# hardcode call counts specific to Python versions
-		test/aaa_profiling
-	)
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-		# TODO
-		test/orm/test_versioning.py::ServerVersioningTest_sqlite+pysqlite_3_40_1::test_sql_expr_w_mods_bump
-		test/sql/test_resultset.py::CursorResultTest_sqlite+pysqlite_3_41_0::test_pickle_rows_other_process
-	)
-	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
-		test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
-		"test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_${sqlite_version//./_}::test_cant_parse_datetime_message"
-		"test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_${sqlite_version//./_}"::test_{delete,insert,update}_single
-		test/base/test_utils.py::ImmutableDictTest::test_pep584
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[not_has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.8.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.8.ebuild
deleted file mode 100644
index 72166aadb1d9..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.8.ebuild
+++ /dev/null
@@ -1,110 +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=( pypy3 python3_{9..11} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		test/ext/mypy/test_mypy_plugin_py3k.py
-		# hardcode call counts specific to Python versions
-		test/aaa_profiling
-	)
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-		# TODO
-		test/orm/test_versioning.py::ServerVersioningTest_sqlite+pysqlite_3_40_1::test_sql_expr_w_mods_bump
-		test/sql/test_resultset.py::CursorResultTest_sqlite+pysqlite_3_41_0::test_pickle_rows_other_process
-	)
-	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
-		test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
-		"test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_${sqlite_version//./_}::test_cant_parse_datetime_message"
-		"test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_${sqlite_version//./_}"::test_{delete,insert,update}_single
-		test/base/test_utils.py::ImmutableDictTest::test_pep584
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[not_has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.9.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.9.ebuild
deleted file mode 100644
index 72166aadb1d9..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.9.ebuild
+++ /dev/null
@@ -1,110 +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=( pypy3 python3_{9..11} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		test/ext/mypy/test_mypy_plugin_py3k.py
-		# hardcode call counts specific to Python versions
-		test/aaa_profiling
-	)
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-		# TODO
-		test/orm/test_versioning.py::ServerVersioningTest_sqlite+pysqlite_3_40_1::test_sql_expr_w_mods_bump
-		test/sql/test_resultset.py::CursorResultTest_sqlite+pysqlite_3_41_0::test_pickle_rows_other_process
-	)
-	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
-		test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
-		"test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_${sqlite_version//./_}::test_cant_parse_datetime_message"
-		"test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_${sqlite_version//./_}"::test_{delete,insert,update}_single
-		test/base/test_utils.py::ImmutableDictTest::test_pep584
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[not_has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index d97057a6c60b..811fea256991 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -7,5 +7,5 @@ AUX wxpython-4.2.0-no-webkit.patch 1285 BLAKE2B 19fdee2293da214b8ae318b2670298b3
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
 DIST wxPython-4.2.0.tar.gz 70958238 BLAKE2B 2e8e34c4f5d1992983bfe4e09bb56ee5619b139b9b3b5f05dee48ecdf6971cf9fe1b0fb22aec685904eb44db6f50a4ba132a08aa91930d809040da828efa097e SHA512 9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f
 EBUILD wxpython-4.0.7-r4.ebuild 2370 BLAKE2B e8b76a2c2a0b2153c4663a4e514d0ee6c54bd5946e92dc436f854775e410031393b8f8506ae50567490b5b709eb5ada1ab3cf24c980f0a14f2d57b91e21c780c SHA512 f8e47b0de868d90b9a9fcb33c9fa22a96c8ad7d195b35917239ec840a685fdd9fc42f5a0259c644dec17886395bc433a125539ab7b09107f4f135a1b08042b95
-EBUILD wxpython-4.2.0.ebuild 3839 BLAKE2B aa8b7787379482def514e29543251a6908b1731c7100187cb4929df5b3bb210591dd50baacbecb6ffb14dc7f89a1f475532840f02e2c2f6b630fdf5c243d2430 SHA512 d2e5041979f897c8653511a2e41bc76a9e674cff0646e59523f214e876627d7dd33562c101e863451226a0dd5dc651debf443d27becd08180224838f3a02f356
+EBUILD wxpython-4.2.0.ebuild 3876 BLAKE2B cb7ed755149dff3baa7d70ae5fa4c1321005c0a5821725356f0a9bf3e604bc7a7254c0496cbeca6de1317391829ab7c9c7755a7e9064d3d9f04eb8044703fc6d SHA512 879176e29a4a97c569416f862363660e085a18d878e008c2e7283d58e59bd2cca27deeb0a331790403e591a2e41dcc5febf0e0293efa35de59adef53737dbbb1
 MISC metadata.xml 491 BLAKE2B ffa0cccf66f484c856fb30249bd0ccc3b0da2f3ee8e3c3a0df1782bc58e4867ff99d9711f1784b44b439f2a8bcf297c1082b49a941823f046c7f2c7977a77629 SHA512 a2f5908a276a8f9c512cb59c8d17873398c91b21977371ab724e669f3b6c032d53510fbcd183a5dc340279fc522289e617b8c313c0d825ca70d0d2a5d74f8cfa
diff --git a/dev-python/wxpython/wxpython-4.2.0.ebuild b/dev-python/wxpython/wxpython-4.2.0.ebuild
index 1a0913847851..d5528c5f28f0 100644
--- a/dev-python/wxpython/wxpython-4.2.0.ebuild
+++ b/dev-python/wxpython/wxpython-4.2.0.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-doc/doxygen
+	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/sip-6.6.2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]