Adding metadata

70 files changed, 342 insertions, 689 deletions

diff --git a/dev-python/ansible-pygments/Manifest b/dev-python/ansible-pygments/Manifest
index 70e2d302fa8b..c33191699c30 100644
--- a/dev-python/ansible-pygments/Manifest
+++ b/dev-python/ansible-pygments/Manifest
@@ -1 +1,2 @@
 DIST ansible-pygments-0.1.0.tar.gz 8046 BLAKE2B a6b9873dc8494af77a8c71de45f23dbd14419f3abb98d577631d51be9fe48cc88f5bec2f77707fd376369e325538800a47ae014a13f85022f805466a2e590316 SHA512 370a28e984f1c19c78b3047c5506847d625ad46458067804fcc7cc850d01cb77f837fbc80071fc9ff0e9df31805e48477a3026ce28389de8de368d35bd9d9428
+DIST ansible-pygments-0.1.1.tar.gz 8446 BLAKE2B ff631dd24c723035db7ab11a6c3fc0c90e8cebd72e6b0fa0d8b2c4bc4250ff5fb1e4180366e4ee084aab90bf24a8c3b2ecfad2c421b9f0cfdbf7675c94f0fcf7 SHA512 1ad2f4568d46d7fc617c6e674bcd9aea48e14307d91c476b51a04f778b452f18cb983d87d4872664d567b984193edee2af7964854fb2f3ae37ab4bce09c387d4
diff --git a/dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild b/dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild
new file mode 100644
index 000000000000..22173f8f9b31
--- /dev/null
+++ b/dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517="poetry"
+
+inherit distutils-r1
+
+DESCRIPTION="Pygments lexer and style Ansible snippets"
+HOMEPAGE="https://github.com/ansible-community/ansible-pygments"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+# 2.11.0+ needed in order for tests to pass
+RDEPEND=">=dev-python/pygments-2.11.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ansible-pygments/metadata.xml b/dev-python/ansible-pygments/metadata.xml
index a094124dae4b..dfd6e78f88b4 100644
--- a/dev-python/ansible-pygments/metadata.xml
+++ b/dev-python/ansible-pygments/metadata.xml
@@ -5,6 +5,13 @@
   <email>marecki@gentoo.org</email>
   <name>Marek Szuba</name>
  </maintainer>
+ <longdescription>
+		This project provides a <pkg>dev-python/pygments</pkg> lexer that is able to handle
+		<pkg>app-admin/ansible</pkg> output. It may be used anywhere Pygments is integrated.
+		The lexer is registered globally under the name "ansible-output".
+
+		It also provides a Pygments style for tools needing to highlight code snippets.
+	</longdescription>
  <upstream>
   <remote-id type="pypi">ansible-pygments</remote-id>
  </upstream>
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 9dcf6ef03715..0e49e90e0620 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1 +1,2 @@
 DIST arrow-1.2.1.tar.gz 118941 BLAKE2B 4e1cb13180d72fa42e8bbbb6ae810aa3101ee4f7be53f8235b901b662293ba67a5379abc1af0f19c1e64ae68c772d0bef8125717b3ce3ee24d587ff89e7c96e6 SHA512 96ac71c103554a9a609227af870c051031e66fcc8abb343f6d8f38c7e35ad632633b68afb2818443e38ff59ea4790101fbca4449f14168fc41260d15fcd6cce4
+DIST arrow-1.2.2.tar.gz 123174 BLAKE2B b8b8d83ede0c61840ffcc75272a0275b6120cc142197c5f95f0fdb7d53981879b431f074db9606caa8d9817761cc4847a525bbc6449c05155410808960a1541e SHA512 f88afa9a0bc967e8731a7bf1712ecf3810f12ade9cc53a94a74efd3ece750f37bea7541a054eb9acd12b99b4a6d32687eab4eae20a6f49b2c2d6f1b499221542
diff --git a/dev-python/arrow/arrow-1.2.2.ebuild b/dev-python/arrow/arrow-1.2.2.ebuild
new file mode 100644
index 000000000000..6c790b610db9
--- /dev/null
+++ b/dev-python/arrow/arrow-1.2.2.ebuild
@@ -0,0 +1,33 @@
+# 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_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Better dates and times for Python"
+HOMEPAGE="https://github.com/arrow-py/arrow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/addopts/d' -i tox.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/automat/automat-20.2.0.ebuild b/dev-python/automat/automat-20.2.0.ebuild
index 5aa29e8365cd..35372d810f16 100644
--- a/dev-python/automat/automat-20.2.0.ebuild
+++ b/dev-python/automat/automat-20.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/cattrs/Manifest b/dev-python/cattrs/Manifest
index 3cab146b0e70..91dd136e7aff 100644
--- a/dev-python/cattrs/Manifest
+++ b/dev-python/cattrs/Manifest
@@ -1,3 +1,2 @@
 DIST cattrs-1.10.0.gh.tar.gz 100657 BLAKE2B b0475644bdd31e12dabf7b969e1890932309497e66b45a311e97d56062e99837af11677c24e33c6d1bed6ec2c6373eab6535874115960ed450f52804a6e5d73e SHA512 51cda84d30627f9d0eb6842c45f7c91dd2f3d9a21b1a635ad21d0648d409b576f52e6127392d60bdd1b6a803f8f897f970706b9cc64b703c06387bc85cd3740e
-DIST cattrs-1.7.1.gh.tar.gz 85853 BLAKE2B 36c411ffa92eb263b85d48c81daeea1deea10d5779c6cd1f57988792ef5ec68bedc20b59620077e6500c2e41bb91e83f110467083f90219be7e2419c3880ed94 SHA512 a72370541cbec8928f9e1ae0c130c94e71d826ac522eb39062840d4b78a7f6aacd13395b677f6ff1453e327af31a71af0e5f81893f57ba33edbb53b7683835b2
 DIST cattrs-1.9.0.gh.tar.gz 102241 BLAKE2B 89cc71de97e1e63d3cfe3a4169c20e44d9fb8b85c6f939a0503d569dbf521d97ac325ead7c8bd58d4d32b6c6097a70effdf58553e334300639d6ef6c26b40bc7 SHA512 e1e4e59f802baf63cf931b3798bf39e4f18d5ab12a9aea000c2b649d34905d29ccb94f9ccdc5b2c52e48114fb9b292e59ab86da4c747243cae8a9d9ba25e768c
