Adding metadata

43 files changed, 352 insertions, 511 deletions

diff --git a/dev-python/aiohttp/aiohttp-3.8.0.ebuild b/dev-python/aiohttp/aiohttp-3.8.0.ebuild
index bb087d58322a..dde9ebc0a6bb 100644
--- a/dev-python/aiohttp/aiohttp-3.8.0.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
 
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/aiosignal/aiosignal-1.2.0.ebuild b/dev-python/aiosignal/aiosignal-1.2.0.ebuild
index 491f29b53d03..42be5c6615f9 100644
--- a/dev-python/aiosignal/aiosignal-1.2.0.ebuild
+++ b/dev-python/aiosignal/aiosignal-1.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/frozenlist-1.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 2a4ec1b8f08c..697283481f4f 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,3 +1,4 @@
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
 DIST async-timeout-4.0.0.tar.gz 8258 BLAKE2B 7a3edee9491aba11e59ef6bf7c07b9e3f00e97bf42e69adac92a23d89715e2c90dbf9e431c146c20e44b05ed47905cfd5afa41fd04df63315d9f347a6b8f70f1 SHA512 92716106b42ad3746c9873649b44d414da08f75cd507a0dc45d764270bcbd6f483c149e5cebe1a4c36f5cd02397c21b67b92a0475117d9dea17c580e422cf4da
 DIST async-timeout-4.0.0a3.tar.gz 11386 BLAKE2B 8918878c4edd64c70d831ddd05e3235c3c7cc116a99755205b7624df52cacfb61bf4e80083c85d93e420fbf18e7da16ee3ebc796c5a4890e2801885b670a494a SHA512 04775ea30ffba90a4b604ef040df24a6a2711fd3e2c3b45d1ab87ae3487f216458f44bbfb2c85498bef286acca90af43d8b3b95cf22244027c0a48494ef84e7a
