Adding metadata

52 files changed, 323 insertions, 509 deletions

diff --git a/dev-python/aiofiles/Manifest b/dev-python/aiofiles/Manifest
index 99b89fc71989..7f579a41086b 100644
--- a/dev-python/aiofiles/Manifest
+++ b/dev-python/aiofiles/Manifest
@@ -1 +1,2 @@
 DIST aiofiles-22.1.0.gh.tar.gz 21630 BLAKE2B 8f068046fc143388debc93b657f8b4715cd48eac7e7b8a031ccdc6d2f5764ddcafb2ad1fab713ca55366cad951b570e1c2a120932bf5545482e1a3f086a76bf9 SHA512 6706fb7b6fd32df415ece64f35b8ccc2f263301c43292612b2b6173fb66c77bc88fd08ed0b0bb30fa3dd49571be8fc733a3d4f3611228fdbb368743588336357
+DIST aiofiles-23.1.0.gh.tar.gz 30110 BLAKE2B c6cb0880cc761d3c34eefbda373a361a3f20bc6e37c81c769609b149dd13ff6cf9f169d63cbde9d02cd91a49d03198705576389c531a82fcd614e7b464bdafe8 SHA512 7afbc492061df6b5e76514d36938ec39e3261fbf0c3123d38f1d32cc1d335603d6ab681c088d9c68ef5be9fc9b9eec1b460268b03d5f6409213bf20ec87dde47
diff --git a/dev-python/aiofiles/aiofiles-23.1.0.ebuild b/dev-python/aiofiles/aiofiles-23.1.0.ebuild
new file mode 100644
index 000000000000..dac7744c3fd5
--- /dev/null
+++ b/dev-python/aiofiles/aiofiles-23.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="File support for asyncio"
+HOMEPAGE="
+	https://github.com/Tinche/aiofiles/
+	https://pypi.org/project/aiofiles/
+"
+SRC_URI="
+	https://github.com/Tinche/aiofiles/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index 11aa6388aa91..4ed4fb355d9f 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1 +1,2 @@
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
+DIST argh-0.27.1.tar.gz 49106 BLAKE2B 48f21d920d97111656cb5b18c956c7fdda94ae242f92ebfb02c47b55d5ccc1b82b0ef8b94a721f97fb3638b15b38ce3293fbe46ab123ed9c968efdb2e881d8f3 SHA512 edddd35b2a90c6286818986945e9ea8484dd06bc263016d8c52b0e29475dbad610d673acc0918d0cf62657b1d965bb0d59e51af4c384ae0610f471c748a90999
diff --git a/dev-python/argh/argh-0.27.1.ebuild b/dev-python/argh/argh-0.27.1.ebuild
new file mode 100644
index 000000000000..8e5716e7e64a
--- /dev/null
+++ b/dev-python/argh/argh-0.27.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 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 pypi
+
+DESCRIPTION="A simple argparse wrapper"
+HOMEPAGE="
+	https://pythonhosted.org/argh/
+	https://github.com/neithere/argh/
+	https://pypi.org/project/argh/
+"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+LICENSE="LGPL-3"
+
+BDEPEND="
+	test? (
+		dev-python/iocapture[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/astor/astor-0.8.1-r1.ebuild b/dev-python/astor/astor-0.8.1-r1.ebuild
index dcb428731e6e..4e5040a03352 100644
--- a/dev-python/astor/astor-0.8.1-r1.ebuild
+++ b/dev-python/astor/astor-0.8.1-r1.ebuild
@@ -16,6 +16,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-tests-bigint.patch
+)
+
 distutils_enable_tests pytest
 
 EPYTEST_IGNORE=(
diff --git a/dev-python/astor/files/astor-0.8.1-tests-bigint.patch b/dev-python/astor/files/astor-0.8.1-tests-bigint.patch
new file mode 100644
index 000000000000..777e9390b9bf
--- /dev/null
+++ b/dev-python/astor/files/astor-0.8.1-tests-bigint.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/868711
+https://github.com/berkerpeksag/astor/commit/8342d6aa5dcdcf20f89a19057527510c245c7a2e
+
+From 8342d6aa5dcdcf20f89a19057527510c245c7a2e Mon Sep 17 00:00:00 2001
+From: Jochen Sprickerhof <jspricke@debian.org>
+Date: Fri, 30 Dec 2022 14:47:57 +0100
+Subject: [PATCH] Reduce huge int in test (Closes: #212)
+
+Int was above limits:
+
+https://docs.python.org/3/library/stdtypes.html#int-max-str-digits
+--- a/tests/test_code_gen.py
++++ b/tests/test_code_gen.py
+@@ -291,7 +291,7 @@ def test_with(self):
+         self.assertAstRoundtripsGtVer(source, (2, 7))
+ 
+     def test_huge_int(self):
+-        for n in (10**10000,
++        for n in (10**1000,
+                   0xdfa21cd2a530ccc8c870aa60d9feb3b35deeab81c3215a96557abbd683d21f4600f38e475d87100da9a4404220eeb3bb5584e5a2b5b48ffda58530ea19104a32577d7459d91e76aa711b241050f4cc6d5327ccee254f371bcad3be56d46eb5919b73f20dbdb1177b700f00891c5bf4ed128bb90ed541b778288285bcfa28432ab5cbcb8321b6e24760e998e0daa519f093a631e44276d7dd252ce0c08c75e2ab28a7349ead779f97d0f20a6d413bf3623cd216dc35375f6366690bcc41e3b2d5465840ec7ee0dc7e3f1c101d674a0c7dbccbc3942788b111396add2f8153b46a0e4b50d66e57ee92958f1c860dd97cc0e40e32febff915343ed53573142bdf4b):
+             self.assertEqual(astornum(n), n)
+ 
+
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index b7234e19d8e0..d3348152b78a 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,4 @@
-DIST aws-sam-translator-1.55.0.gh.tar.gz 1006734 BLAKE2B 5fbfd8719ad605e0df7acd8ecb25ca681f5863e67e97b57624c470fa6e77bb431d7ff19f5e00a181120ea809019d93bd75416e46ba1424e8839f80c10002b30f SHA512 4d2f1e3458cb9d2014f73575946e863e1d74e7432e2aaf17128638d69d9f092b4d531224e45c2110b50103a1e7c4343fc0282ad38fe959cf45af4a0a2b4663aa
-DIST aws-sam-translator-1.56.0.gh.tar.gz 1137468 BLAKE2B 89a190775d1679da681aed7d3ef264fe5c5885033f8209fa3605c32921aa240edd6162bb3f5ebcfc835805b6a7143126ae99d5d1d3e1508d8a9a54284a3dd952 SHA512 f07ab337b9224c39b391fdc6130c0d68bf397d166a1ef50b9b8994a77d1b6ae6dbf9ca2288e0fdef76fc650d230da24c4324e70c5d50a77009db61aeaefb4d22
 DIST aws-sam-translator-1.57.0.gh.tar.gz 1137862 BLAKE2B c164745cf0777dbaea3b95aff8a2ae64973157481edf6f27aab8d376bb4efce322edb40094f0a485ff16abf29fbe02f983a76d41fef20d012a99510fdfe66727 SHA512 0451ffdd4ce79ab3416d63807e068d0431e18180bbd82fb2abb5c14d03ef7232d5e7a2ee13e454df17894bdaca1813fb2af4bbfb87ef274c5c31d64371f05336
 DIST aws-sam-translator-1.58.0.gh.tar.gz 1151591 BLAKE2B 77c5aa88330156ce1c9496a1ab6e5f1ec35bf8405fc24cc95ee78b40f6c57813605365c903e66566f93877989c8a2cfcc9c10184df27791fd4c7b4519a9b41dd SHA512 ce2002c967b9dfc973d61ee2462010ccfc0b8dc9aa2233234205fe38467c5bfc115f27bb34c1e3a8f7d5b669b4190ca2bd983590fa8de898899133e54190223b
 DIST aws-sam-translator-1.58.1.gh.tar.gz 1151817 BLAKE2B a3ba2cc304e25a5d527fdef793deb232c1852ceda51df1bfe75ccbe150c8b08d8dfebfa1933f1722e20cecad6f88af596bbeffd203fce7855c3faaaee2f434bf SHA512 341d6346f7daaab3713962613a89b53d0e852d274222e408d9f314a01ec55fa1bc4ac0111bab54ab802caaa956923f0504c2bf620f06073a85c70c8fa28d15ad
+DIST aws-sam-translator-1.59.0.gh.tar.gz 1688806 BLAKE2B 66e63f5d008b120d95b2258552ba7ea531b6dc2d0090360c3777bcac167f95a0167cf200a8b29d798699e87a060befee71f7e8316ed395eded073960b4f1a18b SHA512 558b5dfe586c0badb7b5b5f35a6b841ffe94f2e6fb68acf7c492529abfe3756760fc5d8cdb16550ebbc47671fa12e09620b445d086f008d05f80606710ec67a9
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.55.0-r1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.55.0-r1.ebuild
deleted file mode 100644
index 53e124330190..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.55.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="
-	https://github.com/aws/serverless-application-model/
-	https://pypi.org/project/aws-sam-translator/
-"
-SRC_URI="
-	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/boto3-2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
-	tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls
-)
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -i -e '/addopts/d' pytest.ini || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.56.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.59.0.ebuild
index d09b63700517..1655bae1da26 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.56.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.59.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
 	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
-	>=dev-python/pydantic-1.10.2[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
@@ -40,19 +40,9 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-EPYTEST_DESELECT=(
-	tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
-	tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls
-)
-
 python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -i -e '/addopts/d' pytest.ini || die
+	# so much noise...
+	sed -i -e '/log_cli/d' pytest.ini || die
 
 	# deps are installed by ebuild, don't try to reinstall them via pip
 	truncate --size=0 requirements/*.txt || die
@@ -62,5 +52,6 @@ python_prepare_all() {
 
 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
+	local -x AWS_DEFAULT_REGION=us-east-1
+	epytest -o addopts=
 }
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 7daf39b76d8c..0460eed3687c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,3 +4,4 @@ DIST boto3-1.26.63.gh.tar.gz 597618 BLAKE2B f48de0f51694efa0a4fa6afa25ad7475fb7e
 DIST boto3-1.26.64.gh.tar.gz 597913 BLAKE2B f3dc63388cf4055c58610eaf980c10ff4d297c6f00f89fe0b46e6b764fba502b7fd85b71421a9d21f1930b668f95aaf2fa174389e5067901d749babf582a8033 SHA512 17ed0e655706f29ed34e1d60a9913d74ab0098ba8085ea76bafb5fcd1bfde91c2efd95d2f3f3e6bcd1b6ef7bed85f9001ba484c01a0251219ea879543a8f2b47
 DIST boto3-1.26.65.gh.tar.gz 598836 BLAKE2B f6e5c14f120bdaa2e797cbd2f62eb0420a28ee5d677705fff8724d22b730ed28090a106ae69cc5b948e8cb5d50dc2d237c2f769d50f1d33634919fd1f116e897 SHA512 575718f82fc0bcf59b724233aca55ca265add7c45b84f8dd63c475a2c6c6ad821dedf4846aa61bc7a8d875fa5bcf438b50d09112bfddaf72373dfdde4f1f7882
 DIST boto3-1.26.66.gh.tar.gz 598939 BLAKE2B c3c8c4bebdb4432beea858226dbb5eb3bfb33d51c776bd619d08b67789a9851963066c50f2e1bd41dccf0c7b35169824b2d8a0a0a9abf98f087890654251f996 SHA512 bd74f1a0264f67532a54f055c7269d53c12298d265a136e431586448eaf2cac23b0fbc133c69a19954cb3b3c52fd4604ac0e0e1a7d04a3ddded67b5a90d7096c
+DIST boto3-1.26.67.gh.tar.gz 599119 BLAKE2B e9cd1877eaa3b6d26cbcece1983a5e89a88f7ecdab1e90b436f358015d4fde13f544b004166917c611cb7bfcd882d3ee9040001c719f2ed44e5ed1ce19bf01b7 SHA512 26e4fbaedc0af7ba94e804c6937984919742e7adcdc65179fa1fb6cf183406d1d5ca15b3a1972b68c3154f1cd7b108d5c626357c4a58185f23edb6a86c63b3d6
diff --git a/dev-python/boto3/boto3-1.26.67.ebuild b/dev-python/boto3/boto3-1.26.67.ebuild
new file mode 100644
index 000000000000..9523f65d5fb9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.67.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="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/botocore/Manifest b/dev-python/botocore/Manifest
index 3ed7956ba535..7d58c84efc2e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,3 +4,4 @@ DIST botocore-1.29.63.gh.tar.gz 11139461 BLAKE2B b05f6d52f55df9e456e80e9b701e249
 DIST botocore-1.29.64.gh.tar.gz 11141125 BLAKE2B 955c7ac0630bd8df8004a0a3d0ec64a7491aee7d68e63a65c62c9fe7a4362aed7bd74ca967cd8550ead458e42a858a428f0db8922a337c83cd680fcd1d1b62c3 SHA512 bb8e177f335e600389123f26788711f4a94c4943a4d80c6195db03bb3cf9489b2a8b0e42d429635c6c8c501df6c27b4177e9ef71e748b0c63874e6682bf2e8e9
 DIST botocore-1.29.65.gh.tar.gz 11138878 BLAKE2B 6757ec86d6c3428a345217cf4903c8a74de4389f52528779ba3cf575098730c61bd228e7d9476665f4fd141bc5a3fc42c30edfcfcf4f2dc85c9ee5421c3bfc7a SHA512 e4472d44014502f468ec5009bd11015f44913fb7d1a42a51190ec70e74972613513c98cc0f7bc6b3646b7156831e1421c4a225d6fb350edd83006891313795c2
 DIST botocore-1.29.66.gh.tar.gz 11139268 BLAKE2B c95ac52a4b0cf4cb407b0ed7452d1454f78ec48a9a4903b18f77fec223fde18dfa0507bfdd89a45428efdfd1cda19f48e881cb0fcae0e1afa9d05f33a2e43434 SHA512 27b0253ea7bd094adb7978207c82cc11460fecd301642ab831c9c7f7d960642bebedec8ac7f88af911b804ec3d085dffff01cccfedc0165f19be8e2154e7b7e4
+DIST botocore-1.29.67.gh.tar.gz 11137715 BLAKE2B 584e7db3adc61dd96b05384e1572c68857e2c5e8c473ade147722ccf7691dc5bd59833e7a8ea4a46149b5acda0f159aca1ce9e67212f0f5c3378b65962752680 SHA512 44059a8cf95b47e11e51e7bff9ae9e9c014ff8cac414fa885b21d1e9b55b599038d3ea72930ae1f1799963297cf9ed545eceb7ed5cfec51a585468481e9e9919
diff --git a/dev-python/botocore/botocore-1.29.67.ebuild b/dev-python/botocore/botocore-1.29.67.ebuild
new file mode 100644
index 000000000000..0f4daaa48e81
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.67.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="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
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cachelib/cachelib-0.10.1.ebuild b/dev-python/cachelib/cachelib-0.10.1.ebuild
index 15cca94af6fa..05a46b96a1e9 100644
--- a/dev-python/cachelib/cachelib-0.10.1.ebuild
+++ b/dev-python/cachelib/cachelib-0.10.1.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 		dev-db/redis
 		dev-python/pylibmc[${PYTHON_USEDEP}]
 		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/redis-py[${PYTHON_USEDEP}]
+		dev-python/redis[${PYTHON_USEDEP}]
 		net-misc/memcached
 		www-servers/uwsgi[python,${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/cachelib/cachelib-0.10.2.ebuild b/dev-python/cachelib/cachelib-0.10.2.ebuild
index 15cca94af6fa..05a46b96a1e9 100644
--- a/dev-python/cachelib/cachelib-0.10.2.ebuild
+++ b/dev-python/cachelib/cachelib-0.10.2.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 		dev-db/redis
 		dev-python/pylibmc[${PYTHON_USEDEP}]
 		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/redis-py[${PYTHON_USEDEP}]
+		dev-python/redis[${PYTHON_USEDEP}]
 		net-misc/memcached
 		www-servers/uwsgi[python,${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/cachelib/cachelib-0.9.0.ebuild b/dev-python/cachelib/cachelib-0.9.0.ebuild
index 567efbfa1288..f93b48269e01 100644
--- a/dev-python/cachelib/cachelib-0.9.0.ebuild
+++ b/dev-python/cachelib/cachelib-0.9.0.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 		dev-db/redis
 		dev-python/pylibmc[${PYTHON_USEDEP}]
 		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/redis-py[${PYTHON_USEDEP}]
+		dev-python/redis[${PYTHON_USEDEP}]
 		net-misc/memcached
 		www-servers/uwsgi[python,${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 349f4e19a737..ad0dff67c34c 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -7,5 +7,3 @@ DIST llvm-project-16.0.0rc1.src.tar.xz 118364920 BLAKE2B 449fa321722e77d1a595d0f
 DIST llvm-project-16.0.0rc1.src.tar.xz.sig 566 BLAKE2B 29a593f74b05ef6268f0b2ee5ebd810a244e7c6b27dd94f709b22bca8e6c8367f8321a6ec61f85476cd399f31519ac2a3c978014afae29490c1e70d26eb6c35f SHA512 dcca03d41ee3cc7d5b150184b03eb9f2e579603ce9cd5289360d1ca47169174afc26a85079cf096ec91e23f487f0b38bb6cd5fb7e5197530582155b16a5ce748
 DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
 DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
-DIST llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz 180436731 BLAKE2B 51c30c3f11dd55a225b8ebe4ded752ce9e8eb58751e7458c29901dbdd3673f94892d337d111d696e779e3f7ef0bca6c7d79709e2072a4bf3a001d8813125d571 SHA512 ebbe0f8becac39d63433dcc3de474c40f1215fc8faab94fa2ba869d28e66b27e4fe088377bd7ae64575a6d7b07017b88bf92e5488a3185a753e647d8da352bbf
-DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
diff --git a/dev-python/clang-python/clang-python-16.0.0_pre20230107.ebuild b/dev-python/clang-python/clang-python-16.0.0_pre20230107.ebuild
deleted file mode 100644
index f37802f5c2d7..000000000000
--- a/dev-python/clang-python/clang-python-16.0.0_pre20230107.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	local -x CLANG_NO_DEFAULT_CONFIG=1
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-16.0.0_pre20230127.ebuild b/dev-python/clang-python/clang-python-16.0.0_pre20230127.ebuild
deleted file mode 100644
index f37802f5c2d7..000000000000
--- a/dev-python/clang-python/clang-python-16.0.0_pre20230127.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	local -x CLANG_NO_DEFAULT_CONFIG=1
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/django-cacheops/django-cacheops-6.1.ebuild b/dev-python/django-cacheops/django-cacheops-6.1.ebuild
index 7af650bb7870..27f0a80253c0 100644
--- a/dev-python/django-cacheops/django-cacheops-6.1.ebuild
+++ b/dev-python/django-cacheops/django-cacheops-6.1.ebuild
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/django-1.8[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/redis-2.9.1[${PYTHON_USEDEP}]
 	>=dev-python/funcy-1.8[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/django-redis/django-redis-5.2.0.ebuild b/dev-python/django-redis/django-redis-5.2.0.ebuild
index f1e61174deaa..70aeeedfcff4 100644
--- a/dev-python/django-redis/django-redis-5.2.0.ebuild
+++ b/dev-python/django-redis/django-redis-5.2.0.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-3.0.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/fakeredis/fakeredis-2.4.0.ebuild b/dev-python/fakeredis/fakeredis-2.4.0.ebuild
index 4bfeb2c64af3..4ad77674de98 100644
--- a/dev-python/fakeredis/fakeredis-2.4.0.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.4.0.ebuild
@@ -25,8 +25,8 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
-	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
-	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
+	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
+	<dev-python/redis-4.5[${PYTHON_USEDEP}]
 	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/fakeredis/fakeredis-2.5.0.ebuild b/dev-python/fakeredis/fakeredis-2.5.0.ebuild
index 90049b194fdf..95f76e0f58fc 100644
--- a/dev-python/fakeredis/fakeredis-2.5.0.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.5.0.ebuild
@@ -25,8 +25,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
-	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
-	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
+	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
+	<dev-python/redis-4.5[${PYTHON_USEDEP}]
 	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/fakeredis/fakeredis-2.6.0.ebuild b/dev-python/fakeredis/fakeredis-2.6.0.ebuild
index 90049b194fdf..95f76e0f58fc 100644
--- a/dev-python/fakeredis/fakeredis-2.6.0.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.6.0.ebuild
@@ -25,8 +25,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
-	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
-	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
+	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
+	<dev-python/redis-4.5[${PYTHON_USEDEP}]
 	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/fakeredis/fakeredis-2.7.0.ebuild b/dev-python/fakeredis/fakeredis-2.7.0.ebuild
index 90049b194fdf..95f76e0f58fc 100644
--- a/dev-python/fakeredis/fakeredis-2.7.0.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.7.0.ebuild
@@ -25,8 +25,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
-	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
-	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
+	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
+	<dev-python/redis-4.5[${PYTHON_USEDEP}]
 	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/fakeredis/fakeredis-2.7.1.ebuild b/dev-python/fakeredis/fakeredis-2.7.1.ebuild
index 90049b194fdf..95f76e0f58fc 100644
--- a/dev-python/fakeredis/fakeredis-2.7.1.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.7.1.ebuild
@@ -25,8 +25,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
-	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
-	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
+	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
+	<dev-python/redis-4.5[${PYTHON_USEDEP}]
 	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/kombu/kombu-5.3.0_beta2.ebuild b/dev-python/kombu/kombu-5.3.0_beta2.ebuild
index 50ea945d3126..565a65d41d89 100644
--- a/dev-python/kombu/kombu-5.3.0_beta2.ebuild
+++ b/dev-python/kombu/kombu-5.3.0_beta2.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 		dev-python/python-zstandard[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-4.2.2[${PYTHON_USEDEP}]
+		>=dev-python/redis-4.2.2[${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
 	)
 "
@@ -85,7 +85,7 @@ pkg_postinst() {
 	optfeature "Etcd backend" dev-python/python-etcd
 	optfeature "MongoDB backend" dev-python/pymongo
 	optfeature "Pyro 4 backend" dev-python/Pyro4
-	optfeature "Redis backend" dev-python/redis-py
+	optfeature "Redis backend" dev-python/redis
 	optfeature "sqlalchemy backend" dev-python/sqlalchemy
 	optfeature "yaml backend" dev-python/pyyaml
 	optfeature "MessagePack (de)serializer for Python" dev-python/msgpack
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 349f4e19a737..ad0dff67c34c 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -7,5 +7,3 @@ DIST llvm-project-16.0.0rc1.src.tar.xz 118364920 BLAKE2B 449fa321722e77d1a595d0f
 DIST llvm-project-16.0.0rc1.src.tar.xz.sig 566 BLAKE2B 29a593f74b05ef6268f0b2ee5ebd810a244e7c6b27dd94f709b22bca8e6c8367f8321a6ec61f85476cd399f31519ac2a3c978014afae29490c1e70d26eb6c35f SHA512 dcca03d41ee3cc7d5b150184b03eb9f2e579603ce9cd5289360d1ca47169174afc26a85079cf096ec91e23f487f0b38bb6cd5fb7e5197530582155b16a5ce748
 DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
 DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
-DIST llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz 180436731 BLAKE2B 51c30c3f11dd55a225b8ebe4ded752ce9e8eb58751e7458c29901dbdd3673f94892d337d111d696e779e3f7ef0bca6c7d79709e2072a4bf3a001d8813125d571 SHA512 ebbe0f8becac39d63433dcc3de474c40f1215fc8faab94fa2ba869d28e66b27e4fe088377bd7ae64575a6d7b07017b88bf92e5488a3185a753e647d8da352bbf
-DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
diff --git a/dev-python/lit/lit-16.0.0_pre20230107.ebuild b/dev-python/lit/lit-16.0.0_pre20230107.ebuild
deleted file mode 100644
index 4a3017cf1639..000000000000
--- a/dev-python/lit/lit-16.0.0_pre20230107.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~loong"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-16.0.0_pre20230127.ebuild b/dev-python/lit/lit-16.0.0_pre20230127.ebuild
deleted file mode 100644
index 0e39fac626c6..000000000000
--- a/dev-python/lit/lit-16.0.0_pre20230127.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/logutils/logutils-0.3.5-r1.ebuild b/dev-python/logutils/logutils-0.3.5-r1.ebuild
index f1829366e612..ebbd6719ea10 100644
--- a/dev-python/logutils/logutils-0.3.5-r1.ebuild
+++ b/dev-python/logutils/logutils-0.3.5-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 BDEPEND="
 	test? (
 		dev-db/redis
-		dev-python/redis-py[${PYTHON_USEDEP}]
+		dev-python/redis[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/packaging/packaging-23.0.ebuild b/dev-python/packaging/packaging-23.0-r1.ebuild
index 22ad07c8a213..99e36856b3e7 100644
--- a/dev-python/packaging/packaging-23.0.ebuild
+++ b/dev-python/packaging/packaging-23.0-r1.ebuild
@@ -22,6 +22,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~
 
 RDEPEND="
 	>=dev-python/pyparsing-3.0.7-r1[${PYTHON_USEDEP}]
+	!<dev-python/setuptools-67
 "
 DEPEND="
 	test? (
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index d6c8de560e4a..284ef9961f20 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,5 +1,2 @@
-DIST pybind11-2.10.0.gh.tar.gz 716362 BLAKE2B d9d3a8a108a303721766b822d43b631396c451c8caea0ec1bd36a97850382cdaec69a4f4e5fb475bc84e2aead050f73b759320a81750a661997870e1a84383b5 SHA512 93112ce530a0652b2b4458a137b4a35f2fd8607f82ad96698ef422128d0b53e16e1d06c239ee4643b821acafae09c74eb0f72bc4ee5584aa9fcdaff4d79980d9
 DIST pybind11-2.10.1.gh.tar.gz 727880 BLAKE2B d051220f33ce44ea6d174d64a2ecfad4f7452b0f5152035cfd36950875dc451e11e8352eb80c9c01b200176c0b09fa5274504ece524e699590deac64c44d57c6 SHA512 040f109ec870516acdaebc5133ccbba9e3ed7ff93214a66997cf4b8366c209322f3c902c283040826c7e585c3ea2259caf62d90d0b475bfa33d21e459dd54df1
-DIST pybind11-2.10.2.gh.tar.gz 739436 BLAKE2B 19d1182f61202b63f3cddcef427a6a4f38329d96932a3882c12a10eb6a6bb725723fe48862d2b0370ea4ddd2bc5675de4c9a680a4f2d28d6bd6e58d0fe5c8848 SHA512 051c2608c37612e857c00ac48429d1c26c14336f20988fb447df25b345b28c5b97ccb80f4227c54de4ef2bd4f8ea3d550acc4a5bb2dd86d65dc1915fdca36719
 DIST pybind11-2.10.3.gh.tar.gz 740214 BLAKE2B 967b93cbf7d1f8faad25db9a4d3e84fd33b48429cdf527c167e65faad5c01df83a5634021cf99f07adf443855d9f6bb076f0cc67b0e6555e189b794a845b533a SHA512 3894400f04cd08e2dbb14b3d696339f0364434f1d6f8bb057338ac88157ec7491b2df1e1e46ebd5abccdcd5775c5e9238de6404f0db87f64f5a1802db3a5b18c
-DIST pybind11-2.9.2.tar.gz 709521 BLAKE2B 76ae9c72faad805885eabbe4dadf1092fe814f04f2a8d834da035c7389dcc996c09a63149911aa7a5c0b70d2da9f7c32e94aaf1c941f13345e0aef40a5748dfc SHA512 c6c18e5f59873adb3692640ade26472abd257607e7bb9fd48cfd1949878811e83d6ac6eb8c8dd926622d52ca4f13e5e6a58e0abaaaa1fa814ee831ea2b515272
diff --git a/dev-python/pybind11/pybind11-2.10.0.ebuild b/dev-python/pybind11/pybind11-2.10.0.ebuild
deleted file mode 100644
index b3466357a0f0..000000000000
--- a/dev-python/pybind11/pybind11-2.10.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit cmake distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="
-	https://pybind11.readthedocs.io/en/stable/
-	https://github.com/pybind/pybind11/
-	https://pypi.org/project/pybind11/
-"
-SRC_URI="
-	https://github.com/pybind/pybind11/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-cpp/eigen:3
-"
-BDEPEND="
-	test? (
-		>=dev-cpp/catch-2.13.5
-		dev-libs/boost
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	export PYBIND11_USE_CMAKE=1
-	cmake_src_prepare
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local mycmakeargs=(
-		# disable forced lto
-		-DPYBIND11_LTO_CXX_FLAGS=
-		-DPYBIND11_INSTALL=ON
-		-DPYBIND11_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Compilation only does anything for tests
-	use test && cmake_src_compile
-}
-
-python_test() {
-	cmake_build check
-}
-
-python_install() {
-	distutils-r1_python_install
-	cmake_src_install
-}
diff --git a/dev-python/pybind11/pybind11-2.10.2.ebuild b/dev-python/pybind11/pybind11-2.10.2.ebuild
deleted file mode 100644
index 3548928961e6..000000000000
--- a/dev-python/pybind11/pybind11-2.10.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit cmake distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="
-	https://pybind11.readthedocs.io/en/stable/
-	https://github.com/pybind/pybind11/
-	https://pypi.org/project/pybind11/
-"
-SRC_URI="
-	https://github.com/pybind/pybind11/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-cpp/eigen:3
-"
-BDEPEND="
-	test? (
-		>=dev-cpp/catch-2.13.5
-		dev-libs/boost
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	export PYBIND11_USE_CMAKE=1
-	cmake_src_prepare
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local mycmakeargs=(
-		# disable forced lto
-		-DPYBIND11_LTO_CXX_FLAGS=
-		-DPYBIND11_INSTALL=ON
-		-DPYBIND11_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Compilation only does anything for tests
-	use test && cmake_src_compile
-}
-
-python_test() {
-	cmake_build check
-}
-
-python_install() {
-	distutils-r1_python_install
-	cmake_src_install
-}
diff --git a/dev-python/pybind11/pybind11-2.9.2-r1.ebuild b/dev-python/pybind11/pybind11-2.9.2-r1.ebuild
deleted file mode 100644
index 428754943600..000000000000
--- a/dev-python/pybind11/pybind11-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit cmake distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="
-	https://pybind11.readthedocs.io/en/stable/
-	https://github.com/pybind/pybind11/
-	https://pypi.org/project/pybind11/
-"
-SRC_URI="
-	https://github.com/pybind/pybind11/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-cpp/eigen:3
-"
-BDEPEND="
-	test? (
-		>=dev-cpp/catch-2.13.5
-		dev-libs/boost
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	export PYBIND11_USE_CMAKE=1
-	cmake_src_prepare
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local mycmakeargs=(
-		# disable forced lto
-		-DPYBIND11_LTO_CXX_FLAGS=
-		-DPYBIND11_INSTALL=ON
-		-DPYBIND11_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Compilation only does anything for tests
-	use test && cmake_src_compile
-}
-
-python_test() {
-	cmake_build check
-}
-
-python_install() {
-	distutils-r1_python_install
-	cmake_src_install
-}
diff --git a/dev-python/pyrate-limiter/pyrate-limiter-2.8.2.ebuild b/dev-python/pyrate-limiter/pyrate-limiter-2.8.2.ebuild
index 6ddef9a22057..43789f812c52 100644
--- a/dev-python/pyrate-limiter/pyrate-limiter-2.8.2.ebuild
+++ b/dev-python/pyrate-limiter/pyrate-limiter-2.8.2.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/redis-py[${PYTHON_USEDEP}]
+	dev-python/redis[${PYTHON_USEDEP}]
 "
 
 BDEPEND="test? (
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index 973d9d99c9d9..1ccb8e45944d 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1 +1,2 @@
 DIST python-utils-3.4.5.tar.gz 28608 BLAKE2B c933bf358ad61563fc35bc87329367946a64216afaddb3cd5bff861e0e1fadcc4d18c7a8ff7820bfee5938bc7ede3cea9d450ecc5b7c0825f917c59576d7195c SHA512 35b4b49dfce56e9e530fe979c070889296079d3a1fd548186bf6dbd6fdbce5363818b52a5d7559b7af3bd32561d87639565298386883351168a267fa88e1ff7f
+DIST python-utils-3.5.1.tar.gz 26753 BLAKE2B f6a6f84883671e4e17938bf8a70332766b3e61f77bd86eda976915a5967710c4c8a6bdd295b6ca9d46bed98b30866bbaabd67ac3d4311dfe061fbc3c5a41e4af SHA512 427660db279b438ce30218bea72f96b952f6cd37c99184f04d458814500f056b16ed4f2fa743f94499a996366c162006c771e9523491afb2a7ee0f666ab98718
diff --git a/dev-python/python-utils/python-utils-3.5.1.ebuild b/dev-python/python-utils/python-utils-3.5.1.ebuild
new file mode 100644
index 000000000000..84daef14cf31
--- /dev/null
+++ b/dev-python/python-utils/python-utils-3.5.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Collection of small Python functions & classes"
+HOMEPAGE="
+	https://github.com/WoLpH/python-utils/
+	https://pypi.org/project/python-utils/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	docs
+	_python_utils_tests/test_logger.py
+	python_utils/loguru.py
+)
+
+python_prepare_all() {
+	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis/Manifest
index ea7c553df02a..ea7c553df02a 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis/Manifest
diff --git a/dev-python/redis-py/metadata.xml b/dev-python/redis/metadata.xml
index 8051c7f9a166..8051c7f9a166 100644
--- a/dev-python/redis-py/metadata.xml
+++ b/dev-python/redis/metadata.xml
diff --git a/dev-python/redis-py/redis-py-4.4.0.ebuild b/dev-python/redis/redis-4.4.0.ebuild
index 05d46f009cdc..4f7104bcd67d 100644
--- a/dev-python/redis-py/redis-py-4.4.0.ebuild
+++ b/dev-python/redis/redis-4.4.0.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
 inherit distutils-r1
 
+MY_P=redis-py-${PV}
 DESCRIPTION="Python client for Redis key-value store"
 HOMEPAGE="
 	https://github.com/redis/redis-py/
@@ -15,8 +16,9 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/redis-py/redis-py-4.5.1.ebuild b/dev-python/redis/redis-4.4.1.ebuild
index 0471f7571158..ae2bb8c4b96f 100644
--- a/dev-python/redis-py/redis-py-4.5.1.ebuild
+++ b/dev-python/redis/redis-4.4.1.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
 inherit distutils-r1
 
+MY_P=redis-py-${PV}
 DESCRIPTION="Python client for Redis key-value store"
 HOMEPAGE="
 	https://github.com/redis/redis-py/
@@ -15,8 +16,9 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/redis-py/redis-py-4.4.1.ebuild b/dev-python/redis/redis-4.4.2.ebuild
index 0471f7571158..ae2bb8c4b96f 100644
--- a/dev-python/redis-py/redis-py-4.4.1.ebuild
+++ b/dev-python/redis/redis-4.4.2.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
 inherit distutils-r1
 
+MY_P=redis-py-${PV}
 DESCRIPTION="Python client for Redis key-value store"
 HOMEPAGE="
 	https://github.com/redis/redis-py/
@@ -15,8 +16,9 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/redis-py/redis-py-4.5.0.ebuild b/dev-python/redis/redis-4.5.0.ebuild
index 0471f7571158..ae2bb8c4b96f 100644
--- a/dev-python/redis-py/redis-py-4.5.0.ebuild
+++ b/dev-python/redis/redis-4.5.0.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
 inherit distutils-r1
 
+MY_P=redis-py-${PV}
 DESCRIPTION="Python client for Redis key-value store"
 HOMEPAGE="
 	https://github.com/redis/redis-py/
@@ -15,8 +16,9 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/redis-py/redis-py-4.4.2.ebuild b/dev-python/redis/redis-4.5.1.ebuild
index 0471f7571158..ae2bb8c4b96f 100644
--- a/dev-python/redis-py/redis-py-4.4.2.ebuild
+++ b/dev-python/redis/redis-4.5.1.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
 inherit distutils-r1
 
+MY_P=redis-py-${PV}
 DESCRIPTION="Python client for Redis key-value store"
 HOMEPAGE="
 	https://github.com/redis/redis-py/
@@ -15,8 +16,9 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/requests-cache/requests-cache-0.9.7.ebuild b/dev-python/requests-cache/requests-cache-0.9.7.ebuild
index 7c2c1cf38b61..80d3a349111f 100644
--- a/dev-python/requests-cache/requests-cache-0.9.7.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.9.7.ebuild
@@ -62,7 +62,7 @@ python_test() {
 }
 
 pkg_postinst() {
-	optfeature "redis backend" "dev-python/redis-py"
+	optfeature "redis backend" "dev-python/redis"
 	optfeature "MongoDB backend" "dev-python/pymongo"
 
 	optfeature "JSON serialization" "dev-python/ujson"
diff --git a/dev-python/requests-cache/requests-cache-0.9.8.ebuild b/dev-python/requests-cache/requests-cache-0.9.8.ebuild
index da63e78f10ec..42de705b919f 100644
--- a/dev-python/requests-cache/requests-cache-0.9.8.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.9.8.ebuild
@@ -62,7 +62,7 @@ python_test() {
 }
 
 pkg_postinst() {
-	optfeature "redis backend" "dev-python/redis-py"
+	optfeature "redis backend" "dev-python/redis"
 	optfeature "MongoDB backend" "dev-python/pymongo"
 
 	optfeature "JSON serialization" "dev-python/ujson"
diff --git a/dev-python/rq/rq-1.11.1.ebuild b/dev-python/rq/rq-1.11.1.ebuild
index 877e1b77a012..71cd68f08136 100644
--- a/dev-python/rq/rq-1.11.1.ebuild
+++ b/dev-python/rq/rq-1.11.1.ebuild
@@ -24,7 +24,7 @@ KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-3.5.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/rq/rq-1.12.0.ebuild b/dev-python/rq/rq-1.12.0.ebuild
index bbf539d43c59..d3f8230dcf81 100644
--- a/dev-python/rq/rq-1.12.0.ebuild
+++ b/dev-python/rq/rq-1.12.0.ebuild
@@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-3.5.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/simber/simber-0.2.5.ebuild b/dev-python/simber/simber-0.2.5.ebuild
index 85fc683e278d..a08ba7850516 100644
--- a/dev-python/simber/simber-0.2.5.ebuild
+++ b/dev-python/simber/simber-0.2.5.ebuild
@@ -20,3 +20,9 @@ KEYWORDS="amd64 ~x86"
 RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i '/ *python_requires/s|.*||' setup.py || die  # bug #893620
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/spotipy/spotipy-2.22.1.ebuild b/dev-python/spotipy/spotipy-2.22.1.ebuild
index ff04c6dbf1d1..958749863dcf 100644
--- a/dev-python/spotipy/spotipy-2.22.1.ebuild
+++ b/dev-python/spotipy/spotipy-2.22.1.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
 IUSE="examples"
 
 RDEPEND="
-	dev-python/redis-py[${PYTHON_USEDEP}]
+	dev-python/redis[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]