diff --git a/dev-python/cattrs/cattrs-1.7.1.ebuild b/dev-python/cattrs/cattrs-1.7.1.ebuild
deleted file mode 100644
index 029fbc555ebe..000000000000
--- a/dev-python/cattrs/cattrs-1.7.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,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/Tinche/cattrs/"
-SRC_URI="
-	https://github.com/Tinche/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 -i -e 's:--benchmark.*::' setup.cfg || 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-1.9.0.ebuild b/dev-python/cattrs/cattrs-1.9.0.ebuild
index d5b7d1793883..718480ca18f8 100644
--- a/dev-python/cattrs/cattrs-1.9.0.ebuild
+++ b/dev-python/cattrs/cattrs-1.9.0.ebuild
@@ -17,7 +17,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/commonmark/commonmark-0.9.1.ebuild b/dev-python/commonmark/commonmark-0.9.1.ebuild
index 720ab8358204..a71a3a708e60 100644
--- a/dev-python/commonmark/commonmark-0.9.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index 0736ccb2ad6e..e965138eb26f 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/twisted/constantly/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild
index 6b31d08ea4a4..93fbb5d606d7 100644
--- a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 18c3efdce760..6003c3b2205b 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,2 +1 @@
-DIST py-filelock-3.4.0.tar.gz 203303 BLAKE2B 615f623c584c39917f280815695dcc58ce6dd5ca26846f88b954526e0866b7e1d020589eecee774dbd8b10ff818d707826c663643ad300465bb85ba751fddddd SHA512 0dc85f083a8c60605dfbd0b6fe55a96b5872e5b8ce3fd746925444571d02e243459bed6cd2d8aa9d7eda7d197bdc31b289cfcf1f0aef295779ca900d24abcbd8
 DIST py-filelock-3.4.2.tar.gz 203805 BLAKE2B be1cb206c4571b86987ea406af4b8efed503f53584fe9f5af5cbc6493728dbeafa3d0154a66ea30404d51700155be877aa74e6c08b1dbf7cefbee1ca3274f1e1 SHA512 361586f976a4b4011af4446e34932cb9e42565e87d828852b0bb7bed48f59c19b3c95895836c9c63c1978d9d113432df19c52e59523a0f00797b3b94f36a4d73
diff --git a/dev-python/filelock/filelock-3.4.0.ebuild b/dev-python/filelock/filelock-3.4.0.ebuild
deleted file mode 100644
index a761389b8438..000000000000
--- a/dev-python/filelock/filelock-3.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-MY_P=py-filelock-${PV}
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="
-	https://github.com/tox-dev/py-filelock/
-	https://pypi.org/project/filelock/"
-SRC_URI="
-	https://github.com/tox-dev/py-filelock/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/gmpy/gmpy-2.1.2.ebuild b/dev-python/gmpy/gmpy-2.1.2.ebuild
index 53e7c99c2678..d45a6cfbb913 100644
--- a/dev-python/gmpy/gmpy-2.1.2.ebuild
+++ b/dev-python/gmpy/gmpy-2.1.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-libs/mpc-1.0.2:=
diff --git a/dev-python/h2/h2-3.2.0.ebuild b/dev-python/h2/h2-3.2.0.ebuild
index d851095606ad..1f0fc0c315a0 100644
--- a/dev-python/h2/h2-3.2.0.ebuild
+++ b/dev-python/h2/h2-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/hyperframe-5.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index 3719ca8c75eb..1b004dbf1f35 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # dev-python/pytest-relaxed causes tests to fail
 BDEPEND="
diff --git a/dev-python/hpack/hpack-4.0.0.ebuild b/dev-python/hpack/hpack-4.0.0.ebuild
index b4178963a46c..250672975133 100644
--- a/dev-python/hpack/hpack-4.0.0.ebuild
+++ b/dev-python/hpack/hpack-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # dev-python/pytest-relaxed causes tests to fail
 BDEPEND="
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index a1d1ce6a9251..d1bb467c90b9 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,4 +1,2 @@
-DIST httpx-0.19.0.tar.gz 1667455 BLAKE2B b8d4cb0b6e7f643b62b507930ccf1534d73d93261cab9281ef57d6392f00da325e897d5339aebacfa07aeae8278d3a81b78d6501a1587ffeaef68cc5087bfdaa SHA512 3b327f07d62cf0430672d4f1a4f884618e588496f049522de327f5c34f7260eb21739b7f1fbd6f43a21962bc8737547f3eddbc22751546647f56c9cd7212840a
-DIST httpx-0.21.1.tar.gz 2155133 BLAKE2B c3c800657abaed461ab6f44e3cd9799be4b6499070a5db2ee8d5d61c776d86591c74192eb1c88d4072dc361ea4c9448a3ed061c715fa4504fc931fdd96ccde62 SHA512 a4f737f6c6ae909fd3ea811e0ff3b78ed6496da8d797ef49746f744216e055f8225d613fe935d5e2780aa1b233053ad436e8849eef578e662ca8ee34513ad12e
 DIST httpx-0.21.3.tar.gz 2157078 BLAKE2B 08a9328a7350534abe646f0bf60bd15600a1cb3eb8d06578c87ed9a7d4e55efdddd2be597650cddec9f6456e89a1b159f3e23aa657f379f78157c12670cdadb0 SHA512 0a551de52954db5ed2c33d1b5c172607516031a7c86c0f235bd04f12f4cf82f63980a9f53115dac801748b0c282890b3ed4a53b2c912adbd245c10ad61dbf67e
 DIST httpx-0.22.0.gh.tar.gz 2157682 BLAKE2B bb08a7c4b72478d24264c0dca5630205ff386af73294dca66dcd12b646de602ad64e308feedaabd58742cb7a9d799fa23cd2f922e685e74f8181e1b5e9f1c4ee SHA512 a7360f5355f75f07425b42d49697e480319f3fe606d4601bb6d64b870c8a8fce6fad8bd857ef422fc48e6141201307ee94876d5bc54a68557c7dc32ce8f1451b
