Adding metadata

71 files changed, 356 insertions, 512 deletions

diff --git a/dev-python/argon2-cffi-bindings/Manifest b/dev-python/argon2-cffi-bindings/Manifest
new file mode 100644
index 000000000000..d82bd13ecb26
--- /dev/null
+++ b/dev-python/argon2-cffi-bindings/Manifest
@@ -0,0 +1 @@
+DIST argon2-cffi-bindings-21.2.0.tar.gz 1779911 BLAKE2B 3e2e2252e37678661502ca15425196b91a7952d0bb5c7ae4ed35132e9085fbbe5d817c9c1bdec7d94eb583ab6baf9d1e1e454a24415bde1408287c5606745fb9 SHA512 71d023ae96073ed78599e4f4e42f8efcc985cc329adeea00b14b54eaac1e6a545e6ad9b7f4cfdc60a4e9c396f95053c0ccb6f6f67d92f70265f91315fff4a390
diff --git a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
new file mode 100644
index 000000000000..84acdc252842
--- /dev/null
+++ b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Low-level CFFI bindings for the Argon2 password hashing library"
+HOMEPAGE="https://github.com/hynek/argon2-cffi-bindings"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2"
+
+DEPEND="app-crypt/argon2:="
+BDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
+
+src_configure() {
+	export ARGON2_CFFI_USE_SYSTEM=1
+	# We cannot call usex in global scope, so we invoke it in src_configure
+	export ARGON2_CFFI_USE_SSE2=$(usex cpu_flags_x86_sse2 1 0)
+	distutils-r1_src_configure
+}
diff --git a/dev-python/argon2-cffi-bindings/metadata.xml b/dev-python/argon2-cffi-bindings/metadata.xml
new file mode 100644
index 000000000000..df34fca50cda
--- /dev/null
+++ b/dev-python/argon2-cffi-bindings/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>m.seifert@digitalernachschub.de</email>
+  <name>Michael Seifert</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">argon2-cffi-bindings</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
index 1210172f4cb4..4674fd4a5257 100644
--- a/dev-python/argon2-cffi/Manifest
+++ b/dev-python/argon2-cffi/Manifest
@@ -1 +1,2 @@
 DIST argon2-cffi-21.1.0.tar.gz 1807800 BLAKE2B 47b1e785b7eb173b671a44e9212af76a59f453c3c0d0e5f2c437e7a62132abf86ab6baa8bdd656ad28d00a151296a66211d365c0afe228821c8c1ff1a0a66c46 SHA512 bbfebd2c075f360a6c1c187c0789be2aae7480b9398f36db7bdfe74f288d9e00b44a788918c54f4cc8bb1947136ab0493f61975de408c482a5131e2bf1a8f4d0
+DIST argon2-cffi-21.2.0.tar.gz 42399 BLAKE2B d2f1a7e7caf776239f343f5e5f2cd1fcd78f0dbdfc28814e3299df18e5c97a81cafa37bf10733614fe32ddc8d19fa5c5721285e8b96b9172eaf2322a5bb9e529 SHA512 40cdd18106d959bf58f20a35ea84ac3c3859d28ed6cfa28ee81655c12038b4e0f28bfe2d8ee9b96cd6009dfcebe0ef6aa4eb7fa9cd81cad0b32911ca723a8bdd
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild
new file mode 100644
index 000000000000..2d4a1cfcca96
--- /dev/null
+++ b/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="CFFI bindings to the Argon2 password hashing library"
+HOMEPAGE="https://github.com/hynek/argon2-cffi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS.rst CHANGELOG.md FAQ.rst README.rst )
+
+src_prepare() {
+	# Patch the tool.flit.module.name entry in pyproject.toml to include
+	# the "src" subfolder. This allows pyproject2setuppy to retrieve the
+	# dynamic version and description correctly.
+	sed -i -e 's:^name = "argon2":name = "src/argon2":' \
+		"pyproject.toml" || die "Unable to patch package name"
+	# Sphinx's conf.py uses importlib.metadata to determine the package
+	# version. However, argon2-cffi is not installed when we try to build
+	# the docs. Therefore, we patch the release version in conf.py.
+	sed -i -e "/^release/s:= .*:= \"${PV}\":" \
+		"docs/conf.py" || die "Unable to patch version in docs"
+	distutils-r1_src_prepare
+}
+
+distutils_enable_sphinx docs \
+	dev-python/furo \
+	dev-python/sphinx-notfound-page
+distutils_enable_tests pytest
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 8ed6b82cdd7c..f02b3e718e02 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,4 +1,2 @@
 DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba
-DIST click-8.0.1.tar.gz 330890 BLAKE2B ae0a29bf1848e92c21ade72fb8ce08991c9edf6d5afb6d70a0dd85cdbfacffeac69a675dc0842566ae23ed8c666deac97879ad4611e8294ee1c6896ea2ddca8a SHA512 d93ec1d070dfa306733ee79893c64de9afcb0c7bf03d3f543dd697ef195f3a750828f77842a22886960a938740b92f0122962076ea52b911b87f7f75941a9032
-DIST click-8.0.2.tar.gz 332870 BLAKE2B b1c623dfa14239b6eda24aa20eb24936954cce7dec4add75cbf1a236a128fcaa2fbb21ce0da181e7d3fe6e13d808ba9ef39166152eebea06ae1a68b08c238e74 SHA512 473184751fde7a09b0730e84db2204fa3bc72d583e0edf5a2897a4bae8f1d2ffdf01c69ae971d9158cc59d22eb852eb83f28428a2635a95c43596abbc9257891
 DIST click-8.0.3.tar.gz 332553 BLAKE2B d0ac16196dd80ca452a5fbab2304cabc2dd6b493789a43c2d69f152c85f247e8512e965683d4d2cab9b59188766ee9950c0d47812b7ca03c30d873f54bc48076 SHA512 73d29b73d5f90132282753fa1b53f42a690ebf713e8e4f2e3ff3c8820ef71ed82c5165bf61563341170a263c4202adb5690540fdeb6501fb9d81d2db06a5e89e
