Adding metadata

60 files changed, 496 insertions, 199 deletions

diff --git a/dev-python/aioredis/aioredis-2.0.0.ebuild b/dev-python/aioredis/aioredis-2.0.0.ebuild
index f3e8e228f811..c067271a686d 100644
--- a/dev-python/aioredis/aioredis-2.0.0.ebuild
+++ b/dev-python/aioredis/aioredis-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/async_timeout[${PYTHON_USEDEP}]
diff --git a/dev-python/argparse-manpage/argparse-manpage-1.5.ebuild b/dev-python/argparse-manpage/argparse-manpage-1.5-r1.ebuild
index da642a4de423..80e2ab7e02e8 100644
--- a/dev-python/argparse-manpage/argparse-manpage-1.5.ebuild
+++ b/dev-python/argparse-manpage/argparse-manpage-1.5-r1.ebuild
@@ -14,4 +14,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+PATCHES=(
+	"${FILESDIR}/${P}-remove-six-dep.patch"
+)
+
 distutils_enable_tests pytest
diff --git a/dev-python/argparse-manpage/files/argparse-manpage-1.5-remove-six-dep.patch b/dev-python/argparse-manpage/files/argparse-manpage-1.5-remove-six-dep.patch
new file mode 100644
index 000000000000..7a5aa777739a
--- /dev/null
+++ b/dev-python/argparse-manpage/files/argparse-manpage-1.5-remove-six-dep.patch
@@ -0,0 +1,19 @@
+--- a/examples/copr/copr_cli/main.py
++++ b/examples/copr/copr_cli/main.py
+@@ -8,15 +8,11 @@ import argparse
+ import sys
+ import datetime
+ import time
+-import six
+ import simplejson
+ from collections import defaultdict
+ 
+ import logging
+-if six.PY2:
+-    from urlparse import urlparse
+-else:
+-    from urllib.parse import urlparse
++from urllib.parse import urlparse
+ 
+ if sys.version_info < (2, 7):
+     class NullHandler(logging.Handler):
diff --git a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
index 1aaeb29d930f..48fbe340f3ec 100644
--- a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
+++ b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index c4c9cb9644f8..111fcee34bc9 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,4 +1,3 @@
 DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330cc1197900a9d21b071d0d99ddd32e09786becfc577407ab402f6da3d8683a59a9deaea1f6b4f07b9e1e4ecbed SHA512 53d6f6a6f47027e5bdfd3909471c993480034c8aa8ae395792565b8d79fb4e3a44299ea529652c0ccabf4309d645db9179bf54efc06fee20517f479e91cec838
-DIST black-21.6b0.tar.gz 1149421 BLAKE2B a9935d9ef3c9530d127cc2d06e2d64b48e6f2a5488ed4851b5afa3bf3166df9723c3815220b68eb5a069c167393f501063321addde19149ad4ef85d59938eac7 SHA512 0f676f6bcd8bcbbdc615a2086631b3cebf9b9612fabc62de78215a7319cabd4e200333340471dd26a6a80cb920f04bcfde5a8dd42d069c19dba471ade30487ac
 DIST black-21.7b0.tar.gz 1148431 BLAKE2B 34dcd2fd45b914433d6290c10bb07b44277cb490ef884c44ec00cb5495fadd2e649099dd356c4063d0fff5a6477609b11db73e1dc94d88106c56a3ca9b087c90 SHA512 7e6ee4e185080802c9dfc6eeb73b52b2489283c4bcbc086366f50ffb8ea3e0f4bdfedac9a5906be6ec119e65050741c71591c394f0c361a1d75b3ff4061945c1
 DIST black-21.8b0.tar.gz 1167978 BLAKE2B e7df398d09b71389069991bf0872a97d8a8c0b13ddeec12ee8f08ae9d9716a3d47447727d2759d475f10d323df151b8bb2353f3fd60c99eccb1e912554ebbe7b SHA512 ed38dbf0c881fee7da74f0d6bfe4ea0f85b5bed30d37abde2fd728e33f94ceaaa27b7107cfe763c19bdaea57fcbf54bcae82ce8bdcabc29035cdc85a8e10ab00