diff --git a/dev-python/httpx/httpx-0.19.0.ebuild b/dev-python/httpx/httpx-0.19.0.ebuild
deleted file mode 100644
index 1d2038b9c2f8..000000000000
--- a/dev-python/httpx/httpx-0.19.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Docs builder mkdocs not keyworded on all these arches yet
-# DOCS_BUILDER="mkdocs"
-# DOCS_DEPEND="dev-python/mkdocs-material"
-# DOCS_AUTODOC=1
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 # docs
-
-DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
-HOMEPAGE="https://www.python-httpx.org/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/charset_normalizer[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	=dev-python/httpcore-0.13*[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
-	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/h2[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/client/test_proxies.py::test_async_proxy_close
-	tests/client/test_proxies.py::test_sync_proxy_close
-	# known to fail, unimportant test
-	"tests/test_decoders.py::test_text_decoder[data3-iso-8859-1]"
-	tests/models/test_responses.py::test_response_no_charset_with_iso_8859_1_content
-)
-
-python_prepare_all() {
-	# increase timeout for slower systems
-	sed -e 's/pool=/&10*/' -i tests/test_timeouts.py || die
-	# trio does not support py3.10
-	sed -e '/^import trio/d' -i tests/concurrency.py || die
-	sed -e '/pytest.param("trio", marks=pytest.mark.trio)/d' -i tests/conftest.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/httpx/httpx-0.21.1.ebuild b/dev-python/httpx/httpx-0.21.1.ebuild
deleted file mode 100644
index 0bd2daaa7c61..000000000000
--- a/dev-python/httpx/httpx-0.21.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Docs builder mkdocs not keyworded on all these arches yet
-# DOCS_BUILDER="mkdocs"
-# DOCS_DEPEND="dev-python/mkdocs-material"
-# DOCS_AUTODOC=1
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 # docs
-
-DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
-HOMEPAGE="https://www.python-httpx.org/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/charset_normalizer[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	=dev-python/httpcore-0.14*[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
-	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
-	cli? (
-		=dev-python/click-8*[${PYTHON_USEDEP}]
-		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		=dev-python/rich-10*[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/h2[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	if ! use cli; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/client/test_proxies.py::test_async_proxy_close
-		tests/client/test_proxies.py::test_sync_proxy_close
-
-		# Result change in charset-normalizer-2.0.7+
-		'tests/test_decoders.py::test_text_decoder[data3-iso-8859-1]'
-		'tests/models/test_responses.py::test_response_no_charset_with_iso_8859_1_content'
-	)
-	local EPYTEST_IGNORE=()
-
-	use cli || EPYTEST_IGNORE+=(
-		tests/test_main.py
-	)
-
-	epytest
-}
diff --git a/dev-python/httpx/httpx-0.21.3.ebuild b/dev-python/httpx/httpx-0.21.3.ebuild
index c317b2fb4603..b5bd1c2a5d04 100644
--- a/dev-python/httpx/httpx-0.21.3.ebuild
+++ b/dev-python/httpx/httpx-0.21.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hyperframe/hyperframe-5.2.0.ebuild b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
index 474598d0d65e..2a4728ff23d6 100644
--- a/dev-python/hyperframe/hyperframe-5.2.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/hyperframe/hyperframe-6.0.1.ebuild b/dev-python/hyperframe/hyperframe-6.0.1.ebuild
index 474598d0d65e..2a4728ff23d6 100644
--- a/dev-python/hyperframe/hyperframe-6.0.1.ebuild
+++ b/dev-python/hyperframe/hyperframe-6.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/hyperlink/hyperlink-21.0.0-r1.ebuild b/dev-python/hyperlink/hyperlink-21.0.0-r1.ebuild
index 6cf4ba8635a2..2e70277cb3c3 100644
--- a/dev-python/hyperlink/hyperlink-21.0.0-r1.ebuild
+++ b/dev-python/hyperlink/hyperlink-21.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index c41048b6d2ad..b20cafe8d3f7 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -4,3 +4,4 @@ DIST identify-2.4.2.tar.gz 101279 BLAKE2B f70bc1d493fb1fd94f95ea7cedfba6c522fb79
 DIST identify-2.4.3.tar.gz 101282 BLAKE2B 5ae76ac22ca462ae3dc7d71ed8d07344729ee54692cce52e1269057451733fab9c02647a51deed98cfa569b7758f37b4cc07353eb418314901b1eed2333eabdc SHA512 2c82cc90d98a149dc211680c96d8c3bfcdbf955fd61eb207ae4a62d9bdb8f159707a7578838582bd16f45c300d9a8e7c5e7009a9daecb6b334b27fd160cc0d40
 DIST identify-2.4.4.tar.gz 101270 BLAKE2B d5e31a8b74a724cfd0c169def52b434bd2b722aa7dfb9d92636a8eb28b1b1a7ccd9c9544d97d5fd359fb995b44b6d8a6428f484ee033f70292717053b1f5825f SHA512 34a93640ca96483599e0cfdb1d69f37f8f4cb659b68ee84824079ee177e93aeb259ebc654f5fb39d5a0b68d267ba3c963870c9c55b6676e12c21b7f7573438a4
 DIST identify-2.4.5.gh.tar.gz 101319 BLAKE2B 78e17e88ad5c463a8bca5cdc2e66433f38e41ad67fbabe60706d7154841ba6fefa52658550107760d521257366806999ffc24b9eb0ebbd37d3a94581df573b12 SHA512 f2c6ac86ad88431e835c723a83c7b8d0578166ab620e2681f5c16e9634592f58761551a1360491edc4863538c967b793fe8e0730cbf4c92bf1690e50c5669ac9
+DIST identify-2.4.6.gh.tar.gz 101330 BLAKE2B 3e1a0d09b52fa7176f4216d7be40b6ae797cc7f8fc75364efbbaf5ded61db42f5aab7f672c7585466efd96aa33bcc4a3628080dc0a16737c322c4f7b6c915de1 SHA512 61f0420ba9067a3b4a85509d52d7dbc1e5affca555bd429453c9fd0d2b0937f1d41a36ddf6c63b323a9af1035ecc470545f5dcba28d7cee2dd6b6d6d3815059d
diff --git a/dev-python/identify/identify-2.4.6.ebuild b/dev-python/identify/identify-2.4.6.ebuild
new file mode 100644
index 000000000000..85c73a4807d6
--- /dev/null
+++ b/dev-python/identify/identify-2.4.6.ebuild
@@ -0,0 +1,23 @@
+# 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_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-python/ukkonen[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/incremental/incremental-21.3.0.ebuild b/dev-python/incremental/incremental-21.3.0.ebuild
index 0610b22ad94e..58ba1b3fa0fd 100644
--- a/dev-python/incremental/incremental-21.3.0.ebuild
+++ b/dev-python/incremental/incremental-21.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
index 6efad7d1aa33..a2cdc02cbbf2 100644
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ b/dev-python/m2r/m2r-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/miyakogi/m2r/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/mistune/mistune-0.8.4-r1.ebuild b/dev-python/mistune/mistune-0.8.4-r1.ebuild
index c2d0d5d5c6f8..51f31ad90110 100644
--- a/dev-python/mistune/mistune-0.8.4-r1.ebuild
+++ b/dev-python/mistune/mistune-0.8.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests nose
diff --git a/dev-python/mistune/mistune-2.0.2.ebuild b/dev-python/mistune/mistune-2.0.2.ebuild
index 61dff8683bb6..59212eca1cb4 100644
--- a/dev-python/mistune/mistune-2.0.2.ebuild
+++ b/dev-python/mistune/mistune-2.0.2.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index 73f2b4aa1acb..e5ac25e24acd 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,3 +1 @@
-DIST mkdocs-git-revision-date-localized-plugin-0.10.0.tar.gz 368270 BLAKE2B c00956c86394bdfc8b2fe9e51e7588362f6bd7bc3bde174c1d387377418a47f56f01137e597405146280bba195ebf7aa5cadf67e9514734e5874df69e4990857 SHA512 8ce742cd995c180372a9d76a96c19f4f7c7b9fafe5c67f13e2c1d7377dc18e071d379cd741cb5f4a84be9f275b3f3d74d23875e766a7dda86498acb0a08d4344
-DIST mkdocs-git-revision-date-localized-plugin-0.10.3.tar.gz 368559 BLAKE2B eb0a1e7f85a99ac6f79ebe8cbb547e4b836bde22909363492b63e0bc40ff139fb1f16c9de5662cbb1ba5ab65f2bb8cd3a6f871bc81b894218c4a7d2b8a37770c SHA512 f5cd242eb48cb50c426c9dad76d36958ed31434090986ab5062d8b57ff941ec4dfd9e1cd1f50ac6713e49751afb476e9bc1d7efadf1cfca19f3de70f08320de7
 DIST mkdocs-git-revision-date-localized-plugin-0.11.1.tar.gz 369943 BLAKE2B 261813f3d63d6b1bfb021aab3f9db96f7977ac8f6bf6239158f1d8045e1eb5b21b89f2c4eb493634944b202334f59ce589797624137bfc643cda3ef52969bd73 SHA512 fb5e1c1b65f431585dc6a6887fc079a3181e73286697c331317a69f7748453af61abfb8fc58eb55203f09c9a70c752781dd834d03e13184ddb0bb761aa10e371
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild
deleted file mode 100644
index 0fad57f5b10f..000000000000
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-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.10.3.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.3.ebuild
deleted file mode 100644
index 0fad57f5b10f..000000000000
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-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/mypy/mypy-0.930.ebuild b/dev-python/mypy/mypy-0.930.ebuild
index 4e4e01f753b7..d4297bf9617d 100644
--- a/dev-python/mypy/mypy-0.930.ebuild
+++ b/dev-python/mypy/mypy-0.930.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/ordered-set/ordered-set-4.1.0.ebuild b/dev-python/ordered-set/ordered-set-4.1.0.ebuild
index 22b2fc36fa6d..16aabd797c4c 100644
--- a/dev-python/ordered-set/ordered-set-4.1.0.ebuild
+++ b/dev-python/ordered-set/ordered-set-4.1.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~m68k ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pecan/Manifest b/dev-python/pecan/Manifest
index c3f45ce4a312..8645aa5cf0eb 100644
--- a/dev-python/pecan/Manifest
+++ b/dev-python/pecan/Manifest
@@ -1,2 +1 @@
-DIST pecan-1.4.0.tar.gz 124233 BLAKE2B 42ac41d9e4aba2ad40b89d2ec742ae82a3d9f599c79d0ac5cce199b8ee50ba5e0765f02dc8812defd3e7276176d0e4dadf06b56256e9808771805df64811e9d4 SHA512 102ac8549fcb8c1f29aaf6facf1fba3dd06c454ed6262c3b0e9a009063033defbf0011b4117d854da1f4770368d3dbce1e3930daabfb0c7ee069eb2522bac7e1
 DIST pecan-1.4.1.tar.gz 124777 BLAKE2B c3af6ba06aa9e24f9e49ace8117480affd34dfdc889639ab34565325e7504d3c75f17003da09f9f67f91edc536bde95080dbc51170cccc50fde3ec1929c63958 SHA512 bd5ba47935e2d97677bcdc25ad4678ec63293e0000750fa3b39a2447be326dc7e1fd4cf77ac0519e1b7c6ecc7ba7c3e66d98443e78e647fba92383f048775c83
diff --git a/dev-python/pecan/pecan-1.4.0.ebuild b/dev-python/pecan/pecan-1.4.0.ebuild
deleted file mode 100644
index 3fe1eddd0515..000000000000
--- a/dev-python/pecan/pecan-1.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies"
-HOMEPAGE="https://pypi.org/project/pecan/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
-	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 1e491030868b..1a519d1a4d7b 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,2 +1 @@
-DIST platformdirs-2.4.0.gh.tar.gz 19482 BLAKE2B 81ebc4424bd2845ae3b28d95428f95c7920300193ff98159263089b3db0d104a3a59af616bf6b815c0c8b1453d3f05d85120573c71b16b0a5104cc2532c472d4 SHA512 76b492f9d1a5c666c3c6957c775055bbd74db93f2a66f0651a74e1914626d757ab8110df87281cd31ad65abbd89f02906fdf8f0854a44f8500487685993fb8af
 DIST platformdirs-2.4.1.gh.tar.gz 20051 BLAKE2B 18fd11f7cae7c81c3615c89468d1deb3ceef3337b4a87a806b245b7bb5a4c14c0eb64fc7cfa06adc2da6150969da3a626da16c1f309f3011a9d4c5d1e4ca1d83 SHA512 d410056207506395c922ecc36c481bcc21f8dd97c69f33dc13580c74d0ea3d1aaa97284b79eed47b723f18c663038874edc5b9c4f4def06d92f1e25f7a8d76b4
diff --git a/dev-python/platformdirs/platformdirs-2.4.0.ebuild b/dev-python/platformdirs/platformdirs-2.4.0.ebuild
deleted file mode 100644
index caf6d1065f41..000000000000
--- a/dev-python/platformdirs/platformdirs-2.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index 973006508c9e..f90c5ed59283 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,2 +1 @@
-DIST plumbum-1.7.1.tar.gz 323014 BLAKE2B 28d9616c3bcb13f1e9cf9c47b4533c62caf630d7eab998e86023256b568f8f038444f8741bb902ed999f04f480bc09159aab075d184f497b00a452bfac57c996 SHA512 d6648acce8e84045cd8c2fc4a90c427fd5ab5a39e49e7a1f10b20ffbca20cc42636183325501e5b577631e4f1c5a1b3e7cae12ec6b89ff853e5a50946c15f3c7
 DIST plumbum-1.7.2.tar.gz 323051 BLAKE2B a16d9210606ac67abd425fcff109d40836dc969729cc5bf78a5d224c0beabf09d56d35f17809994d758153c6e18e4af91403f7ae0111912447367be68f6592c1 SHA512 77e75988255ca78fa5c253c6d076d63f8f9250a2b153ef23e40f35315e255ea09403d854a19bb265fd658bb9e5f0f705dc7530ecacc40b4b48e33acdf50dddf9
diff --git a/dev-python/plumbum/plumbum-1.7.1.ebuild b/dev-python/plumbum/plumbum-1.7.1.ebuild
deleted file mode 100644
index 4176a1bc93ef..000000000000
--- a/dev-python/plumbum/plumbum-1.7.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A library for shell script-like programs in python"
-HOMEPAGE="https://plumbum.readthedocs.io/en/latest/ https://github.com/tomerfiliba/plumbum"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Need sshd running
-	tests/test_remote.py
-	tests/test_utils.py
-	# Windows specific
-	tests/test_putty.py
-	# Needs sudo without password
-	tests/test_sudo.py
-	# Wrong assumptions about env handling
-	tests/test_env.py::TestEnv::test_change_env
-	tests/test_env.py::TestEnv::test_dictlike
-	tests/test_local.py::TestLocalPath::test_iterdir
-)
-
-src_prepare() {
-	sed -e '/addopts/d' -i setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	optfeature "remote commands via ssh" dev-python/paramiko
-	optfeature "progress bars in jupyter" dev-python/ipywidgets
-	optfeature "colored output in jupyter" dev-python/ipython
-	optfeature "images on the command line" dev-python/pillow
-}
diff --git a/dev-python/pony/Manifest b/dev-python/pony/Manifest
index 97baa57249f1..c86e6e677a60 100644
--- a/dev-python/pony/Manifest
+++ b/dev-python/pony/Manifest
@@ -1 +1,2 @@
 DIST pony-0.7.14.gh.tar.gz 305795 BLAKE2B a0e056d722a205a00567a230628be6ef8a7fe86f594f91ec0e8bbfc6d6eec17ec1d4cf3f57ad10984b8beb0a90da3010d9a32f2f08dca434af39e20fc6e9126c SHA512 ed27fd697dd14948c282dab6b75e41c9309d0ef4c4cccb0f91e4214e81de52a2de3910e413dfc5495ffcea190a5b50255c45b2beecead84eecb601ba2463d998
+DIST pony-0.7.15.gh.tar.gz 268638 BLAKE2B d93dcc21a13834a23c0fcbeec7f6ea98ff6750d1650b00e738d65c7b7985ba7880ddfc8238e4b4f3ee4a302a31b69a4767ea52728e66b5cfe62e0190769e6b8c SHA512 ca81441fe1a714bc863bde33739ae2e65f42d8e763a5c6734517987a4c03faffb08a134517bcc61f5b7941f207e32e4ca02fe12fccca871d481f44a81da12536
diff --git a/dev-python/pony/pony-0.7.15.ebuild b/dev-python/pony/pony-0.7.15.ebuild
new file mode 100644
index 000000000000..475caf97468b
--- /dev/null
+++ b/dev-python/pony/pony-0.7.15.ebuild
@@ -0,0 +1,25 @@
+# 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_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python ORM with beautiful query syntax"
+HOMEPAGE="
+	https://ponyorm.org/
+	https://github.com/ponyorm/pony/"
+SRC_URI="
+	https://github.com/ponyorm/pony/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+BDEPEND="test? ( $(python_gen_impl_dep sqlite) )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index 9fbee95ce135..b52d83f20f42 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/priority/priority-2.0.0.ebuild b/dev-python/priority/priority-2.0.0.ebuild
index 00ebe4813aa4..765201df4195 100644
--- a/dev-python/priority/priority-2.0.0.ebuild
+++ b/dev-python/priority/priority-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index df0932dea3d8..5bbfb1fc9b5a 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1 +1,2 @@
 DIST prompt_toolkit-3.0.24.tar.gz 3042044 BLAKE2B e9b4186a38756cf6c0d92575e42dfe4507e63f721038374252e7a7d5af76f7df04dc01251079d99a74167aef7e394b50c43b5190df8b9cd68cf74eae31dfbe51 SHA512 e423735441407ffe51d46225efa4b747899d47fa5d5a2163e5c0c906d2f1937e80a67bcd06ff6aa97d8a336e507fd0322957e79b9382d1a678994060fcccfb84
+DIST prompt_toolkit-3.0.26.tar.gz 402667 BLAKE2B 60160c3e0059b570321d182699b2e6cc10e7d771e9c328314e5561329aec5ddb4951d5cd50d49414314d50a9542e223b44e9c589d272ccf32bfb4f54ed1a9980 SHA512 7151d6678409bf3b04bee76cbcf4e0ffb5ca1963c359d30c8edf9e81bde424ea69b7009cd44e6d72088936290e2fd9dd8cac59efc8b5e59bfb87dacf53967b05
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.26.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.26.ebuild
new file mode 100644
index 000000000000..21a9859f0f77
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.26.ebuild
@@ -0,0 +1,22 @@
+# 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_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pygments/pygments-2.11.2.ebuild b/dev-python/pygments/pygments-2.11.2.ebuild
index 2eb5035306f4..b2adaebcbd16 100644
--- a/dev-python/pygments/pygments-2.11.2.ebuild
+++ b/dev-python/pygments/pygments-2.11.2.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild
index da6be625c115..38b06b8afdfd 100644
--- a/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples"
 
 distutils_enable_sphinx doc \
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 291d7761f603..97afdaccad78 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,2 +1,4 @@
 DIST pypy3-exe-7.3.7-1.amd64.xpak 12149428 BLAKE2B 468fe50d8b607793438bc59179acb32cafdebed4400142e01db7e6af2d920ae5527067b6e83999fa3ab0cf61e420b9ceff5ed1a755675d364520ff9afbb67ca0 SHA512 b7d508f7718216c9ea4c36189ab952bc672a4c5167e406f0d0a335a630ee45b4939c8ab738ec3a201fd74e818196b8519bdbb0eca594d3e713b1d0b36f2d4a81
 DIST pypy3-exe-7.3.7-1.x86.xpak 9221421 BLAKE2B fc24f93533127f48ffc5974dfd3eb4611442489aee6318ccb911a2f3e3d234bc44c659309006ffe55eb6de3a00915fa3aaf6dc50e4efb1adb668d0d38281cf3c SHA512 9322a25ad230615cc96b81448a0591f730a5d09b57c02259412d427290934074baeb48f58f3829d393137252d5cf1b3f0fdd3b50d9194d69ea3ab38fbe83abac
+DIST pypy3-exe-7.3.8_rc1-1.amd64.xpak 12424506 BLAKE2B 32d4c9a8f82ff1940608848cf497124bf628eebcc14f8a118819afca22b0055d010440c657c546449bd4fdc17d4d1933b5d236ab8a6e21cf1aea48a09412c3e6 SHA512 0e8c8b6d287bea00666f53f4fea7d339d5954ebca078ca3f30f0764ab8825da0655464c7c02bac26d6eca66e7915d97d8e4c1ba86e01a408eb9f0741e470f52c
+DIST pypy3-exe-7.3.8_rc1-1.x86.xpak 9226302 BLAKE2B 98efa1ae5f77d0dfb7eb9189a0088177df80271bf41069e14e221e2d8bf645b65b518b8aed43903df5562f1cd9626583dada1c0e617e8ab0c4481d61adc4c8f1 SHA512 f42131ecb9fbea76f250f3f2772e21fd2e562df8c043eb480bfb8d16e837ea24bd8c5db7d70c5d5d97eb9f22c00f39216989876bd19efc76e3854025a5bbf317
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8_rc1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8_rc1.ebuild
new file mode 100644
index 000000000000..d55bb03c5536
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8_rc1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV}-1
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="3.9-${PV%_p*}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	|| (
+		dev-libs/libffi-compat:7
+		dev-libs/libffi:0/7
+	)
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${SLOT}"
+
+PYPY_PV=${PV%_p*}
+QA_PREBUILT="
+	usr/bin/pypy3.9-c-${PYPY_PV}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/bin/pypy3.9-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/bin/pypy3.9-c-${PYPY_PV}"
+}
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 8d2196ffa355..216f67127eae 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,2 +1,3 @@
 DIST redis-py-4.1.0.tar.gz 2346542 BLAKE2B 3d59f904f376df7bca14dcd7bc8547d7a7b41b8d934a50ade6dbf5e74f3da8deef59b3b7cf683fe3c7389859f76fe1d3307f91b52250da945f91b90c629640ab SHA512 85cd09570f4faf34a735befd0677aa8ca2cb0d62b0285c4c040380c2440f2774e47762ec4219381294465343353a15804b96f06b4d6eefa7159a224eb9e72001
 DIST redis-py-4.1.1.tar.gz 2349319 BLAKE2B adebda19239e1fd4cf685c0de7a9b2c2fc4e8f23df0e80f2ecdf5f4b9b8b2698fbab613975bd380ea74dc275710d8ed58ee0720486c079bf554612cb7d8b392e SHA512 a974a910dcbaf75516e311badbe6e019cdce668a6d8cd918503934bb92bf97f7ea373fae32139f89a9eecdb360184ae42d24d742ef8b008e95eae648bd992e64