+DIST async-timeout-4.0.1.tar.gz 8030 BLAKE2B 73bb3f38d33608d120a0d633231bc781b9b5530d80a08c98370ab9100486bda5fd9d7a68ae6b16315bf306a75690897d724fa5db318847803bc445074908e650 SHA512 24a72daf9e0737d0be351a35ff28242dea735bed33f06d9865a71983b1341693c80856c0668d6a485bccc8cf7b9adde33fa904e94bf4730e4a678216e572d119
diff --git a/dev-python/async_timeout/async_timeout-4.0.1.ebuild b/dev-python/async_timeout/async_timeout-4.0.1.ebuild
new file mode 100644
index 000000000000..98c42e5d0e84
--- /dev/null
+++ b/dev-python/async_timeout/async_timeout-4.0.1.ebuild
@@ -0,0 +1,38 @@
+# 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_P=${PN/_/-}-${PV}
+DESCRIPTION="Timeout context manager for asyncio programs"
+HOMEPAGE="https://github.com/aio-libs/async-timeout"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/typing-extensions[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pointless dep on pytest-cov
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest -p no:aiohttp
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 23aa75705e0c..5ace757ace12 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,3 +5,4 @@ DIST boto3-1.19.12.tar.gz 436654 BLAKE2B f92e756bc9f98105e3126e41cf0d6fab948bbd7
 DIST boto3-1.19.5.tar.gz 433567 BLAKE2B 52c12a4dd18d6f02326f8002b345cc5df224455fc862daa700326ae1df258979211d2753f01e1a106f237de393e483dc8926bb4ef0e08bafa575f20811dccd55 SHA512 fad05102f0c3e7e30a3342009f6b3ae28f52758f17a0c22b4da9a03dd10d7f9149ea2ec0119f55ec7280824bd8173653271821e82fcd54ef9fb9161b2d62df70
 DIST boto3-1.20.1.tar.gz 437338 BLAKE2B b2d952263919404518ada651777fd8cbe501b46fe060c4e4c657e2a01801e8f4b0285864cef880cc7ffeb83a84709f1bc91de26d70378a7ab01e681cc8098857 SHA512 0536a90cefbe739941d1eb5e2cb667de144648a8ba4329b49475fc15855c495fdbb0bf73d0c5de57adfb58f86e01e19ff4ce876eabf185a1f5a93499dafa6d49
 DIST boto3-1.20.2.tar.gz 437582 BLAKE2B 7fed58f44e7a6eb4f5aa3f8cf4d1f6e67d818debe55d2ea609f2b1419aafa0f2d9cd15aba48f7d238943bbe5d4b3f5285de731f36df3b8d3276fbd1d411f7374 SHA512 25c5b4f8cc154a408d2d07a88af9e6cad6c1e0ec3544ceb7d8191d8204e5fe45dbfc27796f0b3c2d2a15d86d3f586c53a104575f8ed1eb0ed8a3772723d66e20
+DIST boto3-1.20.3.tar.gz 437920 BLAKE2B e4d6a0ca39bef3212a8eeaccfb79f1a299b7c39794a5ca63dddb0110f47ecf8066f2755bd7a5e016b011b31c2ab6d01f0e2096dde318c1919aba870e9cf0a248 SHA512 b04b46e75482ce8e52295be5c78397acedcb3558716199fcf3a66488f5b0ffb4a6c41818733f0a706d2f2da8f05adcb5a083420ceac490ee36d965246a5fb490
diff --git a/dev-python/boto3/boto3-1.20.3.ebuild b/dev-python/boto3/boto3-1.20.3.ebuild
new file mode 100644
index 000000000000..ace657bcbe4d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.3.ebuild
@@ -0,0 +1,59 @@
+# 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="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index b9e8e6f18044..125672b15358 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,3 +5,4 @@ DIST botocore-1.22.12.tar.gz 8343683 BLAKE2B df7b2c86f226df14dc8181e8506acc7dd66
 DIST botocore-1.22.5.tar.gz 8301083 BLAKE2B 91f9d38e7c5bcb0b8f58c04547ad45489f58d2240c6b7301cf632969a4a73cf4a1d51c8c68c8def27653c10041d2163ad7ca800dcf6fd07972b506bf2566cae3 SHA512 710a9eeee03dc79ca4ffacc4974f09ca769e1e3b8cb143f6f0349240dd8c2af8ee526a1dadb7310a26019363f683fc4149cb4c73d8b94a856a384fab7f84fb5c
 DIST botocore-1.23.1.tar.gz 8353252 BLAKE2B e29dc3a2112c24f244d25336964605ba14a07f9db3f0462db911f9a1009846dc3601ae27bad05e8e58161e911a20ecbaf1f280bd61204a7392906f0553dcec64 SHA512 6938f54a98474aa0bb3c73249f81bc68cb364d381af3f08ac698d66b9f03c2b3649a253bafb57a6f525757f459a8c3da775370f64984be4bca0f2d4310f7a367
 DIST botocore-1.23.2.tar.gz 8356426 BLAKE2B e8ab05b2adb4892460e681ac815461fd917005dc71baf7996b621855c69f5871e012441e3b788dc3d128e615607a711bc2705e65ed1eeefa9fd1b97d980a79af SHA512 a2a741ec5a58a3fce9002f719e03bc2e3cb86f85c84868167b38820e36b16d0a495b0c74b97479f6e0f976b9a0fedfe968f8d738217f61ba780a47a7a046ffb4
+DIST botocore-1.23.3.tar.gz 8367493 BLAKE2B 6e7c27dd69d1256b1d874b330537fb76dae348986ba5764f0568b1e1092b3bb1c069aedb3e6410562a8210a615ca4b1f792fe05d531a08c7c015c47f8ca5f053 SHA512 a7246fbe64df68f49755008de542cce4c166e2421f339cdeb5e45a9e66562bbf9e497b1fdb6014fceedd10db9d1d96d38c19bc77c5d68bec4259621ab0ed0429
diff --git a/dev-python/botocore/botocore-1.23.3.ebuild b/dev-python/botocore/botocore-1.23.3.ebuild
new file mode 100644
index 000000000000..43b65ed32e9b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.3.ebuild
@@ -0,0 +1,64 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 34d573ab1f28..72176d05f920 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,2 @@
-DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
-DIST coverage-5.5.tar.gz 691258 BLAKE2B 66bf340956b760d996ce424f977b407eb74062db56108e4910459dbcb7c271820ca655a648021763aede1c4d87c44524cea0cb34f969f203f630d48cf15b05b4 SHA512 fb78b4920a2f18afb9545a6f13910f491708443965881954fff6ee8553ab3d6bd898f7a95df1091435e8d5627ac850b880a6233e716a6acb934ecc195ec2ee52
 DIST coverage-6.0.2.tar.gz 722511 BLAKE2B 43a860610921fd0df106cbe26ba094e5a11bf1137a795a15bc22d82d0f813e8dc67bfe660757d325f15f719429b480ca625ebe66569489ed8c4c477bac23c393 SHA512 a43a312d4668846b6f72eebac1a289d0a603303cd32624c3308cce8934f693c7d3786b36da5cea3ff1cce60f93110a2ded168304e1ca9a79053f0886b7f1bf17
-DIST coverage-6.0.tar.gz 719495 BLAKE2B fa2768cc34f5c8e5e1b0bd328dda4b83bccae4bcb37b1e2ea8ff9a7fad973239a264f12cea7fae7ed129abe1a7aa86b43e2e32fcfd5c4de2077c8b32f405cd3a SHA512 b9a5dcb2aeb8517a9a52feadfd817727086d88682d9d93d65d9f4d7b6116d8eca1ecceaccc98ff34ca2fb1c2d4dc457d0d58d387465e67970ae4df0f4c9f7ca5
 DIST coverage-6.1.1.tar.gz 715305 BLAKE2B fbd7c8e7e1737bc8be8acf0f10c66fa333a027520b5f54869080ea9e31951230442d0d7f5a5ec11201b7ca3ba65ee92c906a373c18123920abe0d3dee5a8e040 SHA512 c029ab4e0d16e4b0a395e63e96d7a8f24bdb3a46a97fbc223d59dafaa52b8522e924a13d88777f862d69e1f30d015b00e0740530e719b6a94065d285cd3dd03a
diff --git a/dev-python/coverage/coverage-4.5.4.ebuild b/dev-python/coverage/coverage-4.5.4.ebuild
deleted file mode 100644
index a8440e9dedaf..000000000000
--- a/dev-python/coverage/coverage-4.5.4.ebuild
+++ /dev/null
@@ -1,28 +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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-RESTRICT="test"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-
-	distutils-r1_python_compile
-}
diff --git a/dev-python/coverage/coverage-5.5.ebuild b/dev-python/coverage/coverage-5.5.ebuild
deleted file mode 100644
index 272040510444..000000000000
--- a/dev-python/coverage/coverage-5.5.ebuild
+++ /dev/null
@@ -1,59 +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} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-#IUSE="test"
-# The tests are impossible to appease.  Please run them externally
-# via tox.  Or fix the ebuild if you have hours of time to spend
-# on something utterly useless.
-RESTRICT="test"
-
-#BDEPEND="
-#	test? (
-#		dev-python/PyContracts[${PYTHON_USEDEP}]
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/hypothesis[${PYTHON_USEDEP}]
-#		dev-python/mock[${PYTHON_USEDEP}]
-#		dev-python/pytest[${PYTHON_USEDEP}]
-#		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-#	)
-#"
-
-src_prepare() {
-	# avoid the dep on xdist, run tests verbosely
-	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	pushd tests/eggsrc >/dev/null || die
-	distutils_install_for_testing
-	popd >/dev/null || die
-
-	"${EPYTHON}" igor.py zip_mods || die
-	"${EPYTHON}" igor.py test_with_tracer py || die
-
-	# No C extensions under pypy
-	if [[ ${EPYTHON} != pypy* ]]; then
-		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
-		"${EPYTHON}" igor.py test_with_tracer c || die
-	fi
-
-	# clean up leftover "egg1" directory
-	rm -rf build/lib/egg1 || die
-}
diff --git a/dev-python/coverage/coverage-6.0.ebuild b/dev-python/coverage/coverage-6.0.ebuild
deleted file mode 100644
index c1298e4bb251..000000000000
--- a/dev-python/coverage/coverage-6.0.ebuild
+++ /dev/null
@@ -1,58 +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} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-#IUSE="test"
-# The tests are impossible to appease.  Please run them externally
-# via tox.  Or fix the ebuild if you have hours of time to spend
-# on something utterly useless.
-RESTRICT="test"
-
-#BDEPEND="
-#	test? (
-#		dev-python/PyContracts[${PYTHON_USEDEP}]
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/hypothesis[${PYTHON_USEDEP}]
-#		dev-python/mock[${PYTHON_USEDEP}]
-#		dev-python/pytest[${PYTHON_USEDEP}]
-#		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-#	)
-#"
-
-src_prepare() {
-	# avoid the dep on xdist, run tests verbosely
-	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	pushd tests/eggsrc >/dev/null || die
-	distutils_install_for_testing
-	popd >/dev/null || die
-
-	"${EPYTHON}" igor.py zip_mods || die
-	"${EPYTHON}" igor.py test_with_tracer py || die
-
-	# No C extensions under pypy
-	if [[ ${EPYTHON} != pypy* ]]; then
-		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
-		"${EPYTHON}" igor.py test_with_tracer c || die
-	fi
-
-	# clean up leftover "egg1" directory
-	rm -rf build/lib/egg1 || die
-}
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index 200202a96a52..564673c85769 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,2 +1 @@
-DIST dbus-python-1.2.16.tar.gz 576701 BLAKE2B 58d9f9ea092cd3a6b872c084a6159baf03f1aab615282e161a0e3da1d01ff5f4940862e693d21907b0c146d285b9067386759a1306ae2e6907f5e2ff4ef9944d SHA512 e76c00c5fd3fe6884e4c24f258987fd3b80d21bd4e0f96aa8fda152078a860b62321324f6efcbfe7226d5ab2521a14b5bda7cf2468d2cae5f376c124a71aa05c
 DIST dbus-python-1.2.18.tar.gz 578204 BLAKE2B 932a06f4b0145f7a47cf1ab6ea33c14eb4e36570ef548e7557d4aa5b780e49f2d284cdb51f0ec2d8a1cb286097fb9eabb2193d7cbeb387eaf43cbe209b7f11fa SHA512 72f422c59637392bd78b741b66dff2afadcc706452c3e82fdc14b1dc052a0c5cb8a85e2758d18c5cbdc08004419a0b3c16b67b99688d96307084403e72585900
diff --git a/dev-python/dbus-python/dbus-python-1.2.16-r1.ebuild b/dev-python/dbus-python/dbus-python-1.2.16-r1.ebuild
deleted file mode 100644
index 45f460488873..000000000000
--- a/dev-python/dbus-python/dbus-python-1.2.16-r1.ebuild
+++ /dev/null
@@ -1,87 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit autotools python-r1
-
-DESCRIPTION="Python bindings for the D-Bus messagebus"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings/ https://dbus.freedesktop.org/doc/dbus-python/"
-SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-IUSE="doc examples test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	>=sys-apps/dbus-1.8:=
-	>=dev-libs/glib-2.40
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( $(python_gen_any_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		') )
-	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/tappy[${PYTHON_USEDEP}] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-py39.patch" )
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-	has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	# Update py-compile, bug 529502.
-	eautoreconf
-	python_copy_sources
-}
-
-src_configure() {
-	use doc && python_setup
-	local SPHINX_IMPL=${EPYTHON}
-
-	configuring() {
-		local myconf=(
-			--disable-documentation
-
-			# Work around broken AX_PYTHON_DEVEL macro.
-			# https://bugs.gentoo.org/815136
-			PYTHON_EXTRA_LIBS=' '
-		)
-		[[ ${EPYTHON} == ${SPHINX_IMPL} ]] &&
-			myconf+=( --enable-documentation )
-
-		econf "${myconf[@]}"
-	}
-	python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir default
-	find "${D}" -name '*.la' -type f -delete || die
-
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 3113b1ce0e6a..ef633a894f23 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,4 +1,3 @@
 DIST fonttools-4.26.2.tar.gz 2579391 BLAKE2B 35a2533a336498aa1d5b9c2a61c1de6af03e6a7a1932a1ad71522f7f73e52590c347fe3e7d60b93b013389023792e6e6b91d6b4bfb92e007062dc2ac494adbb6 SHA512 2caa52a48574e6bdf418fe57fb4ca69686eeae65cb1f44c0cb16c64400ea666530dfcca9e8a619859cf553435f93b38f63e422c315206ecec467eed6339a5987
-DIST fonttools-4.27.1.tar.gz 2645747 BLAKE2B aea6b8c13f29f460945f2d075176960f0f994fc262af06b493d2c34a0e4e6d37263f642e6ebb44b4a7c082bdcd7d4f1fa88e40e82760cf8a9b90cab8735f005a SHA512 76371a1244cb1c681b90f31ce67de3aff5e732477aea02c046a45a838ed49f097707edd359c7427e2643b357c12f6516d667d6b1a61e942a8e3b57eae1d6df70
 DIST fonttools-4.28.0.tar.gz 2654535 BLAKE2B 2bdde1a5c9184574e220bf3fa5dea04ae0e4ab8bb85bb8893e38e96cd028dc6cdcb88b21a9d12429292fe9cb282a90ce7b3abf4f17dea95df52165f5f4d0da0c SHA512 6fddef1d065001afd63147fc474c49f7799895aafddb37b3c94e981fa86e829b39865a40c61e3bf1e64f64a40cf4d5ae02fa98fcf7c89d3f893a2588d213427d
 DIST fonttools-4.28.1.tar.gz 2654329 BLAKE2B 4d1f2f5caea6ee3ae73a7791ad34da0c49353ef8b8f834c29e990c3c937b05bfdbf32474a4279c9f32f9fce78b4935ba9ba8434576b318b70736c1e14763eb70 SHA512 abcc8b182436feae8e1cfe263488c87f2351079d25a2211529ccf3401a9533f5322a7028d20ba0e31405ec3acad369b46d3b07bf8b4dfe16e43f48859fc5a29f
diff --git a/dev-python/fonttools/fonttools-4.27.1.ebuild b/dev-python/fonttools/fonttools-4.27.1.ebuild
deleted file mode 100644
index 8379447d97e2..000000000000
--- a/dev-python/fonttools/fonttools-4.27.1.ebuild
+++ /dev/null
@@ -1,54 +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} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	DISTUTILS_ARGS=( --with-cython )
-}
-
-python_test() {
-	distutils_install_for_testing
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx epytest Tests fontTools
-}
diff --git a/dev-python/frozenlist/frozenlist-1.2.0.ebuild b/dev-python/frozenlist/frozenlist-1.2.0.ebuild
index 2c3dd6474b9c..bd7c74073c9a 100644
--- a/dev-python/frozenlist/frozenlist-1.2.0.ebuild
+++ b/dev-python/frozenlist/frozenlist-1.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
 
 BDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index a7fc77d26f6c..ab5507fc0bd0 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,2 +1 @@
-DIST multidict-5.1.0.tar.gz 58801 BLAKE2B 9b9194447a7d91d673b07e440d5f1d2068c79b15890c63a5ab679016b02471996adc73173bb303c14609b2aec230d8ebda36ab978b22b67c008f6b03e6f663f2 SHA512 7dfc8862048d274f37341dda72d93c0fab6d5463fade4f5e241f5b8bf65dcea5c0b5120376847a77f00c7246e87a1cfe14502b6f64bf97e4d00594fed6735466
 DIST multidict-5.2.0.tar.gz 56984 BLAKE2B 3580e3f53b3ec581d338676647f2e8dd78387fdad5730fe703c02b3cd4182d69e3b6896d71bd969413dd27974e07272cc541701a2145a517d9bacea45000e9c8 SHA512 508b6db9219c3dae76da5e89a398f4541beff2a875030c2f11da9aaa1e001324d069d7a291148c510fe555cb3a33288ef297c9baa863e42d3d09d60588bebd7e
diff --git a/dev-python/multidict/multidict-5.1.0.ebuild b/dev-python/multidict/multidict-5.1.0.ebuild
deleted file mode 100644
index e66dc7dc8597..000000000000
--- a/dev-python/multidict/multidict-5.1.0.ebuild
+++ /dev/null
@@ -1,28 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND=">=dev-python/cython-0.28.4[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs --no-autodoc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't enable coverage or other pytest settings
-	sed -i -e 's:--cov.*::' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/onkyo-eiscp/Manifest b/dev-python/onkyo-eiscp/Manifest
deleted file mode 100644
index 0b294611294c..000000000000
--- a/dev-python/onkyo-eiscp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST onkyo-eiscp-1.2.7.tar.gz 48290 BLAKE2B c583b2af2619b6dc070c431a91d77ce507d3bf91f87a5ee181b82333ef597fd45d122c85f3fa4dfe5454b5059c89888744beb0a44a916f8e8cba64fd94b6cda1 SHA512 0fe8f23762d49b3b2c45ef24b94345d9a342cf04b2fa55538abf4ea21a6039011c0ade945f7432555ec948811ab521bb6a611909e19163e0e0c806bf87604635
diff --git a/dev-python/onkyo-eiscp/files/onkyo-eiscp-1.2.4-exclude-tests.patch b/dev-python/onkyo-eiscp/files/onkyo-eiscp-1.2.4-exclude-tests.patch
deleted file mode 100644
index 03baf2d475b3..000000000000
--- a/dev-python/onkyo-eiscp/files/onkyo-eiscp-1.2.4-exclude-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- onkyo-eiscp-1.2.4/setup.py
-+++ onkyo-eiscp-1.2.4/setup.py
-@@ -19,7 +19,7 @@
-     author_email='michael@elsdoerfer.com',
-     description='Control Onkyo receivers over ethernet.',
-     long_description=long_description,
--    packages = find_packages(),
-+    packages = find_packages(exclude=["tests"]),
-     entry_points="""[console_scripts]\nonkyo = eiscp.script:run\n""",
-     install_requires=['docopt>=0.4.1', 'netifaces'],
-     platforms='any',
diff --git a/dev-python/onkyo-eiscp/metadata.xml b/dev-python/onkyo-eiscp/metadata.xml
deleted file mode 100644
index e1d8d49b9bcd..000000000000
--- a/dev-python/onkyo-eiscp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <upstream>
-  <remote-id type="pypi">onkyo-eiscp</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.7.ebuild b/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.7.ebuild
deleted file mode 100644
index d0ac8f3e80c2..000000000000
--- a/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 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="Control Onkyo A/V receivers over the network"
-HOMEPAGE="https://github.com/miracle2k/onkyo-eiscp https://pypi.org/project/onkyo-eiscp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/docopt-0.4.1[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.4-exclude-tests.patch )
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index 34683987cae4..6ee917959412 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1 +1,2 @@
 DIST pallets-sphinx-themes-2.0.1.tar.gz 20312 BLAKE2B 6fc745ffc5d344cd542f1b299ef5151144a13d1f75923398d42a6882d3c80aca4827123a3bd1f751dd771e882170c76f5bad99ad42d09dec2a9baf474d846365 SHA512 6e16ead8bb489336f8b8fe7e50d1e65acf950ab64c90ba1508ceb07bd598d8ddd5b960d9b31697867ddb7bffa970a08d7d53b778b5eec5e01b7c07babf2d5de6
