Adding metadata

32 files changed, 61 insertions, 462 deletions

diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 22583bbafc5e..c51742404f3f 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,2 +1 @@
-DIST alembic-1.7.4.tar.gz 1227696 BLAKE2B 1bd11a9dc870dbf861b5c09262dbb0edcb413d6e8f86e6ddcd60d8aceebeb4bfeea9ef7ac6a389c10bded0e9cf478df313c7913ad5995580b88cdf9499e89f18 SHA512 7e3fea729d389c01a4c7756d83d54dacad7ff5b485e80e450da6584f8def14c478e5701bd97290c76894151aada5d4ae2b2cea360c3ff8e48f25a95fa1d19d79
 DIST alembic-1.7.5.tar.gz 1229596 BLAKE2B dbedcc43f60b2b28adc17b1c0c753b22993127acd5aab04bbf4a47920e11894498618d353eb544b48c0c5698d7cf6f96fba39a98df723a611810e71e24809b0e SHA512 4223116c3610f3196335c1fb2032a9a236c3e6ec4e4ca5cb85ccc3667d614e77d51d9fee1ee0173a32451198929428c1fcf39afd90b6df32584b076e0a4ab1a4
diff --git a/dev-python/alembic/alembic-1.7.4.ebuild b/dev-python/alembic/alembic-1.7.4.ebuild
deleted file mode 100644
index 2ab524104450..000000000000
--- a/dev-python/alembic/alembic-1.7.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://github.com/sqlalchemy/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' pypy3 python3_8)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.7.5.ebuild b/dev-python/alembic/alembic-1.7.5.ebuild
index e1b778ca0485..2ab524104450 100644
--- a/dev-python/alembic/alembic-1.7.5.ebuild
+++ b/dev-python/alembic/alembic-1.7.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/imageio/imageio-2.13.3-r1.ebuild b/dev-python/imageio/imageio-2.13.3-r1.ebuild
index f876bbbbaa9b..f77f23d98427 100644
--- a/dev-python/imageio/imageio-2.13.3-r1.ebuild
+++ b/dev-python/imageio/imageio-2.13.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 PROPERTIES="test_network"
 RESTRICT="test"
 
diff --git a/dev-python/jupyterlab-lsp/Manifest b/dev-python/jupyterlab-lsp/Manifest
index 4656c4d56e9a..d5438107a1fc 100644
--- a/dev-python/jupyterlab-lsp/Manifest
+++ b/dev-python/jupyterlab-lsp/Manifest
@@ -1 +1,2 @@
 DIST jupyterlab-lsp-3.9.1.tar.gz 262645 BLAKE2B cd3377ea3abbb3f877b257140d5ac6b162aa9d4229cb58f67fa60a9b7f5db43de6873af381bac5bbf6103a47a53863ae322ad200550d73e5c19baa5eb2866aa2 SHA512 0289dc666a3ec3d93d276c67e95c19b0427e45a4f1e001180df4af9a72f7e81dddc8bdd175684f857dfc8e02935dbd31b454bfd0ee1431a8e702f662365c747e
+DIST jupyterlab-lsp-3.9.2.tar.gz 263499 BLAKE2B 2ece934e68b27e28161ee3218af2d11bd5b286b4c517ff8feb4f9ec10c261e51a95fb4d52de7717d896a7c4dbca9be168aa75ed8ab7728dd4844640417f31365 SHA512 c41045736cbf511f72668dc03c0fd1265c2b2e2f60a4e987fecd8e23be0a6af1ae7b341f6b0c47fb4f5956f00cbb982f8cd9f31ebca8098ce01cc21a8f0df357
diff --git a/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.9.2.ebuild b/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.9.2.ebuild
new file mode 100644
index 000000000000..3b84dfe8eb34
--- /dev/null
+++ b/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.9.2.ebuild
@@ -0,0 +1,21 @@
+# 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="Coding assistance for JupyterLab with Language Server Protocol"
+HOMEPAGE="https://github.com/jupyter-lsp/jupyterlab-lsp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/jupyterlab-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-lsp-1.4.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/nose/files/nose-1.3.7-coverage-4.1-support.patch b/dev-python/nose/files/nose-1.3.7-coverage-4.1-support.patch
deleted file mode 100644
index 87577871b613..000000000000
--- a/dev-python/nose/files/nose-1.3.7-coverage-4.1-support.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/nose/plugins/cover.py	2016-10-11 15:51:26.990868010 +0200
-+++ b/nose/plugins/cover.py	2016-10-11 15:52:28.261102027 +0200
-@@ -187,7 +187,7 @@
-                     for name, module in sys.modules.items()
-                     if self.wantModuleCoverage(name, module)]
-         log.debug("Coverage report will cover modules: %s", modules)
--        self.coverInstance.report(modules, file=stream)
-+        self.coverInstance.report(modules, file=stream, show_missing=True)
- 
-         import coverage
-         if self.coverHtmlDir:
-@@ -207,7 +207,7 @@
-         # make sure we have minimum required coverage
-         if self.coverMinPercentage:
-             f = StringIO.StringIO()
--            self.coverInstance.report(modules, file=f)
-+            self.coverInstance.report(modules, file=f, show_missing=True)
- 
-             multiPackageRe = (r'-------\s\w+\s+\d+\s+\d+(?:\s+\d+\s+\d+)?'
-                               r'\s+(\d+)%\s+\d*\s{0,1}$')
diff --git a/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch b/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch
deleted file mode 100644
index 8d2f2f05dc29..000000000000
--- a/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8e7ad3d50012688ca029d126cbc88251831fea88 Mon Sep 17 00:00:00 2001
-From: Dmitry Shachnev <mitya57@gmail.com>
-Date: Mon, 1 Feb 2016 00:05:30 +0300
-Subject: [PATCH 1/2] Set __qualname__ equal to __name__ on derived classes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-To make output on Python ≥ 3.5 the same as on previous Python versions.
-
-This fixes #928.
----
- functional_tests/test_load_tests_from_test_case.py | 1 +
- nose/util.py                                       | 1 +
- unit_tests/test_xunit.py                           | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/functional_tests/test_load_tests_from_test_case.py b/functional_tests/test_load_tests_from_test_case.py
-index 42f8563..13d0c8a 100644
---- a/functional_tests/test_load_tests_from_test_case.py
-+++ b/functional_tests/test_load_tests_from_test_case.py
-@@ -29,6 +29,7 @@ def setUp(self):
-                 pass
-             def tearDown(self):
-                 pass
-+        Derived.__qualname__ = Derived.__name__
-         # must use nose loader here because the default loader in 2.3
-         # won't load tests from base classes
-         l = loader.TestLoader()
-diff --git a/nose/util.py b/nose/util.py
-index bfe1658..80ab1d4 100644
---- a/nose/util.py
-+++ b/nose/util.py
-@@ -643,6 +643,7 @@ class C(cls):
-         pass
-     C.__module__ = module
-     C.__name__ = cls.__name__
-+    C.__qualname__ = cls.__name__
-     return C
- 
- 
-diff --git a/unit_tests/test_xunit.py b/unit_tests/test_xunit.py
-index 944d285..261436b 100644
---- a/unit_tests/test_xunit.py
-+++ b/unit_tests/test_xunit.py
-@@ -16,6 +16,7 @@ def mktest():
-     class TC(unittest.TestCase):
-         def runTest(self):
-             pass
-+    TC.__qualname__ = TC.__name__
-     test = TC()
-     return test
- 
-
diff --git a/dev-python/nose/files/nose-1.3.7-python-3.6-test.patch b/dev-python/nose/files/nose-1.3.7-python-3.6-test.patch
deleted file mode 100644
index eda10ff036cf..000000000000
--- a/dev-python/nose/files/nose-1.3.7-python-3.6-test.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 84bb82245d10798825439dc13846eb0538d84239 Mon Sep 17 00:00:00 2001
-From: Tomas Orsava <torsava@redhat.com>
-Date: Mon, 12 Dec 2016 14:35:50 +0100
-Subject: [PATCH] Fix compatibility with Python 3.6
-
-Python 3.6 returns ModuleNotFoundError instead of the previous ImportError.
-https://github.com/nose-devs/nose/pull/1029
----
- functional_tests/test_loader.py           |  2 +-
- functional_tests/test_withid_failures.rst | 12 ++++++------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/functional_tests/test_loader.py b/functional_tests/test_loader.py
-index 104f220..906e2ba 100644
---- a/functional_tests/test_loader.py
-+++ b/functional_tests/test_loader.py
-@@ -372,7 +372,7 @@ def test_failed_import_module_name(self):
-         assert res.errors, "Expected errors but got none"
-         assert not res.failures, res.failures
-         err = res.errors[0][0].test.exc_class
--        assert err is ImportError, \
-+        assert issubclass(err, ImportError), \
-             "Expected import error, got %s" % err
- 
-     def test_load_nonsense_name(self):
-diff --git a/functional_tests/test_withid_failures.rst b/functional_tests/test_withid_failures.rst
-index cf09d4f..cb20886 100644
---- a/functional_tests/test_withid_failures.rst
-+++ b/functional_tests/test_withid_failures.rst
-@@ -7,16 +7,16 @@
-     >>> support = os.path.join(os.path.dirname(__file__), 'support', 'id_fails')
-     >>> argv = [__file__, '-v', '--with-id', '--id-file', idfile, support]
-     >>> run(argv=argv, plugins=[TestId()]) # doctest: +ELLIPSIS
--    #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR
-+    #1 Failure: ... (No module ...apackagethatdoesntexist...) ... ERROR
-     #2 test_b.test ... ok
-     #3 test_b.test_fail ... FAIL
-     <BLANKLINE>
-     ======================================================================
--    ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...)
-+    ERROR: Failure: ... (No module ...apackagethatdoesntexist...)
-     ----------------------------------------------------------------------
-     Traceback (most recent call last):
-     ...
--    ImportError: No module ...apackagethatdoesntexist...
-+    ...: No module ...apackagethatdoesntexist...
-     <BLANKLINE>
-     ======================================================================
-     FAIL: test_b.test_fail
-@@ -35,14 +35,14 @@ Addressing failures works (sometimes).
-     >>> argv.append('1')
-     >>> _junk = sys.modules.pop('test_a', None) # 2.3 requires
-     >>> run(argv=argv, plugins=[TestId()]) #doctest: +ELLIPSIS
--    #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR
-+    #1 Failure: ... (No module ...apackagethatdoesntexist...) ... ERROR
-     <BLANKLINE>
-     ======================================================================
--    ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...)
-+    ERROR: Failure: ... (No module ...apackagethatdoesntexist...)
-     ----------------------------------------------------------------------
-     Traceback (most recent call last):
-     ...
--    ImportError: No module ...apackagethatdoesntexist...
-+    ...: No module ...apackagethatdoesntexist...
-     <BLANKLINE>
-     ----------------------------------------------------------------------
-     Ran 1 test in ...s
diff --git a/dev-python/psycopg/psycopg-2.9.2.ebuild b/dev-python/psycopg/psycopg-2.9.2.ebuild
index 6349f1cf0623..dfd40a8bab92 100644
--- a/dev-python/psycopg/psycopg-2.9.2.ebuild
+++ b/dev-python/psycopg/psycopg-2.9.2.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index 78d89414f0f5..a319dc21b02f 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,3 +1,2 @@
 DIST pyparsing_2.4.7.tar.gz 648158 BLAKE2B 24525b4ee7876e245b9eb270f0e3e22fe2d8b398f9777ad3b3657b8a1227dcbd25983aa64a3f3018debdbffc1a042c732e6b3a09800e081c7acac7b97da15317 SHA512 c7a546729f86a2b5176e2482b566b9fd715b03e495aaef4d720b21307bb03f385dbc849247f8d266cb3d92be0a83c34ce4995b655ce85318355d5a0d42d6991e
-DIST pyparsing_3.0.5.tar.gz 940615 BLAKE2B 7ca78eb4ddd769a49f9538757fc3aae1a1fa11ed1a8fd4483ac80bf50b483e0a8ca5ee13739fbb8c40a6009e3dd48aabab6fbb29fdd01f6f82c11b22348408e1 SHA512 b3efebc911f3c3850ebbb573299a843aab1ca2fb612e41d93947f59ebba9a716ca099b5ec2f9ad8091cb82f6018910205d8409c403f26fb64e72cbb474d05223
 DIST pyparsing_3.0.6.tar.gz 942509 BLAKE2B 1ece2e83dd4193c8364bf690afc54090b46658fced62fc852b0098208d2ae4b18e96f050e63d8751c4b5cf95aa178a11dd1c37fc9d63ae1551639b5c91fe81d8 SHA512 5e94f1dcb4560a0f8e5b9a979b691b6362939648d03e9ea03f74e3aeeddafc09029c8e82c42a517aebe4a0483fd06cac03ae45030e074a40576f9570ed1eb5cc
diff --git a/dev-python/pyparsing/pyparsing-3.0.5.ebuild b/dev-python/pyparsing/pyparsing-3.0.5.ebuild
deleted file mode 100644
index 798e1d9c0ea4..000000000000
--- a/dev-python/pyparsing/pyparsing-3.0.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2004-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-S=${WORKDIR}/${PN}-${MY_P}
-
-LICENSE="MIT"
-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"
-IUSE="examples"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# railroad-diagrams not packaged (and not suitable for packaging yet)
-	tests/test_diagram.py
-)
-
-EPYTEST_DESELECT=(
-	# also railroad-diagrams
-	tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly
-)
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyparsing/pyparsing-3.0.6.ebuild b/dev-python/pyparsing/pyparsing-3.0.6.ebuild
index 798e1d9c0ea4..b0cdedb50822 100644
--- a/dev-python/pyparsing/pyparsing-3.0.6.ebuild
+++ b/dev-python/pyparsing/pyparsing-3.0.6.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${PN}-${MY_P}
 
 LICENSE="MIT"
 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="examples"
 
 distutils_enable_tests pytest
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 56063a9499ba..106acde08078 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,2 +1 @@
-DIST python-openstackclient-5.6.0.tar.gz 815567 BLAKE2B 9421af19527d1aa004f9e8928c40896fc001960f12dce11d860185e0c2c396642972099823710bf21fd838ec78681601d4196ce99e16d90836f6117e8ff97c5f SHA512 821abe0f85e53d7f52fd01a87a4d77a63fae029d2f03901f3ed5e47a4dd52fb8d00452a53027a347f83d73851ee3b57da4b025fb799571be256e78cdc6b96f9c
 DIST python-openstackclient-5.7.0.tar.gz 817269 BLAKE2B ce44a0c7466c473ae55c9c2198535f3333f361295121a517cabc61178b1363a8e51078a332f3297123138f3bcea021d1c2a610942099e4710d7e61a0cdfab721 SHA512 ca789640d1cc5c6ceae206652ac9629865dce07158e4f01ef28e841b6c362974add16de3047d520986cf7690a0c49ab308221b4e657d8484cedae892d1d5c3ce
diff --git a/dev-python/python-openstackclient/python-openstackclient-5.6.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-5.6.0.ebuild
deleted file mode 100644
index 14c7a70da0e1..000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-5.6.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack APIs"
-HOMEPAGE="https://github.com/openstack/python-openstackclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.56.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Depends on specific runner
-	sed -e 's/test_command_has_logger/_&/' -i openstackclient/tests/unit/common/test_command.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstackclient/tests/unit
-}
diff --git a/dev-python/python-openstackclient/python-openstackclient-5.7.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-5.7.0.ebuild
index edbdff78afe1..ca205b272aef 100644
--- a/dev-python/python-openstackclient/python-openstackclient-5.7.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-5.7.0.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 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index efb477c23867..bb9efa444564 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -4,3 +4,4 @@ DIST rich-10.14.0.tar.gz 16276866 BLAKE2B bc7d9a493dd4d283b0890bf385ac219c60cfb8
 DIST rich-10.15.0.tar.gz 16279650 BLAKE2B c169ca3d9144349770a0baf56d6267d5ac2e8505878838c233561961c0f1f4c5dee9585e241ee730346935134162652368f735f3f9c8cf20fa43272bc99f0e68 SHA512 8c853221761199b8d3a07c38bf4ca3c355fb5618c6c0edeccd55ad88ea68907cd8d80075824bfd83ad88c9c06a2ddf46e52d88934670040bf74262128e241e89
 DIST rich-10.15.1.tar.gz 16279572 BLAKE2B e91a9d168d88c1d8db4b0901809c4da29d32b2dd582b0a7584a2f20cc60ff4418a95e593c9085babb948c0ffb4568da3b752e60d36adfc85ee704d7dd4dfc7e7 SHA512 9544f00eaddbb69cb95a16a0cd780acff38a49cdc6e35217e88ed462333e17b295dc5fdd3bf1ae25ab5e9100804e1d055b0d81bd0bca805e7b433238313f2edd
 DIST rich-10.15.2.tar.gz 16282858 BLAKE2B 7fe05eb357e5137319764b0d751c3bc68f8545e391575a9a360b252c395714ecb8ad7b944e7c77e74990413cb6bfb2a6c6db0fb8e72eb098f91c8d5d86bc9f8a SHA512 02e851cc9a72cb62d1826f82a5b8919a8911cf3dbdfe5f5443a89b2b7bc48c575dcf5ba63c17da60cf2ef9de3d036c7b68a845610be72af63d082d487c3b61c2
+DIST rich-10.16.0.tar.gz 16280103 BLAKE2B af66398a4bc6e3e5503418721906679dc6f964b6dcbb56195f64d0ef4f504d9e0002f8b727c4fba7b42dda8790a03bb12a85150b99d5294712e38dea2800f841 SHA512 48c9e4d0b733cf79e9bceac284ca3cf37c14f52c0f3590f08acd9b0ea791da0200753f3cbae13a619b9c42fdb1167d55724c80123e2935bf2ed7133a15639ac8
diff --git a/dev-python/rich/rich-10.16.0.ebuild b/dev-python/rich/rich-10.16.0.ebuild
new file mode 100644
index 000000000000..3958bf9474a3
--- /dev/null
+++ b/dev-python/rich/rich-10.16.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 1954f59e712d..813b5593a5fe 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,2 +1 @@
 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.3.1.ebuild b/dev-python/soupsieve/soupsieve-2.3.1.ebuild
index 0954c102997e..ee3c4ef9f148 100644
--- a/dev-python/soupsieve/soupsieve-2.3.1.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.3.1.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/soupsieve/soupsieve-2.3.ebuild b/dev-python/soupsieve/soupsieve-2.3.ebuild
deleted file mode 100644
index ee3c4ef9f148..000000000000
--- a/dev-python/soupsieve/soupsieve-2.3.ebuild
+++ /dev/null
@@ -1,33 +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 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/stripe/Manifest b/dev-python/stripe/Manifest
index 481f477bc0ab..341e0e843f20 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,3 +1,2 @@
-DIST stripe-2.61.0.tar.gz 231302 BLAKE2B e971c3393e255d09eb84bcdf24b5eb32ca42d7d04332cc6fac7685606164c1b95f2b5bffeadb39f11be8c50360da03feca2dce1b4f5f84a3a95cfe4458ff1970 SHA512 5b331d862ea832a821a9dff9bb7569aa2b94726c2d36ec5f304a5a41b3fcdda1096f85f444500f0826fd3e349c47b5ef18ab91b8ec5cb67d966346a0cbd1a7ef
 DIST stripe-2.62.0.tar.gz 233447 BLAKE2B c4cdddcb5397ed45606600183dccba9395e098f236dd592e0a0326832642c79d112bdcb52ade736a0a1137e29b7368157e76a8a84895efa9a2debf2a60ffe886 SHA512 5c2f49e0639082a75ee97b8ad6e50926bb1d894b395f5363b2300825e497527518b682c3380ef458b4dc9ab832dc71afae5f85ff4ecc2e188aab4ad29df4a60f
 DIST stripe-2.63.0.tar.gz 233693 BLAKE2B 18de5e0a74b241759a7c84203e675159958a77e3ee225ebdfd5ed2d2d633a3b91f5165ac14a164b09e4df81176aafe1727685c4156b5055dc4ea2a44b0af9134 SHA512 fedef25d95e1fe3f9b4fdab37fb4ababc3c0243218da590076942491884b284b07e6bb15e9c85a6871dabffc34c260ec9d9fb80634ab0a368cf312c2324c2bdd
diff --git a/dev-python/stripe/stripe-2.61.0.ebuild b/dev-python/stripe/stripe-2.61.0.ebuild
deleted file mode 100644
index 9e5670209f37..000000000000
--- a/dev-python/stripe/stripe-2.61.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 )
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="https://github.com/stripe/stripe-python"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.112.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=(LONG_DESCRIPTION.rst CHANGELOG.md README.md)
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-2.62.0.ebuild b/dev-python/stripe/stripe-2.62.0.ebuild
index f87e53fc5930..46b0f9e0c459 100644
--- a/dev-python/stripe/stripe-2.62.0.ebuild
+++ b/dev-python/stripe/stripe-2.62.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
diff --git a/dev-python/tifffile/tifffile-2021.11.2.ebuild b/dev-python/tifffile/tifffile-2021.11.2.ebuild
index f4b915b9aaf6..296ef73a4525 100644
--- a/dev-python/tifffile/tifffile-2021.11.2.ebuild
+++ b/dev-python/tifffile/tifffile-2021.11.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 9fa4d035eebf..ef141d1d6707 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,3 +1,2 @@
 DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
