Adding metadata

38 files changed, 236 insertions, 271 deletions

diff --git a/dev-python/cleo/Manifest b/dev-python/cleo/Manifest
index 86a6d75da698..a3b3f64d5a29 100644
--- a/dev-python/cleo/Manifest
+++ b/dev-python/cleo/Manifest
@@ -1 +1,2 @@
+DIST cleo-0.8.1.gh.tar.gz 96220 BLAKE2B 57971f6254a31ecf5101d89e96607b5915ab5138d727279d445172b89a10acd6b76619d344973fa2bdbc320866fa1dbdf05c889f4eca879839fa6bcbbad0af7c SHA512 9cd470063db9866a526f0bb8619d772c585377d5b1a662e0f94bad9fb9c853598b176444ca1ac0fadec82992196c471646504d6a28d4dcd1171433b8d160be9c
 DIST cleo-0.8.1.tar.gz 96220 BLAKE2B 57971f6254a31ecf5101d89e96607b5915ab5138d727279d445172b89a10acd6b76619d344973fa2bdbc320866fa1dbdf05c889f4eca879839fa6bcbbad0af7c SHA512 9cd470063db9866a526f0bb8619d772c585377d5b1a662e0f94bad9fb9c853598b176444ca1ac0fadec82992196c471646504d6a28d4dcd1171433b8d160be9c
diff --git a/dev-python/cleo/cleo-0.8.1-r1.ebuild b/dev-python/cleo/cleo-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..ca956d8d355e
--- /dev/null
+++ b/dev-python/cleo/cleo-0.8.1-r1.ebuild
@@ -0,0 +1,33 @@
+# 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="Python tool for building testable command-line interfaces"
+HOMEPAGE="
+	https://github.com/python-poetry/cleo/
+	https://pypi.org/project/cleo/
+"
+SRC_URI="
+	https://github.com/python-poetry/cleo/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/clikit[${PYTHON_USEDEP}]
+		dev-python/crashtest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cleo/metadata.xml b/dev-python/cleo/metadata.xml
index 435852eb93f2..12cb1059a8c1 100644
--- a/dev-python/cleo/metadata.xml
+++ b/dev-python/cleo/metadata.xml
@@ -5,6 +5,10 @@
   <email>jsmolic@gentoo.org</email>
   <name>Jakov Smolić</name>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/clikit/Manifest b/dev-python/clikit/Manifest
index cfef6b02db15..13e4aff894f5 100644
--- a/dev-python/clikit/Manifest
+++ b/dev-python/clikit/Manifest
@@ -1 +1,2 @@
+DIST clikit-0.6.2.gh.tar.gz 72115 BLAKE2B b72f245128c698375f97139cf245bdc8c017e3e2d142f6e3183a42620b23a024531e5b14f05163c6defa9ee54c52c19a64932c62484f2ec8da5c75ea1b7d3d27 SHA512 6f6e436b2161349ce03c705df594e564dbc594b03370dfd62e3b1c8f2accbbc12a1cda881ca392a096435ee243e4f772589ce6f6dfbd3af63d1656d49c3fcb04
 DIST clikit-0.6.2.tar.gz 72115 BLAKE2B b72f245128c698375f97139cf245bdc8c017e3e2d142f6e3183a42620b23a024531e5b14f05163c6defa9ee54c52c19a64932c62484f2ec8da5c75ea1b7d3d27 SHA512 6f6e436b2161349ce03c705df594e564dbc594b03370dfd62e3b1c8f2accbbc12a1cda881ca392a096435ee243e4f772589ce6f6dfbd3af63d1656d49c3fcb04
diff --git a/dev-python/clikit/clikit-0.6.2-r1.ebuild b/dev-python/clikit/clikit-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..31918685893b
--- /dev/null
+++ b/dev-python/clikit/clikit-0.6.2-r1.ebuild
@@ -0,0 +1,43 @@
+# 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="Group of utilities to build beautiful and testable command line interfaces"
+HOMEPAGE="
+	https://github.com/sdispater/clikit/
+	https://pypi.org/project/clikit/
+"
+SRC_URI="
+	https://github.com/sdispater/clikit/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/pastel[${PYTHON_USEDEP}]
+	dev-python/pylev[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/crashtest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock.plugin
+	local -x COLUMNS=80
+	epytest
+}
diff --git a/dev-python/clikit/clikit-0.6.2.ebuild b/dev-python/clikit/clikit-0.6.2.ebuild
index cc926e0746bd..fb63ec83b64a 100644
--- a/dev-python/clikit/clikit-0.6.2.ebuild
+++ b/dev-python/clikit/clikit-0.6.2.ebuild
@@ -27,9 +27,11 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-python_prepare_all() {
-	# skip failing test
-	rm tests/utils/test_terminal.py || die
-
-	distutils-r1_python_prepare_all
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_DESELECT=(
+		# skip failing test
+		tests/utils/test_terminal.py
+	)
+	epytest
 }
