Adding metadata

42 files changed, 289 insertions, 901 deletions

diff --git a/dev-python/ansi/Manifest b/dev-python/ansi/Manifest
index 4b5fb73d3a39..831be9648a39 100644
--- a/dev-python/ansi/Manifest
+++ b/dev-python/ansi/Manifest
@@ -1,3 +1 @@
-DIST ansi-0.2.0.tar.gz 5173 BLAKE2B 436caa8e1f36e96f1844e79e3a0ff0c4099e76b25ce9f56c9d8663aeeb650f32fba75a14fe8548f557fb020e2340707272fdda4cdd3c245c903a4f801ae48413 SHA512 22c69b5030f03eca9470e288c16e62042ccd02ef2e232600a4fab629354601d5da0f7c16b60dae7293c69255e5d4125298890d99dba8e5387960a5be60b92d61
-DIST ansi-0.3.5.tar.gz 6597 BLAKE2B 4e32bd7add4af1d9f11173aa79d6ed139814f3b3727a4599f104e8632a4e169fdaccf3e18ecf425f86c17c70c1d185f6a915bd9cbac2589d376fc23c338127e6 SHA512 a12b7e1231c2691edf6d807907fe6b8a8d6c6bc116fd9681b6bb7603e6e2ce7af17e3e7892d4046752844327eb8f02a248f93686640bec24dbe2be59202b01e3
 DIST ansi-0.3.6.tar.gz 6668 BLAKE2B a2bd492aa5c68041feeb04e798ce301ae50ba217c695f4500b033911a719a9e91dc6213d81361e36819a1d46ddeef82e4684ee0c395ec70fc93c6957e2a410b2 SHA512 6b7512013db18436f5982175d82c9f333eef7655eece12454f4731c7f2ed675ab39986e813560d1621b365b7541a5ca6c37d88f2ca5be4460f1ae86cb27d1911
