Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-05-06 00:39:16 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-05-06 00:39:16 +0000
commit: 9fb02fec29b8d4a8f841cc22fc7d091423c8a490 (patch)
tree: 5cb519e4f0ca1c13915c83b6b2ee956b30080a17 /dev-python
parent: 8a4f25c17601de403342a103fed7b8809f820f63 (diff)
download: baldeagleos-repo-9fb02fec29b8d4a8f841cc22fc7d091423c8a490.tar.gz
baldeagleos-repo-9fb02fec29b8d4a8f841cc22fc7d091423c8a490.tar.xz
baldeagleos-repo-9fb02fec29b8d4a8f841cc22fc7d091423c8a490.zip
79 files changed, 802 insertions, 1248 deletions
diff --git a/dev-python/PyPDF2/metadata.xml b/dev-python/PyPDF2/metadata.xml
index 853174b8f2ab..062759e6a6b3 100644
--- a/dev-python/PyPDF2/metadata.xml
+++ b/dev-python/PyPDF2/metadata.xml
@@ -5,6 +5,8 @@
   <email>python@gentoo.org</email>
   <name>Python</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="cpe">cpe:/a:pypdf2_project:pypdf2</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/asttokens/asttokens-2.0.5.ebuild b/dev-python/asttokens/asttokens-2.0.5.ebuild
index 157fbb8f0ead..7cf9c63c5f5d 100644
--- a/dev-python/asttokens/asttokens-2.0.5.ebuild
+++ b/dev-python/asttokens/asttokens-2.0.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 23a153a25e38..a1a85babf638 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1 +1,2 @@
 DIST autobahn-22.3.2.tar.gz 376020 BLAKE2B 5d7b776c24541b08363942ed1868d5e7a2ccb4f99edc1ad722d3d68417852f324e79afa5ec8cc0251499ba27c078087ba40be744d657b562f5f1c431492705b6 SHA512 a33619bb7624f56bf571a4c61d11290316554c5c5a23724c6d5624f1e8e673dfc6a8e12ea3b17f809306a14f45e982b3425a23efb123003b575b248718c9a299
+DIST autobahn-22.4.2.tar.gz 396061 BLAKE2B da51f53f138ff6935f55561305c9cb0b29dcfef27fa63f32beac867f8aec2149a681f2dcbea6f30423e5571bf0fbf18fe13604c11d1accf78629c714bcbbc754 SHA512 9d803a699dd370b25e6c1601e635fe60a8e24f33245008bfe271d34ba47e70b7fab8c555a2c68a5255515a51e56476a63bfb0c9d98ed3687b71317ab46efc5ec
diff --git a/dev-python/autobahn/autobahn-22.4.2.ebuild b/dev-python/autobahn/autobahn-22.4.2.ebuild
new file mode 100644
index 000000000000..9b7c7ac13093
--- /dev/null
+++ b/dev-python/autobahn/autobahn-22.4.2.ebuild
@@ -0,0 +1,115 @@
+# 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} )
+
+inherit distutils-r1 optfeature
+
+MY_P=${PN}-$(ver_rs 3 -)
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.org/project/autobahn/
+	https://crossbar.io/autobahn/
+	https://github.com/crossbario/autobahn-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="test xbr"
+RESTRICT="!test? ( test )"
+
+# The order of deps is based on their appearance in setup.py
+# All extra deps should be included in test and in optfeature
+RDEPEND="
+	>=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}]
+		>=dev-python/snappy-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/ujson-4.0.2[${PYTHON_USEDEP}]
+		>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
+		>=dev-python/flatbuffers-1.12[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
+		>=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
+		>=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
+
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	if use xbr ; then
+		eerror "***************"
+		eerror "Required xbr dependencies are incomplete in Gentoo."
+		eerror "So this functionality will not yet work"
+		eerror "Please file a bug if this feature is needed"
+		eerror "***************"
+	else
+		# remove xbr components
+		export AUTOBAHN_STRIP_XBR="True"
+	fi
+
+	# avoid useless rust dependency
+	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
+
+	# remove twisted plugin cache regen in setup.py
+	# to fix tinderbox sandbox issue
+	sed -e '/import/s:reactor:__importmustfail__:' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	einfo "Testing all, cryptosign using twisted"
+	local -x USE_TWISTED=true
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
+	unset USE_TWISTED
+
+	einfo "RE-testing cryptosign and component_aio using asyncio"
+	local -x USE_ASYNCIO=true
+	epytest autobahn/wamp/test/test_wamp_{cryptosign,component_aio}.py
+	unset USE_ASYNCIO
+
+	rm -f twisted/plugins/dropin.cache || die
+}
+
+pkg_postinst() {
+	optfeature "C-based WebSocket acceleration" "dev-python/wsaccel"
+	optfeature "non-standard WebSocket compression support" "dev-python/snappy"
+	optfeature "accelerated WAMP serialization support" \
+		"dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson"
+	optfeature "TLS transport encryption" \
+		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/pyqrcode dev-python/service_identity"
+	optfeature "WAMP-SCRAM authentication" \
+		"dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
+	optfeature "native SIMD acceleration" "dev-python/cffi"
+
+	python_foreach_impl twisted-regen-cache
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 1eccf950ed89..4a5ba00edfe0 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,9 +1,2 @@
-DIST boto3-1.21.42.tar.gz 488786 BLAKE2B eba75a62e2460aeb2ea66641fadb52448314e639af3d3ecb09f2ab48336bfdc78be868a5d710ba295732a65518eaef882a162df4d25cb8cb344aa27ab3f2ecbb SHA512 3ee8a299cad05e4317916286028608f3d289e6c2c3b04606dca8ede9ba7f3e8931321f33c91c40bd9c4aa15a2cab21245de5c26f6637139fa716149fbcac9c2c
-DIST boto3-1.21.46.tar.gz 491253 BLAKE2B f55d30087e4f29e3d8ba577d798cd4e4c5fe1f710ac172d6684f005047a422855a6fad91aaaac76e3f33260cbac35be81c8177a80bea913283bcbe7bacb3750f SHA512 0d219b1af786583318a078413a3b30999b2aaad985db72eafe2b63f0068996f0d13b7a48464909cc753d5f9098ea583336ef4887839db5375ebdfcedad3dbffa
-DIST boto3-1.22.0.tar.gz 492175 BLAKE2B cce4b21c0f4de7e70b1c9e402d9e19ccda26e7fc6eab07686c378ae8a9a72a7cf3bb3e2927282e21cd167ca395d63e1fbdfb31d385e5e7a2591c48367c80517c SHA512 b4c51a26e95344ec6e4b876d88148c9603ae7807105ffd0564d928f611c278729f00efd38baff4b31154b358b17ae72c6b90698aef9c013b601bc70d543e2ffb
-DIST boto3-1.22.1.tar.gz 493753 BLAKE2B bd58778f89b792b3203b4b8f86edaca2149ebc24399af9ffa090d9c8ccfa812a078e2d6742bafd08197e39e5020da16948fabb685a448b7acf7ce520321c94cd SHA512 0a8d02325331bb2e069fd1f7280a3c57dae8f6a25f6593db8a1c7998f765d2957765a71645a748da891e66d5ccee859d34171fabea08de62e13ee7793c0d7cb5
-DIST boto3-1.22.2.tar.gz 494671 BLAKE2B c9b72c6a4b667772147235c5791ac4d08adb9e4bd690ea9e369ce712fd705dcc89b2fea4f5b2c580702cc4eb5064b3e46f1237de15e5dd812e2b88c54144d665 SHA512 ecf5d77fb5128a79001a0ccf2e141197d23c0a24d61517e191058de24498d63b13e351fb8e0bfe28f1c58c676d44b2e7f98bd80c41a2510c61d737e086c1010b
-DIST boto3-1.22.3.tar.gz 495091 BLAKE2B a917cfec2cb77f9c639160be06f610855b625a9cf55858e0df4602823d6b068a0e188ee911c40255db9fa88b8e20d8b0354948be36e6bf4923b2e4cc45c30524 SHA512 1b12f40b981faf110a76af2418b2afa6fbcfd1ec01bbc842c2c75518245ca11a7d9bc7d5704965246008d43005e7a7a839cdfee7a2e49786ff543bddd1a41c02
 DIST boto3-1.22.4.tar.gz 495554 BLAKE2B 4c06e2101bcc96e4fab7e088f8593c7b1cfd2b07431d4cd062666df6c1f5d55d9b7fb594268e9a86c4793d35bc3d8de2644244728cf62833dfefb62525eedbdc SHA512 26dbd9ed1af900f7466a1767ada3fb8ee86fa09ca21733f857e2748d98525661fc76e69d75440fe913260e75245cf30298493417d055399a242af0aedaffd349
-DIST boto3-1.22.5.tar.gz 495793 BLAKE2B df31095d43413694ecdefbd641b3f5b54d6c45181752c17fa2558930ce1ef92a6245a4b74503ec8ce0c94273ab47eb2c2868893fb95217a864fe6cc9a39f0a6c SHA512 63124dc8d21273dd80d10b18e14c9e0a0fda449c18a4a4b585a4c8a98ab5c0c10a344d3bf3ddc4306c294fc77339a80bd38fbba335ef71350c81564182c581f2
-DIST boto3-1.22.6.tar.gz 496139 BLAKE2B 85f35eb258550368ca09244086d3fe91365f0b87c26260d8ef7b77119a70836b582c08c32298df48812a6363835206a2ed88577186efd871e5df3f2eabf4272f SHA512 d21c00aeea4db8f11a8aeddba254ae598246f963eb7d45fcf104d5e5c8fce6aabcc2700e396c6a5e911680a04688800e66b7ecae908d2e186c0a9d591fba04c1
+DIST boto3-1.22.7.tar.gz 496523 BLAKE2B 400370268e51b229bd3c465ccc43df93b713e3088baf76cbb7367cdc75b8374b787fee635cc921b431d5e1471a60a990d57a306d8ebdb14f0c462f211b323f99 SHA512 a7b56723a0fd692496a4e397ca29139f0813bfcea365877900441f01f38e5fd15d20a1642a5717940994bdfc840540d38b9a594e2510ab070ae62fadf9b4958b
diff --git a/dev-python/boto3/boto3-1.21.42.ebuild b/dev-python/boto3/boto3-1.21.42.ebuild
deleted file mode 100644
index 0f0535243225..000000000000
--- a/dev-python/boto3/boto3-1.21.42.ebuild
+++ /dev/null
@@ -1,63 +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} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/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/${PN}/archive/${PV}.tar.gz -> ${P}.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.3.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 "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.46.ebuild b/dev-python/boto3/boto3-1.21.46.ebuild
deleted file mode 100644
index 80278b309f54..000000000000
--- a/dev-python/boto3/boto3-1.21.46.ebuild
+++ /dev/null
@@ -1,63 +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} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/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/${PN}/archive/${PV}.tar.gz -> ${P}.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.3.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 "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.22.0.ebuild b/dev-python/boto3/boto3-1.22.0.ebuild
deleted file mode 100644
index a60384bf1f0d..000000000000
--- a/dev-python/boto3/boto3-1.22.0.ebuild
+++ /dev/null
@@ -1,66 +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} )
-
-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/${PN}/archive/${PV}.tar.gz -> ${P}.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.3.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 "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.22.1.ebuild b/dev-python/boto3/boto3-1.22.1.ebuild
deleted file mode 100644
index a60384bf1f0d..000000000000
--- a/dev-python/boto3/boto3-1.22.1.ebuild
+++ /dev/null
@@ -1,66 +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} )
-
-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/${PN}/archive/${PV}.tar.gz -> ${P}.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.3.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 "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.22.2.ebuild b/dev-python/boto3/boto3-1.22.2.ebuild
deleted file mode 100644
index a60384bf1f0d..000000000000
--- a/dev-python/boto3/boto3-1.22.2.ebuild
+++ /dev/null
@@ -1,66 +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} )
-
-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/${PN}/archive/${PV}.tar.gz -> ${P}.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.3.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 "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.22.3.ebuild b/dev-python/boto3/boto3-1.22.3.ebuild
deleted file mode 100644
index a60384bf1f0d..000000000000
--- a/dev-python/boto3/boto3-1.22.3.ebuild
+++ /dev/null
@@ -1,66 +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} )
-
-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/${PN}/archive/${PV}.tar.gz -> ${P}.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.3.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 "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.22.4.ebuild b/dev-python/boto3/boto3-1.22.4.ebuild
index a60384bf1f0d..6daa6ab64e33 100644
--- a/dev-python/boto3/boto3-1.22.4.ebuild
+++ b/dev-python/boto3/boto3-1.22.4.ebuild
@@ -22,7 +22,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.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.22.5.ebuild b/dev-python/boto3/boto3-1.22.5.ebuild
deleted file mode 100644
index a60384bf1f0d..000000000000
--- a/dev-python/boto3/boto3-1.22.5.ebuild
+++ /dev/null
@@ -1,66 +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} )
-
-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/${PN}/archive/${PV}.tar.gz -> ${P}.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.3.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 "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.22.6.ebuild b/dev-python/boto3/boto3-1.22.7.ebuild
index b62a1bd2ec8f..b62a1bd2ec8f 100644
--- a/dev-python/boto3/boto3-1.22.6.ebuild
+++ b/dev-python/boto3/boto3-1.22.7.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index b2965ecead93..6650276b641c 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,9 +1,2 @@
-DIST botocore-1.24.42.tar.gz 8907476 BLAKE2B 11cdce9d9c69835b1e57757d67d561f24932698dcaf9fc20e1add319889992b9c57c91ab5e9495027b9b96b6782698b29801d3f3815e8bfb47a67197c91448b5 SHA512 c7339cf03b121289eccc8dfe24c16ab28cba121ec1cd1883eaf2b29cd57b5e84d4e4b3a0bfcb8b4cbd0d213976af30630b2bda22e336edbaf208f5edd7823571
-DIST botocore-1.24.46.tar.gz 8922345 BLAKE2B f9caf235e902be9e4e15e9a570e67cac328eb7e53668e7e12ba8e6caa4c9ed53e22115231d58fdf8d782ff3ab618e5485438dce7c454918a5d53341e5e5967ac SHA512 ccdbd6e6617a68f810c5491f37a6e94ffe015b30dfea8b01c2543b58c81573358b69af702df2fcf3efb7dd2c4b715e86957c4d60b8f0a0a51279e921dfe02993
-DIST botocore-1.25.0.tar.gz 8925642 BLAKE2B 7f7b89e59801564284cd5e22958bb590aeb821c38682c7dd6163fd31b1c181ae67412b3d8cde351a48a63c2e762923d6bb2bb051e9a367468eb77db228e1c3ad SHA512 43f3edcd6868b37933b24486091097dd6dfc51f51773bea3e3cff1fce5eef5f8b3df6d09b8815c858f5c8d7e87e8ed14cf13f236e72c851e4f98d52ad85e4afc
-DIST botocore-1.25.1.tar.gz 8931771 BLAKE2B 6d2ba3c564104e8463ce588a0f9de47d4ecb7397ae03ddd4698b38f18617ab225676925d142ae0805467f860410addfbefbf6eed521d5142b994274c3bde7a06 SHA512 52dff81c0f7064aa1edc15aebf3e326c0b4ba1dc87667c8da6f487b1caa03a5ba3247253994139dab7d40873197d88f94e8545ffc3e2d51f26c14de27b5d6460
-DIST botocore-1.25.2.tar.gz 8947291 BLAKE2B fedf6c61ac2bc43ae6a60f7afb717d319ffd3baf4d6c5849a11279e96901e4968141b916c8d3c46ff007942ffe25fc85e7c8ef5176331e6537446cf349edc52f SHA512 5660e1fc96575dfa7d8c177192783f6edf5689176f6e3ac8c9ec5c85debe7a124297e1e61af5e1a35785346e40deba1ef7a2d8eac52902cda2cffb0327dcb701
-DIST botocore-1.25.3.tar.gz 8949001 BLAKE2B 5c59bbf4f5189de36093881f4b702027484f916664f8360ed90a301a9db407e44c41f69feb118a54e2f35025711e131f69bae1a032cbf7d3eb339b1cd0bc85a4 SHA512 27e2853e938139e670f1155b64b9e233675316ea11aa2eb6e8dc74dc1b50b75d909811b2a7d470a6933f5263bab10d8aa9108eddd0c501ad974dbb1bc2ff741e
 DIST botocore-1.25.4.tar.gz 8955210 BLAKE2B 50880e9d7f57e4f3b8662625a64e9470eaf8a984fdbcc34239bfe604544ccd3ac62e953d7be4e1b486fab4ad0d571361ffc9fdc43cb860cd37a95c33d7b824b2 SHA512 a04e03271d217ab1ef5488dcfedda2904b8e628dae969c74e284d004ae72f18d9734d3f7cf775235c8384b30f4d0fbfda7c0e5dcd687039ddb7b339330e63317
