Adding metadata

38 files changed, 415 insertions, 878 deletions

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 2d59355cad2c..def08df75028 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,9 +1,3 @@
-DIST boto3-1.28.53.gh.tar.gz 702652 BLAKE2B 6a64fa2c018000a6b89f47a49eaf0270a2f694f02720c0e0527b5ce671bf3ad195f40fa592829bbe9a3b30ede56fd335a81bb30f862bfc6992883dd86d6b9a75 SHA512 750d4905625b207d05842950349eeadaef9bbb413adfc8096998292edeec8985c5488c565f3b5b6f5a00354e69f3071ad1491428b1f894be2b40b23db767be36
-DIST boto3-1.28.57.gh.tar.gz 705839 BLAKE2B 5d536c8465de64b7a0dfff909325d719d6d36f0bf531b14211dd45f4539170e8b0c78ae1ba111028d6273d6453f4087b2de7a7b62ad6b1da115281b87d99b248 SHA512 b5277a0c03a57147e9d0cf05800b1f30059151dc019045dbaa91a36f6cd0c08b21bd4dad25d4359d594379f84b8f862e1dde306382a3cdd6070eaa300dcfd23b
-DIST boto3-1.28.61.gh.tar.gz 711460 BLAKE2B 7710c97ecb3e968a302abc9645488a470fddca01216b95ee944895d3e08bbd6b89d813068f1a14b5cf5c2dcfae7c2c816d63b05df9f95276e9966e7143192c2c SHA512 03b252e9a59302c0ea9b0e790541bbf0e15fbbc3e37bee987a8c85dcc8ac252575bddca46003773a00105e7c7ffbac4a7cc95f6ee54dbac550533474f6d952bc
 DIST boto3-1.28.62.gh.tar.gz 712305 BLAKE2B 1d61f857143f9471a254e035cf532cab38699262b116ccc40e922005bf90ca64a33b7aa7f64df8b0641f58e250d9b6000977a50be10e5ebe93dcbf54148276b7 SHA512 f13d8f812caa650d877ecb3ae72a47ed6f93dfbfede62588266909917a1af6c8c446dbefd130d39f9a5dd156e1b9eca96a0ae084bfbadf926cdcfabfc255633c
 DIST boto3-1.28.63.gh.tar.gz 713769 BLAKE2B f2e300458934893bb6d2186e900c4ba9abbd51d2ffabdbcd3026394315653e64fdc486f3ed4e33b26bef160b00e75acea875278eab03b4eeb50b5ecc94d4c0fc SHA512 782c7bb48af31638899e8bcf8fc87f67ab793fe724392be90951ece61b165f55d1df47585bd5211d7ecf3c989e5316ff9db774c8f0f357d1afc2af3ca0e49879
-DIST boto3-1.28.64.gh.tar.gz 714823 BLAKE2B b051c57d2852699d2c18472629934b97e76f30b1e6e0f398fde113771146cd65f8042bb8622884294fb802424b7beb498648d558f6d5cfc3dd48b1100dafc2d2 SHA512 ca0042e173c4a35dc9d6ab8ed362d3308753d3722bb4cf25302fd0018c5d94e66a2ea288610192ad5a353ca54f0ab8f1942224269935b1fe3444b2e70842da13
-DIST boto3-1.28.65.gh.tar.gz 715573 BLAKE2B 24cf962b2b9e5c52f0e8d86e9acd730c4fe48bd7634ac65ccdf344985e82c51af05ff10f903cbde5048e8510adc5a83992cf2ad4ddf880435c121b20f981a6f6 SHA512 ea8ff1b72b5b8db00c959abf522a7aaf53bccf9b1e06f8ce70052cc752d18b73a8bc75d6bd97bd0740acac5bf3fd68f6fa39fc8aa084128291940c93d6745bf1
-DIST boto3-1.28.66.gh.tar.gz 715939 BLAKE2B 4fda459ac4b066eae30a9f12ea53f2842dff2e4055cac8462ce147cbf2a77d4283ce6d814cefd0ecaff609d3b9401fe9216a1f54d464d2a1d64514ffebbc8352 SHA512 e44a59e124cac7d817a8fcc09004b557387369d5d02e55675e3ef5345a54f1ec5b60dc9558e1a1ae778841dbe7c4d29f27ca8ff066128c351349109d6f95aeab
-DIST boto3-1.28.67.gh.tar.gz 717144 BLAKE2B 6d09aaf4974ea022e2eece1ff6287f9fbc9e8bc3befafe6a0590521e2ba87954e94ac3ed9a38469d84e5f37cc36e2355546d6f391acb674223d47527bea4b214 SHA512 d4390d0e60f1f2a4cdaff660e2a4f13f65ae12a3e5b4db181cb34c0766874875fff068221bdf9bdcc63506fab2ebb6f74c016d10b088ace611f8876db88121be
+DIST boto3-1.28.68.gh.tar.gz 717553 BLAKE2B dd8ba562613456e30c0f8bfe2f3befa9601b091dacf1c19c6153ee98b81c74ed63ea1b54ce5cccfb5bcf0d67386d593276bcdd86ccb56083b54d5905042856cf SHA512 714ff8cbd52d8775bb1fc44792e21d4a93c951b9adc4ac09bacef4df2fabf0af7896edf19b6f3bd3cd9872efab1fe20f0cb07eaca51f688024a3a18515c5f371
diff --git a/dev-python/boto3/boto3-1.28.53.ebuild b/dev-python/boto3/boto3-1.28.53.ebuild
deleted file mode 100644
index 05809dd7133e..000000000000
--- a/dev-python/boto3/boto3-1.28.53.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_{8,9,10,11,12} )
-
-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_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} \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/boto3/boto3-1.28.61.ebuild b/dev-python/boto3/boto3-1.28.61.ebuild
deleted file mode 100644
index fc1e40c08394..000000000000
--- a/dev-python/boto3/boto3-1.28.61.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_{8,9,10,11,12} )
-
-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.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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} \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/boto3/boto3-1.28.62.ebuild b/dev-python/boto3/boto3-1.28.62.ebuild
index fc1e40c08394..f63c002a6083 100644
--- a/dev-python/boto3/boto3-1.28.62.ebuild
+++ b/dev-python/boto3/boto3-1.28.62.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.28.64.ebuild b/dev-python/boto3/boto3-1.28.64.ebuild
deleted file mode 100644
index fc1e40c08394..000000000000
--- a/dev-python/boto3/boto3-1.28.64.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_{8,9,10,11,12} )
-
-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.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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} \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/boto3/boto3-1.28.65.ebuild b/dev-python/boto3/boto3-1.28.65.ebuild
deleted file mode 100644
index fc1e40c08394..000000000000
--- a/dev-python/boto3/boto3-1.28.65.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_{8,9,10,11,12} )
-
-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.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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} \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/boto3/boto3-1.28.66.ebuild b/dev-python/boto3/boto3-1.28.66.ebuild
deleted file mode 100644
index fc1e40c08394..000000000000
--- a/dev-python/boto3/boto3-1.28.66.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_{8,9,10,11,12} )
-
-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.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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} \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/boto3/boto3-1.28.67.ebuild b/dev-python/boto3/boto3-1.28.67.ebuild
deleted file mode 100644
index fc1e40c08394..000000000000
--- a/dev-python/boto3/boto3-1.28.67.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_{8,9,10,11,12} )
-
-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.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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} \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/boto3/boto3-1.28.57.ebuild b/dev-python/boto3/boto3-1.28.68.ebuild
index fc1e40c08394..fc1e40c08394 100644
--- a/dev-python/boto3/boto3-1.28.57.ebuild
+++ b/dev-python/boto3/boto3-1.28.68.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 82736ee2f528..7b0e03a53409 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,9 +1,3 @@
-DIST botocore-1.31.53.gh.tar.gz 11950545 BLAKE2B 2fef49b98179046203470c6dc145b13a1ff4ddec4eb3ac0bc8f9668b4d7ef9dfdee096f91abb8ede1e1abfffe55f72c9c38c63587b79082a2de7de84e4c9f273 SHA512 2c4d9761ee3cc8b73e60de3388475c64cbd562efd8265a098ba49731751d2c501167d84b010984a0dd738bb1e71a85db6f86aea68c86e9db5ed8613304570529
-DIST botocore-1.31.57.gh.tar.gz 11899280 BLAKE2B 047cba5850b024dd4070346eb2c635696f9684a38ea458357c934295e86d33b65e3b9f8e98e5fa96d2f0ba18c68bfc970c1fe7ad13bbfc0e83ede4ae4b6dbb88 SHA512 512bfd31a3534213977f6d05cf8603222e9517cc0d95cdf0fa3c9f9565f0f08cb7e646830a5d5093df7ca5b84c82db2887648e7b7cf47411486c664c730963d9
-DIST botocore-1.31.61.gh.tar.gz 11959525 BLAKE2B 27797d055bf54b91b5eeda7a41baddc9d2def1952109a7a4a48def20c6f1ffd36d8c316ea4624cfea96a8a3e58ee7f463491b157103e9ac40c6214295fd4b823 SHA512 7045d0fcacd80f531f29f6ba3a91dc390d6cb562ecdff4d1bc99e96191f743a7f08cda6699455d658ee21e6798e38abea730653779de5d6b489b8c1637b9d5b1
 DIST botocore-1.31.62.gh.tar.gz 11961556 BLAKE2B 315a1ba1543ba5b92c0a0394a4a21b124a9435e660daef43164cd61ce0b5924c6ba9fa82e41c32b4ae7f0e89783abbe107abf11c807e81a3cb2f883352935053 SHA512 ba13c945fe9308bcc053d459b8934ea358e734b3079620ceb4d4df8274426f349a0ff26190d45275ca05588d48c692338c2dbdbde5122fdda79556af64cfb6c8
 DIST botocore-1.31.63.gh.tar.gz 11975759 BLAKE2B 3e757c6303f3390d3d563187c47140042d09271b16022a7a633bf68dc7188d42ac5a73838d2ae0556c8eec63296bb3f3b3f1011889fa7c10d660654695cd70f1 SHA512 39f1b6cb5c61a55a6f01e41750f651baf16c6d66e0b9e30cff042f54d03c0e862ab91a8f918257df8da678b13e732c68e887b21aa00006778bafad5361f4edd2
