gentoo auto-resync : 10:12:2023 - 17:18:10

34 files changed, 47 insertions, 981 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ebb0b6a11bc4..123b8a151866 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 84e828cc6ddb..2b688d26fe0d 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,8 +1,3 @@
-AUX aiohttp-3.8.6-brotlicffi.patch 1187 BLAKE2B fa565cea0a3a6ad118c1e1af7677cc393199e671a8a87d856b217b31024368248cb2df0515702867ea72f581c795658a70151a3004a718b3dffb9e16baf45269 SHA512 b3b4dc632ef0aa2045c90120c6110675e7df898bd858201eaba1b07c5551d32b37bfabb3685b7a31792e1b3b0dcb9c6d258ac4c6a8bfbbf65a8beeea96bf08fd
-DIST aiohttp-3.8.6.tar.gz 7352172 BLAKE2B 4dc602abb4f9bd7c65bda7d11cde3e703bbc7786fb3f8ef36922caef42912b2c10a198ebdcecd3fcd022c3a9a729766a2023636f756a8fa10663bf988554f967 SHA512 43f1dd6670d90aefee7f0f30411b13c643ea684815b493cc4437e5f1981f4fdf4b718a40543d7c3c8c70d8b27470b8f3bf1609e46146362e0490ce0990a057f5
-DIST aiohttp-3.9.0.tar.gz 7475063 BLAKE2B 0447b9b095b3004b16eef37bd4d815f864dbfad7efb3021cb97676487cdf6d3007de47cb80daa773cc645ca60b21c79768fdc7a15163bb60578b4d05e17db924 SHA512 3001ea211985c26aa4f8a20210d80d6e72a904c1ea93a5aed5d08eb191dd253155ec5a44ae14d961c6ebbc747cbc8e602866ee7eb0b8963cf783a68dcf8b3ba6
 DIST aiohttp-3.9.1.tar.gz 7482118 BLAKE2B 2150ae98f799f9c6e1f48987bfd8b1847439d8b87cd21417676c2fa5c971fcdc13c3f933dfdd5eceb92b47ad604d16c2a71d884118d8bde1816f2d944d2930a2 SHA512 3288085d5fbcfb7e3664f906345aeab6f989f2318babae6bf5cc3955de48707e9de56ce3b9553d6ee35c72b8f884dc1fd01861a638ee738573e78a203e6a9dec
