Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-09-19 01:45:01 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-09-19 01:45:01 +0000
commit: 63822c217487de884f9232cdb02a2f66b266b39e (patch)
tree: b3cc7146cd0380ece16401181ed665b9c5534748 /dev-python
parent: ea97efcc198edfea3f06de64ec17d81de009be36 (diff)
download: baldeagleos-repo-63822c217487de884f9232cdb02a2f66b266b39e.tar.gz
baldeagleos-repo-63822c217487de884f9232cdb02a2f66b266b39e.tar.xz
baldeagleos-repo-63822c217487de884f9232cdb02a2f66b266b39e.zip
90 files changed, 162 insertions, 1304 deletions
diff --git a/dev-python/PyECLib/PyECLib-1.6.0.ebuild b/dev-python/PyECLib/PyECLib-1.6.0-r1.ebuild
index 272eadc6fa24..be739bdfc46d 100644
--- a/dev-python/PyECLib/PyECLib-1.6.0.ebuild
+++ b/dev-python/PyECLib/PyECLib-1.6.0-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
-inherit distutils-r1 multilib
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
 HOMEPAGE="https://pypi.org/project/PyECLib/"
@@ -14,11 +15,23 @@ S="${WORKDIR}/pyeclib-${PV}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-CDEPEND="dev-libs/jerasure"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="dev-libs/liberasurecode
-	${CDEPEND}"
+DEPEND="dev-libs/liberasurecode"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# https://review.opendev.org/c/openstack/pyeclib/+/798010
+	sed -e '/library_dirs/d' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	optfeature "jerasure backend" dev-libs/jerasure
+}
diff --git a/dev-python/aioresponses/aioresponses-0.7.2.ebuild b/dev-python/aioresponses/aioresponses-0.7.2.ebuild
index 97abe829509b..c1ec1d4aec48 100644
--- a/dev-python/aioresponses/aioresponses-0.7.2.ebuild
+++ b/dev-python/aioresponses/aioresponses-0.7.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10-r1.ebuild
index c374172c61f1..098a011ce9d7 100644
--- a/dev-python/async_generator/async_generator-1.10.ebuild
+++ b/dev-python/async_generator/async_generator-1.10-r1.ebuild
@@ -17,6 +17,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-maco
 
 DOCS=( README.rst )
 