diff --git a/dev-python/ansi/ansi-0.2.0-r1.ebuild b/dev-python/ansi/ansi-0.2.0-r1.ebuild
deleted file mode 100644
index 4198917417f1..000000000000
--- a/dev-python/ansi/ansi-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="ANSI cursor movement and graphics in Python"
-HOMEPAGE="https://github.com/tehmaze/ansi"
-SRC_URI="https://github.com/tehmaze/${PN}/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ansi/ansi-0.2.0.ebuild b/dev-python/ansi/ansi-0.2.0.ebuild
deleted file mode 100644
index 0828e0923bb5..000000000000
--- a/dev-python/ansi/ansi-0.2.0.ebuild
+++ /dev/null
@@ -1,19 +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} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="ANSI cursor movement and graphics in Python"
-HOMEPAGE="https://github.com/tehmaze/ansi"
-SRC_URI="https://github.com/tehmaze/${PN}/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ansi/ansi-0.3.5.ebuild b/dev-python/ansi/ansi-0.3.5.ebuild
deleted file mode 100644
index b81f0c932398..000000000000
--- a/dev-python/ansi/ansi-0.3.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="ANSI cursor movement and graphics in Python"
-HOMEPAGE="https://github.com/tehmaze/ansi/"
-SRC_URI="https://github.com/tehmaze/${PN}/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/autoprop/autoprop-4.0.2.ebuild b/dev-python/autoprop/autoprop-4.0.2.ebuild
deleted file mode 100644
index 25c66de013c5..000000000000
--- a/dev-python/autoprop/autoprop-4.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Infer properties from accessor methods"
-HOMEPAGE="
-	https://github.com/kalekundert/autoprop/
-	https://pypi.org/project/autoprop/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/signature_dispatch-1.0.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/bert/bert-2.2.0.ebuild b/dev-python/bert/bert-2.2.0.ebuild
deleted file mode 100644
index f68a2b4e13f2..000000000000
--- a/dev-python/bert/bert-2.2.0.ebuild
+++ /dev/null
@@ -1,24 +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} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="BERT Serialization Library"
-HOMEPAGE="https://pypi.org/project/bert/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/basho-erlastic[${PYTHON_USEDEP}]"
-
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.0-remove-basestring-fix.patch" )
diff --git a/dev-python/carbon/carbon-1.1.8.ebuild b/dev-python/carbon/carbon-1.1.8.ebuild
deleted file mode 100644
index 2f404a9611b4..000000000000
--- a/dev-python/carbon/carbon-1.1.8.ebuild
+++ /dev/null
@@ -1,62 +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} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="https://graphiteapp.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-# whisper appears to have been missed from listing in install_requires in setup.py
-RDEPEND="
-	dev-python/twisted[${PYTHON_USEDEP}]
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	=dev-python/whisper-${PV}*[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Do not install the configuration and data files. We install them
-	# somewhere sensible by hand.
-	sed -i -e '/data_files=install_files,/d' setup.py || die
-	# We want FHS-style paths instead of /opt/graphite
-	export GRAPHITE_NO_PREFIX=yes
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/carbon
-	doins conf/*
-
-	keepdir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
-
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-relay
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-aggregator
-
-	newconfd "${FILESDIR}"/carbon.confd carbon-cache
-	newconfd "${FILESDIR}"/carbon.confd carbon-relay
-	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
-}
-
-pkg_postinst() {
-	einfo 'This ebuild installs carbon into FHS-style paths.'
-	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
-	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
-	einfo '(see /etc/carbon/carbon.conf.example).'
-	einfo ' '
-	einfo 'OpenRC init script supports multiple instances !'
-	einfo 'Example to run an instance b of carbon-cache :'
-	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
-	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
-}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 95a3c3c1830a..2e43bfbee7f3 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,3 +1 @@
-DIST dulwich-0.20.32.tar.gz 418100 BLAKE2B 21d41a7b1e491848a11ab3e3b1b63bfbe1798b38ef331136b07609f004e780672477e91a637dd3b1ccd3b26e359461e1a16d759ac2cb98d1091fbdb1968c00a9 SHA512 9af4cb4462ab9a69bea9074aace81eeb8d33087f2c53e64145991913ad132e076b62f7958551729c758cd6eeae029a278723872771ef36b046331c85ebf2fcf4
-DIST dulwich-0.20.33.tar.gz 419863 BLAKE2B 57b7a05f7a23745ba63e2faba9cd3772637a61cf9f2077eaf7ec799f5e3d25de7245aabbebf22cb58f5cb45318b653335251fc46b136b108770aaa6c2b09e099 SHA512 f2d0f8875dc4cd4ac4629f2884a5e68938d14218ef96a19ce322559a16eb64cdee92ed0bc07790e9d527a20fdcd29f6fe1f95479d0055cdab88f509bc318368c
 DIST dulwich-0.20.35.tar.gz 420972 BLAKE2B 97c877554199aa8f3abf2f95a43c350cbef784f6f71af6280c537a93297c89981190fe1f66914532641a99cc3dca82a33b43d09f864f2ddf370c0097fa28a5e0 SHA512 23c272153547e0ef25a0e7d2deb64987e5d503545775e7d6f438ae09366c0037686eba1027d38a9dbf042bd1553eeb25ccdc818bdd785a2edf2cd3688f0b1271
diff --git a/dev-python/dulwich/dulwich-0.20.32.ebuild b/dev-python/dulwich/dulwich-0.20.32.ebuild
deleted file mode 100644
index 3069685406c5..000000000000
--- a/dev-python/dulwich/dulwich-0.20.32.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/dulwich/dulwich/
-	https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		!hppa? ( !ia64? (
-			dev-python/gevent[${PYTHON_USEDEP}]
-			dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		) )
-		app-crypt/gpgme[python,${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.20.33.ebuild b/dev-python/dulwich/dulwich-0.20.33.ebuild
deleted file mode 100644
index a7bb179c0605..000000000000
--- a/dev-python/dulwich/dulwich-0.20.33.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/dulwich/dulwich/
-	https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		!hppa? ( !ia64? (
-			dev-python/gevent[${PYTHON_USEDEP}]
-			dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		) )
-		app-crypt/gpgme[python,${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.20.35.ebuild b/dev-python/dulwich/dulwich-0.20.35.ebuild
index 56ad0fe8eb35..117114131a51 100644
--- a/dev-python/dulwich/dulwich-0.20.35.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.35.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/empy/empy-3.3.4.ebuild b/dev-python/empy/empy-3.3.4.ebuild
deleted file mode 100644
index cd1f0155369e..000000000000
--- a/dev-python/empy/empy-3.3.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A powerful and robust templating system for Python"
-HOMEPAGE="http://www.alcyone.com/software/empy/"
-SRC_URI="http://www.alcyone.com/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc x86"
-IUSE="doc"
-
-python_test() {
-	"${PYTHON}" em.py sample.em | diff sample.bench -
-	if [[ ${PIPESTATUS[0]} -ne 0 || ${PIPESTATUS[1]} -ne 0 ]]; then
-		die "Testing failed with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		docinto examples
-		dodoc sample.em sample.bench
-		# 3.3 has the html in this funny place. Fix in later version:
-		docinto html
-		dodoc doc/home/max/projects/empy/doc/em/*
-		dodoc doc/home/max/projects/empy/doc/em.html
-		dodoc doc/index.html
-	fi
-}
diff --git a/dev-python/fitsio/Manifest b/dev-python/fitsio/Manifest
index 5d468a97cfeb..218062451e1a 100644
--- a/dev-python/fitsio/Manifest
+++ b/dev-python/fitsio/Manifest
@@ -1,2 +1 @@
-DIST fitsio-0.9.11.tar.gz 6020222 BLAKE2B a71a0a6a026999b06dce54beb48fab2f510951099788b51456a6e07057daa7c911d5a2841d5f15a397705459daf081ff91bff1014782c93cb1dd76faf0ef2e1d SHA512 751b9612fe051f128d8f5dea61e2d119409293051a130ee3e18836181637e8c8daea757a715012fd024678d00e234e8b6c0cc0c9229c2bd9a406db312e4607d7
 DIST fitsio-1.1.7.gh.tar.gz 5052055 BLAKE2B be9c632dcdd08325c5abb2cb9ed9eee6476b27ef2e7197298b269156346ecb72afc9f1d1c2e3ade045f69cde3afac5a6bf3fe5ecbce67fdfc1e6ede529ab1b32 SHA512 d6e81de08c38346050fbaa3e2fb51a496e76133bb0b04f20d816b51b7b7bf21ba37a400c3a6a7f966959223545c736ca6245427457154a4b5976b5a997e9cfcc
diff --git a/dev-python/fitsio/files/fitsio-0.9.11-test-failures.patch b/dev-python/fitsio/files/fitsio-0.9.11-test-failures.patch
deleted file mode 100644
index 243913dc659e..000000000000
--- a/dev-python/fitsio/files/fitsio-0.9.11-test-failures.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Fri, 15 Jul 2016 08:46:15 +0200
-Subject: Mark failures that are known to fail with the original cfitsio
-
----
- fitsio/test.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/fitsio/test.py b/fitsio/test.py
-index bafde15..49a4b3b 100644
---- a/fitsio/test.py
-+++ b/fitsio/test.py
-@@ -545,7 +545,7 @@ class TestReadWrite(unittest.TestCase):
-         try:
-             with fitsio.FITS(fname,'rw',clobber=True) as fits:
-                 # note i8 not supported for compressed!
--                dtypes = ['u1','i1','u2','i2','u4','i4','f4','f8']
-+                dtypes = ['u1','i1',     'i2','u4','i4','f4','f8']
- 
-                 for dtype in dtypes:
-                     data = numpy.arange(5*20,dtype=dtype).reshape(5,20)
-@@ -569,7 +569,7 @@ class TestReadWrite(unittest.TestCase):
-         try:
-             with fitsio.FITS(fname,'rw',clobber=True) as fits:
-                 # note i8 not supported for compressed!
--                dtypes = ['u1','i1','u2','i2','u4','i4','f4','f8']
-+                dtypes = ['u1','i1',     'i2','u4','i4','f4','f8']
- 
-                 for dtype in dtypes:
-                     data = numpy.arange(5*20,dtype=dtype).reshape(5,20)
-@@ -1365,6 +1365,7 @@ class TestReadWrite(unittest.TestCase):
-             if os.path.exists(fname):
-                 os.remove(fname)
- 
-+    @unittest.skip("bzip2 is not supported with debian cfitsio package")
-     def testBz2Read(self):
-         '''
-         Write a normal .fits file, run bzip2 on it, then read the bz2
diff --git a/dev-python/fitsio/fitsio-0.9.11.ebuild b/dev-python/fitsio/fitsio-0.9.11.ebuild
deleted file mode 100644
index 59c1ff080240..000000000000
--- a/dev-python/fitsio/fitsio-0.9.11.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to read from and write to FITS files"
-HOMEPAGE="https://github.com/esheldon/fitsio"
-SRC_URI="https://github.com/esheldon/fitsio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/numpy-1.11[${PYTHON_USEDEP}]
-	sci-libs/cfitsio:0=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-test-failures.patch )
-
-python_prepare_all() {
-	sed -e '/self.use_system_fitsio/s/False/True/' \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	pushd "${TEST_DIR}"/ || die
-	${PYTHON} -c "import fitsio; exit(fitsio.test.test())" || die
-	popd > /dev/null || die
-}
diff --git a/dev-python/httpauth/httpauth-0.3.ebuild b/dev-python/httpauth/httpauth-0.3.ebuild
deleted file mode 100644
index 33ae4b41dcad..000000000000
--- a/dev-python/httpauth/httpauth-0.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI middleware that secures routes using HTTP Digest Authentication"
-HOMEPAGE="https://github.com/jonashaag/httpauth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests nose
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index c5d58cdb787e..6cd5fe3a9175 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,2 +1,3 @@
 DIST imageio-2.16.0.gh.tar.gz 360333 BLAKE2B fbfea25b9a6dfb945bcaced141649bcc3a7c578115fe2be3151d7a90bab6a51fc20e4806085a2afc934b7ec9de95b5df9fedba9af9722242dac44e2f86009e2b SHA512 18f6e3f0b5c09ac546640ef88a0fe6c157e20ecbaa2de5a2199eab6caac3ca9fd294cf66a2eea79b954271c27390816392af62a27d0e2e11817776efec3a0cd3
 DIST imageio-2.16.1.gh.tar.gz 361506 BLAKE2B df7df1cdf414fa762a37c509f2452f7ef20b811695b71acd391d6f565161ae4b5d1caa9dc2f9278ddb87ad518087ed2c729b93806cf1f01a7402e7a77af9383f SHA512 8cd5ce184f67be9cd5edbd5bf51f59c271a71e8fe68c22d284ddabe24cdec6bcf5e590c9c95664b0205509c133e9cd959d11605226a1d4d99f14e95c6d7527c3
+DIST imageio-2.16.2.gh.tar.gz 366758 BLAKE2B cf2f9f2649f3d5a44d5d8efee19406b38cbb8de6fbd079170fd8eb43f893151f68b256e5d3d1fbb766c7f0562783ca2237e6171785927c8ed69a14840f1acb02 SHA512 1a6e0c9ed58d91fc89810d36acc8f5355ec5f0cf8a7dcc099f3a71cd77bc9d5fcf2821a7bd5f67723be46395290c99e4f478949aa11134f11ff2068504c83c04
diff --git a/dev-python/imageio/imageio-2.16.2.ebuild b/dev-python/imageio/imageio-2.16.2.ebuild
new file mode 100644
index 000000000000..fd676564cc2c
--- /dev/null
+++ b/dev-python/imageio/imageio-2.16.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="https://imageio.github.io/"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# over 50% of tests rely on Internet
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+# requests for fsspec[github]
+BDEPEND="
+	test? (
+		dev-python/fsspec[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+)
+
+EPYTEST_IGNORE=(
+	# Needs unpackaged imageio_ffmpeg
+	tests/test_ffmpeg.py
+	tests/test_ffmpeg_info.py
+)
diff --git a/dev-python/jsonref/jsonref-0.1.ebuild b/dev-python/jsonref/jsonref-0.1.ebuild
deleted file mode 100644
index b25049bfab6d..000000000000
--- a/dev-python/jsonref/jsonref-0.1.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON Reference for Python"
-HOMEPAGE="https://github.com/gazpachoking/jsonref https://pypi.org/project/jsonref/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest tests.py
-}
diff --git a/dev-python/liblarch/liblarch-3.1.0.ebuild b/dev-python/liblarch/liblarch-3.1.0.ebuild
deleted file mode 100644
index 3098efe5ac9d..000000000000
--- a/dev-python/liblarch/liblarch-3.1.0.ebuild
+++ /dev/null
@@ -1,31 +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} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library to handle directed acyclic graphs"
-HOMEPAGE="https://wiki.gnome.org/Projects/liblarch"
-SRC_URI="https://github.com/getting-things-gnome/liblarch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	virtx nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/makefun/makefun-1.13.1.ebuild b/dev-python/makefun/makefun-1.13.1.ebuild
index a079b53cab5e..6646168c14e5 100644
--- a/dev-python/makefun/makefun-1.13.1.ebuild
+++ b/dev-python/makefun/makefun-1.13.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pexpect/pexpect-4.8.0-r3.ebuild b/dev-python/pexpect/pexpect-4.8.0-r3.ebuild
new file mode 100644
index 000000000000..d3d901296b9e
--- /dev/null
+++ b/dev-python/pexpect/pexpect-4.8.0-r3.ebuild
@@ -0,0 +1,50 @@
+# 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 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for spawning child apps and responding to expected patterns"
+HOMEPAGE="
+	https://pexpect.readthedocs.io/
+	https://pypi.org/project/pexpect/
+	https://github.com/pexpect/pexpect/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+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"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sphinx-3.patch
+	"${FILESDIR}"/${P}-fix-PS1.patch
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pmw/pmw-2.0.1-r3.ebuild b/dev-python/pmw/pmw-2.0.1-r3.ebuild
new file mode 100644
index 000000000000..41cf27e71458
--- /dev/null
+++ b/dev-python/pmw/pmw-2.0.1-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1 virtualx
+
+MY_PN="Pmw"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Toolkit for building high-level compound Python widgets using the Tkinter module"
+HOMEPAGE="http://pmw.sourceforge.net/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="py3"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc test"
+# https://sourceforge.net/p/pmw/bugs/39/
+RESTRICT="test"
+
+DEPEND="!dev-python/pmw:0"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	VIRTUALX_COMMAND="${PYTHON}"
+	cd "${BUILD_DIR}/lib/Pmw/Pmw_${PV//./_}/" || die
+	cp tests/{flagup.bmp,earthris.gif} . || die
+	for test in tests/*_test.py; do
+		echo "running test "$test
+		PYTHONPATH=tests:../../ virtx emake -j1 $test || die
+	done
+}
+
+python_install_all() {
+	local DIR="Pmw/Pmw_${PV//./_}"
+
+	use doc && HTML_DOCS=( "${DIR}"/doc/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyh2o/pyh2o-1.ebuild b/dev-python/pyh2o/pyh2o-1.ebuild
deleted file mode 100644
index 557f08eacb41..000000000000
--- a/dev-python/pyh2o/pyh2o-1.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for sci-libs/libh2o"
-HOMEPAGE="https://github.com/mgorny/pyh2o/"
-SRC_URI="
-	https://github.com/mgorny/pyh2o/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=sci-libs/libh2o-0.2.1:="
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pymad/pymad-0.10.ebuild b/dev-python/pymad/pymad-0.10.ebuild
deleted file mode 100644
index 73da1332f463..000000000000
--- a/dev-python/pymad/pymad-0.10.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for libmad MP3 decoding in python"
-HOMEPAGE="https://github.com/jaqx0r/pymad"
-SRC_URI="https://github.com/jaqx0r/${PN}/archive/version/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-version-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="media-libs/libmad"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild b/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild
deleted file mode 100644
index 74b38934df96..000000000000
--- a/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-MY_PN=pyPEG2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="An intrinsic PEG Parser-Interpreter for Python"
-HOMEPAGE="https://fdik.org/pyPEG/
-	https://pypi.org/project/pyPEG2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.15.1-test.patch )
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index 105ff77f9f34..f1d239e48ddf 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,3 +1 @@
-DIST python-lsp-server-1.3.3.tar.gz 62604 BLAKE2B 16f49013ccefc0dabcf58c6007c05828a930d0bc873805543fde79630bdc8bd020cb63d0d0ba56c181282a96c57c6084acde30dc2a8011d208040c2a93c3644b SHA512 94e9bf1e74799c395589451c02c1220bc79336e1c1cdc243e95e891f61c7977b2438d78da3db3da572022870e67305b8caca22241e0cfab23d3b546639c69aa7
-DIST python-lsp-server-1.4.0.tar.gz 75443 BLAKE2B 7522ff0d5c9a0c9300f288debc4f606168f968cad80e32d612a674803046c91dc777d9ee320cf844224f6da791b6d66413c643fc48799ef5f57c19bca4f09858 SHA512 9f53e288b9bdb22575b06ec8a89022f533a323457746ef8e2cb52c84f06ac48b3408b4ebfbf96754ce68cdc9ddf1a745365d5ea21ba188a4372064fc87c1e6f4
 DIST python-lsp-server-1.4.1.tar.gz 76416 BLAKE2B 65638b876182c478434c563371b802367fb8439820ccf57e4404dc1507f3cd514ae5d738d418386607db606025fe5126a533c656ec3fede53fdcfd364a4292cf SHA512 4c9171adc88d219c80055ebbc76566583925129969467c156277b52de9b5981b74b11b9961247045ea98cd9e51e146b2d606c8351a7be5db76f6f4e0e4d7195c
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.3.3.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.3.3.ebuild
deleted file mode 100644
index 3ef09fef6bc3..000000000000
--- a/dev-python/python-lsp-server/python-lsp-server-1.3.3.ebuild
+++ /dev/null
@@ -1,91 +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} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python Language Server for the Language Server Protocol"
-HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-IUSE="all-plugins"
-
-BDEPEND="
-	test? (
-		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
-		<dev-python/autopep8-1.7.0[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
-		<dev-python/flake8-4.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-		<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	all-plugins? (
-		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
-		<dev-python/autopep8-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
-		<dev-python/flake8-4.1.0[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-		<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '0,/addopts/I!d' setup.cfg || die
-
-	# This fails with py3.10, but it is not important. Instead of
-	# 'invalid syntax' we now get 'syntax-error'
-	sed -i -e 's/test_syntax_error_pylint_py3/_&/' \
-		test/plugins/test_pylint_lint.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.4.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.4.0.ebuild
deleted file mode 100644
index 28e1d4f9ebcd..000000000000
--- a/dev-python/python-lsp-server/python-lsp-server-1.4.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python Language Server for the Language Server Protocol"
-HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="all-plugins"
-
-BDEPEND="
-	test? (
-		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
-		<dev-python/autopep8-1.7.0[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
-		<dev-python/flake8-4.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-		<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	all-plugins? (
-		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
-		<dev-python/autopep8-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
-		<dev-python/flake8-4.1.0[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-		<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '0,/addopts/I!d' setup.cfg || die
-
-	# This fails with py3.10, but it is not important. Instead of
-	# 'invalid syntax' we now get 'syntax-error'
-	sed -i -e 's/test_syntax_error_pylint_py3/_&/' \
-		test/plugins/test_pylint_lint.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "Automatically format Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.4.1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.4.1.ebuild
index bc7af4bb84d1..85de148de000 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.4.1.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 IUSE="all-plugins"
 
diff --git a/dev-python/rcssmin/Manifest b/dev-python/rcssmin/Manifest
index a3be10438c19..04449ed574f8 100644
--- a/dev-python/rcssmin/Manifest
+++ b/dev-python/rcssmin/Manifest
@@ -1,2 +1 @@
-DIST rcssmin-1.0.6.tar.gz 582894 BLAKE2B 64fcd9bd9ea96037acfcbb0edf5ddba45f0804cb1862fb60dffaa5b60a0ee2a0927fc237fd04cbf9be438a9468b54dfccb56729a6d191ee323d9ccb819857dbc SHA512 5129a6007755a5b1949256bba7ad3616a08034d7bfcf06a1f9d8143897dddc5d2f6b8a0ebde7abb2e8b12e5b1aee2e46260e59101a78f35026e15f9f6503db77
 DIST rcssmin-1.1.0.tar.gz 580779 BLAKE2B 162ec087b791a4ee0c23994cea431e01f76c199c1d2118a75c9e49ebfc0d4f46fc4088126032851446acf2bd7b76b8f17095896100338636f4df8de75612f55d SHA512 9dc7fac0fef73c389baf8fc132e58599471517a2b77b13fe6bfabd30246b46bf859f7307ff1606d6634bdcdc472bdde0882fe7282018a34fba7b8fc80f6e9279
diff --git a/dev-python/rcssmin/rcssmin-1.0.6.ebuild b/dev-python/rcssmin/rcssmin-1.0.6.ebuild
deleted file mode 100644
index 9eda2309f9cd..000000000000
--- a/dev-python/rcssmin/rcssmin-1.0.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="CSS minifier written in python"
-HOMEPAGE="http://opensource.perlig.de/rcssmin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
-}
-
-python_test() {
-	"${EPYTHON}" run_tests.py tests || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/rcssmin/rcssmin-1.1.0.ebuild b/dev-python/rcssmin/rcssmin-1.1.0.ebuild
deleted file mode 100644
index 375022dea123..000000000000
--- a/dev-python/rcssmin/rcssmin-1.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="CSS minifier written in python"
-HOMEPAGE="http://opensource.perlig.de/rcssmin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUP_CEXT_REQUIRED=1
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
-}
diff --git a/dev-python/sarge/Manifest b/dev-python/sarge/Manifest
index c6e4124e66c9..0c3af5a7d48b 100644
--- a/dev-python/sarge/Manifest
+++ b/dev-python/sarge/Manifest
@@ -1,2 +1 @@
-DIST sarge-0.1.6.bb.tar.gz 55320 BLAKE2B 2a641f43ea57ee3b22668dedcfa15fa5e07e8b8d8630e3764739254fb109d61eaedfe8e6e059c43bd22760d822a8cf251616108a6662e9daa2e79a0e35443cb4 SHA512 8cf77141f516297cfc029b6255618f497ab94453214e61ef280dd571019a40f461d81ab9bb793b08de2dae89832e50aaf687205814b22c305e03883b9dc3bfea
 DIST sarge-0.1.7.gh.tar.gz 57029 BLAKE2B 4cba823073b6699d9a3152b55de63b8ea9ba7cafa0f50556d6c2115a863fd3cae44a9d8fc9e6bf14727aa312c90f69dd03ebcb73508c5a2cdb0d1f6ff190435f SHA512 f2017fdab137e1aebfcd60a125ea7ff057158c6bf6a277d3084db73ed62a07cfd3464deba883284980c9f6ea3f56810effb551e8e8523ab750a086895ad0297a
diff --git a/dev-python/sarge/sarge-0.1.6.ebuild b/dev-python/sarge/sarge-0.1.6.ebuild
deleted file mode 100644
index fc265659a372..000000000000
--- a/dev-python/sarge/sarge-0.1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-COMMIT="81dc3347651b"
-
-DESCRIPTION="wrapper for subprocess which provides command pipeline functionality"
-HOMEPAGE="https://sarge.readthedocs.org/"
-SRC_URI="
-	https://bitbucket.org/vinay.sajip/sarge/get/${PV}.tar.gz
-		-> ${P}.bb.tar.gz
-"
-S="${WORKDIR}/vinay.sajip-${PN}-${COMMIT}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-python_test() {
-	"${EPYTHON}" test_sarge.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/sarge/sarge-0.1.7.ebuild b/dev-python/sarge/sarge-0.1.7.ebuild
deleted file mode 100644
index 513636229edd..000000000000
--- a/dev-python/sarge/sarge-0.1.7.ebuild
+++ /dev/null
@@ -1,27 +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} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="wrapper for subprocess which provides command pipeline functionality"
-HOMEPAGE="
-	https://docs.red-dove.com/sarge/
-	https://pypi.org/project/sarge/
-	https://github.com/vsajip/sarge/
-"
-SRC_URI="
-	https://github.com/vsajip/sarge/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-python_test() {
-	"${EPYTHON}" test_sarge.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 31a1e2d6d349..5f46d4fb7593 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -6,3 +6,4 @@ DIST setuptools-60.9.2.tar.gz 2425956 BLAKE2B 09baded7eef555ebd76db1672d69cd06cf
 DIST setuptools-61.3.0.gh.tar.gz 2643769 BLAKE2B 4ede87e7a597a6916dc089c311b0e4d098b08debbd1c4a9cb97078730e9cdc8dbcacd4236ca98a42e3cfafdf66d8f39bb64bc9135291335224b1c3b0bf79deff SHA512 35e2b848cf79e577b8c469562cb68a80b27d42d2d9c1c94f84fea9beb85e2db0796ed64d414add67a404d801c4f4e6cd489a72153de4dc8ed8b45fab24c28fd9
 DIST setuptools-61.3.1.tar.gz 2508220 BLAKE2B be59b7f666d8cc583b98b73d681eddf2d15e1437f05ddb534cb6e95bf458aed01a6e136ddc10bef2b2f66fe3f888187ece8262906079f1321f194e03a93fccca SHA512 463f2203416a298f65b66199fd62941ed32fc0914a4b6afff74b4abb8db37c063ab208a67383b5a7e6108a8c1ed0fda0fbb6b47d8fbc95c68b9e23e4ba152aec
 DIST setuptools-62.0.0.tar.gz 2512032 BLAKE2B 688afed5a19e70a0fd7ab91a8d137e6641597d9f9acf31826216cd59e4632872a9661fe9ca18e45aec5cd40e52956147aa8d40ac2c376380ffa0f01dc2997e63 SHA512 9017ab055c81063eaf741d45bd2479fcf85d15795bdcf0fa55522d194a69b5a912cbdba94e9eeaa6cf2a6cdaa5dda09604205d6e02d56e7c9fd3be4c1c79ba0a
+DIST setuptools-62.1.0.tar.gz 2512885 BLAKE2B a26a6bd5001922885b623bc7f1d42da90c59e6d9e195e9dd292ce2e73cd35a51f07fc714261c12db2fdf4510fa1137f57e7f3f649312f6a75035b9d927936a7c SHA512 41f39b5aa22e908c123e8e04c11e505e23cd3aaaae72793e106015dc14b1a44ff3b17aa15ca3da34f34a4becc887ceea7f41932650e38d409f95d7227707d2e1
diff --git a/dev-python/setuptools/setuptools-62.1.0.ebuild b/dev-python/setuptools/setuptools-62.1.0.ebuild
new file mode 100644
index 000000000000..652419418881
--- /dev/null
+++ b/dev-python/setuptools/setuptools-62.1.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.4"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~m68k ~s390 ~x86 ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	dev-python/nspektr[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.10.1-r1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/tomli[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	# apply distutils patches to the bundled distutils
+	pushd setuptools/_distutils >/dev/null || die
+	# TODO: distutils C++ patch?
+	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
+	popd >/dev/null || die
+
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		# unhappy with pytest-xdist?
+		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_test.py::test_tests_are_run_once
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		# expects bundled deps in virtualenv
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
+}
diff --git a/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild b/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
deleted file mode 100644
index 68d1cb3cf0bc..000000000000
--- a/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
+++ /dev/null
@@ -1,19 +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} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="a simple S-expression parser/serializer"
-HOMEPAGE="https://github.com/jd-boyd/sexpdata"
-SRC_URI="https://github.com/jd-boyd/sexpdata/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-distutils_enable_tests nose
diff --git a/dev-python/signature_dispatch/signature_dispatch-1.0.0.ebuild b/dev-python/signature_dispatch/signature_dispatch-1.0.0.ebuild
deleted file mode 100644
index 5d89eb1e7e7f..000000000000
--- a/dev-python/signature_dispatch/signature_dispatch-1.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Execute the first function that matches the given arguments"
-HOMEPAGE="
-	https://github.com/kalekundert/signature_dispatch/
-	https://pypi.org/project/signature-dispatch/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-RDEPEND="
-	dev-python/typeguard[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.2.ebuild b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.2.ebuild
index 3373945c86b7..bc740e6d7c95 100644
--- a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.2.ebuild
+++ b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.2.ebuild
@@ -22,6 +22,11 @@ RDEPEND="
 	dev-python/pybtex-docutils[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? (
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx doc
diff --git a/dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild b/dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild
deleted file mode 100644
index 315bb46ce747..000000000000
--- a/dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet Another SWF Parser"
-HOMEPAGE="https://github.com/facundobatista/yaswfp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"