-EBUILD aiohttp-3.8.6-r1.ebuild 2883 BLAKE2B 57472a8849a5bb29b5e8ae5d4c24a89f09d968a49cc7d70c45439207471f0cb08fef77529c468afb4110b14c9a3248c43c6332f7c8fd3deda7178a4dc9145869 SHA512 2038cc2b2a50cdeb85f55f3b205288ccfdfdebb0e865563bc7dd8436396c98cd7c10ee88fa3482a612343ec8e4ee567a9176ba805757417c54c9e258ac492497
-EBUILD aiohttp-3.9.0.ebuild 3131 BLAKE2B 9bc6a135cf164493a7097b5de657e929c14e98028eeb03f962cf61ba8af927b8716755cdfc8b8d76586af74bf8dfe4f1f058be69c0679e70e1f1b86943c92c03 SHA512 e69311857e4e6c35f73fd7f8ee902044cb7608890c5f5829e960b02c7a9c8362dc1e8154ed3dec902b86f7a7b5313b06f4551b3be378d31f37b3378ec0f2bc5b
-EBUILD aiohttp-3.9.1.ebuild 3111 BLAKE2B 04d4cfe4d7359c817a23262be308073573bc6ece2b20e71bcec76cc1279fc509e1a53bb6a5f697164d7718d42e8e7f9be1385f3eb802061c4717f3817857eb6f SHA512 24f322d45c5e94a07aadaaa836def4646a46a3dd4b180c66792b361dc634c6f165be4eb727c6bd5b4ed1a98388eb020b827b65fe5165ed9e3b0091d3e28a76a2
+EBUILD aiohttp-3.9.1.ebuild 3110 BLAKE2B 8c725e7fed5738d3f5d17fd6417f828e0650c5528bcb8e2f3607e0bebbd32173cec9576ed718a15431bb55eab7776ce6ade8390b0a70f7fade8201ab9ca8bcf4 SHA512 31635e454da3f331521af678c82eede9cd50d8d422a448a5107eb4a4f475f3446a5c54ca649cea5c5a9fd31ddbd522dbc7fa44ca1360ac4d8e4f54b515ef50f9
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.8.6-r1.ebuild b/dev-python/aiohttp/aiohttp-3.8.6-r1.ebuild
deleted file mode 100644
index 87cf0162f94c..000000000000
--- a/dev-python/aiohttp/aiohttp-3.8.6-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="HTTP client/server for asyncio"
-HOMEPAGE="
-	https://github.com/aio-libs/aiohttp/
-	https://pypi.org/project/aiohttp/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/async-timeout-4.0.0_alpha3[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/brotlicffi[${PYTHON_USEDEP}]
-	<dev-python/charset-normalizer-4[${PYTHON_USEDEP}]
-	>=dev-python/charset-normalizer-2.0[${PYTHON_USEDEP}]
-	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-brotlicffi.patch"
-	)
-
-	# increase the timeout a little
-	sed -e '/abs_tol=/s/0.001/0.01/' -i tests/test_helpers.py || die
-
-	# xfail_strict fails on py3.10
-	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
-
-	# which(1)... also -Werror, sigh
-	sed -i -e 's:which:command -v:' -e 's:-Werror::' Makefile || die
-
-	distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	# workaround missing files
-	mkdir requirements tools || die
-	> requirements/cython.txt || die
-	> tools/gen.py || die
-	chmod +x tools/gen.py || die
-	# force rehashing first
-	emake requirements/.hash/cython.txt.hash
-	> .update-pip || die
-	> .install-cython || die
-	emake cythonize
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# proxy is not packaged
-		tests/test_proxy_functional.py
-	)
-
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/test_client_session.py::test_client_session_timeout_zero
-		# broken by irrelevant deprecation warnings
-		tests/test_circular_imports.py::test_no_warnings
-		# TODO
-		tests/test_client_session.py::test_request_tracing_url_params
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			# upstream unconditionally blocks building C extensions
-			# on PyPy3 but the test suite needs an explicit switch,
-			# sigh
-			local -x AIOHTTP_NO_EXTENSIONS=1
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked
-	rm -rf aiohttp || die
-	epytest -n "$(makeopts_jobs)" --forked
-}
diff --git a/dev-python/aiohttp/aiohttp-3.9.0.ebuild b/dev-python/aiohttp/aiohttp-3.9.0.ebuild
deleted file mode 100644
index 43338cff0e79..000000000000
--- a/dev-python/aiohttp/aiohttp-3.9.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP client/server for asyncio"
-HOMEPAGE="
-	https://github.com/aio-libs/aiohttp/
-	https://pypi.org/project/aiohttp/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/brotlicffi[${PYTHON_USEDEP}]
-	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		<dev-python/async-timeout-5[${PYTHON_USEDEP}]
-		>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		test-rust? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# increase the timeout a little
-	sed -e '/abs=/s/0.001/0.01/' -i tests/test_helpers.py || die
-	# xfail_strict fails on py3.10
-	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
-	sed -i -e 's:-Werror::' Makefile || die
-
-	distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	# workaround missing files
-	mkdir requirements tools || die
-	> requirements/cython.txt || die
-	> tools/gen.py || die
-	chmod +x tools/gen.py || die
-	# force rehashing first
-	emake requirements/.hash/cython.txt.hash
-	> .update-pip || die
-	> .install-cython || die
-	emake cythonize
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# proxy is not packaged
-		tests/test_proxy_functional.py
-		# python_on_whales is not packaged
-		tests/autobahn/test_autobahn.py
-	)
-
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/test_client_session.py::test_client_session_timeout_zero
-		# broken by irrelevant deprecation warnings
-		tests/test_circular_imports.py::test_no_warnings
-		# TODO
-		tests/test_client_session.py::test_request_tracing_url_params
-		# fragile timing test
-		tests/test_imports.py::test_import_time
-		# crash in time-machine
-		# https://github.com/aio-libs/aiohttp/issues/7851
-		# https://github.com/adamchainz/time-machine/issues/403
-		tests/test_cookiejar.py::TestCookieJarSafe::test_max_age
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			# upstream unconditionally blocks building C extensions
-			# on PyPy3 but the test suite needs an explicit switch,
-			# sigh
-			local -x AIOHTTP_NO_EXTENSIONS=1
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked
-	rm -rf aiohttp || die
-	epytest --forked
-}
diff --git a/dev-python/aiohttp/aiohttp-3.9.1.ebuild b/dev-python/aiohttp/aiohttp-3.9.1.ebuild
index 1a23562e1d98..52c9a3b75738 100644
--- a/dev-python/aiohttp/aiohttp-3.9.1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.9.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/aiohttp/files/aiohttp-3.8.6-brotlicffi.patch b/dev-python/aiohttp/files/aiohttp-3.8.6-brotlicffi.patch
deleted file mode 100644
index 20e3c7ea0e5d..000000000000
--- a/dev-python/aiohttp/files/aiohttp-3.8.6-brotlicffi.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 4d60891531637aed2fdc50a5dff4809d7d9b3f32 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 20 Sep 2023 15:28:37 +0200
-Subject: [PATCH] [3.9] Support brotlicffi alternatively to brotli (#7611)
- (#7620)
-
----
- aiohttp/http_parser.py    | 5 ++++-
- tests/test_http_parser.py | 5 ++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/aiohttp/http_parser.py b/aiohttp/http_parser.py
-index 91e01f43..521ff5db 100644
---- a/aiohttp/http_parser.py
-+++ b/aiohttp/http_parser.py
-@@ -49,7 +49,10 @@ else:
-     from typing_extensions import Literal
- 
- try:
--    import brotli
-+    try:
-+        import brotlicffi as brotli
-+    except ImportError:
-+        import brotli
- 
-     HAS_BROTLI = True
- except ImportError:  # pragma: no cover
-diff --git a/tests/test_http_parser.py b/tests/test_http_parser.py
-index 4b185c9e..dc373ea8 100644
---- a/tests/test_http_parser.py
-+++ b/tests/test_http_parser.py
-@@ -21,7 +21,10 @@ from aiohttp.http_parser import (
- )
- 
- try:
--    import brotli
-+    try:
-+        import brotlicffi as brotli
-+    except ImportError:
-+        import brotli
- except ImportError:
-     brotli = None
- 
--- 
-2.42.0
-
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 3d4a4b6bc623..45d3672f8df5 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,18 +1,8 @@
-DIST boto3-1.29.3.gh.tar.gz 737012 BLAKE2B 4282de0bbe03b61cf6884b08cf0a16e93c1e27a0323d2eee93277f8ac62f5ef440612292ebc245f13de0bbac9c156cae0cd5c76e8ae5b7d018a125cd49a682df SHA512 e42064e2c825376dfe2a5aa0c92715d06d6d29c3cf8b194d8742c688a4743e216ba32111bba080d88505907e48ff26086106eaef62fa5048f34fcbf08355ab60
 DIST boto3-1.29.6.gh.tar.gz 738684 BLAKE2B a42245ddc7a0f31329057016f47739fc4071a030dca1ced347b447860e9397e3c8bae8c70ca86629a4b6b3f403ed845887340e6aeb08fe33c006dea9cd3f6317 SHA512 551a3568f3ceb1f37c7d209e7aa011dbd87d01e02f7559f15563bbd06da6d7a1ff79a1a5ed8150cfbc183cd1c56041a1e36753939142962f056348362665c118
-DIST boto3-1.33.10.gh.tar.gz 753779 BLAKE2B 8c46c6459574307c9ed4700afd1dd3e67e308f5c911422fe8942cd2b6cf7cc20a067f52e6aaa65748c4edaaf73d9fe8904da2f5523c067dbb4676b4c13a9613c SHA512 9c8e75464754741732c1865c00f8d74bb50a0e1edd0c90645c92230e21ea28f55c3eff1fa7a80e616999fd0b063fd287d36838a12a828bcc6e6bd0a77205393d
 DIST boto3-1.33.11.gh.tar.gz 754430 BLAKE2B f206c6eeb9859af85f09bb48298b941fc0c969446766638c612fa1e88e19b8f9a99ec2ecbb8565a40432cc7a7f5362459af7488a172f4bca3179385d82742feb SHA512 03f37d99b70d857d2d72e81e02fe3afb64d3139adde80db0bf3a2f78ce8fa33c5cc6965a8dbfd267b263711c73c355d69d7e629eb7f28e6bdccf5480ca9c9810
 DIST boto3-1.33.6.gh.tar.gz 752467 BLAKE2B f0f344a9e93ff3ad1dd03b44784a41637d05961855e2cd0700dbb840f98940f387cf81d1eb36cc63579be810f5a7d52c49cdb3831e930f89b1b2026af1e4b357 SHA512 1d3d2dd734621cf94e88015273f6fd4d68ec956145eb2b91fe34920f9abe7786a64e2e7f4057db30e71574e392fff9190944c3d9e6143fd43c5e48f04e9eb2ae
-DIST boto3-1.33.7.gh.tar.gz 752960 BLAKE2B 2da4ddbf62008e7fe1b2f49eb1358e417ac3fb9ad80ccc18ad5be85b747f96060679a6bf466d970e62fa0bc3c3c91bab6516e8de5b14c6cca79e35be34ddf0d2 SHA512 5102d564cd749684ccab50a5de1782f07dbe1a5bb037f6f037e44e9fb8c1800f996faca855457976a65c49a38b9472d16ea288f140d946e50057a18a0c179b78
-DIST boto3-1.33.8.gh.tar.gz 753219 BLAKE2B 8b6bc4c1d7e5a70f8061a7a966b3b9504e1c6cca604c7f7597ce7a1a05e213b903501c22d1d101fd814055cb112b7f690699ac714238743a64010d88724a3086 SHA512 7bbca4cee2610a5db246e9496bcb936b3266cb05b5aa8c919a06d824980bfbd7b974f9621bf13ce3efb78471b05968909558d94d941bd8764c1b67da25229e08
-DIST boto3-1.33.9.gh.tar.gz 753813 BLAKE2B d194759a15d514b40530e2935c2423f4ab567981d19697fb80b78968b98cbffb5762d110f828756917898799257928f8a8713e7eec278afeb4027d8c982c9424 SHA512 98a95a13c9c2acf34f2590b8ab8440f03b23a43977140516816abe2ff516c23f173fb4239931a9b4cf9cb6f091e9ba5023f3a3e445418f52304c208ba251bfd4
-EBUILD boto3-1.29.3.ebuild 1485 BLAKE2B fc702d3fd55d9c57599926d1e33f65863cd9a14b64aada18aab25ebac3b941904f0c709ded91eff33b7adc235aa649fd75da799a8538706c71cf6170786031e9 SHA512 11d46b930fb64352f68e31a34569d05e0dac9e5446a10a2b3e277b94f4a00b8be84e8e70b6938c6f63327d4d2012d294c98871d5f6d07e0974b654aeb100c0c1
-EBUILD boto3-1.29.6.ebuild 1492 BLAKE2B b917bb04deee77e6b65688e46eb6a2a0bf4c4550311821f0e1ec4fe1031430d56c7052b322ad1ed8bda21caf84d18770ed0aa44357870687af79fc8795ca999b SHA512 d72328e959f9a4567bc5aab853ed06f353d5248cb4158f02fbc49684f6065c9108101d7cc3a541e6d292014c2ffd142b00b3a729a0c82ed8fb9d28b1f5d68ba0
-EBUILD boto3-1.33.10.ebuild 1392 BLAKE2B 4c573992b5d17568bcb702c0bf35cfdcebf2b914834cfaa8fd4ab9a4b7a97313659c4b4adf2ee67da3d4d18a717cddce26819a9de3d4364f4fd5c626257ab7b4 SHA512 3cb3544f613b65537105f83c1218ce1649807e56b9f4a03447d87958e02f3ca62c8a1c614732976925d876e0dc08a921222a67f82c47a892861d5bcd382ed800
+EBUILD boto3-1.29.6.ebuild 1485 BLAKE2B fc702d3fd55d9c57599926d1e33f65863cd9a14b64aada18aab25ebac3b941904f0c709ded91eff33b7adc235aa649fd75da799a8538706c71cf6170786031e9 SHA512 11d46b930fb64352f68e31a34569d05e0dac9e5446a10a2b3e277b94f4a00b8be84e8e70b6938c6f63327d4d2012d294c98871d5f6d07e0974b654aeb100c0c1
 EBUILD boto3-1.33.11.ebuild 1392 BLAKE2B 4c573992b5d17568bcb702c0bf35cfdcebf2b914834cfaa8fd4ab9a4b7a97313659c4b4adf2ee67da3d4d18a717cddce26819a9de3d4364f4fd5c626257ab7b4 SHA512 3cb3544f613b65537105f83c1218ce1649807e56b9f4a03447d87958e02f3ca62c8a1c614732976925d876e0dc08a921222a67f82c47a892861d5bcd382ed800
 EBUILD boto3-1.33.6.ebuild 1392 BLAKE2B 4c573992b5d17568bcb702c0bf35cfdcebf2b914834cfaa8fd4ab9a4b7a97313659c4b4adf2ee67da3d4d18a717cddce26819a9de3d4364f4fd5c626257ab7b4 SHA512 3cb3544f613b65537105f83c1218ce1649807e56b9f4a03447d87958e02f3ca62c8a1c614732976925d876e0dc08a921222a67f82c47a892861d5bcd382ed800
-EBUILD boto3-1.33.7.ebuild 1392 BLAKE2B 4c573992b5d17568bcb702c0bf35cfdcebf2b914834cfaa8fd4ab9a4b7a97313659c4b4adf2ee67da3d4d18a717cddce26819a9de3d4364f4fd5c626257ab7b4 SHA512 3cb3544f613b65537105f83c1218ce1649807e56b9f4a03447d87958e02f3ca62c8a1c614732976925d876e0dc08a921222a67f82c47a892861d5bcd382ed800
-EBUILD boto3-1.33.8.ebuild 1392 BLAKE2B 4c573992b5d17568bcb702c0bf35cfdcebf2b914834cfaa8fd4ab9a4b7a97313659c4b4adf2ee67da3d4d18a717cddce26819a9de3d4364f4fd5c626257ab7b4 SHA512 3cb3544f613b65537105f83c1218ce1649807e56b9f4a03447d87958e02f3ca62c8a1c614732976925d876e0dc08a921222a67f82c47a892861d5bcd382ed800
-EBUILD boto3-1.33.9.ebuild 1392 BLAKE2B 4c573992b5d17568bcb702c0bf35cfdcebf2b914834cfaa8fd4ab9a4b7a97313659c4b4adf2ee67da3d4d18a717cddce26819a9de3d4364f4fd5c626257ab7b4 SHA512 3cb3544f613b65537105f83c1218ce1649807e56b9f4a03447d87958e02f3ca62c8a1c614732976925d876e0dc08a921222a67f82c47a892861d5bcd382ed800
 EBUILD boto3-9999.ebuild 1588 BLAKE2B bfcf68e1a1dffa36c71f030ad8743b59c9170c34a425a7982ee81d1fb0df1c29fdecefa7b55f373557b735d60ab51d510ca398edd4045def5fffb6d4d4d9d579 SHA512 1bca684f585a51d8b58a594c71974b36b145912550f051d6d4c84ba28bce949ec10c112a6f7bfa8f60fa362d9126d9a830243ab36595754bef02f19e02161bb8
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.29.3.ebuild b/dev-python/boto3/boto3-1.29.3.ebuild
deleted file mode 100644
index 11e8804b494b..000000000000
--- a/dev-python/boto3/boto3-1.29.3.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_{10..12} )
-
-inherit distutils-r1
-
-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.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.29.6.ebuild b/dev-python/boto3/boto3-1.29.6.ebuild
index 0604e0996a82..11e8804b494b 100644
--- a/dev-python/boto3/boto3-1.29.6.ebuild
+++ b/dev-python/boto3/boto3-1.29.6.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.33.10.ebuild b/dev-python/boto3/boto3-1.33.10.ebuild
deleted file mode 100644
index 8123b4a12a79..000000000000
--- a/dev-python/boto3/boto3-1.33.10.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..12} )
-
-inherit distutils-r1
-
-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"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.33.7.ebuild b/dev-python/boto3/boto3-1.33.7.ebuild
deleted file mode 100644
index 8123b4a12a79..000000000000
--- a/dev-python/boto3/boto3-1.33.7.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..12} )
-
-inherit distutils-r1
-
-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"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.33.8.ebuild b/dev-python/boto3/boto3-1.33.8.ebuild
deleted file mode 100644
index 8123b4a12a79..000000000000
--- a/dev-python/boto3/boto3-1.33.8.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..12} )
-
-inherit distutils-r1
-
-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"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.33.9.ebuild b/dev-python/boto3/boto3-1.33.9.ebuild
deleted file mode 100644
index 8123b4a12a79..000000000000
--- a/dev-python/boto3/boto3-1.33.9.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..12} )
-
-inherit distutils-r1
-
-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"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 9c7ab12c8738..abd2ea022820 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,18 +1,8 @@
-DIST botocore-1.32.3.gh.tar.gz 12176739 BLAKE2B b119a54fb4770757c8f2c75b7404e009be1c7b35598d8a97e892aa644bbcc301b5f6bb44fa0f37bc8f4523af5ca9771daeda877937e640dd557038c8283967e1 SHA512 398127e140edc33750553f33a14cdc140048f5ee03c162705c6681b9bf08d871c9ba29f824ba2b6f1b11592260c6f0614ab4c06464cdda98172e8ca81bce73e9
 DIST botocore-1.32.6.gh.tar.gz 12201067 BLAKE2B 434581b5047aca3909b586c49b01085ed1cbad972b63156521f675c09f3934e04f6583bf543bfd772127afa6fb59ad993229306456ac10e8dc86dd3bb7c430bb SHA512 e175e23452d6956b995ff93a16ffc992cebcfae76e5a7671f60d719e3e8a2692d873f0e8d8830780ddc11f45ebea7a555d0917da5b33ff8249936dce106c7fed
