gentoo auto-resync : 28:04:2023 - 17:13:02

88 files changed, 366 insertions, 1316 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e084cefeb290..cc8c2180dfea 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 1bc3638fc681..0b9bab372349 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,11 +1,7 @@
-DIST serverless-application-model-1.62.0.gh.tar.gz 5177544 BLAKE2B ad0fdca32821e9b5dab86d03e65ad1a458493ecba0e75f6b2dc8b9978a6085ae5269496e231a2f09cd228e6bd2a66b3803953d2ca5aa7c265fa1019305aa1a9c SHA512 42f1d3ff352a02ab73f5a16cfeb800a80852986b09f71d9468b23c22b8dafff3a20e8ac92956020280884e4318bd80369b5b04ea6e9f0a28067dd792f1623747
-DIST serverless-application-model-1.63.0.gh.tar.gz 5213667 BLAKE2B b75315d1c28789e9f0b8aa4774292ff2531806c1d59a8c16ab683fee439d188025c9cc62c2de037f2d947ad3b7eaa8bb4fbe8a5507ef1a4f3619f758cdf2eadc SHA512 eb6dc0f545550f726b59a2ea1994f8dfcc8eaf7a1fbca6ab12bfbe891813b208d869e25c0b320411aa6476dcf8c86fb19db9e13ddf0419d90d3c3403bd57485c
 DIST serverless-application-model-1.64.0.gh.tar.gz 5231257 BLAKE2B 53eeb37d69ae0f133b936eb8bb20005ecdad5d71956becd61a9e9080be9bead1bebe98b89d0f67604ac74731b2ac7061f74fae67f0c8e12bf10f7a9dfc40eb3e SHA512 9584657026ca7c260fb9851e8669b19c896a88a4455c6e50e734c1d9b375b69d5cf85b64f960fa0987e8a34823343de3e8c8080413da07fcfb69dc491e72c761
 DIST serverless-application-model-1.65.0.gh.tar.gz 5310251 BLAKE2B 41d4b2a8902dc1bbd2b01f534475005b2c288d33d5bc76049af8b034d428f40b063de71830e4ea3552ab00b7b437e197cf561982d28d74f9762b175a956d587b SHA512 d4a7475f955145e9d141b1d3795bef5e1eb1c330e07b01e5f0e6207f33b73622dcce4ab9bbf10413513321f64e09d59f61aaf01d9fe9f0760b9b31d10c6e3d68
 DIST serverless-application-model-1.66.0.gh.tar.gz 5779523 BLAKE2B 7ec6eb68a74686cc7f1acb160582065b7ca50d56f400c7111a2b47733e6e238e010ba912236c60207b7dba65005333507e2babd8022244cea1bea0691300b947 SHA512 fbcc799bc0935c17fa5f9ae655d8e722e659c78c0f4ea6325f2f0a89f6bbad3b8f43951a60e950de1effe699cc858b696a95fbfceb3d7b79eb35cd4d2c618846
-EBUILD aws-sam-translator-1.62.0.ebuild 1544 BLAKE2B 9572110682a5bfaeee90d69c6026a0130cacda3efb2d2da2952d675f5764745fb8fa7e7b1e586b2b029f5d8b955d9934228210734b060af23abdde9b2e18c487 SHA512 48956aabc1cd71db9d3cddb180c37387c8e5e4e314411a41f3ad791bbe6b2435208c9e045dead45d6e10944271b7f9954e2d1ae9290a3078d1e35391c0f52512
-EBUILD aws-sam-translator-1.63.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
-EBUILD aws-sam-translator-1.64.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
+EBUILD aws-sam-translator-1.64.0.ebuild 1544 BLAKE2B 9572110682a5bfaeee90d69c6026a0130cacda3efb2d2da2952d675f5764745fb8fa7e7b1e586b2b029f5d8b955d9934228210734b060af23abdde9b2e18c487 SHA512 48956aabc1cd71db9d3cddb180c37387c8e5e4e314411a41f3ad791bbe6b2435208c9e045dead45d6e10944271b7f9954e2d1ae9290a3078d1e35391c0f52512
 EBUILD aws-sam-translator-1.65.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
 EBUILD aws-sam-translator-1.66.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.62.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.62.0.ebuild
deleted file mode 100644
index 9e1f18c5dab3..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.62.0.ebuild
+++ /dev/null
@@ -1,60 +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=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/aws-sam-translator/aws-sam-translator-1.63.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.63.0.ebuild
deleted file mode 100644
index 5a83e871d7a8..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.63.0.ebuild
+++ /dev/null
@@ -1,60 +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=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/aws-sam-translator/aws-sam-translator-1.64.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.64.0.ebuild
index 5a83e871d7a8..9e1f18c5dab3 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.64.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.64.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index b72c719d1c4d..844b23dee144 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,5 +1,5 @@
 DIST black-23.1.0.gh.tar.gz 1196151 BLAKE2B 3c81bf5e52bb08928b568a20c9b3d769c5ebdd120bdfd4565c89fbffd978cd4a93dd70eacd041a4560723987278d16acfcae49245007bdc59178264757fba74d SHA512 f86d1bcf59c3fa0bb1bc3e71511c5df435ea437fd1cb30c466b8babc9522fb96bba6261da1431db75e6d578a85d061d31bd6ddbe50327fb4a3987eb03b03c330
 DIST black-23.3.0.tar.gz 582156 BLAKE2B 01ed5443e1bb251d46618a5b61bbfcc2dc0b41c0bef7d4315fb704a2ac0fd51eb4fe268838b8be6195630f21e6f7b3a5bfca124a7bd60dbef95a02714924327b SHA512 1ea8749ee25aae34a40c5d1b779c6076971488dea1a85ebfcbe4c2a8bb5abb5e3918a735a4e3f9b4ae2690eda0f48fac014ade055721b54d879fdd2d3450b72b
 EBUILD black-23.1.0.ebuild 1506 BLAKE2B 6f023d2ff0058c63a1dc566c94666a719110795b6ec45efa99476fc5457caa7de0922c3797ab1f0f4af30225d8cecf6d9e6822babf1bd351824fdd836228ebdf SHA512 3a8115a3f3ca8c08086ef4e471d19849b792a20bca97b381eb6e0faf8a0d96cb7bfd30218bccb020e4947701ed2ffd37a3d289fea05e1e48007d9bef1b2cec1a
-EBUILD black-23.3.0.ebuild 1389 BLAKE2B f6a6fa6bd7bb43f980233b34791f46ded24944c5cf2f77122dc0f9eec5ef9b0035d283d4d85dac94dc7f625d9f2510257ae3d3930a31029163c5ab33c9ab3116 SHA512 7d678157c851e6ca0686e340f5052d13f7ad45f357eb550741701955b733244c1cf78b17ef67ca4b5fb31e7a855da70250a9771a379c84e5e5749d496b8300bc
+EBUILD black-23.3.0.ebuild 1387 BLAKE2B c4b41dcf6c90014d468bd3b749c94999287b8d8ed904924963f65fa7663714db5c1930b31b502a036837824388424b3a960deddbe96edd33db619fe70319f0ee SHA512 107e096084fff0b8bd6497765cb087465dc2725e8692401e186b8bef229119c14aaddea9feea21ed3ab4f5ebfc294c7156d60943c0e339672f25d19464cb0f2c
 MISC metadata.xml 446 BLAKE2B 7d9bdbc4fdd62c1b4278a824a75dede64ccd3a4d865722a99edbd4e316342879eefa7b249c453668a5d33009e134e2feb4d1ac01976146c3e988f3724749d4a4 SHA512 0a3a912fc1d439a92452e48c9749705cd2307e645bb1274d22265656f6101574edda79cf04c03ae512818e7077e404f79fb1f70fd68d9c7cd3be3417f991700d
diff --git a/dev-python/black/black-23.3.0.ebuild b/dev-python/black/black-23.3.0.ebuild
index 3bbd465b752b..6b49dd53af6b 100644
--- a/dev-python/black/black-23.3.0.ebuild
+++ b/dev-python/black/black-23.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 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"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/comm/Manifest b/dev-python/comm/Manifest
index 995827a802ad..a6236e1093e2 100644
--- a/dev-python/comm/Manifest
+++ b/dev-python/comm/Manifest
@@ -1,5 +1,3 @@
-DIST comm-0.1.2.gh.tar.gz 5382 BLAKE2B 698cd4823c86d5e589c6bfa1e99d534fc05c34d9c12ea417c0702f6e5b1397db9e334a78fcc445e59b55e4693e5460cb980357c7e299f01db8df3d0bdb2b6ddc SHA512 9cec9909676edc0c8abf41e6d90f83a6ebfa88266023b3b5fd9c1ffe3fe16ba324b68ab92e788bfa01d5304d5de6e6dc96c7238973f3b39f8c77fa5165df8379
 DIST comm-0.1.3.gh.tar.gz 7345 BLAKE2B 2cbe791d226316800a37886d8c68b05ac9d9860bc92e1d95f8b428038a090d9867abfa0860262a9daba3ccd4fd607743df4f8d7fb2c13bf63456d17aa5f69092 SHA512 05696e8b58245ecb02ef0b4e23e904bae8288a6dad6530a9e15587bb0922a8d57f32803a5a34eb8f79eb620f679bb77350842bc441c0ab665a7ca9f7196106c4
-EBUILD comm-0.1.2.ebuild 650 BLAKE2B f8890b9d2ba6aa749b6b3610d15a3fefa59406e9caafcb6b4606afef255762ca559ad8ce859337c39a91e224a125274d540cd997facf1f19b1c64dc86c826520 SHA512 8f542845e74c6b8d588c5d9547ddb31b06f305c8b9a0fe800433876a44e910ac9a68887bc909b7e300ef82d8d642da47586c509381901ee9f4695069306499a5
-EBUILD comm-0.1.3.ebuild 692 BLAKE2B 0bd6a52f166bdc445e5a2ac9f81b1e646e6fcc857763ccdd8b6faf6b0588bd7b2215ec2bcf6cedf27dba48364a3dbb5fb5dd2c74447079ce0c9381bbe476ce98 SHA512 fc77929f96fe6a950ca43816b3f5715a4a5a832bfddc8fde56dda8ea61a82fef17ef4623f0331f26621a9fe489b6d2de6bfb3abfb9e80fede2fb8ba045a7ab84
+EBUILD comm-0.1.3.ebuild 684 BLAKE2B 37df825cb9351504683615c8db6078f214a5ac439c28066b2514dc5f6da3828869fca5c73e1798f06a4ad6665f31a05c3d5ef5c93a22cf73a5159c7761dd17cc SHA512 5cce92210ad9abc47f11332cdd22a545580ff44c6a81b4e0d0fdb57f3d6e1106898324a80216f85d41e72483d2aa87a38317c6d50a8d5fafadc0f6aa091ba792
 MISC metadata.xml 384 BLAKE2B c122aaf6c2b9e6776b19efa2549030f0267c1d553f92862c5ecf21926f30a9c3cd7564434a573cca6fdbb85485eb49213b4d95100e8de2a29ced9c9c1fa81153 SHA512 b06853ad3cb1775ad70e44c48bca74bcf85c11715291974e7e3ee496344256fc57b91920812f19809e7cf14f6a7f7938531934d6a12740baec0dd984d5d48632
diff --git a/dev-python/comm/comm-0.1.2.ebuild b/dev-python/comm/comm-0.1.2.ebuild
deleted file mode 100644
index 386bea008940..000000000000
--- a/dev-python/comm/comm-0.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Python Comm implementation, for usage in ipykernel, xeus-python"
-HOMEPAGE="
-	https://github.com/ipython/comm/
-	https://pypi.org/project/comm/
-"
-SRC_URI="
-	https://github.com/ipython/comm/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/comm/comm-0.1.3.ebuild b/dev-python/comm/comm-0.1.3.ebuild
index 872e77ab10f3..2cd365d938f4 100644
--- a/dev-python/comm/comm-0.1.3.ebuild
+++ b/dev-python/comm/comm-0.1.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index d30e9ff81b6f..cf9d643060bb 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,7 @@
 DIST coverage-7.2.2.tar.gz 812407 BLAKE2B 901ed01eb8411e01c3386dcecccf975f4ac0e46c14fd2c6086bcf83647ff7e26deccb3926f173a207ef2851c0f8c5f99874659a1ba2e16f85b6eb9a1ac23142c SHA512 7d2ba6540ca42c3a72b65343348a64c58156bac915434249fd8740a6727ebf034590f62a5557f6b2f76e67ed1adc2a153ce61eee71f3bc903538c440e080e3e7
 DIST coverage-7.2.3.tar.gz 757154 BLAKE2B eb2d7e9e52dd9480f806556fbb73864884365215834640a1458c06d137706d3a5ca818c0418ecc6646b0722fd23a0348eddb97521a7cd024c218b872072661ea SHA512 2710424b04f812299777497e526d259a3ac35205b425a53973954c8e51cd39e75c30f8be9d60656e7369d3fa2decd810a8cb395dd433381495db4f6a7cd9a600
+DIST coverage-7.2.4.tar.gz 759129 BLAKE2B 186f5dcd5abd86634cf6cd3c58be47cc68e8d8417df02b4e55ac3d66703664b2069cb3f94fdff726eca99108fd243f6410b0118cf4a2b21a067653f567f8f013 SHA512 f22d475a64828d0613747cf7315053c4830acb9931acfe58e1c29029028f0a48e9c633649bea92ab6bae3b67daf790eb9cf3d6ea22dec1d1f5dce7df673ff3ae
 EBUILD coverage-7.2.2.ebuild 1832 BLAKE2B 5a4540dc4b17fe66765bca0408a099d0ca734b625757c70049af7cc2f30d4092b0fc70e161270d6644b776b7c622ee21878bad0d91b96603fab1f8b96b586e7d SHA512 b84e6b6b431d2b3f48ccb28ad2fca97f46eb9f7c5e1427a58d1184c3a185bb1fe92aded01eb7b4180b3726e6a6855d7d595e00ed6f7b058c72b6858cee96fd6d
 EBUILD coverage-7.2.3.ebuild 2017 BLAKE2B 0a3d2fddc33eced59689210c85871e4f7d0b434d3aa0825ed4be96fa1d1758b5be8d54d63ce4497fdc8c7fb19f3359a11865e5d6a5aec0204b341df460ff5140 SHA512 38735dc1b9c3ddd43acaca3ed1f4539a4dad4ccac41d61efefcb349b846571ee5a6450a7d981cc66e436b4064999f974c7f4af8fe225620da41338dadec9fc52
+EBUILD coverage-7.2.4.ebuild 2033 BLAKE2B 5a3cd36c4aa7988c1be7ba7192a46c272e1445727c005a3f81abeb4fa629f2d2b51ad3afd73bdcc7c854b643f23eaf5c7ae15a07f4e14986b004069a9beea88f SHA512 f4f422d48467591160190d4bbefcdf76a9856bfe1f9c98186fad17f4f8f7c3d030af5bd82e81efcfb49e96986ef1824cf6b9faad0d5cac87651c651a2b80c8c6
 MISC metadata.xml 771 BLAKE2B 38e9680d0851f70050aad987714a9dd2f95178b0bc3d794dc08726c0618d1ea98be32a413ac397f4b222e8a5d8fdc747b7f1677bcfe842bac4080537e85a03a9 SHA512 8c44c40348fe5d416d8b4016fe22cc9ae0b94fbaf181deb79aa737f87271992521b710c1208d0eeb7ef92d96fc8a7daac1ec6feb1ae081a80f13327b5b094064
