Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-06-24 13:50:18 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-06-24 13:50:18 +0000
commit: 8b317bcd38029487569edcb3903c78be108b0b85 (patch)
tree: bcb2b5f9fdac8c3995d5f69ea3734f22f7988360 /dev-python
parent: ffa55519fa218c66693a3418b3b1f3d991fb1a1f (diff)
download: baldeagleos-repo-8b317bcd38029487569edcb3903c78be108b0b85.tar.gz
baldeagleos-repo-8b317bcd38029487569edcb3903c78be108b0b85.tar.xz
baldeagleos-repo-8b317bcd38029487569edcb3903c78be108b0b85.zip
90 files changed, 395 insertions, 1454 deletions
diff --git a/dev-python/Faker/Faker-8.8.2.ebuild b/dev-python/Faker/Faker-8.8.2.ebuild
new file mode 100644
index 000000000000..0473bf2016c8
--- /dev/null
+++ b/dev-python/Faker/Faker-8.8.2.ebuild
@@ -0,0 +1,28 @@
+# 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="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 54e8a1f33206..ac859d9a3167 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -3,3 +3,4 @@ DIST Faker-8.6.0.tar.gz 1147647 BLAKE2B 6d3903ec2d75bae963879485572f7781455ff241
 DIST Faker-8.7.0.tar.gz 1147940 BLAKE2B 9f0548472aa3ac092c2cf63da73fc456207da9ff4e405373ff7d2c8e02afff75912e1c3ac03a1d87981d66dfdb7ca611ae9ab2c8638c610032486e09ea37930f SHA512 cd75674aa959854701d2ba47f5f0638be730dbe1e4e6a6f9d551b100a65b8fc53cd9a5b1568a473bcf7c8044d2a3bd4ce7b621c8e7bc0bf002a5eb5afa5a6b96
 DIST Faker-8.8.0.tar.gz 1148063 BLAKE2B e774e208438f7f31331c8c18bee2e7f27c2bb4e8f280bbdbd87e9de6484f5db9b38cfa01932efbbfdc82fc0bd3a8f05a9ade0324578deec750bb576b21f9ba7d SHA512 fc389638be46e109df208e8a6109e2236acfda136ccb7b02df9b4ef793310f63d9317f12b84811290851517afb557a130a4ed370176ef19e76d1e83b06959381
 DIST Faker-8.8.1.tar.gz 1148431 BLAKE2B afb6fe9c3c93e909c26e734558d95186d3dff19efceee3a2bd7bb2158dfac34fc74c959ad163eb8e08f374d47c84bb454ffe45efa30b4b62e9d9e478ac784025 SHA512 46b1d04c40d93b8688421eb3dcfe6f718f61225d6e30846c9d6578c12451a2a1634a36bd084078e992174c9c017865b5acbbbda49d311b67f921ade14a72475f
+DIST Faker-8.8.2.tar.gz 1148529 BLAKE2B 279984479ad4f790dc7acd74b5ccd1cf5f32689b8b1ccf2152d7dfaa6fc7b4699d9827c16f83bb86e298723b6906a5cc40c2fa7f75439b5af5fc78c1af99a3f6 SHA512 4273008bf9ab693a40da2f93ff1fe40e9e7b102a2d5439f09096b6754b82dc26310666da65723b363f628365c97d44dd290e1e7065b7a9d862130baa292325b7
diff --git a/dev-python/aiodns/Manifest b/dev-python/aiodns/Manifest
index 9f41ab2f6a22..a8e6b03e6fe1 100644
--- a/dev-python/aiodns/Manifest
+++ b/dev-python/aiodns/Manifest
@@ -1,2 +1 @@
-DIST aiodns-2.0.0.tar.gz 5948 BLAKE2B 70944ffbfa3fa1c591c5aab6ce2c4c59564a7665fd2eda1b544616a4481e58464f918081dfb21f74db08ebe4c7e43eebd17e0dc314cf79423835a182a257cd11 SHA512 d80b8f7641234c4d367e4554b10c5a66265e75ee82c58adf2a36f9e369bb1dbf4341dd6459f10540b771de3f102454511ca81eddf3082733e88c09bbdf125fe0
 DIST aiodns-3.0.0.tar.gz 6743 BLAKE2B 2a3c61156069fa598df58191b35383da3e054396cdeb1bc8916cc0414bb6efc89d45789883a5b4f33e3a08a6ee544356b02d6c697c096deae3398f0ff4d3c316 SHA512 8c1016f3b0cb461e70e9a55034f9ad3b3db705a845bf20bb6503c7a5d592b4c5d2e8ddc60b375c5fafdc559dc4566736f4c93f26710be2dcbd181284ef039825
diff --git a/dev-python/aiodns/aiodns-2.0.0-r1.ebuild b/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
deleted file mode 100644
index 36fad09cdda1..000000000000
--- a/dev-python/aiodns/aiodns-2.0.0-r1.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple DNS resolver for asyncio"
-HOMEPAGE="https://github.com/saghul/aiodns/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-RESTRICT="test"
-
-RDEPEND=">=dev-python/pycares-3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	#692720 apply https://github.com/saghul/aiodns/pull/73
-	sed -e 's|typing; python_version<"3.7"|typing; python_version<"3.5"|' -i setup.py || die
-}
-
-python_test() {
-	"${EPYTHON}" tests.py -v || die
-}
diff --git a/dev-python/aiodns/aiodns-3.0.0.ebuild b/dev-python/aiodns/aiodns-3.0.0.ebuild
index fb3ea5c9da86..2dafb090f444 100644
--- a/dev-python/aiodns/aiodns-3.0.0.ebuild
+++ b/dev-python/aiodns/aiodns-3.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 # Tests fail with network-sandbox, since they try to resolve google.com
 PROPERTIES="test_network"
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 33a08706f84f..4977f31d9d37 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,2 +1,3 @@
 DIST anyio-3.1.0.tar.gz 122097 BLAKE2B 4a16a5d231cc5262dd4138f628b9d210180733bda4b9e81ced0c0e0c7f49e1760c8dd22db0a1db3b7a21f3210072f4e1c543e52a7dc716ad3f0415827da48e38 SHA512 120d8e3e24f542c06caedd0a67d16b3fb69c94f5feaebde5262e54f8ffba3f1cf927c82030d65fa2efb3479ee64abd968b6ce67aee767ea33ccef6b0e3fbd358
 DIST anyio-3.2.0.tar.gz 126210 BLAKE2B cedace636a115ad579ca47b345bb2a9bb32e97fa2ef886a9e6bd19219dcc92c393aaaf480df5e6f48c959590c2d6a3e0770f700ab4901c7a8e576b231597abf1 SHA512 f4e718704225d9cbb8e2592246ac393f96e82fb1898bc0ff89b2d7990c4aac7e7c9b339cb57a594c59a9e5730696122c9e647310c26e00ab152879e0a7e85863