diff --git a/dev-python/click/click-8.0.1-r1.ebuild b/dev-python/click/click-8.0.1-r1.ebuild
deleted file mode 100644
index b406a4904381..000000000000
--- a/dev-python/click/click-8.0.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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="examples"
-
-distutils_enable_sphinx docs \
-	'>=dev-python/docutils-0.14' \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinxcontrib-log_cabinet \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-8.0.2.ebuild b/dev-python/click/click-8.0.2.ebuild
deleted file mode 100644
index 5cbab4c20e5d..000000000000
--- a/dev-python/click/click-8.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="examples"
-
-distutils_enable_sphinx docs \
-	'>=dev-python/docutils-0.14' \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinxcontrib-log_cabinet \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-8.0.3.ebuild b/dev-python/click/click-8.0.3.ebuild
index 5cbab4c20e5d..bb2d2307ba50 100644
--- a/dev-python/click/click-8.0.3.ebuild
+++ b/dev-python/click/click-8.0.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/django-allauth/Manifest b/dev-python/django-allauth/Manifest
index fa7e7a90260c..cd6ca80e174f 100644
--- a/dev-python/django-allauth/Manifest
+++ b/dev-python/django-allauth/Manifest
@@ -1,2 +1,3 @@
 DIST django-allauth-0.45.0.tar.gz 581007 BLAKE2B a0f586818e4d17ece5ed009481b71c0213bf265f45d391664d411268d53124c1d5df226ca40d98722691ace5f5ed50026b0a9db3bd34070ff855059bf3e237d6 SHA512 16b166a5f97e62fef3c801af17b6b7569bd27e597cec394032a2644397afc30512f52f0ff77af8036e414086cd207dc9f5d310dbc744627b55938243ba18e50f
 DIST django-allauth-0.46.0.tar.gz 643238 BLAKE2B 91534f596e3fa2e6fa5e395bded16a793ccbec994a3099eef22980920013280f58b2204d226975c2fe7a7e2066b665789881a9bcc6d2342f70a9eb0b83c32f6c SHA512 8e89d6d6a10566e40f71845885c30c36994aef3ff9054731a7582484d12ff4c7df7903617777698e42838337ae436c41a59a318acc1d2fc0561883683f79df46
+DIST django-allauth-0.47.0.tar.gz 649860 BLAKE2B 9d230c546f5615a38be5fc915f080c44765c52f315910436af6e698af860efdf0debbe72a7d754cc7bd90a9791cd8647e3a186c748385c2d6e1f91a8ea8fc619 SHA512 b96acb3f44d5c04bef992cd5905e5cb3643d0329b10d9ae7df08f55a80c59bca8b59537a192f8de61b3776842fe166463e001a08585d5f701eeb839882cb6dac
diff --git a/dev-python/django-allauth/django-allauth-0.47.0.ebuild b/dev-python/django-allauth/django-allauth-0.47.0.ebuild
new file mode 100644
index 000000000000..39c599a9035f
--- /dev/null
+++ b/dev-python/django-allauth/django-allauth-0.47.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Django 3rd party (social) account authentication"
+HOMEPAGE="
+	https://www.intenct.nl/projects/django-allauth/
+	https://github.com/pennersr/django-allauth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# cryptography via pyjwt[crypto]
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/django[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	dev-python/python3-openid[${PYTHON_USEDEP}]
+	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${RDEPEND} )"
+
+DOCS=( README.rst AUTHORS ChangeLog.rst )
+
+src_test() {
+	# cern provider tests require Internet
+	rm allauth/socialaccount/providers/cern/tests.py || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=test_settings
+	local -x PYTHONPATH=.
+	django-admin test -v 2 || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/django-configurations/django-configurations-2.3.1.ebuild b/dev-python/django-configurations/django-configurations-2.3.1.ebuild
index 16c67a558e19..3e1ee542a29d 100644
--- a/dev-python/django-configurations/django-configurations-2.3.1.ebuild
+++ b/dev-python/django-configurations/django-configurations-2.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/docutils/docutils-0.18.ebuild b/dev-python/docutils/docutils-0.18.ebuild
index 921cb93e64e7..6856221a9794 100644
--- a/dev-python/docutils/docutils-0.18.ebuild
+++ b/dev-python/docutils/docutils-0.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/fonttools/fonttools-4.28.1.ebuild b/dev-python/fonttools/fonttools-4.28.1.ebuild
index 280f5b4947c7..9aab8e8ad172 100644
--- a/dev-python/fonttools/fonttools-4.28.1.ebuild
+++ b/dev-python/fonttools/fonttools-4.28.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ppc64 ~riscv sparc ~x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/furo/furo-2021.10.9.ebuild b/dev-python/furo/furo-2021.10.9.ebuild
index 83b63e4ec8d8..46e3479ce007 100644
--- a/dev-python/furo/furo-2021.10.9.ebuild
+++ b/dev-python/furo/furo-2021.10.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/gssapi/gssapi-1.7.2.ebuild b/dev-python/gssapi/gssapi-1.7.2.ebuild
index 4dc3125762ad..f268bd32bba4 100644
--- a/dev-python/gssapi/gssapi-1.7.2.ebuild
+++ b/dev-python/gssapi/gssapi-1.7.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 50af26fb9fb4..ee39e0367339 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -13,3 +13,4 @@ DIST hypothesis-python-6.29.1.tar.gz 9175987 BLAKE2B c12691eb1ff9221ba03799f6848
 DIST hypothesis-python-6.29.3.tar.gz 9176581 BLAKE2B d013c6dd2ddb8dfddf7f856c9358157ff4fa22aa19d40c4057952a2e136e8618cfd2bf8c80f0d606147b91efaed03c710cc2a993f9b8658e25669691e3df22f3 SHA512 4226683702b8be568073167ec6e5681a4ea2416c9e2baebb04bc549164e88c3e0d14d8ea525c64d571c8dc1446626f93809bc75b2a1c3f4c50ece97ee791446f
 DIST hypothesis-python-6.30.0.tar.gz 9180275 BLAKE2B f65ff5477054d37f7f7cdc463811dbf94d2a3adc7399cc9015b0088185c31027463e994ecdc6d2274141fb44cc75beca3e783c40b764bddc7430ca0cabcdd545 SHA512 23137db516b04b59f1dfe187998424ce326f82780047b1ebd189a552263beb221d8af0cf43f82656766903f4b2999205f013e6c9ae12ea48114af7c0ca7ade37
 DIST hypothesis-python-6.30.1.tar.gz 9180975 BLAKE2B 3b0e8e29d74f579a9ace6fc341451992386de3358defcf42936d2d535c31bae07d7ab49fa6d4a8d1a2bd0e8231086dd9795d78125555e668425fba2bc539b224 SHA512 8abf31debf94124744d17d5ddac6698a21981feca7b776e97d92d5f6d1404ec17794bdf11b256dc7b0a335a041af6d3f1f20ae6fd6a62abc1ad78c2b39354fa9
+DIST hypothesis-python-6.31.0.tar.gz 9181746 BLAKE2B e62e095ce94abf050b31048623f6d10bbdda23fe9ea46c1494dbb6e956d5939d96ebeb517526675d62320af42b32a52e4f3e07d0cc833694cf2b990aaead7e30 SHA512 5fde89262b03b3e3dd9a640028682bb3b3b2606e4c36d5b0331413aaa89d079f1fdd6db85312f658e02f1fbfd45ecb3ca53817e45e6fb146fc7e9ce36f78ecd3
diff --git a/dev-python/hypothesis/hypothesis-6.31.0.ebuild b/dev-python/hypothesis/hypothesis-6.31.0.ebuild
new file mode 100644
index 000000000000..8a8c3349037b
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.31.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{8..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{8..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-p no:pytest-describe \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/imageio-ffmpeg/Manifest b/dev-python/imageio-ffmpeg/Manifest
new file mode 100644
index 000000000000..1068a1592770
--- /dev/null
+++ b/dev-python/imageio-ffmpeg/Manifest
@@ -0,0 +1 @@
+DIST imageio-ffmpeg-0.4.5.gh.tar.gz 24065 BLAKE2B b960a54435628fdefc1ce21c7f3e75c6ce1ffa3b838537173a28173589c3d430d805a7f7eb2b091250cce3b29660edaa1b442e28cbae998728cb89067304e9ac SHA512 c4180903f7194cac880c3851b08e4563c6e12cb6336e321ca35a7baf92ec1de5a49880fd05db9c7c266327642d75830cac4060371cbdc76448fb0a2c21ab0c1c
diff --git a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.5.ebuild b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.5.ebuild
new file mode 100644
index 000000000000..3abf674c6bc7
--- /dev/null
+++ b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="FFMPEG wrapper for Python"
+HOMEPAGE="https://pypi.org/project/imageio-ffmpeg/ https://github.com/imageio/imageio-ffmpeg"
+SRC_URI="
+	https://github.com/imageio/imageio-ffmpeg/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+# ffmpeg is used as executable during runtime
+RDEPEND="media-video/ffmpeg:*"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/setup_requires/d' -i setup.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/imageio-ffmpeg/metadata.xml b/dev-python/imageio-ffmpeg/metadata.xml
new file mode 100644
index 000000000000..28ef8df971ab
--- /dev/null
+++ b/dev-python/imageio-ffmpeg/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="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">imageio-ffmpeg</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index f34bddec1f25..6c7e4747e2df 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,2 +1 @@
-DIST importlib_metadata-4.8.1.tar.gz 41779 BLAKE2B c6aab81784f45770eef3be14257a30111d30fa8f6c1f7d30722ca93bd4d548b826fc4a4ea54eb627d55d5ff3b539d96d3c0968ac3edf5e4dad013ef83d271618 SHA512 ad9ab435d4a49a12c9440d1d53cfc835fd889fee032db6ad1dded59b6e453f26ef97bca303e22d945124295ec7c50fa55837a13e7790dea01562a1724571f9fe
 DIST importlib_metadata-4.8.2.tar.gz 41791 BLAKE2B a89bbc955ef95fb91f79b49e77d91686ca45774c4c42b2d948a378370b39c96c6f021b29bfcd26ee51cb073ebde350a64b25cbdc4dd7e14ccaa3fb6b46eff4d2 SHA512 bdf90ef1c5a9c24dc139d32e9f9fa0b7a020ce4f840e6f80b8d7bb0204d8ea02ba532bce31213b0e449586418c2606a4d5edd64d6f312d6d6d55db6000e687ba
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.8.1-r1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.8.1-r1.ebuild
deleted file mode 100644
index 234a8b2d75b6..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.8.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 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="
-	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_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.8.2-r1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.8.2-r1.ebuild
index 1c7e40eb2d1b..234a8b2d75b6 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.8.2-r1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.8.2-r1.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="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/imread/imread-0.7.3-r1.ebuild b/dev-python/imread/imread-0.7.3-r1.ebuild
index b16c17a3c7c9..35461ed049a1 100644
--- a/dev-python/imread/imread-0.7.3-r1.ebuild
+++ b/dev-python/imread/imread-0.7.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Read Image Files"
-HOMEPAGE="http://luispedro.org/software/imread/ https://github.com/luispedro/imread"
+HOMEPAGE="https://luispedro.org/software/imread/ https://github.com/luispedro/imread"
 SRC_URI="https://github.com/luispedro/imread/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index c60f8823d973..699305938a6c 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,3 +1,2 @@
-DIST ipykernel-6.2.0.tar.gz 110042 BLAKE2B e1e9f140d434142339c36cdf72c9c4224143aeac8ee5938488fefaf0c15b33ddb6a4e4f49e4096431c89ba6bdcf6321f73e61927186d42518cd73e6016a017ed SHA512 7f3203b072cf7a4ca71e56df0c5621f6ac44440ace2ba855b7354971d04e872621650a0351f9d1ace50ea63459290835306e71fb91d414355810fa79968ddf56
 DIST ipykernel-6.4.2.tar.gz 121253 BLAKE2B 26f8f94df823dd7a4ac41cac574e70ae98eed64f88bbcd8ce600ce6dfe1c43c224d65b5d0f9586ad05829692142e37fbb685a5d577047791831f6138b8309556 SHA512 56f0a15a1f06628e8f74749e4bad4a65dcc78ba7ff45e4fa5802d232e427e4ec152a6b6697302488d2e05d6b0cfa0cbc106ea2a593ab43de9d9defa9c169d5a6
 DIST ipykernel-6.5.0.tar.gz 122962 BLAKE2B fa36ea41d7f2dc8d0d75144f421ea2a72dd50dcda6c6a91f625f18c35ed2ebb950aadfb1715dd57a1fda77bfb49e360bca87f0bd8b9ee8380399d41691db2b9a SHA512 440407818ed6f388f10a727a9be1a2588bf8c9699d66e1b954a1f64575c08b5bddb3978dd13f5ab26220a210ce7177e2be0374d48d3968df681d2d5311ce42d1
diff --git a/dev-python/ipykernel/ipykernel-6.2.0-r1.ebuild b/dev-python/ipykernel/ipykernel-6.2.0-r1.ebuild
deleted file mode 100644
index 4267e6e02df5..000000000000
--- a/dev-python/ipykernel/ipykernel-6.2.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/debugpy-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/debugpy-2.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	<dev-python/ipython-8.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
-	<dev-python/traitlets-6.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-8.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2[${PYTHON_USEDEP}]
-	<www-servers/tornado-7.0[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1.0[${PYTHON_USEDEP}]
-	<dev-python/matplotlib-inline-0.2.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/ipykernel/ipykernel-6.4.2.ebuild b/dev-python/ipykernel/ipykernel-6.4.2.ebuild
index 253be7295cec..4267e6e02df5 100644
--- a/dev-python/ipykernel/ipykernel-6.4.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index f913c5c08586..3bbff74169c5 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,4 +1,3 @@
-DIST iso8601-0.1.16.tar.gz 19599 BLAKE2B ea09dc8f2d339de895e420e1efd6207b7138ba34b37186d86df099fc404a2880b146e20b904cddb69e4dbe777c56b41ad6e04191da8d2062d87b37af4e61c124 SHA512 b049de4c5fb21bca2e3183e82c86149ac7cab684ad8c7281cb8ffc2c0e53a86b00f68f260cff659c19f8814a35970462d2dbd06b21bbc42ed1507b583df7e25e
 DIST iso8601-1.0.0.tar.gz 12294 BLAKE2B 71983fdb2d47dd4699af60ee8bb31e94c1b4aab91aad6b107896429ddccc8dd087c955df812ca088667a082febd5f65fdf3c2cb10974f14e32d0f9605ce0c13b SHA512 137fdbe891889428331883c745fc341b7b066e681d7ffa339bd3484663974f35ac0d9f25eaa438603c8d982821832f8f2fddb2a3906889e62affda6d8cfb38e6
 DIST iso8601-1.0.1.tar.gz 12525 BLAKE2B d5211464ad2e4774b25964a38eea95b63bc5fa7619f3d4e40326242b51340a3bc89d690b8112373450d183235ae3cca2888f2f17d604a730f965f04e73d5d331 SHA512 45e18b80b543fb0f9869810378ccaf17e46e046c2739901e881fb40a5b99315fdf893567e50e68a243ae72e268339ed486c07dbc98539904e4096d3357dca04d
 DIST iso8601-1.0.2.tar.gz 12653 BLAKE2B c7dbbe680f2828050b2ff32765da009b5f6dafdbc5182d5136f951f8604d7ff579b85050dbefae47d2b28ce88515b9dd73a8abf73b3419b4cdc4a4dd275b7228 SHA512 f28fbfe82c25575ad73a92df144c108ef3cf4e1a5a9af8362187014904073f26daa3b77dde689a23cfd87cdbf86196b241e925dd8cf5fd81728f0dbeee4836b7
diff --git a/dev-python/iso8601/iso8601-0.1.16.ebuild b/dev-python/iso8601/iso8601-0.1.16.ebuild
deleted file mode 100644
index 337d80677e54..000000000000
--- a/dev-python/iso8601/iso8601-0.1.16.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="https://pypi.org/project/iso8601/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/iso8601/iso8601-1.0.0.ebuild b/dev-python/iso8601/iso8601-1.0.0.ebuild
index 2cdf8bf83102..9ea5d551aec1 100644
--- a/dev-python/iso8601/iso8601-1.0.0.ebuild
+++ b/dev-python/iso8601/iso8601-1.0.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 2ea7229c03c8..58056178936f 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,3 +1,2 @@
 DIST isort-5.10.0.gh.tar.gz 728239 BLAKE2B 6a206cdd4ebceb29f8c76f1c08b3217da1d76b56bbfbf177175d08f502884ae1f0700dc1443c92c28d68d257cb6468e2210d35a2003680303aa2ae9eaefe3ce3 SHA512 e8de97d6714ad626974e601a676b35a324b306a9f6033fd5cdd4cf5a5caf29cbc3238dca8cbf38e749866776f01aa58026159f53a4181f6637daf93181726ad2
 DIST isort-5.10.1.gh.tar.gz 728462 BLAKE2B 5b892b9849293e8730e6d89592bace62009a8589d185b4d3a5bafded605ccd46fd0f2986fbad5cf1d72321d030e3193a111ab7e6114c6b4a7a67696f546b3a14 SHA512 545c1844bacc1d2d9e87e60b03b30a846ee1ebbfe2a229c3e018a2e1cc6e9a04a3691f1b2e7ec8575806f2341bc1af15eb64904b4eabd786d6b9b289cea5ce2a
-DIST isort-5.9.3.gh.tar.gz 729342 BLAKE2B f40f046c5706ea4fd6daf7dc8eaccaca35e7de3e77bc17fa73681d12c42f7d2a3b19a909384e6b2e2486679a9f9895c2fa944faace4bbc3d0cfd0ec7aff85edd SHA512 96aa9c8bb58c95a41f562d3f0e1cf6e9c0c4158486bca24dfe2293fc86c7c6b74e3e6a84ed755d965b692b1f06d98cdc8ed69080775f8acd9186ac3ae6401570
diff --git a/dev-python/isort/isort-5.10.0.ebuild b/dev-python/isort/isort-5.10.0.ebuild
index 445a25f24725..945227e23fa7 100644
--- a/dev-python/isort/isort-5.10.0.ebuild
+++ b/dev-python/isort/isort-5.10.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]"
diff --git a/dev-python/isort/isort-5.9.3.ebuild b/dev-python/isort/isort-5.9.3.ebuild
deleted file mode 100644
index 945227e23fa7..000000000000
--- a/dev-python/isort/isort-5.9.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="
-	https://github.com/PyCQA/isort/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/natsort[${PYTHON_USEDEP}]
-		dev-python/pylama[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unbundle toml
-	sed -i -e 's:from ._vendored ::' isort/settings.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Some tests run the "isort" command
-	distutils_install_for_testing
-	# Install necessary plugins
-	local p
-	for p in example*/; do
-		pushd "${p}" >/dev/null || die
-		distutils_install_for_testing
-		popd >/dev/null || die
-	done
-
-	local EPYTEST_IGNORE=(
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-	)
-	epytest tests/unit
-}
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 3f38982a0b59..214a032dd70c 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,2 +1 @@
-DIST jaraco.text-3.5.1.tar.gz 11579 BLAKE2B 22753a39b839b575796952e12adf69a10a876d45240c5461f72afddb14d58bbc8396565fb094b3c314ab6d9fbadd7008a7dd66e788f54f17189a48c54b980f1a SHA512 468a2338b82c4352dba0ab40fb774329f115010fdf3633adb860297dffc64c54fb006f85e4d89580923c1e9136168bcf9fd689e33eebee32cd70382bb402debf
 DIST jaraco.text-3.6.0.tar.gz 11575 BLAKE2B 631eb6aa72e9dae7e2baaa896634658525cefa9033b5d8347ab4f2b6f654afb60770ffed0c9397d4ee3d16f81002ba89d383dc6b8899134c2e932cc814aa291a SHA512 74e6f199372b62ee767fd5f5829ab636d6d87c38998d93cb4ed7dddbe53db27e5c3caf45f36f7b5690b3c12367df0c93702fac59ee99ffcb03f53e70b8b18f96
diff --git a/dev-python/jaraco-text/jaraco-text-3.5.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.5.1.ebuild
deleted file mode 100644
index d5faf5d18cd6..000000000000
--- a/dev-python/jaraco-text/jaraco-text-3.5.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Text utilities used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.text"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-text/jaraco-text-3.6.0-r1.ebuild b/dev-python/jaraco-text/jaraco-text-3.6.0-r1.ebuild
index 72d7a8fba9d7..d13de71030de 100644
--- a/dev-python/jaraco-text/jaraco-text-3.6.0-r1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.6.0-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 2d9ab06e1016..9913b49f2ecf 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,2 +1 @@
-DIST jsonpointer-2.1.tar.gz 8190 BLAKE2B 5b9d0b0a27c6e2d133de67cf0ff9442e639a06011005f94cb425568fd3e5678b4832e9467720261fb85669e8b83eac73b1cfa8058adbd78d46339cdf8359561c SHA512 4eed8c7fa908ce3ca79884e98b1b0e818d24515f6b7b2067daa49ab6dbd989be4bc43f387e980773c9fc17bca89d2039750cb0df76675259050e3f48c16da3b6
 DIST jsonpointer-2.2.tar.gz 8292 BLAKE2B 837c6c8a87e0d19cbeed07769afb29fa56ddfb629f05d0f2de94f4e94af916358f71892e085c7c18b9c711ac8e604a0ff7d1fa7dfbf52836edb1a600e5ed390b SHA512 ce680e3915ea9db915095c4106e58acf7cc2148bdc67944e03e225a33b882964ed0c154fdbe8415f787c5aa5bfa007b9e1fd2a31689dcadc88b1560931ca6a6d
diff --git a/dev-python/jsonpointer/jsonpointer-2.1.ebuild b/dev-python/jsonpointer/jsonpointer-2.1.ebuild
deleted file mode 100644
index 8fc28b43ceaf..000000000000
--- a/dev-python/jsonpointer/jsonpointer-2.1.ebuild
+++ /dev/null
@@ -1,19 +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="Identify specific nodes in a JSON document (according to draft 08)"
-HOMEPAGE="https://github.com/stefankoegl/python-json-pointer https://pypi.org/project/jsonpointer/"
-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"
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpointer/jsonpointer-2.2.ebuild b/dev-python/jsonpointer/jsonpointer-2.2.ebuild
index 5175826f9298..fd29770543a7 100644
--- a/dev-python/jsonpointer/jsonpointer-2.2.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.2.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/k5test/k5test-0.10.1.ebuild b/dev-python/k5test/k5test-0.10.1.ebuild
index 18c378cb325e..1ce932053aa3 100644
--- a/dev-python/k5test/k5test-0.10.1.ebuild
+++ b/dev-python/k5test/k5test-0.10.1.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
diff --git a/dev-python/krb5/krb5-0.2.0.ebuild b/dev-python/krb5/krb5-0.2.0.ebuild
index 52ae46a20a82..646740ceb004 100644
--- a/dev-python/krb5/krb5-0.2.0.ebuild
+++ b/dev-python/krb5/krb5-0.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
 
 RDEPEND="
 	virtual/krb5
diff --git a/dev-python/lxml/lxml-4.6.4.ebuild b/dev-python/lxml/lxml-4.6.4.ebuild
index 112c1490d439..749028a99647 100644
--- a/dev-python/lxml/lxml-4.6.4.ebuild
+++ b/dev-python/lxml/lxml-4.6.4.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 2f850bc855bf..99f4ddf78673 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,4 +1,5 @@
 DIST Nuitka-0.6.17.6.tar.gz 3148827 BLAKE2B 4c898cac6ae5934e45ecfd37222670d7665ad9f512ae4e7f4e94eb25d19cd434448dbdf188b74398c49eea3b26a393f4fabfddb879be4d2bd795fc1ae6a8538d SHA512 1e370b083861cc9953ab9b72c98dc81f9d6bbf97196abc69d8229ed2a87f2151101b825c8d34d3656cf3b1cc0cdcbbc5a4aa97fc1c32ce605b0535cbf2d3142f
 DIST Nuitka-0.6.17.7.tar.gz 3150990 BLAKE2B 130c98e0499380591f3d3a4d6acabd396749624eca7a0ddcaa997e27ce0ae05d22230edb4fc7284b89dd3bfad1ac16092b7db5ae7c7b7e7c7a41c1f5a16ea8f3 SHA512 08f99cafbdedaca2df2967f452038a69827f291ab825c31231b434e80f56da0698b458f129c2639d2820257c7dc86e306b507742d4d695002d5a64ab8747cb3e
 DIST Nuitka-0.6.18.1.tar.gz 3688411 BLAKE2B 4ddc98cfb34ff825c628200a72c8cb671a1053c7085a542bf49c96617155c69424b1de924cf6fb7fdaf5a5a52049781f687c1cda909fe4309410296e79f34435 SHA512 3638e6c8dd25a19f69eec3bafed22d758a1ec6c15d0491f91d9c6e5570014b87f6efd6d8944a3e85ade314f49128af8cee15b745e26660cfc466fc22bba3e717
+DIST Nuitka-0.6.18.2.tar.gz 3690219 BLAKE2B 416e23500ce7739858e6393eef9783a385229509666c8fd814ce9b4110e77d69d2e7167e89d7db262ee98f60b48f43a07ffec76185154dbc50460623ac84e125 SHA512 7fa6cf48843d45b1d7a1cad11934b5cca2288939e07c12e6916b9c4a37e65d785599ada9e0001faa4117c50e4161fb54253fda27f186f5a660f59810b7254658
 DIST Nuitka-0.6.18.tar.gz 3687825 BLAKE2B f2c5655c610083065cc205c0a92ff9c57edfc87a479592f435c3dd194e2d6d71ff0ee9866bc97f222b3936190a4420e7d69cf9413b5b2a5e9439448dda82004f SHA512 df4c81d890ce9c5dc24e648f65137d4bb91dcb92917859976a3400ace6c297f985cee4932b50cb3c2aedb2eaa806be7529a98a75a32fe3f59ec718ed3281003b
diff --git a/dev-python/nuitka/nuitka-0.6.18.2.ebuild b/dev-python/nuitka/nuitka-0.6.18.2.ebuild
new file mode 100644
index 000000000000..e7fb8e91318b
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.18.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index d8769b3c13f9..f1b95cd583db 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,3 +1,2 @@
-DIST pbr-5.6.0.tar.gz 125220 BLAKE2B fc26737857195b0dbe16ecbcbc6e389b53a61105b3bc66e714bb4fcb4907e4329ee7c76b5748fa7d892bf231522e6ff9d414328ae0d97e6262b608c44c737764 SHA512 1dca9020a84e3b9be71fa07e2feb37bbdb2bb69d0b4f69fdcee0fc3c7fe4d84ac2e2079d6bd7560192833f069ca6f5dc27d03a3ef87c168eed18eee8579647fc
 DIST pbr-5.7.0.tar.gz 126776 BLAKE2B ff41c0b3d2354dff065bda4dc9278e42d06accc9fab96bdd734cb462682caf240d1e5d3a6e6c1f52c2986f92d4a1b11b74f5d563a9e8bd5e75aaafe7c3b30108 SHA512 076e6f918db46df74688e749242331161b858def6135d4c9695c24cdfe7db3185169787a6d5555a40a9d0e87ea54000be6419701f162283047bee41f36811535
 DIST pbr-5.8.0.tar.gz 127170 BLAKE2B 7fbd166f01617617c0dff568d1bb88a4be03d62f4f0c3ca1a7d16a7cefb20dcc924ffbb8df0d2d34516cfe3b60b8e380a0eb4a1071220bb4ab695d3d7c88d824 SHA512 61a8eb63bb76ce8515c4203d60df7c973e02ea61b603d155b611724efb2b15c42416bf8a0285451d3378056d390bbf63d991cec32cc4114ae5cc30ebae0a5a69
diff --git a/dev-python/pbr/pbr-5.6.0.ebuild b/dev-python/pbr/pbr-5.6.0.ebuild
deleted file mode 100644
index 98745f03e1e1..000000000000
--- a/dev-python/pbr/pbr-5.6.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack/pbr/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-# stestr is run as external tool
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}]
-			dev-vcs/git
-		' 'python*')
-	)"
-
-distutils_enable_tests unittest
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# TODO: investigate
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-i pbr/tests/test_core.py || die
-	# broken on pypy3
-	# https://bugs.launchpad.net/pbr/+bug/1881479
-	sed -e 's:test_generates_c_extensions:_&:' \
-		-i pbr/tests/test_packaging.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} != python* ]]; then
-		einfo "Testing on ${EPYTHON} is not supported at the moment"
-		return
-	fi
-
-	distutils_install_for_testing
-	eunittest -b
-}
diff --git a/dev-python/pbr/pbr-5.7.0.ebuild b/dev-python/pbr/pbr-5.7.0.ebuild
index 6527b8b283a4..30cd5f7ba964 100644
--- a/dev-python/pbr/pbr-5.7.0.ebuild
+++ b/dev-python/pbr/pbr-5.7.0.ebuild
@@ -13,7 +13,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-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 
 # git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
 # docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