-DIST botocore-1.33.10.gh.tar.gz 12524381 BLAKE2B 8c0fe3e14a55ff579eaf71fc533d28a6994ae9b13991ce5b41a4bce2a11544e80f08d27ffac9bc2d584ae0c2cd2847d5b183b7b3833a44fe37b6f3989b9d74b6 SHA512 cd419fb545b6028ee2c2692183299b8378a970d355ec2f2b6c0f1c9469c485ddf6113baf41455b30fe38afd0724c7ef0cf686178b7f93d6c298c4b1d1195ec75
 DIST botocore-1.33.11.gh.tar.gz 12536159 BLAKE2B bce09ad1b93210667e3c1058ab3b4350b752e330c78c29af87c53b3f3f738dd7622b1b670a4fdbfa2dfdeaf763f9885b3f82ad0eb4f44c7e7585ae5b8eaa6b5d SHA512 5d790bbb909230861cf2eb38908f5876ab9bd7e5dd1f718987797af0b263c7ea2c42d69aa1d55b66d1b954204caa04c50cd050385607637192e9ad6b33f65b7d
 DIST botocore-1.33.6.gh.tar.gz 12516087 BLAKE2B da3ca22acb5b6ee27eb3c0f7dab4ad43597ab985aa7512f4f4a51c2ca3db80a049e13faaf986dd4a02125f92c088129506651125a826184656250665dc7b7128 SHA512 cae5019d85c9b3afcfd93fe58d0e51c5a6e0769d58b2a8b1285a34ce66be8db34e9c5dc4dc74ff72e0992cdd142d101e3663fa1d68a2779fa9c09de37d2f2001
