Adding metadata

34 files changed, 62 insertions, 633 deletions

diff --git a/dev-python/XenAPI/XenAPI-22.14.0.ebuild b/dev-python/XenAPI/XenAPI-22.14.0.ebuild
index 3cda37cc5a0d..8ea490396b14 100644
--- a/dev-python/XenAPI/XenAPI-22.14.0.ebuild
+++ b/dev-python/XenAPI/XenAPI-22.14.0.ebuild
@@ -101,7 +101,7 @@ DEPEND="
 	${RDEPEND}
 	test? (
 		dev-ml/mirage-crypto[rng]
-		>=dev-ml/ounit-2
+		dev-ml/ounit2
 		dev-ml/qcheck
 	)
 "
diff --git a/dev-python/audioread/audioread-2.1.9.ebuild b/dev-python/audioread/audioread-2.1.9.ebuild
deleted file mode 100644
index f41f6c68c4ed..000000000000
--- a/dev-python/audioread/audioread-2.1.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Wrapper for audio file decoding using FFmpeg or GStreamer"
-HOMEPAGE="https://pypi.org/project/audioread/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg gstreamer +mad"
-# Enabled mad by default as it's the lighest dep to ease testing
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( || ( ffmpeg gstreamer mad ) )
-"
-
-RDEPEND="
-	ffmpeg? ( media-video/ffmpeg )
-	gstreamer? (
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		media-libs/gstreamer:1.0
-		media-plugins/gst-plugins-meta:1.0
-	)
-	mad? ( dev-python/pymad )
-"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -e "/'pytest-runner'/d" -i setup.py || die
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/black/black-22.1.0.ebuild b/dev-python/black/black-22.1.0.ebuild
index 6d22ca9b054e..c66d974dc346 100644
--- a/dev-python/black/black-22.1.0.ebuild
+++ b/dev-python/black/black-22.1.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/django-appconf/django-appconf-1.0.5.ebuild b/dev-python/django-appconf/django-appconf-1.0.5.ebuild
deleted file mode 100644
index 0ea868773402..000000000000
--- a/dev-python/django-appconf/django-appconf-1.0.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A helper class for handling configuration defaults of packaged apps gracefully"
-HOMEPAGE="https://django-appconf.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE=tests.test_settings
-	local -x PYTHONPATH="${S}"
-	django-admin test -v 2 || die
-}
diff --git a/dev-python/django-cors-headers/django-cors-headers-3.10.1.ebuild b/dev-python/django-cors-headers/django-cors-headers-3.10.1.ebuild
deleted file mode 100644
index a65958c638dd..000000000000
--- a/dev-python/django-cors-headers/django-cors-headers-3.10.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
-HOMEPAGE="https://github.com/adamchainz/django-cors-headers"
-SRC_URI="
-	https://github.com/adamchainz/django-cors-headers/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/glooey/Manifest b/dev-python/glooey/Manifest
index 430e9e9ac376..1039e42b790f 100644
--- a/dev-python/glooey/Manifest
+++ b/dev-python/glooey/Manifest
@@ -1,2 +1 @@
-DIST glooey-0.3.4.tar.gz 19113011 BLAKE2B 45be6355ad51fd9a77003a39f8532f4a86bb3ba758d8fb56d483399ae2d876ff5f072e6f0c6a64ce71b493b650f5e09b553b3d97d8b73c6e2dbdfb789d427f47 SHA512 12222b336f0d1f720b6eb5b2a24eeba8bfa3d39c0775ffc8b9687a6720d8282f263da55cae653ccc1f610db0708a6c75671ca98969accaf0d02320815244ecbf
 DIST glooey-0.3.6.tar.gz 19115984 BLAKE2B 79254f44caa94364a08d9c04394c6fd38ef84ddf539c881938bc05e65cdd0374deb0a10b835c21dd6d83a34118c29ff0876583a6c26f2e1f73cad8ceb4f40bdf SHA512 06e53d9d67e4be6cd800c4090e76d982a664be760fc77e2b5666d1b486665f8eea79f0f8ea58ff49b06b550e580cd2a5d4238f06f349613d323334b80de6b81c
