Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-11-08 10:27:19 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-11-08 10:27:19 +0000
commit: 6a902f6d689cd7cb4e21bbc6d3f1ef07be056aae (patch)
tree: ce8f5e84a351d2f62388a56ab4ecbbe9655d24a5 /dev-python
parent: 52f2e484885632f175b09c04b2eca194859ff9f7 (diff)
download: baldeagleos-repo-6a902f6d689cd7cb4e21bbc6d3f1ef07be056aae.tar.gz
baldeagleos-repo-6a902f6d689cd7cb4e21bbc6d3f1ef07be056aae.tar.xz
baldeagleos-repo-6a902f6d689cd7cb4e21bbc6d3f1ef07be056aae.zip
85 files changed, 249 insertions, 3101 deletions
diff --git a/dev-python/abydos/Manifest b/dev-python/abydos/Manifest
index d9c244d155a7..08bbab06bd8c 100644
--- a/dev-python/abydos/Manifest
+++ b/dev-python/abydos/Manifest
@@ -1,2 +1 @@
 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
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 16a40a27d179..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_{7,8,9,10,11} )
-
-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 c5b1e375b72a..43d5c9b7ad7a 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 0df41c9175cd..30f440ae81e5 100644
--- a/dev-python/asteval/Manifest
+++ b/dev-python/asteval/Manifest
@@ -1 +1,2 @@
 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
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..6975720a2208
--- /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_{7,8,9,10,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 25faf56883d8..9f9a236718f3 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,2 +1 @@
-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
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 63c2f1171749..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_{7,8,9,10,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 f5f14c7a6acd..63c2f1171749 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 78ff6ce59055..30e72befe181 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,2 +1 @@
 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
diff --git a/dev-python/black/black-22.10.0.ebuild b/dev-python/black/black-22.10.0.ebuild
index e574b3e95037..0dc69e4608d6 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 b906130eaade..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_{7,8,9,10,11} )
-
-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 f4fbafb9ac64..f4700730c56b 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,12 +1,3 @@
-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
+DIST boto3-1.26.4.gh.tar.gz 553689 BLAKE2B 0da69cfa0b05ab789fc59938562efb49c3c0a46ae0dd5ca84d5e5782f7ed78f4fae45fa38cfea27c2dbb59bff2604b7f09064d2f4f35578500d379ff9f34513e SHA512 2f7058c405145d66b92412f0941ec705c111132e87121cae3f4be9fd6db4cfee3c1bedc3d952badd5ead13e2e1a4e10d4a1a7bf73b7869225a7615d5038a9086
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 1f8dc6734498..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_{7,8,9,10,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 3d7d652a3b69..1f8dc6734498 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 3d7d652a3b69..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_{7,8,9,10,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 3d7d652a3b69..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_{7,8,9,10,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 3d7d652a3b69..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_{7,8,9,10,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 3d7d652a3b69..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_{7,8,9,10,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 3d7d652a3b69..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_{7,8,9,10,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 3d7d652a3b69..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_{7,8,9,10,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 3d7d652a3b69..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_{7,8,9,10,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 3d7d652a3b69..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_{7,8,9,10,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 3d7d652a3b69..3d7d652a3b69 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 f12fd0dac2fa..193f8789e5b8 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,12 +1,3 @@
-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
+DIST botocore-1.29.4.gh.tar.gz 10587870 BLAKE2B e8007cc2e6aa82bd3223f13c5df0e94dcd6f90cfd86d6137723209191d95b7f1be8df3755eae9190aee44312b9980eb81a5a4ede4d326f4cdf3d4b43febb4486 SHA512 f164b1ab95ea34127d2cdaa6e0ec626e7f8849ac1d112e28384e5e1b105b7e482f386999da52d968023d0f35bff5c6b433b4117f98b85eb060887205fc2f55a4
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 b502c7b98b6f..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_{7,8,9,10,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 4d43aecd8983..b502c7b98b6f 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 4d43aecd8983..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_{7,8,9,10,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 4d43aecd8983..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_{7,8,9,10,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 4d43aecd8983..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_{7,8,9,10,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 4d43aecd8983..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_{7,8,9,10,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 4d43aecd8983..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_{7,8,9,10,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 4d43aecd8983..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_{7,8,9,10,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 4d43aecd8983..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_{7,8,9,10,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 4d43aecd8983..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_{7,8,9,10,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 4d43aecd8983..4d43aecd8983 100644
--- a/dev-python/botocore/botocore-1.28.0.ebuild
+++ b/dev-python/botocore/botocore-1.29.4.ebuild
diff --git a/dev-python/capturer/capturer-3.0-r1.ebuild b/dev-python/capturer/capturer-3.0-r1.ebuild
new file mode 100644
index 000000000000..cdfa43ab3446
--- /dev/null
+++ b/dev-python/capturer/capturer-3.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Easily capture stdout/stderr of the current process and subprocesses"
+HOMEPAGE="https://capturer.readthedocs.io/en/latest/
+	https://pypi.org/project/capturer/
+	https://github.com/xolox/python-capturer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/humanfriendly[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	epytest ${PN}/tests.py
+}
diff --git a/dev-python/coloredlogs/coloredlogs-15.0.1-r1.ebuild b/dev-python/coloredlogs/coloredlogs-15.0.1-r1.ebuild
new file mode 100644
index 000000000000..bf4d65f48f7c
--- /dev/null
+++ b/dev-python/coloredlogs/coloredlogs-15.0.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Colored stream handler for the logging module"
+HOMEPAGE="
+	https://pypi.org/project/coloredlogs/
+	https://github.com/xolox/python-coloredlogs
+	https://coloredlogs.readthedocs.io/en/latest/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/humanfriendly-9.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/verboselogs[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/coloredlogs-14.0-fix-install-prefix.patch" )
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# test_auto_install fails because the pth file isn't being loaded
+	coloredlogs/tests.py::ColoredLogsTestCase::test_auto_install
+)
+
+python_test() {
+	epytest coloredlogs/tests.py
+}
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 a5bdabd3c73d..eda97dd5a624 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 bdc4306118ad..06336fbf676b 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,5 +1,2 @@
-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
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 db4aebd36bba..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_{7,8,9,10,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}]
-	)
-"
-
-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 15859e85b4cf..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_{7,8,9,10,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}]
-	)
-"
-
-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 be314ca3b4b6..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_{7,8,9,10,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 f9259e00cc49..3e8c69e14174 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/humanfriendly/humanfriendly-10.0-r1.ebuild b/dev-python/humanfriendly/humanfriendly-10.0-r1.ebuild
new file mode 100644
index 000000000000..3e45cd9d93ea
--- /dev/null
+++ b/dev-python/humanfriendly/humanfriendly-10.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Human friendly output for text interfaces using Python"
+HOMEPAGE="https://pypi.org/project/humanfriendly/
+	https://github.com/xolox/python-humanfriendly/
+	https://humanfriendly.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+# This is completely broken
+# AttributeError: module 'humanfriendly.tests' has no attribute 'connect'
+RESTRICT="test"
+
+BDEPEND="
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		>=dev-python/coloredlogs-15.0.1[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_test() {
+	epytest humanfriendly/tests.py
+}
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 58a5c135409c..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_{7,8,9,10,11} )
-
-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 26412c3e8013..5473453c98d0 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,5 +1,3 @@
 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
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 b2c10475974d..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_{7,8,9,10,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 b355df4ab545..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_{7,8,9,10,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 52b1d12894ad..7d2343f11a0b 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_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index a2d859a380f0..17b6e9195dc8 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,2 +1 @@
 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
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 1573e7cc4355..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_{7,8,9,10,11} 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 f5eb940de1b5..b0358f92493a 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 97103a2dd1f9..a8ae858da37a 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,2 +1 @@
-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
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 13b1a470e36f..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_{7,8,9,10,11} )
-
-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 565ed9d0fcd8..d959d8875112 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/nbconvert/files/nbconvert-6.5.0-mistune-2.patch b/dev-python/nbconvert/files/nbconvert-6.5.0-mistune-2.patch
deleted file mode 100644
index 4a3f4731b32d..000000000000
--- a/dev-python/nbconvert/files/nbconvert-6.5.0-mistune-2.patch
+++ /dev/null
@@ -1,339 +0,0 @@
-From 6e5ba41803cc8c3192f001b3ede9b74454220bda Mon Sep 17 00:00:00 2001
-From: Tiago de Paula <tiagodepalves@gmail.com>
-Date: Mon, 9 May 2022 09:39:31 -0300
-Subject: [PATCH] Update to Mistune 2.0.2 (#1764)
-
-Co-authored-by: Steven Silvester <steven.silvester@ieee.org>
----
- nbconvert/filters/markdown_mistune.py | 212 ++++++++++++++------------
- setup.py                              |   2 +-
- 2 files changed, 119 insertions(+), 95 deletions(-)
-
-diff --git a/nbconvert/filters/markdown_mistune.py b/nbconvert/filters/markdown_mistune.py
-index 382a5388..636e1e8c 100644
---- a/nbconvert/filters/markdown_mistune.py
-+++ b/nbconvert/filters/markdown_mistune.py
-@@ -21,7 +21,7 @@ except ImportError:
-     from cgi import escape as html_escape
- 
- import bs4
--import mistune
-+from mistune import BlockParser, HTMLRenderer, InlineParser, Markdown
- from pygments import highlight
- from pygments.formatters import HtmlFormatter
- from pygments.lexers import get_lexer_by_name
-@@ -34,158 +34,183 @@ class InvalidNotebook(Exception):
-     pass
- 
- 
--class MathBlockGrammar(mistune.BlockGrammar):
--    """This defines a single regex comprised of the different patterns that
--    identify math content spanning multiple lines. These are used by the
--    MathBlockLexer.
-+class MathBlockParser(BlockParser):
-+    """This acts as a pass-through to the MathInlineParser. It is needed in
-+    order to avoid other block level rules splitting math sections apart.
-     """
- 
--    multi_math_str = "|".join(
--        [r"^\$\$.*?\$\$", r"^\\\\\[.*?\\\\\]", r"^\\begin\{([a-z]*\*?)\}(.*?)\\end\{\1\}"]
-+    MULTILINE_MATH = re.compile(
-+        r"(?<!\\)[$]{2}.*?(?<!\\)[$]{2}|"
-+        r"\\\\\[.*?\\\\\]|"
-+        r"\\begin\{([a-z]*\*?)\}.*?\\end\{\1\}",
-+        re.DOTALL,
-     )
--    multiline_math = re.compile(multi_math_str, re.DOTALL)
- 
-+    RULE_NAMES = ("multiline_math",) + BlockParser.RULE_NAMES
- 
--class MathBlockLexer(mistune.BlockLexer):
--    """This acts as a pass-through to the MathInlineLexer. It is needed in
--    order to avoid other block level rules splitting math sections apart.
--    """
-+    # Regex for header that doesn't require space after '#'
-+    AXT_HEADING = re.compile(r" {0,3}(#{1,6})(?!#+)\s*([^\n]*?)$")
- 
--    default_rules = ["multiline_math"] + mistune.BlockLexer.default_rules
-+    def parse_multiline_math(self, m, state):
-+        """Pass token through mutiline math."""
-+        return {"type": "multiline_math", "text": m.group(0)}
- 
--    def __init__(self, rules=None, **kwargs):
--        if rules is None:
--            rules = MathBlockGrammar()
--        super().__init__(rules, **kwargs)
- 
--    def parse_multiline_math(self, m):
--        """Add token to pass through mutiline math."""
--        self.tokens.append({"type": "multiline_math", "text": m.group(0)})
-+def _dotall(pattern):
-+    """Make the '.' special character match any character inside the pattern, including a newline.
- 
--
--class MathInlineGrammar(mistune.InlineGrammar):
--    """This defines different ways of declaring math objects that should be
--    passed through to mathjax unaffected. These are used by the MathInlineLexer.
-+    This is implemented with the inline flag `(?s:...)` and is equivalent to using `re.DOTALL` when
-+    it is the only pattern used. It is necessary since `mistune>=2.0.0`, where the pattern is passed
-+    to the undocumented `re.Scanner`.
-     """
--
--    inline_math = re.compile(r"^\$(.+?)\$|^\\\\\((.+?)\\\\\)", re.DOTALL)
--    block_math = re.compile(r"^\$\$(.*?)\$\$|^\\\\\[(.*?)\\\\\]", re.DOTALL)
--    latex_environment = re.compile(r"^\\begin\{([a-z]*\*?)\}(.*?)\\end\{\1\}", re.DOTALL)
--    text = re.compile(r"^[\s\S]+?(?=[\\<!\[_*`~$]|https?://| {2,}\n|$)")
-+    return f"(?s:{pattern})"
- 
- 
--class MathInlineLexer(mistune.InlineLexer):
--    r"""This interprets the content of LaTeX style math objects using the rules
--    defined by the MathInlineGrammar.
-+class MathInlineParser(InlineParser):
-+    r"""This interprets the content of LaTeX style math objects.
- 
-     In particular this grabs ``$$...$$``, ``\\[...\\]``, ``\\(...\\)``, ``$...$``,
-     and ``\begin{foo}...\end{foo}`` styles for declaring mathematics. It strips
-     delimiters from all these varieties, and extracts the type of environment
-     in the last case (``foo`` in this example).
-     """
--    default_rules = [
--        "block_math",
--        "inline_math",
-+    BLOCK_MATH_TEX = _dotall(r"(?<!\\)\$\$(.*?)(?<!\\)\$\$")
-+    BLOCK_MATH_LATEX = _dotall(r"(?<!\\)\\\\\[(.*?)(?<!\\)\\\\\]")
-+    INLINE_MATH_TEX = _dotall(r"(?<![$\\])\$(.+?)(?<![$\\])\$")
-+    INLINE_MATH_LATEX = _dotall(r"(?<!\\)\\\\\((.*?)(?<!\\)\\\\\)")
-+    LATEX_ENVIRONMENT = _dotall(r"\\begin\{([a-z]*\*?)\}(.*?)\\end\{\1\}")
-+
-+    # The order is important here
-+    RULE_NAMES = (
-+        "block_math_tex",
-+        "block_math_latex",
-+        "inline_math_tex",
-+        "inline_math_latex",
-         "latex_environment",
--    ] + mistune.InlineLexer.default_rules
--
--    def __init__(self, renderer, rules=None, **kwargs):
--        if rules is None:
--            rules = MathInlineGrammar()
--        super().__init__(renderer, rules, **kwargs)
--
--    def output_inline_math(self, m):
--        return self.renderer.inline_math(m.group(1) or m.group(2))
--
--    def output_block_math(self, m):
--        return self.renderer.block_math(m.group(1) or m.group(2) or "")
--
--    def output_latex_environment(self, m):
--        return self.renderer.latex_environment(m.group(1), m.group(2))
--
--
--class MarkdownWithMath(mistune.Markdown):
--    def __init__(self, renderer, **kwargs):
--        if "inline" not in kwargs:
--            kwargs["inline"] = MathInlineLexer
--        if "block" not in kwargs:
--            kwargs["block"] = MathBlockLexer
--        super().__init__(renderer, **kwargs)
--
--    def output_multiline_math(self):
--        return self.inline(self.token["text"])
--
--
--class IPythonRenderer(mistune.Renderer):
--    def block_code(self, code, lang):
--        if lang:
-+    ) + InlineParser.RULE_NAMES
-+
-+    def parse_block_math_tex(self, m, state):
-+        # sometimes the Scanner keeps the final '$$', so we use the
-+        # full matched string and remove the math markers
-+        text = m.group(0)[2:-2]
-+        return "block_math", text
-+
-+    def parse_block_math_latex(self, m, state):
-+        text = m.group(1)
-+        return "block_math", text
-+
-+    def parse_inline_math_tex(self, m, state):
-+        text = m.group(1)
-+        return "inline_math", text
-+
-+    def parse_inline_math_latex(self, m, state):
-+        text = m.group(1)
-+        return "inline_math", text
-+
-+    def parse_latex_environment(self, m, state):
-+        name, text = m.group(1), m.group(2)
-+        return "latex_environment", name, text
-+
-+
-+class MarkdownWithMath(Markdown):
-+    def __init__(self, renderer, block=None, inline=None, plugins=None):
-+        if block is None:
-+            block = MathBlockParser()
-+        if inline is None:
-+            inline = MathInlineParser(renderer, hard_wrap=False)
-+        super().__init__(renderer, block, inline, plugins)
-+
-+    def render(self, s):
-+        """Compatibility method with `mistune==0.8.4`."""
-+        return self.parse(s)
-+
-+
-+class IPythonRenderer(HTMLRenderer):
-+    def __init__(
-+        self,
-+        escape=True,
-+        allow_harmful_protocols=True,
-+        embed_images=False,
-+        exclude_anchor_links=False,
-+        anchor_link_text="¶",
-+        path="",
-+        attachments=None,
-+    ):
-+        super().__init__(escape, allow_harmful_protocols)
-+        self.embed_images = embed_images
-+        self.exclude_anchor_links = exclude_anchor_links
-+        self.anchor_link_text = anchor_link_text
-+        self.path = path
-+        if attachments is not None:
-+            self.attachments = attachments
-+        else:
-+            self.attachments = {}
-+
-+    def block_code(self, code, info=None):
-+        if info:
-             try:
-+                lang = info.strip().split(None, 1)[0]
-                 lexer = get_lexer_by_name(lang, stripall=True)
-             except ClassNotFound:
-                 code = lang + "\n" + code
-                 lang = None
- 
-         if not lang:
--            return "\n<pre><code>%s</code></pre>\n" % mistune.escape(code)
-+            return super().block_code(code)
- 
-         formatter = HtmlFormatter()
-         return highlight(code, lexer, formatter)
- 
-     def block_html(self, html):
--        embed_images = self.options.get("embed_images", False)
--
--        if embed_images:
-+        if self.embed_images:
-             html = self._html_embed_images(html)
- 
-         return super().block_html(html)
- 
-     def inline_html(self, html):
--        embed_images = self.options.get("embed_images", False)
--
--        if embed_images:
-+        if self.embed_images:
-             html = self._html_embed_images(html)
- 
-         return super().inline_html(html)
- 
--    def header(self, text, level, raw=None):
--        html = super().header(text, level, raw=raw)
--        if self.options.get("exclude_anchor_links"):
-+    def heading(self, text, level):
-+        html = super().heading(text, level)
-+        if self.exclude_anchor_links:
-             return html
--        anchor_link_text = self.options.get("anchor_link_text", "¶")
--        return add_anchor(html, anchor_link_text=anchor_link_text)
-+        return add_anchor(html, anchor_link_text=self.anchor_link_text)
- 
-     def escape_html(self, text):
-         return html_escape(text)
- 
-+    def multiline_math(self, text):
-+        return text
-+
-     def block_math(self, text):
--        return "$$%s$$" % self.escape_html(text)
-+        return f"$${self.escape_html(text)}$$"
- 
-     def latex_environment(self, name, text):
--        name = self.escape_html(name)
--        text = self.escape_html(text)
--        return rf"\begin{{{name}}}{text}\end{{{name}}}"
-+        name, text = self.escape_html(name), self.escape_html(text)
-+        return f"\\begin{{{name}}}{text}\\end{{{name}}}"
- 
-     def inline_math(self, text):
--        return "$%s$" % self.escape_html(text)
-+        return f"${self.escape_html(text)}$"
- 
--    def image(self, src, title, text):
-+    def image(self, src, text, title):
-         """Rendering a image with title and text.
- 
-         :param src: source link of the image.
--        :param title: title text of the image.
-         :param text: alt text of the image.
-+        :param title: title text of the image.
-         """
--        attachments = self.options.get("attachments", {})
-         attachment_prefix = "attachment:"
--        embed_images = self.options.get("embed_images", False)
- 
-         if src.startswith(attachment_prefix):
-             name = src[len(attachment_prefix) :]
- 
--            if name not in attachments:
-+            if name not in self.attachments:
-                 raise InvalidNotebook(f"missing attachment: {name}")
- 
--            attachment = attachments[name]
-+            attachment = self.attachments[name]
-             # we choose vector over raster, and lossless over lossy
-             preferred_mime_types = ["image/svg+xml", "image/png", "image/jpeg"]
-             for preferred_mime_type in preferred_mime_types:
-@@ -197,13 +222,13 @@ class IPythonRenderer(mistune.Renderer):
-             data = attachment[mime_type]
-             src = "data:" + mime_type + ";base64," + data
- 
--        elif embed_images:
-+        elif self.embed_images:
-             base64_url = self._src_to_base64(src)
- 
-             if base64_url is not None:
-                 src = base64_url
- 
--        return super().image(src, title, text)
-+        return super().image(src, text, title)
- 
-     def _src_to_base64(self, src):
-         """Turn the source file into a base64 url.
-@@ -211,8 +236,7 @@ class IPythonRenderer(mistune.Renderer):
-         :param src: source link of the file.
-         :return: the base64 url or None if the file was not found.
-         """
--        path = self.options.get("path", "")
--        src_path = os.path.join(path, src)
-+        src_path = os.path.join(self.path, src)
- 
-         if not os.path.exists(src_path):
-             return None
-diff --git a/setup.py b/setup.py
-index 7220a875..2dfa2534 100644
---- a/setup.py
-+++ b/setup.py
-@@ -245,7 +245,7 @@ setup_args["install_requires"] = [
-     "jupyter_core>=4.7",
-     "jupyterlab_pygments",
-     "MarkupSafe>=2.0",
--    "mistune>=0.8.1,<2",
-+    "mistune>=2.0.2",
-     "nbclient>=0.5.0",
-     "nbformat>=5.1",
-     "packaging",
--- 
-2.35.1
-
diff --git a/dev-python/nltk-data/Manifest b/dev-python/nltk-data/Manifest
index 4b5a3ffbec68..549228678b2a 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
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/pylama/pylama-8.4.1.ebuild b/dev-python/pylama/pylama-8.4.1.ebuild
index ce2c81a1e59e..c22ac0150b0a 100644
--- a/dev-python/pylama/pylama-8.4.1.ebuild
+++ b/dev-python/pylama/pylama-8.4.1.ebuild
@@ -28,6 +28,7 @@ BDEPEND="
 		dev-python/mypy[${PYTHON_USEDEP}]
 		dev-python/pylint[${PYTHON_USEDEP}]
 		dev-python/radon[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)
 "
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 84a049a82651..b6184c8a25a0 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,2 +1 @@
-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
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 375a1254330e..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_{7,8,9,10,11} )
-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 7ab180fbee17..7a051d7abf21 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 39f42af882dd..5e7e290b7667 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,3 +1,4 @@
 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
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..3e96a7d65801
--- /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_{7,8,9,10,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/pyopencl-2022.2.3.ebuild b/dev-python/pyopencl/pyopencl-2022.2.3.ebuild
index f1ea1c26e446..f7687f9856ab 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 91dcf6569b36..fd9ed1e82324 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -1,3 +1,2 @@
-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
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 755065114f6a..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_{7,8,9,10,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 91dcf6569b36..fd9ed1e82324 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,3 +1,2 @@
-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
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 2b7038e16907..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_{7,8,9,10,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/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 f0b66bc22324..902dd05fb26d 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,3 +1 @@
-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
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 517a05032d12..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_{7,8,9,10,11} )
-
-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 1ef59a943186..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_{7,8,9,10,11} )
-
-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 e8cb6f39fb22..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_{7,8,9,10,11} )
-
-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 c5fc78fc4339..948938f7ace5 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/python-systemd-235.ebuild b/dev-python/python-systemd/python-systemd-235.ebuild
index 0ecb50d6b063..a85e347a4031 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/pythran-0.12.0-r2.ebuild b/dev-python/pythran/pythran-0.12.0-r2.ebuild
index 14fcb3cb23a6..6c671c9ea7f2 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 ee684d792aa3..fc853dde42d1 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,3 +1,2 @@
 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
diff --git a/dev-python/twisted/twisted-22.10.0.ebuild b/dev-python/twisted/twisted-22.10.0.ebuild
index 0c49a24b825e..ceef985d47d6 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 6a16807a3b6f..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_{7,8,9,10,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/whatthepatch-1.0.2.ebuild b/dev-python/whatthepatch/whatthepatch-1.0.2.ebuild
index 76771bd33553..4c36d306d55e 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	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-11-08 10:27:19 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-11-08 10:27:19 +0000
commit	6a902f6d689cd7cb4e21bbc6d3f1ef07be056aae (patch)
tree	ce8f5e84a351d2f62388a56ab4ecbbe9655d24a5 /dev-python
parent	52f2e484885632f175b09c04b2eca194859ff9f7 (diff)
download	baldeagleos-repo-6a902f6d689cd7cb4e21bbc6d3f1ef07be056aae.tar.gz baldeagleos-repo-6a902f6d689cd7cb4e21bbc6d3f1ef07be056aae.tar.xz baldeagleos-repo-6a902f6d689cd7cb4e21bbc6d3f1ef07be056aae.zip