+DIST anyio-3.2.1.tar.gz 126277 BLAKE2B 510980c9251081d5188f7654279753051cd9f8221f2090fb99624612e48b6f5fc1f6d9f1808f1c329c350857f14ceaee0d72615857171de33dc35cc7ba35ab23 SHA512 ef78e5531a917e3a5ddc1106f45ba556ca147e52ab29ed6cb25a3bd287148a15a015942dde6b9535d683fbe5910affed27df6ce5c4049251610f689cd151ee89
diff --git a/dev-python/anyio/anyio-3.2.1.ebuild b/dev-python/anyio/anyio-3.2.1.ebuild
new file mode 100644
index 000000000000..08976e100ef3
--- /dev/null
+++ b/dev-python/anyio/anyio-3.2.1.ebuild
@@ -0,0 +1,47 @@
+# 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="Compatibility layer for multiple asynchronous event loop implementations"
+HOMEPAGE="
+	https://github.com/agronholm/anyio
+	https://pypi.org/project/anyio/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+
+RDEPEND="
+	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
+	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-autodoc-typehints
+
+PATCHES=(
+	"${FILESDIR}"/${P}-missing-trio.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	epytest -Wdefault -m 'not network' -p no:django
+}
diff --git a/dev-python/anyio/files/anyio-3.2.1-missing-trio.patch b/dev-python/anyio/files/anyio-3.2.1-missing-trio.patch
new file mode 100644
index 000000000000..492fe40fe70e
--- /dev/null
+++ b/dev-python/anyio/files/anyio-3.2.1-missing-trio.patch
@@ -0,0 +1,125 @@
+From d05f92bddc4b34a8d527f66d5d27513cd91c741a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 24 Jun 2021 09:16:01 +0200
+Subject: [PATCH] Handle missing trio gracefully
+
+Make it possible to use anyio without actually having to install trio.
+This involves modifying get_all_backends() to only return the backends
+that are actually present, and teaching the tests to skip trio if it
+is not importable.
+---
+ src/anyio/_core/_eventloop.py | 13 +++++++++----
+ tests/conftest.py             |  9 ++++++++-
+ tests/test_pytest_plugin.py   |  2 +-
+ tests/test_taskgroups.py      | 10 ++++++++--
+ 4 files changed, 26 insertions(+), 8 deletions(-)
+
+diff --git a/src/anyio/_core/_eventloop.py b/src/anyio/_core/_eventloop.py
+index f2364a3..431a922 100644
+--- a/src/anyio/_core/_eventloop.py
++++ b/src/anyio/_core/_eventloop.py
+@@ -10,8 +10,6 @@ import sniffio
+ # This must be updated when new backends are introduced
+ from ._compat import DeprecatedAwaitableFloat
+ 
+-BACKENDS = 'asyncio', 'trio'
+-
+ T_Retval = TypeVar('T_Retval')
+ threadlocals = threading.local()
+ 
+@@ -106,8 +104,15 @@ def current_time() -> DeprecatedAwaitableFloat:
+ 
+ 
+ def get_all_backends() -> Tuple[str, ...]:
+-    """Return a tuple of the names of all built-in backends."""
+-    return BACKENDS
++    """Return a tuple of the names of all available built-in backends."""
++    backends = ['asyncio']
++    try:
++        import trio
++    except ImportError:
++        pass
++    else:
++        backends.append(trio)
++    return tuple(backends)
+ 
+ 
+ def get_cancelled_exc_class() -> Type[BaseException]:
+diff --git a/tests/conftest.py b/tests/conftest.py
+index f040ac8..5834395 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -8,6 +8,11 @@ import trustme
+ from _pytest.fixtures import SubRequest
+ from trustme import CA
+ 
++try:
++    import trio
++except ImportError:
++    trio = None
++
+ uvloop_marks = []
+ uvloop_policy = None
+ try:
+@@ -30,7 +35,9 @@ pytest_plugins = ['pytester']
+                  id='asyncio'),
+     pytest.param(('asyncio', {'debug': True, 'policy': uvloop_policy}), marks=uvloop_marks,
+                  id='asyncio+uvloop'),
+-    pytest.param('trio')
++    pytest.param('trio',
++                 marks=[pytest.mark.skipif(trio is None,
++                                           reason='trio is not available')])
+ ])
+ def anyio_backend(request: SubRequest) -> Tuple[str, Dict[str, Any]]:
+     return request.param
+diff --git a/tests/test_pytest_plugin.py b/tests/test_pytest_plugin.py
+index bb254a5..d55d511 100644
+--- a/tests/test_pytest_plugin.py
++++ b/tests/test_pytest_plugin.py
+@@ -135,7 +135,7 @@ def test_asyncio(testdir: Testdir) -> None:
+     )
+ 
+     result = testdir.runpytest('-v')
+-    result.assert_outcomes(passed=2, failed=1, errors=2)
++    result.assert_outcomes(passed=2, failed=1, errors=len(get_all_backends()))
+ 
+ 
+ def test_autouse_async_fixture(testdir: Testdir) -> None:
+diff --git a/tests/test_taskgroups.py b/tests/test_taskgroups.py
+index 62a2389..47971c0 100644
+--- a/tests/test_taskgroups.py
++++ b/tests/test_taskgroups.py
+@@ -5,7 +5,6 @@ import time
+ from typing import Any, AsyncGenerator, Coroutine, Dict, Generator, NoReturn, Set
+ 
+ import pytest
+-import trio
+ 
+ import anyio
+ from anyio import (
+@@ -13,6 +12,11 @@ from anyio import (
+     fail_after, get_cancelled_exc_class, move_on_after, sleep, wait_all_tasks_blocked)
+ from anyio.abc import TaskGroup, TaskStatus
+ 
++try:
++    import trio
++except ImportError:
++    trio = None
++
+ if sys.version_info < (3, 7):
+     current_task = asyncio.Task.current_task
+ else:
+@@ -53,7 +57,9 @@ async def test_success() -> None:
+ 
+ @pytest.mark.parametrize('module', [
+     pytest.param(asyncio, id='asyncio'),
+-    pytest.param(trio, id='trio')
++    pytest.param(trio, id='trio',
++                 marks=[pytest.mark.skipif(trio is None,
++                                           reason='trio is not available')])
+ ])
+ def test_run_natively(module: Any) -> None:
+     async def testfunc() -> None:
+-- 
+2.32.0
+
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 7ee3d879fee0..fa6b9dd10f2f 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -20,3 +20,4 @@ DIST boto3-1.17.95.tar.gz 383063 BLAKE2B 9d715ce7cf51daa806c0ed6044eca32c51dddc9
 DIST boto3-1.17.96.tar.gz 383485 BLAKE2B d962177eb5a693aad1900fbe6c44e20853deee74a31f188d1d12a34352d1376a5edcb84e854d8eddb8ce9dfe0aa46d8ec8c5998010a0f3a635d7b4b2ac46a1ea SHA512 c77a682b6895ddaceec21f9ad28eb08bda9eafa102cdb1024270247f9bfe849249c80bc586e18de4c1bd1410dabd165154b6c17655e8d56a16d38e009d695141
 DIST boto3-1.17.97.tar.gz 383223 BLAKE2B 1a1b4e9f2c51d830762f27cf3e30038efb88322e300ac304d1cb88d5b7efc6af35ad9810cea7292c9807dcdfedb11ba039ee6d5dbb9162f2a1c6d6936ef75bcc SHA512 e74a59763cc9b8a51fd09121a790d29a7291d9380d4451c2e6af90902f18415a3780eeea7f7d63e052b295792b92c3cdd3b8597f7013241ebbbdb7e418cf73ce
 DIST boto3-1.17.98.tar.gz 383306 BLAKE2B f9fed22e11d2561a5a665105bdddffce2cea357f588200285ba4758809e6f64ded3ef4ad4eb10a52a1852df86d1098f752f432f5bd90a70669d569866262d638 SHA512 223de2234b235773138ffca02eed8187eaa2b74fa3c0822700bfcebe12da69078ab592ca77158448cb998d47dc63a20c79a3ce9dab2398c41faaf94a329c7cc3
+DIST boto3-1.17.99.tar.gz 384452 BLAKE2B a86fcc79242ce9e55101690f2fc7534d43038621c9d5aa9d9f7f1eebbf9bcb07a035e91d62486163894f8598969ccb99047d54918f874dacfb647116a65b097e SHA512 99f1fc890680162b2ec8bd9da77f4de5ecf23ab1f7cee552f51031f2b21ca930b9d2ab27ad5f61d1b7e4a4433b288374615313e00abe8ae595c10fe36f6a49c3
diff --git a/dev-python/boto3/boto3-1.17.99.ebuild b/dev-python/boto3/boto3-1.17.99.ebuild
new file mode 100644
index 000000000000..76a508785b03
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.99.ebuild
@@ -0,0 +1,56 @@
+# 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="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index b8e4168e9c84..72e78200f120 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -20,3 +20,4 @@ DIST botocore-1.20.95.tar.gz 7833074 BLAKE2B f7c6f01cf28f609a2a6c2cdcb41240d3d65
 DIST botocore-1.20.96.tar.gz 7842597 BLAKE2B 1a30d4d29c1200f51284a30ee1f512debfbf5542836e32e4971b593a041c4e0793e609b11528a1ecf080e2a01dd4b0ab06bfc44905beee202c23fca983238111 SHA512 9a4973b7484fa5586473dbedd402d6b8adfca18a17373752078f35fc24fda7477a37e2c9fee4779e52c3a60b352ab02943ebf49eb77dd607b79e88d25ae9b6c3
 DIST botocore-1.20.97.tar.gz 7846552 BLAKE2B da0355cc229ba8a0632f67866bf06b27d7b257184b53670e5dc183c6b5a1f4d3a34145de0a3f04abd2adc08de3f0775e3c7e0dbecae729acb5bc05c7ce9acaf2 SHA512 7411d5de8ecf0c42c0142ded036189dcf378cd16f761071beb5bc2a2c240eabb0c4a8c669ce89a5b4e798a0aae92f0e67755627c2a84df77fc2e9557265a4e3b
 DIST botocore-1.20.98.tar.gz 7854150 BLAKE2B 3f63f0057555b33fbb69d4f8720b393dc6f866721df0a90be354ae3485e0053bcf2216f180d4f795cd271a5ea77e7d390ff453c5d2655e60b51623be1fe5df8e SHA512 98d931ad9efbcb899bc3f6e1fd55028fdbc88cebb9d2ffe93db08610b8515de8bd784338b2320136319314783fbb65d251526efbf3df76de80be4561bc97f40b
+DIST botocore-1.20.99.tar.gz 7859805 BLAKE2B 41c8afcf4277dd10589209c18281103a4ec288581c08760da380d883542133aec65813792064d70efdd74d94902e45e0a9164d1882d27cdba01ddd12d438b5ff SHA512 45da79b872e8489e6a366106858cf50d5af52d3f1a2df1b831d47b0f72ea0b777c354215b43e2feb2d31cc3646d1995590152133ed865bfc184ad60629a7f61e
diff --git a/dev-python/botocore/botocore-1.20.99.ebuild b/dev-python/botocore/botocore-1.20.99.ebuild
new file mode 100644
index 000000000000..ca62b7dad65f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.99.ebuild
@@ -0,0 +1,59 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index f3795c5a3c54..dccb2f169065 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1,6 +1,2 @@
-DIST cfn-lint-0.49.2.tar.gz 7012647 BLAKE2B 1508c7c2c400ea4fdd878961a00d79b6c464de70f6ff5269069c73d4c524317e37e9431fba0a686da16958b7c575d4d3629a83c31c3f89d81a68f5c320355b14 SHA512 7e7b97d727b06649b2a56b67f1251c24df2646c9759821a7525842796a81e834f560fe5a09431220ead9fd68ad0fa9978a65bb1d9bdeab907aba0a76095fd712
 DIST cfn-lint-0.50.0.tar.gz 7061105 BLAKE2B bba39823b729b0a53dcc97341b6408654190bceb86acd7de0e2ee1a4ae34234ca6ddc3a4d374c38115632faa0fbbb51fbf07cf717853dd917a262ef5c1116ac9 SHA512 9dc5c00946a9bb142771a4b63571043056b1f522348f11256d7d3181e750c251cfab805a66df884b496fd7639442da0e72f65c0a43cc2ce2ed35f214031c7b1a
 DIST cfn-lint-0.51.0.tar.gz 7125333 BLAKE2B 5f18c03cba52e8f38eb4998ce3640564b6346cd788bc7ca4eebbeebf709fddb130de3fd0c99f5e1585aa07fb965f97ec05d48154bb6788f961c31301058d9ac7 SHA512 6b0eada5204da1c4efbf1a548b74065008bf55142b666aefbc5c1e9311eaaef96e83fd427157be4d3dec98d2e5377ed7f21266af0662e565fdf2aeb6883bb1e4
-DIST cfn-python-lint-0.48.3.tar.gz 6758651 BLAKE2B a8aeaffb0791789b25c94c630532ced223432f9902cf60664e4b111d162b4379d6307eda5c8f8074f7d2917ff25f44657016894b2140c8ea1dbf3259b24dde38 SHA512 ab1555719edb9b3541bfe60ce2701cca9e2ab9f4627c1b46ab8f4920477531f56f14f393b3575525da81b6aefd087b6c3cac516bdd6eb1db0f31304d7c63e1cb
-DIST cfn-python-lint-0.49.0.tar.gz 6797106 BLAKE2B aa60c3e5eb246c45997af57f934d2710b56c4966babb61f56cc538c49606e3befd130f6a4298b124d38401927ae40127e699fba6a1f69ee177c07c9bf5d880e4 SHA512 4b656cda70de686aa3bb404908eac6ff66cabc0ebb064d5ccbe554a10551e8a5a7a308e3480826ec52b87549a8626f2a9cbbf51bd44613d94344db8dcd4443a7
-DIST cfn-python-lint-0.49.1.tar.gz 6906770 BLAKE2B 3115e610a73f072f56f0ed45ab8c88f7a906115437081d8974a135b3a9fbfcec4f677bdc108fa0ed37814caa6f0cc1e22fa7892d715c658e9ef05c8299f377a6 SHA512 4ceda24495aa43ad84ca7e63aa566521aab339f01308f5754372289a7f595d6805d6b1ac9bf637ba20a05bf17b93f8a06d5d1fd4dca3b8955094f54a62e28313
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.48.3.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.48.3.ebuild
deleted file mode 100644
index ea0277a101f7..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.48.3.ebuild
+++ /dev/null
@@ -1,52 +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
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
-SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	# requires Internet
-	sed -e 's:test_update_resource_specs_python:_&:' \
-		-i test/unit/module/maintenance/test_update_resource_specs.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.49.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.49.0.ebuild
deleted file mode 100644
index 9bb0327d960f..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.49.0.ebuild
+++ /dev/null
@@ -1,52 +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
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
-SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.35.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	# requires Internet
-	sed -e 's:test_update_resource_specs_python:_&:' \
-		-i test/unit/module/maintenance/test_update_resource_specs.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.49.1.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.49.1.ebuild
deleted file mode 100644
index 9795263359e5..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.49.1.ebuild
+++ /dev/null
@@ -1,52 +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="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
-SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.35.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	# requires Internet
-	sed -e 's:test_update_resource_specs_python:_&:' \
-		-i test/unit/module/maintenance/test_update_resource_specs.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.49.2.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.49.2.ebuild
deleted file mode 100644
index 7602d69e05bf..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.49.2.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} )
-inherit distutils-r1
-
-# TODO: pkgmove to cfn-lint
-MY_P=${P/-python}
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.35.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	# requires Internet
-	sed -e 's:test_update_resource_specs_python:_&:' \
-		-i test/unit/module/maintenance/test_update_resource_specs.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.50.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.50.0.ebuild
index 7602d69e05bf..4d11689b7bf0 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.50.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.50.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.35.0[${PYTHON_USEDEP}]
diff --git a/dev-python/css-parser/css-parser-1.0.6.ebuild b/dev-python/css-parser/css-parser-1.0.6.ebuild
index 185946c90030..aae4a8072a66 100644
--- a/dev-python/css-parser/css-parser-1.0.6.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 66c126aa7f69..5ec10d14cd31 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,3 +1,2 @@
 DIST decorator-4.4.2.tar.gz 33629 BLAKE2B 5b2c6a1b6aba293d4b93444d4613e3c9af16bd9d6d80ae9eb21112a4a16397ff67e1f648e8118beeb7d17755a2f1bd37b867f73129c42ef7f8654d1c1f609e5f SHA512 c068efd4e70764ac447b772c9c29625c2180dad256b2b4e46a50a8479fc1d7de09b114c2ba11bb37dd58774ed9460d2e0ea9fa76061833a2d3c2676ac91a0db1