+DIST redis-py-4.1.2.tar.gz 2349862 BLAKE2B 3e68918654e63c3403f2408350b2a877027a3c3990b623818332e0e77e1fbaa413e85912ea586a90788a87e0206ebe408ab55df522864dc534907c31a690c0c1 SHA512 beb6e50051eae61e84e7cf37f9f3e3efbc404d49e506b0b3bdae0d0c45fd940f12c801434a6394505519bf327b5933c076ad4f8c66ad812441bc08b3aa682542
diff --git a/dev-python/redis-py/redis-py-4.1.2.ebuild b/dev-python/redis-py/redis-py-4.1.2.ebuild
new file mode 100644
index 000000000000..94c57822750d
--- /dev/null
+++ b/dev-python/redis-py/redis-py-4.1.2.ebuild
@@ -0,0 +1,77 @@
+# 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_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/redis/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/deprecated[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Flaky test
+		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
+
+		# Needs a second Redis running
+		tests/test_commands.py::TestRedisCommands::test_sync
+		tests/test_commands.py::TestRedisCommands::test_psync
+	)
+
+	local EPYTEST_IGNORE=(
+		# SSL tests need Docker/stunnel:
+		# https://github.com/redis/redis-py/commit/18c6809b761bc6755349e1d7e08e74e857ec2c65
+		tests/test_ssl.py
+
+		# Needs multiple Redises running
+		tests/test_cluster.py
+	)
+
+	epytest -k "not redismod and not ssl"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	# Spawn Redis itself for testing purposes
+	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
+	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	# "${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/rich/rich-10.16.2.ebuild b/dev-python/rich/rich-10.16.2.ebuild
index 17efd326fe8c..71e6a34341dc 100644
--- a/dev-python/rich/rich-10.16.2.ebuild
+++ b/dev-python/rich/rich-10.16.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/setuptools-60.5.0-r1.ebuild b/dev-python/setuptools/setuptools-60.5.0-r1.ebuild
index 03e5adc2f6e6..bfa28a96698c 100644
--- a/dev-python/setuptools/setuptools-60.5.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-60.5.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~m68k ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/snakeoil/snakeoil-0.9.10.ebuild b/dev-python/snakeoil/snakeoil-0.9.10.ebuild
index 7a99856ad53d..76f383ff2219 100644
--- a/dev-python/snakeoil/snakeoil-0.9.10.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.10.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 4606041f1392..84db4ba2c82e 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,3 +1,2 @@
-DIST stripe-2.63.0.tar.gz 233693 BLAKE2B 18de5e0a74b241759a7c84203e675159958a77e3ee225ebdfd5ed2d2d633a3b91f5165ac14a164b09e4df81176aafe1727685c4156b5055dc4ea2a44b0af9134 SHA512 fedef25d95e1fe3f9b4fdab37fb4ababc3c0243218da590076942491884b284b07e6bb15e9c85a6871dabffc34c260ec9d9fb80634ab0a368cf312c2324c2bdd
 DIST stripe-2.64.0.tar.gz 234442 BLAKE2B 504e32c19f1a65a39ee709d3abc7211d648c7aaf8493edb4130d49d3fbbebea4ec7d2c116b9b715e9e0d5d383578c477ae0e2cbace51f5b8574d540e9b9238d8 SHA512 5055b5a712c0891f3660d00fe7bb27452cce33aa4a9c70fbd7391dd989d31aeb8d8288c3cdd22747b6fd4c480be17f7ab9428c31ea7d2c674e175e77f4f6a0b7
 DIST stripe-2.65.0.tar.gz 234847 BLAKE2B 474757c17abd5259f46913d5be0fa1130e64608f0306d772d6776bc34b76a62c2a7cc1dbe812201d867b06e361f9ec905e0a12bb4830e9ccc1e5211e2aeecd6b SHA512 309a3e2202e7e8983bf7d8a403a588c6793f35866bf44edf6fc2877624a98716033e633b1f38790b2731049cfef3f90c878b5bc9df65dce9f4606414944dc8f4
diff --git a/dev-python/stripe/stripe-2.63.0.ebuild b/dev-python/stripe/stripe-2.63.0.ebuild
deleted file mode 100644
index 2bcc00bcdbc8..000000000000
--- a/dev-python/stripe/stripe-2.63.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="https://github.com/stripe/stripe-python"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.115.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=(LONG_DESCRIPTION.rst CHANGELOG.md README.md)
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/tekore/Manifest b/dev-python/tekore/Manifest
index 6984225cd2a9..d4136029fda7 100644
--- a/dev-python/tekore/Manifest
+++ b/dev-python/tekore/Manifest
@@ -1,3 +1 @@
-DIST tekore-4.0.0.tar.gz 259755 BLAKE2B 5c4c990c14187c20ef3566d1bc0cf32e50fe108d90b59126e2d56105b6fe053ca02c98e7ad7a4fa09345792106e956873a0f42b8492420bd74898557c6d97f23 SHA512 7e5cf6044a6a7045257b9b9830fe4bdb6fb175240b295da3f93cb0557150536655ddf44ab551b52182815fc517b8e43ee704b1061db1284426574e741f7d9a56
-DIST tekore-4.1.0.tar.gz 260732 BLAKE2B 91b9158ee73b8baaaa7134c1c6211a3a491a2669b9b21ed66361d0391d591168eecefe10dfa821a1f6fd9a8e8ab26d166fdf7dfa414b5c1b5d94de6efbea0364 SHA512 424a63d044b0bd9fcf0e3ec0a2ea292860de52ee166a558066b3b5ab382dbf0933116fe0691214e85fdfc10ad3e79cae007876e626e3d61095c63e2765965052
 DIST tekore-4.2.0.tar.gz 261053 BLAKE2B 16e76c7e4ff147140bb5a698381249d135e45cb9bcba23ac14c811bfe220c08e8da003ded44526f5d8f46fc9e439d750c3b21560b38b382751a5d0ee834b72eb SHA512 e22232eb7d4ce453e8338b07caad56b04ec35bf7b4ef2207dae450404e62afaca32b29a74155c99918bea75b0cfb80cc847242ff2ec4762abb8a45c1eb6d6d60
