Adding metadata

60 files changed, 66 insertions, 1027 deletions

diff --git a/dev-python/blinker/files/blinker-1.4-pytest.patch b/dev-python/blinker/files/blinker-1.4-pytest.patch
deleted file mode 100644
index e5c2b04998b5..000000000000
--- a/dev-python/blinker/files/blinker-1.4-pytest.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8238e16c699ce7f99f5ff3f80d03d332d72015f8 Mon Sep 17 00:00:00 2001
-From: pgajdos <pgajdos@suse.cz>
-Date: Wed, 8 Jul 2020 15:22:19 +0200
-Subject: [PATCH] use pytest instead of deprecated nose
-
----
- tests/test_signals.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_signals.py b/tests/test_signals.py
-index 2d6a65a..e74db47 100644
---- a/tests/test_signals.py
-+++ b/tests/test_signals.py
-@@ -4,7 +4,7 @@
- 
- import blinker
- 
--from nose.tools import assert_raises
-+import pytest
- 
- 
- jython = sys.platform.startswith('java')
-@@ -227,7 +227,7 @@ def receiver(sender, **kw):
-         pass
-     sig = blinker.Signal()
- 
--    assert_raises(TypeError, sig.connect, receiver)
-+    pytest.raises(TypeError, sig.connect, receiver)
-     assert not sig.receivers
-     assert not sig._by_receiver
-     assert sig._by_sender == {blinker.base.ANY_ID: set()}
diff --git a/dev-python/commentjson/commentjson-0.9.0-r1.ebuild b/dev-python/commentjson/commentjson-0.9.0-r1.ebuild
deleted file mode 100644
index 6c8b2b3bd585..000000000000
--- a/dev-python/commentjson/commentjson-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2022 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="Add Python and JavaScript style comments in your JSON files"
-HOMEPAGE="
-	https://pypi.org/project/commentjson/
-	https://github.com/vaidik/commentjson/
-"
-SRC_URI="
-	https://github.com/vaidik/commentjson/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/lark[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# remove lark-parser dependency to allow painless upgrade to lark
-	sed -i -e '/lark-parser/d' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/commentjson/commentjson-0.9.0-r2.ebuild b/dev-python/commentjson/commentjson-0.9.0-r2.ebuild
index 2f49e070195b..4ae969699ae6 100644
--- a/dev-python/commentjson/commentjson-0.9.0-r2.ebuild
+++ b/dev-python/commentjson/commentjson-0.9.0-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/lark[${PYTHON_USEDEP}]
diff --git a/dev-python/commentjson/metadata.xml b/dev-python/commentjson/metadata.xml
index 7ad11570cc7d..a0d4c5913ba0 100644
--- a/dev-python/commentjson/metadata.xml
+++ b/dev-python/commentjson/metadata.xml
@@ -6,4 +6,5 @@
  </maintainer>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/confuse/Manifest b/dev-python/confuse/Manifest
index a04cc49afb94..d697b03cbb94 100644
--- a/dev-python/confuse/Manifest
+++ b/dev-python/confuse/Manifest
@@ -1,2 +1 @@
-DIST confuse-1.7.0.tar.gz 49171 BLAKE2B f102ed445d4fc259739305f745fea6c1fef90fe4d8eb7b77bb6c370d37929807478df86ad78ffc8fc2fb1d4cd7033d76e34d880d6dab6721b5fd6cc0e7f5d02a SHA512 0da6cb237aa31f63cf6d2df2e90eb27e7b1a81bd126546a4314425b9dc1d9f993232b4787815abaf7ef4b54ef03ac3286c321e6654fdf18f05f92aa69c3da78e
 DIST confuse-2.0.0.gh.tar.gz 48269 BLAKE2B 58b96ab65da7b48236b798ad5546a72f0f74934c42525b26b44c0aad08ba4de385dbc2dd6915a4b570b1c4e59003e23119f0da80cf84b1bbc88abb9f72d4d8b1 SHA512 53732ef24903bc464f4cda0c9a2728814ff286c2e2a2150b4703b61f925d5bf77d75b98469a4fb92267caeec736e51d33285264f3fd8daa4adaaf23fa9511733
