gentoo auto-resync : 08:11:2022 - 09:23:49

author: V3n3RiX <venerix@koprulu.sector> 2022-11-08 09:23:49 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-11-08 09:23:49 +0000
commit: f077c725ef746943ec7902350b30ff569f5995ba (patch)
tree: ac5ad0215e09a9daa3ce0e55095401ead1936ac8 /dev-python
parent: b6cda9acfebad17184578dfebaf2434ef2884883 (diff)
90 files changed, 162 insertions, 2825 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 2616c4cb90f9..ad32c18167ea 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/abydos/Manifest b/dev-python/abydos/Manifest
index 4bb0c34c7720..bf97386a9fd4 100644
--- a/dev-python/abydos/Manifest
+++ b/dev-python/abydos/Manifest
@@ -1,6 +1,4 @@
 AUX abydos-0.5.0-fix-py3.10.patch 719 BLAKE2B e0607ecb3633642be5b2b034088b7dd097d9dab3acf44619a3fb9493b8cc91dee4b7fdfc2564d88d60ffb83991a95d1f71838e2b48968a1983cf491a59d15c91 SHA512 12730eb82a3186f62da662456fd6648437ac631a3f0278d5840919b13d2798c154115c60f2301560b64234c28b30c68bf761989c682e57cd34c6279e92dcb531
 DIST abydos-0.5.0.gh.tar.gz 21321759 BLAKE2B 1f14675f42e849e5e1563dd858bfb2bf040e25b0f90cb3da9986492378892bedd0f23eea990cd65d804aececb350b0e90fb27921382a8df8b91e55d7f820c27e SHA512 28aeea4ba16ea88b077e8b9902f5d8b3a650eeced489687daf9af0e4aa437eaee6c8eeb0747dd5a8f95291594064a1221cc1da2dfa989978bcc870045fee3531
-DIST abydos-0.5.0.tar.gz 21321759 BLAKE2B 1f14675f42e849e5e1563dd858bfb2bf040e25b0f90cb3da9986492378892bedd0f23eea990cd65d804aececb350b0e90fb27921382a8df8b91e55d7f820c27e SHA512 28aeea4ba16ea88b077e8b9902f5d8b3a650eeced489687daf9af0e4aa437eaee6c8eeb0747dd5a8f95291594064a1221cc1da2dfa989978bcc870045fee3531
-EBUILD abydos-0.5.0-r1.ebuild 981 BLAKE2B b7fed06f873295a9b8e9e63fbb74e9c1f22554680d278afaf7ef8ace71e5e7ca3f4dc736eb07f3125a01e67d1a224e5ab5378716954c230bb9cc48102efecc9b SHA512 5804aa55c3672d492e12299a7d7612eb3736429779bce20d7084e88d1b0ef5c9aef9f3397a92b0c02f00774e4754d2ab3e7afbb3507a92ad2e4cf66fd78db477
-EBUILD abydos-0.5.0-r2.ebuild 1017 BLAKE2B ec16a44c4b7533ab84d941a24e193f42555b78d2888bd923ada5d36aade9b5c5ab6004dc32cddd89f5a37943d4ba735cb90be49dd609002937b9c21562871fad SHA512 df39b0a9651d1ab7ff2ec54886a6ac6e089b0dac8e156c7d28bb0383823bbd48e00088f758d7cacb711875aa77350a7f5a0063f127a1da7e1488c2e8730dc5b2
+EBUILD abydos-0.5.0-r2.ebuild 1015 BLAKE2B 2889b268ac176647be3334bc3e59aa741cec7a024295415a192dba083637d4c0307dfaa04ed807fd8608d457bae69b81917129e0fd116d177383c8954d0c69af SHA512 148ebf90b3c3114010e8101fd4db7548e062ea1a45d89f1e7e332a7f70c64ce7d228771a2cf97d23b8f39fa592b9efbb0c9f09c5ac56d84f5a66dfb20d3fb566
 MISC metadata.xml 407 BLAKE2B f28b4d12169f91e75d4bdb117fef6bc8e3a1a1a9bce3498aa11a26d1ad71c486d4ee8a76084551d3563530a2d492c2f47b4d8f830e00d7379fe079ba1e3df8a8 SHA512 1738b7309d3a9f0e90c5716ac0376274d1f34bb3264d8a3bf69dfe020724417f1b89b1883eae34bba9cd0147b5f2e8962114a216a5e684fd10365505f684fac4
diff --git a/dev-python/abydos/abydos-0.5.0-r1.ebuild b/dev-python/abydos/abydos-0.5.0-r1.ebuild
deleted file mode 100644
index dac00c9b4154..000000000000
--- a/dev-python/abydos/abydos-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abydos NLP/IR library"
-HOMEPAGE="https://github.com/chrislit/abydos"
-SRC_URI="https://github.com/chrislit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-# Requires access to the internet
-RESTRICT="test"
-PROPERTIES="test_network"
-
-RDEPEND="
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/nltk[${PYTHON_USEDEP}]
-)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests pytest
-# Extension error: You must configure the bibtex_bibfiles setting
-#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-bibtex
-
-python_prepare_all() {
-	# do not depend on pytest-cov
-	sed -i -e '/addopts/d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/abydos/abydos-0.5.0-r2.ebuild b/dev-python/abydos/abydos-0.5.0-r2.ebuild
index 22bcda516f48..65f0c11a6a3a 100644
--- a/dev-python/abydos/abydos-0.5.0-r2.ebuild
+++ b/dev-python/abydos/abydos-0.5.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/chrislit/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 # Requires access to the internet
 RESTRICT="test"
diff --git a/dev-python/asteval/Manifest b/dev-python/asteval/Manifest
index 9e137e7c2a51..4e87633357b5 100644
--- a/dev-python/asteval/Manifest
+++ b/dev-python/asteval/Manifest
@@ -1,3 +1,5 @@
 DIST asteval-0.9.27.tar.gz 41789 BLAKE2B 6db628dfc90479b605370e6cd4c3eb27a6fdabd2422016aab200ddb217fc5459df77ae99397145511600ae4a79e259c9e7c75c3be50bf5201e08915a76ca5571 SHA512 b56fb81f1055ab66868084edb89775ec87f40ee45563531bf4661ee65656e777b388856e691740af60b4a3891e872683768ac590a78fda2fed9173e613aa7263
+DIST asteval-0.9.28.gh.tar.gz 39784 BLAKE2B 99c74b7d9f01de07dc568a5276852e66dd6c520c45af91b9471bc6f9485ac50bc20bc96df804188a610bac01e8e34534e8bb157784afd6b1799ca97280e4c5ed SHA512 108652594a0eaaf009b8652ced9000ef7454d8f33fe844e74fb1dd78a2ead42a60d5ba68845c8d9c9d8570a70b5958519a6350d77c66257a7fa18de23802c3b0
 EBUILD asteval-0.9.27.ebuild 610 BLAKE2B cb14facf2eb312582fd5395da3514d891d1c45f3dc94db15918e746f5c4f56110fa47287353a1f95f68b48f783cec3434c75196964c174e0c3e9eb36ded0cbbd SHA512 4f10dbb6ed34ffc47f169e1bafe31508a95ff9425d6b7f35c37da19d2e19bfd979cd39c0e5a31a3ed8e85fde63d044da9527f5760232fe3b39ca3b93fe932112
+EBUILD asteval-0.9.28.ebuild 693 BLAKE2B 4632ac0d69b576cbacc9e1a143576a4498efe7526ad89b73e8c3d7258f4fa2e543035edb1402837c7cada3e059625e17fa3071e8417ae72dd101e9216c09de05 SHA512 3681b15c185bf4b082c32c8b4525e7a893f1d05c81165ceeba8b006f8e551bbf99a94b28da1ed09477cab107432764796a1b2c4e164e7b40fef0dffe527dd82c
 MISC metadata.xml 388 BLAKE2B 8167e3615c8fbf4fdbee5ac6aa354ed365c255ece5a3793a5a9b9db68206781230437f824360c5ff7223ee70c33da9f2c2be1d9b7c9d7f4413b9da82b1a96c2f SHA512 a4185b786faa55a63dedb33b0a2ec1900f2e9fca3887d1531963047be795271c4300c51238afeaab98f39778b1cdace3193b1fa4b3e400d83f7201392b09f221
diff --git a/dev-python/asteval/asteval-0.9.28.ebuild b/dev-python/asteval/asteval-0.9.28.ebuild
new file mode 100644
index 000000000000..f2a91b2237be
--- /dev/null
+++ b/dev-python/asteval/asteval-0.9.28.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Evaluator of Python expression using ast module"
+HOMEPAGE="
+	https://newville.github.io/asteval/
+	https://github.com/newville/asteval/
+	https://pypi.org/project/asteval/
+"
+SRC_URI="
+	https://github.com/newville/asteval/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	epytest -o addopts=
+}
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index bf111510f082..7d61e69427a0 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,5 +1,3 @@
-DIST astroid-2.12.11.gh.tar.gz 436132 BLAKE2B ba3aa5766e669d1b509856cd8eb8cb90f6483b8459e6a2511945c4c54f28d86179b3420d6bfa26f54cf459926114d34dd2fe7d775f356eda17f995be860672a3 SHA512 1e8e364bcebce90d06f90494e2a029bfeae89a0dd3120400fa6ff5098ca05ec7c7f520336cc3b174ac007c81e272d774385c35f94762789b767d38e603c7d41d
 DIST astroid-2.12.12.gh.tar.gz 437277 BLAKE2B a1f549db526b1012e76e1da480e779a35971e8985f452eaf5ce1bc6735c5210db5c2282685dbaa2f1720a1e1fa6cf6f2152fbb8c782243cd11e09acc427774da SHA512 61047c1aa31b5b0a80c604194a91341c474062e2f1094316ff9b03641ecfe3ddf25b4a3b26356561f9c16d8b5599694ecef275ce5846792a18bcc0a7ad3e720f
-EBUILD astroid-2.12.11.ebuild 1809 BLAKE2B 989055cbea9fa3c74f80b54efe69005c1d9f802aa9c0b6c91105ed77dbafd3406e955e98c4acd8b51a5dfc5126bcef001fa00a8d6dce186cb8011ffcb1cd7a07 SHA512 46c0adf7b503d3716baadad6fc9fb1fe61dff5ca4e11c5225354cdd57b0afb1a05e66a8650dff8e76fdd45062e16ba89c639e24405238c175e6e715b4a3a313f
-EBUILD astroid-2.12.12.ebuild 1817 BLAKE2B 8e495b2ba1a5ba50cd82944562d02f279cb9915cff1487ae13e3d752f0341213cb2be6b7a0ad3c88c9a0e09258c8b007ee557fdccfe821fb38d818015a141030 SHA512 18156ef33b1c5bde959cad1afc1309435eec1049e631edece13070713988d76b9ebe5574a15d64fd3098e62a7d74c3c3d6c1ebf500f6811aa7f76d35389d2617
+EBUILD astroid-2.12.12.ebuild 1809 BLAKE2B 989055cbea9fa3c74f80b54efe69005c1d9f802aa9c0b6c91105ed77dbafd3406e955e98c4acd8b51a5dfc5126bcef001fa00a8d6dce186cb8011ffcb1cd7a07 SHA512 46c0adf7b503d3716baadad6fc9fb1fe61dff5ca4e11c5225354cdd57b0afb1a05e66a8650dff8e76fdd45062e16ba89c639e24405238c175e6e715b4a3a313f
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.12.11.ebuild b/dev-python/astroid/astroid-2.12.11.ebuild
deleted file mode 100644
index c357b7dfaa59..000000000000
--- a/dev-python/astroid/astroid-2.12.11.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-		tests/unittest_brain.py::SixBrainTest::test_from_imports
-		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# some problem with warnings (our options?)
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.12.12.ebuild b/dev-python/astroid/astroid-2.12.12.ebuild
index a7561581a64c..c357b7dfaa59 100644
--- a/dev-python/astroid/astroid-2.12.12.ebuild
+++ b/dev-python/astroid/astroid-2.12.12.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Version specified in pyproject.toml
 RDEPEND="
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 71fc09a5e5ba..60cdaeb6c8ed 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,5 +1,3 @@
 DIST black-22.10.0.gh.tar.gz 1177403 BLAKE2B c8185f1cd16bf890ad0c75a50ccf211eb8e0d50a62654abc30ff6404818c323a08551d9a79194d05df6f4f92c4c7bca43b1d317243d84542f8eda3dcc0b2895c SHA512 ec03dd7b29becaabac1393d636ba394182c4fdacc57112980c76485f05e8fdf41e23cf8dc72dfdf530a5f060e709a0bc9d60d797e897020ae036e0a5410fc4b2
-DIST black-22.8.0.gh.tar.gz 1173503 BLAKE2B 851e2dedf35871dc07caaafbffa15aa91e18640a352df717e19dc98b48134af21343e36faf90899fedd700149f988f5385c18c2d01ca330ef6e7a721cbe41a38 SHA512 f9db2079aedb14a8d9388a2c0997ffd55c74636d487ef7a3ad86fcd038a3e5d3f63168a1bca266b3e3128cd8590a641bd4259be9c238a8df968c3c085682d3b6
-EBUILD black-22.10.0.ebuild 1466 BLAKE2B 072a2582f272391ea621754053f24db0a5fd7a7c2d2dfd5500f392111987987f29933da5cca4be26a7c33039698363f2a7328e93eb6a2c3b675167746fa373bd SHA512 fd34188e6961a7e31705995d12005fdc09765003d87910de17782d7a689556ab3a33586927f30c2595c2e3df14c4f20e9f5173183ac4bd3699ca04fdb1d39fd5
-EBUILD black-22.8.0.ebuild 1454 BLAKE2B 30813b617fd5de90fbea17ba485785b4ef5997a112c4d3c17310c368b32e06fae0622ebcb72d02a7ce0446871e9ddf3e3dd57b64b1c766da24376a935d154133 SHA512 05ead152cca0fd418d7e18bcc5d66a129e11825dcf2820f2f8d34b35e928742a117cc46e21db4acbfcf6ae628c1e6b99fd32c4d3bff20e31dce78b156ae3853e
+EBUILD black-22.10.0.ebuild 1458 BLAKE2B 732e396bcd769aaabe77a98e379bed54cb1a3f8546ae59df723e673d69e5ce48f8587433451ded9cd21d735c2fbe2164cc27a055e3a4e49e05b820de8932c5e2 SHA512 65fb488109e2e9418b8eda50d6301f54245ef725f17482b41eb5a5ff342a4618af5246f89ef1599b492ffd91ef8712c9509f374110f0b88dfbcbecf42508478f
 MISC metadata.xml 397 BLAKE2B 505ed4127741ef8d2fd77c36e6ad2d6168dca8ae5570cf7606a557fad29393c0dd78fe2eb1fe990d9d69abec19fb65d563481160b0bf0a914997b114e73f7c66 SHA512 357189214d3cc2a026b8c29ee5c695a62d73db229ca1f71372bfc5a1120317a4c4ffac942f5a196f20e84ae8988a4e707d4194ebde12ef7c96eb713b398f587c
diff --git a/dev-python/black/black-22.10.0.ebuild b/dev-python/black/black-22.10.0.ebuild
index 8c498833dffd..71108f9d7cff 100644
--- a/dev-python/black/black-22.10.0.ebuild
+++ b/dev-python/black/black-22.10.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/black/black-22.8.0.ebuild b/dev-python/black/black-22.8.0.ebuild
deleted file mode 100644
index 2745c95086f2..000000000000
--- a/dev-python/black/black-22.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# py3.11 blocked by mypy_extensions
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="
-	https://black.readthedocs.io/en/stable/
-	https://github.com/psf/black/
-	https://pypi.org/project/black/
-"
-SRC_URI="
-	https://github.com/psf/black/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-3.10.0.0[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" "dev-python/aiohttp dev-python/aiohttp-cors"
-}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 45822960d2a7..ccc359b0dcc0 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,26 +1,8 @@
-DIST boto3-1.24.88.gh.tar.gz 543896 BLAKE2B 9dd2a18e3fb8d0a9f3a3a1fd7d0cceb491765690f99c7bd4200f37c66cbdb1e86dcdcdd09669d3175b97e762e6faabac3a2e5cba49136f42cba459e45f3ab67f SHA512 676528ca180c23834d1666b69292754e551a339914362da2708ff3f937c2eb04fe3b3dd1d4c6960eb8f5f7f58b1e0bcf13b1f52cc16a7c8d3bd025e9ea4ee109
 DIST boto3-1.24.96.gh.tar.gz 547933 BLAKE2B 63c347b3abb383f36e4109b2695014dda6b4dd159b8f0e878ea17bcd24c9605dcf403a120b15f63e9a335065a1e3254813998a435d5eb1663f0066f2e7797be6 SHA512 9c3ac6dba99904a54e4b06b02531c2388d235b1926cb5bd7b767c679632b613db4a0d453030295e5f4101efdb7a3df8aca08e3c2e92a6725dc3df733cef37d72
-DIST boto3-1.25.0.gh.tar.gz 548321 BLAKE2B 46371869420a12b067594efbaa0d0f6b8003e813c5c85511fdead9841489bd333fe1207cc5310fd663628560a3c570ce495f0234ecc72eb93dfa20b79532390f SHA512 7cd6443fdb67a7e2df440c9b1ec84f7d37040549ddcdfaf5ca41fbee3d47e99d995f0be8690f22c25422391734d664746d00c88bd59aa269285f8c0e038836f9
-DIST boto3-1.25.1.gh.tar.gz 548647 BLAKE2B 84a6560e39ea526d1a4fa744bb4cb8fc2f934254c5949a08e0f40f34c363b6cf077dec4f6325da61fd06f5e2d2e021494bc29bf5993213fedc43f5914e18f062 SHA512 dbd0606e2aa4bd4eb3a836fe8e6da20eec97f5c62b5b43009f7296d1a51eaf7eaec7ca8246be8e3db2181e574d5672d72ea18deb4fc73a7cf3f0fca64ab1dacc
-DIST boto3-1.25.2.gh.tar.gz 548880 BLAKE2B 765b16f0192cf6243a34428090234943553384d5422dcdc728b0da9ca303ca5eb860cb49d177191aa53c8818795bb620910c6f3e5a6f2bb9072fd96d1bcf0fa1 SHA512 8e702758923b384ed97803a35daf211e9754ea6967819e301034efb2c1394f05f4f899dac03b96e65480b55101a96d106fe08faa6f28fccd6d37a5e9d7d6cd2c
-DIST boto3-1.25.3.gh.tar.gz 549487 BLAKE2B f0c4f2dee25dff926ce5d0699bc6ff9a876ddd12b469759dd24deb22f037fbf37e013b234605ade2ab1712127f1362d0c5fcfdf8302df2c5b983b2bafa68f1a6 SHA512 3a6227dd10cba78b2f67802da953ca8ddfd0dfe3f7dd2e9a360b8e1a45488d12bece3f8a60729eb185e74c3c2dd95403a610f26ae281acdc6a820238660f86b4
-DIST boto3-1.25.4.gh.tar.gz 549950 BLAKE2B f9dfb94d2bfc3f11ac0e98b4ca1755157cf5d71b5b756a4b228bedf48b0d116de80ad1638789dcc1e44ec2d5ab2bf85923a566caf50a15141b3e04baa195b416 SHA512 77ddbd3ec3815d7fad99e918d2474ffedf2f0f5b35cd9f8fa68eaff0c1f4f7e6495c280e7fb6ef1b6f368103b2ecf11565b99636b34ca5a95038ff44a87088fa
 DIST boto3-1.25.5.gh.tar.gz 550814 BLAKE2B 85f345b635fe16a978853d21192f49804837b050539aba650195bf788c7912f8713aa3a826de6f5ae4c28c4c3795e7053a2105622757f3087579e827eda3487f SHA512 6f4cd909b7a6670f74df6c7cac4a140114a0e05f736ed23c5a53351c5c6505f02d40e81ad1314db86db67d16429b38f78708e9cc8ce2cb08f28742ec209c2755
-DIST boto3-1.26.0.gh.tar.gz 551306 BLAKE2B fb72315724321f1f41b7ff8f90eb5386b5361f049913ed87ac884140c405587ee0dc7acfc13300851566e96d12de16d3c6f1db52af44b27ea320c4e6deaaf2c9 SHA512 eafff7ba7792fb62d2ba93213588e1a034b6d51fcc7e8167dcf15e0276c3b499440d3ff340cb2145aedf2f432c0de563cbc69111543530c5b4a4705cd08871bf
-DIST boto3-1.26.1.gh.tar.gz 551830 BLAKE2B 85dff3350796fcb06ea927d469d5afdbe43c448cc5c267364edc2641d25aac8d33a76a3cae06cf414a52874bce626d88f15252f3273530c1a2a791791134fafa SHA512 d1ccea2a2155d22c765504597dfb185190c52f99e7b1c9210eedf9832d9a191d7bbb1205930682f906a7bf6316226836b61dbece5b54ca24dbc91073b0a41591
-DIST boto3-1.26.2.gh.tar.gz 552193 BLAKE2B 07b12ab669bc0eae08d4f74b8b8f0b979b90b75b24c87172bb2bda7d9a7051e41a6971d758c48b764da35b4e38ff02c0ba2a57971f70aed6e79517225e4f2461 SHA512 ce5362af3109d412de633f74ebb08d60c229ff7644c02c86e2692c2d85611269254be05041e0eedf88dda7e76e7f5d81a20abad6a3367c87585b7b52f7968a08
-DIST boto3-1.26.3.gh.tar.gz 552510 BLAKE2B 58c9040c1273cad53719f17a82c909fdd05a7f56b91e39b61dabfa75871a2d8b011acd8136c11101ee8e87c9e22c82075358c53b4e3fc6210e3b02438d747a2b SHA512 ba63aa8f6c5cf08031fd74661c52527153b02af5a08d4a8e9bfdcf11706e8573b56319195d7d74850a8d5e48174a8076ad8200877494ce3297f3d9a435b8765f
-EBUILD boto3-1.24.88.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
-EBUILD boto3-1.24.96.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.25.0.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.25.1.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.25.2.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.25.3.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.25.4.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+DIST boto3-1.26.4.gh.tar.gz 553689 BLAKE2B 0da69cfa0b05ab789fc59938562efb49c3c0a46ae0dd5ca84d5e5782f7ed78f4fae45fa38cfea27c2dbb59bff2604b7f09064d2f4f35578500d379ff9f34513e SHA512 2f7058c405145d66b92412f0941ec705c111132e87121cae3f4be9fd6db4cfee3c1bedc3d952badd5ead13e2e1a4e10d4a1a7bf73b7869225a7615d5038a9086
+EBUILD boto3-1.24.96.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.25.5.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.26.0.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.26.1.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.26.2.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.26.3.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.26.4.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.88.ebuild b/dev-python/boto3/boto3-1.24.88.ebuild
deleted file mode 100644
index c93eb5e2d7c0..000000000000
--- a/dev-python/boto3/boto3-1.24.88.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.24.96.ebuild b/dev-python/boto3/boto3-1.24.96.ebuild
index 6edcc751d54b..c93eb5e2d7c0 100644
--- a/dev-python/boto3/boto3-1.24.96.ebuild
+++ b/dev-python/boto3/boto3-1.24.96.ebuild
@@ -25,7 +25,7 @@ else
 		https://github.com/boto/boto3/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	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"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.25.1.ebuild b/dev-python/boto3/boto3-1.25.1.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.25.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.25.2.ebuild b/dev-python/boto3/boto3-1.25.2.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.25.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.25.3.ebuild b/dev-python/boto3/boto3-1.25.3.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.25.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.25.4.ebuild b/dev-python/boto3/boto3-1.25.4.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.25.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.0.ebuild b/dev-python/boto3/boto3-1.26.0.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.26.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.1.ebuild b/dev-python/boto3/boto3-1.26.1.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.26.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.2.ebuild b/dev-python/boto3/boto3-1.26.2.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.26.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.3.ebuild b/dev-python/boto3/boto3-1.26.3.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.26.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.25.0.ebuild b/dev-python/boto3/boto3-1.26.4.ebuild
index 6edcc751d54b..6edcc751d54b 100644
--- a/dev-python/boto3/boto3-1.25.0.ebuild
+++ b/dev-python/boto3/boto3-1.26.4.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index a322373bb14c..c4bad384c0b7 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,26 +1,8 @@
-DIST botocore-1.27.88.gh.tar.gz 9703393 BLAKE2B b7152546ffd44fccc3607ce4fb0df586e192a68431d68f40063d6397d6005507118c49197e3bb0215ccc4ce6b075a2e95919dc0b2352da3562ba8b5675274ca4 SHA512 0cca62a8e357c8c345afa2ebfa8fa931aa75e323b93ecd63857db05fac7fcd83118012ee7f93921a31895721189995af3179f6ae62ee61cef68eda84edc88132
 DIST botocore-1.27.96.gh.tar.gz 9792299 BLAKE2B 7d4b388e0dd45a41c794ad8527287fb326c5e828c15998393936b817333055dfbc59f85365f074f6b3017715341d30fed4ea0de8e1ee24ee08d13eff36b369bf SHA512 1050c23a207d089af16e86404db0367936d186c23b8e1fcfa8ebb07737ad411c2771344d535edd5dde43f8473e45ad85c8e5c39f2ddb03449ead3c9daa746a22
-DIST botocore-1.28.0.gh.tar.gz 9815905 BLAKE2B 40c7a5eb9aaa851b682c85d4045f4e3fbdbf34f2933e5a97cd84109e71d6b442c1075122b83870da20cba79a84dfeb213e1df62bf761efbc60d729d672e9224f SHA512 a9700867564d07024527a27c13a9a1fc5a014865afe9fa2f39401abbefeb16fae753fbaf97e81536de946fbb515724d6bdde864868077fd40b4fdfa2b7a35b9c
-DIST botocore-1.28.1.gh.tar.gz 9820975 BLAKE2B 76e578cb3b41e923ced56b12b79b36c589ad64324b6057168c4e0d92c7165f7df3709a2ba968e593d004b43320ca94c3a4a118f91ae1ce8420703c5c6bcd1100 SHA512 8a7ef4a209f145f39f6305fb5ed118849d46dc1bd10be2d0ef9dcd066f4b3dd78e2b3d391903b3d1db3f8ef3c8bc880c40dc3f7a02b4555845fb20f2ceb75ef4
-DIST botocore-1.28.2.gh.tar.gz 9822124 BLAKE2B ff56b485cdc58811e809f39ddf250ff9f04a4da9b7bcfce7f26a8fae92f58828033434b02b7b25ccbff7815e37fb2980d7dc10523d6d4f7543dc811ad50d8d10 SHA512 df3531914c6af955069e3710fb8710a7a5080d783f5a51966df72b0c07e1c319b779770d2a1d0d64d107c1a01bc9f69a92d0cc6cbdae594a376908b67052fd18
-DIST botocore-1.28.3.gh.tar.gz 9829079 BLAKE2B 77010a262689d99530f6cfa89d3389828f0250f83819979cbffebbd47458ab01f45c5a2e10418e11b982fa9c7680334831b5bb2472cf25af97a8283036420ab8 SHA512 99273da875b0b8321182a1135a09d51c98e242f291ed7ec5a62ae0f9708f55dbd69def3d4bfbac590fab9fef41c7c79f7c87f71b6022f17bb232c3b5dfd9b9e7
-DIST botocore-1.28.4.gh.tar.gz 9830940 BLAKE2B a4f7148ff4ef77dab59b088e241f19cf072dbf0231aac36fdf2220660e3460b08d4f50bc8be6e9eacf169997124b58b27a0f8ab52c042741dc5c1cb43837b00e SHA512 7ce121333cd25f1eb2a99dca0edae21988ab6cd9a1e073e453c633dfacb88b45f40f07fe922bf8a52356ec41d819243785091e8c002c192c17bf89a4e626a380
 DIST botocore-1.28.5.gh.tar.gz 9842427 BLAKE2B ed185346c21eeb0d05b39b55e99e065d9a5448fbe8206de49b3c128d12f4aabe1f6258153710350783846d10e5e10a22ccf77f6d27345297ec64e7ce74e51b87 SHA512 8b41b79826a71ed31c27534129e959e0896d9f4cb1769b4f14f1760d173500563a579aa0e00aaff5058275d5b5e8b921fed34b12825cf16ba4e216b174e4bba5
-DIST botocore-1.29.0.gh.tar.gz 10570614 BLAKE2B 08c48caba9516cb7345204d426942779dc8e2060cd3b95f634fe6293f6314c6a825c3c75371a446c22365f855f888c86ce303f50b53ecb6348f3453c5c9b9cab SHA512 b35322e8636fbf9d1743e234889dd370f8cc4853eb0318ad55e563de7a3f3be47fe0842be1ead8fa7c4eaf455264aa7bc15c0a8313fc2343f82d419b7cad781b
-DIST botocore-1.29.1.gh.tar.gz 10572059 BLAKE2B d0adb21a47ae4e4b092a7965630b599e8ad7322e11f808bc18632e7bc79afacf743e5149aecad788fe8d6479a68e99b125fd07bd48e3b3bc5901784b3ca12423 SHA512 ce9b7d2b8a2a590993a3fad259ec3a7b038cad8234cad3e8fdbb5523db278e682a391f40e59811dfda3f312f8e5a158246f8654b7e08bfafe817a7e62ee5ef04
-DIST botocore-1.29.2.gh.tar.gz 10572801 BLAKE2B 3a2512deabf0780fa8ca112753a161c066de19757999c3b948f2e25c4954600ef7477e645b92b706493c0b973478e6f246eb18bb83256946e538fd720c9f5c3b SHA512 efc6229adc9f48ce23432609832de0d20d385217087a23006ede4cc0e415c52a7c80774c57b7a86b804ecd3b1fecd437c7d15d05582c3f585afb670969dbca9d
-DIST botocore-1.29.3.gh.tar.gz 10578018 BLAKE2B 26ef86833ad6cbc3786f7a5e40a6847d40c48571b3f5028e9d40570bf693bc68e2dd1f9536566a038e05854bc629664731d46fcc858e9d05d78f08a3fdfa8e17 SHA512 4000887b78882534e4d1e062186fee49e3fc66521d359fb3c22db009a23901cbbc35194b4eafdd1e4d6aaa398749588bc4f6c444692e5380a10856dc1c2e00d0
-EBUILD botocore-1.27.88.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
-EBUILD botocore-1.27.96.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.28.0.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.28.1.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.28.2.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.28.3.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.28.4.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+DIST botocore-1.29.4.gh.tar.gz 10587870 BLAKE2B e8007cc2e6aa82bd3223f13c5df0e94dcd6f90cfd86d6137723209191d95b7f1be8df3755eae9190aee44312b9980eb81a5a4ede4d326f4cdf3d4b43febb4486 SHA512 f164b1ab95ea34127d2cdaa6e0ec626e7f8849ac1d112e28384e5e1b105b7e482f386999da52d968023d0f35bff5c6b433b4117f98b85eb060887205fc2f55a4
+EBUILD botocore-1.27.96.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
 EBUILD botocore-1.28.5.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.29.0.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.29.1.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.29.2.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.29.3.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+EBUILD botocore-1.29.4.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.88.ebuild b/dev-python/botocore/botocore-1.27.88.ebuild
deleted file mode 100644
index fb557be6c315..000000000000
--- a/dev-python/botocore/botocore-1.27.88.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.96.ebuild b/dev-python/botocore/botocore-1.27.96.ebuild
index d1a6948e70e5..fb557be6c315 100644
--- a/dev-python/botocore/botocore-1.27.96.ebuild
+++ b/dev-python/botocore/botocore-1.27.96.ebuild
@@ -24,7 +24,7 @@ else
 		https://github.com/boto/botocore/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	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"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.28.1.ebuild b/dev-python/botocore/botocore-1.28.1.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.28.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.28.2.ebuild b/dev-python/botocore/botocore-1.28.2.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.28.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.28.3.ebuild b/dev-python/botocore/botocore-1.28.3.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.28.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.28.4.ebuild b/dev-python/botocore/botocore-1.28.4.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.28.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.0.ebuild b/dev-python/botocore/botocore-1.29.0.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.29.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.1.ebuild b/dev-python/botocore/botocore-1.29.1.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.29.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.2.ebuild b/dev-python/botocore/botocore-1.29.2.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.29.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.3.ebuild b/dev-python/botocore/botocore-1.29.3.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.29.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.28.0.ebuild b/dev-python/botocore/botocore-1.29.4.ebuild
index d1a6948e70e5..d1a6948e70e5 100644
--- a/dev-python/botocore/botocore-1.28.0.ebuild
+++ b/dev-python/botocore/botocore-1.29.4.ebuild
diff --git a/dev-python/docstring-to-markdown/Manifest b/dev-python/docstring-to-markdown/Manifest
index f740d11a4b5f..9f741b478dd9 100644
--- a/dev-python/docstring-to-markdown/Manifest
+++ b/dev-python/docstring-to-markdown/Manifest
@@ -1,3 +1,3 @@
 DIST docstring-to-markdown-0.10.gh.tar.gz 24732 BLAKE2B 8e45db90642a1426da138807d4f8b8147fbf125160463a094f5adfc8e0d76f75b39493560df7cadf39e9b63c1e01763867fff38aac6454d4d7bc7ebea8d873f8 SHA512 cb716fbaa8311bd563f9275eb64bb67d2870803a6c6c6ffce7b15b672260b46359008dc9ff80a99fee3033f3105fdfd77d7a248e7d8a22df695af820eba8e319
-EBUILD docstring-to-markdown-0.10.ebuild 697 BLAKE2B 8614c38b10901fd8f2c450e7b4d0cb3fccbea8275e2648dd4808ebbb5b58ab4235d49dad053938c9492ec18a2682d46f4792afd8eb83e77aad3bc7d0f8d6cc9b SHA512 453d1aa919dae9f37aab800b72c174ffa4a8c8732ada3115d8c9bdea3a0042eb01bc4c890eaa9fb49cc5cbe14d458128b18b5efcbdad6c32dbaad77405e11372
+EBUILD docstring-to-markdown-0.10.ebuild 695 BLAKE2B b90fb8c9a6e7e7ccb67074e3009cf6688fcdb738d34d64a9a07cdd5a7ff9bf19ce7b934909a957c80d84aff41fbe7a6f35c15410dc6f655b74f79c56f78bba94 SHA512 8f2bae2d8f72a13938e98a55d1e16533809bed7e29c6fa976c85249b6bb15bc1c28159ee0de8ab336de13513b291d341eb902a1f3210fffa8724721090450056
 MISC metadata.xml 349 BLAKE2B 661c6f1bfbf032dad675ea05faa3d58ec81fac8240c0cfb4bdb8e75b81e12cc1663670fab45201e8e18fde374b59bc60f365558ecb6e4fdb9714f779ea680cac SHA512 fba9f2c707c73fe768f3a50e3b9ed99883359b8ce3122a5b57eb8ba3286d93eaab1b19905188cd8e65440cf9ae40cbcf8b7b5593068773c07c0ea1ea3c7aab53
diff --git a/dev-python/docstring-to-markdown/docstring-to-markdown-0.10.ebuild b/dev-python/docstring-to-markdown/docstring-to-markdown-0.10.ebuild
index 8e4ffb6bce3e..ce6902342c41 100644
--- a/dev-python/docstring-to-markdown/docstring-to-markdown-0.10.ebuild
+++ b/dev-python/docstring-to-markdown/docstring-to-markdown-0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/python-lsp/docstring-to-markdown/archive/refs/tags/v
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index f2cb4c5b0d93..958064f1acac 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,11 +1,5 @@
-DIST executing-0.10.0.gh.tar.gz 507523 BLAKE2B 5ab17adb1d40b83b0cf294aba350faf124a810b4c95e408e9bd2ba80d918154cb41d8b4d4748cd7d897d47e085883a30f431dedd595b00506beb5038e084f473 SHA512 f1ee25679cd1f88f273ee68e8e926a6e98b749a50d063ea3aa73f35ac0d7ea65b13364269f01265f164dba1d775a742cd7cf3594558e06efb39fb1157b3b9f5c
-DIST executing-1.0.0.gh.tar.gz 507720 BLAKE2B 601ddbd4c7dacd6b72317e9f07d8b8566d14b1c805bb7a2768449d51bf75818945f3b61b67dd0402d1d6171bd74165107ef98e835910529d82b8858bd016ac6d SHA512 912cea61ddb2ef12034432d68fa7239daad3c6365dbcbed72f08121b9fdc07e614b5c2233c53f5f7ee3472fca4f690af3db0944a0ed2c83623de8d682cff0a61
-DIST executing-1.1.0.gh.tar.gz 782214 BLAKE2B 56c97b1c0b6617db90a90f562409b406d0838e187fed4e45642506df85ae5e54824a393eb38982902bdb1c67fda2299bac282a5b260f3537cd06145b1c5b992e SHA512 090705c90051fdbf53310293fbb2e06bd2c2144cf83d3d02528768303c70871bd8b3a3d236705e29f8a9fc3132ca94bcb3375fe8834529a684b10b7c879faff0
 DIST executing-1.1.1.gh.tar.gz 661228 BLAKE2B 66ba8509a82d7c7354d70747d08e160423314718a2c1844260104eff474d39a244f880984e2388997f5620905a2f3fd90fcfa393f48e98cd5990e01a053012d6 SHA512 2b2277aa68d1abf2f1bbbf9010f7a27652f74e892e564a3c6269ea1110208b4c2fbf6a002b90423f5e9aa718cf698f996d21930b431241cf88012f20d244eeae
 DIST executing-1.2.0.gh.tar.gz 663650 BLAKE2B ba9420bfcf3805223e6b7e84d65499f3a73ef3156480586d2c5ffde4e438fcf8474f4f02c123953d04ee253de7a6a3a1b2587e57fcae546f3dae7af70a1aaa98 SHA512 c841958cc499b2d78c94570bf0556933d4a58ca5541f7a59e591be6036926ab79d5ae86bb95bbf649f3c3fb729109fe50cf04fbc72692e0cfe12edaa995ea0a6
-EBUILD executing-0.10.0.ebuild 992 BLAKE2B a52d276ea72ec7d34187b09af70d9480c5337927ce4a146ab08e396c0fd25901b2035bab4423ddaed7bcb898d5e43a005821168fbd5ee34f56ed75e4e5a8d000 SHA512 888739c7a6e7f8c656be8ea984bbde47ea8dae2e1469baf8657d2a266e1e34375dc53960da03ab11488f5ab73bc634ec4614770235e88e4f28802498a87d7c10
-EBUILD executing-1.0.0.ebuild 1062 BLAKE2B 098e9a6b7b41fbef780858a28d281b6701a05777a3e08103ce1b31d26cac09c0a3f916a095b0a1661284178b8e0fa5b2193e5168ccc48e4d21bca5e916f43ce3 SHA512 a398f67e9a23651577880eff68a84e209318f642db728008f5e945427c4cd246fcc08244075ffee65fb8afd0cd860c2e597c26e51386004cfc7d0a1bb5ae4bc6
-EBUILD executing-1.1.0.ebuild 1036 BLAKE2B 10df93fe68048fe963ab102c4940e9dfe94cf4afb816babc829c73ff5d2c5c8c284d90a1d2f256aa956727b5f5a0a58130982703b76e4e47828be570f2880bfc SHA512 2b04201dd014c747221f5167048a1041735ffc95dc8487afd102f354359134f3f84986a7d22e0c6babbaa46296ff874eee85fcb35c1b5ad1dc5cf66cd15ce6e1
-EBUILD executing-1.1.1.ebuild 1086 BLAKE2B a21193d8e8bb3b1599b3b01622e1d8aba958c3e4aa8bc48c0175f5c135a19908184257adcae1d2b8e7b0c1b0b5694bdb3c807d9e75e0a6e6ec89e2c88a65c284 SHA512 872afa313cb4663d71e1fb60092161063022260d996219c9fb0246cbb7d3cc8a474fcb2cb508b3df26fa6c75b90e992c4d2f4cb5d7ca75364d5fa1f24151036e
+EBUILD executing-1.1.1.ebuild 1085 BLAKE2B f44483dedbc51b09fc3c2c4c3740fd255d193b711d4b8f6d145589b31a6bebdcdebe70aa8a27768d109aa1880fd9e4718dded7d6f8fd2359e880b1af151f4619 SHA512 8ebd0d125f98722b246664c0f9555b746d06926ed6d6ad378f3cf3f59e0aa8bf8e8cf3c9cb5eb33b1585b56100d69cfafbdea16e790d13832a40c9b7f84240fa
 EBUILD executing-1.2.0.ebuild 1093 BLAKE2B 6e0030524ae316eecc5b836b425a41fe58ebbd44f399c398011b7e91d8e7cbfe8c92f0bbd9854ad110db96bf90a7b78bfe007e9ce65c91306c8dc59f35bd2aab SHA512 c040186ff206237af983264a18985b6c8fdebefe31878c22285d2f22c938a44d7b3129e2c20a9ecc811854cfbc174cccd6d249eebb61fc7cbf781be5aede1229
 MISC metadata.xml 351 BLAKE2B 3e64042e3da09377bd27bcf09b9984eef77bbbc18e84f1e849571ff628cd15068fa680560cfc6c3650bf545e5869c6e3d6be0b4d2fc00f35c5fc58dcc3194eb1 SHA512 de199443767adf299da6c7d857c182071746b2ccf7b84015e9649675451ff336fdb7ac1df2d15951ae708ddf0529f2f1c9c19a2959f45c0dc30db1f341fb8d0f
diff --git a/dev-python/executing/executing-0.10.0.ebuild b/dev-python/executing/executing-0.10.0.ebuild
deleted file mode 100644
index 471d3466d941..000000000000
--- a/dev-python/executing/executing-0.10.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Get information about what a Python frame is currently doing"
-HOMEPAGE="
-	https://github.com/alexmojaki/executing/
-	https://pypi.org/project/executing/
-"
-SRC_URI="
-	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-# asttokens is optional runtime dep
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/littleutils[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	# this test explodes when collected by pytest
-	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
-	epytest tests/test_pytest.py
-}
diff --git a/dev-python/executing/executing-1.0.0.ebuild b/dev-python/executing/executing-1.0.0.ebuild
deleted file mode 100644
index 8a398995c3c1..000000000000
--- a/dev-python/executing/executing-1.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-# py3.11 not ready - https://github.com/alexmojaki/executing/pull/31
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Get information about what a Python frame is currently doing"
-HOMEPAGE="
-	https://github.com/alexmojaki/executing/
-	https://pypi.org/project/executing/
-"
-SRC_URI="
-	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-# asttokens is optional runtime dep
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/littleutils[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	# this test explodes when collected by pytest
-	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
-	epytest tests/test_pytest.py
-}
diff --git a/dev-python/executing/executing-1.1.0.ebuild b/dev-python/executing/executing-1.1.0.ebuild
deleted file mode 100644
index 26b7519766f7..000000000000
--- a/dev-python/executing/executing-1.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Get information about what a Python frame is currently doing"
-HOMEPAGE="
-	https://github.com/alexmojaki/executing/
-	https://pypi.org/project/executing/
-"
-SRC_URI="
-	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# asttokens is optional runtime dep
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/littleutils[${PYTHON_USEDEP}]
-		dev-python/rich[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	# this test explodes when collected by pytest
-	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
-	epytest tests/test_pytest.py
-}
diff --git a/dev-python/executing/executing-1.1.1.ebuild b/dev-python/executing/executing-1.1.1.ebuild
index b8e80c15053a..c30d19f28ed4 100644
--- a/dev-python/executing/executing-1.1.1.ebuild
+++ b/dev-python/executing/executing-1.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index f7ce45892536..55f5c07437ca 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,5 +1,4 @@
 AUX jsonpickle-2.2.0-python3.11.patch 1832 BLAKE2B e21a31ea09dbcd3f6cf5ad4864f959f63d295215f1edf539181710877f6ff33a601c72bed832c58422eaeb96b8aa471479db8b61961cb3108b93306c2f0c416b SHA512 560f269a0e19a5e0881c8266fdacf7fb764eaa872c12740dc57d36240421e2aa645cac2d9b107f7dd62b870e1c6371defa3b37a0ec10353ddf53109d83031e89
 DIST jsonpickle-2.2.0.tar.gz 189866 BLAKE2B d8fcd0e8b71947b734c59240d9fa4f0b35b9b0ac2e2940a9baf05c160771db0eae5f011b61e3b1c0bc746a740ac2e137a392931e270fea3acf4884578133283e SHA512 b6cb35316e32f38875cbfa3784a3930f669d4ea730ead6117242070590647987383e9f933c193b8c246c40dba87ad56600a65db89c45c18a790b3c1f9232b245
 EBUILD jsonpickle-2.2.0-r1.ebuild 1596 BLAKE2B 9b4a270aebd12cd5fc3ff27ca6eaf8a2b3490db43d3456d02cabd4232cea894a92acf766849afa3f5ef76b0dea5e420b9d5adfd8dd6b136f9f7d7c59f23b91a4 SHA512 88588da30cedbe176186087dd53c81c7694dfb143167fd2c389aa08eee9e16fd603c5cffdfb9308fb5b552f0ccbefc8fd28d109d89fc0105e2f1e28c67845094
-EBUILD jsonpickle-2.2.0.ebuild 1493 BLAKE2B 828d3d7f8e8861bedbf785cac825d94adab19c9d90dbda5c3bbc9b97bfa2280ea9bc9e4892eb7471afad82cb8361560f6c728fe5b44dfcb4586ce9e919c48385 SHA512 18b35ac73f991cc1afc018863037f998575ae08e1cffe720ab225cdc0c7e7c0baee610038b1d497c89cdf07f2d681b2d005916e2cb00c9518981871e20159a67
 MISC metadata.xml 412 BLAKE2B a7e746abd8b45415ecdbccbde1b65ba9f1fa9fe7ce353411681c2a3de046878e990aad20849ee561a56ad3208bd5071d7b5e5b3c767fd71b7c44d2e8412d349b SHA512 dc52df78fdfe9024e695aae3d2bf22bed7162e1f2a528a288056b68022ebbc400b0a3a2f3e9c2155ee57e66d77a4f7a3f6f67188fb13ee15f200212ac6809a31
diff --git a/dev-python/jsonpickle/jsonpickle-2.2.0.ebuild b/dev-python/jsonpickle/jsonpickle-2.2.0.ebuild
deleted file mode 100644
index 3e4c1b3e0f8d..000000000000
--- a/dev-python/jsonpickle/jsonpickle-2.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="
-	https://github.com/jsonpickle/jsonpickle/
-	https://pypi.org/project/jsonpickle/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/feedparser[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e 's:--flake8 --cov::' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# unpackaged bson dependency
-		tests/bson_test.py
-		# broken when gmpy is installed
-		# https://github.com/jsonpickle/jsonpickle/issues/328
-		# https://github.com/jsonpickle/jsonpickle/issues/316
-		tests/ecdsa_test.py
-	)
-	epytest
-}
-
-pkg_postinst() {
-	# Unpackaged optional backends: yajl, demjson
-	optfeature "encoding numpy-based data" dev-python/numpy
-	optfeature "encoding pandas objects" dev-python/pandas
-	optfeature "fast JSON backend" dev-python/simplejson
-}
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 9048ffa14fb5..5b8bed0dc92b 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,12 +1,7 @@
-AUX libtmux-0.15.4-no-doctest.patch 476 BLAKE2B 66dc3c6e28be115f64bca53012ae11307ad7b75ed2c01595c42503ddf5898ee2b8f3f643767a26f06e97a05a5c3898d7de8fd57331b5f1cf8b676877bbdaf1b9 SHA512 33b3e7d470780cce59bf3b4c00baed75d640c99aa709f83bf5f17e7a1e7f2873aed7621a3718d873934911de7d9d16923e26f454192f9a0135fe5ff24010139b
 DIST libtmux-0.14.2.gh.tar.gz 234682 BLAKE2B e93b0a280c3cfdfab4c9a313d251d15665c530813f00aa78151efe62a6a566f2d8986afed015de4a8be80b48f31ac197e98d3efa592eb8895e8d9626ff34ef72 SHA512 1565529ecf555dac8f896146e2d802c0e5460458ea1da6ba5496d5d2c394f56cc8c5f7650c5d4aebd1750659bbdc529e439e60dff6a0ccef8806bb65305d2421
 DIST libtmux-0.15.10.gh.tar.gz 240378 BLAKE2B 81841a25b01bb26d2c612a14cd4518c48b12162d4aafa280fe0d6de269d149bddaffe72f4ce2c735e41b00cd2bfec19773d7cd3b9fd927c892f11f0cdf8e8a88 SHA512 8ee870c94bd3e3a9fffc19854f978d4faad747ea395e53c3576adc9cc2dcdd3cbdedeeb589a2dc11b0ac836931ffbdcea06a4a850b2ead163235dda2334defb5
-DIST libtmux-0.15.4.gh.tar.gz 237928 BLAKE2B b12643336717fbba079df884aa7b8a3029c393afd0dbcfe7be07d7c08f15a8252ec73479f5423fbe86efe63fb990529f68ed5690b40e2c7938df7edd2c6e51e5 SHA512 41adc83fde64a00385bb6885243b50c73e4cedd4d0860b1eb5c9a533b73d2f7fedef1e23f1b994c809abb834b666931c3fbdccd417969865172777e34a1cc5fe
-DIST libtmux-0.15.7.gh.tar.gz 237820 BLAKE2B b398fb9c44ebf916e99d442094bee9925e129e67a32becdfdda9d5ec4c8e30bebe937ebde58e2fb5654807251cd00076117646974430a0c608b1b89637fdfe94 SHA512 ac33aeecc579b018af2e09d0aaf86f97dafa7782893bee065798247ebd5e2a5a4a8d14b1b3314e0050e39bceefeadef6600d3881fbb30a8e3e9b4831b4df339b
 DIST libtmux-0.15.9.gh.tar.gz 239611 BLAKE2B 7a171c827fde0ddf3fa0191c00d4e22e5027d925781f7231497c09a038f16d3408ba894d4f8d71470a0d8dbb8f1fc387971d3c8ec94d9f03a3f0af0e2ac0c7c7 SHA512 e7599dece70188cd210de7a1e554d86ba12b8479757dd03903cf3e0608e8e9cf3d181e4c0afc7432d6977dece931707120399690932099ed7d07d847ac76655c
 EBUILD libtmux-0.14.2.ebuild 1045 BLAKE2B 15271b0d210c5a18446c2db48a545c5011681b45f428860d4ce0f203164f48808a31de53574924dab1488119714124d12e8cc0a6272418cf960ec4c44180ce65 SHA512 b613a238fa185740af567aac8ad73753d82cd27c962d76bc3d7a5991b123dcdd42c9f64e6fcdc35a36f0e762066c839eb4e18dfb19ac5d9aa289c5eab06690d2
 EBUILD libtmux-0.15.10.ebuild 1226 BLAKE2B bb2a762509d92843cc06117970cd13f281f240d940b9f643a4b32269cdfd123e59062abe40e1b6384220032809694e0c175f1f644029984928db7d904323c38a SHA512 fd07446e27ab0c2161d361da0cebc671f65735778ace25a935c2b37127a04bb92b7b80da4182634f1d6afa299246ef061ed2785432328bd7abe1accfd86573b9
-EBUILD libtmux-0.15.4.ebuild 1105 BLAKE2B a246a6c5f674b6ce925f464defc95d227b13d0df27da418cd7a17264d9514f46311e152f186f7c22e03bee1c561d8b5a68624cc5b1d9f980d62769ab1a1d7b27 SHA512 39b9d27fafa9ef35f1efdd8f8f98136a9bb5eb233df86a8ed418117e7280e2bfd7df15c0a5c47a33ca19b1a9238433f76b3cd5a209da8201d239c835316e1cf5
-EBUILD libtmux-0.15.7.ebuild 1107 BLAKE2B 86d2a4be1375dd000a50e988048b68ebb71018fc2d7cdbd551afdee3356167806c98016a0d0d683a4979a56fbf2cd0984a57baa3d4e44aafe295378ba3db4b5c SHA512 f064c66e296cf4627d93efedf796f71c84183e27355d39b5275df582ad2992e8bb4f286f337d24aba7eacfdd1e31c04ebf577672c5e2815a3341b2b56a3b83a3
-EBUILD libtmux-0.15.9.ebuild 1226 BLAKE2B bb2a762509d92843cc06117970cd13f281f240d940b9f643a4b32269cdfd123e59062abe40e1b6384220032809694e0c175f1f644029984928db7d904323c38a SHA512 fd07446e27ab0c2161d361da0cebc671f65735778ace25a935c2b37127a04bb92b7b80da4182634f1d6afa299246ef061ed2785432328bd7abe1accfd86573b9
+EBUILD libtmux-0.15.9.ebuild 1224 BLAKE2B f8848b800cad33fd4fbc93aa8ce9e59f52db36afa6113e73817b65795da30975d71bab43945e3c51f776d1e594b5e3c24dfa97969c8397919f898ee9b8f09cf9 SHA512 5ff0b37536c62a38d7006d010a437647330297cde3d1311ebe388f6535e9818731b9bd7ba5e11d6487211994314f4cdf7ca818a49f334a02c34e2c7defd09b42
 MISC metadata.xml 403 BLAKE2B 68af7251349c8999bbdbfb7b55ca4632f8752468d7e478fd985097af86d00afe93b231667a25e3c997a3bc86b708d4e6d6ef5c35a783871cdc83519fc1db1ab1 SHA512 2a88df695e94f1da966bb72f7e90d00f2e343e40fe1924837f8c087dfc9a9a84fe0b2909a98f2f41ba72f6ba01796888a80cbac3f1bf9f05984a06385037d977
diff --git a/dev-python/libtmux/files/libtmux-0.15.4-no-doctest.patch b/dev-python/libtmux/files/libtmux-0.15.4-no-doctest.patch
deleted file mode 100644
index ecfebaa450ca..000000000000
--- a/dev-python/libtmux/files/libtmux-0.15.4-no-doctest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.cfg b/setup.cfg
-index 2547e73..3659616 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -19,7 +19,7 @@ line_length = 88
- [tool:pytest]
- filterwarnings =
-     ignore:.* Use packaging.version.*:DeprecationWarning::
--addopts = --tb=short --no-header --showlocals --doctest-docutils-modules --reruns 2 -p no:doctest
-+addopts = --tb=short --no-header --showlocals --reruns 2 -p no:doctest
- doctest_optionflags = ELLIPSIS NORMALIZE_WHITESPACE
- testpaths =
- 	src/libtmux
diff --git a/dev-python/libtmux/libtmux-0.15.4.ebuild b/dev-python/libtmux/libtmux-0.15.4.ebuild
deleted file mode 100644
index c26d228b0f9e..000000000000
--- a/dev-python/libtmux/libtmux-0.15.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="python api for tmux"
-HOMEPAGE="https://libtmux.git-pull.com/"
-SRC_URI="
-	https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/twine[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/libtmux-0.15.4-no-doctest.patch"
-)
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	libtmux/pane.py::libtmux.pane.Pane.send_keys
-)
-
-python_prepare_all() {
-	local issues="https://github.com/tmux-python/libtmux/issues/"
-	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
-	rm requirements/doc.txt || die
-
-	# increase timeouts for tests
-	sed -e 's/0.01/0.1/' -i tests/test_test.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libtmux/libtmux-0.15.7.ebuild b/dev-python/libtmux/libtmux-0.15.7.ebuild
deleted file mode 100644
index 68646aad4b62..000000000000
--- a/dev-python/libtmux/libtmux-0.15.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="python api for tmux"
-HOMEPAGE="https://libtmux.git-pull.com/"
-SRC_URI="
-	https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/twine[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/libtmux-0.15.4-no-doctest.patch"
-)
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	libtmux/pane.py::libtmux.pane.Pane.send_keys
-)
-
-python_prepare_all() {
-	local issues="https://github.com/tmux-python/libtmux/issues/"
-	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
-	rm requirements/doc.txt || die
-
-	# increase timeouts for tests
-	sed -e 's/0.01/0.1/' -i tests/test_test.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libtmux/libtmux-0.15.9.ebuild b/dev-python/libtmux/libtmux-0.15.9.ebuild
index 6782f5641a27..ae6361d6000f 100644
--- a/dev-python/libtmux/libtmux-0.15.9.ebuild
+++ b/dev-python/libtmux/libtmux-0.15.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=app-misc/tmux-3.0a
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 29c143596cd5..c6608b609a43 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -5,5 +5,5 @@ DIST mypy-0.990.gh.tar.gz 2693855 BLAKE2B d4c4408c763e9e540c1680704b427d0bc41068
 EBUILD mypy-0.971.ebuild 1768 BLAKE2B c9adf0f3b1706821722be1c77370052585e7ee5aeabe44f0903c74e71163de44358ac985a0c251217bee8c657944370842c31a4e3042ce270cf12beacc0f2110 SHA512 fe5abaa26482495522c4c958d6ff71248a72edc7ac51b2fa2b4b3dd9ca4ef83d1f9e476120d7fda83a864117f0b4420eeece7bb505c87dd5f00b753c2790f945
 EBUILD mypy-0.981.ebuild 1776 BLAKE2B c4b1c7abb905623121763a2f44fbb8a422a9d1cb0c6c558e858ddaaa3b1d75aee0b947f74e003d1ada49a7611ae45e22832b4999e89f39ad39cb7957ac7ceab2 SHA512 dc244b629eb8f0aaa59a6e43a8b78850bc1d4e703dd672961a828c4cfbc03d93a5bcf5d6b2a455e8783d8fbb3fb9f626a694c70d1920445f393d90c9da805a27
 EBUILD mypy-0.982.ebuild 1768 BLAKE2B c9adf0f3b1706821722be1c77370052585e7ee5aeabe44f0903c74e71163de44358ac985a0c251217bee8c657944370842c31a4e3042ce270cf12beacc0f2110 SHA512 fe5abaa26482495522c4c958d6ff71248a72edc7ac51b2fa2b4b3dd9ca4ef83d1f9e476120d7fda83a864117f0b4420eeece7bb505c87dd5f00b753c2790f945
-EBUILD mypy-0.990.ebuild 1771 BLAKE2B 2c8c1384773ee385e6bd94ffa6057c76f5c893bcd30efceb6882c4eedadd237c28fe0a142a916d2bad0b6f5f7e8fc67b239095d5887e20d232f8f0071f7f99ef SHA512 d7711db7d8db2f8c77b035606ed29e80a926504d4af314c8996ffb494e073a56f6cc91bf7e56e0f98b1cc91864f3aee6eacb6ca00e64d5428e3b6189bb313572
+EBUILD mypy-0.990.ebuild 1764 BLAKE2B 3bf2884399f86fa8ed0d28f586bc175382d86b1de570f1c5a004d346812f0b751b33efdfb2aa8043fc2d0fd9a188a732748d4d2d270737b90cc787de6b16fe6e SHA512 030e75f8084d372bd7b766a0bff1c02282730982c29f36f404af63ebf1ec691bec145c027f3edf33b79af432513661d8c16817afa86ad3d0fce80474c7e50911
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-0.990.ebuild b/dev-python/mypy/mypy-0.990.ebuild
index 4c893f33c12d..297bfa522327 100644
--- a/dev-python/mypy/mypy-0.990.ebuild
+++ b/dev-python/mypy/mypy-0.990.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index befefe84fffd..056756d9c945 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,5 +1,3 @@
 DIST mypy_extensions-0.4.3.gh.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
-DIST mypy_extensions-0.4.3.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
-EBUILD mypy_extensions-0.4.3-r1.ebuild 633 BLAKE2B 97db0e85dcb30db647590dd2403d11992bb5168e307b924307236c288d7624ae5f15bf124fe22b1bd2be10dc2bfb644cecc4c1210bdf8a84995790391bda8e12 SHA512 acfce99b6982a1b158fb393b70e52b0e163fd71a29c80a9cf09a11d06b63f218b6f2ec7ba3984b602388a8a0ad2c48cf3466e7d164f3b7dd369560eb5cde7d69
-EBUILD mypy_extensions-0.4.3-r2.ebuild 798 BLAKE2B 0f2650524646cad713941a00b4b02e16360725f849bf9ca96ae5a669c00b4f6132e83bb647c2a9bee9c740b2339e6c37e2dee5c676a0c172498eec707aa23ebc SHA512 2f5e2f3c3bf85794c144d9ae510fc323b41be5d57f85d7d7bf9614ac3f9dd3b8d8f8651c80b866d745d2434b2e6df934f685aa545da41c5c60c5608262d7b2a3
+EBUILD mypy_extensions-0.4.3-r2.ebuild 790 BLAKE2B d8c39f144a5d998eff53aedfdcd59b26338d143ae5d5e70b77aa197367240066ddf5b2fee977957a087d9dcc02c233457816169846428689a849d29482028cbd SHA512 5583c6925f17d21a88f898cd8d025386f72a80fa8f9d9c5996b4badaad80cadcaf721bb8267ee7b4bd793ceb449c85f51735b5231a81b554c140ef3b6e222ac4
 MISC metadata.xml 405 BLAKE2B eaf484f8baf4a4353f55fc7a84a40057c70adc6a5403e5f2e22f84d804f63774b60c52ddcdb4cc59fa21f3c350ea772f7eeb12112610d611c053ef82340a1e92 SHA512 26bd5e50dd2d591c6bcc803d27e85fa0508921c688d798e208868b7c9a77bee999ef12732038af42dc62fdbec75b7cfbbd6ff33256756736bcc783893aeaf586
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
deleted file mode 100644
index cc8dc65b7e0d..000000000000
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# fails test_typeddict_errors on py3.11
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="
-	http://www.mypy-lang.org/
-	https://github.com/python/mypy_extensions/"
-SRC_URI="
-	https://github.com/python/mypy_extensions/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest tests
-}
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r2.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r2.ebuild
index 06fdf0d9dc12..e0e65bd902f9 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r2.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index 3339e64cafea..9e7f30512d53 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,5 +1,3 @@
-DIST nbclient-0.6.8.gh.tar.gz 78431 BLAKE2B a59490a42af5fb6090b7e4ddd8c469ddce015ca47ceca51290d9b3b2173d93d2a2d13839b227a78cdd72afdada1f305f810337dcc7aa08818afa78bbc96c4a1d SHA512 2393085e52e2e34574b6f60cff82317caf3b636f8476af20765282f0ebf158104fed3bb7fc8e8f800ff42f7eddc226cf7d9575c2043628fd926708ef71306c04
 DIST nbclient-0.7.0.gh.tar.gz 78253 BLAKE2B 473dcef140c8e1fc8f1e97fa30859b9b9fc2dfd6f951ae52db8ab11febbb3de7f60d129424827983a2c05579cd2340e9d4e1a9d0e452a7678497fc1c7176ecf3 SHA512 93d22e2b4fe1740798b812bb4890bf2fe2c7fdd337e34b50eac3140ead73d443cdb326948b2e8511b6ccad61c7daf1efd8e7cc3664b6b1ad9dda0894ca84fff5
-EBUILD nbclient-0.6.8.ebuild 1205 BLAKE2B a759e50f5b501eb6529f103ef21f01e9ea248133691b90b62f3d10653b0e426f157934f65822ce09861a67e7caf0a632acdf1e661e99852c8a1b824661d2e70b SHA512 9cf636f9fa97979a7e7368898dcb91bf3fd4456e2f8d5bf638f06eeacea06abdc11e2d0d140ace8b445c689d576543e9707096c13f2ae839aae7c8262ca1027e
-EBUILD nbclient-0.7.0.ebuild 1486 BLAKE2B 5977ee80e529c099a96a6efcf204bba01c679313545760fe178e8ba3a9450eacbeb7965fb24d9729bd1ce2cf94eec2455ce2dfd23e4ccd86742687843dcc6a5a SHA512 9633194a719e28a2478f327ec4c566a42c49c288963519d460481334ecd0942b87cd9701f1dcd4dc947d895d7fbb39419eca4689caae9fce25d197fa60189e8c
+EBUILD nbclient-0.7.0.ebuild 1478 BLAKE2B 60bf2d52e8a8dff8469d21ce72786a29c6aebd19e667c9e46044b0faf96ba5bb30eeb57a11dbb7aaff685a1833f7c7ba9ed21ec7f11673d274fb37247816af9f SHA512 f18306d5364c3187f97e48327808e0ee4e2c490bf0961c1e92238f8e8734aa37409ad51edb04c97ad9c89ac528a85865ef114e18fdb57dc877c32679a1fb182a
 MISC metadata.xml 405 BLAKE2B d1efa5f7bb2a959bdbc6093b1bd3930e6cdb9bffbe872c6775c15dfc1024ae24d6bcb4651c8e1fb06242b17d6a86f683de3b528bbf1a60b5656a90c1f4ac81b7 SHA512 5b0de690d37dd5928e3bfd0b380336d154cced094e342b41dfd16d0caddd2b792a2158b209404a36461cf4d1b12d836024eae2aedf15093b90f4e363382b38bf
diff --git a/dev-python/nbclient/nbclient-0.6.8.ebuild b/dev-python/nbclient/nbclient-0.6.8.ebuild
deleted file mode 100644
index de26544c98ad..000000000000
--- a/dev-python/nbclient/nbclient-0.6.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client library for executing Jupyter notebooks"
-HOMEPAGE="
-	https://nbclient.readthedocs.io/en/latest/
-	https://github.com/jupyter/nbclient/
-	https://pypi.org/project/nbclient/
-"
-SRC_URI="
-	https://github.com/jupyter/nbclient/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		dev-python/xmltodict[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	nbclient/tests/test_client.py::test_many_parallel_notebooks
-	'nbclient/tests/test_client.py::test_run_all_notebooks[Interrupt.ipynb-opts6]'
-)
diff --git a/dev-python/nbclient/nbclient-0.7.0.ebuild b/dev-python/nbclient/nbclient-0.7.0.ebuild
index 2f083a3c4f93..c030db2f10fa 100644
--- a/dev-python/nbclient/nbclient-0.7.0.ebuild
+++ b/dev-python/nbclient/nbclient-0.7.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/nltk-data/Manifest b/dev-python/nltk-data/Manifest
index 911e9ba05cbd..7c3403182ebd 100644
--- a/dev-python/nltk-data/Manifest
+++ b/dev-python/nltk-data/Manifest
@@ -67,7 +67,7 @@ DIST nltk-product_reviews_2-20200312.zip 170698 BLAKE2B 395d5ac71b759a546a3e25fb
 DIST nltk-propbank-20200312.zip 5323498 BLAKE2B 7abde7caca8fa267bdcfdacc507ecef133d80989909563380f9ac296213ddd94680c25b0e9eb339d2ed7f851eda185966f6be63ed86fae5d9d397d8758ec75bf SHA512 6bb6f88648c1f6044d30dbc56ce1924240ddc1420c7abe8ebecf3684d69bc2dc20f1c575a6ae368a39fff40c5ef09f80d94bf317a37301639321085f102b54bf
 DIST nltk-pros_cons-20200312.zip 746276 BLAKE2B 7a1aec593396f25c75949bde9627b0568e4d406fb2d42ccb6e7be6ff7d3b118bdfbf34b574e40cdb27d8e65e5a370f820c839bfbc0140b2b177c9dbdd89e3516 SHA512 9eea1070b67e648d5e6e84d5a336d95c9eb3192cd0fa4a66f298076ac5907783ecda5cfe1b6e66209a99ec4e326666b14e1cc89ffb4cc8b2b91fed7db77db75f
 DIST nltk-ptb-20200312.zip 6289 BLAKE2B cc4c91569a5a9bad0f3cfce8e0d98179a53b3caddfb66ece085b293b882e46328a108c3be86261dfd869ea2fcc33d3687bc41adac3ada88ea748cd3480c88836 SHA512 dd59d84f20ec52c38063f0961954c063f614b94696307a63fae21839c51c81435d0205fa276f6811d9da7fd083e93f51f0603b5c35dcddc539a9bf59b9dffb6e
-DIST nltk-punkt-20200312.zip 13707633 BLAKE2B 22a0b3aec8a72735fb39aeeb596601452a70cd69e91206e94c5204153da8dedea3b7ec00c460fe19962e223adfd9cffc05a00daa4df48e3f2da500da51e99d2f SHA512 d477823c0cab57a374822cf58dd8bad35b86a504a51dda10de33b27cfd2ca4c89bba946c09f1ed3b28ab4d1cc1e5f3d3781c5f78ebe87458e1df9d48c8841782
+DIST nltk-punkt-20221108.zip 13905355 BLAKE2B 648d0997e193cde81f838a67f914355ff107973b8858ac081b11c1ee39d23f0416b39ccee5df63a37574bac6f0e1ac2f50edc4092eda0f4c27d635f2759910a3 SHA512 faaf7f37d18a0ced9fc4fb513d703141115cf5a769531f84c8bb9f227b5ff99cb01957be49bffbf3a7131182d66793282044a431a6bf80b19dd7ce63e542e48e
 DIST nltk-qc-20200312.zip 125456 BLAKE2B ae02a2cd727e1832ede5fa5b3ef561059c9c714ced80bca311a360dacec6e176c034d802838335437cb8fa25ea877c3774fbac6790cdf6b9b75a3908e76e2dcd SHA512 8cca288f51164f7a18e1c99f2b6a35a3d890bcc5471b5be26883dd87d9b5e06214d15cc1133598fee330f0daf74ceaaa862410f6d95dfd56842a2cb84dd67390
 DIST nltk-reuters-20200312.zip 6378691 BLAKE2B adcb783246f4fd6e73b32fa9419570d9c7e9ecff1c9e2ae39a587f9036ab5eaf9a6ed87b7794dfe2f0ba965cffca68e51c243e3396c179a0282555601caee55f SHA512 21b5a4e114137cd8a52b6e3567c2d72dbe7eac8a3234952896126d9d598fbfa72a7c1e6b7c424b8b016ed345d7350cc562c6d039e2fd6ec0d73c68e13e58605e
 DIST nltk-rslp-20200312.zip 3805 BLAKE2B bf4500dd0e28cb4f018b8d13c5b920294163e7a9735dda12935f6b25ce5c71f2181e3bcb33444d490ba7bb1a029ef50dcdb2df4bddb09bfaf9d91b91531b8461 SHA512 83994b9cf2c925e559c68a03abb1499e3cd308fdb5ac6e698c3b5e2458393d9eae2420b02b4c46fd04527913133a1f19b3a2e5312f07e222e8cf072886f94973
@@ -109,5 +109,5 @@ DIST nltk-wordnet31-20211221.zip 11058667 BLAKE2B fb2dca62f602e05226dd62802f42e5
 DIST nltk-wordnet_ic-20200312.zip 12056682 BLAKE2B c2dc2a646015b23699a72f636b588ec5718c70e6941d9d56863257e1e0396c8cf59ac1dc6ed74e5d7f0c2ee9129d63221a03967bf66a3d335e99160f295ed44d SHA512 1c94451a13af6c76bff60a0cab2e70402a3d9abd2e8fc62a5473f24ab4229feb0afe4faa8d389734697a6cf86d2c8b1dc700bb3afa3cbc279b75d7e0ec19fc6d
 DIST nltk-words-20200312.zip 757777 BLAKE2B eaaaaab6c26e206e9b6ce45daf779e3cc6706a06132afeabf013026d0009caee2d678f3c4ea9125b9654f7143bef29ec7a5706b79e5650ea556c6821b7754e6f SHA512 2810f05d3fc7ee6b6f8636fa1ff7b4e8c8cdac12b415cc54d15c69102290122ea138ec4fa36cb483f790c1ac10b0f83ae4c2c3e0e8df7e67e90e962ee5dbb0be
 DIST nltk-ycoe-20200312.zip 477 BLAKE2B 574835aa011a06a06363e26facd6a6f583a1dc1cac2de39adff59d8ab48eefac030b43d935a2f79af855259f2a9a571193dae2811589483af97406ff05c76c9e SHA512 e39ce165074d10ff63cb84ea52905d7ecb937797c8123ed113c5609afe1f63ac44d04d48a681002c4eac21dc9076ac74164b886c6f9ce42f3a102c38d1e8e756
-EBUILD nltk-data-20220704.ebuild 4657 BLAKE2B 59db7d970bf28f0a106f014c73318902d3fde0226960b3d6b2ce8d02869c8a1813e8127f725a3170e134cfa3100616c866ef51fe054ca7627e77c25991953fd0 SHA512 d55d30c8a2f45c8db902d6bc5854c3368fd361eafd12712aebc554dacdfa33f63da9089cd5ba3d27a15b8f4e2cad16111a1d196446caf52f0b8589a5c38227c7
+EBUILD nltk-data-20221108.ebuild 4790 BLAKE2B 35913e18e57906d0acd8a85adc5b8d851c09384e1869ee87b5f1e102012f29bb2462d16a117a03fd45fe4ae824fad09ff30384c633803fc3f47d6d669a18bb1f SHA512 83b5800fd026f2c167bb98b1ed808eb4156ac4ac31ab3066ca1e50c4f729b200410870c8562baf4b713fc3718d03e973772c04b8eea58e4c2e6aa896a998ebeb
 MISC metadata.xml 390 BLAKE2B e8f39395d8770de8e0e4c13fd51641c4f4a33935dc9e266a899d50cf9f42780e7682177a81f8902b20255114696d790e1c8aae8fdacd25afe8e6057d68d1b554 SHA512 6f173c8a058d6ae48c8316e00bfcd94e7f297667f729ebdab16733e6ae60ca43918e3e5f992faec07ab53c9682293f4543dbaf06045dfd6ff76cbedc8271afdd
diff --git a/dev-python/nltk-data/nltk-data-20220704.ebuild b/dev-python/nltk-data/nltk-data-20221108.ebuild
index fdbb6fd0da4e..26c9531c0a33 100644
--- a/dev-python/nltk-data/nltk-data-20220704.ebuild
+++ b/dev-python/nltk-data/nltk-data-20221108.ebuild
@@ -111,7 +111,6 @@ PACKAGES_UNPACK_2020=(
 	stemmers/rslp
 	taggers/averaged_perceptron_tagger
 	taggers/averaged_perceptron_tagger_ru
-	tokenizers/punkt
 )
 
 PACKAGES_UNPACK_2021_12=(
@@ -127,6 +126,10 @@ PACKAGES_UNPACK_2022=(
 	taggers/universal_tagset
 )
 
+PACKAGES_UNPACK_2022_11=(
+	tokenizers/punkt
+)
+
 PACKAGES_UNPACK_EXTRA_2020=(
 	chunkers/maxent_ne_chunker
 	corpora/biocreative_ppi
@@ -165,6 +168,7 @@ add_data() {
 add_data 20200312 "${PACKAGES_ZIP_2020[@]}" "${PACKAGES_UNPACK_2020[@]}"
 add_data 20211221 "${PACKAGES_UNPACK_2021_12[@]}"
 add_data 20220704 "${PACKAGES_UNPACK_2022[@]}"
+add_data 20221108 "${PACKAGES_UNPACK_2022_11[@]}"
 SRC_URI+="
 	extra? ("
 add_data 20200312 "${PACKAGES_UNPACK_EXTRA_2020[@]}"
@@ -194,6 +198,7 @@ src_unpack() {
 	unpack_data 20211023 "${PACKAGES_UNPACK_2021[@]}"
 	unpack_data 20211221 "${PACKAGES_UNPACK_2021_12[@]}"
 	unpack_data 20220704 "${PACKAGES_UNPACK_2022[@]}"
+	unpack_data 20221108 "${PACKAGES_UNPACK_2022_11[@]}"
 	if use extra; then
 		unpack_data 20200312 "${PACKAGES_UNPACK_EXTRA_2020[@]}"
 	fi
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 027becf11068..dbf28bb731e7 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,5 +1,3 @@
-DIST pylint-2.15.4.gh.tar.gz 1312017 BLAKE2B 49be7a9288fc4186679946769fd9e88c6df504c1683ba0c070721c9223c4169c65bd0cf6344d755f30c440e5c7af98008457a8d7e6cd3d33952f083acb3f0641 SHA512 63cd8abb176092a2d43f38b6cdae5f8ec73a69e7267b6b1deb17150818d19f95be7ca07d5d75f02a9e238c60b153de5cc9294e5f93b8a5351ce0c99e9cf48216
 DIST pylint-2.15.5.gh.tar.gz 1312932 BLAKE2B b8de4e16122ba0bea4cfd9ce3ec4a12abf5e408d7f9d60875eaac781a962c0d01af7691b3c110f2b895bcb7c2d47e0f868d5d52171594aaaecb53ea045a179b9 SHA512 a6e123ab516ef12be0651dbe144814d9f3f9263d61c259d79e9505ee3b4011b33e302281067aa5bacd504fa079f3a7aaceee4d1f9aad127bec8ebeddfeb2afbe
-EBUILD pylint-2.15.4.ebuild 2301 BLAKE2B fdc16d365d1dfe03e2ea0094db0f9dd40ef1965b50b6313fcd1598cdb3db75cbedfc7f3471b3f22171e09fd00a796ae4343d86728f82bef09d6ad3addd368f65 SHA512 677abf4352ae7bae53e57953fe9196ed8f29cdb7cba2bff70ce64ffb7c66b33dfdf2b5468dcef7af2a7f3a0f4092235cdec6ec3d6e0fab31b3add315edf197bf
-EBUILD pylint-2.15.5.ebuild 2472 BLAKE2B 19016922b61bf37c353823a2b08c3805b83d640c570a528fc3b41681d2aa4eb1f12b488092c241fded6fcfc050bbff82d9f805f5e6cd628f8aae76b4d67c71b5 SHA512 7108609cb88793acada884eb5ebebba6080d3afbf230887935c0b09e5a7d78b6cbf38a9b812161f7afee12aa9f54d3e5a89d0c65d4f081a8801c5b1177831761
+EBUILD pylint-2.15.5.ebuild 2464 BLAKE2B 2bf3f42db574d61e67fa83910df8af134b4f8b32b831d0f521ef624009ebbef8308bed9acdaaaab02b5720412a1e618facf52e7bec3611eb71f5084ce382abfa SHA512 268783cbec0e35d9919a33e8b60fc4403b256b068eb2f2e124608ef3bcada544317daa16b99e43e628bb302c0e95400999b4e29e6e985b9782a473e577d3ccfc
 MISC metadata.xml 1100 BLAKE2B 97ec6bd2f6cf487afb93136e9ee58d0d5f8ad37e2ded456ed4f196e73fd37cddead2462d3592b44ca1a6c3722b1f194905238299f0c066945d1e22bdb18acc9b SHA512 0418d987879446fd76fe9b7fc4ee8b1c3c0d9bbab1d1fc3eb66eada0bc52f6b6480cf9852dc3a18b1915d2093642b9c87f24207e89b34d3e48c29a282a3ba979
diff --git a/dev-python/pylint/pylint-2.15.4.ebuild b/dev-python/pylint/pylint-2.15.4.ebuild
deleted file mode 100644
index 6ec928376952..000000000000
--- a/dev-python/pylint/pylint-2.15.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/PyCQA/pylint/
-"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/pyproject.toml#L34 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-2.14[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.12.11[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf pylint || die
-
-	local EPYTEST_DESELECT=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-
-		# TODO
-		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		'tests/test_functional.py::test_functional[no_name_in_module]'
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
-		tests/config/pylint_config/test_run_pylint_config.py::test_invocation_of_pylint_config
-	)
-	epytest
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.15.5.ebuild b/dev-python/pylint/pylint-2.15.5.ebuild
index 09a9e2a10b7b..549084d3b53c 100644
--- a/dev-python/pylint/pylint-2.15.5.ebuild
+++ b/dev-python/pylint/pylint-2.15.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 # Make sure to check https://github.com/PyCQA/pylint/blob/main/pyproject.toml#L34 on bumps
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index ab8a651e6e51..77033855feb5 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,7 +1,9 @@
 DIST pymdown-extensions-9.5.gh.tar.gz 1004601 BLAKE2B 8950ca104edf476e5557eab1effd9ad4e879f2ef58823e1385b5ee000e704b260b20f758578021d4c03492e675027f079363da49429938221fb1c109c9e1fe2d SHA512 b640947b97be4f7592b86125c7de0f36c34052e77103f7d16818b8fc2794cc28d3b7baef84d99434ca1b2810fbe19bc2fc0d2430b8504425cca71677d9c8753c
 DIST pymdown-extensions-9.6.gh.tar.gz 1011446 BLAKE2B 8e334896738de592d8d852f05f165c70d65b6541915bc4d66472b2e2e08a4921e5ed3e0d5873b03e3bbc31179cd2edb367ca0eb3734f1b437b8eff0dc4f9defb SHA512 b806eac4656b1e541753e9e3f4d29bd49dfdfb24ea67633ea232d40833e4ce438b76c71c013d7bc5c3ebfa790b2e314e6f0f76cc3a76f42d5c2b020c32f8dba7
 DIST pymdown-extensions-9.7.gh.tar.gz 1015024 BLAKE2B 6b2b1a86e693a2e4bca889c66bd97c099976e9e9e56291c35b25d8a99554dbae8e4e7b913b774ed9de6406fcaa8850009e000ee97bc97b1dfd09bbc514f4bd6e SHA512 0e6a28ac991ec02821abc1525de30007ded891d8437a8e4f9eb349e26c18702f9477fac0ca6728d5c3fdb5f0fdea451a3f00db3ea354115f20a69bb0f4a114f2
+DIST pymdown-extensions-9.8.gh.tar.gz 1012711 BLAKE2B 451dba60e42d8ad5e1368ac02c89a99a086d99b24402a2570f1fc51c73416163c200d2056a0667f03f6a7c5611cd3b3b870d8dd9ae934ca1d867c9ed9f3a985b SHA512 f9937625984dee09ba2dfdf9e706bdc382017f906f89c42080db38af63b17c1475cc7ffaf94c967ea116c735419168eb35d9dc272d971fe7d92a5950f67673cd
 EBUILD pymdown-extensions-9.5.ebuild 1244 BLAKE2B 4527630ef9f66cd2c708ee3e32ab8cbc8909575271cd0260dc15442cd168bf7e666124c0e39e841a27034d2481d2306a14a507ad560d96b0b58913832640f138 SHA512 048ec6f01d2d2ec9152dde5badbd50d86624a999777aee58ab53b9ad2fea041b3090404be8ca02c2410275577344e1b905cc87b382f88072bd8a0635c702751f
 EBUILD pymdown-extensions-9.6.ebuild 1627 BLAKE2B 167a6c0187697bf5ea751fb3cf30d061c5d411ad7e922b35738e16a69459011610eec0ea193ce990ae745e8b967142d69b58eca5d3f043dcc4d2fd69c7f1b1f2 SHA512 2e2a85177a139eac580c6554d9fd2c560a8d18ea92612a7dd824e58692f9924b67f64018ca233401fa92df224dd73b1e19abd6cc03ac4311c8d22b01f52153d0
 EBUILD pymdown-extensions-9.7.ebuild 1627 BLAKE2B 167a6c0187697bf5ea751fb3cf30d061c5d411ad7e922b35738e16a69459011610eec0ea193ce990ae745e8b967142d69b58eca5d3f043dcc4d2fd69c7f1b1f2 SHA512 2e2a85177a139eac580c6554d9fd2c560a8d18ea92612a7dd824e58692f9924b67f64018ca233401fa92df224dd73b1e19abd6cc03ac4311c8d22b01f52153d0
+EBUILD pymdown-extensions-9.8.ebuild 1627 BLAKE2B 167a6c0187697bf5ea751fb3cf30d061c5d411ad7e922b35738e16a69459011610eec0ea193ce990ae745e8b967142d69b58eca5d3f043dcc4d2fd69c7f1b1f2 SHA512 2e2a85177a139eac580c6554d9fd2c560a8d18ea92612a7dd824e58692f9924b67f64018ca233401fa92df224dd73b1e19abd6cc03ac4311c8d22b01f52153d0
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.8.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.8.ebuild
new file mode 100644
index 000000000000..c5e7c800284c
--- /dev/null
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.8.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-material
+	dev-python/pymdown-lexers
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Extensions for Python Markdown"
+HOMEPAGE="
+	https://github.com/facelessuser/pymdown-extensions/
+	https://pypi.org/project/pymdown-extensions/
+"
+SRC_URI="
+	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	default
+	# We need to do this manually instead of relying on docs_compile
+	# https://bytemeta.vip/repo/facelessuser/pymdown-extensions/issues/1446
+	# https://bugs.gentoo.org/859637
+	if use doc; then
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index a2bbb5f975b1..b9ada8beaee4 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,5 @@
 DIST pyopencl-2022.1.6.tar.gz 455424 BLAKE2B 03c46bebc4d6093489b0a1501267d5d67b73e9e7fe50f73cec3dd752fbb699adab63e08d60f3a54c8fd215cbb82c81353d28e875b953686b05e188df78cfe237 SHA512 a1e404c4c5f95d111690c969ae5c5d34f0deca2c8b93a5ce4d90e003031af7eb94a7708f878170a9b6e001b899d321f7dfdaa6f7545af3237d30d237d44bb45f
 DIST pyopencl-2022.2.3.tar.gz 468218 BLAKE2B d747014c4cdb4d4303aa03fa16606f032b193497cf20909fd9e449f3c02e3d61dce55e44e93e769e4ec8f9c5f859c8d0a0f13bca1f1350dd7a29f6d92bcc3429 SHA512 b16feaa6d8a00cebb4f8c87d2aabed3472c45484eb5ecd530cb8e3478cfc9a41386203ab8cac0450b211f3330c36b3c52846e73a31e346784182f2ca9e6f4123
 EBUILD pyopencl-2022.1.6.ebuild 1819 BLAKE2B af8e6793bee7f165fe7d2914351363c8202207d47a353055b320cd58ba0f8f08bf53c457007bf45e2e3bd7b13eb25b8c51e3f8abfa446d3be85a47b472e3aee8 SHA512 d686767bc8ba8b39e82465e2c10379f6f9e2704786a443177278091fe55c93856c126d1729fd92bf8da605942a94bb0b91cd63b215164b1649ad0ffba5281236
-EBUILD pyopencl-2022.2.3.ebuild 2044 BLAKE2B 6083d65ab5496d9291bb4b7fceb41b5fc1edc466f4151be6ddc4770311c956f7e310d668fa811b37c568b7010bf59d7fd2b4f6a8434cb6f5982c9e5b20f17a2c SHA512 90255f6c485fc35319289dfe3945b459892d99801645a5bbaf08c52f1c8f0b63587ff2d62a5d8f75f24e13f9e66f0197ea98e43420ac8ea435770334ff51b669
+EBUILD pyopencl-2022.2.3.ebuild 2043 BLAKE2B 71bc88e3ce59a64612e91dbe1985f198815e9e0f13e3773b13c26ef101ecbaa88279026640d342c6ba7b0d500da36b6c6d9f8320c3104183e66953e648749bbb SHA512 eb1d85310e0a24ca3ca280c3d0d40e0c189c31ec0e0d152ad0838521ae5b1538d697129b0d1ac1edd075128af28cccd4f00b661d913f404179b023d4ff4e0eab
 MISC metadata.xml 373 BLAKE2B 0de89cb91a5dba1c34bacf04a95d4e2eb9e903bfb55e291f2ed20d579b9736a9a25f27620eed05d19c903c117e0dfbf410f408e9ff4008ce8c93f7b1b004141e SHA512 4ff5643089e5590d1ae4ef413a1ab0fa2772f71922a9da2c8b43ae375ba2e6e3d95ab90a13d51d22fdea49663c112c36352df609eceebd520fdc06590907b0e7
diff --git a/dev-python/pyopencl/pyopencl-2022.2.3.ebuild b/dev-python/pyopencl/pyopencl-2022.2.3.ebuild
index 253582817f5b..6555792f7d0d 100644
--- a/dev-python/pyopencl/pyopencl-2022.2.3.ebuild
+++ b/dev-python/pyopencl/pyopencl-2022.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="examples opengl"
 
 # Running tests on GPUs requires both appropriate hardware and additional permissions
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 7771b2490922..b9341d4bccfd 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -1,8 +1,6 @@
 AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feabbc752bb4bf0af30b645736b9895fe96063dc4a9d5668866523e567f723693b17c6da4101d28713cfa6ad8adadb78e6bb99756d7c69244a2 SHA512 c8b17db89f42a52f4191dda953d7228eafcafd6afb6d7b70527cef090ffd1f073970010a817bede941de10b4e40e41d35fb99b74091baeea6d237c08eb7f225f
-DIST pyside-setup-opensource-src-5.15.5.tar.xz 3577972 BLAKE2B ee16ce18ec4103add41ad89b658012cb2e8695bda51269d3cd1614c2b6d029c0eaba5e592d5e58b6267e1ddc020a938d3ccd2fbc9461cc5bf202f3bdbf6b5d62 SHA512 61b987ec823e9a89f2a07a1991d47f36eb45e3ce416aa6e0032a58ba3d623ac26224cb0f43a2db76850bce7290d12fae610de06405350362caac7860ba99f0c3
 DIST pyside-setup-opensource-src-5.15.6.tar.xz 3580388 BLAKE2B 8a3b15d073bcbb0c6734f500ca906e56387cb8fc4bfcfd996304d71b54edd5f4568976049519ed26aa718bee9e43f59a0c4ef53837d5a341219b991a8527a800 SHA512 99a0c1a05e722cbf33128cf25742e61b92e151fdc05b79db9bafe778e024a0c6fc2886ee3d0b923ff681c55916f5c0eea4197f174432587fd662fba4390b26f4
 DIST pyside-setup-opensource-src-5.15.7.tar.xz 3581144 BLAKE2B 95b5720a5273c96b00bdf86b36734970991a29cf0db1e6fb2c00d7e671fbc4459b4434abc91a8a47ec5d8ba694bcdae5b57a52448908fdca25c348f9ee2b6c81 SHA512 9c551b47581e4f2671c4378f1a2c0d9e565b08edee74244a7704a2c94eef1e1041d23f0e388c07bdd61067e986340907cf80f4527257a9a706f7f07c497834c6
-EBUILD pyside2-tools-5.15.5.ebuild 1654 BLAKE2B a995039b5d9df220c7a2b26d555d5ef0895f934ec47a86f05b6e1d5a20889c5621973289ec2318630f89d1af83b52d197ed96e32d911360837ff44c179224cf6 SHA512 aa5d0e12a94a9a11c87afdc582540bbd61ed821beaebdee89eb83ad33a4a1a420b4169806ea27584e0f74f638c49be45b61f7d2cff7161ee0d0498b62fef45aa
 EBUILD pyside2-tools-5.15.6.ebuild 1654 BLAKE2B a995039b5d9df220c7a2b26d555d5ef0895f934ec47a86f05b6e1d5a20889c5621973289ec2318630f89d1af83b52d197ed96e32d911360837ff44c179224cf6 SHA512 aa5d0e12a94a9a11c87afdc582540bbd61ed821beaebdee89eb83ad33a4a1a420b4169806ea27584e0f74f638c49be45b61f7d2cff7161ee0d0498b62fef45aa
 EBUILD pyside2-tools-5.15.7.ebuild 1656 BLAKE2B 27b6a059754239949498d22b0091edb3934c9f5cf672564a99665efe20dcc4d891f40229765990027102f9174cad162d890322d3f07b842963a77d5e3f415130 SHA512 a0137cacb8901587833ad30865d27df18f87678a5f99c8a9cb8c9e327ddf072842b79278aacca8efc4b1b5aa07b212514e7c05abd9df4483a5a758cefa17126e
 MISC metadata.xml 512 BLAKE2B e06bacf79750f6cc22b41ade8840a01636793100a85cc469c19af1b4273ef33adb3dec755947057a892e88de4ac68e665fa0ccb265457dd09a502964bd991749 SHA512 d201e34b2d73fb308c6b5f14b2d0d292b453b5ef05c820efe429fcfa7259b23f17bc015c08b8f938a2df75f5b654cc1357632a786abfb555479e3f172feee3fd
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.5.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.5.ebuild
deleted file mode 100644
index 9422185d39fa..000000000000
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{8..11} )
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake python-r1
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="PySide development tools (pyside2-lupdate with support for Python)"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/pyside2-${PV}[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-# the tools conflict with tools from QT
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.1-dont-install-tools.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	# The tests are only related to the tools that we don't install
-	local mycmakeargs=(
-		-DBUILD_TESTS=OFF
-	)
-
-	pyside-tools_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-		)
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
-	}
-
-	python_foreach_impl pyside-tools_configure
-}
-
-src_compile() {
-	pyside-tools_compile() {
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
-	}
-
-	python_foreach_impl pyside-tools_compile
-}
-
-src_install() {
-	pyside-tools_install() {
-		python_doexe "${BUILD_DIR}/pylupdate/pyside2-lupdate"
-	}
-
-	python_foreach_impl pyside-tools_install
-
-	doman pylupdate/pyside2-lupdate.1
-	einstalldocs
-}
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index 46f79345b6da..eb27ff1f2131 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,10 +1,8 @@
 AUX pyside2-5.15.2-python310.patch 508 BLAKE2B bdfc33975d1dd0c9eb73d1bae3ec2aff8c1ab1eace10dbde18b467c451605ef5e8c278965043d3cf19dfa8dc80f3fe4bdc1caadd15119303c3e134e364ed5098 SHA512 69a8691d452472f3ae8a58eadd1c1d69cef186192f9fe8311ae65419c94a9efc0331e9446b97f688777f3d5c7ef5a0100bed2e4ce3956b2a4aacfad0b95c1c75
 AUX pyside2-5.15.2-python311-fixups.patch 1962 BLAKE2B 37d91352ea09eaef6d36c600165e4fea74145b0fa05620e739254d3983acc501455154fc51ce3448aa4f60a00cd377f0896cb3dc14f1a921d6948dc53c500784 SHA512 39e999c80ed2717eaf59b47c12e64208d1b54d3d61daacf7a8ebeb4586f3b7312dd5db3fc53d4d2f3c426d80729e5d655e9b612153c704b40b7d261ddd57e580
 AUX pyside2-5.15.2-python311.patch 1777 BLAKE2B 1afa7c39755c4f91b4b4c951f59e1a3190f924d8b20cf2140ad5342c2fa046ff7e6bec540bea9d7652116894e0cb7f5fa5ea73067212ca5b631382e7139d7786 SHA512 b88f300e4944cbb9adc8ac887e263e74e088a1b291000c86f6677a01241939e612fa5eebba3807fb2318477e68de241914832cc92ed0470726804d3098486120
-DIST pyside-setup-opensource-src-5.15.5.tar.xz 3577972 BLAKE2B ee16ce18ec4103add41ad89b658012cb2e8695bda51269d3cd1614c2b6d029c0eaba5e592d5e58b6267e1ddc020a938d3ccd2fbc9461cc5bf202f3bdbf6b5d62 SHA512 61b987ec823e9a89f2a07a1991d47f36eb45e3ce416aa6e0032a58ba3d623ac26224cb0f43a2db76850bce7290d12fae610de06405350362caac7860ba99f0c3
 DIST pyside-setup-opensource-src-5.15.6.tar.xz 3580388 BLAKE2B 8a3b15d073bcbb0c6734f500ca906e56387cb8fc4bfcfd996304d71b54edd5f4568976049519ed26aa718bee9e43f59a0c4ef53837d5a341219b991a8527a800 SHA512 99a0c1a05e722cbf33128cf25742e61b92e151fdc05b79db9bafe778e024a0c6fc2886ee3d0b923ff681c55916f5c0eea4197f174432587fd662fba4390b26f4
 DIST pyside-setup-opensource-src-5.15.7.tar.xz 3581144 BLAKE2B 95b5720a5273c96b00bdf86b36734970991a29cf0db1e6fb2c00d7e671fbc4459b4434abc91a8a47ec5d8ba694bcdae5b57a52448908fdca25c348f9ee2b6c81 SHA512 9c551b47581e4f2671c4378f1a2c0d9e565b08edee74244a7704a2c94eef1e1041d23f0e388c07bdd61067e986340907cf80f4527257a9a706f7f07c497834c6
-EBUILD pyside2-5.15.5.ebuild 9114 BLAKE2B acf0acd94e58949465895e7771fc771aed19dcb3dd4d319e575c8c2edf3820a7aea4b1793fb3627e26593e27a7d36ebe571d372f6e5e78670f49aac9fd609180 SHA512 ecb43e1bd5b621c3fe4d2db0b21b7ff7650bea5cc38e579527eda8ce3a59dffabb25e56a2424c0d0e3533d6e501c9f7af48aed7f15977abf179856445e4bb6b8
 EBUILD pyside2-5.15.6.ebuild 9114 BLAKE2B c90521a72aa4bf3ef86d27228f9b5aadb1174a450280c1c94517238a7aed5fa2920ba780969517272a580b3b39abe85741f3429558a325c00acc2b421879c0d4 SHA512 c137ce6937d8f55463852333df00c91f0367df6800fc4a8da97b490820645d74ecbe55f40d4f721a1af11e3f5067f2acf3410ddf8b578d0e9c2e7263e6e5ecf0
 EBUILD pyside2-5.15.7.ebuild 9270 BLAKE2B 19153982247f984c9d9b095f256a932a2604a7c1b6d1189ca703027ee8f1c28184ac2fc2102d4f183de887be7e8cae237ace2a7d694f4ba25f9b66d6784242f9 SHA512 621335484f837b08d966754796c9f7d07db0b4e64830dc5855ce54c070b21317a146dba93d87d141b3da91f8a50e3bbd2fe00c54969ab4afbe5f35ebce02b032
 MISC metadata.xml 2255 BLAKE2B 00982d17109b327ce063f5ba53474603cc73ffb013268ec9f6b751a73792a790f56de285291e70ad12147c27ba97b516be1318df312483d67d72509f8e8d8655 SHA512 830f9510f5e141422cbbab356d34a34b631f948eea14bcc96badbef65ce10f56c648748edc4ddf06be77b1c597a7d12d4552bde122937eb4cda01b304a3193c7
diff --git a/dev-python/pyside2/pyside2-5.15.5.ebuild b/dev-python/pyside2/pyside2-5.15.5.ebuild
deleted file mode 100644
index ba9bbd1e9704..000000000000
--- a/dev-python/pyside2/pyside2-5.15.5.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit cmake python-r1 virtualx
-
-# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
-# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
-# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
-# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
-# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
-# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
-# that the "PySide2/QtGui/CMakeLists.txt" and
-# "PySide2/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
-# testing whether the "Qt5::Gui" list property defined by
-# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
-# time contains the substring "opengles2". Since cmake does not permit
-# properties to be overridden from the command line, these files must instead
-# be conditionally patched to avoid these tests. An issue should be filed with
-# upstream requesting a CLI-settable variable to control this.
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/pyside2"
-
-# See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
-# Shall we allow essential modules to be disabled? They are:
-# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
-# x11extras (for X)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="
-	3d charts +concurrent datavis designer gles2-only +gui help location
-	multimedia +network positioning +printsupport qml quick script scripttools
-	scxml sensors speech +sql svg test +testlib webchannel webengine websockets
-	+widgets +x11extras xml xmlpatterns
-"
-
-# Manually reextract these requirements on version bumps by running the
-# following one-liner from within "${S}":
-#     $ grep 'set.*_deps' PySide2/Qt*/CMakeLists.txt
-# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	3d? ( gui network )
-	charts? ( gui widgets )
-	datavis? ( gui )
-	designer? ( widgets xml )
-	gles2-only? ( gui )
-	help? ( widgets )
-	location? ( positioning )
-	multimedia? ( gui network widgets )
-	printsupport? ( widgets )
-	qml? ( gui network )
-	quick? ( gui network qml widgets )
-	scripttools? ( gui script widgets )
-	speech? ( multimedia )
-	sql? ( widgets )
-	svg? ( widgets )
-	testlib? ( widgets )
-	webengine? (
-		network
-		widgets? ( gui printsupport webchannel )
-	)
-	websockets? ( network )
-	widgets? ( gui )
-	x11extras? ( gui )
-"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2):5"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/shiboken2-${PV}[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5[gles2-only=]
-	dev-qt/qtserialport:5
-	3d? ( >=dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] )
-	charts? ( >=dev-qt/qtcharts-${QT_PV}[qml?] )
-	concurrent? ( >=dev-qt/qtconcurrent-${QT_PV} )
-	datavis? ( >=dev-qt/qtdatavis3d-${QT_PV}[qml?,gles2-only=] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[jpeg,gles2-only=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[qml?,gles2-only=,widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml?] )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV}[gles2-only=] )
-	qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	quick? (
-		>=dev-qt/qtdeclarative-${QT_PV}[widgets?]
-		>=dev-qt/qtquickcontrols2-${QT_PV}[widgets?]
-	)
-	script? ( >=dev-qt/qtscript-${QT_PV}[scripttools?] )
-	scxml? ( >=dev-qt/qtscxml-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV}[qml?] )
-	speech? ( >=dev-qt/qtspeech-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV}[qml] )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV}[qml?] )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV}[gles2-only=] )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xml? ( >=dev-qt/qtxml-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV}[qml?] )
-"
-DEPEND="${RDEPEND}
-	test? ( x11-misc/xvfb-run )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.2-python310.patch"
-	"${FILESDIR}/${PN}-5.15.2-python311.patch"
-	"${FILESDIR}"/${PN}-5.15.2-python311-fixups.patch
-)
-
-src_configure() {
-	# See COLLECT_MODULE_IF_FOUND macros in CMakeLists.txt
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DAnimation=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DCore=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DExtras=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DInput=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DLogic=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DRender=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Charts=$(usex !charts)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DataVisualization=$(usex !datavis)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Gui=$(usex !gui)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Location=$(usex !location)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=$(usex !positioning)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !qml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickControls2=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !quick yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=$(usex !script)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=$(usex !scripttools)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=$(usex !sensors)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=$(usex !speech)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sql=$(usex !sql)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !testlib)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebChannel=$(usex !webchannel)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineCore=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebSockets=$(usex !websockets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=$(usex !widgets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=$(usex !x11extras)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Xml=$(usex !xml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=$(usex !xmlpatterns)
-	)
-
-	pyside2_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
-		)
-		cmake_src_configure
-	}
-	python_foreach_impl pyside2_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE
-	python_foreach_impl virtx cmake_src_test
-}
-
-src_install() {
-	pyside2_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the shiboken2 pkgconfig dependency in the PySide2 pkgconfig
-		# file for the current Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		sed -i -e 's~^Requires: shiboken2$~&-'${EPYTHON}'~' \
-			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
-
-		# Uniquify the PySide2 pkgconfig file for the current Python target,
-		# preserving an unversioned "pyside2.pc" file arbitrarily associated
-		# with the last Python target. (See the previously linked issue.)
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl pyside2_install
-
-	# CMakeLists.txt installs a "PySide2Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., pyside2-tools) to target one
-	# "libpyside2-*.so" library linked to one Python interpreter. See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i -e 's~pyside2-python[[:digit:]]\+\.[[:digit:]]\+~pyside2${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)/cmake/PySide2-${PV}/PySide2Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
-}
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index c87d4f49c801..88bd50be2bb7 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -5,7 +5,7 @@ DIST python-3.8.15-docs-html.tar.bz2 6695025 BLAKE2B 614bd68c7038887e4d8f1758b73
 DIST python-3.9.15-docs-html.tar.bz2 6964615 BLAKE2B c5faf1c6d86dba0ceae0a613a0c0bfd86b9605a134762872bc30dd6df113cc836d551032cfb4ba5812aa0d47933bcff28eeff0b68331e4dff1d27497d6e20ff9 SHA512 7f94c2c9569f3e9aa87ab90edbe584b6871a686fee72d8e257a7ae63af301596f7aae1bd63fcac30fa67bdf396453ec6cadc85d3b668514514927131cf70b5d0
 EBUILD python-docs-2.7.18.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
 EBUILD python-docs-3.10.8.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
-EBUILD python-docs-3.11.0.ebuild 631 BLAKE2B d1cc68651830017741886736686e19865c71551e45e4127dfed7ac08e58260046744f9b00c0c3a8baee4c7d09c2b7fa92ae7f7b159b86c84757a39dd59251ceb SHA512 68df29428e84915577cc6df0a702f4eef201ebcc1c3b24d63215e2b1d5135994f1b68ff6a086f9994a45491742acb7bdeec49ef7d2c307165786e1ddcd6b8300
+EBUILD python-docs-3.11.0.ebuild 629 BLAKE2B dcbebf3ed6f4a05ee7c8b394230ea7b2b23120dc72199a1cdd7086c068480c2169b2f57ff7832b4cc89c46c7a4c506b6a501b37fe9017963185db594850581d9 SHA512 2e18944930ba2aadffdc4a540bf4303f5e8433bf344036fdbaa86a038ebeb3e2cb853533ec8c7d285670fd294ac650ffbda7d8401d674cc8d1c19d59cc2c3f83
 EBUILD python-docs-3.8.15.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
 EBUILD python-docs-3.9.15.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
 MISC metadata.xml 237 BLAKE2B e0ddb660341d52285c05ef71475c4790faf6a2c02dfcae63852cf6ec1d59f8d8d05f0053f4dabcc655cee5c52d4105ab7c49b1d073ef81564776ef2ab1dd18cd SHA512 b7c9ef68c5b33164535e398194694d571950d673409429aba5d40fdeffbc69871645509798671b80e47bce55e4237c094e50968e22534b4e83a020b11f4804f3
diff --git a/dev-python/python-docs/python-docs-3.11.0.ebuild b/dev-python/python-docs/python-docs-3.11.0.ebuild
index 293b3f7a8143..6603ab51292c 100644
--- a/dev-python/python-docs/python-docs-3.11.0.ebuild
+++ b/dev-python/python-docs/python-docs-3.11.0.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index d6a7d337e5c5..0b7ce8bec769 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,12 +1,4 @@
-AUX python-lsp-server-1.4.1-allow-mccabe-0.7.patch 625 BLAKE2B 60880a45b859273e9ac3078210b4a1deffd2d6b88ef0fc7a4bbfb6beefe50291c777e6c1681ebb333b1b302ce3df38e8d21aef844b49d7dc0e3cf0d5bdc76229 SHA512 100728b441d48301d8516ba5ce5396a70c9f30f8c02b8b2eebdd3f9248e534c96c1845f8e327c2f31529756bcb9a411a56c845ff8a802f6cc4ad694b71c48b76
-AUX python-lsp-server-1.5.0-allow-mccabe-0.7.patch 707 BLAKE2B ffec2cfbce2741e8760cec724ad36e5d686a7e031032ce5a8d2662ba839b2437b5e14fe2c7f8395eca751085b54a5b9c417a149566033a74bcf2ab12081dfed4 SHA512 2bb3eba93e4f9d24ae1fdac46d4e8aeeb06be6130c139d5291455f0b30c3d71c8c74eb7618ef410530b3e9c58e91c7a88956b898be714fc5b55db98e7ac80f82
-AUX python-lsp-server-1.5.0-unpin-all-the-deps.patch 1213 BLAKE2B b4630dc59f3740f77230556d1dfe45e897afb065bd30d7cc15ebb97ec10a1f8d433ab9e772fcb019c8e10e634854b2b42294e243884dd91c4afadb89d744fab2 SHA512 161c861c26e65f5c2ca7735f7286752ba550e8c8e166fc7f2d0b7ae8d76048ad19e92cc1432f19a4a2c8aa0bc85ff5cd3a9bb3a7ed9c0a786c7c79767a58f330
 AUX python-lsp-server-1.6.0-unpin-all-the-deps.patch 1461 BLAKE2B f4a2bda2717370e18c5cc909486d852c985168fcfca042c8f12bff96701a5a7c2e0cc9fce1429870ceed9e2b385e795b5a5b18c919defc07e42933496b19b863 SHA512 8ba0da9a25bde3c1788e9729b1c98fde9f134ec78c3ee9185e61333cfbf90a50ee9f0cbd9fa569bbaae7289cfa75260b848ececc83f6e7d26891f457808ffb73
-DIST python-lsp-server-1.4.1.tar.gz 76416 BLAKE2B 65638b876182c478434c563371b802367fb8439820ccf57e4404dc1507f3cd514ae5d738d418386607db606025fe5126a533c656ec3fede53fdcfd364a4292cf SHA512 4c9171adc88d219c80055ebbc76566583925129969467c156277b52de9b5981b74b11b9961247045ea98cd9e51e146b2d606c8351a7be5db76f6f4e0e4d7195c
-DIST python-lsp-server-1.5.0.tar.gz 82371 BLAKE2B 3ff388a95f7ae9f4a8e1b41244da1d05e9310e1edcbc7cbd2b17bd4fa0cbe696f31885b2093afb12e879c875b2bfa721cf4e5e9876002f145cf1633238f6238a SHA512 4e3463dc737b4f5f2af0faa8ab2eb10bea8208d4633c22acde9c8ffa2a888b2350e5994dca2a66031e301224a2646660f627d7fc238cbf5103e82a0453a9a809
 DIST python-lsp-server-1.6.0.tar.gz 85242 BLAKE2B 52fcca5a93035a6ec8179908b2139e9392220cad082afb4c31b18284cdd53050c68fca4bcc9d852fa9acb49200487431fec37dc840e61ab9320fd6c3a86189ee SHA512 e4ab52f334fb1eece3458258ed39bf66eeb6056ed7e243be9c69ce2bac92792786df2fbc1d316133ac5523b44a57e7d89d4d6f18120c748e78ef20570a325c9b
-EBUILD python-lsp-server-1.4.1-r1.ebuild 3086 BLAKE2B 7b2f1851b082ae6ac5ec8353a1e8d155060197602c4ddb68a1d7487590313dd08ebdbde64d78ea0cada6fd309945824621d45206047fa8e16c290fd90c23c973 SHA512 17b3cf9fa4de342e3455d65f76aae4c1c0c1bcad73fd142974249aa09b08edaa32200650ac89761c42be7ce4722534b47c4913b7727c93443ab584775a64f467
-EBUILD python-lsp-server-1.5.0-r1.ebuild 3094 BLAKE2B 894dc5c522e2f54de16a984424dbdab8cd27ba652a5638057c96a269cd73c13afda493beab06bfbd6ecd9716c01a00d81114b00c423227d061f06e3afc178aef SHA512 123c56730b3b9f771966fae2de4ec1115e29fd44b965bddbf169addce637526803a470fc0a475add11f2547e14be9b5eb32acd97e48cf3ef7851204419e990e2
-EBUILD python-lsp-server-1.5.0.ebuild 3296 BLAKE2B 59248c3e0a31a00bf18405278ed3ecce81df6135b5e53df76e69f96c51630841955132cd4d857fbf07fa944726c3162a68ac4e9472da6fd0899b2fe5f140009a SHA512 3402de9df0437626ecbab351a383853a72f49ae192e13a477ff7f43593668eb9711115c04f53a2eaced1b24d901f1aa5552b98743c864def7c8d5bd875eb0abe
-EBUILD python-lsp-server-1.6.0.ebuild 2990 BLAKE2B 72c9f051480f10cb87b48761099cf434f4ff310e61d28f82685e8041fa799575ac568829362882b7da0498c0c77c06331e984dd03c25263fbdeddd7aa2f685d8 SHA512 467cb283f588d38f33f7b47904111271df43138ce2ca8217ce7ff0de17a4a9d0b47f3149d22f062001cd19fc0fb98d429a106601a96411c97c2a96c3d4dbe7f6
+EBUILD python-lsp-server-1.6.0.ebuild 2988 BLAKE2B 9c33dd656ba3915055ef7ecdda17e95871045c077689cd59373ef91a909a0316b895ab8f3e59d8ea8eb4baebbdfb48cdfc9e56deac7ec45eb65288a38fc6101c SHA512 53d7cff3eab6a70f399a69d65ea00935c9534809898321ad87a777202e7c2366a29d07611a91e9222926a85a4c97b87175c5e2c580e1e11933a189740d36ab8a
 MISC metadata.xml 542 BLAKE2B ca71a08385d37c7f5cc562986630ae482970842054ffa944151d2e4a5d8449329b71c16c61e2a81f3d3d93f02a61ce637fe0bd0961ba3f86b7182b9728b62d5c SHA512 2d5103643838ba8aec53e7d3e924517cc3d735c724b6dfea249bcce3716aebb9f54e3264cb2cccc15dfe7d0ad4b7d052388122144fe6248d4faeef3482d197e7
diff --git a/dev-python/python-lsp-server/files/python-lsp-server-1.4.1-allow-mccabe-0.7.patch b/dev-python/python-lsp-server/files/python-lsp-server-1.4.1-allow-mccabe-0.7.patch
deleted file mode 100644
index a31201ab6b15..000000000000
--- a/dev-python/python-lsp-server/files/python-lsp-server-1.4.1-allow-mccabe-0.7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/setup.cfg b/setup.cfg
-index 156145f..c46fcf3 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -26,7 +26,7 @@ exclude = contrib; docs; test; test.*; test.plugins; test.plugins.*
- all = 
- 	autopep8>=1.6.0,<1.7.0
- 	flake8>=4.0.0,<4.1.0
--	mccabe>=0.6.0,<0.7.0
-+	mccabe>=0.6.0,<0.8.0
- 	pycodestyle>=2.8.0,<2.9.0
- 	pydocstyle>=2.0.0
- 	pyflakes>=2.4.0,<2.5.0
-@@ -35,7 +35,7 @@ all =
- 	yapf
- autopep8 = autopep8>=1.6.0,<1.7.0
- flake8 = flake8>=4.0.0,<4.1.0
--mccabe = mccabe>=0.6.0,<0.7.0
-+mccabe = mccabe>=0.6.0,<0.8.0
- pycodestyle = pycodestyle>=2.8.0,<2.9.0
- pydocstyle = pydocstyle>=2.0.0
- pyflakes = pyflakes>=2.4.0,<2.5.0
diff --git a/dev-python/python-lsp-server/files/python-lsp-server-1.5.0-allow-mccabe-0.7.patch b/dev-python/python-lsp-server/files/python-lsp-server-1.5.0-allow-mccabe-0.7.patch
deleted file mode 100644
index ae8d0944b8f4..000000000000
--- a/dev-python/python-lsp-server/files/python-lsp-server-1.5.0-allow-mccabe-0.7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index ff60a18..2d292b7 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -28,7 +28,7 @@ Homepage = "https://github.com/python-lsp/python-lsp-server"
- all = [
-     "autopep8>=1.6.0,<1.7.0",
-     "flake8>=4.0.0,<4.1.0",
--    "mccabe>=0.6.0,<0.7.0",
-+    "mccabe>=0.6.0,<0.8.0",
-     "pycodestyle>=2.8.0,<2.9.0",
-     "pydocstyle>=2.0.0",
-     "pyflakes>=2.4.0,<2.5.0",
-@@ -39,7 +39,7 @@ all = [
- ]
- autopep8 = ["autopep8>=1.6.0,<1.7.0"]
- flake8 = ["flake8>=4.0.0,<4.1.0"]
--mccabe = ["mccabe>=0.6.0,<0.7.0"]
-+mccabe = ["mccabe>=0.6.0,<0.8.0"]
- pycodestyle = ["pycodestyle>=2.8.0,<2.9.0"]
- pydocstyle = ["pydocstyle>=2.0.0"]
- pyflakes = ["pyflakes>=2.4.0,<2.5.0"]
diff --git a/dev-python/python-lsp-server/files/python-lsp-server-1.5.0-unpin-all-the-deps.patch b/dev-python/python-lsp-server/files/python-lsp-server-1.5.0-unpin-all-the-deps.patch
deleted file mode 100644
index b8b3eb10f9f2..000000000000
--- a/dev-python/python-lsp-server/files/python-lsp-server-1.5.0-unpin-all-the-deps.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index ff60a18..0c756ff 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -26,26 +26,26 @@ Homepage = "https://github.com/python-lsp/python-lsp-server"
- 
- [project.optional-dependencies]
- all = [
--    "autopep8>=1.6.0,<1.7.0",
--    "flake8>=4.0.0,<4.1.0",
--    "mccabe>=0.6.0,<0.7.0",
--    "pycodestyle>=2.8.0,<2.9.0",
-+    "autopep8>=1.6.0",
-+    "flake8>=4.0.0",
-+    "mccabe>=0.6.0",
-+    "pycodestyle>=2.8.0",
-     "pydocstyle>=2.0.0",
--    "pyflakes>=2.4.0,<2.5.0",
-+    "pyflakes>=2.4.0",
-     "pylint>=2.5.0",
-     "rope>=0.10.5",
-     "yapf",
-     "whatthepatch"
- ]
--autopep8 = ["autopep8>=1.6.0,<1.7.0"]
--flake8 = ["flake8>=4.0.0,<4.1.0"]
--mccabe = ["mccabe>=0.6.0,<0.7.0"]
--pycodestyle = ["pycodestyle>=2.8.0,<2.9.0"]
-+autopep8 = ["autopep8>=1.6.0"]
-+flake8 = ["flake8>=4.0.0"]
-+mccabe = ["mccabe>=0.6.0"]
-+pycodestyle = ["pycodestyle>=2.8.0"]
- pydocstyle = ["pydocstyle>=2.0.0"]
--pyflakes = ["pyflakes>=2.4.0,<2.5.0"]
-+pyflakes = ["pyflakes>=2.4.0"]
- pylint = ["pylint>=2.5.0"]
- rope = ["rope>0.10.5"]
--yapf = ["yapf", "whatthepatch>=1.0.2,<2.0.0"]
-+yapf = ["yapf", "whatthepatch>=1.0.2"]
- websockets = ["websockets>=10.3"]
- test = [
-     "pylint>=2.5.0",
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.4.1-r1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.4.1-r1.ebuild
deleted file mode 100644
index 5b50d2c382e3..000000000000
--- a/dev-python/python-lsp-server/python-lsp-server-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python Language Server for the Language Server Protocol"
-HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-IUSE="all-plugins"
-
-BDEPEND="
-	test? (
-		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
-		<dev-python/autopep8-1.7.0[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
-		<dev-python/flake8-4.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/mccabe-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/numpy-1.23.0[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-		<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="
-	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	all-plugins? (
-		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
-		<dev-python/autopep8-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
-		<dev-python/flake8-4.1.0[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/mccabe-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-		<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-allow-mccabe-0.7.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '0,/addopts/I!d' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "Automatically format Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.5.0-r1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.5.0-r1.ebuild
deleted file mode 100644
index ba5da2428f9b..000000000000
--- a/dev-python/python-lsp-server/python-lsp-server-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python Language Server for the Language Server Protocol"
-HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="all-plugins"
-
-BDEPEND="
-	test? (
-		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/numpy-1.23.0[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="
-	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	all-plugins? (
-		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
-	)
-"
-
-# Upstream is overly cautious, insists on pinning
-# dependencies to versions required by other dependencies.
-# i.e. pin to <dev-python/pycodestyle-2.9.0 because
-# dev-python/autopep8-1.6.0 requires that version.
-# This causes way more problems then it solves.
-PATCHES=(
-	"${FILESDIR}/${P}-unpin-all-the-deps.patch"
-)
-
-EPYTEST_DESELECT=(
-	# This fails because the error output has changed slightly
-	"test/plugins/test_pylint_lint.py::test_syntax_error_pylint_py3"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '/addopts =/d' pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "Automatically format Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.5.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.5.0.ebuild
deleted file mode 100644
index 6ccf9291ac69..000000000000
--- a/dev-python/python-lsp-server/python-lsp-server-1.5.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python Language Server for the Language Server Protocol"
-HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-IUSE="all-plugins"
-
-BDEPEND="
-	test? (
-		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
-		<dev-python/autopep8-1.7.0[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
-		<dev-python/flake8-4.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/mccabe-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/numpy-1.23.0[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-		<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
-		<dev-python/whatthepatch-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="
-	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	all-plugins? (
-		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
-		<dev-python/autopep8-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
-		<dev-python/flake8-4.1.0[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/mccabe-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-		<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
-		<dev-python/whatthepatch-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-allow-mccabe-0.7.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '/addopts =/d' pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "Automatically format Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.6.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.6.0.ebuild
index 373cd37c233f..f4aa1b867174 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.6.0.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 IUSE="all-plugins"
 
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index 2bcbd5541464..50a0560ce79e 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -2,5 +2,5 @@ AUX python-systemd-234-fix-py3.10.patch 1539 BLAKE2B c41b20fea9165c62620c2b7262d
 DIST python-systemd-234.tar.gz 53900 BLAKE2B 2658ee7083036ed8259e5f4ad0714ea15227ee836ad34c7fbbdb55dd9df48751b8d9998350d789b4f47e78fe7b4a7134e12d637e5a6ebeb29a0b31e5a4575d91 SHA512 164e34ba46827711e9c6ff9ed58b2706d9a22abfc7001de030ed7d463d8ddf783eb5fee93b207c29950a3c566018cc3f1a21a549421cf3e05c1287b433367eb2
 DIST python-systemd-235.gh.tar.gz 59858 BLAKE2B 8dbf112773dce4dfe9fb2b0e660a349481fa29c9532c5aa2d125e5bfc255b2408f63b5bd873b6fee9ebbad775ecfaf32497593b17052189797403fa31b05fd6f SHA512 f1286a477200cc7b4d2c44b43452da576e8e660925711466659795775bcee44796688e1ede6cc22e61cb5b03e631c396d22f9a133327ae1147506bce09bab47f
 EBUILD python-systemd-234-r2.ebuild 865 BLAKE2B 8707e264d86df1a815c2b6d1d88c73717cb1066b7f7e11aa86679a18c769b487dab7e4f0bd14f2500d70dd51e5c916cf1fd9437b1524b2393492c1951ff8a1cd SHA512 88ab314e34907113fda7cf90f43bb921b46f01fcd517a428e0518caab541ba96abc44ac2bcb28b7ac053eaa17770718e48d0437df681b134cb48fd3ae792b432
-EBUILD python-systemd-235.ebuild 818 BLAKE2B 89d9415d7f4a493cfb5df9e82d8b28f83d058bb4205b975e90fbc6b3bd092a4697bf1a40985e7d3b21fa675a3415306743acbccdc0db87021bee91948a119656 SHA512 0ebddc0c0f0aa6e41e5bf6887c2fc8527a689eeafab085fc0c1b3c6504261009b86b742ffa3082cf59e59ebca39cfa3414a9bc50d0259991e22981da5d01bd34
+EBUILD python-systemd-235.ebuild 817 BLAKE2B a95c97936f52ebbd4f763c7503ff0d6cfcd0f18d8850282cb089c55b3e54f01a30c0ae182beb5639c868c6dd2bf8dc661e769fd2da819b4655d4a22bff15d559 SHA512 89e1043d1150e80948513127e3973cceaf294f62808dc805d81bea5de28d5ef3c2010e1ab9c30f4703fa7c4b4458cb9f846d2a96d2fdfb8ca08dc84fb974411a
 MISC metadata.xml 359 BLAKE2B 458599dbb5364bdf58f0cabf3fe07f03f79a4cdfb3f707ef6db328c453e606b587e13fa3349e0e0c899a7b1655e558ccae00e6a9ea22146b9e68099e0ac1a981 SHA512 73e524d826bb08d80fbe3e643be5f08e39620ddb343006752729ea41e594ad13eb6241c30da78a58f67e6e5e3c51f567a9e761af498f882f1e23ce0308bfd690
diff --git a/dev-python/python-systemd/python-systemd-235.ebuild b/dev-python/python-systemd/python-systemd-235.ebuild
index 288448e2d373..4bd420269fbc 100644
--- a/dev-python/python-systemd/python-systemd-235.ebuild
+++ b/dev-python/python-systemd/python-systemd-235.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~s390 sparc x86"
 
 DEPEND="sys-apps/systemd:="
 RDEPEND="${DEPEND}
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 5b44d4d11b1c..d94e8a7f3016 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -3,6 +3,6 @@ AUX pythran-0.12.0-gcc13.patch 1472 BLAKE2B f385cfd607a77a72fd5815502416b267342d
 DIST pythran-0.11.0.gh.tar.gz 3582011 BLAKE2B 532afe9edd84d2699254bcad330dc03fcda4defce73997ec9feecf1a9e0c8f4fd407a5c4ebae7e10f96463a43453137953dc3e4df010ae7fb63d540d41b79f53 SHA512 bd703148f26a0511f5a21e691e62f4e9b7bf5a92548f8ac837b2d24135917b71b052941180c9801f29c457018eb57e5f5107a509d6815d8dd8ddab1b8626b1a1
 DIST pythran-0.12.0.gh.tar.gz 3589256 BLAKE2B 5eeba4b7d73e56cc2b696098edb085e11d406485960614b50426e3df7c425ad22537ae72a2931a9ec318ab23153660da543ec1890f03379981eee10a34b82cea SHA512 8f698cb2efc8e53005a6a18b81b9119796d56e638c4634d3a9268bc8d4ac340c7ff1a26212f17210ad7200eb8a3e0f9dd20702d9d9c51f24a76dadc7d0877693
 EBUILD pythran-0.11.0.ebuild 1216 BLAKE2B 3bbdd186dec832ba93efc8681b36738f28779b6b30068b27309ce7a3701a15a95387e56878bf77aa7f7ecbd316328dc9d815178a2c471e0441bf12ca5deb86bd SHA512 78fdf9b66ddf94d3513a2a07203ac1274e9d1dc928afabea0a573e47716006606a5ae38c372a98c7e601195080bd876a3bb816e74c3aaaa49b9f3f56f106ea87
-EBUILD pythran-0.12.0-r2.ebuild 1474 BLAKE2B 3123ba274a30763044012a8e6c509891602a08bd3626662808e7dbcc8981ae0ebabdc31ff97221475cb24fd3b30a2c557c25627960f9e4d6bbe65791bac26e05 SHA512 c1a06bd1283ce299682a0bd6e9eaf5cf76c4df77a8832ca6f5d844cb3ede83abaf309a3eb6e3d0ff631413a005a7aca60558b7d0afd853dea955b6971b02226b
+EBUILD pythran-0.12.0-r2.ebuild 1473 BLAKE2B 26de0d0af5185ff7fd0c20ba2e7ae71ddfbd2cc49fa7fc91984c854a1f399f327c5bc124ddb3954bacc86f942de5907f2bfa4678c4de7dcbe7b13de5d9ad259d SHA512 3c5c0ac72f59f52de13db1594953f97aca17504085c11e48f020ce52c4dd0d15742286d6497737a29ccd380aa27dafb6d17b4c73afcf8053b194e465985319a4
 EBUILD pythran-0.12.0.ebuild 1190 BLAKE2B ef04054cb343d9a3c3e0bdc5fe2f6c41aef90bef6cb2eaf2d3fbadf35430677072a45e0888fc05a8874bfe6b61bb799b0cf9b86a93fc493e95a5e1c6e95dcce1 SHA512 794a5d327f8c9aeea34cdccd596726c7084a14e8a9a9af7ec604afad6f602409b814eac6fb042a7a8a8626a38a5e1e3aadcaa531d0233bcefccffe3647312dfd
 MISC metadata.xml 354 BLAKE2B e7ec71fae294f6f697b0fd99b0ccef24049af7999866344e8da2ebc40bc2988a21f2cb0374b52b781a5f8b55f26ebca364dc93f4e69d957a3ff6bd3c32cd988d SHA512 9008d270ea6757557482edb55c5848aea9a29abfbbad65d93000660a1e51ad2456a2b7ccfcacb80da23b3dd38cee2c4da9645aed48a35edb4a497bbe3a80dd7f
diff --git a/dev-python/pythran/pythran-0.12.0-r2.ebuild b/dev-python/pythran/pythran-0.12.0-r2.ebuild
index e4b60363be00..4202d8f839eb 100644
--- a/dev-python/pythran/pythran-0.12.0-r2.ebuild
+++ b/dev-python/pythran/pythran-0.12.0-r2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	dev-libs/boost
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 55c5ffdbeebf..8e6662408ef5 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -2,8 +2,6 @@ AUX twistd.conf 277 BLAKE2B 78ca35b410a6597c9afe6a9c8d3dfb1de113411634901f936794
 AUX twistd.init 563 BLAKE2B 24488118b025bf2068bbf07af900064ff6a7ee99106c3da30f15f2b3f85af7443212afebc6b52a12645488b85656f87b653df9263fc2be6bd09707917899f252 SHA512 7860601beba1efda2b0a045b2a044ec33caff9ee915d45225c05e281760a68da349b4c45080600177aab32aa806714327acf3cf5dda92be0874f781f129bb129
 AUX twisted-22.1.0-force-gtk3.patch 2634 BLAKE2B bf297589d56a59149e1a269aef416a9aef26dd2123cd9fc87358d19b279bd2924e84d3e9fffe5e6edb70f7268c19b4053cfdf6362b04dd6e91b3a2c997e0f92f SHA512 85b1678cf6c73e78004a015424f2e092b42bf4f5899ed607093b4c26ff1411fe22267df09c331f80086f9d46e5a6dadfad7fe62cbb04e3edeaaa05f40c96239a
 DIST twisted-22.10.0.gh.tar.gz 3512714 BLAKE2B 2fd36ec6922f428e959ce0169bb9a3592b8b3e43aff8d34872883ecf0fad8d0fff01a52f06b54df3dc377f4fc1a488b6d66f9287b108b4749bb7d3c749b96061 SHA512 cf9ed96430376d499ae9627a7d0656c05cb99bc9e9b15a8f4166355363818f090bc3c2b383ed4cf19e1e38fb569e8618d35a0ddde2a90a06f3c9a4ea769837e4
-DIST twisted-22.8.0.gh.tar.gz 3937858 BLAKE2B de5f56f2ac92db3ccd29122f3c3bacc01de325e4b00b60a0ea9bcf13c5714487d596299990d292758821e242443d8c65cda03b895196df0a635b0739f08668fc SHA512 890a11ca55fd88636f404678c6fad3fcea9d0604b1b37681a4b92ea74952bc4d1b96a571dde39a4aa82d966121156801f6b42dbd0bb5a309503591a7a77c6d71
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-22.10.0.ebuild 4788 BLAKE2B 0ec35b63b52d6f8685c2c3e86f304f6e84c4e50f653cec0b674c30a9edb1df094b05f8a9bc35d97f7a752ac4f0713914c6431be1d6954d6e8cc7eeb86e41f3c3 SHA512 1a8ba91ecc7f1801b9b2805bfea455cc2c8d7a499f8e0e4e382ef56b3d418967bb27e79f10a58fc1ea923d2d72f6cb480af02c03b109ec0bc55d961d85d34d78
-EBUILD twisted-22.8.0-r1.ebuild 4744 BLAKE2B 8d3f302e0986fdedb54ff00141e097f2bf75199a88d9a727b6295ff36b9a7ebfd9fed616ac1de2a3f009dd9d03fa247bd63171b1d024054184332852882d3b0a SHA512 7a7a8da9b4818c40ae482171029866609e938b05f5684137f67989320e0d90d6d4fd3d74fc9099c8fdd4d3e96a247a067a64587c457f8316385c318d2c1c7070
+EBUILD twisted-22.10.0.ebuild 4787 BLAKE2B 580c1760a283d0fe32ac5068874d8ef5d0e9d87d5df7446bd1db357bbda8cdd2a513b5e1e408e577d452c28a370cf6459d66a06447b9ad0c18bcc18e269da107 SHA512 3c4f98dfdf935656a9f96019beb86fae0a466a0e162d7f1234174decebd3b072a61cee91ee55cb621068562c2a80d3f8745e2bd28aefdb9a862480abe5004dac
 MISC metadata.xml 1407 BLAKE2B e0cbf18212ca69f9dfc8c593e82be28caef297f245587824276d0a6c1fce09f31d4fa7497ea7e7b2c365e2ea7ca2301bd05ff2022237db1e11d10cb5ce9ed7a5 SHA512 a57b5d63bdd457d4c15b31451ced824933d67b1932af027a3abf3eef7e009eef24484565c6f543c7bafeb1380145bc9f895c78abb1a97f3c02219f6ed2af8fdd
diff --git a/dev-python/twisted/twisted-22.10.0.ebuild b/dev-python/twisted/twisted-22.10.0.ebuild
index 565f95d4b433..abfb3c02a20f 100644
--- a/dev-python/twisted/twisted-22.10.0.ebuild
+++ b/dev-python/twisted/twisted-22.10.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="conch http2 serial ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/twisted/twisted-22.8.0-r1.ebuild b/dev-python/twisted/twisted-22.8.0-r1.ebuild
deleted file mode 100644
index eb99611e14b6..000000000000
--- a/dev-python/twisted/twisted-22.8.0-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="
-	https://github.com/twisted/twisted/archive/${P}.tar.gz -> ${P}.gh.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="conch http2 serial ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/constantly-15.1[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.6.5[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	conch? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/bcrypt-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-2.6[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-	)
-	http2? (
-		<dev-python/h2-5.0.0[${PYTHON_USEDEP}]
-		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-	)
-	serial? (
-		>=dev-python/pyserial-3.0[${PYTHON_USEDEP}]
-	)
-	ssl? (
-		>=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
-		>=dev-python/idna-2.4[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-			>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-			>=dev-python/cython-test-exception-raiser-1.0.2[${PYTHON_USEDEP}]
-			>=dev-python/idna-2.4[${PYTHON_USEDEP}]
-			dev-python/pyasn1[${PYTHON_USEDEP}]
-			>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
-			>=dev-python/pyserial-3.0[${PYTHON_USEDEP}]
-			net-misc/openssh
-			conch? (
-				>=dev-python/bcrypt-3.0.0[${PYTHON_USEDEP}]
-				>=dev-python/cryptography-2.6[${PYTHON_USEDEP}]
-			)
-			ssl? (
-				>=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}]
-				>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
-			)
-		' python3_{8..10} pypy3)
-		$(python_gen_cond_dep '
-			dev-python/gmpy[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-
-PATCHES=(
-	# https://twistedmatrix.com/trac/ticket/10200
-	"${FILESDIR}/${PN}-22.1.0-force-gtk3.patch"
-)
-
-python_prepare_all() {
-	# upstream test for making releases; not very useful and requires
-	# sphinx (including on py2)
-	rm src/twisted/python/test/test_release.py || die
-
-	# puts system in EMFILE state, then the exception handler may fail
-	# trying to open more files due to some gi magic
-	sed -e '/SKIP_EMFILE/s:False:True:' \
-		-i src/twisted/internet/test/test_tcp.py || die
-
-	# multicast tests fail within network-sandbox
-	sed -e 's:test_joinLeave:_&:' \
-		-e 's:test_loopback:_&:' \
-		-e 's:test_multiListen:_&:' \
-		-e 's:test_multicast:_&:' \
-		-i src/twisted/test/test_udp.py || die
-
-	# These tests rely on warnings which seems work unreliably between python versions
-	sed -e 's:test_currentEUID:_&:' \
-		-e 's:test_currentUID:_&:' -i src/twisted/python/test/test_util.py || die
-
-	# broken by new expat
-	sed -e 's:test_namespaceWithWhitespace:_&:' \
-		-i src/twisted/words/test/test_domish.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	# the test suite handles missing file & failing ioctl()s gracefully
-	# but not permission errors from sandbox
-	addwrite /dev/net/tun
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# please keep in sync with python_gen_cond_dep!
-	if ! has "${EPYTHON}" python3_{8..10} pypy3; then
-		einfo "Skipping tests on ${EPYTHON} (xfail)"
-		return
-	fi
-
-	"${EPYTHON}" -m twisted.trial twisted ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# own the dropin.cache so we don't leave orphans
-	> "${D}$(python_get_sitedir)"/twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]]; then
-		python_foreach_impl python_postinst
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/whatthepatch/Manifest b/dev-python/whatthepatch/Manifest
index e193a339694e..7543135bc8a2 100644
--- a/dev-python/whatthepatch/Manifest
+++ b/dev-python/whatthepatch/Manifest
@@ -1,3 +1,3 @@
 DIST whatthepatch-1.0.2.tar.gz 28459 BLAKE2B e24c882fe1ad42f27eeced72d92423d807ac3284bf0045674b78a247a7222bb142d500129b82a32f8fc95934beaa87a378822da2ef80b1d66d98c171b3a15666 SHA512 e77aa6e934f26647b7a060f46eedd8f5984e43b93b7d576cf8d7a930d08e4b3c5c96c79e61e001df405f3f18c07e4296ce79009d9b9e9c721342af9f8560b4cf
-EBUILD whatthepatch-1.0.2.ebuild 445 BLAKE2B 194a3f3b90fbcdc85545b7ff079f9240a78d8d1d14e4f5b22b7f0aef267155fa6d1110c6598de912adac0fe7c505750a631e3b7a02871e846b8c1fe8b61f176e SHA512 652f99af50fe0d9c843d4a17bfe3c8977caa4d1124c3fe20fb9ba51c702f530ce5d842144c085b0c1ac37030bc1dbc49524817f5e2363c2a6c339f7f4b1c97c8
+EBUILD whatthepatch-1.0.2.ebuild 444 BLAKE2B 150927293bef46ba8c4457242a19b388fd8a5f845ad8eaff54019eb5471733c3424287232c19f0a916701eeac96da7eb288683ea4882b1d1b30837f5931d7ee4 SHA512 b0332c7f3539df3ee251ab733e23055627ab0b56834eec4b290a0973a41eb659690c1cb27787c108be4724e28e26e930c84ec893ce9d782d54d5b6c38c6161fd
 MISC metadata.xml 401 BLAKE2B ee370b7f08a16ea4054d5192831a530a9bceac969b2832d6fe058e98dd7558498afbebf4c1f2102979b2f3c252de73c5b11aafcdfed7044a5218144def4f333a SHA512 2a5c7944923e59032c3e75a0a08339ab4b273a346ef855a8ff61c45cc52ecc847db314b0e733876e6d14c3ca42418d9573a26d7f47213958f44a47c6dcbb6c48
diff --git a/dev-python/whatthepatch/whatthepatch-1.0.2.ebuild b/dev-python/whatthepatch/whatthepatch-1.0.2.ebuild
index a5e1d0c1cddb..20968651213b 100644
--- a/dev-python/whatthepatch/whatthepatch-1.0.2.ebuild
+++ b/dev-python/whatthepatch/whatthepatch-1.0.2.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 distutils_enable_tests pytest
author	V3n3RiX <venerix@koprulu.sector>	2022-11-08 09:23:49 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-11-08 09:23:49 +0000
commit	f077c725ef746943ec7902350b30ff569f5995ba (patch)
tree	ac5ad0215e09a9daa3ce0e55095401ead1936ac8 /dev-python
parent	b6cda9acfebad17184578dfebaf2434ef2884883 (diff)