+distutils_enable_tests pytest
+
 python_test() {
 	pushd "${BUILD_DIR}/lib" >/dev/null || die
 	epytest
diff --git a/dev-python/cattrs/cattrs-1.7.1.ebuild b/dev-python/cattrs/cattrs-1.7.1.ebuild
index e19bab36f296..6bdc1ea28528 100644
--- a/dev-python/cattrs/cattrs-1.7.1.ebuild
+++ b/dev-python/cattrs/cattrs-1.7.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/cfn-lint/cfn-lint-0.53.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.53.1.ebuild
index e11ded664f96..673a43848d1c 100644
--- a/dev-python/cfn-lint/cfn-lint-0.53.1.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.53.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.38.0[${PYTHON_USEDEP}]
diff --git a/dev-python/feedgenerator/Manifest b/dev-python/feedgenerator/Manifest
index cb73834b3b6f..307f14e6518c 100644
--- a/dev-python/feedgenerator/Manifest
+++ b/dev-python/feedgenerator/Manifest
@@ -1,2 +1 @@
-DIST feedgenerator-1.9.1.tar.gz 25677 BLAKE2B 0293b3b41f83ab2d0e289cc5ea4b6088217dfa64caedf2da888d99a9d6860c45169852f9249049b2ee0983c9cebcf289b9b107ae63f5f5f5e057d93bf71d8a78 SHA512 db3642acb8f0c9fd692f37a79cf5862e60687a1745afbc6593d37a0372adb994de603238a17a8eae95ffcc993195f63037f16122a3cf8771e6922dea492fb5d5
 DIST feedgenerator-1.9.2.tar.gz 28076 BLAKE2B 18c1db7de23efa79aae7b1d92aeda4d41921e673da7be883099b3c00f54aa4602370caebb02913607644b8cf1d887e8141b8fc71ecd52e4720bb23c645ec5242 SHA512 3f9799a8008cf456635bacce87699c3fa00ac990ed675a92dbdccf898fd189c8908109a27bb393e9f25bda7f880c66c40fc3d1179d09e579be8125c70bf1b7a9
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
deleted file mode 100644
index 91cda884b3bc..000000000000
--- a/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,23 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Standalone version of django.utils.feedgenerator"
-HOMEPAGE="https://pypi.org/project/feedgenerator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.2.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.2.ebuild
index 615f75dcf3a3..9c7c6bb559f1 100644
--- a/dev-python/feedgenerator/feedgenerator-1.9.2.ebuild
+++ b/dev-python/feedgenerator/feedgenerator-1.9.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index bf3941833668..209e712ff623 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,2 +1 @@
-DIST hcloud-python-1.14.1.tar.gz 89865 BLAKE2B 962c24488681ed31d91d2f94b589de2c6192f3397831b482e3f0939224705344671467708266f1ce9ddf2ba767a0eaccaf4ac7516e1a9e27b5a5331fb009ab5c SHA512 bc4fdae97daf41ec8b84bf4069c07d75674b5bab8e74861a28e124343135e6c90fbdef232c6950d612778ffb9ba194bc9bd1a432df2336664e9fef87e28f9210
 DIST hcloud-python-1.16.0.tar.gz 93731 BLAKE2B d94881550dbd08281226b9869008ea6c4a10bc544a21a5aa17e48d4862808baa92b4805dc101ea970bf66baca1f5a971912601c4b934fe47614351029ece9f04 SHA512 282d1accb3c387caefe9dce7ab70dccfe2ff830c6ec3cd665326ad79076d7f9e58ab2f3061fa262208731c9d1e09e6c52d13075adf119f8b19d6af50e0374556
diff --git a/dev-python/hcloud-python/hcloud-python-1.14.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.14.1.ebuild
deleted file mode 100644
index d0d2e5af59cc..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.14.1.ebuild
+++ /dev/null
@@ -1,40 +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="Official Hetzner Cloud python library"
-HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
-SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	epytest --ignore tests/integration
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild
index ca524e78ab95..d0d2e5af59cc 100644
--- a/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild
+++ b/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index b985df8da2d4..b52ac27fddbd 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,2 +1 @@
-DIST httpretty-1.1.3.tar.gz 441309 BLAKE2B 9c8138bd83fd93602d4ab72e9ee2ff27605a851ee4e7e61f5fbe0d1423041479311315cf0168acb2474c2b579401c6817f4713f61707e21faad076968b2aa1f5 SHA512 3bac68ecb78efc7592f9ab314ca9ef570c8193fb7c2ab3d3fa003b0ff623ac57d6a74f8f0e7b6c2ed45f30e520d157345db56837212d9acd4ec6259570a43dfe
 DIST httpretty-1.1.4.tar.gz 442389 BLAKE2B 020a9fd2b5dc9790b53009caac37a3cf5a0e47102b9be05f4df255880f5daf5e7689714e0c0a8f223155d191c471cb5ff4f9b0d0d34b07bd5f377311ed56ba25 SHA512 4daceea4f30ce181e871167d304bd7af9d504364f55d42f8025770f2efe7e833d018aed681c8733d653d4de90db3433e999c56bccd4675f81e66d1cc4023e418
diff --git a/dev-python/httpretty/httpretty-1.1.3.ebuild b/dev-python/httpretty/httpretty-1.1.3.ebuild
deleted file mode 100644
index 6432a99f0d4f..000000000000
--- a/dev-python/httpretty/httpretty-1.1.3.ebuild
+++ /dev/null
@@ -1,46 +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="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-# redis skipped as it requires a redis server running
-DEPEND="
-	test? (
-		>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.18.1[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# remove useless deps
-	sed -i -e '/rednose/d' setup.cfg || die
-	# tests requiring network access
-	rm tests/functional/test_passthrough.py || die
-	# requires running redis server
-	# it is skipped correctly but it causes unnecessary dep on redis-py
-	#rm tests/functional/bugfixes/test_redis.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/httpretty/httpretty-1.1.4.ebuild b/dev-python/httpretty/httpretty-1.1.4.ebuild
index 7de17c8447ba..fef963bbb080 100644
--- a/dev-python/httpretty/httpretty-1.1.4.ebuild
+++ b/dev-python/httpretty/httpretty-1.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]"
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index fb87c3c7508a..eae536885318 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,2 +1 @@
-DIST httpx-0.18.2.tar.gz 1666756 BLAKE2B 3d1e25d503ae5306150c157bc83afdac9a475110d042e041b58de448a0dcfd75de3f4c15836b838dc799cd5f8b7e0d646e43bbe107ffad87d51ff016afe585cd SHA512 727974e5d5924fdd653987dd4f528d27bb2653085b01ef5efcdac39dc92ef2ed586f872c202349aa31105ad970cff914de4315c2d79338a6aa18bebb8126f392
 DIST httpx-0.19.0.tar.gz 1667455 BLAKE2B b8d4cb0b6e7f643b62b507930ccf1534d73d93261cab9281ef57d6392f00da325e897d5339aebacfa07aeae8278d3a81b78d6501a1587ffeaef68cc5087bfdaa SHA512 3b327f07d62cf0430672d4f1a4f884618e588496f049522de327f5c34f7260eb21739b7f1fbd6f43a21962bc8737547f3eddbc22751546647f56c9cd7212840a
diff --git a/dev-python/httpx/files/httpx-0.18.2-big-endian.patch b/dev-python/httpx/files/httpx-0.18.2-big-endian.patch
deleted file mode 100644
index 794609d86a50..000000000000
--- a/dev-python/httpx/files/httpx-0.18.2-big-endian.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 88a0a85ff795d8c23d5cd2cd113eeac957cc818a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 5 Aug 2021 17:35:54 +0200
-Subject: [PATCH] Fix JSON wrong encoding tests on big endian platforms
-
-Fix test_json_without_specified_encoding_*_error tests on big endian
-platforms.  The tests wrongly assume that data encoded as "utf-32-be"
-can not be decoded as "utf-32".  This is true on little endian platforms
-but on big endian platforms "utf-32" is equivalent to "utf-32-be".
-To avoid the problem, explicitly decode as "utf-32-le", as this should
-trigger the expected exception independently of platform's endianness.
----
- tests/models/test_responses.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/models/test_responses.py b/tests/models/test_responses.py
-index f1815dc..b7c2d57 100644
---- a/tests/models/test_responses.py
-+++ b/tests/models/test_responses.py
-@@ -735,7 +735,7 @@ def test_json_without_specified_encoding_decode_error():
-     content = json.dumps(data).encode("utf-32-be")
-     headers = {"Content-Type": "application/json"}
-     # force incorrect guess from `guess_json_utf` to trigger error
--    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32"):
-+    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32-le"):
-         response = httpx.Response(
-             200,
-             content=content,
-@@ -750,7 +750,7 @@ def test_json_without_specified_encoding_value_error():
-     content = json.dumps(data).encode("utf-32-be")
-     headers = {"Content-Type": "application/json"}
-     # force incorrect guess from `guess_json_utf` to trigger error
--    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32"):
-+    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32-le"):
-         response = httpx.Response(200, content=content, headers=headers)
-         with pytest.raises(json.decoder.JSONDecodeError):
-             response.json()
--- 
-2.32.0
-
diff --git a/dev-python/httpx/httpx-0.18.2.ebuild b/dev-python/httpx/httpx-0.18.2.ebuild
deleted file mode 100644
index de2b1ad90024..000000000000
--- a/dev-python/httpx/httpx-0.18.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Docs builder mkdocs not keyworded on all these arches yet
-# DOCS_BUILDER="mkdocs"
-# DOCS_DEPEND="dev-python/mkdocs-material"
-# DOCS_AUTODOC=1
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 # docs
-
-DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
-HOMEPAGE="https://www.python-httpx.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/certifi[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	=dev-python/httpcore-0.13*[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
-	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/hyper-h2[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/encode/httpx/pull/1781
-	"${FILESDIR}"/${P}-big-endian.patch
-)
-
-python_prepare_all() {
-	# trio is not currently in the tree
-	sed -i '/^import trio/d' tests/concurrency.py || die
-	sed -i '/pytest.param("trio", marks=pytest.mark.trio)/d' tests/conftest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		# Internet
-		tests/client/test_proxies.py::test_async_proxy_close
-		tests/client/test_proxies.py::test_sync_proxy_close
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/httpx/httpx-0.19.0.ebuild b/dev-python/httpx/httpx-0.19.0.ebuild
index ee27195bc7de..edc7219dd5bf 100644
--- a/dev-python/httpx/httpx-0.19.0.ebuild
+++ b/dev-python/httpx/httpx-0.19.0.ebuild
@@ -17,7 +17,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 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/dev-python/immutables/immutables-0.15-r1.ebuild b/dev-python/immutables/immutables-0.15-r1.ebuild
index 5134e61b5687..e951a633b966 100644
--- a/dev-python/immutables/immutables-0.15-r1.ebuild
+++ b/dev-python/immutables/immutables-0.15-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 PATCHES=(
 	# https://github.com/MagicStack/immutables/commit/fa355239e70411179c70b16ed4ff7113d8008dad
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 3a7e5ca1023e..351298c13df6 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,2 +1 @@
-DIST jellyfish-0.8.4.tar.gz 137001 BLAKE2B 55ffa7b7b931bf5bd0a2bee9a378fac10212d757d0e28492aac989a836c14106d37591a63a048db16b22c11e3964ad08325fe759e9ac2841722ac491a075feea SHA512 301fed3d4ba7228738b85310272970d2c666dd120a92a61b9870918ca3778bfead2b83437aced7933459f60079efcde863425a4a86077e8a0182db7d6d6c92cf
 DIST jellyfish-0.8.8.tar.gz 134461 BLAKE2B 29a4da13d248ab7916a4c9a6bd16da28bb9b4409bbc2e14660ac2a2bfad2563c7ddafb51c58968f5cac56c238de2786a5e1e64ee8d47cc668b0ab83e881b15f5 SHA512 d78f997a12ea2531e2621b3858f89a00c6c0620974a141fea6fdf6695860fa50ff4b5c21799de898944474563e6043e4d391448061501fbec078923dae21ae7c
diff --git a/dev-python/jellyfish/jellyfish-0.8.4.ebuild b/dev-python/jellyfish/jellyfish-0.8.4.ebuild
deleted file mode 100644
index d0eae3c81277..000000000000
--- a/dev-python/jellyfish/jellyfish-0.8.4.ebuild
+++ /dev/null
@@ -1,30 +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 module for doing approximate and phonetic matching of strings"
-HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/unicodecsv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	cp -r testdata "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	epytest lib/jellyfish/test.py
-}
diff --git a/dev-python/jellyfish/jellyfish-0.8.8.ebuild b/dev-python/jellyfish/jellyfish-0.8.8.ebuild
index 1a38f4aa60e7..d0eae3c81277 100644
--- a/dev-python/jellyfish/jellyfish-0.8.8.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.8.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 840a0bebdbf9..2192e00f67a3 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,4 +1,2 @@
-DIST keyring-23.0.1.tar.gz 48614 BLAKE2B dd56b92464934a7596bba97c5a1990eb2b3bf33da2eb469aa028ad346c09fa14687cc9214cb48ed82c0f32fc4fcf779391a00a5c9fffdff25f31e7f70f2bd731 SHA512 9f779e419049aef699c67dcb93277f336a2063b42394a4ff2350b8e72b81fe6763f6a6fbe8f358e90bf31540513095e2e56b83742841ee567e5d46b91995c063
 DIST keyring-23.1.0.tar.gz 43668 BLAKE2B 7ef9a8858568ef8d0889b693cab55f7d2e61ebc3e6116b1f936c6b841ef3a50838b80d6315e5a04bee44a71b1e3bd1112d627603c8b9d113b12173d3442af776 SHA512 d3bd6c6c224a00f2d2aa0c22ec05a5e78707db37c62ed0e03d444ed94e2eee053f7eb1e4c387073753ca5c9b76a9f51d0bda8294f9ba2a326c84afd913a14293
-DIST keyring-23.2.0.tar.gz 44489 BLAKE2B 8d3321b71bdee6f61c3e33866d9612c2ef249613063af58767658d33975275fce72fb9c8b83cdff5881c3e20738a679f50b84c4e8979ac9f282df3331c718a88 SHA512 10aa3debfcdb8b4a7632cfdaae71d2fb5993192bb25f3acb428f23fb830b262fc69a91f5a3c936e6828182436e999b7aeab4b6510ef0b36881eab44476ddcb8d
 DIST keyring-23.2.1.tar.gz 44522 BLAKE2B 79ba1fb530cecad84ba94e9a27f32196367af92952946c07581d68d5e89fac93d9b7a33cad8d1a95ae9ffe1568ddc189cd17decea7113debb022dafba4472bfd SHA512 205f74d9457f65952b1cada1a829bb97318cb80689b410eedb49def3577234f715ec6420d7d12833255ef5098040d0a5186be47fa6b8c6db6036406c3ee2e246
diff --git a/dev-python/keyring/keyring-23.0.1.ebuild b/dev-python/keyring/keyring-23.0.1.ebuild
deleted file mode 100644
index bc5cacb0de2c..000000000000
--- a/dev-python/keyring/keyring-23.0.1.ebuild
+++ /dev/null
@@ -1,42 +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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/jaraco-packaging \
-	dev-python/rst-linker
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# this test fails if importlib-metadata returns more than one
-		# entry, i.e. when keyring is installed already
-		tests/test_packaging.py::test_entry_point
-	)
-	epytest --ignore tests/backends/test_kwallet.py ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/keyring/keyring-23.1.0.ebuild b/dev-python/keyring/keyring-23.1.0.ebuild
index 9b568419cbc5..e8b9932be6eb 100644
--- a/dev-python/keyring/keyring-23.1.0.ebuild
+++ b/dev-python/keyring/keyring-23.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/keyring-23.2.0.ebuild b/dev-python/keyring/keyring-23.2.0.ebuild
deleted file mode 100644
index 25a51fe7c6bf..000000000000
--- a/dev-python/keyring/keyring-23.2.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 )
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/jaraco-packaging \
-	dev-python/rst-linker
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# this test fails if importlib-metadata returns more than one
-	# entry, i.e. when keyring is installed already
-	tests/test_packaging.py::test_entry_point
-)
-
-EPYTEST_IGNORE=(
-	# hangs
-	tests/backends/test_libsecret.py
-	tests/backends/test_kwallet.py
-)
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index e8eb5f021c40..d7fcea79d25e 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1,2 +1 @@
-DIST markdown2-2.4.0.tar.gz 96596 BLAKE2B 23fa2b05e7f26bd76b38b2c7f4fb5b3b36694b0e30ab3f168b64754f62d7d2742c5e0bfbed774a198527ad226bfe411e0ba11ddf6d0b2002670e5937750070a2 SHA512 ed523116e01121e471ee1a8ea9e8dde42a04c4c7c5170c56eed852268881f18b7b5062c43f1548fad3a84e2fbddc19c26fbf88084f6affdd11fd4d493a480cdf
 DIST markdown2-2.4.1.tar.gz 97089 BLAKE2B 62506be323a0c05060e5922b4eafbe1d0f6c2d9f81348fe5e35af8a577e0d7c26ba56cfa727fc1bb13dc3d08e7a8fe183d9ad91746dfc7a0034d025ff91c1bb9 SHA512 fa62640a135bb01b2dc82f658089c5880a3183c3b6e498ce76a27075d3045d70d7e00b9d497180a63c00cbd9ece83ebabaa8cd31ee326160d891fb422f43528e
diff --git a/dev-python/markdown2/markdown2-2.4.0.ebuild b/dev-python/markdown2/markdown2-2.4.0.ebuild
deleted file mode 100644
index bc624750a961..000000000000
--- a/dev-python/markdown2/markdown2-2.4.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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Markdown language reimplementation"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://github.com/trentm/python-markdown2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest test_markdown2.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/markdown2/markdown2-2.4.1.ebuild b/dev-python/markdown2/markdown2-2.4.1.ebuild
index 9422202c45a5..1a7ea89e2de4 100644
--- a/dev-python/markdown2/markdown2-2.4.1.ebuild
+++ b/dev-python/markdown2/markdown2-2.4.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/trentm/python-markdown2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 2f828f685a61..a7203707f919 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,4 +1,2 @@
-DIST pyglet-1.5.18.tar.gz 6440818 BLAKE2B cb7832000e0df96cd794f8eff9ba41aac8571542fbc45d1607df3935a7ed53ba8fd46b6bba40f6d5d53adfb2024aad1930cba1889b5d40d342457f7dc06db5d1 SHA512 d6ceddecccb36a90bef38c4a1608e866bb90ebb72eaaff693a2eb34678c7a50c99213a69042c569c22d54cc04a4b11d37ea8da47425958505261ebcf99bd28ce
 DIST pyglet-1.5.19.tar.gz 6446786 BLAKE2B fef21122cf31718e0a796b3be4edf386bf477dc4fa6480970159b9d361e489417c9cad1df1060290bc1678408eed36e287c15da442275beaa8d354c268568411 SHA512 7ef85d91cdcafef8cf097e96bd34e800002824696ffbc1132c2dd776fe9d3c7be0b5633fff1cb10344fcc1aafa3c0c9a75547ad374be091f35aa99527869ab4b
-DIST pyglet-1.5.20.tar.gz 6517626 BLAKE2B 41b63bc650823fc3065f71215822d39a1e3f40b02f75401ab8fab6be7d3d8848813c721f400ec923fa29f5d5b0a66f7d7af905caae10f1ea5ab5241cbead1c87 SHA512 da1519a2c196348d8af90f280ffc90b0f46d2d325403a5ca53fa663aab161d13802e22259124c3af77fbf5814c06d8920c0147b30c22db74fff885091e9a9ad0
 DIST pyglet-1.5.21.tar.gz 6516128 BLAKE2B ab7f23dc4ba48450f3da4efd30fadd089777f50b5392945636886192e89e230475f5bff9ba02cd166295423ed67f98b89fd186d18601504fe0f024c203a198c8 SHA512 3df0134dbfdeb15baae059bae489158273fd4797d5dc4da903ac2fdd58ae9e291e8d5371ebe545bd125a1670adfec84cb9d9f4f11841d594f3e4d38e5910ce2a
diff --git a/dev-python/pyglet/pyglet-1.5.18.ebuild b/dev-python/pyglet/pyglet-1.5.18.ebuild
deleted file mode 100644
index 70d5c7e0b5e0..000000000000
--- a/dev-python/pyglet/pyglet-1.5.18.ebuild
+++ /dev/null
@@ -1,62 +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 virtualx xdg-utils
-
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="http://pyglet.org/"
-SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/gst-python[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? ( || (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/gtk+:2
-	) )
-	sound? ( || (
-		media-libs/openal
-		media-sound/pulseaudio
-	) )
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-
-DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	xdg_environment_reset
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	epytest tests/unit
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyglet/pyglet-1.5.19.ebuild b/dev-python/pyglet/pyglet-1.5.19.ebuild
index 5513865e435b..283e937205d0 100644
--- a/dev-python/pyglet/pyglet-1.5.19.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.19.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pyglet/pyglet-1.5.20.ebuild b/dev-python/pyglet/pyglet-1.5.20.ebuild
deleted file mode 100644
index 5513865e435b..000000000000
--- a/dev-python/pyglet/pyglet-1.5.20.ebuild
+++ /dev/null
@@ -1,61 +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 virtualx xdg-utils
-
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="http://pyglet.org/"
-SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/gst-python[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? ( || (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/gtk+:2
-	) )
-	sound? ( || (
-		media-libs/openal
-		media-sound/pulseaudio
-	) )
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-
-DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	xdg_environment_reset
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	epytest tests/unit
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 78c9446303ab..7dc75c3a306e 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,2 +1 @@
 DIST Pygments-2.10.0.tar.gz 4052321 BLAKE2B 003d13344a2c5fe448a23d7bb45a401dc839cac10be262f5831c9547444d395811c92b74d1b18663a11a2e6cedf29b5a74cbd75267157429d61375bd9df6eb49 SHA512 28fdf35e333717795f199e0ef936d6df16ac0752324839ac36cabd2f9f6759a57663527d37f1c2f470258d63c3cf190f6dd4b631b21c849fc76575036fbdae12
-DIST Pygments-2.9.0.tar.gz 4048049 BLAKE2B 3531aa35d875296694dcfea267c3922c94d73959de82a34329b7582b35c8b76310cfd364bf22066be5251ee61bff996e44d8c8ca82e9e34af879f3f2ba734120 SHA512 60a8b38e9ea941e4f10d1c4a547be81b8545202d11e2162c6aec0f95014a5c2f718adab8780017be7f49e1f220f731d57ec26dadbd543bfd6a8a7d016c01d772
diff --git a/dev-python/pygments/pygments-2.10.0.ebuild b/dev-python/pygments/pygments-2.10.0.ebuild
index 73cb1ebb57a3..d1ed67086c40 100644
--- a/dev-python/pygments/pygments-2.10.0.ebuild
+++ b/dev-python/pygments/pygments-2.10.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 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"
+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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pygments/pygments-2.9.0.ebuild b/dev-python/pygments/pygments-2.9.0.ebuild
deleted file mode 100644
index d1ed67086c40..000000000000
--- a/dev-python/pygments/pygments-2.9.0.ebuild
+++ /dev/null
@@ -1,33 +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} pypy3 )
-inherit distutils-r1 bash-completion-r1
-
-MY_P=${P^}
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="
-	https://pygments.org/
-	https://github.com/pygments/pygments/
-	https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-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"
-
-BDEPEND="
-	test? (
-		virtual/ttf-fonts
-	)"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pytest-describe/Manifest b/dev-python/pytest-describe/Manifest
index badacc490dca..dae1902de5d6 100644
--- a/dev-python/pytest-describe/Manifest
+++ b/dev-python/pytest-describe/Manifest
@@ -1,2 +1 @@
-DIST pytest-describe-1.0.0.tar.gz 8917 BLAKE2B 8608a00151273ebb22da6a297580295abbd64c7d9e90bfba9611eac3be64247be20ee43bb64ead1a3f74e65719112a94535506f4402cb7084802360609ab0173 SHA512 1cefa2911e598063b3b9dce381750d204c925cb0dde890b79745c8b4f1cf6d0349f85dc9eaf895000a6f15f45a84fb920f27c01b0af1959125fbe3716cbebbbc
 DIST pytest-describe-2.0.0.tar.gz 9711 BLAKE2B d9a799afebf77166c81a9d2477a378d7664e9aa586460043c9a9448838eafebcb0679768d10d2439ab350b48ad7263ebe17eea6fdaef96ef14aceb6aa9ff943c SHA512 28edd2b10607424aff7b95dd834716fc1888a09c23d810e0b9870a5a93de3ca745d3506a6327ece6f92b3afcdcee0fb56f6f163e2868abcf2022175708ff58af
diff --git a/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild b/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
deleted file mode 100644
index 460dd00650d2..000000000000
--- a/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
+++ /dev/null
@@ -1,27 +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="Describe-style plugin for pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-describe/
-	https://pypi.org/project/pytest-describe/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# We need to disable some plugins because tests don't like unexpected
-	# output
-	PYTEST_ADDOPTS="-p no:flaky -p no:capturelog" epytest
-}
diff --git a/dev-python/pytest-describe/pytest-describe-2.0.0.ebuild b/dev-python/pytest-describe/pytest-describe-2.0.0.ebuild
index 9c59d1a119b3..d1e424ba3fba 100644
--- a/dev-python/pytest-describe/pytest-describe-2.0.0.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index 34c0621a19e1..c158f72a0c2d 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,3 +1 @@
-DIST pytest-httpx-0.12.0.tar.gz 21319 BLAKE2B 59c3678937a7756f13971e3f1f8d312b227f56339b4234ac8e5544f4370622bcff401f76f68c2ee042fdc64deae6a7a9dd05ca8a54b60b14bfb74b2d2d724de4 SHA512 b5866ab0123755020fad679d27d4d113132b2a79da85c52a334904d19aea90ddc71088a6e0f27110498da2731be664c525f3cab256d447a37d9a507f9a508b43
-DIST pytest-httpx-0.12.1.tar.gz 21422 BLAKE2B 6336a79d3aedbba7ec32fdafc6ed6fd70a24354adcdd3803af73522f9eb2d5bb1ac51364c107d3ca663f2c627a29fa9d3b0c12ba1bcba94259932a36c7695ed4 SHA512 959906c366b3cfc4d3df46773888f1da0c65ca4a9d31de302c859a61a71f10df5712b058bf89132756028eda15c35241aa245bc708d69560a0d3a80f9fa1e814
 DIST pytest-httpx-0.13.0.tar.gz 21515 BLAKE2B 691ce45dd2b27c8f47724e3356ba96e62a0d6a7ce7d3feea68295a873c12f9a3df00d5b25aad7ef8a1154e887077ae6f6c1b12f3685a0669534a0d0ee8aae68c SHA512 514d9acacdfd60d13b5ce2c5ebe46d0e4d16c1b06fd359b0b9515ae2fa9091296537f369882a78bdfad48e9a0aad0b2f8c172c2e54f4ae9e23ba03220c7c17fb
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.12.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.12.0.ebuild
deleted file mode 100644
index 8f595983e3fd..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.12.0.ebuild
+++ /dev/null
@@ -1,30 +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
-
-MY_PN="${PN/-/_}"
-DESCRIPTION="Send responses to HTTPX using pytest"
-HOMEPAGE="https://colin-b.github.io/pytest_httpx/"
-SRC_URI="https://github.com/Colin-b/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-python/httpx-0.18*[${PYTHON_USEDEP}]
-	=dev-python/pytest-6*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.12.1.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.12.1.ebuild
deleted file mode 100644
index ee1b4ed560f4..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.12.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 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
-
-MY_PN="${PN/-/_}"
-DESCRIPTION="Send responses to HTTPX using pytest"
-HOMEPAGE="https://colin-b.github.io/pytest_httpx/"
-SRC_URI="https://github.com/Colin-b/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-python/httpx-0.18*[${PYTHON_USEDEP}]
-	=dev-python/pytest-6*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.13.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.13.0.ebuild
index 662da71e0057..6f3c9d69d7fc 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.13.0.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.13.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	=dev-python/httpx-0.19*[${PYTHON_USEDEP}]
diff --git a/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild b/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild
index 15883086c900..4a3810c67b77 100644
--- a/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/JoshData/python-email-validator"
 SRC_URI="https://github.com/JoshData/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
