Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-04-16 01:43:33 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-04-16 01:43:33 +0000
commit: ec74c1107bf15a7200aec53e44515e7498d5226a (patch)
tree: 47e04d8fcfeaa383b61adfcea44c822164d6bbd7 /dev-python
parent: ffd6525753ba8f0883efd0de78e3db8b571df1de (diff)
download: baldeagleos-repo-ec74c1107bf15a7200aec53e44515e7498d5226a.tar.gz
baldeagleos-repo-ec74c1107bf15a7200aec53e44515e7498d5226a.tar.xz
baldeagleos-repo-ec74c1107bf15a7200aec53e44515e7498d5226a.zip
99 files changed, 212 insertions, 1341 deletions
diff --git a/dev-python/XenAPI/XenAPI-22.14.0.ebuild b/dev-python/XenAPI/XenAPI-22.14.0.ebuild
index 5d53de7e14bf..3cda37cc5a0d 100644
--- a/dev-python/XenAPI/XenAPI-22.14.0.ebuild
+++ b/dev-python/XenAPI/XenAPI-22.14.0.ebuild
@@ -19,32 +19,95 @@ S="${WORKDIR}/xen-api-${PV}"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="ocamlopt pam python"
+KEYWORDS="~amd64"
+IUSE="ocamlopt pam python test"
 
 RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 
+	app-emulation/xen
+	dev-libs/openssl
 	dev-libs/xxhash
-	dev-ml/cstruct
-	dev-ml/ezjsonm
-	dev-ml/ezxenstore
-	dev-ml/mtime
-	dev-ml/rpc
-	dev-ml/uuidm
-	dev-ml/xapi-backtrace
-	dev-ml/xapi-stdext
-	dev-ml/xcp-inventory
-	dev-ml/xcp-rrd
-	dev-ml/xen-gnt
-	dev-ml/xenctrl
-	dev-ml/xenstore
-	dev-ml/xenstore-clients
-	dev-ml/xmlm
+	dev-ml/alcotest:=
+	dev-ml/angstrom:=
+	dev-ml/astring:=
+	dev-ml/async_inotify:=
+	dev-ml/async_unix:=
+	dev-ml/async:=
+	dev-ml/base-threads:=
+	dev-ml/base-unix:=
+	dev-ml/cdrom:=
+	dev-ml/cmdliner:=
+	dev-ml/cohttp:=[async,lwt,lwt-unix]
+	dev-ml/core:=
+	dev-ml/crc:=
+	dev-ml/cstruct:=[ppx,unix]
+	dev-ml/domain-name:=
+	dev-ml/dune-build-info:=
+	dev-ml/ezjsonm:=
+	dev-ml/ezxenstore:=
+	dev-ml/fd-send-recv:=
+	dev-ml/fmt:=
+	dev-ml/fpath:=
+	dev-ml/inotify:=
+	dev-ml/io-page:=[unix(-)]
+	dev-ml/ipaddr:=
+	dev-ml/logs:=
+	dev-ml/lwt:=
+	dev-ml/lwt_log:=
+	dev-ml/lwt_ssl:=
+	dev-ml/mirage-block-unix:=
+	dev-ml/mirage-crypto:=[pk]
+	dev-ml/mtime:=
+	dev-ml/mustache:=
+	dev-ml/nbd:=[unix]
+	dev-ml/netlink:=
+	dev-ml/ocaml-base64:=
+	dev-ml/ocaml-ctypes:=
+	dev-ml/ocaml-migrate-parsetree:=
+	dev-ml/ocaml-sha:=
+	dev-ml/pci:=
+	dev-ml/polly:=
+	dev-ml/ppx_sexp_conv:=
+	dev-ml/qmp:=
+	dev-ml/re:=
+	dev-ml/result:=
+	dev-ml/rpc:=[async]
+	dev-ml/rresult:=
+	dev-ml/sexplib:=
+	dev-ml/sexplib0:=
+	dev-ml/shared-block-ring:=
+	dev-ml/systemd:=
+	dev-ml/tar:=[unix]
+	dev-ml/uri:=
+	dev-ml/uuidm:=
+	dev-ml/uutf:=
+	dev-ml/vhd:=[lwt]
+	dev-ml/x509:=
+	dev-ml/xapi-backtrace:=
+	dev-ml/xapi-stdext:=
+	dev-ml/xapi-test-utils:=
+	dev-ml/xcp-inventory:=
+	dev-ml/xcp-rrd:=
+	dev-ml/xenctrl:=
+	dev-ml/xen-gnt:=[unix]
+	dev-ml/xenstore:=
+	dev-ml/xenstore-clients:=
+	dev-ml/xmlm:=
+	dev-ml/yojson:=
+	sys-libs/pam
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-ml/mirage-crypto[rng]
+		>=dev-ml/ounit-2
+		dev-ml/qcheck
+	)
 "