diff --git a/dev-python/coverage/coverage-7.2.4.ebuild b/dev-python/coverage/coverage-7.2.4.ebuild
new file mode 100644
index 000000000000..89226568addc
--- /dev/null
+++ b/dev-python/coverage/coverage-7.2.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="
+	https://coverage.readthedocs.io/en/latest/
+	https://github.com/nedbat/coveragepy/
+	https://pypi.org/project/coverage/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})
+"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/s:-q -n auto::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+test_tracer() {
+	local -x COVERAGE_TEST_TRACER=${1}
+	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
+	epytest tests
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO: fails because of additional "Terminated" print on SIGTERM
+		tests/test_concurrency.py::SigtermTest::test_sigterm_threading_saves_data
+	)
+	local EPYTEST_IGNORE=(
+		# pip these days insists on fetching build deps from Internet
+		tests/test_venv.py
+	)
+
+	"${EPYTHON}" igor.py zip_mods || die
+
+	local -x COVERAGE_TESTING=True
+	# TODO: figure out why they can't be imported inside test env
+	local -x COVERAGE_NO_CONTRACTS=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
+
+	local prev_opt=$(shopt -p nullglob)
+	shopt -s nullglob
+	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
+	${prev_opt}
+
+	if [[ -n ${c_ext} ]]; then
+		cp "${c_ext}" \
+			coverage/ || die
+		test_tracer c
+		rm coverage/*.so || die
+	else
+		test_tracer py
+	fi
+}
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index 842176973590..ecc54326b6d2 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,7 +1,5 @@
-DIST dj-database-url-1.2.0.gh.tar.gz 12479 BLAKE2B cc3fed00cd7329a9ee8f3ced5830cf05b7046960ae6397c68b8e67e0609c0284dba01a1736447b45f219290405a0ab4720267feba276b453555e3b8ac2f0d88a SHA512 72b713a3a1ad4c70d857c5c72e671095ef1b7ec8ebd19902296ea49b63b9bf6d0084d03561c8fb47c533da431b44ee17651b45f3f699faceaed0ee6bfe7c921a
 DIST dj-database-url-1.3.0.gh.tar.gz 13215 BLAKE2B 3af4973ce2720166ac6988acc61e02695520fa8bb4f1aad5bd78649959a5f76b2de1aa0822a8c7440fabe130970cf11bdf4c579860660e4e2e0634e594fc2e83 SHA512 f1ff31955e1d1cd39ea8c497ae38b2569f9056d6fa98a5b426472936781153b55b8b1e72475cab50532a753e53f31daafeca7d52de07bca803cfdbef323195b7
 DIST dj-database-url-2.0.0.gh.tar.gz 13402 BLAKE2B af8db1ad82ececf7d8fde61e878c888fa3592515acb12d495efd416b8a0d9e628fc55fb1bf23332932f00b0afe6d0ae81329b7e9d106a4f9da9c52132357c585 SHA512 d2600997023b1e58c1e6285268a400aed57fbdff972a36025f47bcc2e57d3179f266379d7042dc75c6048b35f7aef8547828c88a2fad1e80f087e6f5680668b0
-EBUILD dj-database-url-1.2.0.ebuild 650 BLAKE2B f6dddf3d82e610f032caea320b19247b3635e1718b7ff3b5c6c42d183817e6ce73d466db36f0bfe3777a180da1bb6b59e76d5b6b2bde1f6779d5d46f5ab649ce SHA512 da18344d9ae694b4abdd37157de15063ce4938e4a228b24c61e720fce3c00152922b5c69699a39f94ec99073eef5be838b8970c71eb043b744c8b9d954603fd3
-EBUILD dj-database-url-1.3.0.ebuild 809 BLAKE2B 4bcfa40804f61e79ab0c1808a6a5be71efb5732df5f4c930bd8364ff7df1b3abbe3ec202578ff48d58b51b9711798056ea7d0709a314ec447779f2da00f01f2c SHA512 66a2707568d7ab5ce391c38983d34476b53d713675ab78bd97c206fa84cb672a74d96cc3f534c5fcd273208c68313e8eb2be0c7b99231123a38440f9784215bf
+EBUILD dj-database-url-1.3.0.ebuild 805 BLAKE2B c06cbfed7f80fb87cc8f4e2bb310a30c56a374d9d8cc2df1debdcbc53b19b08b74137f5a491a777d5dc52f6aa8589d8c09391b4ec420c1316e9a00140b007911 SHA512 2514f3f406036469c29fa4907908121335eb13865c854154430bf233065953cbc8b2576805dd436518c63316b20706162bf3ebc08c17aea49dbee149d05c08ff
 EBUILD dj-database-url-2.0.0.ebuild 809 BLAKE2B 4bcfa40804f61e79ab0c1808a6a5be71efb5732df5f4c930bd8364ff7df1b3abbe3ec202578ff48d58b51b9711798056ea7d0709a314ec447779f2da00f01f2c SHA512 66a2707568d7ab5ce391c38983d34476b53d713675ab78bd97c206fa84cb672a74d96cc3f534c5fcd273208c68313e8eb2be0c7b99231123a38440f9784215bf
 MISC metadata.xml 407 BLAKE2B 0a3736cc0034297f64b77b9b795e8cd339ed58c5b213e730f1d3dccabe7cde10570222626b2b520bc0e51a0195cd99baf4ebf7028cc73b7e507603874b1f4143 SHA512 ec842e583cd4e0b632731e395f6e70e519077bfeaeb58bb88b9ad297368443fc06a182c120635eeb1dedb76b166829c6f414925d3061e55d49d7053a72c739eb
diff --git a/dev-python/dj-database-url/dj-database-url-1.2.0.ebuild b/dev-python/dj-database-url/dj-database-url-1.2.0.ebuild
deleted file mode 100644
index 8f25e507e1a8..000000000000
--- a/dev-python/dj-database-url/dj-database-url-1.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Use Database URLs in your Django Application"
-HOMEPAGE="
-	https://github.com/jazzband/dj-database-url/
-	https://pypi.org/project/dj-database-url/
-"
-SRC_URI="
-	https://github.com/jazzband/dj-database-url/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/dj-database-url/dj-database-url-1.3.0.ebuild b/dev-python/dj-database-url/dj-database-url-1.3.0.ebuild
index 7c7f2279f539..3a12c3eb8771 100644
--- a/dev-python/dj-database-url/dj-database-url-1.3.0.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-1.3.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/django[${PYTHON_USEDEP}]
diff --git a/dev-python/funcy/Manifest b/dev-python/funcy/Manifest
index 391c6b584fdc..7879158d462f 100644
--- a/dev-python/funcy/Manifest
+++ b/dev-python/funcy/Manifest
@@ -1,5 +1,3 @@
-DIST funcy-1.18.tar.gz 277530 BLAKE2B 78e86e23b3908924de1de62dd567ff8ff52079a9a7529923c84f67a3c5f768d232164d758763db1ce941986c28012dbcb3c146412998b1d1d6064efcc0ff4bf9 SHA512 274fec59c1fddc58248b5f8c81686955706333bbd33a1d567f62694c70449ef2488fae6bf76418b8ff3c6655fad12ed344cc6c90a84c5b10412e32fbdda016fe
 DIST funcy-2.0.tar.gz 537931 BLAKE2B cd5d56bba777b9fefff0088daa8ab903bf51520a9cc9ce856eaf4eddbe06a2916b09d2e9f023e32c77f6b308d4291c3154347e921f1c3b78a513f11390226149 SHA512 3abd76296aa03d6c3fa0583cd1c3912a47ce04c340f668d7321e2c4191a61a1679f1a419b787c92680cbbae5757e1fabc5918a6a80130c244b4018c28751e01e
-EBUILD funcy-1.18.ebuild 503 BLAKE2B 46dedafb64b363f8c4298869380f7f236ebd7426e748b46c936197d62a8b6244c37cca844b7c11c040c239d171a0b6f626cb09b3bc1e0d167351adeb550d7443 SHA512 505c8797e1a4661166ebded8bcb853621747685f72e4361e912cd9a688a61793c2a20fe89a1d469ef5361c31d18f6cccf01354b985eb5c0cfe54e4f11c7c7349
-EBUILD funcy-2.0.ebuild 511 BLAKE2B 663c381d684dc65c51e47612ffcd942eae14a1f9fdbf95aab61b3c2505f347da785e0f5c6555f18d0ff00c2def0b9ad528c0f95bb4bd0512acaff451ce49d5d2 SHA512 4b1974086af95124bc406b8094c0fb30e2fd2ea04f21ec3da569ee14a66818ad96de33e1eb2bc4ce6bf9c60350f209207da85ff874c7020e41b9dc6751769672
+EBUILD funcy-2.0.ebuild 509 BLAKE2B dc200cefd892274f7e09f9ee243698e0b50086be48cf8855e556f2ba54ece94e7fff6179c9163f71abad6f1e76f6762819c9fc630aa76ceb29d00d2575c03375 SHA512 dbe83af688831bacc58728bb23240c5eaedcf5dbc830c4866b5d91e4cbef282e20cd51e64b6505b4604b91a1268b117433b85914ed4f9c7b390245307dacb43c
 MISC metadata.xml 491 BLAKE2B 70c6646bc4496af1ef98d1178b2b4bf9d876ee0a3664e878af184d12b162c9c926d14bd8dd7987355c4bef86ce53fb65ea96abe2384198f2c054c3835e78f982 SHA512 31d13ddb7d20c36c98e5a4068e96881200122425608e8877c133483117b565b44d65800bcc61dc6ad7e407b6c9953a3f53afd52aebd1a5c25aa1ceacc067c744
diff --git a/dev-python/funcy/funcy-1.18.ebuild b/dev-python/funcy/funcy-1.18.ebuild
deleted file mode 100644
index b9e11f377890..000000000000
--- a/dev-python/funcy/funcy-1.18.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A collection of fancy functional tools focused on practicality"
-HOMEPAGE="
-	https://github.com/Suor/funcy/
-	https://pypi.org/project/funcy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/whatever[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/funcy/funcy-2.0.ebuild b/dev-python/funcy/funcy-2.0.ebuild
index 1b6b33de12f1..5b140a22e52d 100644
--- a/dev-python/funcy/funcy-2.0.ebuild
+++ b/dev-python/funcy/funcy-2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/furo/Manifest b/dev-python/furo/Manifest
index 3a17a7f92644..136b1b4d5a73 100644
--- a/dev-python/furo/Manifest
+++ b/dev-python/furo/Manifest
@@ -1,7 +1,3 @@
-DIST furo-2022.12.7-py3-none-any.whl 328721 BLAKE2B 2a2d215db9d63946da85579ccc5a71f87e3ecbca0fda180ed44b7e79e77744b47d2c17d4d5a256d71e02d5e7ac5165f3648f38c08567b7c871abf8d7edf2ce26 SHA512 ce44dd78db216875538722a56041ce7634bfeebbc6add6b52cdecd86d0f99f5f9c8aa0d275a8439a269f75345ae716a32b90701d031dfd3047df3f1db33e150e
-DIST furo-2023.3.23-py3-none-any.whl 329348 BLAKE2B 647d28d124be4bc2f9cc748383941127fab88517f880c9e75f18a3b1ef2a1f893576c410a95c1162227c6e35b73018c0f7837a4d625d9038121364ed01a3b0ad SHA512 f664c17f34ca7defe4f1d2ceb976b1e35f125588a3597a1c8542a92a45c1e5453d8470df4259a74e873017983e469daa74a711d08cd6ed4279ae623ea7cfc377
 DIST furo-2023.3.27-py3-none-any.whl 327605 BLAKE2B 1368aabdbd497acf181c5b059da6d4bd3ae11e66bb81ec097358e051f7c64b7cffa537d5855ed68293398b26bb7df4d35a183c3eea00d4790b786b0f4bdbc6eb SHA512 7d321f59064d64c205c9c1a207fd62685c22102bc1546f0e063be9565458c6eed887e9f52851160e2658401ac8ed791572183e3c067c2e85c9c1811411e051f6
-EBUILD furo-2022.12.7.ebuild 922 BLAKE2B 6b0532f93ce16159f688599a964cd11999f3c56edbb40f10c3d527dafd2c2740af10ff3688a15bf4c62a3e19bfbe748fa06ba0f64a02dc0180aa3b62301b1e93 SHA512 28f0de446cc5e84574513a05577f87559617e11ad94fd8df6a34bdb92496949d2646bcd28be51a8221f74132b6ba212d5683e4b1ce397e0e2d53f5e0e8f7bcde
-EBUILD furo-2023.3.23.ebuild 930 BLAKE2B db6c6d2f3fdd3258a7703d1e044b708b207d5e3daf7e591bcfa7983e45f94fdfc7ef4693330bc44c7d5e0e4ac1aa7d251d0acb4b5f5e21759ca70303614fc4ab SHA512 364a231ffbb7ffe54d5d010ad9e311842b178accfc06dd1f6db67261103ee08ab83cf85a643a28143457dd6c1dd0e5dab89d8f6f37b704974a698b39f4acbc9a
-EBUILD furo-2023.3.27.ebuild 930 BLAKE2B db6c6d2f3fdd3258a7703d1e044b708b207d5e3daf7e591bcfa7983e45f94fdfc7ef4693330bc44c7d5e0e4ac1aa7d251d0acb4b5f5e21759ca70303614fc4ab SHA512 364a231ffbb7ffe54d5d010ad9e311842b178accfc06dd1f6db67261103ee08ab83cf85a643a28143457dd6c1dd0e5dab89d8f6f37b704974a698b39f4acbc9a
+EBUILD furo-2023.3.27.ebuild 922 BLAKE2B 6b0532f93ce16159f688599a964cd11999f3c56edbb40f10c3d527dafd2c2740af10ff3688a15bf4c62a3e19bfbe748fa06ba0f64a02dc0180aa3b62301b1e93 SHA512 28f0de446cc5e84574513a05577f87559617e11ad94fd8df6a34bdb92496949d2646bcd28be51a8221f74132b6ba212d5683e4b1ce397e0e2d53f5e0e8f7bcde
 MISC metadata.xml 436 BLAKE2B 81bb1424cf305f98c15a96afc454de34c0965277a5829c1c299ee6da4c86882aa1d47d45b71cfd3413b82c68b521a0f2b4bcd37c47988a6c171f55ef97f930ef SHA512 63d65b518096cba951f2bdac8b3ff0a602ac23fee7679ba808f27b01644cc612a7223942ba01f26d4c0931f16ccf9be1832be5da650835c6f43396e2076d1d30
diff --git a/dev-python/furo/furo-2022.12.7.ebuild b/dev-python/furo/furo-2022.12.7.ebuild
deleted file mode 100644
index e65bd144ad60..000000000000
--- a/dev-python/furo/furo-2022.12.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# sphinx-theme-builder is completely unusable, as it requires pinning
-# to a very-specific nodejs version number, and ofc loves fetching
-# everything from the Internet
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Clean customisable Sphinx documentation theme"
-HOMEPAGE="
-	https://pypi.org/project/furo/
-	https://github.com/pradyunsg/furo/
-"
-SRC_URI="$(pypi_wheel_url)"
-S=${WORKDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/sphinx-basic-ng[${PYTHON_USEDEP}]
-"
-
-python_compile() {
-	distutils_wheel_install "${BUILD_DIR}/install" \
-		"${DISTDIR}/${P}-py3-none-any.whl"
-}
diff --git a/dev-python/furo/furo-2023.3.23.ebuild b/dev-python/furo/furo-2023.3.23.ebuild
deleted file mode 100644
index 23c3292f31c1..000000000000
--- a/dev-python/furo/furo-2023.3.23.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# sphinx-theme-builder is completely unusable, as it requires pinning
-# to a very-specific nodejs version number, and ofc loves fetching
-# everything from the Internet
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Clean customisable Sphinx documentation theme"
-HOMEPAGE="
-	https://pypi.org/project/furo/
-	https://github.com/pradyunsg/furo/
-"
-SRC_URI="$(pypi_wheel_url)"
-S=${WORKDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/sphinx-basic-ng[${PYTHON_USEDEP}]
-"
-
-python_compile() {
-	distutils_wheel_install "${BUILD_DIR}/install" \
-		"${DISTDIR}/${P}-py3-none-any.whl"
-}
diff --git a/dev-python/furo/furo-2023.3.27.ebuild b/dev-python/furo/furo-2023.3.27.ebuild
index 23c3292f31c1..e65bd144ad60 100644
--- a/dev-python/furo/furo-2023.3.27.ebuild
+++ b/dev-python/furo/furo-2023.3.27.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}
 
 LICENSE="MIT"
 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"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 130a7c3c4515..d1d54bc0f3b4 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,9 +1,3 @@
-DIST ipykernel-6.20.2.tar.gz 149263 BLAKE2B 38b3afdbe237ec2facb3af42311315a060f1dba845cb3f7ce10a3d5f68679804640b0dbda869395817a8612af2033f5936ff7f6f3b3b822f47ed512a3b8c0c4d SHA512 9c79c7fa175cd81a920e6b1f2159dda30ba9068437cb1d24b09d864ded36b439045e58f240daee1a46ae375f1990cf318cd8b2e2c02aa6d6e2004d90aff5225a
-DIST ipykernel-6.21.2.tar.gz 150365 BLAKE2B e1bc29018459738a3358af2d4225397028013c1ef9ceb571cb225fafb1a1570c349759caf723e03c6a67a9c354c83d178ae777f7ea4222f5c2ed35e41e22638d SHA512 e4d3aa102d83f9c9b16f392c5b37d55a9cd987ca6a58ce1c4b59d282ec945dcc8803539bf54d7b3bb71c11058fc20a3947fd875bebc5efa5f629015b544fe819
-DIST ipykernel-6.21.3.tar.gz 150659 BLAKE2B 1fd0f0994b0065c662611bf629a4a755a2285b66f9d1e60bcc46fc84a445c7af6b882e09be2c4d26e8ca524a4ccda8534d04e357ec575a8fc034f0f4a437b750 SHA512 68e7bbae60e07805590e00acb186b14ef3c21426db9c49d04b93cb38083a7c5c20b177b72743674224741d8ca946604e8ae733f26d11738b7d99fabdee642064
 DIST ipykernel-6.22.0.tar.gz 151303 BLAKE2B c3567066375099d388c65b43b5b8c8059a823f4185855b6131fd90f42624a71c08d839a3c59c41cf83bb51ec07d0c0487d7bbee573eafa7e7d049dbeff8e59a8 SHA512 e109a2b771ffa40e05416bd925f26a4492c65a44a1acd8100e65ae3e779da9a0eef7222566e79cdcbed4b0fc3224fbd0722728d3fe953b16ab1a14090d0205c2
-EBUILD ipykernel-6.20.2.ebuild 2200 BLAKE2B 48e4b59f2632ea7275fa3de97e958b6a1b8380250e2850594d70d333d5577426782b9cbaf0c9634dc262b66d711d5f02a4cd63b53e2007eabe00a497f77465d9 SHA512 dd0d3b651f08a310831a049600f0456028bc564abc38cf7fa90adcd8a889c67db0ada545657a0cd9537657c19ae194d061b410ddde66510525ebccd27be4efc2
-EBUILD ipykernel-6.21.2.ebuild 2292 BLAKE2B 6d8a1de11d8f2e5294869c860740a63f304f8bc60b37c000dd5118d12eda3e96c0b6158857b46d0de3a531934a5acd3efdaa9715380360d6362d30806e5793cc SHA512 eb30d41cd56cae92a00af4a1800fb72d3b8bf824fe05699e2bd2e76c0685e7aaee704a45a5ca729cc0b267957ea8f359e46fbc44391485eb899e1b8fac211691
-EBUILD ipykernel-6.21.3.ebuild 2297 BLAKE2B 1a28e700053f99ee9832bf9aeaf78a257197e37da4afa532c56a9b8062fb5b6c0191d3cb77116adc452b9861008644a66c283b534ffafe55e8f70990fd95abe1 SHA512 f34fd72fa8167a16f8f7fcf806fb6bb3d78c4d6a0178bc58bd3dcbdabd2142fd61720444bb15a03844757c43a1a2e4ad603ccbe44d9205d1eb9946cd7a761189
-EBUILD ipykernel-6.22.0.ebuild 2311 BLAKE2B e04e299e78d0837104bf31beb77059a20b7cd7dd401a35cecd21d9ff10f5ee98e6cb75d7a56d8d7c49abd1afcddf8883366a7505b4683eb8e90a046b535314ed SHA512 f747ebabd7e57ee93ffb818f3f21d944046f2b6dc380833859c18bb2ea81e107ae5f9a4e18f51411b99ce076999f25792796c599dc0816312b4e070c30c64a84
+EBUILD ipykernel-6.22.0.ebuild 2303 BLAKE2B 18e522b59979e57d43eaa1e37cd6e892cb89a1748246c4218967fecf4c45d803de8729ec5623a2dd81b003d7b8e525b25f25d1efce90b2d2ac243aee5c433a13 SHA512 1614a58773264d6bae24a84375d9f1dcd658fadbfccbe187f8f60968cf4b289d000b82b3d93ab6b8004c5922aa8c97f8f1f60994fb69afef105cc8a4a6805382
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.20.2.ebuild b/dev-python/ipykernel/ipykernel-6.20.2.ebuild
deleted file mode 100644
index 1e5e1e1e4721..000000000000
--- a/dev-python/ipykernel/ipykernel-6.20.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="
-	https://github.com/ipython/ipykernel/
-	https://pypi.org/project/ipykernel/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.4.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
-
-src_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		ipykernel/tests/test_debugger.py::test_attach_debug
-		ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-		ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-		ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-		ipykernel/tests/test_debugger.py::test_set_breakpoints
-		ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-		# hangs?
-		ipykernel/tests/test_eventloop.py::test_tk_loop
-	)
-
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/ipykernel/ipykernel-6.21.2.ebuild b/dev-python/ipykernel/ipykernel-6.21.2.ebuild
deleted file mode 100644
index b00e6b2f724f..000000000000
--- a/dev-python/ipykernel/ipykernel-6.21.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="
-	https://github.com/ipython/ipykernel/
-	https://pypi.org/project/ipykernel/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-8[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-20[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.4.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
-
-src_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		ipykernel/tests/test_debugger.py::test_attach_debug
-		ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-		ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-		ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-		ipykernel/tests/test_debugger.py::test_set_breakpoints
-		ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-		ipykernel/tests/test_debugger.py::test_copy_to_globals
-		# hangs?
-		ipykernel/tests/test_eventloop.py::test_tk_loop
-	)
-
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/ipykernel/ipykernel-6.21.3.ebuild b/dev-python/ipykernel/ipykernel-6.21.3.ebuild
deleted file mode 100644
index 233dc4730f18..000000000000
--- a/dev-python/ipykernel/ipykernel-6.21.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="
-	https://github.com/ipython/ipykernel/
-	https://pypi.org/project/ipykernel/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-8[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-20[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.4.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
-
-src_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		ipykernel/tests/test_debugger.py::test_attach_debug
-		ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-		ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-		ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-		ipykernel/tests/test_debugger.py::test_set_breakpoints
-		ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-		ipykernel/tests/test_debugger.py::test_copy_to_globals
-		# hangs?
-		ipykernel/tests/test_eventloop.py::test_tk_loop
-	)
-
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/ipykernel/ipykernel-6.22.0.ebuild b/dev-python/ipykernel/ipykernel-6.22.0.ebuild
index 257b9df35d16..a5c6cc062f22 100644
--- a/dev-python/ipykernel/ipykernel-6.22.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.22.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index c2fbaf92555a..6cfc02116910 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,4 +1,6 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-8.12.0.tar.gz 5465154 BLAKE2B 946d3e649dcf8eea3518ed68499cfcaa6caa7eac99aa21c05fcbb81338037151253ba84d8d942746600dad3883f6d0e8ba1e82e9932cdddc8e1e77a270573ebf SHA512 3e9a42a6fb34a46d32d1236eac99182a756db2ec7b57c77dbedff1e4b25bcf2ef37effe4e5575cda450a1cde77e3c0d24172dcf19d102110a1ac75b9cfe9272c
+DIST ipython-8.13.0.tar.gz 5467133 BLAKE2B 038b4af8c5f9b32c9a2a1152e9a48131ae46f2903435f50fe67aeabfed7d34daf3f3439af372e561812c88bd6b90d7c729d4d876fe8b6e093582004def5058b7 SHA512 df71a2d30c3e88be89126b7f7178b45377b32c54ed78af0f3dda2612ccdbf7a55f23ccfe8293e50b063f47ecdcab6ff4454855bdabd5c1a45c4e573fd7a7b6d4
 EBUILD ipython-8.12.0.ebuild 4415 BLAKE2B d9b57f42d1dbc5432677372f458f113417e6a172db18a1a84385a1c359eb8c68f8beeecd4ab8b2591d34e5b9d6dfc173a3c385f44f57d222e5edd21af894d881 SHA512 a6dc7b2f0615577027cf4def0ea1332a249894a572cc3b3d953b1201827f98c77d237fada122cb3eb42d96befca0615114a0789c70c4ec39539a43460f7fff75
+EBUILD ipython-8.13.0.ebuild 4423 BLAKE2B 82ea5dabe4579dec38cddc9e54e9ea3b403f60f5f803e2cb84c6ecd35775201a109f79481cf1863aef8bf49e3c93eb03481bacb3f15154c6d03e035467114bdf SHA512 31240e79ed752a85efec0341ebcb83f3eff0442a9b995592d6e5dd327c51861d24025bf5a990923e5f9edd2be64f8e38d3643b9dfaebf596e4bc60fc443b6da3
 MISC metadata.xml 2886 BLAKE2B 88c80f5eef5c89c8939e60c1944be4c63a5a318e55a3490b38bf864e7919debf8e3c3a32f1fa0a43766ceec6462fb20fd4d943194fe2c08208f0839783c20916 SHA512 f4ed7c1898930ade11983fb0666dc25dce7907f017145e1ad903651dcd95ead2734893d55b4548c4ae23425388485a86bffc9d885eae17d12ae1ac2c0058aac2
diff --git a/dev-python/ipython/ipython-8.13.0.ebuild b/dev-python/ipython/ipython-8.13.0.ebuild
new file mode 100644
index 000000000000..1a16373c26a0
--- /dev/null
+++ b/dev-python/ipython/ipython-8.13.0.ebuild
@@ -0,0 +1,159 @@
+# 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='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature pypi virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="
+	https://ipython.org/
+	https://github.com/ipython/ipython/
+	https://pypi.org/project/ipython/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.38[${PYTHON_USEDEP}]
+	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/stack_data[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.9)
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? (
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+python_prepare_all() {
+	# Remove out of date insource files
+	#rm IPython/extensions/cythonmagic.py || die
+	#rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
+	local EPYTEST_DESELECT=(
+		# TODO: looks to be a regression due to a newer dep
+		IPython/core/tests/test_oinspect.py::test_class_signature
+		IPython/core/tests/test_oinspect.py::test_render_signature_long
+		IPython/terminal/tests/test_shortcuts.py::test_modify_shortcut_with_filters
+	)
+	# nonfatal implied by virtx
+	nonfatal epytest || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "code formatting" dev-python/black
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 7ba9a1d07d4e..a7a435762454 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -7,5 +7,5 @@ EBUILD jaraco-collections-3.11.0.ebuild 742 BLAKE2B 0461329753fd7531a0efaeca5507
 EBUILD jaraco-collections-3.8.0.ebuild 736 BLAKE2B fc2f1acd286b09c44671a22e9bc729fc60c7923dc1fcfd4c7da6a4d384bf09a1f2c2e7fe6d221ac81f069c10d1e17c4be3461dbaa3385cdbab1043d459265bf6 SHA512 2a48ae9a9a8141f88cdfcd7f0f7d1ad5f999c4a9476817cdbb4fb5e1a01f6bf5c3180b47246908937f42a3010ce342310678cc98403e61f787bf632198f2d9bc
 EBUILD jaraco-collections-3.9.0.ebuild 742 BLAKE2B 0461329753fd7531a0efaeca5507b45d5dbc27bca238ccb53160ae520cccba5ba7edc4988f067fd8cee9be7976dc97b1794dd896aa5f8ccbfe0e182d9778007c SHA512 7edd27fa21d330f695e24708587912286071c88f5e136656b291b323aa94377342cfae95e6ff214dd0644e47c3cbb0fa7946213eab7f81c0193f114b7d2c07b6
 EBUILD jaraco-collections-4.0.0.ebuild 697 BLAKE2B 14a05ceb115e138d1c608bf8ed60b49473abccff74df58a511d7a5e73ee7a07cf76c3d92003a41d0b1c96870e9dd22d6eac8800ff10cf09b920cb491f44131f1 SHA512 ce4c925ab273474091959b1d15e06767a2948a2b6aee5bbe833726c6e1f5645ab75de6ecd24e19c2df5ece60359fa6af03c03ceca3b11c34c561608d21beeb0c
-EBUILD jaraco-collections-4.1.0.ebuild 697 BLAKE2B 14a05ceb115e138d1c608bf8ed60b49473abccff74df58a511d7a5e73ee7a07cf76c3d92003a41d0b1c96870e9dd22d6eac8800ff10cf09b920cb491f44131f1 SHA512 ce4c925ab273474091959b1d15e06767a2948a2b6aee5bbe833726c6e1f5645ab75de6ecd24e19c2df5ece60359fa6af03c03ceca3b11c34c561608d21beeb0c
+EBUILD jaraco-collections-4.1.0.ebuild 691 BLAKE2B eebc1c89d5a050628d960b10fe93a5456bb3f6d39ae4b1d436c7d16f4d6487331ecd2dea930698e6457129b25683caec98f224435de955904af2cab1c83643b8 SHA512 f5baa58d93011d0238eda0bf31a57e1511c1f18d73af86e7d9f378b3868c83d468da30ee12f3dee43c1998501cbbb4a223d84ce381ba2291eac8e716fc8dc311
 MISC metadata.xml 578 BLAKE2B c6ad7ecaee92099645bcbd75ed9eff9da2a83268e8a7f828b2dbaf5414228f26b40f09fa37fd156d128742b111cfcacb3e177970b217d4de890ca7262275b26f SHA512 b2602fb629500021bd8fad159ddfcdc76a11f15fe2a51d0d25d5d687ae09170f6cc8438c252e8cb2792ca43bec7be65e249a799582f17c882639e30a9222a0ec
diff --git a/dev-python/jaraco-collections/jaraco-collections-4.1.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-4.1.0.ebuild
index 90e5e642b752..1e155122f218 100644
--- a/dev-python/jaraco-collections/jaraco-collections-4.1.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-4.1.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/jaraco-text[${PYTHON_USEDEP}]
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 63f8e9314916..64225d4a0508 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -11,7 +11,6 @@ DIST jellyfish-0.10.0.tar.gz 125949 BLAKE2B 6d6d532e56d9a93d17fd999ab9811592ec07
 DIST jellyfish-0.11.0.tar.gz 261664 BLAKE2B 89f110644abbe3c62df29e6591a11316202720f9da90ff0320598bd6c71690a0cc42e6453824e2835d45751e5714f443f334dfe1aeb9871a87cd4484fd1909b4 SHA512 6454c46a2df30bdf2257a854297c8c9f50b430ece333c54698e5296594ab65c6822051af0b10d0d64b911f30451f231663bc27c903e9b3e3dd310ff5d895671b
 DIST jellyfish-0.11.1.tar.gz 364769 BLAKE2B 4850075d026b39bb30894187a11be00a08a48116f118b945a820805681aac8ee1cef748c2d2cdb21896cdf6bf4145f4464d3df4c5266d622994bf72ddf75a1b9 SHA512 f62da9eb1c567c321ee996eb4fe6b856bb77e60d1723ad013fddee484804655492c3ff9a44ff37b04275638996d233c1606ea34c893fd419615c0ac0113c3dca
 DIST jellyfish-0.11.2.tar.gz 362969 BLAKE2B 6090aa17d581142b7aef539e899bf47f486602bedb5be55877fd088579d74145beb3a2c91854c9785317b97d1f926efb9943c693853efb613120e332ffc6dc5a SHA512 083b1cd4b3048b5a1d1e9bb48805e3049e00a65c8f92fabf28e6c788164c77a22f207794ed00bb16851bd3e6255fa9b38a36d0467bc027db49a379d50e9d2335
-DIST jellyfish-0.9.0.tar.gz 132588 BLAKE2B e7490da91d1a53b775ef145151c6dba5b16c938f59773e205b5cf01e1a262d36bb07a49d8c5d823fa722e2d244fc8af1bf9a603911411461a97b155cfdd0ce83 SHA512 1faa3ea03ec8b26085b5db34339f0aea061d3e4897f29235eca56995bea36ae8c152ae0ab0c67279dab4844d92d89293e2de2126c1d449407652b77da258e9f0
 DIST libc-0.2.140.crate 669153 BLAKE2B f4269549f6b450a3da3196ecaae52afe178d5b6905666fae04e2879f975f0129788898ca2ccd214d721af42a8b2fa86b26355d6baa0a81c223b56c658ee66dd5 SHA512 f450fe619ea2f45e4ada2567981987f19d35a9f13f88a0ce3a53e1751c6fbff708ca69fa6a64d807cce5dfe18b08751f0695d8a01e68e269da1aafc831528b7b
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
@@ -52,9 +51,8 @@ DIST windows_i686_msvc-0.42.2.crate 724951 BLAKE2B b084286cd4927efd2889b149abf8a
 DIST windows_x86_64_gnu-0.42.2.crate 699373 BLAKE2B 01c70809d564b16b268656e47295e99c992d8f9839fac8a51338a0e7c3b9cdcd0429c456ca8c1c139a8c687ed7ed6c43a82250889d881aadaa65bd037223e0a6 SHA512 5767af3c86e717f93137a89d442230e6b60a649057edb3ab104b1f82c0bcd64fe089dcdf2f4fd486a799bece1ddb5f0449641536b678211945e749ae24f35c1f
 DIST windows_x86_64_gnullvm-0.42.2.crate 364068 BLAKE2B 64bc53e98eb3fc649c9b43a6e734de4e65088e41edacabd49f7afcc5dc6e1065c563ecfc682747dda05978dea2dba4f45c16fcc18c3b00684c3d93681e5a7deb SHA512 d39a8bc948110fe612d3f8d6628b3f0d56620df11d8a49e0fabb6c90389ad407582b3af10e4eab46c79b3d11d2e10753d73d9e55963fbeac085f41e9749bdba3
 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788
-EBUILD jellyfish-0.10.0.ebuild 589 BLAKE2B e936d169efc4416200a8c3b0d84d85a5f65a70a6127759c6f689984efda16c030b10b803d75e570beb3c8cf78fb016387faafc9e6f628503471026add5f649f5 SHA512 069981f3b2019cdee2960375926dd0ddc3498291168e565756815f63043068d42335a00f8a943d1b20388b2ba15e909392563f1c9358abd5997acca379fbfa9c
+EBUILD jellyfish-0.10.0.ebuild 588 BLAKE2B 949f2915a0e53f41c23912cb45b9edc9c23f34d27046283bac1f7e7d92ba9f4811f2a5672cdb57722708ab742097a276cee0a6bccbf7e48acf1bc67c064ac7fe SHA512 896d9afef6d4ad79f726d07cb0616d37a9f7d28b36dfc4d229fce6fd5a2b2273e598df54357586a2c261660ab7c473de7279220cd671001d38a27bad023bec34
 EBUILD jellyfish-0.11.0.ebuild 1545 BLAKE2B f925b0b2a2a2300940f1935135935f15cb5c521f69538885acda89a55eb51541d2efbfa16d06c198692d270a80b37ca3f48ea8d910f17393dff9164d11d13da5 SHA512 c5afbd125892bb05a7199da3ea505884d03943f9cad4aa17402b38ed2b7acc23fd7319ddac6c40128840f3f7326dc7fa5cd9cb806825a5b4c4e4585e11a0905a
 EBUILD jellyfish-0.11.1.ebuild 1557 BLAKE2B 966af820ced6ccdec56b727f06b8c56ca2e75919214570f3f0a07be7273de921b95731dceb5f8e7299897ba3190e8b5ce1f6c1522ad84b1e70177a0b7a0644bc SHA512 4218e9bc8d75bc14d5e8f25fd68c0e21751a3769f9f144d05220a37f4c547540f38a0325ad48a8466a761343940de0d442a6b8a72770f9852d7ddbfeb7b99e8c
 EBUILD jellyfish-0.11.2.ebuild 1644 BLAKE2B 570700136776bbbeb9dfd5cd2971a735b1343d480c09a9e84c0fe6d994ea479f74a2b1b8ed15770c703ac029031de405d600f0057d457715eb54ea6128cde2e5 SHA512 039aa93708c5fc25e111069973748da045ad852e2b371ab41bde072ba0c25bf642d83345df4867b2840b004137495b8c94bc06e19b9caa50ab21cd5483e83545
-EBUILD jellyfish-0.9.0-r1.ebuild 583 BLAKE2B 7fd82d58fcddcf088c78232d734bc73d1f788042de344bb72f381058f741158e91c2b86bbde94523156d18d87057859d08ece72472fc03f51b25976764c50411 SHA512 385fc65910383594846cf315810593575d339e5edaded300567de57be913fcc2cafe8119563e5f89ea9013354411e8db0adfc32d48fad52f76d94a943cf2f997
 MISC metadata.xml 504 BLAKE2B 65ba00e0a27d233e6850c5606eac6eacf7d1684bfeb64155c52cee5a196e54a0454465df8c310a91cf30d696b4812fa23014e3a8a483b197e8955a4ad751ee61 SHA512 51396a920abaed74a87aca55c00ee46404b4ed1773a4443eebe19b2e7b64b258b5b526a97bd4afc7e7aa495d7989192e3658105b69efba0bf280f57b52299738
diff --git a/dev-python/jellyfish/jellyfish-0.10.0.ebuild b/dev-python/jellyfish/jellyfish-0.10.0.ebuild
index 300c9fdaf1a0..928750131817 100644
--- a/dev-python/jellyfish/jellyfish-0.10.0.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.10.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/jellyfish/jellyfish-0.9.0-r1.ebuild b/dev-python/jellyfish/jellyfish-0.9.0-r1.ebuild
deleted file mode 100644
index 4fd78aa2712e..000000000000
--- a/dev-python/jellyfish/jellyfish-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
-HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish/"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-
-distutils_enable_tests pytest
-
-src_test() {
-	rm -r jellyfish || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	epytest --pyargs jellyfish.test
-}
diff --git a/dev-python/jupyter-server/Manifest b/dev-python/jupyter-server/Manifest
index b5c74e1a0abc..0c2372f176af 100644
--- a/dev-python/jupyter-server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -2,5 +2,5 @@ AUX jupyter-server-2.0.1-skip-npm.patch 698 BLAKE2B f037094e4ba041f112e6b2b08693
 DIST jupyter_server-2.4.0.tar.gz 693740 BLAKE2B c50a06f1ebe1479c126c2a10ac7f58f012f97f8d565f1705b5d8080ff854a387a6bbcba65785652988a1adc3575009ea0b68e48b7cda8bbd89b5208e1a6d0612 SHA512 c5ceb6caa37c6d8bb5b3026f450bdfc92c37cb5a350541fa35764eeb33007918b2aa55b41108703477efe68f7d5e4f4ba3fea51cd203f3f3c0b74ba3bed6e1c5
 DIST jupyter_server-2.5.0.tar.gz 694029 BLAKE2B bea1082709653617c812124378e1e2a639e90b1e0d7fedacd98628c415adad2daa5343b57a19a776c41820e6665c8591c8d2a652f8c791b605bc3a4b65400ef3 SHA512 7145f60a73bf3d9aceff37aaf56b3b3a54c94fd9f13f06659387909cb1727759a082d11e983df4e687cc508461d5afb6e552f3ac09e30bebb1eb5e863992ad14
 EBUILD jupyter-server-2.4.0.ebuild 2174 BLAKE2B 0484e37ad5a7cc22015c3c541d0227103cfd5d71cc4a8cd4478edb92e3689a63079b034d7fc5aad693b0f4b0765111340c2deb2a4a96788881a466e974aa86c2 SHA512 2288447da7696c858c462005690c1631a8979d56663f5d87c52736574a01487765f6630ce8c18df2378d5e8d210f110a8f919d4fd10413c756d6edd0308bb1a6
-EBUILD jupyter-server-2.5.0.ebuild 2182 BLAKE2B 74393ec5e44849bb6bfafab89af6f1520e5593d69c50dff46d091e0c58a5b150207f80c915f04de489ee8669a52e54fb9448d851183dd0f47bd0dc9fbfc36da1 SHA512 5e941c4d46901b8b3e8441a7356ffeb9b409318e6fe297b5eca23f62d18bd81eb41c7094275dab994d253ac2c01a8d4bb4ed19b3ecd775ce623a4d02bfc6fe9f
+EBUILD jupyter-server-2.5.0.ebuild 2174 BLAKE2B 0484e37ad5a7cc22015c3c541d0227103cfd5d71cc4a8cd4478edb92e3689a63079b034d7fc5aad693b0f4b0765111340c2deb2a4a96788881a466e974aa86c2 SHA512 2288447da7696c858c462005690c1631a8979d56663f5d87c52736574a01487765f6630ce8c18df2378d5e8d210f110a8f919d4fd10413c756d6edd0308bb1a6
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
index b2c8366b4e96..30abc93f4dc3 100644
--- a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index 89a6d30534de..9cb4aaeedc54 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1,6 +1,8 @@
 AUX meson-python-0.11.0-defaults.patch 608 BLAKE2B b4c8d87a766495ee644830dd98903e512e052ccb0c31b75ef755b2b33cc7b912ea3b232b66c539ec3da8d8d77ae90b04a87cac8d0c55cde4c00c0f32ca4cb001 SHA512 f814d2c93bdb14e245b83eb4a94329875ccaed2f9a78fb31ae5c5bc5b778bd25b22b097bbc5dbd810029b9613a2532d1ab971c8bb6c60cda41ad6d1351c9e93a
 DIST meson-python-0.12.1.gh.tar.gz 43855 BLAKE2B 96b9ff5ef628bb471f7f79ce30ec6f3f851ce0006327e8b3a6003fdcb768f3280c0ee882d1c0c8ea183b0f2319d7c977c3fbb62742e3127bafb73e9732b3a1a9 SHA512 6f8e840da0155f2dd0e7139387f875cfad79eb042abcfa69b3043f51cbae3222fc2986e13798389909a0b4719513c93af381ec00a69fdfedf14bbe4e100b2f08
 DIST meson-python-0.13.0.gh.tar.gz 69373 BLAKE2B 439ec0fcffa5398ec400c492bc7719030981605c885158fd477e293b62c6e0eeaf3eba0327937817c20b7d23141749ff4bc71d12a67dbf3473168555cef97918 SHA512 2d319090f77daf5c1bd2a922e50e960fb416008ec60f3e8956ba4d2a29c31129e0a0d864982e9e1c0d6b7659d107e5d90d4a540d84f56cb2a8f79f013d4f14ae
+DIST meson-python-0.13.1.gh.tar.gz 69434 BLAKE2B c3442eb1c066772b80efe4e41764897df85a3581c94f9d958951af04e9ad7a01c646c7ed7f0104fbe957567e16b80c6e3744ab23b6b66a8df3cc920cb68c852f SHA512 037825eabcaec5bdb73890114ecfcfb05373bcb5e2806a8d38e4afeeecea42aa14f9c8cf0bec151bd231e2984c64608b28a1ec79640485933cd57c8895b6a305
 EBUILD meson-python-0.12.1.ebuild 1448 BLAKE2B 595ca91b469122beed8c6e2d488e633600e7a6129396743caea311a40bf4e07d49c35f0a22627ffa342181e6b720f3746cb9e7d3e22935added38e5e7969cc04 SHA512 4884d03dc8284c9aae58b64f6e54a1bbbb57ef561d85d8be009b26371c3bdf08a29698d1feb749fbdbdf3e23ab621eb7b1f8182bc7cc2c4c870be3ae28259665
 EBUILD meson-python-0.13.0.ebuild 1360 BLAKE2B 76a9f4f74aa12d77efddf86148d14f867154b7903acef0b47cd603a45f44ec7ea675b056e55a7b2da40460d1736ef139951ae5637625db30912c3180d29eec9b SHA512 e5b966caeede89663dd63dbc9bffebfa53cda6dd105d237d40e248f51fca6b7e1527d8243c64baff4f1e38942458410123545c98ced0731b50ded181f52c1ff6
+EBUILD meson-python-0.13.1.ebuild 1360 BLAKE2B 76a9f4f74aa12d77efddf86148d14f867154b7903acef0b47cd603a45f44ec7ea675b056e55a7b2da40460d1736ef139951ae5637625db30912c3180d29eec9b SHA512 e5b966caeede89663dd63dbc9bffebfa53cda6dd105d237d40e248f51fca6b7e1527d8243c64baff4f1e38942458410123545c98ced0731b50ded181f52c1ff6
 MISC metadata.xml 357 BLAKE2B c2b5fd8c6ad39e92970a5e6c1db8950b4850660c9a95a84063504ab75e5dd69e3ab844fcef23cb51f33493b7e522a6d26227ff48dd893c92c422badc70f3c962 SHA512 1402ace4da543de7320a1d97f44177593807d5be9f1891d8a53190581877569508c46fe6b4ce63516c7fee2d2165d59d39f44343dde18438570883da3f4ad28c
diff --git a/dev-python/meson-python/meson-python-0.13.1.ebuild b/dev-python/meson-python/meson-python-0.13.1.ebuild
new file mode 100644
index 000000000000..4ac32a433449
--- /dev/null
+++ b/dev-python/meson-python/meson-python-0.13.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Meson PEP 517 Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/meson-python/
+	https://github.com/mesonbuild/meson-python/
+"
+SRC_URI="
+	https://github.com/mesonbuild/meson-python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.63.0[${PYTHON_USEDEP}]
+	dev-util/patchelf
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+"
+BDEPEND="
+	>=dev-python/cython-0.29.34[${PYTHON_USEDEP}]
+	test? (
+		dev-python/GitPython[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+		' 3.9)
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires network access
+		tests/test_pep518.py::test_pep518
+		# requires git repo
+		# https://github.com/mesonbuild/meson-python/issues/397
+		tests/test_project.py::test_user_args
+	)
+	unset NINJA
+
+	epytest
+
+	rm -rf docs/examples/spam/build/ || die # remove artifacts
+}
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 1b770fa1b588..46a0eefaf250 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -5,5 +5,5 @@ DIST nbconvert-7.3.1.tar.gz 880064 BLAKE2B 0bde4a65f27a880fdbf694dc6501ad1d0f78b
 EBUILD nbconvert-7.2.10-r1.ebuild 3045 BLAKE2B 0b8f02f5d55b8b9576fe42f60b19c6f6c0034e0c6beb362b05c74983eccb8c21ef84463b5858ffa3be824c7b00953484568a6d4fb49f7dd288f447c6ae8a118d SHA512 d262250d0c3c8fd474d9aefa7c9dd3bc5f641cb45f349d144fdc58ad4a943dfff2f9c77e6faa8246e136ef9d481572b38eaeb2538bc78fa45f9984e6a18f0645
 EBUILD nbconvert-7.2.9.ebuild 2772 BLAKE2B ae75fd9fdb5c4b98fed9dd0d7d5d4120c26a1c38f33f751520f03e84bf2b6f00c1f8944afb2a6e2ebd12cb387b4b48e894499d6d249d4261324b6358a42cab54 SHA512 d11e67fa0b8de167b86a0d4f850e6fa805631fe47a4ae40498e6eba6a8b10c5c8ccd8904a7236801b39d9d41b0c021cd534e630076e3954fb8acfc1fca44769d
 EBUILD nbconvert-7.3.0.ebuild 3052 BLAKE2B 449b005463d8b9fdf5fbf632b902ebdc07e0f1335f711b18f00e1208d4640010d171b6b7bf0bd0517ec22d5568e3ca29e25e99085975a4a78f4e6b1a5053bf62 SHA512 cad8084c5da7e143bd6611b0e9f0a4b16d09c6bb459cac212bef0d5ba17dbc193c8826b1b4ac6daadbab96a556ce852302920d48bde8e1af879e81d598e5a411
-EBUILD nbconvert-7.3.1.ebuild 3072 BLAKE2B a66c85bc5237b3f670b1694f24e5d940c8d630d808852b087e60e2bf9603f2d6f3ad82e4e26bd10ae5b54843ee1f49c65710898dec931ae0d8a74c211d1eaba5 SHA512 f145b2a9531317b4e19c26386541db87a2bdd434033b7a6c05b00656bc50ddee180942ff6c09146b4a616486e346fd0b975c51c43ab2701727fc8f15717a67d3
+EBUILD nbconvert-7.3.1.ebuild 3078 BLAKE2B 4d60aaaf725333090fbe23c9bbb7a4a79aa3a6b74c1b70cb494130afdbed0fe467de62d7a3f55582a8dba5fd871edcaafe5dc563c69359e661e10e5ce6f439cd SHA512 5de5daba25020356d0e10d1d1120fb55b8281d7f8bbd61e0ace4ca0706d6cc8d208c914fbad0b80b3f77fa61c59c071fc09e9640c2a610dc581c28b30d45cff6
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-7.3.1.ebuild b/dev-python/nbconvert/nbconvert-7.3.1.ebuild
index cb241abc93f1..878ddafff96d 100644
--- a/dev-python/nbconvert/nbconvert-7.3.1.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.3.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/parameterized/Manifest b/dev-python/parameterized/Manifest
index 9da28a67b192..b063941350d2 100644
--- a/dev-python/parameterized/Manifest
+++ b/dev-python/parameterized/Manifest
@@ -1,6 +1,3 @@
-AUX parameterized-0.8.1-nose-to-pytest.patch 3745 BLAKE2B 739bc6c813254e3616ffa3b7fb5c057cac41df1b9d8b076a0fb570d6908e7bd740f90875add4ab6bd265f60087a396434b8641bdc75e5108afc1c790d852132d SHA512 e7e65482f15f5fb3cfba9d7dd3f66755919ab6bf7464812cfa8636bfe0c0d409576d05a0d0e7ada79e4aa1c595507b0b7c12ad13c211b9f8decb7bccfc24833f
-DIST parameterized-0.8.1.tar.gz 23936 BLAKE2B 3d36b049071907f66ef17dcae0ef9480210344f2466744b2bee8e964f46e2553411a07b233fab032d1acbc2523dc32890bc5e6e4ffc5b37d1fee3f0db3a70cbb SHA512 ad6e31b2bb27623bf070ee5c30686a5bd6a531bc71602f77ca6aa01a77fc246caaacca121098dcbe13b1a174cdcfafa6545bf6e62f6a5337a647821c02fac64a
 DIST parameterized-0.9.0.tar.gz 24351 BLAKE2B 3b0fb1c0a788f702cba74b67868fbd179e4912b518646f6a7d0d136f54b515d2546d27ad1fd14a03c128a8b53d42165a4ef9f8f434965483af24f69c3e406b25 SHA512 2c1c97a841db631608e0a9fcd93fa1af819aa288538851e0c771b56ba0bb27fb682ac3a09fcdb33e57162926d1e8fae452f7bab9384d0c40bec9a03ab3d6b126
-EBUILD parameterized-0.8.1-r2.ebuild 694 BLAKE2B b262bca540abfd2691cba6bc76bd768d32ff031fc02c5ca9ccd39a1e018ddb00308f68629da0db3ee57a0b35a8a04a4637843b97f476d7bd02000259890e79fb SHA512 bf8d8b615aeff39c5ae79710f539cb08b503d95328f76b377e791e28b3b65dc4138b18d5f43d40504a3cd23d53ce9a0166bbd78ca2a0189fe0fc499f06f4a3eb
-EBUILD parameterized-0.9.0.ebuild 600 BLAKE2B d1deaedaef7b84e4bf292abcf6d92d192a61d66f1a3aa9f77b933ebaa96b50e6dc9783ba33a0140b8954480e7392dc06d3510a50b788ba7ab066b26dfcd1075e SHA512 f64172c5f34bd0b549d3e4f1362a9844f673962ea76280853c81deb7b95b7f341b25724c69ec5f8e1ba2ae195f898d3d1e79cd1ceacf4e42d3c0282319e5409a
+EBUILD parameterized-0.9.0.ebuild 592 BLAKE2B f90018d1fb335080879497f67f1d9cc3c353496d81d8628dd0b03ea8546536c473f0e458d18824a374b4c7bcccb75974fce7ddde7ecd4b8f58777088ca70a709 SHA512 18c973c95bbaaaaf4ec3a3dafe9c3a3bd85ed7aef6d68b08303ef39318177101ca5aa80bbadf0e5f9f191e8096534623df8409a1f3edd7c350bc9df04795da07
 MISC metadata.xml 480 BLAKE2B 95327992f9b6e7a46cea990d05d1e8b71dc65ce6f3da83cba142dc5190953c79b9932e3e295e6423687b86e8f564a0823acb7d05ed01d04c5d7a1bafc19ce304 SHA512 7717494be66e427dcdbbcc88d87abe2efe84198edae7bb281ad47390641dc66fbc42aa7af6dfe7061fe0dd1ef928da5ef882449dea1ce6e156403dd16dd82aea
diff --git a/dev-python/parameterized/files/parameterized-0.8.1-nose-to-pytest.patch b/dev-python/parameterized/files/parameterized-0.8.1-nose-to-pytest.patch
deleted file mode 100644
index 45b86d8a13af..000000000000
--- a/dev-python/parameterized/files/parameterized-0.8.1-nose-to-pytest.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/parameterized/test.py b/parameterized/test.py
-index f98d865..ede7689 100644
---- a/parameterized/test.py
-+++ b/parameterized/test.py
-@@ -2,8 +2,8 @@
- 
- import inspect
- import mock
-+import pytest
- from unittest import TestCase
--from nose.tools import assert_equal, assert_raises
- 
- from .parameterized import (
-     PY3, PY2, parameterized, param, parameterized_argument_value_pairs,
-@@ -91,7 +91,7 @@ if not PYTEST:
- 
-         @parameterized([(1, ), (2, )])
-         def test_setup(self, count, *a):
--            assert_equal(self.actual_order, "setup %s" %(count, ))
-+            assert self.actual_order == "setup %s" %(count, )
-             missing_tests.remove("test_setup(%s)" %(self.actual_order, ))
- 
- 
-@@ -235,9 +235,9 @@ class TestParamerizedOnTestCase(TestCase):
-         frame_locals = frame[0].f_locals
-         nose_test_method_name = frame_locals['a'][0]._testMethodName
-         expected_name = "test_on_TestCase2_custom_name_" + str(foo)
--        assert_equal(nose_test_method_name, expected_name,
--                     "Test Method name '%s' did not get customized to expected: '%s'" %
--                     (nose_test_method_name, expected_name))
-+        assert nose_test_method_name == expected_name, \
-+                     "Test Method name '%s' did not get customized to expected: '%s'" % \
-+                     (nose_test_method_name, expected_name)
-         missing_tests.remove("%s(%r, bar=%r)" %(expected_name, foo, bar))
- 
- 
-@@ -259,7 +259,7 @@ class TestParameterizedExpandDocstring(TestCase):
-         actual_docstring = test_method.__doc__
-         if rstrip:
-             actual_docstring = actual_docstring.rstrip()
--        assert_equal(actual_docstring, expected_docstring)
-+        assert actual_docstring == expected_docstring
- 
-     @parameterized.expand([param("foo")],
-                           doc_func=lambda f, n, p: "stuff")
-@@ -335,7 +335,7 @@ def test_helpful_error_on_empty_iterable_input():
- 
- def test_skip_test_on_empty_iterable():
-     func = parameterized([], skip_on_empty=True)(lambda: None)
--    assert_raises(SkipTest, func)
-+    pytest.raises(SkipTest, func)
- 
- 
- def test_helpful_error_on_empty_iterable_input_expand():
-@@ -366,10 +366,6 @@ def test_helpful_error_on_non_iterable_input():
-         raise AssertionError("Expected exception not raised")
- 
- 
--def tearDownModule():
--    missing = sorted(list(missing_tests))
--    assert_equal(missing, [])
--
- def test_old_style_classes():
-     if PY3:
-         raise SkipTest("Py3 doesn't have old-style classes")
-@@ -418,7 +414,7 @@ class TestOldStyleClass:
- def test_parameterized_argument_value_pairs(func_params, p, expected):
-     helper = eval("lambda %s: None" %(func_params, ))
-     actual = parameterized_argument_value_pairs(helper, p)
--    assert_equal(actual, expected)
-+    assert actual == expected
- 
- 
- @parameterized([
-@@ -428,7 +424,7 @@ def test_parameterized_argument_value_pairs(func_params, p, expected):
-     (123456789, "12...89", 4),
- ])
- def test_short_repr(input, expected, n=6):
--    assert_equal(short_repr(input, n=n), expected)
-+    assert short_repr(input, n=n) == expected
- 
- @parameterized([
-     ("foo", ),
-@@ -442,7 +438,7 @@ cases_over_10 = [(i, i+1) for i in range(11)]
- 
- @parameterized(cases_over_10)
- def test_cases_over_10(input, expected):
--    assert_equal(input, expected-1)
-+    assert input == expected-1
- 
- 
- @parameterized_class(("a", "b", "c"), [
-@@ -461,7 +457,7 @@ class TestParameterizedClass(TestCase):
- 
-     def _assertions(self, test_name):
-         assert hasattr(self, "a")
--        assert_equal(self.b + self.c, 3)
-+        assert self.b + self.c == 3
-         missing_tests.remove("%s:%s(%r, %r, %r)" %(
-             self.__class__.__name__,
-             test_name,
diff --git a/dev-python/parameterized/parameterized-0.8.1-r2.ebuild b/dev-python/parameterized/parameterized-0.8.1-r2.ebuild
deleted file mode 100644
index dfdd966aed8f..000000000000
--- a/dev-python/parameterized/parameterized-0.8.1-r2.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=( pypy3 python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Parameterized testing with any Python test framework"
-HOMEPAGE="
-	https://github.com/wolever/parameterized/
-	https://pypi.org/project/parameterized/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-nose-to-pytest.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest parameterized/test.py
-}
diff --git a/dev-python/parameterized/parameterized-0.9.0.ebuild b/dev-python/parameterized/parameterized-0.9.0.ebuild
index 83ca7c451ccd..cdcdc7bff151 100644
--- a/dev-python/parameterized/parameterized-0.9.0.ebuild
+++ b/dev-python/parameterized/parameterized-0.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 32ec35582261..01a48ce54535 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -3,5 +3,5 @@ DIST pikepdf-7.1.2.tar.gz 2911232 BLAKE2B 14b6b90617b7bd30f6a595337751f586cbe7d9
 DIST pikepdf-7.2.0.tar.gz 2913496 BLAKE2B 6992b9e64e7bd718fb09c5cd3eb77937c802bb07b24b72bb0825ec721137ee1211f9f7bbc3d8141b60e0ece1f71e6d9d36b50153377b3475f30d7aac3c8f2181 SHA512 96759f36e3f019d6cba775541e7338e774d61cb71c464e42625b1b6c98b8babf5fc9d9324dc6375257897a130d7fe5facdd7a1ddaec6662c8b088854e01fc97e
 EBUILD pikepdf-7.1.1.ebuild 1493 BLAKE2B f1a371305b4810bf3c79e31e0dfa68362603b2efda661d421f0d77e9d836d4f463ec38418c48eebc2a3f328be7ab980ec9cc3c43c486d56bf3c827147e0025c7 SHA512 9fe46a28026fad07a99c1050254fe302a62f32524ec2670b47c13bcafed00eb154868650dd6e3c315d8c03abb35f176d8e36ab804e66d6bdba52e5a284de60bd
 EBUILD pikepdf-7.1.2.ebuild 1501 BLAKE2B 50c70b2f9074d703c4cec6f323ead242f1e9aedb76c83092506659076f61484f51eefca8aeece8f26ef5d3de30a6c12606f280ab54e6d3995c0b1e83468a1968 SHA512 474d6758dab21a2a83e055402b6b941addd7fb63e9f1510237cb0f2021cbc6f7f7116aff5ccefc05c241d866cbd750c763b8285000fae20bfbba070dc212f285
-EBUILD pikepdf-7.2.0.ebuild 1501 BLAKE2B 50c70b2f9074d703c4cec6f323ead242f1e9aedb76c83092506659076f61484f51eefca8aeece8f26ef5d3de30a6c12606f280ab54e6d3995c0b1e83468a1968 SHA512 474d6758dab21a2a83e055402b6b941addd7fb63e9f1510237cb0f2021cbc6f7f7116aff5ccefc05c241d866cbd750c763b8285000fae20bfbba070dc212f285
+EBUILD pikepdf-7.2.0.ebuild 1500 BLAKE2B 3ece5ce538ae10a17accfc178b4d2e7419f68d3966a3321ff3285b20567a4d573493575f94039fd7a5fd1d47252d4907de817cc704168f71c3faa30967489454 SHA512 ca1b6e55bd93558c9159144040abc7d91c3395270cf7f6d3056904a96282f18747aceefe179e0f3401e75f64e4cc7e3e631b6ce853243d2122255039f53cc389
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-7.2.0.ebuild b/dev-python/pikepdf/pikepdf-7.2.0.ebuild
index 68c143cdaf70..7b728aa528fb 100644
--- a/dev-python/pikepdf/pikepdf-7.2.0.ebuild
+++ b/dev-python/pikepdf/pikepdf-7.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 DEPEND="
 	>=app-text/qpdf-11.1.1:0=
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index e5c850fd550d..ed3547348660 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,5 +1,5 @@
 DIST pydantic-1.10.6.gh.tar.gz 902014 BLAKE2B ba3a3896cdcd2eecc7bd4e6ad979846de377c94d939519889752b36827eba7b3d245943ba192dd80925c2aa09ef02243aaae5e990a6f7b1ab9a8d0b5ba9830c4 SHA512 094fda0158faeb6021632f7ce3ea2570c19ddb288260d4e0f5a4361ab2684a68b0e6212264b37a4a75166746570098d1c4aa0311797d2cf1a22cef2c1e1f0137
 DIST pydantic-1.10.7.gh.tar.gz 903379 BLAKE2B b2dd75a640ca54024a2bf141117a1d738a30a4630bed8f4d0169fc5a6a55ded719727d88c7e78b9a2acc3aec68482e9be8c8bf4776fef668fe4acc3e1fd775df SHA512 948a7935b374719773df50243aed708b3c6789243b9aa0ba239cf1502ddd0e0cec4d701e108f1cc78090c088f3cb1c78b840c39f5e7ad0e61739776f552f284d
 EBUILD pydantic-1.10.6.ebuild 2147 BLAKE2B 78b1fbaca4b8246e9d977d850cd7d3e5b681cf07968bc9ef24e33d805a371281a132abdfb3b05f578f7b7aaca6dcc4ece9a7cb57ed84bfe96cc01c40f53c08ff SHA512 1115519399cbacd60716ec69b814e8e20a698c172485614f2a372e165d5f0bde56672ddec689510a1d47a955faa50f75df73b4268b826ea1d5cf6bf67876893e
-EBUILD pydantic-1.10.7.ebuild 2155 BLAKE2B f517b44d6963ce24f6dc9450e216bb2c1459e473440de545843c1a06172d192430286b792861bf01a2c15289bce6150da29d696d6547e83663a8f7a21a583f25 SHA512 e6f9278fc69b0d32003f5b952418924cb66020c25f11be98f05ed503bf787ea89fc5f27b78870f4b30a1d4f9a89d42d5fef290d24d43d5cf7848ac69b61d6026
+EBUILD pydantic-1.10.7.ebuild 2152 BLAKE2B c7dcb638f1a96d096518d0914dfcee29878328f12248242734614c8c1f2309a427cd74ba156c9b436ba362909087d009c2f1890c3cd1eee7a8c7c4f8dc6dbe61 SHA512 5ee0c287681d665055f72e92dc71ac7d2500ae309368c8a9b896d435526377ad7f5f947f07f4c822c7815958aa277dac3b32bb68fd75d0964a8586d5bf113278
 MISC metadata.xml 561 BLAKE2B 9cb2851ece8c8bd005a45008efe6d14d990f82832700f641418c15921f368de9bf2b20f9713362f5308a871a10c60a54ddce4e095a4a60209c89bde964c71ef7 SHA512 2f26f32c0d937153966ffbc3b9bb67252043dabfd9ca96b2ba854b111300a0c8bc89a664e439cda3bcc39597c3a29d28b3aa84172ece0f1d818b49cda746ee33
diff --git a/dev-python/pydantic/pydantic-1.10.7.ebuild b/dev-python/pydantic/pydantic-1.10.7.ebuild
index 1189c74a6be6..39399f63f05b 100644
--- a/dev-python/pydantic/pydantic-1.10.7.ebuild
+++ b/dev-python/pydantic/pydantic-1.10.7.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index c232d4122817..7f7ad6034e79 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,5 +1,5 @@
 DIST pygobject-3.42.2.tar.xz 558724 BLAKE2B 3e98cf52e818eff42beb8b6120ee8eb4cbe3a6f49670d355e1081b71d411bc93fc701cc37108a321cfcc19698c39b8b61cce5a9369d871da58fd2a2c0455fb96 SHA512 eb604f839e0702e8aeff0f19665e44c05c56cae02ce892e9ab8a95ddb0d5d0216182d0c9a0059fc8e05990c0d5707f2f7456d8924bbfb95ce1d9a42908ac0119
 DIST pygobject-3.44.1.tar.xz 559432 BLAKE2B 7edfe91ac1b7301befaf8ef17078b517666467f446bfbe25850336cd365d314153d444d29ecf028ce44a12cef1c94f139d110ac6784c8a2c6077730d4836f6cc SHA512 5f2ff4a068e7e24dcc32f8c43ba58660c85a0fabdd9ff0bac4ddf1ca82bd0fc962ce5cb3ab25b991c212d45e5e89dac67c3259c5423a7d7fd70b2ac1f56e5327
 EBUILD pygobject-3.42.2.ebuild 1788 BLAKE2B 7c3768d2e9a33ce057ade2173327005873f25fe48f0830fa2457aed37455f3a7737490ad98e2ccdd8140befbf6449a09eda64025957e69be07a609738f43d5b7 SHA512 599982b5606a2c4f23739f4b884fbb05cb0a5bb0cbe7282bbd35cc9716a54bf33ceca1636c1b5d119abfba7b2910ae1c25b140a2717b8198df27ea10e5cb6371
-EBUILD pygobject-3.44.1.ebuild 1796 BLAKE2B 2db7c9cddb6b756543f757bc52826b6ac46660f7217f20218443b4a923030179e8902cf5a1114d2d023d489d41905c43b9f6753f5c128b58000543579d7ea425 SHA512 094ef9182301ee7ccf27a12c6f2e38a7a5c40f047719fb912ecbe41f37da4b1b19f57ec1f6a28f2d488c6d3422c48ac5cf3209be38d6a1889aecbdf094fa3641
+EBUILD pygobject-3.44.1.ebuild 1789 BLAKE2B c9279331960d9a2b82e83157fad17ed85a55fb93cc5ff48627ffccc55c5d5deb9f4c25919abdb73050e794cc40f4ff196c5298d34516c15c72dbd915c8f2bad8 SHA512 5d64b90c6305c446c0f2c537324569df286ca7ccb1608f0efb34b2a5832f2f3ddbf8b14dfe5f8ae6e3373eb8be2e00951fcd8b1a172cd4e9139bcb5fe02826a2
 MISC metadata.xml 1398 BLAKE2B 0f89629267eea1f03252ac53ebf6478977301f5edf58024152b7e25cac1bb238241d419241dac72181bc82d0bda4dc281fe490a72967b730df7087300562127c SHA512 49ec255944b9530fe59ba325925713512ca84d71149b988c034d092d4a433c6f7a23822d685180c343a40055bb5c879980996d34a30cae8fddc617707bc1a417
diff --git a/dev-python/pygobject/pygobject-3.44.1.ebuild b/dev-python/pygobject/pygobject-3.44.1.ebuild
index 2b6d84b909b9..4f611f1c0a57 100644
--- a/dev-python/pygobject/pygobject-3.44.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.44.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index f0bf1ea04d4f..882bfc67cafb 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,5 +1,3 @@
 DIST PyMySQL-1.0.3.gh.tar.gz 85371 BLAKE2B 4caaf486413b0fd78acc04c6856b044048c5af28e2b8f85125dda83738daeb31f621726babd8ce724b01fc3f297769f09c2c77b60540cb5c66d152c61fd725e8 SHA512 46d56399b02e61b4b31af82f96cfbb6c24e0c18f780c872bde53a818ad74d30dfe8ded1fdac97971433b0e237e1007631a9c0e38ef2cb17b6601c77f624faf8b
-DIST pymysql-1.0.2.gh.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638
-EBUILD pymysql-1.0.2-r1.ebuild 4241 BLAKE2B b3d2beff0518ab648d58fff3ed60631438ddeb64dbb210708a0a430ac4fc72bd9e6e7c85a95df5ff725bcf301d29b032b45a8af3ee3d069366dd0e1838c853ae SHA512 8bade6df51c142b60a712dca1d569ae5dd392e2ded65501ae69157c0c44032ecd4566ba687e97dea61c049a04922f1718cda0291e843255439dde6130ddb6428
-EBUILD pymysql-1.0.3.ebuild 2894 BLAKE2B da9080e328222b4ada32be2257ef13c06dbd6655a0cbad6da1a9adf96f8ee1f4b05210c514443ad840286c9de7e4c227b2c96a5c47674b39d70c5207778e8045 SHA512 e0270c55fb62d53898ff2a643791b996baef4951af2fa36f65a42f7952f949c01541ebbeb1312f88701c5f5807dbbbfd2fec3c8d3e77dfdadef7097f21befc0a
+EBUILD pymysql-1.0.3.ebuild 2888 BLAKE2B 8073410e0b9d61a14b253fee66e81728a2b61241a28e52fe30b33c01f11e77d3e7f2f5df5abfbe594e86ead0cd7fc83fffce1da47a7e084a752e81622de8a659 SHA512 3650cb077d587723a059f477d83756324eae0763ae05928f718cfcd6bc9cbd43c010e8f01b6d56845449fbbeecc228345d6230b73247f376ad0f1cfb06aed721
 MISC metadata.xml 494 BLAKE2B b6e0ceebdd751d98a5bb60a107c94e8e0908559d8894dcfd06974f7910eb4ba13c5c3e1b9f92314b2cb030e51d4fb73dbc987102eee0d8263abf1f3588ecca46 SHA512 ac51ba234d09a327fc9a9e5b5ab826aeb51011597cdbe572411dab53b14a1e44cdf7429f0d2420810730ddd4921ee25c300d8239eb6c9f9aea391901c2252e29
diff --git a/dev-python/pymysql/pymysql-1.0.2-r1.ebuild b/dev-python/pymysql/pymysql-1.0.2-r1.ebuild
deleted file mode 100644
index 7ec157a702d9..000000000000
--- a/dev-python/pymysql/pymysql-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,150 +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
-
-MY_PN="PyMySQL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pure-Python MySQL Driver"
-HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-# TODO: support other mysql variants
-BDEPEND="
-	test? (
-		dev-db/mariadb[server]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# Auth tests don't support socket auth
-	find tests/ -name '*_auth.py' -delete || die
-
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	if [[ -z "${USER}" ]] ; then
-		# Tests require system user
-		local -x USER="$(whoami)"
-		einfo "USER set to '${USER}'"
-	fi
-
-	local mysql_install_db_cmd="${EPREFIX}/usr/share/mariadb/scripts/mysql_install_db"
-	[[ ! -x "${mysql_install_db_cmd}" ]] && mysql_install_db_cmd="${EPREFIX}/usr/bin/mysql_install_db"
-	[[ ! -x "${mysql_install_db_cmd}" ]] && die "mysql_install_db command not found!"
-
-	local mysqld_cmd="${EPREFIX}/usr/sbin/mysqld"
-	[[ ! -x "${mysqld_cmd}" ]] && die "mysqld command not found!"
-
-	local PIDFILE="${T}/mysqld.pid"
-	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
-		einfo "Killing already running mysqld process ..."
-		pkill -F "${PIDFILE}"
-	fi
-
-	if [[ -d "${T}/mysql" ]] ; then
-		einfo "Removing already existing mysqld data dir ..."
-		rm -rf "${T}/mysql" || die
-	fi
-
-	einfo "Creating mysql test instance ..."
-	mkdir -p "${T}"/mysql || die
-	"${mysql_install_db_cmd}" \
-		--no-defaults \
-		--auth-root-authentication-method=normal \
-		--basedir="${EPREFIX}/usr" \
-		--datadir="${T}"/mysql 1>"${T}"/mysqld_install.log \
-		|| die
-
-	einfo "Starting mysql test instance ..."
-	# TODO: random port
-	"${mysqld_cmd}" \
-		--no-defaults \
-		--character-set-server=utf8 \
-		--bind-address=127.0.0.1 \
-		--port=43306 \
-		--pid-file="${T}"/mysqld.pid \
-		--socket="${T}"/mysqld.sock \
-		--datadir="${T}"/mysql 1>"${T}"/mysqld.log 2>&1 &
-
-	# wait for it to start
-	local i
-	for (( i = 0; i < 10; i++)); do
-		[[ -S ${T}/mysqld.sock ]] && break
-		sleep 1
-	done
-	[[ -S ${T}/mysqld.sock ]] || die "mysqld failed to start"
-
-	einfo "Configuring test mysql instance ..."
-
-	# create test user for auth tests
-	mysql -uroot --socket="${T}"/mysqld.sock -s -e '
-		INSTALL SONAME "auth_ed25519";
-		CREATE FUNCTION ed25519_password RETURNS STRING SONAME "auth_ed25519.so";
-	' || die "Failed to set up auth_ed25519"
-
-	mysql -uroot --socket="${T}"/mysqld.sock -s -e "
-		SELECT CONCAT('CREATE USER nopass_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"\"),'\";');
-		SELECT CONCAT('CREATE USER user_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"pass_ed25519\"),'\";');
-	" || die "Failed to create ed25519 test users"
-
-	# create test databases
-	mysql -uroot --socket="${T}"/mysqld.sock -s -e '
-		create database test1 DEFAULT CHARACTER SET utf8mb4;
-		create database test2 DEFAULT CHARACTER SET utf8mb4;
-
-		create user test2 identified by "some password";
-		grant all on test2.* to test2;
-
-		create user test2@localhost identified by "some password";
-		grant all on test2.* to test2@localhost;
-	' || die "Failed to create test databases"
-
-	cat > pymysql/tests/databases.json <<-EOF || die
-		[{
-			"host": "localhost",
-			"user": "root",
-			"password": "",
-			"database": "test1",
-			"use_unicode": true,
-			"local_infile": true,
-			"unix_socket": "${T}/mysqld.sock"
-		}, {
-			"host": "localhost",
-			"user": "root",
-			"password": "",
-			"database": "test2",
-			"unix_socket": "${T}/mysqld.sock"
-		}]
-	EOF
-
-	distutils-r1_src_test
-
-	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
-		einfo "Stopping mysql test instance ..."
-		pkill -F "${PIDFILE}"
-	fi
-}
-
-python_test() {
-	local excludes=(
-		# requires some dialog plugin
-		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthThreeAttemptsQuestionsInstallPlugin
-		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthTwoQuestionsInstallPlugin
-	)
-
-	PYTHONPATH=. pytest -vv ${excludes[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pymysql/pymysql-1.0.3.ebuild b/dev-python/pymysql/pymysql-1.0.3.ebuild
index 2c99a7b07ddf..cd202b247cfb 100644
--- a/dev-python/pymysql/pymysql-1.0.3.ebuild
+++ b/dev-python/pymysql/pymysql-1.0.3.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # TODO: support other mysql variants
 BDEPEND="
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index 2f60e64e091f..2a77dfbb61e4 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -9,7 +9,7 @@ DIST pypdf-sample-files-d3d250321b01ca1194e16a814d24508897862fe8.gh.tar.gz 90308
 DIST pypdf-sample-files-fb7a080b35b3553bd10221282beeda7847959e83.gh.tar.gz 9027029 BLAKE2B 8f8797263b86f08efd9708d5812000efd08708abf66a0e95f50f5a147102e555dd7f8c465ae73cae842d86efdb52cabba5f8962626f56cb1b98409bfa108e150 SHA512 3a9cdab964a14cf6b14d80d917441a4e5effe2b7647163b666781ecabd189624dbbe5039111f6b1d753ff73e013665a1b86d87ca7806580fda58ec5810f88e94
 EBUILD pypdf-3.6.0.ebuild 1244 BLAKE2B 1bf96d9a0a542242320be90159c51304c5e270f02bb3f33e89feccad38c32013aa37c6165902f503a133f59ca32bfab5150362c998c591fc8be62f2d59717b5d SHA512 c95e5d99fb0a2e565fc0e2b311d50d0573c3f234918444e3618335f35ca0cefd0f8bb68baf6748a17ff7f890660c5401f39ccaaf2a96ff387291cd0143f271c4
 EBUILD pypdf-3.7.0.ebuild 1246 BLAKE2B da8bd7f5e9007468d3fc3e723c20964d9be8b4de54df656eaed47a6ba4ea196e5f131f5c04b564eb1dac28696b361c317e267140857cf5c97cda5ef65c6bd03d SHA512 09c4749006ad9e14378e399266fb9a7d3d6aa285110cc2aa24f1a168217df17c21b7e74acd7f7eb372c3753a763333d6ac21484a609d5dafc32fdfd67e807caf
-EBUILD pypdf-3.7.1.ebuild 1246 BLAKE2B 8b1b52f8525a144b4743efc840c9b98200e5a76b71f6985c84dfec0926695a77b58e57efc85baf0721d8983ac71c9c7b046da53a54e73e1fae9b3e90ca2768b5 SHA512 f9e87f9f1adfb2fa89e41c3b617b7765b60b4a9c15fe7c569a2299c742319eec1f9403e8043c2652149d2b8c7f96966fbaebfb73d4723cbf048c88cfd5f1373d
+EBUILD pypdf-3.7.1.ebuild 1245 BLAKE2B 4f7bdf4e737c6f87831a9460a5809429d766c5a8c710441a056d130693c01842832c7569370cce432bb482803988782aa30689b943fdbbfc60d9e28c8ac10fc9 SHA512 5e0f489d79d594c6826d3c00b23045442fd1d037c891d8fc7df8713c572966c13b62cda3732de5e84c6cd0fe9fb47077308e2285521e461091444aa9af64c83c
 EBUILD pypdf-3.8.0.ebuild 1246 BLAKE2B e4b19bf9823f78ddfb327f833029544b4a7caca2d2e57f345d7f3505d69069849c26f0de4d746bd2f66bbacfd435df513459d56a75e138d246d30c833d5814c2 SHA512 5250526439080843fafd200cc17539517c93912ec572d715bc5814bb228ef54710886d9b9755a297199008954ff6c8cb3b79752bd9a9dda344bc46930965da6c
 EBUILD pypdf-3.8.1.ebuild 1246 BLAKE2B eae2042e379ef70d2f89be49be667604f37acd66778b01c9bc616bbafd82ed9b72077b0fee0f90f85df386a7c78d228932e85e7fbec5c3698407e25f53c11bcb SHA512 c7388c89acae984f7e44161686b7ba9e220ecd30d8ccca70b727ca9f056e8bc7cf51e2e2b46060cad045fbb5781223e980473a49221768eeb8e011f7ce9277ec
 MISC metadata.xml 373 BLAKE2B a829b7048eb3a95caeb1be83b6172603df6a031d40995294f2687bf3c3cb70e66fafb9ba8339d9979fc85f5936b9552963a8fcd072a20661fa78f3aa3c4b89c0 SHA512 775ac2de487f11fba1ea8d283b42b9ef56e42cd95ea11f50a06b099420e69c0567f65c506b14891ac641da90ea05ca70da4f8a3e4a028cf41bdbc823021dccfe
diff --git a/dev-python/pypdf/pypdf-3.7.1.ebuild b/dev-python/pypdf/pypdf-3.7.1.ebuild
index c9cbff9df9cd..5eeb924a862c 100644
--- a/dev-python/pypdf/pypdf-3.7.1.ebuild
+++ b/dev-python/pypdf/pypdf-3.7.1.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/pypdf-${PV}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 423bf7fa398f..aade169fde8f 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,5 +1,5 @@
 DIST pyproj-3.4.1.gh.tar.gz 232371 BLAKE2B 70b0ccbf898c6b52b2a24db811f8d49df89a67afda5a4d2d486aa30e21fdd6438842346a876138a3018edd5308c6c6f49c1473c345507be3af831a3a734ae5a2 SHA512 e1588906c42a6cbf832ea2d2a0cf271271b1b3559fccfd7798d823f80653184a660bf14ab6f741f7d0a5b49361e2519893eb155746761d4a02248c1021660e60
 DIST pyproj-3.5.0.gh.tar.gz 237380 BLAKE2B e401998418efb79be496bf11be904191fa43e004331867415524508c8766ca9f4ae390ade1341ab6508e6d7d92c8875357bad2b1af159b642345065f8c28ebf8 SHA512 64d1eab54fc5e39d6403fcb0ae3e0b5283303471431894fa6fa94c118374c4ca1a9a418a7d0d1d8bbd2a6a96a5a2dbaf3d067417d6335174c8911db796fbd0a9
 EBUILD pyproj-3.4.1.ebuild 1117 BLAKE2B 6faa4519c1d06c78470200967657f76121abf5483a41eea339d90bdef6d0584acf8ff9f8278dcc71aa8a31f9f2d7074af3711dd251e7cef53c88f041b9d9f35e SHA512 9cc70f170b2f95c8457c1ddb5d167cea9f7a28245b2f39e7deaf2eece33779918d41d2fc617b326fb700c2cc9e2a942d06079e348168450a262880fccc18467b
-EBUILD pyproj-3.5.0.ebuild 1119 BLAKE2B 3f6e208dbe950cba89d72a7e774d08abbde16e51624694722adfac9c61df78eefb320333f3c02c5b364a37b16d30f79cb66bd778e14416584e9d04f3327490e9 SHA512 8c28c8f22d7a09dd38f6bf1d654d80820347e6530d405d682f6db2d60f98156ea1417ec0d42870de63a59b6fa1bf3b6200207e6b03586b0b3bf4ec34417ae6b1
+EBUILD pyproj-3.5.0.ebuild 1118 BLAKE2B 02119d362a71f6fc42685872de91c758bb58e64aa1ce288efc143bd54a6285b2c16867289398df46bf412cb102411de39068d42277598eac560b6f65a77807e8 SHA512 dfd49d9bb258793757b4127a59d8c990f078da101747836e4ae5b2589eb1fda781bb4ec1228c0cdf78a90733768fedae6d57bb6864b0cd42c39c2e721faf3a42
 MISC metadata.xml 415 BLAKE2B 4f3ab70bc72ca97a428c357257d3a59591b410f12276a42e141cd0a43072b79107529c95c6a313906129e8893c75b63a6ef11ddc2f3842a7f5e5e7f7349ec38e SHA512 7ca8a01534471dff67c42a96c524d166278e26da309b2c4d766045e38086cc0e52ccc990881ebed7ca81219d705d9e4a9c16e86b052a50867bb032457e354903
diff --git a/dev-python/pyproj/pyproj-3.5.0.ebuild b/dev-python/pyproj/pyproj-3.5.0.ebuild
index 2b285916270b..174f2dba69dc 100644
--- a/dev-python/pyproj/pyproj-3.5.0.ebuild
+++ b/dev-python/pyproj/pyproj-3.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 
 RDEPEND="
 	>=sci-libs/proj-9.0.0:=
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index 4cdc92b80301..bcee6f6de636 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -1,7 +1,5 @@
-DIST pyproject-fmt-0.9.1.gh.tar.gz 15434 BLAKE2B f9dd55b4106e875c80127ac60b3a54d4bdadf3555266a74cfd811ab96500879a7efb8eac71a041b2c33486bfcbc1f818a26a3ae3c50685f35cc3712691a85bb9 SHA512 ade87f43927c74e0328ffa8ac542bad204cc283d694f6921c40c86ae0a941ae50cc43fa4078ddcec28ff0d6003ac34a54232ea23d2820b5b2582482b22ac2a7e
 DIST pyproject-fmt-0.9.2.gh.tar.gz 15615 BLAKE2B 91912d350224fb2cbfd5f4e2310c10849dd0a1f43ac076059b521966d07526f9509cf87bba182cc4e9eb6b87c7c58c2972bb4f256bf63724e9d3b6c4fe9e67dd SHA512 3045381fc811fa8b8b7e845d9af5564d1969b73bfbb3e5a5c1953843754607cdbd809b829691d7195df73a1e136f68fbb3d3b66c783aa7c706b352e88d9b3f92
 DIST pyproject_fmt-0.10.0.tar.gz 11148 BLAKE2B de8f068b4bda97dcde68010645f637c69253712d7b5d8514660a2b3fc874defe76a343b10c5cdc2c3c2bdbb214a5ae0b1483944fb0eb9f1607c8bad7d0f51e60 SHA512 9383f2e02971f95cad724ea7a9c1f322d0c4e94ee36c5a3dd668f15b149f5e259274be086399f83e4f95bded796200debff351558b92249200874f1cb4c04323
 EBUILD pyproject-fmt-0.10.0.ebuild 782 BLAKE2B 8e0dab3061b6ee16ca0aea36198b8b406d3954d7a17ddae9389ae4c74a0d2d1c83e09551849d1489b47f26f3b1307d52ba6fa0175fb1e15e8a1667175c76a1da SHA512 c09a5cda28813143efe75b19cc705c20704649cfb61218efc784f781cbb858f63294d024557d382d18e6c11b6ee3e4f1f09c2269ec23cc7bed0c0c98cfc6d939
-EBUILD pyproject-fmt-0.9.1.ebuild 861 BLAKE2B 8d4b076b7b2af9273591b0022f86c15aa97ad14b62d345305bcddd3f59a964e44756ed10a55dee26b867dc002b3f04ba81488ae4b624b347fb549d197e79d54d SHA512 2cfc68b195fccbd3baa2b6a3d9911b226fd501daaf260996d420ac612045d51d193eb70659dee44c00c9dddb59946a4064198fb3b6b35bc2b87a72439d10f93c
-EBUILD pyproject-fmt-0.9.2.ebuild 869 BLAKE2B a0539489724d2079740af64ef020f0e69d50851c4bedcb0ab7dac5c41418391ff5f4d973e71ef71ba16109667d2168cfdd425970e99a7db413d0d2950388f3b0 SHA512 b6f4da4bbc9187e8843408b0b83704bed7547f03627aa957f99508aa1329789fc4d0188245b3e57994b38a0f1e3f1fdd4885aacbd043c9e77b9f01fda3028543
+EBUILD pyproject-fmt-0.9.2.ebuild 861 BLAKE2B 8d4b076b7b2af9273591b0022f86c15aa97ad14b62d345305bcddd3f59a964e44756ed10a55dee26b867dc002b3f04ba81488ae4b624b347fb549d197e79d54d SHA512 2cfc68b195fccbd3baa2b6a3d9911b226fd501daaf260996d420ac612045d51d193eb70659dee44c00c9dddb59946a4064198fb3b6b35bc2b87a72439d10f93c
 MISC metadata.xml 380 BLAKE2B f139b3f6c22d40d7c91b9b35db262813e299d1a3c1a1f8d6129e457fac62e3e7029a05315a3bddd9c4542764a33160c89b58b3b62f457efb088a7ae7cd86a936 SHA512 38bd0633defb67ee1831480c8b3896e158d0735ec74057b13b3c389cf26bd6ecb878f21d172f83293789d81ca2c30afedab8eaeb4ab1774b39972fdd5f805a81
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.9.1.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.9.1.ebuild
deleted file mode 100644
index 18ae3f04023d..000000000000
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.9.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022-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="Format your pyproject.toml file"
-HOMEPAGE="
-	https://github.com/tox-dev/pyproject-fmt/
-	https://pypi.org/project/pyproject-fmt/
-"
-SRC_URI="
-	https://github.com/tox-dev/pyproject-fmt/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/packaging-23[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.9.2.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.9.2.ebuild
index a802c14c305f..18ae3f04023d 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.9.2.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.9.2.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/packaging-23[${PYTHON_USEDEP}]
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index fe8e3ecb199e..857cd30a20f9 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -5,5 +5,5 @@ DIST pytz-2023.3.tar.gz 317095 BLAKE2B dd2fe27471f641382667ddac77216f9e0e22dd005
 EBUILD pytz-2022.7.1.ebuild 779 BLAKE2B 385bd8561698a862d2c897b0efb2b1217e9966ec7b07cc8c8757fed57e033326534b54cc5dd182c989cd4c18ee908c053e95179379643c56c73644c6a6411987 SHA512 f274dc7caabb2aaeca437931b3100bf1d2b8824ef9e94d1bf2bc27eddf3078b99c4cb2d97a45eeb4794107322bd2b15a0ebb58162fea2c16c1ddd3ddfe6d04f6
 EBUILD pytz-2023.2-r2.ebuild 1181 BLAKE2B bf265f98c94ec1e736985ca43093ea7165d4c2244a80e9fa041b9f3cd3488319467af0f971054509aff00434bfb95ddb6229ed80a1e01a1d4cf3c7ffb35d95d1 SHA512 1b55ce4c86663dbd18e3f4f16dd4276d823309d54acc752f7642e7049e67a8f0bbd38d3aca217c71c7da6112c4da288c0ecfec0834e23d24fead2372c49dc2d1
 EBUILD pytz-2023.2.ebuild 787 BLAKE2B 5bb9d1edc4b62b13a44008a63456e84ff83c00b1eb40139e4cb59f8315f84e6f7fe15ec0ca17c66e86862d2c69724258f3f86feb85ced5648768702d0180c539 SHA512 8d551fe07bb7e33c2fb301c2d37ddc70904c58821cfe548ed64cf673db5648ce8bc1b06b16063b5a06b1cc8fbbd2d026367ca36f46be09948c8f3c22bb957738
-EBUILD pytz-2023.3-r1.ebuild 1175 BLAKE2B f90d5a392899bc5b867800c49b6f032b6ba594180cd4925e343b26a11366c5454a96bdfce141897f6f0a47de4792eb217cf28215a73871ddad3dc2f61fbae4f4 SHA512 15e45d00bc21218b96f3a078985532904cb7bc34dd4c9112203beb7fac4f111c8a465507600c989399f4d8b83b3efcf6ac04afd0af07f1d9d04e1bc8b9491283
+EBUILD pytz-2023.3-r1.ebuild 1174 BLAKE2B ad6af3d1177d29899df69de340e44ed2a3bc5ba4c0273c7f79f636d0e15bd40e74b9167adaf5d2251b7041e5808e8fccb87d686c211ca2b1d4f065b20707a679 SHA512 7f7c99da913beda536832e374bdb7b94cf50540992774204f957f2f29909a2e977af3a1815d3fec3ba8620f6d565063d6468e29843dab011705bd31688533650
 MISC metadata.xml 820 BLAKE2B 224acaf3f2b85e717829a59108a4053e9a60bc710c330b12dc3f181685d5c8ab1b090105796f092004b1a70781882438b0c0a27bc96ef0116b33fe7051cc6ad5 SHA512 c9a677d89a9f831f3a9833b02e6cec36adbb27688e117b66caad32d3be10fca19787dd85eb14e21eb95d6ed8ba6ff02122ad9f54aa175252834dc4c219b7c219
diff --git a/dev-python/pytz/pytz-2023.3-r1.ebuild b/dev-python/pytz/pytz-2023.3-r1.ebuild
index bb05dca55ffc..90d70d19a61c 100644
--- a/dev-python/pytz/pytz-2023.3-r1.ebuild
+++ b/dev-python/pytz/pytz-2023.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/radon/Manifest b/dev-python/radon/Manifest
index a648f0268e8b..215d99ba1c4b 100644
--- a/dev-python/radon/Manifest
+++ b/dev-python/radon/Manifest
@@ -1,5 +1,3 @@
-DIST radon-5.1.0.tar.gz 1873643 BLAKE2B 475c140fa3f9350b2376a66d3cf0dddd7f0ab1b3a4f397e82b65d175dc20ece38da1cdc7a83ef2f9e65d7d735dd589fa7ccbb5d966ca07cc7950430dd33642b9 SHA512 98e1c3dbf419ff0a791f01ea5376177c5be47c9cf1afdd9ae53014e8869dd10c7a7661a69bace48adb880173a8a176d4a13534711fcf53408b3f495f4579f7c5
 DIST radon-6.0.1.tar.gz 1874992 BLAKE2B a70926fc7acc4212d65dc9b6fc843b8fc32ca55aa836464240cf1fd6065ac9d5a28b8a2facdde5287bfd119a388db5ce1a530c5c84aebcbbe414ca1c336451b8 SHA512 91bd091610568dacb95491ba314b68dfb33ee397b043ae96badc7c134a841122d90394a36b1d665c9cabf273c0e6128217ebfc459c36020c12dcab647dd5df53
-EBUILD radon-5.1.0-r2.ebuild 798 BLAKE2B e987f9ca6f19748716a044a1e97077a2ccb884bd8a6ed80c36394c6148734b2a74f97aa99f319f520ac6d3f667c2b4362872328a00aaf39f959ec97d4d6f089f SHA512 55fb7ec23e79892716c3d55fbb9b6f839311b34d2587c397760f18f660d7ac8ec2846b670725334db4f0bc4a6c0f0ead1d0eb27b5ba411671ad4a54f46e5ace3
-EBUILD radon-6.0.1.ebuild 732 BLAKE2B ab33af5de8a1b5d3ab405c5983e60c15d9823eca982e82dc4859e26ba8748caf0cae8f451e31fbd71afd2b09dd0725aad8ae0b4c17b8f9b05efc336e6cb05f60 SHA512 1d4f581e4bd41520a9c80662f8b74e4390f9d42d273d81cbb12562c9f32cbc171acee966e3934ca9f990f3b59dcecacdd0dc94dcc0dc1f4b20d788a5fb393f4d
+EBUILD radon-6.0.1.ebuild 724 BLAKE2B 3dbc679c2ca3069da680aa71ea95eb2383e1b7cb85dbdd7c5bedcc44dc5dd537a3aab4163e34052dccb22956f0ac3594e133fcfb2a7ef32f2b9025dcc6370b2a SHA512 32236f23fabb6149f2364f17bd04131185569c388897c1013d39c2f04eca265d31bc9fe1bbfdefd3dfab1c957ca32150b94d722e2de6f05118d7565a502640a5
 MISC metadata.xml 384 BLAKE2B 9c13838aaec4e01a6152498eb4f0e3bfbbb8cffe0cebc53ae7602c6ef1009852b8568f33e6c0299619a2a2df234abc6e06726ca145b09470b2798ea500dde731 SHA512 5c1a2d23ef8a2450f6d2540d125c9edea2e512e2df03a6d8501a41e238902afe4283c9f455b178e80626cf266aa472391c342d6128683f534f37db60eab38720
diff --git a/dev-python/radon/radon-5.1.0-r2.ebuild b/dev-python/radon/radon-5.1.0-r2.ebuild
deleted file mode 100644
index a7f74d0a270b..000000000000
--- a/dev-python/radon/radon-5.1.0-r2.ebuild
+++ /dev/null
@@ -1,36 +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="Code Metrics in Python"
-HOMEPAGE="
-	https://radon.readthedocs.io/
-	https://github.com/rubik/radon/
-	https://pypi.org/project/radon/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-	dev-python/mando[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the dep
-	sed -i -e '/mando/s:,<0.7::' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/radon/radon-6.0.1.ebuild b/dev-python/radon/radon-6.0.1.ebuild
index c7366aaa17d3..520b0f6f4913 100644
--- a/dev-python/radon/radon-6.0.1.ebuild
+++ b/dev-python/radon/radon-6.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 2321e1e7c4e8..ad8930ef6648 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -5,5 +5,5 @@ DIST regex-2023.3.22.tar.gz 391917 BLAKE2B 62a7c992f0bdd0342a0dd37d6e28b2511dba0
 DIST regex-2023.3.23.tar.gz 391964 BLAKE2B 87271765ce6b3c8a96a79e86a2b2e907a9a97e55c78c38d117b05df2fb5626af3ba90ecb55ccde6cb745eba00da2528bb0b6d21dc759c3040c37f6a0cc647476 SHA512 276e16a60d77f0099d9e9a5241f60a823d8ca3056672d74aba21d38daf11ec18b317009e84135f63470a71c877c6abdfe25da0e69c5ea5ad47c97737099a5167
 EBUILD regex-2022.10.31.ebuild 842 BLAKE2B e389dcbc58021e66508c95bdef0cc7af22f02632216e811e3d98da03584da6997be17d612092e8b0dc5dd3fcabccd06e104fc18ef21a4c15b688c998a1dc431a SHA512 6afd1ec80a090735e92f2fb1b2f485aacfc6432050412e7caf99d28229ba353c61a369ebee3f623fba1569ecbe6c3f689462d048cbdc009d8271da6fc906923c
 EBUILD regex-2023.3.22.ebuild 850 BLAKE2B 8b9c7b887a380675adee05a43119f3c5cded544597ea204bbea121605f3a3c76c7d5ea1ff03b775fbe841b7dfa6d07016f3063694878d72114177d84e85be1fb SHA512 906c6b14f000c8bc28bb7d316dc2e64c467f0bd8bc33c1e8a56108eb39a719995b59862dc6f27ac1aaf59d6f9555bd591fae125bd9403753c4caea9ddf379699
-EBUILD regex-2023.3.23.ebuild 850 BLAKE2B 8b9c7b887a380675adee05a43119f3c5cded544597ea204bbea121605f3a3c76c7d5ea1ff03b775fbe841b7dfa6d07016f3063694878d72114177d84e85be1fb SHA512 906c6b14f000c8bc28bb7d316dc2e64c467f0bd8bc33c1e8a56108eb39a719995b59862dc6f27ac1aaf59d6f9555bd591fae125bd9403753c4caea9ddf379699
+EBUILD regex-2023.3.23.ebuild 846 BLAKE2B f4bdc9e962fd58d72673488ba80bf69b49cef84a314b16a89f59a7e8d27a5840b85252cb0511d5c782d210a2b7f775ed5071824651e15b9d01f77de9f23b9247 SHA512 eebe4540955302f6e076a3385398e743d0bc295042f4e4f3ac6f5510230725ec7f75c8ce23004683a266a228671221e6770faba2887d306529cb1e30c9e7a666
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2023.3.23.ebuild b/dev-python/regex/regex-2023.3.23.ebuild
index 62efc90d2934..4b00aadb8ae3 100644
--- a/dev-python/regex/regex-2023.3.23.ebuild
+++ b/dev-python/regex/regex-2023.3.23.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index c1ef3d29a2f1..41e83ca653e1 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -5,5 +5,5 @@ DIST selenium-selenium-4.8.3-python.gh.tar.gz 90236640 BLAKE2B 943497a5015da8a62
 DIST selenium-selenium-4.9.0.gh.tar.gz 90247221 BLAKE2B fe99ac519ef4ced5f61721d1e3bae70e938b4a481582623a33f4d5a2fd1978c42e216501eb25ac7496957c2ea37a3ad97aff7ab7adf440e1428a311410024aca SHA512 9e745eae4cf6ea95fe1268b79a80734f4b67b0948fa5bfb144d6b681cd4b353add5c1a1d16b3f35652b6fa4a5b135f8a5203de97fcb9af0c27060a45b6269225
 EBUILD selenium-4.5.0.ebuild 781 BLAKE2B 340cf76c9431b8e7598c4fbe415808814a9f7e7d0657d748bbf75ff764dfc7ca0e38f74e21ad60e529fe0ccf2928ea17081e21ef6d23d916c5a51ac8ba346d89 SHA512 ee70ecee71bcb2f36f227f69200dece1fcda518550c1ae74eae0e16f03e091fcc756968cb2cf74a6c038fe1dbde8222faee48bc4c09d2286651368687e70fa72
 EBUILD selenium-4.8.3.ebuild 1649 BLAKE2B 22dbd2a61522eca41b3a6cb53abc2940e20061b3195c5a2753074053ad08cf6d25ed9ae4d6a46d78f68547447768ac79b2a3f2b463c91353aefc19aa22609853 SHA512 29aceae985983379b254021a62f63abc765167d9d50781a743a2426ad4833b2643995d4ce999135acfdfa098c0b0e7c5e64456a1cc0d137396e160c9dd5188fa
-EBUILD selenium-4.9.0.ebuild 1642 BLAKE2B 65c2a49ae463f84bcb7da58dd5789646068f9af7224ebe6587ff6d6b16fc198d8255b8175371435ebc0fb12584a94f2992a9cfe63e613bd934614edd0ee77b08 SHA512 a3bc0b7a377a52a7c032a0c3790d40664305f1cc83756b1f972b375fc3ebadc08279186ff21a9e06a473e20544908ed99c306c5086c3e53ea94738a7107dee0c
+EBUILD selenium-4.9.0.ebuild 1638 BLAKE2B 9a14dfd501df49bed6a2c3f5ec01d5dc08fb749d0dbb36f88c158aba963131c6a095b35995c7bd2f85e2a88c16500680147a679aa322c7317dc18edc1dccbb60 SHA512 ce00a47c85356515fb6ff72980b6c64b954c39ec7241ac278e809063ecb6b2c3a0f82a9be621e021b2e293620dff4d96956f40b8f7714930e18e5b934de3f109
 MISC metadata.xml 383 BLAKE2B d437d1631cefdba12fe2c3ce38ddff34bf9dd2bbc777d5d3425556bda76865711c991c9e3a735130a1d55cb7c6578b083ecb473c28706a2d45563b31bdbe6d1b SHA512 c087323da996b9ad4d0bf8f00306cf044d5daab194b60af029cb1ce06bf60c660fd5959b7914e6f1103143c3e4533d293a6d3bd0ec1c95163eba09d8a19c13a1
diff --git a/dev-python/selenium/selenium-4.9.0.ebuild b/dev-python/selenium/selenium-4.9.0.ebuild
index b61d9b6e44dc..f5989f241bd0 100644
--- a/dev-python/selenium/selenium-4.9.0.ebuild
+++ b/dev-python/selenium/selenium-4.9.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
 	)
 "
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 95a1a0f7eb63..0244d761b7ee 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -3,5 +3,5 @@ DIST stripe-5.3.0.tar.gz 268634 BLAKE2B b6b6ac44f64b2b7f02729840409ed7f432abd692
 DIST stripe-5.4.0.tar.gz 268711 BLAKE2B 2417174ceed571a7b8483992ac15ef9d19a037e5745118c2eec3094f8e848ec49b384f62bd4a136ed046b695bd753efc6064109c30a50aca539a1085b1e056fe SHA512 55351171184672ab55f38ed483078dbbb85216bf80d07726d1bb8848d24ff829a3d464d543182afafedfcaabdb516a5868bc4ac7d16f64f2dc2dc7c1ab2e152a
 EBUILD stripe-5.2.0.ebuild 1777 BLAKE2B 7d52e724895d47f77fa83ed1c81b77070c1453f9e7aa6464975dcf8384ef559567c618b4c056da8d701c33cdc15fe953623e2d1cae20147e8d0e3b8f01c9cc8d SHA512 9bc618c6f3bda2b506c49f87950981607eb5bba6eea89c6362c6b3da83a14da65d8c9d9aee741a97fa98d42314dbf2d3f1c268a94b0c45f850f3911ef023041c
 EBUILD stripe-5.3.0.ebuild 1779 BLAKE2B 86e73471b21fcdda355e14c9540ed07712b18cd40c298de791fa7392dfe96ed20803460f6f953c05c8d88618a26a1e24a476dc62b5a24ef0f2173cc75d10d96b SHA512 32f702eb44fd58d38cec9e79c6db3bfa19b23c44a6f750317e0860954fe7497fb8f12dbce33c4522cc24a93179adfe4e52738139c6471a37a641a70df6197e5f
-EBUILD stripe-5.4.0.ebuild 1856 BLAKE2B 2bcd8207e26a87efc0672a3616113a1a6d68467c237ed68a752af685ec78348b3eda429eb115b20db37fd18120ae36eba9aaa6c0b5e51df2cb5bae4bbd57321a SHA512 6bea3bc03c3e38d305587975f98699be34655b790fd003197b8518f42f41b7349161b8f814681820e7a102e0bcd67813fee7d97764c98cb7cbcdaaff82ca0a71
+EBUILD stripe-5.4.0.ebuild 1854 BLAKE2B d8d234dc0e1f4ae602ff38a5c66c418e584afdeda8ae6d51be99810224509560d787a9f82e9a684b38c54f3b376c060a7656fbd8de92796c00dd747466ed609a SHA512 f8281dfb18e3791643a9733aad5eab4c07d8f631736b40194df7c14905c9bbae0659cacfbfc2f582faee36500d5a81b35bef9ac048962b288b8ccdadeceab867
 MISC metadata.xml 372 BLAKE2B e6a38fdec6fc016068e7a0522ba15e83bf358ba1475e54a9630b1e86c75bc14b790c59716317bd81438a1c770e4d31afbe04400ddcd5dd272715c251fd6cb1a2 SHA512 2d9672b242f2d38654f7906097e597dfbdf75afa3583ea331f61772db95d19a802e83ed523c67a6cf3da18411036055c0996fd04d99199618d5205be8a61bd77
diff --git a/dev-python/stripe/stripe-5.4.0.ebuild b/dev-python/stripe/stripe-5.4.0.ebuild
index 90ecda2ccf22..c6a00a9e2cfb 100644
--- a/dev-python/stripe/stripe-5.4.0.ebuild
+++ b/dev-python/stripe/stripe-5.4.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/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index f87f306cb6b1..467881ac6b45 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,7 +1,5 @@
-DIST tomlkit-0.11.6.tar.gz 188290 BLAKE2B c0fc64177dff2254ab4d377f15bada1093e69ed66f815b04f698359f096b123b256949e871344276e6fcda26e43ac22c505460c4f906505ea9676774cbfb0c5f SHA512 692f2facb18440609b63995f690f4ba29e82d696f5ce612f872499b4a42bb0ab33fcbf52abf36057c25448b3e29f30955dbc7e0ba34f10d21cb9b5d36e9ad9bf
 DIST tomlkit-0.11.7.tar.gz 188555 BLAKE2B 1958ace56c37746585879f1b657af53f36d1b3e741a5e41438a9806897e252bfbf42040c65a05df6c1921413da3e68be6d5d6ef9ce0a0c5d457b170f1cce6528 SHA512 456de2047fe1da1905ebf6eed99bdbd7d565fab2ecb50b9c06655188271d52b3680882ce0db2beb69fa9e7d18548b8045a99c4897e12e1d92d9cf92a937864ab
 DIST tomlkit-0.11.8.tar.gz 188825 BLAKE2B 3b3b31f0243592ae28d3fc7c23bc6cd61eaa0d9907f4c7afc838e816783ac4ce28a0491c15c31649749272c8d65dd51b7a0160c8f0bf1e209115ebcb5ba13906 SHA512 538851d5460770000a1263fb2384dc8283f9fe56364ccebac2cef31be85c51056bbaf59c96134ceae624b978334c29b54653c28838567cd2806e70ec6e3e5856
-EBUILD tomlkit-0.11.6.ebuild 763 BLAKE2B 5c94c6b627c101403809c0b36f078a1482f48c771bce1488efc9e5a703b6f88f058b82492f401681fd3e1d70855e33376293c0c21e848b2799d6dc74e0e3076c SHA512 d3f7af8adfebdb41fda93afed995c1120743ed85831ad6584d34dee154b3e6f493edf61f783ac9fa308c8c2944e2c102ec9714fedd4e7541f1d4886bbe3ac8cc
-EBUILD tomlkit-0.11.7.ebuild 978 BLAKE2B a1d88117af6e7debac2f1c3dc6ee2aa5a3b87fea529d390a812f50b1cf3af5b02824b06729fa47422423efd2be059814f5f502ab942518d25663ddf6eedb1ed9 SHA512 47c82b92e28f0e7d9a73986cb93a630b75c70bcce1ff15c6c87a256ff50946df00b498a4ec4055815aca92e0939056e336d37968a2f75973a641f850517a0c5d
+EBUILD tomlkit-0.11.7.ebuild 970 BLAKE2B 610835a1227ee7b6193082b674c58b7a1ea512e8c066fddf25b58b74c1a95ede8288102e4333bd740528251982d53bc8b916f8a6831311a3f0d9ee7ac16df890 SHA512 236629923b5eec0cc479d4f7964025350dff4a2842f6f6561f37e4cc21959ff87462983f0bb0cf4c50589dc1f1082823cdc253e54da9e783fd575d51b3c703b0
 EBUILD tomlkit-0.11.8.ebuild 978 BLAKE2B a1d88117af6e7debac2f1c3dc6ee2aa5a3b87fea529d390a812f50b1cf3af5b02824b06729fa47422423efd2be059814f5f502ab942518d25663ddf6eedb1ed9 SHA512 47c82b92e28f0e7d9a73986cb93a630b75c70bcce1ff15c6c87a256ff50946df00b498a4ec4055815aca92e0939056e336d37968a2f75973a641f850517a0c5d
 MISC metadata.xml 525 BLAKE2B 663169c851817eb7368c49d678119f1f2dfebe642325d3dbc59498f60b452710a257ca5cd5173a4fc8391d33038cce079b3fba112ad7e9c0caf0c1872ee43f13 SHA512 5a6cf412fc06854557d001ae4a6f654b36d351c8c0b4bc08c1a7c40f49d8dceba931598f5eed6c75e1d7797570fcf8fb7799f5f035931f80d05b1e9bd0d258c0
diff --git a/dev-python/tomlkit/tomlkit-0.11.6.ebuild b/dev-python/tomlkit/tomlkit-0.11.6.ebuild
deleted file mode 100644
index f33b1e140472..000000000000
--- a/dev-python/tomlkit/tomlkit-0.11.6.ebuild
+++ /dev/null
@@ -1,36 +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 pypi
-
-DESCRIPTION="Style preserving TOML library"
-HOMEPAGE="
-	https://github.com/sdispater/tomlkit/
-	https://pypi.org/project/tomlkit/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	# use setup.py to avoid circular dep with poetry-core
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["setuptools"]
-		build-backend = "setuptools.build_meta"
-	EOF
-}
diff --git a/dev-python/tomlkit/tomlkit-0.11.7.ebuild b/dev-python/tomlkit/tomlkit-0.11.7.ebuild
index f9911e9a934d..7abc245f1b50 100644
--- a/dev-python/tomlkit/tomlkit-0.11.7.ebuild
+++ b/dev-python/tomlkit/tomlkit-0.11.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 48a844eb9853..f5c32664b497 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,17 +1,11 @@
 DIST tox-3.28.0.gh.tar.gz 309472 BLAKE2B 9896411426f6aebb3efa468c01696ecc5f17ec3e67825672d0efc74c1b1468bc8b8d9c14b6177c181750ba4b9a5e77d616068dd83e21f5641acfc8e2a271cc1f SHA512 64816754e6800661bb564c5c7d21c4139522d540a04fafe3c4591d596072d48d1cbe0ee2abee9c8faf3d5007774f5371431b5a7a8f49912bc879c7b168aab2ca
 DIST tox-4.4.11.tar.gz 170069 BLAKE2B e2e560462cbb6081c27ff0268fa8a6b0239caac0b237bbd66709ce578996800728346bd22491cfade85d7d04d2c00a769179efd4a160decfd97f94fcedc7ed24 SHA512 7a0a39ac55482aa423368fee6621aef9d95c58afd5d38975bcaf67edfebdc817aacc33efdd1f0f459953c25bceed73c6ef03ce789aea7f82f3ab1dcc6546118c
 DIST tox-4.4.12.tar.gz 170092 BLAKE2B 03a1d1ddd8c36c88e3b30f464df9b20d516ef282664b138f64a969195901d353d678d9c1e4ca2e61d73fed891b942105dbeef97e281e219fe2110ba92517adf2 SHA512 896ecef178b0625246ffe4ab3a9a0c03650eb78633fa92706e93475d6589ac29d65bbf91b9ecfacfa8154739eefd463aeb1252be68998cdffddc270a4f89edd0
-DIST tox-4.4.6.gh.tar.gz 304337 BLAKE2B 2c157fe5febf1eb131d767ade87484880201bb37fa65a579abb9780d755d570f216b8f865dd2dd8dbb3a3af01be78133f9ac0b73a3166dfc2b9cd99f6547498a SHA512 403bca89228d665182bfbb61550dfd9e9fb4ce4a5592472d50cd38e3f264c806fa15bbdccc020a720ad69885d9be54a1f074f6d87549cbe2b523e53d870358dc
-DIST tox-4.4.7.tar.gz 168261 BLAKE2B 276842bb82d01c9e3b66f633e79974790b7d1852f831ab954172ddc1d3c50c861a39e959fb0a990a7102a1cc0840238ef3ac84c7b41f9f45ce502b1245e21988 SHA512 58989ecc0a555ee225614d9b7a718b22f6dd1555a0209a0c1428259fbfc7d336a58753fbfa85f1b9aa160c8489587999425437e71f9d4728631d5cd5b50ca159
-DIST tox-4.4.8.tar.gz 169460 BLAKE2B 5353c489d5051b23b39c23fcbad1455556c23572b504ba241f9942a01f5ae5f1459d3b3837680aa9631dcd8a081c0f3b8acce1b18e85daeab3e2084ec966e451 SHA512 a6e5ceb19ebf1adcfe5cd093a2710da88c1552f2129211175990b7b7fb6b53716fdccd7592e9c6696bf13ce584443c9a266e40ed50953999883fa1a68ea6aec6
 DIST tox-4.5.0.tar.gz 170132 BLAKE2B fbde455d90791b81ba8fb47b2c00a0c931e56bef39749a324e16b12f2955441371c74983d3c77b98f04f5a0e95ddf78678ff96fc2f99f42a87bd0058a3aefb98 SHA512 79e3fd7308a3da0df5859437ff7842a343578a98211a6a936f72caec857dbdb5e0bd4b80fd68a3a48fb0891d4608875ccc1b09d7127416aaa7109a8aa314979c
 DIST tox-4.5.1.tar.gz 170137 BLAKE2B 38ab00eb577e66211db0ecf8931087a8c5a14f8219eb7ebecb7be9938221d1c680edc09a38a5c72b9ec63825d4cbb2d4fd9157a52aed8cdb0d22a1c1bbb70cba SHA512 75d495d6dba134c3fe537fc190c1f428ff188ee67c346911c02ee151a8369425b22956eea52be5d434735e1590edce57b3487d5f4b277022bf8cfe8bf4660cf8
 EBUILD tox-3.28.0.ebuild 1916 BLAKE2B ff8aa55245a3f654897ad4c8f5861a55410b2b9442bf3f85aaa0ee236f576efcea1a2ed697c715c7182679b62a4781c5a0f6236eb92a1b12d6ddc73154612a67 SHA512 2f5999d0263da9efb00216600f8b98fb3c204e11640049d92c6106279baeff452468d2bb78236839bc8bd5540d6f9d01338af26315148d81a788d476ec5dbed5
-EBUILD tox-4.4.11.ebuild 2672 BLAKE2B 34afe26542d3804eeb719c356abd724af517242770cdb69d9a581c7a39c6119918fe530f5be1e1e6adfffd89a0c9796763a7dcb22a997e0f4a3fe54817e94cb6 SHA512 614d4c122b8f8365c90054075cf54080b330cf4335455df2774daec32d607e0276d50e9c9f84385613f5f9780746129eff79c830f0c94456d5d732716bc2eb49
+EBUILD tox-4.4.11.ebuild 2671 BLAKE2B ab8acfb6a3e584508d80112d2cccdd972a42a2d532d181e6d842c6e23505e4fc15858cba90e4b76a0ef816ac4c6ecb4a0550829f0c84ea7e0539da542818a12a SHA512 398eb43a1e2a950faa02af230f87431a46d771a110a3f41b000cfde47cb26ec117159f665e5d2b859dfbf09ac0878972ff75acac350b38e2d572b97e501d8d04
 EBUILD tox-4.4.12.ebuild 2683 BLAKE2B 706fd28a7bfa9567abb080e3a9da51359ffdb051f19acfd5d42c60abba3d69bd229bea576e869d5a0e3e5a51391e5ea5bd06e8e8b99096f199730257e2ebddca SHA512 8aae508cac48fb17dc3105be29dc26992c54d2502bb959efeced684de71c362ebe4e5aebebec19e083b78eef65a225f301af93abd7d9d078c5dcaf14078a296b
-EBUILD tox-4.4.6.ebuild 3029 BLAKE2B 3a3dd193f9eaed38066e520aecda87b81745ec4a175b9a6f6e65a701c85db0c46d2b9c8c3d5b9cac29ef1cf91d21f313d79e673b1e31587e502d7886960e398d SHA512 2ff026c0923e832e3af257fcffbdb5b7722a50d010205723983a6f866b36f63e5665b4466f7cceeb6b04db8bbc99b3e585bd94094b6a7afca2a079a9ce0c3c47
-EBUILD tox-4.4.7.ebuild 3009 BLAKE2B c9f8e6c1cd6260a8a6cefc8045bfb24910e893fd1dad27f30ce52242f24f6528b428f812d47ce75359d32265e29ad7372ec7462fbf506089769899df2bd7a96f SHA512 d8df48dd80e192e69a9f8d9d7b9ff8f19e3efde8acf531eb697e48e81603e765919199d0ac6c812ccbaf72e02649c88830cc2cc6e0c98119d1bb1d52647bce34
-EBUILD tox-4.4.8.ebuild 2679 BLAKE2B 1157f832459beee0909cc41ca3ebb77f935b4909b921ad1deaf5c7936ca4b12b03de39820e648eedc4ada5bb463f15aba9c1311c6e18eec491dfd3dbd9aeb050 SHA512 704e7f6724205ec0f6e4df6632e00f5417f7f8143667e77fba63156a42844eb070b0b78b96c07c6361d068b6d88e6ce195f2c0e7d496a492997a0b7239a30499
 EBUILD tox-4.5.0.ebuild 2685 BLAKE2B 442764b64da2798d59f3bba7b6ef5368447e6fd81d1e30d5548d6d229c5e1a8dc276cac798bed8bfc34eea75ec6be924ae7537f700226d80107b71947de8daf4 SHA512 dffc68c48825a5358372570972c2461b83acd8459ef14c180eeb4e931e60dd7c07459fa154dc89d65e7042ee1a73ab7da79ffcc5cfc4912a553a65600390c3d1
 EBUILD tox-4.5.1.ebuild 2685 BLAKE2B 442764b64da2798d59f3bba7b6ef5368447e6fd81d1e30d5548d6d229c5e1a8dc276cac798bed8bfc34eea75ec6be924ae7537f700226d80107b71947de8daf4 SHA512 dffc68c48825a5358372570972c2461b83acd8459ef14c180eeb4e931e60dd7c07459fa154dc89d65e7042ee1a73ab7da79ffcc5cfc4912a553a65600390c3d1
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-4.4.11.ebuild b/dev-python/tox/tox-4.4.11.ebuild
index 74ea7afabeaf..9ea7b9863fbd 100644
--- a/dev-python/tox/tox-4.4.11.ebuild
+++ b/dev-python/tox/tox-4.4.11.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/cachetools-5.3[${PYTHON_USEDEP}]
diff --git a/dev-python/tox/tox-4.4.6.ebuild b/dev-python/tox/tox-4.4.6.ebuild
deleted file mode 100644
index bb9be16f77c3..000000000000
--- a/dev-python/tox/tox-4.4.6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-SRC_URI="
-	https://github.com/tox-dev/tox/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/cachetools-5.3[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.9[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/build-0.10[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/time-machine-2.9[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-src_prepare() {
-	# the minimal bounds in tox are entirely meaningless and new packaging
-	# breaks setuptools
-	sed -i -e '/packaging/s:>=[0-9]\+::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-	)
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.4.7.ebuild b/dev-python/tox/tox-4.4.7.ebuild
deleted file mode 100644
index 2248781df596..000000000000
--- a/dev-python/tox/tox-4.4.7.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/cachetools-5.3[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.9[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/build-0.10[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/time-machine-2.9[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# the minimal bounds in tox are entirely meaningless and new packaging
-	# breaks setuptools
-	sed -i -e '/packaging/s:>=[0-9]\+::' pyproject.toml || die
-	# workaround https://github.com/agronholm/exceptiongroup/pull/59
-	[[ -f tox.ini ]] && die "Remove the hack, please"
-	> tox.ini || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-	)
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.4.8.ebuild b/dev-python/tox/tox-4.4.8.ebuild
deleted file mode 100644
index 48e88e0cf5d2..000000000000
--- a/dev-python/tox/tox-4.4.8.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/cachetools-5.3[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.10[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.5.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.21[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/build-0.10[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-3.2.1[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/time-machine-2.9[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-	)
-
-	epytest
-}
diff --git a/dev-python/trio-websocket/Manifest b/dev-python/trio-websocket/Manifest
index b4ae25438284..23c20d54bb17 100644
--- a/dev-python/trio-websocket/Manifest
+++ b/dev-python/trio-websocket/Manifest
@@ -1,3 +1,3 @@
 DIST trio-websocket-0.10.2.gh.tar.gz 45025 BLAKE2B cc80f7b8e06bb88bef69c6326dd899a27523ea70e0ea10c8b02a26498102638c569ffe21e2b4e355f9c635d60ae8ae34664d311bf5fe286456e43e0f9c2ba481 SHA512 ad8d4facb153b59597ca7dac14dabe60ac8ca4331aa72df8120e01ec726e1f392a8167d070f72534eb735b5dbf4afe46e385c0e3a2dd250afa2280c6a5a0c863
-EBUILD trio-websocket-0.10.2.ebuild 941 BLAKE2B bfeb112f55649fd93eb61949ab2201d667d42edfd3f0cd3e77173408c57d90b2e98843a5adab73f53c53399433c55001b11ae35fc7a69049166722fb5ff0bebe SHA512 913eff3adb6da872add7ac50f5216d4e74196189af79895c8f96ed2805887de01979036997fc08de098eee00aa40437ebf0681e1d977d26f8089a27063578076
+EBUILD trio-websocket-0.10.2.ebuild 937 BLAKE2B f426233b99cf656a01eb5d83e6540202da570ec02eaee7ed1b0e3d3fa4ad36a0605c8dde26008b54c0dcd66942329fb50aa1ecd24b7f8406820cb658ed161de4 SHA512 0522fcfd3213f4c281ec0019100a2b719d00642da84cc1a126ed8b35d4d5c418c4fcc3d1ed32c58380cbc10ee188824dd7aa0ff33f6aa4cac803151c2d010912
 MISC metadata.xml 409 BLAKE2B 68c9d1ab2984909315d2ec3f91f2703cc0941911fb049c35614c2cdc935e55f0f2440f6624aab4838f0d7d07e3e5717d19c7138660e82f8a3cb237e610a974e1 SHA512 c9d5e6f956b40d03d0a062ded846c507e783c55404a76b75141004df7d43e6a8bf5810480b4286a6bdf2d48c30aad51261e48581abb8799c107b924cd8131170
diff --git a/dev-python/trio-websocket/trio-websocket-0.10.2.ebuild b/dev-python/trio-websocket/trio-websocket-0.10.2.ebuild
index 064cc522d04e..5fd0c0e8880c 100644
--- a/dev-python/trio-websocket/trio-websocket-0.10.2.ebuild
+++ b/dev-python/trio-websocket/trio-websocket-0.10.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	dev-python/exceptiongroup[${PYTHON_USEDEP}]
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index a9740f2c374f..e9a75b5cd59d 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,5 +1,3 @@
-DIST webcolors-1.12.tar.gz 38112 BLAKE2B f229ec69c91ae83bd36194bc85a03e34d1ceedfd98ffd8b5e3583956283297bb9c91f947646d67cf107bcddc6c6c0d655779672fca22c0e4d8452007c8dbff30 SHA512 2c1e46ba2036ff960a973b9f5b4cec06241e9385fa0de876f66a6cf742d5b11bc212fce262011968a612c1446b78a6f50b3e75d04584c3b2b47f3ac3d66fdd51
 DIST webcolors-1.13.tar.gz 41152 BLAKE2B 0a510a7fe10db42af226da465437017b36ffe11382d31b588ee1c53c5d810b9b1bc95c5f8ccaa4a351956368fe7ee74fbac68c880927a83c1d9155937e0c198d SHA512 074aaf135ac6b0025b88b731d1d6dfa4c539b4fff7195658cc58a4326bb9f0449a231685d312b4a1ec48ca535a838bfa5c680787fe0e61473a2a092c448937d0
-EBUILD webcolors-1.12.ebuild 571 BLAKE2B 8bacd59c1f2f23aba7f89d25c5226789bd6e328d570772c933215bec7bd42a04af40a0908db5e1c501c051b57d978f9dada9b8ba699b87194b708290e7681f6e SHA512 31eaf49ea007394aea0c5c5b2ff93135ddd22df3c8a9af5a3be5d0e74b1f576d2c745d2c33ca017adc97195f36fa4336c1f006ec4e14e959a6a94fabd84e365b
-EBUILD webcolors-1.13.ebuild 579 BLAKE2B d0df3397cf80451bf905b27b4327cba6616bbdd7902fa75a37bb29b3f38d4f4874951ea594ffe7963403fd262c872f19d8a166e2ec1c1bd8e5ac09ffd2dfb56c SHA512 f64b9d7dedcf2908caa09335e22b7a87154844b3409d442c9e62dfc60c30bdc82182e1a601a80ae545abff55b207adc16a14b2f5cd557cfd866106c9241dfae8
+EBUILD webcolors-1.13.ebuild 571 BLAKE2B 8bacd59c1f2f23aba7f89d25c5226789bd6e328d570772c933215bec7bd42a04af40a0908db5e1c501c051b57d978f9dada9b8ba699b87194b708290e7681f6e SHA512 31eaf49ea007394aea0c5c5b2ff93135ddd22df3c8a9af5a3be5d0e74b1f576d2c745d2c33ca017adc97195f36fa4336c1f006ec4e14e959a6a94fabd84e365b
 MISC metadata.xml 398 BLAKE2B 051ecee1b66000baa637f8cb769dd94753c64b97aa3b7bc0bfab424a2a3f311f6831e36e01c7a8ec752dc0f92c25fc9a3a23482347bc34a4d92641f1295b7fca SHA512 b2e6a3d0f210e11a2b28c50444b0e4aa573eb47bd59c8a3b21f570fc02da1d1f95dae7c79400673214fb82ff98108e29e071276b1314f2d40f78813513e0d83d
diff --git a/dev-python/webcolors/webcolors-1.12.ebuild b/dev-python/webcolors/webcolors-1.12.ebuild
deleted file mode 100644
index 1f100726a002..000000000000
--- a/dev-python/webcolors/webcolors-1.12.ebuild
+++ /dev/null
@@ -1,21 +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="Color names and value formats defined by the HTML and CSS specifications"
-HOMEPAGE="
-	https://github.com/ubernostrum/webcolors/
-	https://pypi.org/project/webcolors/
-"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
diff --git a/dev-python/webcolors/webcolors-1.13.ebuild b/dev-python/webcolors/webcolors-1.13.ebuild
index 28d2227d9eaf..1f100726a002 100644
--- a/dev-python/webcolors/webcolors-1.13.ebuild
+++ b/dev-python/webcolors/webcolors-1.13.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests unittest
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 15733320bf90..4c73e6f90ffe 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -4,7 +4,7 @@ DIST xarray-2023.4.0.tar.gz 3689883 BLAKE2B 50c5a18eaf28fc3bc38bc322dc393ec3e6a6
 DIST xarray-2023.4.1.tar.gz 3690082 BLAKE2B 33b8c8b6694911e0fb670dc60b784e9473a632bbdc793ac85685c9891933e373e40378c7362d7d3f7d6cf584716f8759ad73701d469534b70323d8e20d27ef3b SHA512 5bffb6b09d1188da27f19b6ec652ffb5a16ebdf036cf53f2d7c5b1805e7beababea6505127a23170d8ae8ad9453f429598b17f468c84b72ad07383ea3951d935
 DIST xarray-2023.4.2.tar.gz 3692437 BLAKE2B d4fb5b184386bb7e9574ea3bdf484c3df82b9dca1fcd2380ac65b6a58da9f89da057d70efa9bd045b5cf6900c38f6aa4176fd2990cfe1369f987c452711307d6 SHA512 581b06a677b80c0f7e494a80ae52d75bd62bf613b13b7b7215458ceef727fb55a898c8da8cc6f8a6875ef6898007897eea8be55fb138f1dacad42965bbf1d956
 EBUILD xarray-2023.2.0.ebuild 1178 BLAKE2B bec6155037d99a0832d283af7d5ceff48a51aedebe5baab14f293008ea31903dc9029a82992e1be0399c9102106c6db776009e1f10a30c0a7304bba6cc96eaf6 SHA512 34cba8d8521f7b8506c6b84804365397974f97a71cb8ddfedbdd7f0dc4f11e7b5bfa1e8216a73ec8aa1c7bac7beded74088cd5db283dee76f67380c56b4f65ea
-EBUILD xarray-2023.3.0.ebuild 1224 BLAKE2B fb7b48af1ac04366407e8f1243b82cac478898e0f233879e0b8ddb8ecc7ffc99962019e31b4b491ba408c28efc8498a38f85be42c6c517618764b2f0461cbef4 SHA512 e0cbe0459854610dab551ac248fc79e397356e6048898e1ada87cb886c22d97d66dea71cbc8c9793e64120cd1d08b5c5a63fc893227e017f1412409eaafda806
+EBUILD xarray-2023.3.0.ebuild 1222 BLAKE2B 11ae0cdd72648274d47812795be212ecd98c265cbd2a68e82af377b3d82c77f4188def85afe33da4b9989dc12f3da758322e95e1a275522e77c394227dbb7444 SHA512 6340918f15666ddc0f9ded9e19107efa4433b6069686772a231d638310d86c26f1ccb4c061bcad517fc05ef27be23222fadb5ea2b48eb46d09358bc7d8f99a34
 EBUILD xarray-2023.4.0.ebuild 1737 BLAKE2B cc338022ae7e4b78a4bfe092810ea71f94e5ebd2d768be293be71e87561273e0ea86bb2f90495540989c604b23ba50ca9de6e6ef1bfb5d4ea34ac534ea45c630 SHA512 82477cffbfbe309882ac31e918de8bc87333a19b84fce86811f17a129e97a37e07907b54e67ec87abc849febb7c8ac844d9fbd4512444318ab4a7a95e9fe0a31
 EBUILD xarray-2023.4.1.ebuild 1823 BLAKE2B 4bf1e3d7abaad1fd66db35eb0e75596deb8587a52eb0503d023f9b3ef7f31bfcc895da241323849b0a97adfbe8a00b1f89b212ad30adc86d2d53c333bad6b8ba SHA512 b57d14a46f5efbe17d1806f69095d1cfe99c5eddd08beac80635b8ee0e2438ae6bda0af4c08baec26766a7755fba828c3c2c2a830ae6f24db745c65a797ef390
 EBUILD xarray-2023.4.2.ebuild 1823 BLAKE2B 4bf1e3d7abaad1fd66db35eb0e75596deb8587a52eb0503d023f9b3ef7f31bfcc895da241323849b0a97adfbe8a00b1f89b212ad30adc86d2d53c333bad6b8ba SHA512 b57d14a46f5efbe17d1806f69095d1cfe99c5eddd08beac80635b8ee0e2438ae6bda0af4c08baec26766a7755fba828c3c2c2a830ae6f24db745c65a797ef390
diff --git a/dev-python/xarray/xarray-2023.3.0.ebuild b/dev-python/xarray/xarray-2023.3.0.ebuild
index cc0d2354ba87..fc2365b9204d 100644
--- a/dev-python/xarray/xarray-2023.3.0.ebuild
+++ b/dev-python/xarray/xarray-2023.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-i18nmessageid/Manifest b/dev-python/zope-i18nmessageid/Manifest
index 0d5bd96ff553..d757ac0736bd 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -3,5 +3,5 @@ DIST zope.i18nmessageid-6.0.0.tar.gz 27791 BLAKE2B 3589c46c0405f21e50df3eae1bc3a
 DIST zope.i18nmessageid-6.0.1.tar.gz 27797 BLAKE2B bab5af18f9bec8a41b633bcd4081381dbda37b71eef32153e6889ca4b7760503f1ac2c8749b508213629505904e85166ea17d1898a5c50d5bcd55ae4a714c2a6 SHA512 8b50df352e7c53ce88c7adbc0eb1155b198ea0b200b411324819ffd59517a403f0be78746c76a7018e61e6272cdc1be1b623dcab1db28dafa3abf2a714623a4b
 EBUILD zope-i18nmessageid-5.1.1.ebuild 968 BLAKE2B f4b7bf4b4ae8d0a3752864e42e06bdf36a5d52ed3491296965328b097324c9950702d3b8de9e5ea8cd6fe360c9824282b800c11952102708aac85d0b80e7095a SHA512 ca440b35aeb346fb23fa757d2e85cb23ae6cc9901d4008ce0930a79eb23ad43f5949d84a5565a3e0743db07324f90e8a1a25c526ce60ba0e084c24a3d704cc87
 EBUILD zope-i18nmessageid-6.0.0.ebuild 971 BLAKE2B 576d0c19c8a0ca56b2ca359f64e0ba23c63ccdea6ef94293bff081f041feb3e5d1f82121e5b02418dd31a6acf84a2a069f4028528438fecf4e848da4ef399894 SHA512 d0a6ad3c0635cad8f13f61edb17fab7b3ed6e332a622aa40974b99e939b340ed6ba78993e0eb328e70524fd7778df82f14f8efaf14b97d8a7e41885c23427415
-EBUILD zope-i18nmessageid-6.0.1.ebuild 936 BLAKE2B 93df6e333c5ae3e6e79768a508fa653feeaf431752abc6bbdd8b2b4cfc91e5ca347c0f5f05dfc5738a4cfb17a1ed6b72772d80e033271a0b9f62d17f77fb23ad SHA512 5a3d465dfa6b8aeed0539457c29c89c2e93efad64eb8df879225a7d054d94f6710159f197dba7bc6c04e465b9ee6dd99b60eb77d4b398f056ba454b3c114ebe2
+EBUILD zope-i18nmessageid-6.0.1.ebuild 935 BLAKE2B 417bb27edc05ec51bcedafefe5122dc261ce9ef86c52ef79b32e0fb3affc015d6aab23acc964cafb8e4ebc9e8a45f0b9c99d0082a810a5b06e35760f51812a9f SHA512 236ea52ead1ee3ce2be56c3ca48da874fc10c3df923784c5029ce892880a7e08c5c217db446cbcdb19ce0be2526574d0e6e2609145bef773e718ed125aeb5624
 MISC metadata.xml 488 BLAKE2B 2b413d726016bdcf199974f77972d7800a4d5f169463d9587f9d0563ee94f8f0cdafb9c384c387b7bf9c2f1814807a8ab32fae796275bc51d624133788df44c8 SHA512 3459883a636540739ecea197d7ebd1429dd6e8fb20d0df2337691e1742995edf50dd0fee6340695b6dc493d0d5fd7ea8d3f55277172cd7385df0b057f376fdbb
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-6.0.1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-6.0.1.ebuild
index 0e5d2bdd3386..d420ecef7506 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-6.0.1.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-6.0.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	!dev-python/namespace-zope