-DIST botocore-1.33.7.gh.tar.gz 12519396 BLAKE2B dde3ea6432d55e14c4c57adc9153857872a556379cce0a37e08c460c676f31658d4e74b354b44514fc9dc8154cf2683b5889dc9659a867af67ef48dd393cf6f3 SHA512 4704ff247983f4492f95b919876caffa8414a6b710e76defcc23a7a08ab3056f5631b3a1698f8e402a0ca6f69ad5d9d91a4cd18c6d3d0ebce650dea8db3ee917
-DIST botocore-1.33.8.gh.tar.gz 12518729 BLAKE2B fb74eaa99bc9b62d0616585c934a45d73a7573544708f6d163288428aa19fbda3f09ef36ba65c310bf4f00cac1c932ff2ed0baf2dfbbeb823b791417d1dad0ab SHA512 c983750b922866e6457b42adfb9661f426d1285e1cab1ad16064c95ed6a79a5bd67882e7014e5dba7c630bbcf95b634349515e9c1b57de9142a94d767f38de66
-DIST botocore-1.33.9.gh.tar.gz 12521140 BLAKE2B 3b2f58d11f13123c49ef674be3dfa403cdea6957ae019cf7c76cb613b4fc13e25e90b1bd3bbee75732e211629058d0fe343c4e9ed070800a52fe87aa36f8b6ee SHA512 bc5233bf81a02117d5d248ad00db1d487b23dd253af928da03adca95a14d4b5df111393436070e63c2fe285dc78e0fb6f8e6a93e5a7332efbd17f31c47427944
-EBUILD botocore-1.32.3.ebuild 1517 BLAKE2B e056da584f834fcb5026f593a9187a613e82f1a6cb8df7b6fff6a997b971905e62ee8cfe8c99a0dbf1a6c514499860d8cb0a0d27e9155715ec07de46a8d8b325 SHA512 f5fd3af7a1209b7ecd8e7b8ac4aad92ae0db0477678d02c88394aeb7b9d1984e6c0975cbc4d006cc2df480f7fbec625ad8dd660edabf148dd44c2785085b9366
-EBUILD botocore-1.32.6.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
-EBUILD botocore-1.33.10.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
+EBUILD botocore-1.32.6.ebuild 1517 BLAKE2B e056da584f834fcb5026f593a9187a613e82f1a6cb8df7b6fff6a997b971905e62ee8cfe8c99a0dbf1a6c514499860d8cb0a0d27e9155715ec07de46a8d8b325 SHA512 f5fd3af7a1209b7ecd8e7b8ac4aad92ae0db0477678d02c88394aeb7b9d1984e6c0975cbc4d006cc2df480f7fbec625ad8dd660edabf148dd44c2785085b9366
 EBUILD botocore-1.33.11.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
 EBUILD botocore-1.33.6.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