-DIST watchdog-2.1.5.tar.gz 98791 BLAKE2B b7663e5aa8918321d570c842abf7c70647712d2045f3cc06ccdff86e305fecc5b95c93048aae9f0a7b2629c2c4f10911ef21077a570b9fb0c3eb03e9597f555f SHA512 850feaf4f5d61b8c8f1521464853df65b72af80c86c63fa87769d17f2bc464112daf3e09a8d83e30474d398315ce854e5a45703c5eabad8b0f5f98f6840d2590
 DIST watchdog-2.1.6.tar.gz 99756 BLAKE2B 5ea08660c28f77be02b261a22e6fbfdfaaa59f79af1eecb396fda2e56ab4b5b290dc2c791b31a6841ac6d96c7974d51e846ce0232e9de6728f6031685685e761 SHA512 810ee2c40d92102815685c6e06bee403dfb85df7c8de5f1b7066b27cef2a8e25f506f8d9cc0ff0ec3213b889a7844138692fd9d1ab0c40d0aa2097c55e85f531
diff --git a/dev-python/watchdog/watchdog-2.1.5.ebuild b/dev-python/watchdog/watchdog-2.1.5.ebuild
deleted file mode 100644
index f718bda5cf10..000000000000
--- a/dev-python/watchdog/watchdog-2.1.5.ebuild
+++ /dev/null
@@ -1,43 +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 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-python_test() {
-	local deselect=()
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_inotify_buffer.py::test_move_internal_batch
-	)
-
-	epytest -p no:django ${deselect[@]/#/--deselect }
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.1.6.ebuild b/dev-python/watchdog/watchdog-2.1.6.ebuild
index cd1d04ae3e97..0341baae41c7 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/xarray/xarray-0.20.1.ebuild b/dev-python/xarray/xarray-0.20.1.ebuild
index a00beae72a56..0d290c54f716 100644
--- a/dev-python/xarray/xarray-0.20.1.ebuild
+++ b/dev-python/xarray/xarray-0.20.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.18[${PYTHON_USEDEP}]
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 45bd035b6628..ef8366107aec 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,4 +1,3 @@
-DIST xmlschema-1.8.1.tar.gz 390835 BLAKE2B 5ba4e37bc52402a939e3c6508bb3d2cca33b85d73db9be375295de62587bae638d498435198a4b25bc6858bad19a89d14a11870774c631bcc9f1b22bb1c41f4c SHA512 741477d006270deb4a1d1b13bb404c6f4917047b0f68e85727a2dfe239a59f36f4160a6a88f26514a05865219a16ccbaa26bc319b06ac867aeabe008a778ddf8
 DIST xmlschema-1.8.2.tar.gz 392045 BLAKE2B 05b63c069bc6f7052e84f7af20b789e2e9b9e54eccbc28971006b924d1eff4b23a43e2a85356214603f4c2263f2478f7cc4321c4ae93e8106f31940098ab7ae2 SHA512 3a03206c732b3d46a58bcfdeafdccb08c7f3334c78df63901352d2d2eaebaabbb663d70329bd9667530a1e8c2bf1b7087eb493f971c3fa914d8944064e12361c
 DIST xmlschema-1.9.0.tar.gz 394048 BLAKE2B 96060d971826263b3a52b3d8720c7d2421af0bf55f1603b68691a374a72d441238b790f3c7ce0e48ca436cd9939aa0f3563bd3862d5371bd57c44815777ec83a SHA512 c7763acefa6cd34a1edc5487f0c2257c871b7c5aed2466dfb1867a004e9f91603e20d458238a52da33225d9303a7262e347f20c41203dea0f0cb7400bed66838
 DIST xmlschema-1.9.1.tar.gz 394695 BLAKE2B 38cb0cbb1bb9f23ea4cd16440c175d509e57dce86bc4362facfb0c034895af7cd27b326be450def6e671320ce08d96eeabd33b2c81a682e33001d8b0e1951d13 SHA512 958052e5a3573c5e3ae08fe487cbbb219d361264920f7ffc4157faf53a4e260f256c0ad9a68575c16d2e6cc1bd75b94459ec088b08daa4a419f756f1a7044836
diff --git a/dev-python/xmlschema/xmlschema-1.8.1.ebuild b/dev-python/xmlschema/xmlschema-1.8.1.ebuild
deleted file mode 100644
index 4c2e4712b712..000000000000
--- a/dev-python/xmlschema/xmlschema-1.8.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.3.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.8.2.ebuild b/dev-python/xmlschema/xmlschema-1.8.2.ebuild
index 4980f9b98bb3..4c2e4712b712 100644
--- a/dev-python/xmlschema/xmlschema-1.8.2.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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="test"
 RESTRICT="!test? ( test )"