diff --git a/dev-python/confuse/confuse-1.7.0-r1.ebuild b/dev-python/confuse/confuse-1.7.0-r1.ebuild
deleted file mode 100644
index 798d0f03ba37..000000000000
--- a/dev-python/confuse/confuse-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,25 +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 )
-DISTUTILS_USE_PEP517=flit
-
-inherit distutils-r1
-
-DESCRIPTION="Confuse is a configuration library for Python that uses YAML"
-HOMEPAGE="https://github.com/beetbox/confuse"
-SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	'dev-python/sphinx_rtd_theme'
diff --git a/dev-python/confuse/confuse-2.0.0.ebuild b/dev-python/confuse/confuse-2.0.0.ebuild
index 0d824b5d4f5b..42805701074f 100644
--- a/dev-python/confuse/confuse-2.0.0.ebuild
+++ b/dev-python/confuse/confuse-2.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index f803db8b211c..c2fdff9c1620 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,2 +1 @@
-DIST dulwich-0.20.44.tar.gz 425226 BLAKE2B ba120c682b0fd298a9f17eec524ffdd92af9024e30d0b8c52accda3ef8a1d4876b483e8aaa5f12b4beb73a6c1719ed4504c52396cd355244ab688ceab551faaf SHA512 124a3ae89abf5df9e192919f916012be67112195fc7cfd7c30e814a04d93749a3dc396e12f2d8df1456b113a24cdd1b2f3a1f2733864d5cfad22431a987c25fb
 DIST dulwich-0.20.45.tar.gz 424373 BLAKE2B 4eb6731312bd8bb45d35efdc1e640dd2cfb118b633de461c4f9ffa2a9e50258bada2c77b4d4bf2e72bc9947f143f89fd720e4e9411f0f84d67ab208f39f7b4b8 SHA512 5b7217fac88a84591e42db2cd3c812a0aae6482221e1da9474df9b3fd968a80b653353fec804103f36a29f0f96e650267f124575a260dd082a3106de5f13fc7b
diff --git a/dev-python/dulwich/dulwich-0.20.44.ebuild b/dev-python/dulwich/dulwich-0.20.44.ebuild
deleted file mode 100644
index 3c885a7a98c6..000000000000
--- a/dev-python/dulwich/dulwich-0.20.44.ebuild
+++ /dev/null
@@ -1,59 +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="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/jelmer/dulwich/
-	https://pypi.org/project/dulwich/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		!hppa? ( !ia64? ( !s390? (
-			dev-python/gevent[${PYTHON_USEDEP}]
-			dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		) ) )
-		app-crypt/gpgme[python,${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.20.45.ebuild b/dev-python/dulwich/dulwich-0.20.45.ebuild
index f1210cad0d15..3c885a7a98c6 100644
--- a/dev-python/dulwich/dulwich-0.20.45.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.45.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/future/future-0.18.2-r1.ebuild b/dev-python/future/future-0.18.2-r1.ebuild
deleted file mode 100644
index fc9653d1c9a4..000000000000
--- a/dev-python/future/future-0.18.2-r1.ebuild
+++ /dev/null
@@ -1,39 +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="Easy, clean, reliable Python 2/3 compatibility"
-HOMEPAGE="https://python-future.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		' 'python*')
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-bootstrap-theme
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tests.patch
-	"${FILESDIR}"/${P}-py39.patch
-	"${FILESDIR}"/${P}-py39-fileurl.patch
-	"${FILESDIR}"/${P}-py3.10.patch
-)
-
-EPYTEST_DESELECT=(
-	# tests requiring network access
-	tests/test_future/test_requests.py
-	tests/test_future/test_standard_library.py::TestStandardLibraryReorganization::test_moves_urllib_request_http
-	tests/test_future/test_standard_library.py::TestStandardLibraryReorganization::test_urllib_request_http
-)
diff --git a/dev-python/html2text/html2text-2020.1.16-r1.ebuild b/dev-python/html2text/html2text-2020.1.16-r1.ebuild
deleted file mode 100644
index b08a3713d8b4..000000000000
--- a/dev-python/html2text/html2text-2020.1.16-r1.ebuild
+++ /dev/null
@@ -1,25 +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="Turn HTML into equivalent Markdown-structured text"
-HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.md )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# naming conflict with app-text/html2text, bug 421647
-	sed -i 's/html2text = html2text.cli:main/py\0/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/html2text/html2text-2020.1.16-r2.ebuild b/dev-python/html2text/html2text-2020.1.16-r2.ebuild
index bad4301071f3..75e8586601e7 100644
--- a/dev-python/html2text/html2text-2020.1.16-r2.ebuild
+++ b/dev-python/html2text/html2text-2020.1.16-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 
 DOCS=( AUTHORS.rst ChangeLog.rst README.md )
 
diff --git a/dev-python/html2text/metadata.xml b/dev-python/html2text/metadata.xml
index 853174b8f2ab..ea8988e8af6a 100644
--- a/dev-python/html2text/metadata.xml
+++ b/dev-python/html2text/metadata.xml
@@ -7,4 +7,5 @@
  </maintainer>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index 218cc6809b53..1053f596b198 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,2 +1 @@
-DIST irc-20.0.0.tar.gz 88662 BLAKE2B 627354a051964e53322484c8a2c28487e25738b21c485121589af331e2da59b80c5704ef4268ff0bac3e84d26f77af031ba6ce0064a46496e846c7160462a5f9 SHA512 cd54e20075e97d7c8259275514741f9bb2f93712b1cc8628399fb7d4b37ff7d1d6515be14f5326fa30e59f49cfb853b954f4f095b4d3cac870a63a9946cfbed2
 DIST irc-20.1.0.tar.gz 89157 BLAKE2B 42498e63e1d62a5c2e545f1d0d581bdbc9f49228ec14e523f4add130b903be2a736072b8ad53775a7f16298a7c57761d8c06053570dc01a338491593564b3fd7 SHA512 83a988b5f75c1d55376a140519725749824dbc9f32e6b0e5d3684d9c58973a746ae517441594cfa745edb89a0fbd98ef847e937a620548fed4e344b66a97ad1c