diff --git a/dev-python/glooey/glooey-0.3.4-r1.ebuild b/dev-python/glooey/glooey-0.3.4-r1.ebuild
deleted file mode 100644
index 5d4d925d16e1..000000000000
--- a/dev-python/glooey/glooey-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="An object-oriented GUI library for pyglet"
-HOMEPAGE="https://glooey.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	dev-python/autoprop[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/vecrec[${PYTHON_USEDEP}]
-"
-
-BDEPEND="${RDEPEND}"
-
-distutils_enable_sphinx docs
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/glyphsets/Manifest b/dev-python/glyphsets/Manifest
index f15e0e525b31..af8a6f862c0d 100644
--- a/dev-python/glyphsets/Manifest
+++ b/dev-python/glyphsets/Manifest
@@ -1 +1,2 @@
 DIST glyphsets-0.2.1.tar.gz 1265612 BLAKE2B 29aeadf2345887eef4b0a2f91bfee272fe8a45a3c0fefdcd6ebd70eef556b899294fc9a58b8e72a8913f9fa9bc63d2b378b7d6229afb516c0a57063ff2e6d08a SHA512 0a937ec231c617ee2fe6cc0d7a4f8930b2b49342a94b82577968e0334224a84ebcfa76f104cce526da854a283c0179da3dd9b7a2dea0d3fdbabdce626f108a9e