index 1c7ef1c87776..50a93cc1225c 100644
--- a/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
+++ b/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mehcode/python-xmlsec/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 DEPEND="
 	dev-libs/xmlsec:=
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 70a20ed250a9..03624812c8fe 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,2 +1 @@
-DIST pytools-2021.2.7.tar.gz 63673 BLAKE2B 0d64aea8c87bf7d8f6f0fb432545fc20589aadf8cee41fdc9096a1e59e1ec4588812b803cffcbf8cc92bab4e18d5ea4422beeddc9408051af11e06b04d8e7a6a SHA512 284fbdb638d40247e330c254567f594f723cad467a504bb31852c0ec5cbbb0648d9596c65e9839975bbe3a52556896440c25da5d2171aaed7c26ba38db6a4426
 DIST pytools-2021.2.8.tar.gz 63381 BLAKE2B 975a611c0ee7b013facf9754926d52e66184d69b9bbbe3ddafd252d0c0bd093c11cb91140879e2660b7e2a4f2291b58f728b2e19add2e205653df59a9f2b7be2 SHA512 9dde96889c3505f5cf4eb06c3174b889ed8ecc964ac95d8cbf36ad500ab23470c5ee46b8f96bc4fa5d2dc710d3603680643a61e10bac4da8305d92b1e3ebd0d8