diff --git a/dev-python/prettytable/prettytable-2.4.0-r1.ebuild b/dev-python/prettytable/prettytable-2.4.0-r1.ebuild
index f6421aee6c3e..6ee3983bae51 100644
--- a/dev-python/prettytable/prettytable-2.4.0-r1.ebuild
+++ b/dev-python/prettytable/prettytable-2.4.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~riscv sparc ~x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index e3a9ea117537..9966acf9bb81 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,2 +1,3 @@
 DIST prompt_toolkit-3.0.22.tar.gz 3041540 BLAKE2B 30afe5e4d4267d6264bfe7fbc179d311d13490971dd461ad6a4461640611fa1f7d55f2ed0b3c3ba534e3b52f9456ca69d2f6f14baba511aa7806866cf40edc57 SHA512 859f5df00792fa9332c9dc6a7b12e01048aa6b2cd88c35fe5e3521defee69ef9122e4f7f415711538b22171e2519ce846062270f319f12ac4390406036d715fb
 DIST prompt_toolkit-3.0.23.tar.gz 3041820 BLAKE2B 99835732024771caf5feef478d904547b8e305e521be87898d861902445ee27ded67962b9ec9905dbfc6bcbaeb8da8d71b52ab1b901cf3758e2c1af1c6f61103 SHA512 9b57f50c7e42bc99697b2b10ce30eb50289eafd71ecc79d64d0afc6a1565dc08d33f7e4ab06903f94dcb1808efa74535dac64426b5816e1f4f034007583d04ba
+DIST prompt_toolkit-3.0.24.tar.gz 3042044 BLAKE2B e9b4186a38756cf6c0d92575e42dfe4507e63f721038374252e7a7d5af76f7df04dc01251079d99a74167aef7e394b50c43b5190df8b9cd68cf74eae31dfbe51 SHA512 e423735441407ffe51d46225efa4b747899d47fa5d5a2163e5c0c906d2f1937e80a67bcd06ff6aa97d8a336e507fd0322957e79b9382d1a678994060fcccfb84
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.24.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.24.ebuild
new file mode 100644
index 000000000000..67dd69a7e158
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.24.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index ea8a467da26a..a74416a89b90 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -1,2 +1 @@
-DIST py-1.10.0.tar.gz 206984 BLAKE2B 94abc8f348a0ae1b64a1417fbb5ea1e29929a0a98130a968ed80d92824c242a9614493c8c7f87c3db8294d2baf3bdb35ce0254fe2aac0fb6af2c151b682c5d33 SHA512 7a0eb964067bc01fa4f8ffe70b043abfd4619134fbee2935713e28382085d0b8972c319ed665a643b879b18ce662db8a9bd722937af7cf36c233214eea211dd1
 DIST py-1.11.0.tar.gz 207796 BLAKE2B becaafa6b9094790693bb99079a59c5a206d05dd42db1bbd75d1f9527a7a089ef3098a8b16da2c8f7aac6b682cd0687ddd454dc50930f13a860c118e9306cc94 SHA512 ce8dd791f9f6dd7e60a6caad32ff5cb816389a0840436efdedf4e0d4b0bfa09f7aea9e7c31d89903c72fe6ef17170a85af480525ba92c458ed73501a0420f2c4
diff --git a/dev-python/py/py-1.10.0.ebuild b/dev-python/py/py-1.10.0.ebuild
deleted file mode 100644
index d9fa6909e2c3..000000000000
--- a/dev-python/py/py-1.10.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://py.readthedocs.io/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# This package is unmaintained and keeps being broken periodically.
-RESTRICT=test
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
diff --git a/dev-python/py/py-1.11.0.ebuild b/dev-python/py/py-1.11.0.ebuild
index 0ccb4c5ae4c4..38265f94328f 100644
--- a/dev-python/py/py-1.11.0.ebuild
+++ b/dev-python/py/py-1.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # This package is unmaintained and keeps being broken periodically.
 RESTRICT=test
 
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 40c6e41dfa2c..d3464cfda22c 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,2 +1 @@
-DIST pyfakefs-4.5.1.tar.gz 203478 BLAKE2B 4f7fdd9a9ee80dc814b854b1e1ab6fca49c398733ea3c61369ed1f88c9e66c3f007e5270f9ea276c9eca4c268036a6cd2f2d05832bea94a0de0d947b5cab63f7 SHA512 2c4b0f4b9cef9866f12bf5d35462ab565f82a7cfb986e78eae07b8e77be67fd523b093ce4f88b34d817f36d04891f128af723be880c8072f6b593ceb31d65367
 DIST pyfakefs-4.5.3.tar.gz 204661 BLAKE2B 87340d98850cad83b5288d310a5e5d9774247bb71ce7fa314243e38ec3d8e0d42f50f73da2e8c732694c35359e36286c896cb7b2703aa91443d22df95aebbe6b SHA512 0fa42a81acb565292d8a9fde220f033100a4fc07eb8d095e79ed98af415fc285d4db46dd9b891e595f599a9ab48323ff7aad4928b47a6df0d5bbf94c975f605c
diff --git a/dev-python/pyfakefs/pyfakefs-4.5.1.ebuild b/dev-python/pyfakefs/pyfakefs-4.5.1.ebuild
deleted file mode 100644
index 7cf4993eac71..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.5.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${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"
-
-distutils_enable_tests pytest
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.5.3.ebuild b/dev-python/pyfakefs/pyfakefs-4.5.3.ebuild
index 735c6b0f7f35..7cf4993eac71 100644
--- a/dev-python/pyfakefs/pyfakefs-4.5.3.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 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"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index df9cdfec11da..ec7950c90739 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,3 +1,2 @@
-DIST pylast-4.2.1.tar.gz 39787 BLAKE2B 1f2f06671ce38bd42f7297279a58f674c3af8f66de4fe804d90e3fc178c73f09a24f65bbc4fd534da0c04f593dc5eb31f03da38a4ca969ea31a04978a603b7b4 SHA512 c1418ff1e6b6ab905d790cc83eb1a4b3172c0c28d523c2bbd641523a2e2601a84aff126dafd047f0fb9b82744bca883648e197b273026611f47671d39afd4fc6
 DIST pylast-4.3.0.tar.gz 39875 BLAKE2B 9b51c44295babc54207593e43d70ec121ddc4c4e5bea8a0936691d02c2cf996869cc3995f5b069bfe3a9208754705a716716cb6bb8aefef142723687dc07a16a SHA512 2880e142da2841775f2c48f2d5ad0adc39e6b65073a76dd6af24c65f420948755b25f7a630b95315ffbdd1f7536d9ac4570b3df01d6837f77faccf89aaf41f33
 DIST pylast-4.4.0.tar.gz 39793 BLAKE2B 13a2bd4652b0dee142442f8bc6bf922f544b093be207efe8661f5355e37ff59a5c0d9c844193d2d3e4f22ccafc10993b8cced6872d4f0fece42c37524bee8beb SHA512 341b3f8a6691699b9581769d1f06908df8ec694a22d8918e4ed37af1f47287577c5fc156f3807c744aa9774d69e23570036f06a8e9921f3c7c7d21b53b8eb041
diff --git a/dev-python/pylast/pylast-4.2.1.ebuild b/dev-python/pylast/pylast-4.2.1.ebuild
deleted file mode 100644
index ba5710f0ee07..000000000000
--- a/dev-python/pylast/pylast-4.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 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 ~riscv 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
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pylast/pylast-4.3.0.ebuild b/dev-python/pylast/pylast-4.3.0.ebuild
index 7df982368ca4..60d5f24a4139 100644
--- a/dev-python/pylast/pylast-4.3.0.ebuild
+++ b/dev-python/pylast/pylast-4.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pyspnego/pyspnego-0.3.1.ebuild b/dev-python/pyspnego/pyspnego-0.3.1.ebuild
index 80fb8746c0b4..e7949177640d 100644
--- a/dev-python/pyspnego/pyspnego-0.3.1.ebuild
+++ b/dev-python/pyspnego/pyspnego-0.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
index 56b0ca5a7c43..44adf782813b 100644
--- a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
+++ b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~riscv sparc x86"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.13.0.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.13.0.ebuild
index 4d9d534bb123..2354b19c2f78 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.13.0.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/s3transfer/s3transfer-0.5.0-r1.ebuild b/dev-python/s3transfer/s3transfer-0.5.0-r1.ebuild
deleted file mode 100644
index 12db64d450ed..000000000000
--- a/dev-python/s3transfer/s3transfer-0.5.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=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/botocore-1.23[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest tests/{unit,functional}
-}
diff --git a/dev-python/s3transfer/s3transfer-0.5.0-r2.ebuild b/dev-python/s3transfer/s3transfer-0.5.0-r2.ebuild
index 1d204477b2d3..515b921ece9a 100644
--- a/dev-python/s3transfer/s3transfer-0.5.0-r2.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.5.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/botocore[${PYTHON_USEDEP}]
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 1d953a1c298b..1954f59e712d 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,3 +1,2 @@
-DIST soupsieve-2.2.1.tar.gz 99298 BLAKE2B 94532421f3b8e49d6ab75a54a60ac861a78eee9f6792ded096e39a8a43d46d195cff9b7d8feab918b0f2debc8a6dd35226ab714384fa7f4d795176e269b6c4cb SHA512 c1339cfca237af7f8915b6d644b8271f769f9a37aa68f8acf536236551baaf9bb44a2f2a736f9168a7649cde14d37b8c24614c9491acbf81e3f4fdaea96b4928
 DIST soupsieve-2.3.1.tar.gz 104251 BLAKE2B c395b8dc0944457d6c5f217a03c6fc5f3895868a629eb72d86733fb0d9c6b1d1c41a2e035d5118c9c6fcc6a22e9ff79b9de8417131d30bbc6e1ba02c813ced56 SHA512 3f1245b27d67e8b37bce4cb0b21b2b3f4d6b7ae112cc66672e5406c0701b28e605ed12db1e111bfeccea15625b17042e398b075b7f026d3f3e15069f0cafccac
 DIST soupsieve-2.3.tar.gz 104025 BLAKE2B 37c1cbbb345a24e843a7b1acef5967b914cd93d4fcbe590e9453f9b0b84975e2fbdc601c45e720483370343f40aa643146cab9a53c17be29c6fa76ce026eca78 SHA512 c5d46703aba737c6eea7cc482311fd75dbaaa4929ebf3ed45b580d7e89d1d0be806608adbab974803acd8df5d74435efe1e149bce5cdbd74f77c90bba960859a
diff --git a/dev-python/soupsieve/soupsieve-2.2.1-r1.ebuild b/dev-python/soupsieve/soupsieve-2.2.1-r1.ebuild
deleted file mode 100644
index 7ac2c065a7cb..000000000000
--- a/dev-python/soupsieve/soupsieve-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,34 +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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# Needed for now until something is figured out either at lxml
-	# upstream or libxml2?
-	# See https://github.com/facelessuser/soupsieve/issues/220
-	"${FILESDIR}"/${PN}-2.2.1-lxml-libxml2-tests.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/soupsieve/soupsieve-2.3.ebuild b/dev-python/soupsieve/soupsieve-2.3.ebuild
index 0954c102997e..ee3c4ef9f148 100644
--- a/dev-python/soupsieve/soupsieve-2.3.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.3.ebuild
@@ -13,7 +13,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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild
index 84adeda539c3..d5b3a77650d4 100644
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/watchdog/watchdog-2.1.6.ebuild b/dev-python/watchdog/watchdog-2.1.6.ebuild
index e90326a68215..f0dfc263da58 100644
--- a/dev-python/watchdog/watchdog-2.1.6.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.6.ebuild
@@ -12,7 +12,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 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/yarl/yarl-1.7.2-r1.ebuild b/dev-python/yarl/yarl-1.7.2-r1.ebuild
index f1af231199b9..efb086aacd9b 100644
--- a/dev-python/yarl/yarl-1.7.2-r1.ebuild
+++ b/dev-python/yarl/yarl-1.7.2-r1.ebuild
@@ -12,7 +12,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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]