+DIST glyphsets-0.3.1.tar.gz 1619668 BLAKE2B d09b07e46a444c55ab5e91b59fa4410af9d1ed0549fe401f4b1c353ed761794e849bd3e3eb61effe80916c63a062af22cd915ecf9cc4df22ea4305465b64870a SHA512 333bcf4aec9c0a78e7c02d4ef9985b053d84a7d7bdbb37adb785003b03184cd94fbe2f19197c76521db53e2220c8e1041480f5ffbef2a7153d3463279ab936d6
diff --git a/dev-python/glyphsets/glyphsets-0.3.1.ebuild b/dev-python/glyphsets/glyphsets-0.3.1.ebuild
new file mode 100644
index 000000000000..521e9189693a
--- /dev/null
+++ b/dev-python/glyphsets/glyphsets-0.3.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python API for evaluating coverage of glyph sets in font projects"
+HOMEPAGE="
+	https://github.com/googlefonts/glyphsets
+	https://pypi.org/project/glyphsets/
+"
+SRC_URI="https://github.com/googlefonts/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+
+#ufoLib2 is an indirect dependency
+RDEPEND="
+	dev-python/fonttools[${PYTHON_USEDEP}]
+	dev-python/ufoLib2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/indexed_gzip/indexed_gzip-1.6.13.ebuild b/dev-python/indexed_gzip/indexed_gzip-1.6.13.ebuild
index 023f2d36b7dc..49fc47b991a6 100644
--- a/dev-python/indexed_gzip/indexed_gzip-1.6.13.ebuild
+++ b/dev-python/indexed_gzip/indexed_gzip-1.6.13.ebuild
@@ -37,6 +37,14 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	# strip custom "clean" command that doesn't support "-a"
+	# https://bugs.gentoo.org/838955
+	# TODO: this can be removed once distutils-r1 stops using clean
+	sed -i -e '/cmdclass/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
 src_compile() {
 	if use test; then
 		export INDEXED_GZIP_TESTING=1
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.1.ebuild
index a53e97418b3d..7984302ed42d 100644
--- a/dev-python/kiwisolver/kiwisolver-1.4.1.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.4.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mando/mando-0.7.1.ebuild b/dev-python/mando/mando-0.7.1.ebuild
index 433462382c96..0ced7534f277 100644
--- a/dev-python/mando/mando-0.7.1.ebuild
+++ b/dev-python/mando/mando-0.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rubik/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/numpy/numpy-1.22.3.ebuild b/dev-python/numpy/numpy-1.22.3.ebuild
index 0c787da0f41c..ed3a24b1fa6d 100644
--- a/dev-python/numpy/numpy-1.22.3.ebuild
+++ b/dev-python/numpy/numpy-1.22.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/pg8000/Manifest b/dev-python/pg8000/Manifest
index a2d0e5be9f58..c03d285693ac 100644
--- a/dev-python/pg8000/Manifest
+++ b/dev-python/pg8000/Manifest
@@ -1,2 +1,2 @@
-DIST pg8000-1.22.0.tar.gz 116910 BLAKE2B a6779fe30a114f4e66c8a09924a4174ab9c128ee286138b80d60c7cc879c496abd56943c22bee1d396de460002a6971762580112f3dd2808f96f4c46db176e4d SHA512 ec506464a7d13d8befee7f8e0837983c4cbc6193b8ec7d8847c46cb04788c23339db6557b31e88d567e395cb45100e3c0a68ac3ba34a031380a980c24857ed87
 DIST pg8000-1.24.1.tar.gz 118816 BLAKE2B 43ed4cfb1850288f65c7b7d9dc20c0459f381b67829199855d5188d030212bd3ff9a4135258b515f2073e4303b7909d1961e7428cd208bb2dfc52abe35bb02c2 SHA512 3260d74eaefc5bcdf179e509b1ff3aceaeb8bf76f01e1ec6886e79d40b564540686e355c8de3fca9ace34447bdbb3ae3b2616e5941655eff890a28e336abef57
+DIST pg8000-1.24.2.tar.gz 118893 BLAKE2B 7856e62239c11d97fea378a690b31c73ee08aecc8b3f66deb16ca37ba1013553c820a2ffce9820dffa4e906b99add5fd2d8fc4d3047c53c6208e34a38a425616 SHA512 0985f05d9f3f252e3c67380c7642e51309964a21b12b0abe300eb3f5a751f75d1544d06a6761874b0798c0004eb61468e27d6c4238576a1d57f9ca4b2c6f77a1
diff --git a/dev-python/pg8000/pg8000-1.22.0.ebuild b/dev-python/pg8000/pg8000-1.24.2.ebuild
index 87a618be6576..a5ce66a854c8 100644
--- a/dev-python/pg8000/pg8000-1.22.0.ebuild
+++ b/dev-python/pg8000/pg8000-1.24.2.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=8
@@ -18,12 +18,11 @@ SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64"
 
-RDEPEND="
-	dev-python/scramp[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
+RDEPEND=">=dev-python/scramp-1.4.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	test? (
+		dev-db/postgresql
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 72487e3c92b0..c70d36a2e2a4 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,2 +1 @@
-DIST pgspecial-1.13.0.tar.gz 49204 BLAKE2B 7269fc94fc0672db1880ba4b76c8926b6a3c995aac3fca77add7ae6756fcc3295d8d32fcede37cd3fa2d82c82aebfc26d91ed50b4294c5206f04d4c72742b45b SHA512 de2560106fbad14f2095ace468c8490cb325aedb772f649f20a0b5fe65f19afeed33f219d3a6eca683a63b418741a9906a01f7c4bdd8734868517faeba791026
 DIST pgspecial-1.13.1.tar.gz 50269 BLAKE2B 0566a7c2d8ee1ea350e27a4283f56c4cb1360f23ac9fe0147358ff68f527907c47650466dd41ae9c68e8a1f8ba658e452a88db360a7066f5562b7f0c578b8b62 SHA512 4b8f0495451db40087327640edc4bf8c29997b4f501dc5af6d093ad880fc337050d651676ae8ff434da3564e773f9e89e6e7d6bf0d6cfb7b70d8b4beea73a347
diff --git a/dev-python/pgspecial/pgspecial-1.13.0.ebuild b/dev-python/pgspecial/pgspecial-1.13.0.ebuild
deleted file mode 100644
index 033c4767609c..000000000000
--- a/dev-python/pgspecial/pgspecial-1.13.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of PostgreSQL meta commands"
-HOMEPAGE="https://github.com/dbcli/pgspecial"
-SRC_URI="https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/click-4.1[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( >=dev-db/postgresql-8.1[server] )"
-
-distutils_enable_tests pytest
-DOCS=( License.txt README.rst changelog.rst  )
-
-src_test() {
-	local db=${T}/pgsql
-
-	initdb --username=postgres -D "${db}" || die
-	# TODO: random port
-	pg_ctl -w -D "${db}" start \
-		-o "-h '127.0.0.1' -p 5432 -k '${T}'" || die
-	psql -h "${T}" -U postgres -d postgres \
-		-c "ALTER ROLE postgres WITH PASSWORD 'postgres';" || die
-	createdb -h "${T}" -U postgres _test_db || die
-
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${db}" stop || die
-}
diff --git a/dev-python/pillow/pillow-9.0.1-r1.ebuild b/dev-python/pillow/pillow-9.0.1-r1.ebuild
index 5f4f2f826b37..c325ddf5f9f7 100644
--- a/dev-python/pillow/pillow-9.0.1-r1.ebuild
+++ b/dev-python/pillow/pillow-9.0.1-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 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="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 3a4f6666bd1e..03bd9c69113b 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,4 +1,3 @@
-DIST pip-22.0.3.tar.gz 9290286 BLAKE2B f81140fbff5d16e8a38d21047dd790be2287b664b130d43e71c7d4f23d6a7cd5c8b2e58f988cc18dc4d08b83b0fcb3eac6b6ec001421e83e35db74f15d6c557e SHA512 05f0807b298c2136842ad1cae3b003f81d85ca79103f12171e4c8d020d6add076848c1acfb6442c4ae2da6b834de0e87dffaec7bd24dfc403372cead94949326
 DIST pip-22.0.4.tar.gz 9325766 BLAKE2B 9ce5a25e6fb9aedc39e2cddab2a8af3b47dbaaaf8bd22c39f8301b784e6e9f5434f63d5ef467f4d819b15bcd5cf8d3da52db34b3514c7b4a15823f77cb47e1c1 SHA512 af6d1787b4fe97f2eec9c2e3e3f0f756efca8cb83f6ecdae797986fb6050ee60d872a8a8eb7502a32c4334fc0c7af8cf3c58ce980407d0e9f89eec28a4290093
 DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b
 DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e SHA512 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42
diff --git a/dev-python/pip/pip-22.0.3.ebuild b/dev-python/pip/pip-22.0.3.ebuild
deleted file mode 100644
index f91ac88accda..000000000000
--- a/dev-python/pip/pip-22.0.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-57.4.0-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.11
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.tar.gz
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
-SLOT="0"
-IUSE="test vanilla"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		dev-python/tomli-w[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-21.3-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
-		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
-		# Internet
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-	)
-
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		tests/lib/test_lib.py::test_correct_pip_version
-		# uses vendored packaging that uses deprecated distutils
-		tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	distutils_install_for_testing
-	pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
-	distutils_install_for_testing
-	popd >/dev/null || die
-	# prevent it from being installed
-	rm -r "${BUILD_DIR}"/lib/virtualenv* || die
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-	epytest -m "not network"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pooch/Manifest b/dev-python/pooch/Manifest
index 08ddb6d445b6..ee30b77b2b53 100644
--- a/dev-python/pooch/Manifest
+++ b/dev-python/pooch/Manifest
@@ -1,2 +1 @@
-DIST pooch-1.5.2.tar.gz 61167 BLAKE2B 36c3ac00ae1d05b688fabc31ae9eb88536d717a3dd179a02bf76f9c8066520bc165af0a71d5cd514e7c9f2422c4a3ee189cf93215bc9a9189bf9f20a77f95e61 SHA512 acb1a48e94a97f79503125f0cf1312d715719ec32817771d2e19d2bd89b2cfd34b50221d67d1854cd93818140d8536f6f5b3db1ae0bbb185fffa2cf9886f98da
 DIST pooch-1.6.0.tar.gz 52318 BLAKE2B c5cdf04a27a5754accee5a4522d5e6a51c4e71b7034cd570c6a2f30bc580ba9c15e0717be792e7cdd020ca745e6813a63681ce966ad61c0ed4aaa8b84829b920 SHA512 e1b6253b8879ef172bd6370139a7807355c7e1c03a1626ac46cb083b1f7d8beb5a8adb08c0828eb34e96a7164211d2dc7da214fd0176eb0606fe4ff47911257c
diff --git a/dev-python/pooch/pooch-1.5.2.ebuild b/dev-python/pooch/pooch-1.5.2.ebuild
deleted file mode 100644
index 192f7c905003..000000000000
--- a/dev-python/pooch/pooch-1.5.2.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_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Manage your Python library's sample data files"
-HOMEPAGE="https://github.com/fatiando/pooch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/pytest-localftpserver[${PYTHON_USEDEP}]
-		dev-python/tqdm[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/rchitect/Manifest b/dev-python/rchitect/Manifest
index 0016442365f2..15d2f25b173a 100644
--- a/dev-python/rchitect/Manifest
+++ b/dev-python/rchitect/Manifest
@@ -1 +1 @@
-DIST rchitect-0.3.36.tar.gz 32682 BLAKE2B dbd9dec8d60f0b3558d0b8fac5c3a02e5ce210778b941b4cd994ee7f815205a34897605a8a7cd29e96791f223ba9d611bdf3064b93f13647c98084e9d07747bc SHA512 53b9cd3cc5cd566d39e74fd70dcb9b6eeb259885b57dde6c42beaea775db07b12f0745abc996218d0df0522d3db39919e953eb1bc13b8e89f69f583b6323476c
+DIST rchitect-0.3.36-github.tar.gz 35978 BLAKE2B 022479c72a6610210ffa05a4758ab843a2e373663adb5d694f05b3b7c33cf4de1c83211f767f8619d76e9e31cb44612b3bf16d9bc30e848835b20fc9c47462e6 SHA512 8ca8428f53d104fad3e950b14e2b7f733b4aba5715f926faa0ac061003775f0f48a15b5e14a634527f0ca28d1cdc316053ddc3f79b061102ed9e81f59c3ec63d
diff --git a/dev-python/rchitect/rchitect-0.3.36.ebuild b/dev-python/rchitect/rchitect-0.3.36.ebuild
index 19894fd57bdd..150f7b93f7c3 100644
--- a/dev-python/rchitect/rchitect-0.3.36.ebuild
+++ b/dev-python/rchitect/rchitect-0.3.36.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://pypi.org/project/rchitect/
 	https://github.com/randy3k/rchitect
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/randy3k/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}-github.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 31a66977e16c..05c8cd6700ba 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,4 +1,2 @@
 DIST redis-py-4.1.4.tar.gz 2352106 BLAKE2B a7f40d381e3e1d295d2ce88f0adb897704d0065ee7d5bb00108c2c8c67ef649ea63d4ca06dbbe2b21b2f92d70d96f8e2d32a7992ecf702bb4c73589f30c1bae8 SHA512 6dd1bc7622529382901b2fe6e63a5f9d6a4b89175b486c879a63cc8f0e708737431dfe5b834124f0d33f34540ac54813a0e6953bbed3a9dbd226597b4b1cb3ae
-DIST redis-py-4.2.0.tar.gz 2419627 BLAKE2B a4429e17dc90289032c5b98cd482fc6e1349b4b63b2c3f289be1df9d0c667a9f568cbee71d34f88c140fbebf2b0061e9bb3426f1548bccf3c0767c040419251b SHA512 3c4c7f859e63ebadf8d4b01ce14d789caffa18b1f177b6a2269737cb20259dc0165773b1c838c3c08edeea790976183b156f886815b42ea709b4b3a0f2aa3354
-DIST redis-py-4.2.1.tar.gz 2420026 BLAKE2B 2e2ef024dc22ad8447bd0b0c9e2318b5c55568e7a93a73f8f264e5af839d50c7c44d98669d19ddc2a9a6440eaafa8842ebeb749b9b22db83d691dab5421fd774 SHA512 3499126d2c19f599e5bc026c3b66ec99639b2746ef0091ba8bea45cf969d39831e1f2ad47f0ba4c65131d4f248320a8b7d2862c5abb289e46555cd3fc6239674
 DIST redis-py-4.2.2.tar.gz 2421362 BLAKE2B ab59a649e8bc08d706536f994f0462505cea39828072884739b1a6434b45fd120e3b8acb51e8e88ec9fe0ce9acc0bfd6a5ff92bb67080724c7b121ef539af16f SHA512 80673d48cd97af1c5ebc67e919f16891ccb20cd30bc06619ddffeb117ad87f82b73f9b9bda6d36829bc51a35aa3c9b2af7c879ec665cc9664bdd86ac6510095b
diff --git a/dev-python/redis-py/redis-py-4.2.0.ebuild b/dev-python/redis-py/redis-py-4.2.0.ebuild
deleted file mode 100644
index 5d8a814f7af3..000000000000
--- a/dev-python/redis-py/redis-py-4.2.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_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 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/async_timeout-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/deprecated-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# not used by our impls
-	# https://github.com/redis/redis-py/pull/2062
-	sed -i -e '/typing-extensions/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-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/redis-py/redis-py-4.2.1.ebuild b/dev-python/redis-py/redis-py-4.2.1.ebuild
deleted file mode 100644
index c382001ce321..000000000000
--- a/dev-python/redis-py/redis-py-4.2.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_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 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/async_timeout-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/deprecated-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${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/sphinx-click/Manifest b/dev-python/sphinx-click/Manifest
index fa88c6f6e6d3..d68daafa5a98 100644
--- a/dev-python/sphinx-click/Manifest
+++ b/dev-python/sphinx-click/Manifest
@@ -1,2 +1,2 @@
-DIST sphinx-click-3.0.2.tar.gz 19764 BLAKE2B 7190958afaa8edab311e6728c5b2ea37e04d9402882c8bb0ceac935fc1bc93b5c087cbe6847396f9331b9b6b4d7fcb2a439d725661bd8d4cebdde6851f38f78a SHA512 dcf60ca31dcc7c1f45157ed88a5d723d8b531f01b617fb0cc4ada8f09c709b23b55a86bcf8bbe66bf4c2f5ef77329123d271724887022a43b86747087e87ed7c
 DIST sphinx-click-3.1.0.tar.gz 20265 BLAKE2B ca38720636c8c3009db4b4345534883b63e647bd1e2fe1a5d79a4e80c2221a0e9543518d4f1ae9663571259cd14aff8b89f302f05a335b2c824ec24622e04853 SHA512 fe44d9e104216a7edadc2cdd467fd704deeacf580908b2d6e597104dabbf5d1006ee08019aa1252895d2929c42f34fc8ae540530a7bf20023cedcce8267c9a8b
+DIST sphinx-click-4.0.2.tar.gz 21218 BLAKE2B 6590e5604bd6c07249f9a7aeb5c43660e913e24d889dad046012e53dc682f981d80df0c6955c7a930c98986378731fb16037ed5e9cd50b45c4a4299d183eadb6 SHA512 f44a3ada5e2a73fed1d4b92d6868b6875cc3c1790b427c8db71e4c8e50e86eec8ef00a46762a34ff539f5061cc3e258494523ba25e9035beaa92c41560ab554a
diff --git a/dev-python/sphinx-click/sphinx-click-3.0.2.ebuild b/dev-python/sphinx-click/sphinx-click-4.0.2.ebuild
index 2fbccd474f09..b1cba43bed9b 100644
--- a/dev-python/sphinx-click/sphinx-click-3.0.2.ebuild
+++ b/dev-python/sphinx-click/sphinx-click-4.0.2.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=8
@@ -15,16 +15,15 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 SLOT="0"
 
 RDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 "
 BDEPEND=">=dev-python/pbr-2.0[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
-
 distutils_enable_sphinx docs --no-autodoc
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index d9887263edb2..21ca7e8e9e52 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,4 +1,3 @@
-DIST stripe-2.66.0.tar.gz 234929 BLAKE2B 289c3464c3aa9ef5ebeccaffde383271ca23e704303d5b5499d1f5f1f197483088781d16878749bca03c8ea56209a22173c376ef00510f53d81c733f0a626af8 SHA512 d716e82580757ec0b187a74de1f8ef7bbe2f32468f13c551886bcbadf631eef001df9f4d249f091856b009545ca8b6d60f16c07e79345fee33651e7d27fb31c0
 DIST stripe-2.67.0.tar.gz 235426 BLAKE2B ee396b0b7d3991afdd81e6b051fad0168a7b3dcfaddccc7700292878fc437788dcc40480fea2131dd52e3b787dc6e7b420d6023079f55d9365f76076cc51070d SHA512 099208259c6ca8d69fd6f39f72b9f12f41eace2f0a2a08b017f6141ad06882df742749941326fb8d9898db7c59e32ed74a464ad372d6f7f0a929c9ae4e4d2475
 DIST stripe-2.70.0.tar.gz 239653 BLAKE2B d59d7b452e91169e83e4d4bc10b544fc94c48aa3a967c899136b1b9ea60e835d998c1a5a0c5e131989d9628c36b77e3fe133952dddbede69d0bcfa11dc9fc640 SHA512 62f40d82e4a5d37ce070a2457b8372d903993e209f6a042ab97a93f5ee98eb994c0cac070451e2b130df9a72f4a9ece65600266735b438aff3cc5cf09e217b27
 DIST stripe-2.71.0.tar.gz 239817 BLAKE2B c1b8fad45e7e9fee79f841502aaad1a849f345357d2facfab833bc50129c5d9eac6c2af128ef572f9d295da966b8a38b095786b44bf026eac6f6d001470ae60a SHA512 5acbaba1e2a5e063beafd0b67994a4a4c7d207f220a49e84b7ab3c0288a92150fd10048f7782e32c3033f4a920f5e81a0893610545e5d1f49ee6dbe62aa4b3a5
diff --git a/dev-python/stripe/stripe-2.66.0.ebuild b/dev-python/stripe/stripe-2.66.0.ebuild
deleted file mode 100644
index 9ee0a6c4672a..000000000000
--- a/dev-python/stripe/stripe-2.66.0.ebuild
+++ /dev/null
@@ -1,62 +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="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.118.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/wsproto/wsproto-1.1.0.ebuild b/dev-python/wsproto/wsproto-1.1.0.ebuild
index 4b222c655578..2c0cc2a18ee8 100644
--- a/dev-python/wsproto/wsproto-1.1.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.1.0.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 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/h11-0.9[${PYTHON_USEDEP}]
diff --git a/dev-python/yara-python/Manifest b/dev-python/yara-python/Manifest
index de63fb4af0d1..f7f693916484 100644
--- a/dev-python/yara-python/Manifest
+++ b/dev-python/yara-python/Manifest
@@ -1,2 +1 @@
-DIST yara-python-4.1.3.tar.gz 33712 BLAKE2B 7878d12620f2834578c98a99bc259422d8ac54efc04ebd29ffa604c15b0462607ce950b3e19f8e80db07195e61dedb4efc8c2ffb18a0c5de0bf2755fe62776d1 SHA512 9c96ae78df7694dd55b8bdde4fad49043f120b94477fa9d7090610665072626eba4fa410cd9292205e0b18bb9f384f07288c0340232e163294b91051b84dcab2
 DIST yara-python-4.2.0.tar.gz 34459 BLAKE2B fce460385eaa75dd1779fe49c7937ff36d7604433deb310b6fe9e66af9ea521952f92bee61829372cf19c7efee170329609530f1f9e863991720e4887c3c1349 SHA512 ba08d709fc51679ec9fe36165e0864b79fc241f85c681bf59823fe7bb0e34e928cded050ff296147eb5bcb837485f39949aa93425a0eb9ca8b3730e60fac93f4
diff --git a/dev-python/yara-python/yara-python-4.1.3.ebuild b/dev-python/yara-python/yara-python-4.1.3.ebuild
deleted file mode 100644
index 37a6f5ab80fa..000000000000
--- a/dev-python/yara-python/yara-python-4.1.3.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} )
-inherit distutils-r1
-
-DESCRIPTION="Python interface for a malware identification and classification tool"
-HOMEPAGE="https://github.com/VirusTotal/yara-python"
-SRC_URI="https://github.com/virustotal/yara-python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${PYTHON_DEPS}
-	=app-forensics/yara-$(ver_cut 1-2)*"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
-
-src_compile() {
-	compile_python() {
-		distutils-r1_python_compile --dynamic-linking
-	}
-	python_foreach_impl compile_python
-}