diff --git a/dev-python/pytools/pytools-2021.2.7.ebuild b/dev-python/pytools/pytools-2021.2.7.ebuild
deleted file mode 100644
index 6c12e65afaab..000000000000
--- a/dev-python/pytools/pytools-2021.2.7.ebuild
+++ /dev/null
@@ -1,24 +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} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2021.2.8.ebuild b/dev-python/pytools/pytools-2021.2.8.ebuild
index 0da343725f9d..6fb82892ec4f 100644
--- a/dev-python/pytools/pytools-2021.2.8.ebuild
+++ b/dev-python/pytools/pytools-2021.2.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
index bbd182155d6e..3516beb4dda5 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1,2 +1 @@
-DIST python-quantities-0.12.4.tar.gz 104093 BLAKE2B 84587726ef3c2f4c7dce4ea538363aecc42aa88c31d2990f834f2de9540b52d6ca0c437c1876a4c2dd5512b4be3af95cc64a1294ea60555ed1b51819f7f46125 SHA512 b5d181880d0789e6fbd55837c5ce65b677764a718be4550f1f553131e171caa59f8fc84d67e69563a293cda01e7b0678074fb311b3766f0013e658a9fa00471f
 DIST python-quantities-0.12.5.tar.gz 105130 BLAKE2B db1cf09fa2efc249bc722abe34ed71d0f59d85595f70baf44203785c32179a3598be8aac225adadfd7d5f09c44ec077dcef310ee2fe7ce4d49a1533b04cb9de6 SHA512 db81e45d464e65d6b144d05e1b990fccc5c17ab7fdd47c7bb0c0094ebcacd6af52a3692492561af3a694741810ddac03e4c887d7c6effed833f196493da5f156
