gentoo auto-resync : 02:07:2024 - 08:01:06

48 files changed, 644 insertions, 884 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 2501d2046002..ff5c1b38c5ba 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/accessible-pygments/Manifest b/dev-python/accessible-pygments/Manifest
index 93d7efc10e02..d01f57091a04 100644
--- a/dev-python/accessible-pygments/Manifest
+++ b/dev-python/accessible-pygments/Manifest
@@ -1,3 +1,3 @@
 DIST accessible-pygments-0.0.5.gh.tar.gz 2273172 BLAKE2B ed07ecb1ef0d6dcc2b02383d1620c373bb54c65522752404a0e2e2382e374d35c11d7ad6978889b4fd20d4536b38d5ea951a2e6366725279123f5357ecff8a0a SHA512 2f5984c4f95a13dc566a0f916168fb293332f175da61f88ef7dcbc9f2bfcd8781d891b7830ed401839eef09ad65f7cbf94bb5a153bc5b4454ddf4c28573948d2
-EBUILD accessible-pygments-0.0.5.ebuild 919 BLAKE2B ab0c5c0a94da5f84c57baf0329d5f5b2f72bbf9c18a844bf0ed88e7db2c445a266b920b00dd92d7fdaa41d27203abb17db41c038ac05ddfbaa3e99df51fe4686 SHA512 e6292cfaef9aa4fd6f7ce75f062306c124fd7af2b084dca35d724514c8001b60f6de6fd6587cf90e460157e6969b29db52dd7939877fdd154cd3ed3b9edf2e04
+EBUILD accessible-pygments-0.0.5.ebuild 925 BLAKE2B 7bbcaceeb2db5879d7e9e53591f0f57bb97280aba0efba6f0d822cf4043e8a8b9197320db7282be0669e44f34032ffa0eb7d999b8121f93eb4b58e09c786c4b2 SHA512 e065c983cd3a769160354b9b18b2d1db63a31bf471c525a3f864d6710c79c5ca2119907d2eadc27a3ec3108120c88e0b4b5046e53ed053ade238eade29433d8f
 MISC metadata.xml 421 BLAKE2B ef299c2eec196b50d776375f0bb9f00319649a659524e959f625e7bd9a1e53d994b7b55f7ca121b6b1a7022424f365ec3a739a072c7fab5de0ba689f099ef250 SHA512 683cfa4011320ee1e5437919f7ac05aa5bf1517da3c4427fa216e15f3e6c96b97de598719d1b66f10a4270a7f6b14101c2925af06bb1db186d770028b06f7b0b
diff --git a/dev-python/accessible-pygments/accessible-pygments-0.0.5.ebuild b/dev-python/accessible-pygments/accessible-pygments-0.0.5.ebuild
index be0453c4f929..8686955b2179 100644
--- a/dev-python/accessible-pygments/accessible-pygments-0.0.5.ebuild
+++ b/dev-python/accessible-pygments/accessible-pygments-0.0.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/asyncssh/Manifest b/dev-python/asyncssh/Manifest
index c755ca2f1f14..c4154b7ab9fc 100644
--- a/dev-python/asyncssh/Manifest
+++ b/dev-python/asyncssh/Manifest
@@ -1,3 +1,4 @@
+AUX asyncssh-2.14.2-py313.patch 4720 BLAKE2B 7bc1d71906c22efe1aa03e65b165d66a98b985d11e15f81e514696d669a99c801cab2d1683e2df041ff7b95d5811c11d4098ff8274f1c7040edfcbc9ab05157e SHA512 8f02d1acca847d5ceaa2d08f639c2bc4c862a5219ee9558d43979b85d89c5d3c7f65f761ceda0748a314c32c6e85ecd91b488ddadce5c108cc33b4b8b8fd713e
 DIST asyncssh-2.14.2.tar.gz 498190 BLAKE2B 66cc538322688d0782e203eb723c7c7a196fd5da725fe95df8b31e25e35e45b86bb01cb5c46f5516475614b9cf7b8076bc3994ec77daf552e030724b0734c2d1 SHA512 76952b8837832139274fbfc4ec4aa84841c66a4eb4c1bd09fd532727287574509fb2b94b684c14d6f76add80a1fe5c8236a3412ab6a71574c203706895b23f93
-EBUILD asyncssh-2.14.2.ebuild 1499 BLAKE2B bdc7b89c00931b1c59b02cbef8e8b6e98a376f40dd7b8497a3e89337a5bc5ffd51e9d9f2963e8919410fb2528e0baa540578488ff4e358eee751df3ecb7a4a8f SHA512 7cd3d6ada72e86fd63c1e84c91a5b1361ba045545c433195f12d02d1011f63f4b50a4ecfcd937f62b8818c50a0cf680e5586c5e1edc302786062f3588056b4d7
+EBUILD asyncssh-2.14.2.ebuild 1469 BLAKE2B 7b09bfaf45778156bc1f37f5a33681ee34196b59ca447d816f681ad2fd0ec7902cde2643056b9425c594a6a80856b3e3716d6152dae8f2d8080cdc0564e8efa0 SHA512 e1e17058678b5aaa61c7fcec6c1fcd1fb61760903d86d51cff4f29806822f94c852359a3bc0a9ad55c73d0aa8a2b3b5a9789a0a9999209a38978077148df7991
 MISC metadata.xml 402 BLAKE2B e4c5d013286a9519d2a2fe0807a3a92ee44bbeb3b862b81fba432a2cda5ec2531d5e1356776de401b9a1c57aaed97d172e3d293254e6e809b5b5cc8670c22489 SHA512 772970deecc78319abfff75ab660da279a92933e4d8efb39b35eb10f3d1edde117fe9b980b04a222e53674402443f48e57b91d07f7f6da395a800bc69632b364
diff --git a/dev-python/asyncssh/asyncssh-2.14.2.ebuild b/dev-python/asyncssh/asyncssh-2.14.2.ebuild
index 1ad40f7b2969..0c7015523b72 100644
--- a/dev-python/asyncssh/asyncssh-2.14.2.ebuild
+++ b/dev-python/asyncssh/asyncssh-2.14.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 optfeature pypi
 
@@ -35,11 +35,12 @@ BDEPEND="
 	)
 "
 
-EPYTEST_DESELECT=(
-	# https://github.com/ronf/asyncssh/pull/578
-	tests/test_process.py::_TestAsyncFileRedirection::test_stdout_aiofile
+PATCHES=(
+	# https://github.com/ronf/asyncssh/issues/616
+	"${FILESDIR}/${P}-py313.patch"
 )
 
+EPYTEST_XDIST=1
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
 
diff --git a/dev-python/asyncssh/files/asyncssh-2.14.2-py313.patch b/dev-python/asyncssh/files/asyncssh-2.14.2-py313.patch
new file mode 100644
index 000000000000..fa3752a2b516
--- /dev/null
+++ b/dev-python/asyncssh/files/asyncssh-2.14.2-py313.patch
@@ -0,0 +1,151 @@
+From 58168139adcaa4bf12448904137cd77812636b18 Mon Sep 17 00:00:00 2001
+From: Ron Frederick <ronf@timeheart.net>
+Date: Sat, 23 Dec 2023 10:25:14 -0800
+Subject: [PATCH] Guard against possible UNIX domain socket cleanup in Python
+ 3.13
+
+This commit adds guards around code which cleans up UNIX domain
+sockets, to protect against a change proposed at
+https://github.com/python/cpython/issues/111246
+which would cause the socket to clean itself up on close.
+---
+ tests/test_agent.py   |  5 ++++-
+ tests/test_forward.py | 50 +++++++++++++++++++++++++++++++++----------
+ 2 files changed, 43 insertions(+), 12 deletions(-)
+
+diff --git a/tests/test_agent.py b/tests/test_agent.py
+index 28ca730..2f0b83c 100644
+--- a/tests/test_agent.py
++++ b/tests/test_agent.py
+@@ -85,7 +85,10 @@ async def stop(self):
+         self._server.close()
+         await self._server.wait_closed()
+ 
+-        os.remove(self._path)
++        try:
++            os.remove(self._path)
++        except OSError:
++            pass
+ 
+ 
+ class _TestAgent(AsyncTestCase):
+diff --git a/tests/test_forward.py b/tests/test_forward.py
+index cae199d..4d30eda 100644
+--- a/tests/test_forward.py
++++ b/tests/test_forward.py
+@@ -651,7 +651,10 @@ async def test_forward_local_path_to_port(self):
+             async with conn.forward_local_path_to_port('local', '', 7):
+                 await self._check_local_unix_connection('local')
+ 
+-        os.remove('local')
++        try:
++            os.remove('local')
++        except OSError:
++            pass
+ 
+     @unittest.skipIf(sys.platform == 'win32',
+                      'skip UNIX domain socket tests on Windows')
+@@ -665,7 +668,10 @@ async def test_forward_local_path_to_port_failure(self):
+             with self.assertRaises(OSError):
+                 await conn.forward_local_path_to_port('local', '', 7)
+ 
+-        os.remove('local')
++        try:
++            os.remove('local')
++        except OSError:
++            pass
+ 
+     @asynctest
+     async def test_forward_local_port_pause(self):
+@@ -798,7 +804,11 @@ async def test_forward_remote_port_to_path(self):
+ 
+         server.close()
+         await server.wait_closed()
+-        os.remove('local')
++
++        try:
++            os.remove('local')
++        except OSError:
++            pass
+ 
+     @asynctest
+     async def test_forward_remote_specific_port(self):
+@@ -1020,7 +1030,10 @@ async def test_unix_server(self):
+             await listener.wait_closed()
+             listener.close()
+ 
+-        os.remove('echo')
++        try:
++            os.remove('echo')
++        except OSError:
++            pass
+ 
+     @asynctest
+     async def test_unix_server_open(self):
+@@ -1053,7 +1066,10 @@ async def test_unix_server_non_async(self):
+             async with conn.start_unix_server(_unix_listener_non_async, path):
+                 await self._check_local_unix_connection('echo')
+ 
+-        os.remove('echo')
++        try:
++            os.remove('echo')
++        except OSError:
++            pass
+ 
+     @asynctest
+     async def test_unix_server_failure(self):
+@@ -1071,7 +1087,10 @@ async def test_forward_local_path(self):
+             async with conn.forward_local_path('local', '/echo'):
+                 await self._check_local_unix_connection('local')
+ 
+-        os.remove('local')
++        try:
++            os.remove('local')
++        except OSError:
++            pass
+ 
+     @asynctest
+     async def test_forward_local_port_to_path_accept_handler(self):
+@@ -1149,8 +1168,11 @@ async def test_forward_remote_path(self):
+         server.close()
+         await server.wait_closed()
+ 
+-        os.remove('echo')
+-        os.remove('local')
++        try:
++            os.remove('echo')
++            os.remove('local')
++        except OSError:
++            pass
+ 
+     @asynctest
+     async def test_forward_remote_path_to_port(self):
+@@ -1167,11 +1189,14 @@ async def test_forward_remote_path_to_port(self):
+                     path, '127.0.0.1', server_port):
+                 await self._check_local_unix_connection('echo')
+ 
+-        os.remove('echo')
+-
+         server.close()
+         await server.wait_closed()
+ 
++        try:
++            os.remove('echo')
++        except OSError:
++            pass
++
+     @asynctest
+     async def test_forward_remote_path_failure(self):
+         """Test failure of forwarding a remote UNIX domain path"""
+@@ -1184,7 +1209,10 @@ async def test_forward_remote_path_failure(self):
+             with self.assertRaises(asyncssh.ChannelListenError):
+                 await conn.forward_remote_path(path, 'local')
+ 
+-        os.remove('echo')
++        try:
++            os.remove('echo')
++        except OSError:
++            pass
+ 
+     @asynctest
+     async def test_forward_remote_path_not_permitted(self):
diff --git a/dev-python/backports-tarfile/Manifest b/dev-python/backports-tarfile/Manifest
index 028e0763e949..0d33af850fd1 100644
--- a/dev-python/backports-tarfile/Manifest
+++ b/dev-python/backports-tarfile/Manifest
@@ -1,3 +1,3 @@
 DIST backports_tarfile-1.2.0.tar.gz 86406 BLAKE2B 20ba5dd91c609b6d7a32b8d489bae5f0d29af83d86c187a8b73e95e3fee034a07469fdfd90fc6c6e96b532b2acbf37ba9e01bdae019ca148d3a668762599fa6d SHA512 8f57526e9aabf7f778e876dab06dd7a476316bb02e9eadd703da3ba74f3b8b0c12338a32fbcb033d477a1a1ff115653a2292b730bfded208c9efb21506bc23d4
-EBUILD backports-tarfile-1.2.0.ebuild 1149 BLAKE2B e951821659a63effa448098e779da7822e64246cf20a85cb26970560ed73bae44e17d5d1bd12c8451e3fb672eb0a115f6b59001d2411651ef6c9d77098e2b189 SHA512 0d809aa60620394ff5b70085253e4fab2f80f59bff727ea46e3f1e9e95e5cd30940cd0b48b833a52c75fb444c39702507ede109d23fabe08e85f4216346aaa1a
+EBUILD backports-tarfile-1.2.0.ebuild 1148 BLAKE2B c5c459ffd8669cfc95aa7b8e754ce7d301f4f3266fae4cf94c6ca00f2a2c53c702534da05555921aacefa26fd224a5d55a851486b7ddcd4a8530263793b8a158 SHA512 1f8f264f3217485699750bbe5d89c51cc7964f438343ea8b22a5e567941e12e28aaf788a7ff44b465a50796a8f3bbc82b3588d1759cb7e7d7fd858b890e1a488
 MISC metadata.xml 387 BLAKE2B f9f0136e2308996c5c4dc5daac7bfd5b700e2249e11dbfc3417dc6bca363dfd2bf654d89392bf818a3963b14d1369052b06788e0367d61fdad36f5b3b2607b51 SHA512 27d9d5892c219d5346046aab5f157a66d8df942f5bbf1f40d06124b4263086ac96d7bac6745e0a0adc8a0e01df12b22b95dcecc4418e90fce6db981934332077
diff --git a/dev-python/backports-tarfile/backports-tarfile-1.2.0.ebuild b/dev-python/backports-tarfile/backports-tarfile-1.2.0.ebuild
index 85bca93a94a7..1f0459fd0cd6 100644
--- a/dev-python/backports-tarfile/backports-tarfile-1.2.0.ebuild
+++ b/dev-python/backports-tarfile/backports-tarfile-1.2.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index 6cb840ba8c3b..ec3037e3981f 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -54,5 +54,5 @@ DIST windows_x86_64_gnu-0.52.5.crate 831539 BLAKE2B 54f84c19988addeb7cbbbddb940e
 DIST windows_x86_64_gnullvm-0.52.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a6305daedf4fecd71840432f104e8707f049b60d784584ce4f02fabdd0281fdb8bc7ebed34b38fdacf3be9c8abd60084e9a4ee9fd56 SHA512 22a978c40df9705cd94e4c52f2b706e477e667b564c608d0adb144b38cb486c279c09d1eb1dd2d6c7bd3401b75a2dc5eafe0f7d642ffe6453f394d1f59483a08
 DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
 DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756
-EBUILD bcrypt-4.1.3.ebuild 1984 BLAKE2B 4b0b8dd1ff4114477e9460dc7156ef6b0dfc081103c8459b099d0bbdc7443f7f814f6e84c7cab4eed413b6d620facda3f3933624fbe97072548745ba029f036c SHA512 fb4038402e907d6c60bbfe44ef9219f7a2cac89c018d2f7424cec329ec3e05c9a11238b18ab373cc923a5ebd8648a8885f68de8c92e68b81cc941ddf543725bf
+EBUILD bcrypt-4.1.3.ebuild 1990 BLAKE2B 801cc018add210adc6604947537ddff6392acb106085fca8245ee3723a6532d55a0fce5bd2fca3b048be36c0d263824592fc2d89d9205a42f656e5e5ce8f201b SHA512 3a02876b4de6444252b1f00f8737b2685c1b1c4b0c7c41b723bdd940f138b64f23c7305cbfbc1a996778461096116a240e0715102d1bdc448627b476df374aff
 MISC metadata.xml 486 BLAKE2B 874ef427438f2a2adc0529010628dd40505fd2597e267b8e51641d95b4c3bd8dab28d0fcd86c23f24c3abc866bd049d5e44438b282a5a13b023320491303a5b5 SHA512 de2e0a2a60b83a660a7c51315816a2762d9ebdb031656b8968da641d4e3897e4f5eb7a3432f828182f733ee4ffd17f11e8fb97d9a72f1a7eec56bb2f46978293