diff --git a/dev-python/clikit/metadata.xml b/dev-python/clikit/metadata.xml
index 435852eb93f2..12cb1059a8c1 100644
--- a/dev-python/clikit/metadata.xml
+++ b/dev-python/clikit/metadata.xml
@@ -5,6 +5,10 @@
   <email>jsmolic@gentoo.org</email>
   <name>Jakov Smolić</name>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/fonttools/fonttools-4.34.4.ebuild b/dev-python/fonttools/fonttools-4.34.4.ebuild
index 48fff4b37489..1576d5c96eb3 100644
--- a/dev-python/fonttools/fonttools-4.34.4.ebuild
+++ b/dev-python/fonttools/fonttools-4.34.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.gh.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.3.0.ebuild b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.3.0.ebuild
index 40b7c813be57..ea9463280e5e 100644
--- a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.3.0.ebuild
+++ b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.3.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390"
 
 RDEPEND="
 	dev-python/hatchling[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/jsonschema-4.12.1.ebuild b/dev-python/jsonschema/jsonschema-4.12.1.ebuild
index c22d365a1b6d..1c3276e9da9e 100644
--- a/dev-python/jsonschema/jsonschema-4.12.1.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.12.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390"
 
 RDEPEND="
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mypy/mypy-0.971.ebuild b/dev-python/mypy/mypy-0.971.ebuild
index 67f294702db1..393cc37bf4e5 100644
--- a/dev-python/mypy/mypy-0.971.ebuild
+++ b/dev-python/mypy/mypy-0.971.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index b9dc5e14633d..a70c333d4c65 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,2 +1 @@
-DIST networkx-2.8.4.tar.gz 1951336 BLAKE2B f45708eb8a642ee2561caf6b82b8947cc0ed8a90e22ff3424c54db728f6ab91bbaf78c62da113d02325c8f56418690386143c74f2098c670fe102c4e5ec78b9d SHA512 3f874e08a55d924905506fabdba1540745f7a1a99745531b49442206b6cac9b911674441d2241bc2c3e8c173635d53f2e5677fe76936630236ffb3fa021b2f9a
 DIST networkx-2.8.5.tar.gz 1955125 BLAKE2B a98eb678f2d3b336e5675ac34b59677ead3d706347feb0150f553b49cad0f1936a5abf179eaa496e32b8e9d59103022e5103d9e2d758aac2df781f031254c2fb SHA512 0a4d50da0eff0ee7d79941d27bf07b5425493b92f482b4f91bd91a930e4e9c5eb1d3832aee44919aa708fd1e2d0a53fe2d77ff33864a54d0e3167b4108545dec
diff --git a/dev-python/networkx/networkx-2.8.4.ebuild b/dev-python/networkx/networkx-2.8.4.ebuild
deleted file mode 100644
index c1d5fb4a2e3c..000000000000
--- a/dev-python/networkx/networkx-2.8.4.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_FULLY_TESTED=( python3_{8..10} )
-# networkx skips tests w/ missing deps and the available ones all pass w/ py3.11
-PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" )
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="
-	https://networkx.org/
-	https://github.com/networkx/networkx/
-	https://pypi.org/project/networkx/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-			>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
-		' "${PYTHON_FULLY_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# virtx implies nonfatal
-	nonfatal epytest -p no:django || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	# those examples use various assets and pre-compressed files
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-pkg_postinst() {
-	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
-	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
-	optfeature "YAML format reading and writing" "dev-python/pyyaml"
-	optfeature "shapefile format reading and writing" "dev-python/gdal"
-	optfeature "GraphML XML format" "dev-python/lxml"
-}
diff --git a/dev-python/networkx/networkx-2.8.5.ebuild b/dev-python/networkx/networkx-2.8.5.ebuild
index 739a7116d4fc..7476f51f6282 100644
--- a/dev-python/networkx/networkx-2.8.5.ebuild
+++ b/dev-python/networkx/networkx-2.8.5.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pastel/Manifest b/dev-python/pastel/Manifest
index ad6aaf29e8a7..5760732e413f 100644
--- a/dev-python/pastel/Manifest
+++ b/dev-python/pastel/Manifest
@@ -1 +1,2 @@
+DIST pastel-0.2.1.gh.tar.gz 125760 BLAKE2B f9b3c29444bb6bd0e710cd80d4e48cdc9099ad6512cd99b0224559b87504f5b61cfcb90165f97b101b8ff5e9f8b7e230878c5cf50ae2b0555447f5be28977cb0 SHA512 585834d035fe208313a77e0c824f6b67630a85697d4aef802800911cb1da72bfd6c9ba47fe5502359bdf244a98b8f6dea300a788ff1cfd56a8bc19eb7b7dcc16
 DIST pastel-0.2.1.tar.gz 125760 BLAKE2B f9b3c29444bb6bd0e710cd80d4e48cdc9099ad6512cd99b0224559b87504f5b61cfcb90165f97b101b8ff5e9f8b7e230878c5cf50ae2b0555447f5be28977cb0 SHA512 585834d035fe208313a77e0c824f6b67630a85697d4aef802800911cb1da72bfd6c9ba47fe5502359bdf244a98b8f6dea300a788ff1cfd56a8bc19eb7b7dcc16
diff --git a/dev-python/pastel/metadata.xml b/dev-python/pastel/metadata.xml
index 435852eb93f2..12cb1059a8c1 100644
--- a/dev-python/pastel/metadata.xml
+++ b/dev-python/pastel/metadata.xml
@@ -5,6 +5,10 @@
   <email>jsmolic@gentoo.org</email>
   <name>Jakov Smolić</name>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/pastel/pastel-0.2.1-r1.ebuild b/dev-python/pastel/pastel-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..a407e9161e4a
--- /dev/null
+++ b/dev-python/pastel/pastel-0.2.1-r1.ebuild
@@ -0,0 +1,25 @@
+# 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="Bring colors to your terminal"
+HOMEPAGE="
+	https://github.com/sdispater/pastel/
+	https://pypi.org/project/pastel/
+"
+SRC_URI="
+	https://github.com/sdispater/pastel/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pylev/Manifest b/dev-python/pylev/Manifest
index 9add27a3a01c..fba4b3fc7099 100644
--- a/dev-python/pylev/Manifest
+++ b/dev-python/pylev/Manifest
@@ -1 +1,2 @@
+DIST pylev-1.4.0.gh.tar.gz 4895 BLAKE2B d49e153d308165dcdc06bad94013afa4ccc6d2a6ecff943a2718a8f9ab71bbacb9c0cf8b604dbf0c77322a8d0cbeba5ffaed13531a31210507f144f716f8e740 SHA512 3999adf04b159499a199b1aa66e2540904c689c50a407bf7e0cc0affe834ea289006d2fc73f65e4fcd486c755c580e9657dc5c67290dccb4704bebc6a4348de3
 DIST pylev-1.4.0.tar.gz 4895 BLAKE2B d49e153d308165dcdc06bad94013afa4ccc6d2a6ecff943a2718a8f9ab71bbacb9c0cf8b604dbf0c77322a8d0cbeba5ffaed13531a31210507f144f716f8e740 SHA512 3999adf04b159499a199b1aa66e2540904c689c50a407bf7e0cc0affe834ea289006d2fc73f65e4fcd486c755c580e9657dc5c67290dccb4704bebc6a4348de3
diff --git a/dev-python/pylev/pylev-1.4.0-r1.ebuild b/dev-python/pylev/pylev-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..51b54df332d3
--- /dev/null
+++ b/dev-python/pylev/pylev-1.4.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 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 Levenshtein implementation"
+HOMEPAGE="
+	https://github.com/toastdriven/pylev/
+	https://pypi.org/project/pylev/
+"
+SRC_URI="
+	https://github.com/toastdriven/pylev/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
index 1d761802f7da..762afccb68e7 100644
--- a/dev-python/pyspelling/Manifest
+++ b/dev-python/pyspelling/Manifest
@@ -1,2 +1 @@
-DIST pyspelling-2.7.3.tar.gz 151244 BLAKE2B bdfb40c6f39dc5adcc31691ef75b2582e78e8d0ed800ef0e263f8f98987ce3911650cb08085315c617c185e6ef183a11508fde4608349d0dad435b9f4fe1da98 SHA512 6903b620993933e80dfef320c0218c6372ee37f1db958b489d273aca24dd91bcc86fd12967848b8e31c2d7d458fb5fbfb521f41328c5955a1914f7d552ae7341
 DIST pyspelling-2.8.1.gh.tar.gz 150813 BLAKE2B 53df7ae453180007af08fe3928274f9a468f7d24cc5f00b85efbda0febe9532f7b57805b54c2e28c3580e34de383a249bb293b1f89905d2b09c1a70853d12fd3 SHA512 24e9b03b3f5c911e2cd32a5594813fad5fce3fe5cc8c570fdaf4a025aebe8d02d2b77542d6e940cb03350df3203f1a9961a3f446fd60d66250a3cff7c54534de
diff --git a/dev-python/pyspelling/pyspelling-2.7.3.ebuild b/dev-python/pyspelling/pyspelling-2.7.3.ebuild
deleted file mode 100644
index 213e3ba8743b..000000000000
--- a/dev-python/pyspelling/pyspelling-2.7.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=setuptools
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.1.3
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Spell checker automation tool"
-HOMEPAGE="https://github.com/facelessuser/pyspelling"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	|| ( app-text/aspell app-text/hunspell )
-
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/soupsieve-1.8[${PYTHON_USEDEP}]
-	>=dev-python/wcmatch-6.0.3[${PYTHON_USEDEP}]
-"
-
-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/pyspelling/pyspelling-2.8.1.ebuild b/dev-python/pyspelling/pyspelling-2.8.1.ebuild
index b1d26070e3c2..0d1fe9a85496 100644
--- a/dev-python/pyspelling/pyspelling-2.8.1.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.8.1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	|| ( app-text/aspell app-text/hunspell )
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
index 3e6801efb6fb..2d825d7ddf5b 100644
--- a/dev-python/python-daemon/Manifest
+++ b/dev-python/python-daemon/Manifest
@@ -1,2 +1 @@
-DIST python-daemon-2.3.0.tar.gz 82831 BLAKE2B 6e7fa082a513827283f46044347dfd445633db0d1781a33aa1bc5b14c340da784310ae6bd07d6cf3673cd05cb14a9d090ab51857d26cca52d09bc8c3b195360f SHA512 30bb70821aae720d09032c8c666524fa9a1a486314ffff73eb161231a1f2b954914295b4ad41f9c8529bc045fb6d0f89256bc59f8979a4f8a6698e9bd4d7441a
 DIST python-daemon-2.3.1.tar.gz 82856 BLAKE2B d1ede5fde50f179b0bf3e3ed89bd988469bae1f57667ab601d44452706a84264f55fc9beb89226e5fb1bb6d92f88fc2a5c2497628de16990407a0e01cfbacd84 SHA512 128fd8ac125eac613936668bb555635c8cec576d5c23513210f0956983c70720dd93906adeee581b192b57480a3df93dc1e08f6f7b62e38b2404fa00aba4805a
diff --git a/dev-python/python-daemon/files/python-daemon-2.3.0-fix-py3.10.patch b/dev-python/python-daemon/files/python-daemon-2.3.0-fix-py3.10.patch
deleted file mode 100644
index 4fd082dc8f77..000000000000
--- a/dev-python/python-daemon/files/python-daemon-2.3.0-fix-py3.10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://pagure.io/python-daemon/c/0c67a3c6407fbf4483ccfc94a7a0d78cf3379296
-
-From: Miro Hrončok <miro@hroncok.cz>
-Date: Sep 29 2021 10:05:27 +0000
-Subject: Remove incorrect double-patch of objects in test cases.
-
-The specific test cases relying on the patches, already are decorated
-to patch the specific attributes needed. We don't need a general patch
-of the attributes in the test case setup.
-
-Signed-off-by: Ben Finney <ben+python@benfinney.id.au>
-
---- a/test/test_pidfile.py
-+++ b/test/test_pidfile.py
-@@ -367,12 +367,6 @@ class TimeoutPIDLockFile_TestCase(scaffold.TestCase):
-         pidlockfile_scenarios = make_pidlockfile_scenarios()
-         self.pidlockfile_scenario = pidlockfile_scenarios['simple']
- 
--        for func_name in ['__init__', 'acquire']:
--            func_patcher = unittest.mock.patch.object(
--                    lockfile.pidlockfile.PIDLockFile, func_name)
--            func_patcher.start()
--            self.addCleanup(func_patcher.stop)
--
-         self.scenario = {
-                 'pidfile_path': self.pidlockfile_scenario['pidfile_path'],
-                 'acquire_timeout': self.getUniqueInteger(),
-
diff --git a/dev-python/python-daemon/python-daemon-2.3.0-r2.ebuild b/dev-python/python-daemon/python-daemon-2.3.0-r2.ebuild
deleted file mode 100644
index 59acfe4df86f..000000000000
--- a/dev-python/python-daemon/python-daemon-2.3.0-r2.ebuild
+++ /dev/null
@@ -1,43 +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="Library to implement a well-behaved Unix daemon process"
-HOMEPAGE="https://pypi.org/project/python-daemon/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="
-	dev-python/lockfile[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/twine[${PYTHON_USEDEP}]
-	test? (
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# fix for >=testtools-2.5.0
-	sed -e 's/testtools.helpers.safe_hasattr/hasattr/' \
-		-i test/test_metadata.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/python-daemon/python-daemon-2.3.1.ebuild b/dev-python/python-daemon/python-daemon-2.3.1.ebuild
index 5a790c61561e..a34578405b40 100644
--- a/dev-python/python-daemon/python-daemon-2.3.1.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # build system and tests use GPL-3.0+ but none of these files are installed
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 
 RDEPEND="
 	dev-python/lockfile[${PYTHON_USEDEP}]
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index 5476fd45b80e..f6c9b1d55816 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,2 +1 @@
-DIST python-dbusmock-0.27.5.tar.gz 89775 BLAKE2B 316bb1ae06c894702d54b7a54d0c422a877c50fb7e8aa4a1bb3c9ac342acdec8f6adaafea86afa5aa041414a283fdd284e27b58728efa234fb8bcbbf92b25f27 SHA512 6e5f5eddfc949c610b64a766434988c142397893e088b8522e6895e31383ec3c14d2f053f9aab17f00137e883a01bf95be35326f7ca97ee8c9780d6704e7d1dc
 DIST python-dbusmock-0.28.4.gh.tar.gz 86900 BLAKE2B af6ca30e15e803e66aec63d40d56d121c93e9fe253d7640111104c8e8c0ea5e0491b53f551d6b454ae7370cbbb7f8fb14c07b5be92a8425efa39e04f962311f5 SHA512 f388425ebb68c20b5110a831879bee0d7d0a3941687fd61c9975c4aaa9950b05709e7fc2a9b885c89935a915f473bb7a9b97e93ca79cf3dc6769911a66aeaea7
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild
deleted file mode 100644
index c54dec45dd85..000000000000
--- a/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
-SRC_URI="
-	https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# needed for unittest discovery
-	> tests/__init__.py || die
-	# linter tests, fragile to newer linter versions
-	rm tests/test_code.py || die
-
-	# Test is removed in master
-	# https://github.com/martinpitt/python-dbusmock/commit/424719793c0a8e15ee05451cd58e21fb09914453
-	# https://github.com/martinpitt/python-dbusmock/issues/75
-	rm tests/test_accounts_service.py dbusmock/templates/accounts_service.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.28.4.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.28.4.ebuild
index 082b5a9bc103..88347ba7bd7a 100644
--- a/dev-python/python-dbusmock/python-dbusmock-0.28.4.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.28.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/pyupgrade/Manifest b/dev-python/pyupgrade/Manifest
new file mode 100644
index 000000000000..93f27da63275
--- /dev/null
+++ b/dev-python/pyupgrade/Manifest
@@ -0,0 +1 @@
+DIST pyupgrade-2.37.3.gh.tar.gz 64041 BLAKE2B 531ac8038c7084a4e46bac15d8da056d04496d979beb1fa98ab0832fab50425f412e3b17de3a52a24264acf489af9a9dde6094dd8a5939877269b38d1997d9ad SHA512 dd7e31c2e586d412902d25f30102dc7d229f76f4735e61ad9c77ad59642c2c2ed65d937cc5c6cde9bd50a1a2dad99d06a97c88fb6b0bd034cbc139685045f738
diff --git a/dev-python/pyupgrade/metadata.xml b/dev-python/pyupgrade/metadata.xml
new file mode 100644
index 000000000000..ae300f5f6226
--- /dev/null
+++ b/dev-python/pyupgrade/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>sam@gentoo.org</email>
+  <name>Sam James</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>ajak@gentoo.org</email>
+  <name>John Helmert III</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pyupgrade/pyupgrade-2.37.3.ebuild b/dev-python/pyupgrade/pyupgrade-2.37.3.ebuild
new file mode 100644
index 000000000000..3b7a3a6ef0c9
--- /dev/null
+++ b/dev-python/pyupgrade/pyupgrade-2.37.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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 tool (and pre-commit hook) to automatically upgrade syntax for newer versions of the language."
+HOMEPAGE="https://github.com/asottile/pyupgrade"
+SRC_URI="https://github.com/asottile/pyupgrade/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/tokenize-rt[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index 5a74657fad05..60883d0f9d57 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,2 +1 @@
-DIST sh-1.14.2.tar.gz 63779 BLAKE2B adc9004334a53f3704e22c318df6b4f60fd9ca2d31f5a9601f84abfaf0fe2ded06938b165e10b1a977ed38fcad7d0fa08799f2f552fc2c6b9b4c2a6476477115 SHA512 b7917504ae85606e1986b681274077777ad3011639bfe933d4133c3ed16f930842e03b572caa396ca4d58f41fd5594bef776cc16c4b0fbd1242e57c6aad19e62
 DIST sh-1.14.3.tar.gz 62851 BLAKE2B e570b3d51bbabebc90a575aaa502dc448f5049caf7485763f7ca84bd30a1e19f37441e4217074cb75ee0094600d328b59693fffdb0647479478246e58c0f00a7 SHA512 f78b418a396b78b4d303846da222eedc7525dee8d200bf96d48054d91a82671d40e0f1f82eb406b16016752ff95c3b2360075974abc3a5a814b8cfe70528231a
diff --git a/dev-python/sh/sh-1.14.2-r1.ebuild b/dev-python/sh/sh-1.14.2-r1.ebuild
deleted file mode 100644
index c77c0d2b3015..000000000000
--- a/dev-python/sh/sh-1.14.2-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=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python subprocess interface"
-HOMEPAGE="
-	https://github.com/amoffat/sh/
-	https://pypi.org/project/sh/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-PATCHES=(
-	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
-	"${FILESDIR}/sh-1.14.0-skip-unreliable-test.patch"
-)
-
-python_test() {
-	"${EPYTHON}" test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sh/sh-1.14.3.ebuild b/dev-python/sh/sh-1.14.3.ebuild
index 799696c01b85..c77c0d2b3015 100644
--- a/dev-python/sh/sh-1.14.3.ebuild
+++ b/dev-python/sh/sh-1.14.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
diff --git a/dev-python/tokenize-rt/Manifest b/dev-python/tokenize-rt/Manifest
new file mode 100644
index 000000000000..9d1301e3addf
--- /dev/null
+++ b/dev-python/tokenize-rt/Manifest
@@ -0,0 +1 @@
+DIST tokenize-rt-4.2.1.gh.tar.gz 7712 BLAKE2B b8cee02bbb9bb559a92645d8230abc29a58f100b9d03a496106bf9301ff2fa6b47e472970dc71203c61a7d1d3b95f6bb88ef8da15641c509efd10a7711e85d2b SHA512 e45d0da12962d67ebf6afe165750dbc6ddf41305154b1c01e99c1172aca27ccdd4da7c9338b84c74bb7e30192b6fc496cbda75a652304c7da6e2bfa63a513631
diff --git a/dev-python/tokenize-rt/metadata.xml b/dev-python/tokenize-rt/metadata.xml
new file mode 100644
index 000000000000..ae300f5f6226
--- /dev/null
+++ b/dev-python/tokenize-rt/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>sam@gentoo.org</email>
+  <name>Sam James</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>ajak@gentoo.org</email>
+  <name>John Helmert III</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/tokenize-rt/tokenize-rt-4.2.1.ebuild b/dev-python/tokenize-rt/tokenize-rt-4.2.1.ebuild
new file mode 100644
index 000000000000..632ba3afef3a
--- /dev/null
+++ b/dev-python/tokenize-rt/tokenize-rt-4.2.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 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 wrapper around the stdlib 'tokenize' which roundtrips"
+HOMEPAGE="https://github.com/asottile/tokenize-rt"
+SRC_URI="https://github.com/asottile/tokenize-rt/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest