Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-06-22 10:25:46 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-06-22 10:25:46 +0000
commit: 3ec09f996cad3cacb8d33bfe0331c6045066371c (patch)
tree: e8c7c5066145321a850bd33ee214274e8e8ade42 /dev-python
parent: cfcb994b646269c1d29a43feb26df61670248ca0 (diff)
download: baldeagleos-repo-3ec09f996cad3cacb8d33bfe0331c6045066371c.tar.gz
baldeagleos-repo-3ec09f996cad3cacb8d33bfe0331c6045066371c.tar.xz
baldeagleos-repo-3ec09f996cad3cacb8d33bfe0331c6045066371c.zip
109 files changed, 581 insertions, 1477 deletions
diff --git a/dev-python/ansicolor/ansicolor-0.3.2-r1.ebuild b/dev-python/ansicolor/ansicolor-0.3.2-r1.ebuild
index b115a336f350..9627383b0122 100644
--- a/dev-python/ansicolor/ansicolor-0.3.2-r1.ebuild
+++ b/dev-python/ansicolor/ansicolor-0.3.2-r1.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="
 	https://github.com/numerodix/ansicolor/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Produce ansi color output and colored highlighting and diffing"
diff --git a/dev-python/ansicolor/ansicolor-0.3.2.ebuild b/dev-python/ansicolor/ansicolor-0.3.2.ebuild
deleted file mode 100644
index 0385214f6dca..000000000000
--- a/dev-python/ansicolor/ansicolor-0.3.2.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="Produce ansi color output and colored highlighting and diffing"
-HOMEPAGE="https://github.com/numerodix/ansicolor https://pypi.org/project/ansicolor/"
-SRC_URI="
-	https://github.com/numerodix/ansicolor/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild
index 251c68559787..2e089a241a44 100644
--- a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild
+++ b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild
@@ -17,7 +17,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"
 IUSE="cpu_flags_x86_sse2"
 
 DEPEND="
diff --git a/dev-python/autobahn/autobahn-22.4.2.ebuild b/dev-python/autobahn/autobahn-22.4.2.ebuild
index 2e9b63a47c35..71397b970805 100644
--- a/dev-python/autobahn/autobahn-22.4.2.ebuild
+++ b/dev-python/autobahn/autobahn-22.4.2.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE="test xbr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index 10cdaa0bf289..a9764351c210 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1 +1,2 @@
 DIST awxkit-21.1.0.gh.tar.gz 16516204 BLAKE2B 2891244e7dcb0aef7b2053713c4479b94528a69f1225a77c46243cb293ebfa2e86d59939bc906223e598c34a322a726c9b3f5fb9aa7859191385f9c15bae57a0 SHA512 2e2ff1ae5a1893e3ba464ff0ab3c5e98b7d0711c3ba1512b8a8f89e55385ab85df9623b23d6a81b2a800b0b184de1ef82fd23a655173fcbcebb1160e9eef973c
+DIST awxkit-21.2.0.gh.tar.gz 16531568 BLAKE2B aa6677408415b2abd6a8d0f3286e2147f0e5ad3d7650feb98dfe018c89431bf9b4fdc8c6c1c76aa9a26fe0d7c8a438cfa209fbe16b7480c7295c60352e30e21e SHA512 d2be8ffacc5b82600ecac5d909450f9eef3d205075c9783849bc50030abcc84ca6cae3682baf20de8e0efb9f651aa03374941d59cf52f9d4cb4b7892d5c0353c
diff --git a/dev-python/awxkit/awxkit-21.2.0.ebuild b/dev-python/awxkit/awxkit-21.2.0.ebuild
new file mode 100644
index 000000000000..38a401e439f7
--- /dev/null
+++ b/dev-python/awxkit/awxkit-21.2.0.ebuild
@@ -0,0 +1,40 @@
+# 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="Command line interface for Ansible AWX"
+HOMEPAGE="https://github.com/ansible/awx"
+SRC_URI="https://github.com/ansible/awx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/awx-${PV}/awxkit"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+		-e "/'clean'/d" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/babelfish/babelfish-0.6.0-r1.ebuild b/dev-python/babelfish/babelfish-0.6.0-r1.ebuild
deleted file mode 100644
index 6ef07fbf4732..000000000000
--- a/dev-python/babelfish/babelfish-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with countries and languages"
-HOMEPAGE="
-	https://github.com/Diaoul/babelfish/
-	https://pypi.org/project/babelfish/"
-SRC_URI="
-	https://github.com/Diaoul/babelfish/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	>=dev-python/pyproject2setuppy-20[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/babelfish/babelfish-0.6.0-r2.ebuild b/dev-python/babelfish/babelfish-0.6.0-r2.ebuild
index 3fc8f5e9076f..dd01927c21e9 100644
--- a/dev-python/babelfish/babelfish-0.6.0-r2.ebuild
+++ b/dev-python/babelfish/babelfish-0.6.0-r2.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
index bec0df37f7bc..e327acf7493b 100644
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@@ -1,2 +1 @@
-DIST backrefs-5.2.tar.gz 5220528 BLAKE2B b786df162f37406c36b99d9d4d36ed439837dae2f1d138238d5afc6e9ab108f1c4be1802606e14892ae08d7e3878f5c5068a6923de14d13ab89ef6749fd69b6e SHA512 fd68cd90deaf299a3bb21f70126db51f537e6dc1126fa38beda63901dccfe4db81842aea23eb20ac9311bfef74ff2339ebffdb8cdbcfed197c3ef0fd5b3e793b
 DIST backrefs-5.3.gh.tar.gz 4291850 BLAKE2B d2d21dcb2d6a540ff6d06fbadb08c9a9ae6251c9bf78601b59611e80215f659cb46e8d535563c397ea28d014a67ffbc4d29a8f8632023ab9904b9630ac96602a SHA512 c42985a26605e3ab1f8b30943efdc554829d2a5951f32cff486959be1c7c1c61613adc947379aaebec74d8f574ae2c39e46e4682e2f78bb059beee2d9572f352