diff --git a/dev-python/bcrypt/bcrypt-4.1.3.ebuild b/dev-python/bcrypt/bcrypt-4.1.3.ebuild
index b48e94c297fb..f6448e1d50c6 100644
--- a/dev-python/bcrypt/bcrypt-4.1.3.ebuild
+++ b/dev-python/bcrypt/bcrypt-4.1.3.ebuild
@@ -80,7 +80,7 @@ LICENSE="Apache-2.0"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/setuptools-rust[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index b2c719110cd4..cc6080657a2a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,7 +1,9 @@
 DIST boto3-1.34.127.gh.tar.gz 820740 BLAKE2B ddfb7802440a01af27059daed4bc7cd3797eb192004a0e7b78e1e56a8ff479206b4835a79bcac1db273c2936fb8dfde0ba16bebe8cbe1befeb188070bf46b2c7 SHA512 b139ad68a4ce29e84e0fa1618b97c4aea13b668521921712df74256ad61c21d2077ea216dfb4102d8f9910a8119b24509aa10a504d746bdb410fee1cecc0461c
 DIST boto3-1.34.131.gh.tar.gz 822851 BLAKE2B cc4b06ca1785e62314308efb7d9ffa6e10a40fe48bdd3e31f9f12490a57843ad528685d04ea9ec40cf2203acc0ee0a9fb58ee272837c9a637f44c2716f60de7a SHA512 79cd8718c6d84cdcdcadfcde80368addc095770624806eb8cfa981852c2a8ebcc8074533ec8f8e24b01a3aed241afccb6f49fdce250ae07f630d8596931778e3
 DIST boto3-1.34.136.gh.tar.gz 826543 BLAKE2B 307705ba777d155772a2dafad775e55d94e17a9e4c2986e48bd8a691c3bc4e433f212e1a59053222927bda42584b2d1d266bc2489f94fd3e4463416c56531d54 SHA512 f2307db517b393164028c17a8073c5baf7f7e3be36c988a90d455cad98a55b7a7e1a6e44584038141047237e81cb495bffaf70747de421ce316bb457e2d168e8
+DIST boto3-1.34.137.gh.tar.gz 827294 BLAKE2B ba4f008114e02f40c5e4ac095241c7dac2b919e1dbe7ffaacc9ab40b3d2a97a12ace2b27359190b20cf2f2c1dcc66044188f15ed12177b002a54537a692b0203 SHA512 7303b32359080f360a95e0fb068ca1e7b83fe54a5f553f6681df3382bd110c70927138e435afc8eb8e93760c9bd685afa7355e661243e6b7f91cd8e8063d401c
 EBUILD boto3-1.34.127.ebuild 1198 BLAKE2B c863be0c9348383129a919e79acbc6962b7c3973f77f68c85df6944a7658a2b39a44a91d904b7fee34ffb849e904e7bf6a503ca35a56085f2b04f40cbb70d4d4 SHA512 10a7f8345e1dc13766f1a15a127a885a42f7750f15c53b25fcba2ef033083192b7381cb53cd7be6c8c876bc1422f615578f730efca83c71ece042593282043a6
 EBUILD boto3-1.34.131.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
 EBUILD boto3-1.34.136.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
+EBUILD boto3-1.34.137.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.34.137.ebuild b/dev-python/boto3/boto3-1.34.137.ebuild
new file mode 100644
index 000000000000..2c733040b7a3
--- /dev/null
+++ b/dev-python/boto3/boto3-1.34.137.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 5fdb587699e7..1d6dc102665f 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,7 +1,9 @@
 DIST botocore-1.34.127.gh.tar.gz 13112261 BLAKE2B e883f0a1e29178667678132195aea9666a124456e731e1b158eed895c125fd614e5671639766f7ad46c2e6b16c4156ff5e42594bc04e49bf25380c91cfcbe264 SHA512 48ca2179c24bb219202e5029dd62350a6fc5c64707762f0f33282e542dbc2227bb146376afa9e6b9eb1e45e3c801208a142bef4827d5036eb4724299c826d534
 DIST botocore-1.34.131.gh.tar.gz 13129943 BLAKE2B 916360c6a9526edcfd338718f80556e59d54692aac13f38490e49457edd59016d264a5acbfeb6298af494f09f9c385e16347a9bf7f144c5a11afda2df188aeed SHA512 9bb788ac8e8a2ec7be999acafef88ccbb4e693ccb315efe5655b80cf3f6629eebccbdac6f201550d2f75e476d83c5a800f1add6c71e2fe5b3d503da313f6d3d3
 DIST botocore-1.34.136.gh.tar.gz 13151618 BLAKE2B 800b800ff2481335f0defb79c10a4216c8bb107a3369e6a45a9c0a6d8f703209a9e44560ebf859f7fc616498c68e9b0de331478a8b5e2d3b36788bdedb597a0b SHA512 e9a31f6e8e241964fa34df65c8a9f8acaa1e33865eeb8257bf6da16982a3704b8ab66b6f424952ff100944471bb8f40cbdbcc26f72120da2d6033319948de81e
+DIST botocore-1.34.137.gh.tar.gz 13153450 BLAKE2B 4049e5f7b12a4df94fa4a819f11732b86897ae838cc1fc9443f343037915e69134c0e3f335796976002ca63305dd12a8272252bed9370b6d64dc83186826467f SHA512 f3ba697813ec4a68978f27be12e44df02336210e47b5347f3868c4630d899eccf4cb0e0cc679122e4e5ae55ba002efc7067e6e13ea5a286707b958cae14b4186
 EBUILD botocore-1.34.127.ebuild 1477 BLAKE2B 784b43f060f0702808a3894fdab7a15dd4b4feeffc3c1ab2fe24cca762b2dc1310f40ae5b2941db5c4aa9c4ff8b69d858520826027a50ce975d25150132b4d56 SHA512 e86970ec900929641794d61e02f26bc7e7c8af803095dcc5c8fbedac9d79275c596176f2b492061289056c7d29ebbaa6e64344148f22b6349ac4420ab5038dca
 EBUILD botocore-1.34.131.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
 EBUILD botocore-1.34.136.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
+EBUILD botocore-1.34.137.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.34.137.ebuild b/dev-python/botocore/botocore-1.34.137.ebuild
new file mode 100644
index 000000000000..ba6cd2a5d2a2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.34.137.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index b86c84338485..4c5a34b8a35e 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,5 +1,5 @@
 DIST defusedxml-0.7.1.gh.tar.gz 34709 BLAKE2B cfe69851e0ac6472cb9e66d1b577831eec37b0a01129dcb43cec151aa939029efc194220f3c7b481d306a77db710a639bdd56f3fd1f7ae46fa4ab8f308b8036f SHA512 4f536794b814291520c7db27765014c57f415554cff569cddab596b33e1aa03799aae9448fdaf07417d1a9f4d8782aa827d1b68aac6881ffe5c2ca9b8a40d864
 DIST defusedxml-0.8.0rc2.gh.tar.gz 37727 BLAKE2B 4a9313c4fe171998b84e22cf1cd2e5781cea6d37ea2436c5450fe4d003c915d3c945c8385b172fc102b601abb4612a217265bdd293f5d20ece2896194e37366a SHA512 d0cdaebf459a203c09c679169eeadc076a92b913558924cc6d3d693fe5732cefd5a6d15c4d2cbcdd7710936063a96e6dca467d0a82165194abeb7111d910daee
 EBUILD defusedxml-0.7.1-r1.ebuild 916 BLAKE2B ceae3a961d716eb8d8e344faabf20f325b11ec2fbd906c9d22203457364cd70cd5eb4fa966bb94f236d1d6e1cf1d27bb30052a3b9a2158336ea430cc3399a26f SHA512 3c083e4fa8ae35ba6b9b1e7cbf40925730a953f40171ee97d489e7c2ed009b2f006536e62fd287d7cd150c2b069bf13c4874d54026a119e2377768fedda27b45
-EBUILD defusedxml-0.8.0_rc2.ebuild 957 BLAKE2B 5ae37d1ba9a4f1c0b3a8220e601264a5288a97d602d369702528f8863925b4ef18f31d4efa40fca9cc42420b71775393b0c42188ca8350a673378e0f9d497b04 SHA512 b596c52fe073b5a2a472fdde858617811f8ff39883e13bf685cb77dc6362112e5c1f375960674b0347ccefde92641ad03b5c4f9a7ddd629604075b03b9a10276
+EBUILD defusedxml-0.8.0_rc2.ebuild 963 BLAKE2B 00fba47407385426660422b90b1b07212660cda71664f771838b7b07d8d0f4dbace65a067d92d92a782d2dcff72257b01733361785134a8b4e3faf97e9a0e68f SHA512 6ba3d147b28057333fe320c84707a645c43c3b247e94315bd8272e894be781d05b6a214718bc3df687c77e74ac8f0a0d6b5cc0d52c8f789d569c69c5ef27f30b
 MISC metadata.xml 407 BLAKE2B 7bdbcb75f81a2de2438c5fb0be0f3a5a634b4ba31b3e32eae6a4094bda9b00ada4c779b8c0884ab0442ff09d3f0ad27ea7de851adff94c320bb6e75c8a499f6b SHA512 a47ffd89a479f85548aa4ce42ea525cb0685acc7c0b83ba74ecaa16d1145912409a4cfe4473297a2923bf4875e567489d5c72a10ddf485e0258605d1c4109f0a
diff --git a/dev-python/defusedxml/defusedxml-0.8.0_rc2.ebuild b/dev-python/defusedxml/defusedxml-0.8.0_rc2.ebuild
index fec5d9032d8f..58f6818a806e 100644
--- a/dev-python/defusedxml/defusedxml-0.8.0_rc2.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.8.0_rc2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 src_prepare() {
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 1789f2a28638..1ec0ebb4fb41 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -2,8 +2,10 @@ DIST setuptools-69.0.3-py3-none-any.whl 819530 BLAKE2B 6ecef64755181255d935e234f
 DIST setuptools-69.5.1-py3-none-any.whl 894566 BLAKE2B a9d24f51240fd528f87642e8765a4a72ae9e03e936acec3e26edd1c5b40127f00dee53db2dd171404778c2e2910d095b5de49e0af3d2f7a67d8edd52d16a0a45 SHA512 d212edd21ab99f50c2daf6080c68a3cc0eeed566f10e91f857e7eeb86513f33e9cde25b975db1030110c3b1714cfbfd4d3c9e2937b4a5ff2bb8971e605ecee85
 DIST setuptools-70.0.0-py3-none-any.whl 863432 BLAKE2B 02b441da8254fc228f2d266b96d26b207271341e9291ffedcfa06f1ccd6a64777658ad83efcc142bd6fc0ec91a21c16cfb6e5b9a8792ea3d46d8c5a23c97b081 SHA512 fde01a0c1ef77e7aa0544663f44d3735ad11430bab57906027e1a260c0d8e0d0b873fcefaef956c1d3992879b5908384b759742e4b726804d42cc681da374a7b
 DIST setuptools-70.1.1-py3-none-any.whl 883347 BLAKE2B f0e9c3b3ee278942b72ebf470279841f648e7852d355841dab27d28551ee09fa1ed6a77e02c5c808a820810a134dffdc28038938c0e2003011f966e6d5799428 SHA512 81ebaa3c39d599ae3975ec5848ca03491188de10c62d0a01923ded1cb4d08dbbbb3be9ecee501cfe16d88726ec0899ad8f36f7c7b289f1f90c5bec403b5049c1
+DIST setuptools-70.2.0-py3-none-any.whl 930834 BLAKE2B 7ef99e6c7c47fd306c4a136504a1d3285faa046da6a4b0be15ec66a2a2eccbe34f203bed794f0a9114ae6970aea163207d22bd4bf5aedf44a92cc2abcac3d881 SHA512 ed6b5199a795c776d653f02e665e560da27e515cf334a2afbbf7f7cb7eb9cd738ca685a2b52d43d68ce6f63486d8da5baa216e58af95e5fad03c6dd95d3d901a
 EBUILD ensurepip-setuptools-69.0.3.ebuild 610 BLAKE2B 30d5981f264556c7910d7d2984d37173e3f2b30fc4c08a041e3e4bbf57ceeae35b02582112fc7b190320fccdf55f25e59d9966fa75bfe39fa23fea1986954a14 SHA512 6923031a97ac255e828fecc00f7c7ad99828a0aab5fe17ee3855462a0e8ec422d96cad81b6e938c2d0fc4eed197a22dd38b31c0e38c2e99c5854f171c8a706b9
 EBUILD ensurepip-setuptools-69.5.1.ebuild 610 BLAKE2B 30d5981f264556c7910d7d2984d37173e3f2b30fc4c08a041e3e4bbf57ceeae35b02582112fc7b190320fccdf55f25e59d9966fa75bfe39fa23fea1986954a14 SHA512 6923031a97ac255e828fecc00f7c7ad99828a0aab5fe17ee3855462a0e8ec422d96cad81b6e938c2d0fc4eed197a22dd38b31c0e38c2e99c5854f171c8a706b9
 EBUILD ensurepip-setuptools-70.0.0.ebuild 611 BLAKE2B 18a927f2d734ccb15db9274b285463fdde3ede4a3dab67d9011a7fa128813d66db3bf87466b1fb99b626b2d982c9dc27a20159d852bdb0008d462031fb1a6725 SHA512 e4244990eaab27a8611074e66e896137d932916dbbb0a760f97057662c66e7f31d509aaef276304b67d96d4dfeaef53fd37bb768bc2e2b58123e18f1448b16bd
 EBUILD ensurepip-setuptools-70.1.1.ebuild 618 BLAKE2B 127ebf8ffb8c4bacd0032dcf268755c43c05c498e506b4e8904440460b06e6614456c40696b3e4aa5a74fda69340c07fa50700c0c8f704e3c2df1c831329b992 SHA512 ab22161ed8de46abcb525f9cc308bc4ba1d905125010734a1510f53bb9c440a24967f35730e7c30253f5d9f1d2320d9b6bb5804c907fefda0eee59a0338cc96a
+EBUILD ensurepip-setuptools-70.2.0.ebuild 618 BLAKE2B 127ebf8ffb8c4bacd0032dcf268755c43c05c498e506b4e8904440460b06e6614456c40696b3e4aa5a74fda69340c07fa50700c0c8f704e3c2df1c831329b992 SHA512 ab22161ed8de46abcb525f9cc308bc4ba1d905125010734a1510f53bb9c440a24967f35730e7c30253f5d9f1d2320d9b6bb5804c907fefda0eee59a0338cc96a
 MISC metadata.xml 316 BLAKE2B 17947c657b45cb01758e222aa6051a459bf0bd9a026a73c0df0ae0c3a0c901f6e2315d459ee37036ecd283481a8d97791d64688c108a0706e745a739e3f9e8f8 SHA512 af18f4ae51b253552752e14210789988c815d0dbf0e1d8ff7057e48a09303c4abc1fb240d6f7f15fc0993b33e4c8ee395c2755754b3a2cbfd4c3a3f0dad41cfe
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-70.2.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-70.2.0.ebuild
new file mode 100644
index 000000000000..97aca4a61872
--- /dev/null
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-70.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pypi
+
+DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
+HOMEPAGE="https://pypi.org/project/setuptools/"
+SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
+S=${DISTDIR}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	!<dev-python/ensurepip-wheels-100
+"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${A}"
+}
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index f86d7e41f84e..66f469ee53c4 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,3 +1,5 @@
+AUX flatbuffers-24.3.25-numpy-2.patch 2623 BLAKE2B 8a5df9dc31b4b1e46a8fe4b5bdce363ddadf96bbe36561ad1f1d51d5b402948194c838e7a2fa8ef77a49a79f6809f2c0606292fe4bfb1f97fa6bad2250da240e SHA512 f02957a07928be1845b258a85e1983ca2799e1838c9b57957841f05c4de13da8b5c50cb7c5584c104e3a9b8dcc35fe4d36fb393e363b79b25c97d8a45ea16b4a
 DIST flatbuffers-24.3.25.gh.tar.gz 2297829 BLAKE2B f3a5a94119a1b1b63fba9126e1cdff7ab712996bfc0d65626a679405f62dfa722bc5de244ef775fba336224b60feff3aa27acf54bed027c4013590b4afbefe7c SHA512 e2a614f4fc526ce07bfe1e1bc79efd3c87acbdb93aee7b42994d4855abd2593f36b5ca1edb53c7dcd470d5fbe14a3e394bd75dcebb4458cc0aeb33d622a3c662
+EBUILD flatbuffers-24.3.25-r1.ebuild 974 BLAKE2B 9413946e58ceeb190060ab2fc0ef40037460d2a9a031778bd15398e9fcfde839d45ebdf341e06549a01c67f008406764917302930d067f1fe1e4b8235118139a SHA512 b8b1c1841acca6922b7bbdf90ceb5fef882f7efa95333079a3a45e9050c4ced6e812dd52921b7df9e16c1454511125b870bb7387ada28c286a0e1f3ac91448dd
 EBUILD flatbuffers-24.3.25.ebuild 831 BLAKE2B 826a9835270ba4b4a20a1aff553378b5dd49133fbc9df1c20693bbe1ef7023e1df94287931beb9e5f336a39d980848fea206436f60328074f7397df5f75be50d SHA512 f446d3c53c17e2a8f7f80bf8ba0255fee8f908bcc5822886cdd32666fa4095dc7bd735954e89371ed249490015420d284a8d920b50a834236d1d65f55a6a124c
 MISC metadata.xml 397 BLAKE2B 2407f1c42b05c20ddeaf0ddce303c24604be89323c35c68a0770b221f44c4fe9e0c6580e7d5f9e50d3e263f81b26935c250e45634279285ebf2c5d327220122b SHA512 635f3e14f3aa038bf8b2b7bf321e48fe4496048a11b337bab0589bab924135f8b1d216329d9326ba214e1db202ed390722345c69e3260327c2e103f5feb7fa31
diff --git a/dev-python/flatbuffers/files/flatbuffers-24.3.25-numpy-2.patch b/dev-python/flatbuffers/files/flatbuffers-24.3.25-numpy-2.patch
new file mode 100644
index 000000000000..cc5846404764
--- /dev/null
+++ b/dev-python/flatbuffers/files/flatbuffers-24.3.25-numpy-2.patch
@@ -0,0 +1,72 @@
+From d053fbd391610e72fff1f8ee02c1222305f15de9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@gentoo.org>
+Date: Mon, 1 Jul 2024 10:29:39 +0000
+Subject: [PATCH] Support for Numpy 2.0 in tests
+
+The newbyteorder has been removed in Numpy 2.0 [1]. Its usages are
+replaced with respect to migration guide.
+
+[1] https://numpy.org/devdocs/numpy_2_0_migration_guide.html#ndarray-and-scalar-methods
+
+Fixes: #8332
+
+Upstream-PR: https://github.com/google/flatbuffers/pull/8346
+
+diff --git a/tests/py_test.py b/tests/py_test.py
+index 7d6c0a37966..fc13a490f71 100644
+--- a/tests/py_test.py
++++ b/tests/py_test.py
+@@ -1095,7 +1095,7 @@ def test_create_numpy_vector_int8(self):
+ 
+       # Reverse endian:
+       b = flatbuffers.Builder(0)
+-      x_other_endian = x.byteswap().newbyteorder()
++      x_other_endian = x.byteswap().view(x.dtype.newbyteorder())
+       b.CreateNumpyVector(x_other_endian)
+       self.assertBuilderEquals(
+           b,
+@@ -1144,7 +1144,7 @@ def test_create_numpy_vector_uint16(self):
+ 
+       # Reverse endian:
+       b = flatbuffers.Builder(0)
+-      x_other_endian = x.byteswap().newbyteorder()
++      x_other_endian = x.byteswap().view(x.dtype.newbyteorder())
+       b.CreateNumpyVector(x_other_endian)
+       self.assertBuilderEquals(
+           b,
+@@ -1213,7 +1213,7 @@ def test_create_numpy_vector_int64(self):
+ 
+       # Reverse endian:
+       b = flatbuffers.Builder(0)
+-      x_other_endian = x.byteswap().newbyteorder()
++      x_other_endian = x.byteswap().view(x.dtype.newbyteorder())
+       b.CreateNumpyVector(x_other_endian)
+       self.assertBuilderEquals(
+           b,
+@@ -1287,7 +1287,7 @@ def test_create_numpy_vector_float32(self):
+ 
+       # Reverse endian:
+       b = flatbuffers.Builder(0)
+-      x_other_endian = x.byteswap().newbyteorder()
++      x_other_endian = x.byteswap().view(x.dtype.newbyteorder())
+       b.CreateNumpyVector(x_other_endian)
+       self.assertBuilderEquals(
+           b,
+@@ -1361,7 +1361,7 @@ def test_create_numpy_vector_float64(self):
+ 
+       # Reverse endian:
+       b = flatbuffers.Builder(0)
+-      x_other_endian = x.byteswap().newbyteorder()
++      x_other_endian = x.byteswap().view(x.dtype.newbyteorder())
+       b.CreateNumpyVector(x_other_endian)
+       self.assertBuilderEquals(
+           b,
+@@ -1427,7 +1427,7 @@ def test_create_numpy_vector_bool(self):
+ 
+       # Reverse endian:
+       b = flatbuffers.Builder(0)
+-      x_other_endian = x.byteswap().newbyteorder()
++      x_other_endian = x.byteswap().view(x.dtype.newbyteorder())
+       b.CreateNumpyVector(x_other_endian)
+       self.assertBuilderEquals(
+           b,
diff --git a/dev-python/flatbuffers/flatbuffers-24.3.25-r1.ebuild b/dev-python/flatbuffers/flatbuffers-24.3.25-r1.ebuild
new file mode 100644
index 000000000000..e82e5d455faa
--- /dev/null
+++ b/dev-python/flatbuffers/flatbuffers-24.3.25-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="
+	https://github.com/google/flatbuffers/
+	https://pypi.org/project/flatbuffers/
+"
+SRC_URI="
+	https://github.com/google/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	cd "${WORKDIR}/${P}" || die
+	eapply "${FILESDIR}/${PN}-24.3.25-numpy-2.patch"
+	cd "${S}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	cd "${WORKDIR}/${P}/tests" || die
+	# zeroes means without benchmarks
+	"${EPYTHON}" py_test.py 0 0 0 0 false || die
+	"${EPYTHON}" py_flexbuffers_test.py -v || die
+}
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 1964c9f09fcb..209d7f7f87df 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.classes-3.4.0.tar.gz 11780 BLAKE2B e16f76f58fae8b42864e5055e8fd97fff634223aa28499fcc8a204f52aec9f2cc66b5cdf53e08acac85bfdeff46b7bdeb8b5bcc9da10fee16f3a5bd84026cd1d SHA512 94e5163120117c51f129d43e85f92ee19efcf8b10683142679511f8b33f4a1fd6c51516b7551aeab9d68c1936791bafc47328b5560ee3fe28e553fe463ea968f
-EBUILD jaraco-classes-3.4.0.ebuild 630 BLAKE2B a8ae0f10e281e7edbb54054ce191f1e87d1f7346661301fed7cb822d0f12ba3a8e4ea8dd2fbcca7db3bb5219e623f43dd170d20ca8abb9e3ee879df516ed10cc SHA512 93ee87a640d16d6619c2d80d3c7bc5a03759d0a156f7c555282243841d1eee732c38b37fb6d0bf0430cbc9721a4afec86c54ec84c5be292d9e87a14d57f2a3ec
+EBUILD jaraco-classes-3.4.0.ebuild 636 BLAKE2B 0519d064f581ae39d6028fb3bc4d456ceded50f0a3b8d6c1831df73680c22b07ded2a768dcae563ecd013267903ba57fd8e941675312fcaadd1e4ca3b20424ed SHA512 9f23539400a7356e61178b1f78b1e27ea37c53a8e9a15f0bbbcf20998e210a7d0dc75a64b439c36fd9aab52ff2d7a42d3629edc0aa6a283fb802a90e0bc9880b
 MISC metadata.xml 472 BLAKE2B f2c9615836b0be2e1820d5ab8d33b16bea45f397c2f3bc10caa9c6910a489271eb399dc407da8a3fbabe9b81fc3ee3806a70eeac65ca627357c7b64429002cb5 SHA512 1f89c22910291e406b5e7ce9c008427ea9948086d190b10da18da020d8ac1c505b068d12fd24a26ee666b1c71ace5b619d511c05fead8855ce0d6c6088d800e9
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.4.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.4.0.ebuild
index 26c33873878d..06f374c35e21 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.4.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.4.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
index a0d8d0ce0bdb..d04be263119d 100644
--- a/dev-python/jaraco-context/Manifest
+++ b/dev-python/jaraco-context/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.context-5.1.0.tar.gz 11626 BLAKE2B c6ac691c6493e0aed5d606784f8418e55fb0c6c8094aa75251ffb12008fb9b4fbfe0912e6ef316d7799d2c0f55be6ba542202f6b8b2bc93afa3a79da4224d35f SHA512 b92c72947060e2219c172c43104055d026f66b119676fcfa31dff34640539d34376b61d209291fffeb558e6051fb92a2a34390fbd3a72f87ee15c5926cb387e5
 DIST jaraco.context-5.3.0.tar.gz 13345 BLAKE2B d2f429335ea80a6b50ea9574adc45c25c0fc78e8ebb5edde218bcbbe7a2b27ae6b5c17453e71904240d0d873ebef36f7c7aeda4424d3fea2dd9aaf01af6fb4c5 SHA512 f63bf272c45ff5c43499621651b78841259040ac98d67c9db75fadebb1c497c1156e05f23bf7c91df3e91f1e070acb9f7dc665e7b242ba7b1ac1cf99a619494d
-EBUILD jaraco-context-5.1.0.ebuild 1300 BLAKE2B a5d616abfd9f7395fbaa66295908f8a3927678a71ecef215042091dcee942640064af3805f16ab83fbd056883168ffed8acc4f9787795058bbc42b879c18d74b SHA512 a2d03fd8f0f5a58b585736bcfa31540298dd4f6086891c91d70ed2d38d3aba99585bbe5f37a5ef57b2e616a37557d6ca6e08eaf23bde7b9dc6f2df920a6a85f2
-EBUILD jaraco-context-5.3.0.ebuild 1393 BLAKE2B 62d8769577db4cb6813549417f18342e8a1ff316edac71e3268f326e6c84d88c1e1997fd1e060a6c83c89e618137152e59f635e37d86309d7eacb59321006435 SHA512 f684ccdddc6e1e9ceeb5f23ff06f8cf38205352580644d3077dc569314e703edb5661b025d267a6143df4ddf397b7b03554f5248570db3c480a08e23199eb226
+EBUILD jaraco-context-5.3.0.ebuild 1392 BLAKE2B 18ec52dcaed3f1e8e52d29e13e93004566743afa4433d183332c1374a8e2db1c7c12d86139e7c6c0bfe95276aabbdcb11abe79611738ec30d336088a0188e054 SHA512 c25826eb33a00a96c9732ac5da0973c538a38cebbd8f7c1e4687b57c670548f7931aa26291c8bed4ed3c6ac9b870b8e66e4998deb6fac3f76da8c7a75ee2a6b4
 MISC metadata.xml 403 BLAKE2B 32344da5308b2bd5eef6ac6efc6299869f4f82ab67b51a23666eef697a803bcc94993ed67f3047e82ba5500d1b0c49ec1f9b32112855c21aa4b3015c09fa0144 SHA512 13dec82eb1581116d8800e60c99c328aa1bb409fec83044fa5e02838008e4bf5d81bc1defeb59bc353ff4032600bdc9213559bdb745fd6571f53e9edd9dd6737
diff --git a/dev-python/jaraco-context/jaraco-context-5.1.0.ebuild b/dev-python/jaraco-context/jaraco-context-5.1.0.ebuild
deleted file mode 100644
index ca0ae619ca68..000000000000
--- a/dev-python/jaraco-context/jaraco-context-5.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Context managers by jaraco"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.context/
-	https://pypi.org/project/jaraco.context/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "jaraco.context"
-		version = "${PV}"
-		description = "Context managers by jaraco"
-	EOF
-}
-
-python_install() {
-	distutils-r1_python_install
-	# rename to workaround a bug in pkg_resources
-	# https://bugs.gentoo.org/834522
-	mv "${D}$(python_get_sitedir)"/jaraco{_,.}context-${PV}.dist-info || die
-}
diff --git a/dev-python/jaraco-context/jaraco-context-5.3.0.ebuild b/dev-python/jaraco-context/jaraco-context-5.3.0.ebuild
index 4c2720a9a726..6a2d88cc996b 100644
--- a/dev-python/jaraco-context/jaraco-context-5.3.0.ebuild
+++ b/dev-python/jaraco-context/jaraco-context-5.3.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index b3c2114ddad1..2b55d8c8bb2e 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.itertools-6.4.1.tar.gz 18202 BLAKE2B f384e7bdbe6068ed85a19e12aeae2ac0ca4bea52a4c3f4840a7ce258440c0a73c0f9f6928be59a1db2f2bef887710a95c423cbf1854bd0e58f068bd4fd833d08 SHA512 57c3ce37d1fb39c7140fc0581bbeacd75479ae1c375af4041144d41bf184299898069418e046f21872c290708ccb44728d1111cb3cfffac4a1d703f1cb86a70a
-EBUILD jaraco-itertools-6.4.1.ebuild 746 BLAKE2B e7c32ffffbbeeb875f2802840743324af1b05498267bcfcd5f715b447b5016847b398ffd6bca976bc334d7900bedf98fc0b38be7c4c3de242adc649c17444c1d SHA512 6b386c4a44692153ae9ee20a713af06d98d8cc0e80c9996b23cc31423e5de9be80dc154cbf794ceb2c490f56bbad94c9e76717c7fe248ddf6d2a074534de7295
+EBUILD jaraco-itertools-6.4.1.ebuild 752 BLAKE2B f89ddc3a61b817460602598c34877253e4f254327f397e6ac64343d74953134af6e07dc908f397719499c2104ba03af12196a986ca900c235168e60c4744d12e SHA512 04bf11aa2e91b430cdb2f7ae0d6061fba7aac64a3f15dd59121a3a9c34e2ff0c09dfe21ed189a370a41430c2e39457d7acce06088bfcc6e801474988bd13b2ad
 MISC metadata.xml 478 BLAKE2B b020626bddcaa0eae2fa3524ce7e785c5357c8bbfbfd9e3ac84cd0593381c252759ac1ecceda3f0215107491233b1478084ef119f32d6d2e135adafdd25b26d6 SHA512 7cb2ed20706c82d6ea53d85ba03c99f6dc97618de70ac271017f747f8756fd701bf399dbb55542286db30a0d2dd27425b0e7ed917da31d81c0ed417e7ab1b5f0
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-6.4.1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-6.4.1.ebuild
index ccd25a82b476..9c9df5728272 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-6.4.1.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-6.4.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/inflect[${PYTHON_USEDEP}]
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index d4c2fbc6121b..2a529e8b9aa5 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,13 +1,4 @@
-AUX lxml-5.1.0-pypy.patch 6885 BLAKE2B 132f2b9037c662f41fd55a0846ac211a6a54a7ac0d976aee815f4dfc787636da2c479f1cd7b2152ad3bbd47fd12e1c0307188f94f8a0c86789d7a84910e46c58 SHA512 4a10ac07626cc69c64ca87ac6c63b03fb1d05631bd7433fac6eca5c46ed896be5d8bc0598d833d6a117adf88d537d8b7b07adbff0457e168def4d6139f11ac9f
 AUX lxml-5.1.1-pypy.patch 6414 BLAKE2B 367cb47fe9466a1f0035fc26884cc55109b2dd69291993f7f2711a943023e5d2b3436f26c879126b4df1b50f0829845fb312eaae6f3bc40cb083a62c6504dc54 SHA512 b95790c42023a296f2eee06b93b381d74e2b7742eb833c22a8a98888cbbadd84032295bdc880c7df98e7ca7aeb8b66c6114e902cdeba0910a91dd8a46269e470
-DIST lxml-5.1.0.gh.tar.gz 962111 BLAKE2B 31c82eb198911d82fd9f7882bf94547b2367f3b3d1183eb8e8f97297b96faa69230d27b3367160b1f732a5d0878296b2d11787c3b220416c81a920e62ebec4f2 SHA512 1fadfeac1fb8b1e4fb1f7f2acb056865eb2567300a6c728eaede380d846ac75a6e33ebebcbbc6d60f54102152afd5dddf970058c4e27af396e9fa58e83c407a7
-DIST lxml-5.1.1.gh.tar.gz 963649 BLAKE2B 0cb7b4e39539ee962cd590b2b2dc644a111a094da9cbccc2ee0c29b9a758d8aca967f989693c76532252909dc44a96a3815273f04f28be2dbeb57d4daae2e6fd SHA512 bb479ca7dcce944a9a3597f67da1b12fb9f3a05592fb8342fe01bc569a86df95c32c7bf1bc0b9cfc0ddffb85adf12612fb2d8622a460357c1aaa56e033476375
-DIST lxml-5.2.0.gh.tar.gz 949400 BLAKE2B 4a1640e1da27504e6a9b5e1c55fa2d51eb2e27f6400b63dae29aa42c6c9bf9a002374d0c4ec3ccd13452efd4f39f0a28dc5989fe7f1da5c80e17b2fb31a0dcae SHA512 5d4faab6430666427a7540b768a81beb5c628e7801a06156a68a03a5f75e424e61b1dfd792b8909e03e8561ffb0be64f62c86a411c110c01a021f4cbf37593f2
-DIST lxml-5.2.1.gh.tar.gz 950408 BLAKE2B d0ad369f9d555a9bcdd92c71fb84063eba864c359d1ff27159c8f6de433bcce6915c9cff31aa7bd99de9aa54cb9a1d7ea7b3bb2526c755f8a38aaa21d9d30dfd SHA512 bd5ab005d617da588f87fa643245916e6963394b167f66991dce6443490692fcbf27620c2208b271bd8a1a97c79b09eedca2d1c6f02ba990a7d88d00ee43edfe
 DIST lxml-5.2.2.gh.tar.gz 950650 BLAKE2B d9e3bd96f386a808eca58ffa9a6b5a79e43102b7161fac9b97905de2bd22d21feaddb093e27463f597ef5378d754011c2999a38953e6288595b8dd171976688b SHA512 20b87a2d6e7ac82b6979d6fd18ecd5c224fec6eeee6b69d47a5bf2947ce53e6a517d1b86ab68836a5974f78ce86551ddc2317c1a7255932b418b98dc64d59376
-EBUILD lxml-5.1.0.ebuild 2902 BLAKE2B 10c758230f1c4fdb3084295749f3d2a0752983b142a56cd6d9362be2dd8d99c7d9bdc72ce74b02b1c5df5fc505ce5df65d87a9297367dfa5f72af83573563962 SHA512 d278b800a03de26b91873dedb0d7c8643f2cfb3e3e691b50e318a8d5575f11359239323fab141fce64a5b04c3d4db9dab3803e62fe85cfb3647023fb692bbd52
-EBUILD lxml-5.1.1.ebuild 2911 BLAKE2B 5230bac2e92edffac28f7bc421e9e7376336621d03a1fc9423e0548e9c3b46fca73915c57183d491de3dfb37b9bfb7d9535c37917962f77ee1b0e96102edd864 SHA512 676c3ca88b2421dc4578aa8f9a7023eb95fa2dba35764af14672ca654ac474956e07b174662691f22ef60a120349d779bdb1aff7b4dae83ea56abc60bc8f4496
-EBUILD lxml-5.2.0.ebuild 3274 BLAKE2B de297284a590885fd96e79308c6999dd9a8abfc35f7a3c6eaeb947134ad7b80a7fbebde96e95c9f5d9771d0f7c3775014db0c178d897b0436023ae3a433f0f3b SHA512 c2217d56a20c3549f90d41cb7265916672b64f98e6ff9999b21c1b1652518bb85836755597a1edd3721d2e24d50f852ed91af5a790dddad1782c7aa5280ab2b9
-EBUILD lxml-5.2.1.ebuild 3267 BLAKE2B a3493eac99db16830146604d2d22b11102a2208faff543fa18bb35fa11769d6cdc7106b27054b785d39cf0bf9bb3bf16f0b8aaf9b8cdfd24e3765f4311a4d806 SHA512 61e7e63eebb4da7a7fdf3b58d6c713fa8ae6c3200b20cb8dc7bca8f1da6939278ed043088f9759dcb75ce6fa54e3b5785ccfb80db0541aa5c24682f9145dc400
-EBUILD lxml-5.2.2.ebuild 2982 BLAKE2B 7d90f81346dc83aad6bc03132f97817ba6fd7fd93cab6ebf64315644026df8ccd959412b2736bff78ed5deff230d662e409a0fb2ea28d4611c39b047f5bab287 SHA512 262b7fa294c24c08de297618df0707455cb235628d977640b7fa3edd989ca2d6b991b758020f4c60baa559becedb6ca60c96fac3d7f02c4304a16b21c0a8600d
+EBUILD lxml-5.2.2.ebuild 2981 BLAKE2B cb9d6df4ddc6afb9e3183fb467747be9ee41acf5f38b74064716d99f16ffcc63c57b3d6dd5f7ec631595308c5b6c33119d3ae4692e558fc4af7ae9793d39ddff SHA512 ed0c89b7951e0c4a12b8faef2b6da5778ef84de45b3aeea65790ebc24f34b7a52819883c45b2571ca92b89b521a79bac584ed09f7031414d40dc2e2a2621a18a
 MISC metadata.xml 463 BLAKE2B 9bcd092b61568f5d467230617b101f36245c41078e6a66c7ff63b22a6b4095de2ba3a59e48ce8b7842ce58d1255fa293995652daa3fab4c3af988498eaa30e97 SHA512 2ba5e340b59e0de4e472380e9c19b1f6f573e86e5c3c2e075f6151d369e94eea70e3ce36bfb5ece4da3fa69459e3ff83368f1df8302aa5754ae52f13c8f2312e
diff --git a/dev-python/lxml/files/lxml-5.1.0-pypy.patch b/dev-python/lxml/files/lxml-5.1.0-pypy.patch
deleted file mode 100644
index 7b50b9d3062c..000000000000
--- a/dev-python/lxml/files/lxml-5.1.0-pypy.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff --git a/src/lxml/tests/test_errors.py b/src/lxml/tests/test_errors.py
-index fa735c28..9337bc04 100644
---- a/src/lxml/tests/test_errors.py
-+++ b/src/lxml/tests/test_errors.py
-@@ -10,3 +10,3 @@ from lxml import etree
- 
--from .common_imports import HelperTestCase
-+from .common_imports import HelperTestCase, IS_PYPY
- 
-@@ -24,2 +24,3 @@ class ErrorTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_element_cyclic_gc_none(self):
-diff --git a/src/lxml/tests/test_http_io.py b/src/lxml/tests/test_http_io.py
-index 8385e393..0b259299 100644
---- a/src/lxml/tests/test_http_io.py
-+++ b/src/lxml/tests/test_http_io.py
-@@ -10,3 +10,3 @@ import gzip
- 
--from .common_imports import etree, HelperTestCase, BytesIO, _bytes
-+from .common_imports import etree, HelperTestCase, BytesIO, _bytes, IS_PYPY
- from .dummy_http_server import webserver, HTTPRequestCollector
-@@ -14,2 +14,3 @@ from .dummy_http_server import webserver, HTTPRequestCollector
- 
-+@unittest.skipIf(IS_PYPY, "broken on pypy")
- class HttpIOTestCase(HelperTestCase):
-diff --git a/src/lxml/tests/test_nsclasses.py b/src/lxml/tests/test_nsclasses.py
-index 750dc1ed..adbec11c 100644
---- a/src/lxml/tests/test_nsclasses.py
-+++ b/src/lxml/tests/test_nsclasses.py
-@@ -8,3 +8,3 @@ import unittest
- 
--from .common_imports import etree, HelperTestCase, _bytes, make_doctest
-+from .common_imports import etree, HelperTestCase, _bytes, make_doctest, IS_PYPY
- 
-@@ -45,2 +45,3 @@ class ETreeNamespaceClassesTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_ns_classes(self):
-diff --git a/src/lxml/tests/test_objectify.py b/src/lxml/tests/test_objectify.py
-index 1c8ff47c..326c5316 100644
---- a/src/lxml/tests/test_objectify.py
-+++ b/src/lxml/tests/test_objectify.py
-@@ -10,3 +10,4 @@ import unittest
- from .common_imports import (
--    etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO
-+    etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO,
-+    IS_PYPY
- )
-@@ -383,2 +384,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_setattr(self):
-@@ -818,2 +820,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_build_tree(self):
-@@ -847,2 +850,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_bool(self):
-@@ -884,2 +888,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str(self):
-@@ -891,2 +896,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_intliteral(self):
-@@ -898,2 +904,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_floatliteral(self):
-@@ -905,2 +912,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_mul(self):
-@@ -917,2 +925,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_add(self):
-@@ -992,2 +1001,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_ustr(self):
-@@ -999,2 +1009,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_ustr_intliteral(self):
-@@ -1006,2 +1017,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_ustr_floatliteral(self):
-@@ -1013,2 +1025,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_ustr_mul(self):
-@@ -1025,2 +1038,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_ustr_add(self):
-@@ -1050,2 +1064,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_int(self):
-@@ -1066,2 +1081,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_float(self):
-@@ -1082,2 +1098,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_float_precision(self):
-@@ -1101,2 +1118,3 @@ class ObjectifyTestCase(HelperTestCase):
-   
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_float_precision_consistency(self):
-@@ -1187,2 +1205,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_unregistered(self):
-@@ -1349,2 +1368,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_cmp(self):
-@@ -1376,2 +1396,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_int_cmp(self):
-@@ -1398,2 +1419,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_bool_cmp(self):
-@@ -2067,2 +2089,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_registered_type_stringify(self):
-@@ -2537,2 +2560,3 @@ class ObjectifyTestCase(HelperTestCase):
-     # type-looked-up as ObjectifiedElement (no annotations)
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_int(self):
-@@ -2542,2 +2566,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_float(self):
-@@ -2547,2 +2572,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_str(self):
-@@ -2552,2 +2578,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_unicode(self):
-@@ -2557,2 +2584,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_bool(self):
-@@ -2562,2 +2590,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_none(self):
-@@ -2567,2 +2596,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_value_concatenation(self):
-@@ -2577,2 +2607,3 @@ class ObjectifyTestCase(HelperTestCase):
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_nested(self):
-@@ -2745,3 +2776,4 @@ def test_suite():
-     suite.addTests(doctest.DocTestSuite(objectify))
--    suite.addTests([make_doctest('../../../doc/objectify.txt')])
-+    if not IS_PYPY:
-+        suite.addTests([make_doctest('../../../doc/objectify.txt')])
-     return suite
diff --git a/dev-python/lxml/lxml-5.1.0.ebuild b/dev-python/lxml/lxml-5.1.0.ebuild
deleted file mode 100644
index 09f1667e8875..000000000000
--- a/dev-python/lxml/lxml-5.1.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="
-	https://lxml.de/
-	https://pypi.org/project/lxml/
-	https://github.com/lxml/lxml/
-"
-SRC_URI="
-	https://github.com/lxml/lxml/archive/${P}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-DEPEND="
-	>=dev-libs/libxml2-2.10.3
-	>=dev-libs/libxslt-1.1.38
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	>=dev-python/cython-3.0.7[${PYTHON_USEDEP}]
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/docutils[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		dev-python/cssselect[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-pypy.patch"
-)
-
-python_check_deps() {
-	use doc || return 0
-	python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local DISTUTILS_ARGS=(
-		# by default it adds -w to CFLAGS
-		--warnings
-	)
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	cp -al "${BUILD_DIR}"/{install,test} || die
-	cp -al src/lxml/tests "${dir}/" || die
-	cp -al src/lxml/html/tests "${dir}/html/" || die
-	ln -rs "${S}"/doc "${dir}"/../../ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-5.1.1.ebuild b/dev-python/lxml/lxml-5.1.1.ebuild
deleted file mode 100644
index adc0126c2821..000000000000
--- a/dev-python/lxml/lxml-5.1.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="
-	https://lxml.de/
-	https://pypi.org/project/lxml/
-	https://github.com/lxml/lxml/
-"
-SRC_URI="
-	https://github.com/lxml/lxml/archive/${P}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-DEPEND="
-	>=dev-libs/libxml2-2.10.3
-	>=dev-libs/libxslt-1.1.38
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	>=dev-python/cython-3.0.9[${PYTHON_USEDEP}]
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/docutils[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		dev-python/cssselect[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.1-pypy.patch"
-)
-
-python_check_deps() {
-	use doc || return 0
-	python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local DISTUTILS_ARGS=(
-		# by default it adds -w to CFLAGS
-		--warnings
-	)
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	cp -al "${BUILD_DIR}"/{install,test} || die
-	cp -al src/lxml/tests "${dir}/" || die
-	cp -al src/lxml/html/tests "${dir}/html/" || die
-	ln -rs "${S}"/doc "${dir}"/../../ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-5.2.0.ebuild b/dev-python/lxml/lxml-5.2.0.ebuild
deleted file mode 100644
index 9153f366839c..000000000000
--- a/dev-python/lxml/lxml-5.2.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="
-	https://lxml.de/
-	https://pypi.org/project/lxml/
-	https://github.com/lxml/lxml/
-"
-SRC_URI="
-	https://github.com/lxml/lxml/archive/${P}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-DEPEND="
-	>=dev-libs/libxml2-2.10.3
-	>=dev-libs/libxslt-1.1.38
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	>=dev-python/cython-3.0.10[${PYTHON_USEDEP}]
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/docutils[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		dev-python/cssselect[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.1-pypy.patch"
-)
-
-python_check_deps() {
-	use doc || return 0
-	python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	# don't depend on sys-apps/which
-	sed -i -e 's:which:command -v:' Makefile || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local DISTUTILS_ARGS=(
-		# by default it adds -w to CFLAGS
-		--warnings
-	)
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	cp -al "${BUILD_DIR}"/{install,test} || die
-	cp -al src/lxml/tests "${dir}/" || die
-	cp -al src/lxml/html/tests "${dir}/html/" || die
-	ln -rs "${S}"/doc "${dir}"/../../ || die
-
-	# test_feedparser_data requires lxml_html_clean
-	# this is the *simplest* way of skipping these without breaking
-	# random other tests, sigh
-	sed -e '/lxml\.html\.clean/d' \
-		-i "${dir}"/html/tests/test_feedparser_data.py || die
-	rm -r "${dir}"/html/tests/*-data/*.data || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p ||
-		die "Tests fail on ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-5.2.1.ebuild b/dev-python/lxml/lxml-5.2.1.ebuild
deleted file mode 100644
index 48345b052c05..000000000000
--- a/dev-python/lxml/lxml-5.2.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="
-	https://lxml.de/
-	https://pypi.org/project/lxml/
-	https://github.com/lxml/lxml/
-"
-SRC_URI="
-	https://github.com/lxml/lxml/archive/${P}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-DEPEND="
-	>=dev-libs/libxml2-2.10.3
-	>=dev-libs/libxslt-1.1.38
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	>=dev-python/cython-3.0.10[${PYTHON_USEDEP}]
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/docutils[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		dev-python/cssselect[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.1-pypy.patch"
-)
-
-python_check_deps() {
-	use doc || return 0
-	python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local DISTUTILS_ARGS=(
-		# by default it adds -w to CFLAGS
-		--warnings
-	)
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	cp -al "${BUILD_DIR}"/{install,test} || die
-	cp -al src/lxml/tests "${dir}/" || die
-	cp -al src/lxml/html/tests "${dir}/html/" || die
-	ln -rs "${S}"/doc "${dir}"/../../ || die
-
-	# test_feedparser_data requires lxml_html_clean
-	# this is the *simplest* way of skipping these without breaking
-	# random other tests, sigh
-	sed -e '/lxml\.html\.clean/d' \
-		-i "${dir}"/html/tests/test_feedparser_data.py || die
-	rm -r "${dir}"/html/tests/*-data/*.data || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p ||
-		die "Tests fail on ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-	optfeature "Support for lxml.html.clean sanitizer" dev-python/lxml-html-clean
-}
diff --git a/dev-python/lxml/lxml-5.2.2.ebuild b/dev-python/lxml/lxml-5.2.2.ebuild
index b11b87bb66b6..ffb3da192041 100644
--- a/dev-python/lxml/lxml-5.2.2.ebuild
+++ b/dev-python/lxml/lxml-5.2.2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/re-assert/Manifest b/dev-python/re-assert/Manifest
index 2dcd3a457351..3002461142c6 100644
--- a/dev-python/re-assert/Manifest
+++ b/dev-python/re-assert/Manifest
@@ -1,4 +1,4 @@
 AUX re-assert-1.1.0-re-fallback.patch 1071 BLAKE2B 8a929f1a240e247d364c6e19fbd2b7e86344d48ad2ba2e51a39850654f3996c32e0f85f8270e6d2f0b112bced5804157fc25c3735ca52db714cf9c80a880d00d SHA512 744c74dfe8232d01fe5b80b1436cbe66ee20b065dbbc1ffc154098855a7e4e5fb9307b66f8b4f427af2b38a6a7e6c2a02295cb5e177e070b0776da841d5a04ce
 DIST re-assert-1.1.0.gh.tar.gz 5010 BLAKE2B fc65f43b3525d02d877d51f0a1556b6b205dd1126fc205b775f5c0b6c34ee7c3e8d224fc3f46a80e8df4a366674be90221e891e19e12072c87ff82451ca8676c SHA512 fc14267cc68a12ff7350982f0bf54c77107809c9f0379ab3aa73fa1b7cf5ccabb130fcd35ab75bdf183e69c802a041deac707e1f0bab1c3815d4146b4e320c07
-EBUILD re-assert-1.1.0-r3.ebuild 1483 BLAKE2B 34a23a426bd51d40e61046c2976063f419a51d745f4599cde8c658c53a0f8a0e887db2ff98c4f546076ad05996237441937d790a776762ab848b88899ba74148 SHA512 6aab033a629aead8633ecaf5dbc5acb4176f27f223504434ce2bf0f290ce62da741913ab654ef6454709c414ee9ee9dbe0dc0529a389772c33493d11eedb0e8e
+EBUILD re-assert-1.1.0-r3.ebuild 1489 BLAKE2B f36a6f596ffbc6c254af90340418c04ce504f09f8c7358952d92e9b301b2f9aab010854e3ea597c3c38e2c7af37ff6265b19dce608226e4e4996824b9de523b6 SHA512 530f3db4547edd3772e997272e56be51171d47079147618d7ed0d5916ff25ad700eb6c54363e2144acc753256628988b0ad91e1ba32b73b277ab5a07dc54fa46
 MISC metadata.xml 395 BLAKE2B dba34f6404c171596f781768e266b2e3ae21b2572db8695c6d17ffac5cfd91ea63ade4dac01b4961a5b691090ad6940d11cc82b629e6abc71e7b393c70e1f572 SHA512 f6c637f1fd777a2382954939e57c07aba53287f9a148ff19c6444ef249d87ac0e1d003b8ec2c2bbf396f756169dac2205bf597f16f5334a4f94e0032a08fe299
diff --git a/dev-python/re-assert/re-assert-1.1.0-r3.ebuild b/dev-python/re-assert/re-assert-1.1.0-r3.ebuild
index e363a25c8816..7227db089f23 100644
--- a/dev-python/re-assert/re-assert-1.1.0-r3.ebuild
+++ b/dev-python/re-assert/re-assert-1.1.0-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 611c89fae619..d6e640c86268 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -4,8 +4,10 @@ DIST setuptools-69.0.3.tar.gz 2219609 BLAKE2B 1a5e7896c7ea82d51b0aa4794435b9899c
 DIST setuptools-69.5.1.tar.gz 2291314 BLAKE2B 3756dd587136c7e688bdfecf4c0434c0e799f50f9a9a95750d41cb75e26b613b3dc178f43a9e0d21f17c42a7c4ad7461e7986966aefb814e3d0ff05178c82542 SHA512 81f4a5184976a0d4aa070261bb56458c54ec6a479786fa469e98cb336e9a1691b281ae771abe41bc5398fac15b2dd039c07cf014ee00572f46908ce6830fcb6a
 DIST setuptools-70.0.0.tar.gz 2265182 BLAKE2B 436189fbd614473c42a08da75837c5bb2f6fb6bc03bfc9b99db22810fa043fb071c2344659125439d507d10354d42ea5b703e91c0572caad90f5d805eca9ee8d SHA512 13a5ac09401165dc36d2a365c0ea236c01153374c002b062c4b403a537157ce86593848e93e3c26f5c81f5783e43e6aa96d813f9a39a55732ea3911ddc5c337a
 DIST setuptools-70.1.1.tar.gz 2292324 BLAKE2B 9d489117a80ef9cefab6b730680a614d990f338aa54579928bafbe3c87dbb5e4db8527b8a0b6c1090bcd3504be97cc69a9ce979e593d0634d9b66b66bccb25e5 SHA512 63452aa1e1d1dea6ad622a21fcc9334bc3603e45de9a1485f79776e02a0fb3b0a0a8b3e886af73845c3c373348c7021f2e06a5665676e9015ee9855441512136
+DIST setuptools-70.2.0.tar.gz 2332711 BLAKE2B d552e3c7fb8bad3829b6c210827af2a3993afa7c534502d08cb7f87df846f9939b75ce181217c673be7a0c71e81ede437b5f44cf9a42ff13133a9f922e426c1d SHA512 a2b0aaf57d012326475ee7637e65ebbc3b1a09b338850e8b0c6a0f169c49651f934c813d6d347ba1ff04894a4d8341bb5fedbea35d45dbc19f317587bbb35094
 EBUILD setuptools-69.0.3-r1.ebuild 3979 BLAKE2B 58d78a82ac5a3fb98a2844dc3b95cb7880c1b9acfa56f9125ce5aeb5ab334a21596a3a7b43ad4e776fb58ab7f91ac706a82dce176b6c971ebb7200374e69a8e6 SHA512 883c1919f2ba8ae92f1f2c78d99fdc786824765ffe6eac3e09f5c4105c22e2b1299a457f729c629d1bb5a9303b25499f9eccd177707b5a88fbe56ccb6ffe1d6e
 EBUILD setuptools-69.5.1-r1.ebuild 4636 BLAKE2B 9aebfc1c5861b64058a9f5ef14ad0cef531c39f6d85e90c25cfc4553fd3d60a29842cd3b26e33cd1c3dcef4d6b3cfa8873ae423beb01a0448fc7b1450081142d SHA512 f80f437a0501918010ea99fd130860ecd82de2c95b49a7a7db83c07eba82e2a36c0b3808fddfcaf16b659f435e8db394caf8663a3a7bc14c16d43ce03f6466f1
 EBUILD setuptools-70.0.0.ebuild 4649 BLAKE2B 17e47a7fb15219ed058b259330db282c8ee803805f8c6f447060676384aae4311cbd8a537ae89caefa5725c6d1c88bcee51864fab82c068ab6df21cc26df3e16 SHA512 11dcfed4ea59444c2fc32b3e99bea725da481a84cf4bead50749acc0c2531b9ae7a402b20b8f900f4e28708f7643e4c74fb72c73e0f310f17f5826f898b0ab06
 EBUILD setuptools-70.1.1.ebuild 4892 BLAKE2B be2911d8b357ed15ac8d66c6a57ada1037581bdecdcc4222357b725076a435757627ac2e4b7e0e06023726d4c864fae50c191b32a1aeeb4670500bd8e5905109 SHA512 f9db6803121eebcd71a8833d1e34c89df4a83a504f3d493443162c23c11057269fc06ab81e64ff0346546137a636b738087d9215495208d2988e3e1bff0d44c8
+EBUILD setuptools-70.2.0.ebuild 4959 BLAKE2B 1ca70f7b0fa744ad8f04ef2dc26744d6300cbadb0c03f7e644943323c742f141f0f423dc6ef4592ce9a8b5a798ecab6b7d26039233cfcbc03739059fdf76af93 SHA512 193b412ff570bce5440a7d0ea824d27ac4895eec20058fc5bacbba0ae49258f4ee3486bf3d5f450ba68708db9213c2c52f02c6c79ad1bf344617fa207ebd843c
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-70.2.0.ebuild b/dev-python/setuptools/setuptools-70.2.0.ebuild
new file mode 100644
index 000000000000..be44dd4c247d
--- /dev/null
+++ b/dev-python/setuptools/setuptools-70.2.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+# please bump dev-python/ensurepip-setuptools along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# check */_vendor/vendored.txt
+RDEPEND="
+	!!<dev-python/setuptools-rust-1.8.0
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-24[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.14[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/pyproject-hooks[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			>=dev-python/pytest-home-0.5[${PYTHON_USEDEP}]
+			dev-python/pytest-subprocess[${PYTHON_USEDEP}]
+			dev-python/pytest-timeout[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/tomli[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+		$(python_gen_cond_dep '
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+		' 3.10)
+	)
+"
+# setuptools-scm is here because installing plugins apparently breaks stuff at
+# runtime, so let's pull it early. See bug #663324.
+PDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
+	)
+
+	distutils-r1_src_prepare
+
+	# breaks tests
+	sed -i -e '/--import-mode/d' pytest.ini || die
+
+	# remove bundled dependencies
+	rm -r */_vendor setuptools/_distutils/_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-e 's:from [.]_vendor[.]:from :' \
+		-i {} + || die
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_build_meta.py::test_legacy_editable_install
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_editable_install.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		# fails if python-xlib is installed
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		# TODO, probably some random package
+		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
+		# Internet, sigh
+		setuptools/tests/test_integration.py
+		# flaky
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_transitive_extra_dependency
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_distutils_command_dep
+	)
+
+	case ${EPYTHON} in
+		python3.12)
+			EPYTEST_DESELECT+=(
+				# TODO
+				setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_distutils_command_dep
+				setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_transitive_extra_dependency
+			)
+	esac
+
+	local EPYTEST_XDIST=1
+	epytest -o tmp_path_retention_policy=all setuptools
+}
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index aaece635628f..599a59ee50dd 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,3 +1,4 @@
+AUX testtools-2.7.2-twisted-fix.patch 1683 BLAKE2B 67ad6c4c7ac816c45b35f5c49f754228ef80bc699770f0c115383d0a50e8bc0c875e1a1fdedc1a8df5adc8410ed8c29f34553a6f876d0912dcab155d325021c7 SHA512 90910f65bb1987f8e6bee3920630ad22d34e5988153d01aca5eae4bf0d670691ff35788087278deb2df40d0a5d4787eac30847a4e14e54965eedcee9853cc11a
 DIST testtools-2.7.2.tar.gz 201430 BLAKE2B d827d8e66c85908f4d16aa0762c3b0a454d374a0d23323fc3c123027f55f0e85f4fea9a24b5d1d0279266af2185f08abbcbbdcb785014b237df45a6448587611 SHA512 5815519d2b72d6b1e9f453c02793c70eb7d3b6580a211fb3708cd6121aed3c6100ceb1e35321f481a63b1f999ede030e43f1ae91d3621faf461c1908db767551
-EBUILD testtools-2.7.2.ebuild 1211 BLAKE2B 9b3c8ce1d15a895a3fde0073fd482da7a05db64e799fdfefebbe3b8514adabde3371fa2c4d8075879861634962e2845b7e5cb9d3a0766791c9f133ed64c9af3a SHA512 27a24ee1a379d7ec13324e31011a3b2e08d174388cca2f2f98ef5e5ae60fb1bfe9289a270817ddf152a777dc4db8806373b1456a37fa35d9fd319bf0ef0999cb
+EBUILD testtools-2.7.2.ebuild 1226 BLAKE2B d6003520a7d69e54fdee9971a8aefb5d9ccd6dd2fff28fb87c5736d3d9baad0a0f7c674ba164eef7436081043d0edbc460733b34742c30c092f24f63c0ffef84 SHA512 f147884e9035f261cc67eb6f7a55d53c485c52ca1e582b3d77f66fa2785b2b7f7b66a439ab363338f040dacae1fb5ac6f64f5ea6b35ff67f4fff32aa840b09d1
 MISC metadata.xml 580 BLAKE2B 5068f4abc80612e7a92fb65865612d93cc4d4803a9cda3555cee34eab48da20f6fb22734b09adeaa068cff135d592b5fbd607157a60052a68e127750f6082b24 SHA512 5807608ef5c6d3fa1a86c715c59afb7c4f3913f69739a0c4ea9b6cf85976077280da6ce019ec4fda6dd6bd490379ee0570d5c98f9d719c0cdaf60a550e01e555
diff --git a/dev-python/testtools/files/testtools-2.7.2-twisted-fix.patch b/dev-python/testtools/files/testtools-2.7.2-twisted-fix.patch
new file mode 100644
index 000000000000..bbf943be60d1
--- /dev/null
+++ b/dev-python/testtools/files/testtools-2.7.2-twisted-fix.patch
@@ -0,0 +1,45 @@
+From 5b8cb6497c7159f593e68de6a13e15f7e78e56e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Mon, 1 Jul 2024 10:00:05 +0200
+Subject: [PATCH] Prepare tests for upcoming twisted version
+
+Twisted recently changed behavior of logger on failures [1]. It newly
+logs the `Main loop terminated.` even on exceptions, which breaks two
+test in twistedsupport test suite. This hack attempts to address the
+upcoming issue.
+
+[1] https://github.com/twisted/twisted/pull/12207
+
+Upstream-PR: https://github.com/testing-cabal/testtools/pull/387
+
+diff --git a/testtools/tests/twistedsupport/test_runtest.py b/testtools/tests/twistedsupport/test_runtest.py
+index 4b46cc64..f8faf7c6 100644
+--- a/testtools/tests/twistedsupport/test_runtest.py
++++ b/testtools/tests/twistedsupport/test_runtest.py
+@@ -16,7 +16,6 @@
+     Contains,
+     ContainsAll,
+     ContainsDict,
+-    EndsWith,
+     Equals,
+     Is,
+     KeysEqual,
+@@ -749,7 +748,7 @@ def test_something(self):
+                     test,
+                     {
+                         "traceback": Not(Is(None)),
+-                        "twisted-log": AsText(EndsWith(" foo\n")),
++                        "twisted-log": AsText(Contains(" foo\n")),
+                     },
+                 ),
+                 ("stopTest", test),
+@@ -790,7 +789,8 @@ def test_something(self):
+         result = self.make_result()
+         runner.run(result)
+         self.assertThat(
+-            messages, MatchesListwise([ContainsDict({"message": Equals(("foo",))})])
++            messages[0:1],
++            MatchesListwise([ContainsDict({"message": Equals(("foo",))})]),
+         )
+ 
+     def test_restore_observers(self):
diff --git a/dev-python/testtools/testtools-2.7.2.ebuild b/dev-python/testtools/testtools-2.7.2.ebuild
index f9c9a6886024..d26da3f05732 100644
--- a/dev-python/testtools/testtools-2.7.2.ebuild
+++ b/dev-python/testtools/testtools-2.7.2.ebuild
@@ -27,12 +27,14 @@ BDEPEND="
 		>=dev-python/fixtures-2.0.0[${PYTHON_USEDEP}]
 		dev-python/testscenarios[${PYTHON_USEDEP}]
 		dev-python/testresources[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/twisted[${PYTHON_USEDEP}]
-		' 3.{10..12})
+		dev-python/twisted[${PYTHON_USEDEP}]
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.7.2-twisted-fix.patch"
+)
+
 distutils_enable_sphinx doc
 
 python_test() {
diff --git a/dev-python/tornado/Manifest b/dev-python/tornado/Manifest
index e5d07d5bc3e5..8aefa235917d 100644
--- a/dev-python/tornado/Manifest
+++ b/dev-python/tornado/Manifest
@@ -1,8 +1,5 @@
 AUX tornado-6.3.2-ignore-deprecationwarning.patch 656 BLAKE2B a64b3b5f021f4e1939c69f20fe93ef61eb64666b083773c1fa189af03d0964b8832a97d49ce18924f9e1202f26bb85b76d182f2baaa8265d0e1a2decbd12efef SHA512 5cd0258db519ec2a02a9988160a345c94ffb2abae92a78fb8e9d3eb6017bac8ecb86f4ef0e3eedb5ea561344213850e2b342a1f6517c909a3c6a0224606f2afd
 AUX tornado-6.3.2-test-timeout-increase.patch 521 BLAKE2B 9d3b5d8a380178f84146e7909a6557c28c48df775abb96afadbe4a06a7b565d5c32f39359060fd45028120c8952238f95fca3348e225096784e806864cfd2b7a SHA512 00a964cd75224195e8de77bc7137c087c6f4128734a9c55505ef4d88d512deb0325df56e3da4c8fefac10915613e1dc244c9107123a22bc9f124fa515fae9f4a
-AUX tornado-6.4-pytest-8.2.patch 2763 BLAKE2B a4f416ac403f8a1f616c7a3e2e97c74919242424d829249f302f9ecd0779f96244b33d5e17e441592d315b014c8b94ce9efef32ea54919c6b6545c3cdfa7041d SHA512 a252f8276b503f5f96f0059f3a75ca480b9f99542cf88066aff4ec020f091acb7826222441538f010a7a2ac1c0a9b423630eb8fcff54be89ef30f998d11e7e3a
 DIST tornado-6.4.1.tar.gz 500623 BLAKE2B e359d9cbf5e7311e608753a2908e61ea121e4d108209866fda49e79ecca3dc8495c35583406dd7d6b2852c4f6a9df2e340b1f4b892489be976d70000ed51aa33 SHA512 294b4fff8a6d1b9592d355f7faf78f1a94a2aaea1b54414b7e81884b8d4069713a28f6105ae36f27be78abf4c47a1fceab3801bc92b5429374f7a534f104c437
-DIST tornado-6.4.tar.gz 498845 BLAKE2B ebcdcfa93490107addfe69f722e2d85058a92fc366b09a4794a4d6e0a93040ef9791095a5a94d21937d4e88dea09521644cf92d0f2c7e98238dc58e6b864a009 SHA512 c063509d4c385e410c63cccdc1e9c66aa2bb739473667ede56cb801b7379b910c8059dec831d609109f3076222b588b257afd960dffa422d7a872867dcdda7c7
-EBUILD tornado-6.4-r1.ebuild 1548 BLAKE2B 2a4698ebfc560294f4c5415252194ab7708afa5f567fc22812d0cf1292a220fc8ea5590ea212c0b7d4019a32fa43464c49819bb2d96be4c8a0b2b0582c548e05 SHA512 813352059ced6a29ea25d543db2757695be0635d6dc58713d0750a6f6379778db805368200dd6dc5d2b325d2318aff670281f1cda842bfcc50af1921aaff0461
-EBUILD tornado-6.4.1.ebuild 1467 BLAKE2B b22a8e53beb42e2cd1dcbf24de2d7960c7deb9eb7dbf92be5c3e071e8d88f0fdfc71ad1f8321038ce9d7f3998ed9f457d5934f6fef974d78d95cce7cd122d92b SHA512 bb57382553b599a73ad7c1b2fb6175d7933ef0223e73b7124c71c995850b3d227470804e380f5b336419c52ab7ffa75fd60cf8c67eb0d7da1145764e694d3f03
+EBUILD tornado-6.4.1.ebuild 1466 BLAKE2B 40ba62aa67ef6fe50f1475d03288b60a50d39bd70e06add48725fe8d17d2fe8da5b39571a48dfa42f8947d22259d8bdd69308a6582ae55c0953fcad1556cd75c SHA512 ca23351484bc62e22e9bb015b48dc9619eb849ce8415440c4b391ec5f76b1a1df903acc7b9498ef5a3474d95adb3ab38ae7df6cd0a61d5a1f7b5c0b25a23a4c0
 MISC metadata.xml 381 BLAKE2B 96d5942b11b6364eeac2248f6e92a9e7a54094ba2b6e9ef966be4143e1fa01fa0c417027d33a71c51bb094b905b9ff79e05107e1a9debb4b1ef932ba11fd8565 SHA512 cd4db13e0c6a9cf8b3c788c53dc5ecd0dce2cf783e7b2d67dba71299d1c6a3d1dd2c2a76c0d69816ab0da4ca23f831613323c55864fd858690c605da5426bf60
diff --git a/dev-python/tornado/files/tornado-6.4-pytest-8.2.patch b/dev-python/tornado/files/tornado-6.4-pytest-8.2.patch
deleted file mode 100644
index 21a2ed04d24a..000000000000
--- a/dev-python/tornado/files/tornado-6.4-pytest-8.2.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From c851aa8a949524b35f72c82b45a52353aa3c0558 Mon Sep 17 00:00:00 2001
-From: Ran Benita <ran@unusedvar.com>
-Date: Sun, 28 Apr 2024 14:17:54 +0300
-Subject: [PATCH] testing: allow to instantiate an empty AsyncTestCase
-
-`unittest.TestCase` has a feature where it allows instantiating
-`MyTestClass()` with the default method name `runTest` even if a
-`runTest` method doesn't actually exist. This is documented in
-`TestCase`'s docs under "Changed in version 3.2"[0].
-
-Since version 8.2, pytest relies on this, and started breaking on
-Tornado's `AsyncTestCase`[1].
-
-Change `AsyncTestCase` to allow empty instatiation, by matching the
-upstream code.
-
-[0] https://docs.python.org/3/library/unittest.html#unittest.TestCase
-[1] https://github.com/pytest-dev/pytest/issues/12263
----
- tornado/test/testing_test.py |  9 +++++++++
- tornado/testing.py           | 12 +++++++++++-
- 2 files changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/tornado/test/testing_test.py b/tornado/test/testing_test.py
-index 0429feee83..8e2b8db428 100644
---- a/tornado/test/testing_test.py
-+++ b/tornado/test/testing_test.py
-@@ -61,6 +61,15 @@ def test_subsequent_wait_calls(self):
-         self.io_loop.add_timeout(self.io_loop.time() + 0.2, self.stop)
-         self.wait(timeout=0.4)
- 
-+    def test_empty_instantation_is_allowed(self):
-+        """
-+        Test that empty instatiation of an AsyncTestCase is allowed.
-+
-+        unittest.TestCase docs guarantee this working, and pytest's unittest
-+        support relies on it.
-+        """
-+        AsyncTestCaseTest()
-+
- 
- class LeakTest(AsyncTestCase):
-     def tearDown(self):
-diff --git a/tornado/testing.py b/tornado/testing.py
-index bdbff87bc3..9455411a6d 100644
---- a/tornado/testing.py
-+++ b/tornado/testing.py
-@@ -177,7 +177,17 @@ def __init__(self, methodName: str = "runTest") -> None:
-         # the test will silently be ignored because nothing will consume
-         # the generator.  Replace the test method with a wrapper that will
-         # make sure it's not an undecorated generator.
--        setattr(self, methodName, _TestMethodWrapper(getattr(self, methodName)))
-+        try:
-+            test_method = getattr(self, methodName)
-+        except AttributeError:
-+            if methodName != "runTest":
-+                # We allow instantiation with no explicit method name
-+                # but not an *incorrect* or missing method name.
-+                raise ValueError(
-+                    "no such test method in %s: %s" % (self.__class__, methodName)
-+                )
-+        else:
-+            setattr(self, methodName, _TestMethodWrapper(test_method))
- 
-         # Not used in this class itself, but used by @gen_test
-         self._test_generator = None  # type: Optional[Union[Generator, Coroutine]]
diff --git a/dev-python/tornado/tornado-6.4-r1.ebuild b/dev-python/tornado/tornado-6.4-r1.ebuild
deleted file mode 100644
index 3b5a869d5c2b..000000000000
--- a/dev-python/tornado/tornado-6.4-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python web framework and asynchronous networking library"
-HOMEPAGE="
-	https://www.tornadoweb.org/
-	https://github.com/tornadoweb/tornado/
-	https://pypi.org/project/tornado/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.3.2-test-timeout-increase.patch"
-	"${FILESDIR}/${PN}-6.3.2-ignore-deprecationwarning.patch"
-	# https://github.com/tornadoweb/tornado/pull/3374
-	"${FILESDIR}/${P}-pytest-8.2.patch"
-)
-
-src_prepare() {
-	# network-sandbox? ipv6?
-	sed -i -e 's:test_localhost:_&:' \
-		tornado/test/netutil_test.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x ASYNC_TEST_TIMEOUT=60
-	# Avoid time-sensitive tests
-	# https://github.com/tornadoweb/tornado/blob/10974e6ebee80a26a2a65bb9bd715cf858fafde5/tornado/test/util.py#L19
-	local -x TRAVIS=1
-	local -x NO_NETWORK=1
-
-	cd "${T}" || die
-	"${EPYTHON}" -m tornado.test.runtests --verbose ||
-		die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/tornado/tornado-6.4.1.ebuild b/dev-python/tornado/tornado-6.4.1.ebuild
index 37bd5e1b2fea..4dbe33864e31 100644
--- a/dev-python/tornado/tornado-6.4.1.ebuild
+++ b/dev-python/tornado/tornado-6.4.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index eb1b0daf15be..b9587a771287 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,3 +1,3 @@
 DIST ujson-5.10.0.tar.gz 7154885 BLAKE2B 5cb09e7b8576b837f19e604eda2f498d5cf479c9b0018d948e011a53c5b91fcaf869d8b8f0babf6c1d725e1ba000f107f767a7c2f74c52121bce95a2082938a7 SHA512 29aeb2f57c607c382deb2825f6262b73d11f1edff0545338819d081f223dabb66b2967744cc11b9f4c0b7f042d51688f04bf07fb9b2cdb6adfec439a3d8aea32
-EBUILD ujson-5.10.0.ebuild 888 BLAKE2B cbc1c1b4f65e13b236d3ebe18c13c2baf2ce237a09634a89aadbb35181ddb684a465e07ab057710c8bda8fe3a89e42e0b71156f83537dec822e579d102cb41e1 SHA512 5d4f921c39eac39985e8b238f2f3f6cfac4dcd53efa1dbe8761d5f96cf215e85c31e456ff18140a3d27da4ec10b4133d36c9644925b4e64761d319dfdce3d046
+EBUILD ujson-5.10.0.ebuild 894 BLAKE2B b14d4c6a8b84fd94a5c022e5f311ab354756d9f370a9d90fb18b35e85a6fe96a3869e48a3bc995db967ca9a74626eb613f882819c6c6d3b87d5997ac064a0b97 SHA512 3bc5e2b808865087285f17cae94739f927040eb39826440ef20569afd341514682d574f11eee7bea3358f3850baa5bdd60c271428c6fc6450f4b354c8a4ea7c6
 MISC metadata.xml 494 BLAKE2B 8e20150926d62643e7ff2110cba22313db0c0e3112290ce08302d57103aa35c42a56921d0b46e0acca2ef83756eb4f7384f23ddb06fe41ef6c4a28921f11ec33 SHA512 d9c0a59f916b84d50e51a21152c1815fea90a909dc9bd44ea620b2a33ca6a92ee237aafe29debcc9d1a2bf63c84112300845309eb0ab1265e5d2b0c05dd313f0
diff --git a/dev-python/ujson/ujson-5.10.0.ebuild b/dev-python/ujson/ujson-5.10.0.ebuild
index cbff0df3f24c..b6d144ceaa51 100644
--- a/dev-python/ujson/ujson-5.10.0.ebuild
+++ b/dev-python/ujson/ujson-5.10.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/double-conversion:=