-DIST botocore-1.31.64.gh.tar.gz 11983429 BLAKE2B 636f0c394a3af8bf174f992444e3e352893f3e8cf11e9732a6e73af3f155b638e9ee3060617bbf184b5872768257ad81aa95379b48452a1fe8a6bc100f601074 SHA512 375b406eb16f93d0ca9631fe9943959d24b62ac579b70f0782f6b386933fb3de25343c05bda7667c441c050ccd10c9c5a254bfd8a620610adb7669ed326a0203
-DIST botocore-1.31.65.gh.tar.gz 11988384 BLAKE2B 38c563e13e4205af8f41622eb0715ae11ac2214979d367894afc75a872e2d2d38be57f8b8a10efcd847bc8751b09e5d4394f21aa8bf4358d8ec55888adcb68d9 SHA512 1919efbf6d807a23d33050c7d306cc63bf85f088b84b6ea18a58b40eb0acec4e2bb6acd3150bd7b2939bed594cfc3fa681c094b35b8ca049ef2299c60502c3d0
-DIST botocore-1.31.66.gh.tar.gz 11990356 BLAKE2B d7cd9963a5911bd14efe10fc44bd723c353f1f1dba92ee201f7bd93c304d6ead63cdcfd2811636b3b5a40b1b4b803391f409093077c273e251de24727d60ee19 SHA512 133ddb2350c350808b553c9d778f2d9f7a5ac3837b94b9475bccdba1f1c90365d4e85f92630d75f2afca865b56ad320eb995ebed23b4a5207f4aa2230eb9636b
-DIST botocore-1.31.67.gh.tar.gz 11987709 BLAKE2B e979d458be428a844978980d4da616df031df579a2cccee848a0b9f54aef8f3589b94cbff27f012aa0da7b847b7cb5bf944366e6d9a5daa975e3c7d1833a0c69 SHA512 1a5cbab845399e738f2c66862aff4b488e25f47bbf97b93d81b9c3586b6f295dd84a9564a07d538672bbfed9df3ab1f9cbc1ed7fcd24c08d6fcd9262e6b88c8e
+DIST botocore-1.31.68.gh.tar.gz 11989788 BLAKE2B d8d34511e3ef65f54e1b305cf60cdb98e43ed7f773da2d84abd2ba45277d0f244080dd9b86fb5ea75a1af3820f27e4255f5f78bf67415e18cff2be30cc625bd4 SHA512 7ec8bd1e2036f17dbaeec4b65e6100c0b5c163f3e05d7e4723f7f1bac75d561f1a2d76331021552cb08093c6e85858e6a76cb9846114adf9deacf97dd94135a0
diff --git a/dev-python/botocore/botocore-1.31.53.ebuild b/dev-python/botocore/botocore-1.31.53.ebuild
deleted file mode 100644
index 93c55a006738..000000000000
--- a/dev-python/botocore/botocore-1.31.53.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_{8,9,10,11,12} )
-
-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_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} -p xdist -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.31.61.ebuild b/dev-python/botocore/botocore-1.31.61.ebuild
deleted file mode 100644
index 9588357367ec..000000000000
--- a/dev-python/botocore/botocore-1.31.61.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_{8,9,10,11,12} )
-
-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_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} -p xdist -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.31.62.ebuild b/dev-python/botocore/botocore-1.31.62.ebuild
index 9588357367ec..93c55a006738 100644
--- a/dev-python/botocore/botocore-1.31.62.ebuild
+++ b/dev-python/botocore/botocore-1.31.62.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.31.64.ebuild b/dev-python/botocore/botocore-1.31.64.ebuild
deleted file mode 100644
index 9588357367ec..000000000000
--- a/dev-python/botocore/botocore-1.31.64.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_{8,9,10,11,12} )
-
-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_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} -p xdist -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.31.65.ebuild b/dev-python/botocore/botocore-1.31.65.ebuild
deleted file mode 100644
index 9588357367ec..000000000000
--- a/dev-python/botocore/botocore-1.31.65.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_{8,9,10,11,12} )
-
-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_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} -p xdist -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.31.66.ebuild b/dev-python/botocore/botocore-1.31.66.ebuild
deleted file mode 100644
index 9588357367ec..000000000000
--- a/dev-python/botocore/botocore-1.31.66.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_{8,9,10,11,12} )
-
-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_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} -p xdist -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.31.67.ebuild b/dev-python/botocore/botocore-1.31.67.ebuild
deleted file mode 100644
index 9588357367ec..000000000000
--- a/dev-python/botocore/botocore-1.31.67.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_{8,9,10,11,12} )
-
-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_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} -p xdist -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.31.57.ebuild b/dev-python/botocore/botocore-1.31.68.ebuild
index 9588357367ec..9588357367ec 100644
--- a/dev-python/botocore/botocore-1.31.57.ebuild
+++ b/dev-python/botocore/botocore-1.31.68.ebuild
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 0827dd0e64bf..49122fba3815 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1 +1,2 @@
 DIST cbor2-5.4.6.tar.gz 86909 BLAKE2B df24c786f32819f9a93a2db28536b78349db6185108188d0a20e7298ff8c083d1feb59110865b4e21190e0363b113201ccddaa0d36b49bd7bbacf9d5ee7695f4 SHA512 44fb3e2e2249c79b1454487670d53eb672ffae4c22374d2a2bb9e314ac15470e4e7913e4eb1981a8bd4d722e6827328dde7e57c5f0556843e951c4723ae5bd8e