diff --git a/dev-python/irc/irc-20.0.0-r1.ebuild b/dev-python/irc/irc-20.0.0-r1.ebuild
deleted file mode 100644
index 7d3fc46f39bb..000000000000
--- a/dev-python/irc/irc-20.0.0-r1.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="IRC client framework written in Python"
-HOMEPAGE="
-	https://github.com/jaraco/irc/
-	https://pypi.org/project/irc/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-itertools-1.8[${PYTHON_USEDEP}]
-	dev-python/jaraco-logging[${PYTHON_USEDEP}]
-	dev-python/jaraco-stream[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/scripts"
-		dodoc -r scripts
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index 400bdca9c651..1003b8128e7c 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1 +1,2 @@
 DIST jaraco.logging-3.1.0.tar.gz 11801 BLAKE2B 858f0930b7e04ea6f1e3d13b3d7be1056ad9efa901857ded3759e450e151c8485feb1cb6eb91c8ebf7be53c649bc818759009394b20f606fd5551c82ce0d1e61 SHA512 ce9a9cbad6d6bb448615eac986d361f9c6ff477b1209e85433f12a49055a9e30125cd49bebcf915a08b8efe0732439a8e1d336e63f6454369b3e846a9a1383ba
+DIST jaraco.logging-3.1.1.gh.tar.gz 10804 BLAKE2B 32d978ae8e9105986926649dcccd710aea44e2b8ea2f4b41dfdb6cb6512cc8597951909c4e217d608245fb37b29ced544429b4f960d080f5a3436f454d042826 SHA512 80cca221c713b3868ac06332451c2bf31cb3c95e27b82275a8cd70533cd790b4e420a5851c0a5ba067a85aa4efa266e38e2b5792e2a0e97fde158357b16b1794
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.1.1.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.1.ebuild
new file mode 100644
index 000000000000..437dc896c71d
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-3.1.1.ebuild
@@ -0,0 +1,45 @@
+# 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="${P/-/.}"
+DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.logging/
+	https://pypi.org/project/jaraco.logging/
+"
+SRC_URI="
+	https://github.com/jaraco/jaraco.logging/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/tempora[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	# create a pkgutil-style __init__.py in order to fix pytest's
+	# determination of package paths
+	cat > jaraco/__init__.py <<-EOF || die
+		__path__ = __import__("pkgutil").extend_path(__path__, __name__)
+	EOF
+	epytest --doctest-modules
+}
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index df7e9a2f95dc..806e607d5d45 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,2 +1 @@
-DIST kiwi-1.4.3.gh.tar.gz 91238 BLAKE2B bdd6164eb428e6769ae7de2a8e689a3944e13e81aef9a839d9f68459deb7e7c0840b0eb59e70932e5c1d835444c515c8cb66fa47f40d8fc6244de47852be57d6 SHA512 04205555da46e772f2d25a481c4d966dc7bab8a541434a7c183e1b4f41ccd6e06aec564f2a95dae649585d337c1bf818a7cf24727460ad14669a3b3d74c74274
 DIST kiwi-1.4.4.gh.tar.gz 91343 BLAKE2B a5e345509e7294eaf89e1361c035b3ef5d672d335682dbb426196d22876762b1f729cc728300f731a42afbfdf2828591f83cc53daf28e8d4c451a1b246b4800f SHA512 9a7ed487bb28f8c430543dc21ea59156078c129fd29b1382f1578368e72f312f4e813eb4501e4c9387647b42b085b93d4bd27d0e846f1396fa4ce68fd9e9ba5f
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild
deleted file mode 100644
index 51ab2c953c3d..000000000000
--- a/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild
+++ /dev/null
@@ -1,37 +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
-
-MY_P=kiwi-${PV}
-DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
-HOMEPAGE="https://github.com/nucleic/kiwi/"
-SRC_URI="
-	https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Clear-BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-COMMON_DEPEND="
-	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-"
-BDEPEND="
-	${COMMON_DEPEND}
-	>=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.4.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.4.ebuild
index 71d7261aab5a..b3c150a344cf 100644
--- a/dev-python/kiwisolver/kiwisolver-1.4.4.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.4.4.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Clear-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"
 
 COMMON_DEPEND="
 	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/netifaces/netifaces-0.11.0-r1.ebuild b/dev-python/netifaces/netifaces-0.11.0-r1.ebuild
index 5af9260614d0..1cdb0835704d 100644
--- a/dev-python/netifaces/netifaces-0.11.0-r1.ebuild
+++ b/dev-python/netifaces/netifaces-0.11.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
 