diff --git a/dev-python/backrefs/backrefs-5.2.ebuild b/dev-python/backrefs/backrefs-5.2.ebuild
deleted file mode 100644
index b49e1f553578..000000000000
--- a/dev-python/backrefs/backrefs-5.2.ebuild
+++ /dev/null
@@ -1,55 +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_PEP517=setuptools
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wrapper around re or regex that adds additional back references"
-HOMEPAGE="
-	https://github.com/facelessuser/backrefs/
-	https://pypi.org/project/backrefs/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-regex-unrecognized-escape.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/backrefs/backrefs-5.3.ebuild b/dev-python/backrefs/backrefs-5.3.ebuild
index 4331a3988d55..ec5bfdd42a1c 100644
--- a/dev-python/backrefs/backrefs-5.3.ebuild
+++ b/dev-python/backrefs/backrefs-5.3.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/backrefs/files/backrefs-5.2-fix-regex-unrecognized-escape.patch b/dev-python/backrefs/files/backrefs-5.2-fix-regex-unrecognized-escape.patch
deleted file mode 100644
index 6bb217d1f66e..000000000000
--- a/dev-python/backrefs/files/backrefs-5.2-fix-regex-unrecognized-escape.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 78577debb9127ace54101f77e669d7c674476803 Mon Sep 17 00:00:00 2001
-From: facelessuser <faceless.shop@gmail.com>
-Date: Fri, 8 Apr 2022 18:35:00 -0600
-Subject: [PATCH] Fixes for recent regex library handling of unrecognized
- escapes
-
----
- tests/test_bre.py    |  4 +--
- tests/test_bregex.py | 60 +++++++++++++++++++++-----------------------
- 2 files changed, 30 insertions(+), 34 deletions(-)
-
-diff --git a/tests/test_bre.py b/tests/test_bre.py
-index d88fe86..64b9a57 100644
---- a/tests/test_bre.py
-+++ b/tests/test_bre.py
-@@ -1464,7 +1464,7 @@ def test_escaped_slash_before_backref(self):
- 
-         self.assertEqual(r'\\test: \This is a test of escaped slash backrefs!', results)
- 
--    def test_normal_escaping(self):
-+    def test_normal_escaping_replace(self):
-         """Test normal escaped slash."""
- 
-         text = "This is a test of normal escaping!"
-@@ -1478,7 +1478,7 @@ def test_normal_escaping(self):
-         self.assertEqual(results2, results)
-         self.assertEqual('\t \\t \\\t \\\\t \\\\\t', results)
- 
--    def test_bytes_normal_escaping(self):
-+    def test_bytes_normal_escaping_replace(self):
-         """Test bytes normal escaped slash."""
- 
-         text = b"This is a test of normal escaping!"
-diff --git a/tests/test_bregex.py b/tests/test_bregex.py
-index 929227a..5a3d0af 100644
---- a/tests/test_bregex.py
-+++ b/tests/test_bregex.py
-@@ -801,12 +801,10 @@ def test_bytes_line_break(self):
-         )
- 
-     def test_line_break_in_group(self):
--        """Test that line break in group matches a normal R."""
-+        """Test that line break in group fails."""
- 
--        self.assertEqual(
--            bregex.sub(r"[\R]", 'l', 'Rine\r\nRine\nRine\r'),
--            'line\r\nline\nline\r'
--        )
-+        with self.assertRaises(_regex_core.error):
-+            bregex.sub(r"[\R]", 'l', 'Rine\r\nRine\nRine\r')
- 
-     def test_replace_unicode_name_ascii_range(self):
-         """Test replacing Unicode names in the ASCII range."""
-@@ -1176,33 +1174,33 @@ def test_escaped_slash_before_backref(self):
- 
-         self.assertEqual(r'\\test: \This is a test of escaped slash backrefs!', results)
- 
--    def test_normal_escaping(self):
-+    def test_normal_escaping_replace(self):
-         """Test normal escaped slash."""
- 
-         text = "This is a test of normal escaping!"
-         pattern = regex.compile(r"(.+)")
--        repl_pattern = r'\e \\e \\\e \\\\e \\\\\e'
-+        repl_pattern = r'\t \\t \\\t \\\\t \\\\\t'
-         expand = bregex.compile_replace(pattern, repl_pattern)
-         m = pattern.match(text)
-         results = expand(m)
-         results2 = pattern.sub(repl_pattern, text)
- 
-         self.assertEqual(results2, results)
--        self.assertEqual('\\e \\e \\\\e \\\\e \\\\\\e', results)
-+        self.assertEqual('\t \\t \\\t \\\\t \\\\\t', results)
- 
--    def test_bytes_normal_escaping(self):
-+    def test_bytes_normal_escaping_replace(self):
-         """Test bytes normal escaped slash."""
- 
-         text = b"This is a test of normal escaping!"
-         pattern = regex.compile(br"(.+)")
--        repl_pattern = br'\e \\e \\\e \\\\e \\\\\e'
-+        repl_pattern = br'\t \\t \\\t \\\\t \\\\\t'
-         expand = bregex.compile_replace(pattern, repl_pattern)
-         m = pattern.match(text)
-         results = expand(m)
-         results2 = pattern.sub(repl_pattern, text)
- 
-         self.assertEqual(results2, results)
--        self.assertEqual(b'\\e \\e \\\\e \\\\e \\\\\\e', results)
-+        self.assertEqual(b'\t \\t \\\t \\\\t \\\\\t', results)
- 
-     def test_escaped_slash_at_eol(self):
-         """Test escaped slash at end of line."""
-@@ -1214,15 +1212,12 @@ def test_escaped_slash_at_eol(self):
- 
-         self.assertEqual('\\\\', results)
- 
--    def test_unrecognized_backrefs(self):
-+    def test_unrecognized_backrefs2(self):
-         """Test unrecognized backrefs, or literal backslash before a char."""
- 
--        text = "This is a test of unrecognized backrefs!"
-         pattern = regex.compile(r"(.+)")
--        expand = bregex.compile_replace(pattern, r'\k\1')
--        results = expand(pattern.match(text))
--
--        self.assertEqual(r'\kThis is a test of unrecognized backrefs!', results)
-+        with self.assertRaises(_regex_core.error):
-+            bregex.compile_replace(pattern, r'\k\1')
- 
-     def test_ignore_group(self):
-         """Test that backrefs inserted by matching groups are passed over."""
-@@ -1628,23 +1623,23 @@ def test_dont_case_special_refs(self):
-         self.assertEqual('\u0108\nWw\u0108', results)
- 
-         # Bytes doesn't care about Unicode, but should evaluate bytes
--        pattern = regex.compile(b'Test')
--        expand = bregex.compile_replace(pattern, br'\C\u0109\n\x77\E\l\x57\c\u0109')
--        results = expand(pattern.match(b'Test'))
--        self.assertEqual(b'\\U0109\nWw\\u0109', results)
-+        # pattern = regex.compile(b'Test')
-+        # expand = bregex.compile_replace(pattern, br'\C\u0109\n\x77\E\l\x57\c\u0109')
-+        # results = expand(pattern.match(b'Test'))
-+        # self.assertEqual(b'\\U0109\nWw\\u0109', results)
- 
--        expandf = bregex.compile_replace(pattern, br'\C\u0109\n\x77\E\l\x57\c\u0109', bregex.FORMAT)
--        results = expandf(pattern.match(b'Test'))
--        self.assertEqual(b'\\U0109\nWw\\u0109', results)
-+        # expandf = bregex.compile_replace(pattern, br'\C\u0109\n\x77\E\l\x57\c\u0109', bregex.FORMAT)
-+        # results = expandf(pattern.match(b'Test'))
-+        # self.assertEqual(b'\\U0109\nWw\\u0109', results)
- 
--        pattern = regex.compile(b'Test')
--        expand = bregex.compile_replace(pattern, br'\C\U00000109\n\x77\E\l\x57\c\U00000109')
--        results = expand(pattern.match(b'Test'))
--        self.assertEqual(b'\U00000109\nWw\U00000109', results)
-+        # pattern = regex.compile(b'Test')
-+        # expand = bregex.compile_replace(pattern, br'\C\U00000109\n\x77\E\l\x57\c\U00000109')
-+        # results = expand(pattern.match(b'Test'))
-+        # self.assertEqual(b'\U00000109\nWw\U00000109', results)
- 
--        expandf = bregex.compile_replace(pattern, br'\C\U00000109\n\x77\E\l\x57\c\U00000109', bregex.FORMAT)
--        results = expandf(pattern.match(b'Test'))
--        self.assertEqual(b'\U00000109\nWw\U00000109', results)
-+        # expandf = bregex.compile_replace(pattern, br'\C\U00000109\n\x77\E\l\x57\c\U00000109', bregex.FORMAT)
-+        # results = expandf(pattern.match(b'Test'))
-+        # self.assertEqual(b'\U00000109\nWw\U00000109', results)
- 
-         # Format doesn't care about groups
-         pattern = regex.compile('Test')
-@@ -2184,4 +2179,5 @@ def test_auto_compile_off(self):
-         replace = p.compile(r'{1}', bregex.FORMAT)
-         self.assertEqual(p.subf(replace, 'tests'), 'test')
- 
--        self.assertEqual(p.sub(r'\ltest', 'tests'), r'\ltest')
-+        with self.assertRaises(_regex_core.error):
-+            self.assertEqual(p.sub(r'\ltest', 'tests'), r'\ltest')
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 59885c8a4e3c..68d9a6af000c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,3 +1,4 @@
 DIST boto3-1.24.12.gh.tar.gz 509573 BLAKE2B 5c9978cac1cbce0521dee6f2164652c4fca82b0bf20276e3f4e75960e0877ec0545ca50884daedde115bba117bea424da2ad2fe63e845a32a6f832a3ab5a5841 SHA512 dec940a6e97c51089933a66994b14882f31f2ed7959f966e1f9cd2e6a4a1bb40cc2c01d509ce7346ac345df30d0f164213034c0de97daf3053ba4ea51e5f7495
 DIST boto3-1.24.13.gh.tar.gz 510032 BLAKE2B 4d204f4b4e1dbe970d45e65eb04061193d1b21236b59f33994d03138e5a1f31fce2d27f7323d1a4da8b5f88d143e1dc51cdc73e19689e79722ae696453d314e3 SHA512 e8962339b1e5c72ace2d9980d7268bd09725b11b30425c32d649703089b32324ca442e597756a14a3d4be222c3628a8ccac4da2d7739cc237dfc29a8ea722818
+DIST boto3-1.24.14.gh.tar.gz 510393 BLAKE2B c5a3f28abdeb3deaf33620ab7278b5d14dce55297e37c8d17e58994348f7459598ea96c3d44cfa7cf4bfa760aee2ab09aea0d905d514cc2365b0beb12424ea49 SHA512 d357cfd4e1098a8aa7e59aad36f27427dbc43fe39bfd3628928879058ee396774ebbc2c270fd5422a125f447a7b64fcb34da5008fcf44a8d74ed344b81f65666
 DIST boto3-1.24.7.gh.tar.gz 508670 BLAKE2B d526f6a4dc4c6126c61ca7c9074b4341c742f84a6e95b38cd8a450fb74df379cee44513e1be6bc7cd0c8f728598d0ecfc06240120a8da71f75f86371498f5233 SHA512 4d57e38c18138b950f93a234132ac1d31c9a29ad00ca5e1298517d6b16ff2849802ce6cfeb8de390c2eb25086043d45e0276a7a563707595649ca1905367be52
diff --git a/dev-python/boto3/boto3-1.24.14.ebuild b/dev-python/boto3/boto3-1.24.14.ebuild
new file mode 100644
index 000000000000..e4a98e2e28f5
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.14.ebuild
@@ -0,0 +1,68 @@
+# 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 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 62b6e7328a3f..179c622f0655 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,3 +1,4 @@
 DIST botocore-1.27.12.tar.gz 9132872 BLAKE2B 74b74b5a5745cfacac066d5e087974fb58be5a600c7cfb2077d243044b8c429b1396d19e6790c0f754e42931085b115f74039b8c93da39593512d28021d6314a SHA512 767defae44ffb3b54b55625fd0f8a20c22a4a5f209a1397b1a27cfc2e36ac9e03cfdd25bc77bebc944613c5744dd7651e1b574674e8a992f219e172eee9210f5
 DIST botocore-1.27.13.tar.gz 9134638 BLAKE2B 471a46a4c4f14082ceb7030495a121ea90a6f67b6f802cbeb1394624513ff86deb7b90e3aa3e568dff42cd3280ea038565752eff69577231250b6542e6586e1f SHA512 6becb7cd6d2ea3b09012f7b168dcf7fd3386c19ee6003a4e8f4059e3b1ad2b281f5fdaab7abaafe6c34bccd547c8f8ef1bc253f5190d3e91127b1239ec8e307a
+DIST botocore-1.27.14.tar.gz 9134503 BLAKE2B ca29a33c5363457053f8ac042279726a15d3dc5f72546558d11bbacd79e7641d94b1137b76e201ad00203ecff53274fd41abd9178e7abbc1c5a51fe388f7fa5e SHA512 3995918212559eab009f141f94e6e6496fc77f12438e1dd62ce3ee232009b90de3882d342d20e83eb11de5f35b7878f53eea884016874caacb9d2e3d167b4f1a
 DIST botocore-1.27.7.tar.gz 9102259 BLAKE2B 094ec463531f1dfd54ff32d0f44ebc39cdc0a6d4c3e19b49a25e25d9d13acdcd26c782c1d4819ea4f1cb8954a858aa6e997411785678700b7ca03cd8844527b5 SHA512 d4a1327f4314279548af00fbc6da2f9fc5f25f704da3f6ddfa90773878f28ac9f03556b00fa4c0207ec2e952eb716aa98c1c22abffbd51d82dc55d9e4ceeca5c
diff --git a/dev-python/botocore/botocore-1.27.14.ebuild b/dev-python/botocore/botocore-1.27.14.ebuild
new file mode 100644
index 000000000000..1f52e2694e84
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.14.ebuild
@@ -0,0 +1,66 @@
+# 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 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest
index 87161d35c8ea..4ca10df673c8 100644
--- a/dev-python/bracex/Manifest
+++ b/dev-python/bracex/Manifest
@@ -1,3 +1 @@
-DIST bracex-2.2.1.tar.gz 27642 BLAKE2B e9eb12dd70b3cf1c6abd8a59f19d8f77f8fc85e07efad02a2c0213266b93641406d05fa8454b2b4cd6870b7f866a22c0b2132d690444f1910a599c9b17594065 SHA512 cad9faf73258493581606bf5c8068d34a82fdcca338dd6a1d7da5dacfbee1932f48d04d6f295151d79f02495ddf89aa6a5d53d6596db7bd53ddb3cd23d59a71d
-DIST bracex-2.3.tar.gz 27489 BLAKE2B c48b668c35d40337fe9096c8fbc67565ea74abf330a278e1fe070055fcf8835a60dc23fba40c0f1c0677d506c7d8f8ca5168f809b13ab0442868bc962faaf1d5 SHA512 73f3b951ce1119154794883106a317e9ed4bbe8d96dc914afb6ca6d358104ae4908bc587504e2761c751a3795adf7f2136e96a2d46634b10478c7523fbee4f60
 DIST bracex-2.3_p1.tar.gz 27541 BLAKE2B a9e33e01f014c6b784b059a76da338a708a24ff88787c98c0916a6d13ac5497a1f4f14d711cab8bde1281a9968db68bdc8fdfbc23a531ef6c89adfa9974492b1 SHA512 3c5a8a81adb78c9d3d40b57328a6a47b3257bb0072be2685c8049cf8a91501993ce470dfd394a61d0a0fdcd082405b204e5e3e0666018978b5aa820b0d74b631
diff --git a/dev-python/bracex/bracex-2.2.1.ebuild b/dev-python/bracex/bracex-2.2.1.ebuild
deleted file mode 100644
index 2bd1a44d201a..000000000000
--- a/dev-python/bracex/bracex-2.2.1.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} )
-DISTUTILS_USE_PEP517=setuptools
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-material
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs_pymdownx_material_extras
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Bash style brace expansion for Python"
-HOMEPAGE="
-	https://github.com/facelessuser/bracex/
-	https://pypi.org/project/bracex/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="test? ( dev-vcs/git )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/bracex/bracex-2.3.ebuild b/dev-python/bracex/bracex-2.3.ebuild
deleted file mode 100644
index 411a8fb005d2..000000000000
--- a/dev-python/bracex/bracex-2.3.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
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_PEP517=hatchling
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-material
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs_pymdownx_material_extras
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Bash style brace expansion for Python"
-HOMEPAGE="
-	https://github.com/facelessuser/bracex/
-	https://pypi.org/project/bracex/
-"
-SRC_URI="
-	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/bracex/bracex-2.3_p1.ebuild b/dev-python/bracex/bracex-2.3_p1.ebuild
index 6b4688cabcdf..513d3771a43e 100644
--- a/dev-python/bracex/bracex-2.3_p1.ebuild
+++ b/dev-python/bracex/bracex-2.3_p1.ebuild
@@ -32,7 +32,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cattrs/Manifest b/dev-python/cattrs/Manifest
index a5aee28ff19c..4c2e996470cf 100644
--- a/dev-python/cattrs/Manifest
+++ b/dev-python/cattrs/Manifest
@@ -1,2 +1 @@
-DIST cattrs-1.10.0.gh.tar.gz 100657 BLAKE2B b0475644bdd31e12dabf7b969e1890932309497e66b45a311e97d56062e99837af11677c24e33c6d1bed6ec2c6373eab6535874115960ed450f52804a6e5d73e SHA512 51cda84d30627f9d0eb6842c45f7c91dd2f3d9a21b1a635ad21d0648d409b576f52e6127392d60bdd1b6a803f8f897f970706b9cc64b703c06387bc85cd3740e
 DIST cattrs-22.1.0.gh.tar.gz 108033 BLAKE2B 823e3ab466fd73385a4aaefb547b3457ee9cd100f38b6778c26bbe3d93e23ed9a00f071d6a5d7626da91e6660e2a8118e70cfa53a5960d550b9038fffec58eef SHA512 db1effb8d632dc3843d38b18bcd439c35d8bae0e4379b075417eaedbc130f6426186c0d299bc5b5d68a7354d7c5e53927ba5e0e989d498841a73237c588febb8
diff --git a/dev-python/cattrs/cattrs-1.10.0-r1.ebuild b/dev-python/cattrs/cattrs-1.10.0-r1.ebuild
deleted file mode 100644
index a121fd0bd2d2..000000000000
--- a/dev-python/cattrs/cattrs-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,52 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Composable complex class support for attrs and dataclasses"
-HOMEPAGE="
-	https://pypi.org/project/cattrs/
-	https://github.com/python-attrs/cattrs/"
-SRC_URI="
-	https://github.com/python-attrs/cattrs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/immutables[${PYTHON_USEDEP}]
-	)"
-# test_preconf:
-#		dev-python/bson[${PYTHON_USEDEP}]
-#		dev-python/msgpack[${PYTHON_USEDEP}]
-#		dev-python/orjson[${PYTHON_USEDEP}]
-#		dev-python/pyyaml[${PYTHON_USEDEP}]
-#		dev-python/tomlkit[${PYTHON_USEDEP}]
-#		dev-python/ujson[${PYTHON_USEDEP}]
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e 's:--benchmark.*::' \
-		-e '/addopts/d' \
-		-i pyproject.toml || die
-	# backport pyproject.toml fix (50ba769c8349f5891b157d2bb7f06602822ac0a3)
-	sed -e 's:group.dev.dependencies:dev-dependencies:' \
-		-i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# unpackaged deps, see above
-	epytest tests --ignore tests/test_preconf.py
-}
diff --git a/dev-python/cattrs/cattrs-22.1.0.ebuild b/dev-python/cattrs/cattrs-22.1.0.ebuild
index bf3f643bbe05..543b4335b132 100644
--- a/dev-python/cattrs/cattrs-22.1.0.ebuild
+++ b/dev-python/cattrs/cattrs-22.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 764bab316b80..ddece4c080ad 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,2 +1 @@
-DIST chameleon-3.10.0.gh.tar.gz 136996 BLAKE2B a622fa4d972dc0bea9532f0815b586e17d56fc4da94bad37f83fb29d2a94442da2a7d1ebd00fdfb0a877fcf9a2d269c2c3780ec9cf96ad772952b096a1ca1db2 SHA512 de59a4f1d0243beae91008f93741e9565831ea3b07c3f39e20e15ecc7220711a78bf475844fcaa9dc25f2376b0e937779ca28bd58f7c9b95fa2cf35cc7212117
 DIST chameleon-3.10.1.gh.tar.gz 137135 BLAKE2B c11520792a833bccc0997ea82e7876e309905ac0cdfd8701c4d83eee7befe1d152787f27b076df15c4ba299d2702ac6a262dc193d1ee7f6d44398e57af73772e SHA512 e79b261ce6f480358191ff3d23af325c0559e9c0b6be8b2c44d4bb3869fb7e09fa759906933d9b4d6f7107779f19bb225170add73ec3205ddf73b9bdb1bcfb9a
diff --git a/dev-python/chameleon/chameleon-3.10.0.ebuild b/dev-python/chameleon/chameleon-3.10.0.ebuild
deleted file mode 100644
index 9351104f8a56..000000000000
--- a/dev-python/chameleon/chameleon-3.10.0.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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast HTML/XML template compiler for Python"
-HOMEPAGE="
-	https://github.com/malthe/chameleon/
-	https://pypi.org/project/Chameleon/
-"
-SRC_URI="
-	https://github.com/malthe/chameleon/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd src || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/chameleon/chameleon-3.10.1.ebuild b/dev-python/chameleon/chameleon-3.10.1.ebuild
index 453d6d5462f0..9351104f8a56 100644
--- a/dev-python/chameleon/chameleon-3.10.1.ebuild
+++ b/dev-python/chameleon/chameleon-3.10.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/cheetah3/cheetah3-3.2.6_p2.ebuild b/dev-python/cheetah3/cheetah3-3.2.6_p2.ebuild
index 7f8d7fcc5538..1b7e6a957ab8 100644
--- a/dev-python/cheetah3/cheetah3-3.2.6_p2.ebuild
+++ b/dev-python/cheetah3/cheetah3-3.2.6_p2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/cheroot/cheroot-8.6.0-r1.ebuild b/dev-python/cheroot/cheroot-8.6.0-r1.ebuild
index 0769e802aee6..73ed10c97e0e 100644
--- a/dev-python/cheroot/cheroot-8.6.0-r1.ebuild
+++ b/dev-python/cheroot/cheroot-8.6.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cheroot/cheroot-8.6.0.ebuild b/dev-python/cheroot/cheroot-8.6.0.ebuild
deleted file mode 100644
index 1c1e3d7ce6a4..000000000000
--- a/dev-python/cheroot/cheroot-8.6.0.ebuild
+++ /dev/null
@@ -1,76 +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="High-performance, pure-Python HTTP server used by CherryPy"
-HOMEPAGE="https://cherrypy.dev/
-	https://pypi.org/project/cheroot/
-	https://github.com/cherrypy/cheroot/"
-SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jaraco-context[${PYTHON_USEDEP}]
-		dev-python/jaraco-text[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
-		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-		!ia64? (
-			dev-python/pyopenssl[${PYTHON_USEDEP}]
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-PATCHES=(
-	# Bad dep (upstream gone, only PyPi package, has py2 code, etc)
-	"${FILESDIR}/${PN}-8.6.0-remove-pypytools-dep.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e '/setuptools_scm/d' -i setup.cfg || die
-	sed -e '/--cov/d' \
-		-e '/--testmon/d' \
-		-e '/--numproc/d' \
-		-i pytest.ini || die
-
-	# broken
-	sed -e '/False.*localhost/d' \
-		-i cheroot/test/test_ssl.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_IGNORE=()
-	if ! has_version "dev-python/pyopenssl[${PYTHON_USEDEP}]" ||
-		! has_version "dev-python/trustme[${PYTHON_USEDEP}]"
-	then
-		EPYTEST_IGNORE+=(
-			lib/cheroot/test/test_ssl.py
-		)
-	fi
-
-	cd "${BUILD_DIR}" || die
-	epytest
-}
diff --git a/dev-python/cssselect2/Manifest b/dev-python/cssselect2/Manifest
index 5d7c14a4487c..76a199558c3d 100644
--- a/dev-python/cssselect2/Manifest
+++ b/dev-python/cssselect2/Manifest
@@ -1,2 +1 @@
-DIST cssselect2-0.5.0.tar.gz 34918 BLAKE2B 12ec30d42caa916e487674ccb910def00acca3f47b3d9e69f376614b997e68f4dae1632a852efd0b9d47c321534935d029fd96028dce9b11e391402b203fbdbd SHA512 869dbce3915db87727b09016c094b908b0055693db238a24c89b0482fed64d7e1811ad2db407faee32638566fd4e47402f05155dc2d8887e98f2107f9b8633c2
 DIST cssselect2-0.6.0.tar.gz 35442 BLAKE2B eb42c6abed531d9ece07ae5aa442be0c0ca926f982987ede1c5ba3e391950fcf88b1c322da5933842993ad5d98488e2a29aa714d1ca65b672cecbe425bac9bd7 SHA512 10cb55ebaaa16b755d85f1e511ae0281fb017d6937750392ae1da7f32d51ff944fb14c6d1c9ea5f42734450b719157ded116dc14ef471a9a20fcc43fb6682308
diff --git a/dev-python/cssselect2/cssselect2-0.5.0.ebuild b/dev-python/cssselect2/cssselect2-0.5.0.ebuild
deleted file mode 100644
index 24eb66ca1323..000000000000
--- a/dev-python/cssselect2/cssselect2-0.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="
-	https://cssselect2.readthedocs.io/en/latest/
-	https://pypi.org/project/cssselect2/
-	https://github.com/Kozea/cssselect2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cssselect2/cssselect2-0.6.0.ebuild b/dev-python/cssselect2/cssselect2-0.6.0.ebuild
index 80f683f41037..17111079b3ce 100644
--- a/dev-python/cssselect2/cssselect2-0.6.0.ebuild
+++ b/dev-python/cssselect2/cssselect2-0.6.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/tinycss2[${PYTHON_USEDEP}]
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index e79d931de9ed..fb17f7905116 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,2 +1 @@
-DIST doc8-0.11.1.tar.gz 25643 BLAKE2B 5f7eaa00b6fac123d02da41e02c7585c7c7160664766466a3bf06ba146411fda14b3720f8c8277f307f7b4985ded47707c836f9f6e6d7e4f89dc1af50111b87f SHA512 88b0882af3a671afc2a87d9dea0df5e7890895907545ff8fc02b40ae7f765c142bc715bff3e90685dd1d2358b701b8c6c30cac431fe3d6d0ec078b78added2f3
 DIST doc8-0.11.2.tar.gz 25898 BLAKE2B 097c6d6b82fe4acf7cfc43ff7860334f0a53df3ca39def33de4b9f04553acab785fe339d8126dd5ae56a7d45c846c575b9c689eed47bc47302b89fd5bfabfe3a SHA512 f607251c3ae792b3210893b2074bb34aad866a54645c4244ef53e156a4c3af9cfb61ddb93617d153510cc6868be7f04409eac47f66f91d4d0b9400bb7aca0eb1
diff --git a/dev-python/doc8/doc8-0.11.1.ebuild b/dev-python/doc8/doc8-0.11.1.ebuild
deleted file mode 100644
index f921c3391121..000000000000
--- a/dev-python/doc8/doc8-0.11.1.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
-HOMEPAGE="
-	https://pypi.org/project/doc8/
-	https://github.com/pycqa/doc8/
-"
-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/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest -s src
-}
diff --git a/dev-python/doc8/doc8-0.11.2.ebuild b/dev-python/doc8/doc8-0.11.2.ebuild
index 64796d8ea566..d16479f221bf 100644
--- a/dev-python/doc8/doc8-0.11.2.ebuild
+++ b/dev-python/doc8/doc8-0.11.2.ebuild
@@ -17,7 +17,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/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/dulwich/dulwich-0.20.43.ebuild b/dev-python/dulwich/dulwich-0.20.43.ebuild
index 6174956163fa..86c1c4a021be 100644
--- a/dev-python/dulwich/dulwich-0.20.43.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.43.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/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
index 6ca9066377b9..9370f7c7b321 100644
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
+++ b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT PSF-2.4"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.4-r1.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.4-r1.ebuild
index ba35a32d3581..bda36d4ffad0 100644
--- a/dev-python/flask-babelex/flask-babelex-0.9.4-r1.ebuild
+++ b/dev-python/flask-babelex/flask-babelex-0.9.4-r1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/flask[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
deleted file mode 100644
index 5cb92ba4159b..000000000000
--- a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
+++ /dev/null
@@ -1,35 +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
-
-MY_PN="Flask-BabelEx"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Adds i18n/l10n support to Flask applications"
-HOMEPAGE="https://github.com/mrjoes/flask-babelex https://pypi.org/project/Flask-BabelEx/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	dev-python/flask-sphinx-themes
-
-PATCHES=( "${FILESDIR}/${PN}-0.9.3-tests-fix.patch" )
-
-python_test() {
-	cd tests || die
-	eunittest
-}
diff --git a/dev-python/flask-cors/flask-cors-3.0.10-r1.ebuild b/dev-python/flask-cors/flask-cors-3.0.10-r1.ebuild
index fb64694f14fa..325f59716760 100644
--- a/dev-python/flask-cors/flask-cors-3.0.10-r1.ebuild
+++ b/dev-python/flask-cors/flask-cors-3.0.10-r1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/corydolphin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
diff --git a/dev-python/flask-cors/flask-cors-3.0.10.ebuild b/dev-python/flask-cors/flask-cors-3.0.10.ebuild
deleted file mode 100644
index c8909e3e454c..000000000000
--- a/dev-python/flask-cors/flask-cors-3.0.10.ebuild
+++ /dev/null
@@ -1,32 +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
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/wcdolphin/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/corydolphin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
-HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors/"
-
-LICENSE="MIT"
-SLOT="0"
-
-BDEPEND="test? ( dev-python/packaging[${PYTHON_USEDEP}] )"
-RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
diff --git a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
deleted file mode 100644
index 3cf8f2d7ca91..000000000000
--- a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,29 +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
-
-MY_PN="Flask-Mail"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Flask extension for sending email"
-HOMEPAGE="https://pythonhosted.org/Flask-Mail/ https://pypi.org/project/Flask-Mail/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/speaklater[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs
-distutils_enable_tests nose
diff --git a/dev-python/flask-mail/flask-mail-0.9.1-r2.ebuild b/dev-python/flask-mail/flask-mail-0.9.1-r2.ebuild
index 813e36957ab9..2cb197696fab 100644
--- a/dev-python/flask-mail/flask-mail-0.9.1-r2.ebuild
+++ b/dev-python/flask-mail/flask-mail-0.9.1-r2.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/blinker[${PYTHON_USEDEP}]
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index d5af86db6d68..ce199c62dfa8 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,2 +1 @@
 DIST flatbuffers-2.0.6.tar.gz 1724250 BLAKE2B b6969b28dba753c4551b33d27409d9925c10a640ae860264f8054c19a470ce3da366c0bf7917bf7fe4f6cb57acbfbe1837f175fde40b84d311df6d1378d146ce SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6
-DIST flatbuffers-2.0.tar.gz 22462 BLAKE2B a07f1d27afd71aaa23ba26a061267f95bbb7e0ced8b2c110b3d60fdb9d922fd4b339d7abc63068a030e08e6d824871c61110a665edd6781ac54dd5ef8613975a SHA512 76636449c107f1b2d1a1f395dfbb04c89c25946d8a731a257475ff2517f9667095f3527280b87fdd4081fd5a9f7aa0a112d5daae742c1575d29abb69da595b6d
diff --git a/dev-python/flatbuffers/flatbuffers-2.0-r1.ebuild b/dev-python/flatbuffers/flatbuffers-2.0-r1.ebuild
deleted file mode 100644
index b27b6fef8b7b..000000000000
--- a/dev-python/flatbuffers/flatbuffers-2.0-r1.ebuild
+++ /dev/null
@@ -1,20 +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="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="
-	https://github.com/google/flatbuffers/
-	https://pypi.org/project/flatbuffers/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
diff --git a/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild b/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild
index 5ddf71c5c6c7..30291a8d4943 100644
--- a/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild
@@ -17,6 +17,6 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 
 S=${WORKDIR}/${P}/python
diff --git a/dev-python/flatbuffers/flatbuffers-2.0.ebuild b/dev-python/flatbuffers/flatbuffers-2.0.ebuild
deleted file mode 100644
index 14cb3c410f37..000000000000
--- a/dev-python/flatbuffers/flatbuffers-2.0.ebuild
+++ /dev/null
@@ -1,16 +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="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="https://github.com/google/flatbuffers
-	https://pypi.org/project/flatbuffers/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
diff --git a/dev-python/flit_scm/flit_scm-1.6.2.ebuild b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
index e4f9ce885b2e..cbb5738a14e5 100644
--- a/dev-python/flit_scm/flit_scm-1.6.2.ebuild
+++ b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
@@ -19,7 +19,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/flit_core-3.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 50190feee89f..1825582213c2 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,5 +1,2 @@
-DIST google-api-python-client-2.47.0.gh.tar.gz 30118538 BLAKE2B 601a02ffdb76b9213c0259042ad5693b46bd72b6178a37d9d6a8fcc263e9a8c02f19c1ce9923c72f41270e960c675e4c71cefb4fbb4e54125bf000186a857ae2 SHA512 1da6660f085edf2562525b904def124398088afb0e9dbda82f0894cf5fc26c052dcd7a497f60ef18d281a16b46c5cfc6b145fca8fd4eb7d3f9225b9ff3ea2ac9
-DIST google-api-python-client-2.48.0.gh.tar.gz 30483162 BLAKE2B fa6371d2cb5b27184eb0e16ea0ef9875af2dfd83b2d34dd84272c2942589f712b35451b9150f38722501edfe5a4b8a506b3f52fedffbb48af31c20dc36a59cfb SHA512 0789aca32b01304095702d908c8ff31d2b4ddd771ed8cf3b3f99f15091fd1eea782000c58646c7760811a40252e5f1982876278f4cdd23e3f8cf672682693605
-DIST google-api-python-client-2.49.0.gh.tar.gz 30499625 BLAKE2B 7c0591b5567c1e9e5840430d490041d0ffea4beca8ec1e56eda0c5c8c6f4ff1e5f9126c4158e370e6c4011a6499e1d41203f83c9e4747dd830606406cef65e23 SHA512 ae53cc4cf18949f75aef9ca39fc2a964242fd556c1c19bb3aa8cd48b94a23deef9788b1c1877923a5ae4af990dff0f6138fb2157d2577fda80f8a86f1f642709
 DIST google-api-python-client-2.50.0.gh.tar.gz 30751763 BLAKE2B 4fa967932d13fa03640970ba2b6b1756864d88e4953deb5c9cf89a4556bd2cb3f1083f2e141b89a08936a40ddea64e45d65b5d9afe4024edf94a56c5ccb32798 SHA512 8dcdb85f2f37d4c668924abba46f0012ad453dc0775b373dc9fc510020479b1dc8a22cd85980ab97bcd4e7bdff19c78d829b1d758e9105a71c3ac7aa0cb19946
 DIST google-api-python-client-2.51.0.gh.tar.gz 31181726 BLAKE2B 465cbc3beb870a543bb54b69342d1a4e75026fa3c83846a3641e048b922cfa14ccb56593a0e8feadf4bf30568425347b14f5f1dd081d5d74fa1112bb0d57caa3 SHA512 ea9e9424aa36e077f10922dba9d6bf43f376d5e059c5d0fc7a31ef919232eb7778a891104fe3a7328e841381d5cd2cd76cdfb1fb80458c979f83a935f8b1df5a
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.47.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.47.0.ebuild
deleted file mode 100644
index 07bbe9ded836..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.47.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="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.48.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.48.0.ebuild
deleted file mode 100644
index 95188afdf1fa..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.48.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="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.49.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.49.0.ebuild
deleted file mode 100644
index 95188afdf1fa..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.49.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="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.50.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.50.0.ebuild
index 95188afdf1fa..07bbe9ded836 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.50.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.50.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index c612c05d365e..64677daaa2bb 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1 +1,2 @@
 DIST googleapis-common-protos-1.56.2.tar.gz 109718 BLAKE2B 6aeb43927f5c2b0332dbc478d47b06d49490b666158b35b5e58ccd3290939d903865f60ff11f396f9f329bb64382aa636d87ebd06cefcb66d465a0551843178f SHA512 814dddc95fa5bde437c124ff8b66c281f98cae6c0143d473b9194a1367ccaf7915c21450f79f372be5fdb3c4fb41c9d717e57244f2dbd1e819b927b8d86e8d2f
+DIST googleapis-common-protos-1.56.3.tar.gz 109601 BLAKE2B ac33ad2d9c737962bbc8c505ce03f57c9add2c9e9d7909371bac33651209bda8a6f85d00d9d93ca8f5bca5a88a3d148c6b0da210dd8330b2711cf3de027a307f SHA512 258f5408c3aae884ddcb13a606f369e80f56675296edb4fdfae1633bfdc707cae414920f87c21e210940667ede2989de7d80355a4b6551f5a9fc567a99fb64c6
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.3.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.3.ebuild
new file mode 100644
index 000000000000..eea2012a7ec6
--- /dev/null
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020-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 classes generated from the common protos in the googleapis repository"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-common-protos/
+	https://pypi.org/project/googleapis-common-protos/
+"
+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/protobuf-python-4[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+# no tests as this is all generated code
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index 739a831dd281..b6939793d46a 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,2 +1 @@
-DIST guessit-3.4.2.tar.gz 165996 BLAKE2B ccad7018ed54a49397ff008555650bb322f6884ece0608a26af89ec58d82e81125ca806b18a9936b578626a0b47f8b4fae3a3b9299cfebd67c29e88e05cc7785 SHA512 e969ed2d89e3b0eb1f70db3d8fe5258c39f4c9f86dfb7f943c2fc2c4d8f85580487921b7ee37e486bf1f8dfc067b3a2a75a54a2e72519b9687aae48ba7631c6e
 DIST guessit-3.4.3.tar.gz 166183 BLAKE2B 30b08719b12580ade5354a501217cf2b0547965d1ef8016ffce313d257a3ca80a0736e0c904b4e3f7f639d24919839afc3887d81e2912e6aafb37861f979766f SHA512 2719683487baa7bf0f212d4150486f3e673721683361004aa4397204fdc1a3414de86dd4b05b805dc91427d897cd391a7431e6c25e1576b0855f4cc3aabade7a
diff --git a/dev-python/guessit/guessit-3.4.2.ebuild b/dev-python/guessit/guessit-3.4.2.ebuild
deleted file mode 100644
index dfe85a1bdf62..000000000000
--- a/dev-python/guessit/guessit-3.4.2.ebuild
+++ /dev/null
@@ -1,44 +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="Python library for guessing information from video filenames"
-HOMEPAGE="https://github.com/guessit-io/guessit
-	https://pypi.org/project/guessit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_8 pypy3)
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Disable benchmarks as they require unavailable pytest-benchmark.
-	rm guessit/test/test_benchmark.py || die
-	sed -i -e "s|'pytest-benchmark',||g" setup.py || die
-
-	# Disable unconditional dependency on dev-python/pytest-runner.
-	sed -i -e "s|'pytest-runner'||g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/guessit/guessit-3.4.3.ebuild b/dev-python/guessit/guessit-3.4.3.ebuild
index bcff5cdaa182..56dd1653b67e 100644
--- a/dev-python/guessit/guessit-3.4.3.ebuild
+++ b/dev-python/guessit/guessit-3.4.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
diff --git a/dev-python/httpcore/httpcore-0.15.0.ebuild b/dev-python/httpcore/httpcore-0.15.0.ebuild
index 061a74f43e1a..8436fa1fa077 100644
--- a/dev-python/httpcore/httpcore-0.15.0.ebuild
+++ b/dev-python/httpcore/httpcore-0.15.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild b/dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild
index 14f2c9c65e9c..17737a6499f8 100644
--- a/dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild
+++ b/dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND="
 	dev-python/arrow[${PYTHON_USEDEP}]
diff --git a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
deleted file mode 100644
index 25dd2198ec4b..000000000000
--- a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
+++ /dev/null
@@ -1,25 +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="Jinja2 Extension for Dates and Times"
-HOMEPAGE="https://github.com/hackebrot/jinja2-time"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-RDEPEND="dev-python/arrow[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-arrow-compat.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
index cda3cfd16183..511a84f3c05f 100644
--- a/dev-python/jsonrpclib/Manifest
+++ b/dev-python/jsonrpclib/Manifest
@@ -1,2 +1 @@
-DIST jsonrpclib-0.4.2.tar.gz 59590 BLAKE2B 4201d62c9be469d7016943acfc84dca56606f17383ac26e86f574c34927ee6131c5c1a9bc5c3934b8324049ac35b1ff5e4e49ca7ef850251ebdf9a42a53e59a4 SHA512 8d9e5ebe8de960272a1ea0a194544d41851f96c5bc16b9eb6984ac4e48ec1aeaee8e4c3846cfe747a737612934d43a3df72bb1267f0608b1cd2d6faba2acc7b2
 DIST jsonrpclib-0.4.3.2.gh.tar.gz 63127 BLAKE2B 4301f23a981f00e78f88f78a8f5e8d776985fcd5d268373430b308cd9e2b07d5e1aaae9fa514640275439f4269ecf9ac5a2e42d5c96b870b72e37e4faea7c790 SHA512 718b9a8a49b6f936635ea8e500d16b8d3f42a28e44c4d0bb2bf1e648063ab1107edca93b4f178600a0b36d2e0584cf531f6e9721f5ed6967ea9a160c923103f3
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild
deleted file mode 100644
index 1bc458f27602..000000000000
--- a/dev-python/jsonrpclib/jsonrpclib-0.4.2.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} )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/tcalmant/jsonrpclib.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~mips x86"
-fi
-
-DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
-HOMEPAGE="https://github.com/tcalmant/jsonrpclib"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.3.2.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.3.2.ebuild
index cd254ab94521..017412fcc51a 100644
--- a/dev-python/jsonrpclib/jsonrpclib-0.4.3.2.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-0.4.3.2.ebuild
@@ -16,7 +16,7 @@ else
 		https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index db6ac8f0d76b..4e8c6ddbec0a 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,2 +1 @@
-DIST jwcrypto-1.2.0.gh.tar.gz 88369 BLAKE2B c2f03cef2130884e8a27faa5a7e204ee448ef0a2b56da414f10df34821a67898a0ed2768201d00e2dc7d14b5a3cad3e73c0bd5707910dd2cb1082d1a20a14c04 SHA512 df9073b0561b43cd92f7f1861f9b517bc736d0846f8ef1c7496a48aa5dec49755e5915285ae659c5e2bb18cd51912cd782d799c41c5c6399330f688348096fa5
 DIST jwcrypto-1.3.1.gh.tar.gz 91903 BLAKE2B 49fb3cb9548c85d406d47074a410f6bc89cbc32f16a0244b4ac5e3fa219bc66fc1e4ed32056f5c9885608b5225c2ed3423555813938465924e60dabb8f39749b SHA512 bc43a1acdb12a4e25251a3c5f9c85286c5a4234bd098efe69b7e3bd3da9ec72e80d7239cc20b1f971e17218cce9a7febe6a92efca33da2f2e1479fe64150bb71
diff --git a/dev-python/jwcrypto/jwcrypto-1.2.0.ebuild b/dev-python/jwcrypto/jwcrypto-1.2.0.ebuild
deleted file mode 100644
index 290d3e4f0210..000000000000
--- a/dev-python/jwcrypto/jwcrypto-1.2.0.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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-HOMEPAGE="
-	https://github.com/latchset/jwcrypto/
-	https://pypi.org/project/jwcrypto/
-"
-SRC_URI="
-	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -i "/data_files/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jwcrypto/jwcrypto-1.3.1.ebuild b/dev-python/jwcrypto/jwcrypto-1.3.1.ebuild
index 9d451b084945..290d3e4f0210 100644
--- a/dev-python/jwcrypto/jwcrypto-1.3.1.ebuild
+++ b/dev-python/jwcrypto/jwcrypto-1.3.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest
index b62fd3b8ac51..647e0d3abd16 100644
--- a/dev-python/libnacl/Manifest
+++ b/dev-python/libnacl/Manifest
@@ -1,2 +1 @@
-DIST libnacl-1.7.2.tar.gz 43343 BLAKE2B 4f7d03661e1385033c51821bf673c81ced11a1523b371ec7da42ed9cf75bdaadee1e679059dfae85871530652b5fea80bfb91c19a8a1eefb4ecf1b8661f11e19 SHA512 a4efbf73f73d9493ac365efa5a5bd6481f85ce4c880ad236bbf7478090bdea857e78e33e445c4e467d2a2032040863b835f32f9a942d2f1e467015bd76b0d469
 DIST libnacl-1.8.0.gh.tar.gz 43351 BLAKE2B 4ba0ebcb50755d80418ffe7238c65d9309954cb2a0eac61937c488144b56093f3fcd87f0bf22a290c7b415c70cb781fbf7a2c608863d43694230fe34b3ad418e SHA512 7a39d646083591782691c4d58fd4d743b385ee553bcc4c4741707a237fa3b1213629b5070390526175bdfe8436859aa7711779ff8b22a981227edb30b94e82d6
diff --git a/dev-python/libnacl/files/libnacl-1.7.2-32bit.patch b/dev-python/libnacl/files/libnacl-1.7.2-32bit.patch
deleted file mode 100644
index f8a06d27949a..000000000000
--- a/dev-python/libnacl/files/libnacl-1.7.2-32bit.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f1567460f2d07822f2125778a55bf90b74ef807f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 12 Apr 2021 15:10:09 +0200
-Subject: [PATCH] Fix crypto_kdf_derive_from_key() on 32-bit platforms
-
----
- libnacl/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libnacl/__init__.py b/libnacl/__init__.py
-index 1aa722a..7649013 100644
---- a/libnacl/__init__.py
-+++ b/libnacl/__init__.py
-@@ -1180,7 +1180,7 @@ def crypto_kdf_derive_from_key(subkey_size, subkey_id, context, master_key):
-     '''
-     size = int(subkey_size)
-     buf = ctypes.create_string_buffer(size)
--    nacl.crypto_kdf_derive_from_key(buf, subkey_size, subkey_id, context, master_key)
-+    nacl.crypto_kdf_derive_from_key(buf, subkey_size, ctypes.c_ulonglong(subkey_id), context, master_key)
-     return buf.raw
- 
- # Key Exchange API
--- 
-2.31.1
-
diff --git a/dev-python/libnacl/libnacl-1.7.2-r1.ebuild b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
deleted file mode 100644
index 5971100d8c52..000000000000
--- a/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,26 +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="Python ctypes wrapper for libsodium"
-HOMEPAGE="https://libnacl.readthedocs.org/"
-SRC_URI="https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="dev-libs/libsodium"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/libnacl-1.7.2-32bit.patch
-)
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v -p 'test_*.py' tests/ || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/libnacl/libnacl-1.8.0.ebuild b/dev-python/libnacl/libnacl-1.8.0.ebuild
index be648d7f1677..4e4e39061665 100644
--- a/dev-python/libnacl/libnacl-1.8.0.ebuild
+++ b/dev-python/libnacl/libnacl-1.8.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/libsodium
diff --git a/dev-python/makefun/Manifest b/dev-python/makefun/Manifest
index e64a9b497cde..1e449426b362 100644
--- a/dev-python/makefun/Manifest
+++ b/dev-python/makefun/Manifest
@@ -1 +1,2 @@
 DIST makefun-1.13.1.tar.gz 72170 BLAKE2B b1b5e76277e742ef51bcdf2bf6f1d1e761010d75bc3f20d7a8c079b368972b90775bd3bb23cf1787911a8d858549d72d4a2c9379675e59f359486bf1c49566e2 SHA512 ae103d3827673c4124d051e3c76d3d0d126c783ac7a1ea09de3801fd695439eaa549c297bd5c262184a3ee6fdf7b046065081fa3183642778148c2134d7bfc06
+DIST makefun-1.14.0.tar.gz 73792 BLAKE2B 8a3f947d53787efc1be6d76c4c817063a21d0e135815d196988aa2c6d1e0998344010dfd1e2f33f31c0d47fcad8b7e4c0c7c9e408bdd3ea60f668c3ec8ae09dd SHA512 49b239a559e0ec5e28c29c210161c3530e1d89b39a22f16382f0569a47a6d696917d86c9abefb7ac6dc59f904276f8a853a2dc09b1d9c2332e422757f6eb9a08
diff --git a/dev-python/makefun/makefun-1.14.0.ebuild b/dev-python/makefun/makefun-1.14.0.ebuild
new file mode 100644
index 000000000000..479f833c4511
--- /dev/null
+++ b/dev-python/makefun/makefun-1.14.0.ebuild
@@ -0,0 +1,31 @@
+# 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="Small library to dynamically create Python functions"
+HOMEPAGE="
+	https://pypi.org/project/makefun/
+	https://github.com/smarie/python-makefun/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index d395bec808b3..6a2ef23abf71 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1,2 +1 @@
-DIST markdown2-2.4.2.tar.gz 96270 BLAKE2B 63808f2b6e8af25eca047e7b24a7ab7ce7afc35fa10aff57b93952cefae765ae8746300f6e93033be87aa73607249198cdfd4fa6e3b3aed711e80d9dc7a006ab SHA512 8c41617213ae8a2d02a986489756d511ee7e1ae970eef348f68808439feaef099ef935ea0a2c31cb9e9abe39899a24fd981a29b7c90d1f8096ba999506121e60
 DIST markdown2-2.4.3.tar.gz 102973 BLAKE2B 7a856a9d0bd539e3de1e358aa7d4968aca62b67a30dc64a905633040a6a525b2ac1ec0d4cd7d8d4ed9b38e68e5df3f187cf0f56e1816a4ec10efe4e849356580 SHA512 b5eb5cb6ac52878a224aa6b4642ade86593de5340594271940b3ef25809a9e37b9b3cbb04f4fa9880a50a4fee8ed85c1c6d76b19065b0fd703363faf4d812679
diff --git a/dev-python/markdown2/markdown2-2.4.2.ebuild b/dev-python/markdown2/markdown2-2.4.2.ebuild
deleted file mode 100644
index 0822e4235cbd..000000000000
--- a/dev-python/markdown2/markdown2-2.4.2.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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python Markdown language reimplementation"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://github.com/trentm/python-markdown2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest test_markdown2.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/markdown2/markdown2-2.4.3.ebuild b/dev-python/markdown2/markdown2-2.4.3.ebuild
index df3369a7a31b..d07d36bc4b99 100644
--- a/dev-python/markdown2/markdown2-2.4.3.ebuild
+++ b/dev-python/markdown2/markdown2-2.4.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index 025ab8316f45..25059d789196 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1 +1,2 @@
 DIST meson-python-0.5.0.gh.tar.gz 30525 BLAKE2B f9afcb0edfdb06ce001b5185bf8c09de18a35d0f2d12f8fd69ed35cf17cc5e987c73724403fe1d6c44c80f1fad41b4b66b07b26e050b551673b3860a3d453a29 SHA512 e3941d258c5d16d0355752aff2f6458705a6af7d83850f679c5304d61699c393e186b9da2fe1a6405cb616a319250351e02ad81ddc8abf042f64c6b42b0be1cf
+DIST meson-python-0.6.0.gh.tar.gz 26783 BLAKE2B d5c5b95d5d609487a0efee1ce05b133794705cdb16f2d05d6e08b9201541e31f61a832c7770b4b5ad675f8dd91860c30c67769ce8fc0af2c48e65b0aad187ddb SHA512 25042ea030d2ad323c67daa0a520db936a4a4efa0de1c9f631c47fac22d797e01d1f1707ed407e2931164a35b3916e19a774ee16ab1d45fc91e41c75add57fa1
diff --git a/dev-python/meson-python/meson-python-0.6.0.ebuild b/dev-python/meson-python/meson-python-0.6.0.ebuild
new file mode 100644
index 000000000000..009ad1171e5a
--- /dev/null
+++ b/dev-python/meson-python/meson-python-0.6.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Meson PEP 517 Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/meson-python/
+	https://github.com/FFY00/meson-python/
+"
+SRC_URI="
+	https://github.com/FFY00/meson-python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="EUPL-1.2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pyproject-metadata-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.60.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/GitPython[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-util/patchelf
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.0-defaults.patch
+)
+
+distutils_enable_sphinx docs \
+	dev-python/furo \
+	dev-python/sphinx-autodoc-typehints
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# https://github.com/FFY00/meson-python/issues/86
+	tests/test_sdist.py::test_contents_unstaged
+)
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index e5ead20a4bc1..24db9ab653c7 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,4 +1 @@
-DIST mkdocs-git-revision-date-localized-plugin-0.11.1.tar.gz 369943 BLAKE2B 261813f3d63d6b1bfb021aab3f9db96f7977ac8f6bf6239158f1d8045e1eb5b21b89f2c4eb493634944b202334f59ce589797624137bfc643cda3ef52969bd73 SHA512 fb5e1c1b65f431585dc6a6887fc079a3181e73286697c331317a69f7748453af61abfb8fc58eb55203f09c9a70c752781dd834d03e13184ddb0bb761aa10e371
-DIST mkdocs-git-revision-date-localized-plugin-0.12.1.tar.gz 370763 BLAKE2B 6b69b34a18288d042aa754bcb6f3c6a3b96de0016db1ef888d2b0fe09f479964e6d0473d8af700aec904befb79d5a56e775847c87cd06b1ffc90cfdbe6e73b18 SHA512 4368ae0341fa9e3af08f93cce883b03cc9bd3bef16dcec7314c7e439d6524726173ffb60bbc11bcdd9e3c9ef5f1fa7d24a1c01dc543241061c61a8b0f5044614
-DIST mkdocs-git-revision-date-localized-plugin-1.0.0.tar.gz 375656 BLAKE2B 3dc850f219ca0396015c474d714412253b05075f5ad55fbfdcc4ed90468466e6c6735904517d598b66cf408c222e83ed35d176b1379a26a97b64d88bcbff06b6 SHA512 632f4e2d0ce8fc0f90707918526e49e2752ecc36c2623eb0df76d49476f6e4b347265166f5f1d6148475bb01bdb61a6337a3edf6ccba2cccb2c372a9aba70cac
 DIST mkdocs-git-revision-date-localized-plugin-1.0.1.tar.gz 375668 BLAKE2B 355b0fdced378305dd12c72d05186ef50fc1e5b7e5302c9c0887ced03329d598528367313e81d3c8a4658ed1bb2e940c9495c09c2e6e40a03cbc52833fbb13a5 SHA512 7f54ac18bb09ce1f396d593edb5e456476c18c68464dafc62e6b6e1f3aa89735319016925d2f2b8a4ff7aed03d8e02109da23f23a84d9ae0d138bbca278aafd5
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.11.1.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.11.1.ebuild
deleted file mode 100644
index 932ff4d0b51b..000000000000
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.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
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-authors-plugin
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Display the localized date of the last git modification of a markdown file"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
-	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-	doc? ( dev-vcs/git )
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin's tests need git repo
-	if use test || use doc; then
-		git init -q || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -qm 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.12.1.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.12.1.ebuild
deleted file mode 100644
index e74497a9737a..000000000000
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.12.1.ebuild
+++ /dev/null
@@ -1,55 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-authors-plugin
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Display the localized date of the last git modification of a markdown file"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
-	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-	doc? ( dev-vcs/git )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin's tests need git repo
-	if use test || use doc; then
-		git init -q || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -qm 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.0.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.0.ebuild
deleted file mode 100644
index 833514143271..000000000000
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.0.ebuild
+++ /dev/null
@@ -1,58 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-i18n
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-authors-plugin
-	dev-python/mkdocs-git-revision-date-localized-plugin
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Display the localized date of the last git modification of a markdown file"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
-	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-python/mkdocs-i18n[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-	doc? ( dev-vcs/git )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin's tests need git repo
-	if use test || use doc; then
-		git init -q || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -qm 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild
index 3ec5fc43a66c..833514143271 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/msgpack/msgpack-1.0.4.ebuild b/dev-python/msgpack/msgpack-1.0.4.ebuild
index ef3db4a53a05..ed53a0bb7bbe 100644
--- a/dev-python/msgpack/msgpack-1.0.4.ebuild
+++ b/dev-python/msgpack/msgpack-1.0.4.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 ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv x86 ~x64-macos"
 IUSE="+native-extensions"
 
 # extension code is relying on CPython implementation details
diff --git a/dev-python/netaddr/metadata.xml b/dev-python/netaddr/metadata.xml
index 9b263681c356..b789e13acbb1 100644
--- a/dev-python/netaddr/metadata.xml
+++ b/dev-python/netaddr/metadata.xml
@@ -11,4 +11,5 @@
   <doc>https://netaddr.readthedocs.io/</doc>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/netaddr/netaddr-0.8.0-r1.ebuild b/dev-python/netaddr/netaddr-0.8.0-r1.ebuild
index 20d496c11315..f2b61f9c6a56 100644
--- a/dev-python/netaddr/netaddr-0.8.0-r1.ebuild
+++ b/dev-python/netaddr/netaddr-0.8.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx docs/source
 distutils_enable_tests pytest
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 06022c933547..cbdc36c11b5e 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,3 +1,3 @@
 DIST psutil-5.9.0.tar.gz 478322 BLAKE2B 763c8ae14ae546bed64a360047d2ce38783e9e7e939160f751c4ccc94b8e023aaa4cdca426f584e05dae8b1326333660e216d7cb3edd820e24a931dddfa5160f SHA512 b521cfce51e90fdf87ba19bf8069877e3210aede92c17460ea0b00324a36e133168e4bff550462d07ab6d93c597c6560d68954340031ff43168d54a8e5d4c4e7
-DIST psutil-5.9.1-tests.patch.xz 3144 BLAKE2B 8980505d76265fbe20556fcec491096fd5e74031a2f1a4bff841837efda93ee240efe23772ffdea526513544ba5c56f37e72be5448759e817c3dc5f4b1abd4c5 SHA512 a0ebbcba6f99293df9c2222b73e994abe1cbb423e707b15f9bcde13a0026a19e023166c830a3d017905385efb838ad892ffbc1b994df99ce54fa03a20e649f41
+DIST psutil-5.9.1-tests-r2.patch.xz 3516 BLAKE2B 6a16d6f89fdeb06c7aa0d9d986eba84deae5f8d2bb829c2509744f954f9b274d8a70a00f94127f1880cea71f8d7e7b85097517f8516ee6ef14f17522ee9297b2 SHA512 b69efb32cd0229056ff9fbbde963f0f01f6bf1d0820f028527f464e38a9bd4211a55bd725cc8962a20608c12c28edb24b2063f5f58b53fdb6b001fe2f95da103
 DIST psutil-5.9.1.tar.gz 479090 BLAKE2B 88f35a9134d942fa56b5fbc79753e82245c3bfdb1f640dbf3b56815b89d872517f9ee3a3945532ebd1a399c3307e160ac80394766c3b2cc7e3fb36ffdd555eef SHA512 1ddb119a10243d17d808417817ec8659d22447f12a4bbc0366c13f6587a4b0b59f4e74f6ac5d1e1a908bb5fd287be630466d32beabcb5008f6a19c24a1557c27
diff --git a/dev-python/psutil/psutil-5.9.1.ebuild b/dev-python/psutil/psutil-5.9.1.ebuild
index df619a9f8c35..1140e06ad230 100644
--- a/dev-python/psutil/psutil-5.9.1.ebuild
+++ b/dev-python/psutil/psutil-5.9.1.ebuild
@@ -8,19 +8,22 @@ PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 
 inherit distutils-r1
 
+TEST_PATCH=psutil-5.9.1-tests-r2.patch
 DESCRIPTION="Retrieve information on running processes and system utilization"
 HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.9.1-tests.patch.xz"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/${TEST_PATCH}.xz
+"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${WORKDIR}"/${PN}-5.9.1-tests.patch
+	"${WORKDIR}/${TEST_PATCH}"
 )
 
 python_test() {
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index d672ee1b4d11..0f234db35a7c 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -1 +1,2 @@
 DIST pycares-4.1.2.tar.gz 43668 BLAKE2B 4b26f8643ff5ce297981b0b60b3afb34b249138e8f702dd4aa0a38935e9e5338d048f3be1b4fb64d6d8b2259a279a8881dbd44b412c10427dbd7eee664e70495 SHA512 6fb2d24fb5f2638c55424608b02ebe9f630866d644decfb663ab9d8e2bb7a42629748fa220054747f9c36ce3dcb42f3b8e457c5c39009f94b564ff07efde0c84
+DIST pycares-4.2.0.gh.tar.gz 43939 BLAKE2B 6cac12ff2b3c44cf7d04b4ce3067d5435d416788e89251d87825e5ea265ecb178948e0187c47e8dfe40ec0480a66b8b2f6cc2c45e74473e9d66f5cc74269f50f SHA512 14c813242ff6cdc5249ae52c2b9ff1870d7b74c7c6083868b2b4bbe0ce2af3f15e9b2775f67940ffbfc4ce84a6a9232ba4fab5a17ef389f7a197a15318280e43
diff --git a/dev-python/pycares/files/pycares-4.2.0-c-ares-1.18.patch b/dev-python/pycares/files/pycares-4.2.0-c-ares-1.18.patch
new file mode 100644
index 000000000000..2e094a2b2f1c
--- /dev/null
+++ b/dev-python/pycares/files/pycares-4.2.0-c-ares-1.18.patch
@@ -0,0 +1,37 @@
+From 72202e0bc135e360102371708e83334856d485cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 22 Jun 2022 07:38:33 +0200
+Subject: [PATCH] core: add flexible member to ares_addrinfo to fix c-ares 1.18
+
+Add a flexible member to account for c-ares 1.18 adding an additional
+`name` member to `struct ares_addrinfo`.  This fixes the following
+exception from cffi, and the resulting test_getaddrinfo* failures:
+
+```
+Exception ignored from cffi callback <function _addrinfo_cb at 0x7f5fa890d040>:
+Traceback (most recent call last):
+  File "/tmp/pycares/.tox/py39/lib/python3.9/site-packages/pycares/__init__.py", line 162, in _addrinfo_cb
+    result = ares_addrinfo_result(res)
+  File "/tmp/pycares/.tox/py39/lib/python3.9/site-packages/pycares/__init__.py", line 841, in __init__
+    cname_ptr = ares_addrinfo.cnames
+ffi.error: struct ares_addrinfo: wrong total size (cdef says 16, but C compiler says 24). fix it or use "...;" as the last field in the cdef for struct ares_addrinfo to make it flexible
+```
+---
+ src/_cffi_src/build_cares.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/_cffi_src/build_cares.py b/src/_cffi_src/build_cares.py
+index 77f03aa..dec42c9 100644
+--- a/src/_cffi_src/build_cares.py
++++ b/src/_cffi_src/build_cares.py
+@@ -337,6 +337,7 @@ struct ares_addrinfo_cname {
+ struct ares_addrinfo {
+   struct ares_addrinfo_cname *cnames;
+   struct ares_addrinfo_node  *nodes;
++  ...;
+ };
+ 
+ struct ares_addrinfo_hints {
+-- 
+2.35.1
+
diff --git a/dev-python/pycares/pycares-4.2.0.ebuild b/dev-python/pycares/pycares-4.2.0.ebuild
new file mode 100644
index 000000000000..42c9a1d63a53
--- /dev/null
+++ b/dev-python/pycares/pycares-4.2.0.ebuild
@@ -0,0 +1,55 @@
+# 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 interface for c-ares"
+HOMEPAGE="
+	https://github.com/saghul/pycares/
+	https://pypi.org/project/pycares/
+"
+SRC_URI="
+	https://github.com/saghul/pycares/archive/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/pycares-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="test"
+# Tests fail with network-sandbox, since they try to resolve google.com
+PROPERTIES="test_network"
+RESTRICT="test"
+
+DEPEND="
+	net-dns/c-ares:=
+"
+BDEPEND="
+	virtual/python-cffi[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-python/idna[${PYTHON_USEDEP}]
+	${DEPEND}
+	${BDEPEND}
+"
+BDEPEND+="
+	test? (
+		dev-python/idna[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-c-ares-1.18.patch
+)
+
+export PYCARES_USE_SYSTEM_LIB=1
+
+python_test() {
+	"${EPYTHON}" tests/tests.py -v || die
+}
diff --git a/dev-python/pymdown-lexers/Manifest b/dev-python/pymdown-lexers/Manifest
index a7574252339a..2036a72e0427 100644
--- a/dev-python/pymdown-lexers/Manifest
+++ b/dev-python/pymdown-lexers/Manifest
@@ -1,2 +1 @@
-DIST pymdown-lexers-0_pre20210308.tar.gz 2962 BLAKE2B 6504974327727cf49c9a6584cf06dee1505c8e0266241b584f84c3a99f6e8344e3dafda2bcdd3773d06e634a6d6aecd1279b40f3126ffdddb77f3218a1a18034 SHA512 08beadf0ee24bc33b6eb231d297bdbb084954fba4a22fb0beed3bb08c2e188bf984465a61138affbcdbf843831bbd7d2f2d26c798c60048145a42d365ae81dd3
 DIST pymdown-lexers-0_pre20210902.tar.gz 2998 BLAKE2B cd9793c247abd7ac2ff2a8104f1b43ef034a8da14fa27c86c59794b7f53c22e75820a0033673e44824f98b50a4e9af446538428252a4064223e5ad35bdeac23a SHA512 c411f935ca0fedbdd0547c2c78d2292d8a07469f90b401d29fc1c2cc1eb899fde865a5eefa253eade03dc139af6188e0b655b8924465238ce9a53cd636eb5b53
diff --git a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
deleted file mode 100644
index 39b264136ec6..000000000000
--- a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-COMMIT="84dc78c7692720bd614209124c3e8af65678532a"
-
-DESCRIPTION="Additional lexers for use in Pygments"
-HOMEPAGE="https://github.com/facelessuser/pymdown-lexers"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210902.ebuild b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210902.ebuild
index 6fb3cc719f97..f3f32f84bd41 100644
--- a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210902.ebuild
+++ b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210902.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyperclip/pyperclip-1.8.2-r1.ebuild b/dev-python/pyperclip/pyperclip-1.8.2-r1.ebuild
index fd730de0a710..3024988a2fa5 100644
--- a/dev-python/pyperclip/pyperclip-1.8.2-r1.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.8.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/dev-python/pyperclip/pyperclip-1.8.2.ebuild b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
deleted file mode 100644
index 1ff7e38dcf20..000000000000
--- a/dev-python/pyperclip/pyperclip-1.8.2.ebuild
+++ /dev/null
@@ -1,60 +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 virtualx
-
-DESCRIPTION="A cross-platform clipboard module for Python"
-HOMEPAGE="https://github.com/asweigart/pyperclip"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	|| (
-		(
-			x11-misc/xsel
-			sys-apps/which
-		)
-		(
-			x11-misc/xclip
-			sys-apps/which
-		)
-		(
-			kde-plasma/plasma-workspace
-			sys-apps/which
-		)
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/QtPy[${PYTHON_USEDEP}]
-	)
-"
-# test at least one backend
-BDEPEND="
-	test? (
-		${RDEPEND}
-	)
-"
-
-src_prepare() {
-	# stupid windows
-	find -type f -exec sed -i -e 's:\r$::' {} + || die
-	# klipper is hard to get working, and once we make it work,
-	# it breaks most of the other backends
-	# wl-copy requires wayland, not Xvfb
-	sed -e 's:_executable_exists("\(klipper\|wl-copy\)"):False:' \
-		-i tests/test_pyperclip.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" tests/test_pyperclip.py -vv ||
-		die "Tests fail on ${EPYTHON}"
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild b/dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild
index a0522e17a57f..df57d713822d 100644
--- a/dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-services/pytest-services-2.2.1.ebuild b/dev-python/pytest-services/pytest-services-2.2.1.ebuild
deleted file mode 100644
index fabe330ddcc2..000000000000
--- a/dev-python/pytest-services/pytest-services-2.2.1.ebuild
+++ /dev/null
@@ -1,50 +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="Collection of fixtures and utility functions to run service processes for pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-services"
-SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/zc-lockfile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pylibmc[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-		net-misc/memcached
-		!dev-python/pytest-salt
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/pytest-services-2.0.1-no-mysql.patch"
-	"${FILESDIR}/pytest-services-2.0.1-lockdir.patch"
-)
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index 1d39ebf8161d..962fe829659c 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,2 +1 @@
-DIST python-slugify-6.1.1.tar.gz 13259 BLAKE2B 2f85061775d9e921bf5679ab47d9a5b4fed2d2e1703aa2717e21c1d43fd1b93ef5d7060151bb4b473cd901aef16d3d905d2ca5004ae7bc61e906464bb52494a2 SHA512 2ffe8420b2f0504c57f42bf20aa0145ae521dab8d1bbefcaff1a815aa04377c7eb48eab929890915a9c9632a5c1cac4d3e7e093dcdfdda59f8ecee1ab787cbb7
 DIST python-slugify-6.1.2.tar.gz 13302 BLAKE2B 600ac1cc37cd0001ca3c08cdccb4655dd3754f7673596eada2dfb6adcb6c190f0e5644bd1cba4debf0fae42ae183b3d81acdcc09270e3ade94076d69ba25895a SHA512 3748c18d469032fc002318fbd5730b96a6f8430ff7b0b1a9afb4c19d4dd8e7528400682fa6b2fcc11ec4230917d7e7f61de290f5b199935d77d5335006af0ffb
diff --git a/dev-python/python-slugify/python-slugify-6.1.1.ebuild b/dev-python/python-slugify/python-slugify-6.1.1.ebuild
deleted file mode 100644
index d728ef3eac60..000000000000
--- a/dev-python/python-slugify/python-slugify-6.1.1.ebuild
+++ /dev/null
@@ -1,26 +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 Python Slugify application that handles Unicode"
-HOMEPAGE="
-	https://github.com/un33k/python-slugify/
-	https://pypi.org/project/python-slugify/
-"
-SRC_URI="
-	https://github.com/un33k/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-
-RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-slugify/python-slugify-6.1.2.ebuild b/dev-python/python-slugify/python-slugify-6.1.2.ebuild
index c9a5bb68fbb8..c63a97b0689f 100644
--- a/dev-python/python-slugify/python-slugify-6.1.2.ebuild
+++ b/dev-python/python-slugify/python-slugify-6.1.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/text-unidecode[${PYTHON_USEDEP}]
diff --git a/dev-python/pyzmq/pyzmq-23.0.0.ebuild b/dev-python/pyzmq/pyzmq-23.0.0.ebuild
index 1aebe04d93cb..617622c2fa1f 100644
--- a/dev-python/pyzmq/pyzmq-23.0.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-23.0.0.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/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index e97607a4452f..f8dbc9d6f6dd 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1 +1,2 @@
 DIST setuptools_scm-6.4.2.tar.gz 61305 BLAKE2B e1b5191425cf5db8334761a6857b0bc39c547c167901cbdf8401af441c5941cd75744162417ff42dbac792ae867d71c7576c5e9e533fe8039a75954f4c2ba439 SHA512 224dfe543e8658e7d8b7272d18eb657fac1774a206d079d65bb6e22bfa68b35e618a31b3671418d095f8b7b492339ea18491a1711be3a87eeecf50c6703a4096
+DIST setuptools_scm-7.0.1.tar.gz 67921 BLAKE2B 15a4a8953bb9cf8754fe465b53e11483ade33b09c5b407f096ecbdaed80081fa554e0c6da1accdbc629163019bf91968f4edae40166dc4598b25e0a51c5881d1 SHA512 49d296ca4af3175c47a385d9d935fe32371d39c31ff4e6d704ea6fc8dd512e7ed6b0136677e7768836c0ec2ae558c47f156adc5975ace30a396fa81644e61acb
diff --git a/dev-python/setuptools_scm/setuptools_scm-7.0.1-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-7.0.1-r1.ebuild
new file mode 100644
index 000000000000..847084d3aa64
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-7.0.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+	https://github.com/pypa/setuptools_scm/
+	https://pypi.org/project/setuptools-scm/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-vcs/git
+		!sparc? (
+			dev-vcs/mercurial
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fetching from the Internet
+	testing/test_regressions.py::test_pip_download
+	testing/test_setuptools_support.py
+
+	# the usual nondescript gpg-agent failure
+	testing/test_git.py::test_git_getdate_signed_commit
+
+	# broken by... pbr?
+	testing/test_integration.py::test_pyproject_support
+)
diff --git a/dev-python/setuptools_scm_git_archive/Manifest b/dev-python/setuptools_scm_git_archive/Manifest
index 0afcae6c2466..9775354ae235 100644
--- a/dev-python/setuptools_scm_git_archive/Manifest
+++ b/dev-python/setuptools_scm_git_archive/Manifest
@@ -1 +1,2 @@
 DIST setuptools_scm_git_archive-1.1.tar.gz 2584 BLAKE2B 7c7569a92300be966b5447b1ab6c30a982c837efdb7a125173f6014420d78cf28e0d8cb0f04c4349ce364219e1567bcbc2e13bd85cb7627d3bdbae9c7974385b SHA512 73783d60d33782fb18012e64685db6333a2dda1be41ce75e0cd74a81585d8ebb7c85f23371056a42974c93b2d4a0633338945cf2a2219b0ee2a21f063dad8809
+DIST setuptools_scm_git_archive-1.2.gh.tar.gz 2648 BLAKE2B d2a6629fa1eb8c413def6c7cb192afb47299cd1ffce3692951fb6f90e9b6b4d0f4f2286486a5ae7e550c4659ed3ef7289746ec48be2bfe43c6c3d80143cc4e46 SHA512 980a7463dd7a53f71c8f9f1fde0f14927a6063bfae386b85d42a2909e05de42339a3770d5cf0c22981f17bbdec52febf7041fb54628f2d8321e46401ef0beccb
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.2.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.2.ebuild
new file mode 100644
index 000000000000..c9999c5e2c8b
--- /dev/null
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.2.ebuild
@@ -0,0 +1,39 @@
+# 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
+
+DESCRIPTION="A setuptools_scm plugin for git archives"
+HOMEPAGE="
+	https://github.com/Changaco/setuptools_scm_git_archive/
+	https://pypi.org/project/setuptools-scm-git-archive/
+"
+SRC_URI="
+	https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+
+python_test() {
+	epytest tests.py
+}
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
index 3dbf21508a56..b5970f295ab2 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/httpdomain-${PV}"
 
 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/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index 20a87b21dcf0..ec0c1ba068f6 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,2 +1,3 @@
+DIST python-tabulate-0.8.10.gh.tar.gz 49453 BLAKE2B 9bf5c9e937f8ef051792fc57dcd56f1150636bf29493fabe56d4b706df04add41fdffbe1108cb93aa561edc96245ba85e621d4a8b402ace513b55710e6e5498c SHA512 d216076112c0d0f0879c1eeecf2d2c0c30edc84d7289396f1a8d24bca862ef90fcf221a09812b409547696c3b7d4472d431043e359c3a7f67bb8392ce1e95ddc
 DIST python-tabulate-0.8.9.gh.tar.gz 42562 BLAKE2B 6e6e1017379d07d5ede0cdfb6a8e3142f60656fd5d5b409c1259239e62637824c3bab0bb0f6b03f8733a24e9e3ac074a80a56d44939a8c6eeab8e9a830ae8277 SHA512 68a4d194068f692b57b2cca0fa42a58ba571b46adaef7f8b1a8cea7e34c78ea0a1c523286c3f1df631897cc60ad39ef6b11bfee61d46c04e2de1fb9ec0b497dd
 DIST tabulate-0.8.9.tar.gz 42562 BLAKE2B 6e6e1017379d07d5ede0cdfb6a8e3142f60656fd5d5b409c1259239e62637824c3bab0bb0f6b03f8733a24e9e3ac074a80a56d44939a8c6eeab8e9a830ae8277 SHA512 68a4d194068f692b57b2cca0fa42a58ba571b46adaef7f8b1a8cea7e34c78ea0a1c523286c3f1df631897cc60ad39ef6b11bfee61d46c04e2de1fb9ec0b497dd
diff --git a/dev-python/tabulate/tabulate-0.8.10.ebuild b/dev-python/tabulate/tabulate-0.8.10.ebuild
new file mode 100644
index 000000000000..5760aa1b2dfa
--- /dev/null
+++ b/dev-python/tabulate/tabulate-0.8.10.ebuild
@@ -0,0 +1,56 @@
+# 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=python-${P}
+DESCRIPTION="Pretty-print tabular data"
+HOMEPAGE="
+	https://github.com/astanin/python-tabulate/
+	https://pypi.org/project/tabulate/
+"
+SRC_URI="
+	https://github.com/astanin/python-${PN}/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep 'sqlite')
+		dev-python/colorclass[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		' 'python3*')
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/test_input.py::test_pandas
+			test/test_input.py::test_pandas_firstrow
+			test/test_input.py::test_pandas_keys
+			test/test_output.py::test_pandas_with_index
+			test/test_output.py::test_pandas_without_index
+			test/test_output.py::test_pandas_rst_with_index
+			test/test_output.py::test_pandas_rst_with_named_index
+		)
+	fi
+	epytest
+}
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-06-22 10:25:46 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-06-22 10:25:46 +0000
commit	3ec09f996cad3cacb8d33bfe0331c6045066371c (patch)
tree	e8c7c5066145321a850bd33ee214274e8e8ade42 /dev-python
parent	cfcb994b646269c1d29a43feb26df61670248ca0 (diff)
download	baldeagleos-repo-3ec09f996cad3cacb8d33bfe0331c6045066371c.tar.gz baldeagleos-repo-3ec09f996cad3cacb8d33bfe0331c6045066371c.tar.xz baldeagleos-repo-3ec09f996cad3cacb8d33bfe0331c6045066371c.zip