diff --git a/dev-python/tekore/tekore-4.0.0.ebuild b/dev-python/tekore/tekore-4.0.0.ebuild
deleted file mode 100644
index b8001c8c693f..000000000000
--- a/dev-python/tekore/tekore-4.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Spotify Web API client"
-HOMEPAGE="
-	https://tekore.readthedocs.io
-	https://github.com/felix-hilden/tekore
-"
-SRC_URI="https://github.com/felix-hilden/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/httpx-0.20[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pytest-asyncio-0.11[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( readme.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/src \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-autodoc-typehints
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/auth/expiring.py::TestCredentialsOnline::test_bad_arguments_raises_error
-)
diff --git a/dev-python/tekore/tekore-4.1.0.ebuild b/dev-python/tekore/tekore-4.1.0.ebuild
deleted file mode 100644
index eff1cccb93f0..000000000000
--- a/dev-python/tekore/tekore-4.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Spotify Web API client"
-HOMEPAGE="
-	https://tekore.readthedocs.io
-	https://github.com/felix-hilden/tekore
-"
-SRC_URI="https://github.com/felix-hilden/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/httpx-0.22[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pytest-asyncio-0.11[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( readme.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/src \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-autodoc-typehints
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/auth/expiring.py::TestCredentialsOnline::test_bad_arguments_raises_error
-)
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index c28079f48c6a..c31306fc5b53 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,2 +1,3 @@
 DIST terminado-0.12.1.tar.gz 14513 BLAKE2B 97537851a2284c4cae2d9cdc42ad2714c9368f4318ac14c35197d6691404bec205b7b589c35302ff9d3fa99e4a15e24e713f70cc319e26788631134ff4b77cb1 SHA512 770a41b8fa6b43a577c077e8239a43b654f8e4423564ca38d66428ed6c322edea64c98225cb94ae182add9757b6d4e52796edd332443fe7ac643677a8d133674
 DIST terminado-0.13.0.tar.gz 16587 BLAKE2B 4a5b7431412d4eb65df076846519bb4ec89873bf2a6daf6ef5bf9c378d428378ca7323dadfcbcac43b4136cc91d6e786361c96e36b1e1dddbc0723a02666a52b SHA512 bf2b1d39afeaff43c9ae9cfa4ab799e254b97b7fb43d831c373ac1a6f954780757546df2a240d863901e13c610f07f429b30f188eebacbae33c6c9bb43d14bcc