diff --git a/dev-python/black/black-21.6_beta0.ebuild b/dev-python/black/black-21.6_beta0.ebuild
deleted file mode 100644
index 4e96a7883454..000000000000
--- a/dev-python/black/black-21.6_beta0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1 optfeature
-
-MY_PV="${PV//_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
-SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	<dev-python/pathspec-1[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typed-ast[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	' python3_7)
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
-
-python_test() {
-	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
-	distutils_install_for_testing
-	epytest -m "not python2"
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
-}
diff --git a/dev-python/black/black-21.7_beta0.ebuild b/dev-python/black/black-21.7_beta0.ebuild
index 7a4e5218f22f..327aad9adda0 100644
--- a/dev-python/black/black-21.7_beta0.ebuild
+++ b/dev-python/black/black-21.7_beta0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 20884777f2b9..4fb539b48ecb 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1 +1,2 @@
 DIST bleach-4.0.0.tar.gz 183459 BLAKE2B 380e94163b353e9436748fc6c1f368fb4d261087c2d6bc6fab1262295d597dbe81a67c34b889a29fd6a5180b8b522b517dc234e78b26556a16845f26f83151c8 SHA512 21f2a2dc5fa5e09cc2e38325191d7dc0bff2606cbe68ade54d866e326e712cb00a80b3a7a44f844ad4967ee6fdf453cca07d02c337bf147e4a12237231bcd99f
+DIST bleach-4.1.0.tar.gz 195798 BLAKE2B 68afd58aa099acb5c21f1ff76301c46834f326ea2aa4fe7a6f820c2cf31913e81dc72deecab4272b2a7ceab1ae01bec028a5cf5e6214cddef4cdec5ec05ea4c6 SHA512 34c522dde5126995789e23fd28f7938d025f56e97e30814dc326d33a772d40fc2ad2f25aed0b367fd4352b1e1e8f54b80282b931819203bf60448ffe2f120622
diff --git a/dev-python/bleach/bleach-4.1.0.ebuild b/dev-python/bleach/bleach-4.1.0.ebuild
new file mode 100644
index 000000000000..98765b5278d3
--- /dev/null
+++ b/dev-python/bleach/bleach-4.1.0.ebuild
@@ -0,0 +1,43 @@
+# 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="An easy whitelist-based HTML-sanitizing tool"
+HOMEPAGE="
+	https://github.com/mozilla/bleach/
+	https://pypi.org/project/bleach/"
+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/packaging[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.0-py39.patch
+)
+
+src_prepare() {
+	# unbundle unpatched broken html5lib
+	rm -r bleach/_vendor || die
+	sed -i -e 's:bleach\._vendor\.::' \
+		bleach/html5lib_shim.py \
+		bleach/sanitizer.py \
+		tests/test_clean.py || die
+	# indirect html5lib deps
+	sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
+
+	sed -i -e '/import/s/parse/urllib.&/' bleach/sanitizer.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/bleach/files/bleach-4.1.0-py39.patch b/dev-python/bleach/files/bleach-4.1.0-py39.patch
new file mode 100644
index 000000000000..8460be601a23
--- /dev/null
+++ b/dev-python/bleach/files/bleach-4.1.0-py39.patch
@@ -0,0 +1,36 @@
+diff --git a/tests/test_clean.py b/tests/test_clean.py
+index 8f816f9..2be6f7b 100644
+--- a/tests/test_clean.py
++++ b/tests/test_clean.py
+@@ -525,31 +525,16 @@ def test_attributes_list():
+             {"protocols": ["http"]},
+             '<a href="example.com">valid</a>',
+         ),
+-        (
+-            '<a href="example.com:8000">valid</a>',
+-            {"protocols": ["http"]},
+-            '<a href="example.com:8000">valid</a>',
+-        ),
+         (
+             '<a href="localhost">valid</a>',
+             {"protocols": ["http"]},
+             '<a href="localhost">valid</a>',
+         ),
+-        (
+-            '<a href="localhost:8000">valid</a>',
+-            {"protocols": ["http"]},
+-            '<a href="localhost:8000">valid</a>',
+-        ),
+         (
+             '<a href="192.168.100.100">valid</a>',
+             {"protocols": ["http"]},
+             '<a href="192.168.100.100">valid</a>',
+         ),
+-        (
+-            '<a href="192.168.100.100:8000">valid</a>',
+-            {"protocols": ["http"]},
+-            '<a href="192.168.100.100:8000">valid</a>',
+-        ),
+         pytest.param(
+             *(
+                 '<a href="192.168.100.100:8000/foo#bar">valid</a>',
diff --git a/dev-python/cairocffi/cairocffi-1.2.0.ebuild b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
index 6ce662bf5465..c0288a3a43ee 100644
--- a/dev-python/cairocffi/cairocffi-1.2.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 3c6b44c06d87..3764190604d2 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -3,3 +3,4 @@ DIST cfn-lint-0.51.0.tar.gz 7125333 BLAKE2B 5f18c03cba52e8f38eb4998ce3640564b634
 DIST cfn-lint-0.52.0.tar.gz 7221391 BLAKE2B 20422bb191e9537ba6950db8c40894ab07655389a0a81eff3489f5bcd626bd81c6f9749f885b8be4f4939f16abe62fbbde7c741e770e6265c28bd59740144558 SHA512 81274b973ede2e60ef113d5ec4e2052dc11ed0a85b79079dd1b40e8afae3738cbd963b2e703f5016e216b2844df8711a34ff024e5dc4b1b12e774176bbe88489
 DIST cfn-lint-0.53.0.tar.gz 7501025 BLAKE2B 0f979ff74e020aa192c040bcc633df8133ed77559afd2fa637af0b02f190f516dc7b3bd2154b9e5ecf3e2edcbf624879727ccbcaab81493f450305e6e1790002 SHA512 58d63e1b9ee7cd64ff30e938d98992dca6214945464c27d61b6d6c7e0daab27daa1feb7f2631de172e9cbf1b22699894b7fb7becd7a292b5efeeedd402db3374
 DIST cfn-lint-0.53.1.tar.gz 7561747 BLAKE2B 2561a04344c567cf9e1e62cdd65e6de0bf8efd17072b5562021055e65c140d8453062fb0019f56f1a8c520043e1215e7c5db894af53801dff26a6e2422688d4f SHA512 3832e6aac7b9a3e638dcf46103a83882fa0bd3778d95aa5837fb7bfe2c9dd10c13ac4434e371396e2f65fe39a36b3f7fb8c7cce52b628fe7dd3fc17ed313f8b6
+DIST cfn-lint-0.54.0.tar.gz 7597662 BLAKE2B 868ed762f807adeddf53624bfbfdcd4a61efff2daf3f745123899f5f397c2b4aa489e2637551707a9eb04272140bc94971b831c5bb0367d3bcf303ba22de7e8d SHA512 34c1b70d5a65b674dd259cf239eb243a4602a337fc1c83ccc9108c86a027bfcb682d09587598d3232f84a0e74716f5df260bbf15750fe1cda1a362f0a4faba43
diff --git a/dev-python/cfn-lint/cfn-lint-0.54.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.54.0.ebuild
new file mode 100644
index 000000000000..e11ded664f96
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.54.0.ebuild
@@ -0,0 +1,51 @@
+# 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="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.38.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+	"${FILESDIR}/cfn-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	# requires Internet
+	sed -e 's:test_update_resource_specs_python:_&:' \
+		-i test/unit/module/maintenance/test_update_resource_specs.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.4.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.4.ebuild
index c7cf40759fee..6421d85fd7a3 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.4.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/cppy/cppy-1.1.0.ebuild b/dev-python/cppy/cppy-1.1.0.ebuild
index b35c1a6e051b..aa676eb28563 100644
--- a/dev-python/cppy/cppy-1.1.0.ebuild
+++ b/dev-python/cppy/cppy-1.1.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cycler/cycler-0.10.0-r1.ebuild b/dev-python/cycler/cycler-0.10.0-r1.ebuild
index b91e3e389f93..6d3f7714d4e3 100644
--- a/dev-python/cycler/cycler-0.10.0-r1.ebuild
+++ b/dev-python/cycler/cycler-0.10.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index 40ba4cdce245..200202a96a52 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1 +1,2 @@
 DIST dbus-python-1.2.16.tar.gz 576701 BLAKE2B 58d9f9ea092cd3a6b872c084a6159baf03f1aab615282e161a0e3da1d01ff5f4940862e693d21907b0c146d285b9067386759a1306ae2e6907f5e2ff4ef9944d SHA512 e76c00c5fd3fe6884e4c24f258987fd3b80d21bd4e0f96aa8fda152078a860b62321324f6efcbfe7226d5ab2521a14b5bda7cf2468d2cae5f376c124a71aa05c
+DIST dbus-python-1.2.18.tar.gz 578204 BLAKE2B 932a06f4b0145f7a47cf1ab6ea33c14eb4e36570ef548e7557d4aa5b780e49f2d284cdb51f0ec2d8a1cb286097fb9eabb2193d7cbeb387eaf43cbe209b7f11fa SHA512 72f422c59637392bd78b741b66dff2afadcc706452c3e82fdc14b1dc052a0c5cb8a85e2758d18c5cbdc08004419a0b3c16b67b99688d96307084403e72585900
diff --git a/dev-python/dbus-python/dbus-python-1.2.18.ebuild b/dev-python/dbus-python/dbus-python-1.2.18.ebuild
new file mode 100644
index 000000000000..31de4d2997ee
--- /dev/null
+++ b/dev-python/dbus-python/dbus-python-1.2.18.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit autotools python-r1
+
+DESCRIPTION="Python bindings for the D-Bus messagebus"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings/ https://dbus.freedesktop.org/doc/dbus-python/"
+SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+IUSE="doc examples test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=sys-apps/dbus-1.8:=
+	>=dev-libs/glib-2.40
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( $(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		') )
+	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/tappy[${PYTHON_USEDEP}] )
+"
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+	has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	# Update py-compile, bug 529502.
+	eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	use doc && python_setup
+	local SPHINX_IMPL=${EPYTHON}
+
+	configuring() {
+		local myconf=(
+			--disable-documentation
+		)
+		[[ ${EPYTHON} == ${SPHINX_IMPL} ]] &&
+			myconf+=( --enable-documentation )
+
+		econf "${myconf[@]}"
+	}
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	find "${D}" -name '*.la' -type f -delete || die
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/ddt/ddt-1.4.2.ebuild b/dev-python/ddt/ddt-1.4.2.ebuild
index c01e697eff15..fb70fbed9a16 100644
--- a/dev-python/ddt/ddt-1.4.2.ebuild
+++ b/dev-python/ddt/ddt-1.4.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/debugpy/debugpy-1.4.1.ebuild b/dev-python/debugpy/debugpy-1.4.1.ebuild
index 41481e44c060..d7c900f9b0e0 100644
--- a/dev-python/debugpy/debugpy-1.4.1.ebuild
+++ b/dev-python/debugpy/debugpy-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/microsoft/${PN}/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc"
 
 # There is not enough time in the universe for this test suite
 RESTRICT="test"
diff --git a/dev-python/diskcache/diskcache-5.2.1-r1.ebuild b/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
index ed33b9ba8454..0d6cb38ff6d7 100644
--- a/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
+++ b/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/python-diskcache-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index d3fdef07db9a..40bec04ef3ea 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,2 +1,3 @@
 DIST elementpath-2.2.3.gh.tar.gz 234094 BLAKE2B e3e56469250f3fd2135d9173d68cd93af2a6e03830859d03872967d72a6b7a39f4bb9288c341cc47c406ad55d764ad65a16169eb78598eeded48c424245064e8 SHA512 75178c12f42582a391aeb8198a45c732601251655e381cf8961dac2f6467217e5a18effcadcaa7e7206b18f358a70e1e4b170b9e02ba9b25108b1721da50ee4e
 DIST elementpath-2.3.0.gh.tar.gz 237865 BLAKE2B 969a98403ff87bc205cd73372414f81efa0612a3647625c32a2823ffd721c31c59cd6f931d547c18f4b3001417216c26f03ee769792543af9d4e15ae49538594 SHA512 636337f96bb5acbcae06fcde922cf2ca4cd788d5302c8bdf5fd403f7de9ae5569f78b57bcf57c60e941ce876f69894b4c2c9d1d11555825bf574230b086b3aa0
+DIST elementpath-2.3.1.gh.tar.gz 238431 BLAKE2B b4ddb651bd1d934d5830fa9f6a4166deed447c1d5ffb3bcbe00e01bde1b8dcc6d473b47139f8afb942abb24ff5a8b15e5fbf7e2fbc8cca132f248aea31bab4b2 SHA512 c62ff7a05815d2acb296785ac5733e2a24ebea6fe04053f7addeef0c84dd5c3bac8f03b5c0183f7ec9d6a394e94e6abe76d80ba5b5dc461cf8d3adeb27ddedc4
diff --git a/dev-python/elementpath/elementpath-2.3.1.ebuild b/dev-python/elementpath/elementpath-2.3.1.ebuild
new file mode 100644
index 000000000000..16bab1f28605
--- /dev/null
+++ b/dev-python/elementpath/elementpath-2.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-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="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+HOMEPAGE="https://github.com/sissaschool/elementpath/
+	https://pypi.org/project/elementpath/"
+SRC_URI="
+	https://github.com/sissaschool/elementpath/archive/v${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 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 67d2a481950f..f721ffa090cf 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1 +1,2 @@
 DIST eventlet-0.31.1.tar.gz 412021 BLAKE2B 6358dca8e0a766f0cc2cef37586a8d38f5d87f03d8389a7cc11b3d2d616669825df2a416ae980eed8a980f8e81ce8b2848225921bb4536f5537a7954ed75fb64 SHA512 c240a332aaf8eeb4af429d1b190ae198b4bcb92ae1bc38ade3f824634327872526267c6ff02f7196e3f9dfd17d639af500c28a3ed70a773b1b050d6d967a88a5
+DIST eventlet-0.32.0.tar.gz 412769 BLAKE2B c0b35e1ea0e3353f326f24787f253ef666c34de5a2880c0d78e9541738c47f72787e6ccb3fb861a9f651da7e501443d220809a09d31dbd6e6d75aee509258dc8 SHA512 6a8ca80ef7318114e13690f8d2cd640f1be3c716f01644a7a84cd983ab90ab00ec0962cfc7e85f071e73a6da139bbdf8ad3918f15097e94dfc97db7056d13a9d
diff --git a/dev-python/eventlet/eventlet-0.32.0.ebuild b/dev-python/eventlet/eventlet-0.32.0.ebuild
new file mode 100644
index 000000000000..518949150d7c
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.32.0.ebuild
@@ -0,0 +1,52 @@
+# 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="Highly concurrent networking library"
+HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+	<dev-python/dnspython-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/eventlet-0.25.1-tests.patch"
+	"${FILESDIR}/eventlet-0.30.0-tests-socket.patch"
+	"${FILESDIR}/eventlet-0.30.2-test-timeout.patch"
+)
+
+distutils_enable_tests nose
+
+python_test() {
+	unset PYTHONPATH
+	export TMPDIR="${T}"
+	nosetests -v -x || die
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/executing/executing-0.8.0.ebuild b/dev-python/executing/executing-0.8.0.ebuild
index 2b7071285535..bdd5ceae9885 100644
--- a/dev-python/executing/executing-0.8.0.ebuild
+++ b/dev-python/executing/executing-0.8.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 # asttokens is optional runtime dep
 BDEPEND="
diff --git a/dev-python/fakeredis/fakeredis-1.6.0.ebuild b/dev-python/fakeredis/fakeredis-1.6.0.ebuild
index 854234636fef..0484e5f7c25b 100644
--- a/dev-python/fakeredis/fakeredis-1.6.0.ebuild
+++ b/dev-python/fakeredis/fakeredis-1.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/redis-py[${PYTHON_USEDEP}]
diff --git a/dev-python/fasteners/fasteners-0.16.3.ebuild b/dev-python/fasteners/fasteners-0.16.3.ebuild
index 97b2693a07a4..b7ef2bccb45c 100644
--- a/dev-python/fasteners/fasteners-0.16.3.ebuild
+++ b/dev-python/fasteners/fasteners-0.16.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/hiredis/hiredis-2.0.0.ebuild b/dev-python/hiredis/hiredis-2.0.0.ebuild
index 1540e23f4b69..aec561d0ef16 100644
--- a/dev-python/hiredis/hiredis-2.0.0.ebuild
+++ b/dev-python/hiredis/hiredis-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="system-libs"
 
 DEPEND="system-libs? ( dev-libs/hiredis:0/1.0.0 )"
diff --git a/dev-python/ipykernel/ipykernel-6.2.0.ebuild b/dev-python/ipykernel/ipykernel-6.2.0.ebuild
index a307d3a56bdc..ae840a80b4db 100644
--- a/dev-python/ipykernel/ipykernel-6.2.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc"
 
 RDEPEND="
 	>=dev-python/debugpy-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/kiwisolver/kiwisolver-1.3.2.ebuild b/dev-python/kiwisolver/kiwisolver-1.3.2.ebuild
index 34b7305e570f..cb2989ea229b 100644
--- a/dev-python/kiwisolver/kiwisolver-1.3.2.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.3.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/kiwi-${MY_PV}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib-inline/Manifest b/dev-python/matplotlib-inline/Manifest
index af2220e19bde..22f0a9bf8048 100644
--- a/dev-python/matplotlib-inline/Manifest
+++ b/dev-python/matplotlib-inline/Manifest
@@ -1 +1,2 @@
 DIST matplotlib-inline-0.1.2.gh.tar.gz 7340 BLAKE2B 026c08d8a96d4402a1b70e50f1adce2b620c17b00d9e4dc365540c41b2d8f189a73cf6c65c8946ae45e7e5325321d28918692c2c6b5f81668fa56fedb40fd425 SHA512 e6ac7efe10979afb773b75c4d2ee321c52b1e9788a80703d063b0936b4989946aa35206ff7e8ad4ffaf6c1116d893de9516fc033f53685ad3a55d8f1a9a8fd48
+DIST matplotlib-inline-0.1.3.gh.tar.gz 7337 BLAKE2B 995b6e5ce9068760e701e3b429d2187bdc7e7c5b989d54a9fb1f8b5f385f91c6a3621a54d5a1e62c9000737f5f42d9ceae5be7f36b664b7e06ff9c712e6d76ac SHA512 684821204faa3cb35c46663b8c8cb8f0ba5d4f761d15bc708de69c98753685c89da1d330087bcfa970792de592188768dc068accc471d55360f551e44cf4a79a
diff --git a/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild b/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild
new file mode 100644
index 000000000000..71cb3d5b2d56
--- /dev/null
+++ b/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild
@@ -0,0 +1,21 @@
+# 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="Inline Matplotlib backend for Jupyter"
+HOMEPAGE="https://github.com/ipython/matplotlib-inline/"
+SRC_URI="
+	https://github.com/ipython/matplotlib-inline/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]"
diff --git a/dev-python/matplotlib/matplotlib-3.4.3.ebuild b/dev-python/matplotlib/matplotlib-3.4.3.ebuild
index 8456a93b13b7..200c8a1841d6 100644
--- a/dev-python/matplotlib/matplotlib-3.4.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.4.3.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.26.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.26.ebuild
index 9cd16f7c76a6..3f872fc2b7eb 100644
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.26.ebuild
+++ b/dev-python/mysql-connector-python/mysql-connector-python-8.0.26.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Python client library for MariaDB/MySQL"
 HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
 SRC_URI="https://github.com/mysql/mysql-connector-python/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="examples test"
diff --git a/dev-python/numpy/numpy-1.20.3-r1.ebuild b/dev-python/numpy/numpy-1.20.3-r1.ebuild
index 227a0eedc602..a3f37dd8ae66 100644
--- a/dev-python/numpy/numpy-1.20.3-r1.ebuild
+++ b/dev-python/numpy/numpy-1.20.3-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/numpy/numpy-1.21.1.ebuild b/dev-python/numpy/numpy-1.21.1.ebuild
index 5829603abc0d..fce45629c5f0 100644
--- a/dev-python/numpy/numpy-1.21.1.ebuild
+++ b/dev-python/numpy/numpy-1.21.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/platformdirs/platformdirs-2.0.2.ebuild b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
index 0b451877626e..9c5fe4c0358e 100644
--- a/dev-python/platformdirs/platformdirs-2.0.2.ebuild
+++ b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="
 	test? ( dev-python/appdirs[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pulsectl/Manifest b/dev-python/pulsectl/Manifest
index 9cbac03fe9cd..a31477684d0f 100644
--- a/dev-python/pulsectl/Manifest
+++ b/dev-python/pulsectl/Manifest
@@ -1,2 +1,3 @@
 DIST pulsectl-21.5.17.tar.gz 41487 BLAKE2B d4e547a140a9843107bac70a0a98ab230018b6457875b395528c3c1c1e7f20df4c4e6db569334c98f62be549930ab8e8f07927a54396554f1aaabc9a6eb46d7a SHA512 fdfceea8833955880326c04c536e6b2d63a260a851b98d7a76bb3637f30f414c2b2f4bd50c493f86edde76983e0a0f83c39839fa39646d8f1f2a4e93229d42fe
 DIST pulsectl-21.5.18.tar.gz 41636 BLAKE2B 1949f14c12a9d39f2ef6db798c7e8c8ca6dfb4fd3a3825af9f165e03fe1a3b2650bf369a4dc031528974db594740c0d990ebbb20d54aaa5c79a8859b9bcb605c SHA512 33dd4ca0daac4be1af510f6b4ac102f5b4b555bf2c72a446b2b498a80f972e4a970953812fd06ecf1e780bcfb61037e5a1245a8a047a592d73a7f4bd14790033
+DIST pulsectl-21.9.1.tar.gz 40432 BLAKE2B 531f2a6f750e1b1c0b8cc63899b3753af6d7a83999242e74f42147932d78a3416dab1ec4379fa6b9b981b9b0859d7b52102ec935b5695dd730858c4476f0ae5e SHA512 5fc1469acf0e1878d8fa73b7dc25f2579b42fcc4d9e0aa36ac3a806a5ad792ae2398cc86c6310439014d8ba0100abab988c32913a37f1aab9773acb2d19cecd0
diff --git a/dev-python/pulsectl/pulsectl-21.9.1.ebuild b/dev-python/pulsectl/pulsectl-21.9.1.ebuild
new file mode 100644
index 000000000000..cc3880261ad6
--- /dev/null
+++ b/dev-python/pulsectl/pulsectl-21.9.1.ebuild
@@ -0,0 +1,19 @@
+# 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="Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)"
+HOMEPAGE="https://github.com/mk-fg/python-pulse-control"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-sound/pulseaudio"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pydiff/Manifest b/dev-python/pydiff/Manifest
deleted file mode 100644
index 2404a3293a8c..000000000000
--- a/dev-python/pydiff/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pydiff-0.2.tar.gz 4108 BLAKE2B 868b9b31f96e49a4e375d2933fc158845ced4bc561816512f41c85dbd6d5373567a51153dedc527826ef2d03306288e3255d300fc2b400e28983e6616eec6a25 SHA512 0f55edf17138c4a1894a1ca03db21e6d6d21fb3961a2738c00d59e05d32a006413aee04005962f1ba6628c012bb018d43fcbbef50665ea10d3397539e5d3def1
diff --git a/dev-python/pydiff/metadata.xml b/dev-python/pydiff/metadata.xml
deleted file mode 100644
index 72bf9d74d068..000000000000
--- a/dev-python/pydiff/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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">pydiff</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pydiff/pydiff-0.2-r1.ebuild b/dev-python/pydiff/pydiff-0.2-r1.ebuild
deleted file mode 100644
index 07fc47fb25b2..000000000000
--- a/dev-python/pydiff/pydiff-0.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Diffs two Python files at the bytecode level"
-HOMEPAGE="https://github.com/myint/pydiff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86"
-
-python_test() {
-	"${EPYTHON}" test_pydiff.py || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 670bc3b5adea..d9abb71faf82 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -1,2 +1 @@
-DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
deleted file mode 100644
index 735da416e1d8..000000000000
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake python-r1
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="PySide development tools (pyside2-lupdate with support for Python)"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="${PYTHON_DEPS}
-	>=dev-python/pyside2-${PV}[${PYTHON_USEDEP}]
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
-
-S=${WORKDIR}/${MY_P}/sources/${PN}
-DOCS=( README.md )
-
-# the tools conflict with tools from QT
-PATCHES=(
-	"${FILESDIR}/${P}-dont-install-tools.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	# The tests are only related to the tools that we don't install
-	local mycmakeargs=(
-		-DBUILD_TESTS=OFF
-	)
-
-	pyside-tools_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-		)
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
-	}
-
-	python_foreach_impl pyside-tools_configure
-}
-
-src_compile() {
-	pyside-tools_compile() {
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
-	}
-
-	python_foreach_impl pyside-tools_compile
-}
-
-src_install() {
-	pyside-tools_install() {
-		python_doexe "${BUILD_DIR}/pylupdate/pyside2-lupdate"
-	}
-
-	python_foreach_impl pyside-tools_install
-
-	doman pylupdate/pyside2-lupdate.1
-	einstalldocs
-}
diff --git a/dev-python/pytest-metadata/Manifest b/dev-python/pytest-metadata/Manifest
index 04483d3c2dc9..3e474496a07a 100644
--- a/dev-python/pytest-metadata/Manifest
+++ b/dev-python/pytest-metadata/Manifest
@@ -1 +1,2 @@
+DIST pytest-metadata-1.11.0.tar.gz 14135 BLAKE2B 1de1c47b1d7775040075de479722fd07cb187f14cd37c5fe73458fb54ce01653295288fd11add8066170b8dc39f80c8749e739deb01ac8d579ef5e6f4339478d SHA512 09867df6158ba66f55a0a812b3731b4372f874b6bdc91301ed0c4d4c38f6fe9a4f936006d4e27f8c68d4a2d6b0fe5fedee3c6269bc6867eb1c7d73a42bda0361
 DIST pytest-metadata-1.8.0.tar.gz 9227 BLAKE2B ccc8d1ffa1f10540bb312bdc3a2e0342829935a108adaafd562efd75497768653a5eb452393b56eb97c624f4622a0b6ef5cbf860057d28ae340c28aeb5d7de2d SHA512 04871fe0c4c30bc23eba80a58919841cf45045b91d501e67630426cbac88a16005657eaccb1d2587263d4fcd940d37382f3a5649f142b1aab327f1f1c5d61963
diff --git a/dev-python/pytest-metadata/pytest-metadata-1.11.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-1.11.0.ebuild
new file mode 100644
index 000000000000..4ebc8ec19bbd
--- /dev/null
+++ b/dev-python/pytest-metadata/pytest-metadata-1.11.0.ebuild
@@ -0,0 +1,20 @@
+# 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 plugin for pytest that provides access to test session metadata"
+HOMEPAGE="https://github.com/pytest-dev/pytest-metadata/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild
index 1b43f12fdd4e..673393b4bea1 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-2.0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 BDEPEND="
 	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
 	test? ( !!dev-python/flaky )
diff --git a/dev-python/pyzmq/pyzmq-22.1.0.ebuild b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
index 94effb66728f..155e4eb6d997 100644
--- a/dev-python/pyzmq/pyzmq-22.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/regex/regex-2021.8.3.ebuild b/dev-python/regex/regex-2021.8.3.ebuild
index 5dd775a30497..98d870fbc8fb 100644
--- a/dev-python/regex/regex-2021.8.3.ebuild
+++ b/dev-python/regex/regex-2021.8.3.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 ~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"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 99ad63155c1a..5be3e760ee26 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -3,3 +3,4 @@ DIST requests-cache-0.7.1.gh.tar.gz 959455 BLAKE2B ce41514f21dc0708e437f70b92eb9
 DIST requests-cache-0.7.2.gh.tar.gz 962215 BLAKE2B 0f66548b4c37c14347021a4675d0165b9f9648dc9842f1d94c9507c096f6ef359f7109f88ac369de2de263673542f42d6e4a7402449354aee900970331f87cea SHA512 1712f3568ec4c8c41988c9d2ca07e72b1a66efceb596d814219b5eb9bb0c05448ee33b4634ec39fb03634032a6bfaaf877b297be7f92f540788dba40b4c202df
 DIST requests-cache-0.7.3.gh.tar.gz 1182825 BLAKE2B bc2b936f3b13388c23c344119a0ae2dc8efae3ba243e3a176ac27a7affb9b1c691e99ee88dfa61823a5c517ea898f144c7a9450867ea611c8518a0ecb3d77287 SHA512 fca494438001d14b0edce2cf93f51f65a0bf363d31bf1c70d1a4b2f214fe7bfc6f6f6fc97d21357fcfb9ab38c83d76cabe9c0ff4703171679ce509bd9f55753f
 DIST requests-cache-0.7.4.gh.tar.gz 1254975 BLAKE2B f0df6ac156665f8eed8850e153bfa3738d8c6677ff1613a54fcbf3208861c590e5e0ede3d5c30eeda36dcd709390402a020e03a0180e701e0751c5c982903a35 SHA512 684a3182135b6a31816629c8b4a174b52a629e964a5862573df1ac6e9e9b5cb807d1661a3a6daf8cc4b2a0f6778bd780d822a2f6c409242aa090c6565adf0aab
+DIST requests-cache-0.8.0.gh.tar.gz 1642151 BLAKE2B e341707b2473438a8c4155350bce3e0fc712537692991e23965aa6504e8eed735caae8b103896bd324882a8f73f13f36b23b329c3c155864c1b7665c6bcc4e2a SHA512 b9f1769f70b33f128aacf05a2251f9d2511649a4e80cb702c14ac3fcbfaf72d1049a5792a295286b6969985320a0d5a87ef81bfe3bacbbc200042ba51889b7ea
diff --git a/dev-python/requests-cache/requests-cache-0.8.0.ebuild b/dev-python/requests-cache/requests-cache-0.8.0.ebuild
new file mode 100644
index 000000000000..5c2349760cbf
--- /dev/null
+++ b/dev-python/requests-cache/requests-cache-0.8.0.ebuild
@@ -0,0 +1,54 @@
+# 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} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+HOMEPAGE="
+	https://pypi.org/project/requests-cache/
+	https://github.com/reclosedev/requests-cache/"
+DESCRIPTION="Persistent cache for requests library"
+SRC_URI="
+	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cattrs[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# These require extra servers running
+		tests/integration/test_dynamodb.py
+		tests/integration/test_gridfs.py
+		tests/integration/test_mongodb.py
+		tests/integration/test_redis.py
+	)
+	local EPYTEST_DESELECT=(
+		# Requires Internet access
+		tests/integration/test_compat.py::test_version_upgrade
+	)
+
+	local -x USE_PYTEST_HTTPBIN=true
+	epytest
+}
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index 4388d0760ce3..99f94273d8b8 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="socks5"
 
 RDEPEND="
diff --git a/dev-python/stestr/stestr-3.2.0.ebuild b/dev-python/stestr/stestr-3.2.0.ebuild
index d03c724ec731..88217987fd0e 100644
--- a/dev-python/stestr/stestr-3.2.0.ebuild
+++ b/dev-python/stestr/stestr-3.2.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 ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index 89248c749744..7d7679912879 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,3 +1,4 @@
 DIST terminado-0.10.1.tar.gz 13911 BLAKE2B e939bab2a23b75d803ba2260548a48a0f1c9925f6a2fe69ff7b549255539898e35f76e94526f8f470126d4d50466f8a85a14bbd3c38d2999d4e90ec4be3e0222 SHA512 fb6a6e27cec8e644565ecab3a7c43fd288c6ff9e18e68dda6d306532fa5e39274574f3dabdbf629cf00096256fef9a0419c98a3d9b7b038e04dd6ca1af16af46
 DIST terminado-0.11.0.tar.gz 14423 BLAKE2B 0fd782bd2b75bb74990b4638af3855d4c63bc53c1be5b1614ab7669e0504ad40b608bfcc4d8c77a4aa36bc3f2a0304a534b791161320de11c1687b4f568ce9c4 SHA512 038619e3e2114200afdc940c4937e20ac0aaee5df152fd2f1fc92f50c5f51bd0e351d3fb8d3979fe8ce5d5a12a27b9f896cf9ff0578a82772fe464b73d6a8d98
 DIST terminado-0.11.1.tar.gz 14451 BLAKE2B 02650bb272d2f11a5a4fa24d1d67f6fb7e35aa2b55e24abec0016c190d6af705079f2e4f56ca4cfb65eb801b7db02950daa8834c8f8768c15ec7637bb8d1a21a SHA512 55b44e8153a54ab43eff35ce8e1fcc0a3ec9189d5fc14cba6953fa03a7584b1be24ba53bcd8a5ca6e17da1fdc8e4f34c5c74417842bdad54a6c913a083d9487a
+DIST terminado-0.12.1.tar.gz 14513 BLAKE2B 97537851a2284c4cae2d9cdc42ad2714c9368f4318ac14c35197d6691404bec205b7b589c35302ff9d3fa99e4a15e24e713f70cc319e26788631134ff4b77cb1 SHA512 770a41b8fa6b43a577c077e8239a43b654f8e4423564ca38d66428ed6c322edea64c98225cb94ae182add9757b6d4e52796edd332443fe7ac643677a8d133674
diff --git a/dev-python/terminado/terminado-0.12.1.ebuild b/dev-python/terminado/terminado-0.12.1.ebuild
new file mode 100644
index 000000000000..17dca75ed0a3
--- /dev/null
+++ b/dev-python/terminado/terminado-0.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminals served to term.js using Tornado websockets"
+HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
index 5c3fe4b6f586..5ab01b72301a 100644
--- a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-libs/tree-sitter:="
 DEPEND=${RDEPEND}
diff --git a/dev-python/virtualenv/virtualenv-20.7.2.ebuild b/dev-python/virtualenv/virtualenv-20.7.2.ebuild
index b4b48767acc6..f23ee0480dd7 100644
--- a/dev-python/virtualenv/virtualenv-20.7.2.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.7.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/xcffib/xcffib-0.11.1.ebuild b/dev-python/xcffib/xcffib-0.11.1.ebuild
index 80c76b84fce3..d0d625f27a3a 100644
--- a/dev-python/xcffib/xcffib-0.11.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="x11-libs/libxcb"
 RDEPEND="
diff --git a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
index 1fc4fa391e97..c8fde49ddd35 100644
--- a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_sphinx docs \