gentoo auto-resync : 11:03:2023 - 12:07:11

159 files changed, 716 insertions, 2389 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index fba337a90c75..74db5baeaa21 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 5608fe59bd3c..e1653fdb1be7 100644
--- a/dev-python/accessible-pygments/Manifest
+++ b/dev-python/accessible-pygments/Manifest
@@ -1,4 +1,4 @@
 AUX accessible-pygments-0.0.3-test-install.patch 810 BLAKE2B e4047a022f73b929ab12a3daaf3e91ec1d0ebfccfa6428b75a15654eb4a6095e072defd1ba1a8aa5dd03b0580ace2c4385092d343ff7629c571b63d1c80633ed SHA512 7070ecab79137baa67925fc89624291cac7d3c5e6ecb53488d3783a53dd8cc011f39a4e75cd2b22cefc95a9076d4654be4ee793e526456ea976bed8f39469b55
 DIST accessible-pygments-0.0.3.gh.tar.gz 4540727 BLAKE2B 7b5a4f36a938a2de531227e6dc6b55d3738c61433ae88b3b565b5cc1d4d76526eaf72f90c79362ab5d4818f8483d33e48265e3dea58a273742ecdb0bcc57ca91 SHA512 21803f2f6332c42996de5722cd575b9b6cf544a8a038298d9462a910bce51b63df8cc47077b510b675fee5a4c1250c797627e2f7dca7cfa0d75fcb115067bfa0
-EBUILD accessible-pygments-0.0.3.ebuild 917 BLAKE2B 61dc02abc619eb907d2fce9d7d28a11162914bc5bddab1b75ea53baf981e069c5575e6dc2d78e859cb3bac334d851f6324d11b2dafd4d97ddb234eea8b5725be SHA512 0fdef06ce3f4a4894c1fd8a45bdc7297791c28ddabda75006fbdb6fe3387ba049ad61cb9cefe3d8148cfeb0a855b3b125ae9e4f50d6abefd4130dedda5bb20c2
+EBUILD accessible-pygments-0.0.3.ebuild 923 BLAKE2B 246bb106f187d48740beb847f43cf1429d2802c17da238d8dac633254b51fe518838e01984232e03b462f0335c77a09e477c6e02888421773a4f2adfacae6508 SHA512 1bddaa190bc3606c35b288480a727258d1cf48de0938bc881fe212f689fb673bdeb188b6771cb8c7bb9eb8ff6ad1c41c41659cbe8d5ce62951c203c2ca11853d
 MISC metadata.xml 421 BLAKE2B ef299c2eec196b50d776375f0bb9f00319649a659524e959f625e7bd9a1e53d994b7b55f7ca121b6b1a7022424f365ec3a739a072c7fab5de0ba689f099ef250 SHA512 683cfa4011320ee1e5437919f7ac05aa5bf1517da3c4427fa216e15f3e6c96b97de598719d1b66f10a4270a7f6b14101c2925af06bb1db186d770028b06f7b0b
diff --git a/dev-python/accessible-pygments/accessible-pygments-0.0.3.ebuild b/dev-python/accessible-pygments/accessible-pygments-0.0.3.ebuild
index 0f912a16966c..897f8fa91d7f 100644
--- a/dev-python/accessible-pygments/accessible-pygments-0.0.3.ebuild
+++ b/dev-python/accessible-pygments/accessible-pygments-0.0.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 41a912cee980..c7196531fe8c 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,5 +1,3 @@
-DIST ansible-compat-2.2.7.tar.gz 47378 BLAKE2B 58f3b19400fb7646d37c585df07435e65a60f3e57d445c98e8089c6a2ed853cb5dbab682d85cee1a604e1b4de6dd137faa12bf78fe7913752839f95bd651435f SHA512 9a3863be3d755eb5a1a61ba0c526786ea3df14bc6fcabd9196559eb625ab6dfc8de7a17fdb2cdd8ad71d7d61b5e2f0543b8b5908f39d5e7d9ea45e387aa625b1
 DIST ansible-compat-3.0.1.tar.gz 62676 BLAKE2B a1d08311e1b61d8387ef82db65581df4ab7cb4a2520bff9173845fa5b9fe18d173afd4306874967fb40c007546f36d78349a503bd09ae14257a38a59e1cbb22f SHA512 27183b09f957a79254b5dfa237c2ef789dac95e86f421277878a57487a16684de862f03f6ecee6c57ab5a5dfa8c7ee2802d5e63e74ca0aebc61efa46574f0a61
-EBUILD ansible-compat-2.2.7.ebuild 1676 BLAKE2B 8e228ea92060ace99d977804a082a638cfbd40528d78ab96174e029b3e4748ebae3c7f5369163830f742095778f1c3cc8a7179490b3b33c7c0f7e1290ef97d8b SHA512 542c4e06b0bedb367f36e7739f6267e7ecae60ba0f112db6865e4f282c130df1e9d412c1462ed3d5c5e156016096b79c83cb921a2d793a7c772e1797016759ac
-EBUILD ansible-compat-3.0.1.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
+EBUILD ansible-compat-3.0.1.ebuild 1527 BLAKE2B 96e2661ff15393733d6b14ec2c3a3e80a1088c6091c4c18ae890e63209c89da545c9dd6ce43a758d7657172bc99ed337b7cd9854932b1ed5f90c5b1a846e0f01 SHA512 e00b04aae139353bac04b38ca8af9831aa20cba91ca222b7f729079f620f1dcbab67d67b7a55c183ba0908ad9bf2d502cfbe2d934db4ac2075d480c6b37d770e
 MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
deleted file mode 100644
index 2e7296f0d6fb..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst-parser \
-	dev-python/sphinx_ansible_theme
-distutils_enable_tests pytest
diff --git a/dev-python/ansible-compat/ansible-compat-3.0.1.ebuild b/dev-python/ansible-compat/ansible-compat-3.0.1.ebuild
index bbea175e5664..a7845cd7c34b 100644
--- a/dev-python/ansible-compat/ansible-compat-3.0.1.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-3.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	>=app-admin/ansible-core-2.12[${PYTHON_USEDEP}]
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index 042cdc27690d..919e0a50eb6f 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -1,7 +1,9 @@
 DIST apispec-6.0.2.gh.tar.gz 72472 BLAKE2B 0ff39ad92648cd63487f8901dc918fc1c642ce677ef73d5a7c849cdafbf7c81ac3ec51224575cd83c060930c1b2ef0ebfb3e94e1fb30f040e4dc4aa2bd221936 SHA512 aa5e2cc41d5b3c4555da929819135df30192e6f6ff08518d62674495f0d28c14e51a0aa111b289e5f9d7205f821c1fd4e28b914899ea3e15b3e20f6052258117
 DIST apispec-6.1.0.gh.tar.gz 72570 BLAKE2B 524573d188c487c57bed25f735888623d3abb848a949920bfa7ef8737b33d5fa29670d90af47eedb8b6202ddd553d04c2809285151555159c81203989fe23a2c SHA512 95d24491992572304b5c5adbb2a50668d55cb60585e32c85f718f2c211eb15c35082146fd6c88b7d3d574b4fef8f49fdd3cfe714f15d80aa657f3b48f38a40ed
 DIST apispec-6.2.0.gh.tar.gz 72921 BLAKE2B 32a0f5c607277afb4db319183777e9cdba625f17942a983ccf8b67fead459783b4d88e8bbd71c24be421aa068fb6dd96c193806b287de3d63f3456ec840132d7 SHA512 432391b42dab9cb1172bd6959346dabf639dabec85540cd6f3c0f227cbc833a8424ae6b34e3d4d79f6bf41d3cf24464d1f5584204e143c3dc2d092029a2d2cf7
+DIST apispec-6.3.0.tar.gz 77157 BLAKE2B 0ccf398f36548ea269c4e91fb512d8789bb387cff6956c0fe0426f1b3c38b6670e8c41972948d7a3f87c75e52c97fdff7570306d64c6ad41bfcb9f19e391b7de SHA512 65119851ee31cebc0bb0ddc6668e3961f870a7759bc95128e67063d0f3c6a88ddb590efc478c2e8eb8ecd7d3edd51bd51971a4e3e1e25a7486dfcb1b49e98dc4
 EBUILD apispec-6.0.2.ebuild 1108 BLAKE2B 06db107a509f97325fcd982824ff0f5b1de72cc48cc075e0175d6144c4a34c087106ec52bbcca0a790603c2fefa2797dfcc562618283787afa37c4310f633383 SHA512 6f4133bd06b918d03c4bd45854cf5c4b8d8a278d1dde2b7dac8a59eb88dff3dd61428bcd69b67fd9587176af288ffb4d1486191c3913c3a72108731bab0b743e
 EBUILD apispec-6.1.0.ebuild 1108 BLAKE2B 06db107a509f97325fcd982824ff0f5b1de72cc48cc075e0175d6144c4a34c087106ec52bbcca0a790603c2fefa2797dfcc562618283787afa37c4310f633383 SHA512 6f4133bd06b918d03c4bd45854cf5c4b8d8a278d1dde2b7dac8a59eb88dff3dd61428bcd69b67fd9587176af288ffb4d1486191c3913c3a72108731bab0b743e
 EBUILD apispec-6.2.0.ebuild 1108 BLAKE2B 06db107a509f97325fcd982824ff0f5b1de72cc48cc075e0175d6144c4a34c087106ec52bbcca0a790603c2fefa2797dfcc562618283787afa37c4310f633383 SHA512 6f4133bd06b918d03c4bd45854cf5c4b8d8a278d1dde2b7dac8a59eb88dff3dd61428bcd69b67fd9587176af288ffb4d1486191c3913c3a72108731bab0b743e
+EBUILD apispec-6.3.0.ebuild 1015 BLAKE2B 3c9056f3fe979b9a71a086786bde0268ddb0e6e2c2ea6d0eff14f9baaba5eba09a18df73a660770a0a5e29f60e5fe3670c732c21b99b2c36a109d0e0b8f23968 SHA512 9dbaa6319b7d89534aa63b724984efb640a58361a942611cf121e373a2dc6648059285acc4145d6ada93d8df71d65c0af594d79b6ae88427820eeb1c73475e72
 MISC metadata.xml 504 BLAKE2B d55ae521520ba60a139e83f23aacbb3df76c4c120a54f1b65b185018647c1f363bc88f354abc1810b7a9d9f3cfa264e0303d46cd23b8091dbb365bd84cc04815 SHA512 e0297e941c3c544cbb14044f02451c26cfdec81b2bd49cf225dc9f32d1ccb207e630d838d8928d28ccb35a3cf01493a87ceb2633cc5ede36b62a6d81f164ea32
diff --git a/dev-python/apispec/apispec-6.3.0.ebuild b/dev-python/apispec/apispec-6.3.0.ebuild
new file mode 100644
index 000000000000..42c586b7f57d
--- /dev/null
+++ b/dev-python/apispec/apispec-6.3.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A pluggable API specification generator"
+HOMEPAGE="
+	https://github.com/marshmallow-code/apispec/
+	https://pypi.org/project/apispec/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		>=dev-python/marshmallow-3.18.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/sphinx-rtd-theme
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires unpackaged prance
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index fc5dd3021756..8709abe8539f 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,10 +1,3 @@
-AUX argh-0.26.2-fix-py3.9-msgs.patch 1135 BLAKE2B 4730066f38371dd5c8c0e7004ffb633077e3b246d204a24e07064a1e7ae0cdf2069c3495acee25e22f49297eea21bcc3893432093180e69b2f387a5d2d111d69 SHA512 0dbd6086af1cc4486d736142b8321c09f37d4e732a6f6b8e307f05fe461486d01c7def8cc2e36a0b6068ab8533b20ae6e5dce2b4d556a5181b65043c5e568ef3
-DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
-DIST argh-0.27.1.tar.gz 49106 BLAKE2B 48f21d920d97111656cb5b18c956c7fdda94ae242f92ebfb02c47b55d5ccc1b82b0ef8b94a721f97fb3638b15b38ce3293fbe46ab123ed9c968efdb2e881d8f3 SHA512 edddd35b2a90c6286818986945e9ea8484dd06bc263016d8c52b0e29475dbad610d673acc0918d0cf62657b1d965bb0d59e51af4c384ae0610f471c748a90999
-DIST argh-0.27.2.tar.gz 49200 BLAKE2B 4599781854feb0aa1b5251f6361bcf4e5e4f96c391fd8be3e5a3397d2a6130ec9111f36ad87dd553345a0d9d6471d20ecca7cd7462d41012c8117d2a07f18290 SHA512 9bed6d5f4ea6407be675b4b5c015e0bda5015ef78289ba9c08503687dc33d91fcda9aabdb9a94b9e3dc11020edf873e51eb1ef9d7ee0831b4f0eb0e302b83b98
 DIST argh-0.28.1.tar.gz 62511 BLAKE2B fb06ad73c5d8e8508103007a2213285f52f4d245ade288504616d42847c982a27ca94f0850f87052737c17740de705a9f8557fcafbea6f656e30ca1ed99efffb SHA512 c5d4515f5ba94a60dbcc6fa81812c192b51539ceee349129028a3d736ba1b0eac23135b31fa6d350e9fff778250365848e6c2077553849aeebbb9b67be6774dc
-EBUILD argh-0.26.2-r3.ebuild 631 BLAKE2B 8b525c0f1945804b6224a5842f97ee5a338505fe0f5aec6f5f40db4f0297fb359c7e83be5486b08c92f97935f634ca3a4ce8f884dd629c6945f91d3c56b8b7c4 SHA512 eb53253cff22812442819e88c83657440830612bd568ed61ee964edb02de81406e5722648e6581a2b5fa4abf90561354350c6519f4b645d71d77bc1f00bfdc32
-EBUILD argh-0.27.1.ebuild 581 BLAKE2B bb79d37f0223e9f3ca9729898492affef5d06fb6d8dcabcb9e4648a853d9bc3d8e40df577ca59bb18076e2389b6a820204b2b64d9ba05ffbda3f4651851c8ba3 SHA512 db4c75ddc3e883452f5bdd095da0cd25e85e0322b99c7ce1e2f1a9490ae566134ff0b3ff4816eacefa8a1f35818d6b87ab5d1b117bbc7ca85123667c6e2aa726
-EBUILD argh-0.27.2.ebuild 581 BLAKE2B bb79d37f0223e9f3ca9729898492affef5d06fb6d8dcabcb9e4648a853d9bc3d8e40df577ca59bb18076e2389b6a820204b2b64d9ba05ffbda3f4651851c8ba3 SHA512 db4c75ddc3e883452f5bdd095da0cd25e85e0322b99c7ce1e2f1a9490ae566134ff0b3ff4816eacefa8a1f35818d6b87ab5d1b117bbc7ca85123667c6e2aa726
-EBUILD argh-0.28.1.ebuild 575 BLAKE2B 976f53038bec8b093acfadfcc6b9b6fd0d6a29eea69354a50c87e1abf0ec363d485705e0ef2a5d17fbb3354055113c15076c7d91b497db190606beed6c4e8127 SHA512 51786d7146600794b819aa64770bb2207232ee3c9c040bcd21daff89058cc840aa5dd32623c0abf676d045060263c066596bc6117647ecf6320309c09d94add9
+EBUILD argh-0.28.1.ebuild 567 BLAKE2B 26187ec09213590d209a062138de40f347fc4cfa79a6aabc0cfecd30170d26ffe1a965c15f76f347865ac4082b0dc5d4afe9eac1f58fe288d286ce8e49352c55 SHA512 6566cf449690b3e53d6f236e0af0113df5ee5b16b6b1e34c59fb2bf231079fc81c8ba8c29a7bec7793c8c82adbae6642f415489a1d92a6a93388b6a14ec5739c
 MISC metadata.xml 385 BLAKE2B e1fc25e92c45fbd0183634cc645085fef5223a59975a5000557c1a2ef497c6f9ce017e462a9a881e61b4578c90859f51e5471d197ea884b7dc4ce90786a0987a SHA512 97719df6c0b48c7348bf25de9016dd1de373d6b9e1fd7f52d87eb6e0935608719c726aa3f4ca4aba8fa1211d1234c2b959dd821d241cd65b6cb47b1a06481df6
diff --git a/dev-python/argh/argh-0.26.2-r3.ebuild b/dev-python/argh/argh-0.26.2-r3.ebuild
deleted file mode 100644
index 610a5b87e84a..000000000000
--- a/dev-python/argh/argh-0.26.2-r3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="A simple argparse wrapper"
-HOMEPAGE="https://pythonhosted.org/argh/"
-SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-LICENSE="LGPL-3"
-
-BDEPEND="
-	test? (
-		dev-python/iocapture[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.9-msgs.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/argh/argh-0.27.1.ebuild b/dev-python/argh/argh-0.27.1.ebuild
deleted file mode 100644
index 5a8b81d933a6..000000000000
--- a/dev-python/argh/argh-0.27.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A simple argparse wrapper"
-HOMEPAGE="
-	https://pythonhosted.org/argh/
-	https://github.com/neithere/argh/
-	https://pypi.org/project/argh/
-"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-LICENSE="LGPL-3"
-
-BDEPEND="
-	test? (
-		dev-python/iocapture[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/argh/argh-0.27.2.ebuild b/dev-python/argh/argh-0.27.2.ebuild
deleted file mode 100644
index 5a8b81d933a6..000000000000
--- a/dev-python/argh/argh-0.27.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A simple argparse wrapper"
-HOMEPAGE="
-	https://pythonhosted.org/argh/
-	https://github.com/neithere/argh/
-	https://pypi.org/project/argh/
-"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-LICENSE="LGPL-3"
-
-BDEPEND="
-	test? (
-		dev-python/iocapture[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/argh/argh-0.28.1.ebuild b/dev-python/argh/argh-0.28.1.ebuild
index a5678353c3de..51d768c9a0b7 100644
--- a/dev-python/argh/argh-0.28.1.ebuild
+++ b/dev-python/argh/argh-0.28.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 LICENSE="LGPL-3"
 
 BDEPEND="
diff --git a/dev-python/argh/files/argh-0.26.2-fix-py3.9-msgs.patch b/dev-python/argh/files/argh-0.26.2-fix-py3.9-msgs.patch
deleted file mode 100644
index 5835c5acbb8e..000000000000
--- a/dev-python/argh/files/argh-0.26.2-fix-py3.9-msgs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/test/test_integration.py b/test/test_integration.py
-index 8899d8e..589f6d6 100644
---- a/test/test_integration.py
-+++ b/test/test_integration.py
-@@ -377,7 +377,7 @@ def test_invalid_choice():
-     p = DebugArghParser()
-     p.add_commands([cmd])
- 
--    assert run(p, 'bar', exit=True).startswith('invalid choice')
-+    assert 'invalid choice' in run(p, 'bar', exit=True)
- 
-     if sys.version_info < (3,3):
-         # Python before 3.3 exits with a less informative error
-@@ -391,7 +391,7 @@ def test_invalid_choice():
-     p = DebugArghParser()
-     p.add_commands([cmd], namespace='nest')
- 
--    assert run(p, 'nest bar', exit=True).startswith('invalid choice')
-+    assert 'invalid choice' in run(p, 'nest bar', exit=True)
- 
-     if sys.version_info < (3,3):
-         # Python before 3.3 exits with a less informative error
-@@ -511,7 +511,7 @@ def test_explicit_cmd_name():
- 
-     p = DebugArghParser()
-     p.add_commands([orig_name])
--    assert run(p, 'orig-name', exit=True).startswith('invalid choice')
-+    assert 'invalid choice' in run(p, 'orig-name', exit=True)
-     assert run(p, 'new-name').out == 'ok\n'
- 
- 
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 47cdc2b93a0c..5f54cb5fe9cc 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,7 @@
 DIST aws-sam-translator-1.59.0.gh.tar.gz 1688806 BLAKE2B 66e63f5d008b120d95b2258552ba7ea531b6dc2d0090360c3777bcac167f95a0167cf200a8b29d798699e87a060befee71f7e8316ed395eded073960b4f1a18b SHA512 558b5dfe586c0badb7b5b5f35a6b841ffe94f2e6fb68acf7c492529abfe3756760fc5d8cdb16550ebbc47671fa12e09620b445d086f008d05f80606710ec67a9
 DIST serverless-application-model-1.60.1.gh.tar.gz 4600439 BLAKE2B fabd84e66da433410ff7d54a9db9ae6aed5dd67de16669450146adb5f86ef3b0b90a1c6165b935eb1aef0df0c116a687da6c43e75f332a8a5f3f93c79338f2e4 SHA512 75e3aca9248ce599837f87bdc633fc48e9f5980f878884aef7e3b1b41a2cbe1d982d9eb6b5bd41a2057fc53b9edc4ce6fd9e016750d0757f58feaeb08f02fe3a
+DIST serverless-application-model-1.61.0.gh.tar.gz 5166263 BLAKE2B 9f787dac4761974e4114e4d3477eaf050e92d722111fef65cad3ebda1f265420aa62fc068140e102a0963679f20485e3f53968da74ba804b70a131df9535dbe7 SHA512 0d12c1b0d83c2824177a68c544177e2d80ec2e670ab469069621553745850a88e5c6143f7f529e8227c576d72e37ba007ab06ad0302282266170e0c33096b626
 EBUILD aws-sam-translator-1.59.0.ebuild 1431 BLAKE2B 1b7660cbdd772eb805b1ac58121f9c29ca02cd71a0d009a609ed4a3547d0280d5ce6312a07d06a6f74bfce5e9e3c210ef6bdf254bf79efaa3ba4ae55a8f4d88c SHA512 bec6bfe53df77c7dcdfeada9c1ea3030bae5f096b2628022c9a4a34f499a382a1e750ea61926bc3670cf293b269468e5616a593ab2a4aefcd5918650eae7c740
 EBUILD aws-sam-translator-1.60.1.ebuild 1447 BLAKE2B a02b63bf23efed53753bb4e775305e1fa04382241257382c23d47b54eb2a37d887fb19eddb4407f93f1e6701845979620092d4cd4786cbb97a62512db391d42d SHA512 0360076a43b8f88e60b9deacfd3de8dc3bf35d10eeeab71d94ade2c7225aff1021aa9d97a1cdddf6e75ce19b08f77d47feb43ebb111807d81d0a86f5f2d2f41b
+EBUILD aws-sam-translator-1.61.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.61.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.61.0.ebuild
new file mode 100644
index 000000000000..5a83e871d7a8
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.61.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=serverless-application-model-${PV}
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	<dev-python/pydantic-2[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# so much noise...
+	sed -i -e '/log_cli/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AWS_DEFAULT_REGION=us-east-1
+	epytest -o addopts=
+}
diff --git a/dev-python/binaryornot/Manifest b/dev-python/binaryornot/Manifest
index 5e96e8d6634a..4e1cf3cd71db 100644
--- a/dev-python/binaryornot/Manifest
+++ b/dev-python/binaryornot/Manifest
@@ -1,5 +1,4 @@
 AUX binaryornot-0.4.4-tests.patch 674 BLAKE2B f07730709f11bf0732b60b81603c40bea1fa6da2d8df545b088072e0f710a7e123e438b03d2390122b6000c14343e932b38d4b6f8956ea87b72e29deae1a4715 SHA512 8a0f1066a580f08778434ed7d30c2ebf2764dbfd746b561ffce2fb8dd8d77cafaf4a58b03504cf5b1e4d37e0a6ffe3038dcaa5611cdfd7d42ada86edd1e47f3f
-DIST binaryornot-0.4.4.r1.tar.gz 371054 BLAKE2B 4a70e22eba51a266987308e8d1b4571ace5760f945920194a1a61f4336f33dcb655c4f0b1f760aa3502834d29a1a64ac62657e5d73eac8f1d7d02edf71db8af9 SHA512 379e71b41824b9389ea02c64223e26c57694d07b749c197e3a6b9f10558c8d502e9b93a13ae6c3a4bca49064ffc650ce822073dc312fb06e50e06b8a3f04f419
-EBUILD binaryornot-0.4.4-r2.ebuild 812 BLAKE2B f44f6f3b5c56c1fcf95cf9f48d1e194a7d8230c0efb8294c6943baf8c99bde1a678cc242287ebe9e24d748504d7cc0433bee9a816dbfc884a5ab620b9152650a SHA512 7b7a19aa60d0598d37b1aebe36b5c86762f46f9af4ba8a759748d828c6222477619ea6beb985e68726735f6ec89d6e470c0958419b6f0aee343d805be4a44cab
-EBUILD binaryornot-0.4.4-r3.ebuild 898 BLAKE2B 57b6e4722f0e21b93467f62e84076f5c5b10937a60349cfcb3009ba9c76382745ec870d70658c6153aea150b99e04359de2589a282718e310c011ab85993ca88 SHA512 7b01c25ef9a4931a71aa731c9f5bf067b4f565606a1ee6ecb9c2aeaabc11bc905e516405810f16809a481ce52de9a532c4e112a78901b544d2b723dcd6dd5f6b
+DIST binaryornot-0.4.4.tar.gz 371054 BLAKE2B 4a70e22eba51a266987308e8d1b4571ace5760f945920194a1a61f4336f33dcb655c4f0b1f760aa3502834d29a1a64ac62657e5d73eac8f1d7d02edf71db8af9 SHA512 379e71b41824b9389ea02c64223e26c57694d07b749c197e3a6b9f10558c8d502e9b93a13ae6c3a4bca49064ffc650ce822073dc312fb06e50e06b8a3f04f419
+EBUILD binaryornot-0.4.4-r3.ebuild 831 BLAKE2B 0ef7c83c88496ea4e2b134d7a6bee08947291e7c427b787b7305f2d935be57fc56d2058c71a32e8045fc4a465844be3cb1352415d7cbb4f9047f01a73604baa7 SHA512 693f8733c9d6af95f020c199dd7f48d738211a2ce0c54fc1ff17e6a13d7ef02e2b4d1dd1bab168c026de160f2e290622cbca1372d8b227e6653cf39d418d2dc6
 MISC metadata.xml 404 BLAKE2B ee81a7d43719ea7ca5819ca53ba0ee32d84372b08af7f3716f2dab221bd26c5d922d8da1956bd3aaefe292bdc3ee8a077c09ea93c0f8ca6d2270a6def5c0b6b3 SHA512 7bf005480a3bcd7d13d28735b73a13bdd96107b11da7bf06bfc2894f2f2c514a72f946bab4b8ff4cd8f8dad651b96ea68566e712b77aa506d258c11d5390d25b
diff --git a/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild b/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
deleted file mode 100644
index a07543960284..000000000000
--- a/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Ultra-lightweight pure Python package to guess whether a file is binary or text"
-HOMEPAGE="https://github.com/audreyfeldroy/binaryornot"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.r1.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-
-RDEPEND=">=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
-
-DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
-
-PATCHES=(
-	# https://github.com/audreyr/binaryornot/commit/38dee57986c6679d9936a1da6f6c8182da3734f8
-	"${FILESDIR}"/${P}-tests.patch
-)
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs
diff --git a/dev-python/binaryornot/binaryornot-0.4.4-r3.ebuild b/dev-python/binaryornot/binaryornot-0.4.4-r3.ebuild
index 77d3e22aa76c..ffd76d0df21a 100644
--- a/dev-python/binaryornot/binaryornot-0.4.4-r3.ebuild
+++ b/dev-python/binaryornot/binaryornot-0.4.4-r3.ebuild
@@ -6,18 +6,17 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Ultra-lightweight pure Python package to guess whether a file is binary or text"
 HOMEPAGE="
 	https://github.com/audreyfeldroy/binaryornot/
 	https://pypi.org/project/binaryornot/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.r1.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 572862fdd1f6..16ad8074d819 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,11 +1,3 @@
-DIST bitarray-2.6.2.tar.gz 103565 BLAKE2B 07aef624bc7d36e0631082688f9803f7fb3d4c2fcb9d8ac7af0d207e56f8229c1e6a7e6ac7c0639d88b55f6d27f697cd6e4ece5cd0768d2624ac94eedabb0c60 SHA512 21a10fcc174b3e705551a6cfcf6e1b4ccb899c9d9a69e273e3c49528bcc5d889eac0dc3dbffc1f55fa561a091f8d11f3246035499cb9168192a03c6af034bd82
-DIST bitarray-2.7.0.tar.gz 120536 BLAKE2B e8e518a8293a22c81decbf3bb8ecc83d3796023bc6e3e5b75617ccc6c13b291d27d5a707d9a88e361329fa36e6f0363f4330b382b35236079f98052154bd5750 SHA512 762628d3b24315619176bf7ceaef95ba83fc87bb49c0daa23503fcb5dd54d447b4950b75b4923fbeaace2ee8a3037f228184ca5978fc8c782eb9eb3e7dd65d8d
-DIST bitarray-2.7.1.tar.gz 120656 BLAKE2B 3daeb4ad02aebbd22929cc755eadcc5bc0d7bc779c269d5e2e9de3dcc9349d3f73179cc5d5a27679dc9682127b89c32af18fd3c96f5fb03fd5325db34751e479 SHA512 ead010745825ee8758a3028267a975b92833c2d5ec76d8a1655c11ade6a76a56df8887e43342be5d4569dcb8e8c0f6534ab70bf850b0ae5a07c0189ce5feed25
-DIST bitarray-2.7.2.tar.gz 121846 BLAKE2B 542a1b3e7b7f3c8da42db93e5ee516c6138386508044ce81177bfaa2ef60713e3768d8e08e90c6619e30f685f4b5efb9fe3eabb2b8208ee0570203e94a4d3c7d SHA512 42bf4d43fefcf5d8500a004c83261b533c2e4ed486c3fa79256b99b8a0ce00873357621edf9270ce2c7ec704242ca96226e33285d9620f01aa5175d5d7cba00c
 DIST bitarray-2.7.3.tar.gz 123574 BLAKE2B 9a7a1b0025a7853434ae5e1c6e7bc5302668016f3cf8d569376644ced092ab1b3c28eeaabdf9d51d604e98a3f68f8f8d3002a87cc4dbfd897e30e6b162adf4aa SHA512 4ace2bfe78e06723bedbc263c7b2b163bbc5c35bde84f286390cbfffc8c513bbd4a4f5f775e6d0a863ded7b24cb555c7784e7dd067c3b9125abd8d62863ac684
-EBUILD bitarray-2.6.2.ebuild 571 BLAKE2B 1635fd40baf1614ecba870ad759f2c4f418f3b2eb59ca6930c80dcd7998c8bbae73e569a39733de33aa4ff2975d8b197332cfd8bc48714f086f42c91a15185ae SHA512 2cc349c48fe5bf351395d3186eef36ac3372ad708c8ebfe968a10df830c1ecbc9c2c6fb11c2a07c73e7a9f4ece424e5da77c237a08c8bd8d2fda6b6eeb290c71
-EBUILD bitarray-2.7.0.ebuild 573 BLAKE2B 1286c5f4ec4fa2c2f47c5a6d5ba5154d2095b22739304ef585fea8c4f3ae76771d8221e4c07397c774e2bc617dbcb8b1a861a041b9d0d1fc52b709f230d38334 SHA512 a607d9a25b936692845d6be2adf4367e76d209c902b10394837d83ea39daa0b98b68adfd375bbab62e2d6916650f9fa2d163c571f0c4b1486c41c09cc91d43ca
-EBUILD bitarray-2.7.1.ebuild 573 BLAKE2B 1286c5f4ec4fa2c2f47c5a6d5ba5154d2095b22739304ef585fea8c4f3ae76771d8221e4c07397c774e2bc617dbcb8b1a861a041b9d0d1fc52b709f230d38334 SHA512 a607d9a25b936692845d6be2adf4367e76d209c902b10394837d83ea39daa0b98b68adfd375bbab62e2d6916650f9fa2d163c571f0c4b1486c41c09cc91d43ca
-EBUILD bitarray-2.7.2.ebuild 527 BLAKE2B 41ec3ce94745aeb01f709d248ed029fc65941054feb60451187904740bf83370ff8e2925c50967de5cf7639f588fa368a950620aa64bad413907bcc2abf065e1 SHA512 9a76abb06c1aae677622f96919ad4c0f9af82c7d25f56c012b04317c9ff6d5950965d4a802870a0561ecb2326afa25d365cc6e6518dd56afb162e71abdd51f0d
-EBUILD bitarray-2.7.3.ebuild 527 BLAKE2B 41ec3ce94745aeb01f709d248ed029fc65941054feb60451187904740bf83370ff8e2925c50967de5cf7639f588fa368a950620aa64bad413907bcc2abf065e1 SHA512 9a76abb06c1aae677622f96919ad4c0f9af82c7d25f56c012b04317c9ff6d5950965d4a802870a0561ecb2326afa25d365cc6e6518dd56afb162e71abdd51f0d
+EBUILD bitarray-2.7.3.ebuild 525 BLAKE2B 19d37bc25b6aadb04cba42fa393259f51e85e4b43a01c7dd22a3e3209011cd9b2bc719965816b1c9da553cc57669889ca34a914cf5933af1f3a4f7107fa54a6f SHA512 2677e412e4dee23505adbaf5f5f6a5c24f9d7a69ee772a38fa55f9b4afba847ae69e611eb6206745a8a74d4262caeea887cc92cd35bd77e558a6e0c496acd8f1
 MISC metadata.xml 1207 BLAKE2B 67a57c61a71655fcd94e7025fe4d30792b6921a40f151d827f4c936dbc96c2b81afd2f2a302cfbf15356a591be941268561545d7ac7bc0cdb19e3f87a03e4b4b SHA512 5069c6622d7840c402007c420169e679da08db020952f798fd4299d6f1b324ce8cead3ca2a9072b96d8d852d5630827833eb27d39a190153e8da46ac9f386b90
diff --git a/dev-python/bitarray/bitarray-2.6.2.ebuild b/dev-python/bitarray/bitarray-2.6.2.ebuild
deleted file mode 100644
index 1c38b679c12e..000000000000
--- a/dev-python/bitarray/bitarray-2.6.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.7.0.ebuild b/dev-python/bitarray/bitarray-2.7.0.ebuild
deleted file mode 100644
index 3f58f0209420..000000000000
--- a/dev-python/bitarray/bitarray-2.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.7.1.ebuild b/dev-python/bitarray/bitarray-2.7.1.ebuild
deleted file mode 100644
index 3f58f0209420..000000000000
--- a/dev-python/bitarray/bitarray-2.7.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.7.2.ebuild b/dev-python/bitarray/bitarray-2.7.2.ebuild
deleted file mode 100644
index fa92ae1db01c..000000000000
--- a/dev-python/bitarray/bitarray-2.7.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.7.3.ebuild b/dev-python/bitarray/bitarray-2.7.3.ebuild
index fa92ae1db01c..bae3212d25a3 100644
--- a/dev-python/bitarray/bitarray-2.7.3.ebuild
+++ b/dev-python/bitarray/bitarray-2.7.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index ad994de91563..83420de64356 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,5 +1,3 @@
-DIST bitstring-3.1.9.tar.gz 408443 BLAKE2B 747ce06fc33681cbe63d706c2dace5ebce314aea1ba45f8a5a9d65f849bcf253fa9354e39fd80731af4845993e418f27232ede47c940367b8cb425867ffee8c9 SHA512 6dc9c8d683e4415dfd685153b350bd5462117c49c7d8fcd9b2a066f927d82bb2bfae1cc5df543dd38c5e65b93d453ad13d2937f9523b77b007b1234b24ba7be1
 DIST bitstring-bitstring-4.0.1.gh.tar.gz 413983 BLAKE2B a4b424d2c139b34ce5ea81522486d0e42d82a06cfc64ce664505a2c1f1a626939b57b1755642220e2fb4219ead3a2a368006878ea05bdae59a638948b24e8b8c SHA512 f036a042f83c70b830f987114e7eb54754145296c60cd6486f398247a069c50588f3c86395a849a99e3c9b94364f1fcf4fedf4b59b80f03b6aecb38d992f5490
-EBUILD bitstring-3.1.9.ebuild 612 BLAKE2B b0ee0487b0703f83d0cc10bea4070273a73c3ec9f1fe0c48d21587937140430cba7554ac31e76bf8c34f2c05cb4a7e81c203aa21447c6a8a20036114e10ac218 SHA512 97b3b30bfdfe566b54094c672077f8cd872b71ad3bd903c5feb971db0bca4401c87773dcdcfdab7ff11b24b028fbd3565ece5e5b7b6e3af553ed57d9e950fdfb
-EBUILD bitstring-4.0.1.ebuild 845 BLAKE2B 76902829d324a61bdca2081855b73a87f11d681399b0b663b78e4feb7847241c587b502e475326faa1bca5aff46f730df59b675b000d1499e97845006923235a SHA512 62e84b209b7d047bc6d2de905a7eb3ca714af25c84d2f4392599b30ae4e59ba984a5399521626a46ee92e2fc3d89e68da0f10973c93d7537a3520d6c7f9c0bca
+EBUILD bitstring-4.0.1.ebuild 843 BLAKE2B d44aae2a630071a865370b6bd6313a2154c2d98e9822863a6ab16194ed550c2f9641f976b458a8d1898f62825fe953cb01e7b91b2dce1d970a145427c3c8b536 SHA512 6474464d67aafcfd53cb0963a19d8c4f8c860556d2ab91a440b3e0103431390ef2c66c2032cfcce4b0ec7e7f625024ea8ca042a3ae0ed2c30f88a5c7c65b7361
 MISC metadata.xml 733 BLAKE2B 5d978fb3a90e33422df3c35986386d83e38b7760a2cac0708894c8c58c41002b8c7e1fe16bc1e9c707d8009afd0613d4afccf459770d40ec7c9223ede6a34e05 SHA512 ba4a8fb544c13bce8b31eb1dc3c4c5f5beff5f883f922479ccf809d81532719353ef322a26cdf16a0ef499dcdfb300b4a3fd0812edcb62651f8b617f0e391930
diff --git a/dev-python/bitstring/bitstring-3.1.9.ebuild b/dev-python/bitstring/bitstring-3.1.9.ebuild
deleted file mode 100644
index ec6f82467f7f..000000000000
--- a/dev-python/bitstring/bitstring-3.1.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="A pure Python module for creation and analysis of binary data"
-HOMEPAGE="https://github.com/scott-griffiths/bitstring"
-SRC_URI="https://github.com/scott-griffiths/${PN}/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-distutils_enable_tests unittest
-
-DOCS=( README.rst release_notes.txt )
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/bitstring/bitstring-4.0.1.ebuild b/dev-python/bitstring/bitstring-4.0.1.ebuild
index 28d8a4c9d103..1023d223c46e 100644
--- a/dev-python/bitstring/bitstring-4.0.1.ebuild
+++ b/dev-python/bitstring/bitstring-4.0.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/colorclass/Manifest b/dev-python/colorclass/Manifest
index 35089ab9dd4f..f6426c830ca6 100644
--- a/dev-python/colorclass/Manifest
+++ b/dev-python/colorclass/Manifest
@@ -1,3 +1,3 @@
 DIST colorclass-2.2.2.gh.tar.gz 490884 BLAKE2B e03c1a7091c133cea67c595363029121083d9a9d70a27f5803b20bb810b105ea9cb95aa68114ba98526b8a3b0e8365eadd7b375443215a5e0b636f0bd4cce632 SHA512 c38b58d4122e794654a8ac71adb2be0fb679eb10bd70c9d8f5dee06b3c978c1530bb3fb8fd6530d88aa35311a46a2590b709e4dcc6e3a81d14b90bf8cb74ebc1
-EBUILD colorclass-2.2.2-r1.ebuild 786 BLAKE2B 9558b7cf25ee88fe22df03052e0e375da27557bdaa551aa740f777112cc1447430908caf301f0f70d1534d67ca37f74c33d0c4043582e736d5ac39a6480e1245 SHA512 cec1b5ed67e28d7000c0830ac159bd2a5c22419d78de4460a27c95b85b6eebff3b1bb1fe5706907dfcc6d4e9eb1c670dfe498649ffebfde18568174baac2a404
+EBUILD colorclass-2.2.2-r1.ebuild 793 BLAKE2B 02e494dadccbdc254a1483cd3b300388bc8e71cbe73520f40a223068c678f654680ff6faefbe8a82b7e1c18a21c4b0c7b514c8d7f49ab85a029bd7e45b380e98 SHA512 629786b990747c41a50c273b202ec3a5f04a425fa228df611f46202624d67577349b3e6fa2dc4e63cdb29fd9350ff025bac52200986eaaceb1edddd4904e1243
 MISC metadata.xml 375 BLAKE2B 80d8bedbdd9260ff3c0113c3ea75df61ddc166fbc36033289531d0a9e704c04582ca1defa3107ee5f0d5c1bf0510b8739b19b28d00cba655988486c45bbfbce9 SHA512 27ad28c11c7b5114d0eadffe08ba4378bdd0e756dd3193e331e66dc4974c9543640b5530c4e344c263b5028bcde7ff87339a1627b87b9c715649bb6755e12d7c
diff --git a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
index a0e58a29a467..bfa409e2ce5c 100644
--- a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 23d86b5e01d5..0da52840b167 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,5 +1,7 @@
 DIST dask-2023.2.1.gh.tar.gz 8514054 BLAKE2B 6f94172cf9f921675fc53cf59e9cbbe211f576374190eecf8e17ad9943bbd1ba15fb002e7cf81f0043b4f2450a0cde7bdb6feb42a08160d0fbaee24d4a2f483a SHA512 1af031fd2992377297daff42c4f706e4e5573cce86a9158ea1fa4f09cf0c8a51ff5fb33d7bc551c16eb0a8e5052e76b32a143b2793027becb4e2367572c46219
 DIST dask-2023.3.0.gh.tar.gz 8514069 BLAKE2B 427b975010e08d23bb55606da726c64a08bf17144d50f0b4641469f30620359052434a9108510c08a7d646fd567cbeafb99afe9162a0becc3417fceecf4604d3 SHA512 1834c98edb1fd92fd022d472ec9d05497e7845d712d0e2faae27b6a408faff3678908d3109db5ae50642348a4fa6832af995f2fb67782c7a71933126699577da
+DIST dask-2023.3.1.gh.tar.gz 8520302 BLAKE2B 5b70e355ca02163d42615d504207e8186b2b5887d2c57c517876ffbc8a1bd4a3c56ea755d79696d952f802043134c4be4b0a69ff2eb4ea6da8faa80096bebdca SHA512 e4b8306a900453b27bc19055b5a5bfd0d0ed2dc143be854d8f056ede8b1e4bdc5e91a54c674201b1b1f27cbc0c9ba908e5a82a12f52d337c3cb23cbc2e6ef199
 EBUILD dask-2023.2.1.ebuild 2056 BLAKE2B bd3d6e54d8daa25c660d16c699cfe8ac453be5cab4879f243abdad400c0a1e3aeb8b00d7c6cde53eb5ea3872983c989449a54b5e2173826a0528748d286218e3 SHA512 5f4b97cb022d38f2276ae4880842e04d3c8076e99cb12162c37843696b0cb7d96c7d7ed14e203d7739bd881a295b0a06ed68534cf9aa6ee34147dd4903a1c1ef
 EBUILD dask-2023.3.0.ebuild 2057 BLAKE2B a55850beb755d4e2072584d0bcb348b654d52e407e30e4afefb172e13772d95941e42421e66361e3593a1cbade95fbf632db839ad04e5a8a3697cd43b6659e39 SHA512 06973f5a694562ec68bec3da843a58af0d117ec2e983b5cfbb5218b0335c1de948976e1b22facf379542d1175f2e2a47161241ebcfce3ecc70ccee6b7a72bee5
+EBUILD dask-2023.3.1.ebuild 2057 BLAKE2B a55850beb755d4e2072584d0bcb348b654d52e407e30e4afefb172e13772d95941e42421e66361e3593a1cbade95fbf632db839ad04e5a8a3697cd43b6659e39 SHA512 06973f5a694562ec68bec3da843a58af0d117ec2e983b5cfbb5218b0335c1de948976e1b22facf379542d1175f2e2a47161241ebcfce3ecc70ccee6b7a72bee5
 MISC metadata.xml 724 BLAKE2B 9af7553cec2b66228a21f146372d86b8d620048d68f94c1fd09006c8ee7ddaa4e212c2a359b937a5ee37ac23df01e10af0796e8b4cf952237cb4c73a2dff7ca0 SHA512 89b83402c13b06f7adf10cd1cc08b96b90dbc2ca3b5c0c6c422b6e2394e03fd51346306479557c11fcfdbd4a81a574890f2367228ea38531b5f05c02a30b8dcb
diff --git a/dev-python/dask/dask-2023.3.1.ebuild b/dev-python/dask/dask-2023.3.1.ebuild
new file mode 100644
index 000000000000..718d091d9013
--- /dev/null
+++ b/dev-python/dask/dask-2023.3.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="
+	https://www.dask.org/
+	https://github.com/dask/dask/
+	https://pypi.org/project/dask/
+"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-1.2.0[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# more tests relying on -Werror
+	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
+	dask/array/tests/test_random.py::test_RandomState_only_funcs
+	# TODO
+	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
+	dask/tests/test_config.py::test__get_paths
+	dask/array/tests/test_linalg.py::test_solve_assume_a
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
+	# require sqlalchemy<2.0
+	dask/dataframe/io/tests/test_sql.py
+)
+
+src_prepare() {
+	# fails with sqlalchemy-2.0, even though we don't use it x_x
+	sed -i -e '/RemovedIn20Warning/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index 04ff976fc03f..2e6c6e66f59e 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -1,7 +1,4 @@
-AUX debugpy-1.6.1-unbundle-pydevd.patch 2908 BLAKE2B 2c9ef22ce4e00f8a7bafa4097bfbcaf4218195df9f6243233da2d713c819af40251d9a5b0d150a0d7e1615fa128ae36236aae0440791e6f5e1ccd6376f2c1192 SHA512 5f4938171f6edfbf093032ddd3711f112c90e350ca26287edc70cda0668aece98075ab34721e1734ba7c9e72c9a5df774e3683e230c15533e32dc9798329647f
 AUX debugpy-1.6.6-unbundle-pydevd.patch 2531 BLAKE2B c7cf5cc10a75393b191ab3ecd3137b2d4df30a0611b76fd18bf1822aa61c06ec912358afe6da420c1ace3314e12b57079cadb0deebeb19fc3242f75f7ef5860a SHA512 98d6557c516617273a1a75c5269733f02d55754078ba9a5137f9abdcddc58275a7ea451f290ecf809003abc614b0865d235a8b712caec71e3811911a4f231448
-DIST debugpy-1.6.3.gh.tar.gz 6697583 BLAKE2B 38138be3294615e78995575c8f8ad1f990733be90cfaf76197c714e84f179086501417cc2d64627d3a8ecd0fa451e14e3229bd14d02353bc7512e288e8d4f092 SHA512 c055351351f6705b7bbab93ec07abba09027f1f2a52d90a242f51b4eb6fec19821fbb251b8c8e80587d1333faa4c6d7cab5dead938e9739c5c45013af8ee46a7
 DIST debugpy-1.6.6.gh.tar.gz 6942488 BLAKE2B 18c6eee2322239e5cbbacf9431fa7480abcf14a68f290d2228edc8b2ead042e7b09d19ee5bcc60be32e8a6b0b34b925eaa8246991298744f3ca74d4ed2ea3f3e SHA512 1a209bfd702d5f0649ce50b0910023e295953dd39cefdefb0b5af1d6023e629a727610789cd244e656bdf4276cee957fa463506ddaca603ab3ee85cc250dc212
-EBUILD debugpy-1.6.3.ebuild 1145 BLAKE2B a3c641fab5ea9ffdc1ac452fcc83810a02b48fec1adbe7cd85d1296eddcced63a1ba1601efc4671f3924c7384b5df7200dae1c8d215b373e4508d4604648ce2d SHA512 779369fcbfa80d0b85a4d9ac08c87b406599b07018e439aa8c2d8be1d4f99d3086459f48b1052a1eaab49de8f0004611e849427b28a54d4b34629731e58d936d
-EBUILD debugpy-1.6.6.ebuild 1153 BLAKE2B e0687e6ba401b4bd49de9684dacbdd31aa485b308f20325d434f961570ed913efeb902c51018719ed511e5ba3ae808104d796ba87a9cff97d56e7162f594c6a8 SHA512 f84b9f6ff46bd39338072796f465889ebab5f8b124c590e35f1babe72300ede342627b75b276b2c40b7d4c85915237d174a5b12751fbeda93699d8bae17e9810
+EBUILD debugpy-1.6.6.ebuild 1145 BLAKE2B c9fab7600289a7c493412da331daf21d570536187d44ee0f9985a7007393413643e1a28f51e71f22430b58646140cc08aea05eaf227fd47cb22e50ba7affad07 SHA512 a80aea8f84167cfbc8a54dcb183f7ce71cba4e6ab288351223c83820aaa68a0f60d56f97cbe5499163712130ea3689d6bb8b0de3b009f829a5fc61be3c0e979c
 MISC metadata.xml 508 BLAKE2B f5af1472be02222c1eb89246c4c4b782aaf5de8dd785aa983bbee6df69982b96c276310480a7ffbf2ac0105268507474d3b0823fc9e0bff89acfe648a2cc490f SHA512 d4697748bc79f4c684dd3bf58e52b211e8ba7816041840e705b896f2731a1a0518a01d7b7cca5e441bbc88e6eb272175c26681517873883068c4fe1bc864c09b
diff --git a/dev-python/debugpy/debugpy-1.6.3.ebuild b/dev-python/debugpy/debugpy-1.6.3.ebuild
deleted file mode 100644
index 9f7bbc8501a4..000000000000
--- a/dev-python/debugpy/debugpy-1.6.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
-HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
-SRC_URI="
-	https://github.com/microsoft/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# This is completely broken
-RESTRICT="test"
-
-RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.1-unbundle-pydevd.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Drop unnecessary and unrecognized option
-	# __main__.py: error: unrecognized arguments: -n8
-	# Do not timeout
-	sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
-
-	# Unbundle dev-python/pydevd
-	rm -r src/debugpy/_vendored tests/tests/test_vendoring.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/debugpy/debugpy-1.6.6.ebuild b/dev-python/debugpy/debugpy-1.6.6.ebuild
index 8579d79609a8..1d59edda4b4d 100644
--- a/dev-python/debugpy/debugpy-1.6.6.ebuild
+++ b/dev-python/debugpy/debugpy-1.6.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 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"
 
 # This is completely broken
 RESTRICT="test"
diff --git a/dev-python/debugpy/files/debugpy-1.6.1-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.6.1-unbundle-pydevd.patch
deleted file mode 100644
index c8ebe384349d..000000000000
--- a/dev-python/debugpy/files/debugpy-1.6.1-unbundle-pydevd.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -8,7 +8,6 @@ exclude = '''
- ( __pycache__
- | ^/.tox
- | ^/versioneer.py
--| ^/src/debugpy/_vendored
- | ^/src/debugpy/_version.py
- )
- '''
---- a/setup.py
-+++ b/setup.py
-@@ -18,12 +18,10 @@ del sys.path[0]
- 
- sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))
- import debugpy
--import debugpy._vendored
- 
- del sys.path[0]
- 
- 
--PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")
- DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))
- 
- 
-@@ -33,27 +31,6 @@ def get_buildplatform():
-     return None
- 
- 
--def cython_build():
--    print("Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)")
--    subprocess.call(
--        [
--            sys.executable,
--            os.path.join(PYDEVD_ROOT, "setup_pydevd_cython.py"),
--            "build_ext",
--            "-i",
--        ]
--    )
--
--
--def iter_vendored_files():
--    # Add pydevd files as data files for this package. They are not
--    # treated as a package of their own, because we don't actually
--    # want to provide pydevd - just use our own copy internally.
--    for project in debugpy._vendored.list_all():
--        for filename in debugpy._vendored.iter_packaging_files(project):
--            yield filename
--
--
- # bdist_wheel determines whether the package is pure or not based on ext_modules.
- # However, all pydevd native modules are prebuilt and packaged as data, so they
- # should not be in the list.
-@@ -133,8 +110,6 @@ with open("DESCRIPTION.md", "r") as fh:
- 
- 
- if __name__ == "__main__":
--    if not os.getenv("SKIP_CYTHON_BUILD"):
--        cython_build()
- 
-     extras = {}
-     platforms = get_buildplatform()
-@@ -179,11 +154,9 @@ if __name__ == "__main__":
-             "debugpy.common",
-             "debugpy.launcher",
-             "debugpy.server",
--            "debugpy._vendored",
-         ],
-         package_data={
-             "debugpy": ["ThirdPartyNotices.txt"],
--            "debugpy._vendored": list(iter_vendored_files()),
-         },
-         ext_modules=ExtModules(),
-         has_ext_modules=lambda: True,
---- a/src/debugpy/server/__init__.py
-+++ b/src/debugpy/server/__init__.py
-@@ -1,7 +1,3 @@
- # Copyright (c) Microsoft Corporation. All rights reserved.
- # Licensed under the MIT License. See LICENSE in the project root
- # for license information.
--
--# "force_pydevd" must be imported first to ensure (via side effects)
--# that the debugpy-vendored copy of pydevd gets used.
--import debugpy._vendored.force_pydevd  # noqa
---- a/src/debugpy/server/attach_pid_injected.py
-+++ b/src/debugpy/server/attach_pid_injected.py
-@@ -31,7 +31,6 @@ def attach(setup):
-                 pydevd_attach_to_process_path = os.path.join(
-                     _debugpy_dir,
-                     "debugpy",
--                    "_vendored",
-                     "pydevd",
-                     "pydevd_attach_to_process",
-                 )
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index 42f68a962730..732429c1e51b 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,5 +1,7 @@
 DIST dkimpy-1.0.5.tar.gz 59799 BLAKE2B 317e7a9e7ad1efdbbc7f4f1ce7efca70f3be4272ead3761d8bbde14d19e9f3a90af96d7bff5fba5b612cecaa166b58da4617e39a13276d0982ea38809f808b4d SHA512 af72a56a777b23318af8f8014bad03cadb93cc39f0b8c2062e15f3e5ca77a13be6f49664c9745f1fe97c592be5a63c4b0a3942da2c2c6eaa486137fdbb96528f
 DIST dkimpy-1.1.0.tar.gz 66326 BLAKE2B 3af2ab63351c117b7fa0fd2c7a2f2a98b2177511af61734d171fb69e25c5a3d629d95f8ba2832b66f57607ff447a4093ab8ebd58c931975e9ca0c1bab9469590 SHA512 d8c656d1adabbf8ef2121a36a848818ee9ce5ac9fe42c4b16ef50588870478989159f4ff3aa422ba0556a82763a9e78fde5e19195fe0b95176f2f4ff1d60c70e
+DIST dkimpy-1.1.1.tar.gz 66368 BLAKE2B 6b9107129a0857a384d90b9c7d3970177aa32edaaeb41d62dd4edc6fdf7e8c16e3160162aaed074f865d476dc3f7f20ad299f7034858c0fc59ef88c651552ae4 SHA512 46db739f48f5b3aa1605f12822bef61286767b8770685d5056fcebf8475f9cbc78265c792a0371226ffaa97a55703acc6f6ae63c44944cf29a392c8bf51d49b9
 EBUILD dkimpy-1.0.5-r1.ebuild 764 BLAKE2B 685f28d69261fddddc280e1cfd415006b4922c0a5d98693db4da248c875af4786aad094cbfad8268d732004b4eff003efadc654b871e5bcc572a54c33d0a09d2 SHA512 c612ba54b0e88755784ccfeaa77a1dddd07a4c97aaa7987133ff42ea482c53a9ee22fea0dbf6c62316df29b7dbcaf819cd15f36dffe252dda67089ac7e4daecf
 EBUILD dkimpy-1.1.0.ebuild 767 BLAKE2B 8960217a56f673459968760888226b9b4f6f98db17d268ce589e578661fa4ac2612fa1acb617d2c44f33bdaea5c2305392decb213fa1dab7281814c6020bf7c5 SHA512 ce8c5728bf2076458fbcc7270de55a43695899c5db046d3984e707c5da687a54a5fdfaeed394adbefa02ac26b51dc31015fc3c9071e8153faffcdf1125c681db
+EBUILD dkimpy-1.1.1.ebuild 767 BLAKE2B 8960217a56f673459968760888226b9b4f6f98db17d268ce589e578661fa4ac2612fa1acb617d2c44f33bdaea5c2305392decb213fa1dab7281814c6020bf7c5 SHA512 ce8c5728bf2076458fbcc7270de55a43695899c5db046d3984e707c5da687a54a5fdfaeed394adbefa02ac26b51dc31015fc3c9071e8153faffcdf1125c681db
 MISC metadata.xml 538 BLAKE2B c0b9cb73f84e5f3e6cb6653b0983a0ef5002ad9c1a201b36f6ccbfb150d15990820562b18eef385e571f024b4e44f8572b30eaea57e93df44bbb6105df7abd11 SHA512 1c650532a9c9152eef0803c1c29781095390aca93c036cc097dcf6b16ad0d5ff9938ed48cb12ab092d0df777fbb6f7ca6626be7dc10935ac2563332869e6d511
diff --git a/dev-python/dkimpy/dkimpy-1.1.1.ebuild b/dev-python/dkimpy/dkimpy-1.1.1.ebuild
new file mode 100644
index 000000000000..7a71236ad9dd
--- /dev/null
+++ b/dev-python/dkimpy/dkimpy-1.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="DKIM and ARC email signing and verification library"
+HOMEPAGE="
+	https://launchpad.net/dkimpy/
+	https://pypi.org/project/dkimpy/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/dnspython[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/authres[${PYTHON_USEDEP}]
+		dev-python/pynacl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "ARC support" dev-python/authres
+	optfeature "ed25519 capability" dev-python/pynacl
+	optfeature "asyncio support" dev-python/aiodns
+}
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index 90aa9c93f3bc..7e7385759d62 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-Babel-2.0.0.tar.gz 19588 BLAKE2B dbd5d6f3af38fad15a4eb6d674222473d673a9002ced21ce09a913e0bce3285b1eac9a5a85ce53c1dcebf648444164f33a5c790039a7d01184d45c7734dac05f SHA512 2ad8f80b450db0cab7dd57f46158e7e653556d60869acdb3c2469d42dceca3fa97237cc960986655091c84a1a67a057d72ed510787ccb065d171e6f35764cb1d
 DIST flask-babel-3.0.1.gh.tar.gz 20367 BLAKE2B 760b3ff9b867ad14f138b75e3e13c9d40a9dd4fab1dcef57c062677d6e52b31340403125f13427b6f57487609794176055f888a277eacc2323281f6899f115d9 SHA512 d189aac67f5671c3053efa1c8049fc364c031a77568db7a502d63e2ea09867c981c12669752f1524faecaddd4594ab064249f08b8af50dfde7267322b50ed2af
-EBUILD flask-babel-2.0.0-r1.ebuild 971 BLAKE2B f2c784051073409b796d4f9a3842c3b20607586f162a64e83a6d0e75e6ccb037a64359414aa44a876effa0e429f41f448827f4b56df51fd331a3bcac729f9b7d SHA512 c4179c8271ea7bf7efcf1e38a5fa017ae54a775aed7fbd1cede6b6efea259b4382b2a11c5ec555e3d52f051798a51ab83503f1a2bd68484cd8c6107ac6c360c7
-EBUILD flask-babel-3.0.1-r1.ebuild 1105 BLAKE2B 4fae40e37ab7437013b0cf8052151abf7e2c72aab8b223f993981cbf0fe6cf745e5246349f4fffcde9648691097d4dc0162adcb6dd2f9b7484501f0e014badb7 SHA512 9f0fe2ab70d592c491972b34c88269ff05057dc2ba38ecdf69aadb633180a651135568721ee53701eb6e4069a76fb349e8f1ab40187fe803fc8c1797155647b2
+EBUILD flask-babel-3.0.1-r1.ebuild 1102 BLAKE2B e54576af6dbee210a584c9bf1be331b64beb61cf4d7748e85be1c63fbf97bcc74594c82cf4ce3000fb6da2857df69f1a601d071b9d72f78cda313f5f76dbe9d9 SHA512 a4f117c5df643a2389cd9084b18c2a107eea3bc90615338c58756091066fa77356e9839d9e179f2373e920fce96601a3b91a132d7a462d56f33e07ba0d03477d
 MISC metadata.xml 475 BLAKE2B 4c2f62351a8c1c7d90b9089b0dd4257519c3b284b1c3af4209083be77a5d8c0e1f537aeaa51da44bd367c2a691046de5e30fcfb0ae7702cff3c4687d7e22c2eb SHA512 4f5365d5da849e7f7a083e5813f6c89b16b6241ad3a5c9b4873c76a952c0684387df9b9abcd8cbcda3905ea4bc41cfc3847dac41b5ab318300bc8b5da2149918
diff --git a/dev-python/flask-babel/flask-babel-2.0.0-r1.ebuild b/dev-python/flask-babel/flask-babel-2.0.0-r1.ebuild
deleted file mode 100644
index 107640f02ab5..000000000000
--- a/dev-python/flask-babel/flask-babel-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-MY_PN="Flask-Babel"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz"
-HOMEPAGE="
-	https://python-babel.github.io/flask-babel/
-	https://github.com/python-babel/flask-babel/
-	https://pypi.org/project/Flask-Babel/
-"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
diff --git a/dev-python/flask-babel/flask-babel-3.0.1-r1.ebuild b/dev-python/flask-babel/flask-babel-3.0.1-r1.ebuild
index 914d55fc495d..df53913bec59 100644
--- a/dev-python/flask-babel/flask-babel-3.0.1-r1.ebuild
+++ b/dev-python/flask-babel/flask-babel-3.0.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	<dev-python/Babel-3[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 109f2f64183f..9ee2d3a02efc 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -3,5 +3,5 @@ DIST ipykernel-6.21.2.tar.gz 150365 BLAKE2B e1bc29018459738a3358af2d422539702801
 DIST ipykernel-6.21.3.tar.gz 150659 BLAKE2B 1fd0f0994b0065c662611bf629a4a755a2285b66f9d1e60bcc46fc84a445c7af6b882e09be2c4d26e8ca524a4ccda8534d04e357ec575a8fc034f0f4a437b750 SHA512 68e7bbae60e07805590e00acb186b14ef3c21426db9c49d04b93cb38083a7c5c20b177b72743674224741d8ca946604e8ae733f26d11738b7d99fabdee642064
 EBUILD ipykernel-6.20.2.ebuild 2200 BLAKE2B c19bf30bd6f63deef8ff8fc40b8dc820d54e6a4d920c601390e2594d88d7d4a9eae9d589e2ba770bfe63c183db293cadd665641dc0a13dfc4053b4d1e3bd7072 SHA512 fb6523fef893723dbba507df1de115693b4a51418e8dca28893448644c2e93f7ad34054dce0241bcce250e3ddc6656c3703cdf14f5f2736784444f6af8940f04
 EBUILD ipykernel-6.21.2.ebuild 2292 BLAKE2B af8f60ceed3e9686f3ec213b303c5ffdf59b258dbeb5a2d84f85abb96423a842754dbae89662855183530de8568f34307a05e327f2433b79bcec0c945e7af66f SHA512 9a2b354dcf866626dc55cf2c7d453468d53741ab36f4143d33b714f241f01b10fd2ba09cc9d08f924dfc1a8cb715f63c629a08b48ad04f3dd6a4868b1a63c966
-EBUILD ipykernel-6.21.3.ebuild 2299 BLAKE2B 0f3205b6bbc67bd6af706ffd42a448a582d3a386f7efd1eeefbf98f63c15950855897f62ef76125208ebc35214e63c7a6df138cd292b634316b651549b0be9d0 SHA512 cf73265c8d5cd6b6d5e29afd3a2340e7ebe6426dddc39fd0579430c7acf69931b7351fee9fdfe8665f6fc9783bfe07d1d35b45f85203a7d9c200c0cfa360ce68
+EBUILD ipykernel-6.21.3.ebuild 2305 BLAKE2B f5164df83aa162bf2fb5a869c508c8e73efa0c695efca8b1c426e39ae56be2a9fc727c7a1cf6460cfeafe9560604ab01bad52f00a2a62dbf864dc93dc18db2aa SHA512 20364a07d5098555e0fb2ef8eb656cf37b0faec1b984b94d058de4c209b9cc8ea974ce89f33833cf4b7f9d1aa06f754643fff398403e2856bd8f35082a05e7a3
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.21.3.ebuild b/dev-python/ipykernel/ipykernel-6.21.3.ebuild
index 093bf5971450..2dd7bdd27b87 100644
--- a/dev-python/ipykernel/ipykernel-6.21.3.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.21.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 96e4d4633478..03f4b7875fa1 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,5 +1,3 @@
-DIST isort-5.11.4.gh.tar.gz 733368 BLAKE2B 82a9738cf48fd662c6128c7f58766e6b204d93fee73cbdd0d84850a62a1a714322dc6c31429a3b043401a963178c4aa3120e98c8f590f24799b75a92f9427798 SHA512 fd7dd8938cc700fa4a295bf1aabb9dc479e1b837e443e3210e4f2234316e207293eeb6f666b49ed2bc4f92942b3185de64439ce86ece201093072fee905766a8
 DIST isort-5.12.0.gh.tar.gz 743141 BLAKE2B a7f8deef02b57162eebe15b35e71382c654372a80dedba7eee63d0c9b0899c053fb517401585af17014db3cf9ed44089f6cbd1e2b0ed17393cc667de06bfbddd SHA512 ceb861d1a077be6fecd82fde775bded1fb676c77135e2004c92a6221762e0b3ff6c1071d17957e1add4062ec26ba6c9264e4905724f2c659339cbd0601f4b45e
-EBUILD isort-5.11.4.ebuild 1707 BLAKE2B 2a9e775d26c979fb5ca3fcf10604447b44497a41b95eb869bbbd87ca61a84742a99afafe9516ed5c747b171b5d55bbb1d3c156a24da9abd16c1716e541f889b5 SHA512 e0e5db706b7082c174cbb8aebb696897812a06f90bfde10f35bc97b4031e8178f7a1ad3e860981b273da53ca13d042c6592c6206dad01a1e69cfdfa415b0ebf7
-EBUILD isort-5.12.0.ebuild 1471 BLAKE2B 86834dcb3987829735512c126537c1921f41e37ee46914e67e5ae944b2c5f6627649397c45d54b301c059ff3aece8583089679330d08662fde22401edfc58402 SHA512 e0f09fd4e455248ea3b027d8907e84269fb102a89fec22c75b9293823c629a256f2c1e03498b3c1415ad27856549f101c062f00473d5beb1481532fb0eb9d4bf
+EBUILD isort-5.12.0.ebuild 1463 BLAKE2B 0bf065e04d0b34b77de3a9a7fcbee63ab046c3f21c904f8ccc0062c6ed8bc68f347239867a16dea1b32b3233a3c3483bf6e35dd0f38dc9523ceedf3f5e24901a SHA512 6f25c931b5b30bccc55b53f7cbb0192bc552c425557d0c36efd3e7f8bafa73dbf1782a866a5d8e59e0ccc5d87de70e0fda460e948a5fd84ee01aa68df157a115
 MISC metadata.xml 574 BLAKE2B db8aac55351f15190d9b71508268f26b12a781b3b4f0f6836a30efc954b46b71da496129a9641655db483730435b44a5c5283132521dc3cc93279c57735a1ba4 SHA512 c8116bf66155ffeb7ac8d68822559e18252210dae604b4984aa5e6a3fb7161d785cbd235dc6f656513b5bab326f6e579489245bcef9d0a5dfadc34d7477758fb
diff --git a/dev-python/isort/isort-5.11.4.ebuild b/dev-python/isort/isort-5.11.4.ebuild
deleted file mode 100644
index 426bfd0652b3..000000000000
--- a/dev-python/isort/isort-5.11.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="
-	https://github.com/PyCQA/isort/
-	https://pypi.org/project/isort/
-"
-SRC_URI="
-	https://github.com/PyCQA/isort/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/natsort[${PYTHON_USEDEP}]
-		dev-python/pylama[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unbundle tomli
-	sed -i -e 's:from ._vendored ::' isort/settings.py || die
-	rm -r isort/_vendored || die
-	# leftover toml import used to determine .toml support
-	sed -i -e 's:import toml:toml = True:' tests/unit/test_isort.py || die
-	# syntax error that triggers with new poetry-core
-	sed -i -e 's:pip-shims<=0.3.4:pip-shims:' pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	# Install necessary plugins
-	local p
-	for p in example*/; do
-		pushd "${p}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local EPYTEST_IGNORE=(
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-	)
-	epytest tests/unit
-}
diff --git a/dev-python/isort/isort-5.12.0.ebuild b/dev-python/isort/isort-5.12.0.ebuild
index 131c8a595db9..c9fcff720b34 100644
--- a/dev-python/isort/isort-5.12.0.ebuild
+++ b/dev-python/isort/isort-5.12.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 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="
 	dev-python/tomli[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 33dfc19df8dd..f6c160ffe371 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -2,5 +2,5 @@ AUX jupyter_client-7.0.6-test-timeout.patch 1270 BLAKE2B c039b22d8f0c2893738a1b8
 DIST jupyter_client-7.4.9.tar.gz 329115 BLAKE2B 8b43b237ac79bc51e40e403cf4a3ada18d03437094dc1dd9b9988adb1bcfbc56ba4b2373d3dd858df583b723723127f934c01544f3d6a576886b012364674f0f SHA512 0de91309ffddd2da50ae69bff4f7ecd741398171982f66488e6367d78388c6844b353bed1834684fa4af890364120ce09f2fa6b3ed7778c501058ae558439969
 DIST jupyter_client-8.0.3.tar.gz 334366 BLAKE2B 04ea6e8206fe0b741da1ba0d17cb559657824c20f4fcff48fd0ce4287dce7da9a151000e7a0f08cbf3fa6b1868d8d7e424d49d70a258283466350946f4ce5220 SHA512 27eca49e44c13d819624c6ab596b24b9b469f82a788920eb4db02cee43c2efdf22ea68bf282f5f4ca28d38c9238d51d70d7aa214f2c3b8f6c2a7ebcaf12d567c
 EBUILD jupyter_client-7.4.9.ebuild 1209 BLAKE2B 8889fec0b7f86f01bae55a528e69c7b04804cf11c7b9782c9ef334c291b0c2adf2750193b47dbdd4fe0295e7ffb78e36825e06411a0f9c2a197e3d33967c7588 SHA512 de28921c90362a4109b783a16dd4a82f965c9e4debd2c6b22b39185e75833c44b15854b32b278de3b6c316458019732dbe0a462d38706061fdc87e75d07137d6
-EBUILD jupyter_client-8.0.3.ebuild 1297 BLAKE2B 7b4514ff0c2c3b38ba9530af6da5ca0363c319c884678accace75f8d02450d6c1fbbdcbe75c317652473b0b7f24cfef449b52bb0f7e27600cef39f9683c2f454 SHA512 4c51badcc21f0dd9a545fb6af92f57f8cef34af53aa13071dd1f26ead24fbd5cad97d136fd51393bdd4b3c8011b3162def19d2e55683ec480f6b59f4c7335cce
+EBUILD jupyter_client-8.0.3.ebuild 1303 BLAKE2B 98902b9a6793fc934fe47f8f068b8253bd84d1da78d853a5ce40c596a6066eb2eabde6e3505c4b8a6b8f3b49aa955345b6a118cae189f92dbea591fcbb88fb12 SHA512 2d998e0189294de3d7958fb9ba6b488b01687910453c33f7f14ccc02ff4e565bb7c4ad8cfcc07371540c8e7e7755cb75944118d7c6471147076d94a1026c8f46
 MISC metadata.xml 844 BLAKE2B 8beea01f144f8e28b58b1bd4d0d2a32eda4b5e50e479c83ed940cd6894d581aa22418bc2733910465cb6980134c3a29b63a6e31f595d037b9492337285837ac6 SHA512 73f427cc561e728c6f941052a4b6f9c6ec5c9d6ba3bb601bc58313687dfc8d6ed3602e1fb2f7f0ea00aec4360c8c1200334675917d22092ed79585b117865ebd
diff --git a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild b/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
index eaeed6dd9ee5..70aa93d089d3 100644
--- a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/jupyter_core-5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_server_mathjax/Manifest b/dev-python/jupyter_server_mathjax/Manifest
index 8a7db55b12c5..ec681b818b4a 100644
--- a/dev-python/jupyter_server_mathjax/Manifest
+++ b/dev-python/jupyter_server_mathjax/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server_mathjax-0.2.6.tar.gz 2648665 BLAKE2B 079108842d1c62b58c12e5466736508a4002fcc977acdbb1ea0c35205f685f53b985038af7df1d58ab188eadf6be85c59cc3eed4012a92d4353d5b77424935ea SHA512 a87a73471c470a60fae67d3a2dc7e163c39fc2ce62b357fd6eaa030ffcf63b44106ef35377795e58c5f89a847648c7fedfcace68ad9aef8efa45e71a2fd1a79c
-EBUILD jupyter_server_mathjax-0.2.6.ebuild 1072 BLAKE2B 007654bdcb590a6e4d9de0ee1cc8ff35f300f7d52c673551a2ee5617de0e5cf9813666d7bf42fb10aafb83c5f66b56deba35c16ab9ed481925b56a6ee853aaa4 SHA512 f598a3257e42d07a518a41b548fc5298d50528ba58d76185aebd98b839f487ee1953ed8738607115e6fbb37b116c7b7ba6a3cd3ca93382e7f351e0f8369be1a3
+EBUILD jupyter_server_mathjax-0.2.6.ebuild 1079 BLAKE2B 58a63b4f37f9dce2212e84f62c2c38460ceb863a64cadcc543161b820d0b365d82636215f8ae1a1e3c44766ca751ac48de28d013eb5a4662427573586ec66344 SHA512 9546ca7f42e0a1a9119e23a409c898bdc7b97e8e8229bf94522f4c9693e601c0f1e4fc818721ea7a84198363284469a6bc5f4c1c696382f3c5bd414f1f8ef703
 MISC metadata.xml 453 BLAKE2B 7a4ebaf263ff85d75f9ceac762692040bac146e147e7d01f5464132f3c518f2141c884cc0c447388e863651929727fe1524971925bcee7fad92aa5d33febf90e SHA512 399c94bc19b4144701f44638ea0fde80c366750131c8952a9c8c5f8554275e8ff0be72c3ad08335facb3719c0f8b9c9027ab2f60b3897e5e9791eb3ab95daa17
diff --git a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
index f6e236598892..acf10cb91b65 100644
--- a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
+++ b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	>=dev-python/jupyter_server-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index b54062f7a4c3..2c64f10c4cea 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,5 +1,3 @@
-DIST mistune-2.0.4.tar.gz 75977 BLAKE2B f5c29a211695897240664ff9ce7891ce81fec11f6a2e3865cf07e796ddf8e5664a4055f887318e53b315ac3bbdc90a3d0976ed1fe5b74b2f7812dffa29a57bda SHA512 4d000c5791c29069b5f252f2aa5d361eb9cdf717d33f8d66dee8b4aa3bfe1242a572af63ca3dfd57324fac457fb9b5a9dff18e7da15f9036becd14cb27882dba
 DIST mistune-2.0.5.tar.gz 75854 BLAKE2B 3a69d585a5c311a81fd5259574233f514c745fa675b675810c48392cf8f52608d097ae2712a5272f94146b0fcef6f4f77b86fc78115ddeff1d1e7e08a589a7f2 SHA512 109447977a441ebbedfca2abbe62415139d94c48ae56c3d8cae04df3f93ccd1e8333b3dbb8bf61a2096b903df6c3aab2fadd0893fb82815416f17555465e98c7
-EBUILD mistune-2.0.4.ebuild 589 BLAKE2B b821202f0378a71334db2759d45c165dd0c66e14e8675bb1a64b4d610b0ffe7a30e9a449019aac9ece8905769d6be19288eb6baf50e797d13a8918d9e575a771 SHA512 f67232e34f3d64f1dfeb900d3414d8801d82b22816e554ef5dc056fbbfd47fcaecf7916524312f346449cd943752510cb7f2d45ef85d9ff6b9d4c8d70aa55229
-EBUILD mistune-2.0.5.ebuild 550 BLAKE2B 6b11680ad0759ed5ff39eb9903c297443864f9d7f0c73bfc9af79a85fd6e88669495955e92a94df9d0eb03d95a681f9c96757269003999ca8830149336ae410b SHA512 bf772fd7f90fa74a3d8a2fe3a4e5bdae1db0e88a7c90ff21f1b7ccb0e4ba44e51a77b96a3911779e97de4df59559808cd8d73468ffe4601e4bb7a1b067bba196
+EBUILD mistune-2.0.5.ebuild 542 BLAKE2B 43a3b9503b0eff0bfbba19c334b13c3085f61909315f03bc99cfd30ed05d2c320403df1a423c71ddcd2afa44daffa65072425d70dfdd3322e6b40d30d8790c91 SHA512 06d90bdf199ab5030e08128170c40f7b9cf22feb7eea6661b2f7bbfe060147fec530c8adae03a63c9dbdc4fe9a353362e2dabfb38902d7240bc025e9e8e1acf9
 MISC metadata.xml 403 BLAKE2B ed684a2a6de8b40c202467abc3277bfd280cff4441bd265b2ceb36105a4d3315a5147db7ec555a01c7cdd5c2ed26521254c75586cd44edbeaf0c59766800fc71 SHA512 a14b77e8fca2f7c7c51803f15a53ab82198d5a0682f7ebc53d5565e5b50d22c2ae196607da6fc67ef2c07c11a5469d394b1753546c270735dfa56a99bffc0f28
diff --git a/dev-python/mistune/mistune-2.0.4.ebuild b/dev-python/mistune/mistune-2.0.4.ebuild
deleted file mode 100644
index 653d05e84da1..000000000000
--- a/dev-python/mistune/mistune-2.0.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The fastest markdown parser in pure Python"
-HOMEPAGE="
-	https://github.com/lepture/mistune/
-	https://pypi.org/project/mistune/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mistune/mistune-2.0.5.ebuild b/dev-python/mistune/mistune-2.0.5.ebuild
index deb7384cc355..38b8aaa5b410 100644
--- a/dev-python/mistune/mistune-2.0.5.ebuild
+++ b/dev-python/mistune/mistune-2.0.5.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index c4e336ff32d1..472221971ce9 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,5 +1,3 @@
-DIST mpmath-1.2.1.tar.gz 2135690 BLAKE2B a21e0ef04a025f23e32dad5839db411708266c6cf3408e97ec5c995f197b14f446c1d328bd2e9f50e1c48a2e08239ef7908fcc3aab8659118fc1e0e78106a47e SHA512 2dd908bca26162adcdce0493146d009e04d3d96db965ff2207c332504020fa6f5a5e2af97d38e8fb3e7442a26c1e93a756a8d93b378da720ab7c07753f700d10
-DIST mpmath-1.3.0.tar.gz 2136844 BLAKE2B 42b121896e1bcffe459ac5591a4e0ec41fdd708d5518b1a76bf4cc434f34e5801d77207ea9769d11b6746340aa32a84b58e089c81b5163b48a80ccc6ecd0a345 SHA512 ec703e661323035e3c973fc2e52206e793f6182ed9897e5a483cb35a22421d7869df850cdd89fc1ef4e1bb28b17b4914447116dbeed136a687e582cce0bf9e42
-EBUILD mpmath-1.2.1.ebuild 959 BLAKE2B a044500435ec937b16101674f10b3f84f44da60c9d86b03b4592b68cd3475c92d83f5b25f5e655cccd28f02b57a5df701d72f3d08d1ef91d241253d3c2813f6c SHA512 4c7e7ce6bffdb4f62d627c11d3ef95018aa1f44d6d95814dcbcf985e5839a6f5f98b2025b28428e2d507053044465329c1f6a3c2da880df62163479bce81a884
-EBUILD mpmath-1.3.0.ebuild 843 BLAKE2B d7637f54834dbbd2c687270ae76903286fece5d23bae8e8f27960646f837f9c9665c84d7dd66a1ef8ea4b9a6561e4263d3862a57eeb354f8007038b0a661f5f8 SHA512 ddad39adf27783eae436db89852d2012e5e9f0ed6796d5bf7d1a768ec08e668b6859f6d03343fca6bfe36d15d2f8a90af8ce1c80a82b861a3925b22a2bd62051
-MISC metadata.xml 732 BLAKE2B ea477c6ec344dd4d81872b771fda360f78739c0853ff45f2b3a32569f5cab76cd73233fbe3380ae19e10da61b172fba6f35db0e55d2b0af788da47167f320871 SHA512 7525d8d88ebcc5063f6c171b825c9d115c3c7223f49be28eae80d00b66e2a281060f28d5fda9c547833f3c0b0f3d2667434acfd52a30fdadb99193afb170769d
+DIST mpmath-1.3.0.tar.gz 508106 BLAKE2B 9d4eebbbb6788dd3ee45c8c30068ef3512043dd09ab626cbaf69b0f6bdf057a6e8c53c34e3dda7627db923f0d536a0bebf83916d8942f4dde9546bb8e0046f33 SHA512 a68028150095d743eae9669a0f70cbe6b7bcb4d27dfad6b1a96575f0885ec7306459a2a464117bab18779883ee8b4293502b4bd0ebd8672767e1d08d38f8b202
+EBUILD mpmath-1.3.0.ebuild 830 BLAKE2B ff1846282ede75cc4c071f640ba02ff19cab57ee03674cdddc0e40f8f18e36949d1494b605e843e7609de6b98c6b16444788d368fac783db3007fd0f4d9593be SHA512 13a6d9d73bb378a2ef79df736921f7e307428d75afba9b13d77fee602a2c440829e4febc0a50c53be140108a19b432755daffec62187e4b672ee3191cfcd757d
+MISC metadata.xml 721 BLAKE2B 45ab45adcc349dc01eb416f63384ec6aec0d7d7464823e1fe0bf9c41b58f1e982a37e75c4c4766eab34b0ab2503617986889ff259b425b2846906f8c412049dd SHA512 2a8f981893c5d2d00893a42b78e53c0eb3b34e655b2c4d4b5e6167c5b4b17c1c47a8f17ccc3b03ccb4594b29940f3f6e46ad227d00f8dc2a5d2be243e7222615
diff --git a/dev-python/mpmath/metadata.xml b/dev-python/mpmath/metadata.xml
index 289a27dddbc4..1d77e6ff1a98 100644
--- a/dev-python/mpmath/metadata.xml
+++ b/dev-python/mpmath/metadata.xml
@@ -19,6 +19,6 @@
 	</use>
 	<upstream>
 		<remote-id type="pypi">mpmath</remote-id>
-		<remote-id type="github">fredrik-johansson/mpmath</remote-id>
+		<remote-id type="github">mpmath/mpmath</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mpmath/mpmath-1.2.1.ebuild b/dev-python/mpmath/mpmath-1.2.1.ebuild
deleted file mode 100644
index a06b4fac1b15..000000000000
--- a/dev-python/mpmath/mpmath-1.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
-HOMEPAGE="https://mpmath.org/"
-SRC_URI="https://github.com/fredrik-johansson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="gmp matplotlib"
-
-RDEPEND="
-	gmp? ( dev-python/gmpy[${PYTHON_USEDEP}] )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-	distutils-r1_src_configure
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" mpmath/tests/runtests.py -local || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/mpmath/mpmath-1.3.0.ebuild b/dev-python/mpmath/mpmath-1.3.0.ebuild
index ddc293e2387e..98fddbe53c57 100644
--- a/dev-python/mpmath/mpmath-1.3.0.ebuild
+++ b/dev-python/mpmath/mpmath-1.3.0.ebuild
@@ -5,15 +5,19 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 virtualx
+
+inherit distutils-r1 pypi virtualx
 
 DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
-HOMEPAGE="https://mpmath.org/"
-SRC_URI="https://github.com/fredrik-johansson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://mpmath.org/
+	https://github.com/mpmath/mpmath/
+	https://pypi.org/project/mpmath/
+"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gmp matplotlib"
 
 RDEPEND="
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index f74e5be04bb6..45d9e59466ba 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -4,6 +4,6 @@ DIST mypy-1.0.1.gh.tar.gz 2763553 BLAKE2B d8d2b6cd3ff386ce0f78d32f81f3f631bbb8ff
 DIST mypy-1.1.1.gh.tar.gz 2787425 BLAKE2B e72a4dcb41107e6438b360bb342b7ac42778ab3d6bd557d7fe2a9f92f6427d94d782661ff80bee36aafa676d0cc1553bcfd74cf3e413d4afa525fd8e93e9b87e SHA512 fcd50366837d005f255e2e8ecf20c843374a5d7670d714d1f8cfdaef1c6d44e37e7e84ba91fd1d49513e3aeffc8d5c0ab40ddd7bc9fced75082c9fea60d38f6a
 EBUILD mypy-0.991.ebuild 1763 BLAKE2B 92329440451f1324563d0a1f11d84c1037271a6691048f6132de70268991d9f9080a3447d9172c3a5292c65bf6d693c66176fa2ce7d76afd542f60642f9f8d34 SHA512 62506ce8a43b1af1896d742104146a9952ee31429d704ff14fba96456849195a94560fb5f1aec342472d1ccd2a2a688336f3b2b8c5417ca013d65420b98f7e43
 EBUILD mypy-1.0.0.ebuild 1772 BLAKE2B ed954a628ba6f5155642d519e7b0750764b7619c5f1ea1fa53f2cf3a73c29e75595358871b490bc77cc5d2798cfbf31e36abfac2b1d2dd5842857448cabbbb92 SHA512 9ed5a549ace985a257025be8897d4146bdbc007a19f53115d198afdcb77d0656a3ab46e1e1d1e5dcff549076e8d8da8e934149a2889935b05f631e50d8bd8578
-EBUILD mypy-1.0.1.ebuild 1781 BLAKE2B b2d9f7c39290f9c90b6289779c9571466f9ba639b92d7ad5b637d496d64e334da2e2173dcd17e24ba561bdcf1cef1f01454d26dc4b26493f0060db63cd9bc883 SHA512 46528ff19d204b976205823f0c097a8c3f3fa62d627c4e0608b69c8f253fcba25916a330bab4e4c0eb83914ded09356d96defa79fb556fa87c2d58633a64a032
+EBUILD mypy-1.0.1.ebuild 1775 BLAKE2B 46ddb484af3a3259c9cc36989eafe3985d6cb22f8a9b8729fe5ec68851d93ed45cad76f1428cb53414a0ff7c70ae3bb381fef609232b214912b1372086ca4ce5 SHA512 cdeebbacd96e74b93b156f038b000a6625f93ec1fdd0904869bebb0a1b954ddbeed0afc23232d9aa5b5eb105d5c6d33edd1c39603608707f6f410cb2aec1c75b
 EBUILD mypy-1.1.1.ebuild 1730 BLAKE2B d551dcf3e6533016345a05ab95a050df3fd2bef314cfa0f804637507b38c97d82097ae497d86eb298e7433ad522502197a7ba66355cea1f2515d408abe1f5be9 SHA512 910864eccebd73e17b097fff17a11b04b63e84b361332a053aecee2d7d86618573f4492bf192c7034eb8ecbf45223fee6d986a04619e3c7e234ad09d171d04fa
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-1.0.1.ebuild b/dev-python/mypy/mypy-1.0.1.ebuild
index ea354636609f..2581f57bdb52 100644
--- a/dev-python/mypy/mypy-1.0.1.ebuild
+++ b/dev-python/mypy/mypy-1.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index 9d75a97734d6..5cd6c59aed6c 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -3,5 +3,5 @@ DIST mypy_extensions-0.4.4.gh.tar.gz 5555 BLAKE2B 89852229a2c37994aac1bdb0026a14
 DIST mypy_extensions-1.0.0.gh.tar.gz 6097 BLAKE2B 099616ee0bacad62d9ce642c3adb1eebe27546f7c567d1e0fa6ec04d9e6cbcda2966fff9769940cfda8b7d6cc9f33100af9d6f416ab2def26079668a16c354b3 SHA512 ac89a9f60a2c3df3457d5a6ab7ed47b72dd173646ef57f1450556051617e62046405a69fadeb40d2c24e68ce6ffed56d9182365e3203477facdc935e1a807847
 EBUILD mypy_extensions-0.4.3-r2.ebuild 790 BLAKE2B 2faf75075712f075aff24803d8a49fd7fc357e3f6de384ebc00e36133d6c98df133d3da08f8c8a4a0d742e279e20e677df5dc2c650068dc0c5ed021a50c03175 SHA512 d6fcb1d70eba7bee40e3cb4dadc2643e209cc8ca5e6946e82c65a4a0a59fba76f1f51c011c67bcb626e7c6369e2dba6a11ecba5ec5b61167a76a0fbc05a3a01b
 EBUILD mypy_extensions-0.4.4.ebuild 805 BLAKE2B 3f2ab1c61051fff660c715f021daf38e1a89dc10b6f1ed4f32bdddd72539dc08cb9c63435bcb521895dc63dc614df5ebdf5775d1cc163c0cac05ce587b45933e SHA512 55657958647a766b0e1b0851c79087c2576f12e43bd76add2c8b8e7970f8dd02056277a9e82959cf4e23e3ebf1216308ed4c9d3b5b4d5c49e6a3e6fb34fa5e09
-EBUILD mypy_extensions-1.0.0.ebuild 661 BLAKE2B 49591255edb6dc180dd9221efdd746af93740edb4ddfd4a26ae9e2542352a9ef1a110cf61282e1e09c9b714784214e1436bb5bc7732eeae12ec1c0fcffd3df60 SHA512 75ef86965b3e49fcc22aa2db512d602ae17dde150b68acb46911466afdcf5c1d74e814ce9453d2c2021cb254cdb113f16d2f08d4ff45070a15d730e67a183902
+EBUILD mypy_extensions-1.0.0.ebuild 653 BLAKE2B 679c98bf0eefe1efa174855e96a7aad18452adeffb8984c160a8c3fead8ecd0a3da8901c3f47d55b7fc1257ea04c5c4dcaf612229bd9ec0875cff18984b87d19 SHA512 ca9c5d40b23920bf8ae5ec705d788ff84c5e35aaed4638a6fb757a7bd1b5f41900bc295b476f2ea0713f0232777b820bafa5b01ef0cb62798f7a1196f2f9f896
 MISC metadata.xml 405 BLAKE2B eaf484f8baf4a4353f55fc7a84a40057c70adc6a5403e5f2e22f84d804f63774b60c52ddcdb4cc59fa21f3c350ea772f7eeb12112610d611c053ef82340a1e92 SHA512 26bd5e50dd2d591c6bcc803d27e85fa0508921c688d798e208868b7c9a77bee999ef12732038af42dc62fdbec75b7cfbbd6ff33256756736bcc783893aeaf586
diff --git a/dev-python/mypy_extensions/mypy_extensions-1.0.0.ebuild b/dev-python/mypy_extensions/mypy_extensions-1.0.0.ebuild
index 7dfecc74deb8..317c3859f01f 100644
--- a/dev-python/mypy_extensions/mypy_extensions-1.0.0.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-1.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~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"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index 47e8924aac7c..b3018cdcec28 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -3,5 +3,5 @@ DIST nbclassic-0.5.2.tar.gz 20182217 BLAKE2B 02a91ea461acf56c8aeafab5d2af726c21a
 DIST nbclassic-0.5.3.tar.gz 20199979 BLAKE2B aa509bbd2bab51b94f475e81b7e1c5661370e850680df8f64c86d76ff2aed7a84a0e6c00f36a695ef7f84cdc731fb7613107abc96fb13a3127ded6689d6e81a1 SHA512 07e26d4cb30e3388420ced182a31a050419f4a872256efca6684e4af0e08ec8bf7f6f14f127fe1391457ad5fc792377a1a7bafc0fa1a92eec455454c6321a9ec
 EBUILD nbclassic-0.5.1.ebuild 2340 BLAKE2B 3c0703556e35e86a9461a51b8169690cb9126a94d475f8c9dc8bdf88cac95ebc86b2766dea7423cd6b5dc68752cc9e2b6dab9fde76983f170b62c2479e3374af SHA512 8a73f4c1c4f54dd9b77e3b877c17d528948af8302c12a97507bf7eb387caa19aa94937e224ba7cc1eaac1ceb220b2dee967cbd26b929d1e18c28a494a6514d37
 EBUILD nbclassic-0.5.2.ebuild 2130 BLAKE2B 817b4014738b88e737737f4ef258dfa59c2466070d9ffb971db89d1fd7639687c9ddd48db93203512cc5b42d63cab733f2787117a9f1dfa8d260fd5dab967abd SHA512 9f4b53ed05c990feddadbc0ab4eca5d1f43cc1b525288f8f788852405a0ca0b72da0e872bed096ef8e8617212151ad816d317722fddfff45766f1ff72aec26d4
-EBUILD nbclassic-0.5.3.ebuild 2130 BLAKE2B 817b4014738b88e737737f4ef258dfa59c2466070d9ffb971db89d1fd7639687c9ddd48db93203512cc5b42d63cab733f2787117a9f1dfa8d260fd5dab967abd SHA512 9f4b53ed05c990feddadbc0ab4eca5d1f43cc1b525288f8f788852405a0ca0b72da0e872bed096ef8e8617212151ad816d317722fddfff45766f1ff72aec26d4
+EBUILD nbclassic-0.5.3.ebuild 2137 BLAKE2B f3a2ae624fa05bcb79cad422aa402d9b016e7f7fe8659a46bb494c9f2e389cedec241fb8b0297f8c44d2c50e09f37509676b6f3ae9dfdeb54aacd601e92966c6 SHA512 d3fe2433eb168d102fc525b2e79f3afb62dee1436141ddce0efa93a98901407b2a8ee1e9bfc7f948afb18cf7c2374e2d7dbf461e79a0efb2a8a2c1de62d3361f
 MISC metadata.xml 407 BLAKE2B 8be751d3f2e0e1e2952c39cd1846285ebb994d833022767dde609294ee9f98044b1189934e7d27c3134b1f06c95705687491dbf52739bdd0bc17f06cfdff53cf SHA512 6cc07376da4e55e5df153fdb0f43371ed415bed6db1bce2f67dd113d1e0f1994974dd6bee746021efb2d8c36ca2ca534109227c541d38b37b652a68b9642f2cb
diff --git a/dev-python/nbclassic/nbclassic-0.5.3.ebuild b/dev-python/nbclassic/nbclassic-0.5.3.ebuild
index 965e97187b26..83e0aa3e17b8 100644
--- a/dev-python/nbclassic/nbclassic-0.5.3.ebuild
+++ b/dev-python/nbclassic/nbclassic-0.5.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-python/argon2-cffi[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 08fb2f715ce1..d404fce8b894 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -2,5 +2,5 @@ DIST nbdime-3.1.1-jupyter_server2.patch 9483 BLAKE2B 767f7c848a5d840c1ac26d42f40
 DIST nbdime-3.1.1-py3.11.patch 873 BLAKE2B cc7e7a2cb7a95eb4280d1ee64b4563691c099e0c9d0613283dcbdf6cdebabc78f5c8f181006fb7176df43950ec86be880620e0381dffcf5614f8c05b78f7c4dd SHA512 e26054c7ed2c8201e3e6b6d4e18c80f3b5a3a9a21d201f2ba1f68cc2dcd0e6c4bc2d82c57cd07400f0ee6ce8a52e9a5c8e77000cd7912d3ca6b2ea53b80909fe
 DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c SHA512 268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f
 EBUILD nbdime-3.1.1-r1.ebuild 2498 BLAKE2B 62f136576b109f522c9effe76a87aa6be4255cdcc8c796a115cbc3c7706a1cbb969411fa697d1bd782cab8af2b7e723bae359e3f168b84adb6e071f125fbc911 SHA512 5c7838a7edec40fed0c17bf1f098ef1326cf17665ca71230d50ba607333525b53cdb12997315bc12d611aceee537e457b262be5c5dce633dc95dee51e5c93145
-EBUILD nbdime-3.1.1-r2.ebuild 2886 BLAKE2B bee2087c01158aa9e084d654e7590eb0a15c226e7350e6d44e8c1d8fd3be0c915322fee3505d4de496b6fd7b4c1cf4b5015c97e6030c64ac6c5e292b43bdbda8 SHA512 0109f4d39d0e6a94711d868c68a74c4596364e0e8bc6e923c74ecb3ffda3d0178b9736592f9d9e0f2a44ae989b936f568fe174ebed9afec1aed874a22534e23f
+EBUILD nbdime-3.1.1-r2.ebuild 2893 BLAKE2B a511ed6dd1cf5677787e816fecd01c112e2e3d289aa201035b6d2da8a36a8813d8c48b4f231b9d0135289fef27204c5f303e884faa8e081f0b6ecf27d4175604 SHA512 90f49d4330b59f9bdbf048c03b9f6570dc829271019c2d03a711fbd95e8051aa25bd9bcf6ccb637baf49c2b793b3a955cc58999dc2dd0c2f8dca042804b9e2ee
 MISC metadata.xml 514 BLAKE2B c3062055cb710079162f879e3a7ca9cc1009946eba2e3d09f5cdfeb9f3bccbc12a9c6fe86d84f80d88b07eb17d03b55f8d1c6770b97c7a760015e4466e6fa531 SHA512 069589261da9b38841c363712255d55e2203c55af94ce62c3640a90139b6d260d2f1ba6475b9c0264b8c4530207cdb17983ebb2f67565fef9fce891603c1d3a3
diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 4587c840c4d4..6097f2e1933f 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 4a0c0359f7f5..ac4ff401999c 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,3 +1,3 @@
 DIST nbsphinx-0.8.12.tar.gz 178986 BLAKE2B 5f79e20be5ceb3c9458530c19f453599cff8c278d5ad56faec952cc191336469cee3ecc130bbca8cae5d14447abf544a6b127251f3ee2a26e63c94a1326b707c SHA512 fd18cde3b7034bbd0f0f5ec7addd8925e867dbe0cfe810310240e5748014f2cc6bf275ff24d070d0c8748e7d144bf3dc2e9a26ede3a50e880f3db27d1a0d0575
-EBUILD nbsphinx-0.8.12.ebuild 700 BLAKE2B 16f7b9edc408282cac3e773b91ed1a5ef7172bd08c6c6af21cba456ef7c796f105e11f9f65f2b5b79aa246bbf47f6cb8c75a025e93ace9e44a74e8b9e03854e4 SHA512 f06a95193a6fc06e29152b47d0e29c5f5123882e579b1970b39da639a504e4c2e4cc3cfa16c1072891465b5552711de07601b04653e1bd0609c60c77688e4e6b
+EBUILD nbsphinx-0.8.12.ebuild 707 BLAKE2B 6f0375f513da4974df0f281a2dc29c2d55fbb28bcaac2fd53408c15c6d39a79f3293aab2789a5925b415dd0c5c8af50f9a91b421f49ce92d56ccb5b60f67391e SHA512 8b2db9a47d7c62b09850ea30e4aa5b350b4de98f15aff15a39674ad80f00fd154e9dbb9c4f9d6a17307dc21b5f333e01053e45d0a0ead8c713870dc3a0a22460
 MISC metadata.xml 835 BLAKE2B a3a10c9fb26688d90ad6f4e2ddb8b174eae9fdc2637d4aabdb86f63093982c7c9a42c4eaa3b2adee6ddb12ba2d537aec79d324c0a3c7355424a4255cea90eda6 SHA512 9ac5cebe164b19f80e0eb07f7c4fb5cb2cf5251af1f81290931f8fd01223261cb6224500387c131c7bc8738d7bb07eb790fd9ea426a295d0688489510e58d55c
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.12.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.12.ebuild
index 40a1e044fb6f..eec19ef6ed60 100644
--- a/dev-python/nbsphinx/nbsphinx-0.8.12.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.8.12.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest
index 4be99766ce07..16defce6770f 100644
--- a/dev-python/nbval/Manifest
+++ b/dev-python/nbval/Manifest
@@ -1,6 +1,6 @@
 DIST nbval-0.10.0.tar.gz 62727 BLAKE2B 5b8d2815ec38481da1c0b3b5b62f809a231c4d136499b73ef13dba6a5214c87a5d4f77db1d81488e1bf13bd3ff365414e75760763a56a3cc28e752dd316ac009 SHA512 3e0e495db40aa4969e03ed1359f0c509b7470a54b3d8b6a85731601af5da0407bd44b3f069178f1a6b3aca7bf243747aaeaca4cb2332912e917e360f705eae61
 DIST nbval-0.9.6.tar.gz 60932 BLAKE2B 77f283279e16e03ec87f250b2012aabd8f580e24b222efcb0b21d9b0dadc381cea3c4a3f96a85df0104da86911de66e6c21bfd3985801fa9c3d8764b2fb26183 SHA512 d4261fc30e197e7350c07504649f0230751b5ed746fe4626b92c5920032dc15abe47ad421c93f4762e93a8b6afcbca440ca006bfd1cdbcba37d131c4e6decaa7
-EBUILD nbval-0.10.0-r1.ebuild 1032 BLAKE2B ca29604a2511d433c1affc623203c7171af3b7ec89d41cb099ff3dd665e6824a200c834b00813bb5a1114aba8b6ce0071f6f1a6b44ba1f13aeac3c424660ee46 SHA512 e7ff45e03dc0ff3a06cfe46863dfba7c043ad598d927b48a4da1fb51b642f02cb9123e0953a2a9c98c3cd0cff71f38d5e3244aff04128201308ac4c3c542626f
+EBUILD nbval-0.10.0-r1.ebuild 1039 BLAKE2B 3b55e4e42cf2b68c1b60fc6f2a28eef70b5b98ba98ff16a43c664e047f6a2991994d0b4d646568a6a7a38621950f92ce4272735abf662455819e46ce4e5a4216 SHA512 df1cfddda8128bf7efc13aac8d42ae74687dd91d18706a0db2c49b1568e4760f063ada145cb2600fe984dcab60355522258128934e5a8928f0a68190cfa49de8
 EBUILD nbval-0.10.0.ebuild 982 BLAKE2B ab88288ceb71c365590f013c395acd29d39d804cb9e78ec6212444d8c8d1495402e76a251949579314d3f4cfeaec37c04ea4878ae629f3267a70ed6a90bda92a SHA512 5336f540c4d9bb481259df7cf6103e47b49bad19317d386026adad7246639b587d81e3f08125e51db30108e19658af1d3673e93b95a64e0152e887fa649ff646
 EBUILD nbval-0.9.6.ebuild 978 BLAKE2B ef92b18bc87a4fb1a13c41ea028c45ca7955913d8c1a8dd74f5034864888ce560a68de0781198d6acab77afbf3eee6cd9bd2b2e04449ae98f2bc4924ade996f5 SHA512 95f5021e5cebb90cb6ad5f909e214f691955ff818976ca49cc0e628b12d30b48208d530054afbbb7f62af025549918fbf7b3b0dd0ed2b3e474ace0ba15f4b7fb
 MISC metadata.xml 984 BLAKE2B 1f5a69806d70ed9aa5c0cf2a7f3466afc76e8b5078923142d10aa8ac5a68ab41dc54cd2345cef061236b7b68fc13fc76ff7a072b9fec8697eae259272a32aefc SHA512 13284c08e700976e1da78dbfe0038c2cca1d1e3f286726c4096ad53ded3b6ebbaabd51e105f70781be57293a46d8e2de3116e406cee4ac35d2dc80f1a165a7f8
diff --git a/dev-python/nbval/nbval-0.10.0-r1.ebuild b/dev-python/nbval/nbval-0.10.0-r1.ebuild
index dc0e0c0d3e3b..281fb84c2b62 100644
--- a/dev-python/nbval/nbval-0.10.0-r1.ebuild
+++ b/dev-python/nbval/nbval-0.10.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-python/coverage[${PYTHON_USEDEP}]
diff --git a/dev-python/nbxmpp/Manifest b/dev-python/nbxmpp/Manifest
index c6d4cabfd3ec..fc34a30f6d4a 100644
--- a/dev-python/nbxmpp/Manifest
+++ b/dev-python/nbxmpp/Manifest
@@ -1,7 +1,5 @@
 DIST python-nbxmpp-3.2.5.tar.bz2 132029 BLAKE2B 846f3b47c3a9a95cf1fa1b557a007fd4901fb4acaa3160ea4b9b1cdff1e9d2c3e64bc5251b739d816f3f1c449c350d1ac44c14cbef87d14fe5a6450418451007 SHA512 577f8c7b0f5a7c69b4d980bff93f0a208ab0a660d731eb95ec63b76583194b94bd9d9f6b10fcac3951a6e6afb5d0c4da2140cbc17ef653f19ec6957b5d2e5f04
-DIST python-nbxmpp-4.1.0.tar.bz2 132973 BLAKE2B b28b7e24debecd5088234d8eb862aebdbd461511c02f0bf8b45429c3b1964706046fdc773d654b4dce7a6ec62cc1f58e5caf9f9ef2cc0c58603129232e658325 SHA512 fd977ba9e4795abec8e1367462e7ae8c38671deea1e40849e84350bdab8281595f839848a8dff6fa730f65c5b60d82826b4d660ca2f14519ce2db0bd5f092782
 DIST python-nbxmpp-4.2.0.tar.bz2 133803 BLAKE2B db63b5ca085a90913ba6cac07c214e2528bf629bab24f7256ee751fb3ae4ddf417a9d09c509a259d468fff81feaf890b639bb9145b02c957fe777101bfbe7afb SHA512 8927b867ece2be1a2610cc5221615f026bd84b242a2d257740079f86aaa61c7f6208e90c8051f570d5539189476c68a316f840240ae0a6372311f353182b2940
 EBUILD nbxmpp-3.2.5-r1.ebuild 798 BLAKE2B c5a53c25c177b51344a80efc8f9f723ebf26b6b934b5b8d09ed2418a5aec552625efd3ddb27de9d4492fc468fd7def31b3affc8d6384a5a2e2792711178eeb02 SHA512 a0c4d39a2df8f8904c45c9166bb13e2f3ef095591d614f62d47a0f95419f159d846fdd9899e525be8d718ba4f59d5bd7530e7855f7507e4dc19bd231851c9071
-EBUILD nbxmpp-4.1.0.ebuild 849 BLAKE2B c4f7dce603dfdb234fff6d102320c40507dad8e243b115b628d26c2167ea8e129c3d5ab73114dfb76c703ca428d94416d5ec4c4d226d358aa3be8bb29407140d SHA512 3182448a3a91bee4a04e678109bdb2a293d337bf8406cddb175b64fb50935cf37d5efe4d71b630475438d6c86a921373858b7c55d9cdbade80a7cad0b1bf4587
-EBUILD nbxmpp-4.2.0.ebuild 856 BLAKE2B 451428e7b688a1e47d01117451ec63bda581e9019fa1cc9c639c590477011f09effbf5343e6a03bfc8e4d6e89d6c8d92a9f0c73a00c330d75f3dc6691057b31b SHA512 2883a578e813aa257aa0ffd231d9029aff97fac597d3335124d702cfd5b93f9e6e935b2c601b22c07f505b1b7356744df6b99616d518f5913ab64782dbe4ae2a
+EBUILD nbxmpp-4.2.0.ebuild 854 BLAKE2B 59b9c9d23f3bc3158289a5766908639b59a8fe5ad0ed7a76c9d83cd420035a0ad0696121d72aa6242ff07e7fc276fbc2ebaf4ce8d76548bb39056915c6110bd6 SHA512 aaaea7dee6254f92a5f170c7f5af9a94b4e3658296b86f5f2bde23c3ee80715513ce46c3c334cf462a775e35b55b87ea7100da0a5188ac5fa8bd55870d0355a5
 MISC metadata.xml 426 BLAKE2B 2772501445c7b3f8db801d5d6c52c6004cc6c67527b30cfcd5f48b54c3e483f1ace9307632f0da179cc4462e3ffde741b66af38c76e248004ff7238a591a15bf SHA512 0f456e67e255e045d97f969ed16c7e304d07a6b9a60d938dded30e78235a2ef984f5883c08f655e14084a8d76f54cd578c3d1eb387f0cc4d8502a5188dac987d
diff --git a/dev-python/nbxmpp/nbxmpp-4.1.0.ebuild b/dev-python/nbxmpp/nbxmpp-4.1.0.ebuild
deleted file mode 100644
index 68b1414870d9..000000000000
--- a/dev-python/nbxmpp/nbxmpp-4.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-MY_P=python-nbxmpp-${PV}
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${MY_P}.tar.bz2
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup:3.0[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/precis-i18n-1.0.0[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/nbxmpp/nbxmpp-4.2.0.ebuild b/dev-python/nbxmpp/nbxmpp-4.2.0.ebuild
index 570d6eeeb400..24eb0a76f3a8 100644
--- a/dev-python/nbxmpp/nbxmpp-4.2.0.ebuild
+++ b/dev-python/nbxmpp/nbxmpp-4.2.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/gobject-introspection
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 26fa2635f3bc..2684c2a16c55 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -2,5 +2,5 @@ AUX notebook-6.4.11-no-mathjax.patch 1527 BLAKE2B ccd6d1af303eccdd0eacb760d1b741
 DIST notebook-6.4.12.tar.gz 14389641 BLAKE2B 1cda6a1eb1f4e7ccce964153bdce8de243588ffd4abcc5ab6687ba0ea347d68c5dd239c2af5bf93809409d850747db28df72be5c2ec03bfd06b725976ae1c599 SHA512 1314cfebe97ddada61e1013fdfd606bed08908c06b58e59f2fda6e63c43a1158eeed6a93a5cddbb609ecad0347bf80ee3a74747104fd29942629734c1ea749f0
 DIST notebook-6.5.3.tar.gz 5785846 BLAKE2B 90b028816ad906057708612c82d4c257616e28e2f335dfa26990888b04f6c2372dd1f579b28534ec0ed3c5a160e3c44c35f173b312e3d395db0fd3f01860dab6 SHA512 27177908960ca2e4c83bc5f4502250e02a885daed5f9ad67694502794f140e9e66f0cb24568a3903600c8f5cbae6d626fd7bfd362e23cc523bb42c210f5d2c70
 EBUILD notebook-6.4.12.ebuild 3180 BLAKE2B 4294a3299739de611a6843e9b434d568e01ecaf6dfeea5768695e153ca77977e2044f9ad33a0d5f55fe719090b94d2e1f2336e9c6d28bf8f72d15e4816983f95 SHA512 de87f5116675728098d2da7a970d61d646b3f3cdaf4d098ba10fa6fe66768d2779f29ff8d632d578ce60e409482f6700a0cacdb11997e4edb1bf7d7d3d500929
-EBUILD notebook-6.5.3.ebuild 2798 BLAKE2B 31b04af1b2c11f11469f7ea406be3ae77f8c5186c9325b38de84d6cf925d0f72eaf85d66747f3eb4729509f68dbfb23f07aee2569b25c9313dac4c4ecd9232e0 SHA512 b0cb3231d739b12c6ab88bfbc88d62ddb8516566210c7efbab9cded19388a07b3b494c59ef5af2cfd3aa8f94ea558c770194febdc2be4fb25a43097c72ee550e
+EBUILD notebook-6.5.3.ebuild 2805 BLAKE2B 34b34bc4afc686400747c4b43ed5fc428607b160553a61fcd7f7d32c2d2aefa86143070469b56f5817256d8a40a7f0236ed6c5eea23bfda611756f6bd443b7c1 SHA512 bbb243cf1ef65f91a78529f45f7eadf68095473817cd2df31567fdb9b5a819fa31f5bd0dbd1f5bea5b252edb0c7cc288f1832e8bcd23a60a855ea90d8a11e031
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/notebook-6.5.3.ebuild b/dev-python/notebook/notebook-6.5.3.ebuild
index d269b1600a3e..e8251d1989a2 100644
--- a/dev-python/notebook/notebook-6.5.3.ebuild
+++ b/dev-python/notebook/notebook-6.5.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://jupyter.org"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.7.4
diff --git a/dev-python/notebook_shim/Manifest b/dev-python/notebook_shim/Manifest
index 829ddf4b08e1..01fb6ba764c5 100644
--- a/dev-python/notebook_shim/Manifest
+++ b/dev-python/notebook_shim/Manifest
@@ -1,3 +1,3 @@
 DIST notebook_shim-0.2.2.tar.gz 12947 BLAKE2B 5a04944be3f8de7bd7b1c10f59d73869b7aed670c3afebf79e7780d5992f9af2929529498604c1a5c0d164467681ffa0e8924e1c9a7945e52ae353bdb710c7bc SHA512 42cf9153495e4ab8230ef560d36381a5aa1d9bbd583ed140e04e9850f4a82bab06ecf36e45b88595e8686d8122c9a52eee8133a7f1b622d75d326ebf36519d30
-EBUILD notebook_shim-0.2.2-r1.ebuild 920 BLAKE2B 7f4f086c5eb48acb0d48022b992c845681dac4297fa36541207cdde86ad8f68c6cac757f9d8234f79687f74fee8abc54737ec8a26ab64008f6752e3c4ed22a79 SHA512 c676d31411fe674dfaf51516e848af83aacaa4555a9cf2db8ccff2838f0ff8f339bb2681c9e7d3ffe84723964d04858168bed222a8476efeb89d97ea8e4cdbda
+EBUILD notebook_shim-0.2.2-r1.ebuild 927 BLAKE2B b62fa3611c2f7f291ad3c7f656bcd3bb74286345ea99d69722182ce5a87270728b161632daa315fbf557651be42a44f7a53bb6e96009944a6f1f2b1e5b74f4b8 SHA512 36c77b185caa0d254e849bbd1fb677e1f038c189c278ddec283765b91fcfa41bb566c5f529505ca6b1730ce1dc19de57a68d15b19ce317e99e50953a2d3ba3a8
 MISC metadata.xml 535 BLAKE2B 074e2bbcdd15078aaba2c65641a16ca7ce27e0c412d48f2a48a4cd80459a948abc478baa28b3e7417dde2bf13717040dc083711b114d61dfd2a7f7aaac1295ca SHA512 9ff7408848878f74eb9f10ec5aded639a749635851385b6679a72112c253a7427f65ac3e3c41f21f9e8551a439a7c00c4e28a5d70b3529ab9e687a5d0e7abeb9
diff --git a/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild b/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
index 7706ee8942a3..98aa56183270 100644
--- a/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
+++ b/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	<dev-python/jupyter_server-3[${PYTHON_USEDEP}]
diff --git a/dev-python/openapi-schema-validator/Manifest b/dev-python/openapi-schema-validator/Manifest
index e3c35912d2eb..4b896a676486 100644
--- a/dev-python/openapi-schema-validator/Manifest
+++ b/dev-python/openapi-schema-validator/Manifest
@@ -1,5 +1,3 @@
-DIST openapi-schema-validator-0.4.1.gh.tar.gz 17478 BLAKE2B 0c215589eb72f97205c565bf7cfc77096dd9cf2a7d05d2ea7946fcbc3c8c9acb5702635f6cfe520993139ce9713c426f01b98d34b3c962ac918989f7d87f22c9 SHA512 e437309a6e741eaefa6b49bb038bd5976288bd6559fc6957d7029d9c0fed36ee368ac5fb26133a0fe54366da77ec649b5e44eb6a7926d9d5c49573afdfa3309b
 DIST openapi-schema-validator-0.4.3.gh.tar.gz 30639 BLAKE2B 370e3cc4e6c9892912dc77114ca867752f46afd1555f91a3721f41a9c4516fdffc0416f2f1028f4717ca8cc1a1ef2ec47607b7ef2b6578a0b01afb8ddb6660c8 SHA512 a930ecafe2e4c1d4d021a71fe9b8f35c496320e5c5198e2ccb57d82e01570430c4904cae7bc44578bc95be63cf5c709c5bef1d96014c3a66fca3b4495c5e455c
-EBUILD openapi-schema-validator-0.4.1.ebuild 860 BLAKE2B 6352f65fd378928d265ae4b793252d13c0dd838ad1951bfac8a4705e13b806f9beffb44d7ae8b1b65bffa8db3d87113f97994419963b721a1b411ccbcbb47dbc SHA512 5604b99a9be0358e315081a31304c371e96486a07fe5299f7ebf722e73f2377c533b8682fe65cb27c885e8706bb0a14383f715d01392bf5733ab0e63953e1f14
-EBUILD openapi-schema-validator-0.4.3.ebuild 779 BLAKE2B abfabf3f40fb31b3d5d2e79b3fa84360d9598eec180e70fa3182848ce1480a602b9753fba6b405a2f9ff6a4d6bf433c63bd6dcdd34b0e5dc8aed64d6927a7ce6 SHA512 45aa6a8ec59f6a2a00f6b7c7908efda8ccf815589675180539d388f7a4f13a0e299d5cc03719ffc994f6d0765d372c0f970feec03789f51ad66eee71caab9f0c
-MISC metadata.xml 400 BLAKE2B 7869b5ce26c516d7e8ac441229cc5e749dfe6ee5fea478a0d5a0574bfbb863434d03f5c16332376337c33f4215877b985251cd5a2e71caf445a16f52283a63fc SHA512 071df32bb4ad2c941aafb9232ff890ec9e1150ee789eb9e335a94024ceb7bf6b7b79cd8f9f0ca16fc08c6e19383616253d391710b4d1e2796d57d12ff00436e0
+EBUILD openapi-schema-validator-0.4.3.ebuild 795 BLAKE2B a16d35a1f7e38907ae3ca55ae6a7745abe416f3b776506f1cb96086ec6b9fcf0eb0920fe47be454ca15b53d14b389ef463ddf6f4f6d09e47222a7bc7e5010528 SHA512 bcefcd7d354627e6e379469eeea554e881413332f51d0d16e052bd5b68906df7f0ecf82c5b1e52af31656ca79dbe89bef73e2f797b2d55026d8724b13a9756e9
+MISC metadata.xml 409 BLAKE2B 601169266922e87a4fddde77d3528759d1f8470f28b865733ef6be57551f01675c9d5d694cfe9e7823dc9b360b9354c0bb74fb57a962e4f7155775e26b9fe3d7 SHA512 e4a29fd3c48b7b317b52354a64c7906f2ae87b1ebab275ec992bbfee421d677ea23a3310b1f9de44b75bf131738a308ce2a6d28712ea493b21c9760b43efe569
diff --git a/dev-python/openapi-schema-validator/metadata.xml b/dev-python/openapi-schema-validator/metadata.xml
index 951e196ea341..bbbd304e9938 100644
--- a/dev-python/openapi-schema-validator/metadata.xml
+++ b/dev-python/openapi-schema-validator/metadata.xml
@@ -6,7 +6,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">p1c2u/openapi-schema-validator</remote-id>
+		<remote-id type="github">python-openapi/openapi-schema-validator</remote-id>
 		<remote-id type="pypi">openapi-schema-validator</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.1.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.1.ebuild
deleted file mode 100644
index 9f2107defcad..000000000000
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI schema validation for Python"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-schema-validator/
-	https://pypi.org/project/openapi-schema-validator/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-schema-validator/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/isodate[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/--cov/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.3.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.3.ebuild
index 3c2a9d37941c..6ac189f24a13 100644
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.3.ebuild
+++ b/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.3.ebuild
@@ -10,17 +10,17 @@ inherit distutils-r1
 
 DESCRIPTION="OpenAPI schema validation for Python"
 HOMEPAGE="
-	https://github.com/p1c2u/openapi-schema-validator/
+	https://github.com/python-openapi/openapi-schema-validator/
 	https://pypi.org/project/openapi-schema-validator/
 "
 SRC_URI="
-	https://github.com/p1c2u/openapi-schema-validator/archive/${PV}.tar.gz
+	https://github.com/python-openapi/openapi-schema-validator/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openapi-spec-validator/Manifest b/dev-python/openapi-spec-validator/Manifest
index b2ec2db9f0f0..fef7a9e02894 100644
--- a/dev-python/openapi-spec-validator/Manifest
+++ b/dev-python/openapi-spec-validator/Manifest
@@ -1,5 +1,3 @@
-DIST openapi-spec-validator-0.5.2.gh.tar.gz 39743 BLAKE2B 92a4c4503add68c2683f4229f7b68b7cf98d38f36f3c03835b03be5e2a1092ebbb46a9f8d09bfb9e3cf7059a2a72ff01b81742986d479c2713dc6ef783718e00 SHA512 68f7d507a239c555575e2edb3bab576fd1fede9bcebde48c57361e3e764c9c19c4dc0d63e650851c2f6e7f2dd7f4efcdcd028842e259aa9e341823cd052a6e20
 DIST openapi-spec-validator-0.5.5.gh.tar.gz 57200 BLAKE2B 037566130546d2cc894dd12e0fc0d80fe9631f94085ec286a61ea810c58b48cd7837cc044388773798a7684fa4d73bb89eed643a164280433c1cd8d6a9cd42cc SHA512 4b5415216e74937a0c6f527850921f362a3183119a641d4d369cbf3e6aa19209ec7d8ff05697eed7dcd1ee6d0e8fbcc9cb8aaa0e3eb46e4da34bc7a0a4b78c00
-EBUILD openapi-spec-validator-0.5.2.ebuild 1819 BLAKE2B 6589fe0451e096dfcc459a4edc956cef751844911b4b70f70db4a4f66df666e868041de15a726bc5d59547fc9a7121891da41413204641fae51f095c27595883 SHA512 2bd119076d1d685814542b5b20bd7cb6848378eea1830b9d0201758804e63c2a929a5a154f0dc42368065b928255d8a42bce9c8b92eedfb2fd75b30c495d3c7c
-EBUILD openapi-spec-validator-0.5.5.ebuild 1821 BLAKE2B ae8e47b9b5f3c3b791feddc94429fa0d4c09d94f7c25d2f3c6d0ea188cbb115eef07d6b9d449bf8db4ddc8971a9156eaedc62ed7f01942617f9589367a654ba4 SHA512 78a0f0588110e9e862432fe26580412d3527680f8a2201298a121a356968fbe28f63df9220be25f8f078218b78bef246172b6938fdcd2ef717fcfe538bad95d0
-MISC metadata.xml 396 BLAKE2B 05d9c3dd63043847458eea89c101e7fd83846f57a7098347977a539b593591fcfe04b421a22dcc91c3a7418dc533ee2547691dc4672a24389e9ff836eb64253d SHA512 4b7ee8cf53213243659202af35e87e9d7f633bc2abccff8d449fe8476c7964baa247707a68017b9d855cb23d81c8b11374f970996ec20cc90263573298f163b6
+EBUILD openapi-spec-validator-0.5.5.ebuild 1837 BLAKE2B 5655358dd185ec09be2892819bd0c30aef75060106f8626c23bd1892dacbda94cdc1fdfb93a5c0402f4af18b289920e21347afe4bf2005aec05f528f2736704e SHA512 54056463e40b755ef644c5b264de5e3264a842d77ac936b37d2f8ab865e841ec6cffe978a8d1a11d5eced48f398718a393a797829bdfb0addae9aa380f243975
+MISC metadata.xml 405 BLAKE2B 82dfdb0a9a068a90ad245a33da95883f863571b12e3d354cee5b7e10b9c098f3635b25fc1871db3b384c5218c2305c90e9f185c97619ba142735b03de90bde01 SHA512 a3f926750e11ce7b8960fa7adef139a329b7dac777c78acfc2cf24225862d8f04a2bb8edba36f99aabd1ea44f93220afefafe060dce6418fa03f360c129a344c
diff --git a/dev-python/openapi-spec-validator/metadata.xml b/dev-python/openapi-spec-validator/metadata.xml
index be2432aed5c9..eb0b0955d089 100644
--- a/dev-python/openapi-spec-validator/metadata.xml
+++ b/dev-python/openapi-spec-validator/metadata.xml
@@ -6,7 +6,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">p1c2u/openapi-spec-validator</remote-id>
+		<remote-id type="github">python-openapi/openapi-spec-validator</remote-id>
 		<remote-id type="pypi">openapi-spec-validator</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.2.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.2.ebuild
deleted file mode 100644
index 4711abc587eb..000000000000
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-spec-validator/
-	https://pypi.org/project/openapi-spec-validator/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-spec-validator/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-spec-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/lazy-object-proxy-1.7.1[${PYTHON_USEDEP}]
-	<dev-python/openapi-schema-validator-0.5[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/integration/test_shortcuts.py::TestPetstoreV2Example
-	tests/integration/test_shortcuts.py::TestApiV2WithExampe
-	tests/integration/test_shortcuts.py::TestPetstoreV2ExpandedExample
-	tests/integration/test_shortcuts.py::TestPetstoreExample
-	tests/integration/test_shortcuts.py::TestRemoteValidatev2SpecUrl
-	tests/integration/test_shortcuts.py::TestRemoteValidatev30SpecUrl
-	tests/integration/test_shortcuts.py::TestApiWithExample
-	tests/integration/test_shortcuts.py::TestPetstoreExpandedExample
-	tests/integration/test_validate.py::TestPetstoreExample
-	tests/integration/test_validate.py::TestApiWithExample
-	tests/integration/test_validate.py::TestPetstoreExpandedExample
-	tests/integration/validation/test_validators.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.5.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.5.ebuild
index 5951fb69acfe..02d0efe87dbe 100644
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.5.ebuild
+++ b/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.5.ebuild
@@ -10,17 +10,17 @@ inherit distutils-r1
 
 DESCRIPTION="OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator"
 HOMEPAGE="
-	https://github.com/p1c2u/openapi-spec-validator/
+	https://github.com/python-openapi/openapi-spec-validator/
 	https://pypi.org/project/openapi-spec-validator/
 "
 SRC_URI="
-	https://github.com/p1c2u/openapi-spec-validator/archive/${PV}.tar.gz
+	https://github.com/python-openapi/openapi-spec-validator/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index cc551e73f266..b53a8bf24e47 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,5 +1,7 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 AUX paramiko-3.0.0-nih-test-deps.patch 3435 BLAKE2B fbbe2bbd8b05dd215b2ba413e208a96fbd1df9904271980658e1fae100e6fb1d049e15d582a307364d6416090b97741cbfc8d7304e08d7b7bbfbd70e0f1a1522 SHA512 76cca0e404215e505d6ceb650da796862fd87ab460e1a65438c62cb926af4a3ebb8f603bd26acc1a6d1a1a37e6090fc01edc4ae7a7f81f18105d3d9fce03545d
 DIST paramiko-3.0.0.gh.tar.gz 350348 BLAKE2B ba7211a3f3c7d4f9c0023017d96ed51511039378b4eba1ace13fbbf6902cda40aa09f2cf7b5ce9f7aee666907d9a662e9bf7eccd5d06669685b9aa25fccfa551 SHA512 3754314fcbd64bf3db5fd6a8d55babc13e639675d09e85d796e99f25eecb55b0f987c0b47bce288c3d154a2dbdb586ecc34bbb09d67786bcc13b0a94a78e6654
+DIST paramiko-3.1.0.gh.tar.gz 351910 BLAKE2B 7350626f3a8e54d8950085cbd8253f5564355abb4db7c65113c0df22674e3df0081da7299cfad779f1fcf9569b01720b6ab5dc2bde32c4a71500e79910caf4c8 SHA512 1a556a5b7a6ebc72a0c61b59f326a95c9f2784d74fdc1a171455867ba7b4b07a15741e168747b5a3a225685ad069e2d58021f54dadf7feb00f8acf65b0c07d51
 EBUILD paramiko-3.0.0.ebuild 1235 BLAKE2B 36a9f9d10eb7a60962f30ae039ccb6f1b2146f9545cebc901db59544fd3251f1c61d25b4b94c2874151c92852cf2555f84894dea34d529cf43b7de9d3a2ccac7 SHA512 e0573656798999815fbdbdda8938c3b9eda4b17f2de32f5fff9a37465bf1ae220380d6daf0528af2250f71e804efe707ed4b20a99f791a1574cc3c17fb2aff51
+EBUILD paramiko-3.1.0.ebuild 1242 BLAKE2B 706ba49d1a6ef82ced03039ecbed0e6a23dc88c2c48b71d593e1c2cc8252b37e46ae1c7113ed071a9466c699f4264927ba39b080f5f1b9aee0c700d939839e07 SHA512 2084f6194bdac521acd259c9f8132b53e3df6794a85eb796df6b22eeaf3858b5adb23826fc4a9d6ee5b14c7275724993c1f85754b39c9ba8bd6e9d7a30745071
 MISC metadata.xml 1222 BLAKE2B 46fb6385f6779cbc13fa54090dd5dfa0b5a7b5a753f728b133fa79a1e1c779a5652d6b38c5ea11cfcb505178b2ba70d9000dabba6228e38f30f426ecb1c49a3f SHA512 bf07a537ed375a3bf58d219c18ccfc29c810554041943e62819a46b63ce3fbcdd2197085dbeeb7ad36e0e601700edec6121ce5cc83dce1c7435d663473df2583
diff --git a/dev-python/paramiko/paramiko-3.1.0.ebuild b/dev-python/paramiko/paramiko-3.1.0.ebuild
new file mode 100644
index 000000000000..f521b9dc0990
--- /dev/null
+++ b/dev-python/paramiko/paramiko-3.1.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="
+	https://www.paramiko.org/
+	https://github.com/paramiko/paramiko/
+	https://pypi.org/project/paramiko/
+"
+SRC_URI="
+	https://github.com/paramiko/paramiko/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="examples server"
+
+RDEPEND="
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-3.0.0-nih-test-deps.patch"
+	)
+
+	if ! use server; then
+		PATCHES+=( "${FILESDIR}/${PN}-2.4.2-disable-server.patch" )
+	fi
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r demos/*
+	fi
+}
diff --git a/dev-python/pefile/Manifest b/dev-python/pefile/Manifest
index d52001773f9e..8b60a4a3f253 100644
--- a/dev-python/pefile/Manifest
+++ b/dev-python/pefile/Manifest
@@ -1,7 +1,4 @@
-AUX pefile-2022.5.30-remove-future.patch 2980 BLAKE2B 7cd8d7e744d488cc8720ba6da84ccee4f481b58e4e0cd7f5810b873ee74a0b57fc2e578a4444dfdfc1948b16c75af94e1ccbf57baa4efbe1c244326bfc8d12bf SHA512 cc04fff8f25b008c2b966b6072548b90948881c59eeecb20fb6b285e72e56f42768f1853ef839a6a697c43d33d867e42c835ec1a007b6c3b2846dc973d9d109b
-DIST pefile-2022.5.30.tar.gz 72899 BLAKE2B 11752fe849c91749c5272ee9157513db0690fa47a51e274d24093f47c21096e877b364e1dba9cf08d9369abb7e9133743fe98d524079559b9aa9159ece76af74 SHA512 b584472387f7f0161449d2dc0035867da8983eb2c89b488952f38a3e836d23241d46f49a1c9cde13dde4253ef3f212971df48747ea2fec6b91c4db2b7618956d
 DIST pefile-2023.2.7.gh.tar.gz 74852 BLAKE2B ddca4b8ef37af829bb1757eb4c4ba9f46c3914e05e6c13e13a8e5a3c88a608aba486deec9338400fddae4591867c0c7dcf7325cee14d42b1bb724751a3a2a7f0 SHA512 241d9846954f094ed39e61d80e7d8c1612829ec909650175e75657f9cf69c9bef9e2a115d4106bb14757125c0ffaa3e93abfb2f078e80326e78ac5818c7c2fd3
-EBUILD pefile-2022.5.30-r1.ebuild 856 BLAKE2B 28b50ebcf8e394594a6cd4118d094aef5535dfb5c8eb7bf8d1deb4cf0af8316d9dd323fdf489d48813ebe4c1fbdb3f7f11f64a98e9a66fc5caba162e22dd1beb SHA512 22fe3f60586914f61902df37dcd3c166a20326994c0a64d254e4bb3f6323eaf1f46257f40954ffe1c802df055c37cd3219454189e7209fd6cbb2ef7613015528
-EBUILD pefile-2023.2.7.ebuild 811 BLAKE2B e6afcbcaeec278c80f7ad8a7bc6233777386ea75e58cb86f1bc3a900a32288fb3f3cf60dc108c36ac8427c50019230a9ad39859c548e45f94b14cc568723ec66 SHA512 71ef8961a74aa72c16dfc92103aa8a698065e2735605de5ca546ca242651711703be6da299c66ae66d1ae677e2e4cdeb4b999959329c1bbc8f641b92fdd2f98e
-EBUILD pefile-9999.ebuild 811 BLAKE2B e6afcbcaeec278c80f7ad8a7bc6233777386ea75e58cb86f1bc3a900a32288fb3f3cf60dc108c36ac8427c50019230a9ad39859c548e45f94b14cc568723ec66 SHA512 71ef8961a74aa72c16dfc92103aa8a698065e2735605de5ca546ca242651711703be6da299c66ae66d1ae677e2e4cdeb4b999959329c1bbc8f641b92fdd2f98e
+EBUILD pefile-2023.2.7.ebuild 821 BLAKE2B fab817dabdefdab8d7a89d358cb3a003ae2613691c4180556dd0e44b748e12da94d9811fcb24f087a16b6958e5468ec20557d57b7560a783f78926d8ae8c0eab SHA512 3c44b38db1e4e787b92b786c52ad1351ba9c7b9dd29610f38d8d593f099e6cfc8f33e29ac79c3d9365ebd248fe4be18e0dae6de294c2e2061686adc0c0789aca
+EBUILD pefile-9999.ebuild 821 BLAKE2B fab817dabdefdab8d7a89d358cb3a003ae2613691c4180556dd0e44b748e12da94d9811fcb24f087a16b6958e5468ec20557d57b7560a783f78926d8ae8c0eab SHA512 3c44b38db1e4e787b92b786c52ad1351ba9c7b9dd29610f38d8d593f099e6cfc8f33e29ac79c3d9365ebd248fe4be18e0dae6de294c2e2061686adc0c0789aca
 MISC metadata.xml 766 BLAKE2B 8cd0206bb0cc7de9a76159851092c27b5e7c6d8294a136de2dd74e51da9062f6daa67c2421c173b6125758a9f350b84b03e2a85fa2029beb50032aa034f08c3a SHA512 7c3e9d6d89108b17a722c805353a9c457ccb5a5233bfca7145f82a37ab0337405c84a1e806d9fba77dbee779dd06cb18f7272399277d377aa84dcafc470156bf
diff --git a/dev-python/pefile/files/pefile-2022.5.30-remove-future.patch b/dev-python/pefile/files/pefile-2022.5.30-remove-future.patch
deleted file mode 100644
index 7f7cc5d29d48..000000000000
--- a/dev-python/pefile/files/pefile-2022.5.30-remove-future.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Bug: https://bugs.gentoo.org/888279
-
-From 36bf63f1185b8407ff9b4ce8c1c8e8620d8ae30f Mon Sep 17 00:00:00 2001
-From: Letu Ren <fantasquex@gmail.com>
-Date: Sun, 26 Jun 2022 22:54:27 +0800
-Subject: [PATCH] Remove future from dependencies
-
-Fix: #348
----
- ordlookup/__init__.py | 15 ++-------------
- peutils.py            |  7 -------
- setup.py              | 19 ++++---------------
- tests/pefile_test.py  |  3 ---
- 4 files changed, 6 insertions(+), 38 deletions(-)
-
-diff --git a/ordlookup/__init__.py b/ordlookup/__init__.py
-index c69aee0..8841d74 100644
---- a/ordlookup/__init__.py
-+++ b/ordlookup/__init__.py
-@@ -1,5 +1,3 @@
--from __future__ import absolute_import
--import sys
- from . import ws2_32
- from . import oleaut32
- 
-@@ -15,18 +13,9 @@
-     b"oleaut32.dll": oleaut32.ord_names,
- }
- 
--PY3 = sys.version_info > (3,)
- 
--if PY3:
--
--    def formatOrdString(ord_val):
--        return "ord{}".format(ord_val).encode()
--
--
--else:
--
--    def formatOrdString(ord_val):
--        return b"ord%d" % ord_val
-+def formatOrdString(ord_val):
-+    return "ord{}".format(ord_val).encode()
- 
- 
- def ordLookup(libname, ord_val, make_name=False):
-diff --git a/peutils.py b/peutils.py
-index 34b98f5..4d4b2bd 100644
---- a/peutils.py
-+++ b/peutils.py
-@@ -6,13 +6,6 @@
- 
- All rights reserved.
- """
--from __future__ import division
--from future import standard_library
--
--standard_library.install_aliases()
--from builtins import range
--from builtins import object
--
- import os
- import re
- import string
-diff --git a/setup.py b/setup.py
-index c8ab89f..206db6f 100755
---- a/setup.py
-+++ b/setup.py
-@@ -5,8 +5,6 @@
- import re
- import sys
- 
--if sys.version_info.major == 3:
--    from io import open
- 
- try:
-     from setuptools import setup, Command
-@@ -25,12 +23,8 @@ def _read_doc():
-     Parse docstring from file 'pefile.py' and avoid importing
-     this module directly.
-     """
--    if sys.version_info.major == 2:
--        with open('pefile.py', 'r') as f:
--            tree = ast.parse(f.read())
--    else:
--        with open('pefile.py', 'r', encoding='utf-8') as f:
--            tree = ast.parse(f.read())
-+    with open('pefile.py', 'r', encoding='utf-8') as f:
-+        tree = ast.parse(f.read())
-     return ast.get_docstring(tree)
- 
- 
-@@ -42,12 +36,8 @@ def _read_attr(attr_name):
-     __version__, __author__, __contact__,
-     """
-     regex = attr_name + r"\s+=\s+['\"](.+)['\"]"
--    if sys.version_info.major == 2:
--        with open('pefile.py', 'r') as f:
--            match = re.search(regex, f.read())
--    else:
--        with open('pefile.py', 'r', encoding='utf-8') as f:
--            match = re.search(regex, f.read())
-+    with open('pefile.py', 'r', encoding='utf-8') as f:
-+        match = re.search(regex, f.read())
-     # Second item in the group is the value of attribute.
-     return match.group(1)
- 
-@@ -89,7 +79,6 @@ def run(self):
-     python_requires=">=3.6.0",
-     packages = ['ordlookup'],
-     install_requires=[
--          'future',
-     ],
-     license="MIT",
- )
diff --git a/dev-python/pefile/pefile-2022.5.30-r1.ebuild b/dev-python/pefile/pefile-2022.5.30-r1.ebuild
deleted file mode 100644
index f2bd1adb8c03..000000000000
--- a/dev-python/pefile/pefile-2022.5.30-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="Module to read and work with Portable Executable (PE) files"
-HOMEPAGE="https://github.com/erocarrera/pefile"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/erocarrera/pefile.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove-future.patch"
-)
-
-# Unfortunately there is nothing we can test here. Upstream doesn't ship a test
-# suite inside the release files. The test fixtures in the source repo is
-# encrypted so that only their CI pipeline is able to run the tests.
diff --git a/dev-python/pefile/pefile-2023.2.7.ebuild b/dev-python/pefile/pefile-2023.2.7.ebuild
index 845b25ecea0f..1b9514683746 100644
--- a/dev-python/pefile/pefile-2023.2.7.ebuild
+++ b/dev-python/pefile/pefile-2023.2.7.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/pefile/pefile-9999.ebuild b/dev-python/pefile/pefile-9999.ebuild
index 845b25ecea0f..1b9514683746 100644
--- a/dev-python/pefile/pefile-9999.ebuild
+++ b/dev-python/pefile/pefile-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index ccbf95e60cb6..a0651bf454a5 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,7 +1,9 @@
 DIST platformdirs-2.6.2.gh.tar.gz 21184 BLAKE2B 4acc85301f764d4457ace88f9fb409e4d2f8bb17b9133dc3316c4d265a7cf50019298f1ba4cef87f5999b48fd7060687f7008079de26ffe74740a4cefff9309e SHA512 704cc39ba1746055e0459139759e118bd6178fb13cc8ecf580f58d16073fbb8ade0bce8b5eb9230ccc45b19f622a41c84a06f8698ee722da9d5cec44c5f46e25
 DIST platformdirs-3.0.0.gh.tar.gz 21358 BLAKE2B b7dd6d55cc07d9e584d2e3f4a8a1e3bcd5b75eac6786c4225c9b249af9d98cbe0c8b1edc7a6180c147ad13d0a7d5c4fbc9f15cf71af03590c011f7fd4ae336a4 SHA512 36885fdb4767e2525eef48e8ede6cec8013d2e8767c7940381d642faa14382583885c2428ce7b27fc36d33048494354cb4d16b42eac2748ca4458b8c124ed01f
 DIST platformdirs-3.1.0.gh.tar.gz 21721 BLAKE2B 5f7334c0003d0dcd51473820239068dd441ecc18e7837822f824f8ca2e5f5915aa89363eee27740214b97c1c4bb258a4ffa2ab6b4963bf6e9346c13fed6dc0f0 SHA512 49ad7b15419aff2c5af5c63a8850378d688eb95aadcd0c489d26fe4eea8315caffb17136fa7cbdf4a945bebae2eb8154ddfb771ed6fdc47595eff590e0f32ccb
+DIST platformdirs-3.1.1.gh.tar.gz 21773 BLAKE2B e0e9f8d2387f3b391feb926c478852c1e189ce89ab4fb5731b95b619047c77ac0ea5209a3a64ca85ba8479552aab753900fa8ca0b7b3f1051f7f29a2cc7841aa SHA512 32929363c3d9d0589d13f3b4447fe2a77e72e0ed28dd61d6a4fc627f2064e130134fe98f07b915fa148e1066f4db0869b8aa064775aa6ff61810c87f7f084916
 EBUILD platformdirs-2.6.2-r1.ebuild 1375 BLAKE2B fdd1177dd124e5a3411eb86eeb0f251483df463137e0aa9a3dd61ffb8176b109e5837a039727b1b1a7eacc40f29c5cc1dbd6a7dd029c3a9c88a17fe64dd4eb6a SHA512 c8694385b07d5ea7bb5f185ffb0f5ec14cd4bed7e6c24371de2a50eb05d7b34a6d7d131825b80d409b9a179cd67a54d460c1f737535ce0a87bde7a170d59ec85
 EBUILD platformdirs-3.0.0.ebuild 1414 BLAKE2B 68954bd97f7ec0d195695c17a179b8030c7bd0f1149253cb15d8aad73835036faeffc611e64e160d55282060bc4bacbd949d472f5a684e5396e958b2db0a810d SHA512 79953dc5e4aa2a36c40b1cf9151ec1ad41a44591fd08d15f343cb1819e16088e361d1a5a8bc56f4c20d9e32410b52b6896913b905b4dcc2ad5eb3f4c0d376b9a
 EBUILD platformdirs-3.1.0.ebuild 1427 BLAKE2B 4edcbd6fe7eeb8f474fcd49f881953bfddf3ff21262b353d99ad514eca9e8a185ec53971c13449e5162daafe089bc04d8f2005f0d7e1a34a8fe730fe48e442da SHA512 c60f695597a45a31d3c102de0bd5311faba9f4f486ef5e3407fe43fed3b89d1a0b7e80925c60cb06a48eb1b99ae5f0a2bf9a3ba063ac57b3b60baa94303eb1fe
+EBUILD platformdirs-3.1.1.ebuild 1427 BLAKE2B 4edcbd6fe7eeb8f474fcd49f881953bfddf3ff21262b353d99ad514eca9e8a185ec53971c13449e5162daafe089bc04d8f2005f0d7e1a34a8fe730fe48e442da SHA512 c60f695597a45a31d3c102de0bd5311faba9f4f486ef5e3407fe43fed3b89d1a0b7e80925c60cb06a48eb1b99ae5f0a2bf9a3ba063ac57b3b60baa94303eb1fe
 MISC metadata.xml 383 BLAKE2B b8c8c1593d154e7a38ca4bc450c14ca21f2411ea1d71f67e9631c1def0acace43ebb6e67adc0c4a1f5f14aadfbce44d0d815fc3696410bef66c826fd5fb00a45 SHA512 f4ba6722e1cf661b3febe10bb15755a9cbc30226a08bdcabfa3d80be87b42d662d6a1edb3412ad79e8f36836a6dd4fd91a83dae29725ec47041056dc1f1f9b75
diff --git a/dev-python/platformdirs/platformdirs-3.1.1.ebuild b/dev-python/platformdirs/platformdirs-3.1.1.ebuild
new file mode 100644
index 000000000000..b876a13536e6
--- /dev/null
+++ b/dev-python/platformdirs/platformdirs-3.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
+HOMEPAGE="
+	https://pypi.org/project/platformdirs/
+	https://github.com/platformdirs/platformdirs/
+"
+SRC_URI="
+	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+
+BDEPEND="
+	test? (
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "hatchling' 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 = "${PN}"
+		version = "${PV}"
+		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
+	EOF
+	# sigh
+	cat > src/platformdirs/version.py <<-EOF || die
+		__version__ = version = '${PV}'
+		__version_tuple__ = version_tuple = (${PV//./, })
+	EOF
+}
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index 482decb12a6d..85c12bc9f808 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,6 +1,6 @@
 DIST pydata-sphinx-theme-0.13.1.gh.tar.gz 3391663 BLAKE2B 411b3dfb81b84189da86b0d11bf983348ecc6cef25142616f997f6301bc7873360835ba87309c055df46800ba34c30cf0d82bc3fb2c1984214d0c3e02556d17b SHA512 c88db817891800ee3483f724770354ab8c02abb0e430537ecd29b2e4b566fbdccb0a461926858a20da2da98dff37c6f09fa3f29dc538ecc30abd87597a9c08c2
 DIST pydata-sphinx-theme-0.7.2.gh.tar.gz 2632129 BLAKE2B 2beb9fac60b5f6c863ee4c570b88c4331135d2c8a10d84599f97944002576424caae06d062104a58c7f329f85e046eaa820d03a4117396009084707d563608d7 SHA512 2f6cac080807eab04f1c4de2fdd1563de17f1214f79c094f69b5ff116bcc47f1b0e159d6c87412c8cbe7691b19eebb3b228ca8243d05c81bba94d0aacbdb3e5e
 DIST pydata_sphinx_theme-0.13.1-py3-none-any.whl 1624783 BLAKE2B 9ff997244b12320dccbec56866af4cf780a5341a5d75b7040de3623d15a2593561a6506f31be769b63bb72905e1e428e9fe0955988b2919732bdfe1dfba68062 SHA512 1f31d59b0041aa6302ea3d6a03d089adb7108e334813f2ceb576b04b5767a96ef4b3d6d3d3f4bc40c399932b193575a21f418dba2a1737a14ba90deead951457
-EBUILD pydata-sphinx-theme-0.13.1.ebuild 1146 BLAKE2B ea01cec62cc3ccb23fddfdcc7f0ef24d40bf850e1444dd6c457c6a2dce9b415f6fdad1cb271fb2db082b0971c570b35d9ac5100ed2dc4d60ec171fd370a59c7b SHA512 94e43d6b8bed24b9b42ce39fd771053c0ecc5cb8c78b48e64a70f074cc44a1d8045a5be1d045bb241bf8046d3d2081b17dd3e35444c452075aa663f1f2fdcc14
+EBUILD pydata-sphinx-theme-0.13.1.ebuild 1152 BLAKE2B 7a6c3c3d13190d5069aecc18be5dda281142572f945d910fef7330383450e785c9fe90ec510f0b7fee511e2735086232ca4fa839bda32cebb8f84fc208643a04 SHA512 30d046e6db7a9780bccf29cfc693ee2c7f77d2dbefa346c2b75128c8008f666ae7c8f9f875027e581a8e2529e3780b806c25944b3620647fd4876b64d5df0494
 EBUILD pydata-sphinx-theme-0.7.2-r1.ebuild 1044 BLAKE2B a024f2013538da03bdaae92aecdfaff967784c56c10f760c1354efff596465a45d5453fc9bd9312075dd6b18cea6a16fd7c4e2157f12be86f9c91c6559309c34 SHA512 b156267d00caa08cbd26cfc661345dd141fe0a37cc4409f3b80edf28e4469844cd2c2d4be101872f86f00af32c723d3801ca5180b27804c5974051434b5c3c1e
 MISC metadata.xml 532 BLAKE2B 397b44fab769346cc170d5627dc663adbe29b780cbabc3d7643d5bda6ff89d6fbe6e6f55da69e93b8b20ddee16856612063b442125a16e035803e50f5aae924f SHA512 9de912fb51a153d508f3a12a3eb7ef3cd926089452bd6bfb822ae4a797d8aeb9ac68973ea7bebf3095f546dd288fdf651710ca8536f19907ac69f622ca3b0550
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.13.1.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.13.1.ebuild
index cc800029fa50..7d26f1651837 100644
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.13.1.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.13.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD-with-disclosure"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/accessible-pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/pydevd/Manifest b/dev-python/pydevd/Manifest
index 79ead8cf2f18..c181ef1a2d19 100644
--- a/dev-python/pydevd/Manifest
+++ b/dev-python/pydevd/Manifest
@@ -1,5 +1,3 @@
-DIST pydevd-2.9.3.gh.tar.gz 3979334 BLAKE2B f26af62d12d89317ffc9e670c78bac2c977195897dfb858861f6d12a331714c084d11dc030efe82777d51f9cd429b54d78c7126f366fdda15ebd315121b55dcd SHA512 c8d30658e84a1edd3e4d0cd35563f50231b6a2df247fecab5e90236c4c80da10e7fe5f182b1791f86063d3228d115d32d388087605e58842505ab19aabe75444
 DIST pydevd-2.9.5.gh.tar.gz 3982897 BLAKE2B 06f0712301b419c472bcef2443a2ed277eb477041ff2e40e41b57f61649d84a7559dcae82c30ac572b14e90b98c2b9b9542c7360deded087eec92aeb0372ad67 SHA512 9aa38bc9a238e6f2956883a6318536382726013ea9e4a9d902b36d60df0cf924c279545bcdf92afdb435bfe36598982edd5805725860798fb3970b105254ba1d
-EBUILD pydevd-2.9.3.ebuild 2565 BLAKE2B c6d62cc33736c89466e0100815f7d1f1a3b084ae27cc4af1fc653578ec46b6b449775058a431ef6a2173eb06580f0447ccc0821eeaa07516f41bc4a52d1e81fe SHA512 1a04cac3328fba3b39a8516d6f4647c732c284df3c42ce58e71d7c76759dd6895ec3af7520d73caf245777c26d749665cb787886ba95194b7f01e590e732f8b9
-EBUILD pydevd-2.9.5.ebuild 2477 BLAKE2B cdc0a3ada74fbc8bcfd3846ed16a93dc60fe9044d77398ab153675eb2cd7764b63495128fac223631efa52bc738fe3fee7ae69d0e9b80fa0d738fa8a0494b9d3 SHA512 cece7dc3808387b462f86bc2b8fe7d8322d4824513d41af50e2a23083941a8dd5b6a263ac9a3dd65132b0603a359f37daba542fe68ac42ffcc6829bfa743b1ea
+EBUILD pydevd-2.9.5.ebuild 2469 BLAKE2B e896d796689ee3729b7a24f7e7048c795ab163b0aa854b30cc8e53a7e7d412b9ee3d995b5a53958f7e11f424f6545ee7488fc35ac768d8012ae45a93a6ddecfb SHA512 584ea1de51b034222720d6cd40d04b7d24366c175496b43f326c4c6fda8239f8cc0525932c951a9702ed337cd4224f0694b60ca18a02ff36fde6ea14520de771
 MISC metadata.xml 384 BLAKE2B 37a4caa01a28f98ec8d141129c08754e6ba4dee5910a81c26f3eafcd7ac832962e91d3e39783e4859ac7e5ae5754837c89e496c4c2c205d12626359adf7dddae SHA512 5cf80b2e0eaf21e900c83341e9bef5c74a36d3c0a7354e3b6a832184cc60c42eeef6a22236e4fd9d484dc8834e5d4f98facd2578c223da2cc187dd76f91db764
diff --git a/dev-python/pydevd/pydevd-2.9.3.ebuild b/dev-python/pydevd/pydevd-2.9.3.ebuild
deleted file mode 100644
index a78c1bb016df..000000000000
--- a/dev-python/pydevd/pydevd-2.9.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 toolchain-funcs
-
-MY_P="pydev_debugger_${PV//./_}"
-
-DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
-HOMEPAGE="https://github.com/fabioz/PyDev.Debugger/"
-SRC_URI="
-	https://github.com/fabioz/PyDev.Debugger/archive/${MY_P}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/PyDev.Debugger-${MY_P}"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# After removing and recompiling the prebuilt lib the tests fail?
-# For some reason the test suite is executing a slightly different gdb command
-# then before, which is lacking the file name of the lib that was pre built:
-# gdb: No symbol table is loaded. Use the "file" command
-# This also happens outside of portage so it is not related to any *FLAGS
-RESTRICT="test"
-
-BDEPEND="
-	test? (
-		dev-python/untangle[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-# Block against the version of debugpy that still bundles pydevd
-RDEPEND="
-	!<dev-python/debugpy-1.4.2
-	sys-devel/gdb
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Drop -O3 and -flto compiler args
-	sed -i \
-		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
-		-e '/extra_compile_args/d' \
-		setup.py || die
-
-	# Clean up some prebuilt files
-	rm -r third_party || die
-	cd pydevd_attach_to_process || die
-
-	# Remove these Windows files
-	rm attach_{amd64,x86}.dll || die
-	rm inject_dll_{amd64,x86}.exe || die
-	rm run_code_on_dllmain_{amd64,x86}.dll || die
-	rm -r windows winappdbg || die
-
-	# Remove these MacOS files
-	rm attach_x86_64.dylib || die
-
-	# Remove these prebuilt linux files
-	rm attach_linux_{amd64,x86}.so || die
-
-	cd linux_and_mac || die
-	rm compile_mac.sh || die
-}
-
-src_compile() {
-	pushd pydevd_attach_to_process/linux_and_mac || die
-	# recompile removed file (extracted from compile_linux.sh)
-	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CPPFLAGS} -o "attach_linux_${ARCH}.so" \
-		${LDFLAGS} -nostartfiles attach.cpp -ldl || die
-	mv "attach_linux_${ARCH}.so" ../ || die
-	popd || die
-
-	distutils-r1_src_compile
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# Remove this duplicate that is installed directly to /usr/
-	# These files are also correctly installed to the python site-packages dir
-	rm -r "${ED}/usr/pydevd_attach_to_process" || die
-}
diff --git a/dev-python/pydevd/pydevd-2.9.5.ebuild b/dev-python/pydevd/pydevd-2.9.5.ebuild
index aa9a8f932b61..8c93d22eebc4 100644
--- a/dev-python/pydevd/pydevd-2.9.5.ebuild
+++ b/dev-python/pydevd/pydevd-2.9.5.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/PyDev.Debugger-${MY_P}"
 
 LICENSE="EPL-1.0"
 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"
 
 # After removing and recompiling the prebuilt lib the tests fail?
 # For some reason the test suite is executing a slightly different gdb command
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index e316bb0fc6f6..0d9365bed43f 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,3 @@
-DIST pyopencl-2022.2.4.tar.gz 468743 BLAKE2B 52c0d1bfc1f01eef853efb334434eba81adfaa57d98592663145b3124110765f2afa936331e36b534abadf8d87a5c606ab32ab4452e0b8e87f1ee41c1ef2548c SHA512 b1996dec89a6921216d624e5e38407dd7ada77f137e9c245f9c2dd634dd33d208ffdad57f84739e7942c64643c37ea2d044277fed85eefb362bbc331f4be3ab0
 DIST pyopencl-2022.3.1.tar.gz 470441 BLAKE2B 86ec602f3d73a64e34fe77b7985e64db332a685b33231ad7832d7e864f3170e3eee0aed42742b9892f7950a0f672a736e169ccd0ca08a124b7f20738b348dbff SHA512 57944de69bb24f0f22fb2c0165cd4de5265f5329246fead8449d26e6cbe1204fd44ced70df9960aa54e7d285abe81d8f8a802ba62309de5f4865e882177025ae
-EBUILD pyopencl-2022.2.4.ebuild 2043 BLAKE2B 129157f9e2ca1ca81ce356082aae9a09695179857864d759ce11a04d5746bf06c44d60d9834c1da012dbab913c58d618c178abb88b21616cb29ab357ea851326 SHA512 aec768ce78cb93ba04805cb26388a5b39dc953a705c2028938376964370d68ae6ad07c48859449593724e27ec714f12a6b8e96d80fd01825b014feb44d877f36
-EBUILD pyopencl-2022.3.1.ebuild 2044 BLAKE2B 4c714fe77cf73a6b356fdc8b0f8e8ad3f71d8c43b7a22916652918ae3315e83c74346d91b5e547d0efa84d58d5ca2a32e092b52c0de8a63b2a56faf97f599232 SHA512 32557bc9557d4232ac627cf9eca80abc649ed81224388b68b6070bf70955da5ca2824ccb8f640fa97d0c4625fce585157a5060d8c73143480d3ed83ab8c610eb
+EBUILD pyopencl-2022.3.1.ebuild 1999 BLAKE2B d64eb47dc442534e666b141e7d02bde62d80ead50d74cbde05dc32b28b143f20e1e6ceab3c199720ae07fa4e26272c034484ee8cd2962ba98dfc9f5db9cf4346 SHA512 d339449a1043befbf8eacbdb9f6874b16be9b54fcc17c0c1070ac4176fccdc04fb488dcef44555031d5aed30179bb3a74684240ec980dc66c67b7b63be1f34ac
 MISC metadata.xml 373 BLAKE2B 0de89cb91a5dba1c34bacf04a95d4e2eb9e903bfb55e291f2ed20d579b9736a9a25f27620eed05d19c903c117e0dfbf410f408e9ff4008ce8c93f7b1b004141e SHA512 4ff5643089e5590d1ae4ef413a1ab0fa2772f71922a9da2c8b43ae375ba2e6e3d95ab90a13d51d22fdea49663c112c36352df609eceebd520fdc06590907b0e7
diff --git a/dev-python/pyopencl/pyopencl-2022.2.4.ebuild b/dev-python/pyopencl/pyopencl-2022.2.4.ebuild
deleted file mode 100644
index 5b660b8c377c..000000000000
--- a/dev-python/pyopencl/pyopencl-2022.2.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl/
-	https://pypi.org/project/pyopencl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="examples opengl"
-
-# Running tests on GPUs requires both appropriate hardware and additional permissions
-# having been granted to the user running them. Testing on CPUs with dev-libs/pocl
-# is in theory possible but has been found to be very fragile, see e.g. Bug #872308.
-RESTRICT="test"
-
-COMMON=">=virtual/opencl-2"
-# libglvnd is only needed for the headers
-DEPEND="${COMMON}
-	opengl? ( media-libs/libglvnd )"
-RDEPEND="${COMMON}
-	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
-	test? ( dev-libs/pocl )"
-
-distutils_enable_tests pytest
-
-python_configure_all() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${EPYTHON}" configure.py \
-		"${myconf[@]}"
-}
-
-python_test() {
-	# Use dev-libs/pocl for testing; ignore any other OpenCL devices that might be present
-	local -x PYOPENCL_TEST="portable:pthread"
-	# Set the number of threads to match MAKEOPTS
-	local -x POCL_MAX_PTHREAD_COUNT=$(makeopts_jobs)
-	# Change to the 'test' directory so that python does not try to import pyopencl from the source directory
-	# (Importing from the source directory fails, because the compiled '_cl' module is only in the build directory)
-	pushd test >/dev/null || die
-	epytest
-	popd >/dev/null || die
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopencl/pyopencl-2022.3.1.ebuild b/dev-python/pyopencl/pyopencl-2022.3.1.ebuild
index ca30dc274779..c5b324926a54 100644
--- a/dev-python/pyopencl/pyopencl-2022.3.1.ebuild
+++ b/dev-python/pyopencl/pyopencl-2022.3.1.ebuild
@@ -6,16 +6,17 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1 multiprocessing
+inherit distutils-r1 multiprocessing pypi
 
 DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl/
-	https://pypi.org/project/pyopencl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://mathema.tician.de/software/pyopencl/
+	https://pypi.org/project/pyopencl/
+"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="examples opengl"
 
 # Running tests on GPUs requires both appropriate hardware and additional permissions
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index c6861560a972..ee17f20c5e68 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,15 +1,11 @@
 DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d SHA512 db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
 DIST python-3.10.10-docs-html.tar.bz2 7387634 BLAKE2B 27b340b02412fc8a6f2911c2faf1da64511955432046a8580472b0445adb8272584f99c7fe41469932c948485ccdb799aea76cc9596f5a122342afccff2f7c83 SHA512 4678fc3a33e0bd53419894e98a3132f18635693dcf91846c6911a163ebd693b9af42d78ffc27fd5e522eca7376097555271b6bd85a21d1231d6b7523f4620534
-DIST python-3.10.9-docs-html.tar.bz2 7379489 BLAKE2B ab7bc918417682179d60d80685d2e22a4c8eb5f1080fc8a0469f525192426a72adaec7fba0c3c654b6ea3892b4723d2a1cc7b827c17648e7710c569bfc591d30 SHA512 06677a0c5d841833e590979cc174dc4dc7d7b67c277e5af680afc205d913e11987985e1a17d8f90538ca96fae4a9940c922c7f538dea222b7ffcd446a7168b4e
-DIST python-3.11.1-docs-html.tar.bz2 7701638 BLAKE2B 9c5452c2b8601dc5f9b681ebe8e5bbf6a74f915310554c158997bed0fdf471354c6de0eb260b31717cb9310f0d96b3a5ff497173cd17e2b278372e6af12f9ad5 SHA512 2541b13c2b7b06aa4d8750a4399f761619600d8978e691f0910365329167565d8a306d45895e3fb6c83e6b32b8e84943b0056fcd6264539500bac7a5625856ba
 DIST python-3.11.2-docs-html.tar.bz2 7779519 BLAKE2B d9e1faa1414b18923c08686097d4d65613768c404f712a8ca104f546938016afe5e47bdec25296db1792f1ec49a11ed9899b062b9fdb24e93b2f60d6f49ae82c SHA512 0a6b54b0e3579f640a78e9255ff60b6b18f36752b8949f0f19e5c2fb84c33775c761bed907fb45dc606e5bc894068086cac4935574e89421bee55e8b2127d7d8
 DIST python-3.8.16-docs-html.tar.bz2 6697934 BLAKE2B 99fb1b8e95c3719b1146e845051fa6b9fbf61fabfdd1fe6d93a44e6a46f4b4e44c9ce0adef89cfdeafc8b67d290adda21d295f492a8f54c069ad86fba4952c0b SHA512 aaffc1f4d56be0ff7fbd35c7ca690d9089f9686d957669852aff1406efad2bee52b2b965ffd652780da6048ff9d89e6bbc421e92588841b89d73af43ad4970fb
 DIST python-3.9.16-docs-html.tar.bz2 6965048 BLAKE2B 14d30cf5c444b993409751d17959bc46668d2b6e5be76e10d36adb0b8704a2a3908d829e8aa12d384efab31f8b60b462f711f2fa6adf8bc84fbdfe25e4cbc703 SHA512 38828ca880e3ed84a705dba465430f1b9623fec830662805008847c5d44ce04225ea7c2173d3eb138fd98e134fa2bb9ed84788e2b1d045bf9cf20e78e12d4472
 EBUILD python-docs-2.7.18.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.10.10.ebuild 635 BLAKE2B 1fc0f16e350547451331c1e6c22c98b14d844191e6f673f3e5f76201b5ab2bb4969201b0903459e5af2fba6ddf81f6e9b63d19d98a7d1a801bb29db6e988994e SHA512 a00c6816470eaa17405cbfec2fc0582490c4945d14753ec99fcfafc152e96a04f6b7955201630cedc8f9221ae0bbcf938ec79c63c015ae152da04ed015a3d670
-EBUILD python-docs-3.10.9.ebuild 627 BLAKE2B 5e44a7966eb23113adf482d53f128930255316f9e9ae7d9e9e6fad37cdcbab6fdc105a98cc3f6eb82647e8022fd0a074f9b207823d3616c9e08602f1cc524692 SHA512 6af9153b2d6a7a1573a114c9ce2e8fc2afd801405a38d60cb70312f0adfe50684c5e05c1382ab4215ae99ae94c21ababcd6d40e16e0fb1e6819282100d1fb0da
-EBUILD python-docs-3.11.1.ebuild 627 BLAKE2B 5e44a7966eb23113adf482d53f128930255316f9e9ae7d9e9e6fad37cdcbab6fdc105a98cc3f6eb82647e8022fd0a074f9b207823d3616c9e08602f1cc524692 SHA512 6af9153b2d6a7a1573a114c9ce2e8fc2afd801405a38d60cb70312f0adfe50684c5e05c1382ab4215ae99ae94c21ababcd6d40e16e0fb1e6819282100d1fb0da
-EBUILD python-docs-3.11.2.ebuild 635 BLAKE2B 1fc0f16e350547451331c1e6c22c98b14d844191e6f673f3e5f76201b5ab2bb4969201b0903459e5af2fba6ddf81f6e9b63d19d98a7d1a801bb29db6e988994e SHA512 a00c6816470eaa17405cbfec2fc0582490c4945d14753ec99fcfafc152e96a04f6b7955201630cedc8f9221ae0bbcf938ec79c63c015ae152da04ed015a3d670
+EBUILD python-docs-3.10.10.ebuild 627 BLAKE2B 5e44a7966eb23113adf482d53f128930255316f9e9ae7d9e9e6fad37cdcbab6fdc105a98cc3f6eb82647e8022fd0a074f9b207823d3616c9e08602f1cc524692 SHA512 6af9153b2d6a7a1573a114c9ce2e8fc2afd801405a38d60cb70312f0adfe50684c5e05c1382ab4215ae99ae94c21ababcd6d40e16e0fb1e6819282100d1fb0da
+EBUILD python-docs-3.11.2.ebuild 627 BLAKE2B 5e44a7966eb23113adf482d53f128930255316f9e9ae7d9e9e6fad37cdcbab6fdc105a98cc3f6eb82647e8022fd0a074f9b207823d3616c9e08602f1cc524692 SHA512 6af9153b2d6a7a1573a114c9ce2e8fc2afd801405a38d60cb70312f0adfe50684c5e05c1382ab4215ae99ae94c21ababcd6d40e16e0fb1e6819282100d1fb0da
 EBUILD python-docs-3.8.16.ebuild 627 BLAKE2B 5e44a7966eb23113adf482d53f128930255316f9e9ae7d9e9e6fad37cdcbab6fdc105a98cc3f6eb82647e8022fd0a074f9b207823d3616c9e08602f1cc524692 SHA512 6af9153b2d6a7a1573a114c9ce2e8fc2afd801405a38d60cb70312f0adfe50684c5e05c1382ab4215ae99ae94c21ababcd6d40e16e0fb1e6819282100d1fb0da
 EBUILD python-docs-3.9.16.ebuild 627 BLAKE2B 5e44a7966eb23113adf482d53f128930255316f9e9ae7d9e9e6fad37cdcbab6fdc105a98cc3f6eb82647e8022fd0a074f9b207823d3616c9e08602f1cc524692 SHA512 6af9153b2d6a7a1573a114c9ce2e8fc2afd801405a38d60cb70312f0adfe50684c5e05c1382ab4215ae99ae94c21ababcd6d40e16e0fb1e6819282100d1fb0da
 MISC metadata.xml 237 BLAKE2B e0ddb660341d52285c05ef71475c4790faf6a2c02dfcae63852cf6ec1d59f8d8d05f0053f4dabcc655cee5c52d4105ab7c49b1d073ef81564776ef2ab1dd18cd SHA512 b7c9ef68c5b33164535e398194694d571950d673409429aba5d40fdeffbc69871645509798671b80e47bce55e4237c094e50968e22534b4e83a020b11f4804f3
diff --git a/dev-python/python-docs/python-docs-3.10.10.ebuild b/dev-python/python-docs/python-docs-3.10.10.ebuild
index 2ab918028481..e0ae576a6a47 100644
--- a/dev-python/python-docs/python-docs-3.10.10.ebuild
+++ b/dev-python/python-docs/python-docs-3.10.10.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.10.9.ebuild b/dev-python/python-docs/python-docs-3.10.9.ebuild
deleted file mode 100644
index e0ae576a6a47..000000000000
--- a/dev-python/python-docs/python-docs-3.10.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/dev-python/python-docs/python-docs-3.11.1.ebuild b/dev-python/python-docs/python-docs-3.11.1.ebuild
deleted file mode 100644
index e0ae576a6a47..000000000000
--- a/dev-python/python-docs/python-docs-3.11.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/dev-python/python-docs/python-docs-3.11.2.ebuild b/dev-python/python-docs/python-docs-3.11.2.ebuild
index 2ab918028481..e0ae576a6a47 100644
--- a/dev-python/python-docs/python-docs-3.11.2.ebuild
+++ b/dev-python/python-docs/python-docs-3.11.2.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-markdown-math/Manifest b/dev-python/python-markdown-math/Manifest
index 050d5aec014a..4641aa401a24 100644
--- a/dev-python/python-markdown-math/Manifest
+++ b/dev-python/python-markdown-math/Manifest
@@ -1,4 +1,3 @@
 DIST python-markdown-math-0.8.tar.gz 8509 BLAKE2B f91d0dbd6073d724f90a1265a64f2375be51ce25f6bdf808e1176a582c0e98aa59a52d45d67c5e37f674db5b5b7dead572a93950b9143f0950a0ee20b241e4a2 SHA512 d35e0cba68fb4ec099368d0d4865a5ad1baab6fbd23f7457312ab6893c3864287c41c32f560bbd8cddb0afff6522640f9b9144a02774539eba4e1302fac05bcb
-EBUILD python-markdown-math-0.8-r1.ebuild 565 BLAKE2B a0ab57f125354cef5b25283f0d93f6cf62b0f16dabc2ed53ffbf3e65359adc15958f685ceb8b66cf1ad8e96d9d97f7986c9f065889277c5ab5fd22d472d89d32 SHA512 8decedc90c20016ebd068fb07aaa47867f45cb4905d7722b1823359d43cabf30d7d8dbe8dec45ccb8254e5e63480ceba86d664bba66a7ad9146e42f76c2afca2
-EBUILD python-markdown-math-0.8.ebuild 479 BLAKE2B d75c8e43524a1b2d4c8abf17b2603a61c27276ee8326d28ec24c15ff982d60333f9bcb76548c9367a4d3b5b0d4ae779477a2ad15b3d2ca601b889682cf3e3b04 SHA512 afcb876901445ddf663fd459841fbdeb8244e9ccafe885f5b9abd88c5134e98d23610432399e479dfaaf74d0e45943da01812650dd2b04921f803395afc38f8a
+EBUILD python-markdown-math-0.8-r1.ebuild 538 BLAKE2B aab4a1b7541b55ba201f182d7365ba98f338f2d4147db4766fdfa58707c2192d0049240e4374550b678fad91936c5cff063b4000867aa32f086ba39cc319dae8 SHA512 215e5b9e91aa65a7e28c0708c04f03294108a13900154cf529548328ca2036fd7ab779bb102650a6a0f242cd495dd4a5c62702d8d43392664d008830768ecc27
 MISC metadata.xml 673 BLAKE2B 4db5def6fafb04f04eee6e210dae60688e47d18f84d6d92cd66f75c67adf678c91908b8c06ba7dd9d1bf4089cd552bef2bdbe462537a2c4d117ea98c8df87aff SHA512 84d67e6430d8ca0202ed926f6a784c02168e68d2b44421acae27ad94a2a319d41e8fd171c3db282a27553c79da614c914f83b7264d6f5770dbb851984283f36d
diff --git a/dev-python/python-markdown-math/python-markdown-math-0.8-r1.ebuild b/dev-python/python-markdown-math/python-markdown-math-0.8-r1.ebuild
index d38d5ee35c83..0f767deb1ab9 100644
--- a/dev-python/python-markdown-math/python-markdown-math-0.8-r1.ebuild
+++ b/dev-python/python-markdown-math/python-markdown-math-0.8-r1.ebuild
@@ -4,19 +4,20 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
-inherit distutils-r1
+
+inherit distutils-r1 pypi
 
 DESCRIPTION="Math extension for Python-Markdown"
 HOMEPAGE="
 	https://github.com/mitya57/python-markdown-math/
 	https://pypi.org/project/python-markdown-math/
 "
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.3.7[${PYTHON_USEDEP}]
diff --git a/dev-python/python-markdown-math/python-markdown-math-0.8.ebuild b/dev-python/python-markdown-math/python-markdown-math-0.8.ebuild
deleted file mode 100644
index 465d18b449e4..000000000000
--- a/dev-python/python-markdown-math/python-markdown-math-0.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Math extension for Python-Markdown"
-HOMEPAGE="https://github.com/mitya57/python-markdown-math"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/redis/Manifest b/dev-python/redis/Manifest
index 9d1b2bfc934e..6592a8110b74 100644
--- a/dev-python/redis/Manifest
+++ b/dev-python/redis/Manifest
@@ -7,5 +7,5 @@ EBUILD redis-4.4.0.ebuild 1785 BLAKE2B ddfd60d2ed4e589c9c000adb8fb5a14e1e1960c9b
 EBUILD redis-4.4.1.ebuild 1792 BLAKE2B 3c450cd506c732a24bb224ae379f0826d9bbff2b466ec4a595572c56107569bf0f40b8916f9ca3dcae4fcb27ef2f16d53dfbb23e0895cb8d30f276a845e1401e SHA512 66478401b5fd8df86042728cd0945d446a9ca8efdfa14692339d2f4129e1bee2e050cbe645bec0363ea0d9b1b285522ab3f3c6003c826e7696cc583df3a2833a
 EBUILD redis-4.4.2.ebuild 1792 BLAKE2B 3c450cd506c732a24bb224ae379f0826d9bbff2b466ec4a595572c56107569bf0f40b8916f9ca3dcae4fcb27ef2f16d53dfbb23e0895cb8d30f276a845e1401e SHA512 66478401b5fd8df86042728cd0945d446a9ca8efdfa14692339d2f4129e1bee2e050cbe645bec0363ea0d9b1b285522ab3f3c6003c826e7696cc583df3a2833a
 EBUILD redis-4.5.0.ebuild 1792 BLAKE2B 3c450cd506c732a24bb224ae379f0826d9bbff2b466ec4a595572c56107569bf0f40b8916f9ca3dcae4fcb27ef2f16d53dfbb23e0895cb8d30f276a845e1401e SHA512 66478401b5fd8df86042728cd0945d446a9ca8efdfa14692339d2f4129e1bee2e050cbe645bec0363ea0d9b1b285522ab3f3c6003c826e7696cc583df3a2833a
-EBUILD redis-4.5.1.ebuild 1792 BLAKE2B 3c450cd506c732a24bb224ae379f0826d9bbff2b466ec4a595572c56107569bf0f40b8916f9ca3dcae4fcb27ef2f16d53dfbb23e0895cb8d30f276a845e1401e SHA512 66478401b5fd8df86042728cd0945d446a9ca8efdfa14692339d2f4129e1bee2e050cbe645bec0363ea0d9b1b285522ab3f3c6003c826e7696cc583df3a2833a
+EBUILD redis-4.5.1.ebuild 1785 BLAKE2B ddfd60d2ed4e589c9c000adb8fb5a14e1e1960c9b8ac6be66f0950b3dff1f16a34a9dd9b44d800bae645b76fa7ad427e834e9f4e9de8da904476dcafdcb04895 SHA512 8e62f3858bbbeb0e37d8859cc8d50c395459e885e460f3e0e1a8fa397e8e757910ce8f087f19bd49216dfdbb2ee8031ecbb85331735c34f4d22ccb4a1e8f211b
 MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75
diff --git a/dev-python/redis/redis-4.5.1.ebuild b/dev-python/redis/redis-4.5.1.ebuild
index d8eddff68492..320d50b908dc 100644
--- a/dev-python/redis/redis-4.5.1.ebuild
+++ b/dev-python/redis/redis-4.5.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 9519fbb82801..27443ec9baa0 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,4 +1,6 @@
 DIST responses-0.22.0-tomli.patch 4793 BLAKE2B d5991f55f4378d35224a19d4e85ee9786612f6b5931e52e326c46ca2b791e6e2f8985f69ebff14779948b45a6433d6b4223f8fabe615b0ad479364d941128179 SHA512 0d0bd3d10e4f38fdb236204f161ae499f876d8daadc8306b6ad02efec9277fdfdbc1c862704f49aec69cabbd52f3616acf74d3baab573f1f5418436928af3c6c
 DIST responses-0.22.0.gh.tar.gz 54094 BLAKE2B eacb1ba4fcae10d3a4e29fe1516da3f1d3ff07eacbaf65b0dd3f86ecfb36aa51527c0d89547a1480064654c49fd1233d2c3491d9afdf4eff34a4058e4f89ec0d SHA512 361e59e02df36fac0fb0ba2a070b730e485ec94fe90490c271e4ac86fae7954a551bf2486714d95c91e9d0b011f06a9d10b0d6408fd4d03234e1224cca1e9d0e
+DIST responses-0.23.1.tar.gz 72966 BLAKE2B e75db65ab98ebf7773c469dee5486b52b6f5c1f39d847c6f38a65e664c244937716c792cf009c750019043845b95c11ea38f99d68137899ef2ef48e60edc0c2a SHA512 2c05ac5c4ccca351940d3821b0830cee366cd7c9637f1e4c1e6b40c72ed2168a1036de634f03bfaaa2f7270e3825f6d9e8d31fc7a16f321f1de1cc64255454a1
 EBUILD responses-0.22.0-r1.ebuild 1077 BLAKE2B 31ae131a57fa7a313d3218171a01d7a89252875aa1af0605df0c77606aaab569a3aa4f6ddbdb2d233b7ebc2bff17fb52b62c2d2b280e6850621e9d1b34305f05 SHA512 7e68515e0426bca40326321a90f1fd3394f682703c704145137186793e23219c89794ad17272c1d3441ad5279ab786a73a5bad798ef14756c2ed3e94e4d71bcc
+EBUILD responses-0.23.1-r1.ebuild 1216 BLAKE2B a3c163210143dc88794050f004046afb8ecd36b3628b6b8e9df6aa74553462a739631a23785568c3a47ff5dd98ea43952292cb777adc30804144d89b19e40e24 SHA512 b8df4735dc100eb358c340c1e8fcb967f1021c3be7ff0bd92b87a68d8c53851b1c01adae7140a1973dc91aca00a20e0e298db8a31287120c8f14a96522c8387e
 MISC metadata.xml 463 BLAKE2B 64d3c7be57863ae6088ce746fbfcc68a8eefc37c6d8fbe1bc6866d4c24ad18e75215158d89217d13f0e5b9db2e82d1aab86fa2ff664098239440bfd3fa3e7cd1 SHA512 546de31e1cde62b866673aedb4d3c1278213b36cc75fe86a8e759eaf16471cdefe91d6b0005b4ec4caf4316f8449717d672ede4181f1c1912f5647d50557eca9
diff --git a/dev-python/responses/responses-0.23.1-r1.ebuild b/dev-python/responses/responses-0.23.1-r1.ebuild
new file mode 100644
index 000000000000..92276888acc7
--- /dev/null
+++ b/dev-python/responses/responses-0.23.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="
+	https://pypi.org/project/responses/
+	https://github.com/getsentry/responses/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# tomli backend is optional now, with pyyaml being the new default.
+# However, keeping it unconditional here for backwards compatibility.
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove unnecessary RDEP on type stubs
+	sed -i -e '/types-/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest -p no:localserver
+}
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 6571864d9b02..1e2c37d6ee15 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,5 +1,3 @@
-DIST rst.linker-2.3.1.tar.gz 10436 BLAKE2B 0de71c1994b65c20f2ef13e1e8f9f04d431d9bd7215ca9dca2c51d78deaa55803f69432d27dd14b3b5f9d224b75f72a56ac4bba72ec3fad660af31b248a265ba SHA512 0c9f236e372ffe69c2b37983c491c5b6fdb41f1c2a4ac16d3d815bfe5e8b93b58f001d449a57e663041d69d0e13e13d17178c477a1ea37f05ba7e919fcee698c
 DIST rst.linker-2.4.0.tar.gz 11340 BLAKE2B a1ae9c811b7d6fa2821bfbf5787dce75fd3d7e5d933ec15fbac9cd3bde08cfad59fdc81b3b58dc39d1209a27ca9dd8d2ecd68034b434b3f6d15469bfb98efa3d SHA512 31e3427ecf35b433cc9650138ee36090e99003b72c69b60b530835eb624d7eb13aae4cf81cc0044b36750798a4b8aa676e53e3b9eb335430076593640a243940
-EBUILD rst-linker-2.3.1.ebuild 801 BLAKE2B 6e4e42fe31f5147075cfcade1557d81e84b8c9f47dc9e7a74a434707b32ee1ee4f925bd9965f968a408279adc7af048c9dcc60f13a7b9daf2e7c9ff50543388c SHA512 1116a9ac82bf70d235d4706863cf7ec910bbc28a6449689b7f6a4fe9b75a93d13972211345e0e9bbc039766c1b9e1f727878bc91dbfe257cd86333912201bc0d
-EBUILD rst-linker-2.4.0.ebuild 778 BLAKE2B 9ca9e97cd7d4e50a3c89456e42fcc9e05ae8006c4e98fbf735f58ef733cd881cba8a931d189d0d0ef4b5d6fc5cbfa0ba2858ada1c1870ca3bb95c0a30b54b957 SHA512 64df9023394b632f60b6fd88aa2243605fd7536f253b71fa64b7429f941e34c6e0e15f7be9893f4490b950e51af482303243ffe00ef4a56a7f12b7dd80260a6a
+EBUILD rst-linker-2.4.0.ebuild 770 BLAKE2B 0c05cd455468520f994daace4e45884e4feac708325541741ce9a0383cecea4cb94c7c89fd083214a1d2244132030a1216fada72e9cb70d8f5e701ec7ead3221 SHA512 b5a7e0a817515ba2bd9299e488af50032885c24ceedc3f2fe5006bf56ed07e2fcad0e7b7d3b2340f9b91664b27dba9d6ee621f63cf39b0ce8bfe814d955a2831
 MISC metadata.xml 566 BLAKE2B 25dde9994c8bd1a39a9ca0f9a35d344730f43711d1b1219b834d3eee4232e5a1b2843aeac4f16cc780c96ec7537b750380d8adf4e06d6aa14eb4a2334c53db59 SHA512 31e07b2b90a0288af173214898a2f7589aa58c14a7641f05e18c4bd4a8623a3951d297337e9708a3c732649d23c74a22b1a1cd4cc7a18dbb28d0ead1a5eca87e
diff --git a/dev-python/rst-linker/rst-linker-2.3.1.ebuild b/dev-python/rst-linker/rst-linker-2.3.1.ebuild
deleted file mode 100644
index 5726371c6140..000000000000
--- a/dev-python/rst-linker/rst-linker-2.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
-HOMEPAGE="
-	https://github.com/jaraco/rst.linker/
-	https://pypi.org/project/rst.linker/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/path[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/rst-linker/rst-linker-2.4.0.ebuild b/dev-python/rst-linker/rst-linker-2.4.0.ebuild
index b0b4e51bd6f5..6342a9f2ad34 100644
--- a/dev-python/rst-linker/rst-linker-2.4.0.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.4.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${P/-/.}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 35e8527d9758..630ee180bf7e 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,7 +1,3 @@
 DIST sentry-python-1.16.0.gh.tar.gz 325763 BLAKE2B e53f6051a74065950c4f1ce9010a87071b4a715990643cb7e955411ffb784fabc7ca6f2ade3cc6c66eb0718c6fc4993c6035763a0937b8a1cd66289f3f026806 SHA512 7f46f6c66b0e4f97e7f64a0eba9c396fbb9ab95607ba8ecb4880bb117c4f3fff7881a6787ea814981bdfabd84ea2b172c878821877403852661e746b6fe666bb
-DIST sentry-sdk-1.14.0.gh.tar.gz 312667 BLAKE2B 02772c3313a6cdb5f872df93274b291cdbae35db8387eab3816261b446bb438afd41610580cc642299877d8f03732a1d7bae4e6ad9824a92f4126677a4a3ca1a SHA512 cd0c4ca10d61825919721335fe0413f1050bd8d1f41a2f3f4a25b843c4bf83d35610382f55dc14fe86f70cca962e30a8d9d0708a07b10730783ae09b22f20e04
-DIST sentry-sdk-1.15.0.gh.tar.gz 317804 BLAKE2B 65a45f0da5327057827f4533418d846d8d4dc4bdd2723fddd754e5391e12c50946bb2f3f7914c5ee03cfdac324d565e68158aaca8e6686dc4502a02813cd6442 SHA512 9ae477c3ddc90c4189f4cbcca8756d7b0bd2df0358afa553467b431a2a131f32c9a9df9ce0ca3cca4d98b5a14746222f21476c164bf6da09bc06d94ce7ed0afe
-EBUILD sentry-sdk-1.14.0.ebuild 3492 BLAKE2B 83e95fe53c8df2e51bfba5773f8b64803338728c0dd3a1a1b9bd46e390d1db4ce58c205f475462efba2a221747dbc6c391465abba85b01bab174f0a28b15476e SHA512 0b27e8734d40c2d7706792e6bd3ab659f4b1b08dc47c5860453cc6fd44a679011b540d2da56e21052a2d4621096dc64f270049f0caba6a133e34a69dbb479510
-EBUILD sentry-sdk-1.15.0.ebuild 3585 BLAKE2B 10a6931a241bfd84ef7e0d243c5fd37ffcb412d2285059b595589ce2ac151f36d1ff9975eaacb45eb8b2641594298216d072ed149d544e2d84e45415d4d494bb SHA512 1afef6f22c500b5e08a0777812e24cf4f6853d7e75039d00ad7bf0dcccf1e9d6930f650afdcfd459cec403dee546053a3a1ba74113e165f8d028a619410ffcee
-EBUILD sentry-sdk-1.16.0.ebuild 3640 BLAKE2B c3bd23007576bb9673782ef7ad4af56936c72f8b3c73e01bc86ce4436404066103532b0b358f82ae5b5058c9ec3c6e5b998eb54ca8245482a4aa819ebe2e2f0c SHA512 e0faee205c88e10a6abbf9eea5aea0d62d49031693a9a0aaed8fdbe9e5a075d719be897547fd3ac8ae296752030bb223cf8874958291a42421ab464273a9fedc
+EBUILD sentry-sdk-1.16.0.ebuild 3636 BLAKE2B 0a1659ddd0bc2f95875637270b637cda32fe557ac7471fed9b8c2518f0c51de97a542190d35d719d5fd13eebde63074fe6965d56e1100762b4cae16eddd26806 SHA512 c0de06866e1fe7b4594ff77ba3aa3291e9c8c7309aa2572a5c4dd4f799d42c85f7b7983f61fb74a0c443723bc4104482831465300b13cfa3d9af7b3ae8206ae8
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.14.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.14.0.ebuild
deleted file mode 100644
index 7f8695b09e51..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.14.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.15.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.15.0.ebuild
deleted file mode 100644
index b213e365e768..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.15.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.16.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.16.0.ebuild
index f02570ff1556..f842e3729450 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.16.0.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.16.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index 2206c14195fb..5141d069bcad 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,5 +1,5 @@
 DIST simplejson-3.18.1.tar.gz 83603 BLAKE2B 5f51d06238210b0bdd3dbb2338979023324e1056c2278f7eef7b929cc0bf9f9178d032829a3ce49c0b630f3367268d68753f250968962159e9a9aafcd3105d20 SHA512 3a18d02f42624e27c536582cf9b6ceb8559d54dd97224294a6f6ee8173ee37c0cc9cd21bad777c29ab432ac41b1495fca9d45da300b5040c175980d236d3b9d6
 DIST simplejson-3.18.3.gh.tar.gz 81540 BLAKE2B bf6a162499b28a362638e19735f668571f88943ae396fb7f813d51ab0684caa8cb996a35deaf1d68adee2a812d685058e9e80d6f6e66604bbb7c704051b0b37f SHA512 54223e08775ab6277722342084bf56684588dd9dda574428cb73b791d37d0b74decef6082268c0389cc4586a534a19e62ec5738fa9ffffaee63f68e27fb465c8
 EBUILD simplejson-3.18.1.ebuild 673 BLAKE2B 92bed311cf874ccc1dedcf67ff7846caf625b0dfb54440d605c725d4afed0424750ea2aa4203cb87d4679b8c0b624ab19a88c53026a74c22c1a882438d5b0e48 SHA512 5522bc25807604aac47eba679ea2486b268ace629963ab4ace68228a0fee72a878752a2214f9425a4870f8135756f3a836a809870972f6d70c6a7180a22f967e
-EBUILD simplejson-3.18.3.ebuild 964 BLAKE2B 4d3455a1725c06da1fe7c9738bcc9aacbe14d7027e8a1691720412ad7f21a99aea1e1e8cd08ce88e151087d9923c12192e94bc44c0fc62ec732cdb9225730236 SHA512 2efa867ff8fc47c962c0ddcec15bd9cf46e76f6505b0e77f5c471aa428e8b125b1bd246522356e2065c9a4b5e48fc4670434eb9be7b89911be22ca52d9f406b4
+EBUILD simplejson-3.18.3.ebuild 958 BLAKE2B 9b3fb2a45004644406ca63aa9e3a507b1575f8c0826eda482939615596580b3837bf76b1c4631f0834f6ad82e8aca4756ea6014e12f532ee96c8764a2f744e1c SHA512 89f3780b510e2b450fbcb7dceccf4902aaff236bc6a66127b7bf6cba026f3088c21d8de071f622a4f14fab5266b93de4c8886593c04bba862808eedb3a9350c7
 MISC metadata.xml 522 BLAKE2B b8b8fdade498ef65f4d5d6e30bc9f0708390f3d064a332d04f0b33346224c59252ef3d512a5a7187c637348201829ccc83254cd898e8df06dff314e857debb58 SHA512 1a1b53900ef62d4d40977504378dce3ce15f1c56ae5a73263127f5919674b1f9b13964128550e0c0e274d4bf50f2c2b438626e3ba1a5f8436071e1eb2f4c30af
diff --git a/dev-python/simplejson/simplejson-3.18.3.ebuild b/dev-python/simplejson/simplejson-3.18.3.ebuild
index e517c93ea2be..c26a4a1a8b5e 100644
--- a/dev-python/simplejson/simplejson-3.18.3.ebuild
+++ b/dev-python/simplejson/simplejson-3.18.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+native-extensions"
 
 DOCS=( README.rst CHANGES.txt )
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index ed07b07b37d5..d289130590d2 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,7 +1,9 @@
 DIST sphinx-gallery-0.11.1.tar.gz 393927 BLAKE2B c4c56e7bc7bfc519cd172cd104cfee902524c70de7fe76cc816d8f4612cbdf1a0786e3d5f83ea74ce7c1726eeaea5db45682efa3d873efeac49d94ab1393b9ac SHA512 514139213516851fe09aac4168d8fff72e5ce62eecdb0864f58e45d5fe6eab58b8fda749b72ae98f94b2bf8ac1a917396195d8a4d1750ec1563b30b879b12b8d
 DIST sphinx-gallery-0.12.0.tar.gz 402165 BLAKE2B 679b51041df7593a693116a558a0b297367b230f447f53821408631ef92f301e003d1c8446b4b3666b8836149f806b92a5f101993c4f0b395df983a49ef77101 SHA512 e086c9f4ca3c8f2018c88cf6d32e644735ddec0cf85a12757a36da93c6eda43bb77d64573b963fdcf7a2e24a8123ec675af48d2500eaed040ed91bde5f776b59
 DIST sphinx-gallery-0.12.1.tar.gz 402470 BLAKE2B e198679edca69be0a3ad01a3ddc45f909dbfa5771aa5f1dc3cb3bc4fc51d0b4565f28e2462c466386cd5982720b62ea28e3f4df7befbfd747042092fbf5387d8 SHA512 030423e4ff259d5e373c85bc04460598714ce8895a63537bcd96b9a903ddf44d05bfa4ecf15853f98391a9f35dc689406abb2d6fb1eaab0e40981806cd045241
+DIST sphinx-gallery-0.12.2.tar.gz 402524 BLAKE2B c872ec403adf150df540253b996e35f5d99dae17a884fad8e6a79a9b08934228e22c2b830d79cbe08cf43889738b2f0f8aa8e582851a993584d59d36adb6ced2 SHA512 c56c84ab7e4c55686b1c83791c46a83f3887c5c3a19da89baeba8aba874663d1dc4718534fadb11d3d95197c34ee9b78884095e2caeee4f58a9b0d4bba26d5d2
 EBUILD sphinx-gallery-0.11.1.ebuild 1086 BLAKE2B 90f5886ff545981d49dcb4c68d70d9b8145d61a63b5b3f06f79ab35fad1bac183d1f416252ee1038377f087f328f3be1a6005a7967174b087e9b97c5529c7e6f SHA512 a856665925eb0d873b82b980e9fb5f284332d7236ce1ab07969f6a984fb29c30c8872f42291b834c23d5d51de9e995ab43eece64fdef8c690a3fe6a8c0a396db
 EBUILD sphinx-gallery-0.12.0.ebuild 1492 BLAKE2B 73e0b547e935d500631a673760b6076a6b23c2c05f44937fde39a639501be401d9cf566136f6449f05b6423480b99706b6f8cd51d29d124feccc016eeb4c29c4 SHA512 7ece7ea4c297981634839cc0c92ffd6cf2f4f988ca7dd56d66d46c3593ced1f621e6702c96945d6ccd4c1c32da621ded222ac7dab563e43e0e6e4ba1994f1663
 EBUILD sphinx-gallery-0.12.1.ebuild 1492 BLAKE2B 73e0b547e935d500631a673760b6076a6b23c2c05f44937fde39a639501be401d9cf566136f6449f05b6423480b99706b6f8cd51d29d124feccc016eeb4c29c4 SHA512 7ece7ea4c297981634839cc0c92ffd6cf2f4f988ca7dd56d66d46c3593ced1f621e6702c96945d6ccd4c1c32da621ded222ac7dab563e43e0e6e4ba1994f1663
+EBUILD sphinx-gallery-0.12.2.ebuild 1492 BLAKE2B 73e0b547e935d500631a673760b6076a6b23c2c05f44937fde39a639501be401d9cf566136f6449f05b6423480b99706b6f8cd51d29d124feccc016eeb4c29c4 SHA512 7ece7ea4c297981634839cc0c92ffd6cf2f4f988ca7dd56d66d46c3593ced1f621e6702c96945d6ccd4c1c32da621ded222ac7dab563e43e0e6e4ba1994f1663
 MISC metadata.xml 424 BLAKE2B 4e5cd1e912fd5934c7221d3e5cc60b2894eca6b994384f6ceb8397ce9c5312be1e9869b57f9dd7f3ac66501b20e6fd6abd2f33b5d19b93d3a12f7158ba08e7c6 SHA512 17acc19bf43dbbf1a377949576252f77fd334ddd8a3bec593d2339db5a44e4fde831f9ce47be97318bf72e30a062608f883e48cf572904b3476fde0df33adb09
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.12.2.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.12.2.ebuild
new file mode 100644
index 000000000000..fb10706de391
--- /dev/null
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.12.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Sphinx extension to automatically generate an examples gallery"
+HOMEPAGE="
+	https://github.com/sphinx-gallery/sphinx-gallery/
+	https://sphinx-gallery.github.io/
+	https://pypi.org/project/sphinx-gallery/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/joblib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov-report= --cov=sphinx_gallery::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+EPYTEST_DESELECT=(
+	# Internet
+	sphinx_gallery/tests/test_docs_resolv.py::test_embed_code_links_get_data
+	sphinx_gallery/tests/test_full.py::test_run_sphinx
+	sphinx_gallery/tests/test_full.py::test_embed_links_and_styles
+	# require jupyterlite_sphinx
+	sphinx_gallery/tests/test_full.py
+	sphinx_gallery/tests/test_full_noexec.py
+	sphinx_gallery/tests/test_gen_gallery.py::test_create_jupyterlite_contents
+	sphinx_gallery/tests/test_gen_gallery.py::test_create_jupyterlite_contents_non_default_contents
+	sphinx_gallery/tests/test_gen_gallery.py::test_create_jupyterlite_contents_with_jupyterlite_disabled_via_config
+)
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index fd381bc9a289..249af9b050d5 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,11 +1,7 @@
 DIST starlette-0.21.0.gh.tar.gz 2830353 BLAKE2B 7ff818d4687757ec8699dcd0e2582af78211787b7a0f2110da045eb4f7a8760262cf144b0af7dc9f72140b5dae1e65f7a4207ee3b165db4091c5139ce0bfcc85 SHA512 c246862604ba807141313857321d898d996eaa771ccb197546d0928a75cbb69f0e485fe90d2c817e70323146077c487436516384e1401d815c59c0ac75845e2b
-DIST starlette-0.23.1.gh.tar.gz 2830865 BLAKE2B b1eaf59421d413179ad294b240babb9b1beabbf10d8364187eb406a3b87a1412b3959b90f44ac1bbada7858c3ffc90560208bc433ca5aaf835dda1766282fe65 SHA512 9af4ab2b2e3af4e7acd2e93a9a4b4f4c8c3b56ba971f7a8faf65308d76a4f30b8ab0ab263535480af614a5082420cafb3d939c7477472710cce9241bd947139b
-DIST starlette-0.24.0.gh.tar.gz 2834269 BLAKE2B 82e1ae2cd835015f20c5421254c0facbe16c1592d1f34e95d38c94898fb30e308dd32ab8bc1856c16d600074c86300afc4aa11e2617a94a29aad9dc4dd0fbdfc SHA512 6ff38cb48efd25183971ea4578dbbd7aff537d624fe2e2b9249551b9bf559dad05da949ec52d305bb0323e37c837212e3a804c7614884e5cd4b85260ec1435cc
 DIST starlette-0.25.0.gh.tar.gz 2835696 BLAKE2B 82ed915a2ff7824a99e0f15f16a0723b8799ef43ab5b25dbbf7ee7bff7a3a1fc555e802a82950b11eb752a39e23fdf0870090a99bed568bfa82e3ecbcf42f5f3 SHA512 ecff4905c093ffd21a4b102d4ca1dba22ceebd8e73f53f984fbe58daa7a0bf9c3de9a41b1672837602142a4e14787f3b59291d05b9cb6a0dd034d58ddacd9eb1
 DIST starlette-0.26.0.post1.gh.tar.gz 2837411 BLAKE2B b5db12f5c9fa8a8e9b78ec61ce26d2caff7f4160ad2e1446d6c161c223b3efc797e6cae65171e03aa14deb33172ceadb20d78ee02bd5754bc66e0406e4bbca89 SHA512 e8f1e98b922b2b067b1d7c581e5c9a6af887f204546ce04206abaea21b0c6e16de182022a5f70153a4f0833847f510f2ccae7f685c92a7f344a581d1d3d6ca0a
 EBUILD starlette-0.21.0-r1.ebuild 1076 BLAKE2B 6f6d698251b05f596260ad9c88d2f893e98647b817f275e305b1875f0f52dfc2e7abe92473ea16d7133aaf8458a6bbde024f1be5adc56dbc6774634691c37b62 SHA512 fe86cad02a7416a249a60279cbfed1e48f01d3a19550181faeb9d828addaa069fe991d86586d7cfc8e315c88fc46435a5be80c64e68053f3c6eb69ac4dd9f4c2
-EBUILD starlette-0.23.1.ebuild 1110 BLAKE2B 82834427582baf6a076071128ef6c31f7c983889e3f3ac9e7a9ee330338ce598c0cd064c85705c488c0e12ce2781f29bba81a0abcd54dfa32e4791b835b9c4fd SHA512 58e19a84588c288060561e0a58639e39fbf990db6eb2d2de7e6c5d649db9515494bec3bd1256f6c48d9da574e11e70482a6710e45379f6293c46d1db8c279825
-EBUILD starlette-0.24.0.ebuild 1115 BLAKE2B f8c0a424aeacfc96d41820f0271952a0a4bf5a7a4e9cd82c6ea46a62b4ffdcdf9c4dc688b3b43919063549b9003b1451083f66b32f758c2b9c980c87e5066a46 SHA512 dcd2c36824e995317476044573223748fd07065435956f1dc82db91e539ef1e87798628dd5d61b04d6296edabdf6998b9346676489628f420587e2f6b94967b4
-EBUILD starlette-0.25.0.ebuild 1133 BLAKE2B 99c4fc9274115f51903f0d5e76bb700b52a7b8c312577da32a382e92b8abcfc2b6ed61d29454f774a0649777ae52e982404a8f773cca5173542ecfc81f93b373 SHA512 a983ae5fea4daa054f67f24383ca85edf72b0f0a31b6355c36aaf153b421050eaa98f3ccb3c22498f5864a047ace6d09dfa1e68109acc2dfeb0ec9e0abb452af
+EBUILD starlette-0.25.0.ebuild 1128 BLAKE2B 48e92a02a892572f04f8d0b5c7f76b963f1c2e602ab0fed68e0a06f1dd5e8b27d6ccbd06c2fdea1b4c61d68bf346a6e0b078e220bf522561d301c933c78dfcaf SHA512 c5140292443bd9c0479e3a81346b47fbfa4408e42a5d8bdafb0c8ae3387dfc64ead76e12a69db7c3c2e0e41f1d4a326aa022e70548f2aa021d7743b3db0e52c9
 EBUILD starlette-0.26.0_p1.ebuild 1185 BLAKE2B 24a50f971a223d5fe2be6e670c9eed120f77807d56c3e2bd971fc69840e14b0f3a24a8c7333329ff64c0541d988d4781eef58b14a48310e327b070584420de01 SHA512 5ec883b6d54a2640e3fbe23a019b117edbcac599ba390edde14e28a682b3e623a0122ef419c00e2a9c8b27096c2a2b243e9c756006cfa20b33e921ce8f634f6a
 MISC metadata.xml 371 BLAKE2B 0ccaa4659e63162b565359a1cae05764bea66d708a5f4af1a4716ba9ba23faa39ab4f5a806c0a9783f3f42282ee9b98e22a92f2b308b8dfe97bbf9c770a8add1 SHA512 0fc326941861260becd4129c8a351e89ba0f98f9a3ce9b5d50812f0eaf667743ab0d403889aa1b0a2d9fcedbe0212ba879d165ec8edd115686d4768e6b1326ca
diff --git a/dev-python/starlette/starlette-0.23.1.ebuild b/dev-python/starlette/starlette-0.23.1.ebuild
deleted file mode 100644
index 1e826f4696fc..000000000000
--- a/dev-python/starlette/starlette-0.23.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ppc ppc64 ~riscv x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/python-multipart[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-3.10.0[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/starlette/starlette-0.24.0.ebuild b/dev-python/starlette/starlette-0.24.0.ebuild
deleted file mode 100644
index 65f85b51857a..000000000000
--- a/dev-python/starlette/starlette-0.24.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/python-multipart[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-3.10.0[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/starlette/starlette-0.25.0.ebuild b/dev-python/starlette/starlette-0.25.0.ebuild
index 4b08d84dd01e..8980e3f0d73e 100644
--- a/dev-python/starlette/starlette-0.25.0.ebuild
+++ b/dev-python/starlette/starlette-0.25.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 3f93cde92a65..d96fe2330157 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,9 +1,3 @@
-DIST stripe-5.0.0.tar.gz 267241 BLAKE2B 6b4a58a355baf2d16d6de8667d1dff655c3334b58933c6172b25963f90bf072ebb5fae197faafd69285ceaaf06ba952c7012c35222df873d0453ec9fcee45cd5 SHA512 3d782abd3d6983734b6248fcb44cb69609475e14b820062882439c11ba8ba64e19f3db7984902157adaf0a80f9c26d18e7fbe414eb27bfeda95a7fae78a07577
-DIST stripe-5.1.0.tar.gz 267508 BLAKE2B 973f286c1a6a6703e903d65267465def0a99c15e65b034a690f12d51e6572412f1007eb8fa7ba9df41f4450e09c8b0584a1ce472d0815757ef1e402021daec67 SHA512 1afe76180922bfdd90c19d9a6326a98a9cc8e138fc9bb26c42f245373f8b4b93bc0144d3c41e0fd5f278fe425f6bb219cda7d4f993db845756de22c0047cb228
-DIST stripe-5.1.1.tar.gz 267508 BLAKE2B da7918aeaa50dcb0e02274a93d39db16cc02b185597b00b442437050df3842c4d9dcbf3477015b7166837845fe6d2f9f9b79fc05ace118c985254545d424b1d9 SHA512 119af52d0a3548dc73a14b3de84cf9b8c465cccc296386b045b7aa23e0db6a071f2d03e6d445c0581863055497378b2a1169bd70119eb4d5ecc62382968da2ef
 DIST stripe-5.2.0.tar.gz 267950 BLAKE2B b7312e4c7e56803fdd64507602df3527efcc964aa7bb6deae59d00df75c72c47cf179382ce6b90ffab5089e7fce9b2e03de0748a091b36dd25d93d8cf6b1d119 SHA512 e928487b690a2c7bce9013ba988ff5a1d9b0ef4b0be56852385925fd5fa4a1b9e655e05b7fa2728d38ed7834eebe621b883851e6a6db625f388866f32c9f8a15
-EBUILD stripe-5.0.0.ebuild 1816 BLAKE2B 946accaca81fdb3985cd70e3ee52fe062712e6c9464d429d0e49aad10aab51d1b5fb8dbb51f61a7a4c92cfac1e46e04b1ee699a8dddded0d57ae0d7da372fec6 SHA512 2f49dbe494941f67f4832c27e49f883ca60b31cf760d95f456d04088cac02e9803d981dca77b0e36e3a9dc652943d3a3024968e125aebd7e66029d1688ea2f5a
-EBUILD stripe-5.1.0.ebuild 1818 BLAKE2B dcfd6e92c29be7d2ee5e54d198abc2d44d899702f7798c184352a26fc191168a86b708c259ef461554ea0215ecddff0d7f885bb64c924da1f46157f388d751bb SHA512 00b8fcb108caf40d6d8620a833097ae08fe10b15afc01a02079988113147d05e492b0470ee2f5c6223d8a6a0f180eb51028ff15b0e1f7a8e87133d91744fd6fb
-EBUILD stripe-5.1.1.ebuild 1779 BLAKE2B 14f2f04eda62fd13177875f47c1ff824c764ba2bddde8d44ced72b4843b1aa85b94da553dd7d0961f5ca7da4d4c444f49f11bf961db922aa4d3f88a028d47654 SHA512 45f700a2070b78855e25c65683f6013fe324dbf2eb68837c4d243649a94c5dc690bc7649aec433f13f4fa96929076e2fe9d86b6ab7a0ee534e16065f1fb57c14
-EBUILD stripe-5.2.0.ebuild 1779 BLAKE2B 14f2f04eda62fd13177875f47c1ff824c764ba2bddde8d44ced72b4843b1aa85b94da553dd7d0961f5ca7da4d4c444f49f11bf961db922aa4d3f88a028d47654 SHA512 45f700a2070b78855e25c65683f6013fe324dbf2eb68837c4d243649a94c5dc690bc7649aec433f13f4fa96929076e2fe9d86b6ab7a0ee534e16065f1fb57c14
+EBUILD stripe-5.2.0.ebuild 1777 BLAKE2B 7d52e724895d47f77fa83ed1c81b77070c1453f9e7aa6464975dcf8384ef559567c618b4c056da8d701c33cdc15fe953623e2d1cae20147e8d0e3b8f01c9cc8d SHA512 9bc618c6f3bda2b506c49f87950981607eb5bba6eea89c6362c6b3da83a14da65d8c9d9aee741a97fa98d42314dbf2d3f1c268a94b0c45f850f3911ef023041c
 MISC metadata.xml 372 BLAKE2B e6a38fdec6fc016068e7a0522ba15e83bf358ba1475e54a9630b1e86c75bc14b790c59716317bd81438a1c770e4d31afbe04400ddcd5dd272715c251fd6cb1a2 SHA512 2d9672b242f2d38654f7906097e597dfbdf75afa3583ea331f61772db95d19a802e83ed523c67a6cf3da18411036055c0996fd04d99199618d5205be8a61bd77
diff --git a/dev-python/stripe/stripe-5.0.0.ebuild b/dev-python/stripe/stripe-5.0.0.ebuild
deleted file mode 100644
index fa2766359154..000000000000
--- a/dev-python/stripe/stripe-5.0.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.141.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-5.1.0.ebuild b/dev-python/stripe/stripe-5.1.0.ebuild
deleted file mode 100644
index 25678121e96f..000000000000
--- a/dev-python/stripe/stripe-5.1.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.151.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-5.1.1.ebuild b/dev-python/stripe/stripe-5.1.1.ebuild
deleted file mode 100644
index 324896ea5925..000000000000
--- a/dev-python/stripe/stripe-5.1.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.151.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-5.2.0.ebuild b/dev-python/stripe/stripe-5.2.0.ebuild
index 324896ea5925..3dcb231fe397 100644
--- a/dev-python/stripe/stripe-5.2.0.ebuild
+++ b/dev-python/stripe/stripe-5.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 67b995046c10..fa94bb8cace7 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,5 +1,3 @@
-DIST sure-2.0.0.tar.gz 46747 BLAKE2B 631923bf2fc0a972e276fbfd1918abbafec28e662669993b40ff8ca72944952d092ac662728f98a286fc9b5c8e3765d10a4d6ef1f17b17655802b971b97410af SHA512 8286846374c2bfc773444e90bf4f9c0b0d66d0229afa53af63025bfec690bf8bcc959f86c238ca5244c6a29099e955691771b0eb954af479bde2f17e51f6f1de
 DIST sure-2.0.1.tar.gz 48467 BLAKE2B 2143d073c09e46fa987c6d62ebf59aac61e1304079707cf517d7d1ee10303c21369517a1fc2836d8f1081ebbe7d9c3e68aa629d432f85622b9ff8eaab1dd2abc SHA512 f319685ebb1c00bb064bff3e86543789ec94c9a6a8192ca2e97da3513208f9cac66e9db44e945f68ab39eec696880a2c211627f9881623492946e1a14f2444f5
-EBUILD sure-2.0.0-r1.ebuild 773 BLAKE2B 3280a244e6d8aed3c400039ae5a695d15de294292bb93bbe834cb8e932576b433228cd04fec69c75d354758cd1636cf8e5d853f4705ef3319c25c75f7052e3a1 SHA512 fa7448ae4b91349d601b580535479548dff271ef30c285094f7a6376ba05a738caee7bff94d707c1c3f211c6af55fbe3bd578124bf3305c33ab55f31e1b32c88
-EBUILD sure-2.0.1.ebuild 780 BLAKE2B f31c80c62fb02819b79b5129547038317ee17103b54b70fc428b82dc12ff9458a902ce6e264f724f475da16af56ec702caea3aa62b8a4b0f3510594d5d59b4cc SHA512 f69c13af7d134261a8633670eef2e148af22f71a570c4121eb9b5ac35a6c2079c58c38e7f283ef46c5e17a38737b582ebb82e3359c80c83283d2179921028e39
+EBUILD sure-2.0.1.ebuild 726 BLAKE2B 5125685f6f357e6a9749c5e79330df2392df4c9b66453c8b6ea1c2c7e6246de695d312d3b218710793e4af7bd515df350e3998fce16410ab96c4408cc6d73ec8 SHA512 bf6bdc37fc6f59964c2eaa53e82b676f6ea453f35f3aa0a5e5334e0d0b2becc02ab8e0ded38f1acdf725d17d29b2fe16e6807ec7321d85f59e52885b997b8038
 MISC metadata.xml 583 BLAKE2B 3a551f125c9df8f77a05b69cf54b30d94bace7869decb608b3685e06a7cb9f1462d4e674d06d59d84100e06ee95cce30a68c4777632bb0691397f1e6faaa26ef SHA512 57b87cbde1f34395fbd42bc8f7712aaf193aded2248815cb6919cb51387227f1cab46dd0d1595be9a55bdd131ac554e401366c3740c3d01782b8329a6f8e6588
diff --git a/dev-python/sure/sure-2.0.0-r1.ebuild b/dev-python/sure/sure-2.0.0-r1.ebuild
deleted file mode 100644
index febd02d7db38..000000000000
--- a/dev-python/sure/sure-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="idiomatic assertion toolkit with human-friendly failure messages"
-HOMEPAGE="
-	https://github.com/gabrielfalcao/sure/
-	https://pypi.org/project/sure/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# requires dev-python/nose
-	tests/test_old_api.py
-)
-
-src_prepare() {
-	sed -i -e 's:--cov=sure::' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/sure/sure-2.0.1.ebuild b/dev-python/sure/sure-2.0.1.ebuild
index 73fb2e9471d0..aea87095cb4a 100644
--- a/dev-python/sure/sure-2.0.1.ebuild
+++ b/dev-python/sure/sure-2.0.1.ebuild
@@ -6,18 +6,17 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="idiomatic assertion toolkit with human-friendly failure messages"
 HOMEPAGE="
 	https://github.com/gabrielfalcao/sure/
 	https://pypi.org/project/sure/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/mock[${PYTHON_USEDEP}]
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index 56b5a1b83d48..507635c9e31f 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,3 +1,3 @@
 DIST python-tabulate-0.9.0.gh.tar.gz 59342 BLAKE2B dc101ab8d1411196619c3d77dd83c84e48f31e148ec3878c2b844a1e26ea1187cc948cfb1eb740d61a667d6b669806a5288c397ea7fcbd59685fedaa9bd0bd2e SHA512 26b0f079f1aca48578883147cb1a2e30e96e0bb85d5af3b72b26eba5f73cea41cf1a0686f666487c8374f95ca0412703168e480c947f1567e6408f941756498b
-EBUILD tabulate-0.9.0.ebuild 1339 BLAKE2B 82d6d3b79bad17cddafa0181bea08ce5090db2f4bc6ee525e93bfe141a275c6f2df96080344b55f03a0395cdeb268ec36bf6311901bd22ce0aba34b81b3ef229 SHA512 444c3dac5b7ab08874bfa44e34797fd75c041ce9ab98695666612faca4d67ef907b03682e8880ef60d47a13e2e9b35b01ab7c331ea11e945a2ae06b7de7b373d
+EBUILD tabulate-0.9.0.ebuild 1346 BLAKE2B e2b270cd6c574e85c9ef299ada08742664c0dd3ef13806fdcf9f19a6aa6eec2fb4a50f1f311e85c5067e58f7f6d751ab1017a7b41bb2e6d3628b6810db69ec28 SHA512 20a8f361ef4f1452c1c980de51d53ee9efda16333126f7e5520b0195a187459e04bb8f30d3ccbc36e32313a5e606724a7fab1d4dd9374ba65e5766096d20db6b
 MISC metadata.xml 399 BLAKE2B b92bc308afead78cb604ddc6bc288fb28ed5a2a523c890270ee87eb5bfee21133748c5861829bafcc8a7b3401b430dff84dd99264ebf3e7ea74342f99ee8cfc5 SHA512 2d8c4dca9558e5a5d6413a6bd5e2cd6e15d1d0d447e6c692af84c8575be899f3d78246782e6c908a626326662aaffde56b2c3f96f4e9cfa0473c976109e3dcac
diff --git a/dev-python/tabulate/tabulate-0.9.0.ebuild b/dev-python/tabulate/tabulate-0.9.0.ebuild
index f076ab90fff3..e8bba4aa61eb 100644
--- a/dev-python/tabulate/tabulate-0.9.0.ebuild
+++ b/dev-python/tabulate/tabulate-0.9.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index 0acfd194e065..a31ce31729b2 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,9 +1,3 @@
-DIST tenacity-8.1.0.tar.gz 37658 BLAKE2B 4f9e2ea44ac0f0ed8b694b0f60e938fadbcf65bd989e9d641f7a40750f499aa9635a70d80e406aa2ebf436ebd37cde0d88e8ecb6cb3436ba755c2d921541c8e8 SHA512 194312e80233d6edcdf30496a355b272a4de4809bbe187948a7ce9c1382958845d12401498569f2b8d4251ede2857317820779f13a65bb2e69dcb97dde9bb501
-DIST tenacity-8.2.0.tar.gz 39842 BLAKE2B 4c7b58654eff79e2b5e7412f5a920dd09df44a7699d6959dd6e1c5ee87a1e74a0c60df28239be6976368859ebabc4ab35e318a71a7ad5861d92da76a516bd721 SHA512 7bb962257200a450a5599309977c895b9e2918a195a2b60c942dad934145e85e64cf1c043e81fe1a4eb5a4a7d4eaeca626a21388297cf0983bdcea22d56553d3
-DIST tenacity-8.2.1.tar.gz 39876 BLAKE2B 5141a5ee79ee6b5664e35c06c2d95e65daf75bfcb2ea6b33418385e49f9136adde2ff99bfd8215f056f6370c7b3c2e0a755c749c164c3857c0aae4c27cc63d1b SHA512 43decc20206544165d7ad4ae67292388c45c70a126d3b1ba529529429897dafc1bf8df72a15b545a80cc1fe0eee766866e592d3f49ee6a24feddcb525dffaab8
 DIST tenacity-8.2.2.tar.gz 40186 BLAKE2B af24fa209a0f9de0bb7ddd0d0979620fdb3a41967ea2d45c8864cc9feb3237d345b85015379228dd7714d7dd3f921e190bfdea3ba5c3fe627df804de6641894d SHA512 a1e2569dd5afdc982716f22ba7c67f7a43351e9f2dbefad30854d8655fa7600300c624b7353ea7d68aa462cbf2f33cf93e643e2868e8e197a61eb1ccf25c275e
-EBUILD tenacity-8.1.0.ebuild 813 BLAKE2B 6b4965f0e087f7acde04d8d3ea5393f411f666cf127be629849899ea1f4d6ea1466a59c69c2a9bda0441541bf1e0022f5cf1c3011ed204257aab33926ade0347 SHA512 3c060905c10fece3590cba4ef1a05b5b54dc6b775a9d86efa18f4eea0e5d1f6328b68ad4deefed96cc028c9e205a9b6569feef354a1f51d476ff76a7e3917e83
-EBUILD tenacity-8.2.0.ebuild 768 BLAKE2B 62e8f6af2d83d15f9cb347b724130894456ee68b49f687ad6c8c938d31b227653763db54dd1f170755c00edb23d8480799b32a7bfe1f4fe069f904ce26c051f5 SHA512 84ae7e44f515877a5402de9a6d4aad5bac45996e1be862c934a0bc059980b77d1a05ed706c210e3173d5075e06518dfabb801970b9757b3c14377d352eacb680
-EBUILD tenacity-8.2.1.ebuild 768 BLAKE2B 62e8f6af2d83d15f9cb347b724130894456ee68b49f687ad6c8c938d31b227653763db54dd1f170755c00edb23d8480799b32a7bfe1f4fe069f904ce26c051f5 SHA512 84ae7e44f515877a5402de9a6d4aad5bac45996e1be862c934a0bc059980b77d1a05ed706c210e3173d5075e06518dfabb801970b9757b3c14377d352eacb680
-EBUILD tenacity-8.2.2.ebuild 768 BLAKE2B 62e8f6af2d83d15f9cb347b724130894456ee68b49f687ad6c8c938d31b227653763db54dd1f170755c00edb23d8480799b32a7bfe1f4fe069f904ce26c051f5 SHA512 84ae7e44f515877a5402de9a6d4aad5bac45996e1be862c934a0bc059980b77d1a05ed706c210e3173d5075e06518dfabb801970b9757b3c14377d352eacb680
+EBUILD tenacity-8.2.2.ebuild 766 BLAKE2B 13e0eb1d04fe1ec546abb771d9b0012ef2de79d0c1dd05179e0d5f93415dac40ef6ca5903af3c0e9b32b27b98b8fbfd3e6ac8709175c2a01e9d7483245b455e4 SHA512 de7cc743c0dce9c58917d3a1de6d055f6e3aa926009eb9b55f50bd32b13122cee4215ead72897b2c1e0f66f82424de2efaa9d967e8d2a707ae71be19b1bb3e3a
 MISC metadata.xml 856 BLAKE2B af0d5417912404af6b5be19c32d150db197d27b55681871cbd45f983d1caf8b8ba7c8c44936b1465ecf00b4d185552399d0023bbfc16e84451e4fbf006eefcab SHA512 1fe2c8617bfaeba198a8b5430c2b38acf60f17c29fc89599d198037310589b4a5bb1170919e2f57c3e27951288d06ab281ec5a55ae64e6a0a33296a89be17839
diff --git a/dev-python/tenacity/tenacity-8.1.0.ebuild b/dev-python/tenacity/tenacity-8.1.0.ebuild
deleted file mode 100644
index 0ac51168196c..000000000000
--- a/dev-python/tenacity/tenacity-8.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="
-	https://github.com/jd/tenacity/
-	https://pypi.org/project/tenacity/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/tornado[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	if ! has_version "dev-python/typeguard[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/tenacity/tenacity-8.2.0.ebuild b/dev-python/tenacity/tenacity-8.2.0.ebuild
deleted file mode 100644
index 0bba32fca1ec..000000000000
--- a/dev-python/tenacity/tenacity-8.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="
-	https://github.com/jd/tenacity/
-	https://pypi.org/project/tenacity/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/tornado[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	if ! has_version "dev-python/typeguard[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/tenacity/tenacity-8.2.1.ebuild b/dev-python/tenacity/tenacity-8.2.1.ebuild
deleted file mode 100644
index 0bba32fca1ec..000000000000
--- a/dev-python/tenacity/tenacity-8.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="
-	https://github.com/jd/tenacity/
-	https://pypi.org/project/tenacity/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/tornado[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	if ! has_version "dev-python/typeguard[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/tenacity/tenacity-8.2.2.ebuild b/dev-python/tenacity/tenacity-8.2.2.ebuild
index 0bba32fca1ec..15e151851f33 100644
--- a/dev-python/tenacity/tenacity-8.2.2.ebuild
+++ b/dev-python/tenacity/tenacity-8.2.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index c490485c52f2..1f06b6263928 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,5 +1,3 @@
-DIST testfixtures-7.0.3.tar.gz 127280 BLAKE2B 14725f5a04a77453f1a6e1cb07b2ee8e907dcf49a845c9c75951d77160448c1037c7bfa0a759cf4061d92448203b8f4b14d611cdde32f46269b484985e654e67 SHA512 875aba5102bd43800b2f6464dc93185cd2bb5e117523cb4b3c458b2f8f8eb71f309c0a5266eeca70a7928f9992ccfe7807c67e42531c17fd82ca1c3b838d02a5
 DIST testfixtures-7.1.0.tar.gz 133026 BLAKE2B 0fbb25e97c06cdd7c94be26c56e96a70847493f71b2f0adc58f333fe2ab930a9bfb6de154a1a23a5cb2cbb1e5e87cb6d9ac95433d357de0689296e33c04078c3 SHA512 d1b2b3ca9674865a45be254a41777c2cba42d4ac3de5d77420d6d33416bfde7ba6a8ca39033cd2c217b0eb81ef5c97bf5b197dd047f9a337bbe1a3da91d9c0ef
-EBUILD testfixtures-7.0.3.ebuild 1328 BLAKE2B d5de26e34ab0ec7b027b8ad151bba731ed621e804cd457a78daa9929f36ba90b6dcb6e3bc1ca98ebc6952ee786919544a93bbf11ea0afc42e7127aa7a238e39e SHA512 e030a5317d8a6a665e741d89426ef92a5c5a3d4d63ac32cbf4daa0755635d88c043d002b6c1ea9259daae4535d5bd428b44544585e8c2c9c2322c521dfc863b1
-EBUILD testfixtures-7.1.0.ebuild 1147 BLAKE2B 0b78cb1633cb2392c98e691934856c6995854bfcf420ff8f1bd9ab247b17a3bd06cb6f9cf450ab6a0b9bbc253ebce19e0b225d93c925eca327b19d384cbe66a9 SHA512 1849f0a8f317479ec9a76a3c1a0818e794db1395dbbefa7d3526fb3b938651c08a9d74ea2c65bc7b9498b64598278770574b2f894f5f653e11063732bb4e8d3b
+EBUILD testfixtures-7.1.0.ebuild 1144 BLAKE2B 4208c213ac4bbd5e6b260048097e97e8c98a4318fea695263b7fa6fc32d068be81323e4e949b32adc5e40406912c18812c2d9e076456c3a7e26104442971a6f8 SHA512 362cea5c986bc7c0e6d01380eecb59d43a00ec32152bafe0c512415ee5d804bb5dad90415a488652eff9fa1416574c7566023c8ba70a9af7a226fe359c0c40bf
 MISC metadata.xml 416 BLAKE2B 19f5d275458874364d2719ecf363f7a5627f9e612b7d3a3f2c075e306063ed899dec0b2e59ea5e5d7ba65209c9a6d91045d80b2fe50e74278e61247d0426b940 SHA512 8a5776feee4d6758da67dc0b413e2d0ddc0c843075ca96c9b44adace1f7669a6abf820c5b73b86652b27e9feed19a4a30e1004a021b24bda0829b5690a1687ec
diff --git a/dev-python/testfixtures/testfixtures-7.0.3.ebuild b/dev-python/testfixtures/testfixtures-7.0.3.ebuild
deleted file mode 100644
index 0b81500e2883..000000000000
--- a/dev-python/testfixtures/testfixtures-7.0.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
-HOMEPAGE="https://pypi.org/project/testfixtures/
-	https://github.com/Simplistix/testfixtures"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/sybil[${PYTHON_USEDEP}]
-		>=dev-python/twisted-18[${PYTHON_USEDEP}]
-		dev-python/zope-component[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/furo
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# kill weird way of declaring build deps
-	sed -e '/build=/d' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTHONPATH="."
-	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
-
-	local EPYTEST_DESELECT=(
-		# TODO
-		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_missing
-		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_present
-	)
-
-	epytest
-}
diff --git a/dev-python/testfixtures/testfixtures-7.1.0.ebuild b/dev-python/testfixtures/testfixtures-7.1.0.ebuild
index d0541a212cd8..e64f557ee6d1 100644
--- a/dev-python/testfixtures/testfixtures-7.1.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-7.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tornado/Manifest b/dev-python/tornado/Manifest
index 5dcb286b3357..d644a40a166c 100644
--- a/dev-python/tornado/Manifest
+++ b/dev-python/tornado/Manifest
@@ -1,3 +1,4 @@
 DIST tornado-6.2.tar.gz 504849 BLAKE2B 18fee464e043e20dcdd5677bc3a72949140a64ce353e09a21242fcade6d8b668517553c649d65e892d9c3fabacea96903d4e42b70676a62759900abc8f4a202f SHA512 157cbeee21bef29ac68b319329e7fc57db4c68dbb5a245e2171b7a28427ebbfe16b745e3bdbdec5912caae5eaa60c3cbbf8830c9c76fec5ffdf025e234468517
-EBUILD tornado-6.2.ebuild 1729 BLAKE2B d0466bd0c4d8ca33dedeb0ddcf79a7aabf2fa9cb9afe836104b2f4af38aeade3a7f8fe0d1fed0e322ba1fed599fe29bc4af546cb811706111d77b6eee07af0ce SHA512 ab1784de7492c8094cc6b13027ea7c18830048098ebc17a8441b6ee6b8d841e3c89b859a923606a465900bf5c7846c4e7f3ff2f74a2ab957919add38c4ad3433
+EBUILD tornado-6.2-r1.ebuild 1739 BLAKE2B b86a8bacd43941330fde286567c7c69760a60089fc7eb540073687c1ccf344071684f552e880081d1b10013ae343a4e2bec1087a48595f5d3485f1d7027cf328 SHA512 5a56b40494b63c692fcf6d10d8e1ef8e7f127c426d2e4cbf7b635f4b5b51fa12b9890b04057db75123be9cb0b24d0107287cd73815794a5b2c14b447d901f392
+EBUILD tornado-6.2.ebuild 1682 BLAKE2B e7e538a617c514b7c76166c35a4f9f2b441ad92b36dbc6a106bea0fa4c5b9782709c0449bed34b46c38f962e7df1745a577f893b1800d25f98d66f10f31caa09 SHA512 ec776527aa1d35b8e81c2450209bfa56be94f1cc2fd245abc80c5808656745380b76a056ed115f3f180c5602f3838e7fee31f2846ee7dbde7786f8286db10d0f
 MISC metadata.xml 381 BLAKE2B 96d5942b11b6364eeac2248f6e92a9e7a54094ba2b6e9ef966be4143e1fa01fa0c417027d33a71c51bb094b905b9ff79e05107e1a9debb4b1ef932ba11fd8565 SHA512 cd4db13e0c6a9cf8b3c788c53dc5ecd0dce2cf783e7b2d67dba71299d1c6a3d1dd2c2a76c0d69816ab0da4ca23f831613323c55864fd858690c605da5426bf60
diff --git a/dev-python/tornado/tornado-6.2-r1.ebuild b/dev-python/tornado/tornado-6.2-r1.ebuild
new file mode 100644
index 000000000000..0ba2105f03a4
--- /dev/null
+++ b/dev-python/tornado/tornado-6.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_REQ_USE="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 ~x64-macos"
+IUSE="examples 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*')
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme \
+	dev-python/sphinxcontrib-asyncio
+
+src_prepare() {
+	# Disable deprecation-warnings-as-errors because tornado has a lot of stuff deprecated in 3.10
+	sed 's/warnings.filterwarnings("error", category=DeprecationWarning, module=r"tornado\\..*")//' \
+		-i tornado/test/runtests.py || die
+	# broken upstream
+	sed -i -e 's:test_multi_line_headers:_&:' \
+		tornado/test/httpclient_test.py || die
+	# 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
+	cd "${T}" || die
+	"${EPYTHON}" -m tornado.test.runtests --verbose ||
+		die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r demos/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tornado/tornado-6.2.ebuild b/dev-python/tornado/tornado-6.2.ebuild
index 7fbe04479120..e06b3c0c2c1a 100644
--- a/dev-python/tornado/tornado-6.2.ebuild
+++ b/dev-python/tornado/tornado-6.2.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python web framework and asynchronous networking library"
 HOMEPAGE="
@@ -15,7 +15,6 @@ HOMEPAGE="
 	https://github.com/tornadoweb/tornado/
 	https://pypi.org/project/tornado/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index f10f16f762ec..597ec12933db 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,10 +1,5 @@
-DIST translate-3.8.3.gh.tar.gz 1157587 BLAKE2B 4dc8ca9cb7f0040364ceeb6fae47d9189642e8383fb1c808713aeb82452690ffe5957c63d649994eae486efaa51aee664fa7b0bb199036d869a87d7a0bf21806 SHA512 ad5a814cc03ed0d41aeac60bea72133fcd47470ab254849647d674bc00b71f2afe1c0956891decc6906fafbd07c4e3d5efcf4212c0e449f3fb3fb4fdbee9aab8
 DIST translate-3.8.4.gh.tar.gz 1158012 BLAKE2B 37d26792b9382d318e359db3c7087cbf71a444c4f76c9b3fcec9311820ade1d3f346d7ff4b22983d6a49e0afd47b4277d2c0222e2982d56f52fcf7f655bd349b SHA512 28d452d9da1d1b400e88a30b9f997dd70ab2db5e6ae33a7882203bf6b59abf6bd315bee97c9f01de536dc752fde93429bb65aeb7b6386482193a68a472bd2e9a
-DIST translate-3.8.5.gh.tar.gz 1158381 BLAKE2B efa51a672bac419e0cf847099f68f33882b8a60c339b157f2a3144014e10b5c241a0817fd93755e2327afd9b9dd923f28c4f22c3a950fe95189bfb6592dd4c83 SHA512 687aadbdaeddd33de64224e33fdf2f47f3b368d5f22e8d79f580ab407595bda0fbdbbb45edeeddff4b0d583eb4238de9ecb7514289ff4ae8fb387c3d089374de
 DIST translate-3.8.6.gh.tar.gz 1158560 BLAKE2B 127083188e3f25551e1a55b4499fb2247e7fb7c751d813f6a78491ec2f1e457e0c18d3416cf05533d11e36201b36814054f4eaf94693d04351a0928a0347fa98 SHA512 271b34ac44835af2e50537ec5a6a5d4dff497fd3358fe53c92e800109a347206d544f71bee7181ec335736a462578913262ddfbb27d4bcef39f247338bc99134
-EBUILD translate-toolkit-3.8.3.ebuild 2436 BLAKE2B c84859e2882719d6557918f1580a4a027ea586ae062f877baef0559cac641b59281abadfe9a1f888899778fa76babdb301e73796dff6fe03cea09161848bea2c SHA512 9f50a862bf8ff4129ff974c3ab1d4e4c3863585393aaf35fc1056c63fb6fda24485458e240abda227f5d995427e4796913b30e63b6bae5459f903c50f40384cf
-EBUILD translate-toolkit-3.8.4.ebuild 2439 BLAKE2B 76a7b69c12540271aaa50ee950a971c40dd6db7f9dd48b286d8ed17a133adffca050a77e16a2021bd0f5bf4de1fbc43576b12d54d19d4e1f6e6b8eed89387abb SHA512 48a037441d0f33e5f019dd406a13bf5da32dbc3ea25ce2e10bacbe2a422bd6b35feea56c684cfe9d747e6f711a94b8b00298763dbd8ba37b452c43ef5d529ab3
-EBUILD translate-toolkit-3.8.5.ebuild 2439 BLAKE2B 76a7b69c12540271aaa50ee950a971c40dd6db7f9dd48b286d8ed17a133adffca050a77e16a2021bd0f5bf4de1fbc43576b12d54d19d4e1f6e6b8eed89387abb SHA512 48a037441d0f33e5f019dd406a13bf5da32dbc3ea25ce2e10bacbe2a422bd6b35feea56c684cfe9d747e6f711a94b8b00298763dbd8ba37b452c43ef5d529ab3
+EBUILD translate-toolkit-3.8.4.ebuild 2436 BLAKE2B c84859e2882719d6557918f1580a4a027ea586ae062f877baef0559cac641b59281abadfe9a1f888899778fa76babdb301e73796dff6fe03cea09161848bea2c SHA512 9f50a862bf8ff4129ff974c3ab1d4e4c3863585393aaf35fc1056c63fb6fda24485458e240abda227f5d995427e4796913b30e63b6bae5459f903c50f40384cf
 EBUILD translate-toolkit-3.8.6-r1.ebuild 2298 BLAKE2B 07249d48ff690a539f300e9bccc5ca6d9c0ddffcc41471b88d2c5c078703d47fbc513cfd19f5c3497d7c62183b466ea7babf0be5f783a55ac974271e50d89f8a SHA512 05192aa81f29a35e6937b8973d82460e6c675743c8c60e04ea16f57c0aa13edb11fd742e064ebe3398a599c050508613c00761c3f20ddb01c4b453473dc9d24f
-EBUILD translate-toolkit-3.8.6.ebuild 2421 BLAKE2B 499c566f19c0a7f0ceae62d4258a16e793ec7e017a438147081ff7f2db4aa65b8ebee3dc41e89730becb628b29ea5388d206b7e8e304ecdab08ebe7393f4bee6 SHA512 0d8693b8f1e86dae2b442f15a69d9eb5df0b7f6b400c9dce7ddfe7e51f8faa6871075c04ab904695fbedcb21de68331c2a9c9ff12a484841e2d6995f76be6e2a
 MISC metadata.xml 756 BLAKE2B 06f64f258d362954f99f7e9eee241eb3dddc6b00b9069df2ad977d28b5cf06f9c8ee2246ee5958600b5ac86297968d7aaced6b6420dca4ed507c441c58c61ca9 SHA512 80374c40513ca450f97e3930929c1450e7438ea15830e60937952a6fccfd999675f2ca2056c5aa4e287ba256c6ec08a09d8f7adb8b2c5af8ca0cd595f34acd85
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.8.3.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.8.3.ebuild
deleted file mode 100644
index 389f504d2a3a..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.8.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-		# Apparently a change in line wrapping x_x
-		translate/storage/test_cpo.py::TestCPOFile::test_wrap_gettext
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		translate/storage/test_fluent.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.8.4.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.8.4.ebuild
index 5628bcd1f693..389f504d2a3a 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.8.4.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.8.4.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 RDEPEND="
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.8.5.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.8.5.ebuild
deleted file mode 100644
index 5628bcd1f693..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.8.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-		# Apparently a change in line wrapping x_x
-		translate/storage/test_cpo.py::TestCPOFile::test_wrap_gettext
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		translate/storage/test_fluent.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.8.6.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.8.6.ebuild
deleted file mode 100644
index 184a3803dc7c..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.8.6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-		# Apparently a change in line wrapping x_x
-		translate/storage/test_cpo.py::TestCPOFile::test_wrap_gettext
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		translate/storage/test_fluent.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index e6ba9d10ba5c..44d0a640aac1 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,3 +1,5 @@
 DIST urllib3-1.26.14.tar.gz 300665 BLAKE2B d9373c6f88eae86bd74cbc1c20b352064135a5e3686cf594a3fc2375afa881696751a4e318970ce15adb8fadb60e334117e4d4e431eaa591ce7b13b7ce2ab606 SHA512 0a2dffcb4d3b199e1d82c2bb0d8f4e6b57466bdc43e31dbed62b392ef32e021f6d31cb53ebedef9e1a62b1113f7a370e9f0baa36e3fba942a2543473e4df0828
+DIST urllib3-1.26.15.tar.gz 301444 BLAKE2B 2681f0290a4f8b335dcdf384a0c0692cf51e88ea829f80c8c857be328b00c618978a84957da4e23826e4597fe90764eb36ab9acbbc33f9a6ec8df3e3ff3f4d48 SHA512 b6ddb29c15b2d729605a6acb7c602f18c75a937cdfe9649d35d790a59fbb1d96a8d68975ba0a4c073c9f1750e383c67b7566dbcd81b3e8611501e9f4153e9a2b
 EBUILD urllib3-1.26.14.ebuild 2306 BLAKE2B cba511b14221ad58d48f3f9d4ae0548a6efa31e08d98ce93a0196b8045954c94052b8adbaff384035aa5646b2843285ae236c263f9520fa4d8d75df717c0875a SHA512 3cf38437f94495b182db0ed0f88095d7abb6b80ddec70ff2f99796d99ebd90c58131cafb64872c9c7ce8c4a76c458b37701d39b0f04d33db00c2eca963784444
+EBUILD urllib3-1.26.15.ebuild 2323 BLAKE2B 2d90d20776df48667ed29dac208add77f711700d008180f8f616eb033ff8cc1851361095f4c64b844331e44502526f1335fc90a25f6044d3064106d33c6a9556 SHA512 23dcc408f2e64e437b228ab86d4b09bb78adcd21c9c3403f9d9b4578ba318c27ddc74edccb18edb2142e70d744c1717f1ca466d8da52e73f1357c4a091a68fa0
 MISC metadata.xml 531 BLAKE2B 3ddfea4b8817c827437a79abae8cf4e9cda95addb1c6505ef13018587720bba0cf0788041c0b4cc8b25f319e7cb1c94117ae25b3cbb567f24373e8e89bedaa7b SHA512 7e7191f0338c4c47f01bdceb3d2c6ed94de2241e77fb3be6cbf3ecf8a0682730392a9ee5adf24304d9a322acc06bd84f4f90f1dddcb258cb2e9ba0de9952b693
diff --git a/dev-python/urllib3/urllib3-1.26.15.ebuild b/dev-python/urllib3/urllib3-1.26.15.ebuild
new file mode 100644
index 000000000000..cc75cabf45be
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.15.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 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=setuptools
+PYTHON_TESTED=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="
+	https://github.com/urllib3/urllib3/
+	https://pypi.org/project/urllib3/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli test"
+RESTRICT="!test? ( test )"
+
+# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
+# dependencies. Do not add them to RDEPEND. They should be unnecessary with
+# modern versions of python (>= 3.2).
+RDEPEND="
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlicffi[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
+			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
+			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+		" "${PYTHON_TESTED[@]}")
+	)
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unbundle urllib3
+	rm src/urllib3/packages/six.py || die
+	find -name '*.py' -exec sed -i \
+		-e 's:\([.]*\|urllib3\.\)\?packages\.six:six:g' \
+		-e 's:from \([.]*\|urllib3\.\)\?packages import six:import six:g' \
+		{} + || die
+}
+
+python_test() {
+	local -x CI=1
+	# FIXME: get tornado ported
+	# please keep in sync with BDEPEND!
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# unstable (relies on warning count)
+		test/with_dummyserver/test_proxy_poolmanager.py::TestHTTPProxyManager::test_proxy_verified_warning
+	)
+	has "${EPYTHON}" python3.{8..10} && EPYTEST_DESELECT+=(
+		test/contrib/test_pyopenssl.py::TestPyOpenSSLHelpers::test_get_subj_alt_name
+	)
+
+	epytest
+}
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 90e60b1f6ab6..e47528235587 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,5 +1,5 @@
-DIST XlsxWriter-RELEASE_3.0.7.gh.tar.gz 35214702 BLAKE2B 8af7a7da9f2e6fd3a8f794f906935ed9dc1389a710d8b60fbf74e419829e6d233ad122d8ce75de93a6d3229e394277fadd76239aac73e8949f7c4737430a0859 SHA512 e80b9cfa741984db5b0aebd083c0a3c12f987b1a851088bc16e52b56cadb69feb1b795c1061ebde56c7ab1bf17d7899e90b42facd45bcacf5ce6c7070208e6e9
 DIST XlsxWriter-RELEASE_3.0.8.gh.tar.gz 35224268 BLAKE2B 593236a4fa9aaa5fde3920cf3af4819afcc026b14160b61de41f7186ff594611a7f08e2a1befbd5a060f4f84c0f2541c773153c311154d1a94bba7260ae650f7 SHA512 c03e518cf517803f006fc13d314a40e54f47e4156ea16d46be023f3af727edd02aedbfe0e15da019fcec2b4f160643846f86c80c80d93be421cef33f1d11dae7
-EBUILD xlsxwriter-3.0.7.ebuild 685 BLAKE2B 5ddcc459a9806a68cbff7d23a326f7ee65a3489bee5adb169ece7c57055b02be7eb67e94b43922f9c26941a2eff97678533bff22d7626e77c752c07454dd0b74 SHA512 26e7957e0d66363b3c374e0e068c64bd6dce7ba01d599f33218d7e0d5733ade25b4a1caf96dc81ad1e0c3a9ebbeb0d38a92f0b216b0a2cd6ab25fa42c0dadca0
-EBUILD xlsxwriter-3.0.8.ebuild 691 BLAKE2B ca659bcd2b8c9c9cee9f8a291a8799148cab32adb6a5111c63120702c19fa8c772d8f24e8ec59fa53055a86df9e63436d0b7248a5de281b70ea6bb5e0e58f1b5 SHA512 ee093d0a7619f9962fac416565425b9246f92559934d10f3aa1fb024292b1f3ba753ae3a8d9a468b03bca4419d6a27d31deabf1a55ad48b7038984cfcb358df5
+DIST XlsxWriter-RELEASE_3.0.9.gh.tar.gz 36701357 BLAKE2B d53246e6d142395a59145dbf0ee453a014c351c8ed48eec2a2b4d370cbcc33c28c0f2703a9010c43f7bd59c1c89076a8ca814d1a8e7a233eb29301d7e03378f5 SHA512 4e0b505230bc40ab01b9015d333bb4e26b1538bdc3c1b349c71a5413ffd75741d5bee2755e8f916f278cdafe4a3097bc77203e7b678bd7834a287d3398ccb767
+EBUILD xlsxwriter-3.0.8.ebuild 685 BLAKE2B 5ddcc459a9806a68cbff7d23a326f7ee65a3489bee5adb169ece7c57055b02be7eb67e94b43922f9c26941a2eff97678533bff22d7626e77c752c07454dd0b74 SHA512 26e7957e0d66363b3c374e0e068c64bd6dce7ba01d599f33218d7e0d5733ade25b4a1caf96dc81ad1e0c3a9ebbeb0d38a92f0b216b0a2cd6ab25fa42c0dadca0
+EBUILD xlsxwriter-3.0.9.ebuild 691 BLAKE2B ca659bcd2b8c9c9cee9f8a291a8799148cab32adb6a5111c63120702c19fa8c772d8f24e8ec59fa53055a86df9e63436d0b7248a5de281b70ea6bb5e0e58f1b5 SHA512 ee093d0a7619f9962fac416565425b9246f92559934d10f3aa1fb024292b1f3ba753ae3a8d9a468b03bca4419d6a27d31deabf1a55ad48b7038984cfcb358df5
 MISC metadata.xml 411 BLAKE2B e41e1e6dddecef73fff1c0bd74d51b023694ea6eb162022679a2939819f5c3339b1e76d00e25f761c46f66d323a5ad7085ed86fb13fbe3f53526c75004a68e93 SHA512 63242ff274e1dde596e50f9360e1247084b7bae05cd42d60605700c49e33b53849529578cf532415b899bd2ccd04066f99e97c6e80d53c13f71522a041579976
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.8.ebuild
index b9643a5b3c75..5536e4aa6608 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.0.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.0.8.ebuild
@@ -23,6 +23,6 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-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 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.7.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.9.ebuild
index 5536e4aa6608..b9643a5b3c75 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.0.7.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.0.9.ebuild
@@ -23,6 +23,6 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest