Adding metadata

41 files changed, 181 insertions, 329 deletions

diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 9336e462cea3..a20e37adc6c6 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,3 +1,2 @@
-DIST breathe-4.25.1.tar.gz 76931 BLAKE2B 3f910042f3822e5887da8239ba1a65bf7b1c8903a514c359ad64c58928fe8fe6b867a99351e18fb394a0a56aa0dbecc040203406a1e64961266fbd69aaddacfa SHA512 417adc7facbd5ec9eb69ec79028987fde537cbd928e3d552e7020377b683816b1b670614daa24c2047d711043f0a9116a09e8c1ca7aecb82db97b1f6fac872d8
 DIST breathe-4.26.1.tar.gz 183929 BLAKE2B ef31c8b900aa2a943dc592b630ce60ecf7ca484fb455aeb081b4c7783f7e25ffe169343a98f2a2635d243c25962bde81b6bc116e6a381ce0a8a6d116a7fb6686 SHA512 d272b99295f2d7d2d118aca61f3ecbe6679a2cf84c143d7fced8387af129f68996e07e513870e6cc2573e39a6005a76e36337b0622bd3e46edffccfbd59ab74f
 DIST breathe-4.27.0.tar.gz 186352 BLAKE2B fd4cac6e32a4988812085a71ea6b7222058d6856c377c9ad147da4a9eed980904f09cc04d9524bb20d6495d593c3fb3aa05792b1f0a6a8ce58bff4ca3c29d643 SHA512 b5fc79f8d7728b39e5667d1d763b02a4c0556d9b79ee6b138dc7b1951d9896d18cac1d418401edcb5eb7c4da416c77f177b40b34f85a7ea823cc2d8a4bf6dda4
diff --git a/dev-python/breathe/breathe-4.25.1-r1.ebuild b/dev-python/breathe/breathe-4.25.1-r1.ebuild
deleted file mode 100644
index bae2958b51a4..000000000000
--- a/dev-python/breathe/breathe-4.25.1-r1.ebuild
+++ /dev/null
@@ -1,29 +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="Sphinx Doxygen renderer"
-HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
diff --git a/dev-python/breathe/breathe-4.26.1.ebuild b/dev-python/breathe/breathe-4.26.1.ebuild
index fc33165df342..91d9524b7089 100644
--- a/dev-python/breathe/breathe-4.26.1.ebuild
+++ b/dev-python/breathe/breathe-4.26.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild
index d0bf09860838..af5afbaca97f 100644
--- a/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-arch/brotli:=
diff --git a/dev-python/cffi/cffi-1.14.5.ebuild b/dev-python/cffi/cffi-1.14.5.ebuild
index f2487202df7e..31d2775f6ab5 100644
--- a/dev-python/cffi/cffi-1.14.5.ebuild
+++ b/dev-python/cffi/cffi-1.14.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/elementpath/elementpath-2.1.4.ebuild b/dev-python/elementpath/elementpath-2.1.4.ebuild
index 88ad17d6cb56..3356f8987c5a 100644
--- a/dev-python/elementpath/elementpath-2.1.4.ebuild
+++ b/dev-python/elementpath/elementpath-2.1.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/immutables/immutables-0.15.ebuild b/dev-python/immutables/immutables-0.15.ebuild
index c59f023fdbb1..1fc0e24c0a36 100644
--- a/dev-python/immutables/immutables-0.15.ebuild
+++ b/dev-python/immutables/immutables-0.15.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 64b51cac20ea..6bfd72dca741 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -2,3 +2,4 @@ DIST importlib_metadata-3.4.0.tar.gz 33841 BLAKE2B e2ac38c0f6fc5ecf78d3a40187152
 DIST importlib_metadata-3.7.0.tar.gz 36517 BLAKE2B b96ac99bbc9ed7c961635a598d46bf409f11b008453123f3236feaf3650f7c6fe262c803dbf6b65bbe42ca4ea9990b559d3f03dde2287b19f0f7ff21668a3a3a SHA512 c11c503412cb5f18a235dbff13eb0d5b24a2a7510f32cb8fc4abec3259987de9e5a01692aef729c5d7c7fe597156b1317abc357d49726ef1026172995b080631
 DIST importlib_metadata-3.7.1.tar.gz 36595 BLAKE2B c4eaf3671ec48610ce310a2609625ab77496252953c2d0567cc4824c39a8601ef99fb3ffd5d7968eb7aa358aaedf0ab81d87271afdddac68d7bd3a70971b153a SHA512 b301c6c72b185d893e5e400dbd9417b2ba94122073d6cb163c9e9949fb13762ddc57b34dbba1330b55bef47073fc72a6a4b5689adf9af819a68be603c9d64c9e
 DIST importlib_metadata-3.7.2.tar.gz 36644 BLAKE2B 11e8f0c012d405a7059842fbc0aa1edfd8313a01b12b36e40c5a542b17f6ebe5284e945967f080c5934758820354f131df81e84d1fa4d5e6ac1660dac055a914 SHA512 ecf630c83c08895d566fbf3f435d4bfc5c0336dff1c682e6413598749c13720211aad4085dd7b9a88ca4218ef5514cd730a6f13c2c53be6cc349edd142106204
+DIST importlib_metadata-3.7.3.tar.gz 37193 BLAKE2B 0de5f4ece99db9ec4f86e9b967c8583d06a5bda939a7bdb137dba3c6a9d7fd034802d9fa0eb5bf209ae5ada89ebd0f3120557d3fa2b300739ebff2ff1bb6edb8 SHA512 1d6ee80edb3e5efb56deb0676ef42ba72fdaf124504023954cb3b1192e5378c3370a35b5e77708f3d9a19c02f0d89a1ba08a919a7aaec5e284f54c2eb3c61fc1
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.7.3.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.7.3.ebuild
new file mode 100644
index 000000000000..eb45b99adc44
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-3.7.3.ebuild
@@ -0,0 +1,42 @@
+# 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})
+	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/jaraco-collections/jaraco-collections-3.2.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.2.0.ebuild
index 8d2220308021..a08ddd796676 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.2.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.2.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.2.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.2.0.ebuild
index 8712374a1b9b..cc23de852275 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.2.0.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.2.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/more-itertools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-text/jaraco-text-3.5.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.5.0.ebuild
index a3eea3df229b..63394b5f76ed 100644
--- a/dev-python/jaraco-text/jaraco-text-3.5.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.5.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
diff --git a/dev-python/more-itertools/more-itertools-8.7.0.ebuild b/dev-python/more-itertools/more-itertools-8.7.0.ebuild
index c6d4bdf95cac..c4816eba3294 100644
--- a/dev-python/more-itertools/more-itertools-8.7.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.7.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"
 
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.16.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.16.ebuild
index 46cd3eff785d..65261ccb753e 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.16.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 9a7fbb91ad73..bc49eb634c78 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,2 +1,2 @@
-DIST 2.5.0.tar.gz 78266 BLAKE2B 27caeb5dfd2166b80e9c11bc10bc5957d7acb92cd1b0480704451ffedc85b6c6b44f205ab3b212524581cc223b1a37f44594d8e899f1eb682307398cfc109d83 SHA512 b40d2b4fd6673f4115cb0fa056056ef39f4705ba8826bb2a4b91c98e542132951471e1226d697daeb6fac9a5520df5f8dde0931462e540ee2eb8b5f275eb2288
 DIST 2.6.0.tar.gz 80253 BLAKE2B 01f17d677886dfce6d4973fab61609a51f1d6313234b011bc3a2ba4a3b063e1a92f2620385968c3666cda378deea01fb50f304602249536610e7fe29a044b788 SHA512 251b2526edc9759aa07b43c23c2785ebf2b7c4cca7e70444b8f79ff72cfb842ca49b929c01faba307534e4f213247597739ba777181fca6048d6cfae67cd25b6
+DIST pycodestyle-2.7.0.tar.gz 103640 BLAKE2B 5b1ad351aadff101732748fd4d3a4d34c3eabc058dd9d0c7551afde0dbb169ddce82ccc539e71b72ea2df0dc199b3c2213d259910a18b5acd892782e1314cc19 SHA512 26502480e5855f0fd9378664ec813bb38dc2f8ac22e01767fc8bf75e52fa7a7691382fd4f6f1edaeb5f41d150ed71ee87e0d7f525bf06acbf4b3034cec3a227a
diff --git a/dev-python/pycodestyle/pycodestyle-2.5.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
index dbf19c00dad7..27d67bc8e941 100644
--- a/dev-python/pycodestyle/pycodestyle-2.5.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python style guide checker (fka pep8)"
 HOMEPAGE="https://pypi.org/project/pycodestyle/"
-SRC_URI="https://github.com/PyCQA/pycodestyle/archive/${PV}.tar.gz"
+SRC_URI="https://files.pythonhosted.org/packages/02/b3/c832123f2699892c715fcdfebb1a8fdeffa11bb7b2350e46ecdd76b45a20/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index b3bb3b6bc03c..3475fc42ad39 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1 +1,2 @@
 DIST pyflakes-2.2.0.tar.gz 65307 BLAKE2B e48e0cb0497f90b6482c0fd08c182d766ab50755fe348352df510841f4ad43f7c1d6486753ce774603a3624f49c9b0165ad930bb1451ef30cf2e828d732e0652 SHA512 6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35
+DIST pyflakes-2.3.0.tar.gz 68452 BLAKE2B b108dc79ce916e1d1c05b13a167b11bf5350672f5513d6642c0c9f6b46a46d558acf1cb5035f6d987a10087242f2e1040d271c4270d1f510156883d37a7c658e SHA512 e65e534139b7739e742eaa07e8803387f20bba0332247688c864ef8fab74d5851c68e9705cecae158c8d178ddbb08d54aea7ce77910979be1cc3fea57687fce4
diff --git a/dev-python/pyflakes/pyflakes-2.3.0.ebuild b/dev-python/pyflakes/pyflakes-2.3.0.ebuild
new file mode 100644
index 000000000000..51a322a0d6b5
--- /dev/null
+++ b/dev-python/pyflakes/pyflakes-2.3.0.ebuild
@@ -0,0 +1,20 @@
+# 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 )
+# Uses pkg_resources
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Passive checker for Python programs"
+HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
+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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 02af93706a0c..db83127025cb 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1 +1,2 @@
 DIST pylast-4.1.0.tar.gz 39592 BLAKE2B ff1f9f025701ebf741e53d96c2ba0c34d7a165d1c248973874484ed0c2e5e24693631f31de516fb4a58ea14014cb38c60fe04b9d116128a6a259346f16085dc2 SHA512 90be1cafb9252c2c19db9b179350269dc8eec82545487394d671d411e4fc2ca10fcd85259874f72c39674474c75274446cd8c64cd5f2274ef98ebf5ba7fbb351
+DIST pylast-4.2.0.tar.gz 39761 BLAKE2B 35ab18928b2761255a25e2b8549fe852f28f04057c9fb1075fa223333d079c07340ea17d425695d17c0ec99d67e6e31ed93f6fe60df1121ae7c298cca99b1b03 SHA512 9c8c0eea0d3f54514ba06ad7da0868844f8dc53715717decb3b56772093e637673deb22ee4277e508d7e659b48c79733514c67c9af0283e8aa0032caeae3d44f
diff --git a/dev-python/pylast/pylast-4.2.0.ebuild b/dev-python/pylast/pylast-4.2.0.ebuild
new file mode 100644
index 000000000000..8307d3f4888e
--- /dev/null
+++ b/dev-python/pylast/pylast-4.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to last.fm and other api-compatible websites"
+HOMEPAGE="https://github.com/pylast/pylast"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/flaky[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests --install pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index aed96c0d4de3..4008b8ef3773 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,3 +1 @@
-DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
-DIST pytest-xdist-2.2.0.tar.gz 64781 BLAKE2B 17287c28f31c42c6a8fe3622d4ba920a530e0ced3bc99cffd8f9de91c3498cc2a3b654cc32bd5b09ee8ec6c1f64226aec736acafd73397be2eb34bd3d192bb46 SHA512 2027f8512fbd6cb68ab36eb774b9d8b7e855c181733b884f394d0e84994926b4fe6158dbd55808328b262497036f101e71cb86553340eba0031d654f34541689
 DIST pytest-xdist-2.2.1.tar.gz 64956 BLAKE2B 7ea18b0e7893000ed9d8718506a7b0f7cf45444196a23e3defec34639c2159b52c7a533ddbc0e0a9b3c3f1e0a867ad5c85e3549167e9b7049ce718646ed50717 SHA512 0732f5ffb56eead3d1aeecd37381c2d9c6ed22398e8e51e9358b562765d737ebde48ecb6fe9f90d9a46902dba1422721cb2c7bfc9fc13918aa2c3b8e6a5e48c4
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch b/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch
deleted file mode 100644
index 8595480c01f0..000000000000
--- a/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bd4e91d12bf6e20538d9b3acfe69536b3badcde5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 31 Jul 2020 20:13:24 +0200
-Subject: [PATCH 1/3] Fix test_config_initialization condition for pytest<5
-
-Fix test_config_initialization to be correctly skipped on pytest<5,
-by explicitly checking pytest version (idea copied from
-test_looponfail_removed_test).  The current conditions are insufficient
--- the outer check wrongly assumes pytest>=5 will always be used
-on Python 3 (which is not true if you need the same version to support
-both Python 2 and Python 3), and the inner condition apparently
-wrongly assuming that invocation_params attribute is not present
-in pytest-4.
----
- testing/acceptance_test.py | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
-index 7f9a551..29c5d9a 100644
---- a/testing/acceptance_test.py
-+++ b/testing/acceptance_test.py
-@@ -2,6 +2,7 @@ import os
- import re
- import sys
- import textwrap
-+from pkg_resources import parse_version
- 
- import py
- import pytest
-@@ -594,15 +595,11 @@ def test_fixture_teardown_failure(testdir):
- 
- 
- @pytest.mark.skipif(
--    sys.version_info[:2] == (2, 7),
--    reason="Only available in pytest 5.0+ (Python 3 only)",
-+    parse_version(pytest.__version__) < parse_version("5"),
-+    reason="Only available in pytest 5.0+",
- )
- def test_config_initialization(testdir, monkeypatch, pytestconfig):
-     """Ensure workers and master are initialized consistently. Integration test for #445"""
--    if not hasattr(pytestconfig, "invocation_params"):
--        pytest.skip(
--            "requires pytest >=5.1 (config has no attribute 'invocation_params')"
--        )
-     testdir.makepyfile(
-         **{
-             "dir_a/test_foo.py": """
--- 
-2.28.0
-
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild
deleted file mode 100644
index 960fb7d5b9da..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-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="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# pleaes do not depend on pytest to avoid unnecessary USEDEP enforcement
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/filelock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pytest4.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv testing || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild
deleted file mode 100644
index b8fa8c1cd8fd..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,37 +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="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# pytest-xdist >= 2 fails with pytest < 6
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-services-conflict.patch
-)
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild
index 10a1aca214ba..dbf1cc4984d8 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 # pytest-xdist >= 2 fails with pytest < 6
 RDEPEND="
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index 48f48612b255..83874646d3ec 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -1,2 +1 @@
-DIST recommonmark-0.6.0.tar.gz 24537 BLAKE2B 47f667ca0799394dc88964709efc59d1e2a68973b1c00fb41abfb514166e939b8dd0b6a0827285cfa1bb60669e08868b7a0993b6a32880fc0dd22cfefa6cf273 SHA512 44005b3fd0052cd8d4fce8a64f9d66a1ac75dc3041a28c115e922254956b2143296cbfbc0a2396b9f95691145645c4242e3be68e695b2c62ae37964014511679
 DIST recommonmark-0.7.1.tar.gz 24720 BLAKE2B 6543a23bd262be0ff6847fc1eb1bd3dad433606aa1adb52162cab2e0c4dd2265ac41b3816bbe1994c4f6ca732105712dbc9cd295d5cfd93061ad83520b8f449c SHA512 3e03440d606ea6247df9bd122a6fa2dccf01c0c315eeace046d5cd336657e26bbd1c6b7ad4ba46f344215905128b72508c036cc57bbe4b5e27df50c55371fe01
diff --git a/dev-python/recommonmark/recommonmark-0.6.0-r1.ebuild b/dev-python/recommonmark/recommonmark-0.6.0-r1.ebuild
deleted file mode 100644
index 97feb2c56ebc..000000000000
--- a/dev-python/recommonmark/recommonmark-0.6.0-r1.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=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
-HOMEPAGE="https://recommonmark.readthedocs.io/"
-SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.14[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.0-sphinx3-1.patch"
-	"${FILESDIR}/${PN}-0.6.0-sphinx3-2.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/recommonmark/recommonmark-0.7.1.ebuild b/dev-python/recommonmark/recommonmark-0.7.1.ebuild
index 2ead7f8a0956..97feb2c56ebc 100644
--- a/dev-python/recommonmark/recommonmark-0.7.1.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 098f82e926a3..0437871e994e 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,3 +1,4 @@
 DIST setuptools-53.0.0.tar.gz 2050503 BLAKE2B b1ebe5a9776917fe9a21a13a4db613fd05aa1f61043482487013bcfed7802ff1b984fe0f72623b092eee7ebfb9debd5f71732223220bc2b73a6ece0a7ec86a2c SHA512 d045198210f09c5f2acbd487d3dd291cd7ce814bebe331f1876c133cd28f56d368717c7bd4a875b439c9cc8c9488dc9a7d3e27ab791cce419f78b87fcfd8fff6
 DIST setuptools-53.1.0.tar.gz 2051159 BLAKE2B f4148df45f5c62acd6acae833619dcae50f131da91ece1a2e1231620d4800294f14dab6c72ca5b2ffd31191c4e3306a869abdba349adcec5746600fc067b340d SHA512 0ca02e9b997623268d8f73b73ee6a4b1ad513802cbc75c74124a85bd5ca7bfaea5cf7cccb706334c0dac2c8a0674a5bc2cea10f44f99f881ad893c8337af3da2
 DIST setuptools-54.1.1.tar.gz 2053415 BLAKE2B 59d60e9be5a184e34e8c9e1ccb477eae538836c8fac4862f3365e1abe8beec6cc85490918d413b29831c4d3738ca19cd84ac4a9d30178e45e42c652a0ade5fac SHA512 d2ab5445a9b4de5b5fae8aab6a47131ad41a011fa23fb1e6c07a599bcb27a8f89ea3c5ea9939577d6286bf3f8e2edf0334816ae1a507dba09c46435d063c3379
+DIST setuptools-54.1.2.tar.gz 2053508 BLAKE2B 23958ab6bc8ac5681fb4a86217b893f5389be1afc9e71f77a3aaaca469e3f86117e55f9df8f864ae56059ef6aef054a6a5ce8d6670a5ce266de6322b820e68d7 SHA512 b6efe6e92227704a95d4d4a31d033df6df96a430d7e51cb7df80203af56d8f8f64c95deaf194c7cfbfd2111f5bc02be45db2c0383c3209c898c1858821eb4642
diff --git a/dev-python/setuptools/setuptools-54.1.2.ebuild b/dev-python/setuptools/setuptools-54.1.2.ebuild
new file mode 100644
index 000000000000..a3d301f4a6fa
--- /dev/null
+++ b/dev-python/setuptools/setuptools-54.1.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+	distutils_install_for_testing --via-root
+	local deselect=(
+		# network
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_distutils_adoption.py
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		# this one's unhappy about pytest-xdist but one test is not worth
+		# losing the speed gain
+		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 64ebe4d5ca41..89038333174c 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,2 +1 @@
-DIST soupsieve-2.1.0.tar.gz 98150 BLAKE2B 37f6ef00f42d164ef57be88135e8a942166f53a39ed5643d6ae0468916a66be04c79e4e70da6ad38f8adf6fac41cb8bccb7edcfabd7e1a07083ab8a043d5203a SHA512 19cd4ee596d189a001bbaf9f047e6c9eff569e2149ef5424bfe55c9b4325d856c957de87d55510335f748aab322dbb847b06b48931fbdeadbcc3790259c69eb1
 DIST soupsieve-2.2.tar.gz 99261 BLAKE2B 637bed198a62a7f92f6b3c022dcb9a579c15a3dcb1e3581b5a18b9ff804c2075c976c3478f86d2400841c177f3160dc05da41991ca56731c91e6db5b95262671 SHA512 26402c831c19c9b133442dd8ea31363e1eadc3cafe172b933cdbc746df6dc9961e930d4fbe8399b847848bf3fcd5893d2449e912ed0cdf8766468997acf5ee87
diff --git a/dev-python/soupsieve/soupsieve-2.1.0.ebuild b/dev-python/soupsieve/soupsieve-2.1.0.ebuild
deleted file mode 100644
index ce09cdbc94d2..000000000000
--- a/dev-python/soupsieve/soupsieve-2.1.0.ebuild
+++ /dev/null
@@ -1,29 +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 modern CSS selector implementation for BeautifulSoup"
-HOMEPAGE="https://github.com/facelessuser/soupsieve/
-	https://pypi.org/project/soupsieve/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT+=" !test? ( test )"
-
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/soupsieve/soupsieve-2.2.ebuild b/dev-python/soupsieve/soupsieve-2.2.ebuild
index 807465d3d2ce..a5f18df2decc 100644
--- a/dev-python/soupsieve/soupsieve-2.2.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT+=" !test? ( test )"
 
diff --git a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild
index a01ed2444deb..70e9bc6811ed 100644
--- a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild
+++ b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://gitlab.com/lv2/${PN}/-/archive/v${PV}/{PN}-v${PV}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
 
 S="${WORKDIR}/${PN}-v${PV}-${COMMIT}"
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 10e06abaa668..96e06b2cf1c8 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,4 +1,3 @@
-DIST tqdm-4.55.2.tar.gz 162632 BLAKE2B 02e49f442c8d5ad3799de143dd8a188796293253e836c24d04e75aa45f7cbeecb967f1503467ca7486dfd412538da6f7a3aa4c674e16f0da3954f44347c5a498 SHA512 f61f28f2b8f7c4d848e31a3d791822a0433573b36aa900d055e1919b555b84ee36d988c6f51d6951355e70821f4d24bee72bdd4472262ea55ea012ff0556b0df
 DIST tqdm-4.56.2.tar.gz 167040 BLAKE2B c1754cb262977688365c6bf17ec6b6ec31704cdb22aaf05261653c4c9609bdbd16863a15f58a7fe0fb2c0983513b091be55dbca48a0a7b1177a4d017d6800ce0 SHA512 8e7ec199c43a3cdb69bdbfaaec33c11ce8b337255eff4ae6af9928c2a2c5adb065698538562020c9f0a29a63671cbbfcf2c4c9ccb25bec0ec1d8ae8df66516c3
 DIST tqdm-4.57.0.tar.gz 167590 BLAKE2B 30852febdcb69d1f0c6a7416ec7611a79896d643e18c658bb19e52196b4998d8ff9ef708c92d09d9804d8c0210b378dc8a3d58ef2b788a65835cd95ddf3406e4 SHA512 5393ffe6cbb5b41a3c51efdd14169936fcae9dd635b7a35d64f44157f2c855914dbd5c8aa933c4830a16867c83a73c0734e0ebee548392d2c73cae4e6aba531f
 DIST tqdm-4.58.0.tar.gz 167844 BLAKE2B 9a28aa91b330714f6f4d178ca793f9bc1ce5988417b38dc5a9af06c36b8949d0f23de846bc1fb87f7dac2a3b09028c4d216659f84a8ce2125de0a7870d8bc4b4 SHA512 a97a7fc1d5a181d326e91bd017cf9737fd2322f375b8efe5e53c8e49c7986edcdea39086f5057a6d2584a16e2a45b5a679055ba08c83d813fff0a61050b71b45
diff --git a/dev-python/tqdm/tqdm-4.55.2.ebuild b/dev-python/tqdm/tqdm-4.55.2.ebuild
deleted file mode 100644
index e98fff6f8208..000000000000
--- a/dev-python/tqdm/tqdm-4.55.2.ebuild
+++ /dev/null
@@ -1,54 +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 )
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-fi
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="https://github.com/tqdm/tqdm"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Skip unpredictable performance tests
-	pytest -vv --ignore 'tests/tests_perf.py' ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
-	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
-	distutils-r1_python_install
-}
-
-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/tqdm/tqdm-4.56.2.ebuild b/dev-python/tqdm/tqdm-4.56.2.ebuild
index 5caf7e58ff9e..e98fff6f8208 100644
--- a/dev-python/tqdm/tqdm-4.56.2.ebuild
+++ b/dev-python/tqdm/tqdm-4.56.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/watchdog/watchdog-2.0.0.ebuild b/dev-python/watchdog/watchdog-2.0.0.ebuild
index 95100a133215..5eb55c041cb4 100644
--- a/dev-python/watchdog/watchdog-2.0.0.ebuild
+++ b/dev-python/watchdog/watchdog-2.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 3d289a8ab340..a727783d5f0b 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,4 +1,3 @@
-DIST xmlschema-1.4.2.tar.gz 331747 BLAKE2B 013a74e7d929e46d497a55ad67888f0dd25b60097e390c3ad3b69c9a87d9e5a83bd68873336137805d755a47d0e5cb5b7347403ee38bcb7457e70803c6aca2ff SHA512 a490d1686f3e8cc7fd45bcb51f00ddf8b734e0c928f8690f9988232f8781fa070f7f03be7473ed5e8b3d1ab67bb08e123c79b408c3daaebfd2df0e94c8827888
 DIST xmlschema-1.5.1.tar.gz 349788 BLAKE2B a46aa6619594de4db31158f26def3dc070629cc29112aa02555c2479f57883d7d5afb82cbc65e4193d607b2572049ff7da8cf3cb14850b0a6f3166ae87d86928 SHA512 5e8b3adbf8c5b4ac6a85a2d9b62212870cdc6639634f9adf9d16499d86b9cc73fd1fc6ba496f14d840ecefc60f175c62f077a62bab68bd057150889d5ae0a872
 DIST xmlschema-1.5.2.tar.gz 350754 BLAKE2B e00a25e12ebef613f4d89522e059fcbd41f28920da62bcf8782e6c345b44133072dd578ef547d51e547ed92e5424fc9a885f1c789544f83d5cfe1743fcbe2f30 SHA512 8ab6de10c40aa96f57c4dbb37af2256ec46b28a844f3ad7a44f6184ff38687581c7f038ef87374f49fb204f48053c4693a98fa79059e9074745e0d2a6f353bce
 DIST xmlschema-1.5.3.tar.gz 350684 BLAKE2B 5dfcd2e00339caa834195729cce1604d17e5aa4705150649e22bebe3dc7b3ac6ace5dccbc7b6313c5cadb5ca29992853191afff2f76f05d18c10294131a904cf SHA512 3d86dc407d3181bf5c34b2d6aead9995eca1b7210b39ce3cb95c5655fa0cac0bbcc9f15c6ac016aca69a23f19befbe0525d6f13644b68fde348dcd0fd03bfa73
diff --git a/dev-python/xmlschema/xmlschema-1.4.2.ebuild b/dev-python/xmlschema/xmlschema-1.4.2.ebuild
deleted file mode 100644
index 543008b12926..000000000000
--- a/dev-python/xmlschema/xmlschema-1.4.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-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 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.1.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.5.1.ebuild b/dev-python/xmlschema/xmlschema-1.5.1.ebuild
index 644806d1a94e..73108f2dd7a5 100644
--- a/dev-python/xmlschema/xmlschema-1.5.1.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"