-EBUILD botocore-1.33.7.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
-EBUILD botocore-1.33.8.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
-EBUILD botocore-1.33.9.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
 EBUILD botocore-9999.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.32.3.ebuild b/dev-python/botocore/botocore-1.32.3.ebuild
deleted file mode 100644
index d33c969b31de..000000000000
--- a/dev-python/botocore/botocore-1.32.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-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}]
-	)
-"
-
-EPYTEST_XDIST=1
-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
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.32.6.ebuild b/dev-python/botocore/botocore-1.32.6.ebuild
index 05766e84276c..d33c969b31de 100644
--- a/dev-python/botocore/botocore-1.32.6.ebuild
+++ b/dev-python/botocore/botocore-1.32.6.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.33.10.ebuild b/dev-python/botocore/botocore-1.33.10.ebuild
deleted file mode 100644
index 05766e84276c..000000000000
--- a/dev-python/botocore/botocore-1.33.10.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-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}]
-	)
-"
-
-EPYTEST_XDIST=1
-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
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.33.7.ebuild b/dev-python/botocore/botocore-1.33.7.ebuild
deleted file mode 100644
index 05766e84276c..000000000000
--- a/dev-python/botocore/botocore-1.33.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-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}]
-	)
-"
-
-EPYTEST_XDIST=1
-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
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.33.8.ebuild b/dev-python/botocore/botocore-1.33.8.ebuild
deleted file mode 100644
index 05766e84276c..000000000000
--- a/dev-python/botocore/botocore-1.33.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-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}]
-	)
-"
-
-EPYTEST_XDIST=1
-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
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.33.9.ebuild b/dev-python/botocore/botocore-1.33.9.ebuild
deleted file mode 100644
index 05766e84276c..000000000000
--- a/dev-python/botocore/botocore-1.33.9.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-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}]
-	)
-"
-
-EPYTEST_XDIST=1
-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
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/django-tables2/Manifest b/dev-python/django-tables2/Manifest
index 6379adc497ee..4e9bb8ef7c69 100644
--- a/dev-python/django-tables2/Manifest
+++ b/dev-python/django-tables2/Manifest
@@ -1,5 +1,5 @@
 DIST django-tables2-2.6.0.gh.tar.gz 431368 BLAKE2B 56896a416599e6f4293202ca945bf808c99ce08c4b5f53848919c3a32590e18d867e694fe7c989fdb855a5cdaf94350199c65735078c0d312d1f4f0a556ed9ae SHA512 29cabb777ed102dfde4d24836c5952bf892c7c8e3c5e5f608e00fd1aa4eecc33c6a2b1be1fd07617b354d7de34215d501592c53033d6f48c29e89ab68fdcb22d
 DIST django-tables2-2.7.0.gh.tar.gz 431811 BLAKE2B 2a6a9d74fa50bab049b9b85fc4a2d39b5a54b0fbbcd51f86f2b196e51bd1a1ef36ccc032db13f7cde4f836419a2d92248571b4fb985a8aefb3be2bb740856a2b SHA512 9666dad152d995ef7772881ace4bb83fc41aca1675e0cc116791e4fbfb970de600bd8cc2310b5694558b11e479dea2fc84584a669f6a8127a4bb0a354d24e39a
 EBUILD django-tables2-2.6.0.ebuild 995 BLAKE2B 1c1218885608e09be056fecd06400b0f34946854070458922904865e154bb761d0a1c5a7b2f152c5ea04f1078a2f7273b0f43e25633ca99738e0ced86439a3ae SHA512 80ecc9bfc9b2bd22635db22368280285efc7bd3d731126c2407d8d876bb78834d97a2c03a0acce958aa248edeed52f869b4312068d35927b1a806d9a30d6d849
-EBUILD django-tables2-2.7.0.ebuild 995 BLAKE2B 1c1218885608e09be056fecd06400b0f34946854070458922904865e154bb761d0a1c5a7b2f152c5ea04f1078a2f7273b0f43e25633ca99738e0ced86439a3ae SHA512 80ecc9bfc9b2bd22635db22368280285efc7bd3d731126c2407d8d876bb78834d97a2c03a0acce958aa248edeed52f869b4312068d35927b1a806d9a30d6d849
+EBUILD django-tables2-2.7.0.ebuild 1106 BLAKE2B 20eb2e49c35e118b233ba2f575048d39cb615add60976adc280f9a600d1a504a71e576a5325db4c38a35a010fa705dcc2d67a3dc586df0c641c88af61078c227 SHA512 4b17b123f1cedb51cee0517020985fdf2bd6a415801c45a9e3c600ed2237243943be3760ccceb1723d3534ad91cbc82c048906cb5e0723f570a67788644c86ae
 MISC metadata.xml 416 BLAKE2B f63a86611d3d5805c63f14c75851d6283f12777fce462a796c205ca4141fd5d5a321a7173f2b8bda70d67a3db5935864ca632e6858757626ed632fe3ec6874fb SHA512 1cf202a6a5fcbe86157ba8bf71f5c0c8df2c4393dcc955b2ad37e4f2164a33e241287bed237116df298e6a062a861ec99f3326d13f8f5845891556eb36d9bbf3
