Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-01-09 01:38:09 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-01-09 01:38:09 +0000
commit: e771466d6b39173c88bdf482632447d79a7f1d69 (patch)
tree: f8cea2425c5c1fb56e66b47a4598eef0bccb2763 /dev-python
parent: be7e773261a6219481557643c0ef737fe9153cca (diff)
download: baldeagleos-repo-e771466d6b39173c88bdf482632447d79a7f1d69.tar.gz
baldeagleos-repo-e771466d6b39173c88bdf482632447d79a7f1d69.tar.xz
baldeagleos-repo-e771466d6b39173c88bdf482632447d79a7f1d69.zip
97 files changed, 490 insertions, 1713 deletions
diff --git a/dev-python/GitPython/GitPython-3.1.24-r1.ebuild b/dev-python/GitPython/GitPython-3.1.24-r1.ebuild
index be440e237f51..b87850f5d7d2 100644
--- a/dev-python/GitPython/GitPython-3.1.24-r1.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.24-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index b165c8867461..3213c2866907 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,5 +1,2 @@
-DIST astroid-2.7.3.tar.gz 378876 BLAKE2B 016ab6e798f1a608c0e0ce0bd81865145349c70497d09e336ec8b21eaf01ea365c204f42daf6d55d148f6873ef15e223adc9baf4a09dc8945158e4b5e24f1ebb SHA512 03a886c2daef640cf0a85f38e39b6e12080dc722862cb03386d1355f3f955ea46a7bb7b85c2887f52ba6d0ecb6243c653c7f1cd44d6c7429f2cd29c1dfd2297f
-DIST astroid-2.8.6.tar.gz 394852 BLAKE2B 400531227ce5a8b0f284f51ccb2d37aeb0463ee0fc7faceb3fd33b4bd727b7283421fb69c50eba3246217e06dca2cecfac49030d33c7e2a7cf252144860b50a3 SHA512 8fae723f0b7df34ba51d7f97634b09173956ae1eaa1543b81af8a80b5d9c9fcbdd96de709da2432a935dd5fc7369f9f1ea03cf2b7e3f0b09dac8485145d8f1d9
 DIST astroid-2.9.0.tar.gz 404906 BLAKE2B 2aefe21392289b95a4ea3bde047e6f33b6915f4feac722164b4c35cc97dedb83f7d2e7f277485c5a3a8c7abc7865ccd88923266aa675755eeb17b0bd22077931 SHA512 949520268303a257102c2348920df9ff779bf5736739be5985b0441fae664212bee476445dc5d52478e789e08bbd5826ef83cf8a730a73d4e2d6eb04251c3cee
-DIST astroid-2.9.1.tar.gz 408617 BLAKE2B 921178fc6be9f3905c0e93c755fbf0ff70da4bf6242cb10a6881e78b66f9636fa39d7aef1ba9435ec69ae314968d33126a64d2d11a8da2aa2ee0dc9010d58ce3 SHA512 b6c69a316bd9f21be34b5e15505e38719721991c0b9a9162233c2c8c7b0fcef792027f6564fa58f083448d00bbae910f8dad1a2957aad5d3bf23c1bfb6727e31
 DIST astroid-2.9.2.tar.gz 408664 BLAKE2B 918fcf1e90667a9f3c69689557026f282e5fbbb40a8e3c184569f53d9a005d9822538cd15401e984256f928731d44a04d1a618ca818eb1eeae57b32e94d06425 SHA512 e9523f5874dec8cc3f252efc2b2f6707999772cc9809cf982d92693182052e575eac31c7d759c9aea22068e90a9bb25d89a20bc8d89dfe2ba44ebcc04f78471e
diff --git a/dev-python/astroid/astroid-2.7.3-r1.ebuild b/dev-python/astroid/astroid-2.7.3-r1.ebuild
deleted file mode 100644
index f3bcdf0da21d..000000000000
--- a/dev-python/astroid/astroid-2.7.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/wrapt-1.13[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/astroid/astroid-2.8.6.ebuild b/dev-python/astroid/astroid-2.8.6.ebuild
deleted file mode 100644
index 7a9ba7c70f89..000000000000
--- a/dev-python/astroid/astroid-2.8.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-1.14[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/astroid/astroid-2.9.1.ebuild b/dev-python/astroid/astroid-2.9.1.ebuild
deleted file mode 100644
index 20b93fd65346..000000000000
--- a/dev-python/astroid/astroid-2.9.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-1.14[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index e0ca3d533c73..0c2982d4fef5 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,2 +1,2 @@
-DIST bitarray-2.3.3.tar.gz 88192 BLAKE2B 1635db26f1c9c5f90f7f858e11d608cb361644f0d7ba3f7830f7e6216ddab485647b8be51c38b8da1e3a0a12fd959f1a8ea138db710e8d9f48782c0afebff205 SHA512 34b7a66c3bffc58fb4ead51f379152ce33f9cd4f56c6251f7d366f5f95786a6afc310ff71b3ac73eb256cece8789bd3227c0924ed94696497721a220532e746a
 DIST bitarray-2.3.4.tar.gz 88229 BLAKE2B adf9c6e0cd1ebab3aa36af82d15fac2d7772289c3969134540154863decb7f58f532ad2a721127774c931b2fdb8f2a9698f990f8778b744a1eb267666140c66d SHA512 ba77ade534044bf19298c886958600cbf90c907ef08fbc70ad0975981942a213622a68a9c7e2708d89f19a8d127d6189cdcf365b27b0ae4c4f553b4febb3fcce
+DIST bitarray-2.3.5.tar.gz 88403 BLAKE2B ebd2b41f3282765a8fe754c421f6813f1d35f105b52148dc3db158d937f0ab0e1ab09590d45f9e09301090bd113e28e9e45bf7a5d76ee0696018cb4e2fe2cca7 SHA512 8d409c8dad077774f4622afbb89435a6f6e5785ab4e53bc1a286e0d5a167a17152ccad78fb7569649c8a28674e269095c8ecb63bf26ac1ee4ed131c41552f55f
diff --git a/dev-python/bitarray/bitarray-2.3.3.ebuild b/dev-python/bitarray/bitarray-2.3.5.ebuild
index 012b3f886892..f20cb3746220 100644
--- a/dev-python/bitarray/bitarray-2.3.3.ebuild
+++ b/dev-python/bitarray/bitarray-2.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Liguros Authors
+# Copyright 2020-2022 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index 286c03c13870..8834ebbe3e06 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -1,2 +1 @@
-DIST blockdiag-2.0.1.tar.gz 2694776 BLAKE2B 289bbeab89dff4e8274efb9e2061b1e412e29bfbd663f64b55346ee09d09279e0813347c51b6cdc9e547b417eba637a85f7cb37f48006467bfa1c9875a113971 SHA512 07690882b05d4cf7be04245e183a7c54d9cd4acab3bb4b5e170b7b0f9229d6ea42eba4dc9fab47604c1572d3c4b09de96cffb610c0c31882b9c0b150f0e76d89
 DIST blockdiag-3.0.0.tar.gz 2694464 BLAKE2B 18887a48e0aa8293703e45746ee68c7c11accfaddf11d0d02af446c769404ce1666c2587b3e212cc48f4fb09bfa6169931c42a024adb739ce9223ccec862905a SHA512 e0e588941c5212a924068cc0b3953b670089e33c385ea8ce52fc54f5ca79414fb12217eba1052c5384c9f2fd81e79304639c9604cdc4a6464f7c221bb67ef267
diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
deleted file mode 100644
index 8d6824e86f01..000000000000
--- a/dev-python/blockdiag/blockdiag-2.0.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Generate block-diagram image from text"
-HOMEPAGE="http://blockdiag.com/ https://pypi.org/project/blockdiag/ https://github.com/blockdiag/blockdiag/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.0.0[${PYTHON_USEDEP}]
-	dev-python/webcolors[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/reportlab[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		media-fonts/ja-ipafonts
-	)
-"
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	sed -i -e /build-base/d setup.cfg || die
-	# unnecessary dep
-	sed -i -e '/pep8/d' setup.py || die
-	# disable tests requiring Internet access
-	sed -i -e 's:test_app_cleans_up_images:_&:' \
-		src/blockdiag/tests/test_command.py || die
-	sed -i -e 's:ghostscript_not_found_test:_&:' \
-		src/blockdiag/tests/test_generate_diagram.py || die
-	rm src/blockdiag/tests/diagrams/node_icon.diag || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	# TODO: Better descriptions!
-	optfeature "PDF format" dev-python/reportlab
-	optfeature "misc extra support" media-gfx/imagemagick
-	optfeature "Ctypes-based simple MagickWand API binding for Python" dev-python/wand
-}
diff --git a/dev-python/blockdiag/blockdiag-3.0.0.ebuild b/dev-python/blockdiag/blockdiag-3.0.0.ebuild
index 83e5e77d72cd..563068c9c323 100644
--- a/dev-python/blockdiag/blockdiag-3.0.0.ebuild
+++ b/dev-python/blockdiag/blockdiag-3.0.0.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/funcparserlib-1.0.0_alpha0[${PYTHON_USEDEP}]
diff --git a/dev-python/build/Manifest b/dev-python/build/Manifest
new file mode 100644
index 000000000000..d31757b11156
--- /dev/null
+++ b/dev-python/build/Manifest
@@ -0,0 +1 @@
+DIST build-0.7.0.gh.tar.gz 37127 BLAKE2B b06ba16c154087046bd5efddb5fd6f60dad9ee79a204a0c1124fb4885d3692bcf4bd88b75c9665ade3f8457e12742d32e3cef40a0ffb5a894b049a6e942c09e3 SHA512 fd8410dc91333ba94c5141dd78f8052b66f947839752a5d0f401630f6bceed5be2e1f45eceaa2a98908c0e3ddb88a00e3ccca341a3890fa99202bc560ab6ff42
diff --git a/dev-python/build/build-0.7.0.ebuild b/dev-python/build/build-0.7.0.ebuild
new file mode 100644
index 000000000000..c23fbdef0e80
--- /dev/null
+++ b/dev-python/build/build-0.7.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="A simple, correct PEP517 package builder"
+HOMEPAGE="
+	https://pypi.org/project/build/
+	https://github.com/pypa/build/"
+SRC_URI="
+	https://github.com/pypa/build/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/packaging-19.0[${PYTHON_USEDEP}]
+	>=dev-python/pep517-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/filelock-3[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-rerunfailures-9.1[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-56.0.0[${PYTHON_USEDEP}]
+		>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken by the presence of flit_core
+		tests/test_util.py::test_wheel_metadata_isolation
+		# broken by the presence of virtualenv (it changes the error
+		# messages, sic!)
+		tests/test_env.py::test_isolated_env_log
+		tests/test_main.py::test_output_env_subprocess_error
+		'tests/test_main.py::test_output[via-sdist-isolation]'
+		'tests/test_main.py::test_output[wheel-direct-isolation]'
+		# Internet
+		tests/test_main.py::test_build_package
+		tests/test_main.py::test_build_package_via_sdist
+		'tests/test_util.py::test_wheel_metadata[True]'
+		tests/test_util.py::test_with_get_requires
+	)
+
+	epytest -p no:flaky \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/build/metadata.xml b/dev-python/build/metadata.xml
new file mode 100644
index 000000000000..10aa7111abc6
--- /dev/null
+++ b/dev-python/build/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">build</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/colorclass/Manifest b/dev-python/colorclass/Manifest
index a1c3916f4544..a72fca89d8ca 100644
--- a/dev-python/colorclass/Manifest
+++ b/dev-python/colorclass/Manifest
@@ -1,2 +1 @@
-DIST colorclass-2.2.0.gh.tar.gz 486151 BLAKE2B d8f4c9e826cf284df47bf2aac4da71f448818858e2383b331b5bba791d9db3c5c11d5aff74b3eb740e657914137b2b74b217854ab589806a22a0ff6697cbde1c SHA512 c627cdf6abdb5a60e9ecc1fb3b669898edc027fdc3f8cde31be2e10402ee308c2067fcd50d1228759e93fc58c521b7fc12e6b259233a17cf99f55cda26279fed
 DIST colorclass-2.2.2.gh.tar.gz 490884 BLAKE2B e03c1a7091c133cea67c595363029121083d9a9d70a27f5803b20bb810b105ea9cb95aa68114ba98526b8a3b0e8365eadd7b375443215a5e0b636f0bd4cce632 SHA512 c38b58d4122e794654a8ac71adb2be0fb679eb10bd70c9d8f5dee06b3c978c1530bb3fb8fd6530d88aa35311a46a2590b709e4dcc6e3a81d14b90bf8cb74ebc1
diff --git a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
deleted file mode 100644
index 1edb3795986c..000000000000
--- a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Colorful worry-free console applications for multiple platforms"
-HOMEPAGE="https://pypi.org/project/colorclass/ https://github.com/Robpol86/colorclass"
-SRC_URI="https://github.com/Robpol86/colorclass/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tests.patch"
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/colorclass/colorclass-2.2.2.ebuild b/dev-python/colorclass/colorclass-2.2.2.ebuild
index a663d85a7dc5..58b904fe5fa2 100644
--- a/dev-python/colorclass/colorclass-2.2.2.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch b/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch
deleted file mode 100644
index ee67d6d40bb3..000000000000
--- a/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f8bbe9fdcff1d97b1d0e5dcb94680923cc43a507 Mon Sep 17 00:00:00 2001
-From: Ralph Broenink <ralph@ralphbroenink.net>
-Date: Mon, 24 Aug 2020 14:49:24 +0200
-Subject: [PATCH] Make code forwards-compatible with Python 3.9
-
-Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated since Python 3.3, and in 3.9 it will stop working
----
- colorclass/codes.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/colorclass/codes.py b/colorclass/codes.py
-index b0ecb03..8b6085d 100644
---- a/colorclass/codes.py
-+++ b/colorclass/codes.py
-@@ -1,7 +1,12 @@
- """Handles mapping between color names and ANSI codes and determining auto color codes."""
- 
- import sys
--from collections import Mapping
-+try:
-+    # Using or importing the ABCs from 'collections' instead of from 'collections.abc' is 
-+    # deprecated since Python 3.3, and in 3.9 it will stop working
-+    from collections.abc import Mapping
-+except ImportError:
-+    from collections import Mapping
- 
- BASE_CODES = {
-     '/all': 0, 'b': 1, 'f': 2, 'i': 3, 'u': 4, 'flash': 5, 'outline': 6, 'negative': 7, 'invis': 8, 'strike': 9,
diff --git a/dev-python/colorclass/files/colorclass-2.2.0-tests.patch b/dev-python/colorclass/files/colorclass-2.2.0-tests.patch
deleted file mode 100644
index f25dd0440aa7..000000000000
--- a/dev-python/colorclass/files/colorclass-2.2.0-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/test_example.py b/tests/test_example.py
-index 7ee8c05..3516460 100644
---- a/tests/test_example.py
-+++ b/tests/test_example.py
-@@ -10,6 +10,7 @@ from tests.conftest import PROJECT_ROOT
- from tests.screenshot import RunNewConsole, screenshot_until_match
- 
- 
-+@pytest.mark.skip(reason="test fails on all platforms")
- @pytest.mark.parametrize('colors', [True, False, None])
- @pytest.mark.parametrize('light_bg', [True, False, None])
- def test_piped(colors, light_bg):
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.9.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.9.ebuild
index 0beb15636a74..c0cc94244122 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.9.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.9.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="
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/importlib_metadata[${PYTHON_USEDEP}]
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 94d3b6198bde..deb61b54af02 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,5 +1,2 @@
-DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
-DIST cython-0.29.23.gh.tar.gz 2093463 BLAKE2B c710b9bc9e05e0030dff3098857b349564fd167f7d9c47e2ef4e8897e072f67497b8ed3994f45135c21f8b2bf3a2cff016fec9a808b2bbe9712174dd0a6b1a3e SHA512 093b7a1d5c68f6e2d2b9b8adb9ac99e8967ddd0a66c0513a78e88bd55d96533dd8352b2478554fb53bf32a72d730967fb08ccb2eaa462da68f86891dceb4925a
-DIST cython-0.29.24.gh.tar.gz 2097245 BLAKE2B 9f5f2da0aed61d7fda2e14ea0669a2dd187cd053f3b82621342c7be29e26ff581b673a32e43bacd5c0df3e515f250eb23a64b1dae8911132fdca48175910a3dc SHA512 387a827f3cb7428248019744e3ed606a133d98ac882b83624d24ae0fdf8a8f2334978555d7d84e5cc4adaf715c541fef64e45bcbdda85ca33473c21f99360be8
 DIST cython-0.29.25.gh.tar.gz 2100012 BLAKE2B 497c2550c870c808f1c972d3e9ffedd6672544b9976653faac4a4125008e4472ae5a2e0db0510c8b2c5fd11f73a5885e0e4394bbce2f1327b7610bf59b64f640 SHA512 1d655bb4de8bd3480bcd579c32cd0e5bfc5cfc3d966d3d892b98cc86f59c9bd0522066c4c5dbc4c6abeb3ebe3fcd3f49ec873dd724f9ad04976635f652fdf9e3
 DIST cython-0.29.26.gh.tar.gz 2100616 BLAKE2B 9990d8fd14a8042b1a27a4f60fcc8f6d4be42a1e475f0e5d37bc6c60439ca00a1a70b49ab708ad2dfac5184a62c25d75f27ff158ef7f0df9132355c570a9aac6 SHA512 936449dd0031c2e2baeb4402a448d632324c1b66bf062ae0e632cf63dc27556607efb8446e8f913253b761627d3946283c2a60fdcad8c2434e1601fe4b0fb60e
diff --git a/dev-python/cython/cython-0.29.21.ebuild b/dev-python/cython/cython-0.29.21.ebuild
deleted file mode 100644
index a6a650356d36..000000000000
--- a/dev-python/cython/cython-0.29.21.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			python3_{6,7,8})
-	)"
-
-PATCHES=(
-	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
-	"${FILESDIR}/cython-0.29.21-spawn-multiprocessing.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.23.ebuild b/dev-python/cython/cython-0.29.23.ebuild
deleted file mode 100644
index 28c05b65da41..000000000000
--- a/dev-python/cython/cython-0.29.23.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python3*')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.29.14-sphinx-update.patch"
-	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
-	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
-	"${FILESDIR}/${PN}-0.29.23-tracing-py310.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.24-r1.ebuild b/dev-python/cython/cython-0.29.24-r1.ebuild
deleted file mode 100644
index 9d9391dcba04..000000000000
--- a/dev-python/cython/cython-0.29.24-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.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 ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python3*')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
-	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
-	"${FILESDIR}/${PN}-0.29.24-unaligned-format.patch"
-	"${FILESDIR}/${PN}-0.29.24-test-failure-warning.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.25.ebuild b/dev-python/cython/cython-0.29.25.ebuild
index b95f6c53b644..3fa9d66433da 100644
--- a/dev-python/cython/cython-0.29.25.ebuild
+++ b/dev-python/cython/cython-0.29.25.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.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 ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/files/cython-0.29.14-sphinx-update.patch b/dev-python/cython/files/cython-0.29.14-sphinx-update.patch
deleted file mode 100644
index 3f426754f6f1..000000000000
--- a/dev-python/cython/files/cython-0.29.14-sphinx-update.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/docs/conf.py b/docs/conf.py
-index 10662e28c..a84e0b928 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -41,7 +41,7 @@ highlight_language = 'cython'
- extensions = [
-     'ipython_console_highlighting',
-     'cython_highlighting',
--    'sphinx.ext.pngmath',
-+    'sphinx.ext.imgmath',
-     'sphinx.ext.todo',
-     'sphinx.ext.intersphinx',
-     'sphinx.ext.autodoc'
diff --git a/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch b/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch
deleted file mode 100644
index 0aa7212b9a34..000000000000
--- a/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Needed to prevent a loop while calling cythonize on macOS - or any platform
-defaulting to the 'spawn' method, as Python 3.8 does on Darwin.
-
-https://github.com/cython/cython/pull/3263
-From 15ae78bb74a856836dd64828326f4f0812d36520 Mon Sep 17 00:00:00 2001
-From: Marcel Bargull <marcel.bargull@udo.edu>
-Date: Fri, 6 Dec 2019 18:21:19 +0100
-Subject: [PATCH] Disable parallel cythonization for "spawn" start method.
-
----
- Cython/Build/Dependencies.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/Cython/Build/Dependencies.py b/Cython/Build/Dependencies.py
-index 593e00a6ef..f9b9c15bc5 100644
---- a/Cython/Build/Dependencies.py
-+++ b/Cython/Build/Dependencies.py
-@@ -1073,6 +1073,11 @@ def copy_to_build_dir(filepath, root=os.getcwd()):
- 
-     if N <= 1:
-         nthreads = 0
-+    if nthreads:
-+        import multiprocessing
-+        if multiprocessing.get_start_method() == 'spawn':
-+            print('Disabling parallel cythonization for "spawn" process start method.')
-+            nthreads = 0
-     if nthreads:
-         import multiprocessing
-         pool = multiprocessing.Pool(
diff --git a/dev-python/cython/files/cython-0.29.23-tracing-py310.patch b/dev-python/cython/files/cython-0.29.23-tracing-py310.patch
deleted file mode 100644
index ff0e45a646dc..000000000000
--- a/dev-python/cython/files/cython-0.29.23-tracing-py310.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-From c9cccfeaf3f0e20c2bb14fc234e86f4fc8e4fe81 Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml@behnel.de>
-Date: Fri, 14 May 2021 19:39:58 +0200
-Subject: [PATCH] Adapt tracing code to Py3.10 beta 1.
-
----
- Cython/Utility/Profile.c | 79 +++++++++++++++++++++++++---------------
- 1 file changed, 49 insertions(+), 30 deletions(-)
-
-diff --git a/Cython/Utility/Profile.c b/Cython/Utility/Profile.c
-index 15ceb41cc2..2cd9af9da7 100644
---- a/Cython/Utility/Profile.c
-+++ b/Cython/Utility/Profile.c
-@@ -47,13 +47,32 @@
-     #define CYTHON_FRAME_DEL(frame) Py_CLEAR(frame)
-   #endif
- 
--  #define __Pyx_TraceDeclarations                                     \
--  static PyCodeObject *$frame_code_cname = NULL;                      \
--  CYTHON_FRAME_MODIFIER PyFrameObject *$frame_cname = NULL;           \
--  int __Pyx_use_tracing = 0;
-+  #define __Pyx_TraceDeclarations                                         \
-+      static PyCodeObject *$frame_code_cname = NULL;                      \
-+      CYTHON_FRAME_MODIFIER PyFrameObject *$frame_cname = NULL;           \
-+      int __Pyx_use_tracing = 0;
- 
--  #define __Pyx_TraceFrameInit(codeobj)                               \
--  if (codeobj) $frame_code_cname = (PyCodeObject*) codeobj;
-+  #define __Pyx_TraceFrameInit(codeobj)                                   \
-+      if (codeobj) $frame_code_cname = (PyCodeObject*) codeobj;
-+
-+#if PY_VERSION_HEX >= 0x030a00b1
-+  #define __Pyx_IsTracing(tstate, check_tracing, check_funcs) \
-+     (unlikely(tstate->cframe->use_tracing) && \
-+         (!(check_tracing) || !tstate->tracing) && \
-+         (!(check_funcs) || tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc)))
-+
-+  #define __Pyx_SetTracing(tstate, enable) \
-+      (tstate)->cframe->use_tracing = (enable)
-+
-+#else
-+  #define __Pyx_IsTracing(tstate, check_tracing, check_funcs) \
-+     (unlikely(tstate->use_tracing) && \
-+         (!(check_tracing) || !tstate->tracing) && \
-+         (!(check_funcs) || tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc)))
-+
-+  #define __Pyx_SetTracing(tstate, enable) \
-+      (tstate)->use_tracing = (enable)
-+#endif
- 
-   #ifdef WITH_THREAD
-   #define __Pyx_TraceCall(funcname, srcfile, firstlineno, nogil, goto_error)             \
-@@ -62,8 +81,7 @@
-           PyThreadState *tstate;                                                         \
-           PyGILState_STATE state = PyGILState_Ensure();                                  \
-           tstate = __Pyx_PyThreadState_Current;                                          \
--          if (unlikely(tstate->use_tracing) && !tstate->tracing &&                       \
--                  (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {    \
-+          if (__Pyx_IsTracing(tstate, 1, 1)) {                                           \
-               __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno);  \
-           }                                                                              \
-           PyGILState_Release(state);                                                     \
-@@ -71,8 +89,7 @@
-       }                                                                                  \
-   } else {                                                                               \
-       PyThreadState* tstate = PyThreadState_GET();                                       \
--      if (unlikely(tstate->use_tracing) && !tstate->tracing &&                           \
--              (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {        \
-+      if (__Pyx_IsTracing(tstate, 1, 1)) {                                               \
-           __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno);  \
-           if (unlikely(__Pyx_use_tracing < 0)) goto_error;                               \
-       }                                                                                  \
-@@ -80,8 +97,7 @@
-   #else
-   #define __Pyx_TraceCall(funcname, srcfile, firstlineno, nogil, goto_error)             \
-   {   PyThreadState* tstate = PyThreadState_GET();                                       \
--      if (unlikely(tstate->use_tracing) && !tstate->tracing &&                           \
--              (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {        \
-+      if (__Pyx_IsTracing(tstate, 1, 1)) {                                               \
-           __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno);  \
-           if (unlikely(__Pyx_use_tracing < 0)) goto_error;                               \
-       }                                                                                  \
-@@ -91,10 +107,9 @@
-   #define __Pyx_TraceException()                                                           \
-   if (likely(!__Pyx_use_tracing)); else {                                                  \
-       PyThreadState* tstate = __Pyx_PyThreadState_Current;                                 \
--      if (tstate->use_tracing &&                                                           \
--              (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {          \
-+      if (__Pyx_IsTracing(tstate, 0, 1)) {                                                 \
-           tstate->tracing++;                                                               \
--          tstate->use_tracing = 0;                                                         \
-+          __Pyx_SetTracing(tstate, 0);                                                     \
-           PyObject *exc_info = __Pyx_GetExceptionTuple(tstate);                            \
-           if (exc_info) {                                                                  \
-               if (CYTHON_TRACE && tstate->c_tracefunc)                                     \
-@@ -104,7 +119,7 @@
-                   tstate->c_profileobj, $frame_cname, PyTrace_EXCEPTION, exc_info);        \
-               Py_DECREF(exc_info);                                                         \
-           }                                                                                \
--          tstate->use_tracing = 1;                                                         \
-+          __Pyx_SetTracing(tstate, 1);                                                     \
-           tstate->tracing--;                                                               \
-       }                                                                                    \
-   }
-@@ -113,13 +128,13 @@
-       PyObject *type, *value, *traceback;
-       __Pyx_ErrFetchInState(tstate, &type, &value, &traceback);
-       tstate->tracing++;
--      tstate->use_tracing = 0;
-+      __Pyx_SetTracing(tstate, 0);
-       if (CYTHON_TRACE && tstate->c_tracefunc)
-           tstate->c_tracefunc(tstate->c_traceobj, frame, PyTrace_RETURN, result);
-       if (tstate->c_profilefunc)
-           tstate->c_profilefunc(tstate->c_profileobj, frame, PyTrace_RETURN, result);
-       CYTHON_FRAME_DEL(frame);
--      tstate->use_tracing = 1;
-+      __Pyx_SetTracing(tstate, 1);
-       tstate->tracing--;
-       __Pyx_ErrRestoreInState(tstate, type, value, traceback);
-   }
-@@ -132,14 +147,14 @@
-               PyThreadState *tstate;                                                      \
-               PyGILState_STATE state = PyGILState_Ensure();                               \
-               tstate = __Pyx_PyThreadState_Current;                                       \
--              if (tstate->use_tracing) {                                                  \
-+              if (__Pyx_IsTracing(tstate, 0, 0)) {                                        \
-                   __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result);  \
-               }                                                                           \
-               PyGILState_Release(state);                                                  \
-           }                                                                               \
-       } else {                                                                            \
-           PyThreadState* tstate = __Pyx_PyThreadState_Current;                            \
--          if (tstate->use_tracing) {                                                      \
-+          if (__Pyx_IsTracing(tstate, 0, 0)) {                                            \
-               __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result);      \
-           }                                                                               \
-       }                                                                                   \
-@@ -148,7 +163,7 @@
-   #define __Pyx_TraceReturn(result, nogil)                                                \
-   if (likely(!__Pyx_use_tracing)); else {                                                 \
-       PyThreadState* tstate = __Pyx_PyThreadState_Current;                                \
--      if (tstate->use_tracing) {                                                          \
-+      if (__Pyx_IsTracing(tstate, 0, 0)) {                                                \
-           __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result);          \
-       }                                                                                   \
-   }
-@@ -176,9 +191,11 @@
-       __Pyx_ErrFetchInState(tstate, &type, &value, &traceback);
-       __Pyx_PyFrame_SetLineNumber(frame, lineno);
-       tstate->tracing++;
--      tstate->use_tracing = 0;
-+      __Pyx_SetTracing(tstate, 0);
-+
-       ret = tstate->c_tracefunc(tstate->c_traceobj, frame, PyTrace_LINE, NULL);
--      tstate->use_tracing = 1;
-+
-+      __Pyx_SetTracing(tstate, 1);
-       tstate->tracing--;
-       if (likely(!ret)) {
-           __Pyx_ErrRestoreInState(tstate, type, value, traceback);
-@@ -199,7 +216,7 @@
-               PyThreadState *tstate;                                                       \
-               PyGILState_STATE state = __Pyx_PyGILState_Ensure();                          \
-               tstate = __Pyx_PyThreadState_Current;                                        \
--              if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \
-+              if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \
-                   ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno);          \
-               }                                                                            \
-               __Pyx_PyGILState_Release(state);                                             \
-@@ -207,7 +224,7 @@
-           }                                                                                \
-       } else {                                                                             \
-           PyThreadState* tstate = __Pyx_PyThreadState_Current;                             \
--          if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \
-+          if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \
-               int ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno);          \
-               if (unlikely(ret)) goto_error;                                               \
-           }                                                                                \
-@@ -217,7 +234,7 @@
-   #define __Pyx_TraceLine(lineno, nogil, goto_error)                                       \
-   if (likely(!__Pyx_use_tracing)); else {                                                  \
-       PyThreadState* tstate = __Pyx_PyThreadState_Current;                                 \
--      if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \
-+      if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \
-           int ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno);              \
-           if (unlikely(ret)) goto_error;                                                   \
-       }                                                                                    \
-@@ -263,19 +280,21 @@ static int __Pyx_TraceSetupAndCall(PyCodeObject** code,
-         (*frame)->f_tstate = tstate;
- #endif
-     }
--      __Pyx_PyFrame_SetLineNumber(*frame, firstlineno);
-+    __Pyx_PyFrame_SetLineNumber(*frame, firstlineno);
-+
-     retval = 1;
-     tstate->tracing++;
--    tstate->use_tracing = 0;
-+    __Pyx_SetTracing(tstate, 0);
-     __Pyx_ErrFetchInState(tstate, &type, &value, &traceback);
-+
-     #if CYTHON_TRACE
-     if (tstate->c_tracefunc)
-         retval = tstate->c_tracefunc(tstate->c_traceobj, *frame, PyTrace_CALL, NULL) == 0;
-     if (retval && tstate->c_profilefunc)
-     #endif
-         retval = tstate->c_profilefunc(tstate->c_profileobj, *frame, PyTrace_CALL, NULL) == 0;
--    tstate->use_tracing = (tstate->c_profilefunc ||
--                           (CYTHON_TRACE && tstate->c_tracefunc));
-+
-+    __Pyx_SetTracing(tstate, (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc)));
-     tstate->tracing--;
-     if (retval) {
-         __Pyx_ErrRestoreInState(tstate, type, value, traceback);
diff --git a/dev-python/cython/files/cython-0.29.24-test-failure-warning.patch b/dev-python/cython/files/cython-0.29.24-test-failure-warning.patch
deleted file mode 100644
index 64202a93ecad..000000000000
--- a/dev-python/cython/files/cython-0.29.24-test-failure-warning.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/cython/cython/commit/bf4979e2441ffbc9aaeb88f5c67608578040588f
-https://bugs.gentoo.org/739516
-
-From: Stefan Behnel <stefan_ml@behnel.de>
-Date: Sat, 3 Apr 2021 08:23:44 +0200
-Subject: [PATCH] Make a helper function in a C++ test correctly propagate
- exceptions so that it won't have to spit out compiler warnings.
-
---- a/tests/run/cpp_stl_conversion.pyx
-+++ b/tests/run/cpp_stl_conversion.pyx
-@@ -15,7 +15,7 @@ py_set = set
- py_xrange = xrange
- py_unicode = unicode
- 
--cdef string add_strings(string a, string b):
-+cdef string add_strings(string a, string b) except *:
-     return a + b
- 
- def normalize(bytes b):
-
diff --git a/dev-python/cython/files/cython-0.29.24-unaligned-format.patch b/dev-python/cython/files/cython-0.29.24-unaligned-format.patch
deleted file mode 100644
index 955c32debb49..000000000000
--- a/dev-python/cython/files/cython-0.29.24-unaligned-format.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2c08fd50d62e4255602ee3c0d41157df7608e773 Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml@behnel.de>
-Date: Wed, 1 Sep 2021 00:09:02 +0200
-Subject: [PATCH] Avoid copying unaligned 16-bit values since some platforms
- require them to be aligned. Use memcpy() instead to let the C compiler decide
- how to do it.
-
-Closes https://github.com/cython/cython/issues/4343
----
- Cython/Utility/TypeConversion.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Cython/Utility/TypeConversion.c b/Cython/Utility/TypeConversion.c
-index 751d12b62a..3669bc9ec1 100644
---- a/Cython/Utility/TypeConversion.c
-+++ b/Cython/Utility/TypeConversion.c
-@@ -829,14 +829,14 @@ static CYTHON_INLINE PyObject* {{TO_PY_FUNCTION}}({{TYPE}} value, Py_ssize_t wid
-             digit_pos = abs((int)(remaining % (8*8)));
-             remaining = ({{TYPE}}) (remaining / (8*8));
-             dpos -= 2;
--            *(uint16_t*)dpos = ((const uint16_t*)DIGIT_PAIRS_8)[digit_pos]; /* copy 2 digits at a time */
-+            memcpy(dpos, DIGIT_PAIRS_8 + digit_pos * 2, 2); /* copy 2 digits at a time, unaligned */
-             last_one_off = (digit_pos < 8);
-             break;
-         case 'd':
-             digit_pos = abs((int)(remaining % (10*10)));
-             remaining = ({{TYPE}}) (remaining / (10*10));
-             dpos -= 2;
--            *(uint16_t*)dpos = ((const uint16_t*)DIGIT_PAIRS_10)[digit_pos]; /* copy 2 digits at a time */
-+            memcpy(dpos, DIGIT_PAIRS_10 + digit_pos * 2, 2); /* copy 2 digits at a time, unaligned */
-             last_one_off = (digit_pos < 10);
-             break;
-         case 'x':
diff --git a/dev-python/ddt/ddt-1.4.4.ebuild b/dev-python/ddt/ddt-1.4.4.ebuild
index b1b1f06b39a2..bd3b5fe755a8 100644
--- a/dev-python/ddt/ddt-1.4.4.ebuild
+++ b/dev-python/ddt/ddt-1.4.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 83ea3006bbe5..59a80e4a647d 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,2 +1 @@
-DIST distlib-0.3.2.tar.bz2 1075843 BLAKE2B 3595dc6af53beb7ff7dc49013e6c3db3453b501b56790a953c2cfea5a73aaca71fc69de68c8121ae92ffafd32a70ffa69d768cfd42844135fd5bd6647611e090 SHA512 e033ff2ff6b760f698a20103e01d63fa87bc1839bbf44fce252284c793e10a057dac645d818a4e0a2aa8be97bb85fcf9c8706b2399c505f12a093024d11be578
 DIST distlib-0.3.4.tar.bz2 1169083 BLAKE2B f1b5e5ca7d0155d204db177d9844cdff4d593be3d927bd5f9e8ad07065b52383527d3990b66c5868bb8377703d031958c5c88a9daf4f0b238903ddbea3ef6cf0 SHA512 24f8d6f5012c881ffa6bbdae7887ee5a7608ac36a83e2a96cb8a337d1ab6c896a4078028d0383165ff44be6b735aa31f7d199845d89899813be74ed00e1680e8
diff --git a/dev-python/distlib/distlib-0.3.2.ebuild b/dev-python/distlib/distlib-0.3.2.ebuild
deleted file mode 100644
index 42c1179125db..000000000000
--- a/dev-python/distlib/distlib-0.3.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Low-level components of distutils2/packaging"
-HOMEPAGE="https://pypi.org/project/distlib/
-	https://bitbucket.org/pypa/distlib/"
-# pypi has zip only :-(
-SRC_URI="
-	https://bitbucket.org/pypa/distlib/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-# This package's tests are extremely fragile and tend to break or hang
-# when it doesn't like metadata of packages installed on the system.
-RESTRICT="test"
-
-# pypiserver is called as external executable
-# openpyxl installs invalid metadata that breaks distlib
-BDEPEND="
-	test? (
-		dev-python/pypiserver
-		!!<dev-python/openpyxl-3.0.3[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	# make sure they're not used
-	rm -r tests/unittest2 || die
-	rm tests/pypi-server-standalone.py || die
-
-	# use system pypiserver instead of broken bundled one
-	eapply "${FILESDIR}"/distlib-0.3.2-system-pypiserver.py || die
-	# fix tests for py310
-	eapply "${FILESDIR}"/${P}-py310.patch
-
-	# doesn't work with our patched pip
-	sed -e '/PIP_AVAIL/s:True:False:' \
-		-i tests/test_wheel.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SKIP_ONLINE=1
-	local -x PYTHONHASHSEED=0
-	"${EPYTHON}" tests/test_all.py -v -x ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/distlib/distlib-0.3.4.ebuild b/dev-python/distlib/distlib-0.3.4.ebuild
index f997d4b5037c..f157eaeb6502 100644
--- a/dev-python/distlib/distlib-0.3.4.ebuild
+++ b/dev-python/distlib/distlib-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 # This package's tests are extremely fragile and tend to break or hang
 # when it doesn't like metadata of packages installed on the system.
diff --git a/dev-python/distlib/files/distlib-0.3.2-py310.patch b/dev-python/distlib/files/distlib-0.3.2-py310.patch
deleted file mode 100644
index 23c3dbbe0274..000000000000
--- a/dev-python/distlib/files/distlib-0.3.2-py310.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5a9540cf58fc020b0c6a1d5c23b9b93d1abd2eb0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 29 May 2021 22:08:57 +0200
-Subject: [PATCH] Fix test_is_compatible to fix Python 3.10 support
-
-On Python 3.10, PYVER is py310 which wrongly matches the original
-'py27' <= PYVER < 'py32' condition.  Replace it with explicit match
-against known Python versions in this range.  This is probably
-the simplest and the most future-proof solution to the problem at hand.
----
- tests/test_wheel.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_wheel.py b/tests/test_wheel.py
-index 849e7c1..7c8f5ee 100644
---- a/tests/test_wheel.py
-+++ b/tests/test_wheel.py
-@@ -206,7 +206,7 @@ class WheelTestCase(DistlibTestCase):
- 
-     def test_is_compatible(self):
-         fn = os.path.join(HERE, 'dummy-0.1-py27-none-any.whl')
--        if 'py27' <= PYVER < 'py32':
-+        if PYVER in ('py27', 'py30', 'py31'):
-             self.assertTrue(is_compatible(fn))
-             self.assertTrue(Wheel(fn).is_compatible())
-         # use actual wheel names from PyPI.
--- 
-2.31.1
-
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 263f0d7d407c..bae6143af039 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,2 +1 @@
-DIST funcparserlib-0.3.6_p20210809.gh.tar.gz 68069 BLAKE2B 937079952a42f2171af8f6421097eb920d01eae02f870c27a790ae374a1c8c3ac27019eae78d655b80458bf319fd2db7d411404902357ac66eea5daa4472ecf9 SHA512 7d2b6d27e1981d97097c2aafc0730e5b6c6bf98707e997f87f7a9944667ea361db41305099803a43ec04b46ab53e4ab09d0863413d00a39a6fb27c30cceac361
 DIST funcparserlib-1.0.0_alpha0.gh.tar.gz 68260 BLAKE2B e1a9a9a516142d683424df881a7c390a3999438905136fbd394f23856022f14390d22f1dd3914e680d2c188c819cce9cc4f7ff2e485478614dd4632701db4614 SHA512 02cac31d76bb888118a99367811a8cfac28a999ba113ce43f4bd6211cef815ce1793fc1767637dd019728f15d5c408e859d5bc8365a2c53804092f1d6f03e54e
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6_p20210809.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6_p20210809.ebuild
deleted file mode 100644
index abc1c79fbc4e..000000000000
--- a/dev-python/funcparserlib/funcparserlib-0.3.6_p20210809.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-COMMIT="d4ba3955ffc10544dbae6aaed68bcab21d0c294b"
-
-DESCRIPTION="Recursive descent parsing library based on functional combinators"
-HOMEPAGE="https://pypi.org/project/funcparserlib/"
-SRC_URI="
-	https://github.com/vlasovskikh/funcparserlib/archive/${COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-BDEPEND="test? ( dev-python/six[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	local DOCS=( doc/*.md )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha0.ebuild b/dev-python/funcparserlib/funcparserlib-1.0.0_alpha0.ebuild
index f98374a4b219..cb03d1563244 100644
--- a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha0.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-1.0.0_alpha0.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
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="test? ( dev-python/six[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/gitdb/gitdb-4.0.8.ebuild b/dev-python/gitdb/gitdb-4.0.8.ebuild
index eeedd8936df9..521a590091b9 100644
--- a/dev-python/gitdb/gitdb-4.0.8.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="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"
 
 RDEPEND="
 	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index a0eb2b496d77..5395a2279f24 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,3 +1 @@
-DIST google-api-core-2.2.2.tar.gz 140701 BLAKE2B 4e90db4311fc88d3fc8e29d6d8f11ae1424000c0e293f219d679984ec4a2c1bbbaf72d734b937d6916302f3a9a8b1cb369dd719972f4eb2d3f7264bf16ffbc7f SHA512 9b307c8ebd224b7614bd1d9f48d752852929b726c04df24f81e0b1b601f9a14d10654e9ef53b6a5ab677e8e57256f87b8683fa4dde0585f9c2e6d313d29d53fe
-DIST google-api-core-2.3.0.tar.gz 155449 BLAKE2B 4aba324a18c8b6f9b9afd223688771fc6a57ee71f550736cfb5c9fac861a6a84369eb4e6ebec0664241590624c52cd0bcc8762afeb230debc16f0849fde049bf SHA512 f85c9279822ab818aa9d183bc930e61be9cfb2e65ab6a46fcd8aaab2531b4258c6247b02fb8f4f29841d9ab13ca33e129198589cbc37b3c77677a72e72635285
 DIST google-api-core-2.3.1.tar.gz 156495 BLAKE2B fdc7f7d8457b96947181eee9992c5e51bbd18f9740a0415a32d4d0f45ade9c0c784e01f0aa78fe0dbbf3717ee860e78d6b4d1c5f154361afbf919abe033e5380 SHA512 ab1c333727e666f920d81186e6213d440052021d952efcb47eac487d10ab33a2e1116278925e54bfb3468de70c18837a0e241ba3426af09728ea59a725789a29
diff --git a/dev-python/google-api-core/google-api-core-2.2.2.ebuild b/dev-python/google-api-core/google-api-core-2.2.2.ebuild
deleted file mode 100644
index 65980f359409..000000000000
--- a/dev-python/google-api-core/google-api-core-2.2.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core/
-	https://googleapis.dev/python/google-api-core/latest/index.html"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-"
-# grpcio support is broken if grpcio-status is not installed,
-# and we do not package the latter
-BDEPEND="
-	test? (
-		!!dev-python/grpcio
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-EPYTEST_DESELECT=(
-	# TODO: package proto-plus
-	tests/unit/test_protobuf_helpers.py::test_field_mask_ignore_trailing_underscore
-	tests/unit/test_protobuf_helpers.py::test_field_mask_ignore_trailing_underscore_with_nesting
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-api-core/google-api-core-2.3.0.ebuild b/dev-python/google-api-core/google-api-core-2.3.0.ebuild
deleted file mode 100644
index b678fbba508f..000000000000
--- a/dev-python/google-api-core/google-api-core-2.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core/
-	https://googleapis.dev/python/google-api-core/latest/index.html"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-"
-# grpcio support is broken if grpcio-status is not installed,
-# and we do not package the latter
-BDEPEND="
-	test? (
-		!!dev-python/grpcio
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-EPYTEST_DESELECT=(
-	# TODO: package proto-plus
-	tests/unit/test_protobuf_helpers.py::test_field_mask_ignore_trailing_underscore
-	tests/unit/test_protobuf_helpers.py::test_field_mask_ignore_trailing_underscore_with_nesting
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-api-core/google-api-core-2.3.1.ebuild b/dev-python/google-api-core/google-api-core-2.3.1.ebuild
index b678fbba508f..b755d5a331ee 100644
--- a/dev-python/google-api-core/google-api-core-2.3.1.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index 23b4ce89b0d6..41f3df2c5c64 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,2 +1 @@
-DIST googleapis-common-protos-1.53.0.tar.gz 106651 BLAKE2B a38ae93d0fe639bad571d74c9f2d011504cd82175e19aad27deda467676936c7df804ded50ee51544615609ce4fb6a6ec629fa175fbda7b2119c73747b6c58a7 SHA512 2ae8230b712ab6fc8328d3e3ba55ace28b9ba5fe3a300899b4a1f13d5d8b3bfd19eef9d1829747b57c56169351e4aa14380551d009fe6bd46e27aa22e7d3b9a5
 DIST googleapis-common-protos-1.54.0.tar.gz 112874 BLAKE2B 95d2429d8bf27299ff406d0a06f31b2b499f66533cf884a8ec77ed6defa10bdabd6460232265efc9606e5f890ab14c571a0240e842fbdf7117ff3d7bff5ef28d SHA512 535cf6e4e5331a99232cb3eec1bc56676fcf87c522bd5b06f3452c7b22abd51479f3e4c69c8654bba4d789e8267360e11573d357ac90bb63854281e227eb8bc6
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.53.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.53.0.ebuild
deleted file mode 100644
index 4a21e32bc924..000000000000
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.53.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="python classes generated from the common protos in the googleapis repository"
-HOMEPAGE="https://pypi.org/project/googleapis-common-protos/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12.0[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
-
-# no tests as this is all generated code
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.54.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.54.0.ebuild
index 2fcb8c626805..247da2f13533 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.54.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.54.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 4a839711e785..a6441b835ebf 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,3 +4,4 @@ DIST hypothesis-python-6.32.1.tar.gz 9176925 BLAKE2B 0b57c8b46b766055a19c8831620
 DIST hypothesis-python-6.33.0.tar.gz 9177426 BLAKE2B ad1b1a358345f9b92bf41cee196c7bba5374054c84b7ca96500cf41b095e7ae6df12499dcb3b656907df30b360d167630d3d4c640c9d5d903125158af6db3089 SHA512 0165b7c431980d7758be50e834dbe04356478590d5fc54656ea9d31508bbae81f9fbb53b38178862b2d4959e17fa3564bc6971d466ba95555c8e80a6fb208639
 DIST hypothesis-python-6.34.1.tar.gz 9178792 BLAKE2B 72cbb1b372fb23da8ecf4eb8355cb054216c78b6464b5ddbc7ee5534652d69e4f3cc094241c0434bc0d80cc555c87699504f87bcf4659724f77d70deaa19b871 SHA512 234b8a814994b0e93cae24233cc30ab8eba853a081d4cce4309b4af5e13234a3de8d704f3255cce11195603645c2641fa1985529d64631df90a61cfd1c4a7f06
 DIST hypothesis-python-6.34.2.tar.gz 9178843 BLAKE2B 24bbc19ea5c207880d577a3c451f6e90c4b124a934aa1cd103c11ec77cbb5076d75e3860abd2b9bd2fc75640ba562b81d3fa038cc7752109625990e0ac0e1039 SHA512 a03233a2b84b1e009ad246663b0c7f6b56f2c04d08d69297ff50b02b8af292fdee37f877ca2f709e6ef64192d31e3d9bf18f78a6f5c92b8f03bf04ba398d063c
+DIST hypothesis-python-6.35.0.tar.gz 9178905 BLAKE2B 7cb55da84b979d8a075361674bbfa00cfeb5276e0ae25c153794fd876d1f65c7a88c5cc16e8b0c085560be937be14a113ba4854b734808b592f3d7c0be30215f SHA512 b390272ac471b23d8de1414cb7e2fd9d814318bc1063e4ad2bb2d61ba3b3af0c92701fa7a737117dc894a71e8d0473f52c11caf70fbb35d0837a4927537daaf5
diff --git a/dev-python/hypothesis/hypothesis-6.35.0.ebuild b/dev-python/hypothesis/hypothesis-6.35.0.ebuild
new file mode 100644
index 000000000000..6b6b7e17cd07
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.35.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{8..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{8..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-x \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 58056178936f..fd4260d7faa5 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,2 +1 @@
-DIST isort-5.10.0.gh.tar.gz 728239 BLAKE2B 6a206cdd4ebceb29f8c76f1c08b3217da1d76b56bbfbf177175d08f502884ae1f0700dc1443c92c28d68d257cb6468e2210d35a2003680303aa2ae9eaefe3ce3 SHA512 e8de97d6714ad626974e601a676b35a324b306a9f6033fd5cdd4cf5a5caf29cbc3238dca8cbf38e749866776f01aa58026159f53a4181f6637daf93181726ad2
 DIST isort-5.10.1.gh.tar.gz 728462 BLAKE2B 5b892b9849293e8730e6d89592bace62009a8589d185b4d3a5bafded605ccd46fd0f2986fbad5cf1d72321d030e3193a111ab7e6114c6b4a7a67696f546b3a14 SHA512 545c1844bacc1d2d9e87e60b03b30a846ee1ebbfe2a229c3e018a2e1cc6e9a04a3691f1b2e7ec8575806f2341bc1af15eb64904b4eabd786d6b9b289cea5ce2a
diff --git a/dev-python/isort/isort-5.10.0.ebuild b/dev-python/isort/isort-5.10.0.ebuild
deleted file mode 100644
index 945227e23fa7..000000000000
--- a/dev-python/isort/isort-5.10.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="
-	https://github.com/PyCQA/isort/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/natsort[${PYTHON_USEDEP}]
-		dev-python/pylama[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unbundle toml
-	sed -i -e 's:from ._vendored ::' isort/settings.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Some tests run the "isort" command
-	distutils_install_for_testing
-	# Install necessary plugins
-	local p
-	for p in example*/; do
-		pushd "${p}" >/dev/null || die
-		distutils_install_for_testing
-		popd >/dev/null || die
-	done
-
-	local EPYTEST_IGNORE=(
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-	)
-	epytest tests/unit
-}
diff --git a/dev-python/isort/isort-5.10.1.ebuild b/dev-python/isort/isort-5.10.1.ebuild
index 56dd5902230d..1d526efdaf9c 100644
--- a/dev-python/isort/isort-5.10.1.ebuild
+++ b/dev-python/isort/isort-5.10.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="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]"
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
index daa6aeffaf9c..d7315859fdb9 100644
--- a/dev-python/memory_profiler/Manifest
+++ b/dev-python/memory_profiler/Manifest
@@ -1,3 +1,2 @@
-DIST memory_profiler-0.58.0.gh.tar.gz 140692 BLAKE2B 2f3917d833dfcc722b61871c7e704e869527a389b10a81b473989b8455630f5defa5f5b21a172708070b89468c7dd66682cd3b9c0bf435e9be49651b69b50137 SHA512 5c02933acffc05f42d2ae98a069d36563e1d26515d439d94ad3903960dd06cd378faae3000b26c022770e71e83db6f770ceaf63cabb92f4159bda0ff9cc4e849
 DIST memory_profiler-0.59.gh.tar.gz 142586 BLAKE2B b9c8cffbd03f980937d30626facf431e6effd9a86a21fbe629f4238a2f78f2d65242637105ad3a07b4158a6335a541701bba657941bb23c9da0f49a1113402ee SHA512 f70ad8f871bd5068e2817049231abee7e535cb352f0444dcb0d9d072b9f4dda944e85ec7854855307a9748257da80f53dd50fe17fefbd73045dce1306f51f88d
 DIST memory_profiler-0.60.gh.tar.gz 142585 BLAKE2B aa7fd9e547eecadc184d4da5830c582a9a9ab9565f3dc9c763caaa7e75698ed6b499d2555e4a93b39d2f80f85fad025b84043e0812cb25dd1511f4ebf8da5a85 SHA512 407e44a410cdb4c7c8cc5ff40198c28012f8b0c6bba88d2d1612681eb621a1b802ef137be62fc64ca9e3c362ca3814433bc12169d7c3827bf97293c5bbb8bfbc
diff --git a/dev-python/memory_profiler/memory_profiler-0.58.0.ebuild b/dev-python/memory_profiler/memory_profiler-0.58.0.ebuild
deleted file mode 100644
index 0b5231cfce16..000000000000
--- a/dev-python/memory_profiler/memory_profiler-0.58.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A module for monitoring memory usage of a python program"
-HOMEPAGE="https://pypi.org/project/memory_profiler/ https://github.com/pythonprofilers/memory_profiler"
-SRC_URI="
-	https://github.com/pythonprofilers/memory_profiler/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-IUSE="examples"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-# dev-lang/mercury: collision on 'mprof'
-# https://bugs.gentoo.org/571176
-RDEPEND="dev-python/psutil[${PYTHON_USEDEP}]
-	!dev-lang/mercury"
-
-distutils_enable_tests pytest
-
-python_test() {
-	${EPYTHON} -m memory_profiler test/test_as.py || die
-	${EPYTHON} -m memory_profiler test/test_func.py || die
-	${EPYTHON} -m memory_profiler test/test_gen.py || die
-	${EPYTHON} -m memory_profiler test/test_loop.py || die
-	${EPYTHON} -m memory_profiler test/test_loop_decorated.py || die
-	${EPYTHON} -m memory_profiler test/test_mprofile.py || die
-	${EPYTHON} -m memory_profiler test/test_nested.py || die
-	${EPYTHON} -m memory_profiler test/test_precision_command_line.py || die
-	${EPYTHON} -m memory_profiler test/test_unicode.py || die
-
-	${EPYTHON} test/test_exception.py || die
-	${EPYTHON} test/test_exit_code.py || die
-	${EPYTHON} test/test_global.py || die
-	${EPYTHON} test/test_import.py || die
-	${EPYTHON} test/test_memory_usage.py || die
-	${EPYTHON} test/test_mprof.py || die
-	${EPYTHON} test/test_precision_import.py || die
-	${EPYTHON} test/test_stream_unicode.py || die
-	${EPYTHON} test/test_tracemalloc.py || die
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/memory_profiler/memory_profiler-0.59.ebuild b/dev-python/memory_profiler/memory_profiler-0.59.ebuild
index bf625fa4b0a0..999a55f09c51 100644
--- a/dev-python/memory_profiler/memory_profiler-0.59.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.59.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
@@ -17,7 +17,7 @@ IUSE="examples"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 # dev-lang/mercury: collision on 'mprof'
 # https://bugs.gentoo.org/571176
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index f14310ba5bc4..42f2ee0933cb 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,5 +1,3 @@
-DIST mkdocs-material-7.3.4.tar.gz 7319409 BLAKE2B 5e3805bdb4186637795011436281d5e2082fa7ec9d3f2eb07e2ee3ceb245ae1dbe81d461f59529fe2b821042a254b6d69a0838f01f470387bccca4a9a85179a3 SHA512 052245d69e7d19bdfa4db7e2d1d880cf49bd850ea79371cd222ecaab8964840e5b2b09bf4646f1a30f56b0161be6f3f163bcc81291ccbb0e6f47f7c24e741ab8
-DIST mkdocs-material-7.3.6.tar.gz 7391997 BLAKE2B 9ac47337287b724aa30da5c95b5fb54475fe96ac9c1b089f647430699b5393ea8859786214f47a4b32ed84bd509824d94cb876c1e3e40a3935e6669d24077490 SHA512 c29f30971e1e692dfca09408af3eda3b10211dba44f34aae42a61148008a0a3a020579c86bac8fc413a7938e866a9cf4630eab7a91a6e9a734a9ed52e327bceb
 DIST mkdocs-material-8.0.5.tar.gz 7523273 BLAKE2B 93b1f545e90784635a0f9b4c01a697310b18421540fd9563c5307806268af2e48e37c193979b8d86823bd5d875b1cc16d912aab52d108b12d6a796b08f8e7932 SHA512 6508b740ccc4ff7bd30c207cbe437d62c02140566cec047fdf0d98a23894825199b0928764f3fa1fe1314e9e95beaeff817d900dc5bf3d4b42b9b0e677eb3a47
 DIST mkdocs-material-8.1.0.tar.gz 7526249 BLAKE2B 6938ae4ff23ba450520f84630759ce408f1c11d75200281f6c454aa90d6af659d49c0d8f345a87b969e0169d4851a2510906b9e7243a0a93efbc99025dc9792a SHA512 2493edefbdbca0a3708950b62178c66ceefb5fb1868cafcb087bf727c404e3955abb2d45b14e944b4720b532e3cd049fbcae3e0d9b8f36295dede9dd2bdb3717
 DIST mkdocs-material-8.1.3.tar.gz 7654739 BLAKE2B 9b381e99ee2911d9d54a64b40538fb15bf568ba92171d6d42e1679143cf5729c5fabdb24de4d97509bdbdc05e5e282e310c03dc12c973449c935c77ea277dcc9 SHA512 65527fa1b5cd1f3a31cbc84d3bf52aa49844549dde042534f0d24e7bcf175f72ba1b21bda87d1fb4e25307b51f995d8de492b7c5c909f84d075e2b50fe97fc05
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.3.4.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.3.4.ebuild
deleted file mode 100644
index 9a3d859a26e6..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-7.3.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material
-	https://pypi.org/project/mkdocs-material
-"
-SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.3.6.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.3.6.ebuild
deleted file mode 100644
index 7a8869fc1d4a..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-7.3.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material
-	https://pypi.org/project/mkdocs-material
-"
-SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.0.5.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.0.5.ebuild
index 9b406b3eabe3..43632ae9b791 100644
--- a/dev-python/mkdocs-material/mkdocs-material-8.0.5.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-8.0.5.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
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index f01f20bfa0e3..f8d8047eb817 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -1 +1,2 @@
 DIST mpi4py-3.0.3.tar.gz 1429389 BLAKE2B 1e8c44b857b417237832682d0b3b5c90d1f1046fd8137d2a63972419ff8ec0e1fd2ebba521e2d2d6ba9f773b7c607370b55d8d75c9afeaca172ac06dd838943c SHA512 041768f753c8188b2560fe92711861780f0d77eda3281433520c98bb1e9b4da6a89c364f2d1c4623868ffbbcfde34ef556198b1bef6fc1c4a9c19cd5e71b546c
+DIST mpi4py-3.1.3.tar.gz 2461368 BLAKE2B 3ff7f6519a1ee96249567b1c65401fd1242c433bbb0a55c9d0a9b07f167ec44c71aefc24ac5fb354ceeb591dbfe97a4306f8455bb00559789367e91b78d80c16 SHA512 7a15224692016253120e8e88be1f7201e6f4548c1fb5ed15f04f416000b0d9e259dd8e80c0e237b1a960143e52b4a840d2a541359833387ac12868af1c059cea
diff --git a/dev-python/mpi4py/metadata.xml b/dev-python/mpi4py/metadata.xml
index 6ab567102c64..908bae2622f4 100644
--- a/dev-python/mpi4py/metadata.xml
+++ b/dev-python/mpi4py/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
+ <maintainer type="person">
+  <email>alex.fan.q@gmail.com</email>
+  <name>Alex Fan</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
  <longdescription lang="en">MPI for Python (mpi4py) provides bindings of the Message Passing
   Interface (MPI) standard for the Python programming language,
   allowing any Python program to exploit multiple processors.
diff --git a/dev-python/mpi4py/mpi4py-3.1.3.ebuild b/dev-python/mpi4py/mpi4py-3.1.3.ebuild
new file mode 100644
index 000000000000..45201fd95208
--- /dev/null
+++ b/dev-python/mpi4py/mpi4py-3.1.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Message Passing Interface for Python"
+HOMEPAGE="https://github.com/mpi4py/mpi4py https://pypi.org/project/mpi4py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	virtual/mpi
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		virtual/mpi[romio]
+	)
+"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# not needed on install
+	rm -vr docs/source || die
+	rm test/test_pickle.py || die # disabled by Gentoo-bug #659348
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	export FAKEROOTKEY=1
+	distutils-r1_src_compile
+}
+
+python_test() {
+	echo "Beginning test phase"
+	pushd "${BUILD_DIR}"/../ &> /dev/null || die
+	# spawn is not stable in OpenMPI 4
+	# https://github.com/jsquyres/ompi/pull/4#issuecomment-806897758
+	# oob_tcp_if_include lo is needed to allow test in systemd-nspawn container
+	mpiexec --use-hwthread-cpus --mca btl tcp,self --mca oob_tcp_if_include lo \
+		-n 1 "${PYTHON}" -B ./test/runtests.py -v \
+		--exclude="test_msgspec" --exclude="test_spawn" ||
+		die "Testsuite failed under ${EPYTHON}"
+	popd &> /dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	use examples && local DOCS=( demo )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index ff670d9e3b36..ed1b5bace875 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,3 +1,4 @@
 DIST paramiko-2.8.0.tar.gz 332217 BLAKE2B fcd691159b0306204064806881f8a42e7310fe23daf22c5de5ce8124d1496d48606247ab03c7657ff01560f801121a35011e0e615c5e142c41d191568f5b2300 SHA512 15f6e1cab9afdf3285804ce09b3af6c20ffc1f8e50d2549272f0ea545d1fdc858e72c7cba085db85c69aad2033655ae2f025e8ed2bd0dff574bcc03156bdb6ed
 DIST paramiko-2.9.0.tar.gz 344160 BLAKE2B b3436934143971b8a16f6100b6d1633b8ce37303d9be16fd228d7c8c83849e3ef8875cb5d3a3cfa8f08e9e72822ed1dfd310782f1fea0b32051758030b7a1f70 SHA512 3385f837ad36131f4508021b4ee0f073f293c0c1005768071becdfa0b9897dc7dd05467009329160f1eee709d32da72fe9e45fb6d61ea099f64748b00cffce14
 DIST paramiko-2.9.1.tar.gz 344470 BLAKE2B b750cf27d3a1324193f4c9bb39cbf773a4ad859dd3af3065da82d35177b2be9561c5175e15e9dcf4612a109849b5cfeea0d6a5f08098d3a6f3e529310ea8abc8 SHA512 d86824451be417322e0cdd073b31c103e737663af89f31abb1de21b5fbb9bdaa4b2e49505d2bc599114173df2457dcea308eb5c445fc5191248eb13e4c1eb500
+DIST paramiko-2.9.2.tar.gz 345088 BLAKE2B b3b95ec222ac5386fba311c2f0878a44a92bfd0d6edd45c928e2c681fccaf66f2bcfb185cf3eafd37361dc119127623d2c690a981e9f30bfe280eb4c1a0f66e6 SHA512 5b0810358376e4a42ba38ffa4a713f104b122fd77d463a80937dd6dc529da70825d6741fec16f93071aefe4bbfa6f0dbdb2eabd125663c19ba4d35ac06ecfa90
diff --git a/dev-python/paramiko/paramiko-2.9.2.ebuild b/dev-python/paramiko/paramiko-2.9.2.ebuild
new file mode 100644
index 000000000000..39d63492c75f
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.9.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
+# pypi tarballs are missing test data
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="examples server"
+
+RDEPEND="
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx sites/docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-2.7.1-tests.patch"
+	)
+
+	if ! use server; then
+		PATCHES+=( "${FILESDIR}/${PN}-2.4.2-disable-server.patch" )
+	fi
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r demos/*
+	fi
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 7ae4e3089b2e..4b240d5cd10c 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1 @@
-DIST phonenumbers-8.12.38.tar.gz 2268865 BLAKE2B 491e8e881a2c938c77053a16c7af6e01bf19eb83d1abc94e08eb23dd8ed6d3e864509d98a95f0300dff66a242cae01c6b158e0e1d5085334b4cb2de1e3b6bb1e SHA512 e5ff96fa803180f0843959db7337b9a2c23fe1ba60e4de50b2d679430b160c16a47f1a666c06ae9e8b35980a42fface89a55d866d824ce6db61cef8220ac0e1b
-DIST phonenumbers-8.12.39.tar.gz 2268929 BLAKE2B b89250a8f2df77302bd57ead7bc2d3c1bc3dfb87d246f235e5c53f40fb6cbe6f7b525f3af3f6412bb6a44858aba4def492c3e3bbc25a0e129cf021ad27633ac1 SHA512 018c33a0d602cc4d4e4a6a154d2fcf15cd036a1d247e5bc79ff0e6932a7ca6ef452a193b2e6d090cfe43a3347d374b183d203763247c9653f9ea1af3a7d980d1
 DIST phonenumbers-8.12.40.tar.gz 2269926 BLAKE2B 87163e927719441430ba9665085245a7664feed9bda66995d7d27203eda3d729e8b50409745efe2eaffb656b2998b952c6ee7a05576cd6144e7d52d23773089f SHA512 38fb914a23b0a683f0ef77da33360a594cf9c198e1b0143271d9615bd97089097bab5f4718f837bbbd89f8010ce2641a3b56b165b2c64845a8d2979af859fb7e
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.38.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.38.ebuild
deleted file mode 100644
index b584689d82f2..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.38.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DOCS=(README.md)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.39.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.39.ebuild
deleted file mode 100644
index 717843f08927..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.39.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=(README.md)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.40.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.40.ebuild
index 717843f08927..7d16db0d6124 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.40.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.40.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=(README.md)
 
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 5a5a142d30b6..b54a9e207301 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -1,2 +1 @@
-DIST pyalsa-1.1.6.tar.bz2 39797 BLAKE2B 3a23dde67ec807d09b2e9ef0f893b8ec2f5902b0fa88f0f02f8127b7a5a8bdf3fa09397dd01ae1cafbce6b9c733a0eca65fda3cd6fd18e533dd4fbace284caa3 SHA512 6c6aee1ad32c2208ab3f91defee5651cca8bb414479ff80e8a1bd6791ec1df2218a61dd8e7c01f95bd5d51807776034ff96cca2b935e9e4e23d13b6c3c40a0dd
 DIST pyalsa-1.2.6.tar.bz2 40171 BLAKE2B d142d5818527b30b333d2552045892854df25eb14a7983320fe56e30a6239d3fe947ef1f0e1202ed3b5aad7722002e0e5e82ab9f89564bb9640aca2dc03c7887 SHA512 11b8eed822e0f8acc96ff0e10eeec0ba26b2997c7a0000b1d82561661f59931cd6b6aa6397b46c5944a0853344517878ede6c9ba13bea241cefc72b72bf1d9ff
diff --git a/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild b/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
deleted file mode 100644
index 552726d3fc88..000000000000
--- a/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python bindings for ALSA library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${PN}-1.1.6-no-build-symlinks.patch" )
-
-# Testsuite appears to require installed state
diff --git a/dev-python/pyalsa/pyalsa-1.2.6.ebuild b/dev-python/pyalsa/pyalsa-1.2.6.ebuild
index 7b72dbda5dbc..ba6baa34ee42 100644
--- a/dev-python/pyalsa/pyalsa-1.2.6.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.2.6.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
@@ -13,7 +13,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib"
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 665d61331ce3..eedeeb413396 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,2 +1 @@
-DIST pycryptodome-3.11.0.tar.gz 15555515 BLAKE2B fee6a2f2ac0659c82efed2cfdaf7c4d1e4813aaa2203c41c249a7e512a4ec1c955f443022e81847fbfd095cd95f205c054b8c3ef90f4741063c679798cd8c5e5 SHA512 9a6f94a78909b236e9b9224915495f092891951b76836396706c11e8e87717ff84fd92fe04ad641d6a5a0ef1f3b339990d7f21a326e72b95b166a76169240964
 DIST pycryptodome-3.12.0.tar.gz 15130980 BLAKE2B 5eb34a03523652d990ddfdd1eebcbbacea30bffbe4838289c195b07658a98814ebec322aaffbed7b3fa564bc005d52ea1e483dedcb9f40b65d00e50c28d78582 SHA512 67f2a814d74305614fdf9dfb633c4fd9d80d2064119d0ecab24ae52fd8ce4b6de1a1e82c6ba7bcf22fb7db1a5a850adf078e22317b4c07229cd7cb8cb7f1ffd4
diff --git a/dev-python/pycryptodome/pycryptodome-3.11.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.11.0.ebuild
deleted file mode 100644
index 7f39bf2d7781..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.11.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org/
-	https://github.com/Legrandin/pycryptodome/
-	https://pypi.org/project/pycryptodome/"
-SRC_URI="
-	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	dev-libs/gmp:0=
-	>=dev-libs/libtomcrypt-1.18.2-r1:="
-BDEPEND="
-	virtual/python-cffi[${PYTHON_USEDEP}]"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-	!dev-python/pycrypto"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	# make sure we're unbundling it correctly
-	rm -r src/libtom || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.12.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.12.0.ebuild
index 59ed78add1b6..3c2668b9fe2f 100644
--- a/dev-python/pycryptodome/pycryptodome-3.12.0.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.12.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index c03bb75cfcbe..ee99635a75bf 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,2 +1 @@
-DIST pylint-2.11.1.gh.tar.gz 967223 BLAKE2B 435bb4589fa6dbfadfa234f8cb968a1d5c39efaf9b37fd20dfadc6feb1e997b34124386dab777b1aa1657bd9a36055d535e231181c71834517528cbbc04c698f SHA512 fe283b6eb8090414ea99809158b4e7f9fe85187ef6488ec37c5f34430793b0b4ff8afd9c97452fe0bb88efb9be001c0fd9f9a09a23081cb79084ae409b277f34
 DIST pylint-2.12.2.gh.tar.gz 1032702 BLAKE2B de7dce04159b332baa5c23f4034ee249e49f9239c5c9190213a51a84a47ac2129f8a2265e1ad9c01ab448ec58f4f36653c6de5b0be6bfdf6aa286c8887313759 SHA512 0d2b9b785371af0a1c809271153abbab58f50455b34f12370461ded2c4f3d62656e4c0391adff48e179b95da945a2f44e762863e2b7d63808976bf5f684e20d2
diff --git a/dev-python/pylint/pylint-2.11.1.ebuild b/dev-python/pylint/pylint-2.11.1.ebuild
deleted file mode 100644
index 356c0bbaa746..000000000000
--- a/dev-python/pylint/pylint-2.11.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-2.9[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.12.2.ebuild b/dev-python/pylint/pylint-2.12.2.ebuild
index 86bf75d9f35e..4cc0d1aea4e8 100644
--- a/dev-python/pylint/pylint-2.12.2.ebuild
+++ b/dev-python/pylint/pylint-2.12.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 # Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
diff --git a/dev-python/qdarkstyle/qdarkstyle-3.0.3.ebuild b/dev-python/qdarkstyle/qdarkstyle-3.0.3.ebuild
index 1dd710f757f7..42c2c797b653 100644
--- a/dev-python/qdarkstyle/qdarkstyle-3.0.3.ebuild
+++ b/dev-python/qdarkstyle/qdarkstyle-3.0.3.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # TODO: Figure out how to get this to work
 # Please pass a palette class in order to create its qrc file
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 500022809a50..3da3881c9a51 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,2 +1 @@
 DIST rq-1.10.1.tar.gz 599678 BLAKE2B 0673ca0eea69c3f86e50f5609a9c4ed2c2d93d331479510365a744461a5d878e6de6a9683356562754a25760f8ba1d8a65f6d5acfe878e488a70c54dc0bb5b54 SHA512 1a12bd5db27eb3f9303b2f3465c2f22092f7eebfabfc1e6aa7f65de7ea139df3833f9bbdc7061de564b2418608641b3755993bb918efbf93b04df67ca942ea09
-DIST rq-1.10.tar.gz 598643 BLAKE2B 503c2e45d134434373eb89ce205dc1a82f16e0281c1f872046d51538b3352b0ffeeef72f64991d093f271c276c1a8a3be92fdda4d7db3e083549f69ea7a04560 SHA512 7e2de3e36309eb3c095d34c28d9cba340d0699b8b4b457491d12420bfc1370e0336dc10f4f1115e83ac0ea8884500750895417f8b5c2090105d3c9e32d1b5bec
diff --git a/dev-python/rq/rq-1.10.1.ebuild b/dev-python/rq/rq-1.10.1.ebuild
index 1c62576fd51f..4c79c8890ac7 100644
--- a/dev-python/rq/rq-1.10.1.ebuild
+++ b/dev-python/rq/rq-1.10.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/rq/rq-1.10.ebuild b/dev-python/rq/rq-1.10.ebuild
deleted file mode 100644
index 5deb957ec024..000000000000
--- a/dev-python/rq/rq-1.10.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
-SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	elog "Spawning Redis"
-	elog "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 94fdffc34af7..d303038daf1a 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -3,3 +3,4 @@ DIST setuptools-59.8.0.tar.gz 2282358 BLAKE2B 2f1b49285fc70420e24f958c4955200ef0
 DIST setuptools-60.2.0.tar.gz 2282807 BLAKE2B 97d54353050d4e8a009e617a112c23d70726ad00625994d78639665f41245cee6f92544d5d5fc9962841ac0b2db3302ebbf0b5c6ee8f544f003fa05358c7ccf2 SHA512 9c7185843ead283ef97311018f1bb683c2e969f0333d5b246c7f1687c5ec6a9d6a2dafc39540ea7354e969d5a3f84e74c07dbce010970dd0ed46ebb48300a0bf
 DIST setuptools-60.3.0.tar.gz 2283824 BLAKE2B c0e1ffb6c19fd4c85aed2878a95e23372131e5c069551b39af477c72d591608e73d1bd9710d34a8540c226a0dbb91dd9def170121672daf2928d039f589c238e SHA512 71c19147e8f34a5eb2c830ad0942bcb1a468a3ae07c91035fb19eb50d549dbc3b9e992dd2b654383843ac6ba088a46dedfe928850417da92c24f1c5bf3e8b6c9
 DIST setuptools-60.3.1.tar.gz 2284193 BLAKE2B 0138acaf830d7f29db95c759e60d77986113385b13e96446974b63abf3621db2d2fd033f0f45bf380b6cfb2066ed66ff008446ca595f741c3f5446107f2a554b SHA512 7a2434d857b2914136d5ec0a7b9fbd89352a5dd3452bf2e3f7c0e2ef7317b45a3cfe6d3921b7f61a1f0a99a7c06f73428f9871dac0d7ae481fa1a1a0b97042cb
+DIST setuptools-60.5.0.tar.gz 2292478 BLAKE2B e41b2717b34d454b3959ee5b6f4fdc70dfec13d97fe6962bd1c1ea2296be8ee2d27bb14ed2cc5e6fb9a757661a0415984b3cf7cf1665347c62a50965f651f9d4 SHA512 b2cf7d99e60d0c862a7a4fd8e806019db52502de48ff77556df26ce39a8620f476de767e2e8be8aa260366f54d1429db8a42d538345ec2cd2cfd5286e62e770d
diff --git a/dev-python/setuptools/setuptools-60.5.0.ebuild b/dev-python/setuptools/setuptools-60.5.0.ebuild
new file mode 100644
index 000000000000..afc00e70f8ef
--- /dev/null
+++ b/dev-python/setuptools/setuptools-60.5.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/tomli[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# apply distutils patches to the bundled distutils
+	pushd setuptools/_distutils >/dev/null || die
+	# TODO: distutils C++ patch?
+	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
+	popd >/dev/null || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	distutils_install_for_testing
+	local EPYTEST_DESELECT=(
+		# network
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# unhappy with pytest-xdist?
+		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_test.py::test_tests_are_run_once
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/smmap/smmap-5.0.0.ebuild b/dev-python/smmap/smmap-5.0.0.ebuild
index 2f614c259483..5602d2c7f32a 100644
--- a/dev-python/smmap/smmap-5.0.0.ebuild
+++ b/dev-python/smmap/smmap-5.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-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"
 SLOT="0"
 
 distutils_enable_tests unittest
diff --git a/dev-python/spyder-unittest/Manifest b/dev-python/spyder-unittest/Manifest
index b347fd8808b7..beacbc8d1a77 100644
--- a/dev-python/spyder-unittest/Manifest
+++ b/dev-python/spyder-unittest/Manifest
@@ -1 +1,2 @@
 DIST spyder-unittest-0.4.1.tar.gz 79158 BLAKE2B 10b7a8fde9dffdb436c44f22d305ceab84970dabd19aaeb7b5685be21f0e7bfc701a5fbbf9e393a71c9feb36dd6a2be68680e276c8d0841b2133a7171c504e3f SHA512 17e08b09accd938bf533c409f9a8011e9780f9cc4533af0ec754b6a01061490f198213cb77af9050e1e67e2b4b9c25251bbab27dce23d3f6e09f502cfbef95fc
+DIST spyder-unittest-0.4.1_p20220106.tar.gz 80022 BLAKE2B c904196f7b0288b4d4f105037cbf75fc7ef60669ba1a24687b4f6aa672b88b139b64282c2d12340c958a3ffb65b8cf01b61256f669e167a6c15eb9471430af2a SHA512 4bea5d88b6be80435e2fa6498803ceea275b72c47bd0a54bb3be962bfe00feed2073e4d4915ea1b4dd780cb1c104f6dcd2735ee000cdedb934ed9fac059d0ca5
diff --git a/dev-python/spyder-unittest/spyder-unittest-0.4.1_p20220106.ebuild b/dev-python/spyder-unittest/spyder-unittest-0.4.1_p20220106.ebuild
new file mode 100644
index 000000000000..76fb97774924
--- /dev/null
+++ b/dev-python/spyder-unittest/spyder-unittest-0.4.1_p20220106.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 virtualx
+
+COMMIT="d210d9fe6c4efbb21d680a040cc4741d76a81f49"
+
+DESCRIPTION="Plugin for Spyder to run tests and view the results"
+HOMEPAGE="https://github.com/spyder-ide/spyder-unittest"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+# AttributeError: 'NoneType' object has no attribute 'split'
+RESTRICT="test"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/spyder-5.2.0[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+
+DEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	virtx epytest
+}
diff --git a/dev-python/terminaltables/Manifest b/dev-python/terminaltables/Manifest
index 9b87fce62975..eb45f1bce5a9 100644
--- a/dev-python/terminaltables/Manifest
+++ b/dev-python/terminaltables/Manifest
@@ -1,2 +1 @@
-DIST terminaltables-3.1.0.tar.gz 278484 BLAKE2B 733bcfcdc51c5e78e85e8f7fc9db00fa96c1ad48f76a9ec48ed546dc0acd62af90f437de346fe05d4cb09151b33ddea2f62beb21b418d7f76d8a719423a5f694 SHA512 dc49458652fff8bc6094d316d84c9b8e9fca1a26e3230c0b668bc03ec8528793f4ef024e8032d4a56fbfabfdfd4a1142870f550f0b373ba6a42dd2e3ead3f501
 DIST terminaltables-3.1.10.tar.gz 282122 BLAKE2B 53d5ecde38370f5b05d3eaae4b618ada6991214feadc7e826467dafede5baaf8292e47e6b2be903eb8ae6d46e3066314fe7950d7330056cd3053e0d643ad1a9e SHA512 84fa403cee4206b6b19de0206d89535bd2965a0796e1890dd9b0a9c6593c5f41d0d24b88ee9db426067c777712a4e810d67d4d0246496239a7a96b53a24e8174
diff --git a/dev-python/terminaltables/terminaltables-3.1.0.ebuild b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
deleted file mode 100644
index 5e938a4bd279..000000000000
--- a/dev-python/terminaltables/terminaltables-3.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Generate simple tables in terminals from a nested list of strings"
-HOMEPAGE="https://robpol86.github.io/terminaltables/"
-SRC_URI="
-	https://github.com/Robpol86/terminaltables/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/colorclass[${PYTHON_USEDEP}]
-		dev-python/termcolor[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/terminaltables-3.1.0-stdout.patch
-)
diff --git a/dev-python/terminaltables/terminaltables-3.1.10.ebuild b/dev-python/terminaltables/terminaltables-3.1.10.ebuild
index 4958ea544400..77cf2f45693c 100644
--- a/dev-python/terminaltables/terminaltables-3.1.10.ebuild
+++ b/dev-python/terminaltables/terminaltables-3.1.10.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
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 81238cb9b48f..c2a67564576d 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,3 +1,2 @@
-DIST uvicorn-0.14.0.tar.gz 511593 BLAKE2B 9f7aee0001874c128e44d31945aaa0ca92237e594debb6fea3c6c6d0f283c96cfad5248578b0e1c170fe2fde96a6b17c56ecf2436783fcae135b8eab1997b701 SHA512 f41a7f01ac6893ceaf4d1f06a4bccd7355e319eee11d6aa290b0d316fb356eb807c926941157ec64f1fc6b7c4601930cfbe271075d6c4cf684bd7e175617390f
 DIST uvicorn-0.15.0_p20210913.gh.tar.gz 542385 BLAKE2B 1e551ffccac6f92981b0ef62cc80fb494b57dc19bddf8430c54b8a06801ee81cdc31a3167a56e90dd8e0f318cc84dfc71443f74beb39dc68ccc252bc6d6c1042 SHA512 865fe148900c8c00847017bab3ef17a9514e7ef7878ad6220633e2bd6d89b2e65a79a82fdabb8beec83841346a175f0c20807bea07536071a06a884c74418e0d
 DIST uvicorn-0.16.0.tar.gz 707858 BLAKE2B 604aa23f8eac6409396ed603c89a524ce61630e3edd354cfe86950c535f3829aa1ececc8a91a8eeb8164d125e2b20add14f457ba0b23a0d0efd085c168739bee SHA512 68eb5daeb72b457a43fa89e352bfe281c79c1057ad9616ba083f96c1392aeb56759f13a3ee7e9eb90749f92df137f1db2bf8c90256751513d770d6679e971003
diff --git a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild b/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
deleted file mode 100644
index 6a9849b3564b..000000000000
--- a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="https://www.uvicorn.org/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-	>=dev-python/click-7[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_7)
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		>=dev-python/websockets-9.1[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# watchgod is not in the tree
-	sed -e '/^from uvicorn.supervisors.watchgodreload/d' \
-		-e 's/, WatchGodReload//' \
-		-i tests/supervisors/test_reload.py
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/uvicorn/uvicorn-0.14.0.ebuild b/dev-python/uvicorn/uvicorn-0.14.0.ebuild
deleted file mode 100644
index 85a6f8054a67..000000000000
--- a/dev-python/uvicorn/uvicorn-0.14.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="https://www.uvicorn.org/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-	>=dev-python/click-7[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_7)
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		>=dev-python/websockets-9.1[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# watchgod is not in the tree
-	sed -e '/^from uvicorn.supervisors.watchgodreload/d' \
-		-e 's/, WatchGodReload//' \
-		-i tests/supervisors/test_reload.py
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		# requires python-dotenv that's not keyworded everywhere yet
-		# see 0.14.0-r1
-		tests/test_config.py::test_env_file
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/uvicorn/uvicorn-0.16.0.ebuild b/dev-python/uvicorn/uvicorn-0.16.0.ebuild
index 19a1c94e2af8..4ea9eea7844e 100644
--- a/dev-python/uvicorn/uvicorn-0.16.0.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 54ea11ed58b7..b94c8f29ae6c 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,2 +1,3 @@
 DIST weasyprint-53.3.tar.gz 387448 BLAKE2B bc575a150ce3af4b33dc36b1d4148d5059c8a61c2576b9305735ae192314d7df61bd9c92defaa65159933be489c262e8ac343090a840d1cf49ed5af1e5e669ad SHA512 28efd97c06572de3e82763400efee3d2415da03feafcb38158c35465823d6ee8df9be4e11b813beeb2e851a6affae668ee9eea8859ec5de6c4da9347d9f4216a
 DIST weasyprint-53.4.tar.gz 388163 BLAKE2B c4a15be4f11f7d6be1bc96da39defb3420f0e96181998f0f20a1da94ea2c942fd1b23f0c4257da122647a88c6950c519b01910476711d4b482a8a9ae0354d95c SHA512 7fcdedbecfa13434217b08491db62b9afd3e716d4ac6378490a04120c407ab1b20883227c32a77c9bd8c8dd7324fb505920264db3c9105d712fa4d7dcf3a1578
+DIST weasyprint-54.0.tar.gz 402453 BLAKE2B 57c086a0ddf71e5eecf3860f5efcac327c927689e726694d59122a1ad6e7065c828497eacc04866bd4896a12016a75fc227e5f278f7ee987c8c489db3f7474c4 SHA512 3f6595fa856a5ef97e6c0009de34c3c614b829618fc9a28d5728047bbb6edf4972576a5577ef57d588a645d09a76e87ceb8928cc5536fb3900e6525559bf643b
diff --git a/dev-python/weasyprint/weasyprint-54.0.ebuild b/dev-python/weasyprint/weasyprint-54.0.ebuild
new file mode 100644
index 000000000000..50e90bae7650
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-54.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
+	>=dev-python/pydyf-0.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
+	x11-libs/pango
+"
+
+BDEPEND="
+	test? (
+		app-text/ghostscript-gpl
+		media-fonts/ahem
+		media-fonts/dejavu
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index f5d35705beea..df1dc5e65a27 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,3 +1 @@
-DIST websocket-client-1.2.1.tar.gz 45921 BLAKE2B 3717daac2aafcc13cfa71cd5678aeef7e6dd1933b072c40aa26bb315b2e2c84dea5734299fb954179b22a659fa271734ba78724e5f9d92be7a35efe1f611dd8b SHA512 fdbeb7ac2add27478a17b388ac62e9378094a368f29749d8b63c274ee41836506369dddd083956f42f1f2d74948392b3ddd59b801c98f9e028c126bdb54c636b
-DIST websocket-client-1.2.2.tar.gz 45971 BLAKE2B b62ba2d7b6d1b0d7a95f9350f1304cb178854a459bf4fb601b0c56404cfa2ec52824e6533b5f546b3f4e91a9b4a40072782640acdcdd170911a92efdea9c2ca0 SHA512 a47b70f754ee5b9f954a6b5a7cb788db21765776be8f3564e6a339ebd3a6b46c7b363eef208f92da4758f21e9923b97be08554586d3b30e9ad2251948a054add
 DIST websocket-client-1.2.3.tar.gz 46434 BLAKE2B e1e294938b41e6d82fa5cf8cd58fd9653e5170e11e546a04bce6dc0c8a9752cc25a21dbc1352fc614651f9fee43410a269a35e4c8dbacffec14f1ed8e8526f89 SHA512 5e5e00d43b7b4da5e2cb0d00d1e743e420791856e51e2b3d28d78219edcd7a2eace834ae4d7ee2faf89ab27c2b65f063e508f0e470a47ff9d88c36748b3dd113
diff --git a/dev-python/websocket-client/websocket-client-1.2.1.ebuild b/dev-python/websocket-client/websocket-client-1.2.1.ebuild
deleted file mode 100644
index 9604c8a98a2b..000000000000
--- a/dev-python/websocket-client/websocket-client-1.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="https://github.com/websocket-client/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/python-socks[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-1.2.2.ebuild b/dev-python/websocket-client/websocket-client-1.2.2.ebuild
deleted file mode 100644
index f3c1afef86e7..000000000000
--- a/dev-python/websocket-client/websocket-client-1.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="https://github.com/websocket-client/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/python-socks[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-1.2.3.ebuild b/dev-python/websocket-client/websocket-client-1.2.3.ebuild
index 995779e54f70..ba504f2ac6e4 100644
--- a/dev-python/websocket-client/websocket-client-1.2.3.ebuild
+++ b/dev-python/websocket-client/websocket-client-1.2.3.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="examples"
 
 BDEPEND="
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-01-09 01:38:09 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-01-09 01:38:09 +0000
commit	e771466d6b39173c88bdf482632447d79a7f1d69 (patch)
tree	f8cea2425c5c1fb56e66b47a4598eef0bccb2763 /dev-python
parent	be7e773261a6219481557643c0ef737fe9153cca (diff)
download	baldeagleos-repo-e771466d6b39173c88bdf482632447d79a7f1d69.tar.gz baldeagleos-repo-e771466d6b39173c88bdf482632447d79a7f1d69.tar.xz baldeagleos-repo-e771466d6b39173c88bdf482632447d79a7f1d69.zip