+DIST pallets-sphinx-themes-2.0.2.tar.gz 20655 BLAKE2B a5e2d3a02a5996df6e648b8cf9943260d6e0e475108921493300c7d9437837cc66e83b489ad335596c39eac29f3a6e23b7b4abc3cf1fe3bbb018fd874b44aefd SHA512 a37b0f4fe38c098c0508988faa54ed8b2e1ad9ba41f95f862734cf38fd093e2b7c42d408fc10e529aca810f4cc37d16e6d707ed9affa433adfcb481006cd4577
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.2.ebuild
new file mode 100644
index 000000000000..0730a3b23546
--- /dev/null
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.2.ebuild
@@ -0,0 +1,20 @@
+# 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="Sphinx themes for Pallets and related projects"
+HOMEPAGE="https://github.com/pallets/pallets-sphinx-themes"
+SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/pipfile/Manifest b/dev-python/pipfile/Manifest
deleted file mode 100644
index dbc117c4b7da..000000000000
--- a/dev-python/pipfile/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pipfile-0.0.2.tar.gz 17395 BLAKE2B ac86dc6a725cfec0e3d23cd24ab9cdbaa5c803b15916e03e6d2a1e371eb137e25836e78b3393bf6ac42c6d98ebf85fd4ccf29f63b8ab9b87cdd4828b3499278e SHA512 070986a213d0d42c3f5391b303ee0c4a588269ad1889c79b6622c1a9817cfcec4365b8764dcd208aafd78394890d3367c7c9782e65dd3f04ea1bcce001f164f1
diff --git a/dev-python/pipfile/metadata.xml b/dev-python/pipfile/metadata.xml
deleted file mode 100644
index a82d58247c04..000000000000
--- a/dev-python/pipfile/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- <upstream>
-  <remote-id type="pypi">pipfile</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pipfile/pipfile-0.0.2.ebuild b/dev-python/pipfile/pipfile-0.0.2.ebuild
deleted file mode 100644
index 7c914fc3c192..000000000000
--- a/dev-python/pipfile/pipfile-0.0.2.ebuild
+++ /dev/null
@@ -1,27 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Replacement for the existing standard pip's requirements.txt file"
-HOMEPAGE="https://github.com/pypa/pipfile"
-SRC_URI="https://github.com/pypa/pipfile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# no tests in this release
-RESTRICT="test"
-
-# master has pytest tests
-distutils_enable_tests pytest
diff --git a/dev-python/ptvsd/Manifest b/dev-python/ptvsd/Manifest
deleted file mode 100644
index 93e2d6c7c15b..000000000000
--- a/dev-python/ptvsd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ptvsd-4.3.2.tar.gz 7399976 BLAKE2B bd697773fcb504316e827ab0a25c029c77183f9a9ac8295060046bb6af92dcd9f30cd0edcf78dc6fd4c28b7af84054d75143e2734e6f7f19fa93f242800d0c4b SHA512 5d4fc0e37ade9ae5a8d88348102d150f77c49ee5fac657083e094e9f4bec80c36dcc5cfc89649b9b088a6ac2a899071ded3571ebb1bc9bb46e92d4a14dd5d7e0
diff --git a/dev-python/ptvsd/metadata.xml b/dev-python/ptvsd/metadata.xml
deleted file mode 100644
index eead08d06e8a..000000000000
--- a/dev-python/ptvsd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <upstream>
-  <remote-id type="pypi">ptvsd</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/ptvsd/ptvsd-4.3.2.ebuild b/dev-python/ptvsd/ptvsd-4.3.2.ebuild
deleted file mode 100644
index 92a102f3e732..000000000000
--- a/dev-python/ptvsd/ptvsd-4.3.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 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=bdepend
-inherit distutils-r1
-
-DESCRIPTION="Visual Studio remote debugging server for Python"
-HOMEPAGE="https://pypi.org/project/ptvsd/ https://github.com/Microsoft/ptvsd/"
-SRC_URI="https://github.com/microsoft/ptvsd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index a6d12516bf66..e872810d30cf 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1 +1,2 @@
 DIST pydata-sphinx-theme-0.7.1.tar.gz 2632065 BLAKE2B 6289c61ba6634ba2b98263bf1319d36e9742a3c6dca811eec016b7172e0c780ef1e0ce1201ffd5bdce398a2a988a01dea56414ddb514ec63a424d11f63968f16 SHA512 b3ced8be8ed48d7efc51bd8334cf359f5f581e75990fca96ae87a3cc51cfa61f9aedd610124f5a92227ddd2d7a55810ef4a6857726582c38b2251130b4cdb674
+DIST pydata-sphinx-theme-0.7.2.tar.gz 2632129 BLAKE2B 2beb9fac60b5f6c863ee4c570b88c4331135d2c8a10d84599f97944002576424caae06d062104a58c7f329f85e046eaa820d03a4117396009084707d563608d7 SHA512 2f6cac080807eab04f1c4de2fdd1563de17f1214f79c094f69b5ff116bcc47f1b0e159d6c87412c8cbe7691b19eebb3b228ca8243d05c81bba94d0aacbdb3e5e
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.7.2.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.7.2.ebuild
new file mode 100644
index 000000000000..1870c266a069
--- /dev/null
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.7.2.ebuild
@@ -0,0 +1,30 @@
+# 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="Bootstrap-based Sphinx theme from the PyData community"
+HOMEPAGE="https://github.com/pydata/pydata-sphinx-theme"
+SRC_URI="https://github.com/pydata/pydata-sphinx-theme/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+"
+
+# TODO: fix this: Sandbox violation to /usr/local/share
+#distutils_enable_sphinx docs dev-python/commonmark dev-python/recommonmark dev-python/numpydoc dev-python/jupyter-sphinx dev-python/plotly dev-python/xarray
+distutils_enable_tests pytest
diff --git a/dev-python/pydevd/pydevd-2.7.0.ebuild b/dev-python/pydevd/pydevd-2.7.0.ebuild
index 9e86f5cb98c1..342c00df649e 100644
--- a/dev-python/pydevd/pydevd-2.7.0.ebuild
+++ b/dev-python/pydevd/pydevd-2.7.0.ebuild
@@ -74,7 +74,7 @@ src_compile() {
 	pushd pydevd_attach_to_process/linux_and_mac || die
 	# recompile removed file (extracted from compile_linux.sh)
 	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CPPFLAGS} -o "attach_linux_${ARCH}.so" \
-		${LDFLAGS} -ldl -nostartfiles attach.cpp || die
+		${LDFLAGS} -nostartfiles attach.cpp -ldl || die
 	mv "attach_linux_${ARCH}.so" ../ || die
 	popd || die
 	python_foreach_impl distutils-r1_python_compile
diff --git a/dev-python/python-ceilometerclient/Manifest b/dev-python/python-ceilometerclient/Manifest
deleted file mode 100644
index fdf59a4db633..000000000000
--- a/dev-python/python-ceilometerclient/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-ceilometerclient-2.9.0.tar.gz 95460 BLAKE2B c78320609944d69c74db038b4cb8dfff8ab065ae01fb05afc79715c4694ce872506d156cff3e0e8762e9b4231d1325558dd2340a04768a74f09e1fdb0b153d68 SHA512 ca03ce55fe628503bf7c5c187fb7a697962443708c0c3753ebe19ed9c20633ff3df57dd92f498f252a158e23312dc51fa694a46be46b23ff7430447d5afeb85f
diff --git a/dev-python/python-ceilometerclient/metadata.xml b/dev-python/python-ceilometerclient/metadata.xml
deleted file mode 100644
index b3e73b253826..000000000000
--- a/dev-python/python-ceilometerclient/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>prometheanfire@gentoo.org</email>
-  <name>Matthew Thode</name>
- </maintainer>
- <maintainer type="project">
-  <email>openstack@gentoo.org</email>
-  <name>Openstack</name>
- </maintainer>
- <longdescription lang="en">
-		This is a client library for Ceilometer built on the Ceilometer API. It
-		provides a Python API (the ceilometerclient module) and a command-line tool (ceilometer).
-	</longdescription>
- <upstream>
-  <remote-id type="pypi">python-ceilometerclient</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/python-ceilometerclient/python-ceilometerclient-2.9.0.ebuild b/dev-python/python-ceilometerclient/python-ceilometerclient-2.9.0.ebuild
deleted file mode 100644
index 3c602084ec50..000000000000
--- a/dev-python/python-ceilometerclient/python-ceilometerclient-2.9.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 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="This is a client library for Ceilometer built on the Ceilometer API"
-HOMEPAGE="https://github.com/openstack/python-ceilometerclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.1.0
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.17.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 9a7327f0a0e5..7d9f035754b0 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,2 +1,3 @@
 DIST Sphinx-3.5.4.tar.gz 5911093 BLAKE2B 8740714dfaf3733bf57d0b277315b4e7b5cad86247ea30dcbc4f5dadf5f5169329050b7be43ec8625c47df9dcc19afcc6c4d782725c7007f8178b7eb7be7dc05 SHA512 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125
 DIST Sphinx-4.2.0.tar.gz 6503692 BLAKE2B a3cc73c215be6859f285b92d651f2fe60f731340e7c003d3b275247593d1e641a25618817f67e7f3d8767724d6e98a6d63493bea340c7171e4e3da384da776e2 SHA512 6c6a2424362805b758c43136a9293dcfb02d45af6e6dc2dd7ed9382f6ae04ecfbd416efeecb42219b67d026a4a0b007500e87b20d81847ab48e2ccfcdca52e75