diff --git a/dev-python/quantities/quantities-0.12.4.ebuild b/dev-python/quantities/quantities-0.12.4.ebuild
deleted file mode 100644
index 6dfc0d4255bf..000000000000
--- a/dev-python/quantities/quantities-0.12.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="python-quantities"
-MY_PV="$(ver_cut 1-3)"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Support for physical quantities with units, based on numpy"
-HOMEPAGE="https://github.com/python-quantities/python-quantities"
-SRC_URI="https://github.com/python-quantities/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${MY_PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/numpy[$PYTHON_USEDEP]
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Unexpected success
-	sed -i -e 's:test_fix:_&:' \
-		quantities/tests/test_umath.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/quantities/quantities-0.12.5.ebuild b/dev-python/quantities/quantities-0.12.5.ebuild
index d4e01f9734e5..1f6ee4b592f6 100644
--- a/dev-python/quantities/quantities-0.12.5.ebuild
+++ b/dev-python/quantities/quantities-0.12.5.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/numpy[$PYTHON_USEDEP]
diff --git a/dev-python/requests-cache/requests-cache-0.7.4.ebuild b/dev-python/requests-cache/requests-cache-0.7.4.ebuild
index 354c4fad4369..ea739200c353 100644
--- a/dev-python/requests-cache/requests-cache-0.7.4.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.7.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/cattrs[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-file/requests-file-1.5.1-r1.ebuild b/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
index 63f36efa8a26..74573ec54a0b 100644
--- a/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
+++ b/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 6bc9a19251ad..35df8b202fa2 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,3 +1,4 @@
+DIST rich-10.10.0.tar.gz 16264680 BLAKE2B 5f57b7ea7a091b3478ddc17dfe29309f558f36e8795a66ea918141f42f2a9e5a655667a1db8420193f3f44ba070413ebb512601751a6a5663a87db775576ce65 SHA512 8b9f1348b0f55db90c17042a83e8317d4f00b5446a77334a12379676ef1fe526f40dc92425e4bafce22ee5f65bcb2fae2422b903c6f958feb5734c254813826e
 DIST rich-10.3.0.tar.gz 16237609 BLAKE2B ddac8f2ed7b3b39e647179cd03cf59994729d7d82bdfad6670284a692871b79f2f6ceb86fae0d47d76401f756c122ebcb5978d241d4a95b4f3d6c54de67132a1 SHA512 91886b19c91052a7fe24fb9ae8c98a59f882e6c387036420f17a4867f581e71839b990541fcedf7831d361a9cb535f05c13e45bf5505a4d1fcdc0d0f8e8b39c8
 DIST rich-10.4.0.tar.gz 16240850 BLAKE2B 76874e3efd9a8d696ba96579e1c658b1c76e71d353574cf3f9fb5d8a15810879f649d0ebfcbd1d72d9d496ce438cc08099b5d0416b932875704be2d0b4b28d0a SHA512 ecf6234ac862c1e04ab71c39763857d770c20200f5e1903a7d8e90fc1a67b5702a9eb0c67454ca48fb786a7631f60401f0a3299e82d864eca8c7afefedf21e26
 DIST rich-10.5.0.tar.gz 16242786 BLAKE2B d4d612555f9dca24b5150f5502d95bede784d7e6481e15948614de15a914d0cb3c83b64148a02db4ce8693feb1604c3729006fc0ca347eb10313aedcb795feca SHA512 c0471c0f35d3d9e5b5baf5798911073de02820a5bb5dcf42324bef2153a49a3019db44bc96b95247defe3be65f18097fc266a30bdeab153d9dda0ae38d34a79b
diff --git a/dev-python/rich/rich-10.10.0.ebuild b/dev-python/rich/rich-10.10.0.ebuild
new file mode 100644
index 000000000000..901679288d88
--- /dev/null
+++ b/dev-python/rich/rich-10.10.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 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 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 0398fbd3bcde..ed86b3bd2fda 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,2 +1,3 @@
 DIST rope-0.19.0.tar.gz 252902 BLAKE2B 41760dc29d26558bdf5f296238b7d59ca949530826953fe5592b763b8d24fb49a90a56b9c7d0e3475daf145185987116a7dd0cbfba74829abfa4bf6a57c79937 SHA512 fd41777d76861837479bf0777ea42cc052eed7ba396bc4531a0c7f101b05b1c5a57c300950b7a3c8a2902e28ff049d146646f83f8a8a447ab9ccd7cd8aa48110
 DIST rope-0.20.0.tar.gz 257356 BLAKE2B 054ab1fd1b8ede2576c83eada588fb04827cfef570b2cd30461e1b12b3a42d601aa1e60bf1428a54b4d74127a561fce3f34f064b8018943fd1e6fe5c03764a5a SHA512 d84e2da66712da927b6dcf0ea40c50627002baebfd93585dbecda32e6ce0682fdf13577769b12890d31c4f1022795ab98c2dba25aa23a8b434762dbbcab974b8
+DIST rope-0.20.1.tar.gz 257811 BLAKE2B 58f11c02e68e08c532d08a4b36c08316afb42329f10ca67f7f73f0e19ef6b09aaf4b4e4fb1e90cf0af61c9779efc067e42945f9f10cf0abe4ff82b8cb3c8b5f6 SHA512 328016e711a7d684fa316b3eb8ebc233bcdf579d2545d038dedc703be82e6d5b4a8af8a9fba96569c84b9cab4450a139013ec25ae16a082c699920ea9096ce7f
diff --git a/dev-python/rope/rope-0.20.1.ebuild b/dev-python/rope/rope-0.20.1.ebuild
new file mode 100644
index 000000000000..a85054180d87
--- /dev/null
+++ b/dev-python/rope/rope-0.20.1.ebuild
@@ -0,0 +1,41 @@
+# 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 refactoring library"
+HOMEPAGE="https://github.com/python-rope/rope"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+# Dependency for docbuild documentation which is not noted in
+# setup.py, using standard docutils builds docs successfully.
+BDEPEND="
+	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_compile_all() {
+	if use doc; then
+		pushd docs > /dev/null || die
+		mkdir build || die
+		local i
+		for i in ./*.rst; do
+			rst2html.py $i > ./build/${i/rst/html} || die
+		done
+		popd > /dev/null || die
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sabyenc/files/sabyenc-4.0.2-fix-segfault.patch b/dev-python/sabyenc/files/sabyenc-4.0.2-fix-segfault.patch
new file mode 100644
index 000000000000..1a80d5f13da8
--- /dev/null
+++ b/dev-python/sabyenc/files/sabyenc-4.0.2-fix-segfault.patch
@@ -0,0 +1,28 @@
+From: Arthur Zamarin <arthurzam@gmail.com>
+Date: Sat, 18 Sep 2021 21:07:45 +0300
+Subject: Fix Segfault during testing
+
+decode_usenet_chunks might receive it argument as bytesarray, or
+as bytes object, but the C code expects only bytesarray.
+Add code, to apply variant for each case, and fail using assert when
+both don't apply.
+
+Signed-off-by: Arthur Zamarin <arthurzam@gmail.com>
+
+--- a/src/sabyenc3.c
++++ b/src/sabyenc3.c
+@@ -593,7 +593,13 @@ PyObject* decode_usenet_chunks(PyObject* self, PyObject* args) {
+         num_bytes_reserved = 0;
+         lp_max = (int)PyList_Size(Py_input_list);
+         for(lp = 0; lp < lp_max; lp++) {
+-            num_bytes_reserved += (int)PyByteArray_GET_SIZE(PyList_GetItem(Py_input_list, lp));
++            PyObject *temp = PyList_GetItem(Py_input_list, lp);
++            if (PyByteArray_Check(temp))
++                num_bytes_reserved += (int)PyByteArray_GET_SIZE(temp);
++            else if (PyBytes_Check(temp))
++                num_bytes_reserved += (int)PyBytes_GET_SIZE(temp);
++            else
++                assert(PyByteArray_Check(temp) || PyBytes_Check(temp));
+         }
+     }
+
diff --git a/dev-python/sabyenc/sabyenc-4.0.2.ebuild b/dev-python/sabyenc/sabyenc-4.0.2.ebuild
index 80c310464154..65a2c088df81 100644
--- a/dev-python/sabyenc/sabyenc-4.0.2.ebuild
+++ b/dev-python/sabyenc/sabyenc-4.0.2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
@@ -13,13 +14,15 @@ SRC_URI="https://github.com/sabnzbd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DOCS=( CHANGES.md README.md doc/yenc-draft.1.3.txt )
 
-DEPEND="test? (
+BDEPEND="test? (
 		dev-python/chardet[${PYTHON_USEDEP}]
 	)"
 
+DOCS=( CHANGES.md README.md doc/yenc-draft.1.3.txt )
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-segfault.patch"
+)
+
 distutils_enable_tests pytest
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 9180ab42c1d1..f65a3e93331a 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,2 +1 @@
-DIST scikit-build-0.11.1.tar.gz 132025 BLAKE2B 0f818d8da896695ee0d6b046249e74cbd4ea643bec0515d6ac6ff4276d92430a1dbf81abb3b7c10890538c373225a45cc21b0906de891f1a5390226be914dacd SHA512 030c6cc727d39cbafd2865722de9c45ba2f13461461cf75019b9caf6afd0a776b4f598fa2ce102b5adbc770140ab1de2c33e2bbd3ef03c958ae8849e5fc26cb4
 DIST scikit-build-0.12.0.tar.gz 138053 BLAKE2B 5007bd070cee14056cbc9cc24a022a39c920ce7fa794a79dcdb707f185529e1ed2442a201593f6df8d2dd9b4ab7a9a1ed209b0bc08f3feae748edd06894f8661 SHA512 76be92d8ff96dc230e38dc36a58021399dd8c57b6883dc032fbcd8f01ce42c879c6d557e7a46d48aa9b8bc724270f409f3760824d5810654b53a1aca25ec1cf9
diff --git a/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch b/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
deleted file mode 100644
index f48ad9340754..000000000000
--- a/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/docs/conf.py b/docs/conf.py
-index 094ed23..a58cb85 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -41,7 +41,6 @@ import skbuild
- # Add any Sphinx extension module names here, as strings. They can be
- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- extensions = [
--    'cmake',
-     'sphinx.ext.autodoc',
-     'sphinx.ext.viewcode',
-     'sphinx_issues'
-@@ -291,4 +290,4 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
- if not on_rtd:  # only import and set the theme if we're building docs locally
-     import sphinx_rtd_theme
-     html_theme = 'sphinx_rtd_theme'
--    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-\ No newline at end of file
-+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
diff --git a/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch b/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch
deleted file mode 100644
index fa00556f9add..000000000000
--- a/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c1677527af3f7afd48ebbe1b2338ac822f64c524 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 19 Jun 2021 19:27:09 +0200
-Subject: [PATCH] fix: fix regex in test_get_python_version for Python 3.10
-
-Fix the regular expression in test_get_python_version to permit
-the minor version to contain more than one digit.  This fixes the test
-on Python 3.10.
----
- tests/test_cmaker.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_cmaker.py b/tests/test_cmaker.py
-index d63059c..52d0028 100644
---- a/tests/test_cmaker.py
-+++ b/tests/test_cmaker.py
-@@ -21,7 +21,7 @@ from . import _tmpdir, get_cmakecache_variables
- 
- 
- def test_get_python_version():
--    assert re.match(r'^[23](\.?)[0-9]$', CMaker.get_python_version())
-+    assert re.match(r'^[23](\.?)\d+$', CMaker.get_python_version())
- 
- 
- def test_get_python_include_dir():
--- 
-2.32.0
-
diff --git a/dev-python/scikit-build/scikit-build-0.11.1.ebuild b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
deleted file mode 100644
index be5f99f42f6e..000000000000
--- a/dev-python/scikit-build/scikit-build-0.11.1.ebuild
+++ /dev/null
@@ -1,53 +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="Improved build system generator for Python C/C++/Fortran/Cython extensions"
-HOMEPAGE="https://github.com/scikit-build/scikit-build"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]"
-
-DEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10.0-docs.patch"
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# sandbox violations
-		tests/test_hello_cpp.py::test_hello_develop
-		tests/test_issue274_support_default_package_dir.py
-		tests/test_issue274_support_one_package_without_package_dir.py
-		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/scikit-build/scikit-build-0.12.0.ebuild b/dev-python/scikit-build/scikit-build-0.12.0.ebuild
index 1fe188315509..0f0b56cdad80 100644
--- a/dev-python/scikit-build/scikit-build-0.12.0.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index 7d7679912879..d2cd649ba348 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,4 +1,2 @@
-DIST terminado-0.10.1.tar.gz 13911 BLAKE2B e939bab2a23b75d803ba2260548a48a0f1c9925f6a2fe69ff7b549255539898e35f76e94526f8f470126d4d50466f8a85a14bbd3c38d2999d4e90ec4be3e0222 SHA512 fb6a6e27cec8e644565ecab3a7c43fd288c6ff9e18e68dda6d306532fa5e39274574f3dabdbf629cf00096256fef9a0419c98a3d9b7b038e04dd6ca1af16af46
-DIST terminado-0.11.0.tar.gz 14423 BLAKE2B 0fd782bd2b75bb74990b4638af3855d4c63bc53c1be5b1614ab7669e0504ad40b608bfcc4d8c77a4aa36bc3f2a0304a534b791161320de11c1687b4f568ce9c4 SHA512 038619e3e2114200afdc940c4937e20ac0aaee5df152fd2f1fc92f50c5f51bd0e351d3fb8d3979fe8ce5d5a12a27b9f896cf9ff0578a82772fe464b73d6a8d98
 DIST terminado-0.11.1.tar.gz 14451 BLAKE2B 02650bb272d2f11a5a4fa24d1d67f6fb7e35aa2b55e24abec0016c190d6af705079f2e4f56ca4cfb65eb801b7db02950daa8834c8f8768c15ec7637bb8d1a21a SHA512 55b44e8153a54ab43eff35ce8e1fcc0a3ec9189d5fc14cba6953fa03a7584b1be24ba53bcd8a5ca6e17da1fdc8e4f34c5c74417842bdad54a6c913a083d9487a
 DIST terminado-0.12.1.tar.gz 14513 BLAKE2B 97537851a2284c4cae2d9cdc42ad2714c9368f4318ac14c35197d6691404bec205b7b589c35302ff9d3fa99e4a15e24e713f70cc319e26788631134ff4b77cb1 SHA512 770a41b8fa6b43a577c077e8239a43b654f8e4423564ca38d66428ed6c322edea64c98225cb94ae182add9757b6d4e52796edd332443fe7ac643677a8d133674
diff --git a/dev-python/terminado/terminado-0.10.1.ebuild b/dev-python/terminado/terminado-0.10.1.ebuild
deleted file mode 100644
index 8db681be8723..000000000000
--- a/dev-python/terminado/terminado-0.10.1.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
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
diff --git a/dev-python/terminado/terminado-0.11.0.ebuild b/dev-python/terminado/terminado-0.11.0.ebuild
deleted file mode 100644
index e792dda82d05..000000000000
--- a/dev-python/terminado/terminado-0.11.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=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
diff --git a/dev-python/terminado/terminado-0.11.1.ebuild b/dev-python/terminado/terminado-0.11.1.ebuild
index 17dca75ed0a3..2fc4aca65941 100644
--- a/dev-python/terminado/terminado-0.11.1.ebuild
+++ b/dev-python/terminado/terminado-0.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index b714e7647ac0..935dba5f7e08 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,4 +1,2 @@
-DIST tox-3.24.1.tar.gz 305886 BLAKE2B fcedf8054a19a79045b2edead599fb11b7942986fa4bbc184140603e3bc6700eada452e661f4a576d029804ab2a9282df0cf9198eee9b483c2c6c68b086ee156 SHA512 e4bfb3dab15887ce6432a91b88a7387179cbf2a5ab5fa608b3f1f7349be4122d76ce01d396ae9b1515c211f2905d110a8414e254cc72bcf8a74542db98ea52de
-DIST tox-3.24.2.tar.gz 305924 BLAKE2B f91af9fdb4de94eb9ecf65774619234f1e52827c7c6e3ce75ca8161564f8cdc8af210f229ae07f5d381f7964cbbc936f47d4242848513c9bf1c8989a73fe0420 SHA512 e33a1126440ac53cf07cd7dbe695ea1307ebad92e0ed4d6e6c738affa059104f1b5bfc360883283ddd59e5156f7bb00c52d2d2ddd2294b6664f22a2abaaf66c3
 DIST tox-3.24.3.tar.gz 306285 BLAKE2B 368eaf959533f62b08d6e44929ae327ff25ea6eca25a3f47c7b9945428821bf80ab7e0ab4daea8821b55b9a7a009f30c3d5641812fd444a86577ea0ae83adb7d SHA512 de1c1ccc3a277c617521e77806d1d993a5c19f811016bebc442bfea12c3d40a22bf80b7d11b11744a5ddf705c6e8955f2811f149d413ea8522d94c985ed1f715
 DIST tox-3.24.4.tar.gz 306760 BLAKE2B 332c99d021bc3c25549fd95d051baaa1f0dc3aaf776928320826bb7e6bce6444fd5a993e1dbff3a4ebbde9dbb59e30d07eae4b04096294b3a186b130b8312587 SHA512 49e2cb74f119b5cc049d2a64479e56307cea1f36a5586840cca12cb8f4ce8a2ba991cc6142bef7f095a7d32b44f7513f89cce56d89deaff0e12194ceb3da6249
diff --git a/dev-python/tox/tox-3.24.1.ebuild b/dev-python/tox/tox-3.24.1.ebuild
deleted file mode 100644
index 93af768403d9..000000000000
--- a/dev-python/tox/tox-3.24.1.ebuild
+++ /dev/null
@@ -1,69 +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="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' pypy3)
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		# broken without Internet
-		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
-		tests/integration/test_provision_int.py::test_provision_interrupt_child
-
-		# expects python2 to exist
-		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
-	)
-
-	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
-		# TODO?
-		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
-
-		# broken without tox installed first
-		# TODO: why it can't import itself?
-		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
-	)
-
-	distutils_install_for_testing --via-venv
-	epytest --no-network ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/tox/tox-3.24.2.ebuild b/dev-python/tox/tox-3.24.2.ebuild
deleted file mode 100644
index e97421796c36..000000000000
--- a/dev-python/tox/tox-3.24.2.ebuild
+++ /dev/null
@@ -1,69 +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="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' pypy3)
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		# broken without Internet
-		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
-		tests/integration/test_provision_int.py::test_provision_interrupt_child
-
-		# expects python2 to exist
-		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
-	)
-
-	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
-		# TODO?
-		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
-
-		# broken without tox installed first
-		# TODO: why it can't import itself?
-		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
-	)
-
-	distutils_install_for_testing --via-venv
-	epytest --no-network ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/tox/tox-3.24.3.ebuild b/dev-python/tox/tox-3.24.3.ebuild
index 3cefcfd185a1..c5e26678c68c 100644
--- a/dev-python/tox/tox-3.24.3.ebuild
+++ b/dev-python/tox/tox-3.24.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 38df5b00f115..4cdf9ea4df48 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,2 +1 @@
-DIST trustme-0.8.0.tar.gz 29046 BLAKE2B 5f2dd542974466dd8e61fa0ba5cd78e824afd243dd3b27ca21aec4ba4905daaa0c46db8f4edb30dcb483acf44758d7ad8de4db9c3e07a05d4d3d084565722def SHA512 93b1007319f7d625410eddf92910607c8190533f9bb02a71ecc4c424e44ecea70749f6bceb917297241e179b0d50ce1ed330c208cf3de77d4d3a619f5436af9d
 DIST trustme-0.9.0.tar.gz 30081 BLAKE2B 5623fba91f07027032f48ee355b5c4f853518bc6a5c1e93b4ea387ff25838302efa42476db8eb64e364980805aa1c3be97f827260efc31ffb536c53fe30ba988 SHA512 f0d983a4c52374f178c0bf96f758fdb5f132e7f7c4bac187c84fbc8dc82dc36d6c801c340bf8871e872178f7b2ac66d6159b5462d073beec9a13a086f64b58b7
diff --git a/dev-python/trustme/trustme-0.8.0.ebuild b/dev-python/trustme/trustme-0.8.0.ebuild
deleted file mode 100644
index c8049a924bdc..000000000000
--- a/dev-python/trustme/trustme-0.8.0.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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
-HOMEPAGE="https://github.com/python-trio/trustme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/trustme/trustme-0.9.0.ebuild b/dev-python/trustme/trustme-0.9.0.ebuild
index 408bd47484d6..983f3d7ee438 100644
--- a/dev-python/trustme/trustme-0.9.0.ebuild
+++ b/dev-python/trustme/trustme-0.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/tzlocal/tzlocal-3.0.ebuild b/dev-python/tzlocal/tzlocal-3.0.ebuild
index c98b31e260a7..0f42d01cf2d0 100644
--- a/dev-python/tzlocal/tzlocal-3.0.ebuild
+++ b/dev-python/tzlocal/tzlocal-3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/ujson/ujson-4.1.0.ebuild b/dev-python/ujson/ujson-4.1.0.ebuild
index b673dda64ffb..5c27a313d1ca 100644
--- a/dev-python/ujson/ujson-4.1.0.ebuild
+++ b/dev-python/ujson/ujson-4.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/websockets/websockets-9.1-r1.ebuild b/dev-python/websockets/websockets-9.1-r1.ebuild
index 3c9266fb02bb..118c188e0686 100644
--- a/dev-python/websockets/websockets-9.1-r1.ebuild
+++ b/dev-python/websockets/websockets-9.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index 2e92aa18fae9..d3a18a7dbf34 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -1,3 +1 @@
-DIST WSGIProxy2-0.4.6.tar.gz 16481 BLAKE2B c33dc34d430da795e8144e06e1d6f100cce7d0155295c2d3038567a048647a4f008dbc0156fd4234ce069b3f4ec01af0e42b174dd68c92c9cb3ff4e13be83f8a SHA512 c60d794c0c8b383bf1857ec325d6d0b4fce9c4aec4a06cbf9d7549b609633e491e137342b7bbaf4eec12462eabba63096328c8517b0685e241d1baecd5827cad
-DIST WSGIProxy2-0.5.0.tar.gz 16464 BLAKE2B be8f818a1eb3280598427d52b4a7661f5c3cb86a4701e6c3c6b9c57bfde740a0ed616f9f6df8d7f4539c6716898bb5f7ebbf245d72452d84da9862df7cbec761 SHA512 8351225ffe78069f35e636efbd508d3ccd1a3365ac8846bc8fd5712c04869d21c1f9e9e9207d286649713cb9dcbc4770cf41f2c5f06a8d72e86f290211f05c0a
 DIST WSGIProxy2-0.5.1.tar.gz 16565 BLAKE2B 54bdc404111d910af61a59a7da5d47924e1950162dfb79dc0fd221a417c4fbb717dc4e7cf521589e3d087ffce1917449a199f5278bd4410ccce391b9c551eced SHA512 6be9d4893515cc70ee1c5d7b7a29895a8c8b5afd316e2ad05f92fc1fa93e26da22b93440994ec9782f0663ff7073e476f75351fb7955bde93a2b6fbf9f4bf78a
diff --git a/dev-python/wsgiproxy2/files/wsgiproxy2-0.4.6-tests.patch b/dev-python/wsgiproxy2/files/wsgiproxy2-0.4.6-tests.patch
deleted file mode 100644
index 77515b85b027..000000000000
--- a/dev-python/wsgiproxy2/files/wsgiproxy2-0.4.6-tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/wsgiproxy/test_wsgiproxy.py b/wsgiproxy/test_wsgiproxy.py
-index 39355d9..7806d3b 100644
---- a/wsgiproxy/test_wsgiproxy.py
-+++ b/wsgiproxy/test_wsgiproxy.py
-@@ -1,4 +1,6 @@
- # -*- coding: utf-8 -*-
-+import sys
-+import platform
- import unittest
- from wsgiproxy import proxies
- from webtest import TestApp
-@@ -86,6 +88,7 @@ class TestHttplib(unittest.TestCase):
-                             headers=[('Transfer-Encoding', 'chunked')])
-         resp.mustcontain(no='chunked')
- 
-+    @unittest.skipIf(sys.hexversion < 0x3000000 and 'pypy' not in platform.python_implementation().lower(), "broken on cpython2")
-     def test_quoted_utf8_url(self):
-         path = '/targets/NR2F1%C3%82-human/'
-         resp = self.app.get(path)
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
deleted file mode 100644
index cc34396cc2ba..000000000000
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
+++ /dev/null
@@ -1,44 +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} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="WSGIProxy2"
-DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="https://pypi.org/project/WSGIProxy2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/webtest-2.0.17[${PYTHON_USEDEP}]
-		dev-python/socketpool[${PYTHON_USEDEP}]
-	)"
-# Testing also revealed the suite needs latest webtest
-
-PATCHES=(
-	"${FILESDIR}/wsgiproxy2-0.4.6-tests.patch"
-)
-
-distutils_enable_sphinx docs
-distutils_enable_tests nose
-
-python_prepare_all() {
-	sed -i '/with-coverage/ d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.5.0.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.5.0.ebuild
deleted file mode 100644
index 56ab2b0f1086..000000000000
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.5.0.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
-
-MY_PN="WSGIProxy2"
-DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="https://pypi.org/project/WSGIProxy2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/webtest-2.0.17[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.5.1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.5.1.ebuild
index a2c7822f1e87..e76e61d09de0 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.5.1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.5.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/zeep/zeep-4.1.0.ebuild b/dev-python/zeep/zeep-4.1.0.ebuild
index 8939a9e65305..fc5d6ec8f904 100644
--- a/dev-python/zeep/zeep-4.1.0.ebuild
+++ b/dev-python/zeep/zeep-4.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="async"
 
 RDEPEND="
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 4966b9dc249e..4703e84b97a7 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,6 +1,2 @@
-DIST python-zeroconf-0.33.4.gh.tar.gz 121380 BLAKE2B a1a8ac266aaded65337aa9d5c26d8a52b6329500a1a18354148590fdb47988f200b0658a41e18b78694cd9f95f1322cce0ff289a795bf9459ab6d383d5ee13f9 SHA512 fa6dd453ea22beb113c53941ce750e214da3211b6fc14d8b0cb575b927cff14759c49fec4e9ada4a2fd4ebc0bb3b0b355a2454ca0e128a3213fc8be41f096af7
 DIST python-zeroconf-0.35.1.gh.tar.gz 127099 BLAKE2B dc09dadaeaac64d8517de407ddcfffc4152e366430c492d4ab562c56afa3264c33a26373f249bbddd969bb28dbc5c1b7513e59c0ebb728c12a77fb9d428e4f0a SHA512 27386cd425928821080c9c6fd2babdcfc001cc4583ef4c699169e3818f6bb8536f712cf7959e6003a6aaf40e85b5337a8a5abcfdf686455dee577cfa61270fb7
-DIST python-zeroconf-0.36.1.gh.tar.gz 128104 BLAKE2B a5f2fdf35dd8c51e727ad1f4cd9ba442f2b99fd7ecc6ce0ce9cb0331997f445be90bba17571cec5ec0f59b64268241abacb5aee39134427098902b8d592494c6 SHA512 c568dd836a101a47ef74318154cd6c7fe2eb93c674450596f8e6ec4b7cfb66740126cc994b8f4d98458dd64a16c971ebab29b0877366396b8f5fabd03341107c
-DIST python-zeroconf-0.36.2.gh.tar.gz 129052 BLAKE2B 4bdc4ac13064e162590af12da2d89cd566fbe749f1b11ebef210b2adbe7e33e75ff0e95d3ed11f7d045e016fff525c9a7b9124804d741160b0073016f4757d09 SHA512 2f2a7a87afa07907ed3aa3cd79d2f2e9b61e82193301f219f0505831349b003bca1ae2b6fc1dc71fcf6cb9cfb849413f9766ef88e3955fc569ad84fb9e5e5b60
-DIST python-zeroconf-0.36.3.gh.tar.gz 128887 BLAKE2B 57fa2359f5086eff9069334738db7515607309849b5d1e6bedfa16a7d24a12c068cf139d6885a85c418bf22c1033fa437670be6cce09b758af6d073f3cb37123 SHA512 a93799713ee7c4d507b350b4074bca23556275b1a1a14795a621f2cd9c10cf711fd80333e5685dae753207db265ab454a5bfe965cf44de77121bccd5ce8e1625
 DIST python-zeroconf-0.36.4.gh.tar.gz 128860 BLAKE2B ee6d02b583933404b6a1945235c1708e74211ae985a8c8e493098c59fe7003ef09223a87f9db87c78a22d0c1823748ea9f3aa1ca106a340d5df5a3ca6cfcb0bf SHA512 b1bfba10f374d006979ab0a626b9c3e9c0be25b07ad0f5242c463507b221cabfe11d18b02b29edc68f14b838b738b9a1265445fb8988e3243889454f17b3d7f3
diff --git a/dev-python/zeroconf/zeroconf-0.33.4.ebuild b/dev-python/zeroconf/zeroconf-0.33.4.ebuild
deleted file mode 100644
index c73003154e65..000000000000
--- a/dev-python/zeroconf/zeroconf-0.33.4.ebuild
+++ /dev/null
@@ -1,39 +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
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/jstasiak/python-zeroconf/
-	https://pypi.org/project/zeroconf/"
-SRC_URI="
-	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local excludes=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-	)
-
-	epytest ${excludes[@]/#/--deselect }
-}
diff --git a/dev-python/zeroconf/zeroconf-0.35.1.ebuild b/dev-python/zeroconf/zeroconf-0.35.1.ebuild
index c406eead3ace..c73003154e65 100644
--- a/dev-python/zeroconf/zeroconf-0.35.1.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.35.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/zeroconf/zeroconf-0.36.1.ebuild b/dev-python/zeroconf/zeroconf-0.36.1.ebuild
deleted file mode 100644
index c406eead3ace..000000000000
--- a/dev-python/zeroconf/zeroconf-0.36.1.ebuild
+++ /dev/null
@@ -1,39 +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
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/jstasiak/python-zeroconf/
-	https://pypi.org/project/zeroconf/"
-SRC_URI="
-	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local excludes=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-	)
-
-	epytest ${excludes[@]/#/--deselect }
-}
diff --git a/dev-python/zeroconf/zeroconf-0.36.2.ebuild b/dev-python/zeroconf/zeroconf-0.36.2.ebuild
deleted file mode 100644
index c406eead3ace..000000000000
--- a/dev-python/zeroconf/zeroconf-0.36.2.ebuild
+++ /dev/null
@@ -1,39 +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
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/jstasiak/python-zeroconf/
-	https://pypi.org/project/zeroconf/"
-SRC_URI="
-	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local excludes=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-	)
-
-	epytest ${excludes[@]/#/--deselect }
-}
diff --git a/dev-python/zeroconf/zeroconf-0.36.3.ebuild b/dev-python/zeroconf/zeroconf-0.36.3.ebuild
deleted file mode 100644
index 727d5570c1fd..000000000000
--- a/dev-python/zeroconf/zeroconf-0.36.3.ebuild
+++ /dev/null
@@ -1,35 +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
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/jstasiak/python-zeroconf/
-	https://pypi.org/project/zeroconf/"
-SRC_URI="
-	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# network
-	tests/test_core.py::Framework::test_close_multiple_times
-	tests/test_core.py::Framework::test_launch_and_close
-	tests/test_core.py::Framework::test_launch_and_close_context_manager
-	tests/test_core.py::Framework::test_launch_and_close_v4_v6
-	tests/test_core.py::Framework::test_launch_and_close_v6_only
-	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-)
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-09-19 01:45:01 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-09-19 01:45:01 +0000
commit	63822c217487de884f9232cdb02a2f66b266b39e (patch)
tree	b3cc7146cd0380ece16401181ed665b9c5534748 /dev-python
parent	ea97efcc198edfea3f06de64ec17d81de009be36 (diff)
download	baldeagleos-repo-63822c217487de884f9232cdb02a2f66b266b39e.tar.gz baldeagleos-repo-63822c217487de884f9232cdb02a2f66b266b39e.tar.xz baldeagleos-repo-63822c217487de884f9232cdb02a2f66b266b39e.zip