-DEPEND="${RDEPEND}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
 
 src_compile() {
 	dune_src_compile
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 79a0dbc757bc..ca92d9a27300 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,5 +1,2 @@
-DIST astroid-2.10.0.tar.gz 417686 BLAKE2B a4aa0451134403abf8e56ccd9dae106d2a92b2bd53c6772c952984ea5603b44ef5c13b9822b4fda0a146ad96a7412a602c2c46313938dea30cfb390fc55ee54d SHA512 34b52cd2e6636009369ec55a5781caaf8e8b0766b7ba4e70ff1f55d275a673266e0293f65145ff38637d6da353679314d0fbf182416146b89e210a68e39d86f0
-DIST astroid-2.11.0.tar.gz 412098 BLAKE2B 022c940913ae71ca0280a2ae47c19a6c82ea69b4f2a1c1ce0e2f00dac7a37b26f7ee2fa798db4f5d230e021ac5096b79d48b12d389d0c754dc17bde301c1712f SHA512 82423c9cf6da4e041621218acc81b9a301e4c1f532a74863c89040654d61457a89481004556a4795f021f0fc52b5f79412a35e9e43a1de33189dcae305cefdff
-DIST astroid-2.11.1.tar.gz 412506 BLAKE2B d3153b9019d5c466d39f7b27d459158cabe47cc9375afe2f1362b20620847fed0b4b09e2994e4372712fbd5bdff3cf88f709c1644abd25bdb6085e93cdcb145f SHA512 e0a1cfc67602e53c8d5b67d1605b38ee5c62886cb0ca757f0835f8af2ad94b21af58427ed4aad9f98171955733c4b333443efb1f7fdcec661d1e68c403a529b1
 DIST astroid-2.11.2.tar.gz 412621 BLAKE2B e43be65b733a5de5d027920e8e4db0365a3af98614739f0a56dcf95ef6c1c3a9e104b52c1fad4477bccd460850cf6bab6f38014aaa6891e8d04720d4a52b79d8 SHA512 5b33cb3594513804c6933a888297ed54c42cb52274c7fe49060368e3fac62be8f3febcb822aa9267a5a0a99a32932912ebc4640a7d10288b7021955fe0277c0d
 DIST astroid-2.9.3.tar.gz 409069 BLAKE2B 152dbe8ab2fee3964dc8cc714a5ba48c71b5994c77d1e20683bcf028483aca22d5be5772e72d056cfd3d1f59562b447366d61fc35a2b67d545f069a8f7975e84 SHA512 7bb3bf2d456c0d22325444e641961c34eaddcddf50c97ee9f5b5c8755232cf1b65a315258403b40bb7dcad15c4f9b6b73ab0eb607525a48a65f52406969eca04
diff --git a/dev-python/astroid/astroid-2.10.0.ebuild b/dev-python/astroid/astroid-2.10.0.ebuild
deleted file mode 100644
index 83bd80833c2e..000000000000
--- a/dev-python/astroid/astroid-2.10.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-1.14[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.11.0.ebuild b/dev-python/astroid/astroid-2.11.0.ebuild
deleted file mode 100644
index 28d7a6e99920..000000000000
--- a/dev-python/astroid/astroid-2.11.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.11.1.ebuild b/dev-python/astroid/astroid-2.11.1.ebuild
deleted file mode 100644
index 57f7c91c8afa..000000000000
--- a/dev-python/astroid/astroid-2.11.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.11.2.ebuild b/dev-python/astroid/astroid-2.11.2.ebuild
index 57f7c91c8afa..576027b066b6 100644
--- a/dev-python/astroid/astroid-2.11.2.ebuild
+++ b/dev-python/astroid/astroid-2.11.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
diff --git a/dev-python/asyncssh/asyncssh-2.10.0.ebuild b/dev-python/asyncssh/asyncssh-2.10.0.ebuild
index d55d8e3783f6..1d91fc853dc3 100644
--- a/dev-python/asyncssh/asyncssh-2.10.0.ebuild
+++ b/dev-python/asyncssh/asyncssh-2.10.0.ebuild
@@ -5,6 +5,11 @@ EAPI=8
 
 DOCS_BUILDER="sphinx"
 DOCS_DIR="docs"
+EPYTEST_DESELECT=(
+	tests/test_connection.py::_TestConnection::test_connect_timeout_exceeded
+	tests/test_connection.py::_TestConnection::test_connect_timeout_exceeded_string
+	tests/test_connection.py::_TestConnection::test_connect_timeout_exceeded_tunnel
+) # network tests
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1 docs optfeature
diff --git a/dev-python/cppy/cppy-1.2.0.ebuild b/dev-python/cppy/cppy-1.2.0.ebuild
index 6572dfefc54e..351aaae0434d 100644
--- a/dev-python/cppy/cppy-1.2.0.ebuild
+++ b/dev-python/cppy/cppy-1.2.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 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"
 
 distutils_enable_tests pytest
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index 94159b144b4f..dc03bf6280ab 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -1,2 +1 @@
-DIST debtcollector-2.4.0.tar.gz 31376 BLAKE2B ccd34005133a888b164538c01ed482da26e91e2dd5d9f11bb0efacc0941c9eb1c0357ce8d0c237734ad450226512263ba8aa52f3b8e712a33a40fac384db2791 SHA512 31287e223524d5997e9dc776766c5ab2ec77c771fca6e9b27e058fdd94a20b67a73147c538f9a7a3155c4ce6eb85a20e8276bedd1a53a81bebcb5daaceb1b463
 DIST debtcollector-2.5.0.tar.gz 31334 BLAKE2B 1f06725ead19e36e6feda1c8666403e536d5f39f775d9a9929a06ea053be41e64575a4e4d28b3a0032610cdd7f68f35bf54ff2445543c4b8ec667732e1a8d5ea SHA512 3f1378c52994a0320b8abd997a1b240496f6f12d29e8b08612bb97c7c8d2993b23224be62cbe4eaa556dcd5a3c7a4a8f8ea4873688e1aad2f26bb5ba522c1d6a
diff --git a/dev-python/debtcollector/debtcollector-2.4.0.ebuild b/dev-python/debtcollector/debtcollector-2.4.0.ebuild
deleted file mode 100644
index cce27e56b297..000000000000
--- a/dev-python/debtcollector/debtcollector-2.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python deprecation patterns and strategies that collect technical debt"
-HOMEPAGE="https://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/subunit[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/debtcollector/debtcollector-2.5.0.ebuild b/dev-python/debtcollector/debtcollector-2.5.0.ebuild
index 2340de4d135e..76064e853067 100644
--- a/dev-python/debtcollector/debtcollector-2.5.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-2.5.0.ebuild
@@ -14,7 +14,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/wrapt-1.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/django-cache-url/Manifest b/dev-python/django-cache-url/Manifest
index 06cc6ba9c646..ca57d87e53c6 100644
--- a/dev-python/django-cache-url/Manifest
+++ b/dev-python/django-cache-url/Manifest
@@ -1,2 +1 @@
-DIST django-cache-url-3.3.0.tar.gz 8319 BLAKE2B 28e627270baf5ea030bdcf098968644fd59551b1e974c7e08b396313c13bc48d4417c1e7b7c9942a1773b05d53c1b918177ef649ab088efcfa9ecf375b17ecac SHA512 fc01f3ef1e490146b911cff6f905c5257c8adbca57734a442d0d8e715c77d398fe07d3e47f043627eabc87f6f72153c2504873bf81d248c9da9183d6fe005069
 DIST django-cache-url-3.4.0.tar.gz 8455 BLAKE2B 91780a053a90decbffd3d9a6fc0b9043dee74b6b6b265b9ef4b035c5679a4955582b3a3b831ff9670fceb89d5729b9ac607b6f318543d437eb35e7d1a1c1c638 SHA512 17fb8aff3b65f4860b2d2c7c765341f17c13a0f78453f627f62f40894d3e83281ecbde1d1ddcbeff7de8fe55189ce9504d03281353d227f9e7b1678af4c423ec
diff --git a/dev-python/django-cache-url/django-cache-url-3.3.0.ebuild b/dev-python/django-cache-url/django-cache-url-3.3.0.ebuild
deleted file mode 100644
index aa5cf33aab8f..000000000000
--- a/dev-python/django-cache-url/django-cache-url-3.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Use Cache URLs in your Django application"
-HOMEPAGE="https://github.com/epicserve/django-cache-url"
-SRC_URI="
-	https://github.com/epicserve/django-cache-url/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e '/--cov/d' -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/django-cache-url/django-cache-url-3.4.0.ebuild b/dev-python/django-cache-url/django-cache-url-3.4.0.ebuild
index 001b815fbef8..9a78f381f7b8 100644
--- a/dev-python/django-cache-url/django-cache-url-3.4.0.ebuild
+++ b/dev-python/django-cache-url/django-cache-url-3.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/django[${PYTHON_USEDEP}]
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index e9b8c2585aaf..948cb93bdb3f 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,2 +1 @@
-DIST dnspython-2.2.0.tar.gz 303844 BLAKE2B 5a99a06d1c7e8f29e44ddc99fed11d772d83d962d7abde61befb3189c6faa2796b239e9c0ec05a453360986ff4bbbcea929f62017eb3bab2bafa517ae4c02a3b SHA512 0a93bde1ca1081c92b9fb5a02644c4920813f2d0dbe4de1dae736262d53afe41327f3fdd38a10f74ec78f54dd7c7570e37d0adb2b21ab18f9b5cc099fcc6bb85
 DIST dnspython-2.2.1.tar.gz 304861 BLAKE2B e6446b91579c6ec0a7266a354ceb58e2f881b55b7376648770ebc2c6104fd815214497516d305b75802e9211703d47a70d66745d872a43afb72f41e55a617652 SHA512 ec545468f604d6131f07259ca154c4f71d445d12c336ac1da0d2f025d6478ada76320a7235119312fed85da071ef309d2531e541d3c2340a50deaf3f4dd7b4eb
diff --git a/dev-python/dnspython/dnspython-2.2.0.ebuild b/dev-python/dnspython/dnspython-2.2.0.ebuild
deleted file mode 100644
index 84ab657ac2b8..000000000000
--- a/dev-python/dnspython/dnspython-2.2.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="https://www.dnspython.org/
-	https://pypi.org/project/dnspython/"
-SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	<dev-python/idna-4.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/network_avail/s:True:False:' \
-		tests/*.py || die
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	epytest -s
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/dnspython/dnspython-2.2.1.ebuild b/dev-python/dnspython/dnspython-2.2.1.ebuild
index 40c760d95b84..04c52394f5ec 100644
--- a/dev-python/dnspython/dnspython-2.2.1.ebuild
+++ b/dev-python/dnspython/dnspython-2.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-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="examples"
 
 RDEPEND="
diff --git a/dev-python/dotmap/Manifest b/dev-python/dotmap/Manifest
index e144385b3806..0d06fae4db64 100644
--- a/dev-python/dotmap/Manifest
+++ b/dev-python/dotmap/Manifest
@@ -1,2 +1,2 @@
-DIST dotmap-1.3.26.tar.gz 12070 BLAKE2B 28023eebf6437530f3f1ee541f138eaffbc632f441bc9698e2329ab8d9894510e04122f797a77416cbe498fde5092f5c0a821615c4e9fbd1959c75cce94f7cfc SHA512 5083fec8f9e909f68f0fa12db8709ca064d0fd134230f6d0fe315c66613983290bf7de35db29d805013b13024babf250e9110308817265d4e70b9dea5b9a132f
 DIST dotmap-1.3.28.tar.gz 12097 BLAKE2B c172a3c4b8f4b10e2351d342cf38eed1ea8cac510eb4a66fa7df5660628fcf57056083af519f8360e78dce1d494185d2b09edfc7a4e7e604af658af15335fcc3 SHA512 9d16b1886884464cbe9df5d0af6426c869969767b9fee527cf108551d8f0d5d81f479d429350e31c89b9db2d3cc6d395945321f56688850dca7bfa2bbf273451
+DIST dotmap-1.3.30.tar.gz 12391 BLAKE2B f6e5713704d2f7c828c0a373174348900ebe39b72fd85456ed374a62f474c67e916b5956afeec246d8a6e9253b08c5e495c781d2915cecb38bee0d0b256810d2 SHA512 8e6d3e4419c3dbd1c0a3209dfc7bcda859bf547ab3fe88471c04a7f4c34219c9ca13b848788e6a24c6d3ece539f9ba0a16600f7941abdbd99c4e6d0badf4af27
diff --git a/dev-python/dotmap/dotmap-1.3.26.ebuild b/dev-python/dotmap/dotmap-1.3.30.ebuild
index f12b076956d2..f12b076956d2 100644
--- a/dev-python/dotmap/dotmap-1.3.26.ebuild
+++ b/dev-python/dotmap/dotmap-1.3.30.ebuild
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index ea8224884dfb..b94accd176f3 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,5 +1,3 @@
 DIST Flask-1.1.4.tar.gz 635920 BLAKE2B c1f19e7449177ecf6e901d5932ad25cbe866ff53b9323f717541922b1ea5b10203ff07630fcf3eabaedd9b6a24ef031ad2aaa2e2f759925363bebfa7e5d967da SHA512 6f427a1264921b8560446afacee2757d16de0dc22d6ed249b7bc5d6f50f3af50c89b79ce900d75b41af4befc53910f2b532c2e280de42837e2133acb6b1bd80d
-DIST Flask-2.0.1.tar.gz 626851 BLAKE2B 05273edacd6d66237a552410df7ef7ff367e28c273cc89f654eac5ed2eb3d26f71437169905372b398cc6c5c5067dcbea54aa1cab782e03c6186ac9ae3949f4c SHA512 fefed4971f0542b25ba2867919aa54a83b6e3f47e7cee94586543843e7e00ba209ac15d8fe28a3c53981f587aebcf2f3915a49e1a9cd1b729099dccbed3783c2
-DIST Flask-2.0.2.tar.gz 628479 BLAKE2B 13555ce0602e685b5fe29ba51e05534263d70440c56c9096e95e0893e010d877154d3d1db1bff47209e6b70e91612a71e8aed149a067465f9e3a11486d843a86 SHA512 341be4e453dd5f682e465af356ff85ffe76f52a62e529e6cd251f95199e73b0f93414af093f899f61721e9bb351f09972a433a55beacc972b5e577b86e003081
 DIST Flask-2.0.3.tar.gz 629304 BLAKE2B dae5ffb86b9f57ea95c682be4f858faec6432c877695c06fff40a056cd7eedff25cf120458435b634954f0e65e57ad6c22c3eb6b5ed751b6d7f5d4501358c240 SHA512 b759ada3ab610d4893cd48f6de070c23929ab2e37af863238912fa19246acfb399b1e67576bf6112c9bb56b00002792d28c7538c65b026f31bcc6f64305ae966
 DIST Flask-2.1.0.tar.gz 630852 BLAKE2B 6a67d4c0f67aebf326493d86baefcdfb5d1e1b36a3b6a2e818d8bd92d84267ca8762ee0af3e70254bd4ce53a4f781edc9560e6408adf8ac285b308cdf1103c0f SHA512 8d9da72e3ad7df378a32fc40290e9499bc79eb3167235e8497f8f2753ac2c9da170d34f0ae3e87db99ba8282c887a479a64b680818b668bc13e033e6e5603926
diff --git a/dev-python/flask/flask-2.0.1-r1.ebuild b/dev-python/flask/flask-2.0.1-r1.ebuild
deleted file mode 100644
index 64825c41fc35..000000000000
--- a/dev-python/flask/flask-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
-HOMEPAGE="https://github.com/pallets/flask/"
-MY_PN="Flask"
-MY_P="${MY_PN}-${PV}"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-tabs \
-	dev-python/sphinxcontrib-log_cabinet
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:httpbin
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask/flask-2.0.1.ebuild b/dev-python/flask/flask-2.0.1.ebuild
deleted file mode 100644
index 1ba8a44542f0..000000000000
--- a/dev-python/flask/flask-2.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
-HOMEPAGE="https://github.com/pallets/flask/"
-MY_PN="Flask"
-MY_P="${MY_PN}-${PV}"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:httpbin
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask/flask-2.0.2.ebuild b/dev-python/flask/flask-2.0.2.ebuild
deleted file mode 100644
index 5bcce692f1fc..000000000000
--- a/dev-python/flask/flask-2.0.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
-HOMEPAGE="https://github.com/pallets/flask/"
-MY_PN="Flask"
-MY_P="${MY_PN}-${PV}"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-tabs \
-	dev-python/sphinxcontrib-log_cabinet
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		# https://github.com/pallets/flask/issues/4292
-		# (test xfailed in newer version)
-		tests/test_cli.py::test_lazy_load_error
-	)
-
-	epytest -p no:httpbin
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask/flask-2.0.3.ebuild b/dev-python/flask/flask-2.0.3.ebuild
index c77e70855797..03a44c3005e8 100644
--- a/dev-python/flask/flask-2.0.3.ebuild
+++ b/dev-python/flask/flask-2.0.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/fonttools/fonttools-4.30.0.ebuild b/dev-python/fonttools/fonttools-4.30.0.ebuild
index 0597adaf64a8..89e82d0595b7 100644
--- a/dev-python/fonttools/fonttools-4.30.0.ebuild
+++ b/dev-python/fonttools/fonttools-4.30.0.ebuild
@@ -15,7 +15,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="${RDEPEND}
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 3cce861b413e..832122d805b3 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,2 +1 @@
-DIST ipywidgets-7.6.5.tar.gz 4072535 BLAKE2B bc2347863af42254e740454e1d91ca8b7fc03de9dc6a2fdddaf9dbb13da2fe7af0f429733166865ebcdda9840189fc65dc677b7181b34f1c0dc697905aa3af4f SHA512 4952f1cd293f1a4bf1721222579273c95f59adfa9385963617924f5f28232e1940ec045e18aeae83ad138176e4d887e952fe875b960279f3e0b7d982a790a4dc
 DIST ipywidgets-7.7.0.tar.gz 4074763 BLAKE2B cff338dd635c57943161c78708e6a69abccaa46878e0bedb11ead76590b858ba57ce4dcfa8052533a4849da0dc9d5472987a7918fd2043462a21a908105d7910 SHA512 038da040912e6701762fb66fb3b6996ce0a59706afb05405b5932c02d34733842b227426f0b29eea115196bab384617425b0553c5db13a9dc832bddef63dfb92
diff --git a/dev-python/ipywidgets/files/ipywidgets-7.6.3-py310.patch b/dev-python/ipywidgets/files/ipywidgets-7.6.3-py310.patch
deleted file mode 100644
index f3d82d0a8ec1..000000000000
--- a/dev-python/ipywidgets/files/ipywidgets-7.6.3-py310.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f9a13dbb3b8f1ffefef483bdb4c14f04f7743ff1 Mon Sep 17 00:00:00 2001
-From: Jason Grout <jgrout6@bloomberg.net>
-Date: Tue, 31 Dec 2019 12:57:52 -0800
-Subject: [PATCH] Fix more python 3 deprecations
-
----
- ipywidgets/widgets/interaction.py            | 2 +-
- ipywidgets/widgets/tests/test_interaction.py | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/ipywidgets/widgets/interaction.py b/ipywidgets/widgets/interaction.py
-index 3dd7272047..6e3b9fc955 100644
---- a/ipywidgets/widgets/interaction.py
-+++ b/ipywidgets/widgets/interaction.py
-@@ -246,7 +246,7 @@ def update(self, *args):
-         except Exception as e:
-             ip = get_ipython()
-             if ip is None:
--                self.log.warn("Exception in interact callback: %s", e, exc_info=True)
-+                self.log.warning("Exception in interact callback: %s", e, exc_info=True)
-             else:
-                 ip.showtraceback()
-         finally:
-diff --git a/ipywidgets/widgets/tests/test_interaction.py b/ipywidgets/widgets/tests/test_interaction.py
-index 1ee946744e..c792c5377a 100644
---- a/ipywidgets/widgets/tests/test_interaction.py
-+++ b/ipywidgets/widgets/tests/test_interaction.py
-@@ -249,7 +249,8 @@ def test_iterable_tuple():
-     check_widgets(c, lis=d)
- 
- def test_mapping():
--    from collections import Mapping, OrderedDict
-+    from collections.abc import Mapping
-+    from collections import OrderedDict
-     class TestMapping(Mapping):
-         def __init__(self, values):
-             self.values = values
diff --git a/dev-python/ipywidgets/ipywidgets-7.6.5-r2.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.5-r2.ebuild
deleted file mode 100644
index c7778d7a68d9..000000000000
--- a/dev-python/ipywidgets/ipywidgets-7.6.5-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="https://ipywidgets.readthedocs.io/"
-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 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/widgetsnbextension-3.5.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${PN}-7.6.3-py310.patch"
-)
-
-src_prepare() {
-	# upstream hack to autoconfigure ipywidgets in jupyter
-	# we don't have jupyterlab_widgets packaged
-	sed -i -e '/jupyterlab_widgets/d' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/ipywidgets/ipywidgets-7.7.0.ebuild b/dev-python/ipywidgets/ipywidgets-7.7.0.ebuild
index 38b4b39d0a81..48b3bd9aceef 100644
--- a/dev-python/ipywidgets/ipywidgets-7.7.0.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.7.0.ebuild
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jmespath/jmespath-1.0.0.ebuild b/dev-python/jmespath/jmespath-1.0.0.ebuild
index a2808c661c0b..21d5588c710a 100644
--- a/dev-python/jmespath/jmespath-1.0.0.ebuild
+++ b/dev-python/jmespath/jmespath-1.0.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/mako/mako-1.2.0.ebuild b/dev-python/mako/mako-1.2.0.ebuild
index 6cac5693efba..32387d3ffa3a 100644
--- a/dev-python/mako/mako-1.2.0.ebuild
+++ b/dev-python/mako/mako-1.2.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/mypy/mypy-0.941.ebuild b/dev-python/mypy/mypy-0.941.ebuild
index 5c68592bbdad..fa91345646da 100644
--- a/dev-python/mypy/mypy-0.941.ebuild
+++ b/dev-python/mypy/mypy-0.941.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 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"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/nbclient/nbclient-0.6.0.ebuild b/dev-python/nbclient/nbclient-0.6.0.ebuild
index 992f1096134b..80faf5bc58b0 100644
--- a/dev-python/nbclient/nbclient-0.6.0.ebuild
+++ b/dev-python/nbclient/nbclient-0.6.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-6.4.5.ebuild b/dev-python/nbconvert/nbconvert-6.4.5.ebuild
index 1b0fb39ed095..9efe44d49d36 100644
--- a/dev-python/nbconvert/nbconvert-6.4.5.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.4.5.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-6.5.0.ebuild b/dev-python/nbconvert/nbconvert-6.5.0.ebuild
index 1b0fb39ed095..0c5e972b86a8 100644
--- a/dev-python/nbconvert/nbconvert-6.5.0.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.5.0.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index ce2b9c372541..383bd7ad257c 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,3 +1,2 @@
-DIST nbformat-5.1.3.gh.tar.gz 130922 BLAKE2B 866eb53dd3f04c09f4a08303c5e84b672cc826d2d9b369cd85038b6c4075e74dce88fbcae80fc9b5450faf1c4971d121abe35e0a2ce2a8e73e020d2bed3a5594 SHA512 b4bc3d51d6e940ce1e2b1f5ca1005cf3d466b2b7b589383a31c4d2908c4e539344f4c8fb9e92993469d4d66f363c35082f0c16b8a63aa61e19fb24fa5ac910fd
 DIST nbformat-5.2.0.gh.tar.gz 133519 BLAKE2B aa9ff18ff879fe4b85af6d552a7d2f44d10bb96366e7af15214f7ae4c9d193a24bee8d0dc0ae1b71da13f44abaf4093e412f32b8357b4846985940c002a17b7e SHA512 55718e84a5125f8c28c8cd1be0725669f4d56bc22e6dd92b907a0e8cda27e17f8f56aad29806ee9f1c2c58641dd80455f04241fe5a54f8b6309575bb7656fc87
 DIST nbformat-5.3.0.gh.tar.gz 133531 BLAKE2B 7d4e0fdee7c2b5cfdb09bf90ff225b6be184cb6e02e36319e52c5a021283b2ae884c189f1e98a9fd40f1e12811bafe37cc59d27f1e34433d38c00e5fb0cc9fbe SHA512 50cb0b98501c2ee640ae1e6036346912ebc58f63faa8f1e4535681eb3f468072d5bc462d3788cc4233108612239fe03a1da41acfe30c915e13e7428f35415a91
diff --git a/dev-python/nbformat/nbformat-5.1.3-r1.ebuild b/dev-python/nbformat/nbformat-5.1.3-r1.ebuild
deleted file mode 100644
index 72c14457b45b..000000000000
--- a/dev-python/nbformat/nbformat-5.1.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="https://jupyter.org"
-# missing on pypi
-SRC_URI="
-	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	"
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc
-distutils_enable_tests pytest
diff --git a/dev-python/nbformat/nbformat-5.2.0.ebuild b/dev-python/nbformat/nbformat-5.2.0.ebuild
index e33182de31e0..bff3fa5f7bdc 100644
--- a/dev-python/nbformat/nbformat-5.2.0.ebuild
+++ b/dev-python/nbformat/nbformat-5.2.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ncclient/Manifest b/dev-python/ncclient/Manifest
index 923800b635fa..15fe4be7d45b 100644
--- a/dev-python/ncclient/Manifest
+++ b/dev-python/ncclient/Manifest
@@ -1 +1,2 @@
 DIST ncclient-0.6.12.tar.gz 129189 BLAKE2B 456791d422928b134aefc568f2ffa31ada9246c3e10e481724d57c56e8eb44353e402e828dfa34ee12edc7edb40e86a8e1ad12797666a7d12ecd9931e4377323 SHA512 ba1547579c830733f2f450ecafaf146a364b3a123f4cb0a3395e0ed19ad31025823b928d06acb537a531203a5ac65fc757b6fb34fefdde0f1e357e5f57bf73d0
+DIST ncclient-0.6.13.tar.gz 130399 BLAKE2B b6084b967d4099d5c40075bf1ea0a70a19f8b1eb75225113e74469ce3d6fa381d8398b920ae570895fb0d39af1dd2523816a343c1e110640324fd10e784fdfbe SHA512 650d07477d48cd209ef758ebd1716e48c4021c3d681f0ce2e9065ca5f34ace82079f5577884d26fc99e552c6f4cd7b59a9bf8866008e7b2985f1d8b23cc8d61f
diff --git a/dev-python/ncclient/ncclient-0.6.13.ebuild b/dev-python/ncclient/ncclient-0.6.13.ebuild
new file mode 100644
index 000000000000..91ec76533ecd
--- /dev/null
+++ b/dev-python/ncclient/ncclient-0.6.13.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for NETCONF clients"
+HOMEPAGE="
+	https://github.com/ncclient/ncclient
+	https://pypi.org/project/ncclient/
+"
+SRC_URI="https://github.com/ncclient/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests nose
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 5edc67b44fe2..0030ef2ebd60 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,3 +1 @@
 DIST notebook-6.4.10.tar.gz 14357395 BLAKE2B 32415b7d303b18c380ea6bab398246307a2b218ad52cdeb9a08db6f2f5f100515f36407358de094144f8da558762f7acf62505edbd9cf9e757fad1ac299f2431 SHA512 78a186c9907006d1fec1cea99e4c0f4181f673bf4dd383ed934cd2eb491cfd247db240fcec6a35a2967fe12b121863bbfaad0c4a8270618d03cd746f4688743b
-DIST notebook-6.4.8.tar.gz 14347639 BLAKE2B c2201562f0d672f16d6ae2388a443fcd87e81ae7de78c3a42acef82ff3e78c8e94e2be61e6156f622a9339138a2f14edef5057a3e601a7c15c8793f56d1071e2 SHA512 0e87aa155635ae536eb5a152c46cadbf85907a5af2ca15d063e718ff566ac6b76f4ce0f06f8adacae3be05ea970f1059d793e3121be855efd6c9072e9aa51719
-DIST notebook-6.4.9.tar.gz 14348373 BLAKE2B 3a89c1765d4866e148f104fb0b5a9c6303576589e30547a3cf152824b57bcff3a543ac370f2e76bd35c5198c99edf23f8e80cdd7a76b06f14107051ab77c08db SHA512 21c7ce0ae48ae17da27397b5c0d0579ad11a2525decf96288977d8d56a232a0e6cca05cff3e3bd4633b4abbf7f57d82b4fb36b8fccf9159f74f9cf2bbf023ff8
diff --git a/dev-python/notebook/notebook-6.4.10.ebuild b/dev-python/notebook/notebook-6.4.10.ebuild
index 71d75277aff8..2e14e71da1da 100644
--- a/dev-python/notebook/notebook-6.4.10.ebuild
+++ b/dev-python/notebook/notebook-6.4.10.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/notebook/notebook-6.4.8.ebuild b/dev-python/notebook/notebook-6.4.8.ebuild
deleted file mode 100644
index 8c8eabc6203d..000000000000
--- a/dev-python/notebook/notebook-6.4.8.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="https://jupyter.org"
-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-libs/mathjax-2.4
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	>=dev-python/jupyter_packaging-0.9[${PYTHON_USEDEP}]
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	distutils-r1_python_prepare_all
-}
-
-EPYTEST_DESELECT=(
-	# trash doesn't seem to work for us
-	notebook/services/contents/tests/test_contents_api.py::APITest::test_checkpoints_follow_file
-	notebook/services/contents/tests/test_contents_api.py::APITest::test_delete
-	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
-	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
-	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
-	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
-	notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
-	notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
-	# TODO
-	notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
-	notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
-	notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
-	notebook/services/nbconvert/tests/test_nbconvert_api.py::APITest::test_list_formats
-)
-
-EPYTEST_IGNORE=(
-	# selenium tests require geckodriver
-	notebook/tests/selenium
-)
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/notebook/notebook-6.4.9.ebuild b/dev-python/notebook/notebook-6.4.9.ebuild
deleted file mode 100644
index 71d75277aff8..000000000000
--- a/dev-python/notebook/notebook-6.4.9.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="https://jupyter.org"
-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-libs/mathjax-2.4
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	>=dev-python/jupyter_packaging-0.9[${PYTHON_USEDEP}]
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	distutils-r1_python_prepare_all
-}
-
-EPYTEST_DESELECT=(
-	# trash doesn't seem to work for us
-	notebook/services/contents/tests/test_contents_api.py::APITest::test_checkpoints_follow_file
-	notebook/services/contents/tests/test_contents_api.py::APITest::test_delete
-	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
-	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
-	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
-	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
-	notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
-	notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
-	# TODO
-	notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
-	notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
-	notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
-	notebook/services/nbconvert/tests/test_nbconvert_api.py::APITest::test_list_formats
-)
-
-EPYTEST_IGNORE=(
-	# selenium tests require geckodriver
-	notebook/tests/selenium
-)
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/numpy/numpy-1.22.3.ebuild b/dev-python/numpy/numpy-1.22.3.ebuild
index baa69f4cd265..e07e6a3a5dad 100644
--- a/dev-python/numpy/numpy-1.22.3.ebuild
+++ b/dev-python/numpy/numpy-1.22.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
index dc1a3c89f84d..cd0401a7ebcc 100644
--- a/dev-python/ovsdbapp/Manifest
+++ b/dev-python/ovsdbapp/Manifest
@@ -1 +1 @@
-DIST ovsdbapp-1.15.1.tar.gz 106361 BLAKE2B 754195e6ed1c9f6e43c34df66976403e84390febf3dba71a73245a34fd0c277a72def3f5b8ce6ed56c0897d3de80737ce4be521a9aec0a6d3c24ca4a36b5503a SHA512 f4d6e983c883ca23827e8216f90f352926600e0cdcf32d524a1c912505e4672c143ed66bf2e1e1bbbba1578469befc559077828910862d7fc81db2b6ceb68887
+DIST ovsdbapp-1.16.0.tar.gz 105855 BLAKE2B 4aad43209c9c51c526fd101b8dc34108cd331b455ba36564fd3d2c1907f7eded0b7811926fb1cbae692d53f878d8f058928a796d310ab222143cdb0aa181f8d0 SHA512 035db0ebb6677cd43c8943f027d61f09f7413fed42cc9e1d84bc71cdb87bab0a44660c0d8df9ab6239df118952e0a5ead0cca67dfc2bf28d5f4c50f4930ed672
diff --git a/dev-python/ovsdbapp/ovsdbapp-1.15.1.ebuild b/dev-python/ovsdbapp/ovsdbapp-1.16.0.ebuild
index d8d6fdca0240..d8d6fdca0240 100644
--- a/dev-python/ovsdbapp/ovsdbapp-1.15.1.ebuild
+++ b/dev-python/ovsdbapp/ovsdbapp-1.16.0.ebuild
diff --git a/dev-python/pycairo/pycairo-1.21.0.ebuild b/dev-python/pycairo/pycairo-1.21.0.ebuild
index 62abe4fd91a9..8a5b916d6e33 100644
--- a/dev-python/pycairo/pycairo-1.21.0.ebuild
+++ b/dev-python/pycairo/pycairo-1.21.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index 4c933257f85a..56437b11bf06 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,2 +1 @@
-DIST pylama-8.3.7.tar.gz 36264 BLAKE2B 8092320c039b5cd45a379a2718443cf03f5cef931767ae765c90096e3b23d5b7242034009eecb40413f05e2de2fd72a4285a91ebbc1fb474d232cffc9c992b94 SHA512 acfab9584e7bd8b146350e6af83975e91391e39c00a0fea23d4e55f46dd684b519088ed68c90e335e334e8526aecab2ad2286a0c082d26a4b867eadcbd8866c8
 DIST pylama-8.3.8.tar.gz 36319 BLAKE2B 5251bd32549793a8d06b6180a3e4f4c20f23dbdfecc146eb877222995bcadcf8cf8343f99ad897fb3e00c0f455762f82f4e3d157c34be6f21b4f220e87b636a2 SHA512 b55d7cb28a94f19270bde7ff6a8d760ef9132c845aaa85340271e42af6987fcc919ba9b0ddaebb6da6c1ffe789aaf39c83d273f8adea88db58a9218577899924