+DIST Sphinx-4.3.0.tar.gz 6657624 BLAKE2B 6bd2b2a1b1d84e8da07676cd820c7db793e60649c6d2336f5fe0347e1ffaf1cfeb2e376f480f2f83f1745c1bd7325b482d312ae4446735052defcfa0e74ad09d SHA512 ba3463135dc578024819d9c70b3707d4465c4a71aa305474f7b34b14e276ee491e029bb8bc93c05ed1463a6bc63a82e0507c16ede7046fd1216e31553027e449
diff --git a/dev-python/sphinx/sphinx-4.3.0.ebuild b/dev-python/sphinx/sphinx-4.3.0.ebuild
new file mode 100644
index 000000000000..513870e4836d
--- /dev/null
+++ b/dev-python/sphinx/sphinx-4.3.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+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 ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.18[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	# remove unnecessary upper bounds
+	sed -e '/Jinja2/s:,<3.0::' \
+		-e '/MarkupSafe/s:<2.0::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local deselect=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/utidylib/utidylib-0.6-r2.ebuild b/dev-python/utidylib/utidylib-0.6-r2.ebuild
index acd617caa53d..926dcead562f 100644
--- a/dev-python/utidylib/utidylib-0.6-r2.ebuild
+++ b/dev-python/utidylib/utidylib-0.6-r2.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
 RDEPEND="
-	|| ( app-text/tidy-html5 >=app-text/htmltidy-5.0.0 )
+	>=app-text/htmltidy-5.0.0
 "
 
 RESTRICT="!test? ( test )"
diff --git a/dev-python/utidylib/utidylib-0.7-r2.ebuild b/dev-python/utidylib/utidylib-0.7-r2.ebuild
index 8a43bd1cf447..d0820ccb2839 100644
--- a/dev-python/utidylib/utidylib-0.7-r2.ebuild
+++ b/dev-python/utidylib/utidylib-0.7-r2.ebuild
@@ -16,7 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~riscv x86"
 
-RDEPEND="|| ( app-text/tidy-html5 >=app-text/htmltidy-5.0.0 )"
+RDEPEND=">=app-text/htmltidy-5.0.0"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index f584c0016811..91be8a8bfa8f 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,3 +1,2 @@
 DIST wrapt-1.12.1.tar.gz 126750 BLAKE2B 92aba2d400aa626445be68fdda2831132e1c341a2f20065b3d7071a2ebc174cb9de7e6a20a8375360cf7df181881fd20b7b2f70dbfdf533e8823982eeaa722f5 SHA512 33e964cb3aa2437bc7d084a98f622f7c5c8c719d97806796ae0317d35130bdb2679a9dd87be7077e2cae1eb32b65d152349fa7cc138cb392d5999cbfdcecc9ac
-DIST wrapt-1.13.1.tar.gz 130138 BLAKE2B bc9a0238a4e16f36e83a6fd81e94d5a257e27e0d5864dc98ba4036f16c3cd92b971e9eddf8193afd13b5afe82ac4f83d50e66f8bedfcd0068ce53f162f4f7ac5 SHA512 a5d7d9013e975261608563fc86b92dd9d455b9efe5f5a79800d317438317f86d59b5678cd4c053832aad2e35dfc08d75b16ed456564cfcbb6541a12a1741352f
 DIST wrapt-1.13.2.tar.gz 130624 BLAKE2B 7ad74653208042326630ae4464494fcdd5299b35a42d495a16a3cbd68bb60fe5ea17f3e95eac85d98142fe339a593a8cda7e3182ce2a6e96f6ba2bb204a1fc46 SHA512 14648465745af7972ffd449783a24a4b5bf8187cbee517d3427825409bd5d073e3153a0c61f5583b84fc6ca2c48479ebf112977ce340369019a617559d09dfc0
diff --git a/dev-python/wrapt/wrapt-1.13.1.ebuild b/dev-python/wrapt/wrapt-1.13.1.ebuild
deleted file mode 100644
index d53e075a9c36..000000000000
--- a/dev-python/wrapt/wrapt-1.13.1.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_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Module for decorators, wrappers and monkey patching"
-HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
-SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-python_compile() {
-	local WRAPT_EXTENSIONS=true
-
-	distutils-r1_python_compile
-}