diff --git a/dev-python/django-tables2/django-tables2-2.7.0.ebuild b/dev-python/django-tables2/django-tables2-2.7.0.ebuild
index 455addd05950..9503ae38d137 100644
--- a/dev-python/django-tables2/django-tables2-2.7.0.ebuild
+++ b/dev-python/django-tables2/django-tables2-2.7.0.ebuild
@@ -32,7 +32,13 @@ BDEPEND="
 		${RDEPEND}
 		dev-python/django-filter[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		|| (
+			(
+				>=dev-python/django-4.2[${PYTHON_USEDEP}]
+				dev-python/psycopg:*[${PYTHON_USEDEP}]
+			)
+			dev-python/psycopg:2[${PYTHON_USEDEP}]
+		)
 		dev-python/pytz[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index e2a121d57b0e..af2550b56557 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -19,6 +19,6 @@ EBUILD django-3.2.22.ebuild 3017 BLAKE2B e16c0f15ab99d5d3636aac0d2e507fd52d4709b
 EBUILD django-4.1.12-r1.ebuild 2828 BLAKE2B 649c3e8f77e1f19beafb795fa35e78390826f5c7520e571bafb41d297d1bffdf250a239eed368335fca985cd5ee78c4c3c17c69cc8bcb116f62da941ca0daa40 SHA512 68bc9302c3426df90a1985e494838bce679177331cce34019a84a9edf80d6ed9869ce2a352a0d58169a094c83b4a7a0fd74ff99c6ae555fa6ec7527d04341af6
 EBUILD django-4.1.12.ebuild 2640 BLAKE2B 6a2b9d1f80a7a16c6b892c6cb1c242668aa3d300037662be339e2112a7ef57beb698e7887ec75d6ae480cad09efceb598b2d37d1caf6f63b06d093f861a63e8d SHA512 e4628c3bd55bddbb36d0f5364a3fada8a42547fe87eee76c076014b61e714214fee9534cb29ddb00ade89a606622f684749195165ac09e15640bbe4bc96d08c2
 EBUILD django-4.2.6.ebuild 2681 BLAKE2B 74a8e4a4837d861df4d6faec7f50a24d15a24c29d39b3a8113532ef0c32b40c42bb718e898dfa5f54d8ebb41b4005ff9d5d4328fce67791ebaabca04e4bf2942 SHA512 0a51bed47ab789244e136136dcaa4508ad96eb2a4cc0816ed59b93d6d6d0ba85f8e8bcb24e818c3ef5ddea4203a2b972c1963410c48a23898e4b99af245f5d0f
-EBUILD django-4.2.8-r1.ebuild 2829 BLAKE2B 2135548e518fe172772f3b6286e973428b83620de7bfd8537ab121d91308b1118c88dcf30b5994d46a125ca55c0305f06c99b8525acd19b233e514edf5c31759 SHA512 187b701a296b471187c72673d8f8783bc88bcd81c1bb8ba5ae9528df7d27f1778da9bbd43d9ab79dce34650d381bea193e92c6ea298280233e1813a1d7374329
-EBUILD django-5.0-r1.ebuild 2816 BLAKE2B 8a3c561393d8007b77f40223d070a8b9846cfae9d7ae9c38a4ddbc89dbfb78d6664d4d9238f5dcbb05263aea2f5c59ac9a0f74aa04de6fdb34dce4c9754eca4a SHA512 1720a437b6246380150738e27211034b4bc1fa9413c0f36701acf5b3115e9ac63ad0c1b198eecafd090bbcfcf524c8eb9642a261d49da58d3e24bab0e64da0b6
+EBUILD django-4.2.8-r1.ebuild 2829 BLAKE2B a2007528aa68e8405bfa11eea38074fb734cbdea89a6fae357480f6aca73989fe6118efd7fa50c60f7a3c718d6b369ca0c50adf5d202e34d38ca962e72c4548a SHA512 1d049311c5074d80b4116637c058b241c7bad81481bde2474b45c4cfd1128c2153e1a4b64f1ef328af4e316f640a4f29bf1657270d48c44fb229c1cd94244d15
+EBUILD django-5.0-r1.ebuild 2816 BLAKE2B 2a6dddc144987215f56d2ad6347e0d41bab1ef2641e4f54a9ba7d4205aa3eb5b7876139e46bfd86d90bac768ff2e7b76b66c1e39ec6a1d6c2659743f22f43f84 SHA512 1e417518688b91076257ec067a2f746d7d39593ba7944761e7cd06772d387dba8e792e7b7e820e3ca064f5a2a4fd634ea7492071aadda5078ef542d421653867
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-4.2.8-r1.ebuild b/dev-python/django/django-4.2.8-r1.ebuild
index 2420d13d267e..7cb1ec1b76a5 100644
--- a/dev-python/django/django-4.2.8-r1.ebuild
+++ b/dev-python/django/django-4.2.8-r1.ebuild
@@ -91,7 +91,7 @@ python_install_all() {
 pkg_postinst() {
 	optfeature_header "Additional Backend support can be enabled via:"
 	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature "PostgreSQL backend support" dev-python/psycopg:0
 	optfeature_header
 	optfeature "GEO Django" "sci-libs/gdal[geos]"
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
diff --git a/dev-python/django/django-5.0-r1.ebuild b/dev-python/django/django-5.0-r1.ebuild
index fa0f0a054801..c66819f153be 100644
--- a/dev-python/django/django-5.0-r1.ebuild
+++ b/dev-python/django/django-5.0-r1.ebuild
@@ -90,7 +90,7 @@ python_install_all() {
 pkg_postinst() {
 	optfeature_header "Additional Backend support can be enabled via:"
 	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature "PostgreSQL backend support" dev-python/psycopg:0
 	optfeature_header
 	optfeature "GEO Django" "sci-libs/gdal[geos]"
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
diff --git a/dev-python/expandvars/Manifest b/dev-python/expandvars/Manifest
index e34cb4a98cc0..58ce8cc23000 100644
--- a/dev-python/expandvars/Manifest
+++ b/dev-python/expandvars/Manifest
@@ -1,3 +1,3 @@
 DIST expandvars-0.11.0.gh.tar.gz 10663 BLAKE2B cfbcb8bedc61cc8b1e88d4774784518e15846f7ea5ddbf58bd016ea2043dd5b1c9e55af117f6482e05e9ae4ba07e01d0fb471a72719f38191f1a29a9f66387a9 SHA512 e8de6544f2d369728e35c8b862662f348f46673f836f8b14dbdcfdc3dbcb7efda80deb55f8bcd597037ac974752e2463d429ddda3b8502fe19c402c253babf7f
-EBUILD expandvars-0.11.0.ebuild 843 BLAKE2B ce464cb740efcd89289e200e91e41d83e7a0e66a78d62ef4174b7c0486488f223cc958049870cff6312673cd8c6e67754ef6ff77355fd3d860a177776f92d0c5 SHA512 526c8d4d302b39630ca9dba9c735610a737493b626e6e6a8a7fbfc4f8c909f9eb83b55b96d8618009beedc15b5aba7067dd21861b23c255a338c7c4dace5506b
+EBUILD expandvars-0.11.0.ebuild 842 BLAKE2B d21ec88a9037128a5fc15b08f26a608b7584fb0e72c8e3133864ebc5d5e9b75065cce81418004bbe0d6835800f661c8eb1ba6c191c9d6488c7a9a2b63af7554b SHA512 f9b0e730d311bd0ea1f6fe6987e91adc7cbc75212c6f4067504a327a27b7916536dc326020380543185318bd82cdbd8afa2bf67fe15b4db0a46c37600ad7f0cd
 MISC metadata.xml 378 BLAKE2B ea984772fa8cd80ee947c6a950e90357d88fee179f2c389ac904b73aaeff153537f662f3f21604772c341e89b6d8ad772cf0e2ac253cd0a2a0038ab93d056dd4 SHA512 6fc7c7d666e6dc0d342525d9cef241a8cbd3f3f3725570dd3819628e1967c6a9a536a6df93266a55cafafd2e5cf0b1588fdc2fc1c9238919fb155f7b833cb212
diff --git a/dev-python/expandvars/expandvars-0.11.0.ebuild b/dev-python/expandvars/expandvars-0.11.0.ebuild
index 67713342d21d..d5b3f18d5211 100644
--- a/dev-python/expandvars/expandvars-0.11.0.ebuild
+++ b/dev-python/expandvars/expandvars-0.11.0.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"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 690f62ebfc48..043f1ca49e81 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,6 +1,7 @@
 AUX isort-5.12.0-py312.patch 1563 BLAKE2B 719905427e91895261aa7282cc9f56759b47ec71f8459d3959dfff1f9e254ae7a906d4fc1bfdb241bc20249cd45563854496f6bf1efd1a9cfb74203dc7ba137d SHA512 ecd2b1cb734cfea8a169b5412f221279c226938ec9d18b98b81b6f3fbf122124875236a46f0ac8bb3213f4331c888553d036e6835b826be78fe9dc300bfa1fdb
+AUX isort-5.13.0-poetry.patch 485 BLAKE2B 8ac8d53e2fdf6db49cfac8f6949fec21d92e730c13cc3fcd2b140acd4ef0fe203e83377a429da34b05b076c96df431e84428ae3b48d1a1557900681cf9cab50c SHA512 5eff8369c98fc236085431fed2bc44c958259cf422e12134a88f271af968b83d0ab2361f3c91626d98f075c7c442c2b72cdb84ae0c1095e11ec556a8b4e7bf5a
 DIST isort-5.12.0.gh.tar.gz 743141 BLAKE2B a7f8deef02b57162eebe15b35e71382c654372a80dedba7eee63d0c9b0899c053fb517401585af17014db3cf9ed44089f6cbd1e2b0ed17393cc667de06bfbddd SHA512 ceb861d1a077be6fecd82fde775bded1fb676c77135e2004c92a6221762e0b3ff6c1071d17957e1add4062ec26ba6c9264e4905724f2c659339cbd0601f4b45e
 DIST isort-5.13.0.gh.tar.gz 753826 BLAKE2B 074e8b762b304618a2291d96dc9e18061e5303f3e6772479e8eda42c687cf289c12c73ce585c869df754b244bf14d59c6d2eba10877756287d88f27a3d470939 SHA512 3c5a170b1526ec58f1c774e4b55e2227df0af23eebd7a387d61cd3eaa0a698b5ad22a0be81a87d4e6a026030ffbdaea0f23331a43e28b5df98bf33b7afe2a42d
 EBUILD isort-5.12.0.ebuild 1691 BLAKE2B 9899ef315fca3c2d591f6b99ce9d84230690631f873216bea8fa5d36b51d2fbb7f813cffc7efe1d7bbefb947b14a6ae1049cc3914e7da8a6cd2f22582283ae91 SHA512 dae89599e7f4ca3e3056411f0435ae5fe84c90dd7f0c9f8554032bc8d98567972c82be70f1abc180e4a1342d776330423606af83b3e04c42b89403739a325c44
-EBUILD isort-5.13.0.ebuild 1608 BLAKE2B 4055fe5a915f48ec2f8b2a045cc998cca196ea6a6e055fec328197357fe1fef176675052e843b72b51af8f8408f6d2f5d7be2e27ea2b4053c71c939fc57148d4 SHA512 624a284ece8bacf394976ea6b8749cf2ef4d9f6ca9104c2bc30fbc7051659053ee5bc440fc8152eb3131375a902eabe0f6fb20ee3566be463bd016ff200c7ce6
+EBUILD isort-5.13.0-r1.ebuild 1794 BLAKE2B 6b6e96ec89d66a3411930316e3d866df0398cb3d6636a8bc6481814837f6940e6ebdde0401406868b97a2b9e28b204ec9289b5a003d68d6c9e7dca44a1d74e62 SHA512 a7e4f2c53ec184ef13b72cd2eb8b2e7ef246577b19498e976eea9383d5c12ae389db444b87b35e57df2adf4a0e8c5c219f25ed357601d18a9d03a873b48b9658
 MISC metadata.xml 574 BLAKE2B db8aac55351f15190d9b71508268f26b12a781b3b4f0f6836a30efc954b46b71da496129a9641655db483730435b44a5c5283132521dc3cc93279c57735a1ba4 SHA512 c8116bf66155ffeb7ac8d68822559e18252210dae604b4984aa5e6a3fb7161d785cbd235dc6f656513b5bab326f6e579489245bcef9d0a5dfadc34d7477758fb
diff --git a/dev-python/isort/files/isort-5.13.0-poetry.patch b/dev-python/isort/files/isort-5.13.0-poetry.patch
new file mode 100644
index 000000000000..31baa2ec08f8
--- /dev/null
+++ b/dev-python/isort/files/isort-5.13.0-poetry.patch
@@ -0,0 +1,16 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index ae539490..11e229ad 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -41,11 +41,6 @@ include = [
+ 
+ [tool.poetry.dependencies]
+ python = ">=3.8.0"
+-pipreqs = {version = "*", optional = true}
+-requirementslib = {version = "*", optional = true}
+-pip-api = {version = "*", optional = true}
+-colorama = {version = ">=0.4.6", optional = true}
+-setuptools = {version = "*", optional = true}
+ 
+ [tool.poetry.extras]
+ colors = ["colorama"]
diff --git a/dev-python/isort/isort-5.13.0.ebuild b/dev-python/isort/isort-5.13.0-r1.ebuild
index 219f0a3f4657..83f18a7f3177 100644
--- a/dev-python/isort/isort-5.13.0.ebuild
+++ b/dev-python/isort/isort-5.13.0-r1.ebuild
@@ -39,6 +39,12 @@ BDEPEND="
 distutils_enable_tests pytest
 
 src_prepare() {
+	local PATCHES=(
+		# sigh, can't people just stop using poetry?!
+		# https://github.com/PyCQA/isort/commit/f7a6b0eea57e87155a367e2490b49b40f83c3944
+		"${FILESDIR}/${P}-poetry.patch"
+	)
+
 	# unbundle tomli
 	sed -i -e 's:from ._vendored ::' isort/settings.py || die
 	rm -r isort/_vendored || die
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index f3afa3b9826d..11f2d3b9570a 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -7,5 +7,5 @@ DIST pandas-2.1.4.tar.gz 4274800 BLAKE2B 71cd374964d5e751a9ea0b29cb341d7de521de8
 EBUILD pandas-1.5.3.ebuild 7202 BLAKE2B b881cc7535d5b4264516eb1f962ce2e463e6affebbcf4ba88d152913c1cc7c0e92788c52526ccbffae939edad198ad2fe424a48e1f961929ac630b146a8ff61d SHA512 55a7d902255ed5f8be8c31f2fa4e9df9aa73f20ca276914235e3022c57c0340291cd7e3668f155c6290864a5db70b1d77fd7ff42edb4f33ef07eb66ab98d89d7
 EBUILD pandas-2.1.1.ebuild 8640 BLAKE2B bbe6beafa3ad8f31bd18c9bc81974b881bf73c5c998d7c971cf4f8e97966c82d090b393eddc27ffc2d994fdab17eb7406a0752e5ff5ffb7601a6d92841ed8960 SHA512 2b900d7af96cd1842be557df89f44bf99e9e82e141a5b269e54027a1a588c53d91e2c13c6cb0fbaf4c36204078114ce497cd66e97445385eae5bd86daef10034
 EBUILD pandas-2.1.3.ebuild 8969 BLAKE2B ce3e49dcd527352a8bfcc6390d38d69857eebb7627561519d17a754cef5f275164849e2528fe9f662de6c45f5d736821d62cfb25cd62e68f07e35c28dce418b1 SHA512 2f31371bbcde6c6aad89abfb0c40c90853663468c974ed0e5de23d877a051bd713980ddf19133ef5336729a66ea01491d9c594b03a810122e66ae0291b03c21e
-EBUILD pandas-2.1.4.ebuild 9189 BLAKE2B 4a3f9326950bfe522c5fe05219c315736004077cccfb6b68d8b0e7dc0ff98c19bc4e83af3563ffc1fd08e98c71616569e55ab7363668f34b418310d8c5ce231c SHA512 d0e7458f0fb7435d1ea017d6c9e87a8e2c1b19623006c8769dca626039e6d45ae7edd635ef9d89bb56f29a774a838a7ebf10bd77f9e544619fad2f978246cd03
+EBUILD pandas-2.1.4.ebuild 9140 BLAKE2B f0594f2dcd6e410a131fc2873fd2b3b2faeb5efd9c0e468a7d70f9ab31b6bf34f643b0ff27cf907886bb123cc43af543873a762fa9e65e41f400731d40f6dcf8 SHA512 aae6cb18d97a1e6e90260d2509e91982c5b9ef8866bd2a71ffe4e73311bc5357392d99b002099190df60ef6065e97f718964161b7815c2cc4ad2dfaa468e0d66
 MISC metadata.xml 920 BLAKE2B d6bd854acdd851d578038657d91adaedf4f220dbdc5905ebba5e35e74437c6d5bc2384061f7796a6f359aa128c526485635debfd0e1a9646d09daed740167c87 SHA512 dcd949e89cae9df918acb3cf8be5ad8c396ee5e646d2179aa2b646fafa15ffc11e9ccf853df8d7fdcc787f88ce7063639d8d87715aaba943774edc8ad98b540a
diff --git a/dev-python/pandas/pandas-2.1.4.ebuild b/dev-python/pandas/pandas-2.1.4.ebuild
index f4a73c081111..ece487f69df4 100644
--- a/dev-python/pandas/pandas-2.1.4.ebuild
+++ b/dev-python/pandas/pandas-2.1.4.ebuild
@@ -84,7 +84,6 @@ BDEPEND="
 		>=dev-python/hypothesis-6.46.1[${PYTHON_USEDEP}]
 		>=dev-python/openpyxl-3.0.10[${PYTHON_USEDEP}]
 		>=dev-python/pymysql-1.0.2[${PYTHON_USEDEP}]
-		>=dev-python/psycopg-2.9.3:2[${PYTHON_USEDEP}]
 		>=dev-python/xlsxwriter-3.0.3[${PYTHON_USEDEP}]
 		x11-misc/xclip
 		x11-misc/xsel
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index c3b3d09ed77e..60830de9c055 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -3,5 +3,5 @@ DIST yarl-1.9.3.tar.gz 135606 BLAKE2B f73b41227c08c791442c4c96ec961bcdbc8078f720
 DIST yarl-1.9.4.tar.gz 141869 BLAKE2B 367eac4674bf1190122f10bb1dc1c4f3d5e4263e1d95ff2b871067d55a894dc19a6bb5a6c673d1bed28b3c5f77c704799568edfe639d50f0ae10313eb847352d SHA512 e4f7917f1625b40125abae9a13d61795f97e8cf489735e15cf58476e97c3bcf840b1452482f1f7a737fbb2bdd1dc7bbcfa882d0a7f76a27dfb3aea72b7a66c82
 EBUILD yarl-1.9.2.ebuild 1341 BLAKE2B 92bab115f3719bcd29a8b21ccaec6fc24247d4bfd0189de7e8cb234ac23198012311d97290bd579b32515a258959ceffed71ba0b22182bca568fdbbeed4eb142 SHA512 0518ba27b67a1d72b0557c978017ff6a4db5e3506851a1b4fc6906cbba954804701ce6f26feaf69ac90fc45c3d928117ee84bba546047ea23908ce2cc5eaa1a2
 EBUILD yarl-1.9.3.ebuild 783 BLAKE2B e7ce01ba896745aeec3af75a027fce4ccda457879ac54d8f151ae241ca8aef9118391e5fcb19457937de89776f0e9188ce01324f983d58cda904a811f2660ccb SHA512 66468700fdb002736b54be3380bfa9ddd4a2b10ac045f6fc5bf912d3bae6c82722295743305e3564c6fe65cd89fd4d9a9c6ea6b57eda7877fef5d0e82b9ee25d
-EBUILD yarl-1.9.4.ebuild 783 BLAKE2B 9d9f5da1b2d51667210f067f352774bb19dae4111d258e578936ef1457486ca668438a8fd58d1ed3ccaa1e4b2a101000487da27984316507227236523da913fb SHA512 6d76ab4f0d9cbe9c7c19f1975641f8e4c056490513e43f959f35b8646a4eacc1e4bb5feb96a1f8a2a40a2eb88cd0e99bd8352d8174822dc8d78f8a13b96c8e97
+EBUILD yarl-1.9.4.ebuild 782 BLAKE2B b14e894b969f9da45740fc48a7f3167d5a09b699da6e8680426d65297a131f2fc923d7b22bb65920ad4123de0b3498fb8e4cee2c302c55b4d4d8d1bc0a676add SHA512 aff8c56ef4180ae5e2a001fc254f2054aff0b812ecb4e0cddab63b886e271406d052c521796e8423f53389967ab3f929ccf7b20bcdb1f3221ce50244af2c9955
 MISC metadata.xml 440 BLAKE2B 10fd0e37c9be76c5d1dd90b9fd1cb1e5161fc5a7d2b51bcb5658a8c187a67d5f9573241733c3f9570e9fb7767bf84b38a6f8b2c212596627bea4e1686b7eb41e SHA512 c9e340124ed93cb0d52a0ae5abd43c10528197893c3d5ab57a0eb7046ebae5b80119f7b033d6697110c4bc064c0a8581d904788f6969cb52a433064067898cbe
diff --git a/dev-python/yarl/yarl-1.9.4.ebuild b/dev-python/yarl/yarl-1.9.4.ebuild
index b574735b95fd..6f6467382df3 100644
--- a/dev-python/yarl/yarl-1.9.4.ebuild
+++ b/dev-python/yarl/yarl-1.9.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 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/multidict-4.0[${PYTHON_USEDEP}]