diff --git a/dev-python/pylama/pylama-8.3.7.ebuild b/dev-python/pylama/pylama-8.3.7.ebuild
deleted file mode 100644
index 1260868299df..000000000000
--- a/dev-python/pylama/pylama-8.3.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Code audit tool for python"
-HOMEPAGE="https://github.com/klen/pylama"
-SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/mccabe-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pydocstyle-6.1.1[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/eradicate[${PYTHON_USEDEP}]
-		dev-python/mypy[${PYTHON_USEDEP}]
-		dev-python/pylint[${PYTHON_USEDEP}]
-		dev-python/radon[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# not packaged
-	tests/test_linters.py::test_quotes
-	tests/test_linters.py::test_vulture
-)
diff --git a/dev-python/pylama/pylama-8.3.8.ebuild b/dev-python/pylama/pylama-8.3.8.ebuild
index 4c9fa241083d..4cba09640a46 100644
--- a/dev-python/pylama/pylama-8.3.8.ebuild
+++ b/dev-python/pylama/pylama-8.3.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 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="
 	>=dev-python/mccabe-0.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pymongo/pymongo-4.0.2.ebuild b/dev-python/pymongo/pymongo-4.0.2.ebuild
index 565026d64ba7..dad722db13ab 100644
--- a/dev-python/pymongo/pymongo-4.0.2.ebuild
+++ b/dev-python/pymongo/pymongo-4.0.2.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~hppa ~riscv ~x86"
 IUSE="doc kerberos"
 
 RDEPEND="
diff --git a/dev-python/pypng/pypng-0.0.21-r1.ebuild b/dev-python/pypng/pypng-0.0.21-r1.ebuild
index 4e637ea3cd38..6ffc43362f7d 100644
--- a/dev-python/pypng/pypng-0.0.21-r1.ebuild
+++ b/dev-python/pypng/pypng-0.0.21-r1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/pypng-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~riscv ~x86"
 
 python_test() {
 	"${EPYTHON}" code/test_png.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/rchitect/Manifest b/dev-python/rchitect/Manifest
new file mode 100644
index 000000000000..0016442365f2
--- /dev/null
+++ b/dev-python/rchitect/Manifest
@@ -0,0 +1 @@
+DIST rchitect-0.3.36.tar.gz 32682 BLAKE2B dbd9dec8d60f0b3558d0b8fac5c3a02e5ce210778b941b4cd994ee7f815205a34897605a8a7cd29e96791f223ba9d611bdf3064b93f13647c98084e9d07747bc SHA512 53b9cd3cc5cd566d39e74fd70dcb9b6eeb259885b57dde6c42beaea775db07b12f0745abc996218d0df0522d3db39919e953eb1bc13b8e89f69f583b6323476c
diff --git a/dev-python/rchitect/files/rchitect-0.3.36-no-pytest-runner.patch b/dev-python/rchitect/files/rchitect-0.3.36-no-pytest-runner.patch
new file mode 100644
index 000000000000..41ee0be51f96
--- /dev/null
+++ b/dev-python/rchitect/files/rchitect-0.3.36-no-pytest-runner.patch
@@ -0,0 +1,12 @@
+--- a/setup.py
++++ b/setup.py
+@@ -44,8 +44,7 @@
+     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
+     install_requires=install_requires,
+     setup_requires=[
+-        'cffi>=1.10.0',
+-        "pytest-runner"
++        'cffi>=1.10.0'
+     ],
+     extras_require={
+         "test": [
diff --git a/dev-python/rchitect/metadata.xml b/dev-python/rchitect/metadata.xml
new file mode 100644
index 000000000000..0a6791078c69
--- /dev/null
+++ b/dev-python/rchitect/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">randy3k/rchitect</remote-id>
+    <remote-id type="pypi">rchitect</remote-id>
+    <maintainer status="unknown">
+      <email>randy.cs.lai@gmail.com</email>
+      <name>Randy Lai</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rchitect/rchitect-0.3.36.ebuild b/dev-python/rchitect/rchitect-0.3.36.ebuild
new file mode 100644
index 000000000000..19894fd57bdd
--- /dev/null
+++ b/dev-python/rchitect/rchitect-0.3.36.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Interoperate R with Python"
+HOMEPAGE="
+	https://pypi.org/project/rchitect/
+	https://github.com/randy3k/rchitect
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/cffi-1.10.0[${PYTHON_USEDEP}]"
+DEPEND="
+	${RDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${P}-no-pytest-runner.patch" )
+
+distutils_enable_tests pytest
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index e7d8b5761f72..f8baeb212617 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,2 +1 @@
-DIST readthedocs-sphinx-ext-2.1.4.tar.gz 11218 BLAKE2B 9851da181b9d181715436dfb350bcaa2f8f6c5dbf56941d2f26457976cd5f5f1e32752b0fa39c65a7ca4f4f304e0e83bb9cd34dcc25a039e6f970d7ca6410a38 SHA512 dc3e70f55634e6769a0cd8778644389838884da7f175464e56c7766a1cef257bf6d4bd317a4dd4442fb46fc21714f5697991d1b2a764e40857eefae340b15278
 DIST readthedocs-sphinx-ext-2.1.5.tar.gz 12351 BLAKE2B 5cb3e821b04dabb492cac194ec3be4cdf5874811d8e57556c653611d4a1e2d57a38c00492662d1530f25f15a011834a7966af4c58b9f8f8fe71559753cf3d79d SHA512 0d2960ca55bf9be4faad0a8aa9cdcde74aaa69529b98be6059377ae037ce447d5919617fd8d4afb85ece6dc7f2693426e1a5574049025859e300211f7a5802fb
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild
deleted file mode 100644
index b1f0a3f8fa5d..000000000000
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Code specific for Read the Docs and Sphinx"
-HOMEPAGE="https://github.com/readthedocs/readthedocs-sphinx-ext"
-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"
-
-RDEPEND="
-	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-PDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${PDEPEND} )"
-
-# unittest should be sufficient but tests are very verbose, so pytest's
-# output capture is most welcome
-distutils_enable_tests pytest
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.5.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.5.ebuild
index b5f7fa5f3009..daf53a708ef2 100644
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.5.ebuild
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index a49a185e2a34..05d735f645c2 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,4 +1,3 @@
-DIST rich-11.2.0.gh.tar.gz 16300346 BLAKE2B 520f512a7e26613a4cc881834f8c150963b84a6dc3a43029dde6d64d1e405d82422b9c6f0098293b6f9bdb55749c7929426dad14840c9a287889c1a6a70f6bf2 SHA512 ec1178a6a320a48f589ead5163e974725f79ae63ddf9a2deb66400e43619ade8d366dbef6b524e66e603647a957b8e26266845a0bcb85912fd9ad2a81dd92f5e
 DIST rich-12.0.0.gh.tar.gz 14727980 BLAKE2B b9f7761ab1084765f804fd22f9fb18e659f91b917bb452217752683f6d61320d2703eee28de3be3bd70009fc06d04165528393c4c0ec32a49b1dc7e94989a224 SHA512 4e47e48709180ef844bcf1cd516b22de8a4f22c5121ca0582a2cff7297d97afe63232926d518cd2bf4d6d1a7cea362ab12e71eedacce6b6d378ef1a1528d9e4c
 DIST rich-12.0.1.gh.tar.gz 14857207 BLAKE2B 8e6419904ef0ba91d4b15059630f63769a28323600cb212f07c2a239201489e2078b8c4c792f486bde75efd9d09afe832fa2e2235ac91433ee24b33fcda02e68 SHA512 61077663b46a7e615b29df3b75b15ef97979c804abd283cc26f217ee8128b74a514fd7b92831d1d8928f768d2ec8230d8cd1da733106b424704a3187ee18ce95
 DIST rich-12.1.0.gh.tar.gz 14883003 BLAKE2B f11642b5a90934e95dd7d71707617c8a3a1680644dafa9535f86ed5648f14389cddd968c329d4d94649c15123dd00045e0e9e7bb3314be3e6bbc72ba67c100e1 SHA512 6144af9b8843592d586e1c54d5bd97b6974a2510746319c7c0e961f04515ab837088bde2d0876e1a3d33eff40f4dfd8babc3c3f8123f6a4472b7a3eca580d131
diff --git a/dev-python/rich/rich-11.2.0.ebuild b/dev-python/rich/rich-11.2.0.ebuild
deleted file mode 100644
index 4971dbb2b4f0..000000000000
--- a/dev-python/rich/rich-11.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/Textualize/rich"
-SRC_URI="
-	https://github.com/Textualize/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/rich-11.1.0-pypy3.patch
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# check for exact color render string, which changes across pygments bumps
-		tests/test_syntax.py::test_python_render
-		tests/test_syntax.py::test_python_render_simple
-		tests/test_syntax.py::test_python_render_indent_guides
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-12.0.0.ebuild b/dev-python/rich/rich-12.0.0.ebuild
index e7518f2f5ef7..2432dd98d98e 100644
--- a/dev-python/rich/rich-12.0.0.ebuild
+++ b/dev-python/rich/rich-12.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 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/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/simplesoapy/Manifest b/dev-python/simplesoapy/Manifest
deleted file mode 100644
index 920ac36ec772..000000000000
--- a/dev-python/simplesoapy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST simplesoapy-1.5.1.tar.gz 6129 BLAKE2B 766369677208a1cd58939e917fa16a30c87340fb6b76c5667913431625b89a8e97684ad4ba0af14fb4043ba42b2cec7f2b84eb968f128c3c3fc0e178c610cda5 SHA512 5ef0a4fcd84e1da9207154d4b8c4679e8aa2c9885ca76eacb17c4fbd39f489be459f52bfd42ee9b369790c33a02ecc5d776735cf1665f3ee034c1e315fdbb818
diff --git a/dev-python/simplesoapy/metadata.xml b/dev-python/simplesoapy/metadata.xml
deleted file mode 100644
index 4c97e9d9f5cd..000000000000
--- a/dev-python/simplesoapy/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>zerochaos@gentoo.org</email>
-  <name>Rick Farina</name>
- </maintainer>
- <maintainer type="project">
-  <email>radio@gentoo.org</email>
-  <name>Radio</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild b/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild
deleted file mode 100644
index a47b8fca33e9..000000000000
--- a/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Simple pythonic wrapper for SoapySDR library"
-HOMEPAGE="https://github.com/xmikos/simplesoapy"
-
-LICENSE="MIT"
-SLOT="0"
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/xmikos/simplesoapy.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xmikos/simplesoapy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	net-wireless/soapysdr[python]
-	net-wireless/soapysdr[${PYTHON_USEDEP}]"
diff --git a/dev-python/simplesoapy/simplesoapy-9999.ebuild b/dev-python/simplesoapy/simplesoapy-9999.ebuild
deleted file mode 100644
index a47b8fca33e9..000000000000
--- a/dev-python/simplesoapy/simplesoapy-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Simple pythonic wrapper for SoapySDR library"
-HOMEPAGE="https://github.com/xmikos/simplesoapy"
-
-LICENSE="MIT"
-SLOT="0"
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/xmikos/simplesoapy.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xmikos/simplesoapy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	net-wireless/soapysdr[python]
-	net-wireless/soapysdr[${PYTHON_USEDEP}]"
diff --git a/dev-python/simplespectral/Manifest b/dev-python/simplespectral/Manifest
deleted file mode 100644
index 01c21d5e93a0..000000000000
--- a/dev-python/simplespectral/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST simplespectral-1.0.0.tar.gz 5750 BLAKE2B 04ee4c90f9cda35ade1d250162ab1bcc278ae82a4d7f9a22d1aee6a1eceac7819ce6aa19f52e024469c51e08c00dc5f19253ff2b85d9b668dafdcd7a18c78d6f SHA512 16da3cb19cd7c567b64709a26ed5def7eb3047b08e2cb48db6962036a6c3e34c122dadf71821b6a22df55ebcf3c2ff95e3af3898efc8b4a6d5902e48de8e050c
diff --git a/dev-python/simplespectral/metadata.xml b/dev-python/simplespectral/metadata.xml
deleted file mode 100644
index 64c61db5ccfe..000000000000
--- a/dev-python/simplespectral/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>zerochaos@gentoo.org</email>
-  <name>Rick Farina</name>
- </maintainer>
- <maintainer type="project">
-  <email>radio@gentoo.org</email>
-  <name>Radio</name>
- </maintainer>
- 
- <use>
-  <flag name="faster">Use <pkg>dev-python/scipy</pkg> to speed up drawing</flag>
-  <flag name="fastest">Use <pkg>dev-python/pyFFTW</pkg> to speed up drawing to the max</flag>
- </use>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/simplespectral/simplespectral-1.0.0.ebuild b/dev-python/simplespectral/simplespectral-1.0.0.ebuild
deleted file mode 100644
index 48c8b8500f1a..000000000000
--- a/dev-python/simplespectral/simplespectral-1.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Heavily simplified scipy.signal.spectral module"
-HOMEPAGE="https://github.com/xmikos/simplespectral"
-
-LICENSE="MIT"
-SLOT="0"
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/xmikos/simplespectral.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xmikos/simplespectral/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-IUSE="faster +fastest"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-		faster? ( dev-python/scipy[${PYTHON_USEDEP}] )
-		fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/simplespectral/simplespectral-9999.ebuild b/dev-python/simplespectral/simplespectral-9999.ebuild
deleted file mode 100644
index 48c8b8500f1a..000000000000
--- a/dev-python/simplespectral/simplespectral-9999.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_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Heavily simplified scipy.signal.spectral module"
-HOMEPAGE="https://github.com/xmikos/simplespectral"
-
-LICENSE="MIT"
-SLOT="0"
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/xmikos/simplespectral.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xmikos/simplespectral/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-IUSE="faster +fastest"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-		faster? ( dev-python/scipy[${PYTHON_USEDEP}] )
-		fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-jinja/Manifest b/dev-python/sphinx-jinja/Manifest
deleted file mode 100644
index ced46ac0ff57..000000000000
--- a/dev-python/sphinx-jinja/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sphinx-jinja-1.1.0.tar.gz 7306 BLAKE2B 17b8df65f32e0b39eeed406b9bd71974a2b4399154b6d3bf13d9011c0d415b856345ec2fffff8fed39f893b7adb5fa1c012ebf80319ac6af74739e7fe9372229 SHA512 acbe1c2f2044b8e202db60a9964c509a33206c113ca2833dc43bb4849bc91e26b0c84959d8c8f2e5331c33c2e9de73c0348a3841740a5b7d260a43bf4876949f
-DIST sphinx-jinja-1.2.1.gh.tar.gz 16963 BLAKE2B 6ec67c6e212fa9e99705c02633416d1397a5ae36dc66984f2839609b9924930b6b5b49ff56b0b712f1326f6651f44d2ba3a15c0061cb6131517f6a463b12552b SHA512 31905aef35b87e5b44bc777a5bd01c5b9fe9350c849b918407710a6b75e26a1f217cd2524874ebb2b97c20c53c4f3fd678b1f166f8100eb81b489f23d114d24b
-DIST sphinx-jinja-1.4.0.gh.tar.gz 17768 BLAKE2B dec2f78020603882c45427f34a336537394d9c3454a6fa021969c8ea2ba0fa297be32565c7afd3f061c8ffeb644e86d8ede935222b3f71419d09038b213b70c8 SHA512 7762b38fa1bf8c7d6a2910aab6c8c80f8df446754f311375cff4c0d6c163bcde10475c2eb7fe2892bac1ab4c24d92984e96fbcdba65c2be100668247a7987c05
diff --git a/dev-python/sphinx-jinja/metadata.xml b/dev-python/sphinx-jinja/metadata.xml
deleted file mode 100644
index f0609a5259d1..000000000000
--- a/dev-python/sphinx-jinja/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- 
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-1.1.0.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-1.1.0.ebuild
deleted file mode 100644
index 5ef5b6a3d317..000000000000
--- a/dev-python/sphinx-jinja/sphinx-jinja-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A sphinx extension to include jinja based templates into a sphinx doc"
-HOMEPAGE="https://github.com/tardyp/sphinx-jinja https://pypi.org/project/sphinx-jinja/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -e "s/import urllib/import urllib.request as urllib/" \
-		-i sphinxcontrib/jinja.py || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-1.2.1-r1.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-1.2.1-r1.ebuild
deleted file mode 100644
index 5d4222f17a97..000000000000
--- a/dev-python/sphinx-jinja/sphinx-jinja-1.2.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=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="A sphinx extension to include jinja based templates into a sphinx doc"
-HOMEPAGE="https://github.com/tardyp/sphinx-jinja https://pypi.org/project/sphinx-jinja/"
-SRC_URI="
-	https://github.com/tardyp/sphinx-jinja/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_install() {
-	# Avoid namespace collision: bug #829747
-	rm "${BUILD_DIR}"/lib/sphinxcontrib/__init__.py || die
-	distutils-r1_python_install
-}
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-1.4.0.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-1.4.0.ebuild
deleted file mode 100644
index b7310c33308a..000000000000
--- a/dev-python/sphinx-jinja/sphinx-jinja-1.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="A sphinx extension to include jinja based templates into a sphinx doc"
-HOMEPAGE="https://github.com/tardyp/sphinx-jinja https://pypi.org/project/sphinx-jinja/"
-SRC_URI="
-	https://github.com/tardyp/sphinx-jinja/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_install() {
-	# Avoid namespace collision: bug #829747
-	rm "${BUILD_DIR}"/lib/sphinxcontrib/__init__.py || die
-	distutils-r1_python_install
-}
diff --git a/dev-python/sphinx-tabs/Manifest b/dev-python/sphinx-tabs/Manifest
index 866c7a910b6d..6f7cb8f0940d 100644
--- a/dev-python/sphinx-tabs/Manifest
+++ b/dev-python/sphinx-tabs/Manifest
@@ -1,3 +1,2 @@
-DIST sphinx-tabs-3.1.0.tar.gz 521642 BLAKE2B 10fb138f62ff98316b348437d1fcb0354060a89902b6706919d4439800b79b94d68fb871d37abe3ac5d19a7920c928143251c5d58d5f66979b9e551797d8f9c3 SHA512 4e278e860a763cc03981dc15ed493fb1a9c43f671031eadf7c75412687543e4eaa75c60d527fd6c7f815d4abe79a833cf11ff97b660c47b635fc8b0b3c77bf3f
 DIST sphinx-tabs-3.3.0.tar.gz 523885 BLAKE2B a02426197dad8d68f57d94804f9c8488236943719e26c3b65f0bea0f539c9be2ef11d9df9b69810081f354cfdbdf8bf5e52806b79b902a3c6bdc0bb36df9e61a SHA512 95b601ac08bf69c96b97834878b2794d0fc0e3aed860c5bbb174e039207b6dc07369f8a5108353a1823e76ac42d0068d4d5185992b1124e9b71ee7cd9c8dc778
 DIST sphinx-tabs-3.3.1.tar.gz 523932 BLAKE2B 8b941eb549ea8a10fcd329e880b8fa15742ba7903f4f9d6422335cf889c344a1fec8f16798c286b0c0f7561c128ea297153c31d0445b867e5e23f7960698d31a SHA512 d93ba1149a20711b52f8a76f22d212fdbb97349561f3e13b53873cdb4dba8f18f645e2d73ef378c2dde3d1c0c585c1402d73f4102da0e973be0c90a5912e7036
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
deleted file mode 100644
index fbb1c148c23a..000000000000
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tabbed views for Sphinx"
-HOMEPAGE="https://github.com/executablebooks/sphinx-tabs"
-SRC_URI="https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-python_test() {
-	# Unpackaged rinohtype
-	epytest --deselect 'tests/test_build.py::test_rinohtype_pdf'
-}
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.3.0.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.3.0.ebuild
index 928835674af0..c4212c734259 100644
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.3.0.ebuild
+++ b/dev-python/sphinx-tabs/sphinx-tabs-3.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 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/docutils-0.17*[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild
index f07265de4257..06e66eb9d823 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 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/six[${PYTHON_USEDEP}]
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index 71e63171ae3a..729d80cf7b9e 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,2 +1 @@
-DIST terminado-0.13.1.tar.gz 16770 BLAKE2B ee95896d8fea06496ff9c7b44e081719227fa83ac612a40919ecbd979b0078df3a66f69b9a0ce2b944f4e6d181208f6918a1d69ffb3315bea7793c1f1c449eb1 SHA512 80d0ae11debd302b561d27ebf5f62cd8e318f0f0585818b71da5bf3fa43da497c0a7a90f4c23330e4d7e65c1f879db2df1e80768d9f45bbb5a7dd9e4362b4198
 DIST terminado-0.13.3.tar.gz 17060 BLAKE2B b91358209f190a831c45b73b06616d6101cda0ffe2768dea2e60e679e631d523335eebde46f721efc304bfdc3b6da329081219f1eb07bd1b306cd53b13465eed SHA512 8dfbf917f4700b1ad8d18a16439d66c0d98e6b115591cc453041d3132c349037fcdab281668519d2af2fa314830fc9d2366030fd69917385e7df23ec87b46a8f
diff --git a/dev-python/terminado/terminado-0.13.1.ebuild b/dev-python/terminado/terminado-0.13.1.ebuild
deleted file mode 100644
index d7263d6ecb8b..000000000000
--- a/dev-python/terminado/terminado-0.13.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	www-servers/tornado[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
-	dev-python/ptyprocess[${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/terminado/terminado-0.13.3.ebuild b/dev-python/terminado/terminado-0.13.3.ebuild
index e6c473ba7fbe..f7f896c80f61 100644
--- a/dev-python/terminado/terminado-0.13.3.ebuild
+++ b/dev-python/terminado/terminado-0.13.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	www-servers/tornado[${PYTHON_USEDEP}]"
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index e5f2a880c796..1b6fde8f7c16 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -1,2 +1 @@
-DIST txaio-21.2.1.tar.gz 53383 BLAKE2B ff245c7e303a88e0e0f71bfa99ec5cfa2e6ec026e43e9477beb711cc753d73d4f49079727f9f86499779819fda74747edee00ebe22c0ac59c764c1403b983960 SHA512 762875b9c10304dab31dd54f7830f56b0cc26dd6e7a98c8faf57891a2810e36f53004833f872f0f51bad61cb62be033cfc228c99fd6aff60cd4dd2ae2f2e5c37
 DIST txaio-22.2.1.tar.gz 53645 BLAKE2B 375203ddbe65d293ba0bf85e316880d552f47cbc9008bd41e50976ee097940c626ec66ad25e0b5322493f71f77141d03f543ce9c9d83268a1a896b16f434ccaa SHA512 b5e33ba671ab215dadf4c348b01e9d5057d080c21707d31e38912fe596aabd7b388e8c5e0f2dd2b7d0d09fe0a175a0906e2a2ee428c1a943e786afa79182631e
diff --git a/dev-python/txaio/txaio-21.2.1.ebuild b/dev-python/txaio/txaio-21.2.1.ebuild
deleted file mode 100644
index 7903728f283f..000000000000
--- a/dev-python/txaio/txaio-21.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-	)
-"
-distutils_enable_sphinx docs \
-	'>=dev-python/sphinxcontrib-spelling-2.1.2' \
-	'>=dev-python/sphinx_rtd_theme-0.1.9'
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Take out failing tests known to pass when run manually
-	# we certainly don't need to test "python setup.py sdist" here
-	test/test_packaging.py
-)
-
-pkg_postinst() {
-	optfeature "Twisted support" "dev-python/twisted dev-python/zope-interface"
-}
diff --git a/dev-python/txaio/txaio-22.2.1.ebuild b/dev-python/txaio/txaio-22.2.1.ebuild
index 8f3afb6afafb..a2dfd8e886f3 100644
--- a/dev-python/txaio/txaio-22.2.1.ebuild
+++ b/dev-python/txaio/txaio-22.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx docs \
 	'>=dev-python/sphinxcontrib-spelling-2.1.2' \
diff --git a/dev-python/ufo2ft/Manifest b/dev-python/ufo2ft/Manifest
index fe175322b9d5..28493d4249a0 100644
--- a/dev-python/ufo2ft/Manifest
+++ b/dev-python/ufo2ft/Manifest
@@ -1,2 +1,2 @@
-DIST ufo2ft-2.25.3.tar.gz 173168 BLAKE2B 365a14dff4704f98a8c6ad1904420d01e367099e96d35fe9275e93dd30c4224d3c0f573fc5d0cb4bede7625e6eaeea58f14a1864fa22355ce4ee259f18a82f18 SHA512 eec5ddd997830bfb93c7545e94569d447f31f23ac74babe66bf5a3f552c709ef9add6da43b02a92f6990413aaa64b411dc8ed79151cf4debf5c38aadeb4ff856
 DIST ufo2ft-2.26.0.tar.gz 173354 BLAKE2B 6271498143219e7a6870dc66eacf99a0ef4f6a0216d6d41e20b74517b0efa68f9a0a950c17c92d0a080a26c0761a86cf88d4918efb76658e233d9b08b76d1e9d SHA512 6a6d07603c0335adbe74f6913bfa3cb33d5eaaf6fb8b3ff0d92744bb2aaddcfa14bbfeedfd18215d3483fe39e4c6166352387b639768ce90a7d9c4905a79900d
+DIST ufo2ft-2.27.0.tar.gz 174521 BLAKE2B 2b80fa7bf234860e2d61940c662435d3f1a0f7a254e9a79a2acda1aded5b2948840a8e74455f177b6a76e6d5dc2950fc2328589cdc517a98b863cef228326594 SHA512 f1475424730a98d8eee4b1c3fcbcace97b55e8b5109cae5ad5a1de191d30483ac9ecfc8e1ade3eabb0d04e12dfb2bfc73478b17d637d65c566b7ddf41dc0caec
diff --git a/dev-python/ufo2ft/ufo2ft-2.25.3.ebuild b/dev-python/ufo2ft/ufo2ft-2.27.0.ebuild
index bd412cf995cf..bd412cf995cf 100644
--- a/dev-python/ufo2ft/ufo2ft-2.25.3.ebuild
+++ b/dev-python/ufo2ft/ufo2ft-2.27.0.ebuild
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index f533b374a385..eafec87e347b 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,2 +1 @@
-DIST Unidecode-1.3.3.tar.gz 192050 BLAKE2B 74fe777ad25e78357499ed80f3cd9e43ef42d0a08e3b14e4916c57d43e0e296c6852722f84a3fd1c57911f7d97962cbe12043e3b68adad15d785793912ec53ed SHA512 1c42f2530fa68c56ded097a92b580a3b1c223c957711778b81dd92c8543068a76a87379db7fbe4d2dcb6a9a6c2fc2aef28ed950e0c07d411ae2891c00a8ffea7
 DIST Unidecode-1.3.4.tar.gz 192346 BLAKE2B 34edea805896022fa42f47929a55ba01850475cb49431c4c50329caa2f198455704224320887ac7dcad5fba3517ab42cafc8ade726e785be0d0141814a5ad455 SHA512 bdbf482abd0d93ea8d891b95aea9f95cca6f85dbe71cd2bef4664216b3aa1d672c2f4ecf3b8bf356cdb1d8e4a1141c296728498473d9d0067d9774d0a7de8d48
diff --git a/dev-python/unidecode/unidecode-1.3.3.ebuild b/dev-python/unidecode/unidecode-1.3.3.ebuild
deleted file mode 100644
index 1d2902095fe0..000000000000
--- a/dev-python/unidecode/unidecode-1.3.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=Unidecode-${PV}
-DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.org/project/Unidecode/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/unidecode/unidecode-1.3.4.ebuild b/dev-python/unidecode/unidecode-1.3.4.ebuild
index 5c6a08536a69..1d2902095fe0 100644
--- a/dev-python/unidecode/unidecode-1.3.4.ebuild
+++ b/dev-python/unidecode/unidecode-1.3.4.ebuild
@@ -16,6 +16,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/watchgod/watchgod-0.8.ebuild b/dev-python/watchgod/watchgod-0.8.ebuild
index 1c6e27e1ddf5..ab05b0d678c3 100644
--- a/dev-python/watchgod/watchgod-0.8.ebuild
+++ b/dev-python/watchgod/watchgod-0.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 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/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index d579ea2c3d79..579fdc38feb7 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,2 +1 @@
-DIST widgetsnbextension-3.5.1.tar.gz 1112877 BLAKE2B 9608a4bb385e697685383e52ee3a17127b87dded4e8edd22233ed03ec837818798a8c08709a83ef7c13995797ebc1b43961e2bc8592e542c5b4fe7c2f5f08f7b SHA512 484f6d91e36ab734c02675973e9007b1f379f1a1cb762c863ad0d80c8c6eb8c9c49a138b3280894ed17ed86775f517a13790cb4537e1cf8bcbdc57e72d13cc2b
 DIST widgetsnbextension-3.6.0.tar.gz 802154 BLAKE2B ef6b56c9ba2e40dde4a6ca40687488fd823886ab5eae474558b994f8a4206c4665e3ed4d953deb93a6261d3f55f3b514ec44eae3aa10bf699e8d2378f1669631 SHA512 d00b0e8d5edfc85ea1a9ac036dbdbe0b0ac6cb0eb694fc999f81e8f615e2a637890a2d5383c0f0ea041d886dbddf2e7036f8163fae0b8c3b5aa315a072b3ff7a
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
deleted file mode 100644
index af1d495f77df..000000000000
--- a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="https://ipython.org"
-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 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/notebook[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.6.0.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.6.0.ebuild
index 989b4d976cfa..35d9afc512fa 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-3.6.0.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.6.0.ebuild
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/wrapt/wrapt-1.14.0.ebuild b/dev-python/wrapt/wrapt-1.14.0.ebuild
index 2979fbcd4e07..6c18704e0e00 100644
--- a/dev-python/wrapt/wrapt-1.14.0.ebuild
+++ b/dev-python/wrapt/wrapt-1.14.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 04b583e3741d..49f92e7d0f6d 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,2 +1 @@
 DIST xmlschema-1.10.0.tar.gz 396057 BLAKE2B 44facdb16e79ddf16ca798b937c4cf35444f9d31278c26121f179e5055134b82d425cc5b69a8a2e4fdd44388cbd3e96534b55794a267a3b4c0b606752ede533e SHA512 c4358b210cc96e46617cc11b1b7e2a4d69c1bd6489cc73602552b184f209eb90b13eff353741aa7b1dbc3ff8514f90b7bb331ac18ffc466b3ce36f42f7497899
-DIST xmlschema-1.9.2.tar.gz 394954 BLAKE2B c8d932827f03962fcd6b1408d25cb4079b84d44984227c53922587d9c61dcf16e2b46c7df16a2795623017c1b844f3fca497e5856b6d6b2a475eabf1c49cc4cc SHA512 99abc53da52ba8f7f0f269c791b227d2b5c81d7ede847ccd98e18c5817ddd988ba26b88ad5afe0a0933e0c5af5425c0efdd4a1beb218d009e476de5b2931a0fb
diff --git a/dev-python/xmlschema/xmlschema-1.10.0.ebuild b/dev-python/xmlschema/xmlschema-1.10.0.ebuild
index 165b2429f8fa..4242c5564211 100644
--- a/dev-python/xmlschema/xmlschema-1.10.0.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 )"
 
diff --git a/dev-python/xmlschema/xmlschema-1.9.2.ebuild b/dev-python/xmlschema/xmlschema-1.9.2.ebuild
deleted file mode 100644
index 248c02a92d41..000000000000
--- a/dev-python/xmlschema/xmlschema-1.9.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{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}"
-}
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-04-16 01:43:33 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-04-16 01:43:33 +0000
commit	ec74c1107bf15a7200aec53e44515e7498d5226a (patch)
tree	47e04d8fcfeaa383b61adfcea44c822164d6bbd7 /dev-python
parent	ffd6525753ba8f0883efd0de78e3db8b571df1de (diff)
download	baldeagleos-repo-ec74c1107bf15a7200aec53e44515e7498d5226a.tar.gz baldeagleos-repo-ec74c1107bf15a7200aec53e44515e7498d5226a.tar.xz baldeagleos-repo-ec74c1107bf15a7200aec53e44515e7498d5226a.zip