-DIST decorator-5.0.7.tar.gz 34292 BLAKE2B 93f69256e21fd9867faf8c80c6a62834e5206aeb552efb757badeb0f0ec0085699a520542feac2bfa1a0165c0a40f86ecf70e5717c10801bed28d1acd7397216 SHA512 78ae542b2f20d3d1714cf13120b14db308d73b866591c8ae42d69103a11e8d05a553438619bb68730310857587746e9d211ec4cf4b3fb5fbbcef030183b65294
 DIST decorator-5.0.9.tar.gz 34544 BLAKE2B c7dfafd9d7354d075a154ba9bd3aa2bed52454e3412ce22ed2cd47f4c1ec94f601c754bd270c1a2d9447a087ce114579d3b2b2340721dfd4aaac1e2d1f801b93 SHA512 8b46370bbc9cff5208823af60f31779b0ee02e03c796223ddfeb473f7c36bf7ee7da48c5712eea89ca8a96ef32695ff31c4902a76284caf543cf4937a0bd7aa5
diff --git a/dev-python/decorator/decorator-5.0.7.ebuild b/dev-python/decorator/decorator-5.0.7.ebuild
deleted file mode 100644
index f89c20047bf4..000000000000
--- a/dev-python/decorator/decorator-5.0.7.ebuild
+++ /dev/null
@@ -1,21 +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="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DOCS=( CHANGES.md )
-
-python_test() {
-	"${EPYTHON}" src/tests/test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/decorator/decorator-5.0.9.ebuild b/dev-python/decorator/decorator-5.0.9.ebuild
index 9775a5587507..f89c20047bf4 100644
--- a/dev-python/decorator/decorator-5.0.9.ebuild
+++ b/dev-python/decorator/decorator-5.0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DOCS=( CHANGES.md )
 
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index b7a1b2077ff9..80cc1b4384a3 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,2 +1 @@
-DIST dogpile.cache-1.1.2.tar.gz 370404 BLAKE2B 6895ffe057ef614ef6bcc4ba58a4bb2fe69b8e57943cff38dfc472bd3dec5ad4e34fc65d9fa0830a2396f6a789aedd6cd1e1e06dff911a3197ca4b64fdca1c36 SHA512 e68c2b358e6822d2db90422b92f1e9c9b997c89087ca69c8fc9511be1e06cdfeb14eef759085fdbca4dfc668dabf3901cddeb6a6c2f327d28c8968975908c160
 DIST dogpile.cache-1.1.3.tar.gz 387490 BLAKE2B 580be4f524196fb56e651d793045bf2e3419d3c98e65be0ba2cfaaed97f9c9cc08efe67191f77b273e97ffe907e8f5e050a7a36d2d8287522a21e7c4290d1354 SHA512 fd735b0bb9b7eb3bb559c030c15ac547aeb3f4718c64d7edb0f26f0f8a71b9b067434e984460c40cfbca57696d2b9579266f0c9d48bad4cb3c5bbc07030a4fb4
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.2.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.2.ebuild
deleted file mode 100644
index 8fa58f9bcfae..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.2.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="A locking API for expiring values while a single thread generates a new value."
-HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
-SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
-S="${WORKDIR}/dogpile.cache-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild
index 1fe2762afdd9..8fa58f9bcfae 100644
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
index 3766d56af29d..fb2a8dc5a1f4 100644
--- a/dev-python/flask-restful/Manifest
+++ b/dev-python/flask-restful/Manifest
@@ -1,2 +1 @@
-DIST flask-restful-0.3.8.tar.gz 114588 BLAKE2B a18eac613300102bb5a5ca78cea1e6f81f3de21d8bd2e6c72f2f1a559e8b4228175cc7d372b68f131267cd8bc759e354e5782e527d1e992579210348cd2b78dd SHA512 15172114fcedc2f4286cf5f583d95e42c8c8ce6553f9a44e57124f2b1417bf9f094dcb5154a6933ebebc8022f39d4d7969d29d38576111f9d5b45f630b36a66c
 DIST flask-restful-0.3.9.gh.tar.gz 118195 BLAKE2B a4f18c3faf06a7c9b628657aafbab4b9492793d9a61ab60a3e4d8112e0fb5e120cff2f2dae87915e44915838572ae0ca1737025ad5f906c2a953afc4b1f49c6f SHA512 34bea8ed6e9de3ad1c2ca63e7af67ed2a175f84c433b08ff643f91d88feda0e3c1c3967deb2fe5ad308b05f373b10c08245edf65ed97a7c5a3683aa900e9edf2
diff --git a/dev-python/flask-restful/files/flask-restful-0.3.8-werkzeug.patch b/dev-python/flask-restful/files/flask-restful-0.3.8-werkzeug.patch
deleted file mode 100644
index 32b0b7b2b460..000000000000
--- a/dev-python/flask-restful/files/flask-restful-0.3.8-werkzeug.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 73376a488907af3042b52678ac4c23f8a8911e5b Mon Sep 17 00:00:00 2001
-From: Anthony Sottile <asottile@umich.edu>
-Date: Fri, 7 Feb 2020 11:06:15 -0800
-Subject: [PATCH] Fix testsuite for werkzeug 1.x (#862)
-
----
- tests/test_api.py      | 4 +++-
- tests/test_reqparse.py | 4 ++--
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/tests/test_api.py b/tests/test_api.py
-index f7f8e661..6795d362 100644
---- a/tests/test_api.py
-+++ b/tests/test_api.py
-@@ -445,7 +445,9 @@ def test_handle_non_api_error(self):
- 
-         resp = app.get("/foo")
-         self.assertEquals(resp.status_code, 404)
--        self.assertEquals('text/html', resp.headers['Content-Type'])
-+        # in newer versions of werkzeug this is `text/html; charset=utf8`
-+        content_type, _, _ = resp.headers['Content-Type'].partition(';')
-+        self.assertEquals('text/html', content_type)
- 
-     def test_non_api_error_404_catchall(self):
-         app = Flask(__name__)
-diff --git a/tests/test_reqparse.py b/tests/test_reqparse.py
-index 2f1fbedf..9776f17c 100644
---- a/tests/test_reqparse.py
-+++ b/tests/test_reqparse.py
-@@ -2,9 +2,9 @@
- import unittest
- from mock import Mock, patch
- from flask import Flask
--from werkzeug import exceptions, MultiDict
-+from werkzeug import exceptions
- from werkzeug.wrappers import Request
--from werkzeug.datastructures import FileStorage
-+from werkzeug.datastructures import FileStorage, MultiDict
- from flask_restful.reqparse import Argument, RequestParser, Namespace
- import six
- import decimal
diff --git a/dev-python/flask-restful/flask-restful-0.3.8.ebuild b/dev-python/flask-restful/flask-restful-0.3.8.ebuild
deleted file mode 100644
index 0bff36fa55e2..000000000000
--- a/dev-python/flask-restful/flask-restful-0.3.8.ebuild
+++ /dev/null
@@ -1,45 +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="Simple framework for creating REST APIs"
-HOMEPAGE="
-	https://flask-restful.readthedocs.io/en/latest/
-	https://github.com/flask-restful/flask-restful/"
-SRC_URI="https://github.com/flask-restful/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/aniso8601-0.82[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/flask-restful-0.3.8-werkzeug.patch
-)
-
-distutils_enable_sphinx docs
-distutils_enable_tests nose
-
-python_install_all() {
-	use examples && dodoc -r examples
-	local DOCS=( AUTHORS.md CHANGES.md CONTRIBUTING.md README.md )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-restful/flask-restful-0.3.9.ebuild b/dev-python/flask-restful/flask-restful-0.3.9.ebuild
index c36abdef65a4..9b1bd24c0bfa 100644
--- a/dev-python/flask-restful/flask-restful-0.3.9.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 9d97412fe442..fc7c8a2f70ec 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,5 +1,2 @@
-DIST google-api-core-1.26.3.tar.gz 133409 BLAKE2B ca3c63769f87cc79483d5ac52646cb044fa21e4f702a945994aeffad71b5be6bd1105e7aa3ec489c943d8adb1148f1c5eb868d64d71f0bcc4a6084ff470acf05 SHA512 8a7753ee30f6f3bb78265b083d8fb80a48021ab32c849ddadaf969263e5a63bfaeb3010b584440d5c5f1c4e0dcd4e8fcd4df16321ccb03d3c0932e19502bbe4c
-DIST google-api-core-1.27.0.tar.gz 134035 BLAKE2B be074208ac51b6e33466a2304e5780894d6a420ccf7ea36e5b98b6d9f920cd6f0cc9f94dababb154731ebe4a36d8b863897f5c654e00068a0f12753ceecb6e8c SHA512 5e8ca58c7f1dc9aa3e612ea635feb84a115c0f21bde2a3152cd54be5b041841ab1c0d2c725660794e15d42e63a4b6955a5318d3dec20bbbb3e7d683c630a5f5e
 DIST google-api-core-1.28.0.tar.gz 133640 BLAKE2B 8134e39cc3ff2fbb850d5e774d08589e3e64b83ca5d5209279f5d1b7fc2eb350a523bbe2890fba6d907689149df3872a7e0a11991b1ecc62fc64a4753dce38e4 SHA512 3702d27613e621394209047451729c1308beb88c917033b4340e3fa96bf4a5ec36ad2594c98ed14439c578f69a202d95a96d30472438a30417484cff6e06fe7d
-DIST google-api-core-1.29.0.tar.gz 134251 BLAKE2B 46455f34ad18bd57b21afe70b237466a51d5dbaca8f46f31491d00fcc7e6339fcf48e150418ef71100a628245cc5333984e6377e27eec00b9b55e0c1a3de86e2 SHA512 b8a7b19ba737172e04c0a322af7c60299b72002b17a099fbaa9445c4965b94fd6f3087380fa4262f4440113af4304d5235cd062f22c27cd997e62b276ea67471
 DIST google-api-core-1.30.0.tar.gz 134595 BLAKE2B 104f52bafb68fd91904c02cbd6d3dd2e32c160a528f58e9af3612fc4f7a9934c522f79895b50982b46ee77947af7eb52557bf304b6f2624b97b5082905511829 SHA512 cc14f9c67bac99290665e2b85a97eacf43cdd2a0e4668ecbc7dd8e7131a7e4e908aca2be6d65797d0838081a02768354703762a1a80fa0b666efb81448b27899
diff --git a/dev-python/google-api-core/google-api-core-1.26.3.ebuild b/dev-python/google-api-core/google-api-core-1.26.3.ebuild
deleted file mode 100644
index 4bb106b3b6c8..000000000000
--- a/dev-python/google-api-core/google-api-core-1.26.3.ebuild
+++ /dev/null
@@ -1,44 +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} )
-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"
-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.21.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-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-1.27.0.ebuild b/dev-python/google-api-core/google-api-core-1.27.0.ebuild
deleted file mode 100644
index 1f2741cdc81a..000000000000
--- a/dev-python/google-api-core/google-api-core-1.27.0.ebuild
+++ /dev/null
@@ -1,44 +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} )
-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"
-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.21.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-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-1.28.0.ebuild b/dev-python/google-api-core/google-api-core-1.28.0.ebuild
index b40ab82c7645..cdf75f0b6a4f 100644
--- a/dev-python/google-api-core/google-api-core-1.28.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.28.0.ebuild
@@ -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/google-api-core/google-api-core-1.29.0.ebuild b/dev-python/google-api-core/google-api-core-1.29.0.ebuild
deleted file mode 100644
index b40ab82c7645..000000000000
--- a/dev-python/google-api-core/google-api-core-1.29.0.ebuild
+++ /dev/null
@@ -1,44 +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} )
-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"
-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}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-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-1.30.0.ebuild b/dev-python/google-api-core/google-api-core-1.30.0.ebuild
index b40ab82c7645..226fc549154f 100644
--- a/dev-python/google-api-core/google-api-core-1.30.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.30.0.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/rsa[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 28edfadf9004..a4ada3046f0d 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,6 +1,2 @@
-DIST importlib_metadata-3.10.1.tar.gz 39980 BLAKE2B 9e7ba25618c9a530d122e43d6d56cc0386aad87accef111574b24aa53aaea51e08c422275acf4650eae2102a92de30d066a66c72c02b3a3b432ce9bd9453dacc SHA512 e028fb6abba0c7775943c346db0e733b5ba879583184c99f8413ded6314162e5dce03e10661b16392825038096fac8f6fbbea47ceac9565c60227129f3a3a48d
-DIST importlib_metadata-4.0.0.tar.gz 41881 BLAKE2B cd0330e2a5959f651ef6ceee722762c3cbb034a534dab6c24523ca76d25dde4cb2c6bb06cef7e787db9a9cd83ca08a71bfd7b849db57ef4a95e461e6d887b14e SHA512 bbdf7b3f1e714c5a02babe0f9ff5eb366942e21b626d1d61839ee04040d0ed529cd299afd446639795b34665be20e6438d8e9970292b282946a8b6495682f726
-DIST importlib_metadata-4.3.0.tar.gz 38461 BLAKE2B 5c8387aa618b6561910adf48a701b28556574abe0a4aacc6ae8fbecb258cd0308f637a95402a07c2452ba92daca39034a5fdaac03608e5112534c379e66aa4b9 SHA512 44e3da5207ae6900059758ab26636798fafa9d186d045096e382660083909305887e28c63c2147c940f0af5870d1781f69968c9cc992e50811b5f9b055048459
 DIST importlib_metadata-4.3.1.tar.gz 38637 BLAKE2B f9c9330fd9b63bbea3fc30ed6d3cc384f9b241f0089ca7b0b5fe1934214e9f644c3884ecfc866b9b9e6af6c0fd7d04fc5e8af83e252d2e1b0e274fcf408a7323 SHA512 2202be5f7b7f1c1fdad4c6b290da60fa5c9576c665c11f9c62012791b50ee0b6da029bbe424c9501ac1f663f4df883fbd3c6cb9179cb80491b2b350cfa2eec30
-DIST importlib_metadata-4.4.0.tar.gz 39577 BLAKE2B 1c1536b72385380176febfe012b5e47bc4d1b1382e048dd6383b5097f8047404a9a726438100e6f812f397f425e4d0d92ff296530e1f81cf16d3f26a57f47e48 SHA512 d227caaa1130d5023a87e5fa32aa1cd473ff0ae09cd82969be86f4301402cacee068dfc5d744bff82a18abb86848780013b6e6b2ebfa8a568ee027c270b90efd
 DIST importlib_metadata-4.5.0.tar.gz 39595 BLAKE2B 22ef03a47637f523b583cb8c442f7351e0b94633772978fea47dab9be583f35daa32691997b4110b832709658568b6eb79a006f109b969c6f25a638dcfcd4702 SHA512 62b9cefa502d751d36b5f43606ea86c46574fea159941b68319e5dd9aa53d6d990e630c36d72830c54eb2bba2f2be53201be2482974f833cc1da8869eb2a8dc2
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild
deleted file mode 100644
index 20ccabaef567..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-3.10.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
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_{7,8})
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.0.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.0.0.ebuild
deleted file mode 100644
index 7508f028abc5..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.0.0.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
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_{7,8})
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.3.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.3.0.ebuild
deleted file mode 100644
index e67ddfddb764..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.3.0.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
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_{7,8})
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild
index e67ddfddb764..b57420e8b171 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.4.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.4.0.ebuild
deleted file mode 100644
index e67ddfddb764..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.4.0.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
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_{7,8})
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index d677557847e4..77a4e63746f5 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,2 +1 @@
-DIST more-itertools-8.7.0.tar.gz 92857 BLAKE2B 65966fa2939fb6908c25a658e96162238056403e2b67d41d027c11cf04c01a09f954ea1a75363e0f615ea3e5fa5b9cfa4289ef18942c68122f10588f37f797ab SHA512 0e80dd5e08ffbd1878f414e1e8d036046ecfaf74c638a79d277d72e8357892b73735cc18d8a022c53916acc3733ebde4cb8030c5cecc354d6469933d91c66c13
 DIST more-itertools-8.8.0.tar.gz 93660 BLAKE2B 7d26b847c856064b6edfbda661b9e9288ba2069604e687d90713040ec469abab9853f3bff1b4e25b9ded764822a9ba58eccd5be5e9a13094ab4fc0871626289b SHA512 c6efec614a10a2fc72a4bbb7c62ac586e5dd28e04582768e0b3749cbd8307df0b4a609637d427d9c4940874e2aed1432094c09ac249e16a20dc6a09723172f06