-DIST botocore-1.25.5.tar.gz 8956539 BLAKE2B d4e3206a44fffe0d0f4ac1ebf493cd9613ad8b0ae4524255c290c8fe2d67b74e45eaff5a8b5004cc747fef9c8b27da9ef5047145c44787d348b03495a1277f31 SHA512 594fbf14dcf9a64ffe3111255e02b6b60fef856e360228b6466b96945e581f17d0b035f4df0cec14525b9cb54ca583d0aa5a0c5039595052f4bcedd96351c91e
-DIST botocore-1.25.6.tar.gz 8960023 BLAKE2B fabcd513c89b30ce2635b71722649e15fc3bc4c44c40de70569fa1c228d0c17573e10ceedb5a3418fd13b5871bdb15a4a951842e439d8a3c3d08030e666b4328 SHA512 0dc9c0230edcee8e64954fde4ed1d25b7e84375e29cfcaacadd7182898e0b51b93454a62240da3b79c9919af18ff6f42b73a7dac5944476397e8eccfd9857fff
+DIST botocore-1.25.7.tar.gz 8961319 BLAKE2B 1d22e3cd625252f1e6c6b13b9317750b48765150006ca0b632fd15aa6f31079855a1b6c7201cbed0ebfc7147a87389e1a4445d0736829554f8063b68944107cf SHA512 a22a35a1de87aff2efa7b4b5f478e44be7ce2eadf0b7da43af2a0de9ba315a9b75ac59da29a8f10ed15bbf6ff4d76d904407f95a7f8f08049c546450bd6c7c4d
diff --git a/dev-python/botocore/botocore-1.24.42.ebuild b/dev-python/botocore/botocore-1.24.42.ebuild
deleted file mode 100644
index 96074109f08d..000000000000
--- a/dev-python/botocore/botocore-1.24.42.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} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/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="mirror://pypi/${PN:0:1}/${PN}/${P}.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}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-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
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.46.ebuild b/dev-python/botocore/botocore-1.24.46.ebuild
deleted file mode 100644
index 5fe8ae8c2f96..000000000000
--- a/dev-python/botocore/botocore-1.24.46.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} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/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="mirror://pypi/${PN:0:1}/${PN}/${P}.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}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-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
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.25.0.ebuild b/dev-python/botocore/botocore-1.25.0.ebuild
deleted file mode 100644
index a45a0b69b8f6..000000000000
--- a/dev-python/botocore/botocore-1.25.0.ebuild
+++ /dev/null
@@ -1,71 +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} )
-
-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="mirror://pypi/${PN:0:1}/${PN}/${P}.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}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-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
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.25.1.ebuild b/dev-python/botocore/botocore-1.25.1.ebuild
deleted file mode 100644
index a45a0b69b8f6..000000000000
--- a/dev-python/botocore/botocore-1.25.1.ebuild
+++ /dev/null
@@ -1,71 +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} )
-
-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="mirror://pypi/${PN:0:1}/${PN}/${P}.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}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-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
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.25.2.ebuild b/dev-python/botocore/botocore-1.25.2.ebuild
deleted file mode 100644
index a45a0b69b8f6..000000000000
--- a/dev-python/botocore/botocore-1.25.2.ebuild
+++ /dev/null
@@ -1,71 +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} )
-
-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="mirror://pypi/${PN:0:1}/${PN}/${P}.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}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-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
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.25.3.ebuild b/dev-python/botocore/botocore-1.25.3.ebuild
deleted file mode 100644
index a45a0b69b8f6..000000000000
--- a/dev-python/botocore/botocore-1.25.3.ebuild
+++ /dev/null
@@ -1,71 +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} )
-
-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="mirror://pypi/${PN:0:1}/${PN}/${P}.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}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-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
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.25.4.ebuild b/dev-python/botocore/botocore-1.25.4.ebuild
index a45a0b69b8f6..b2f7cfb36a2c 100644
--- a/dev-python/botocore/botocore-1.25.4.ebuild
+++ b/dev-python/botocore/botocore-1.25.4.ebuild
@@ -21,7 +21,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.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.25.5.ebuild b/dev-python/botocore/botocore-1.25.5.ebuild
deleted file mode 100644
index a45a0b69b8f6..000000000000
--- a/dev-python/botocore/botocore-1.25.5.ebuild
+++ /dev/null
@@ -1,71 +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} )
-
-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="mirror://pypi/${PN:0:1}/${PN}/${P}.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}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-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
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.25.6.ebuild b/dev-python/botocore/botocore-1.25.7.ebuild
index 245c8cbd8472..245c8cbd8472 100644
--- a/dev-python/botocore/botocore-1.25.6.ebuild
+++ b/dev-python/botocore/botocore-1.25.7.ebuild
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index 745af2b1da17..a9cf9fe659a8 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1 +1,2 @@
 DIST defcon-0.10.0.tar.gz 426111 BLAKE2B 6750ac064677bd1b2a2b49d37792b4e35c923ddd239c521490dd3aa0c40f55a96dcdac156a2511c3bb40605505beb920c66053488bb2bc2508899d4a81f77ddb SHA512 69d48701bdf419080b7acafe2b92c1897358d969d6ea5b78330969b79b9e393a1c53cfb1a17b4d58719329c403ac3a52a4e12828d99b8793d8dd19ddda151c76
+DIST defcon-0.10.1.tar.gz 426234 BLAKE2B 0d4f0749c061860603d343bd8d0291699a64794ec8f3f1e6f1cff0af0f22cd0cfc4ae60d578c5f55131d1de694b3234017afd124a4266c972217b39d70071473 SHA512 12cb1512321b91676f8be380999dfb00942eb8355389db409ef896f7e7100fc97186a920c1c0a741b660e57134e880d068446e5ad00e2768221f80a26608819c
diff --git a/dev-python/defcon/defcon-0.10.1.ebuild b/dev-python/defcon/defcon-0.10.1.ebuild
new file mode 100644
index 000000000000..384521522525
--- /dev/null
+++ b/dev-python/defcon/defcon-0.10.1.ebuild
@@ -0,0 +1,31 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A set of UFO based objects for use in font editing applications"
+HOMEPAGE="https://github.com/robotools/defcon"
+SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/fonttools-4.28.5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/django-haystack/Manifest b/dev-python/django-haystack/Manifest
index d185fffe7b2b..cd44a6b40c86 100644
--- a/dev-python/django-haystack/Manifest
+++ b/dev-python/django-haystack/Manifest
@@ -1 +1,2 @@
 DIST django-haystack-3.0.tar.gz 450713 BLAKE2B 0766711b127dfa1515583998058f588bea1619a792d6eef353da569a212b94c36683c0a743bdabee563c473f19f3197800bd585faf0b4eb39663b5ffbac6d6b8 SHA512 466ac18bbb6d6add1482d9debdffd195a2049c6c287cc4620e4db2ce4a702c97ca8ffb3ce048dc6c278dc50be701daab4f32b05a71c94ac67645890afb9f49bf
+DIST django-haystack-3.2.1.tar.gz 466580 BLAKE2B 6071ae9502a3bad885e95b79a1969b6ca6dd044a6d113726045d722168aa05d88b12047b0fbf7d7710936bd32158f2f9c27a6f29868e70e00f88ded1bc3b740a SHA512 60ce7297243ab5a43780b0aed6f25970ef0438aaadf8f7c92f89970e58c045d3f6ba7a5a635a275e21dc73b116fb33cad32a41991a677bd0a9c66aef4b7ff0c2
diff --git a/dev-python/django-haystack/django-haystack-3.2.1.ebuild b/dev-python/django-haystack/django-haystack-3.2.1.ebuild
new file mode 100644
index 000000000000..7ac9394be5d5
--- /dev/null
+++ b/dev-python/django-haystack/django-haystack-3.2.1.ebuild
@@ -0,0 +1,23 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Pluggable search for Django"
+HOMEPAGE="https://haystacksearch.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]"
+
+# tests have too many dependencies to maintain
+RESTRICT="test"
+
+distutils_enable_sphinx docs --no-autodoc
diff --git a/dev-python/dnspython/dnspython-2.2.1.ebuild b/dev-python/dnspython/dnspython-2.2.1.ebuild
index 04c52394f5ec..5c94abbdd5df 100644
--- a/dev-python/dnspython/dnspython-2.2.1.ebuild
+++ b/dev-python/dnspython/dnspython-2.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 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 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild b/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
index 325cb24b6d1d..4d388e2747a9 100644
--- a/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
+++ b/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/executing/executing-0.8.3.ebuild b/dev-python/executing/executing-0.8.3.ebuild
index 99afe5a67578..26383c98b03e 100644
--- a/dev-python/executing/executing-0.8.3.ebuild
+++ b/dev-python/executing/executing-0.8.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86"
 
 # asttokens is optional runtime dep
 BDEPEND="
diff --git a/dev-python/gpep517/gpep517-3.ebuild b/dev-python/gpep517/gpep517-3.ebuild
index 48414905d4af..2887a0fe6570 100644
--- a/dev-python/gpep517/gpep517-3.ebuild
+++ b/dev-python/gpep517/gpep517-3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k 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"
 
 RDEPEND="
 	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/gpep517/gpep517-4.ebuild b/dev-python/gpep517/gpep517-4.ebuild
index 9961a68562f4..1d630f7f146a 100644
--- a/dev-python/gpep517/gpep517-4.ebuild
+++ b/dev-python/gpep517/gpep517-4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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"
 
 RDEPEND="
 	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ini2toml/ini2toml-0.10.ebuild b/dev-python/ini2toml/ini2toml-0.10.ebuild
index df81bc9f5d0d..cb3ac5711f0f 100644
--- a/dev-python/ini2toml/ini2toml-0.10.ebuild
+++ b/dev-python/ini2toml/ini2toml-0.10.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
diff --git a/dev-python/ipython/ipython-8.2.0.ebuild b/dev-python/ipython/ipython-8.2.0.ebuild
index dc93fe9b07d5..59560099d2b7 100644
--- a/dev-python/ipython/ipython-8.2.0.ebuild
+++ b/dev-python/ipython/ipython-8.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ipython/ipython-8.3.0.ebuild b/dev-python/ipython/ipython-8.3.0-r1.ebuild
index df1d5b7e9fed..640e52da01ac 100644
--- a/dev-python/ipython/ipython-8.3.0.ebuild
+++ b/dev-python/ipython/ipython-8.3.0-r1.ebuild
@@ -23,6 +23,7 @@ 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}]
@@ -32,9 +33,6 @@ RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/stack_data[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
-	matplotlib? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)
 "
 
 BDEPEND="
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 2c484f637935..2b035efe4cd7 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1 +1,2 @@
 DIST jsonschema-4.4.0.tar.gz 313519 BLAKE2B 6339c4ac9e99b55e41c133861baacb6644e04d15e915d3199955512530c946973ca6d5348746688660ea7392d53102754dba3f3380fc8aa3a4ab284a9dcde684 SHA512 8e5c138f4debf7540e2cd131f3f208d1778927ac9036f5fa67bcf5db8c62fe1bb454c7818ee61acef64e856ea4b498ef6ab08be314a3c6b1e461e0bb44db41c7
+DIST jsonschema-4.5.1.tar.gz 282414 BLAKE2B 5b1d4e591e48c760e89a438b3bf9ea6b27b0959030be4558d5a863ceea218bdc4db19d09e2783724026fc2e10eeb6c969a939f4d1a5b44c16dbf7ff39c61a743 SHA512 3866a649ece45c1c69d3d5e9810cfdb094f1af82fcc08a186f9babd7516ad311c4bffa52f61f013bc84e7ab1be06605c5fab738c1c920ff8ce85a73429d9efde
diff --git a/dev-python/jsonschema/jsonschema-4.5.1.ebuild b/dev-python/jsonschema/jsonschema-4.5.1.ebuild
new file mode 100644
index 000000000000..d4bdf59d058a
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.5.1.ebuild
@@ -0,0 +1,50 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema/
+	https://github.com/python-jsonschema/jsonschema/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
+	' 3.8)
+"
+
+# formatter deps
+RDEPEND+="
+	dev-python/fqdn[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/isoduration[${PYTHON_USEDEP}]
+	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
+	dev-python/rfc3987[${PYTHON_USEDEP}]
+	dev-python/uri_template[${PYTHON_USEDEP}]
+	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires pip, does not make much sense for the users
+	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
+	# wtf?
+	jsonschema/tests/test_deprecations.py::TestDeprecations::test_version
+)
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
index 60672c6c8703..8706751092e7 100644
--- a/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Clear-BSD"
 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"
 
 COMMON_DEPEND="
 	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/littleutils/littleutils-0.2.2.ebuild b/dev-python/littleutils/littleutils-0.2.2.ebuild
index 1d1492994d17..092a21e55424 100644
--- a/dev-python/littleutils/littleutils-0.2.2.ebuild
+++ b/dev-python/littleutils/littleutils-0.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86"
 
 python_test() {
 	"${EPYTHON}" -m doctest -v ${PN}/__init__.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/matplotlib/matplotlib-3.4.3-r1.ebuild b/dev-python/matplotlib/matplotlib-3.4.3-r1.ebuild
index dad6e655d48c..99f9dca850df 100644
--- a/dev-python/matplotlib/matplotlib-3.4.3-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -71,9 +71,7 @@ RDEPEND="
 		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
 	)
 	wxwidgets? (
-		$(python_gen_cond_dep '
-			dev-python/wxpython:*[${PYTHON_USEDEP}]
-		' python3_{8,9})
+		dev-python/wxpython:*[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/matplotlib/matplotlib-3.5.1.ebuild b/dev-python/matplotlib/matplotlib-3.5.1.ebuild
index 2d6fdc2b4f35..84ebd0a6988b 100644
--- a/dev-python/matplotlib/matplotlib-3.5.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.1.ebuild
@@ -73,9 +73,7 @@ RDEPEND="
 		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
 	)
 	wxwidgets? (
-		$(python_gen_cond_dep '
-			dev-python/wxpython:*[${PYTHON_USEDEP}]
-		' python3_{8,9})
+		dev-python/wxpython:*[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/neovim-remote/Manifest b/dev-python/neovim-remote/Manifest
index 2eab41f49497..de84c2754b82 100644
--- a/dev-python/neovim-remote/Manifest
+++ b/dev-python/neovim-remote/Manifest
@@ -1 +1,2 @@
 DIST neovim-remote-2.4.0.tar.gz 438687 BLAKE2B 0dfbe3d660d9b2f6b7a4f1016d4d230d63612306ea99079364ed5c6dbae51df7a19c4d1bca51a7bfad142ffe5811e286b843edf6b0715c7aac921c584701030e SHA512 073bf95a0238c76c19258d886fe71e23ec85f9cba200b8a490014a2842d1a84b3c95092afcfdcc8ca80122639b9e07652594faa24ed6a6aff537192ec3a3d14c
+DIST neovim-remote-2.4.2.gh.tar.gz 438766 BLAKE2B e4ff3218e405da24f5146e38fec94d61953e2b89ef1bdae49a2ec925c3c1f953187fec51e9ea9a71c9265959212221fd73d59582a8f91fd4c03c734ad04e219f SHA512 4c39a28781d33bd179492816b2723dba4ef8e535813a25373c94852125b2b743732e98875c89111dce4a6329338c7d69837fed0dd9072740b1bf2b0f192855ab
diff --git a/dev-python/neovim-remote/neovim-remote-2.4.2.ebuild b/dev-python/neovim-remote/neovim-remote-2.4.2.ebuild
new file mode 100644
index 000000000000..1df6e632cd85
--- /dev/null
+++ b/dev-python/neovim-remote/neovim-remote-2.4.2.ebuild
@@ -0,0 +1,42 @@
+# 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} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mhinz/${PN}.git"
+else
+	SRC_URI="
+		https://github.com/mhinz/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+DESCRIPTION="A tool that helps control neovim processes"
+HOMEPAGE="
+	https://github.com/mhinz/neovim-remote/
+	https://pypi.org/project/neovim-remote/
+"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/pynvim[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		app-editors/neovim
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/neovim-remote/neovim-remote-9999.ebuild b/dev-python/neovim-remote/neovim-remote-9999.ebuild
index 1f08408042b9..1df6e632cd85 100644
--- a/dev-python/neovim-remote/neovim-remote-9999.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-9999.ebuild
@@ -1,21 +1,29 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} )
+
 inherit distutils-r1
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mhinz/${PN}.git"
 else
-	SRC_URI="https://github.com/mhinz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/mhinz/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
 	KEYWORDS="~amd64 ~arm"
 fi
 
 DESCRIPTION="A tool that helps control neovim processes"
-HOMEPAGE="https://github.com/mhinz/neovim-remote"
+HOMEPAGE="
+	https://github.com/mhinz/neovim-remote/
+	https://pypi.org/project/neovim-remote/
+"
 
 LICENSE="MIT"
 SLOT="0"
@@ -25,8 +33,10 @@ RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests pytest
-
-BDEPEND+="
-	test? ( app-editors/neovim )
+BDEPEND="
+	test? (
+		app-editors/neovim
+	)
 "
+
+distutils_enable_tests pytest
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 45a241227279..fb6cec0090b7 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1 +1,2 @@
 DIST oslo.concurrency-4.5.0.tar.gz 58979 BLAKE2B 9e2eb4a233985a33994aeaf335c195c980e1e9dd8b48a7c4e53ae502599f12c0dc65466ee45569a97b72f1face0e80ce166922ca3e42f6ad28fd5b27bdf884a3 SHA512 13a2f4d39d3241370374e6fe4ea6047dfc4d20da6116aaebd27f085fdbce089d58b0ebab4f1224234c88237cdefafc2f96229e6527bf5cda13ef1e471e25a50c
+DIST oslo.concurrency-4.5.1.tar.gz 59126 BLAKE2B 61f509b4ce76cd036b695bb5ad744374e029239a63a629a4b96d44c8ba29150095fe9d57000367c4d07dc7c358ef61cfa4868a2347f206327093ad32ffb85955 SHA512 88319915c90befb01a275666b4a760357c1e72f04d5faf27ab9c67629ecbf2dd3a73d077f3c57435231b55aa777a9642f26e91cc4cb27ad56eb801b2b98eca48
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.5.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.5.1.ebuild
new file mode 100644
index 000000000000..6b8af9705801
--- /dev/null
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.5.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2021-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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Oslo Concurrency library"
+HOMEPAGE="https://pypi.org/project/oslo.concurrency/
+	https://github.com/openstack/oslo.concurrency"
+SRC_URI="mirror://pypi/o/${PN/-/.}/${PN/-/.}-${PV}.tar.gz"
+S="${WORKDIR}/${PN/-/.}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/eventlet-0.19.0[${PYTHON_USEDEP}]
+		' 3.8 3.9)
+	)
+"
+
+distutils_enable_tests unittest
+
+python_compile() {
+	distutils-r1_python_compile
+	if ! has "${EPYTHON}" python3.{8..9}; then
+		find "${BUILD_DIR}"/install -name '*eventlet*.py' -delete || die
+	fi
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	eunittest
+}
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index df842770e4d2..cb7cde0b82a5 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1 +1,2 @@
 DIST oslo.log-4.7.0.tar.gz 92502 BLAKE2B 092a3673d769be807db90790d68aae3ffa219bb31edf7477bd8ef5a8d290d2cb7978d1c088d7048fd31f519091170627d433b496bd1532b8eeb2dc47e3ac854b SHA512 eeb7e158c940e35b28f736e8ae5fe0beadedf821f1f54f340490307c3a7dac58b2c62393bc4cd26af43b1be37372422323987e4f830d5c4c25e4ec01bc327856
+DIST oslo.log-4.8.0.tar.gz 92939 BLAKE2B 1bbd2d6c2d7c44ea9a2bf8e037b64d37018e3208c2cab13e0e2ae547087ba6ed5b1cb6e39bd4a6be0896a723180b4307c7393a57fcb2169cfd05d01cca6f5b99 SHA512 a918aba1707aeaeed7883497f1cefd6c6169889283627adee5c3a41c6840043b963c8f74db0c47f840c9019a9e783660a1850235c9479653fefccbceffa83fc2
diff --git a/dev-python/oslo-log/oslo-log-4.8.0.ebuild b/dev-python/oslo-log/oslo-log-4.8.0.ebuild
new file mode 100644
index 000000000000..cb2c30a3c8a3
--- /dev/null
+++ b/dev-python/oslo-log/oslo-log-4.8.0.ebuild
@@ -0,0 +1,47 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack logging config library, configuration for all openstack projects"
+HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx doc/source \
+	dev-python/openstackdocstheme \
+	dev-python/oslo-config
+
+python_test() {
+	eunittest -b
+}
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index 2d96592bd0aa..92b4eaa75be2 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -1,2 +1,3 @@
 DIST ovs-2.13.0.tar.gz 100450 BLAKE2B 943486bf0aad0e8e9eac96c85aeccb32fd36c60689623acc76175eafc286f4689142d6ea6953224e0a4ea8e4437c56738cb5b113286114de0898bf783cd49668 SHA512 7ec8980257ae87d24dbabc5900cf81253490bcfa0431f96b79280603da04a972fc536055bf532d2b251e03e007b49b34e8118b0f323e5fee05c116824d68562c
 DIST ovs-2.13.3.tar.gz 102736 BLAKE2B ee6f10a41bf46534d3963360a63a0a39a7ffbed6de468894c566c7dd2ee0c645cf6f8f211bfbcda70f03b4204e396fc0b081f457df9d27f93fc40d158bb641b8 SHA512 9f73dc383f7b717000d6d1f8f2f9114ee2be2457c9b352de68c01c1f9075c39ab4a9ef14fe67083bf1da1872240204eb2642fbf7b5a871a5ad044191e0774d88
+DIST ovs-2.17.1.post1.tar.gz 104766 BLAKE2B e1cb471f7f3f3b8461292c79ee5318a36d70c2ee55947bfa0274277e36514d20ad9293cb8c602e0b2c82a590397869fe51f52ee2579255bb8163014d58dccaf7 SHA512 772e7b4768f1e7fe1f2be700a0eb6bc539459e4c70432c45e7f7877b060f4c845eaa5a974f2b2264af621f5f43b97da30a9fe344a53904ec0008393689e6b895
diff --git a/dev-python/ovs/ovs-2.17.1_p1.ebuild b/dev-python/ovs/ovs-2.17.1_p1.ebuild
new file mode 100644
index 000000000000..624a99a4970b
--- /dev/null
+++ b/dev-python/ovs/ovs-2.17.1_p1.ebuild
@@ -0,0 +1,21 @@
+# 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} )
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+
+DESCRIPTION="OVS bindings for python"
+HOMEPAGE="https://github.com/openvswitch/ovs/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index e47a21a036c6..1a898093aece 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1 +1,2 @@
 DIST pbr-5.8.0.tar.gz 127170 BLAKE2B 7fbd166f01617617c0dff568d1bb88a4be03d62f4f0c3ca1a7d16a7cefb20dcc924ffbb8df0d2d34516cfe3b60b8e380a0eb4a1071220bb4ab695d3d7c88d824 SHA512 61a8eb63bb76ce8515c4203d60df7c973e02ea61b603d155b611724efb2b15c42416bf8a0285451d3378056d390bbf63d991cec32cc4114ae5cc30ebae0a5a69
+DIST pbr-5.9.0.tar.gz 126893 BLAKE2B 3f1d39c037afa7fe6d45b0b039968243e99717b347d1f1ada25023a64e7e683c0d83d2ce177e0f7c5f4cb65cd2a0eedd594b463d5d72bdc86560d811bd3f0cd3 SHA512 b36cc331664b91899a884bb1bc6980174ba2463db35c591d480d0b5a49dd37781132893e488c6a9238fbd2ec16589652d66b01a8c2701d02ff5c0b04e9c6121b
diff --git a/dev-python/pbr/pbr-5.9.0.ebuild b/dev-python/pbr/pbr-5.9.0.ebuild
new file mode 100644
index 000000000000..c7fe6b972d99
--- /dev/null
+++ b/dev-python/pbr/pbr-5.9.0.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=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="https://github.com/openstack/pbr/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}]
+"
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
+# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
+# stestr is run as external tool
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}]
+			dev-vcs/git
+		' 'python*')
+	)"
+
+distutils_enable_tests unittest
+
+# This normally actually belongs here.
+python_prepare_all() {
+	# TODO: investigate
+	sed -e s':test_console_script_develop:_&:' \
+		-e s':test_console_script_install:_&:' \
+		-i pbr/tests/test_core.py || die
+	# broken on pypy3
+	# https://bugs.launchpad.net/pbr/+bug/1881479
+	sed -e 's:test_generates_c_extensions:_&:' \
+		-i pbr/tests/test_packaging.py || die
+	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
+	# installs random packages via pip from the Internet
+	sed -e 's:test_requirement_parsing:_&:' \
+		-e 's:test_pep_517_support:_&:' \
+		-i pbr/tests/test_packaging.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if [[ ${EPYTHON} != python* ]]; then
+		einfo "Testing on ${EPYTHON} is not supported at the moment"
+		return
+	fi
+
+	eunittest -b
+}
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 254f7d231533..db76e50cb998 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1 +1,2 @@
 DIST prettytable-3.2.0.tar.gz 52976 BLAKE2B ec41ffe9c752f530128d641a3341cc5c2dc4fd26ae8cf795fd526144ae8c82d359d022a9d52aebcea3217251c7d9513ef2df0f50c3a4f31ec0c2ef6b9c7e6189 SHA512 8f2a0945159727741a52ffdaa5602b862841cb8e0c33d3f755699f4376d2c0bfa539a270e56242503f94cb4fc469cbfd27348abfd740ec8f1cd3f1970053e5db
+DIST prettytable-3.3.0.tar.gz 54305 BLAKE2B 4d131c16b6c6a0fd64aae1f9f54e286bf27b562888af56a6944d192a24c05d6138c3bdb8f298dcc060db7609d72b8d86ab9664bf6bcf43cd2105bdd433bae3cf SHA512 e190717e2ea89e8faddc7015fd5118e0d93ac5f5318641ce5960b22b4ea3740ff12c4d15812b33655252f258c96f9e848f554d1e678d39761c28025ba7772609
diff --git a/dev-python/prettytable/prettytable-3.3.0.ebuild b/dev-python/prettytable/prettytable-3.3.0.ebuild
new file mode 100644
index 000000000000..661f345b1982
--- /dev/null
+++ b/dev-python/prettytable/prettytable-3.3.0.ebuild
@@ -0,0 +1,31 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
+HOMEPAGE="
+	https://github.com/jazzband/prettytable/
+	https://pypi.org/project/prettytable/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/psutil/files/psutil-5.9.0-tests.patch b/dev-python/psutil/files/psutil-5.9.0-tests.patch
index 56a5e1168733..245041f81221 100644
--- a/dev-python/psutil/files/psutil-5.9.0-tests.patch
+++ b/dev-python/psutil/files/psutil-5.9.0-tests.patch
@@ -19,7 +19,7 @@ index 21bb3e61..6c45c9e0 100644
  IS_64BIT = sys.maxsize > 2 ** 32
  
 diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
-index 20e28d29..ce5d10a0 100755
+index 20e28d29..ab676110 100755
 --- a/psutil/tests/test_linux.py
 +++ b/psutil/tests/test_linux.py
 @@ -28,6 +28,7 @@ from psutil._compat import PY3
@@ -30,7 +30,21 @@ index 20e28d29..ce5d10a0 100755
  from psutil.tests import GITHUB_ACTIONS
  from psutil.tests import GLOBAL_TIMEOUT
  from psutil.tests import HAS_BATTERY
-@@ -929,6 +930,7 @@ class TestLoadAvg(PsutilTestCase):
+@@ -896,11 +897,13 @@ class TestSystemCPUFrequency(PsutilTestCase):
+ @unittest.skipIf(not LINUX, "LINUX only")
+ class TestSystemCPUStats(PsutilTestCase):
+ 
++    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
+     def test_ctx_switches(self):
+         vmstat_value = vmstat("context switches")
+         psutil_value = psutil.cpu_stats().ctx_switches
+         self.assertAlmostEqual(vmstat_value, psutil_value, delta=500)
+ 
++    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
+     def test_interrupts(self):
+         vmstat_value = vmstat("interrupts")
+         psutil_value = psutil.cpu_stats().interrupts
+@@ -929,6 +932,7 @@ class TestLoadAvg(PsutilTestCase):
  @unittest.skipIf(not LINUX, "LINUX only")
  class TestSystemNetIfAddrs(PsutilTestCase):
  
@@ -38,7 +52,15 @@ index 20e28d29..ce5d10a0 100755
      def test_ips(self):
          for name, addrs in psutil.net_if_addrs().items():
              for addr in addrs:
-@@ -1491,6 +1493,7 @@ class TestMisc(PsutilTestCase):
+@@ -1316,6 +1320,7 @@ class TestRootFsDeviceFinder(PsutilTestCase):
+         findmnt_value = sh("findmnt -o SOURCE -rn /")
+         self.assertEqual(psutil_value, findmnt_value)
+ 
++    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
+     def test_disk_partitions_mocked(self):
+         with mock.patch(
+                 'psutil._pslinux.cext.disk_partitions',
+@@ -1491,6 +1496,7 @@ class TestMisc(PsutilTestCase):
              psutil.PROCFS_PATH = "/proc"
  
      @retry_on_failure()
@@ -46,7 +68,7 @@ index 20e28d29..ce5d10a0 100755
      def test_issue_687(self):
          # In case of thread ID:
          # - pid_exists() is supposed to return False
-@@ -1596,6 +1599,8 @@ class TestSensorsBattery(PsutilTestCase):
+@@ -1596,6 +1602,8 @@ class TestSensorsBattery(PsutilTestCase):
              self.assertEqual(psutil.sensors_battery().power_plugged, False)
              assert m.called
  
@@ -55,7 +77,7 @@ index 20e28d29..ce5d10a0 100755
      def test_emulate_power_undetermined(self):
          # Pretend we can't know whether the AC power cable not
          # connected (assert fallback to False).
-@@ -1614,6 +1619,8 @@ class TestSensorsBattery(PsutilTestCase):
+@@ -1614,6 +1622,8 @@ class TestSensorsBattery(PsutilTestCase):
              self.assertIsNone(psutil.sensors_battery().power_plugged)
              assert m.called
  
@@ -64,7 +86,7 @@ index 20e28d29..ce5d10a0 100755
      def test_emulate_energy_full_0(self):
          # Emulate a case where energy_full files returns 0.
          with mock_open_content(
-@@ -1621,6 +1628,8 @@ class TestSensorsBattery(PsutilTestCase):
+@@ -1621,6 +1631,8 @@ class TestSensorsBattery(PsutilTestCase):
              self.assertEqual(psutil.sensors_battery().percent, 0)
              assert m.called
  
@@ -73,7 +95,7 @@ index 20e28d29..ce5d10a0 100755
      def test_emulate_energy_full_not_avail(self):
          # Emulate a case where energy_full file does not exist.
          # Expected fallback on /capacity.
-@@ -1634,6 +1643,8 @@ class TestSensorsBattery(PsutilTestCase):
+@@ -1634,6 +1646,8 @@ class TestSensorsBattery(PsutilTestCase):
                          "/sys/class/power_supply/BAT0/capacity", b"88"):
                      self.assertEqual(psutil.sensors_battery().percent, 88)
  
@@ -82,7 +104,7 @@ index 20e28d29..ce5d10a0 100755
      def test_emulate_no_power(self):
          # Emulate a case where /AC0/online file nor /BAT0/status exist.
          with mock_open_exception(
-@@ -2220,6 +2231,7 @@ class TestProcessAgainstStatus(PsutilTestCase):
+@@ -2220,6 +2234,7 @@ class TestProcessAgainstStatus(PsutilTestCase):
          value = self.read_status_file("nonvoluntary_ctxt_switches:")
          self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
  
@@ -111,7 +133,7 @@ index d946eb62..a53de565 100755
          if PY3:
              from io import StringIO
 diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py
-index 31b81926..7eb9bac5 100755
+index 31b81926..53b17953 100755
 --- a/psutil/tests/test_posix.py
 +++ b/psutil/tests/test_posix.py
 @@ -23,6 +23,7 @@ from psutil import OPENBSD
@@ -122,7 +144,23 @@ index 31b81926..7eb9bac5 100755
  from psutil.tests import HAS_NET_IO_COUNTERS
  from psutil.tests import PYTHON_EXE
  from psutil.tests import PsutilTestCase
-@@ -326,6 +327,7 @@ class TestSystemAPIs(PsutilTestCase):
+@@ -193,6 +194,7 @@ class TestProcess(PsutilTestCase):
+         vsz_psutil = psutil.Process(self.pid).memory_info()[1] / 1024
+         self.assertEqual(vsz_ps, vsz_psutil)
+ 
++    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
+     def test_name(self):
+         name_ps = ps_name(self.pid)
+         # remove path if there is any, from the command
+@@ -271,6 +273,7 @@ class TestProcess(PsutilTestCase):
+             adjusted_ps_pathname = ps_pathname[:len(ps_pathname)]
+             self.assertEqual(ps_pathname, adjusted_ps_pathname)
+ 
++    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
+     def test_cmdline(self):
+         ps_cmdline = ps_args(self.pid)
+         psutil_cmdline = " ".join(psutil.Process(self.pid).cmdline())
+@@ -326,6 +329,7 @@ class TestSystemAPIs(PsutilTestCase):
                      "couldn't find %s nic in 'ifconfig -a' output\n%s" % (
                          nic, output))
  
@@ -167,7 +205,7 @@ index c9059e33..0050c42a 100755
      @unittest.skipIf(not POSIX, "POSIX only")
      def test_weird_environ(self):
 diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
-index db2cb348..b1faa154 100755
+index db2cb348..411835d4 100755
 --- a/psutil/tests/test_system.py
 +++ b/psutil/tests/test_system.py
 @@ -33,6 +33,7 @@ from psutil._compat import long
@@ -186,3 +224,11 @@ index db2cb348..b1faa154 100755
      @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
      def test_users(self):
          users = psutil.users()
+@@ -580,6 +582,7 @@ class TestDiskAPIs(PsutilTestCase):
+     def test_disk_usage_bytes(self):
+         psutil.disk_usage(b'.')
+ 
++    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
+     def test_disk_partitions(self):
+         def check_ntuple(nt):
+             self.assertIsInstance(nt.device, str)
diff --git a/dev-python/pure_eval/pure_eval-0.2.2.ebuild b/dev-python/pure_eval/pure_eval-0.2.2.ebuild
index 2574f649cad1..8fbffbf46563 100644
--- a/dev-python/pure_eval/pure_eval-0.2.2.ebuild
+++ b/dev-python/pure_eval/pure_eval-0.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86"
 
 BDEPEND="dev-python/wheel[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index a3808f1e9433..4456f619d9e1 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,2 +1 @@
-DIST pybind11-2.9.1.tar.gz 703882 BLAKE2B cc162332b637f81ea5d3098a2e9882f16a9c889e83e6ccd36d2a2da2f90361d8d188abd559f2313b45ff1de7d9ee56ee198c1193b47829d1fdf6d8871ce35b0c SHA512 1f268cc6df1f572658bfc3e60f7f010bec9b9444d6a6d6c95f7b26f7b4b7dd42846e65ae5a611c01c0341335fdfa84b01272b5c1b2cc11a418f64fecabfa0588
 DIST pybind11-2.9.2.tar.gz 709521 BLAKE2B 76ae9c72faad805885eabbe4dadf1092fe814f04f2a8d834da035c7389dcc996c09a63149911aa7a5c0b70d2da9f7c32e94aaf1c941f13345e0aef40a5748dfc SHA512 c6c18e5f59873adb3692640ade26472abd257607e7bb9fd48cfd1949878811e83d6ac6eb8c8dd926622d52ca4f13e5e6a58e0abaaaa1fa814ee831ea2b515272
diff --git a/dev-python/pybind11/files/pybind11-2.9.1-numpy-1.22.patch b/dev-python/pybind11/files/pybind11-2.9.1-numpy-1.22.patch
deleted file mode 100644
index c7f16fb53364..000000000000
--- a/dev-python/pybind11/files/pybind11-2.9.1-numpy-1.22.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From 116f8c7db5a11d0e1e7830de3f2bbf3e5ed1316c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 3 Feb 2022 17:41:45 +0100
-Subject: [PATCH 1/2] test: Strip whitespace when comparing numpy dtypes for
- 1.22 compat
-
-Strip whitespace when comparing numpy dtype str() in order to preserve
-test compatibility with both numpy 1.22 and older versions whose output
-differ by whitespace.
-
-Fixes #3680
----
- tests/test_numpy_dtypes.py | 44 +++++++++++++++++++-------------------
- 1 file changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/tests/test_numpy_dtypes.py b/tests/test_numpy_dtypes.py
-index 06e578329e..43480334aa 100644
---- a/tests/test_numpy_dtypes.py
-+++ b/tests/test_numpy_dtypes.py
-@@ -32,8 +32,8 @@ def dt_fmt():
-     e = "<" if byteorder == "little" else ">"
-     return (
-         "{{'names':['bool_','uint_','float_','ldbl_'],"
--        " 'formats':['?','" + e + "u4','" + e + "f4','" + e + "f{}'],"
--        " 'offsets':[0,4,8,{}], 'itemsize':{}}}"
-+        "'formats':['?','" + e + "u4','" + e + "f4','" + e + "f{}'],"
-+        "'offsets':[0,4,8,{}],'itemsize':{}}}"
-     )
- 
- 
-@@ -46,7 +46,7 @@ def simple_dtype_fmt():
- def packed_dtype_fmt():
-     from sys import byteorder
- 
--    return "[('bool_', '?'), ('uint_', '{e}u4'), ('float_', '{e}f4'), ('ldbl_', '{e}f{}')]".format(
-+    return "[('bool_','?'),('uint_','{e}u4'),('float_','{e}f4'),('ldbl_','{e}f{}')]".format(
-         np.dtype("longdouble").itemsize, e="<" if byteorder == "little" else ">"
-     )
- 
-@@ -77,7 +77,7 @@ def partial_nested_fmt():
-     partial_size = partial_ld_off + ld.itemsize
-     partial_end_padding = partial_size % np.dtype("uint64").alignment
-     partial_nested_size = partial_nested_off * 2 + partial_size + partial_end_padding
--    return "{{'names':['a'], 'formats':[{}], 'offsets':[{}], 'itemsize':{}}}".format(
-+    return "{{'names':['a'],'formats':[{}],'offsets':[{}],'itemsize':{}}}".format(
-         partial_dtype_fmt(), partial_nested_off, partial_nested_size
-     )
- 
-@@ -123,25 +123,25 @@ def test_dtype(simple_dtype):
- 
-     e = "<" if byteorder == "little" else ">"
- 
--    assert m.print_dtypes() == [
-+    assert [x.replace(' ', '') for x in m.print_dtypes()] == [
-         simple_dtype_fmt(),
-         packed_dtype_fmt(),
--        "[('a', {}), ('b', {})]".format(simple_dtype_fmt(), packed_dtype_fmt()),
-+        "[('a',{}),('b',{})]".format(simple_dtype_fmt(), packed_dtype_fmt()),
-         partial_dtype_fmt(),
-         partial_nested_fmt(),
--        "[('a', 'S3'), ('b', 'S3')]",
-+        "[('a','S3'),('b','S3')]",
-         (
--            "{{'names':['a','b','c','d'], "
--            + "'formats':[('S4', (3,)),('"
-+            "{{'names':['a','b','c','d'],"
-+            + "'formats':[('S4',(3,)),('"
-             + e
--            + "i4', (2,)),('u1', (3,)),('"
-+            + "i4',(2,)),('u1',(3,)),('"
-             + e
--            + "f4', (4, 2))], "
--            + "'offsets':[0,12,20,24], 'itemsize':56}}"
-+            + "f4',(4,2))],"
-+            + "'offsets':[0,12,20,24],'itemsize':56}}"
-         ).format(e=e),
--        "[('e1', '" + e + "i8'), ('e2', 'u1')]",
--        "[('x', 'i1'), ('y', '" + e + "u8')]",
--        "[('cflt', '" + e + "c8'), ('cdbl', '" + e + "c16')]",
-+        "[('e1','" + e + "i8'),('e2','u1')]",
-+        "[('x','i1'),('y','" + e + "u8')]",
-+        "[('cflt','" + e + "c8'),('cdbl','" + e + "c16')]",
-     ]
- 
-     d1 = np.dtype(
-@@ -238,7 +238,7 @@ def test_recarray(simple_dtype, packed_dtype):
-     ]
- 
-     arr = m.create_rec_partial(3)
--    assert str(arr.dtype) == partial_dtype_fmt()
-+    assert str(arr.dtype).replace(' ', '') == partial_dtype_fmt()
-     partial_dtype = arr.dtype
-     assert "" not in arr.dtype.fields
-     assert partial_dtype.itemsize > simple_dtype.itemsize
-@@ -246,7 +246,7 @@ def test_recarray(simple_dtype, packed_dtype):
-     assert_equal(arr, elements, packed_dtype)
- 
-     arr = m.create_rec_partial_nested(3)
--    assert str(arr.dtype) == partial_nested_fmt()
-+    assert str(arr.dtype).replace(' ', '') == partial_nested_fmt()
-     assert "" not in arr.dtype.fields
-     assert "" not in arr.dtype.fields["a"][0].fields
-     assert arr.dtype.itemsize > partial_dtype.itemsize
-@@ -285,12 +285,12 @@ def test_array_array():
-     e = "<" if byteorder == "little" else ">"
- 
-     arr = m.create_array_array(3)
--    assert str(arr.dtype) == (
--        "{{'names':['a','b','c','d'], "
--        + "'formats':[('S4', (3,)),('"
-+    assert str(arr.dtype).replace(' ', '') == (
-+        "{{'names':['a','b','c','d'],"
-+        + "'formats':[('S4',(3,)),('"
-         + e
--        + "i4', (2,)),('u1', (3,)),('{e}f4', (4, 2))], "
--        + "'offsets':[0,12,20,24], 'itemsize':56}}"
-+        + "i4',(2,)),('u1',(3,)),('{e}f4',(4,2))],"
-+        + "'offsets':[0,12,20,24],'itemsize':56}}"
-     ).format(e=e)
-     assert m.print_array_array(arr) == [
-         "a={{A,B,C,D},{K,L,M,N},{U,V,W,X}},b={0,1},"
-
-From 2c4a1e98e56a257fbc8dd0e8644181acd6d7e5a7 Mon Sep 17 00:00:00 2001
-From: "pre-commit-ci[bot]"
- <66853113+pre-commit-ci[bot]@users.noreply.github.com>
-Date: Thu, 3 Feb 2022 16:45:33 +0000
-Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks
-
-for more information, see https://pre-commit.ci
----
- tests/test_numpy_dtypes.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/test_numpy_dtypes.py b/tests/test_numpy_dtypes.py
-index 43480334aa..0098eccb87 100644
---- a/tests/test_numpy_dtypes.py
-+++ b/tests/test_numpy_dtypes.py
-@@ -123,7 +123,7 @@ def test_dtype(simple_dtype):
- 
-     e = "<" if byteorder == "little" else ">"
- 
--    assert [x.replace(' ', '') for x in m.print_dtypes()] == [
-+    assert [x.replace(" ", "") for x in m.print_dtypes()] == [
-         simple_dtype_fmt(),
-         packed_dtype_fmt(),
-         "[('a',{}),('b',{})]".format(simple_dtype_fmt(), packed_dtype_fmt()),
-@@ -238,7 +238,7 @@ def test_recarray(simple_dtype, packed_dtype):
-     ]
- 
-     arr = m.create_rec_partial(3)
--    assert str(arr.dtype).replace(' ', '') == partial_dtype_fmt()
-+    assert str(arr.dtype).replace(" ", "") == partial_dtype_fmt()
-     partial_dtype = arr.dtype
-     assert "" not in arr.dtype.fields
-     assert partial_dtype.itemsize > simple_dtype.itemsize
-@@ -246,7 +246,7 @@ def test_recarray(simple_dtype, packed_dtype):
-     assert_equal(arr, elements, packed_dtype)
- 
-     arr = m.create_rec_partial_nested(3)
--    assert str(arr.dtype).replace(' ', '') == partial_nested_fmt()
-+    assert str(arr.dtype).replace(" ", "") == partial_nested_fmt()
-     assert "" not in arr.dtype.fields
-     assert "" not in arr.dtype.fields["a"][0].fields
-     assert arr.dtype.itemsize > partial_dtype.itemsize
-@@ -285,7 +285,7 @@ def test_array_array():
-     e = "<" if byteorder == "little" else ">"
- 
-     arr = m.create_array_array(3)
--    assert str(arr.dtype).replace(' ', '') == (
-+    assert str(arr.dtype).replace(" ", "") == (
-         "{{'names':['a','b','c','d'],"
-         + "'formats':[('S4',(3,)),('"
-         + e
diff --git a/dev-python/pybind11/pybind11-2.9.1.ebuild b/dev-python/pybind11/pybind11-2.9.1.ebuild
deleted file mode 100644
index 4ca8eb904eb8..000000000000
--- a/dev-python/pybind11/pybind11-2.9.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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} )
-inherit cmake distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
-SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="
-	dev-cpp/eigen:3
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	export PYBIND11_USE_CMAKE=1
-	cmake_src_prepare
-
-	local PATCHES=(
-		# https://github.com/pybind/pybind11/pull/3682
-		"${FILESDIR}"/${P}-numpy-1.22.patch
-	)
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local mycmakeargs=(
-		# disable forced lto
-		-DPYBIND11_LTO_CXX_FLAGS=
-		-DPYBIND11_INSTALL=ON
-		-DPYBIND11_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Compilation only does anything for tests
-	use test && cmake_src_compile
-}
-
-python_test() {
-	cmake_build check
-}
-
-python_install() {
-	distutils-r1_python_install
-	cmake_src_install
-}
diff --git a/dev-python/pybind11/pybind11-2.9.2.ebuild b/dev-python/pybind11/pybind11-2.9.2.ebuild
index ac066d8d9c2b..8ea77d987025 100644
--- a/dev-python/pybind11/pybind11-2.9.2.ebuild
+++ b/dev-python/pybind11/pybind11-2.9.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pycurl/files/7.44-fix-tests.patch b/dev-python/pycurl/files/7.44-fix-tests.patch
new file mode 100644
index 000000000000..d5d900100086
--- /dev/null
+++ b/dev-python/pycurl/files/7.44-fix-tests.patch
@@ -0,0 +1,34 @@
+https://github.com/pycurl/pycurl/commit/d47c68b1364f8a1a45ab8c584c291d44b762f7b1
+From: Samuel Henrique <samueloph@debian.org>
+Date: Sat, 30 Apr 2022 23:02:34 +0100
+Subject: [PATCH] tests: fix error message on error_test (for curl >= 7.83)
+
+curl 7.83.0 removed exclamation marks from a few error messages, curl commit:
+https://github.com/curl/curl/commit/6968fb9d54dc3a1aaa1b16088f038eaf5dd8b2d7
+
+This commit adds support for the new curl release while also supporting the previous ones.
+--- a/tests/error_test.py
++++ b/tests/error_test.py
+@@ -29,7 +29,8 @@ def test_pycurl_error_libcurl(self):
+             err, msg = exc.args
+             self.assertEqual(pycurl.E_URL_MALFORMAT, err)
+             # possibly fragile
+-            self.assertEqual('No URL set!', msg)
++            # curl < 7.83.0 has an exclamation mark in this error message
++            self.assertIn(msg, ['No URL set!', 'No URL set'])
+         else:
+             self.fail('Expected pycurl.error to be raised')
+     
+@@ -43,9 +44,10 @@ def test_pycurl_errstr_type(self):
+             self.curl.perform()
+         except pycurl.error:
+             # might be fragile
+-            self.assertEqual('No URL set!', self.curl.errstr())
++            # curl < 7.83.0 has an exclamation mark in this error message
++            self.assertIn(self.curl.errstr(), ['No URL set!', 'No URL set'])
+             # repeated checks do not clear value
+-            self.assertEqual('No URL set!', self.curl.errstr())
++            self.assertIn(self.curl.errstr(), ['No URL set!', 'No URL set'])
+             # check the type - on all python versions
+             self.assertEqual(str, type(self.curl.errstr()))
+         else:
diff --git a/dev-python/pycurl/pycurl-7.44.1.ebuild b/dev-python/pycurl/pycurl-7.44.1.ebuild
index 178f0ab79db3..1b482739918f 100644
--- a/dev-python/pycurl/pycurl-7.44.1.ebuild
+++ b/dev-python/pycurl/pycurl-7.44.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
 RESTRICT="!test? ( test )"
 
@@ -44,6 +44,10 @@ DEPEND="${RDEPEND}
 		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	"${FILESDIR}/7.44-fix-tests.patch"
+)
+
 python_prepare_all() {
 	# docs installed into the wrong directory
 	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
diff --git a/dev-python/pyelftools/pyelftools-0.28.ebuild b/dev-python/pyelftools/pyelftools-0.28.ebuild
index 96415d351974..8e481dc13cd8 100644
--- a/dev-python/pyelftools/pyelftools-0.28.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.28.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 python_test() {
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 8f995e96196e..5f8ba16ce08f 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1 +1,2 @@
 DIST pygobject-3.42.0.tar.xz 557060 BLAKE2B 25c0634dcb713f4059d19ff2efdd67004e1343f49982123686f4df71fc2678583244dab7a22160f42d5361c3e5c6e38bcd8ccaeeafb3e1d885e5d5febaa9dde1 SHA512 2f3e9187cb8dd7ccbf139a58ea348732fc7cb95dbf4bee2ba8f78003a7540d90c0b29153d93f50bf613c2d43f0de0ec8971c61c358d48552e42ce17775a178dd
+DIST pygobject-3.42.1.tar.xz 557904 BLAKE2B 5264c1b187210622548203e0df5089262ea0b3e93d9e46679030b4722e74f1993f200cfe9357c389357902bcdfdb13c8fd9cc9d6efa3b5fa0f730c3b54017fe5 SHA512 b044d395f8334057be632fd56f670ae8405d9fc375bcbd7a0a3b2dcfb8efb06bad45e62e92d2ee5432e503642dba11d6f9bf91f26bf135fa5f9a871657105a18
diff --git a/dev-python/pygobject/pygobject-3.42.1.ebuild b/dev-python/pygobject/pygobject-3.42.1.ebuild
new file mode 100644
index 000000000000..89617b494458
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.42.1.ebuild
@@ -0,0 +1,74 @@
+# 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} )
+
+inherit gnome.org meson python-r1 virtualx xdg
+
+DESCRIPTION="Python bindings for GObject Introspection"
+HOMEPAGE="https://pygobject.readthedocs.io/"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cairo examples test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/gobject-introspection-1.56:=
+	dev-libs/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
+		x11-libs/cairo[glib] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/atk[introspection]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		x11-libs/gdk-pixbuf:2[introspection,jpeg]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	configuring() {
+		meson_src_configure \
+			$(meson_feature cairo pycairo) \
+			$(meson_use test tests) \
+			-Dpython="${EPYTHON}"
+	}
+
+	python_foreach_impl configuring
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+
+	testing() {
+		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+		meson_src_test --timeout-multiplier 3 || die "test failed for ${EPYTHON}"
+	}
+	virtx python_foreach_impl testing
+}
+
+src_install() {
+	installing() {
+		meson_src_install
+		python_optimize
+	}
+	python_foreach_impl installing
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/python-pam/python-pam-2.0.2-r1.ebuild b/dev-python/python-pam/python-pam-2.0.2-r1.ebuild
index e9d80d2cfeb8..945b7603c508 100644
--- a/dev-python/python-pam/python-pam-2.0.2-r1.ebuild
+++ b/dev-python/python-pam/python-pam-2.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/FirefighterBlu3/python-pam/archive/refs/tags/v${PV}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index fa261662598e..ab76bc36c691 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -2,3 +2,4 @@ DIST pytools-2022.1.3.tar.gz 68522 BLAKE2B 49223fa3763e40e613708323e755f3cf4df2d
 DIST pytools-2022.1.4.tar.gz 68840 BLAKE2B 27205ec5e4af2f9193c5ca3e2ca33f8511f49105b7252d3fd95006e6eb6086c1650e39050be3cb469b2906ce946144d5c5d5c155380d3e8b62b0af85975cb736 SHA512 feb1d2f10175700d8fea1e531b9f0c78a57f4f1547976ac0c4d2e40b870cba95b99b7484ba2268fb36e62894d074856acfbfeb1219b23011cddb16cea597bb2c
 DIST pytools-2022.1.5.tar.gz 68877 BLAKE2B f25bf60d4bb927f3b1cfb6535704a0ea258240985b2e112baef3505286cc21d9917a4c80ceee04bd9efd916c455dd58c696f92c03d59b056804809a1df26e743 SHA512 85086529cc0d197d97378b9862b84fd2951bfaf1fa3af1d2ff2698d0e9053949c0eb060f9203237a99eb7c7a773ef9eb46e7f503120e607a38a077333faa7c02
 DIST pytools-2022.1.6.tar.gz 68918 BLAKE2B ddbc2b4956aa820c811dd04ea6297455837d388c6aae46b73a934086014aa58633777a2647ea1aa8c13d61f2aa95f36b836d1f98104a926cdfd12402c6456410 SHA512 9b2c2f9e08d71ee5b56e352fff36206276108125174cd977103e59255f0ce180dc9bd00a9ae0e88071b3e60019862c6e72613bc094bfe64d26fa694e7de6685d
+DIST pytools-2022.1.7.tar.gz 69154 BLAKE2B cba04b4033b1910ad0946f650a6e5ab94c0802375eb27575ce56a838a6c62c541f5ed6f80842b2b42c7001a6d1bbf0379aff559110e07862e24e60d60aa2a619 SHA512 9b96aded94604848e9e8784ecdd09aa1fd99a33005ac4840f9a33a5e059895193967060e9e9eb37281a8b8ebae5c9867671109137685492c03492efe672302db
diff --git a/dev-python/pytools/pytools-2022.1.7.ebuild b/dev-python/pytools/pytools-2022.1.7.ebuild
new file mode 100644
index 000000000000..b61a0cd6a3c0
--- /dev/null
+++ b/dev-python/pytools/pytools-2022.1.7.ebuild
@@ -0,0 +1,32 @@
+# 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} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="
+	https://mathema.tician.de/software/pytools/
+	https://github.com/inducer/pytools/
+	https://pypi.org/project/pytools/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/setproctitle/setproctitle-1.2.3.ebuild b/dev-python/setproctitle/setproctitle-1.2.3.ebuild
index c3e0ce6ad6c1..9570c7d5f629 100644
--- a/dev-python/setproctitle/setproctitle-1.2.3.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.2.3.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/setuptools/setuptools-62.1.0.ebuild b/dev-python/setuptools/setuptools-62.1.0.ebuild
index 637766e29478..d2fd4886e152 100644
--- a/dev-python/setuptools/setuptools-62.1.0.ebuild
+++ b/dev-python/setuptools/setuptools-62.1.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
index 6bda6d1aa72a..6f468816a5a9 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/stack_data/stack_data-0.2.0.ebuild b/dev-python/stack_data/stack_data-0.2.0.ebuild
index 7321aad19b98..a5eaca9a67c7 100644
--- a/dev-python/stack_data/stack_data-0.2.0.ebuild
+++ b/dev-python/stack_data/stack_data-0.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86"
 
 RDEPEND="
 	dev-python/asttokens[${PYTHON_USEDEP}]
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index 1f9bca95710b..7ddc489a7a65 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,2 +1,3 @@
 DIST tldextract-3.2.0.tar.gz 103653 BLAKE2B 74b85da2e5a8c953075636f908bd32ba825c53fbea145a691cb681596376318b63729e2c6b7291f1ef21a55fa927d48e31cf0db241bb94be47f706fb68239515 SHA512 4e0731792793eb0a6d0da8387d15e8b9de17f20108361230703fd9f66f2aaad6260073b611e27135e571b1899844b271f3dae4e77122186cc78fbb05f3b3f237
 DIST tldextract-3.2.1.tar.gz 104364 BLAKE2B 6bd16ad4af4b3d7f92286f09ff265ba83f3661aa17976688e741bc3d8a2c386f695edff85f15f94fe203420cf44e5ce76ff8cfb047c3eeec1b6a8056b4a48cd1 SHA512 545013f5f25ea2e207e8dc65caeef3999f0f3a5abdaad09f5a599dc25a9344c9fde9a816785a20df8a137c082e37329f3984fdf6a80789d5976c0bef244d9095
+DIST tldextract-3.3.0.tar.gz 110388 BLAKE2B 4f60f35de9bf774b3cbf9a67e17a5724197521b1ff1ec072fe4487608165c265ba6de736140e8677eca47229fc68d6c634ba1013a5bee294e7e1990925703938 SHA512 530e8592c2813c297355cdea591a772fad3e4cdcfccf72844c49ad68ab1acd57e6050828f78fe3bbfb9d54d62f33c63fec70dfb81d9955abf971703f53daa326
diff --git a/dev-python/tldextract/tldextract-3.3.0.ebuild b/dev-python/tldextract/tldextract-3.3.0.ebuild
new file mode 100644
index 000000000000..9c41e5e693f2
--- /dev/null
+++ b/dev-python/tldextract/tldextract-3.3.0.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL"
+HOMEPAGE="https://pypi.org/project/tldextract/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-file[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/typeguard/typeguard-2.13.3.ebuild b/dev-python/typeguard/typeguard-2.13.3.ebuild
index 76ec50a16e3b..059c3b6fa4fe 100644
--- a/dev-python/typeguard/typeguard-2.13.3.ebuild
+++ b/dev-python/typeguard/typeguard-2.13.3.ebuild
@@ -16,7 +16,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/validators/Manifest b/dev-python/validators/Manifest
index f9d7f1287c36..8991f5107575 100644
--- a/dev-python/validators/Manifest
+++ b/dev-python/validators/Manifest
@@ -1 +1,2 @@
 DIST validators-0.18.2.tar.gz 30299 BLAKE2B 96be7c0bed74e32143d2ea9de7b595599d567b6a8c81b85d92ba7be035e7fe26361240896ada08b2b5f30ce5519a6828dc4350b6ce7ecdb27525e40934a10d31 SHA512 8213736508e56b5d4ddaa9c8e707a7ceb398c8b2c41b938d626459d8bf134aa113116f49cef0cd317033a683d18493448ac4107a5f50151899946bbd48197411
+DIST validators-0.19.0.tar.gz 30548 BLAKE2B 11dbd5636ea47c340175243b91bd56f55a71e833454e1f2781c879a23cfc097b3c2ee6e86ea05e47d4aeb4175dd6ecafeaa98dffc05ea55f44c8dfee23e49f5a SHA512 6d5f1913f2067670258a669a7333319a1a41f556aa8d013fd445aa301fa2dc112a1fc580b542887a60cc17d9811f262030df470d2785a3490c108b07062ddb63
diff --git a/dev-python/validators/validators-0.19.0.ebuild b/dev-python/validators/validators-0.19.0.ebuild
new file mode 100644
index 000000000000..03df93502d45
--- /dev/null
+++ b/dev-python/validators/validators-0.19.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021-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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Data Validation for Humans"
+HOMEPAGE="https://github.com/kvesteri/validators"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/werkzeug/werkzeug-2.1.1.ebuild b/dev-python/werkzeug/werkzeug-2.1.1.ebuild
index f2829b104b26..187ffa19f261 100644
--- a/dev-python/werkzeug/werkzeug-2.1.1.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.1.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-05-06 00:39:16 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-05-06 00:39:16 +0000
commit	9fb02fec29b8d4a8f841cc22fc7d091423c8a490 (patch)
tree	5cb519e4f0ca1c13915c83b6b2ee956b30080a17 /dev-python
parent	8a4f25c17601de403342a103fed7b8809f820f63 (diff)
download	baldeagleos-repo-9fb02fec29b8d4a8f841cc22fc7d091423c8a490.tar.gz baldeagleos-repo-9fb02fec29b8d4a8f841cc22fc7d091423c8a490.tar.xz baldeagleos-repo-9fb02fec29b8d4a8f841cc22fc7d091423c8a490.zip