diff --git a/dev-python/netifaces/netifaces-0.11.0.ebuild b/dev-python/netifaces/netifaces-0.11.0.ebuild
deleted file mode 100644
index b7e6e4b3e1c2..000000000000
--- a/dev-python/netifaces/netifaces-0.11.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 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="Portable network interface information"
-HOMEPAGE="
-	https://pypi.org/project/netifaces/
-	https://alastairs-place.net/projects/netifaces/
-	https://github.com/al45tair/netifaces
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index b6c1a81737be..142400f3b752 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,2 +1 @@
 DIST openstacksdk-0.100.0.tar.gz 1065692 BLAKE2B 7941cb9a14f10924953ad114f9bce4847b7e26bbea4622790503209ab70a01c254f2ec59d3f794f64d1ecc8f320a9a2be2db8015cccad8b20fe06dc1e72683d0 SHA512 c3e47510518bc4abac78aab654f6f8aa7c0deec3f4355ec7ea064ffa32c1862a9015806fd04cc1975c3d7e688e9c5ee66e3837baa21ae6c82db8f39b4b8f8330
-DIST openstacksdk-0.99.0.tar.gz 1060314 BLAKE2B 0c8f641e301ba4fb8ca83e651f85f8ba98aa73904b2e94b15b17d99354aace5b73ba243c4e624e4c53dd7fb1deb147801aee93233f1fe019a0068873530bdb37 SHA512 5e15f29002231dbad15e7a2dadaa97e64ed191389d259222880a7e40984d6fbcd9d1602a041164e4f819141417d108a179171b4c1430947dc5c5e9cdc5409aea
diff --git a/dev-python/openstacksdk/openstacksdk-0.99.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.99.0.ebuild
deleted file mode 100644
index 99f45f1ebedd..000000000000
--- a/dev-python/openstacksdk/openstacksdk-0.99.0.ebuild
+++ /dev/null
@@ -1,85 +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="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="https://github.com/openstack/openstacksdk/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-CDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index 0adbb3d6b351..4f882a1d43a2 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,2 +1 @@
-DIST osc-lib-2.6.0.tar.gz 98452 BLAKE2B b22bcce4a0cdc787422f4fa2d63cae8a289801f5e04bbb2623f261017887e936d2514016ee38aa5b2e4f6e87f137f1d9f59a289b589cd0d6ccce21c54065ccd1 SHA512 b97935da923bbd802ba32a70a91084ca60377a0995b1b204053409c87865dda2a88e8bbf9adf3ed6fb05169448a9d1793a9ea00bc0199f17f86201989159621a
 DIST osc-lib-2.6.1.tar.gz 98508 BLAKE2B 26ca0229c174ac17e17a3b3075e5a225add8272fbf6c28fd1cda40acff5c34092bc37ed7e8f4004734c5509213b9a92915c15e9f37e8e032d99f30fb143b7505 SHA512 ed62fe45ed324d2fa672b4d0366df2db0462e6fa40820ee028540afe853e394293d60d72168d09313fd86f204a55784fce7c038ed906a9b2f8b587f4958f3391
diff --git a/dev-python/osc-lib/osc-lib-2.6.0.ebuild b/dev-python/osc-lib/osc-lib-2.6.0.ebuild
deleted file mode 100644
index f83e0ed02661..000000000000
--- a/dev-python/osc-lib/osc-lib-2.6.0.ebuild
+++ /dev/null
@@ -1,47 +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="A package of common support modules for writing OSC plugins"
-HOMEPAGE="https://github.com/openstack/osc-lib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# need to skip all tests under TestTagHelps class
-	# checks exact help message, based on another unittest runner
-	sed -e '179,$s/test_add_tag_/_&/' -i osc_lib/tests/utils/test_tags.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/osc-lib/osc-lib-2.6.1.ebuild b/dev-python/osc-lib/osc-lib-2.6.1.ebuild
index 61281595b64e..ebdb7eeddfd4 100644
--- a/dev-python/osc-lib/osc-lib-2.6.1.ebuild
+++ b/dev-python/osc-lib/osc-lib-2.6.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 8b81133424fa..690a371baaee 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,3 +1 @@
-DIST pikepdf-5.3.2.gh.tar.gz 2886857 BLAKE2B 343006c8123bd814a93d1863442e9fdf80d93ae020ae6b4471cbae640653e74f3652c7c3e32d2e5ec68f5425f24a34543c0d712d78320d46db9bdb8db64ce1bb SHA512 3586a8f33550698d9b49852d741ebea7fd06e3afdbd7f1ed74ba7d9f8bbc086ff35ed964dd065f1e764f6690b3a708440eee97857591829a565acf2f0702ae33
-DIST pikepdf-5.4.0.gh.tar.gz 2891493 BLAKE2B 12aec9e7fe22c9e372886bdf3c32d509f13a92fe0526469445f801ecb3b92d8fb27ad817bee6fc1845a3057d6fe56cfde5712907e9a89fc16412a1528e988504 SHA512 5be5f1d79a4fb9119aa4aed8fd4e0d02f53a7affe39c8b019aad3717b20ec303e8dbd3ac19d57e099c591ea7a29cbaf786b40d5235850f756bc17fe5335324fd
 DIST pikepdf-5.4.2.gh.tar.gz 2901145 BLAKE2B d7559901f59e5bd08ef660b88a4e9d50ac1bb64b397bcd56c1ed707ea7c0d9eca61d7ffe9e98361c01f3b71b640a9da1376c130fa5dff3324bbe2d64ce267347 SHA512 9afbd565ae82c65f743ffe7dc37509a15b03a1057bbdf4243ebacf4e0d315f9dead31fcd0f8b34023850a4d85aec302c229b1df0f045db4b1a8c171b58732b48
diff --git a/dev-python/pikepdf/pikepdf-5.3.2.ebuild b/dev-python/pikepdf/pikepdf-5.3.2.ebuild
deleted file mode 100644
index 1ecb35a7f85b..000000000000
--- a/dev-python/pikepdf/pikepdf-5.3.2.ebuild
+++ /dev/null
@@ -1,59 +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
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="
-	>=app-text/qpdf-10.6.2:0=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pillow-9[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/-n auto/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-5.4.0.ebuild b/dev-python/pikepdf/pikepdf-5.4.0.ebuild
deleted file mode 100644
index cea416014946..000000000000
--- a/dev-python/pikepdf/pikepdf-5.4.0.ebuild
+++ /dev/null
@@ -1,61 +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
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=app-text/qpdf-10.6.2:0=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pillow-9[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/-n auto/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-5.4.2.ebuild b/dev-python/pikepdf/pikepdf-5.4.2.ebuild
index cea416014946..4486598c3710 100644
--- a/dev-python/pikepdf/pikepdf-5.4.2.ebuild
+++ b/dev-python/pikepdf/pikepdf-5.4.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="
 	>=app-text/qpdf-10.6.2:0=
diff --git a/dev-python/pybind11/pybind11-2.10.0.ebuild b/dev-python/pybind11/pybind11-2.10.0.ebuild
index 256f7814d3a4..6ebdacd991d1 100644
--- a/dev-python/pybind11/pybind11-2.10.0.ebuild
+++ b/dev-python/pybind11/pybind11-2.10.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 900c6caefaac..df901fe0368e 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,2 +1 @@
-DIST pylint-2.14.4.gh.tar.gz 1275701 BLAKE2B a91dee4c2feb83fb98d0782cd7bbfa81752cc00c707a7b2fbeacf42c6857819d8d4cfffd4caf897af0fd38237d881cfa3b9f57a7e6eb34bee59e0203e3cdd9f3 SHA512 ee305d880052c4e1ebf939201fb5d5d52b642b5130c3314aa91eaad1a413e33e2665a935df1f7a73a3745660de3d3f0a3bed10b2871d840f73bfd2fee651d2b5
 DIST pylint-2.14.5.gh.tar.gz 1275994 BLAKE2B 0d490e81f758cca0ff5c4108090414373c3276b3a51f54df26938e128d82b15ca976cb62d999d8b012ce1fe69b56988a385110be02b1d2a281e39d9f91cdb378 SHA512 8c4d2b17c078c305b081e7dd225a1e744420e01b27f63217f80d61e6bcd0e4f8381c94c504cacd3b8f96cc58c3c53d693fb59277ccbd396ea31f6c72af666042
diff --git a/dev-python/pylint/pylint-2.14.4.ebuild b/dev-python/pylint/pylint-2.14.4.ebuild
deleted file mode 100644
index 89371245211b..000000000000
--- a/dev-python/pylint/pylint-2.14.4.ebuild
+++ /dev/null
@@ -1,82 +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="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/PyCQA/pylint/
-"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/pyproject.toml#L34 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.11.6[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf pylint || die
-
-	local EPYTEST_DESELECT=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-
-		# TODO
-		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		'tests/test_functional.py::test_functional[no_name_in_module]'
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
-		tests/config/pylint_config/test_run_pylint_config.py::test_invocation_of_pylint_config
-	)
-	epytest
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pypng/Manifest b/dev-python/pypng/Manifest
index 824b61ec3591..ef0e01cd5d5e 100644
--- a/dev-python/pypng/Manifest
+++ b/dev-python/pypng/Manifest
@@ -1,2 +1 @@
-DIST pypng-0.0.21.tar.gz 111899 BLAKE2B b4b8f17b76918f415c02edc09a597af643615f46839fb4464f3116e4cefb0a251227f344ff2c1c51efb87933faf647bfa6a7c4d89bc91c8389a3dc71479e878d SHA512 b8f5f9be05aafe59aeb69462b7ccc9e5c4df8eb157731d888773f0ef223dc1c45db83daa51347b45dc3c59be5141c3fc4e031004ac28927b786d7e254ffff4fa
 DIST pypng-pypng-0.20220715.0.tar.bz2 103437 BLAKE2B 4079df64f54a2f7f38ac0515c6be7d1b1048d5662c4bee78d0d1cbc014b3a560c7458845b8be07d499644e112a5b92aac890d887c0165577daeded09ca69a69d SHA512 48e254be1631c626bea366bcac5d8123bda14378d27ee95b4b80ae172821a9b194f136be315ae3539a6d1ad3e712a795f5cc60938b55941e441c64ec40feccb0
diff --git a/dev-python/pypng/pypng-0.0.21-r1.ebuild b/dev-python/pypng/pypng-0.0.21-r1.ebuild
deleted file mode 100644
index a28419eb8d55..000000000000
--- a/dev-python/pypng/pypng-0.0.21-r1.ebuild
+++ /dev/null
@@ -1,25 +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="Pure Python PNG image encoder/decoder"
-HOMEPAGE="
-	https://github.com/drj11/pypng/
-	https://pypi.org/project/pypng/
-"
-SRC_URI="https://github.com/drj11/pypng/archive/${P}.tar.gz"
-S=${WORKDIR}/pypng-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-
-python_test() {
-	"${EPYTHON}" code/test_png.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pypng/pypng-0.20220715.0.ebuild b/dev-python/pypng/pypng-0.20220715.0.ebuild
index e55bff9727be..fa14081ac752 100644
--- a/dev-python/pypng/pypng-0.20220715.0.ebuild
+++ b/dev-python/pypng/pypng-0.20220715.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 
 python_test() {
 	# let's talk about code quality
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 8ef79a403d23..b6c350f39f21 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,2 +1 @@
-DIST python-cinderclient-8.3.0.tar.gz 234371 BLAKE2B 092d7abdd348f5fac750efb3f3f4df1575584684ad613d22c558630576ad2f82c399af671aad7070dd224a89fa01d73333c2505dc0166d2e4c70e21ac01f298d SHA512 4d633b39a3c59cfdc2fc2c6235b3b87093f7617c89a80b50cf26d8f6fd63e8c3197d788e0b9e81347b9427cf363289b09b85376512d5820031472a735e0ca839
 DIST python-cinderclient-9.0.0.tar.gz 234533 BLAKE2B 18d673cbe02c5a4221b8667d051b1e0c1cbfe0c071e2b8c2f37b37dcf4ea9adae7ee64a7d5c8663c8ebd5946be53d91e253b9fb1df75e0d7f4dd8554098d22db SHA512 66542e10041d567fd7193a577ea5e8e7de6d7f735e05b1135f5d41e88847a6d042356431f54b481d9c13ec99c56e6d898df0222737e17c21fe6be6cfa886eafe
diff --git a/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
deleted file mode 100644
index b11c6475c487..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
+++ /dev/null
@@ -1,45 +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="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/keystoneauth-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-5.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-5.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/oslo-serialization[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b cinderclient/tests/unit
-}
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index caa3506ed4ca..418742012671 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,2 +1 @@
-DIST python-evdev-1.5.0.tar.gz 86384 BLAKE2B 6cb6fb634d974b8ab15722def24037019590f510792fcf2bb64d8c2ffec0871ab4075674eb45a737185e4b42e39d0cd556760d51b13b5a97b79d3ee64cfd342f SHA512 27ceca723a0157fe9efa2f7aad8bb790c63d2b8d399f629eaf11fb387f3ebde0885b2d8a5297492968d625d8d9b186877e074334115e70551a1b121c8864339d
 DIST python-evdev-1.6.0.gh.tar.gz 86212 BLAKE2B bbb9adc3caff31c817972e33cd02ff63ee4e037ebe346fc6b128d119c38b337681bc9ef9069cbe9b604b1ac926dd23a02add23da2f629b31b74b0de338f9f423 SHA512 d3dc27aad70897d46ae3cad71cafdf5ac49e8cb52b88566b004edaee3b192b68093e44b487f9ab27b503a18e8e62a08b17d7b782726658f4d8131aa4562cd17a
diff --git a/dev-python/python-evdev/python-evdev-1.5.0-r1.ebuild b/dev-python/python-evdev/python-evdev-1.5.0-r1.ebuild
deleted file mode 100644
index dd2e59170481..000000000000
--- a/dev-python/python-evdev/python-evdev-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,37 +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 library for evdev bindings"
-HOMEPAGE="https://python-evdev.readthedocs.io/"
-SRC_URI="
-	https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/test_uinput.py
-)
-
-python_configure_all() {
-	esetup.py build_ecodes \
-		--evdev-headers \
-		"${ESYSROOT}/usr/include/linux/input.h:${ESYSROOT}/usr/include/linux/input-event-codes.h"
-}
-
-src_test() {
-	cd tests || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/python-evdev/python-evdev-1.6.0.ebuild b/dev-python/python-evdev/python-evdev-1.6.0.ebuild
index b03645c60762..15f79cec1d78 100644
--- a/dev-python/python-evdev/python-evdev-1.6.0.ebuild
+++ b/dev-python/python-evdev/python-evdev-1.6.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index 586227493cab..6a9e7aa54b30 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,2 +1 @@
-DIST python-ironicclient-4.11.0.tar.gz 220770 BLAKE2B a653cf04497a4df9627ed5026094690d0569dd7d6c55abf3a3223fee8cbc14e450106645ed1e4461cb3931f2ca49c8df47ca9e8e2ec9478cf15fcc0623d19379 SHA512 863429269807f759a864e427206d29a68b7431ce33009e1b6d3a630ab154e66b85b9f61dd90303a681a5ed459005af1686edf056eb9a63cfb6de1f1eda85bbb5
 DIST python-ironicclient-5.0.0.tar.gz 220583 BLAKE2B 8de728995db55d6786349ad390234c02b2dd38cb0119569c3f2af3a88789bae1b9fb6a43300502f083f4c01e75476d707a8b86576b509b4f3dbf750038f915b9 SHA512 3bee0be64daeee1ae3b88f00a3c3bf4a96a0ad10e7c55e60fd5342925e836a753668e32284b64aee4bf9d88b9f4379ad66287516559738b817efe1e815bb483d
diff --git a/dev-python/python-ironicclient/python-ironicclient-4.11.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-4.11.0.ebuild
deleted file mode 100644
index 8aaaae42e43a..000000000000
--- a/dev-python/python-ironicclient/python-ironicclient-4.11.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Ironic API"
-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/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-ironicclient/python-ironicclient-5.0.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-5.0.0.ebuild
index 7451604bfa49..8aaaae42e43a 100644
--- a/dev-python/python-ironicclient/python-ironicclient-5.0.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-5.0.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/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index b1b492ec8ce4..05a3468ccbde 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,2 +1 @@
-DIST python-keystoneclient-4.5.0.tar.gz 325120 BLAKE2B 4511cb381ebfc11afefef0dbb7b9962efd2bbb5ac7455386ef4e831459614dfd51570cfaa1be9672936a6ed45d58b9b29e8326830840e80ffdb758089cbab887 SHA512 d3a5034bd05843b733410d4c6fc2c271edb25c837b50ba801031b45a00c0632b4420f2f4dd24dd25e78bf71b5ae31e2ec6b303d85aa4ecea0a89a49b5c67533d
 DIST python-keystoneclient-5.0.0.tar.gz 325208 BLAKE2B 86feea8d226976ee9fc568d10514d56d378727a11fada2d3f7acb1f95a33cbdcef165e8c5add656e53874463d81f8250905753aa03234de9dc87cf8d92213309 SHA512 94010e8a681817cae7c0555968a34102a430366b81393badc7661fd13eeea17e4e82d2065385a41c569c0e6ee89f4ccf3308a909186fbe2d29d7f46c5795d95b
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.5.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.5.0.ebuild
deleted file mode 100644
index 626a973f25f4..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-4.5.0.ebuild
+++ /dev/null
@@ -1,52 +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="Client Library for OpenStack Identity"
-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 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.28.0
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest keystoneclient/tests/unit
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-5.0.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-5.0.0.ebuild
index 58e337e23f81..626a973f25f4 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-5.0.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-5.0.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 8bd8bfc82aca..b6e281228686 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,2 +1 @@
-DIST python-neutronclient-7.8.0.tar.gz 304872 BLAKE2B 780e1b2942a43bca93888683d1c2e713cfc0927d49135004a6f6d42dff7962def6b0fc7f308b75b4392f4fb5df4d26fcea107b9006d4ba957c0d76294395e5c9 SHA512 3022d79348334632ab3afa142aab11e424b168a4ba04223722da80e59de2695b477c2d829bb14a37e7baf387f9d63b8c4456fc5712f8d591d3de51fad76d6c78
 DIST python-neutronclient-8.0.0.tar.gz 304243 BLAKE2B 664594bacd1d7480d502f97a0b0a3f441433ee70dac2af9359a22091c64503aba51e026b4e5eb0c68e7bc847b9120639ffdc1547d1d4ff92785459e1880a9747 SHA512 8846a87fb70555ca9f02a93f04dc68aa4ad332aea41398df744531f9afab034a37cb5390b93fa4fe4bd9ca25a9ee5787cccc1493232fe4019e5fcb2a842b2b44
diff --git a/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild
deleted file mode 100644
index 44df93c20aeb..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 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="A client for the OpenStack Quantum API"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bandit[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/oslotest[${PYTHON_USEDEP}]
-		dev-python/python-openstackclient[${PYTHON_USEDEP}]
-		dev-python/subunit[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Needs osprofile
-	rm neutronclient/tests/unit/test_http.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b neutronclient.tests.unit
-}
-
-python_install() {
-	distutils-r1_python_install
-	#stupid stupid
-	local SITEDIR="${D}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
diff --git a/dev-python/python-neutronclient/python-neutronclient-8.0.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-8.0.0.ebuild
index f72d2f58df48..44df93c20aeb 100644
--- a/dev-python/python-neutronclient/python-neutronclient-8.0.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-8.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index b5c4eb220a2f..05ac41ea40d0 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1,2 +1 @@
-DIST python-swiftclient-4.0.0.tar.gz 200490 BLAKE2B 37cadf27758640a916014e09309282a4b7ffebb3e578ae7411744fafd22431cfb748cffb4127309b20a8b2d8daca7f8f0a1ed6431f55766c33b243744ce5a71e SHA512 9058558564973ea2a4944e87dedd7b9b12e106672576da1d796eae336d3127ce8b35803cade93c605b38fd16a2d3466e6dc710838ceb77143059007625299360
 DIST python-swiftclient-4.0.1.tar.gz 201300 BLAKE2B 6a506ae8996a3937048f67e7b3f8e5185605f9e5fe955f23e1131eead4d3699fb01e7851ab632e3dfaa75c12e88ec17cec5b4c1b19c1663163a2ff95530561ec SHA512 0028bc12a9694047e31da3c05fe92ce846de8858743771281cc9b93f0826c596bb6ed5ee72f4e5c68c4bba2dbd9f311062dccdf13c9917536d2aaec7eaf33ef9
diff --git a/dev-python/python-swiftclient/python-swiftclient-4.0.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-4.0.0.ebuild
deleted file mode 100644
index a656fd717a2e..000000000000
--- a/dev-python/python-swiftclient/python-swiftclient-4.0.0.ebuild
+++ /dev/null
@@ -1,40 +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 bindings to the OpenStack Object Storage API"
-HOMEPAGE="https://launchpad.net/python-swiftclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/openstacksdk-0.11.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	sed -e 's/test_password_prompt/_&/' -i test/unit/test_shell.py || die
-	# fix duplicate script/entry point
-	# https://bugs.launchpad.net/python-swiftclient/+bug/1975361
-	sed -i -e '/bin\/swift/d' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyzmq/pyzmq-23.2.0-r1.ebuild b/dev-python/pyzmq/pyzmq-23.2.0-r1.ebuild
index 64d5a6208ff1..bfa7514a1e75 100644
--- a/dev-python/pyzmq/pyzmq-23.2.0-r1.ebuild
+++ b/dev-python/pyzmq/pyzmq-23.2.0-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index f14a04e1c031..f49c260d89f8 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,4 +1,4 @@
-DIST sentry-sdk-1.6.0.gh.tar.gz 249637 BLAKE2B c4d6788c80184ce9127ed85dfb5305363fd27bcbebd74763e4c14c4fed35dd05069ad4a244fa2d8a59f8cb618df22d4d864bf72510fe42600d23fcc6bf8228cf SHA512 d2999831af595ed7f1861ec78887e46887eea8c4c931f22bd4003aede508511287f67eb6100232362a110d16b7bdec892572225440be52a9bd37952c30478f15
+DIST sentry-sdk-1.7.2.gh.tar.gz 254370 BLAKE2B e65b2236bfec9279a4aa05b77c9492547f657e461a7c96c4158acb6bc0887571186bfa71893dce34251ef8d783fb5d583b25aa12539c5db7993cec65fdf05229 SHA512 9fe2c283a326b78c8be95500e4916bb633dc7369960a4e0ef69c0f29de74c38db81f43b3931c47d50431ee7f1a66a2b18e8c4fc02ce71c404a5e9700644cb76c
 DIST sentry-sdk-1.8.0.gh.tar.gz 286488 BLAKE2B d47f33a1c83cfffa6e4a801a6fdfde132d4cfe1b734e464c4db60e97abf53ebe503c53c3edd89d1a84e655a348a4463a75c3475d4824d03cd9b95733b13b5532 SHA512 aa3be96dbc55265f17371d8f20f8b3116b4310cbc1d078b62beeb1fd90bdbb840db85c25309e16f793a188d373c6dbcfd11a104db21b60221a5fb06d8deacc2d
 DIST sentry-sdk-1.9.0.gh.tar.gz 290271 BLAKE2B fcb4c45c129faf23a1177167e2bdd567a7ff228abbaa782676abb16c29e9c4cccef89f67ae5cd28c4f2b25e6687152fdc5eab0c7d981021a8df16374dc4e1fec SHA512 4f287bad8e9dd8eaad8f8a31d7335ccf6bfe72cc0ba8c0b26abcbd7e326bad886709d001976966a7b917f39e1ca249fa881abf29778cfd4bd65c63f05a6f6ef2
 DIST sentry-sdk-1.9.1.gh.tar.gz 270398 BLAKE2B 66ee16816d312b38df737c5ecb0ecc4a2189c932c162bbedf165f2a153029e95c389372a4638d5f71f669ac780710769e4708c3e7673573d1b1e79a29cbf93c9 SHA512 5997252aeee900125e42d7275627359ca5382707162b93e45b238c11a181ac724fea327fa1b29deed63dbf800463d10c9d2a8e8943c32b907e4eac055e399297
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.6.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.7.2.ebuild
index 879ba820c2d9..879ba820c2d9 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.6.0.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.7.2.ebuild
diff --git a/dev-python/simplegeneric/metadata.xml b/dev-python/simplegeneric/metadata.xml
index a1ffd7658619..95ac68496d9a 100644
--- a/dev-python/simplegeneric/metadata.xml
+++ b/dev-python/simplegeneric/metadata.xml
@@ -15,4 +15,5 @@
 	</longdescription>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
deleted file mode 100644
index eb323f9cc4b2..000000000000
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,20 +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 generic functions for Python"
-HOMEPAGE="https://pypi.org/project/simplegeneric/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="app-arch/unzip"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r2.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r2.ebuild
index 97761ab11d14..b65b8178aaac 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r2.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="app-arch/unzip"