+DIST cbor2-5.5.0.tar.gz 94286 BLAKE2B 01c3659c161d47b3e0fa5c9e8833989e448b60d40f408f8c9ebde0a4e3d388dd047aea1666a93f3bb4be1e49695a4089e869d658b594456839c71e2bfe17cb29 SHA512 64b9ef0e358ac02113f85a2e633ed52900c4d5d6c89f889d9322f181e29fbdf9462663b5eaec7a255d5e6d47c82c4902cb7ff56999251c5ec070c7b610e615b3
diff --git a/dev-python/cbor2/cbor2-5.5.0.ebuild b/dev-python/cbor2/cbor2-5.5.0.ebuild
new file mode 100644
index 000000000000..40cfb90674c1
--- /dev/null
+++ b/dev-python/cbor2/cbor2-5.5.0.ebuild
@@ -0,0 +1,46 @@
+# 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_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
+HOMEPAGE="
+	https://github.com/agronholm/cbor2/
+	https://pypi.org/project/cbor2/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+native-extensions"
+
+BDEPEND="
+	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e "s/--cov//" pyproject.toml || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local -x CBOR2_BUILD_C_EXTENSION=1
+	# pypy3 not supported upstream
+	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
+		CBOR2_BUILD_C_EXTENSION=0
+	fi
+	distutils-r1_python_compile
+}
diff --git a/dev-python/cbor2/metadata.xml b/dev-python/cbor2/metadata.xml
index d3d03e766940..96ef1e2ff0f3 100644
--- a/dev-python/cbor2/metadata.xml
+++ b/dev-python/cbor2/metadata.xml
@@ -22,5 +22,11 @@ Python Standard Library.
    <name>Brian Olson</name>
   </maintainer>
  </upstream>
+ <use>
+  <flag name="native-extensions">
+			Compiles native "C" extensions (speedups, instead of using python
+			fallback code).
+		</flag>
+ </use>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index b5ce88b5c535..c4d06f27e148 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -1 +1,2 @@
 DIST debugpy-1.6.6.gh.tar.gz 6942488 BLAKE2B 18c6eee2322239e5cbbacf9431fa7480abcf14a68f290d2228edc8b2ead042e7b09d19ee5bcc60be32e8a6b0b34b925eaa8246991298744f3ca74d4ed2ea3f3e SHA512 1a209bfd702d5f0649ce50b0910023e295953dd39cefdefb0b5af1d6023e629a727610789cd244e656bdf4276cee957fa463506ddaca603ab3ee85cc250dc212
+DIST debugpy-1.8.0.gh.tar.gz 6760323 BLAKE2B 99c4188c0b0383dc4dcbdd86c4d35e6eb973ca32ba56b757adea9668b161f20f17b436e0dc019790b1e85586387fc848712143c5e3d3814e2522850d97a4048e SHA512 f9e47371ca854c12811d1c0984f063b1ad5cac2bea769f91a67f9fa125cfcbeccbecafca9b9d5ea16a4ed8a1c123f34db3ba19efe1567b93a86cbd325239b355
diff --git a/dev-python/debugpy/debugpy-1.8.0.ebuild b/dev-python/debugpy/debugpy-1.8.0.ebuild
new file mode 100644
index 000000000000..253674b7d554
--- /dev/null
+++ b/dev-python/debugpy/debugpy-1.8.0.ebuild
@@ -0,0 +1,66 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
+HOMEPAGE="
+	https://github.com/microsoft/debugpy/
+	https://pypi.org/project/debugpy/
+"
+SRC_URI="
+	https://github.com/microsoft/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pydevd[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Unbundle dev-python/pydevd
+	rm -r src/debugpy/_vendored/pydevd || die
+	local PATCHES=(
+		"${FILESDIR}/${PN}-1.8.0-unbundle-pydevd.patch"
+	)
+
+	# Drop unnecessary and unrecognized option
+	# __main__.py: error: unrecognized arguments: -n8
+	# Do not timeout
+	sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_DESELECT=(
+		tests/debugpy/test_gevent.py::test_gevent
+		tests/debugpy/test_run.py::test_custom_python_args
+		tests/tests/test_timeline.py::test_occurrences
+	)
+	local EPYTEST_IGNORE=(
+		tests/tests/test_vendoring.py
+	)
+	epytest -p timeout -p xdist -n "$(makeopts_jobs)" --dist=worksteal \
+		-k "not attach_pid"
+}
diff --git a/dev-python/debugpy/files/debugpy-1.8.0-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.8.0-unbundle-pydevd.patch
new file mode 100644
index 000000000000..54ccdae4ca01
--- /dev/null
+++ b/dev-python/debugpy/files/debugpy-1.8.0-unbundle-pydevd.patch
@@ -0,0 +1,46 @@
+diff --git a/setup.py b/setup.py
+index 0bb4f00..abfce1c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -18,12 +18,10 @@ del sys.path[0]
+ 
+ sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))
+ import debugpy
+-import debugpy._vendored
+ 
+ del sys.path[0]
+ 
+ 
+-PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")
+ DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))
+ 
+ 
+@@ -146,8 +144,6 @@ if __name__ == "__main__":
+         extras["platforms"] = platforms
+ 
+     cmds = versioneer.get_cmdclass()
+-    override_build(cmds)
+-    override_build_py(cmds)
+ 
+     setuptools.setup(
+         name="debugpy",
+diff --git a/src/debugpy/_vendored/force_pydevd.py b/src/debugpy/_vendored/force_pydevd.py
+index cfd8927..0cb1bca 100644
+--- a/src/debugpy/_vendored/force_pydevd.py
++++ b/src/debugpy/_vendored/force_pydevd.py
+@@ -8,15 +8,6 @@ import warnings
+ 
+ from . import check_modules, prefix_matcher, preimport, vendored
+ 
+-# Ensure that pydevd is our vendored copy.
+-_unvendored, _ = check_modules('pydevd',
+-                               prefix_matcher('pydev', '_pydev'))
+-if _unvendored:
+-    _unvendored = sorted(_unvendored.values())
+-    msg = 'incompatible copy of pydevd already imported'
+-    # raise ImportError(msg)
+-    warnings.warn(msg + ':\n {}'.format('\n  '.join(_unvendored)))
+-
+ # If debugpy logging is enabled, enable it for pydevd as well
+ if "DEBUGPY_LOG_DIR" in os.environ:
+     os.environ[str("PYDEVD_DEBUG")] = str("True")
diff --git a/dev-python/hvac/Manifest b/dev-python/hvac/Manifest
index 37b09f3aeea9..7739b25d23a6 100644
--- a/dev-python/hvac/Manifest
+++ b/dev-python/hvac/Manifest
@@ -1,3 +1,4 @@
 DIST hvac-1.1.1.gh.tar.gz 317494 BLAKE2B 3a6849a1f41a8e45f436baae3f5e2ba400c4b7cc49b253eca1741d8685d0499a9cfd42d3eaaac330ac949f64b6e9dc66d209df0efe2e9248b5750eedecca924e SHA512 f5de49b33c257ccfcdc662ed269e843d3f76912bc2e773663e72c8425d1ccc317cdc137dc7bb978e0e966bc6248f34953306fc919fba2cc8f97f0a695b5daf2b
 DIST hvac-1.2.0.tar.gz 310344 BLAKE2B be81cfb9b2632da9146ef9153017e478e121a908bfb7a4838169f0a1984b91fe29d9efeb887352e02244136ba96c1ae98618de88ecc238f2f1a6cf2d46b45401 SHA512 61fee19dae22661c8c9aac56656b3038083ff6487773ea7fd62cb9655b55f8aaf60d40760125179c790a02323ea8711829261969695459c67834c4bdd315312d
 DIST hvac-1.2.1.tar.gz 310371 BLAKE2B c7d0f10b7721035d1e474d4d5aeab636c2475b5532e2ef79be1f7e1f5e854363f56fcf8c46ace3b10725fca029d2da0358af321c37842696b6ab5010c481eb58 SHA512 17d0bb485714e85937dc74a96530a921767efb7f10facb211d68e9e0bb39477ca105bdeafbe9979a390d05a6af66a8aabbf1ada75b391bea8e091a62ad1a49bf
+DIST hvac-2.0.0.tar.gz 316473 BLAKE2B 72da5325e560ff07a08296403d1b9c8182d2b75ed1b1d5b33474d95816ccc735306b2d7a4489d3c40a975915ea69be9afde4e0291ce2a5e7c22f0b3e074093ff SHA512 ba9114005e3610146fe69d3739daf36fd0b83cd22f5d89546dd7a7b43e9b1b704ce544b6d2ca3c0b93fd309587076266786ab81bde3dc4209a44ee4456eb8f35
diff --git a/dev-python/hvac/hvac-2.0.0.ebuild b/dev-python/hvac/hvac-2.0.0.ebuild
new file mode 100644
index 000000000000..980c6156c317
--- /dev/null
+++ b/dev-python/hvac/hvac-2.0.0.ebuild
@@ -0,0 +1,44 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="HashiCorp Vault API client"
+HOMEPAGE="
+	https://github.com/hvac/hvac/
+	https://pypi.org/project/hvac/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	>=dev-python/pyhcl-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/jwcrypto[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/semantic-version[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# ldap_test is not packaged.
+	tests/integration_tests/api/auth_methods/test_ldap.py
+	# https://github.com/lepture/authlib is not packaged.
+	tests/integration_tests/api/auth_methods/test_oidc.py
+)
diff --git a/dev-python/nh3/nh3-0.2.14.ebuild b/dev-python/nh3/nh3-0.2.14.ebuild
index 90bcaa8de54b..23d508ccd836 100644
--- a/dev-python/nh3/nh3-0.2.14.ebuild
+++ b/dev-python/nh3/nh3-0.2.14.ebuild
@@ -92,7 +92,7 @@ LICENSE+="
 	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pytest-skip-markers/Manifest b/dev-python/pytest-skip-markers/Manifest
index 37ed6f7dbc5b..fff547d386cc 100644
--- a/dev-python/pytest-skip-markers/Manifest
+++ b/dev-python/pytest-skip-markers/Manifest
@@ -1 +1,2 @@
 DIST pytest-skip-markers-1.4.1.gh.tar.gz 71828 BLAKE2B 2abd097c529a6db51f36de6f5ac705da981e87196da4ccf99895b24277e9d4d717c80ebcf6b8d72959b7f76a10f23c2be11608c390845cca215472d2d4e99326 SHA512 c54cd2cafbe29648cfeccc2dc25b245e2e1a226ca6eb9e1c77e6aeb705e06c4b67854dd81673955fb77e16d1128c247d92d38d19dbedbdf01924a95c01721f3c
+DIST pytest-skip-markers-1.5.0.gh.tar.gz 73142 BLAKE2B 26575a1a7880714b3af4fd7b02b5c5d56b99e0ad0947012823e6c917afe7ca134e930f2bf75b3504fe3fd1516d39e82acd7dae799255b30c370ae085d0cff402 SHA512 217fae64013a0d0f4b91d33a22576df9dece1bdda28beda0919e3638ed6cddcf24715971fb1da8e8c62df50510c969ce24716044d6aa05f8a0b4891082e83584
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.0.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.0.ebuild
new file mode 100644
index 000000000000..f2d16f899ed5
--- /dev/null
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Pytest plugin which implements a few useful skip markers"
+HOMEPAGE="
+	https://pytest-skip-markers.readthedocs.io/en/latest/
+	https://github.com/saltstack/pytest-skip-markers
+"
+SRC_URI="
+	https://github.com/saltstack/pytest-skip-markers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-7.1.0[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytestskipmarkers.plugin,pyfakefs.pytest_plugin
+	epytest
+}
diff --git a/dev-python/readme-renderer/readme-renderer-42.0.ebuild b/dev-python/readme-renderer/readme-renderer-42.0.ebuild
index 5c3213132953..de458639ee8d 100644
--- a/dev-python/readme-renderer/readme-renderer-42.0.ebuild
+++ b/dev-python/readme-renderer/readme-renderer-42.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index f56105d44f40..a975db8ea5ec 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -4,3 +4,4 @@ DIST ruamel.yaml-0.17.34.tar.xz 190824 BLAKE2B e396b59f94a18e77e7bd3d42cc8f934b8
 DIST ruamel.yaml-0.17.35.tar.xz 191432 BLAKE2B 7fe4a44aeebe4e82202277139056f4046c6c7636b75c77202fd3bd4d71b3276890bd4ea30997c3acc634f0a8f7e482f4c81145749e1e37ac59ad53421aaa518a SHA512 4f5218b8ad9172a925e29e0b46d055b6b6dc57b9685a31e7e4147d1f7bcc908c73a05a350fd6d85016ea4d8bde13705e5f8d5866aa9087a34e3f648ff0460311
 DIST ruamel.yaml-0.17.36.tar.xz 193148 BLAKE2B 20c7389b29a34a917049c1ef1081ac7d349608435b2bdea03a390a6db979feefe1a1926db73bdee4cff100c605fa594c65ee23c64a0db45ce8230745d10945da SHA512 dce0cefec0b89cfb48d2124e2f18d4dbd9d67cca1af2cb556c308548f25dba932b129e62d3b5b666bfbed52838e0e16e3e4ae549689155b6314667d565b7bae2
 DIST ruamel.yaml-0.17.39.tar.xz 192916 BLAKE2B 23553af89c3083837a54805097c2c59eb2bff96e200acd12fcc646bf346eab20d87f58e6c9553598615a750d408dc855886fe4251ba128e3325cecb953f18275 SHA512 ee534cff9a6b72b617faf3fb4044bff0ae2d3c29508ef8df948774db45d39c8f80362f7ed8c8091319718a221b9d462838d521d97603d9cb18c38a008ebec8e5
+DIST ruamel.yaml-0.17.40.tar.xz 193424 BLAKE2B 80405ef0c85af476ef0e996b1da5aba1a116e8c181d18f40fb4fd86093a512c09cf0da30d52d85946c524e86e10379cb11154cb08a7ea7b054ba9379996de4f4 SHA512 848af49430b9c028a6676a159915c66e29f4290374ba0863e4fd87527f3178bb303a80f4ba97139fc8cbcd01f7f7782a4b3112325237a39659e227afda61fcb8
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.40.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.40.ebuild
new file mode 100644
index 000000000000..36154d7811ad
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.40.ebuild
@@ -0,0 +1,58 @@
+# 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_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="
+	https://pypi.org/project/ruamel.yaml/
+	https://sourceforge.net/projects/ruamel-yaml/
+"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
+	!dev-python/namespace-ruamel
+"
+BDEPEND="
+	test? (
+		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		_test/test_deprecation.py::test_collections_deprecation
+	)
+	local EPYTEST_IGNORE=(
+		# Old PyYAML tests from lib/ require special set-up and are
+		# invoked indirectly via test_z_olddata, tell pytest itself
+		# to leave the subdir alone.
+		_test/lib/
+	)
+
+	# this is needed to keep the tests working while
+	# dev-python/namespace-ruamel is still installed
+	distutils_write_namespace ruamel
+	epytest
+}
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index 8be45d7717df..b35561073eee 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,2 +1 @@
-DIST s3transfer-0.6.2.tar.gz 132821 BLAKE2B 0441b1270adbddcabcff6a6a62128d753d6faa50f590bab4d41ebb2e89aa27c40e2036d8fd7ae59392838e79b0d8b740423cb9d585361e85433f62415978487b SHA512 2f52621fac81a9209f5d4bcfad0a861906e714d0159cb3776f5fbc1e9a4946072d4c4e969dfea2837c600ce1d0ba55c53c6c892b59950f0b910b29bdf9ab0cca
 DIST s3transfer-0.7.0.tar.gz 132904 BLAKE2B cdb1315d4c6ca2ae36199f3a7c0796a1460c07d9b3c68c47f94fea99082ba9136fd13904908e477af84fdeec1ee45e35993612734dd66e989e28706c80f893d4 SHA512 93a0ee7fe607796b7d78319897465e09bc1b0a8dd430b7f13997cbecb54922edb9db7eadbd663a9b65c66d10ef19bc6bd876c51f73349cf377ef02febccffdb0
diff --git a/dev-python/s3transfer/s3transfer-0.6.2.ebuild b/dev-python/s3transfer/s3transfer-0.6.2.ebuild
deleted file mode 100644
index 4a90ae1d0b9c..000000000000
--- a/dev-python/s3transfer/s3transfer-0.6.2.ebuild
+++ /dev/null
@@ -1,43 +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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="
-	https://github.com/boto/s3transfer/
-	https://pypi.org/project/s3transfer/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-1.24.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# 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_src_prepare
-}
-
-python_test() {
-	epytest tests/{unit,functional}
-}
diff --git a/dev-python/scikit-build-core/Manifest b/dev-python/scikit-build-core/Manifest
index ae87c7929ef6..95dc9e7d9405 100644
--- a/dev-python/scikit-build-core/Manifest
+++ b/dev-python/scikit-build-core/Manifest
@@ -1 +1,2 @@
 DIST scikit_build_core-0.5.1.tar.gz 179718 BLAKE2B 31cd974a3deec188dc97ca708a04badfa8d75a0e66e85a2a814816bac126921aa5531f4f0de56f93a264b98edd341498298e1536502506d7b47ff40ca8bf92da SHA512 de7dd843a7979615a1421bc9ea6c0fde40b72ed94209783f176a5fb427a9fdee497a69e891441591d65d06a3ea619c4c67c9314cf0b7622d19cd88c149b43c7b
+DIST scikit_build_core-0.6.0.tar.gz 189359 BLAKE2B 8c2a3028b34c6dff1daa33476d87b42c80762f0f6ec2bea4e5358e573330fb5b3f470ba9c79ba662126df3950779c1f4cd67eef51c571940baa396f47e7d5679 SHA512 11841ecc2035decdbb5538235f3d1ec75afc6611de2336d6ed5b762677988223723f58b18f4c6ffaa11c47e3bb2e28f3a0fb7c41d3e68a738b039add42f9729d
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.6.0.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.6.0.ebuild
new file mode 100644
index 000000000000..d12923975576
--- /dev/null
+++ b/dev-python/scikit-build-core/scikit-build-core-0.6.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Build backend for CMake based projects"
+HOMEPAGE="
+	https://github.com/scikit-build/scikit-build-core/
+	https://pypi.org/project/scikit-build-core/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# we always want [pyproject] extra
+RDEPEND="
+	>=dev-python/packaging-20.9[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pyproject-metadata-0.5[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/exceptiongroup[${PYTHON_USEDEP}]
+		>=dev-python/tomli-1.1[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		>=dev-python/cattrs-22.2.0[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		>=dev-python/pytest-subprocess-1.5[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO / we don't package validate_pyproject anyway
+		tests/test_schema.py::test_compare_schemas
+	)
+
+	epytest -m "not isolated and not network"
+}
diff --git a/dev-python/sqlglot/Manifest b/dev-python/sqlglot/Manifest
index e18f33070051..5c093df431b4 100644
--- a/dev-python/sqlglot/Manifest
+++ b/dev-python/sqlglot/Manifest
@@ -3,3 +3,4 @@ DIST sqlglot-18.13.0.tar.gz 8873766 BLAKE2B 4dfe6d3d6332bedf13229d2820a12ead44ff
 DIST sqlglot-18.14.0.tar.gz 8880297 BLAKE2B f5036816e165ca8f6d65ed21db618b216444578b5a0d403f4674d878a02fae6d9dfc5ce67cef3398d040f4cc44eaff7e5f62bcb1521f244a1fa5b9b127dd666a SHA512 1da34636a92238c0cf67230da3fb5551bd6b9e2a252f252e8fdb0a0b237c7bea2435ecd2852f66a4427628445b25ffe78cd86b46f3939a798612f72efd884148
 DIST sqlglot-18.15.0.tar.gz 8888074 BLAKE2B 22082ddd15eb6245c05495b4202e9fab5d3ab1085cc74139a5ba3f909fbde1487e2cd9501bb218efe9e72748e8b2f7d04a247e357c27e6a9027169b809fe7136 SHA512 25df8fdf1ba2e2022ed82ba7d7a6f2c861b96cc5e440bf23488b75f861ee93504ad1d706cd88cdb74a652070c328abe52e4790cc4020059f27129720c0fa4be8
 DIST sqlglot-18.15.1.tar.gz 8895777 BLAKE2B 7aa5d7269c2e9d17ed68130d0129cc0a5abcd101a28ce5b85f5636dfa215934309cf7bf2d56ab6c2a819fe1a6128cd33355b39b29f76db32f84ea88034098502 SHA512 487646147ed2084c54e93326ba8df0225ae26e780e1ed3375f3eb2fc7fc6c82f0a4bf41a1967ce7719df1bd92b09b0fc175cd70659fe692507b6bfc4eafe6791
+DIST sqlglot-18.16.0.tar.gz 8929202 BLAKE2B e47a86345eb3ff2422d45171fddda2ebe9994b5749bb91293253d83874df64f5e1d494c78c359c7c46b5f0b95d4bfe89b06fd0deb3a4d75cf379c3f98e8ae03f SHA512 b98837e947c75cdca2034bf09ee0474e908c8d69d5f5e8306381967b7e8d8b3a7e8d4027bbd436eae328d856abdbef7121a117f8486a949f0129fd3e06d6f87a
diff --git a/dev-python/sqlglot/sqlglot-18.16.0.ebuild b/dev-python/sqlglot/sqlglot-18.16.0.ebuild
new file mode 100644
index 000000000000..ac53f7b0ad7d
--- /dev/null
+++ b/dev-python/sqlglot/sqlglot-18.16.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi optfeature
+
+DESCRIPTION="An easily customizable SQL parser and transpiler"
+HOMEPAGE="
+	https://sqlglot.com/
+	https://github.com/tobymao/sqlglot/
+	https://pypi.org/project/sqlglot/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+EPYTEST_IGNORE=(
+	# Tests require pyspark or duckdb which aren't in the tree.
+	# Pandas would be a requirement normally, but it gets ignored by proxy.
+	"tests/dataframe/integration/test_dataframe.py"
+	"tests/dataframe/integration/test_grouped_data.py"
+	"tests/dataframe/integration/test_session.py"
+	"tests/test_executor.py"
+	"tests/test_optimizer.py"
+)
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
+}