diff --git a/dev-python/more-itertools/more-itertools-8.7.0.ebuild b/dev-python/more-itertools/more-itertools-8.7.0.ebuild
deleted file mode 100644
index 716a7429626e..000000000000
--- a/dev-python/more-itertools/more-itertools-8.7.0.ebuild
+++ /dev/null
@@ -1,20 +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="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
diff --git a/dev-python/more-itertools/more-itertools-8.8.0.ebuild b/dev-python/more-itertools/more-itertools-8.8.0.ebuild
index e36c4b470e21..716a7429626e 100644
--- a/dev-python/more-itertools/more-itertools-8.8.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.8.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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/pdoc3/Manifest b/dev-python/pdoc3/Manifest
new file mode 100644
index 000000000000..82043ca9081d
--- /dev/null
+++ b/dev-python/pdoc3/Manifest
@@ -0,0 +1 @@
+DIST pdoc3-0.9.2.tar.gz 84803 BLAKE2B 5ff52a630722b9504d1de83bb236aaaafde95417ac163b79b3585156484a12b71a16de55d00ab7377b9e44eec7902384f1f648a514b8e7392da6f5e79f6f229f SHA512 653231a124239ec189dc5aa4dec59245c6d20e4ff6ca9cb7fa468410b712b766288f4c59f8c0d0b8c1a4190ce84603455ec0ad7c7b1e0dc4f28cd279bb69685f
diff --git a/dev-python/pdoc3/metadata.xml b/dev-python/pdoc3/metadata.xml
new file mode 100644
index 000000000000..deca3ceb2da9
--- /dev/null
+++ b/dev-python/pdoc3/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>flow@gentoo.org</email>
+  <name>Florian Schmaus</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">pdoc3</remote-id>
+  <remote-id type="github">pdoc3/pdoc</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/pdoc3/pdoc3-0.9.2.ebuild b/dev-python/pdoc3/pdoc3-0.9.2.ebuild
new file mode 100644
index 000000000000..2f8320213cbe
--- /dev/null
+++ b/dev-python/pdoc3/pdoc3-0.9.2.ebuild
@@ -0,0 +1,34 @@
+# 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
+
+DESCRIPTION="Auto-generate API documentation for Python projects"
+HOMEPAGE="https://pdoc3.github.io/pdoc/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/wheel[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i \
+		-e "/setuptools_git/d" \
+		-e "/setuptools_scm/d" \
+		setup.py || die
+}
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 83f1275385ec..f361a4ac9992 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,2 +1 @@
-DIST pgspecial-1.12.1.tar.gz 47945 BLAKE2B e189695a3689f76f6fd3afc3b5f7c412dfc0a79fcd2465f8bca29b81de1609e045f0237fcc6b63a75c7df1d9a31d4c04cd8fa227493d6cce4cd6863a4c36cd2a SHA512 d1ef6462ab3d1cf5fe35f0dabc61698d7c2cf7e35b292c3cb540cce4bd613485d7dca53fd549a134209461c31c8144d72d1af1ee8aad5569766d9387b7e10e0b
 DIST pgspecial-1.13.0.tar.gz 49204 BLAKE2B 7269fc94fc0672db1880ba4b76c8926b6a3c995aac3fca77add7ae6756fcc3295d8d32fcede37cd3fa2d82c82aebfc26d91ed50b4294c5206f04d4c72742b45b SHA512 de2560106fbad14f2095ace468c8490cb325aedb772f649f20a0b5fe65f19afeed33f219d3a6eca683a63b418741a9906a01f7c4bdd8734868517faeba791026
diff --git a/dev-python/pgspecial/pgspecial-1.12.1.ebuild b/dev-python/pgspecial/pgspecial-1.12.1.ebuild
deleted file mode 100644
index 3e75b9eb2fc4..000000000000
--- a/dev-python/pgspecial/pgspecial-1.12.1.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
-
-DESCRIPTION="Python implementation of PostgreSQL meta commands"
-HOMEPAGE="https://github.com/dbcli/pgspecial"
-SRC_URI="https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/click-4.1[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-DOCS=( License.txt README.rst changelog.rst  )
diff --git a/dev-python/pgspecial/pgspecial-1.13.0.ebuild b/dev-python/pgspecial/pgspecial-1.13.0.ebuild
index e2e838b16713..486578359579 100644
--- a/dev-python/pgspecial/pgspecial-1.13.0.ebuild
+++ b/dev-python/pgspecial/pgspecial-1.13.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/click-4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index f77673147502..707002d356e6 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,4 +1,2 @@
-DIST pikepdf-2.12.0.tar.gz 2300821 BLAKE2B 17f2a316d7139471f1bc1106b52895246ecf4503a0c52cb7ed0b8fd408c9bdc8f4e4539f7381b184be50747edc12ee4ab1d58587c9db1fd4c3384d83a56a3ea0 SHA512 7484da6b6aeb8dc93c7b9eacbf5f5096bf738c2b75e4d3d63b189494acddba3da8c707fe25526ef2fa0be15be03729b347ef971f1ae61e38fe6c55ee72272359
-DIST pikepdf-2.12.1.tar.gz 2301208 BLAKE2B b3fa60c97a58dc312e00c0e129d1f55fd390d83b221dfd90acad5f5954e0c564492fe39718248f87980e42ecd590dfd98bfb21133c8ab0664666391e8e030902 SHA512 13bb7132282c024fa5118970deb6347c954a94545602fa21efe99ea2f837693b810dc6706d1681c28588d5ef41a867c70f75c7ab85b01267fbcf55ba89d39b94
 DIST pikepdf-2.12.2.tar.gz 2301822 BLAKE2B e600ab0809c44ba3749440ae6820761e28cc2d509ebb8824a5b2fde709db341366ee2b8f8160e65d876c2fff0aa7da54eddb1fe2b9fd524b0c25adf79779e21c SHA512 6bde2a538cdaf55460083c54a6d55ddab3ec4ba127dfc77d3f79da8492ff50ffb76281312395973f8448c360ae53b0c9a0d090258f43bfdfdf420336c99fb423
 DIST pikepdf-2.13.0.tar.gz 2302937 BLAKE2B 1a46cdf25badcc1d00dde22fba7dea837dde902295ccb3215d1441c5838acb2744aedb1696fb1fc57d55752bee66387bdd968695a6b3dfad5614c352d57366ae SHA512 a57188f420f93fbb00aa4df9857df0c64aade057639b1e1c126cca2da8b57d7be34117eae34038b5e873a8d65c5332f3f3f2f1812e7e748647ee657b8eebf78a
diff --git a/dev-python/pikepdf/pikepdf-2.12.0.ebuild b/dev-python/pikepdf/pikepdf-2.12.0.ebuild
deleted file mode 100644
index 176688bed65f..000000000000
--- a/dev-python/pikepdf/pikepdf-2.12.0.ebuild
+++ /dev/null
@@ -1,51 +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
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="app-text/qpdf:0="
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)"
-
-#distutils_enable_sphinx docs \
-#	dev-python/ipython \
-#	dev-python/matplotlib \
-#	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/wheel/d' setup.py || die
-	sed -i -e '/-n auto/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-2.12.1.ebuild b/dev-python/pikepdf/pikepdf-2.12.1.ebuild
deleted file mode 100644
index c1b5454f13e9..000000000000
--- a/dev-python/pikepdf/pikepdf-2.12.1.ebuild
+++ /dev/null
@@ -1,51 +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
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-text/qpdf:0="
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)"
-
-#distutils_enable_sphinx docs \
-#	dev-python/ipython \
-#	dev-python/matplotlib \
-#	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/wheel/d' setup.py || die
-	sed -i -e '/-n auto/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-2.12.2.ebuild b/dev-python/pikepdf/pikepdf-2.12.2.ebuild
index c1b5454f13e9..176688bed65f 100644
--- a/dev-python/pikepdf/pikepdf-2.12.2.ebuild
+++ b/dev-python/pikepdf/pikepdf-2.12.2.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="app-text/qpdf:0="
 RDEPEND="${DEPEND}
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index e47711af1e9d..48810da85ba5 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,4 +1,3 @@
-DIST pip-21.1.1.tar.gz 8771867 BLAKE2B 1cb920ab52510e816a7c3b8b6d1b47576a27cf1b208ab8fefa102ff36c09eb4e99b34f213a043550a9e6fb37bb8b6306f9e939371661ff7f23ba03f21b4a643b SHA512 05157ed586597f16948afdad43d98cc095803d2d22b1427ac1028ca2a73a26d65e597446808194343ed36f9eb7cb910ac89e73a6a9a90ee868ec822fdbe641c5
 DIST pip-21.1.2.tar.gz 8772481 BLAKE2B 23dbcc5dd7e7f66934282b9c93958267eb367d418b6c814032b7b89e0d94c73c143626781b8df081394019d2e575030b7a2fd61bb5221992ce2060cf069e8b04 SHA512 54a2b6074fcb2640868dedcabb5087b79a53a8ad57ec4ab5acf2862b8037403d8f156c2853ab60c2f10c6af999a0a90774f0bc3eca2978a82590935d37af167f
 DIST setuptools-56.0.0-py3-none-any.whl 784941 BLAKE2B 136352bcaeeb803f94983db2e0f9ec79dacc23a6742a2f6f1b4bdd2b29a104f4965d78f9b4adf1a501c7bf39d4ed85a6786b03489f90872661afbf5e674fd3f9 SHA512 32405236e9c2936cde137bc4d4d07b548391336ce0511cd5677dcd1f85c7a142b0947e03cdceaeb37067874f5aa71daacaa1a6af95ae9fe3ad8af264f61e10f4
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
diff --git a/dev-python/pip/pip-21.1.1.ebuild b/dev-python/pip/pip-21.1.1.ebuild
deleted file mode 100644
index f76b1bede4e9..000000000000
--- a/dev-python/pip/pip-21.1.1.ebuild
+++ /dev/null
@@ -1,117 +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="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-56.0.0-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-SLOT="0"
-IUSE="test vanilla"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		<dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-21.1-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local deselect=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
-		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
-		# Internet
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-	)
-
-	distutils_install_for_testing --via-root
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-	epytest ${deselect[@]/#/--deselect } -m "not network"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; from pip._internal.cli.main import main; sys.exit(main())'
-
-	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-21.1.2-r1.ebuild b/dev-python/pip/pip-21.1.2-r1.ebuild
index 704fd5093209..7ee3a3171b47 100644
--- a/dev-python/pip/pip-21.1.2-r1.ebuild
+++ b/dev-python/pip/pip-21.1.2-r1.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="test vanilla"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/pip-21.1.2.ebuild b/dev-python/pip/pip-21.1.2.ebuild
deleted file mode 100644
index 1a01e3a1008f..000000000000
--- a/dev-python/pip/pip-21.1.2.ebuild
+++ /dev/null
@@ -1,124 +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 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-56.0.0-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-SLOT="0"
-IUSE="test vanilla"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/cryptography[${PYTHON_USEDEP}]
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			<dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-21.1-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	# virtualenv-16 doesn't support python3_10 yet is still required by pip test suite
-	if [[ ${EPYTHON} == "python3.10" ]]; then
-		ewarn "Skipping tests on ${EPYTHON} due to missing dependencies"
-		return 0
-	fi
-
-	local deselect=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
-		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
-		# Internet
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-	)
-
-	distutils_install_for_testing --via-root
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-	epytest ${deselect[@]/#/--deselect } -m "not network"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; from pip._internal.cli.main import main; sys.exit(main())'
-
-	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index 4192487cbf2c..70448015989d 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,2 +1 @@
-DIST pydocstyle-6.0.0.tar.gz 72143 BLAKE2B 1036a5eab38a38bda0f98371f7e4094248cf5057a9afd8743a478f153a5f06feab6b3e7d6be031615b5e88c388786f59a0619f774f492e40a722f39973051d5b SHA512 609a10307aa24513f476ef639771fc095fe7a65ffd8d530fad02886369c62969c69a5134fd0ec79a1e07d1b6cb8f920c3478db546c26aefb0e45771777c02a0b
 DIST pydocstyle-6.1.1.tar.gz 73982 BLAKE2B 6a896221fdcd257f0475472e1cf87ef892d8292a4c0faf661595adb17e2d18f4a8277cda498197309d34597c448203856c272256277a7e35fba20e2e5ba47f2b SHA512 ce4932a6601c80d05a46600f5af7df54798025a5f3dc41ab8cf1bc0d63e7f78b70cccb17dc99ddab25eda9abd639f91468fca1b1ceb4539708350212e481a156
diff --git a/dev-python/pydocstyle/pydocstyle-6.0.0.ebuild b/dev-python/pydocstyle/pydocstyle-6.0.0.ebuild
deleted file mode 100644
index 560432c746ac..000000000000
--- a/dev-python/pydocstyle/pydocstyle-6.0.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 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python docstring style checker"
-HOMEPAGE="https://github.com/PyCQA/pydocstyle/"
-SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
-
-distutils_enable_tests --install pytest
-# Requires network to lookup github issues
-#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-issuetracker
-
-src_prepare() {
-	# no, seriously, you don't need to install it yourself
-	sed -i -e '/pip/d' src/tests/test_integration.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
index 3ae76bab5f1e..aed268f179c9 100644
--- a/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 7fa937cddf74..91418c61e14b 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,3 +1,2 @@
-DIST pyglet-1.5.16.tar.gz 6446875 BLAKE2B bdc40303b096a91924eb1b9c541cea199792ebf36d857f0466df4c5dff4ec2945dbc6e6c4933a293ae5bd5033dbcf49af913f3b0915082f33ea98a7d5f66fde6 SHA512 5cd1c604245c45f4b9d56c6a6290d301f8a925a4988d847df978b0f4431afb46046592f25d73b54cdf99402022a616afb3eb9c579d5ac29160408a74769f7a43
 DIST pyglet-1.5.17.tar.gz 6448500 BLAKE2B c2e27d5525c1e8eb5203b935b6a901283521ed12cf08b1d18297bd2772b83ee4fd721a9aac4fc41b6249b140b36e70d060d3649f4d2eb30f1e6f1f8fd42aa314 SHA512 3bb9594c02894fc58937b9312187b7848843d591fadb8e46553602ebad7c4b2bfd5dc615cc5f5d0cc1f8b59f10afda8e5130a0dee3c2066decb7af3faf114dae
 DIST pyglet-1.5.18.tar.gz 6440818 BLAKE2B cb7832000e0df96cd794f8eff9ba41aac8571542fbc45d1607df3935a7ed53ba8fd46b6bba40f6d5d53adfb2024aad1930cba1889b5d40d342457f7dc06db5d1 SHA512 d6ceddecccb36a90bef38c4a1608e866bb90ebb72eaaff693a2eb34678c7a50c99213a69042c569c22d54cc04a4b11d37ea8da47425958505261ebcf99bd28ce
diff --git a/dev-python/pyglet/pyglet-1.5.16.ebuild b/dev-python/pyglet/pyglet-1.5.16.ebuild
deleted file mode 100644
index 70d5c7e0b5e0..000000000000
--- a/dev-python/pyglet/pyglet-1.5.16.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.17.ebuild b/dev-python/pyglet/pyglet-1.5.17.ebuild
index ec477d627d0b..70d5c7e0b5e0 100644
--- a/dev-python/pyglet/pyglet-1.5.17.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.17.ebuild
@@ -13,7 +13,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/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index 6c8a0f6f4ae4..8195b53a812f 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,3 +1,2 @@
-DIST pytest-django-4.2.0.gh.tar.gz 68370 BLAKE2B 94165a01ecd2734a4e02267ecfe8b531df33ca9237cfcd1ebad41f68289fb89590bed0027137d6dddefc4cbbd5c0f8445703e01a516d3992c2307ebe53d6572b SHA512 2dcaa80f3ebb67984d3849cea5de296388990ca65a607f995b89bd67e2d8964f944100bccb42a32bb75c7009849619e50421c2dce077037ce0440233dbdc13f1
 DIST pytest-django-4.3.0.gh.tar.gz 71525 BLAKE2B 0eba9d9917759369aa2e126539f17fc36874453caf59838be2baf660fe29487aa80490f2af4ecbd72a9ba1f63a8a87202af2eff7e9d28c9c0fc686b09b07e82a SHA512 3c3ac31ed75daa29ab473ef3b87b5c66333cf7ccd8d217eb120b7899f463aafe5982b1e867e26e3b9ab51f312612fbc3d9f1ed9169815507816267fd4de76757
 DIST pytest-django-4.4.0.gh.tar.gz 72905 BLAKE2B 4532bef9afdc7f11fdf9a16f019810d10e4e580b517958722184d361a69a195f6c66f7f3bc18be6cb7f63fe4576963c59a00d72bd8a42f104d26e5ad091c6d54 SHA512 47e4a84606aeb6bb99ed74603faf988298d52f81f74ec8e4608cb670f0f331ad0c6555f3e4a516fc7834aea4e634f849dc0ff6d446a86e924a116fbe90bd79e0
diff --git a/dev-python/pytest-django/pytest-django-4.2.0.ebuild b/dev-python/pytest-django/pytest-django-4.2.0.ebuild
deleted file mode 100644
index 3301b15f0eae..000000000000
--- a/dev-python/pytest-django/pytest-django-4.2.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
-
-DESCRIPTION="A Django plugin for py.test"
-HOMEPAGE="
-	https://pypi.org/project/pytest-django/
-	https://pytest-django.readthedocs.io/
-	https://github.com/pytest-dev/pytest-django/"
-SRC_URI="
-	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
-"
-
-# not all test dependencies are packaged and this package isn't worth it.
-RESTRICT="test"
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-django/pytest-django-4.3.0.ebuild b/dev-python/pytest-django/pytest-django-4.3.0.ebuild
index 34f608100388..3301b15f0eae 100644
--- a/dev-python/pytest-django/pytest-django-4.3.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index e72da292788f..223f83a26535 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,2 +1 @@
-DIST python-xlib-0.29.tar.bz2 209322 BLAKE2B 4d94d99c8094947ce1acb84f3adc28ab4b6e9d6aaf61317b625e50578ece3800f6462551f8656b194d5635e3e35a5d6fec86d4eb553d7b65684a7f74fdf0dc14 SHA512 6275deb2c1e2068d560c45803e651fef9910b5cb921e043ed8204878a1f885b92122b6af3d4ac33f220231c1933d3150524169d0078f64b74df29a8f617d953a
 DIST python-xlib-0.30.tar.bz2 211256 BLAKE2B 979a004f6ff6ac933baa41623b346c8d1fa9944bc771308e3dd527de7ae6aebb8df0c5d269f21e7aca590ad7d3981d0deeb592981b0672c54b30ce286e650236 SHA512 52ee01cce73f024d6fdc995cff38ba9ff2838888aced12186a754c1760228f89209c1d6fc9d4fe0e371a4a43743f8fdfdef6ea32ea3feda5a85055897aaf887d
diff --git a/dev-python/python-xlib/python-xlib-0.29.ebuild b/dev-python/python-xlib/python-xlib-0.29.ebuild
deleted file mode 100644
index 685f42523eed..000000000000
--- a/dev-python/python-xlib/python-xlib-0.29.ebuild
+++ /dev/null
@@ -1,39 +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
-
-DESCRIPTION="A fully functional X client library for Python, written in Python"
-HOMEPAGE="https://github.com/python-xlib/python-xlib"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( sys-apps/texinfo )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
-
-python_compile_all() {
-	use doc && emake -C doc/info
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_install_all() {
-	use doc && doinfo doc/info/*.info
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-xlib/python-xlib-0.30.ebuild b/dev-python/python-xlib/python-xlib-0.30.ebuild
index 475dcdd2e5b6..685f42523eed 100644
--- a/dev-python/python-xlib/python-xlib-0.30.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.30.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="doc"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/slixmpp/metadata.xml b/dev-python/slixmpp/metadata.xml
index 9799bb06e668..d5094ac535b1 100644
--- a/dev-python/slixmpp/metadata.xml
+++ b/dev-python/slixmpp/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
+  <email>flow@gentoo.org</email>
+  <name>Florian Schmaus</name>
+ </maintainer>
+ <maintainer type="person">
   <email>andrey_utkin@gentoo.org</email>
   <name>Andrey Utkin</name>
  </maintainer>
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index 9c855ff5be0a..622e7ad2d758 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -1,2 +1 @@
-DIST python-sortedcontainers-2.3.0.gh.tar.gz 9228968 BLAKE2B cdff8230d4e4ac42a89ed3192666ebf22cd48a4475f1dc173cffb0339c7f27e9cdfde1fb631daadf04adf2c00bed8a924e1202712d0ebcbd591f5542de863461 SHA512 0488e2f9f07ea7e4737ade69441f02614b63cfccb32a71af4e5953001bfa840d2e113a36a0a0a6d4c1e7fdd920ac3937b0baaea522d742547a4d81a99b8d1a6c
 DIST python-sortedcontainers-2.4.0.gh.tar.gz 9229380 BLAKE2B ca9348ab7d467b2a81126217451262bb0547901b953edc3bba7c87c67b415eef5c3d454a08d227ebc8b213c1cc7db6262e864511fe67beefe865014ae5fc5977 SHA512 f80185c6f95a85cc78f88f6f6cf389eb48be22cf94d5fcd84f3592873f17de37ec7f44c1627b7f02956ac4b4f74ca4febefc47d3c6232f70ee05dbb2449ad770
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
deleted file mode 100644
index 7e5df074aa55..000000000000
--- a/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
+++ /dev/null
@@ -1,28 +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_P=python-${P}
-DESCRIPTION="Python library to sort collections and containers"
-HOMEPAGE="http://www.grantjenks.com/docs/sortedcontainers/
-	https://pypi.org/project/sortedcontainers/
-	https://github.com/grantjenks/python-sortedcontainers/"
-SRC_URI="
-	https://github.com/grantjenks/python-sortedcontainers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH=.
-	epytest --ignore docs/conf.py
-}
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
index 1d5ad41666fc..7e5df074aa55 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/sphinx-notfound-page/Manifest b/dev-python/sphinx-notfound-page/Manifest
index cc4d0a9ed9d5..3198e87693fb 100644
--- a/dev-python/sphinx-notfound-page/Manifest
+++ b/dev-python/sphinx-notfound-page/Manifest
@@ -1,2 +1 @@
-DIST sphinx-notfound-page-0.5.tar.gz 47806 BLAKE2B 4715bed7509970f9198a0c666a568ca403157ad0704d0e1d17d222e6e8dc7adefab3922a4b79e056d20034463d5f034cba8c7b65248569a46866a964abec7e70 SHA512 a48cf4bcc755687c9e02482727ab2c28abe314118cef775e6b5625e2db67e4040745740c3c9fd88206bf050f1621ef20ffb0262ec614c11497ef030f9fb675a3
 DIST sphinx-notfound-page-0.7.1.gh.tar.gz 50670 BLAKE2B b438413585fce3623451015d873242de3e6d7c466aa06b0b6398d7e337d2a0d3c2041973b1f1c8491b1f382d8e87a2da00b6a97e3a857b60cb345e715d2aa27b SHA512 f2894b19f8ccee22ac7f6e3a34f8270923e8cc4b2182d490e6ec46477460555de9b67b0075f74cc089b0b9e7474c6db9373d107d272d161d98a3c5609edfa7a0
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.5.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.5.ebuild
deleted file mode 100644
index e3bbc26031b4..000000000000
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2019-2020 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="Create a custom 404 page with absolute URLs hardcoded."
-HOMEPAGE="https://sphinx-notfound-page.readthedocs.io/"
-# PyPI tarballs lack tests
-# https://github.com/readthedocs/sphinx-notfound-page/pull/110
-SRC_URI="https://github.com/readthedocs/sphinx-notfound-page/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
index 5265cc317faa..62824f9affea 100644
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index 3c9031fab190..254320a5ef50 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,3 +1,2 @@
 DIST terminado-0.10.0.tar.gz 14059 BLAKE2B 9fedf12900275154068f5bac97a7038bbd9f655b30a1f3f50f5a66f581b7ed7599116be8eb59d1a82234455574b3a85f239f25af81b03967e986da01b5cee87b SHA512 a0fdbe904e617659a96a594430da3bc00a8addf93b111557355cca48f7d7e39ea1f388d6cb4179de1c10a35c0bec0c69e97c38e1ce77823b5c938c04fa1a632a
 DIST terminado-0.10.1.tar.gz 13911 BLAKE2B e939bab2a23b75d803ba2260548a48a0f1c9925f6a2fe69ff7b549255539898e35f76e94526f8f470126d4d50466f8a85a14bbd3c38d2999d4e90ec4be3e0222 SHA512 fb6a6e27cec8e644565ecab3a7c43fd288c6ff9e18e68dda6d306532fa5e39274574f3dabdbf629cf00096256fef9a0419c98a3d9b7b038e04dd6ca1af16af46
-DIST terminado-0.9.4.tar.gz 13934 BLAKE2B 8544d70a7c561005370bbb2b16db593ac9e4453b729b58d641b99066dc1255e294b712958d54a35a92d85e30b918a1122d24e97400b967858b542498d76305b5 SHA512 ab297e60c1adb25b5fbfcd0246db12f5df3acceeac3357af310602da3915345cb2d4fb460cc303cc4b5b5df237e750ce123ac0ed98a9bf7c6e8493783398cbc9
diff --git a/dev-python/terminado/terminado-0.10.0.ebuild b/dev-python/terminado/terminado-0.10.0.ebuild
index 3589fe1290df..c17b31f94799 100644
--- a/dev-python/terminado/terminado-0.10.0.ebuild
+++ b/dev-python/terminado/terminado-0.10.0.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 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/terminado/terminado-0.9.4.ebuild b/dev-python/terminado/terminado-0.9.4.ebuild
deleted file mode 100644
index c17b31f94799..000000000000
--- a/dev-python/terminado/terminado-0.9.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=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 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/testpath/Manifest b/dev-python/testpath/Manifest
index 6382fff90072..1a5f559abbe1 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,2 +1 @@
-DIST testpath-0.4.4.tar.gz 92101 BLAKE2B e607fbccf66570ebe29779701bac11048751e9ee8381cd7841ba5dc55e02ee2edc32e8fd8a4a869fdd786f0c4bacdb5e7efc644e0111c24a786631257a08c9cb SHA512 4435c99325d535c713e88b59ce16704e10947232e4eccfe0e792ff9288b65e677417881ce8bbb69577aebb4b9ef793621d8e54898ecb158d07fc22e8445950e2
 DIST testpath-0.5.0.tar.gz 93168 BLAKE2B 864ac80e027192fb1a83f1a15db55fe72729154c7236f2054abfe161be36741614732efbea2a6b4eeb1fb59befa36002d767b4113fab98202ff22330ad15e21d SHA512 d960da04b490b355c5ca9d8e348d81a0d528f13dc7a2b5d6d3c09327a603c1582bce76f7de6d1666b490112306a10d6a19c7979c1119fb726c08c712a08bbcb0
diff --git a/dev-python/testpath/testpath-0.4.4-r1.ebuild b/dev-python/testpath/testpath-0.4.4-r1.ebuild
deleted file mode 100644
index bb8f471c6129..000000000000
--- a/dev-python/testpath/testpath-0.4.4-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Test utilities for code working with files and commands"
-HOMEPAGE="https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
-
-DEPEND="
-	test? (
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
diff --git a/dev-python/testpath/testpath-0.5.0.ebuild b/dev-python/testpath/testpath-0.5.0.ebuild
index 92b2fb0f175d..2cefe957d41a 100644
--- a/dev-python/testpath/testpath-0.5.0.ebuild
+++ b/dev-python/testpath/testpath-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 BDEPEND=">=dev-python/pyproject2setuppy-15"
 
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index a1e085e2d9dd..3c66e100c6f3 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,3 +1,2 @@
-DIST websocket-client-0.59.0.tar.gz 57897 BLAKE2B 9f15c563491bd105a1987281cc20c0ab80ed1625036eeaa674fd28334b8226b5f9660b150743649f6bc7717d4306cbb1778222f9caeeff29507ab364572ce2b5 SHA512 c7f4a0336093de86fd00828049a836477a3c859cc4bddebd9e7d31eb746dab4de8fa11205a5fb182e5df3590964aa73f279310575dfabc4abc32157e80df42b1
 DIST websocket-client-1.0.1.tar.gz 58561 BLAKE2B 852693b08cec5d8345ee0cd38d87a93abfd5ac52a72a0715705ae4a7d5f810288d9409e920424a317867e7292568a9a67b4fde8b892e9ff3fa011cf31c016f35 SHA512 349ecf0f80859e146e6039a29b50f8bb9a377ad65655c49b354702a7895ebed4f8849d979f04b1632c7926e3dfb707ae5791a75b3e9c66d35ad1445040d651b3
 DIST websocket-client-1.1.0.tar.gz 58890 BLAKE2B b7557f0847ee4ec31279d98661f2370f32eff35de5ea6207abe4afa6ef7314258da275d823487773722ac717888ca629284ef92870b5880fb385f7fb677506d6 SHA512 6f4b963455bdb6a0e0defff92a6b898ee4bdf605c18fef7e25e18e2c72a2ae360d760c2069a0ed330e5dc0f3347f16a9129c405d5c98cd2d56014f8636e7d5b5
diff --git a/dev-python/websocket-client/websocket-client-0.59.0.ebuild b/dev-python/websocket-client/websocket-client-0.59.0.ebuild
deleted file mode 100644
index aad8342b11e4..000000000000
--- a/dev-python/websocket-client/websocket-client-0.59.0.ebuild
+++ /dev/null
@@ -1,38 +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="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="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	sed -i -e '1i#!/usr/bin/env python' bin/wsdump.py || die
-	# Internet
-	sed -i -e 's:testConnect:_&:' websocket/tests/test_http.py || die
-	distutils-r1_src_prepare
-}
-
-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.0.1.ebuild b/dev-python/websocket-client/websocket-client-1.0.1.ebuild
index 15db76ef875a..e4319c6b5f84 100644
--- a/dev-python/websocket-client/websocket-client-1.0.1.ebuild
+++ b/dev-python/websocket-client/websocket-client-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 IUSE="examples"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/xarray/xarray-0.18.2.ebuild b/dev-python/xarray/xarray-0.18.2.ebuild
index 5e20b6367e84..184406e7ca1d 100644
--- a/dev-python/xarray/xarray-0.18.2.ebuild
+++ b/dev-python/xarray/xarray-0.18.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
diff --git a/dev-python/zstd/Manifest b/dev-python/zstd/Manifest
index 96980b95e75e..301fdceb5c35 100644
--- a/dev-python/zstd/Manifest
+++ b/dev-python/zstd/Manifest
@@ -1,2 +1 @@
-DIST zstd-1.4.9.1.tar.gz 516353 BLAKE2B ec318c1b6e3d44a8959dae61c2ba3f2210c0cb9daf88519b07b1df8801b8345a2b9c18fddab497a478a1c6e03118f42f9526019a624f86f347691b7daea17bb0 SHA512 53816d252611ce3a1aa0dfa7b568ce8ffba07dd8ca6009ab3406680e674f5040633718cc65e1d5a0cfea1e1f5dd746a8f3e91b313b2be39b0ed4c6f9d887b24e
 DIST zstd-1.5.0.2.tar.gz 528892 BLAKE2B 9aaa0beba1a6703d881daf5c5e10d93a8c67923d07773bce5eda3eba652f50c4cb4aa18d2ea9bea304a8742a7e8501568679837aa8bb1e71fe6eff5a5d08d193 SHA512 a7a6033e743c5bc0fa5256dfd256c2a9417c200cda5d5c02c6c7a5d5553d188637e21908658a4a948e565b16bb03f85f57c74d51c63a3ae7eb160f8b3bdbd3c3
diff --git a/dev-python/zstd/zstd-1.4.9.1.ebuild b/dev-python/zstd/zstd-1.4.9.1.ebuild
deleted file mode 100644
index 27217e54768e..000000000000
--- a/dev-python/zstd/zstd-1.4.9.1.ebuild
+++ /dev/null
@@ -1,21 +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="Simple python bindings to Yann Collet ZSTD compression library"
-HOMEPAGE="https://github.com/sergey-dryabzhinsky/python-zstd"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	app-arch/zstd:=
-	!dev-python/zstandard[${PYTHON_USEDEP}]
-"
-DEPEND=${RDEPEND}
diff --git a/dev-python/zstd/zstd-1.5.0.2.ebuild b/dev-python/zstd/zstd-1.5.0.2.ebuild
index b6e61a87fc8c..bdf7ee57f37b 100644
--- a/dev-python/zstd/zstd-1.5.0.2.ebuild
+++ b/dev-python/zstd/zstd-1.5.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	app-arch/zstd:=
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-06-24 13:50:18 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-06-24 13:50:18 +0000
commit	8b317bcd38029487569edcb3903c78be108b0b85 (patch)
tree	bcb2b5f9fdac8c3995d5f69ea3734f22f7988360 /dev-python
parent	ffa55519fa218c66693a3418b3b1f3d991fb1a1f (diff)
download	baldeagleos-repo-8b317bcd38029487569edcb3903c78be108b0b85.tar.gz baldeagleos-repo-8b317bcd38029487569edcb3903c78be108b0b85.tar.xz baldeagleos-repo-8b317bcd38029487569edcb3903c78be108b0b85.zip