Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-11-29 08:08:05 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-11-29 08:08:05 +0000
commit: 45f6013c107855664ed7bc3a1ab320ca4e839c2b (patch)
tree: 9e607b3ee5829bb4667109b58554dcc65b6bef2d /dev-python
parent: 8c928ef04ae398485ff725dd57ab841057e424ac (diff)
download: baldeagleos-repo-45f6013c107855664ed7bc3a1ab320ca4e839c2b.tar.gz
baldeagleos-repo-45f6013c107855664ed7bc3a1ab320ca4e839c2b.tar.xz
baldeagleos-repo-45f6013c107855664ed7bc3a1ab320ca4e839c2b.zip
70 files changed, 863 insertions, 901 deletions
diff --git a/dev-python/asttokens/asttokens-2.1.0.ebuild b/dev-python/asttokens/asttokens-2.1.0.ebuild
index b4f51f2efde5..b4133fc5bd98 100644
--- a/dev-python/asttokens/asttokens-2.1.0.ebuild
+++ b/dev-python/asttokens/asttokens-2.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 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/six[${PYTHON_USEDEP}]
diff --git a/dev-python/automat/automat-22.10.0.ebuild b/dev-python/automat/automat-22.10.0.ebuild
index 3bc3e6dda2d5..38c70da08633 100644
--- a/dev-python/automat/automat-22.10.0.ebuild
+++ b/dev-python/automat/automat-22.10.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 17bc20154ff6..dc458f6bece8 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,2 +1,3 @@
 DIST aws-sam-translator-1.53.0.gh.tar.gz 1158682 BLAKE2B 4bc8430936a1b180dc04637e540ecad7eb82cd7a5da5254f2b823075878a03ad3e63422c183b365b0dad927bcdf063b8ab40984ab23abe1d91d8bc3c411aa2f1 SHA512 292259bf8d4002b72be51db0358673eee61fe368be5db15e7faff195baae8fa194bef882fd0f5a9b5c46379fe5f9593d101a212121da8d0636aca709dd087f05
 DIST aws-sam-translator-1.54.0.gh.tar.gz 1004760 BLAKE2B acb875f6f25c43d605dc1a2ee38bde66eacc8de85aaa8c3231ded77a9252e1d722a82724e2d8bb8016e1d8cb7bd188c7dcb76e50ac79af20109713160b90a891 SHA512 a8dbf74e983eab124cfab7627f64fb013a59340b77820a96c5654503956370aeca51a676508b688d2f1c96c1fb9586c7711f03af5ca68f680edbb19516007f4f
+DIST aws-sam-translator-1.55.0.gh.tar.gz 1006734 BLAKE2B 5fbfd8719ad605e0df7acd8ecb25ca681f5863e67e97b57624c470fa6e77bb431d7ff19f5e00a181120ea809019d93bd75416e46ba1424e8839f80c10002b30f SHA512 4d2f1e3458cb9d2014f73575946e863e1d74e7432e2aaf17128638d69d9f092b4d531224e45c2110b50103a1e7c4343fc0282ad38fe959cf45af4a0a2b4663aa
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.55.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.55.0.ebuild
new file mode 100644
index 000000000000..be2c2f881325
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.55.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
+	tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls
+)
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -i -e '/addopts/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index d0e6bcd616aa..8aadf56f9b64 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,9 +1,4 @@
-DIST boto3-1.25.5.gh.tar.gz 550814 BLAKE2B 85f345b635fe16a978853d21192f49804837b050539aba650195bf788c7912f8713aa3a826de6f5ae4c28c4c3795e7053a2105622757f3087579e827eda3487f SHA512 6f4cd909b7a6670f74df6c7cac4a140114a0e05f736ed23c5a53351c5c6505f02d40e81ad1314db86db67d16429b38f78708e9cc8ce2cb08f28742ec209c2755
 DIST boto3-1.26.11.gh.tar.gz 561018 BLAKE2B 3bd4ddd23d0752dcaad9795041658909f8df88eb75a89fd727866a25bd0e8a3106a497776c1be8e53274d85302d9185f9bb95b777efd89fed3f5a33edfe04fa1 SHA512 f31e15bf46fa4338418507840ac3961c06f3573502a71892a262bf24bfc38b4058888cccef1abc6e59859a9985f917c4463e698a1a92543519a8da3ff6221a67
-DIST boto3-1.26.12.gh.tar.gz 563006 BLAKE2B 3618532b3156029590dbfb9cabb62506bd1a945bac78cf7d4a4e95300ba6a4c9d2258801f8f69107670c57bada7cb2fb37811ad18db891c2b4d50dda257a8f28 SHA512 0a7d504bfcfd0f6c0a7f1ee799911e3828094d104472d150ef8ccdd8e0ecd10b25e88d845fe701bf2a93629bf0f71bf673ba07c469a76aa301fc5e9bbe3c9ece
-DIST boto3-1.26.13.gh.tar.gz 565005 BLAKE2B 445b5d49dec5983213166c1365a38f721d945d6ff32a2c6d2fd74bf87512d5a5d5dbac5379eb0f5da10744e7e4c3993f206d2f224c9fa09723c263c615183ad0 SHA512 ba2948cefd0bb8befbe0de5c082c0e7de6ddd44be1e05b245ab2b4cf7bf464ac1efa37c12a9ddd6aebadb6b71ec3b8ab6f7f3038c8d538b73ff0cf3b2e1a2199
-DIST boto3-1.26.14.gh.tar.gz 565166 BLAKE2B 271ebad718999d3986ff393c670fe495af3a37dcea2fabd8ad4c459929d50f237eaef74e0b7e18731839b8cc9562183e4d0ba3128f6407f83a4df8166e4cab58 SHA512 42243b3b93a84571a050e7cec5091f2a70dd8e14018a1f2e825e40761ecd9bf822ae7b35a48831259eb8007b0564254255a5899795454178a6fc4d1c8d81aa1f
-DIST boto3-1.26.15.gh.tar.gz 565491 BLAKE2B 13435c477bb865cc3f74d0890f5bc425567e0e14d61d5784bb1297c3b233c5ed0642a6f2d0ee26e9a8268b8b5c5f61edd7af79d439eec6a0535b7604876bec6d SHA512 477d0119166cb0c2c5ae42bec627718b6072be6f611b7ee885398b62e52a6f6a270d73032b4d9cf4dbd1a07cd562380e23348aac8e7bb2fed54cafa75b33896b
 DIST boto3-1.26.16.gh.tar.gz 565753 BLAKE2B 7b30f4a3e15ca893cacca7ea58e18d654f3895e37b36e08e632b4da5a3e4b7225ad864daf60604b074973f90b38ca71afb3d28ed8f90172e78193ef9a1f626c0 SHA512 54d3a3bd551cd2018070144b956d5f5af8c84fb6c689647a39b42f03ea1f1fce3c1032d9c694851977aa498950011f28b7014d5e8c4091c2f771b2d2cb1c2714
