Adding metadata

26 files changed, 301 insertions, 511 deletions

diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 3bad1e315fa1..c5a16a92aa4d 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1 @@
-DIST aiohttp-3.6.2.tar.gz 1076923 BLAKE2B 14327a0bc5b5fffdf436a4c3525e4c25d80100aa464ed652316f7724c2bea6de4ace6c27e8a2a8cf9d895673ed63ed52e8c958ad611636e1e524a4e40efa4735 SHA512 49bd3089158c05ff6312420190ccd7fed95efb4a18b8aff7497d5507c71c692080d6949801edabdcd95379ca8e6614398408118d72ff1e782399e059e2cfc1a8
-DIST aiohttp-3.7.1.tar.gz 1111777 BLAKE2B 03d16e8c9d64ec407cf7b6dbbf5547a88f528ab23e9e256559c11fc2cb6f568101f79dad89b0e5698fd02a3918051e4bc3c349e3ea4358ecb5de1543fea91708 SHA512 accdd588fdd7ba1792cf5e8fb67c6d5dd3e1c5382d9c9ece14e449d6f4f1c116975809d2dad786e0d472b3bb54e3b8c59722be871401a82cef5eff9c12f3c3f8
-DIST aiohttp-3.7.2.tar.gz 1111049 BLAKE2B faffc582f2c72ff892862b5b782da75b381e59b21b284b1120e4edb16f22b760f8cabe56261061e0049a5dfd041456076e294e942a02309e9b3d6b414facb0cb SHA512 2dd4f0264f1fb0801be366c269b73dd80b542e8e5bfe18a01fbdfadd0210022ccd6e3975be1be416551ccce82f42881e18735d5c6fc68a42b7452ab18e157dc5
-DIST aiohttp-3.7.3.tar.gz 1113127 BLAKE2B 47d95565db1184c6b55a1e7d7a6df8cda872e4fe621f653e3143608f51dde2c7d30d00835da357dd7ae33f4858ad5778074dfde5261331a3539a5d6776ea1a25 SHA512 d1dbbe3cbdeb1a460f5030a08a251a7bb7ae7ec038ca93ba5187b2da1fe21b80ed6513db647ef382d2d92a3d527a34dffbd37f51aa1e8b65bb36d517304b1812
 DIST aiohttp-3.7.4.tar.gz 1114533 BLAKE2B dcae3e66e13df8264d731a3ca65b4718feca8d0e6e1baeb6608dcb9bfb4bd4baaed6bd34297ed5ece78d01189bf9a0b9860845cae4e2b93cc2ba463cc35cfb77 SHA512 66fcc837b388020dc998cbaa2db31e48ecec75bcfaa8af9108e2ea265588dafa5684ca96a8fe3ad6759b22e09a4ae6d4efd8653fb76126eccdc826c15cbbe2e6
diff --git a/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild b/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild
deleted file mode 100644
index 85649f355101..000000000000
--- a/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,156 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/idna-ssl[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		${COMMON_DEPEND}
-		!!dev-python/pytest-aiohttp
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/brotlipy[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
-
-distutils_enable_sphinx docs \
-	'>=dev-python/alabaster-0.6.2' \
-	'dev-python/sphinxcontrib-asyncio' \
-	'dev-python/sphinxcontrib-blockdiag' \
-	'dev-python/sphinxcontrib-newsfeed' \
-	'dev-python/sphinxcontrib-spelling' \
-	'dev-python/sphinx' \
-	'dev-python/sphinx-aiohttp-theme'
-
-distutils_enable_tests pytest || die "Tests fail with ${EPYTHON}"
-
-python_prepare_all() {
-	sed -e 's|^async def test_aiohttp_request_coroutine(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_handle_keepalive_on_closed_connection(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_server_close_keepalive_connection(|@pytest.mark.xfail\n\0|' \
-		-i tests/test_client_functional.py || die
-
-	sed -e 's|^async def test_request_tracing_exception(|@pytest.mark.xfail\n\0|' \
-		-i tests/test_client_session.py || die
-
-	sed -e 's|^async def test_cleanup2(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_cleanup3(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_close(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_close_abort_closed_transports(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_close_cancels_cleanup_closed_handle(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_close_cancels_cleanup_handle(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_close_during_connect(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_close_twice(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_close_with_acquired_connection(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_connect_queued_operation_tracing(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_connect_reuseconn_tracing(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_connect_with_limit(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_connect_with_limit_and_limit_per_host(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_connect_with_limit_concurrent(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_connect_with_no_limit_and_limit_per_host(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_connect_with_no_limits(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_get(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_get_expired(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_get_expired_ssl(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_limit_per_host_property(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_limit_per_host_property_default(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_limit_property(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_limit_property_default(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_acquired(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_acquired_closed(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_already_closed(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_close_do_not_delete_existing_connections(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_not_started(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_ssl_transport(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_waiter_first_available(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_waiter_no_available(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_waiter_no_limit(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_waiter_per_host(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_waiter_release_first(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_waiter_skip_done_waiter(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_tcp_connector_dns_throttle_requests_cancelled_when_close(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_tcp_connector_do_not_raise_connector_ssl_error(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_tcp_connector_uses_provided_local_addr(|@pytest.mark.xfail\n\0|' \
-		-i tests/test_connector.py || die
-
-	sed -e 's|^    async def test_read_boundary_with_incomplete_chunk(|    @pytest.mark.xfail\n\0|' \
-		-e 's|^    async def test_read_incomplete_chunk(|    @pytest.mark.xfail\n\0|' \
-		-i tests/test_multipart.py || die
-
-	sed -e 's|^def test_aiohttp_plugin_async_fixture(|@pytest.mark.xfail\n\0|' \
-		-i tests/test_pytest_plugin.py || die
-
-	sed -e 's|^def test_static(|@pytest.mark.xfail\n\0|' \
-		-i tests/test_route_def.py || die
-
-	sed -e 's|^async def test_mixed_middleware(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_new_style_middleware_class(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_new_style_middleware_method(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_old_style_middleware(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_old_style_middleware_class(|@pytest.mark.xfail\n\0|' \
-		-i tests/test_web_middleware.py || die
-
-	sed -e 's|^async def test_client_disconnect(|@pytest.mark.xfail\n\0|' \
-		-i tests/test_web_protocol.py || die
-
-	sed -e 's|^async def test_static_file_range(|@pytest.mark.xfail\n\0|' \
-		-i tests/test_web_sendfile_functional.py || die
-
-	sed -e 's|^async def test_partially_applied_handler(|@pytest.mark.xfail\n\0|' \
-		-i tests/test_web_urldispatcher.py || die
-
-	# minor breakages on py3.9
-	sed -e 's:test_iface:_&:' \
-		-i tests/test_frozenlist.py || die
-	sed -e 's:test_proxy_https_bad_response:_&:' \
-		-i tests/test_proxy_functional.py || die
-
-	# newer chardet works too
-	sed -e 's|chardet>=2.0,<4.0|chardet>=2.0|' \
-		-i setup.py aiohttp.egg-info/requires.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pushd "${BUILD_DIR}/lib" >/dev/null || die
-	ln -snf "${S}/tests" tests || die
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-	rm -rf .pytest_cache tests || die
-	popd >/dev/null || die
-}
diff --git a/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
deleted file mode 100644
index 75621da5f2df..000000000000
--- a/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
+++ /dev/null
@@ -1,90 +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} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/idna-ssl[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		!!dev-python/pytest-aiohttp
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/brotlipy[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	'>=dev-python/alabaster-0.6.2' \
-	'dev-python/sphinxcontrib-asyncio' \
-	'dev-python/sphinxcontrib-blockdiag' \
-	'dev-python/sphinxcontrib-newsfeed' \
-	'dev-python/sphinxcontrib-spelling' \
-	'dev-python/sphinx' \
-	'dev-python/sphinx-aiohttp-theme'
-
-python_prepare_all() {
-	# Fails due to a warning
-	sed -e 's:test_read_boundary_with_incomplete_chunk:_&:' \
-		-i tests/test_multipart.py || die
-	# with py3.7+
-	sed -e 's:test_aiohttp_request_coroutine:_&:' \
-		-i tests/test_client_functional.py || die
-
-	# Fails due to path mismatch
-	sed -e 's:test_static:_&:' \
-		-i tests/test_route_def.py || die
-
-	# Internet
-	sed -e 's:test_mark_formdata_as_processed:_&:' \
-		-i tests/test_formdata.py || die
-
-	# newer chardet works too
-	sed -e 's|chardet>=2.0,<4.0|chardet>=2.0|' \
-		-i setup.py aiohttp.egg-info/requires.txt || die
-
-	# takes a very long time, then fails
-	rm tests/test_pytest_plugin.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pushd "${BUILD_DIR}/lib" >/dev/null || die
-	ln -snf "${S}"/{LICENSE.txt,tests} . || die
-	pytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" --forked \
-		-vv tests || die "Tests fail with ${EPYTHON}"
-	rm -rf .pytest_cache tests || die
-	popd >/dev/null || die
-}
diff --git a/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
deleted file mode 100644
index c95c54cdde94..000000000000
--- a/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
+++ /dev/null
@@ -1,91 +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} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
-
-RDEPEND="
-	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/idna-ssl[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		!!dev-python/pytest-aiohttp
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/brotlipy[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	'>=dev-python/alabaster-0.6.2' \
-	'dev-python/sphinxcontrib-asyncio' \
-	'dev-python/sphinxcontrib-blockdiag' \
-	'dev-python/sphinxcontrib-newsfeed' \
-	'dev-python/sphinxcontrib-spelling' \
-	'dev-python/sphinx' \
-	'dev-python/sphinx-aiohttp-theme'
-
-python_prepare_all() {
-	# Fails due to a warning
-	sed -e 's:test_read_boundary_with_incomplete_chunk:_&:' \
-		-i tests/test_multipart.py || die
-	# with py3.7+
-	sed -e 's:test_aiohttp_request_coroutine:_&:' \
-		-i tests/test_client_functional.py || die
-
-	# Fails due to path mismatch
-	sed -e 's:test_static:_&:' \
-		-i tests/test_route_def.py || die
-
-	# Internet
-	sed -e 's:test_mark_formdata_as_processed:_&:' \
-		-i tests/test_formdata.py || die
-
-	# newer chardet works too
-	sed -e 's|chardet>=2.0,<4.0|chardet>=2.0|' \
-		-i setup.py aiohttp.egg-info/requires.txt || die
-
-	# takes a very long time, then fails
-	rm tests/test_pytest_plugin.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pushd "${BUILD_DIR}/lib" >/dev/null || die
-	ln -snf "${S}"/{LICENSE.txt,tests} . || die
-	pytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" --forked \
-		-vv tests || die "Tests fail with ${EPYTHON}"
-	rm -rf .pytest_cache tests || die
-	popd >/dev/null || die
-}
diff --git a/dev-python/aiohttp/aiohttp-3.7.3.ebuild b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
deleted file mode 100644
index 483b8b14ca83..000000000000
--- a/dev-python/aiohttp/aiohttp-3.7.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/idna-ssl[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		!!dev-python/pytest-aiohttp
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/brotlipy[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	'>=dev-python/alabaster-0.6.2' \
-	'dev-python/sphinxcontrib-asyncio' \
-	'dev-python/sphinxcontrib-blockdiag' \
-	'dev-python/sphinxcontrib-newsfeed' \
-	'dev-python/sphinxcontrib-spelling' \
-	'dev-python/sphinx' \
-	'dev-python/sphinx-aiohttp-theme'
-
-python_prepare_all() {
-	# Fails due to a warning
-	sed -e 's:test_read_boundary_with_incomplete_chunk:_&:' \
-		-i tests/test_multipart.py || die
-	# with py3.7+
-	sed -e 's:test_aiohttp_request_coroutine:_&:' \
-		-i tests/test_client_functional.py || die
-
-	# Fails due to path mismatch
-	sed -e 's:test_static:_&:' \
-		-i tests/test_route_def.py || die
-
-	# Internet
-	sed -e 's:test_mark_formdata_as_processed:_&:' \
-		-i tests/test_formdata.py || die
-
-	# newer chardet works too
-	sed -e 's|chardet>=2.0,<4.0|chardet>=2.0|' \
-		-i setup.py aiohttp.egg-info/requires.txt || die
-
-	# takes a very long time, then fails
-	rm tests/test_pytest_plugin.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pushd "${BUILD_DIR}/lib" >/dev/null || die
-	ln -snf "${S}"/{LICENSE.txt,tests} . || die
-	pytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" --forked \
-		-vv tests || die "Tests fail with ${EPYTHON}"
-	rm -rf .pytest_cache tests || die
-	popd >/dev/null || die
-}
diff --git a/dev-python/aiohttp/aiohttp-3.7.4.ebuild b/dev-python/aiohttp/aiohttp-3.7.4.ebuild
index 10e826b0ebe3..bfb79f21f5d7 100644
--- a/dev-python/aiohttp/aiohttp-3.7.4.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cython-test-exception-raiser/Manifest b/dev-python/cython-test-exception-raiser/Manifest
new file mode 100644
index 000000000000..83a65c97746a
--- /dev/null
+++ b/dev-python/cython-test-exception-raiser/Manifest
@@ -0,0 +1 @@
+DIST cython-test-exception-raiser-1.0.0.gh.tar.gz 4273 BLAKE2B 028c3ded07b137a186055b4fa8f9d7306585942ad7ee022a37b3df065dae5d2110d6ddcd874f3dc2c687f10da1122329194b817b1a78a76ff8de557997ca2a19 SHA512 4e1c5dd65a7c493cf43213badfcaaeb0df9c4774cc6f90cfd437612126893e7831d218c707599adb97dbee7ebaaa2372c796c634d75738bd06328735eb8f1189
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
new file mode 100644
index 000000000000..6e6f1381036c
--- /dev/null
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A trivial extension that just raises an exception (for testing)"
+HOMEPAGE="
+	https://pypi.org/project/cython-test-exception-raiser/
+	https://github.com/twisted/cython-test-exception-raiser/"
+SRC_URI="
+	https://github.com/twisted/cython-test-exception-raiser/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/cython-test-exception-raiser/metadata.xml b/dev-python/cython-test-exception-raiser/metadata.xml
new file mode 100644
index 000000000000..d0574142fd21
--- /dev/null
+++ b/dev-python/cython-test-exception-raiser/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">cython-test-exception-raiser</remote-id>
+  <remote-id type="github">twisted/cython-test-exception-raiser</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index f0d4a82982b3..5f476ecf403c 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1 +1,2 @@
 DIST httpx-0.16.1.tar.gz 965347 BLAKE2B a6c5bcdda595ffcfb824194564ebd93760a9180e60665a9540fc6a2822b1be4273b940fee61cb4b49c2d97a5f4d71b1caf32deddec18d2fb636465b3868aece4 SHA512 d76b2c94c655c187ab150f20b16906034574d017a67c4a06c456d55071434cc0ba7752bdceda86aa6b1a1fe9109fa11594e4ea679cd7d2a77898fb40fa5153d3
+DIST httpx-0.17.0.tar.gz 1651681 BLAKE2B 46eec46d5f2006667ab51e5e4d98c1a22783351d9e2fa50ccab2431bf6e52dd9b124d50b32f151fc171561c913d879cfec4f717ea22fd2a333c13190368ab505 SHA512 9471c404c02481a10d42e10e36a55cd55cdecd2cd98a8f3ca1f453a7f1ad7f1ce3b292b8fe583b1c95119f27c0b2eefc756b4e4ed353e3383c12009f3bde21cd
diff --git a/dev-python/httpx/httpx-0.17.0.ebuild b/dev-python/httpx/httpx-0.17.0.ebuild
new file mode 100644
index 000000000000..5fbcd07d4e1f
--- /dev/null
+++ b/dev-python/httpx/httpx-0.17.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
+HOMEPAGE="https://www.python-httpx.org/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/sniffio[${PYTHON_USEDEP}]
+	=dev-python/httpcore-0.12*[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
+	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/brotlipy[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/hyper-h2[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/uvicorn[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Require Internet access
+	sed -i 's/test_async_proxy_close\|test_sync_proxy_close/_&/' \
+		tests/client/test_proxies.py || die
+	# trio is not currently in the tree
+	sed -i '/^import trio/d' tests/concurrency.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jikanpy/Manifest b/dev-python/jikanpy/Manifest
index 22105430962c..d58b025c4def 100644
--- a/dev-python/jikanpy/Manifest
+++ b/dev-python/jikanpy/Manifest
@@ -1,2 +1 @@
-DIST jikanpy-4.2.1.tar.gz 536588 BLAKE2B f6bf531cc57814d2740e1d325bc521dc92651a1a467b65277086130d9c00de7b592e81a7f82e12cb35ac8d8c7f1bcc6201f945ab9c49befb8b89093e627eacc1 SHA512 7f690745a790836ddae95aaffdaa59ea60d0c2b2d9c64be7548372719c826239d3d650931652ca75d8e35f1d4354c0b80ebf0d7e80a4fa4b65ec3bbd4bef1cd5
-DIST jikanpy-4.2.2.tar.gz 536658 BLAKE2B b8f34f506aa93c68586d59d0ba37e1731e509f8ce2e0cd4f157b6ea5ae8b333271f528992998c92c19e08358ca14508a2bfae6fa167a750bb732fbcd3ccb13d3 SHA512 117aed3c968214aae659437b795cd4e326e0d94a536005861edad861b6e08d50be346063d1d75c3874ae2d1b3670cfa2ab566e340aa58ff6137a94dbd6369bed
+DIST jikanpy-4.3.1.tar.gz 725938 BLAKE2B 5e011ae4b6d267ad6a6a99b2d28a3f11c4b8949cc1682524d966ac441cce9c527465455573ec873360865f9b913bc14b5c4448ee681540a01bbb95f67c38dec2 SHA512 43170c3512393c50fd859e7481cdd6cce874bd54415959c0660d0804f10546bd22b836bf3c27a86946fc771e92192e28dd8ee02c71796f799b4cf748102d5e3f
diff --git a/dev-python/jikanpy/jikanpy-4.2.2.ebuild b/dev-python/jikanpy/jikanpy-4.2.2.ebuild
deleted file mode 100644
index b753eb463dd4..000000000000
--- a/dev-python/jikanpy/jikanpy-4.2.2.ebuild
+++ /dev/null
@@ -1,22 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for jikan.moe API."
-HOMEPAGE="https://pypi.org/project/jikanpy/"
-SRC_URI="https://github.com/abhinavk99/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/jikanpy/jikanpy-4.2.1.ebuild b/dev-python/jikanpy/jikanpy-4.3.1.ebuild
index b753eb463dd4..a82a8e429573 100644
--- a/dev-python/jikanpy/jikanpy-4.2.1.ebuild
+++ b/dev-python/jikanpy/jikanpy-4.3.1.ebuild
@@ -15,8 +15,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+BDEPEND="
+	test? ( dev-python/vcrpy )
+"
+
 RDEPEND="
 	dev-python/aiohttp[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/simplejson[${PYTHON_USEDEP}]
 "
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	rm "$D"/usr/CHANGELOG.md
+}
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 98cb343c6d80..b47686745b75 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1 +1,2 @@
 DIST nbsphinx-0.7.1.tar.gz 129553 BLAKE2B 635d102804a0e9d3c649707c874d28e8455d3e7082653cb12542a5fbe9cad991815f9f577333f3850347ccad46b77e880d40581a44e1e4fcc515be1ff40d90c5 SHA512 af03272459f5cc20ea2e0abc644ce602c6be5a21c7d3e81950ca153cc6e9566e89defb6f1cbb4caa154958f3e8832d0924dcd1ba5b902d2e1a4496f5c3ac6c8c
+DIST nbsphinx-0.8.2.tar.gz 135256 BLAKE2B 9e2f733df713f5285bdcd876d595e5268a193e07c9d3d85e84f315cc1f11250be4e36854c307b96c0e03ab1f64e573896ef387eeea874553f7ca60c51bcba746 SHA512 b474bdbe291c498f8c392c9c5877eac12d9242e4784f2c8621825ed74dc264be60c1bc1b8ae4ff40809c4eb2a65b04ac54e5369eba3c3c79c1ad6b0a4c711bc5
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.2.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.2.ebuild
new file mode 100644
index 000000000000..15efb84937be
--- /dev/null
+++ b/dev-python/nbsphinx/nbsphinx-0.8.2.ebuild
@@ -0,0 +1,24 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Notebook Tools for Sphinx"
+HOMEPAGE="https://github.com/spatialaudio/nbsphinx/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyrqlite/Manifest b/dev-python/pyrqlite/Manifest
index 06c00b8e025b..a34732178808 100644
--- a/dev-python/pyrqlite/Manifest
+++ b/dev-python/pyrqlite/Manifest
@@ -1 +1 @@
-DIST pyrqlite-2.0.tar.gz 7224 BLAKE2B f3de4d4d6f0598c6dc21e323db4c717f7f8dc85f6e592ea9dfb209ba778d1f16049d40e39b8d98c94dec61c02949ba1fabeae29e25ec8afbe4810df52b6210df SHA512 9d284161e492683955000dd3e3f0593b79e69ba5eb087bee4d3ffc1e4be9de1c362212936b10e1781538eacd838e6ed22adfc82e8cc0dd00e1d3318a4dc14720
+DIST pyrqlite-2.1.tar.gz 19069 BLAKE2B f5ce9c1201632e81ba6f7f41e3ef54bd5fff354c869e73879e8b324ad12aea6476eb197119a22ba15d58c9ab3503435b0110ce9bfe2c21d16fe10b44afbe486a SHA512 6a63860378021b29ec0e8d81cf2c3534c97cec2c65d60e8ac2ec9b0a7900efb9a9a63546da44d8be89570eae2fd47eca4004167d11438b2dd9eb6bc68e646bad
diff --git a/dev-python/pyrqlite/pyrqlite-2.0.ebuild b/dev-python/pyrqlite/pyrqlite-2.1.ebuild
index a58b7dd7b42a..cbbea9b0aa0c 100644
--- a/dev-python/pyrqlite/pyrqlite-2.0.ebuild
+++ b/dev-python/pyrqlite/pyrqlite-2.1.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
 
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-fi
-
 DESCRIPTION="Python client for rqlite"
-EGIT_REPO_URI="https://github.com/rqlite/pyrqlite.git"
 HOMEPAGE="https://github.com/rqlite/pyrqlite"
-SRC_URI="${EGIT_REPO_URI%.git}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rqlite/pyrqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+BDEPEND="test? ( dev-db/rqlite )"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyudev/pyudev-0.22.0.ebuild b/dev-python/pyudev/pyudev-0.22.0.ebuild
index 796424b05193..99377c59eeca 100644
--- a/dev-python/pyudev/pyudev-0.22.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.22.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy-rqlite/Manifest b/dev-python/sqlalchemy-rqlite/Manifest
index c985d3bb92e9..418e1b79317d 100644
--- a/dev-python/sqlalchemy-rqlite/Manifest
+++ b/dev-python/sqlalchemy-rqlite/Manifest
@@ -1 +1 @@
-DIST sqlalchemy-rqlite-1.0.tar.gz 3910 BLAKE2B c2a07ba91812ea2223bdea4e715b364a96b66057f2ed1c7bc0d373860880f3e0d7188ea8d513b127d8c7138695b9703b4a2ed5f6a4a001a8b2ae68020189a058 SHA512 794d0a1d80803f624af4b530efe277947d3a8fa7001df2177de6bdb34ffc9fc76e22c8b73caad7cda02429ddc251fdcbdd8e95ea286a6540054efb28ee53d2bb
+DIST sqlalchemy-rqlite-1.1.tar.gz 4281 BLAKE2B 09cee627790d15715c0124a1065f5cc2c72820a652a99e4c2088de21c980071f27c451e438e84d4c92222d19b651b0e239fac8280c2bbb33c55e76c9b77868b7 SHA512 da11cadd2b6dd0f3501bdf717ad7dd7552edfcf7f32a57ce09b6dadc7eb7fb31fd92e7143151a3e3b2d5f75793f6e5096d13dbe446cb71cfa901d6ff8d4c6e12
diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.1.ebuild
index f1f9d262c4e1..9254f390d7ca 100644
--- a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
+++ b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,14 +8,10 @@ DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-fi
-
 DESCRIPTION="A SQLAlchemy dialect for rqlite"
 EGIT_REPO_URI="https://github.com/rqlite/sqlalchemy-rqlite.git"
 HOMEPAGE="https://github.com/rqlite/sqlalchemy-rqlite"
-SRC_URI="${EGIT_REPO_URI%.git}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rqlite/sqlalchemy-rqlite/archive//v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
deleted file mode 100644
index 6d1773ddb24e..000000000000
--- a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
+++ /dev/null
@@ -1,32 +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
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="A SQLAlchemy dialect for rqlite"
-EGIT_REPO_URI="https://github.com/rqlite/sqlalchemy-rqlite.git"
-HOMEPAGE="https://github.com/rqlite/sqlalchemy-rqlite"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	dev-python/pyrqlite[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/sqlalchemy_rqlite/constants.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 0272c5077b20..2c0ee46f9bf9 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,3 +1,4 @@
 DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6ff694f78cd7600865718ffe861023a53ea6a922f7de232133edba26f5255074d7ef277ce8f3bdf02d556ccf4abf41 SHA512 de8d7fd0b2081cebeff68b060c8469377011648bc563a94a993d3530fb007ed42c3a54925c9a10c465ee7a3065cc9108ace12d10d358223fab13494becb9ac4b
 DIST Twisted-20.3.0.tar.bz2 3127793 BLAKE2B 2e85fc3ec26d89e563c9e79a5d2adea81ff1745d18f0f92b8d45ae3729fbddf09998664257880372c7a4caeb5977c5cad7c863596b8c27ad7890275cead9f763 SHA512 1b850e5fc21a3630ead4c2cc3622c16e78bb3be38ab11d021779b7ce3d3c30acc4e19d79c7791a5fce6c5c6e09c2baa349901dffe952de67dd98eec419846365
+DIST twisted-21.2.0.tar.gz 3882978 BLAKE2B ba37572b0f9eadf2962a2730e4c2c0ed65f582b11b3350034660a2c53c5cd0892b19867d19e0201d4808c09fca621dbe540d153dc6c7d5827d45d2423d19d28b SHA512 fa743dcf22f3c17dfd17f39b7df0cc31fb8ce3e989478ada9a026424ec2de35e6a403ef35acdef5905eed008d42e3c2fee6b7ccdda433e6c250f1feaa83ea8a4
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
diff --git a/dev-python/twisted/twisted-21.2.0.ebuild b/dev-python/twisted/twisted-21.2.0.ebuild
new file mode 100644
index 000000000000..b98bf39a1fc5
--- /dev/null
+++ b/dev-python/twisted/twisted-21.2.0.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+HOMEPAGE="https://www.twistedmatrix.com/trac/"
+SRC_URI="
+	https://github.com/twisted/twisted/archive/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="conch crypt http2 serial test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
+	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+	conch? (
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+	)
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
+	)
+	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
+	http2? (
+		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/priority-2.0[${PYTHON_USEDEP}]
+	)
+	!dev-python/twisted-core
+	!dev-python/twisted-conch
+	!dev-python/twisted-lore
+	!dev-python/twisted-mail
+	!dev-python/twisted-names
+	!dev-python/twisted-news
+	!dev-python/twisted-pair
+	!dev-python/twisted-runner
+	!dev-python/twisted-words
+	!dev-python/twisted-web
+"
+BDEPEND="
+	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
+		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		net-misc/openssh
+	)
+"
+
+S=${WORKDIR}/${PN}-${P}
+
+python_prepare_all() {
+	# upstream test for making releases; not very useful and requires
+	# sphinx (including on py2)
+	rm src/twisted/python/test/test_release.py || die
+
+	# puts system in EMFILE state, then the exception handler may fail
+	# trying to open more files due to some gi magic
+	sed -e '/SKIP_EMFILE/s:False:True:' \
+		-i src/twisted/internet/test/test_tcp.py || die
+
+	# multicast tests fail within network-sandbox
+	sed -e 's:test_joinLeave:_&:' \
+		-e 's:test_loopback:_&:' \
+		-e 's:test_multiListen:_&:' \
+		-e 's:test_multicast:_&:' \
+		-i src/twisted/test/test_udp.py || die
+
+	# accesses /dev/net/tun
+	sed -e '/class RealDeviceTestsMixin/a\
+    skip = "Requires extra permissions"' \
+		-i src/twisted/pair/test/test_tuntap.py || die
+
+	# relies on the pre-CVE parse_qs() behavior in Python
+	sed -e '/d=c;+=f/d' \
+		-i src/twisted/web/test/test_http.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# TODO: upstream seems to override our build paths
+	distutils_install_for_testing
+
+	"${EPYTHON}" -m twisted.trial twisted ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D}$(python_get_sitedir)" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+
+	python_doscript "${WORKDIR}"/twisted-regen-cache
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
+
+python_postinst() {
+	twisted-regen-cache || die
+}
+
+pkg_postinst() {
+	python_foreach_impl python_postinst
+
+	einfo "Install complete"
+	if use test ; then
+		einfo ""
+		einfo "Some tests have been disabled during testing due to"
+		einfo "known incompatibilities with the emerge sandboxes and/or"
+		einfo "not runnable as the root user."
+		einfo "For a complete test suite run on the code."
+		einfo "Run the tests as a normal user for each python it is installed to."
+		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
+	fi
+}
+
+python_postrm() {
+	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+}
+
+pkg_postrm() {
+	# if we're removing the last version, remove the cache file
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		python_foreach_impl python_postrm
+	fi
+}
diff --git a/dev-python/wand/Manifest b/dev-python/wand/Manifest
index f575f27b648d..4dd63a16e71f 100644
--- a/dev-python/wand/Manifest
+++ b/dev-python/wand/Manifest
@@ -1,2 +1,2 @@
-DIST Wand-0.6.3.tar.gz 10506834 BLAKE2B 65ba3d5719f7ad8d77a088d94344cc96f14ca45e95850494033a395cc8772d431653a16b2c3494268f351ee4187e5f5f0dbc22058266e9526cff2312e9a2c5b9 SHA512 9aef97434cc8cdef0880d1d1b2bbbdadba807543489d2c82725aa0b5287718f2a10f5508ca7d72a859e242e2b3e205e5f95649cb43be56d5eec8a83c272d0bac
 DIST Wand-0.6.5.tar.gz 11477141 BLAKE2B 7257dbee8642d619d69d773aa5e0f70c27e32eb5ca4168746efb191ce6d2a49b000aee07127aa51e1906e52e7bc7f2375f39482edf6a841933e4eb2711217fed SHA512 7355888da6ea604759d4af8548d4c2e08d529c88d2720400bbfc6a19bdb03049f3faa5abcd5f3a9c69b705754e86ad4f511a76a0a310d5dece5c2774d74e543b
+DIST Wand-0.6.6.tar.gz 11477246 BLAKE2B e4e908da487994c50b02fb25c7a19a70865fc021e00a36170562dd546ac0d0b9c6eb6d622fc50e0160feb48d52828617d8cf83b1ef0f2f449fdc32f174880917 SHA512 618a8678031b57382d008062ffa21168aeb7afd7a5b82675020b11c756f1542f9a2d2d656d7d683cbf47e4d8be118bf0aac005b4aa1a6e5ae9dc417edea0bd79
diff --git a/dev-python/wand/wand-0.6.3.ebuild b/dev-python/wand/wand-0.6.6.ebuild
index 66b911ec28bb..ee67a5c79698 100644
--- a/dev-python/wand/wand-0.6.3.ebuild
+++ b/dev-python/wand/wand-0.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,18 +16,16 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="media-gfx/imagemagick"
 BDEPEND="
 	test? (
 		media-gfx/imagemagick[fftw,jpeg,png,truetype,xml]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
 	)
 "
 
 distutils_enable_sphinx docs
+distutils_enable_tests pytest
 
 python_test() {
 	# PDF support is blocked by the default ImageMagick security policy