+DIST terminado-0.13.1.tar.gz 16770 BLAKE2B ee95896d8fea06496ff9c7b44e081719227fa83ac612a40919ecbd979b0078df3a66f69b9a0ce2b944f4e6d181208f6918a1d69ffb3315bea7793c1f1c449eb1 SHA512 80d0ae11debd302b561d27ebf5f62cd8e318f0f0585818b71da5bf3fa43da497c0a7a90f4c23330e4d7e65c1f879db2df1e80768d9f45bbb5a7dd9e4362b4198
diff --git a/dev-python/terminado/terminado-0.13.1.ebuild b/dev-python/terminado/terminado-0.13.1.ebuild
new file mode 100644
index 000000000000..568ed7e5e195
--- /dev/null
+++ b/dev-python/terminado/terminado-0.13.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Terminals served to term.js using Tornado websockets"
+HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	www-servers/tornado[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}
+	dev-python/ptyprocess[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
diff --git a/dev-python/twisted/twisted-21.7.0.ebuild b/dev-python/twisted/twisted-21.7.0.ebuild
index 8d208f0690c2..670a05b5446e 100644
--- a/dev-python/twisted/twisted-21.7.0.ebuild
+++ b/dev-python/twisted/twisted-21.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild b/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild
index 77ee6f1a18de..3bd85b0567f6 100644
--- a/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild
+++ b/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index a3850a254177..9dfb36115c0f 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1,2 +1 @@
-DIST WTForms-3.0.0.tar.gz 137053 BLAKE2B 518dfadf248a70fd0627a822c646e884709e295517bc187750e42296896db16dddbe95aa67bf29624147e77fc9db7deb46f3ebc3558801f7b8a5895116df1922 SHA512 dbed8706a317022be07f9568d11c7dab6021642957efab38e547b7b1b83b1ac8863a521b8fb0f5f4ec15cdc2966520a76d079a00ea88ce56f40a42b335fcfc6e
 DIST WTForms-3.0.1.tar.gz 137513 BLAKE2B 17fbb385a28baefaf3fe368b7c7dbd3d6671aaef887ee89617e60e0537ae060248442d4990e7ea926b15d4b85585a1c80ffb61c0fdad2627e5cca90799eb01d7 SHA512 a6db54a7ef9bc96b8fdf69cd65d3810fab9436ff9c056e1cfc580f5ecd0ed8837dcbb7c2adf92419cc5f74e865bb3a023e316407a87d5c5277da5d30e6836fb3
diff --git a/dev-python/wtforms/wtforms-3.0.0.ebuild b/dev-python/wtforms/wtforms-3.0.0.ebuild
deleted file mode 100644
index ec8c49db06a4..000000000000
--- a/dev-python/wtforms/wtforms-3.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-MY_PN="WTForms"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Flexible forms validation and rendering library for python web development"
-HOMEPAGE="https://wtforms.readthedocs.io/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/python-email-validator[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index ed06e3ebfc44..651f3c262b0a 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,2 +1 @@
-DIST python-zeroconf-0.36.13.gh.tar.gz 131067 BLAKE2B 5d5641071ed5842652542f28dbf4bd1478bf1c908ce838790d251af9612dc4fa174cc69b42852f9cd80660d0fd29b4a4ad26a3cfc311a72216eae1a9e1c9c2d6 SHA512 2c7aa4d78617ab69f2862deb6bc1c5492feaccadf364f3f8c960bcb1e0d1ecd8eca3bc17474b4be9c131d88117d65044f12f4171f3e08edfbbaa00291f28828c
 DIST python-zeroconf-0.38.1.gh.tar.gz 133094 BLAKE2B dae802e19b8b9488fc71cf482578be53c99bbb58580de987522e068b8d4042ac093225035bf5f7c2318c9a90bf5404e42f315cae095b0b4455ebd769facdcd81 SHA512 c60f03100c83e9327a910ad84aec768fb890453c21f9baf0fbbec96f0077c602c5e806e8a6047b87108f6d257942305a2ce76c984935ed3c000d83d2c44bb8d6
diff --git a/dev-python/zeroconf/zeroconf-0.36.13.ebuild b/dev-python/zeroconf/zeroconf-0.36.13.ebuild
deleted file mode 100644
index 0e94e84d353d..000000000000
--- a/dev-python/zeroconf/zeroconf-0.36.13.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/jstasiak/python-zeroconf/
-	https://pypi.org/project/zeroconf/"
-SRC_URI="
-	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# network
-	tests/test_core.py::Framework::test_close_multiple_times
-	tests/test_core.py::Framework::test_launch_and_close
-	tests/test_core.py::Framework::test_launch_and_close_context_manager
-	tests/test_core.py::Framework::test_launch_and_close_v4_v6
-	tests/test_core.py::Framework::test_launch_and_close_v6_only
-	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-)