-DIST boto3-1.26.17.gh.tar.gz 568557 BLAKE2B b4ba0a5b6e6434403ad3e9f7a83c714c7bb4650ae9702844ba2e5f980b64370984f9ed58f6b6be7f52b2c55b3082869c45c04f73dbb8576c22cda2983e19b215 SHA512 61ceeef40cf00973f01f5b57d3427f205be75a43950fbfa98a09c4e0ad25d55b9cb07ca66aef3daf955eb5b1d84409b4e37f6f0e42971ef40ec860b905cf5e70
+DIST boto3-1.26.18.gh.tar.gz 570818 BLAKE2B 2f77acbb6fa77c867cda0b1d7828c5aafdfc8b6e5d7cced4beda08f151c9ed889356ec32b4b0ad2724bffbaa20690f149caf69f89dfbf70761ca354893685cb7 SHA512 b67d62057c7c421eedbf8778c2bd10d9cad9a81678dfc68415cb5ca546182c418d1c8a6619d20be066d78891af7720ec29209fecd27628e1d456b04965edfb83
 DIST boto3-1.26.8.gh.tar.gz 557012 BLAKE2B 211bb7441acc8b1f901ebf5251288dc7c9073fa6e34f5a34426424ef064efb0fb3031deaf48ef336ec43bb015f95f618598da43d12ec83cbf814e1b4097b28a0 SHA512 738190cedfb0b85d3a1e9558b03e7f2fb14e43b152bc9627fd95c8ecc4a0ddc17f4c87ccb6129c1fbf5f47db9eea4dbc5c2cfbb69b903bc6f3ff417ef86b6f6b
diff --git a/dev-python/boto3/boto3-1.25.5.ebuild b/dev-python/boto3/boto3-1.25.5.ebuild
deleted file mode 100644
index 1f8dc6734498..000000000000
--- a/dev-python/boto3/boto3-1.25.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.13.ebuild b/dev-python/boto3/boto3-1.26.13.ebuild
deleted file mode 100644
index 3d7d652a3b69..000000000000
--- a/dev-python/boto3/boto3-1.26.13.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.14.ebuild b/dev-python/boto3/boto3-1.26.14.ebuild
deleted file mode 100644
index 3d7d652a3b69..000000000000
--- a/dev-python/boto3/boto3-1.26.14.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.15.ebuild b/dev-python/boto3/boto3-1.26.15.ebuild
deleted file mode 100644
index 3d7d652a3b69..000000000000
--- a/dev-python/boto3/boto3-1.26.15.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.17.ebuild b/dev-python/boto3/boto3-1.26.17.ebuild
deleted file mode 100644
index 3d7d652a3b69..000000000000
--- a/dev-python/boto3/boto3-1.26.17.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.12.ebuild b/dev-python/boto3/boto3-1.26.18.ebuild
index 3d7d652a3b69..3d7d652a3b69 100644
--- a/dev-python/boto3/boto3-1.26.12.ebuild
+++ b/dev-python/boto3/boto3-1.26.18.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 57aa946feda6..d8c3f3ba26b2 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,9 +1,4 @@
-DIST botocore-1.28.5.gh.tar.gz 9842427 BLAKE2B ed185346c21eeb0d05b39b55e99e065d9a5448fbe8206de49b3c128d12f4aabe1f6258153710350783846d10e5e10a22ccf77f6d27345297ec64e7ce74e51b87 SHA512 8b41b79826a71ed31c27534129e959e0896d9f4cb1769b4f14f1760d173500563a579aa0e00aaff5058275d5b5e8b921fed34b12825cf16ba4e216b174e4bba5
 DIST botocore-1.29.11.gh.tar.gz 10660645 BLAKE2B 0d5f8a7e34f99947e1488b468699e682acf0077fcc9f3bfb87e00f4966571970e335964edeabb20b41e4f900aee8c5075a004e8e3b09ce7d04a38f4c729d3361 SHA512 f1e2d948b7123316084228b574c8d0a0cc7dac1e615edfc525f9f42e081bf87d107ec948b5f209a6013b37c0f9617d1e585ef602a1f76c106dbd2369ae6e4514
-DIST botocore-1.29.12.gh.tar.gz 10675051 BLAKE2B 8ccf2f7fe711556d05771712b365a5317aa386411b3a98eaf3240fe14b7f14f04974e2847dc3c49178f4c22a8add957f3286b75f96f10dc68f99e2260a2ade77 SHA512 8728ac25d6dba86d99998a336b17446f1b5000dab9e0f01e0bd61afcf9b806cb2fd3ac747119dac9a9b063463555cd977b2edac2a0b363b79d18ae68b1e8bdb1
-DIST botocore-1.29.13.gh.tar.gz 10704244 BLAKE2B 593fb236ac87e13fca6688e91ee680404506f308a312b35e1a92205b3e533c24fb9dd39a0eedbd64887128daf388607fdce74b439d0e3e1fa1df970e73b22c79 SHA512 673e7ec32cbfb4aff51ad0399ffbf51cafacd7d29f06769290a00284d54f43891d0a25dfef3d805b6808130cdafeebf07c0f4cec7ac614b22aa8daba1c79cda6
-DIST botocore-1.29.14.gh.tar.gz 10705895 BLAKE2B 3f20e92819965abb6ce280e4d4c4d967ddc2fa722de058140785637ee541b4f3d88c158aa9ceacfc0c2308c8bbda37d0b8ee53bc63a8594806c5175b150b2f62 SHA512 b6ddc39c82d9b7f59dd5f953e0eca90e21f1de2bd82ab731708acc3853d826308f7480b83f018f663ccb2846abed84d6bf1443df0d9ab1041589b1ed3b0d4fc3
-DIST botocore-1.29.15.gh.tar.gz 10707154 BLAKE2B e282f61ec0909bc6d58190310b798ef44367ec4d404679666855266134df3988ce90e30e4d85c834f4825c1d013462510d30ae3224491991a2671fb0f4b680f4 SHA512 e723bd34543b01286d0e7f3890ec27683c079ff80324fd5c450b9893d40b3126e996712e3605b6ea93f7551b0929fd9eca696ed383819c03dd801cf00f3264bb
 DIST botocore-1.29.16.gh.tar.gz 10709321 BLAKE2B d9a8590b1685351f1167962fa45f97906554dead7ec72487f390a78cf5e0cbca933e4e2d6d147af9beb43f05299a771cfb5f6d76e58d44397eeb6240e8856167 SHA512 247c9800a24141cf970f02ae3c6436027c86677f1a287f24be4d85292add874465851b8a963dc49dffe103b1088e5120db18dc58d93f04285715f0b4fe08258e
-DIST botocore-1.29.17.gh.tar.gz 10752212 BLAKE2B bd1254d9612347cfeedbea9cbe1601fa82fd8ab0b3572cdcadb2fdfd17d19811aff5101633d797763b1b31f3987e42ce7d1a3bb1cc109e4f844f0c499721fc0d SHA512 cf90845049025d28b6dc3a32cd2471330367370ac86c010113595a4d3e2078e3b031f807067f6b0c054f1212baa723231633c0234072a8a0f2fc9ae34777dfdd
+DIST botocore-1.29.18.gh.tar.gz 10837962 BLAKE2B c1d32b31ba687427f6c88e53dd4908d966b83d3d5d087b64e5370b7294d568a09dfe08e72e89acf8402dbf887369c509d1c7fcf77c5156ef9029319878e7311c SHA512 2e8e7108e343028cf6ff30fd9f6b66b8b49a2b3013656ee3fc912c67052a42eca49d93a57e322248dfce7cfa765c6bf4b78f364a71b843536853bc4f413e1930
 DIST botocore-1.29.8.gh.tar.gz 10636661 BLAKE2B 3ebd9e5cb6cc1a9d4ddb877e806e0a845e6a19a4604b4489dbdb9a0f35251201de5d7062f3b0193db3e28f5170d8c3315fdc0b2bec7668a61880ff3e9305d3bc SHA512 c4a1a3993576bd0340de4eeb25e10650219e9d74c21f7e51e5298120bc92a8359143c38d5a991b940316fc5eac483e4e838298881a5c068fa91dc3ebf92a7f5a
diff --git a/dev-python/botocore/botocore-1.28.5.ebuild b/dev-python/botocore/botocore-1.28.5.ebuild
deleted file mode 100644
index b502c7b98b6f..000000000000
--- a/dev-python/botocore/botocore-1.28.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.13.ebuild b/dev-python/botocore/botocore-1.29.13.ebuild
deleted file mode 100644
index 40131f66e350..000000000000
--- a/dev-python/botocore/botocore-1.29.13.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.14.ebuild b/dev-python/botocore/botocore-1.29.14.ebuild
deleted file mode 100644
index 40131f66e350..000000000000
--- a/dev-python/botocore/botocore-1.29.14.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.15.ebuild b/dev-python/botocore/botocore-1.29.15.ebuild
deleted file mode 100644
index 40131f66e350..000000000000
--- a/dev-python/botocore/botocore-1.29.15.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.17.ebuild b/dev-python/botocore/botocore-1.29.17.ebuild
deleted file mode 100644
index 40131f66e350..000000000000
--- a/dev-python/botocore/botocore-1.29.17.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.12.ebuild b/dev-python/botocore/botocore-1.29.18.ebuild
index 40131f66e350..40131f66e350 100644
--- a/dev-python/botocore/botocore-1.29.12.ebuild
+++ b/dev-python/botocore/botocore-1.29.18.ebuild
diff --git a/dev-python/build/build-0.9.0.ebuild b/dev-python/build/build-0.9.0.ebuild
index 3bc303d23c74..2cdadeae5b87 100644
--- a/dev-python/build/build-0.9.0.ebuild
+++ b/dev-python/build/build-0.9.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-19.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 18c1d3a9d0dc..f340b77ba2a2 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1 +1,2 @@
 DIST cbor2-5.4.3.tar.gz 86499 BLAKE2B 0303ed49a1c468a3aa13e12a4bebef17479f106bc3f0a92e35c6029ff1bd86aea6a77f557ac0c8acb5e055ec0b56c82e5c95e9417d00715a1fb244bd94d0f60d SHA512 9527bec5a36464bb7dc9a8c0ece3ad72f1c6182272a7edf0526668b264c957b72bc031d2398dc6af38af09bb298219c316da194084fab410bae5f9100b22328b
+DIST cbor2-5.4.4.tar.gz 86755 BLAKE2B 616a5e3d10f979f7f5923b0226d6ca52392e79bf1c4dcdef6d44143af75b02a91846e1a8f0c571f096f2168908137a5f31995199c13383b4d81cb1f17062b1fd SHA512 f8754423490b8a9643ca3309c99254f6be5e9eeab2163b57631fd2e6fd3f5f5dbd8495e24bbfcf96720f07467797eb3f4e3603822a7d6999f1ee4fa66651f2d7
diff --git a/dev-python/cbor2/cbor2-5.4.4.ebuild b/dev-python/cbor2/cbor2-5.4.4.ebuild
new file mode 100644
index 000000000000..eb0ac3d389f9
--- /dev/null
+++ b/dev-python/cbor2/cbor2-5.4.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
+HOMEPAGE="
+	https://github.com/agronholm/cbor2/
+	https://pypi.org/project/cbor2/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+BDEPEND="
+	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-6.4[${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
+}
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index b92436040f7b..f9fb6b20746a 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,4 +1 @@
-DIST charset_normalizer-2.1.0.gh.tar.gz 85498 BLAKE2B f18c491b7d2b32cfc3cd92b1dc074b89f562c11a1bdebb9d4ff7c230ac7c2394c6f7cb30caa8cde9d8da26f1ed527a01c28236099b793808274c1146f258546d SHA512 a14e9e1d58eb23c9c568e7e74ab88361f522a76575b5ddc30df392f33584c821cf4943029395d2535c641d8fe441256803e6d2212e52c6f4b0544db64bd73b7c
-DIST charset_normalizer-2.1.1.gh.tar.gz 86023 BLAKE2B aefd9b5f78a5c75701b4239d443f0ca2f6ec755703c7b51ddecff5bf014c7e9203650a5f09ac791b76793c6ef999c31236dceb6721e81959c5df40d70c7cb20f SHA512 77df5bdf9ca2f6b2594cc6a5ff54d1d50fd17c2175f96d6853ef6b3a48cdfc0d2852e1dcffc4814fa9bba30ebc3e26ce992c7139b6b21dfaf46fd9c9e8b0c95e
-DIST charset_normalizer-3.0.0.gh.tar.gz 88411 BLAKE2B f57f24e79da20a60570d5350bb848d77b2cf5980da00813f706b09ff691235473d955740d0575355da2d9c6e58ea69a441000c1429033cdb8478506f0580c26b SHA512 240589047b177b38b1f59723699cb8336ca43cabff8269e877f9c62430a3c3a8875cdfcf66a10801a33136279c5e0c150b873ff2b5f596b5dbb2049122e18fc2
 DIST charset_normalizer-3.0.1.gh.tar.gz 89120 BLAKE2B ce46758a0e188c2c3370e8cadcf35430e62fc7abb158d4c6c86b4a93a75b30fbff10b584ebaaf9489c47bdcfe9ad3b04d0fe3e474b03b89700364b676caf4e0f SHA512 9c78713b17e9e8d10b2ac8de26b8481dd039aab98eb990d0788f82c354afc8290040da1aa07faed6f90590fed098e793fdf2aa257825222e44571c1810f263ec
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.1.0.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.1.0.ebuild
deleted file mode 100644
index 0560acb5a256..000000000000
--- a/dev-python/charset_normalizer/charset_normalizer-2.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Real First Universal Charset Detector"
-HOMEPAGE="
-	https://pypi.org/project/charset-normalizer/
-	https://github.com/Ousret/charset_normalizer/
-"
-SRC_URI="
-	https://github.com/Ousret/charset_normalizer/archive/${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"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.1.1-r1.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.1.1-r1.ebuild
deleted file mode 100644
index 0560acb5a256..000000000000
--- a/dev-python/charset_normalizer/charset_normalizer-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Real First Universal Charset Detector"
-HOMEPAGE="
-	https://pypi.org/project/charset-normalizer/
-	https://github.com/Ousret/charset_normalizer/
-"
-SRC_URI="
-	https://github.com/Ousret/charset_normalizer/archive/${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"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/charset_normalizer/charset_normalizer-3.0.0.ebuild b/dev-python/charset_normalizer/charset_normalizer-3.0.0.ebuild
deleted file mode 100644
index 3b8994b67196..000000000000
--- a/dev-python/charset_normalizer/charset_normalizer-3.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Real First Universal Charset Detector"
-HOMEPAGE="
-	https://pypi.org/project/charset-normalizer/
-	https://github.com/Ousret/charset_normalizer/
-"
-SRC_URI="
-	https://github.com/Ousret/charset_normalizer/archive/${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"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts=
-}
diff --git a/dev-python/charset_normalizer/charset_normalizer-3.0.1.ebuild b/dev-python/charset_normalizer/charset_normalizer-3.0.1.ebuild
index 3b8994b67196..ee88e081f79d 100644
--- a/dev-python/charset_normalizer/charset_normalizer-3.0.1.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-3.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/cssselect/cssselect-1.2.0.ebuild b/dev-python/cssselect/cssselect-1.2.0.ebuild
index db6bd8b40df9..512e33115850 100644
--- a/dev-python/cssselect/cssselect-1.2.0.ebuild
+++ b/dev-python/cssselect/cssselect-1.2.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/executing/executing-1.2.0.ebuild b/dev-python/executing/executing-1.2.0.ebuild
index 2fd24ad21f6d..e68cb1ced162 100644
--- a/dev-python/executing/executing-1.2.0.ebuild
+++ b/dev-python/executing/executing-1.2.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"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/flatbuffers/flatbuffers-22.10.26.ebuild b/dev-python/flatbuffers/flatbuffers-22.10.26.ebuild
index 350dfcd24810..197eef6f389c 100644
--- a/dev-python/flatbuffers/flatbuffers-22.10.26.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-22.10.26.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 
 S=${WORKDIR}/${P}/python
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index 8b74ea0fc289..56dc95a6fa63 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1 +1,2 @@
 DIST grpcio-testing-1.43.0.tar.gz 17693 BLAKE2B f75158a870b63c48d19e849f87e4682c13a1d500690ff0f39d0d609c3de2f3086765dc7fe15acd590667fcc8ab8ce5d149517be5cbbb685bc222619b23e367a8 SHA512 4ad3da7805e85c0869c5a8c992d1512942334edeef10812665bdfb4a81b3d07efff08686b93c501f43d12e0c6181717ddbea392f1751a229d7a5fe26f162fae2
+DIST grpcio-testing-1.51.0.tar.gz 22390 BLAKE2B 813ade1f3f44e3aeda7ca779f130897281036de111cb17f9297f267961a591e1fa3b88380ccbec42edd339487f1b3f1028dcd308c46ffd8fde5817e3909cfd41 SHA512 3fd9de9cd75aebcf1f6c3716bbacaf5cc9cc9aa74acb42dd128b5c158fa2d52549cdcc8f3ea9f2cb0b86d0b84c998acd55fa16e879ac9099a2348d889d35d837
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.51.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.51.0.ebuild
new file mode 100644
index 000000000000..5d3eded570f9
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.51.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Testing utilities for gRPC Python"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-4.21.3[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
diff --git a/dev-python/httplib2/httplib2-0.21.0.ebuild b/dev-python/httplib2/httplib2-0.21.0.ebuild
index cf54c90a1d7a..18eafe1ca384 100644
--- a/dev-python/httplib2/httplib2-0.21.0.ebuild
+++ b/dev-python/httplib2/httplib2-0.21.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	app-misc/ca-certificates
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 3ccde23a6332..c94ea4a05a3d 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -2,3 +2,4 @@ DIST ipykernel-6.16.2.tar.gz 136606 BLAKE2B 596cae97c6e4d170c51a2f2f481c306a9383
 DIST ipykernel-6.17.0.tar.gz 136711 BLAKE2B 2d037334e3fbff0cdd3e2a99cb0987c2c647bf04e3eaa85ff56a202d2b2c88383ffd81f8ba74565fee9ade19ab9d6bcfcb862bd92fdea00892f0195f1c97a752 SHA512 52ff2cbf2aa8f1d02c0d25866e91e2eccddca55b70a226145b99165b3514ab1b87e797abac4423bfb7090152e7eafbc47aacde8c3373f5b2bdf0ff642c07d0ba
 DIST ipykernel-6.17.1.tar.gz 137131 BLAKE2B 0805f04b685fdfd8e43b733962e096035f900a4f8a525cf6f52980bffeedb88d5f33eb75a311dda26fe482ee2625c9f3ade15d1b449165f8050c5e83b20e0b39 SHA512 f1293ac6c4744fe3c79e0886d55a15f6c19ac73c07f5bd4a09f4f0c26c8ed0935b5c0924c55efc2097257737d6a59caba1cf9fba004b5f368a62840a269908f7
 DIST ipykernel-6.18.0.tar.gz 137928 BLAKE2B dd296b1fcf7d9fcf81a3315e22d6c488086d44f91807242a8fdfaed99836a0f97af6274ec967a1a4052b03c72b5706381e15511b5fb8d3fa3e169e08e7e68049 SHA512 918f11d7eef2d6e11ba5fb835ffb7511039142609bab04d68fd0c187085aa2c5b9634438484c9ae5a9bdb8822098e3073d6ffacae1f19f82eb0efda53eca366d
+DIST ipykernel-6.18.1.tar.gz 141559 BLAKE2B 4c12ff56d2e9c34a278e68e141032768ede70f86119193bab22e2ea58faec6e723dbc4d4411565f8c7974e67d55e053b6821e88f5c105cd9f2e2ae7049d137f2 SHA512 ff9fe59c646487483e979b757ea34d884b0bf9749430daf5ae6dd0cf7381c67e51712624938800d49c53f9ca70cb63fc8c38f10851084d4a5b68f3b1e2762b0a
diff --git a/dev-python/ipykernel/ipykernel-6.18.1.ebuild b/dev-python/ipykernel/ipykernel-6.18.1.ebuild
new file mode 100644
index 000000000000..e04dced67efc
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.18.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="
+	https://github.com/ipython/ipykernel/
+	https://pypi.org/project/ipykernel/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+
+RDEPEND="
+	dev-python/comm[${PYTHON_USEDEP}]
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	ipykernel/tests/test_debugger.py::test_attach_debug
+	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_set_breakpoints
+	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+)
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 06102f98cbac..bdda37078239 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,2 +1,3 @@
 DIST ipython-8.5.0.tar.gz 5319096 BLAKE2B 6ab330ffe99611478bdcf1211a500c08edd4aff802a1121156c302cb8a49b9c5f2fa98012dbaf80996574789bdb98d87924492181e45f00f46f600789c1ae6e4 SHA512 9339507fbe229d83f4c41b79257a7b40890d9d0601692521a61dc777c040a6d22d131014d660ffc9ba79f7128f579082473642f47b86e59a038f79c6553c8186
 DIST ipython-8.6.0.tar.gz 5329155 BLAKE2B 2c2ed361af7f4a3884fe3d20fa92fb65c9eb0f020ca935e6a7edec7d28891b74433db56b55070ae07369f93d69e0f46a23fc470ba1c0b7ebf8d3d0f620464ab5 SHA512 54c9e354754b1086e5b87d4d76fa4fe5aa261b095d18210f6660fa9e0a3177db4c9b66d26da5e5d6880a40534477d8c6ea59615c4069327939bca41d49addb47
+DIST ipython-8.7.0.tar.gz 5329857 BLAKE2B 876ed4e16377f2a4d1c0aa83a7e2e0dfda64100de97ff349911d10b07acf351329b0bff75bcf6085f9fadf773fa6762ed88586e1132cabf6479790a38a0bc4e6 SHA512 4652d06d1a0cf33a2b55f640d6bcc3fd9f1f644c848e869bc3807da8f4166060798ea5629fa80cc98a4a79b8ea1cde6013507eae859354a5db270b7fb3cca6bf
diff --git a/dev-python/ipython/ipython-8.7.0.ebuild b/dev-python/ipython/ipython-8.7.0.ebuild
new file mode 100644
index 000000000000..adff457fb9bd
--- /dev/null
+++ b/dev-python/ipython/ipython-8.7.0.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="
+	https://ipython.org/
+	https://github.com/ipython/ipython/
+	https://pypi.org/project/ipython/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/stack_data[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? (
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+python_prepare_all() {
+	# Remove out of date insource files
+	#rm IPython/extensions/cythonmagic.py || die
+	#rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
+	local EPYTEST_DESELECT=(
+		# TODO: looks to be a regression due to a newer dep
+		IPython/core/tests/test_oinspect.py::test_class_signature
+		IPython/core/tests/test_oinspect.py::test_render_signature_long
+	)
+	# nonfatal implied by virtx
+	nonfatal epytest || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "code formatting" dev-python/black
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index c788a36895b4..4d6adafa3ccb 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,2 +1,4 @@
 DIST jupyter_core-4.11.2.tar.gz 788994 BLAKE2B a337d6974f905b3b666225f828f2026f7dd314e34411f7998b8d2981ad9623029901e5369bfe831ecfcbf3be387bb0adc7f067269537a6b2a73029f439bfe9a1 SHA512 7659b61ad5793d6e4ceba09f7d4422610ceb358cbba30e2bee7ab7910e6c03cb365fad5db8e4444f9e0fd196361d5b15370f41fb7cb13c2e551382e19d7d6b73
+DIST jupyter_core-4.12.0.tar.gz 74760 BLAKE2B 793554c6293dde966a5eaeb4c1f57b0a17f3d7291dad7a5806465fe0b4d9e4a8fa4a6051f918156ee834afcb6c0d98d0d1a1142ca62a1f3c911c8f1492c41b1b SHA512 5f0a0094f5266dc0d0aab6c7c4a0ca2977a6787f1dc1e2b32128aab16dcdfd7d9f1b63b0419ab7f045fb3f2797b866fb91a8c4e623dafd4d03c38b5000a478ec
 DIST jupyter_core-5.0.0.tar.gz 78285 BLAKE2B 530dac61088dcbb402ffa6fd6c3e3df2238c6da438f826ddfbeb3c6f26ed4e4f0d741a2cddf801db886c24e22c74db2336e59c6223d30830a32bb38f7d7d9c3e SHA512 a587b5a0e6ceb85a842670121fe78f93a232dbdc56412c7b32b415054cf06b6028a8f4669b7e7c8a702ebbbf4873962ae4cbff2b3636f8abb75ec0ae6bdeb64d
+DIST jupyter_core-5.1.0.tar.gz 80224 BLAKE2B 21eed1b69f9ab5059adf1e26eba1a30b62cf5f47976fad37b74442f2d17e0b904b89811188be526ece4b5a993de4d3cd3831d821140bf1188a0e4e0b25d11d83 SHA512 75ad0aaee5cf464d080a9dc679b5aa4b58e6d483ba53620c5a819a41fc149054ea47579d7b2903eed3de203a33a582383a384fa445a7aac7bb801029508bd914
diff --git a/dev-python/jupyter_core/jupyter_core-4.12.0.ebuild b/dev-python/jupyter_core/jupyter_core-4.12.0.ebuild
new file mode 100644
index 000000000000..5bf6c3ff58c2
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-4.12.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/jupyter_core/
+	https://pypi.org/project/jupyter-core/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/traitlets[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinxcontrib-github-alt
+distutils_enable_tests pytest
diff --git a/dev-python/jupyter_core/jupyter_core-5.1.0.ebuild b/dev-python/jupyter_core/jupyter_core-5.1.0.ebuild
new file mode 100644
index 000000000000..066182fbf053
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-5.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/jupyter_core/
+	https://pypi.org/project/jupyter-core/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/platformdirs-2.5[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/myst_parser \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/traitlets
+distutils_enable_tests pytest
diff --git a/dev-python/k5test/k5test-0.10.3.ebuild b/dev-python/k5test/k5test-0.10.3.ebuild
index 15bc194c5152..83e41f4ab223 100644
--- a/dev-python/k5test/k5test-0.10.3.ebuild
+++ b/dev-python/k5test/k5test-0.10.3.ebuild
@@ -17,4 +17,4 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.8.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.8.0.ebuild
index 684205048ece..84c53c05968e 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.8.0.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.8.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/meson-python/meson-python-0.11.0.ebuild b/dev-python/meson-python/meson-python-0.11.0.ebuild
index 0b6c2723c49a..f0f037bdf850 100644
--- a/dev-python/meson-python/meson-python-0.11.0.ebuild
+++ b/dev-python/meson-python/meson-python-0.11.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/pyproject-metadata-0.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index d243fe78e5b9..7dd535b84832 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -1,3 +1,4 @@
 DIST mkdocs-minify-plugin-0.5.0.tar.gz 3387 BLAKE2B bce05582eab831976b430d5c331c0e51cecf790f4db6f3bd089ff6f0f5421c0b824c9bf6637a6b00555eee203b23cbd5fc3a0e81fcb5a8697ab7c06e94a9d2e0 SHA512 a31770c9de39439ba5eb4e35acd088aa7df2d7fa39f7942819c0b25429abb7b2b0626765f26f4d4fc77fd11e48dfdf90f9eb93e999cf7b641bb630c852eec50a
 DIST mkdocs-minify-plugin-0.6.0.gh.tar.gz 8069 BLAKE2B 7b2860ecdd1778cc51fca7357fd699578d6805176e9aa21013aec3650b40fa28381350d6690c2188cd04e25259ac71e3c9ca4e005fcc81c33182eb898a218aef SHA512 ad045fe6643de1d979051c58f89ffc5e98eb2063152a3301073864fb2bf3e5a0c183b4362ee175b8fc14be0335d0e76c509b9b6b721cdb78d9add632a46d72e9
 DIST mkdocs-minify-plugin-0.6.1.gh.tar.gz 8346 BLAKE2B 130495cc2dcc2b71c6dd715c1ed277df0d8fac5aef8fc49094bf05b324d692e41e3db85175df5455eed21f2cf413d57225a1baafe14770a77ffd3c2bb77ff3d8 SHA512 f1611b1a8f946e27450c9825f65e77e798200b22d08b5957417ae060cc2d6cb40c6edd2a6ace08eff2b32b59c9aca3020e26da35917aaddae293047d9cc8f86b
+DIST mkdocs-minify-plugin-0.6.2.gh.tar.gz 8480 BLAKE2B 91091702c0f5953b8cef4e081004cf44abbc2a7b21a0ea1996a337c96764a636fa79054c5d05ffc2814acb4b7fda0e833e61b02c6b97466586875e9da21c937b SHA512 563e150eb380aab105b18492eb0f725ec96fe12768c666b093e40d375e66cccf42f859aeb4d2788ae8c7a5b01e6e103c9f9aa1153802ad104955a98d90036144
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.2.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.2.ebuild
new file mode 100644
index 000000000000..819472faad3d
--- /dev/null
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
+HOMEPAGE="
+	https://github.com/byrnereese/mkdocs-minify-plugin
+	https://pypi.org/project/mkdocs-minify-plugin/
+"
+SRC_URI="
+	https://github.com/byrnereese/mkdocs-minify-plugin/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.4.1[${PYTHON_USEDEP}]
+	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
+	>=dev-python/jsmin-3.0.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/numexpr/numexpr-2.8.4.ebuild b/dev-python/numexpr/numexpr-2.8.4.ebuild
index 54dee8310fb3..3dfce693b3fb 100644
--- a/dev-python/numexpr/numexpr-2.8.4.ebuild
+++ b/dev-python/numexpr/numexpr-2.8.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 5620091e7caa..44531bb51ca4 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,2 +1,3 @@
 DIST python-phonenumbers-8.12.57.gh.tar.gz 4906700 BLAKE2B b755e6e27c3006ce2b72f8e8900937ac2b7d2bd464052cd9a788ba5cdbd08ead4628963ea794a5dee962531753f6674342a3eed092edfb421c1d8f203d90b2b3 SHA512 8da340dd88c4bd41fd18af264667211e7d9dea97dcb71306c901feb3f32ee7a7012dfa1a66b8ddac746ceaab972529c32d9fc19e331893296f9938c7249173ba
 DIST python-phonenumbers-8.13.0.gh.tar.gz 4907144 BLAKE2B 8441eb3bae743c92aacd581c0dfbea32d04353dbb6e45a3fd24ed4b9ef2e6a80ee70167b59ad288383cf409bdad73ed9bded6c991b7809d6ff2bbcc68519aab3 SHA512 1f8e78b3fa1418dec1cc89c02a7e8544847f343912be99d2b62aa49250aa0d89d67d27f0f9c40481ef6125872be7cc772de25bdd9ce26df512e7715f4f8281f2
+DIST python-phonenumbers-8.13.1.gh.tar.gz 4906086 BLAKE2B 3287df69f8246d241ee41b7fb71e1d49ed6393715a1bed31a60755e170c74f8a88c4b5a2dfe4dd87fa7e8049cefb930d33fe0821bff34745e18402bcc8a1e424 SHA512 2a3d7ac670db1f20a6409a705f654b7802266d9bc4f562b50beace67bc6af188b685159192c73078009fae787ad5de6bb191a8695d1c1626e2fd564f01c55592
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.1.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.1.ebuild
new file mode 100644
index 000000000000..99028fc767a1
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.13.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/piexif/piexif-1.1.3-r2.ebuild b/dev-python/piexif/piexif-1.1.3-r2.ebuild
new file mode 100644
index 000000000000..2a2eecbc3668
--- /dev/null
+++ b/dev-python/piexif/piexif-1.1.3-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit edos2unix distutils-r1
+
+DESCRIPTION="Exif manipulation with pure Python"
+HOMEPAGE="https://github.com/hMatoba/Piexif
+	https://pypi.org/project/piexif/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	app-arch/unzip
+	test? ( dev-python/pillow[jpeg,${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+PATCHES=(
+	# From https://github.com/hMatoba/Piexif/pull/109
+	"${FILESDIR}"/${P}-tests-pillow-7.2.0.patch
+)
+
+src_prepare() {
+	edos2unix tests/s_test.py  # to be able to patch it
+	default
+}
+
+python_test() {
+	"${PYTHON}" setup.py test || die
+}
diff --git a/dev-python/prettytable/prettytable-3.5.0.ebuild b/dev-python/prettytable/prettytable-3.5.0.ebuild
index f89caaac7f94..2f6c8f9c687a 100644
--- a/dev-python/prettytable/prettytable-3.5.0.ebuild
+++ b/dev-python/prettytable/prettytable-3.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/psycopg/psycopg-3.1.4.ebuild b/dev-python/psycopg/psycopg-3.1.4.ebuild
index 51949d3195b0..7c01a455c694 100644
--- a/dev-python/psycopg/psycopg-3.1.4.ebuild
+++ b/dev-python/psycopg/psycopg-3.1.4.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${P}/psycopg
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 DEPEND="
 	>=dev-db/postgresql-8.1:*
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index f43db5e48bd2..1b93929f7d42 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,2 +1,3 @@
 DIST pycairo-1.21.0.tar.gz 340712 BLAKE2B 6578c75b478c14c641b5c0be44c3c633d32ecc09c4ef22a079024dd12b539d37f88efa6ce8aadb5a88a48b3cc793e573afe00eaa4e3ba563c3133cad72dacfe4 SHA512 0de226b05d0a358f3546e4a0d5bf342f124373718d4900c891a09c1ede11e3ed1fb9bee163c00acfc215044683ddf0b29c8573b7454f9c39f957a47d63c34baf
 DIST pycairo-1.22.0.tar.gz 342295 BLAKE2B b331a627aea3b5fabaf9bbc089b5bb975178ea3be6383207ebefa994900dd73ff503309474729c9ce7b69e41c6495dd83a0db0d51410bea9aa37b30975e39700 SHA512 2a8da5b905536291291655a237fd0c6c54a5fe91a38296cffdc187c0c35837bd3176045f4ab39e59e7f67947deba7ba076c5e6ffdb46256b4b180c42267f41b6
+DIST pycairo-1.23.0.tar.gz 344623 BLAKE2B e0551e2d4259d509f3165682b11852f28f0df93e6befcd398ef95bc5f0eed0818dc72a05a9b085148d4369e9b3283bc4d91ce032c6c88a3b15962c83eb03db57 SHA512 fc0cc878cc716a6a2baf89a193facfcd89970c884afd3bb9d7fbecf42894ddd191988a8f0fe79100786509f17fbe4f1990eca33a5299414b2df2539d66de5abf
diff --git a/dev-python/pycairo/pycairo-1.23.0.ebuild b/dev-python/pycairo/pycairo-1.23.0.ebuild
new file mode 100644
index 000000000000..012914827463
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.23.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the cairo library"
+HOMEPAGE="
+	https://www.cairographics.org/pycairo/
+	https://github.com/pygobject/pycairo/
+	https://pypi.org/project/pycairo/
+"
+SRC_URI="
+	https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
+"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="examples"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=x11-libs/cairo-1.15.10[svg(+)]
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_test() {
+	esetup.py build_tests
+	epytest
+}
+
+python_install() {
+	distutils-r1_python_install \
+		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index bd8fdd9c4a29..b2a1ef174f08 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1 +1,2 @@
 DIST pycxx-7.1.5.tar.gz 156343 BLAKE2B 099de7f88c19ec86aea67b503e6fbdc0df66bbdd3bdc0ff7f8ce77425be9486e6abebed8548f9ac764688a85e62cda77d3832f460e5678b4c07b1c6d2123b257 SHA512 0f980298739886d0c05ddd5ee23ebb234014b8276d811e62dc5b0a738666c6a011ad3f4aeeb7b1b404d8bff87dddfc30f68eec9c6bd13d5f262a2f7c53e273be
+DIST pycxx-7.1.7.tar.gz 156383 BLAKE2B 69a454615c9a7cdc57f4c357b9e3805821711bc48efb82e684da6066069ff0ee6af3b76911a705adb6f984969659441d331a8470061b514180ddf53f6494a33d SHA512 5439b2f72a7f04a628e7e93d093566654f3b4eafe78a7834005f86fb08e614f22f4d1fffb8d626e46cd56880ff7792e494ee3282b313ce668a7497d2bc1fbea9
diff --git a/dev-python/pycxx/pycxx-7.1.7.ebuild b/dev-python/pycxx/pycxx-7.1.7.ebuild
new file mode 100644
index 000000000000..8ba3c357860e
--- /dev/null
+++ b/dev-python/pycxx/pycxx-7.1.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+# DISTUTILS_USE_PEP517=setuptools broken, installs files to /usr/CXX
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Set of facilities to extend Python with C++"
+HOMEPAGE="http://cxx.sourceforge.net"
+SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="doc examples"
+
+python_prepare_all() {
+	# Without this, pysvn fails.
+	# Src/Python3/cxxextensions.c: No such file or directory
+	sed -e "/^#include/s:Src/::" -i Src/*.{c,cxx} || die "sed failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Doc/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r Demo/Python{2,3}/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyspnego/pyspnego-0.6.3.ebuild b/dev-python/pyspnego/pyspnego-0.6.3.ebuild
index 883b1ca4a940..676f1df1a526 100644
--- a/dev-python/pyspnego/pyspnego-0.6.3.ebuild
+++ b/dev-python/pyspnego/pyspnego-0.6.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index 80ed5fc49c1c..242b0c338cd9 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1 +1,2 @@
 DIST pysvn-1.9.15.tar.gz 667161 BLAKE2B 35e9e0967d5c0b4cebf546e40df17b66c66406d0f8100c32e6e840220f60b0083c0ed3f3af5f54e2264d06905ea90970d6b7cbfad2bab872a14d5d4aea5900df SHA512 0809507134fd31f6bcc90217e7840eb166e2eb2ed56316010a549dd70f6f855599f596942574343cdefd5997947b12c847df2cd145669f50aa93f603e46a5ee0
+DIST pysvn-1.9.18.tar.gz 667827 BLAKE2B cd32b4ec55118becd496a9aab6f4dd2b9d57c82e12d5a08b18d36d0caffbafe7066ff45c9493a36499979e759d38dd6b15a68e7bb5819464362c2691e7599160 SHA512 0ca2924223cdc5f29e961e879db6b0f88e82b5c4c40df50169468dd5a72cbccddea9f0d1680ef4a54d45e89b4b2b2c3c22f5e76c66196783a89cac8b583b6623
diff --git a/dev-python/pysvn/files/pysvn-1.9.18-tests-3.11.patch b/dev-python/pysvn/files/pysvn-1.9.18-tests-3.11.patch
new file mode 100644
index 000000000000..06a0bec16720
--- /dev/null
+++ b/dev-python/pysvn/files/pysvn-1.9.18-tests-3.11.patch
@@ -0,0 +1,33 @@
+From 0f4a2071dfeb90357a3eba947d6dd7cc879675ce Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 29 Nov 2022 01:08:49 +0100
+Subject: [PATCH] Examples/Client/svn_cmd.py: Stop DeprecationWarning from
+ breaking tests with Python 3.11
+
+---
+ Examples/Client/svn_cmd.py | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/Examples/Client/svn_cmd.py b/Examples/Client/svn_cmd.py
+index 42e4c87..b8ef4ff 100644
+--- a/Examples/Client/svn_cmd.py
++++ b/Examples/Client/svn_cmd.py
+@@ -72,7 +72,14 @@ def initLocale():
+         locale.setlocale( locale.LC_ALL, '' )
+ 
+     else:
+-        language_code, encoding = locale.getdefaultlocale()
++        import warnings
++
++        with warnings.catch_warnings():
++            if sys.version_info >= (3, 11):
++                warnings.filterwarnings("ignore", category=DeprecationWarning)
++
++            language_code, encoding = locale.getdefaultlocale()
++
+         if language_code is None:
+             language_code = 'en_GB'
+ 
+-- 
+2.38.1
+
diff --git a/dev-python/pysvn/pysvn-1.9.18.ebuild b/dev-python/pysvn/pysvn-1.9.18.ebuild
new file mode 100644
index 000000000000..aef643b124fc
--- /dev/null
+++ b/dev-python/pysvn/pysvn-1.9.18.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Object-oriented python bindings for subversion"
+HOMEPAGE="https://pysvn.sourceforge.io/"
+SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc examples"
+
+DEPEND="
+	>=dev-python/pycxx-7.0.2[${PYTHON_USEDEP}]
+	>=dev-vcs/subversion-1.9"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.18-tests-3.11.patch
+)
+
+python_prepare_all() {
+	# Don't use internal copy of dev-python/pycxx.
+	rm -r Import || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	cd Source || die
+	CC="$(tc-getCC)" CCC="$(tc-getCXX)" \
+		esetup.py configure
+}
+
+python_compile() {
+	cd Source || die
+	emake
+}
+
+python_test() {
+	cd Tests || die
+	emake
+}
+
+python_install() {
+	cd Source || die
+	python_domodule pysvn
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Docs/. )
+	if use examples; then
+		docinto examples
+		dodoc -r Examples/Client/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.4.1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.4.1.ebuild
index 44f25acabc3b..302798e50e48 100644
--- a/dev-python/pytest-datadir/pytest-datadir-1.4.1.ebuild
+++ b/dev-python/pytest-datadir/pytest-datadir-1.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-subtests/Manifest b/dev-python/pytest-subtests/Manifest
index f03ec7f71117..a6a2ac1af939 100644
--- a/dev-python/pytest-subtests/Manifest
+++ b/dev-python/pytest-subtests/Manifest
@@ -1,2 +1 @@
-DIST pytest-subtests-0.8.0.gh.tar.gz 9767 BLAKE2B 707f6744f1cd7723d7bee11f5e535750fa179e7ad3912cd94d5200002e1dc0a206cbdb5c3bc8be587a1c81342ef9d6a8a397acd08388096a484feca6f9c84e0c SHA512 0164e02c81685108bb5c12f7e7ce92dc2fd5c844be454b2cb26e3cb942d51c453f06bb48e0300438a82b28c747dea35ea4f75eaf65ff8b66b338bcb0f0dd9ed1
 DIST pytest-subtests-0.9.0.gh.tar.gz 9840 BLAKE2B c94155c1e44b4bf81bc4d2d1963c952b721634372db9dc5c1b8a7819acba8e84815333c0c67a90d2a930abb98affbd99a721796ed09513635923f6a89e336d4a SHA512 f1bc2b99e6f04864cdc45675574d32821fd5e08c01c937bddc846ac509cd8906d21ee63b11e9e8a87c2631334541e9adc601a7dd69702572d51c3d4b72443ad2
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.8.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.8.0.ebuild
deleted file mode 100644
index 6b5064adaa7f..000000000000
--- a/dev-python/pytest-subtests/pytest-subtests-0.8.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="unittest subTest() support and subtests fixture"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-subtests/
-	https://pypi.org/project/pytest-subtests/"
-SRC_URI="
-	https://github.com/pytest-dev/pytest-subtests/archive/refs/tags/${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/pytest-7[${PYTHON_USEDEP}]
-"
-# pytest-xdist is used to test compatibility
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-xdist[${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=xdist.plugin,xdist.looponfail,pytest_forked,pytest_subtests
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# broken by output changes
-		# https://github.com/pytest-dev/pytest-subtests/issues/69
-		"tests/test_subtests.py::TestSubTest::test_simple_terminal_normal[unittest]"
-		"tests/test_subtests.py::TestSubTest::test_simple_terminal_verbose[unittest]"
-	)
-
-	epytest
-}
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.9.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.9.0.ebuild
index 618e15e8497f..0a42e289857a 100644
--- a/dev-python/pytest-subtests/pytest-subtests-0.9.0.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.9.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-7[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/pytest-7.2.0.ebuild b/dev-python/pytest/pytest-7.2.0.ebuild
index 9a3eded93d49..6c1c874c9ebc 100644
--- a/dev-python/pytest/pytest-7.2.0.ebuild
+++ b/dev-python/pytest/pytest-7.2.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-zstandard/python-zstandard-0.19.0.ebuild b/dev-python/python-zstandard/python-zstandard-0.19.0.ebuild
index c1c01b356ed5..e6910829dd86 100644
--- a/dev-python/python-zstandard/python-zstandard-0.19.0.ebuild
+++ b/dev-python/python-zstandard/python-zstandard-0.19.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	app-arch/zstd:=
diff --git a/dev-python/reportlab/reportlab-3.6.12.ebuild b/dev-python/reportlab/reportlab-3.6.12.ebuild
index 9b41c6f158c5..33b455bb38c2 100644
--- a/dev-python/reportlab/reportlab-3.6.12.ebuild
+++ b/dev-python/reportlab/reportlab-3.6.12.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	media-libs/freetype
diff --git a/dev-python/scikit-build/scikit-build-0.16.2.ebuild b/dev-python/scikit-build/scikit-build-0.16.2.ebuild
index 0d03b807abe5..014f5c622844 100644
--- a/dev-python/scikit-build/scikit-build-0.16.2.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.16.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
diff --git a/dev-python/tomlkit/tomlkit-0.11.6.ebuild b/dev-python/tomlkit/tomlkit-0.11.6.ebuild
index 45480a830136..a9599bdf36a3 100644
--- a/dev-python/tomlkit/tomlkit-0.11.6.ebuild
+++ b/dev-python/tomlkit/tomlkit-0.11.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index ac5bae1f731f..0cf00daa5510 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,4 @@
 DIST virtualenv-20.16.5.tar.gz 12223925 BLAKE2B 4f87f955d2d2c2b722d7a3699a74dc06aff7f2898203e87e607d1cabf182954fdf5eb2ba847d7b5641ded88e068d6e133441082703f8d874fbb92583f72eb6b1 SHA512 2d4f96057eb8fea5da07126bbc656306b8ebc2db1c82a84b784fcb82cd1959a571dc1f016dead9561e1d073a8b06e10f2e225d6484b363b960adaa64239826d3
 DIST virtualenv-20.16.6.tar.gz 12233333 BLAKE2B 3165de2c5350185f06ad2c1b105987b6bca421d5172a07dbef6486a285c2c5e7f8e095901241c894daec11f2e9bc565ddb2a7605eb5ff5ec9f84ea77296ab206 SHA512 24ca5038cc4e9cd72cf99a8bd4b96bda10cdc8deae2e6e7a0bef5000fd8fbeda87c4fda21aeb3b109a3763e47e0a7c7a5f383914a1bb1edcd8ed6791117d91cb
 DIST virtualenv-20.16.7.tar.gz 12268638 BLAKE2B 59403066eaa717532f672d5367916dda69c53e075c09eec62c2cdc1eaf3d642c206b4cf4959f498776b2c6022a88a42c21f2f8308a1efe9c2d03fb0f4ca634a2 SHA512 975298181696c4636a9567c29b4da5bad703d35fcf2a110cc24146e5bf7afe63b3fcb1f1601586b03bc0deef08c2278577bedf40cb21a7e07841986a9215dc69
+DIST virtualenv-20.17.0.tar.gz 12269523 BLAKE2B 0aca62cbe7467b8afa17c6189439cbc9141c8e3d471674a65d3624180bf7bef199a5860b56be1659c4c9b40c065bad9ff8b879b85d785aff97a6b63ff7b428a9 SHA512 28318a33b168c2226e703951b9205d48fd0349fa8407f265cdba97d9d12d7aec6bfe209f1de4f115eb860ced0a3c0323ab6bd5ac9b88f72342e95daeed839524
diff --git a/dev-python/virtualenv/virtualenv-20.17.0.ebuild b/dev-python/virtualenv/virtualenv-20.17.0.ebuild
new file mode 100644
index 000000000000..f2e11ebbb72a
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.17.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.4.1[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-63.2.0[${PYTHON_USEDEP}]
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+		# tests failing without python2 installed
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
+		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
+		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
+	)
+
+	epytest
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/wsaccel/wsaccel-0.6.4.ebuild b/dev-python/wsaccel/wsaccel-0.6.4.ebuild
index 1adc234a4d0a..95d147ebc849 100644
--- a/dev-python/wsaccel/wsaccel-0.6.4.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-11-29 08:08:05 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-11-29 08:08:05 +0000
commit	45f6013c107855664ed7bc3a1ab320ca4e839c2b (patch)
tree	9e607b3ee5829bb4667109b58554dcc65b6bef2d /dev-python
parent	8c928ef04ae398485ff725dd57ab841057e424ac (diff)
download	baldeagleos-repo-45f6013c107855664ed7bc3a1ab320ca4e839c2b.tar.gz baldeagleos-repo-45f6013c107855664ed7bc3a1ab320ca4e839c2b.tar.xz baldeagleos-repo-45f6013c107855664ed7bc3a1ab320ca4e839c2b.zip