gentoo auto-resync : 20:12:2023 - 19:51:59

author: V3n3RiX <venerix@koprulu.sector> 2023-12-20 19:51:59 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-12-20 19:51:59 +0000
commit: 1fb8608d6f0b1acf0e34361c105533087a09c710 (patch)
tree: 5c247db22c44a72ff61ecd68477ed3d7ee357cb8 /dev-python
parent: aec6329fe6b56821fd643ccaacb4d5d61f4eaad6 (diff)
109 files changed, 265 insertions, 2179 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 78f6cb76a4af..0fb0b96626b7 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index 294681f3a2c1..08f66d4e70c3 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt-builder-1.15.3.tar.gz 3909851 BLAKE2B 27680dbbee2fb1f549f7d98fa0b422dfe88933aedcb907bfa74dbdbce7324a5f003b62f7fd03ef4ec5c4f8ff5151fb23b73a3111b1e03bf04daba6faa00cf13e SHA512 58bd082d339cedd34c5bd8dc58f690a8a801b04c334e24c9843be0f0c24f2d4548ff69374bc0cf0aa96f8dea526f5a73c688f00cd72d29deb86fedaab5987f49
 DIST PyQt-builder-1.15.4.tar.gz 3766458 BLAKE2B d0bff31ee1c25172c621defdf0a9e4c297b6b4e692142a44018338be8f037b9d286096c642b8efb8ae6df79f5900ee7be9732efbb32142f6b58752c7409a0026 SHA512 ec0b9f7784a32af744111615b93f98d73f284bb752fd71359c798d3b093a01925823effea72c866a5f49f77e3dfc5dee4125bbb289f647d84000bf34b5db6931
 EBUILD PyQt-builder-1.15.3.ebuild 721 BLAKE2B 10b743fac004acb9293df8c241700a836c762be5a8694af4eef2d46dcf8b6dcc4748de99a106bd63a24fb2948502e4490cdb0d251e474f8d29bb1ff382716db0 SHA512 64404ac127b5fa046401a53fe0606062d799cedbda4ed2220d04e4d046fb416f7b93a8f6e11604e03b5781d69488f42754cec7e7ea06329d5de938e1b88087f7
-EBUILD PyQt-builder-1.15.4.ebuild 726 BLAKE2B 28fae4bdf763ef9e24d9d1c2c9874b11ca987bbb0ec35bd432fbd43df81e0ad60c0588ba86438a4526cd434acd57c4c051a647ca9c88448ae357faa96a944b9b SHA512 740590507da29bf273fcbe5f9609517ab9039a237733709436cc3fde9b8f4c9fb7c83fa9e27868ac8905ad28e7e79d142028b536b8987429b7991ad7b64d00d7
+EBUILD PyQt-builder-1.15.4.ebuild 721 BLAKE2B 10b743fac004acb9293df8c241700a836c762be5a8694af4eef2d46dcf8b6dcc4748de99a106bd63a24fb2948502e4490cdb0d251e474f8d29bb1ff382716db0 SHA512 64404ac127b5fa046401a53fe0606062d799cedbda4ed2220d04e4d046fb416f7b93a8f6e11604e03b5781d69488f42754cec7e7ea06329d5de938e1b88087f7
 MISC metadata.xml 666 BLAKE2B 2602886cadc8244466e26c92178552ac1f618ace1dcd6eca9ced2c3e0f7a7777c435f842f1581d93ea7642dbcc278a4aa59a84305f5a825f39edb736e7d29f69 SHA512 42746ac242170047e0a44389c8d2e8eb5be60fbff1f5f1908802e5c3a04a0c740fe338c9b3049fc03bdb45a4182b388aad9b89a573e87d440a9a833443a1470c
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.15.4.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.15.4.ebuild
index 5ef4f3ffc44d..bccaecfc4fee 100644
--- a/dev-python/PyQt-builder/PyQt-builder-1.15.4.ebuild
+++ b/dev-python/PyQt-builder/PyQt-builder-1.15.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/"
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 9fdc622d5e36..0db4fcca9f10 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,5 +1,3 @@
-DIST alembic-1.12.1.tar.gz 1200204 BLAKE2B 640435e09ee7d33c7fa375b6fa784e2ef4097b50074753341717bc21fa8bd838ca00ced6c5cc9e3d82eca494270ffe84bc4b74dc96ed01cb9aded77f21e33520 SHA512 c76bae8f22dcbb4b2d235a17059a756c33bf40d4ea62b937373a29dab7c4f6e36eef0030a721222663c191eba565530299d28726f06e0c40d74daec1d3e03b33
 DIST alembic-1.13.0.tar.gz 1208438 BLAKE2B e5e3040eecd74e6095062dac51138f91b79197af6410a451f7a7ac699f8d31d12ab4e381f8b1e9ce04fd8c897339d5074493e4ef95f294276ea5d67403504229 SHA512 c9a014fc30000a09fa69e7a56cb591000443317d0cc3576fd6bd70cab7cec29906fa48d57e40dcf12d7dd93762de0d6f395fb37c9d5c1780664555757f387262
-EBUILD alembic-1.12.1.ebuild 997 BLAKE2B badb6d71bd53c7370231a64ea42cffc5e4f6f790bd1e704afe4d78d2855f83566ea482718319f897cfa72ebdef1beec857f66efe8d87fe1d8d8e09b50e7a9ee5 SHA512 5dc9ff4a2795e723200f6fff45176589d7755bf8909e317b0d96c185063986f8502e46292add34f54dd3e1fc3b38f0280cfb942893d76092347ec062c605cf8b
-EBUILD alembic-1.13.0.ebuild 1013 BLAKE2B 4f4f1758204899f7954aca23be7182313d38e6a07c0e1f00cbdb6fd540960d9ee9d77145e84564a1955c40a7fd1e6a218c5fb12d35e5e2900cd42e483bd6d6ed SHA512 af0925c243920af0201206c01a7504fa536a61b4a23fececee85cea6bec8e0819453513ea9288c55c563c967408ecaf4d827287e8ded23da964daf3ed8473048
+EBUILD alembic-1.13.0.ebuild 1010 BLAKE2B 613d8d61bbbc07536b878f98f6923006f1cba1dc68ace1a07782edbb4253ab5da5026b8611e4a1dd209597deaeec5731b9667e3f338d32694401895615f6baa2 SHA512 48fea4145c4c20dee6cca468e517a4df6101aeb9458f09d9d3d062da36396902bc6b43b0150f10f863ddeff3168e1d07768e324e6a107f6f61569d1fc59f786b
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.12.1.ebuild b/dev-python/alembic/alembic-1.12.1.ebuild
deleted file mode 100644
index 1f596377813f..000000000000
--- a/dev-python/alembic/alembic-1.12.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="
-	https://github.com/sqlalchemy/alembic/
-	https://pypi.org/project/alembic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# setup.cfg contains -p no:warnings in addopts which triggers
-	# datetime.utcfromtimestamp() deprecation warning as an error in py3.12
-	epytest -o addopts=
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.13.0.ebuild b/dev-python/alembic/alembic-1.13.0.ebuild
index 5d610b87ddda..856f3fe8ba25 100644
--- a/dev-python/alembic/alembic-1.13.0.ebuild
+++ b/dev-python/alembic/alembic-1.13.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 071567967c6e..cae11106ad8b 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,3 @@
-DIST serverless-application-model-1.81.0.gh.tar.gz 5135291 BLAKE2B a55cf5600184e49f3168f4fef201167b91469c9968cff6350c0138fb013c23140b94144564d0ca764d91dc7e683e8f8e2e15ed57277b6e6f71cdef419f93b822 SHA512 939d882c4c64396855f0ff6ae168554dd25dc73fe77e0c34c195be408850b8b9109b9e5b7dc7375a1fa9f53462c573a12683e36fd1d3cf0e9014b754a014f1b9
 DIST serverless-application-model-1.82.0.gh.tar.gz 5135310 BLAKE2B f49bdbbc009f5d41d03c0a1b82ca5a6b1ed03e14989c364eb0047cc7e90ba948a52f41237b06a35d3a48bcf2f4eac0570903e6a3a95801ffad8b9756a1f62f0e SHA512 cd757b1b99a515bed5f1cb521a23e70bc7b2e05c5566eb86198fcc77e6dfbbf74237ed7ef05e20f1a9021d57b097bf21bed1219f54a0696f6a081bc5c2321826
-EBUILD aws-sam-translator-1.81.0.ebuild 1674 BLAKE2B 86a59eaf54671847bca02cd04f75efbcc4c028b7105bb21abdc1f7e54298ccc6ef3053ca568c51879d6f40b8479669cf6c270b0cd4d3a2a0417929ac9bc934a2 SHA512 44fa23761c404f2d446cb21287c282e5ff67f6fcb84b57941171238a2107a26d39403e511e0f3f915bb735892b6145dc07974c721508a2e630eb171901e1ef0c
-EBUILD aws-sam-translator-1.82.0.ebuild 1677 BLAKE2B df22a3b4fd4e80adca55bfe69a56a8449e05b0480c018d7c1ecf0fddb3f035c6b9a29f2169fc9942ea65cc9401efc1a567b90779d7d556181eea13da0c1edcfb SHA512 ea106ee17cb08d218e330b2264fa0293920e684acd06e6d301bce8eb6845fb4d080fefca1182b147703356bde665015bb012facda8705a95ff9f55a977f57b17
+EBUILD aws-sam-translator-1.82.0.ebuild 1674 BLAKE2B 86a59eaf54671847bca02cd04f75efbcc4c028b7105bb21abdc1f7e54298ccc6ef3053ca568c51879d6f40b8479669cf6c270b0cd4d3a2a0417929ac9bc934a2 SHA512 44fa23761c404f2d446cb21287c282e5ff67f6fcb84b57941171238a2107a26d39403e511e0f3f915bb735892b6145dc07974c721508a2e630eb171901e1ef0c
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.81.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.81.0.ebuild
deleted file mode 100644
index 22ea734192d7..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.81.0.ebuild
+++ /dev/null
@@ -1,62 +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..12} )
-
-inherit distutils-r1 multiprocessing
-
-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-3[${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}]
-		dev-python/pytest-xdist[${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= -o filterwarnings= \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.82.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.82.0.ebuild
index 63efd590ab79..22ea734192d7 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.82.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.82.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/bitarray/Manifest b/dev-python/bitarray/Manifest
index fb96c1fc4208..9bfe41b496d5 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,9 +1,5 @@
-DIST bitarray-2.8.3.tar.gz 128790 BLAKE2B 198723c7e26ad1638f541ae5269a9294e4588d8ece76121c4e2758f79dd704217fb0a83da3b5798f95f93006a18c4a6704aeb0efc7d55a42cc277789c6581154 SHA512 60c551ec98746495c3ae73fc40b660bcadc27dcbb42f022524daf33830494f5d168b9577bb5270de42f59da43a52548cfdb262c3386fafe6c1dd1d18592a7a7e
-DIST bitarray-2.8.4.tar.gz 129128 BLAKE2B d41ab6d83825c479b4b70aa52d5e314c68223ce46b32a8e5ff3abfd7afd7bb4bb03ffb478d8c58979204109582d725dfdca5070058d0d5dc76fd529cdc347392 SHA512 42533daa7cd98d94f103a873be72244a0a0973dadcbb35441d5efd8134e57b4cd7f77ed734870b58a931f465f26dac1bf81008febac8439b2fa427063ad4947e
 DIST bitarray-2.8.5.tar.gz 129895 BLAKE2B a0dc14c488c2c818ca1bbd60abc51fe800b7c4f8a015f373baf90894ea42fe1c70c4d13d235bcbac55fcccb70e2b1245e2b39a0f485e4ce62c44472d3f3f2c9b SHA512 fcae4223608cf308bd1ce07749de2a0c3f00c5d0ff471b25da8c0cc5c289b3776aea0ff24fc7be6b8b89fb86ce268a1989488559b0ed9b08a347d3bb476daaa6
 DIST bitarray-2.9.0.tar.gz 132895 BLAKE2B c10687a90267b91f9fbe4f9b3ca90ec4d6bcf079a43f02b697650efcb319c3b0abbf305bac3507d18f784a3e6b202bab25b7781ce2386f3ccd328ec115e93bd3 SHA512 c436e4e580a8050ce9befe1290b44b61094b550dda12fed1734d927eb3744eefb5312c3903865897b8dccf1b0e02b1053686eaf0e6a0317b93745e9fcf2fb0a9
-EBUILD bitarray-2.8.3.ebuild 553 BLAKE2B 0597521ca71666cc251845819a3e098e7dccc6d246a7dd8232c7f101a0a8d11d123d2c5a0762a49df7f897a8a6dd4e96142534c940c2f570441f51ede7bb709f SHA512 faabf4d28405b7218aacd5d1cfd5b33908d3d33e0b52e560a14199f29b2ecdb151021ae5e4c165f13d2ec5afd4785481a677f0688c1c04330131060d98148811
-EBUILD bitarray-2.8.4.ebuild 556 BLAKE2B 98002852b78c48dcf0be300376ab049abf7a6bce173598a5aabb125efd00e466d886e35a9b56d50ae0a10ed5943ed588c67697167f488814f522a60d83603170 SHA512 19c9a5e726f5ef3ae2c7540f20ba6c14bec519740d04426d8c820d73eb38f3a46b84b36444ca150af08356a9a03836bfbdfffa20cf8776eabd05e54b85ce66be
-EBUILD bitarray-2.8.5.ebuild 556 BLAKE2B 98002852b78c48dcf0be300376ab049abf7a6bce173598a5aabb125efd00e466d886e35a9b56d50ae0a10ed5943ed588c67697167f488814f522a60d83603170 SHA512 19c9a5e726f5ef3ae2c7540f20ba6c14bec519740d04426d8c820d73eb38f3a46b84b36444ca150af08356a9a03836bfbdfffa20cf8776eabd05e54b85ce66be
+EBUILD bitarray-2.8.5.ebuild 553 BLAKE2B 0597521ca71666cc251845819a3e098e7dccc6d246a7dd8232c7f101a0a8d11d123d2c5a0762a49df7f897a8a6dd4e96142534c940c2f570441f51ede7bb709f SHA512 faabf4d28405b7218aacd5d1cfd5b33908d3d33e0b52e560a14199f29b2ecdb151021ae5e4c165f13d2ec5afd4785481a677f0688c1c04330131060d98148811
 EBUILD bitarray-2.9.0.ebuild 556 BLAKE2B 98002852b78c48dcf0be300376ab049abf7a6bce173598a5aabb125efd00e466d886e35a9b56d50ae0a10ed5943ed588c67697167f488814f522a60d83603170 SHA512 19c9a5e726f5ef3ae2c7540f20ba6c14bec519740d04426d8c820d73eb38f3a46b84b36444ca150af08356a9a03836bfbdfffa20cf8776eabd05e54b85ce66be
 MISC metadata.xml 1207 BLAKE2B 67a57c61a71655fcd94e7025fe4d30792b6921a40f151d827f4c936dbc96c2b81afd2f2a302cfbf15356a591be941268561545d7ac7bc0cdb19e3f87a03e4b4b SHA512 5069c6622d7840c402007c420169e679da08db020952f798fd4299d6f1b324ce8cead3ca2a9072b96d8d852d5630827833eb27d39a190153e8da46ac9f386b90
diff --git a/dev-python/bitarray/bitarray-2.8.3.ebuild b/dev-python/bitarray/bitarray-2.8.3.ebuild
deleted file mode 100644
index f1bfdf5400a9..000000000000
--- a/dev-python/bitarray/bitarray-2.8.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.8.4.ebuild b/dev-python/bitarray/bitarray-2.8.4.ebuild
deleted file mode 100644
index 952aef38021e..000000000000
--- a/dev-python/bitarray/bitarray-2.8.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.8.5.ebuild b/dev-python/bitarray/bitarray-2.8.5.ebuild
index 952aef38021e..f1bfdf5400a9 100644
--- a/dev-python/bitarray/bitarray-2.8.5.ebuild
+++ b/dev-python/bitarray/bitarray-2.8.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index dfcc7d345af1..02c88552d2d7 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,9 +1,7 @@
-DIST cfn-lint-0.83.3.tar.gz 3683221 BLAKE2B 57e3d093eaabb4907cacd9908cadc1268600423e481316dab17da52f50472634e2114ab4069a9f68db440be1a76c4c96db9c53dd6991524bf2cd3699f8e5299b SHA512 6c47fcab3b077ea7ffc7f7fab695f69d2e4a00eb85c2db7889235b0b41b462a92293e538640df190871148ab6f779570385787bed161db0f65efa289b4b4803c
 DIST cfn-lint-0.83.4.tar.gz 3715966 BLAKE2B 5e30c43ae9fec958ef048eeafacb9d05a00732bd79446ef652f9b3d41f9bdd262b35b028c6a20a5f93ec46cc8da0e8adfad5d87129a5d591812a89c4ced0e619 SHA512 d3dc80ec99959c4112a7bd87bcab9f261542f25c4529df9a8e5745901e1dc4a8ca94bdec829f8042a7f94eba6021fe08975e06d4596993a7a319ac861897e2cc
 DIST cfn-lint-0.83.5.tar.gz 3779609 BLAKE2B 7ef8032e53a430fbcd7407b9573956ddd09af02475c0ffc730c6e26cef6eef97ee770b974b5e109ab1759e33b1ec9bd8b17c94a218e0c041bb2b0c53cdd3df32 SHA512 bb27abff9161116fc485301397321922e56a8c0f8382d0d28b82671d754907d0bd80c1c90d03b98b745d90807c8c3f4ebffbb8a78f219b86a489094c2184f17e
 DIST cfn-lint-0.83.6.tar.gz 3851281 BLAKE2B 13a8e84430e89a492b5aba8194f3f8f8b441ed86e25feea9173ffcbee9875eb8dc2ec5e7c8140a77ef2c2cbc2fd074da9e7e39f0cab3f78b9c0bb5fd7d24724f SHA512 42bd700657d7762df06e4f67b73427fa584e6c53779db900f4ce9fe604eb77e49c87d2ebe4daf0b21e0438d4d51d55a2b3e0b23cd435320ac082dd8926a363cd
-EBUILD cfn-lint-0.83.3.ebuild 2065 BLAKE2B b134a28d19b071032a90a829c12cac55244cef9bc58c79caa85fdeb1fea35c3633dbcf8364356cd1f9181694c676ea60b55779253083eae1d51d6107df52694b SHA512 52d6fd15e6797d6a46616ee5ef871cc2442a5370a74e037d29eca0250deeee13dc9a597f5a4ec3843f9a8c2902149c3ea5f2d3e40b60355fbca6e7cc3913586c
-EBUILD cfn-lint-0.83.4.ebuild 2068 BLAKE2B a9ebd8524305333a51042099236084d9f73382fe14b9b5fd588acaf2cdc5fad3e3bea01621f2c0c5889791d260cb6b85a9c1c11e9ac1568a830c0452efe3af37 SHA512 7ac3e54970c3f6f25d471635cb81b1d56957fd6bc384ceabf77d588f74bf9e5a3ff02689806016dba343df6c71a3bd6b68e29481225558302a37ea47800f3e6e
+EBUILD cfn-lint-0.83.4.ebuild 2065 BLAKE2B db3e92ccffda00a5ff05eb2af7cb5888ad99b588c6fdbbe18a115a03d056337e3219958782e3a8abb7744f60d5c663f2833ff6dba287a909df097a19e4e28ee9 SHA512 f3185c8d7a0846a7a39666a55cc5b0ba20c515c0f946344c75a4c91aee58d4056951165de582855f036bc085bb0ade2dbbf8852778a3f2429c811ef1a9f4f7c0
 EBUILD cfn-lint-0.83.5.ebuild 2068 BLAKE2B c241f44b7ecf4658802fef18a1d11f582f4f9cade4b44821da2cded6d86fb745dc23ada51e4d450e6ab2f80153973d13b0569ca73ee9b41dda2451510aaf2936 SHA512 698de497f40fda671b236fb48d60715680fd9d7ddd6ee973977e95c1d45f302da6f6cbad5a2fbc103a9686c1de2f3d7af0388ead0cabee8e41d721ec49f8c7ca
 EBUILD cfn-lint-0.83.6.ebuild 2068 BLAKE2B 8d3e48ccfc857aba8d9c3b63f8b6c2422841e57758de54dd2046b2a9c1aecbf33277d626b17e083fcb8847e44308001ad8450fd2db3bd19eed369452dfb38be8 SHA512 4efdf09bff94cdee00f7480377ee2aa806669e069b6dddf89b868d557cbb090b970974363ca20f621914a7a4767de3473d3096185715246874702463d7d2ab91
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.83.3.ebuild b/dev-python/cfn-lint/cfn-lint-0.83.3.ebuild
deleted file mode 100644
index b88409b2b436..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.83.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.79.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.83.4.ebuild b/dev-python/cfn-lint/cfn-lint-0.83.4.ebuild
index dc2f1b5bd0a8..7d1778d9518f 100644
--- a/dev-python/cfn-lint/cfn-lint-0.83.4.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.83.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.80.0[${PYTHON_USEDEP}]
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 782368d6c308..3b3fdf7520d2 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,9 +1,5 @@
-DIST Chameleon-4.2.0.tar.gz 176515 BLAKE2B 6be07b88e962ca155d390e9f4d5070ca4116993568840c50fd94b0569721983084065bdc2dbebf4d573ff511f41456fc54d40442a505ea891be6eee947b9b690 SHA512 bedbf6bad35370ccb449151098d04e6f8fee917128bcd18a6694ae7df57c15e005c34696c50da43ede2b42d593a2772c55691978982d8a2d83380df29ff7406b
 DIST Chameleon-4.3.0.tar.gz 178781 BLAKE2B 8dfad0c915291a5afb87d10b17ccca00ee26468bb2ddab2bccb36a67451d52727daecb3207923785820702173bd553fa5e8e2af09c89e51cac830917dc77ce66 SHA512 4fc63b7cff2cd41030d8efe32aa723e9245a6c9197faa9be3862c433ce668998ee39adf3b4b59d3b4968341f3af4326fbb61f9c93ee3399d195c1e521525fc52
-DIST Chameleon-4.4.0.tar.gz 179583 BLAKE2B 1290670875011033843be55378ba317097275580a7b1975efe6d3010eadf8501f918c5ba1b70aec6e56bf29b9da8d6c291855e0469de6953a02d451c41d5d099 SHA512 dd9e03037c5bff034d49abe60445d70660b1c3a34af2930b6d655f951d9224e62722b2de82b1b03d587c3a4f96394952b8419d34fff11b3ff2d4733039d02170
 DIST Chameleon-4.4.2.tar.gz 179991 BLAKE2B 240737d20653c5787261fd12aa5e8cc6c6fb8b97498eb5716385bd5960540ff75ea4e109463f12dce060819499d355820830360f397815205f1737b03ce40286 SHA512 5cf5a86981711b2e694f5c47017e39628e8160aaa4020288b3ea87b4212e7fa0694dccae9255f6a2d314fa1e7d2e8fa1994f5587d9c07ced07abcff0361c9f01
-EBUILD chameleon-4.2.0.ebuild 535 BLAKE2B 1ff8de57721aeba3f92e737e81685c2e0118773b81522e7b2f2ad4976f54a3dff07bc2ce385e5f7a13fcf9e0894272309f2409498886991e33a839a4721bb8a8 SHA512 d85cad6a32485d5de2f5250133faff2d2879b6e4ba473f4463005272251a3d53260107f6fe064bd5a58fccf4b5f595b6f6255d7fd29891a11c8eee9c45796fe4
-EBUILD chameleon-4.3.0.ebuild 538 BLAKE2B 347b9da79eb6d6b373941ae26d735f38f62ff5529eac243160925123830dd9dd6b690fe4fbb32f9e67cbcb3d4800b2ddb6883c26d429e98ab83bf300840cabc5 SHA512 97b8b4e7941415a714c46cd9510c1685723488a11280a8d4e844a6928d00daa8b48ca857125cee07be701abe14ecd1017166d5afbfe6c872a6c6fe7aa2d7bdc2
-EBUILD chameleon-4.4.0.ebuild 538 BLAKE2B 347b9da79eb6d6b373941ae26d735f38f62ff5529eac243160925123830dd9dd6b690fe4fbb32f9e67cbcb3d4800b2ddb6883c26d429e98ab83bf300840cabc5 SHA512 97b8b4e7941415a714c46cd9510c1685723488a11280a8d4e844a6928d00daa8b48ca857125cee07be701abe14ecd1017166d5afbfe6c872a6c6fe7aa2d7bdc2
+EBUILD chameleon-4.3.0.ebuild 535 BLAKE2B 1ff8de57721aeba3f92e737e81685c2e0118773b81522e7b2f2ad4976f54a3dff07bc2ce385e5f7a13fcf9e0894272309f2409498886991e33a839a4721bb8a8 SHA512 d85cad6a32485d5de2f5250133faff2d2879b6e4ba473f4463005272251a3d53260107f6fe064bd5a58fccf4b5f595b6f6255d7fd29891a11c8eee9c45796fe4
 EBUILD chameleon-4.4.2.ebuild 538 BLAKE2B 347b9da79eb6d6b373941ae26d735f38f62ff5529eac243160925123830dd9dd6b690fe4fbb32f9e67cbcb3d4800b2ddb6883c26d429e98ab83bf300840cabc5 SHA512 97b8b4e7941415a714c46cd9510c1685723488a11280a8d4e844a6928d00daa8b48ca857125cee07be701abe14ecd1017166d5afbfe6c872a6c6fe7aa2d7bdc2
 MISC metadata.xml 393 BLAKE2B da75a225bf4e4b27bdcfeec93eb41d2e20b2498bd28624d5728bc0aaa915a312376e85252258f7195ef77f4d089b8a94097b5d5762472e8a686df8e8901c7d15 SHA512 715ba1cb0190a925747a0c8d5529aa5e61202fba701cb2238ebe16643607918560373d34079e7ccd3e097e988b1ce2f6e6bf5eb3d090fd3f384bc7e651cb331c
diff --git a/dev-python/chameleon/chameleon-4.2.0.ebuild b/dev-python/chameleon/chameleon-4.2.0.ebuild
deleted file mode 100644
index f0d3ee3e731e..000000000000
--- a/dev-python/chameleon/chameleon-4.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fast HTML/XML template compiler for Python"
-HOMEPAGE="
-	https://github.com/malthe/chameleon/
-	https://pypi.org/project/Chameleon/
-"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd src || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/chameleon/chameleon-4.3.0.ebuild b/dev-python/chameleon/chameleon-4.3.0.ebuild
index 23c5ee01b8d3..f0d3ee3e731e 100644
--- a/dev-python/chameleon/chameleon-4.3.0.ebuild
+++ b/dev-python/chameleon/chameleon-4.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/chameleon/chameleon-4.4.0.ebuild b/dev-python/chameleon/chameleon-4.4.0.ebuild
deleted file mode 100644
index 23c5ee01b8d3..000000000000
--- a/dev-python/chameleon/chameleon-4.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fast HTML/XML template compiler for Python"
-HOMEPAGE="
-	https://github.com/malthe/chameleon/
-	https://pypi.org/project/Chameleon/
-"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd src || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
index 7fe0ee5025d3..1898e40b5aca 100644
--- a/dev-python/colorlog/Manifest
+++ b/dev-python/colorlog/Manifest
@@ -1,6 +1,3 @@
-AUX colorlog-6.7.0-nocolor.patch 1066 BLAKE2B ea43721681af7de1cc95ee931d0b111a23327e8ef6684c2f08f3f6b56be54ffb2c1ffa54c2fdc297ec4183ea574e805636f432f4d76d84ee82d7eee9b95d2f21 SHA512 a001bd56036c62091c54b171f1bd0961fa51b33f7db091c1f0d409ab02b0c1d86f77011228a4f2016c277dafe8357fb5de992929276e3088fa60bc833ec9fa51
-DIST colorlog-6.7.0.tar.gz 29920 BLAKE2B b4240f3fd17b17ead968293e54d5f4e589515d333a6cdf157a6d913c7457deff67d320ee87270ce05b853616134901c8ac47c4a542ef74158e1174d92de00b3c SHA512 19b3c04beb8ac26d3db69f78bc1e7db40288c95ba7edc7c1d2495d592262dea9a1bf91e42dce0e575341eb2a572f0050866970f23d3be8c5adae518c4115787d
 DIST colorlog-6.8.0.tar.gz 29939 BLAKE2B fd260f0c4149283a008d0902962848c579500f24937c2ae7a0ef75f6f10552f9739c5c1dce9553e264617f6662a9d3c8c31943d6690a4769abfa550dc4862f76 SHA512 a16752be362ed1ed5104e54d872d847873b9bc9138d59a8e525e32b386c8824c7a21689c354517392de6f16035601ce0f30daebc32d08b911c18ca4004292e02
-EBUILD colorlog-6.7.0.ebuild 488 BLAKE2B cf562e70eafce89ef2be920e0bb1857630f69a7e79d538d96c30c4e040310b29e762ff70a5e9bf0429537ddd7f7fc4c0bec5031653940695df91830edfbbc6dc SHA512 1828302f9124a274490144be8555798d2abee64c209e0ebb9644aa0ea8585262a8cc50c36384555d50178cc3285f344fad2857384ab8b33630a111c6b3c27984
-EBUILD colorlog-6.8.0.ebuild 444 BLAKE2B 494eb45ccd57acd0c1166bca06c0aac160dafea471823ae425a9fd1d1d6906df56f73efda23d0612a6ca2a8bddf260a475b1d93564748f9f94f5c15b52cd8193 SHA512 a00402240eed74587887ddfa4699bfa8b0c6594fb4f1f44043515dab51c788b6472714e52a7105f29794ec926889ce871059f7ef2bd1798477a5c3b0be4ae169
+EBUILD colorlog-6.8.0.ebuild 441 BLAKE2B 3725b484c2b826d892270a20d452aad22e1d4924a8b2abada00c4d921a2ac287841b0e30ebe7cc79aad28ececfbdc81ed5beb445c160a0d3bd13b0cab63aa905 SHA512 4037370c350ca4ec1002376881691be8f03d21a0ed834c913786a316936737e0cf9723ac9fe4e9230a8299c0bbebbc116a7743cb7834b938fd0c1402bc9f6533
 MISC metadata.xml 415 BLAKE2B 4b7aecb1bfde4142a6d3f090e5aa93245e98a5ad63238e141666d1b4ea621a8cde4a9b642b44ff8792fa3bea6d50107b084bf07f9eeb41074f34746be934c0f0 SHA512 66bb051d87b620dc5f04dfacb5abc9a67b87bc28f9cb60f99ace58731c8e23576d061bc16a84942d4c69eb04563a3effa7a21f10392e58256bc73e3414ae798d
diff --git a/dev-python/colorlog/colorlog-6.7.0.ebuild b/dev-python/colorlog/colorlog-6.7.0.ebuild
deleted file mode 100644
index fd1f5d028ae7..000000000000
--- a/dev-python/colorlog/colorlog-6.7.0.ebuild
+++ /dev/null
@@ -1,25 +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_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Log formatting with colors"
-HOMEPAGE="
-	https://pypi.org/project/colorlog/
-	https://github.com/borntyping/python-colorlog/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${P}-nocolor.patch"
-)
diff --git a/dev-python/colorlog/colorlog-6.8.0.ebuild b/dev-python/colorlog/colorlog-6.8.0.ebuild
index a3daf1fc155f..b9b986dad330 100644
--- a/dev-python/colorlog/colorlog-6.8.0.ebuild
+++ b/dev-python/colorlog/colorlog-6.8.0.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/colorlog/files/colorlog-6.7.0-nocolor.patch b/dev-python/colorlog/files/colorlog-6.7.0-nocolor.patch
deleted file mode 100644
index cbd799a2f0d7..000000000000
--- a/dev-python/colorlog/files/colorlog-6.7.0-nocolor.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4babdb5f18bd4799c25d61f0f7937b5e164770cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 24 Nov 2023 16:45:42 +0100
-Subject: [PATCH] Fix running tests in environment with NO_COLOR=1
-
-Fix running the test suite when pytest is run with NO_COLOR=1 set
-in the environment.  An fixture is autoused to ensure that the variables
-are removed for the scope of the test, while they are respected
-e.g. by pytest itself.
----
- colorlog/tests/conftest.py | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/colorlog/tests/conftest.py b/colorlog/tests/conftest.py
-index 65fd6d4..33e23e6 100644
---- a/colorlog/tests/conftest.py
-+++ b/colorlog/tests/conftest.py
-@@ -28,6 +28,13 @@ def assert_log_message(capsys, log_function, message, *args):
-     return err
- 
- 
-+@pytest.fixture(autouse=True)
-+def clean_env(monkeypatch):
-+    monkeypatch.delenv("FORCE_COLOR", raising=False)
-+    monkeypatch.delenv("NO_COLOR", raising=False)
-+    yield
-+
-+
- @pytest.fixture()
- def reset_loggers():
-     logging.root.handlers = list()
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 98f224a2e0af..8e362acd8e99 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,7 +1,5 @@
-DIST dask-2023.11.0.gh.tar.gz 8559592 BLAKE2B 3d9e2d049c4ef3a880caef56298dfe76033a79d60424554f9122e68354bd2be2c6c0aae3b833c84d5704c45167b050c65227a0b799a5131600a1417a09bd4d1f SHA512 1ebac9c9fb158682dc5063710fd11ccbe0f584cea26afad4b3fe01001f3f7d6888ddbb7653cfdaf2da4ca7acb2b88bc7b1d8b4055790e7036b419ae995346e8f
 DIST dask-2023.12.0.gh.tar.gz 8576162 BLAKE2B 2e7764a0f2181daf96b175f5d4ad473f126df88614f00d434f74a9f291c6f654ba4a0961ae95737164b5cfda88755fe5734bdaed4821a4d88df4780544bad14f SHA512 879d8a83f5659387bdfd425a68128b72745e693e9904164cfa2ff249682539d9051f5c19bcdf230cf3415b0f2253683dd6b286083be05124b2b5a900c9307104
 DIST dask-2023.12.1.gh.tar.gz 8967874 BLAKE2B f397512fb50a53719fff8e234db0e366b17c9abaca4b98c0b1d4a98287dec7f869612e688cfa2e717fc35c4ed1f7a8d8fe74c7dec939e8f669e6790490005370 SHA512 4a90239e83e7cbd4797ee91dc9609d7322a7003b976ed3309de95b47d20e2e9f449cea803618539c5f80ec552dd2ac71e55c87c024beeabf74062beeb3260292
-EBUILD dask-2023.11.0.ebuild 2919 BLAKE2B cd51b4e720364d272bb0d2aa517927a77f36b5497bf29eb89f5dd6328515e600016d2ae3360cfe501d30e17b5764fb0bcc5bd52cb7f1c5e134957ebf251f1cfa SHA512 4574641ebc2eb7bbc0a1bc162e7597b0902e9f20ad485a33316d5d0f48f4242a8c55acbb96fcdffac2c55f131663f386b863d3b04ee30d2191dcda47305970e5
-EBUILD dask-2023.12.0.ebuild 2921 BLAKE2B 97b64f7860fa1cac94fed4decd263f843de3b0a520f26fda0d123c27e7105d042b6017802a298379838568f235f3e432e7ce2fd98b4ba514bd1d7f3020ae6a1b SHA512 8fd59868f8858334bb4efb7e67282575cb10bcd7fe5d67f7e8231ddea51e70132655461fc97a1245e5f57c3bc8956122c3304a12f011936c92a00bf3c902d88c
+EBUILD dask-2023.12.0.ebuild 2919 BLAKE2B cd51b4e720364d272bb0d2aa517927a77f36b5497bf29eb89f5dd6328515e600016d2ae3360cfe501d30e17b5764fb0bcc5bd52cb7f1c5e134957ebf251f1cfa SHA512 4574641ebc2eb7bbc0a1bc162e7597b0902e9f20ad485a33316d5d0f48f4242a8c55acbb96fcdffac2c55f131663f386b863d3b04ee30d2191dcda47305970e5
 EBUILD dask-2023.12.1.ebuild 2921 BLAKE2B 97b64f7860fa1cac94fed4decd263f843de3b0a520f26fda0d123c27e7105d042b6017802a298379838568f235f3e432e7ce2fd98b4ba514bd1d7f3020ae6a1b SHA512 8fd59868f8858334bb4efb7e67282575cb10bcd7fe5d67f7e8231ddea51e70132655461fc97a1245e5f57c3bc8956122c3304a12f011936c92a00bf3c902d88c
 MISC metadata.xml 724 BLAKE2B 9af7553cec2b66228a21f146372d86b8d620048d68f94c1fd09006c8ee7ddaa4e212c2a359b937a5ee37ac23df01e10af0796e8b4cf952237cb4c73a2dff7ca0 SHA512 89b83402c13b06f7adf10cd1cc08b96b90dbc2ca3b5c0c6c422b6e2394e03fd51346306479557c11fcfdbd4a81a574890f2367228ea38531b5f05c02a30b8dcb
diff --git a/dev-python/dask/dask-2023.11.0.ebuild b/dev-python/dask/dask-2023.11.0.ebuild
deleted file mode 100644
index 1fa97a3f32d4..000000000000
--- a/dev-python/dask/dask-2023.11.0.ebuild
+++ /dev/null
@@ -1,89 +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 multiprocessing
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="
-	https://www.dask.org/
-	https://github.com/dask/dask/
-	https://pypi.org/project/dask/
-"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/click-8.1[${PYTHON_USEDEP}]
-	>=dev-python/cloudpickle-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-2021.9.0[${PYTHON_USEDEP}]
-	>=dev-python/importlib-metadata-4.13.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-1.2.0[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	>=dev-python/versioneer-0.28[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# fails with sqlalchemy-2.0, even though we don't use it x_x
-	sed -i -e '/RemovedIn20Warning/d' pyproject.toml || die
-	sed -i -e 's:--cov-config=pyproject.toml::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# more tests relying on -Werror
-		"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
-		dask/array/tests/test_random.py::test_RandomState_only_funcs
-		# TODO
-		dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
-		dask/tests/test_config.py::test__get_paths
-		dask/array/tests/test_linalg.py::test_solve_assume_a
-		"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
-		"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
-		dask/array/tests/test_image.py::test_preprocess
-		dask/tests/test_system.py::test_cpu_count_cgroups_v2
-		# require sqlalchemy<2.0
-		dask/dataframe/io/tests/test_sql.py
-		# crashes
-		dask/tests/test_base.py::test_tokenize_object_with_recursion_error
-	)
-
-	if ! has_version -b "dev-python/pyarrow[parquet,${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			# fails if pyarrow is installed without USE=parquet
-			# (optional dep, skipped if it's not installed at all)
-			dask/dataframe/io/tests/test_parquet.py::test_pyarrow_filter_divisions
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_rerunfailures -m "not network" \
-		-p xdist -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/dask/dask-2023.12.0.ebuild b/dev-python/dask/dask-2023.12.0.ebuild
index e2f5047c0cef..1fa97a3f32d4 100644
--- a/dev-python/dask/dask-2023.12.0.ebuild
+++ b/dev-python/dask/dask-2023.12.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/click-8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/django-cache-url/Manifest b/dev-python/django-cache-url/Manifest
index 1f3a3cc9c8b9..2688c62f9d1c 100644
--- a/dev-python/django-cache-url/Manifest
+++ b/dev-python/django-cache-url/Manifest
@@ -1,5 +1,3 @@
-DIST django-cache-url-3.4.4.gh.tar.gz 8671 BLAKE2B 5245e87b786470e45ca1e30a39337904577889b15d644fbef94f55e861de7d2bb8b6725b6e62c58424511fb3f81093a6d3107cc1a8f8dc575e5463d6ab2e6c13 SHA512 745fddec8546c4ad4b70d7a039e0954f1c99cb91766a10185b29804cd69560a3dd64f90a85bb1a9ae029d34038944b288b4c497ad15492791121ea9c61fd6ae5
 DIST django-cache-url-3.4.5.gh.tar.gz 8761 BLAKE2B 44cfa956f33848dd7947a97b390ba792d44eb1fd42b4c33ae57e3575405c40d93be4716c9b990e20a482b4398ed69ff838993e30ae0bdecb5a33c3fd7685a6e6 SHA512 532f47f6c8d8150d3ec484e533b165430ee6fd9854ed1b0404b68f8acaf388bfa2fb9beba8349d56e1e9d00dd65065425fdbeeed5eb698d9a745f8293f8d93ee
-EBUILD django-cache-url-3.4.4.ebuild 772 BLAKE2B 9a4b9d3f83a77cddef82a1421e2e57c44aa52c90f69ab3e5c69089022da7761ecc13d14ed0c4381973e69d9d153a67ff9b63f023e658976573ef0308394309e9 SHA512 ca6a7aef8a41ea7d23319c7fa27025b3a91b57a8c0909b354494c6ffad4efc81a970394eebfa6243974413afb91856c554be5eb8510f61fa468893a8faff2274
-EBUILD django-cache-url-3.4.5.ebuild 776 BLAKE2B 7c447fbbe864995a3c58ed00abc223e3f25a7dbd1b3caaa19ac9e77c64c4694c9ec8dc8988a05602b6e19818abc62124bb8f653825cb42a74658e08a8cdbae49 SHA512 4afb8dcd954fa1198135bd177c3e56bda1070295b2b3bd14bab69d85c17e6d20cdc35bc2db9bb9314f99fec76d5e3a04120453cf70f7e44852b35a8e2d03323e
+EBUILD django-cache-url-3.4.5.ebuild 772 BLAKE2B 9a4b9d3f83a77cddef82a1421e2e57c44aa52c90f69ab3e5c69089022da7761ecc13d14ed0c4381973e69d9d153a67ff9b63f023e658976573ef0308394309e9 SHA512 ca6a7aef8a41ea7d23319c7fa27025b3a91b57a8c0909b354494c6ffad4efc81a970394eebfa6243974413afb91856c554be5eb8510f61fa468893a8faff2274
 MISC metadata.xml 515 BLAKE2B 0933720797d254031a1a8b134cbede61196f6f6bba8e09decb144c0db328e42faab7cbd3015dcc682711ce45cfe3466fb4c4ffa65bb18305be06937460e61822 SHA512 d6be30d34de3601f3c364094d23a3d322e3fed2f3badf28f132cc6464996bf7bda32cf970b397997554649232d72af747ebc1d4f4815397a6a32e2008438d18f
diff --git a/dev-python/django-cache-url/django-cache-url-3.4.4.ebuild b/dev-python/django-cache-url/django-cache-url-3.4.4.ebuild
deleted file mode 100644
index e359f123a75f..000000000000
--- a/dev-python/django-cache-url/django-cache-url-3.4.4.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Use Cache URLs in your Django application"
-HOMEPAGE="
-	https://github.com/epicserve/django-cache-url/
-	https://pypi.org/project/django-cache-url/
-"
-SRC_URI="
-	https://github.com/epicserve/django-cache-url/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]
-"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e '/--cov/d' -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/django-cache-url/django-cache-url-3.4.5.ebuild b/dev-python/django-cache-url/django-cache-url-3.4.5.ebuild
index 0d8255cd5243..e359f123a75f 100644
--- a/dev-python/django-cache-url/django-cache-url-3.4.5.ebuild
+++ b/dev-python/django-cache-url/django-cache-url-3.4.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/django[${PYTHON_USEDEP}]
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 4fae8c10634b..2c99e5acbdf1 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,3 +1,5 @@
 DIST dogpile.cache-1.2.2.tar.gz 263102 BLAKE2B ccd64492e154f30b27a9b031086acd89002c9cae402105720022370688c6343c6c7a023fc643390764a40dfa9dde083e5adaf644aa79939c0bf6573c4c518366 SHA512 23b078b79e4b1f87c8d397d35b772f0b5fee66a0e452de06e7644ecb1ef577ae1629307a0e32fa62f49d536f95fb62fe70ededeb43647fa0c2e0baf896261931
+DIST dogpile.cache-1.3.0.tar.gz 265984 BLAKE2B 80aba607dad31b1ddb4e8b706f40c2ed47c7c2a4f074b7d115737ed934ed2b97c900e8ff5f01fa52c3177ebd364d4bac585cca4dd1d6aa5830cf42cdade52070 SHA512 fb00e114b2107d4ee27d699c62581554758f9ff2121ccade8f5c5aee5240adc0c6a1ae734f5d64b06f25493bfe19c40cffe1393d361be484433baaec74791b5a
 EBUILD dogpile-cache-1.2.2.ebuild 799 BLAKE2B 4d80e8e2fb3f6b2ec5c153f42f7f9ecfb1e9295020d9c1febfb5505d1ed83154fc8cc26b233f95f863940f94475d59ad4fca1c0ea6846ef2dfcee24d45f37628 SHA512 51b09510c6d43a48c751b2c29bd2cb10325e5ddc7fb702e8aab381c022ba1e8544f63e7e01b7366656c232b793c8f0e808e6b8e41acb40714f590b184cd7bb1a
+EBUILD dogpile-cache-1.3.0.ebuild 802 BLAKE2B 2b249b45461346d7816fd44b12fe9681c29c4045dedb762bbc7266392d329d9ed7ca87f478213e5db0f1f8b97ff3673a31f8d3bbaea95bb5636262b22a23ab9e SHA512 b02725c85788a63d245756472ddf0f5d6b9b8751b7695738d5da83cd2069c7e30f2dca15ce14981d8f3689392c70868dd38ab73e99812895ac7e1262e2aa7de8
 MISC metadata.xml 843 BLAKE2B e0b6ed26300c658bb3f9bdc500bd24c38f26821d3a32ce448c56e5fd129f211efd58ef0faab1a6a9114a96991514de5fb9cf53b26601cb68fedb4c43aab3cdb2 SHA512 992ae84d983cbc06969e888e298cf8124dcf6068871bd5e12dd479a70ca00f5422d8c3cc178a842a340bffc5f72a5b203ce307ccbe49a0a60c0c52a5091052d9
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.3.0.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.3.0.ebuild
new file mode 100644
index 000000000000..24f2c8fe8b23
--- /dev/null
+++ b/dev-python/dogpile-cache/dogpile-cache-1.3.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A locking API for expiring values while a single thread generates a new value"
+HOMEPAGE="
+	https://github.com/sqlalchemy/dogpile.cache/
+	https://pypi.org/project/dogpile.cache/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 2cd71e928dda..ce1adb21be36 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,5 +1,3 @@
-DIST dulwich-0.21.6.tar.gz 445545 BLAKE2B a3189b4777e295bf26345172fa1c4f6ca4c45e807a9197cd2bc8c0255a9ebb7fa752bc98369ffe780671dc9610fefb1fc4bd9b6b75d90b7322d048197da0aeaa SHA512 24f1d82be08b6ee78e41cd86ec2323a51dd6bff3714b1eae1f8484eda316c9d1c8089ded853511d587898ba789d36ee014c8f3b7c718bf7168519725f4d9dc2c
 DIST dulwich-0.21.7.tar.gz 448028 BLAKE2B 8ceace901ce4b444d6f40f7071b7a95a04d27a63b9076fd82c97b7fb551dd769c38940d0ec42ebfd6592154df912139f0ca58801ba2fa0ef412d6a749253500a SHA512 56ddf8db21088b264623c568f28caa80d8687d26e5127093daaa4d556b0f49218ac51491a47ced00e9af073bd7ca05b2eb8b29d64aae8b93dd4bd47ca67ee443
-EBUILD dulwich-0.21.6-r1.ebuild 1400 BLAKE2B 865c569df71b2a3df33b3e4d5e32411730d635d7293ec2430a1b4ff9b7a4f2f14e323f19f23204226403d60b8b2d3e5d099be56142231a4190c8eae754705399 SHA512 3d4f0b94b12232eb35472cce12c32adfbf5bbe9f0ca3b02e5da6678a282e2234f92608da94acb731141633897c9c146ebeefeddf19a2857acc1a645e6ec45982
-EBUILD dulwich-0.21.7.ebuild 1404 BLAKE2B dd0a82d5efdf5c822573a51f9123ba861f8ae512cb9adc28d6007d1990c65099ade7ead4dbf666aa11e30de926bf765bc60777443cd3d4235b63cbdf2b2b43bc SHA512 1ee507e29393fa9ce6ceeccc9bf817547e76c61f389bd390eda12ffb902725d1b704cb0304d1988e3393bc67b0ce1370e01590a8b56ebe06fd975f5481540bb5
+EBUILD dulwich-0.21.7.ebuild 1400 BLAKE2B 865c569df71b2a3df33b3e4d5e32411730d635d7293ec2430a1b4ff9b7a4f2f14e323f19f23204226403d60b8b2d3e5d099be56142231a4190c8eae754705399 SHA512 3d4f0b94b12232eb35472cce12c32adfbf5bbe9f0ca3b02e5da6678a282e2234f92608da94acb731141633897c9c146ebeefeddf19a2857acc1a645e6ec45982
 MISC metadata.xml 556 BLAKE2B 240554ff522160e9508bf6debadafcc44b5ccc4074dd4c9d3ce82358963084c60a1afae9fafee6ab1e6e5d898940ccb4d1b524cebff155e61bf6707c9396b647 SHA512 a7cdca224a01d5bd26bf4a5adb0273977ddff61f75cd02f5642132656fd0c6608114617efcb068d834f107804666cf4fb3725967e804b73d2ddcb67342dc30de
diff --git a/dev-python/dulwich/dulwich-0.21.6-r1.ebuild b/dev-python/dulwich/dulwich-0.21.6-r1.ebuild
deleted file mode 100644
index 5ddf377dafa2..000000000000
--- a/dev-python/dulwich/dulwich-0.21.6-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/jelmer/dulwich/
-	https://pypi.org/project/dulwich/
-"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/urllib3-1.25[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		app-crypt/gpgme[python,${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
-	unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE
-	unset EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.21.7.ebuild b/dev-python/dulwich/dulwich-0.21.7.ebuild
index 994b7cf3899b..5ddf377dafa2 100644
--- a/dev-python/dulwich/dulwich-0.21.7.ebuild
+++ b/dev-python/dulwich/dulwich-0.21.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index f5947807d369..5045b327fd3b 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,10 +1,5 @@
-AUX freezegun-1.1.0-py310.patch 1056 BLAKE2B f1ffc2ed1d03d014c5d2e7c5ac41f75c62763e325fcb6004ac835336a461df7edbedb55278b2583a4153057a018ab16f4618f85be7e394886e1faf6de97cc7c4 SHA512 cd23ff28e9b05674ae58b7d8086d16be14277ec932628731ef7ae6c6149a0ac2ce32f75f18d6ec6f6dca4770fa9c0d225e02f2b680a6f71f131f9bcbdec6ac8a
-DIST freezegun-1.2.2.tar.gz 30670 BLAKE2B 88941ccd9694c842e4999da47e1a8fbe9b82c1fa512467de174715e627c213167cf3c7f943b35d039ff118bae9d1bca4b64ceaa5683db818727cd9ad2533a827 SHA512 c6dc3da66a2d3063f819a104b6bc98eb3d4b772b8edb06bde130a6e355d96e1861e650c44eb691be892223150a652a528fda4237bd77b1bdcee1fcfad74f307c
-DIST freezegun-1.3.0.tar.gz 31165 BLAKE2B 69341b4b7fe52e0aa2ad7c70e6a1b9e4bcb5cdac88ac48e85a968b2159260a9aee4196fc9622a153d1d5ebfee3b081f568b01a5cd59ff388e7bf5a6900bb45f6 SHA512 a0de4f2827696ea0bc1e5ff89aae9dfc36e013e03212bc7d8c3a93addb55e408fe03744fb0638d5ca0758322e2f3e0acb503fbdecfa14dd128d0399c9a60edf1
 DIST freezegun-1.3.1.tar.gz 31535 BLAKE2B 5601f7359668dac186b8d76d203b7b5844af3f3171133fe25eba3182793dd68eeb14a1485d42ab50da316bf710e42d9fb4b6ebfc7afe9f86e6f4e5f3354997e8 SHA512 7524c85ad4d49fdf86d132085845ec9c67d06600cfa25e0d650cc0a565d1830f9f83315930fd6516ae924c2395721473a04c1ecfeb1735ee31e894370267ef95
 DIST freezegun-1.4.0.tar.gz 31748 BLAKE2B a7ea433ea8e5f0137fc5d88a5375e3fc0e2f307a04684ab5b844168ed214fd9dd1d1ed2a0e0c91ed20ee1fc32c8e3e75fb9dc73de64723efe881e843a38269a1 SHA512 bbdad19b7fc2da9a2851d6b4c14427ccda1f2e06617993cf7173ded65cced9b98d36e1da05a2718b70653a69986cd81d84317003271eda2075177ccf63495b7a
-EBUILD freezegun-1.2.2.ebuild 833 BLAKE2B 2856aeefc1a88854ab6465e69b44be68ef0ba11488ebd66d5c84948a9ae15edb3c107b4c0513bdf6c594d14df5a0a36faeb3f5449829b34009fc30e19fab7ca4 SHA512 8c654d9d69a86286b79a6db246e0484aa9bc267c0607398ad6e4ee5adf52932c3170707aa3b1996b520bef17e7446992a65d2b12a26028a6d7c38417813a07bd
-EBUILD freezegun-1.3.0.ebuild 762 BLAKE2B 330faec028e1be22e3d00d723192d0ae60b51301406188ce82ffda6e0a456fafb47af08d594f1f8e84c204b3b61107821807a0e7ad467776e198034886425fca SHA512 9715f5e7a04b3b46bc72960411a197d7c1872415a85ae181581aa7d6057482df8436af5cebeb6112320e1adcbdbb71bb7943f7e7ae8218a40eeb7cd126bb725b
-EBUILD freezegun-1.3.1.ebuild 762 BLAKE2B 330faec028e1be22e3d00d723192d0ae60b51301406188ce82ffda6e0a456fafb47af08d594f1f8e84c204b3b61107821807a0e7ad467776e198034886425fca SHA512 9715f5e7a04b3b46bc72960411a197d7c1872415a85ae181581aa7d6057482df8436af5cebeb6112320e1adcbdbb71bb7943f7e7ae8218a40eeb7cd126bb725b
+EBUILD freezegun-1.3.1.ebuild 754 BLAKE2B 5bed854cca265235d5e73b341faf3c68ce4778c94b251a483a329fd75e550b19f923318d221fc2ecad69bed996596c063d3960e9fa4d6e3d1086c64732a22de3 SHA512 0be5e6bebc54dd673536abfb484577e0f8ea296c378042527a4aae44da689b0c565d3b4d4ec7cea7dec2cba74f346d18433d3b4ac08a7833384bbec3b0356270
 EBUILD freezegun-1.4.0.ebuild 762 BLAKE2B 330faec028e1be22e3d00d723192d0ae60b51301406188ce82ffda6e0a456fafb47af08d594f1f8e84c204b3b61107821807a0e7ad467776e198034886425fca SHA512 9715f5e7a04b3b46bc72960411a197d7c1872415a85ae181581aa7d6057482df8436af5cebeb6112320e1adcbdbb71bb7943f7e7ae8218a40eeb7cd126bb725b
 MISC metadata.xml 393 BLAKE2B b2cf7947fff6a03fba00b03503693e0ecb16b4934602ba66225f1d339db131975cea5f503b4b18fac54b38853905d21a1e56b5250674bc6d8cc0fe3e7d37403c SHA512 6bc2d99fc1d7c5c0a259424423f45fdd6bf23ae09c1f42bb5ab777fcefe4b1915cea96b1c767b7e048770b1c5ab9f2b0947fca4438838a4ee20f072f974c0a80
diff --git a/dev-python/freezegun/files/freezegun-1.1.0-py310.patch b/dev-python/freezegun/files/freezegun-1.1.0-py310.patch
deleted file mode 100644
index 41bd7bc2712b..000000000000
--- a/dev-python/freezegun/files/freezegun-1.1.0-py310.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 57d024e4ce2516c55c715448296b9099db68343c Mon Sep 17 00:00:00 2001
-From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
-Date: Fri, 7 May 2021 15:51:33 +0000
-Subject: [PATCH] Fix decorate_class for Python 3.10 where staticmethod is
- callable.
-
-(edited by mgorny for more readable indent)
----
- freezegun/api.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/freezegun/api.py b/freezegun/api.py
-index cab9ebe..eb3a931 100644
---- a/freezegun/api.py
-+++ b/freezegun/api.py
-@@ -598,7 +598,10 @@ class _freeze_time(object):
-                         continue
-                     seen.add(attr)
- 
--                    if not callable(attr_value) or inspect.isclass(attr_value):
-+                    # staticmethods are callable from Python 3.10 . Hence skip them from decoration
-+                    if (not callable(attr_value)
-+                            or inspect.isclass(attr_value)
-+                            or isinstance(attr_value, staticmethod)):
-                         continue
- 
-                     try:
--- 
-2.31.1
-
diff --git a/dev-python/freezegun/freezegun-1.2.2.ebuild b/dev-python/freezegun/freezegun-1.2.2.ebuild
deleted file mode 100644
index a22769775121..000000000000
--- a/dev-python/freezegun/freezegun-1.2.2.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_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Let your Python tests travel through time"
-HOMEPAGE="
-	https://github.com/spulec/freezegun/
-	https://pypi.org/project/freezegun/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/spulec/freezegun/issues/396
-	# https://github.com/spulec/freezegun/pull/397
-	"${FILESDIR}"/${PN}-1.1.0-py310.patch
-)
diff --git a/dev-python/freezegun/freezegun-1.3.0.ebuild b/dev-python/freezegun/freezegun-1.3.0.ebuild
deleted file mode 100644
index 52f4b81dc5b8..000000000000
--- a/dev-python/freezegun/freezegun-1.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Let your Python tests travel through time"
-HOMEPAGE="
-	https://github.com/spulec/freezegun/
-	https://pypi.org/project/freezegun/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/freezegun/freezegun-1.3.1.ebuild b/dev-python/freezegun/freezegun-1.3.1.ebuild
index 52f4b81dc5b8..c3d861bb56db 100644
--- a/dev-python/freezegun/freezegun-1.3.1.ebuild
+++ b/dev-python/freezegun/freezegun-1.3.1.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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index c196e2d8ad50..b8998304e00e 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,9 +1,5 @@
-DIST filesystem_spec-2023.10.0.gh.tar.gz 404845 BLAKE2B 6c8cf801664c9fc848cb55660db1725c90facf534d58e49f604b2051d1b6a78d13d8f083282071beb7ab3dcb8d75f6d52fe24ce744c5cf1808b4ae3cb673998d SHA512 cb449052208516930c73dbe1de7c495d252677a3d3d85267836224d79c1b8cf9449ebdba8287f6f6206d5a8e631a99cd81c2fb62b82288a626a202876a45139c
-DIST filesystem_spec-2023.12.0.gh.tar.gz 408457 BLAKE2B d46383ff22124b714b58264e203a12fad13ee17fb8124d949c107546cceaf2713d52e1e33e0a9d63017695681ab9e8dfb86f85da809675fba7b1838f3a12a486 SHA512 87bdd147cfddaf971af6c0c34dafb47b6d1782c7a0eb2ec7fbcbf01f6d01b59ecea98b9bf75461827e9e1070f78346b53e753673838e1db505d33f9fa8d59349
 DIST filesystem_spec-2023.12.1.gh.tar.gz 408506 BLAKE2B 8f07efccd294049e27b44154c5f4680db968c9ba7c3a36bdb4aa6d140bc615061c10c53d2109f90e0b6af3338cb9284acdfed867fc57172a4bee07fcc95d450e SHA512 aeaa3f8ba512ca99488fe43b1c63a04d8b2d1b70a537142f3fa4437f608a702a26c25eb60788eb69cc310123801beb510cc485eca0754e39f0e5daa76f059a24
 DIST filesystem_spec-2023.12.2.gh.tar.gz 409321 BLAKE2B f074d8d3277a954bebc29bca663d142763a6b9f13edb43286b1f59aff125c9eec0ae18cfa44b99a35daca7a9bf89a627c9abe57cbebe713ac494ca98f61899eb SHA512 654ff72b9c5ca648d4a4b469b4f3706b3200f023e26b657e3200dee301469da6f67c93fcfaa82edae7c7b074fe77715d0093269a38ee68416cf8491203bde5cb
-EBUILD fsspec-2023.10.0.ebuild 1705 BLAKE2B e973ab1cffa2674bebca185d533bb02264853ccb60021560eba7e2418d14f7139c0e26df4dbe5e421a6316b0b8ee167c8e228097684d2fe175f0ea1d650d7dff SHA512 4ab7c5e014719cdd1a5200ee40c0706ba03d9aaf8dd639cf9c5f438ac4c29ea2c96fd93b106a5f93fc196c12e56940460fa9a9c7a7407ba687fca73058345343
-EBUILD fsspec-2023.12.0.ebuild 1708 BLAKE2B 43726784283ca374e767b17e8a0a7af4ead8d161aa0a7f5c56af859eea7d3bb36c0c75d39e2ef4a59846e44d97354ac74d0cea0af7f705f38cd6e8dafe037bd1 SHA512 9c8501b00e7d150200a6540492f98d24f7ca02f389eb7516294984df50c39c065bad75957907c45f2fd156f4568046f33f317b5909032ff736b12f1862a70d43
-EBUILD fsspec-2023.12.1.ebuild 1708 BLAKE2B 43726784283ca374e767b17e8a0a7af4ead8d161aa0a7f5c56af859eea7d3bb36c0c75d39e2ef4a59846e44d97354ac74d0cea0af7f705f38cd6e8dafe037bd1 SHA512 9c8501b00e7d150200a6540492f98d24f7ca02f389eb7516294984df50c39c065bad75957907c45f2fd156f4568046f33f317b5909032ff736b12f1862a70d43
+EBUILD fsspec-2023.12.1.ebuild 1705 BLAKE2B e973ab1cffa2674bebca185d533bb02264853ccb60021560eba7e2418d14f7139c0e26df4dbe5e421a6316b0b8ee167c8e228097684d2fe175f0ea1d650d7dff SHA512 4ab7c5e014719cdd1a5200ee40c0706ba03d9aaf8dd639cf9c5f438ac4c29ea2c96fd93b106a5f93fc196c12e56940460fa9a9c7a7407ba687fca73058345343
 EBUILD fsspec-2023.12.2.ebuild 1708 BLAKE2B 43726784283ca374e767b17e8a0a7af4ead8d161aa0a7f5c56af859eea7d3bb36c0c75d39e2ef4a59846e44d97354ac74d0cea0af7f705f38cd6e8dafe037bd1 SHA512 9c8501b00e7d150200a6540492f98d24f7ca02f389eb7516294984df50c39c065bad75957907c45f2fd156f4568046f33f317b5909032ff736b12f1862a70d43
 MISC metadata.xml 374 BLAKE2B 6c0b18a0ad3b85713ae6f618ac0646ed63f08549bd7d1ed5bd94b80d89d79efaf2f97ce913a0a7d6e54e77cc602994416520a22deadcc71e484cf7ca22bc6dde SHA512 5bf051387d6bcffb3022d023f60ee8f76ca277bb8d626dda988a0baaf1d1e3a71e872d8316607ee7e269e579b5a17c23ab93c56fade533150171d3ce44e4bb71
diff --git a/dev-python/fsspec/fsspec-2023.10.0.ebuild b/dev-python/fsspec/fsspec-2023.10.0.ebuild
deleted file mode 100644
index 397fa9af6b6b..000000000000
--- a/dev-python/fsspec/fsspec-2023.10.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=filesystem_spec-${PV}
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="
-	https://github.com/fsspec/filesystem_spec/
-	https://pypi.org/project/fsspec/
-"
-SRC_URI="
-	https://github.com/fsspec/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tqdm[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-# Note: this package is not xdist-friendly
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-EPYTEST_DESELECT=(
-	fsspec/tests/test_spec.py::test_find
-	# requires s3fs
-	fsspec/implementations/tests/test_local.py::test_urlpath_inference_errors
-	fsspec/tests/test_core.py::test_mismatch
-	# requires pyarrow, fastparquet
-	fsspec/implementations/tests/test_reference.py::test_df_single
-	fsspec/implementations/tests/test_reference.py::test_df_multi
-)
-
-EPYTEST_IGNORE=(
-	# sftp and smb require server started via docker
-	fsspec/implementations/tests/test_dbfs.py
-	fsspec/implementations/tests/test_sftp.py
-	fsspec/implementations/tests/test_smb.py
-	# unhappy about dev-python/fuse-python (?)
-	fsspec/tests/test_fuse.py
-)
diff --git a/dev-python/fsspec/fsspec-2023.12.0.ebuild b/dev-python/fsspec/fsspec-2023.12.0.ebuild
deleted file mode 100644
index 1cdf466d85da..000000000000
--- a/dev-python/fsspec/fsspec-2023.12.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=filesystem_spec-${PV}
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="
-	https://github.com/fsspec/filesystem_spec/
-	https://pypi.org/project/fsspec/
-"
-SRC_URI="
-	https://github.com/fsspec/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tqdm[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-# Note: this package is not xdist-friendly
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-EPYTEST_DESELECT=(
-	fsspec/tests/test_spec.py::test_find
-	# requires s3fs
-	fsspec/implementations/tests/test_local.py::test_urlpath_inference_errors
-	fsspec/tests/test_core.py::test_mismatch
-	# requires pyarrow, fastparquet
-	fsspec/implementations/tests/test_reference.py::test_df_single
-	fsspec/implementations/tests/test_reference.py::test_df_multi
-)
-
-EPYTEST_IGNORE=(
-	# sftp and smb require server started via docker
-	fsspec/implementations/tests/test_dbfs.py
-	fsspec/implementations/tests/test_sftp.py
-	fsspec/implementations/tests/test_smb.py
-	# unhappy about dev-python/fuse-python (?)
-	fsspec/tests/test_fuse.py
-)
diff --git a/dev-python/fsspec/fsspec-2023.12.1.ebuild b/dev-python/fsspec/fsspec-2023.12.1.ebuild
index 1cdf466d85da..397fa9af6b6b 100644
--- a/dev-python/fsspec/fsspec-2023.12.1.ebuild
+++ b/dev-python/fsspec/fsspec-2023.12.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 186ca257fcc3..c152cfbf7306 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,3 +1,5 @@
 DIST httpx-0.25.2.gh.tar.gz 2162693 BLAKE2B 8ae9fd692341ae3224c73c1f6837489819df1a00e13702a7af72143bf291cfcae23807fd51a6e1092672d0b5595f9557084151f3d07fbdd4e7fce8f5860a879f SHA512 7e62fcea55b7d0710f6d50581c8dd1ff5ae594a673a9b1cea5c03487eb3402ca96d44c311a9bcef14f20a7faa03462a3fab07edfe1ce2b11ecd66e4f7e1a06d5
+DIST httpx-0.26.0.gh.tar.gz 2164373 BLAKE2B 1de507dd1a0a4f5c87187645f7928f37f29e9a6cdcaacfbefe0e324cda5ad7f86a29efe99b496629a2e2f14851b8a6312d8be4595cfc61a97ce302b284dd1939 SHA512 76838d5c191700f5fd4c6afcc9d129f3809811f6ce40d45edf89518457a9497cdd94c11a68a9c42494780c579eaa43760a8bd85313d7864a8f5ae1c1b9912d61
 EBUILD httpx-0.25.2.ebuild 2157 BLAKE2B 253a24e8f98610d615f5f448d637eb7ca7d77f91c3fbae07192bb723ce80d118c6c2440fe0ddfb5eb08d14d6bdc2fb62346a654128ca84a1f346b28e04d25869 SHA512 6cb62a2c48755b32072cc1a11d0b185bc022858fc555209b6d89a317bae84d291bf965b84c74ee1c39f05abe14b0638f7f3c1cf196c3df5b95cb86619a50cf3c
+EBUILD httpx-0.26.0.ebuild 2027 BLAKE2B 1aa331402f0a0b63ea3a181183fbfcb5964a95ec774877f6123e54a959abecb42df47a4cfd77d221937818e7aaeeea32be197a10f94332c6090158ec7d618ab7 SHA512 ad33f97ed1ef7597414c9bc8102976a5d50319036b51fdc7b034b6ed3fea300af02b3b7958f7eb2adcbe98fd187ef98835530be9c6a1db951a49206350237c15
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/httpx-0.26.0.ebuild b/dev-python/httpx/httpx-0.26.0.ebuild
new file mode 100644
index 000000000000..c6d702cbd883
--- /dev/null
+++ b/dev-python/httpx/httpx-0.26.0.ebuild
@@ -0,0 +1,83 @@
+# 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_{10..12} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
+HOMEPAGE="
+	https://www.python-httpx.org/
+	https://github.com/encode/httpx/
+	https://pypi.org/project/httpx/
+"
+SRC_URI="
+	https://github.com/encode/httpx/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	dev-python/anyio[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	=dev-python/httpcore-1*[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/sniffio[${PYTHON_USEDEP}]
+	cli? (
+		=dev-python/click-8*[${PYTHON_USEDEP}]
+		=dev-python/pygments-2*[${PYTHON_USEDEP}]
+		dev-python/rich[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	test? (
+		dev-python/brotlicffi[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/h2[${PYTHON_USEDEP}]
+		dev-python/socksio[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		dev-python/uvicorn[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	if ! use cli; then
+		sed -i -e '/^httpx =/d' pyproject.toml || die
+	fi
+	sed -i -e '/rich/s:,<14::' pyproject.toml || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/client/test_proxies.py::test_async_proxy_close
+		tests/client/test_proxies.py::test_sync_proxy_close
+	)
+
+	use cli || EPYTEST_IGNORE+=(
+		tests/test_main.py
+	)
+
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "HTTP/2 support" dev-python/h2
+	optfeature "SOCKS proxy support" dev-python/socksio
+	optfeature "Decoding for brotli compressed responses" dev-python/brotlicffi
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index bfeef2486c56..fb649067e70c 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,11 +1,7 @@
-DIST hypothesis-6.90.0.gh.tar.gz 9395761 BLAKE2B fb910f8f885355d6045f1f218dedf35e6713fbed8d9d247310ec7a8b7aa4549b30715a50ebb0daa5e48f863b6c582a8cbc8910f26ab0da0476bc423f942534fc SHA512 02ca4f5b4c0c6cc2b949d46ac221a3c06a9d05fb89fc17c1a8e42813172b914822ba484970a20d1be1900e5396bf020ba1e274344aa8bf16253f18a6f11c6ac1
-DIST hypothesis-6.91.0.gh.tar.gz 9396774 BLAKE2B c2db54aa0cb95725c2ef38854ee04d756551746ea2b9eb5b79728dec274ffed08b9e8357616ce7057f4e988d3194017ea35849bfb88a35ce8d9574dd6710c582 SHA512 e6280e14e600305a0d9007c086fb55a2c5f441e40274d920d627d7cf12f07b0fe65d1e64c42ad712d662cf0f5aa41bfbb00b6ae3a716e88dacb7c72c3067601c
 DIST hypothesis-6.91.1.gh.tar.gz 9398188 BLAKE2B 3a068ec668f84cf84ebd274505938d861ef7b6f50a9bb33403c26c53b783ee6fe6afba214ca5d9c31e933909dd657d367c09dd74dac257348316e308ed761ccb SHA512 4004fe0dcef1dc679ee512f901f1115426fdbd8d0f2b1fc539c331157d1840bb16c415c7bcf0cbfae3e1dcf6f9741eb8e2ec725810f5d65e20e75f0ea07369b8
 DIST hypothesis-6.92.0.gh.tar.gz 9407699 BLAKE2B 7943aa958e135a954d4534b8992557a4ffd51941529cad6a8bb10b4ccd2e5c136159deaf11f822d96ecf60df536cff8b92756d902cd93de26df74ae10f73e14f SHA512 1fad215bd7ab69896d300ed39fd99a8a7145e6e21799429627b0d587939bfbe01d02fb7e1154a8b31f0b164ba9323b55b6ea36a268be20f1ef282d6b6f0d457a
 DIST hypothesis-6.92.1.gh.tar.gz 9408706 BLAKE2B b41bba23e5aa8715ff095edddcae02430db99b3294c85cd74c3f553a203bf3f484f4820494519f7100a261bc646abf6bc1d8a45dafb97d4bf709115f480f2b91 SHA512 fd5e52a258ba46682ae198457d857cfc82230be6faaefa2160a764e56ac1d8abb32dc0eaed3606877ca7fd7d184232c5e218d8f2eab54e5b9db0fd6ad30c8930
-EBUILD hypothesis-6.90.0.ebuild 2461 BLAKE2B f6e298ca639c631ff0749d70e82aa5f9a8a62a1cde53883ffae44b660c537cc9e14375ead8b424df849c4da590e6e6accfea39efc7fb414795301d760f0837a1 SHA512 6251d4aa72af0307c1d057dd72ec1a1924fe546237a7dc9625a75222f6331ba79500ebcc312d21870ec97dd297c30286f20b9f39059a43efdffa4a91eded701a
-EBUILD hypothesis-6.91.0.ebuild 2469 BLAKE2B d5d037935ee91a0d086f7651ebffedcf8eaa8f89106927d41dc008859ae22e945809012a2a3863f7f01ae4aea5c49bee36c68f39d17d26d7586049000418119b SHA512 a1ffd2ee8539b1dcb1e71ba521e2003136f40fecb8a1548dbfc89a4eeb9c8be9a6c52597b25c292f28e1a85b3f234bb9f9a7d91b2793a0fdb39feb5b6adcda8b
-EBUILD hypothesis-6.91.1.ebuild 2469 BLAKE2B 79c1aad30d28529c6c63f3279f7d86bee6a9a327c5ed447597b15456dee3f8de8af7bba45a376616e3460602ffb349206019731de6c44f3248fe568a1457a2dc SHA512 e4f204ef4113ffb64222031ccd954b450ddae44fd049c633e51082d030785f53928447c47ae7a167b3bc091f263caab90054e40cffe01d070a7b98060b973324
+EBUILD hypothesis-6.91.1.ebuild 2461 BLAKE2B fa15e027fc0501aa061b5a9c35a4c54279552f8b16ff0a74835528d13cdf50258f673fcff6f53e8b49cdcf9d11eb54780e6c48acb3318e8729b3e76b776ae422 SHA512 a1c518afe1d9ec2aeee8e84ef370e320696d05b2bf87daa164327c86f8154d4dd7d4b5964451d64f4de24519541986c2e2e54a240a63a9dc188e5e9f35ce9264
 EBUILD hypothesis-6.92.0.ebuild 2469 BLAKE2B 79c1aad30d28529c6c63f3279f7d86bee6a9a327c5ed447597b15456dee3f8de8af7bba45a376616e3460602ffb349206019731de6c44f3248fe568a1457a2dc SHA512 e4f204ef4113ffb64222031ccd954b450ddae44fd049c633e51082d030785f53928447c47ae7a167b3bc091f263caab90054e40cffe01d070a7b98060b973324
 EBUILD hypothesis-6.92.1.ebuild 2469 BLAKE2B 79c1aad30d28529c6c63f3279f7d86bee6a9a327c5ed447597b15456dee3f8de8af7bba45a376616e3460602ffb349206019731de6c44f3248fe568a1457a2dc SHA512 e4f204ef4113ffb64222031ccd954b450ddae44fd049c633e51082d030785f53928447c47ae7a167b3bc091f263caab90054e40cffe01d070a7b98060b973324
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.90.0.ebuild b/dev-python/hypothesis/hypothesis-6.90.0.ebuild
deleted file mode 100644
index a61663724aa9..000000000000
--- a/dev-python/hypothesis/hypothesis-6.90.0.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=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.91.0.ebuild b/dev-python/hypothesis/hypothesis-6.91.0.ebuild
deleted file mode 100644
index ad99abb563b8..000000000000
--- a/dev-python/hypothesis/hypothesis-6.91.0.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=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.91.1.ebuild b/dev-python/hypothesis/hypothesis-6.91.1.ebuild
index 832123b43c6e..0ecc0c890899 100644
--- a/dev-python/hypothesis/hypothesis-6.91.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.91.1.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/importlib-metadata/Manifest b/dev-python/importlib-metadata/Manifest
index 521aa7cc7b5d..123988585f37 100644
--- a/dev-python/importlib-metadata/Manifest
+++ b/dev-python/importlib-metadata/Manifest
@@ -1,9 +1,3 @@
-DIST importlib_metadata-6.11.0.tar.gz 54593 BLAKE2B 4fff1999d2b431338d8826c98ef9bc3d92017b52eb60f34ab43482ae15fd09e76fab750531ba0694f13127de31e6a28f30975751a981e3440fcb346a37f83a20 SHA512 f8473c049e01f9e346e379f0cf5b97a64420e002bc8885263f9fd8cc759d05624d7951e372dba2b1a71dd3ce42588c04fd261f21706afbef24e395741994bb6a
-DIST importlib_metadata-6.8.0.tar.gz 53494 BLAKE2B b4bb1b423cb470f5aa26d763e459f40a49b3163fc74d2d0e1883e1308c775393ebcbd369bbc4233398e38190ba683ffd7e14c0b355a289daa81eaeddbb7d1414 SHA512 04746aac8278f2fb0064df36a558890a0c9de7c8e61c31d7548ff8ad27091e3dcbda79903eb01053f7ad85b91274d92ded40b730c095ad56672427ab17e3f921
-DIST importlib_metadata-6.9.0.tar.gz 53933 BLAKE2B 741f42f675d13ed619f3e0fff22186f6946d380898cb899a065238c3c9be45c7b790fcddf086400468766346e6b3769e268f8905d02a3d55c9a6534e53415515 SHA512 e3ed9a9a7c7b4170ca5ef25e4dcd12d7a7c6f7eea88682a9ce19632362849ddb46cc76b3431a6df3ea7a24da2e1530ead02b0404ec163137498afaaa86b58a19
 DIST importlib_metadata-7.0.0.tar.gz 54280 BLAKE2B 56da8260ad1eb785577bbb0db1695652eb4d09d2fb48c8770e8fba22be92c2f9a4f89727ada53a1bf83f17128078bffe424636dc4ed805288bef1b74e162729b SHA512 2b71f9f14cb2bed74184fea23f1111588753c6054c308cd33fc79d0ea297219025bbea2af996535f69b63832c546145cabaeb18850bfe843251788f3f74418d6
-EBUILD importlib-metadata-6.11.0.ebuild 1368 BLAKE2B d479ac930db930913d94e6c38500b8e9abaa99da73ec3975ebbcdc138c099ba1a1ec7aecca3949ca4fd4b3a61f257bdc0631877960c2a9b873b51106db3e2ac8 SHA512 a940ab9764b6f6cb2357559ee5d7fef14d7c506fc78e19ac6aa4c3d4d0318eae298f549fa3a2354d5e2ec7cc21dbf83c561e69771e10825782e219977bcb6e8b
-EBUILD importlib-metadata-6.8.0.ebuild 1360 BLAKE2B d248edbc2cc787c2c9fb07248371613306f56cb79f203078bd3a2c7edd15ac6b6d2704f801ae7a642686973391595224d5dc4af04ab99410468d21b427bfc58a SHA512 1e80ac4bbe3d371a2f809e3c93676d1a85b393d1f377bb425254e2b7cb2a19ac1b4ae917aa83f3aaebf8f8887ab8cf15a53c342ccac2108fb98148bf694f169d
-EBUILD importlib-metadata-6.9.0.ebuild 1368 BLAKE2B d479ac930db930913d94e6c38500b8e9abaa99da73ec3975ebbcdc138c099ba1a1ec7aecca3949ca4fd4b3a61f257bdc0631877960c2a9b873b51106db3e2ac8 SHA512 a940ab9764b6f6cb2357559ee5d7fef14d7c506fc78e19ac6aa4c3d4d0318eae298f549fa3a2354d5e2ec7cc21dbf83c561e69771e10825782e219977bcb6e8b
-EBUILD importlib-metadata-7.0.0.ebuild 1368 BLAKE2B d479ac930db930913d94e6c38500b8e9abaa99da73ec3975ebbcdc138c099ba1a1ec7aecca3949ca4fd4b3a61f257bdc0631877960c2a9b873b51106db3e2ac8 SHA512 a940ab9764b6f6cb2357559ee5d7fef14d7c506fc78e19ac6aa4c3d4d0318eae298f549fa3a2354d5e2ec7cc21dbf83c561e69771e10825782e219977bcb6e8b
+EBUILD importlib-metadata-7.0.0.ebuild 1360 BLAKE2B d248edbc2cc787c2c9fb07248371613306f56cb79f203078bd3a2c7edd15ac6b6d2704f801ae7a642686973391595224d5dc4af04ab99410468d21b427bfc58a SHA512 1e80ac4bbe3d371a2f809e3c93676d1a85b393d1f377bb425254e2b7cb2a19ac1b4ae917aa83f3aaebf8f8887ab8cf15a53c342ccac2108fb98148bf694f169d
 MISC metadata.xml 540 BLAKE2B aa3ac97002fae5cb12dd2a8bab724322fa7a2ccea0b8b8b7e46a9e27e9566493b12a795e47724b703a74387b3805e925cc0b042a020e2a2e7862f74455b87809 SHA512 bc20e7317e1ea93d3d06666830bf32e00be6d50b1b8fb47d8092b3a80078a575e04c2cdbf9b78a17dbd1af23ae1d75766e62005ebf2942359ddd71867e8d9a12
diff --git a/dev-python/importlib-metadata/importlib-metadata-6.11.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-6.11.0.ebuild
deleted file mode 100644
index b944433689b4..000000000000
--- a/dev-python/importlib-metadata/importlib-metadata-6.11.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_metadata/
-	https://pypi.org/project/importlib-metadata/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib-metadata/importlib-metadata-6.8.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-6.8.0.ebuild
deleted file mode 100644
index 67f495f16cf3..000000000000
--- a/dev-python/importlib-metadata/importlib-metadata-6.8.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_metadata/
-	https://pypi.org/project/importlib-metadata/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib-metadata/importlib-metadata-6.9.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-6.9.0.ebuild
deleted file mode 100644
index b944433689b4..000000000000
--- a/dev-python/importlib-metadata/importlib-metadata-6.9.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_metadata/
-	https://pypi.org/project/importlib-metadata/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib-metadata/importlib-metadata-7.0.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-7.0.0.ebuild
index b944433689b4..67f495f16cf3 100644
--- a/dev-python/importlib-metadata/importlib-metadata-7.0.0.ebuild
+++ b/dev-python/importlib-metadata/importlib-metadata-7.0.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~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"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index a8e9d531ef75..b50083aaf946 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1,7 +1,5 @@
-DIST markdown2-2.4.10.tar.gz 123813 BLAKE2B 4aee5ece385a6987fc9d8fccbd3141f42f6469328d0c6ddd7bfeb4bcbffb2cdf2a6375bd9fab8dbc79b099894303e94f15df334b244d877970cc5e52d2f0bf5f SHA512 1053d5e13dfe83158c7e1b87a68f12a2d5bdeddf1cae359c2992028687d18e69d71c1347ac04cbfcbcb4a6c629eeb1f465537e2e4b47c0594f0c5d175b9ce04f
 DIST markdown2-2.4.11.tar.gz 128610 BLAKE2B 0418b97589be177bd3ac76d426e653f2ec48b1e12ab54d7a3e1d1e69a0f926e59fb0287f02ba9e72047ac62c0a1bc404711ad7e0e10a4aec32606d2231d32c71 SHA512 dbb7130eaf0924741694e905fc6ca8c2f0c46059c5aec144c3170b6793f2c50d2b0be90bd76f775a79e83101c3b0a549056c5e8f0ea0fed911c22ae1844b0c31
 DIST markdown2-2.4.12.tar.gz 129973 BLAKE2B a4e693a63cbb30a4c5351e3dd5974fa9750ff22ef956a5e09b53056081d2a95072b5c591f3f084913247691ffdef8c96a20bdd56b916a77a0319c663de2fada8 SHA512 db5f75b03e2056b43c4c3fde0e7b0e3d3b584d9ce2d4a71dbaf53d733c33ac20bf497bd3eb64ff3c8b4947969cf581bb50496ba189a39b8edcc9130cacb0874a
-EBUILD markdown2-2.4.10.ebuild 682 BLAKE2B 8a2bc4549b2242043ff6f9b12ad6cf9fc42c3759b50d439c17ed28fb36ee4f54257a48ec1274e71dbfdf117029e67079cba00877117d146a913a99d79507a375 SHA512 661a170f31dc29f67c743fc7a8736617ee9586d8b79617ab7df327b5130bead46731ec6edddad006e1ec961d3950beaf36b4872c7f2c09910e654be6c6775208
-EBUILD markdown2-2.4.11.ebuild 687 BLAKE2B 56f9f749783d4e7009ef8427c6b345b3058082b81a504128a9861abc2c6c8d444f79675bf2727ae80b1a2beeab1f6dd5849da9e399865c8da14037f86af44e68 SHA512 c4656a1c33ba7a122f9a1e3b5ea6c3ac0d481945058dbe0aa5b07dee5438f9928b3c6f8d918704868a7fbaf00a3284f3070d24e3fa287a9dfd91a580001bc9bb
+EBUILD markdown2-2.4.11.ebuild 682 BLAKE2B 8a2bc4549b2242043ff6f9b12ad6cf9fc42c3759b50d439c17ed28fb36ee4f54257a48ec1274e71dbfdf117029e67079cba00877117d146a913a99d79507a375 SHA512 661a170f31dc29f67c743fc7a8736617ee9586d8b79617ab7df327b5130bead46731ec6edddad006e1ec961d3950beaf36b4872c7f2c09910e654be6c6775208
 EBUILD markdown2-2.4.12.ebuild 687 BLAKE2B 56f9f749783d4e7009ef8427c6b345b3058082b81a504128a9861abc2c6c8d444f79675bf2727ae80b1a2beeab1f6dd5849da9e399865c8da14037f86af44e68 SHA512 c4656a1c33ba7a122f9a1e3b5ea6c3ac0d481945058dbe0aa5b07dee5438f9928b3c6f8d918704868a7fbaf00a3284f3070d24e3fa287a9dfd91a580001bc9bb
 MISC metadata.xml 551 BLAKE2B 293046752073df3a0fe72acea3165d62ae78297f82aa72e40edeaab6bb6021ccbeaa8cc145341aa05dd3fe87c2f89e88f2281ca95ead33d99bbfc5ba53573ca1 SHA512 9d30d896754f1379f4fae79f86bec966cc3639a42e5e7bcc7e8d2e94881ee8a75b7e3ddedbc1573f1eb3c429aea636512efdb887f2827dc1b1aaa4caaa44e413
diff --git a/dev-python/markdown2/markdown2-2.4.10.ebuild b/dev-python/markdown2/markdown2-2.4.10.ebuild
deleted file mode 100644
index 624adcdad0a2..000000000000
--- a/dev-python/markdown2/markdown2-2.4.10.ebuild
+++ /dev/null
@@ -1,31 +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_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python Markdown language reimplementation"
-HOMEPAGE="
-	https://github.com/trentm/python-markdown2/
-	https://pypi.org/project/markdown2/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pygments-2.7.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" -m unittest test_markdown2.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/markdown2/markdown2-2.4.11.ebuild b/dev-python/markdown2/markdown2-2.4.11.ebuild
index 40066426c08c..624adcdad0a2 100644
--- a/dev-python/markdown2/markdown2-2.4.11.ebuild
+++ b/dev-python/markdown2/markdown2-2.4.11.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-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/pygments-2.7.3[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 916b483a53be..66433e864d3d 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,7 +1,5 @@
-DIST nbconvert-7.11.0.tar.gz 851158 BLAKE2B 0506acda6a645ffba6771f600c63f0c37705481021b716a2b5ec61b49f2b9da490beac7a1fec67718d091d7bfcf82d7f07b68e207573ca5c08271fc502214eb1 SHA512 097e740413520b943afea11e2b797fbb163e1c34b79932597ec1c5a2c64bbb9342e4b3e1f0ab7e4d6dbdaa736d747650d8e0e50da0e4db5398151da8c3b57c59
 DIST nbconvert-7.12.0.tar.gz 851572 BLAKE2B e6f91a29790fc24901bfb527fc4335000af11354090c969d393eb1c95ad9f36c1e65e941a061b20ed884fd4e70316c6cdf1eb7ca115147ecb8a4726f62a98b83 SHA512 ba450938e7a907a6b5679e619b79ea6555f81b6f4ca387c3fab94377ce060d5b99424804052855451ec3f6f8a160355d58c6b875bdd3951a16c5dacae19a2c24
 DIST nbconvert-7.13.0.tar.gz 851504 BLAKE2B 72e745f58f624c4bf8dc05e366e924f734590cb7deaf27ea14229d6cdcca6b057fd1fb47a35bae511c7abb72cf7836203401613cb37ca2541f543b98422204ee SHA512 8d008ccb5e281cd7fd25c384ca1ecf4f3ddd314c07ec1eae079ad2075ca3ed8d92b4d9849fc29a444f8784727cd92335e02154340980c1631d5fc0d6bad956f9
-EBUILD nbconvert-7.11.0.ebuild 2390 BLAKE2B 80dedc85dad12fc83b3602c38478b945bd05381a9207c7d097ccafc945bb002a3f8f41e0c1dd73e1fcf25e8c619d0c59d2fea14a62759e222fd3a125a2e65d5a SHA512 07ab27230ff23a90e5e52ab876871ab451d0b6f82085b7fb69d4e0fc428e9ea5d788ae2e9984e7287502d8da220e5969c7d108b5bd3a59e9bc04baebfea63d56
-EBUILD nbconvert-7.12.0.ebuild 2398 BLAKE2B 12761913206dc5e22b0e34ca954a4a82ebb2c66eb7783235e5665fee304b0f31717f259ee409a0e987551fab22562cda0fb7e135da5e4b9fd48a2dbfb8d46a10 SHA512 78813ad98caa42ea738e55455a4921a3aa51abcbf6902f07581719e71fb3ab381484e5ac9b549d04191ca761c7dba0c38487e72b26cd6470a070d9d87a12dbd3
+EBUILD nbconvert-7.12.0.ebuild 2390 BLAKE2B 80dedc85dad12fc83b3602c38478b945bd05381a9207c7d097ccafc945bb002a3f8f41e0c1dd73e1fcf25e8c619d0c59d2fea14a62759e222fd3a125a2e65d5a SHA512 07ab27230ff23a90e5e52ab876871ab451d0b6f82085b7fb69d4e0fc428e9ea5d788ae2e9984e7287502d8da220e5969c7d108b5bd3a59e9bc04baebfea63d56
 EBUILD nbconvert-7.13.0.ebuild 2400 BLAKE2B 846ea8d23cb0138d587b0d92596018aa2d94378bf5f4612b2ff050e61255f9a8e095e8d45478d83818ea1274d861919f078adec6b25f213fdf8428ea172f0181 SHA512 be480d5d6bfa2d10a7b4662a3139c51266e91a4204984c0130ebbf2e0a9f612ee66d21cd4aa452654d9ef2c844265fa208edefffc4c4d4eeeb34eceb3ca33668
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-7.11.0.ebuild b/dev-python/nbconvert/nbconvert-7.11.0.ebuild
deleted file mode 100644
index 53500dc9c310..000000000000
--- a/dev-python/nbconvert/nbconvert-7.11.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="
-	https://nbconvert.readthedocs.io/
-	https://github.com/jupyter/nbconvert/
-	https://pypi.org/project/nbconvert/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
-	dev-python/jupyterlab-pygments[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
-	<dev-python/mistune-4[${PYTHON_USEDEP}]
-	>=dev-python/nbclient-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.7[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.1[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		>=dev-python/ipywidgets-7[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	mkdir -p share/templates/classic/static || die
-	# tries to refetch stuff even if it's already present
-	sed -e 's:css = .*:raise PermissionError("You shall not fetch!"):' \
-		-i hatch_build.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_nbconvertapp.py::TestNbConvertApp::test_convert_full_qualified_name
-		tests/test_nbconvertapp.py::TestNbConvertApp::test_post_processor
-		# crazy qtweb* stuff, perhaps permissions
-		tests/exporters/test_qtpdf.py::TestQtPDFExporter::test_export
-		tests/exporters/test_qtpng.py::TestQtPNGExporter::test_export
-	)
-
-	# virtx implies nonfatal, make it explicit to avoid confusion
-	nonfatal epytest || die
-}
-
-pkg_postinst() {
-	if ! has_version virtual/pandoc; then
-		einfo "Pandoc is required for converting to formats other than Python,"
-		einfo "HTML, and Markdown. If you need this functionality, install"
-		einfo "app-text/pandoc or app-text/pandoc-bin."
-	fi
-}
diff --git a/dev-python/nbconvert/nbconvert-7.12.0.ebuild b/dev-python/nbconvert/nbconvert-7.12.0.ebuild
index e6d12ff02703..53500dc9c310 100644
--- a/dev-python/nbconvert/nbconvert-7.12.0.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.12.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 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/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 85c0bc60f723..1dc99327150c 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,5 +1,3 @@
-DIST olefile-0.46.gh.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
 DIST olefile-0.47.gh.tar.gz 102116 BLAKE2B d3b3e8349901b7bf4a4facd0a784e9fa01f3acc50412f3952e85d59e6816321cd41d65cca83731cf280a6a83c3a4bf4e9ae9ee84662f0883e138dc2ceb22798d SHA512 efd73092f4fb428a91066c11fd319a60fa43e46f7abc4e7ba38627f11e19a6fbba227d1307ee308d1297e97b3fff30e6e497c50d7f708204e20122ea01dddfd8
-EBUILD olefile-0.46-r2.ebuild 756 BLAKE2B 371002c5f6a0c83e10864700f91f840de475b55a6315462f481fe5d5a85266995cbe3bd18858c41870f9afddd878bfefa14cb48261d6614fa6a2fd7c1efde26a SHA512 d31b7fab535deb96399629a727661e24edfced746b6df16dbf232926cbcde1b2216dc53efcf609bd68e79959ad150d3f1a43fcc16e22b062c01da84f4ae97b11
-EBUILD olefile-0.47.ebuild 764 BLAKE2B deaeadf554a52c8692e5bc1aa03d997f482eb21a2eefaae5e523af3030dee5c30301909957e8e2e7e9d89b4a7d3e0372214b274f84f6b34ba2fb9f351359caa9 SHA512 f75ef58d0c3828bc65e7de7122ff6f387bfde1da564d585ba3ccf72d7237fc0c77b89cf3e1472705e6050d4cd3f994987464c87dd3702fdbf7997a7c7dc19e09
+EBUILD olefile-0.47.ebuild 756 BLAKE2B 371002c5f6a0c83e10864700f91f840de475b55a6315462f481fe5d5a85266995cbe3bd18858c41870f9afddd878bfefa14cb48261d6614fa6a2fd7c1efde26a SHA512 d31b7fab535deb96399629a727661e24edfced746b6df16dbf232926cbcde1b2216dc53efcf609bd68e79959ad150d3f1a43fcc16e22b062c01da84f4ae97b11
 MISC metadata.xml 405 BLAKE2B 0624bf86d3688ac305571048b0dd8229d8789c7c28cd8d3e5536a7e653390400a2aa7615da7b2b32dc54eb11762d9c72db9d3b5cd19518fb52c4ec479a42f15d SHA512 2dfba1b0cb3bd235952c0ecad910354a1589243f66a2d04ff93a9975aa3395e50cea3230947e8db884442951a8871c1457c1a9b99e8657a04432185b3e9acaaa
diff --git a/dev-python/olefile/olefile-0.46-r2.ebuild b/dev-python/olefile/olefile-0.46-r2.ebuild
deleted file mode 100644
index 6c63f39cca9b..000000000000
--- a/dev-python/olefile/olefile-0.46-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package to parse, read and write Microsoft OLE2 files"
-HOMEPAGE="
-	https://www.decalage.info/olefile/
-	https://github.com/decalage2/olefile/
-	https://pypi.org/project/olefile/
-"
-SRC_URI="
-	https://github.com/decalage2/olefile/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests unittest
diff --git a/dev-python/olefile/olefile-0.47.ebuild b/dev-python/olefile/olefile-0.47.ebuild
index 71181806677f..6c63f39cca9b 100644
--- a/dev-python/olefile/olefile-0.47.ebuild
+++ b/dev-python/olefile/olefile-0.47.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 distutils_enable_sphinx doc \
 	dev-python/sphinx-rtd-theme
diff --git a/dev-python/path/Manifest b/dev-python/path/Manifest
index 94c528875a78..afabe0a01a8b 100644
--- a/dev-python/path/Manifest
+++ b/dev-python/path/Manifest
@@ -1,5 +1,3 @@
-DIST path-16.7.1.tar.gz 48974 BLAKE2B a03eebbb391cf17033adce4d6b258217546e3b7494200a8ea97f756512177f1c7d7ea8155420e167cefe79b566a4240eec98d17b160478f9cb06d3fd839c28f2 SHA512 7d660373046845a5882a316051c350558527d6d8a5cd11735d38214f986c8e096f72b45f87cfec41bf6171e7845287a42e6e45535f87a01b46670eccd4013dbf
 DIST path-16.9.0.tar.gz 48850 BLAKE2B 0c5edc6538cb22543dd810a535840a235b66c51415284f00338bd1e84e63847d09235e55dd3d40a71f3b02f54d18cbbf4fa1e5a0356798cee3383666a26a441c SHA512 2d4c8e3923bc712c7901328a0406ce05c6c157664dfacb5a563a1b214ce561215398b31494865c99a77ed09c3ef63bb04a36d57a60e7c0e3dea05b1dacfdecf7
-EBUILD path-16.7.1.ebuild 800 BLAKE2B 6e811206e2db786e31a9d358d9560b4695e6b2a0e6b5abdde043a32da5ac5a70a951a35038fd52de2506c70fd4a77c46b9c817f63f5e25fed25260df81363f68 SHA512 5602ad85e8f7d1759d7f7200fab7d5c4848880b9072b43d51628348d5798a8e3266cf9c62515391f6c963a95842f120f951696d200aaaca66e06504bc84d6079
-EBUILD path-16.9.0.ebuild 854 BLAKE2B 810ed2e822c935424c26284086cd7680bc1d380f0280c78066c37ff0b2f60549642c4c51244cd2dcbca89d0e58fcd1aa0d0844a5d80588be2b39a310a191778a SHA512 1f5bd95a315f8d48f341ce921583c346d3c08ac97ef262142ea53bb9c3bce589c7a26459808e3b97d8ef381a2a634e5ac07bc49ec9256e7a08b7fa557c10bf4b
+EBUILD path-16.9.0.ebuild 846 BLAKE2B 2697bd087e4cb740bd6a224e3247466fc8c4fb1f52d247f1ff43c55d6f25751725ebd22283522f1d8b1e3cd37bfe8cab606fae5dc80dfb05180ae8e9cb76dec6 SHA512 8ad5c9247b6f8ce68717fe956376ed336236ef6f6f38a077d80dc8f34b4cc94494cd326b44716a7e408adf2f07511e0426913b4a8ee5bc2ef9a334be5ad972a5
 MISC metadata.xml 383 BLAKE2B 30f12776bf4f9c1995774d7dc68cd8d9a85b74d514e8239ba76af336e6b08979e496ddaffce999bf0a3557f88ced148335024628b61f765b5bd08bf90b453c5a SHA512 aaceff1caa2714c0b8b3f7373c8721358e63833cfac824e3feda8a34fd1d6a961a27805c012a1125cad1f76d8bf7b1a92d7719480d90b344e5b4d0260ccf0547
diff --git a/dev-python/path/path-16.7.1.ebuild b/dev-python/path/path-16.7.1.ebuild
deleted file mode 100644
index 297c8b83451d..000000000000
--- a/dev-python/path/path-16.7.1.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_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="
-	https://github.com/jaraco/path/
-	https://pypi.org/project/path/
-"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# unreliable, not really meaningful for end users
-	test_path.py::TestPerformance
-)
diff --git a/dev-python/path/path-16.9.0.ebuild b/dev-python/path/path-16.9.0.ebuild
index 52a7318fd514..fc38708e9794 100644
--- a/dev-python/path/path-16.9.0.ebuild
+++ b/dev-python/path/path-16.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index b6461b3aa82a..6510b5cb42dd 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1,5 @@
 DIST python-phonenumbers-8.13.26.gh.tar.gz 4916065 BLAKE2B 383c4be5593abaa332dc75e8db348f085e7a695af2bc89185faf176fcd77148060889d92244097cc8cafa8e08fe52e6e62be32a31721576c330531c8277d7af3 SHA512 37daea2458b95536c25f4026c1aea79d2ab34c73c957178edcdb63cac96d1d84b4ce92b4e239354090321c4980bb26170862602423d3db3edc3c68c9f659582e
+DIST python-phonenumbers-8.13.27.gh.tar.gz 4915760 BLAKE2B 1a46d8b878ca9529bece2bf1144baf7800f2d52a2b613d27d2d6dd3f16a94fb6655fc892b9e305f4926674e20a3221e891a10b683ec009dd3b57a6e31da38136 SHA512 a057a7925611a25f1d100e2d32b16b76fb14880e91bc166a78ece18c0af2089f8dd0dbed66751f454040072b516c795dc60f42659353b4cab4c6c39fc599352d
 EBUILD phonenumbers-8.13.26.ebuild 816 BLAKE2B f4ad0ce9c34847200c35e5017107ff73b4915a78a78b937e2a8cc7a9c77f42ac905853ee9e9952e37ec47a1b209677d5e41519a71f6874a280c93a772bf4e3db SHA512 5f01d5988c41523d8bad765fed254824675ebe1f76912a5f12fd1b2952a5458d3cf20a59a69623012dce3bc7a7f282eef7532df3a705151ceb605fd3813c9c8c
+EBUILD phonenumbers-8.13.27.ebuild 818 BLAKE2B a1ec0e933c38aa2f63ab0fa05a360868769ff5d41e6f4e69bf54ef2c3837cee56a0a35b19525ec02b361ec13d7f273fdaef8a9fb20ae402232c248c9fe87e2cd SHA512 85a2a984403956c67b35e16c4fa6fc280a674843a6ef8e2135f1f878b308cae1a7a7f48cc656596f4d659de6d52a25dbda48a7b70181e5eb744b503d5acc0dee
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.27.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.27.ebuild
new file mode 100644
index 000000000000..f77207b71a78
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.13.27.ebuild
@@ -0,0 +1,39 @@
+# 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..12} )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index f80788f622a4..08062dd5fd14 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,5 +1,3 @@
-DIST platformdirs-4.0.0.tar.gz 19914 BLAKE2B 0ae3f7491f3f1d38561c89312c988b4145c9afb60e3d866cd05bef7e02c6df95d56cb230995de2893c0afd32bd63eb08448e67d5cdd0bdf6f3556ea1a23e2b49 SHA512 28eeb18ab5a52bf60d85ab76c986300d0f69c3bcff9ec18b961b70f97bce4e0d1bd3315b8d97f6b6a41de000b734979c08754780d282695525348342ab9c9931
 DIST platformdirs-4.1.0.tar.gz 19760 BLAKE2B d2deeb3d8300a92af0c0d69bcee2c02210d0cd32925ba7fdbd992723e13deba2a432bc7cb5eaf83ca9f576888d54d237b17028b25554bd65f044e61c0a353384 SHA512 f9cc171e7861cd9018be179963fc5d0316dc39a953b67dccf946937077704eb80955cca0d51c0edd8b4f931f705f719767f2b888be4276278891a099b5928fa2
-EBUILD platformdirs-4.0.0.ebuild 1326 BLAKE2B 02a40864be04dfe30c609d82652dac8ea264fdcf5e5fa7802cccd67aea42fef23fa674fac448cbe4af75e22a60e029fe00ab49a82529b45e02786d36fbbd6107 SHA512 97ac223f0e44101860803b0a109f3ba4d9f521b43f30d7f3ae79cd6745819bfba6ca46464323da9a0483c8a0f466dfe406d3928fe567323e6579e7adfd4d97ed
-EBUILD platformdirs-4.1.0.ebuild 1334 BLAKE2B 200f71291e7e4d5986d17b6cdb7f2357eba9560c3b3a827f70ecdd590170b12fcb7a5d349fb249e2dcddcd5be2b17fcbd852bfa637cbf0f94c16ee07d43408c5 SHA512 4e6095aabd727e20f53ee1e381af4782910c33d1806c311f6394740a9b2cdaf7fe5491fc8408a7e0bbb090b8d4da1163404149e6ce1238823eae14a0a02b6772
+EBUILD platformdirs-4.1.0.ebuild 1326 BLAKE2B 02a40864be04dfe30c609d82652dac8ea264fdcf5e5fa7802cccd67aea42fef23fa674fac448cbe4af75e22a60e029fe00ab49a82529b45e02786d36fbbd6107 SHA512 97ac223f0e44101860803b0a109f3ba4d9f521b43f30d7f3ae79cd6745819bfba6ca46464323da9a0483c8a0f466dfe406d3928fe567323e6579e7adfd4d97ed
 MISC metadata.xml 383 BLAKE2B b8c8c1593d154e7a38ca4bc450c14ca21f2411ea1d71f67e9631c1def0acace43ebb6e67adc0c4a1f5f14aadfbce44d0d815fc3696410bef66c826fd5fb00a45 SHA512 f4ba6722e1cf661b3febe10bb15755a9cbc30226a08bdcabfa3d80be87b42d662d6a1edb3412ad79e8f36836a6dd4fd91a83dae29725ec47041056dc1f1f9b75
diff --git a/dev-python/platformdirs/platformdirs-4.0.0.ebuild b/dev-python/platformdirs/platformdirs-4.0.0.ebuild
deleted file mode 100644
index c890201db8ae..000000000000
--- a/dev-python/platformdirs/platformdirs-4.0.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-
-BDEPEND="
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "hatchling' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "${PN}"
-		version = "${PV}"
-		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
-	EOF
-	# sigh
-	cat > src/platformdirs/version.py <<-EOF || die
-		__version__ = version = '${PV}'
-		__version_tuple__ = version_tuple = (${PV//./, })
-	EOF
-}
diff --git a/dev-python/platformdirs/platformdirs-4.1.0.ebuild b/dev-python/platformdirs/platformdirs-4.1.0.ebuild
index 70e821d796fb..c890201db8ae 100644
--- a/dev-python/platformdirs/platformdirs-4.1.0.ebuild
+++ b/dev-python/platformdirs/platformdirs-4.1.0.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 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pynvim/Manifest b/dev-python/pynvim/Manifest
index 2804a9b1c919..e1a3a7233b8f 100644
--- a/dev-python/pynvim/Manifest
+++ b/dev-python/pynvim/Manifest
@@ -1,5 +1,3 @@
-DIST pynvim-0.4.3.tar.gz 52807 BLAKE2B 2ac8894af71a28f8008dca1f9e34a0cda6a68aa108ddfe122e4e9cac4c7669262483729aafb238d0e8eb0022ddea9bb222ec7b718e9a9c59fbb349821b6b8dbe SHA512 5d8fc7623a5bc2e069991b901dbd4dcc6005ddab31e2f0a70ee50c2d6febf3b5c29a61fc4dce454aa494779d7a869a1e92a2a97cb66212ed858c3d3fd77c0f55
 DIST pynvim-0.5.0.gh.tar.gz 59043 BLAKE2B 4c9ce46e90dbb6cf278b48a904bef6dbd821d696c578a29d84af5ee64b223c602727dd09bdecbc90f7b6a634cbcd11b615d7ae48782e5cf71ae59faf8f8b1ff2 SHA512 91ffe3f42cc23ba372223b8c9f6930b0cff9d30b6764052a77a5c34e39a3312a1834b9a753152e96d04d5b4b61ce647bd7470095fac3122ae6b1346dcdf07f2f
-EBUILD pynvim-0.4.3-r2.ebuild 732 BLAKE2B a0b368f2788dc76bfbfaa4026299a7103c44649cddd937e9dce63e7d4fa439a499524b0b9e8933b8b22fc0f35b8d92b750c58a9c94cb34216673c8e965c93135 SHA512 f9763114907e58bb7bb6597c4f6f558b88fcfc6b0a00f1bc91a4fd6d1627b54f077ff4024ecfb5fa7359909fe3f76248efecdf01a1e4ba1a56d7e87b9d7e59f8
-EBUILD pynvim-0.5.0.ebuild 686 BLAKE2B 375cdcc5dfd3051fb8b44c4cdb702f92dd6951ccf672ac753395281c9967abac0217dce36ae55db3f2f279714c63afeba372dcc5baa29d9668986c2cdc2c1f80 SHA512 2d9bd0863841ed6bbdeac2259512a1cc3eedfcc5fe4a19d1a44e91bf2f0dffdad4b797ddb54ad26616c96f1da5131d7d8496ee46a42c4ba5bb682f7b4511d459
+EBUILD pynvim-0.5.0.ebuild 684 BLAKE2B f0a50b78a1d93119b5ab1872b185765e2492db56f370f3e2d8a0db22e63008054b7ae1d574820f8ab480acd86941b373b30917bbea562450ef8044ec006d2434 SHA512 d54abaefee3cd59f9fd4d26295c57b0f3dbdae2bb9da6ca4519fe1317c612cf41fa87cb1238519e3563e92786de3c2d195ac4a5993b57be5ea97d25ca6313105
 MISC metadata.xml 497 BLAKE2B 0fb6f83694d47c77d6b370e19a2c681caff4d9a105ce831f54823c65c995cb88949bf1f276a186245c8a03f551374cb6583cc9e0b4143fa048fae289278d4042 SHA512 bbf30f5aa13e28b3a7f810d6660815767e0c21e21de7e01ebfd6b1ca6a22187e3f3aa8278ee26ffb632a6c201e5544ad2b069710dc8cccf6d4bbda962b48437c
diff --git a/dev-python/pynvim/pynvim-0.4.3-r2.ebuild b/dev-python/pynvim/pynvim-0.4.3-r2.ebuild
deleted file mode 100644
index d894cf940182..000000000000
--- a/dev-python/pynvim/pynvim-0.4.3-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python client for Neovim"
-HOMEPAGE="https://github.com/neovim/pynvim"
-SRC_URI="https://github.com/neovim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
-
-RDEPEND="
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/greenlet[${PYTHON_USEDEP}]
-	' 'python*')
-"
-DEPEND="${RDEPEND}
-	test? ( app-editors/neovim )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -r -i "s:[\"']pytest-runner[\"'](,|)::" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pynvim/pynvim-0.5.0.ebuild b/dev-python/pynvim/pynvim-0.5.0.ebuild
index 3f3c0a3198c7..6cd29f28b219 100644
--- a/dev-python/pynvim/pynvim-0.5.0.ebuild
+++ b/dev-python/pynvim/pynvim-0.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 
 RDEPEND="
 	dev-python/msgpack[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy3_10/Manifest b/dev-python/pypy3_10/Manifest
index c46f1890ddfa..2c9bf0e33dd9 100644
--- a/dev-python/pypy3_10/Manifest
+++ b/dev-python/pypy3_10/Manifest
@@ -1,6 +1,4 @@
-DIST pypy3.10-gentoo-patches-7.3.13_p1.tar.xz 5068 BLAKE2B 2dd739a0ec9fc358a1fa1c278d06ed30f63f01565a593abc8b6f6bc14a5210ae3b6d541558b61ec97aad4f520e362310b825409ac46698846e66adbabcc805e7 SHA512 4ba5b2aa173b70ace6ee01ba4b870ab7baceea0b2fc6b0592787f80493c3f76ed0c662e0c86e9043c1bff981aec0268c7122d5a59d592bdb99cd8224953c8b2f
 DIST pypy3.10-gentoo-patches-7.3.13_p3.tar.xz 9780 BLAKE2B a72cfc6723ad914f012309eac7606a37f2e6dd2c5f83c049c0d68466dae45a366536f2065c1ccdc9516339cb8949b146e410ab04b1cbbff3b9d62620a039040d SHA512 c1beb5c661dd0c0d94bebb23b82972ac9442caf777c377923c31b3f82b007396d0c3ef9874fc01cf765986cc7c6a941628f7e377a732a0706e99e3acb6fc5db6
 DIST pypy3.10-v7.3.13-src.tar.bz2 23067819 BLAKE2B 6e2bfd83bcf16feef006dad39ab6d8f452418ee6bc4043edaa590db702f39275e775004bdba762736a901da94cb5274cd34f2811461048d46ac0f4af04158702 SHA512 16fbc76558152b3eadca999d56197a6bf906cbb7bb75035ccd3501372af0f0c22533d22ba231a40b7c02afa11f0d692a6ae85ba6d5e1607b737b8c68209b7c43
-EBUILD pypy3_10-7.3.13_p1.ebuild 6148 BLAKE2B 9ec37a7c3fdd246519ee3cf32401cd82d5f877448f64bddf630e7207a63570a0d04a20572578ddb96780a1861f66844c8050f426dc8d425864b59e4a1e7a54ec SHA512 6295e54f03bc1f1f2a3114c454549e0700778005bd7c050056c52675f2a41474722db0a32bcf8e26a32663d890c261ab83b8196875b4e499e8a2d8bb009575d2
-EBUILD pypy3_10-7.3.13_p3.ebuild 6326 BLAKE2B d9d95e7d419f041a24c4a93f873a4e02f218fdcc066c131cbbe93461e48740db6fda7bf6172ffa603c2ddc6cb254e89017d4b13ceb8cd03fb593566b095faf3b SHA512 f0f5aae0456d4b936149cdcff02ef10fee70d45dbc807a57c35f3c056e9a983718f0302224597cc661575b116d20743b06e3964e769b4efd86724dce578f7f29
+EBUILD pypy3_10-7.3.13_p3.ebuild 6312 BLAKE2B e4bb68bf731dd0edeacf369450b6db571437bf467f4d63ab10525807c2fe5ee4b7b7ee2af70968d8f582e90f735a906583c3aa657fe86bd133ba616294b45b4f SHA512 fe410e9c77c5de3d06cff0977c0295173eb5f36eac4db5e2fb30de290b92220618b63a33e4c2cc38045aa66afd481b6582a69012439631c43622cade405fe352
 MISC metadata.xml 531 BLAKE2B 0f727c7ced9fb24ba0dc0b41d51c177b3711de33b838bf46cfdde5d8b751de9694873c13fe8153747f2cb533c078c54f004ee84b1c3c57b6f8d62128ffb9dba2 SHA512 331b66647a58047ded4bcf1529e3ca16b21cbb37afa82d8be0a4b6ad605e17bf3f1478fad1ea3b9c970bdf5162cb41e6adcb029a261fcbf894e807998b9219f6
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.13_p1.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.13_p1.ebuild
deleted file mode 100644
index a12e9f0f8bdc..000000000000
--- a/dev-python/pypy3_10/pypy3_10-7.3.13_p1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils python-utils-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.10
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
-HOMEPAGE="
-	https://www.pypy.org/
-	https://foss.heptapod.net/pypy/pypy/
-"
-SRC_URI="
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="0/pypy310-pp73-384"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py${PYVER}
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
-		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	dev-python/gentoo-common
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!~dev-python/pypy3-7.3.12_rc1
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	mkdir bin || die
-	# switch to the layout expected for cffi module builds
-	mkdir include/pypy${PYVER} || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
-	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
-	pax-mark m pypy${PYVER}-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy${PYVER}-c - <<-EOF
-			import importlib.util
-			import sysconfig
-			soabi = sysconfig.get_config_var("SOABI")
-			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
-			print(f"{soabi}-{magic}")
-		EOF
-	)
-	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	# Add epython.py to the distribution
-	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate sysconfig data
-	local host_gnu_type=$(sh pypy/tool/release/config.guess)
-	local overrides=(
-		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
-		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
-		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
-		TZPATH "${EPREFIX}/usr/share/zoneinfo"
-		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
-	)
-	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
-	local outdir
-	outdir=$(<pybuilddir.txt) || die
-	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
-		import lib2to3.pygram
-		import lib2to3.patcomp
-		lib2to3.patcomp.PatternCompiler()
-	EOF
-
-	# Generate cffi modules
-	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
-	# (NB: we build CFFI modules first to avoid error log when importing
-	# build_cffi_imports).
-	cffi_targets=(
-		pypy_util blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma posixshmem
-		ctypes_test testmultiphase
-	)
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-	# testcapi does not have a "build" script
-	../pypy${PYVER}-c -c "import _testcapi" || die
-
-	# Verify that CFFI module list is up-to-date
-	local expected_cksum=63d4659f
-	local local_cksum=$(
-		../pypy${PYVER}-c - <<-EOF
-			import binascii
-			import json
-			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
-			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
-		EOF
-	)
-	if [[ ${local_cksum} != ${expected_cksum} ]]; then
-		die "Please verify cffi_targets and update checksum to ${local_cksum}"
-	fi
-
-	# Cleanup temporary objects
-	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
-	find -type d -empty -delete || die
-}
-
-src_install() {
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
-	insinto /usr/lib/pypy${PYVER}
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r include/pypy${PYVER}
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	local dest=/usr/lib/pypy${PYVER}
-	rm -r "${ED}${dest}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${ED}${dest}"/ensurepip || die
-	fi
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/sqlite3 \
-			"${ED}${dest}"/_sqlite3* \
-			"${ED}${dest}"/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/{idlelib,tkinter} \
-			"${ED}${dest}"/_tkinter \
-			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
-	fi
-	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.13_p3.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.13_p3.ebuild
index c463e1f54501..602fae3f411e 100644
--- a/dev-python/pypy3_10/pypy3_10-7.3.13_p3.ebuild
+++ b/dev-python/pypy3_10/pypy3_10-7.3.13_p3.ebuild
@@ -57,8 +57,6 @@ src_prepare() {
 		"${WORKDIR}/${PATCHSET}"
 	)
 	default
-
-	eapply_user
 }
 
 src_configure() {
diff --git a/dev-python/pypy3_9/Manifest b/dev-python/pypy3_9/Manifest
index 293c9279c576..6ded36f580cd 100644
--- a/dev-python/pypy3_9/Manifest
+++ b/dev-python/pypy3_9/Manifest
@@ -1,4 +1,4 @@
 DIST pypy3.9-gentoo-patches-7.3.13.tar.xz 7476 BLAKE2B 70f80c489686e92e933a200d2e92a095a80e2300814ec4e1f3cb31ec5f5500a45667f7bfe9570ea5eef3933fdda33a9930bdf2cf683c28e3ddb610bebeeca6dd SHA512 5170f5141beb93b3b37cc94f85324c88182967eaff2f8ca26b81d63d5b0d20414a139ca44c250c07b46c747e27c97fd0fe5a2365f6636aba2dd28df3bc55cdca
 DIST pypy3.9-v7.3.13-src.tar.bz2 23452374 BLAKE2B b5ce8dd78e4851b5c7fa6aa0c6f2f5c198a3b2d1e4691ccb20d1b229397d60ac41eaecef37f7c76e4de837876bdd6c1e4276302afc292080e0a38f1a58869580 SHA512 04b184050625f06d2acaa836a786db788c4f658f3384ebde176d0acc95044ee83dbf7193ebab1e4fd6275bed7a590d3945482294be32d8f94e8c541e053dce59
-EBUILD pypy3_9-7.3.13-r1.ebuild 6325 BLAKE2B 7d0ef7ed89197c7a3294a7d25e3a12f2dfcf5023e0e4e4df7915e30dc6510392b569cfd9c3875efa455071432e67e96ab46c3aebb7d57c7ff056e6b4de87f500 SHA512 e17685848a1a314d3212ac66a8a23d5da46f1ee40cdb3eba235e707ab6e917e38861db2bf764ce68ea1d0cb4f3bf669822e580a4408bb317c237b8e514f7b08f
+EBUILD pypy3_9-7.3.13-r1.ebuild 6311 BLAKE2B 30358bee837ab93c154ab620bde6eb6294a66bcdd72bd903be489c6044a3a08b2f1dd8751f422c3c3ad59c30fe31cdd5ff1e5bcea6e2fa63f0d9384617f91c7d SHA512 243e6eda91d69474f58e593e17f0550db19c2859d831aa1403b41c4b65e4366a9240ec34aad7b80003cab4200201f3b9310ec72bee16d1377f09512674f6b635
 MISC metadata.xml 531 BLAKE2B 0f727c7ced9fb24ba0dc0b41d51c177b3711de33b838bf46cfdde5d8b751de9694873c13fe8153747f2cb533c078c54f004ee84b1c3c57b6f8d62128ffb9dba2 SHA512 331b66647a58047ded4bcf1529e3ca16b21cbb37afa82d8be0a4b6ad605e17bf3f1478fad1ea3b9c970bdf5162cb41e6adcb029a261fcbf894e807998b9219f6
diff --git a/dev-python/pypy3_9/pypy3_9-7.3.13-r1.ebuild b/dev-python/pypy3_9/pypy3_9-7.3.13-r1.ebuild
index 661ab0988ec8..4cf1093bca1d 100644
--- a/dev-python/pypy3_9/pypy3_9-7.3.13-r1.ebuild
+++ b/dev-python/pypy3_9/pypy3_9-7.3.13-r1.ebuild
@@ -57,8 +57,6 @@ src_prepare() {
 		"${WORKDIR}/${PATCHSET}"
 	)
 	default
-
-	eapply_user
 }
 
 src_configure() {
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 7d0f7f3aee84..de594a7ad547 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-asyncio-0.21.1.tar.gz 30492 BLAKE2B 6a17f9ba89b8181b5fb734af6d0c0904a828156e63df910b4fe4adb9b93e240266063dcca8d97c8f9d784c6d5111796949fe32bb2832921919e41398ccffc155 SHA512 3aef14bade1dddab4320450d60c6909a76c7cf334d8225ad155b474b042d1c692edc5b567fb86ecf6b3453746105c3cecce86d2c6ff5cf6652d5147a8532cfd0
-DIST pytest-asyncio-0.22.0.tar.gz 37081 BLAKE2B 62941bdf10ee8a5195e900e71c7eba1810edd9721457656fc0b62dca3264f4ce0cba9221f80fd8a5249ee30e662cf068fcc8e491ba6b297e0370fcb04b7fe068 SHA512 7880b03c44997b0cb05b1c9633bf3e94e7eefc0396dc88512baf0e8f700508fa76eb9cbf2ce6d837be9ae0f1efb75343cdc32c7b2983e294ffa30e94893a3a2c
 DIST pytest-asyncio-0.23.2.tar.gz 44174 BLAKE2B 36dbd0022416eef05c781b9f74fd143bb52fe0583461ca7e52fd4981d552bbefdddd8e3a3399bc229a8ae68b150e199237ae0ce3a375075ab8f7f507bfa59316 SHA512 aa5b5fe8b633b187303dd2958d2ea01561604044507da107e46115d9bf4c1ac3c78826b4b6a6cbf474a6ee4ce0cd1bede87a2c8fe0d35397ddf6a4069437dd84
-EBUILD pytest-asyncio-0.21.1.ebuild 1544 BLAKE2B 5d26765ec0f856550e5246ab1bad7fab1aac0b90837b9a58f26ca5ebc158a5ecb92c356a4d6c3f262bbdeb768acace9c0e9ad06fb074bc255cee7600ab4fb0f4 SHA512 17162c9aae7aec78bfa371f01dc29b252ba0c96c79dd4dd3958f2a2648606ea07c122257456d2bc3e608c60b2ddc9c00813b1faa13fc12c70fef9c1ad6e8e529
-EBUILD pytest-asyncio-0.22.0.ebuild 1422 BLAKE2B bea4fa88e677d12627e6ad0586212774b71162329c46a6e4d7c71bf988a65dbb786154862bdce830e8f634a0864887870a089bfbe758622e3054c339e322ff20 SHA512 294ac7331ad6ff685dab0531560678b159d8e313069f5ae019bc70da44f47a00e7a3bcaff6b2be05712a52888ed6c76c4eb866dde09cdf2ad5ba4c7bcec8661c
-EBUILD pytest-asyncio-0.23.2.ebuild 1510 BLAKE2B 6b5d8de5e8041ecf1924f1b6a3b884bbaeadc483dc08d8790359e281e10f3c13e428faf943397aaf782b2f5307de14cc1756ee5379f276b1ed1c13695711fe5f SHA512 84f1db73fcb9b7400f3fe15f3a0fb176d63c7d3c32b6c63c807f2db88d39bdc8af4e0b6b630a0e2def58c7c313edd70c5a32231a6a55aea19ef2d216b130503f
+EBUILD pytest-asyncio-0.23.2.ebuild 1502 BLAKE2B 4bbf1e0e7b4ad35829ce587b367384cd3d5c0e170347f27d4d8948eea5aba4fde10b6bc2a79eab9f8dcf9c137bf3a3d4ea7916fd415839cc7a957670a6f59f5d SHA512 980b67811fc3596c910d51b520a971351d47e6813b42e08af4de32aa30a1417b8084d74c0c8cbac33352b8c55a2ff893a395f6fdbdf8a8ed310839a51e54da36
 MISC metadata.xml 385 BLAKE2B 3d8faba48e1b3e531ea338f08f2de4b7bf637190e65fc61df2bd4d994cc97707016f83927f4a5181ac27d412a8c91255e90caba15f2d687f2339bc8ea61b18f2 SHA512 71178d3fba362e7532c87cb519f3661b25018771b86c302660de11f1bc7817b8352a2c8fcf60084a5e62b15148307a360267381ac38e8c856784034d80327d4d
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.21.1.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.21.1.ebuild
deleted file mode 100644
index 68822fde2045..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.21.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Library for testing asyncio code with pytest"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-asyncio/
-	https://pypi.org/project/pytest-asyncio/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on precise warning counts
-		tests/test_pytest_min_version_warning.py
-		tests/modes/test_legacy_mode.py
-		tests/trio/test_fixtures.py::test_strict_mode_ignores_trio_fixtures
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_fixture_leaves_loop_unclosed
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_test_leaves_loop_unclosed
-		# incorrect use of hypothesis, test removed in git
-		# https://bugs.gentoo.org/916339
-		tests/hypothesis/test_inherited_test.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_asyncio.plugin,_hypothesis_pytestplugin,flaky.flaky_pytest_plugin
-	epytest
-}
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.22.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.22.0.ebuild
deleted file mode 100644
index 9756a65aac50..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.22.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Library for testing asyncio code with pytest"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-asyncio/
-	https://pypi.org/project/pytest-asyncio/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on precise warning counts
-		tests/test_pytest_min_version_warning.py
-		tests/modes/test_legacy_mode.py
-		tests/trio/test_fixtures.py::test_strict_mode_ignores_trio_fixtures
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_fixture_leaves_loop_unclosed
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_test_leaves_loop_unclosed
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_asyncio.plugin,_hypothesis_pytestplugin,flaky.flaky_pytest_plugin
-	epytest
-}
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.23.2.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.23.2.ebuild
index c35e42670f46..84f1303a694a 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.23.2.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.23.2.ebuild
@@ -17,7 +17,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"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-jupyter/Manifest b/dev-python/pytest-jupyter/Manifest
index 29a41e331222..0ebafb2293a2 100644
--- a/dev-python/pytest-jupyter/Manifest
+++ b/dev-python/pytest-jupyter/Manifest
@@ -1,5 +1,3 @@
-DIST pytest_jupyter-0.7.0.tar.gz 15507 BLAKE2B b4b580668083e46830d06908f484f221e511a9dc5b32285de25e8e83268a1cb4a110ab5bc92c4652033bd658332c6aef8560313e041d39ceeec6d7339c67b24d SHA512 5bd44d1cc927281823ab92f5e1dbb4fa66e917fb9ba098c63001bb9edf60d4eb7842d4178c1dce1772e156d871def2319d511187185fbfd81ee9128c7c23ea2a
 DIST pytest_jupyter-0.8.0.tar.gz 15716 BLAKE2B 9000be141466553346737596e80c5208aa9c1bdd9a72c8b1ae9fa1b8d994dc33f6e237a2eb16e60fa9c1a9040e6711ac45b0420aa865b6c27c48455cc1a11c34 SHA512 7789d4e92a1da254c8ef161a58b63fc494e4b59ce7721d5c501fdce0975452ed53700292e1554c247f5fa58cbe1f87489403f0f5ae97c5260cc3d7c9fc1c3418
-EBUILD pytest-jupyter-0.7.0.ebuild 816 BLAKE2B 2122fba1470338920058a41c6acf8b1d17625bdede941ad0bf7e7b8ef1f0a4446b538f2c379fb665246d52f458d00ffb59c35cbffc104a5170201b58ad2ce478 SHA512 d71aa42197513e6b945fa1ee972732a99a7fc15e0e9b667d317c61871c0269905935243d0e09f98766e133c563eb7a0d328efa6ac0c79a71396c17069bcdfb0d
-EBUILD pytest-jupyter-0.8.0.ebuild 823 BLAKE2B b14bc96fbbcfc766146933334a1a817bcc8eeb3c75f6bf805576e998f91bc12d83ef57623c7f2ae043bf268d9135a743a919e898bad1b3ad3ac0c51b7dddf194 SHA512 d24d8b765e6c62758f41ca4148dc8168afa8eab9f4521cb81e68f0f3936794ad3c39d69c27b44a2a0c58f7180f3b2f5456b79539c34a1185d149785c1068f300
+EBUILD pytest-jupyter-0.8.0.ebuild 816 BLAKE2B 2122fba1470338920058a41c6acf8b1d17625bdede941ad0bf7e7b8ef1f0a4446b538f2c379fb665246d52f458d00ffb59c35cbffc104a5170201b58ad2ce478 SHA512 d71aa42197513e6b945fa1ee972732a99a7fc15e0e9b667d317c61871c0269905935243d0e09f98766e133c563eb7a0d328efa6ac0c79a71396c17069bcdfb0d
 MISC metadata.xml 544 BLAKE2B 2774989bbb5ea75c4254ec2c9f3daf04a48bdec28698d62afd2471abb4031273bea581c09151efa643fc691a3fda2e1a4211dca66882fe2c5a24d7a6bef7c1a1 SHA512 e3751515a8baf2b422cb680870adbe9393d37ecf2e8b01212bcfa7d0b62ca368c34a9140945e1af4d7c7f0c5443b996ac7cbd4394833aa13b4e937b05bfe0e6b
diff --git a/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild b/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
deleted file mode 100644
index 53737cb166f2..000000000000
--- a/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pytest plugin for testing Jupyter libraries and extensions"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter-server/pytest-jupyter/
-	https://pypi.org/project/pytest-jupyter/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jupyter-client-7.4.0[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-jupyter/pytest-jupyter-0.8.0.ebuild b/dev-python/pytest-jupyter/pytest-jupyter-0.8.0.ebuild
index a63b795a126c..53737cb166f2 100644
--- a/dev-python/pytest-jupyter/pytest-jupyter-0.8.0.ebuild
+++ b/dev-python/pytest-jupyter/pytest-jupyter-0.8.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter-client-7.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index b91a82df255a..df109339b4b7 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,6 +1,4 @@
 AUX pyzmq-23.2.0-libdir.patch 510 BLAKE2B cb7884416d3e15f735412d69a7ae0decbbf8eca14ae909b23e68231a65b3ad36d021b5c6f5315a3cb982cd571913ce021cc5df60509d90b28d4353dd7bd316e8 SHA512 f268d03de45971d50a89210366b4aef0e79e652a45d650fc3e4a6711558ee186ee558a2808b7c9f5c5a64ce8b9282adf024ab21a782ba614900a4813e8b6d6ca
-DIST pyzmq-25.1.1.gh.tar.gz 389825 BLAKE2B d8e231a0eeaa6a7ad372da912cb42e96e4d862e163859b97d1c369a7940e019c074fc717685f53da06de69cfee79430e343fcd1987d768f3cc99ec75cad0955b SHA512 4aa0d5d5c1036e6ac35898c48d9612f677ee6e9345fafd02091ba81a5081f1ac8bf552eb5c03636ad643cc87e17f037013ec981d9b852c0252d30de8ce046d5a
 DIST pyzmq-25.1.2.gh.tar.gz 391272 BLAKE2B 80814704e7ea08d407859c1d71338f6ea283efcd1f3994155334aa5b60c4b6cd89167de8c78d19f8efdbeb5f4071f7b5954ea911eb6e7fbb48a0087b86579cab SHA512 b146a6dbce7cbbe2eb1da7ebd64e463067354f1566cdb4ff634b59bbb6d65e16263b6acb2d101a4ea53f870be5c753c9a12f9cc37bc5a81236681ea4fda6c56b
-EBUILD pyzmq-25.1.1.ebuild 2307 BLAKE2B 518a210ee7f2b29debae65a154c954e299e433a490808aac7169b5955341db1b371949f3a18c256ac9aff30669eafd42c027140a3219e9b15b7b01dccd56b1b2 SHA512 e97f310487ff3b94e1476b9af92437f639e20751b93ad54dc6955c4bf58d2f9d1c02fa36603bdd470d4da1f78712d31c998c909d1c36da73d4a97236b2a1c379
-EBUILD pyzmq-25.1.2.ebuild 2315 BLAKE2B 7444306ad2b6e5b2abae5823456d6888514427372f8a2991e0cbb6f565a72d908be52edaf1d84d7e8f5106900f9fe58979926a7fea7599961fd800075402b31b SHA512 aad1fdd14ea11f82b63439780bf16e25e71f9e4ab203b8849df3a1a4c273b7244cfa83ee74573d884be88cddf4acf74007330f54e9c3a95d27e11d46dd6e807f
+EBUILD pyzmq-25.1.2.ebuild 2307 BLAKE2B 518a210ee7f2b29debae65a154c954e299e433a490808aac7169b5955341db1b371949f3a18c256ac9aff30669eafd42c027140a3219e9b15b7b01dccd56b1b2 SHA512 e97f310487ff3b94e1476b9af92437f639e20751b93ad54dc6955c4bf58d2f9d1c02fa36603bdd470d4da1f78712d31c998c909d1c36da73d4a97236b2a1c379
 MISC metadata.xml 549 BLAKE2B 46a9a1476f68f05c71bb4f849a9e0822c58142ac036da635454f57781dcea81687accfbf9563273d4f8672a8479b098c9f03cec64e5e7f456e50ad8c7ffba9d3 SHA512 3765c31f1b0048a60d5ccf90aa1fa5416c92addb7b01c62e529419e53a4e29746d0e4434d4d4fbd5918413e7521144c8758cdef9eacf5298108c2287783908c1
diff --git a/dev-python/pyzmq/pyzmq-25.1.1.ebuild b/dev-python/pyzmq/pyzmq-25.1.1.ebuild
deleted file mode 100644
index 7a6aa2779167..000000000000
--- a/dev-python/pyzmq/pyzmq-25.1.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="
-	https://zeromq.org/languages/python/
-	https://pypi.org/project/pyzmq/
-	https://github.com/zeromq/pyzmq/
-"
-SRC_URI="
-	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="drafts"
-
-# There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
-DEPEND="
-	>=net-libs/zeromq-4.2.2-r2:=[drafts=]
-"
-# It uses cffi backend for pypy, cython backend for cpython
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_USEDEP}]
-	' 'python*')
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=dev-python/tornado-5.0.2[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-23.2.0-libdir.patch
-)
-
-distutils_enable_tests pytest
-# TODO: Package enum_tools
-# distutils_enable_sphinx docs/source \
-# 	dev-python/numpydoc \
-# 	dev-python/sphinx-rtd-theme \
-# 	dev-python/myst-parser
-
-python_prepare_all() {
-	export ZMQ_DRAFT_API=$(usex drafts '1' '0')
-	export ZMQ_PREFIX="${EPREFIX}/usr"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		zmq/tests/test_auth.py
-		zmq/tests/test_cython.py
-		zmq/tests/test_zmqstream.py
-
-		# swap thrashing on low-mem hosts, per Debian:
-		# https://salsa.debian.org/python-team/packages/pyzmq/-/blob/master/debian/patches/skip_large_send
-		zmq/tests/test_socket.py::TestSocket::test_large_send
-	)
-	local EPYTEST_IGNORE=(
-		# Avoid dependency on mypy
-		zmq/tests/test_mypy.py
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# not implemented in cffi variant?
-				zmq/tests/test_draft.py::TestDraftSockets
-			)
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	epytest -p asyncio -p rerunfailures
-}
diff --git a/dev-python/pyzmq/pyzmq-25.1.2.ebuild b/dev-python/pyzmq/pyzmq-25.1.2.ebuild
index e647f9a638db..7a6aa2779167 100644
--- a/dev-python/pyzmq/pyzmq-25.1.2.ebuild
+++ b/dev-python/pyzmq/pyzmq-25.1.2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="drafts"
 
 # There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
diff --git a/dev-python/sabctools/Manifest b/dev-python/sabctools/Manifest
index f2be911b5549..b900b07f4b3c 100644
--- a/dev-python/sabctools/Manifest
+++ b/dev-python/sabctools/Manifest
@@ -3,9 +3,11 @@ DIST sabctools-7.1.1.gh.tar.gz 8963314 BLAKE2B 583ac11ba8f4ef9d0f9d04a1697bb7e09
 DIST sabctools-7.1.2.gh.tar.gz 8963375 BLAKE2B a404780c40cd98a605af58a79c9ecf7c5e479460db925c34486bc36621e749dcad363225e7a73e0222cc30b7bba8747d5d21ed4ac240c5df75485a2bd620e962 SHA512 7887ff3f6b46bd538540b591ab7b47a7b3efa277b45d69ed7329252b1f7326adfa6b286cc207a4262002a802c6acff03c0df4792e099da3dd8be1c3dd68a1ae0
 DIST sabctools-8.0.0.gh.tar.gz 8963761 BLAKE2B d6977c399801653bcc04136c614257a8dba952129ff87a06064518796bb4de1bf340b3f5ba1e841d05c33be804232cedc38da46991b69451661a89fcb2e2ede9 SHA512 0a1e17bbb316271fa620b037cd71a88b7a424206471766f8b77c81db7d7f2828fb58518916e51d4a3aa29f0615c31fd1da615f1b67838a31ee985c13b3045257
 DIST sabctools-8.0.1.gh.tar.gz 8963513 BLAKE2B 40fbd230c40b72f1a74e255f0b715f476c52b8d75c04bac9e5131065e1cb431581debc5bec9fac5060f172ed7ccd1ae282e6ed3fe93d2c24abef064fa9918b84 SHA512 170ccfec6807165954322a58910c1aaf368acc600b4cca10abd69e1b1859ff0d52058a846a0a0e3ebbdde93d6a7079efa418dd2453e73496f043c26532b64af2
+DIST sabctools-8.1.0.gh.tar.gz 8963885 BLAKE2B 36d6bbc34f636ac4e892f941eb6e583166ee1f5f740440b3f07faacddf7715d8b4c642a4e6252ece1bdef69017be3d04ce5d6c8e36479bb176e4cd0635f1567d SHA512 862c39f2e386622b528f120a431f214e1e2e92b7c5a751e47d0768f40ce06ad2736d867f7ac2e1810d676e980312bbfedd29951cbadeddefe75246cdcf53fcc6
 EBUILD sabctools-7.0.2.ebuild 762 BLAKE2B cdc9333c738724772186bbe75590def51a2a660598011d20ceab3df376bc693464e365072dae643bb007a9a7d310d4af1fbb9086426847f99698598697b28749 SHA512 edb4485c2d9e69a69dfbc310a92ba498f36d8836ca93423bbb628d772d7940ab781efe4ef093cac5adf89840d5815a1bc1736a1842ad56587263d7e3e978a643
 EBUILD sabctools-7.1.1.ebuild 762 BLAKE2B cdc9333c738724772186bbe75590def51a2a660598011d20ceab3df376bc693464e365072dae643bb007a9a7d310d4af1fbb9086426847f99698598697b28749 SHA512 edb4485c2d9e69a69dfbc310a92ba498f36d8836ca93423bbb628d772d7940ab781efe4ef093cac5adf89840d5815a1bc1736a1842ad56587263d7e3e978a643
 EBUILD sabctools-7.1.2.ebuild 763 BLAKE2B d9a775d03561bc3a14b6be4f22e9a47aaec3334c3cb8dc50e70b4cc39530391850960fc5c1d66d22031443f4c64234ea0ece75dbff301f6fe59f624b0c605ae9 SHA512 e0afba13f5d81df0805072dc39a46332640b4994227668e019558aaf721a46dfdba60fd0fe84d7da22291f3c7a7dbf2fa2a0b72dbcfee5618d596091726218b6
 EBUILD sabctools-8.0.0.ebuild 762 BLAKE2B cdc9333c738724772186bbe75590def51a2a660598011d20ceab3df376bc693464e365072dae643bb007a9a7d310d4af1fbb9086426847f99698598697b28749 SHA512 edb4485c2d9e69a69dfbc310a92ba498f36d8836ca93423bbb628d772d7940ab781efe4ef093cac5adf89840d5815a1bc1736a1842ad56587263d7e3e978a643
 EBUILD sabctools-8.0.1.ebuild 763 BLAKE2B d9a775d03561bc3a14b6be4f22e9a47aaec3334c3cb8dc50e70b4cc39530391850960fc5c1d66d22031443f4c64234ea0ece75dbff301f6fe59f624b0c605ae9 SHA512 e0afba13f5d81df0805072dc39a46332640b4994227668e019558aaf721a46dfdba60fd0fe84d7da22291f3c7a7dbf2fa2a0b72dbcfee5618d596091726218b6
+EBUILD sabctools-8.1.0.ebuild 763 BLAKE2B d9a775d03561bc3a14b6be4f22e9a47aaec3334c3cb8dc50e70b4cc39530391850960fc5c1d66d22031443f4c64234ea0ece75dbff301f6fe59f624b0c605ae9 SHA512 e0afba13f5d81df0805072dc39a46332640b4994227668e019558aaf721a46dfdba60fd0fe84d7da22291f3c7a7dbf2fa2a0b72dbcfee5618d596091726218b6
 MISC metadata.xml 528 BLAKE2B 5dfe580ccb2a5bf9abe052dd7a11451eea49bc2182455b4feef17f927e73fb93a3402bd02f8f2cf03295170831377ac0f33f081bfed2256a0718b5d95cd43d6c SHA512 9a33e306b81242609de76aa1d99e7785e6b3d09b789bf967c0b9fd6d6ca07a00995e3dbbd27d4f63f8beee7657910a40712e255f7875d5b432c5c4fa5ace7085
diff --git a/dev-python/sabctools/sabctools-8.1.0.ebuild b/dev-python/sabctools/sabctools-8.1.0.ebuild
new file mode 100644
index 000000000000..a500ef55dcbb
--- /dev/null
+++ b/dev-python/sabctools/sabctools-8.1.0.ebuild
@@ -0,0 +1,39 @@
+# 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_{10..12} )
+
+inherit distutils-r1
+
+MY_PN="sabctools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Module providing raw yEnc encoding/decoding for SABnzbd"
+HOMEPAGE="
+	https://github.com/sabnzbd/sabctools/
+	https://pypi.org/project/sabctools/
+"
+SRC_URI="
+	https://github.com/sabnzbd/${MY_PN}/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.md doc/yenc-draft.1.3.txt )
+
+distutils_enable_tests pytest
diff --git a/dev-python/shapely/Manifest b/dev-python/shapely/Manifest
index 75b79a457551..7e1d1373d86a 100644
--- a/dev-python/shapely/Manifest
+++ b/dev-python/shapely/Manifest
@@ -1,5 +1,4 @@
 AUX shapely-2.0.2-c99.patch 654 BLAKE2B 98ac763b8c6170708a3399f4f863d17ebdce9d9979832073c36539ba1d35cfb4388ba6442ea5fe954853c5c0149e80b03024fb915c6b7290eddd1270d078fdbc SHA512 9111c77d76f40c8d2595793091448b4e0d6d0696ce40dcc57d34285e06339e6537f7285aaaa88628302ab03dd591bd8bc1abb0091c5582cc17cf20a59a99986f
 DIST shapely-2.0.2.gh.tar.gz 330120 BLAKE2B 01630239075c767897635fb25573bc37469ecb7b03d62cef2d82b95a8bd7216864087b9bbcaa46c75850f2048efac2b171f2a78090bf4cd846e882fd8b549942 SHA512 7d19984a1fae9a4ec6abaa2f88712ff442272019976427a915ccd3493e3dc8fe169c5ab3aacf71f3104fc325f93b1877bfcbe9c44968b661feccc38eeeb16f9a
-EBUILD shapely-2.0.2-r1.ebuild 910 BLAKE2B a940f01ae4cf6ab65f612276434d870c0a2884c5bef633412aac2cea5c71bec8e1cda0bfbb04f0f6b1cc65d646672b93908dd4b2576521843cc45261df24bb78 SHA512 b62fc41c55092af45768f24f68623c2029b292c9caa17e3a553614a974361f24681ade4b372d348d6b3f22cb8f17d2e9f066023f5b61f89a98a35cfb19b7d1fe
-EBUILD shapely-2.0.2.ebuild 858 BLAKE2B 1aa394852469b0bcd9544266c49905074dbc55c5c3d5784fe478739208724c48c99f51745306a57e791085420c3abec97b1588689eb03e04d9d14b85d5fe0158 SHA512 cf24c0612e427daa1b195cbc4d58bffce046aaaf4665dee7f2ac1a8a464f0bf00302b295d8d34da083e290e1a057dd649c6934ea03f4d3a907d0ecef8deaf7e4
+EBUILD shapely-2.0.2-r1.ebuild 908 BLAKE2B 981914079fe91d48458bf996b28075adda077e466881087da1747855137a30381e019dd2979cc362091749beafb99bd843d921681c71ff7530aa41dc0206d91f SHA512 2c88ef45d768032271e17144b4d3b1fed9f7a92c346978a0a0b1ddf491e63261800b5f8da9c7f09b04d5e2234c856059d9f01fb98547fbd14835e5da251cbe1b
 MISC metadata.xml 1000 BLAKE2B 9be4c31c417a5660338f479aee97ec224a420cbd1ebd665ff4269a9920e16a5d78b494790bd1450ceb8be0d1228666cb5f7559b76abc669b8a15e61fb683a38a SHA512 044961ebb0caebfdacfd130fa5ed132b3ce59d0f3343c76d394e2e1cd5544bc23d3013e5b206597960f514da0203d59759a115daeab1291b6ce40ca5bdce6c8a
diff --git a/dev-python/shapely/shapely-2.0.2-r1.ebuild b/dev-python/shapely/shapely-2.0.2-r1.ebuild
index 794dd6b9b43e..4a6a38514cb4 100644
--- a/dev-python/shapely/shapely-2.0.2-r1.ebuild
+++ b/dev-python/shapely/shapely-2.0.2-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 DEPEND="
 	>=sci-libs/geos-3.9
diff --git a/dev-python/shapely/shapely-2.0.2.ebuild b/dev-python/shapely/shapely-2.0.2.ebuild
deleted file mode 100644
index acfc3a8a7763..000000000000
--- a/dev-python/shapely/shapely-2.0.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="
-	https://pypi.org/project/shapely/
-	https://github.com/shapely/shapely/
-"
-SRC_URI="
-	https://github.com/shapely/shapely/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-DEPEND="
-	>=sci-libs/geos-3.9
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${DEPEND}
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf shapely || die
-	epytest --pyargs shapely
-}
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index 6f7f27ec6b0c..db9c921cd165 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,7 +1,5 @@
-DIST starlette-0.32.0.gh.tar.gz 2839571 BLAKE2B adf6b382b267f77309cea1914e980df3ec6e1a05c2ed535c9a26518581349523f9ef5b07c3b97af9123950a52b4ea43acd257527e00a83423b992ce93956b86e SHA512 4b655af29e0a2e031db4155e8697d23abee1e100735904a47b0989faf56a9a05c007a672e6576748849347aaab931c8c1ea89a09d77b04ac8b55a78284ab551a
 DIST starlette-0.33.0.gh.tar.gz 2840495 BLAKE2B 64bf929409be913bd193d0a929c7ab158383ea69a31a98833f425d68f308a1459998af89b631c6db34a32ef599e10fa0dd11c07c7d74e90de2ff10d2a7378a46 SHA512 4ebf75b76656a23599e45b839451af13261ac893efd4dcb3fb1a23de79e9779e8a1e007e3f8d755228f8348aa3e7d821e885774a8fd04a1efac45776cf00790f
 DIST starlette-0.34.0.gh.tar.gz 2841390 BLAKE2B c7eb980fe0a1a6fff0e2bb0c2bb0af4a409933a51de28d2641698f39f8280e7e1d767927f6f919cbb6e5817d34f81b48835c3ad8600c05c6194f70e4f0475d39 SHA512 bf8ce6b665f91e0410dca7b4f427f07cf977f5e9dd6614cf7c06ef2521e359410cdfc2008d7324a500c68bb8b1ecfd9b3a165c7dfc62a84c01762910debb981e
-EBUILD starlette-0.32.0.ebuild 1137 BLAKE2B 35b6093daf96407877ee3b705e67fb9a5ecabcd12f652efdab990618f99e071ba218231d24760de4904fd4da46adc862d7022ddd256e1510b195454a8367c7ee SHA512 a6914801c50ae27c0195dd6fa3e792a464b46a94b3f2e372ca9a78b88cccfa4a777c9a2ee87e9d6dab9a1fe2c134a526f0417cd48bf9ccc3e794369927783083
-EBUILD starlette-0.33.0.ebuild 1145 BLAKE2B 96a1b0e3328e0d0d31cf2f30bdfeb11759f30be9a861844e13eb40f375a95fbc2b6cec2c54734ca300bf256b865d98f2f77c0e0065f7dcddbe3bb67a5fb4d856 SHA512 d3735cee3c781dce763dcbb49fc60ecc980372d9ed20e8d8c2d05c4d50b9df46909632b73b3ec4f02617878e5f4445840c8b8c9fdc54bdd1fc24c42f77c20120
+EBUILD starlette-0.33.0.ebuild 1137 BLAKE2B 35b6093daf96407877ee3b705e67fb9a5ecabcd12f652efdab990618f99e071ba218231d24760de4904fd4da46adc862d7022ddd256e1510b195454a8367c7ee SHA512 a6914801c50ae27c0195dd6fa3e792a464b46a94b3f2e372ca9a78b88cccfa4a777c9a2ee87e9d6dab9a1fe2c134a526f0417cd48bf9ccc3e794369927783083
 EBUILD starlette-0.34.0.ebuild 1145 BLAKE2B 96a1b0e3328e0d0d31cf2f30bdfeb11759f30be9a861844e13eb40f375a95fbc2b6cec2c54734ca300bf256b865d98f2f77c0e0065f7dcddbe3bb67a5fb4d856 SHA512 d3735cee3c781dce763dcbb49fc60ecc980372d9ed20e8d8c2d05c4d50b9df46909632b73b3ec4f02617878e5f4445840c8b8c9fdc54bdd1fc24c42f77c20120
 MISC metadata.xml 371 BLAKE2B 0ccaa4659e63162b565359a1cae05764bea66d708a5f4af1a4716ba9ba23faa39ab4f5a806c0a9783f3f42282ee9b98e22a92f2b308b8dfe97bbf9c770a8add1 SHA512 0fc326941861260becd4129c8a351e89ba0f98f9a3ce9b5d50812f0eaf667743ab0d403889aa1b0a2d9fcedbe0212ba879d165ec8edd115686d4768e6b1326ca
diff --git a/dev-python/starlette/starlette-0.32.0.ebuild b/dev-python/starlette/starlette-0.32.0.ebuild
deleted file mode 100644
index e26ea3f5cc28..000000000000
--- a/dev-python/starlette/starlette-0.32.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/python-multipart[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/starlette/starlette-0.33.0.ebuild b/dev-python/starlette/starlette-0.33.0.ebuild
index 5157f33105ee..e26ea3f5cc28 100644
--- a/dev-python/starlette/starlette-0.33.0.ebuild
+++ b/dev-python/starlette/starlette-0.33.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 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-5[${PYTHON_USEDEP}]
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
index ae3ae2b60e9a..be755e32ac7f 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,5 +1,3 @@
-DIST termcolor-2.3.0.py.tar.gz 12163 BLAKE2B a500cc13b0a7d43c32981f82408491c6fd30e489c1729bdbecae6e13e9deefe4a54944da56a241bc5c5f5411abfc2671dab8bc3ae23adf907f7eba617223f308 SHA512 0ccfd9320235215b85ddbf099399aaa325dd7176be7a39225377a81c372f9733105dcfe4a9e577cdca451be1f9b5538a071fc511bccd226fe0c4cbecb536bbf3
 DIST termcolor-2.4.0.py.tar.gz 12664 BLAKE2B e5cf8f3ce1d27ffc0128cd9c1e38323e1e579a7a4017254a1d03c5f5baf0fa897522134ea68929c2e492b933fe8a6c3d79b55cb674fa3af134445581d870bf85 SHA512 e715940ccc8863baae020345cabc8fc90b5bbbd5ef4b384de96920a90d97508cee6f863aa39a2c08971e58f45cf85ec73c0659715f54072bbc57612681138355
-EBUILD termcolor-2.3.0.ebuild 700 BLAKE2B 42db3063868893d11604b7d0e51671c8103f250294e8bbba51eb5c5bd05e8ab85e15f1b234a0ccf37c1f975104ce59e9852c591e583cfbfd3b3cb5fced80c644 SHA512 cabe7b28534e5662d2aad2180a6b0434d400a2d2f4365c95c3bb7a23360a116643ecba373d02fecac783a2e12514389985c1ef92cfddad0b2f4097370ef1caff
-EBUILD termcolor-2.4.0.ebuild 708 BLAKE2B 73bcb4dd84ddd23988a905352da49bcb1701f9875fdc63a46c519ea63f0cc27b26c54fc78426cbabfae73d1cd399fb1d55cd56cef8bf5b25426c1ed4d164475d SHA512 160e5f3dc3558bb4a52d8803e1978c6769d5ce0dbf2823b665bf5bca60228d6a0be9915554f0f8421dcbf75e29effacba816aa8e91578f791048b429760c3334
+EBUILD termcolor-2.4.0.ebuild 700 BLAKE2B 42db3063868893d11604b7d0e51671c8103f250294e8bbba51eb5c5bd05e8ab85e15f1b234a0ccf37c1f975104ce59e9852c591e583cfbfd3b3cb5fced80c644 SHA512 cabe7b28534e5662d2aad2180a6b0434d400a2d2f4365c95c3bb7a23360a116643ecba373d02fecac783a2e12514389985c1ef92cfddad0b2f4097370ef1caff
 MISC metadata.xml 530 BLAKE2B 6a8fc517eae6f2bbc099ba4e24cfdd48e6baf092baaef4921e9665521eec54c741a7cae9bb4d03cadedb845f5d5cd631c46544709c3efc4d4103408a57f35c26 SHA512 c2bf2f0aa44c39d4c9b2865c7f0a8abea0956bbcaed38485de60b7baedcda0df2f71d34e4a6bb5355eccbaa8dcc21e8c1b47d948d968668e3e55c3e8d7f3efa4
diff --git a/dev-python/termcolor/termcolor-2.3.0.ebuild b/dev-python/termcolor/termcolor-2.3.0.ebuild
deleted file mode 100644
index 997bbd927f97..000000000000
--- a/dev-python/termcolor/termcolor-2.3.0.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=hatchling
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="ANSI Color formatting for output in terminal"
-HOMEPAGE="
-	https://github.com/termcolor/termcolor/
-	https://pypi.org/project/termcolor/
-"
-# rename is for avoiding conflict with dev-cpp/termcolor
-SRC_URI="$(pypi_sdist_url) -> ${P}.py.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/termcolor/termcolor-2.4.0.ebuild b/dev-python/termcolor/termcolor-2.4.0.ebuild
index 7ace1b1d05f7..997bbd927f97 100644
--- a/dev-python/termcolor/termcolor-2.4.0.ebuild
+++ b/dev-python/termcolor/termcolor-2.4.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="$(pypi_sdist_url) -> ${P}.py.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index fbd7d18ae3ef..5761c5efedc8 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,5 +1,5 @@
 DIST urwid-2.2.3.tar.gz 677723 BLAKE2B 4aeae29e557e0ecbe902b56865feef3b2978263e657f2159194d8334852627ac6ccee82730d6a7e24b8914e5548ca88ac00eeddd7c2a34299d135843a99008fb SHA512 48588d0c819b229bdaaa70bec3a279c3bf232b8520d95e1f45a83bea927244634e91fd47cc161647c2d8155e523543549bc5ed2ccb5eac29843e12515e5dfd22
 DIST urwid-2.3.4.tar.gz 678305 BLAKE2B 1b0de4ae4a18751275de968da9899e934277d8f9ac24cd1363ec9bbef48492f5fc6e00785c75447c8eddba2952fb37689b1e2b7b74a430590020b3aa77979f16 SHA512 e1ed9357b738975c909f847a2f12292cfad1cf824be9d3818ca0de3d1ca5c992ba89d5cea25888db3a8bb6c73a64b94ecb1df0a19d5af7f7b060bd113f93a8dd
 EBUILD urwid-2.2.3.ebuild 815 BLAKE2B fd114925b60d335c752bce1c6ff0c98963e2e345607bc11b3a933a30004fda86818c8e04ebca5b5df0481d56898aba7996f298c28d89a179c431acfe79e05f69 SHA512 3d3cecc0da00a02e14c18bcf2ec1682d9ee1d13648df1524b008144a502524cf0eac03d864f6bebbf3a900f07d670411984350376dfc1e5fc3406718e018b3ee
-EBUILD urwid-2.3.4.ebuild 822 BLAKE2B 8e3fd8ca2dae9ebac601cdef2713048ebb9fb8350d6e667afcdb812f767136d6a361760d0c4643e7a873feeae4114575d012d08f1ed1738411b1c80f1dd1bfb2 SHA512 8dbdbd3a07ccd7e1109979ee4cc17f0e833dddf62c41e9efa7e88dc7797345043765918f66761918d8e8c43a4e013367f72fd656297c389ec12aada78cb6df1d
+EBUILD urwid-2.3.4.ebuild 816 BLAKE2B 0273af6d5fe55b6e88e80721605e73fd56caf56c4221799098ab76732138974cd8d32057c6575d4d07ea14200bc62935df192b67599b7297fcea4715949647bc SHA512 ff00c3da5c2e82a350cd91c51c9fed24e2820ffc81b448214d76846479d43f6b2abce6c63ae3812e1be19110d5e9997704a8d6f55c24c61d4b6ee2db7c2f6b6e
 MISC metadata.xml 1194 BLAKE2B 387c1e6ca71806f706b054e11755e885c7bbe11e6be1b639a6160e0b2c51df91feef025f6166a973a38e8ad16fe7627ba6f2b5e293c007da8a1e32e46db1541d SHA512 ee6bb39746fdfe3ebcc83304cb9d7c7cce16f4caca284bd82907fd13672bdcf982f1fbfba22b0877da8de9f6cdadc4045916eff678095320745eab954960ab6f
diff --git a/dev-python/urwid/urwid-2.3.4.ebuild b/dev-python/urwid/urwid-2.3.4.ebuild
index ddf92bfdf600..b24d7e4b06a4 100644
--- a/dev-python/urwid/urwid-2.3.4.ebuild
+++ b/dev-python/urwid/urwid-2.3.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_tests unittest
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index eb576919a6bc..2d8ef287a96a 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,5 +1,3 @@
-DIST virtualenv-20.24.7.tar.gz 7141024 BLAKE2B 1125960c3a0b84f1350a9b427e6387dacbf2b2c5ef827bd21d61b5b0fd2e0c81c01b452390b1ec96ed139ed42d3f061394c82227c06a873bca9c21bd5a8fcfbc SHA512 fdfa763f026665cf8bd624192f71853c00b22f0b34f4bf4cd629c928a3c666f60d3dd7ee10c3c46b9a8b383cce51015c5fdeb891e9c6033b02563686d5e7790e
 DIST virtualenv-20.25.0.tar.gz 7150307 BLAKE2B ebe36d523d23aa6e29b53cf49e536aa0f2ab6bb2edcfaed3ba89456893a0cb9fb7bf8f97c61f12725a57023a6b565a0de797f988714469e2166da5d63652d54e SHA512 f4d8acff9d5837aa40eea18810517d4f1b9936b567395d6216bbda36e84b24f8efc584586cd2d168491139b346513d924e371b6b1396833fbbfedebef8620b94
-EBUILD virtualenv-20.24.7.ebuild 5086 BLAKE2B e6accacdff191403d255cef345eb094d74c45dc5f291d762780ba74469d4560083a21d987d60f1ecc18ef8fc00c9596bed3f8381b9f8162b3ea5b786a4ae5835 SHA512 41c9e8a2a6998dfaa48ec4049a6164d6a3bffce8a73c3ec1c7e5c3ec3b2d5bb4c08da760d1631ab4d06ebe35236d64907f43c4b5257f547663c3abe04761e40e
-EBUILD virtualenv-20.25.0.ebuild 5094 BLAKE2B 0a51379a7f8ef0ae2abe437cc3ae9361600b8782267b358285356539112dd22f832ce31c3635e8879e2b061f00cad72f7e6a1302fa2914271daa651b6f92f2b3 SHA512 5549f68b8f067ee21a83e3492742d7bcb0471e35ca2e6d4e2199899eb3814e8890eb9b08568325a3cbaaca94ffa654f4bd1df06d833d2d79518b42c3b5934dbd
+EBUILD virtualenv-20.25.0.ebuild 5086 BLAKE2B e6accacdff191403d255cef345eb094d74c45dc5f291d762780ba74469d4560083a21d987d60f1ecc18ef8fc00c9596bed3f8381b9f8162b3ea5b786a4ae5835 SHA512 41c9e8a2a6998dfaa48ec4049a6164d6a3bffce8a73c3ec1c7e5c3ec3b2d5bb4c08da760d1631ab4d06ebe35236d64907f43c4b5257f547663c3abe04761e40e
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.24.7.ebuild b/dev-python/virtualenv/virtualenv-20.24.7.ebuild
deleted file mode 100644
index f88ff8d25e6f..000000000000
--- a/dev-python/virtualenv/virtualenv-20.24.7.ebuild
+++ /dev/null
@@ -1,122 +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_{10..12} pypy3 )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# workaround test failures due to warnings from setuptools-scm, sigh
-	echo '[tool.setuptools_scm]' >> pyproject.toml || die
-
-	# remove useless pins
-	sed -i -e 's:<[0-9.]*,::' pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-				'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-			)
-			;;
-		python3.12)
-			EPYTEST_DESELECT+=(
-				tests/unit/create/via_global_ref/test_build_c_ext.py
-			)
-			;&
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# TODO
-				tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezegun )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/virtualenv/virtualenv-20.25.0.ebuild b/dev-python/virtualenv/virtualenv-20.25.0.ebuild
index e19def335af9..f88ff8d25e6f 100644
--- a/dev-python/virtualenv/virtualenv-20.25.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.25.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 
 LICENSE="MIT"
-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"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 7500b489611b..b4512d115e12 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,5 +1,3 @@
-DIST websocket-client-1.6.4.tar.gz 51905 BLAKE2B 5bfab632bfa727ad950c4898f52422b11d9c1582567295dd0833321d494d33c057e94e40fad8d612e2aca6efe0fe03595bcfebd1e890c1b15a6fa97864818e59 SHA512 d5a44c78bf5f6d4b5a1344bf6d5c94435e529dd85ee5d7fe5552478bbf2e57229ca7573b28a93fa28d1e5cf72fd721b4456bb5e154db578ec652cbc82316413b
 DIST websocket-client-1.7.0.tar.gz 54037 BLAKE2B 6a37b17c0a428dfacfd441384469954bc30f5ca5cf8380c08b45337ebdd69999cbd14eb0f0cde3c33d2f5c2698dac9a34eb51430bb810ab6edf8130415e98a4b SHA512 1f6b3253f7febd053e1271bcacd71701ec27d6921ba9791b16a203c8b7240925284e033dba4ad5d4c56a88568dc57ecb760c254964bc3bb4e87df52573239a9a
-EBUILD websocket-client-1.6.4.ebuild 789 BLAKE2B 259d55e55d770593c07a5ba2268d420897cc3a113d86c9755d583e7dca210a611c8602c8ec39107829f056f28b9105037ffa528cf83033d72fbae153d7cce180 SHA512 b56e3801d253fa50a17346ac939c0c8f54e73171b37e46e2ba890014c1431a9ae8ca4f3f0e33f4a0adb72a0d7ea98c232cf1ea4f2f1bc74b2d5e3fd2505de267
-EBUILD websocket-client-1.7.0.ebuild 797 BLAKE2B 51f87d9823f7bc4253193fd671efec6b554b3537604cc41d1b22a78ff1d41f81a7e0e8628515cb367dcf9cd8b1ff1fe4453be51ba0e7179918e3557b918bf9aa SHA512 71e19e260b647784cf2bff64da09d5cbc7bf54441276c3ec95d5f08af6c59696a27874aa6bc073f06ba19dc70feab8e0e8a71561141c17c9b83a625d8659ae4c
+EBUILD websocket-client-1.7.0.ebuild 789 BLAKE2B 259d55e55d770593c07a5ba2268d420897cc3a113d86c9755d583e7dca210a611c8602c8ec39107829f056f28b9105037ffa528cf83033d72fbae153d7cce180 SHA512 b56e3801d253fa50a17346ac939c0c8f54e73171b37e46e2ba890014c1431a9ae8ca4f3f0e33f4a0adb72a0d7ea98c232cf1ea4f2f1bc74b2d5e3fd2505de267
 MISC metadata.xml 498 BLAKE2B de7c287e513c7e64b4bec29693e6eb9104ff963e0d4d942ed37402bf341739fb17b2ebdb1bf0aaa0081934bae34e16f025d0549f94c1a863be95d64a338eede4 SHA512 13dd8cf0f3e363a3fbf2b246bcc1ccd78a898d5ca830e30fb1606947ce129d99f2d8065c3668dc2c7749bbd4e24e39e5a7c483065737a580246a89dd4d41eaa7
diff --git a/dev-python/websocket-client/websocket-client-1.6.4.ebuild b/dev-python/websocket-client/websocket-client-1.6.4.ebuild
deleted file mode 100644
index 596f7a2a7b64..000000000000
--- a/dev-python/websocket-client/websocket-client-1.6.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="
-	https://github.com/websocket-client/websocket-client/
-	https://pypi.org/project/websocket-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/python-socks[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-1.7.0.ebuild b/dev-python/websocket-client/websocket-client-1.7.0.ebuild
index e70ca56c7688..596f7a2a7b64 100644
--- a/dev-python/websocket-client/websocket-client-1.7.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-1.7.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 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"
 IUSE="examples"
 
 BDEPEND="
author	V3n3RiX <venerix@koprulu.sector>	2023-12-20 19:51:59 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-12-20 19:51:59 +0000
commit	1fb8608d6f0b1acf0e34361c105533087a09c710 (patch)
tree	5c247db22c44a72ff61ecd68477ed3d7ee357cb8 /dev-python
parent	aec6329fe6b56821fd643ccaacb4d5d61f4eaad6 (diff)