gentoo auto-resync : 28:10:2022 - 15:59:37

22 files changed, 124 insertions, 529 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6d6c34ee1e9a..1f7faa6c25d5 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/abydos/Manifest b/dev-python/abydos/Manifest
index c67cab8854bd..4bb0c34c7720 100644
--- a/dev-python/abydos/Manifest
+++ b/dev-python/abydos/Manifest
@@ -1,4 +1,6 @@
 AUX abydos-0.5.0-fix-py3.10.patch 719 BLAKE2B e0607ecb3633642be5b2b034088b7dd097d9dab3acf44619a3fb9493b8cc91dee4b7fdfc2564d88d60ffb83991a95d1f71838e2b48968a1983cf491a59d15c91 SHA512 12730eb82a3186f62da662456fd6648437ac631a3f0278d5840919b13d2798c154115c60f2301560b64234c28b30c68bf761989c682e57cd34c6279e92dcb531
+DIST abydos-0.5.0.gh.tar.gz 21321759 BLAKE2B 1f14675f42e849e5e1563dd858bfb2bf040e25b0f90cb3da9986492378892bedd0f23eea990cd65d804aececb350b0e90fb27921382a8df8b91e55d7f820c27e SHA512 28aeea4ba16ea88b077e8b9902f5d8b3a650eeced489687daf9af0e4aa437eaee6c8eeb0747dd5a8f95291594064a1221cc1da2dfa989978bcc870045fee3531
 DIST abydos-0.5.0.tar.gz 21321759 BLAKE2B 1f14675f42e849e5e1563dd858bfb2bf040e25b0f90cb3da9986492378892bedd0f23eea990cd65d804aececb350b0e90fb27921382a8df8b91e55d7f820c27e SHA512 28aeea4ba16ea88b077e8b9902f5d8b3a650eeced489687daf9af0e4aa437eaee6c8eeb0747dd5a8f95291594064a1221cc1da2dfa989978bcc870045fee3531
 EBUILD abydos-0.5.0-r1.ebuild 981 BLAKE2B b7fed06f873295a9b8e9e63fbb74e9c1f22554680d278afaf7ef8ace71e5e7ca3f4dc736eb07f3125a01e67d1a224e5ab5378716954c230bb9cc48102efecc9b SHA512 5804aa55c3672d492e12299a7d7612eb3736429779bce20d7084e88d1b0ef5c9aef9f3397a92b0c02f00774e4754d2ab3e7afbb3507a92ad2e4cf66fd78db477
+EBUILD abydos-0.5.0-r2.ebuild 1017 BLAKE2B ec16a44c4b7533ab84d941a24e193f42555b78d2888bd923ada5d36aade9b5c5ab6004dc32cddd89f5a37943d4ba735cb90be49dd609002937b9c21562871fad SHA512 df39b0a9651d1ab7ff2ec54886a6ac6e089b0dac8e156c7d28bb0383823bbd48e00088f758d7cacb711875aa77350a7f5a0063f127a1da7e1488c2e8730dc5b2
 MISC metadata.xml 407 BLAKE2B f28b4d12169f91e75d4bdb117fef6bc8e3a1a1a9bce3498aa11a26d1ad71c486d4ee8a76084551d3563530a2d492c2f47b4d8f830e00d7379fe079ba1e3df8a8 SHA512 1738b7309d3a9f0e90c5716ac0376274d1f34bb3264d8a3bf69dfe020724417f1b89b1883eae34bba9cd0147b5f2e8962114a216a5e684fd10365505f684fac4
diff --git a/dev-python/abydos/abydos-0.5.0-r2.ebuild b/dev-python/abydos/abydos-0.5.0-r2.ebuild
new file mode 100644
index 000000000000..22bcda516f48
--- /dev/null
+++ b/dev-python/abydos/abydos-0.5.0-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Abydos NLP/IR library"
+HOMEPAGE="https://github.com/chrislit/abydos"
+SRC_URI="https://github.com/chrislit/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+# Requires access to the internet
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+	dev-python/deprecation[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/nltk[${PYTHON_USEDEP}]
+)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
+distutils_enable_tests pytest
+# Extension error: You must configure the bibtex_bibfiles setting
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-bibtex
+
+python_prepare_all() {
+	# do not depend on pytest-cov
+	sed -i -e '/addopts/d' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 4ed1087b2fd4..0b08d9d0dd35 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1,3 @@
-DIST aiohttp-3.8.1.tar.gz 7324180 BLAKE2B 99f85b8510782a31de2d2f6c8efa65ef5c5cde600a5c5f49d6362d5833a0443b9adcaed9beb27c5d8502aca37af154b06017f48836b73d4c61d78204b62b7f05 SHA512 3611549393e50c8d30426aee9ddd23794a71ddefe4384eb549049b93e452fafb38de7ad900737213b61fbe717bd85035a780c1622593eae250328f17d484a0a7
 DIST aiohttp-3.8.3.tar.gz 7337480 BLAKE2B 28d2b5bf6dd6f19506127747511e006c22fcb59959ab090bdc53ca5ee0f7f186aedb0c8b4103c2ea52399dc998fa2e6d3f872239223cf72629a1168e3950f1f8 SHA512 248c232604c91442b2fc9fa55fbf7df8e3af56dcf4cd9c516414a3a738c5c60a8a06395cd9c6e2c8ea9884728aea757423735c7b9be889e6f17e3ee6395a2f64
-EBUILD aiohttp-3.8.1-r1.ebuild 3657 BLAKE2B 2da81b97e0b3f1d167557b6d675acd9a857e45b45166e924493900eaf395e77cee71d45b2f0c7e428ce7a0f22bd47cbfabc49fbb9e462216029a271a57dc5f7c SHA512 d9b644e44be853ab68704d175ac8a99bb292fd09fc8097c356ee0f8b06335420c3cec66bee3d20a554c0413d278e35c25cda08251fc5e00fcca20f2f68cb0e69
 EBUILD aiohttp-3.8.3.ebuild 2922 BLAKE2B 7b83eef57c1f351019b48661f6cab4e73f2228eb54a3494f5519d96fb094f65cadc8f75e4e0591b72fbe1e516374bcaaba6952f86c1f5f603fbbdb3d186e1f47 SHA512 1bce1e9c1aa73de44f1716d2921295689c637c305e6de8db94110a55389e1168ccacf86c7bcdca92ad51c1b63d17d50807990f24fdbc38fb1b6e0c72f701f254
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild b/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
deleted file mode 100644
index 2f2c34c7277c..000000000000
--- a/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
+++ /dev/null
@@ -1,127 +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_{8..11} pypy3 )
-
-inherit distutils-r1 multiprocessing
-
-LLHTTP_COMMIT=69d6db2008508489d19267a0dcab30602b16fc5b
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="
-	https://github.com/aio-libs/aiohttp/
-	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 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	app-arch/brotli[python,${PYTHON_USEDEP}]
-	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/async-timeout-4.0.0_alpha3[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	>=dev-python/charset_normalizer-2.0[${PYTHON_USEDEP}]
-	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		dev-python/async_generator[${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-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		test-rust? (
-			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'
-
-src_prepare() {
-	# increase the timeout a little
-	sed -e '/abs_tol=/s/0.001/0.01/' -i tests/test_helpers.py || die
-
-	# xfail_strict fails on py3.10
-	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
-
-	# which(1)...
-	sed -i -e 's:which:command -v:' Makefile || die
-
-	distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	# workaround missing files
-	mkdir requirements tools || die
-	> requirements/cython.txt || die
-	> tools/gen.py || die
-	chmod +x tools/gen.py || die
-	# force rehashing first
-	emake requirements/.hash/cython.txt.hash
-	> .update-pip || die
-	> .install-cython || die
-	emake cythonize
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# proxy is not packaged
-		tests/test_proxy_functional.py
-	)
-
-	local EPYTEST_DESELECT=(
-		# runtime warnings
-		'tests/test_client_functional.py::test_aiohttp_request_coroutine[pyloop]'
-		# Internet
-		tests/test_client_session.py::test_client_session_timeout_zero
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# C extensions are not used on PyPy3
-				tests/test_http_parser.py::test_c_parser_loaded
-			)
-			;;
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# known problem with tests, not code itself
-				'tests/test_client_functional.py::test_timeout_on_reading_headers[pyloop]'
-				'tests/test_client_functional.py::test_timeout_on_conn_reading_headers[pyloop]'
-				'tests/test_client_request.py::test_data_stream_exc_chain[pyloop]'
-				tests/test_test_utils.py::TestAioHTTPTestCase::test_example_with_loop
-				tests/test_test_utils.py::TestAioHTTPTestCase::test_example_without_explicit_loop
-				tests/test_test_utils.py::TestAioHTTPTestCase::test_inner_example_without_explicit_loop
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked
-	rm -rf aiohttp || die
-	epytest -n "$(makeopts_jobs)" --forked
-}
diff --git a/dev-python/klein/Manifest b/dev-python/klein/Manifest
index 72bd65e5e86e..352f7b6c8ace 100644
--- a/dev-python/klein/Manifest
+++ b/dev-python/klein/Manifest
@@ -1,3 +1,4 @@
+AUX klein-21.8.0-test_resource.patch 1068 BLAKE2B ac1dceb24d74a5cc23eb1c89cd26f2fb308a834c1a6ef7452fe20dc46fd312ab38f4cb3479aa74af5f82744f3184528ca91556e3186e70c0fa930fb40710f63d SHA512 89a1ddbd4b53e3a0d0f6b1e0972805411f2d935e6b4059afd0f4259259b9e3e7db5df2c31063cddcb183ddc256d087f496b47cb40165d14d67ed7a96ec731b7f
 DIST klein-21.8.0.tar.gz 100578 BLAKE2B ea2535e93affebe822ff086eb5749481edf7811340a35b11319b7c23b23d3877f6208ac1ef6cc7a4bb9eedd33d087820304f2ee71695413d72308e83c47aa2ee SHA512 cce28865e172effb6044f73c1841875fa5eb55daf20dcea482d0764604ab826ca5063a4679165bb253953d54428a42c2082022fd273e2a1083aefa595a563ccd
-EBUILD klein-21.8.0.ebuild 1133 BLAKE2B c4fbb1fdb49b926560d96026ed8fc700acfc9e32de6147738cf4840f78cf5b447d81fd53cd5535f61911b2d387c4e834a8260a76ed7dd4a4ef2c029285ed6210 SHA512 8b99ef4deeb0cad871bdab7678b5983b7cad86108099fb89b55ec8821e5262e978b7785bf9ad3012cdf60d311c7f519eb54089758072cf95bffba6833d60027f
+EBUILD klein-21.8.0.ebuild 1186 BLAKE2B 452f7d5215506f9d4374cfb0c04f1ffb25e44e0fb2c575b08895aa394ce0991f2958faf5561637290c761d8a4b2eb130704f03b802df0b80959c1e165806986f SHA512 8bbe59cd936459a993f6907cb01441e06a0193bbf56ce1e803c71887f5b380e464ca792f00b864754edda8e5fcab597b37decebded9d5d27f72f4972d50a5322
 MISC metadata.xml 973 BLAKE2B 870f3a89f25a7b230a3b837287ed3c0f96bb2ada0eeaf464b0bbf70c4982be57a783c73671309044053d24c57f9c77d79e72ec65d031d8ddd4e7e406822823fc SHA512 9e81588cbd096d31af040b48e467af6d124d4f4249abf808b4ee4a8f1171b5c02a8e5d87bcb869d8f4d86c3224c9e555a1e5f3d4aba8a1b2a179f3c5aa609726
diff --git a/dev-python/klein/files/klein-21.8.0-test_resource.patch b/dev-python/klein/files/klein-21.8.0-test_resource.patch
new file mode 100644
index 000000000000..c9779c46ac17
--- /dev/null
+++ b/dev-python/klein/files/klein-21.8.0-test_resource.patch
@@ -0,0 +1,28 @@
+https://github.com/twisted/klein/commit/bce8b85036a6d185b9e8aab037c805f81354544c
+
+From bce8b85036a6d185b9e8aab037c805f81354544c Mon Sep 17 00:00:00 2001
+From: Glyph <glyph@twistedmatrix.com>
+Date: Tue, 31 May 2022 17:44:13 -0700
+Subject: [PATCH] testing exact content-length is way too strict
+
+--- a/src/klein/test/test_resource.py
++++ b/src/klein/test/test_resource.py
+@@ -2,7 +2,7 @@
+ from io import BytesIO
+ from types import MappingProxyType
+ from typing import Any, Callable, List, Mapping, Optional, Sequence, cast
+-from unittest.mock import Mock, call
++from unittest.mock import ANY, Mock, call
+ from urllib.parse import parse_qs
+ 
+ from werkzeug.exceptions import NotFound
+@@ -642,7 +642,7 @@ def foo(request: IRequest) -> KleinRenderable:
+         request.setHeader.assert_has_calls(
+             [
+                 call(b"Content-Type", b"text/html; charset=utf-8"),
+-                call(b"Content-Length", b"258"),
++                call(b"Content-Length", ANY),
+                 call(b"Location", b"http://localhost:8080/foo/"),
+             ]
+         )
+
diff --git a/dev-python/klein/klein-21.8.0.ebuild b/dev-python/klein/klein-21.8.0.ebuild
index 3008d5599a89..da5e00f51a2b 100644
--- a/dev-python/klein/klein-21.8.0.ebuild
+++ b/dev-python/klein/klein-21.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="micro-framework for developing production-ready web services with Python"
@@ -30,6 +30,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-test_resource.patch
+)
+
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index d52aaa77d735..67582e3bf398 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,3 +1,3 @@
 DIST nltk-3.7.tar.gz 2851947 BLAKE2B 4cd4fed9f26de7996bcabbd71d500c072489e79ae0edb29f09577e465227c948efa7130af6975b029e77fb79db015437a9e3311eb28048d02dcc2356441d0908 SHA512 66d79afa59f18f2bf7d086dcb22813c7b92239c05669daa62866dbda06c0ca22367317749cf19db3e41a7bdb405d4f87f72b695aa58fd0669bf36de64f1f9888
-EBUILD nltk-3.7.ebuild 1748 BLAKE2B 5d2a3752c513001ad9b6ac47d8f5b34436cb81b6907ea5ca00716096b974d2425312c1b256aa47cc090202ce23566b70a64f828cad7d36b8d1b95dc126f0048e SHA512 1a2fbdb43ccbd916f0a1d3f79d32ef97181fe634b459c0d0d38c2efb4986de4c3dc68494b9fd245d9cc7163d94740e26a37b4d7355913f923ae8a78b3373d45d
+EBUILD nltk-3.7.ebuild 1748 BLAKE2B 5d3b06138802ee36b269b01eeb62249051c9a5de807b249f2ec4efeda7860508d779f997c627097f907427d950d7e516b06c45718640f3413078ab83662b0967 SHA512 d72f2d36b1f3d3a83d7685cb8d3e2d4020d9264fc5772e8643fd9090985274ff3c3c7084228ca240c80b7c945eba3341af8dc9cf96e7b2debc9eeafbf09b9fda
 MISC metadata.xml 430 BLAKE2B 9c67c091a126c4af98c56de2d8227c1da65fbfad00671825642daefa117d711475b804bd90d72345e43d519a9219e195c1de1579dd6d60f6663c9813fc9c0d81 SHA512 5707c61031544a51e298d9c4c70685011f06b9d65c2370ecba6ecc23491c92fcc30988b6c0c28cb16f21eddebe412fff978a8f9661e5e95b9cff249f81420018
diff --git a/dev-python/nltk/nltk-3.7.ebuild b/dev-python/nltk/nltk-3.7.ebuild
index 0eb34545c3f7..0855f4a1b8fc 100644
--- a/dev-python/nltk/nltk-3.7.ebuild
+++ b/dev-python/nltk/nltk-3.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="sqlite,tk?,xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 915fa8d39ee3..ccfefa0148b3 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -1,7 +1,8 @@
 AUX pythran-0.10.0-tests-werror.patch 480 BLAKE2B ac7b6fe2cd4b4aeed3be4baf2a433ff48ae9e2bedc7be70c04122bf097906480e57d077ed485e0e47c6414d390e64fdef47d5ef77a890af99403defcc43b0bc8 SHA512 e699298e03b5d0e868aa2704100f47368baf2477c4f3632d97f1c65af0ff6babbbecab3c083f09f09353194dedc3b77b653b1b8ae9ac7967ebc65c8932bf8bdf
+AUX pythran-0.12.0-gcc13.patch 1472 BLAKE2B f385cfd607a77a72fd5815502416b267342dc6d9307b5d6974ea4a5188233b19efaf389fa90051b9435130a63aa892870a9d573d3c7f50a5cdf83b034a15d3d1 SHA512 b42398b068da7fbe35e9f8fdf76579102347f63f63b94ed2db1966b15e3ff53c26a1a015a8a5a53a36d4e0cd1ed4689f9f4fae120741dd6804fc9a3adc78404a
 DIST pythran-0.11.0.gh.tar.gz 3582011 BLAKE2B 532afe9edd84d2699254bcad330dc03fcda4defce73997ec9feecf1a9e0c8f4fd407a5c4ebae7e10f96463a43453137953dc3e4df010ae7fb63d540d41b79f53 SHA512 bd703148f26a0511f5a21e691e62f4e9b7bf5a92548f8ac837b2d24135917b71b052941180c9801f29c457018eb57e5f5107a509d6815d8dd8ddab1b8626b1a1
 DIST pythran-0.12.0.gh.tar.gz 3589256 BLAKE2B 5eeba4b7d73e56cc2b696098edb085e11d406485960614b50426e3df7c425ad22537ae72a2931a9ec318ab23153660da543ec1890f03379981eee10a34b82cea SHA512 8f698cb2efc8e53005a6a18b81b9119796d56e638c4634d3a9268bc8d4ac340c7ff1a26212f17210ad7200eb8a3e0f9dd20702d9d9c51f24a76dadc7d0877693
 EBUILD pythran-0.11.0.ebuild 1216 BLAKE2B 3bbdd186dec832ba93efc8681b36738f28779b6b30068b27309ce7a3701a15a95387e56878bf77aa7f7ecbd316328dc9d815178a2c471e0441bf12ca5deb86bd SHA512 78fdf9b66ddf94d3513a2a07203ac1274e9d1dc928afabea0a573e47716006606a5ae38c372a98c7e601195080bd876a3bb816e74c3aaaa49b9f3f56f106ea87
-EBUILD pythran-0.12.0-r1.ebuild 1438 BLAKE2B 8e9886ec0cf6b2f7e51d32abebf8c4d718c7722537a0d29a887a8ed1f29ded7e8fe160f517213a304ec0b24e628b494ea60549220285629b1194b8052bcf83e8 SHA512 08a540208a25712104cfc21668f972fa1eaa021d02e1e1980ae3576415f3ec08dce71f5296127295e687a154c0932649ad60ad0743c9a65e5e530252c94ce49d
+EBUILD pythran-0.12.0-r2.ebuild 1478 BLAKE2B 3548ddd74816e938f39338d2c0b258595f49581fe80f2afdce6b0f07b3968c38410b531618500e147e2aae58078738f9a750dd361140af681830a51bb892070a SHA512 ae94645859d96d389e04ef9918a40c9793fec41f9f6fd0c2d64133d754bd5e1628945528c148ef1000f8d36e00a6e7f8480ebe246c5dba2bce501568b3fbcee6
 EBUILD pythran-0.12.0.ebuild 1190 BLAKE2B ef04054cb343d9a3c3e0bdc5fe2f6c41aef90bef6cb2eaf2d3fbadf35430677072a45e0888fc05a8874bfe6b61bb799b0cf9b86a93fc493e95a5e1c6e95dcce1 SHA512 794a5d327f8c9aeea34cdccd596726c7084a14e8a9a9af7ec604afad6f602409b814eac6fb042a7a8a8626a38a5e1e3aadcaa531d0233bcefccffe3647312dfd
 MISC metadata.xml 354 BLAKE2B e7ec71fae294f6f697b0fd99b0ccef24049af7999866344e8da2ebc40bc2988a21f2cb0374b52b781a5f8b55f26ebca364dc93f4e69d957a3ff6bd3c32cd988d SHA512 9008d270ea6757557482edb55c5848aea9a29abfbbad65d93000660a1e51ad2456a2b7ccfcacb80da23b3dd38cee2c4da9645aed48a35edb4a497bbe3a80dd7f
diff --git a/dev-python/pythran/files/pythran-0.12.0-gcc13.patch b/dev-python/pythran/files/pythran-0.12.0-gcc13.patch
new file mode 100644
index 000000000000..d7b9f28f0f45
--- /dev/null
+++ b/dev-python/pythran/files/pythran-0.12.0-gcc13.patch
@@ -0,0 +1,36 @@
+https://github.com/serge-sans-paille/pythran/pull/2029
+
+From 13a89edad477077331ae8071eadf239e88adea0c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 28 Oct 2022 12:47:35 +0100
+Subject: [PATCH] Fix build with GCC 13 (missing <cstdint> include)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When building scipy, one gets:
+```
+/usr/lib/python3.10/site-packages/pythran/pythonic/include/types/combined.hpp:304:17: error: ‘uint8_t’ was not declared in this scope
+  304 | SCALAR_COMBINER(uint8_t)
+      |                 ^~~~~~~
+/usr/lib/python3.10/site-packages/pythran/pythonic/include/types/combined.hpp:300:21: note: in definition of macro ‘SCALAR_COMBINER’
+  300 |   struct __combined<Type, Type> {                                              \
+      |                     ^~~~
+/usr/lib/python3.10/site-packages/pythran/pythonic/include/types/combined.hpp:5:1: note: ‘uint8_t’ is defined in header ‘<cstdint>’; did you forget to ‘#include <cstdint>’?
+    4 | #include "pythonic/include/types/traits.hpp"
+  +++ |+#include <cstdint>
+```
+
+Bug: https://bugs.gentoo.org/878527
+--- a/pythran/pythonic/include/types/combined.hpp
++++ b/pythran/pythonic/include/types/combined.hpp
+@@ -1,6 +1,8 @@
+ #ifndef PYTHONIC_INCLUDE_TYPES_COMBINED_HPP
+ #define PYTHONIC_INCLUDE_TYPES_COMBINED_HPP
+ 
++#include <cstdint>
++
+ #include "pythonic/include/types/traits.hpp"
+ PYTHONIC_NS_BEGIN
+ namespace types
+
diff --git a/dev-python/pythran/pythran-0.12.0-r1.ebuild b/dev-python/pythran/pythran-0.12.0-r2.ebuild
index 585d64925bd1..3a8d913b453c 100644
--- a/dev-python/pythran/pythran-0.12.0-r1.ebuild
+++ b/dev-python/pythran/pythran-0.12.0-r2.ebuild
@@ -49,6 +49,7 @@ distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.10.0-tests-werror.patch
+	"${FILESDIR}"/${PN}-0.12.0-gcc13.patch
 )
 
 src_configure() {
diff --git a/dev-python/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index 427a20e621bb..a3aa7aa6eadb 100644
--- a/dev-python/setuptools-rust/Manifest
+++ b/dev-python/setuptools-rust/Manifest
@@ -39,15 +39,10 @@ DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed
 DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
-DIST pyo3-0.16.5.crate 363266 BLAKE2B 3162d9a3da37b5579a91dbd42d3e200c480b5e3fb3a2ec208735045cb78a8418f6810a72ec24452f24d00961c72a58ccac4f5ca9a567c92c0a82ca37173de442 SHA512 068019c76b1fc3de2e100c6cdf084df24587094aac3479cb1d906f7fc95ab6296cfe4d0d211a1c5696261be5e0e0e96776f5bc5535faf8243432f93e4d2537f9
 DIST pyo3-0.17.1.crate 394706 BLAKE2B 30d4d6285c977f0eb3581dd89e4d2cdb2c9badce3729c03f7f8f41bc0be9253bf4ef0d30b0c137007fb26cad02e17efdfbbe6d248829edf111be0ecf9c25a2fb SHA512 d5e28c9931abd06050e7dbf261024aeaf7a81b079b27cfdd610a2be08ee2e64c60f0c4d90eee28565a98a6ee34ba228e7085b7fecc85dfc504b66a6cf77dcfca
-DIST pyo3-build-config-0.16.5.crate 28880 BLAKE2B b821818831e410dc75df12f9f9625986ceea97d00f3160fc8cbf7315f003f94bad425bcfb3db73cca07ec62de47b763196e019e37d16beed9d5cf7386c05ca6c SHA512 91a9eb743b05808ccb5816a631e381167b16707515a68bbc43c04dee333c2537fd03ca1ae4a02b26738c79baa695b5dfa603753eee58e9002ac6b33320d275c6
 DIST pyo3-build-config-0.17.1.crate 29232 BLAKE2B 76e95012c0c2713f41bd70c49ef06f5e48ee6d89cce158902eb7d2c805c241e6cadfbac426de35bd3078307f120814d06a39fd227e093982807e825b868a3308 SHA512 1ec2d8069a8eb247b3e152adb47f675ba3d05aaecf13f7d3a580bac128339b9220f9dcf9f984009e0e8d4b9e11415d0b563c0087fcdd1499acbe8d263b3330bd
-DIST pyo3-ffi-0.16.5.crate 60737 BLAKE2B 84907201cf48e57a6b692a9261d67d005d0b773965116dd22d679eff2a3a02ee4f59678dde896635052e62c55ee2703f30726a65651a0f38fdcb31e8c95e3059 SHA512 8b4a486dfd204ea5c394b6832f5e2ead5cd88bc2a943bbc156fcf70e8212be6fa96af5c9ce06ce28a2d0e702fee858f26b49094070e00be658ffe3fa84265496
 DIST pyo3-ffi-0.17.1.crate 62851 BLAKE2B f23c29b4ba41ef59dc0723fbf4622e3a1f32ca127cf76d72f5e4f8988da448bbe9a7a324fbb57233e5ac1369e60b1ed0ef02f7ebb1576a31447fe060919c63d0 SHA512 f67462e48b8acb8a9b01c93f9100a37b45801271598398a106d7fc7bf9721c51ba114fe6d0b919b2199e29fdc8a0945a79ba18d766d1f22a536ff75ed5902235
-DIST pyo3-macros-0.16.5.crate 8456 BLAKE2B c37f31ebcea08fec38849ac52e6a52613b07e7532d7c79889ad52693461a0966e69a6cf29d4c2c8da19bce7e7d05e8c103dddccbb41667c69b28bb15cd388230 SHA512 c4f4993ab67d2f8fc6f1fe5c0eeffc00c10024e201c64fb49f3075f5c33af63d2d455f7696b094fe9786091469a27c5472cb11aea3e9c3b73404578ba76a93fc
 DIST pyo3-macros-0.17.1.crate 7229 BLAKE2B ef54df6d41d309dfd6bee907e83c63c53352b0a5fdc910bb1617b999bf5cc316c0ec81e504200d72b69ea9819e2da3e74027106f6ae08d8de751b91bc4fee7c6 SHA512 2958728e8d9d5c99ad785aee9755bca4ae6bf8b5b8e13af4a00a4fce9250af51d64093aaef8f19c8861557eb8f6448de75c55b1c637968d481241ff2ae8abc3e
-DIST pyo3-macros-backend-0.16.5.crate 49221 BLAKE2B 690f5e90074f44478b7701203b8a7b63f1fd83ab20c7458fbafa17e61ff34053c8f81d22151a30aa78980bc983a73cb1e56b2cdc5a55c5d8ab9b7e3941ab7503 SHA512 c85a1f53311355e96284cffc40d181aa65d63f9fffcdf8fa33fa989b771bb1b412ab118c9d3b08b1f686936797edb24c61c000dc59bbc5c69aacccf70b035b4f
 DIST pyo3-macros-backend-0.17.1.crate 49872 BLAKE2B 91d58229cdb012bfa701816d091309cf02e397a80e91663f050a800868cc7a7e54128c27c3b7a82467487c3c84b341baecaa2a36d0154a14602a272aa634421c SHA512 e4b706a80c9239d23c8c3b125d17e6f66ec64a442294d2cba3f21b50bd8ed839e6ef8816bacf9dcd9c5a15d4e0660f0594b4c1a213ffa3b59b19630720b76948
 DIST quote-1.0.16.crate 27566 BLAKE2B 3352f4ed2158cb8d29947d5435b7414ed223088887718f9d258f1f5d555034a4fbb79cbfb3cb772be4868be366853feabec777fba7f275ac36d8091eb3b371c7 SHA512 489f4dcaa8a8a2041b39fc8fc815fa7943c0a456881283398e4eb65f7b50f220a6e5493d60d1d5019a48b189ca217fd8c62056b552bf94b9329ec963cce01c74
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
@@ -62,7 +57,6 @@ DIST selectors-0.22.0.crate 44199 BLAKE2B f749e0e53476b695b4937bc0cbf1add4f3f7d4
 DIST semver-1.0.6.crate 29941 BLAKE2B 1aad12eb93534a0a72fa1645a71fe4cc03121a2215520030d697e863427fa06edd9f63d05c522f696c5b9c1c45556803ae381cb4c77a2d4a7fc30f7363e3ecea SHA512 0470b9a3a6d398233d19a8240de3b0d18c4cd8f8fc6887658baac4053c88463d5de9b7145a564abd43f813e03b75a26050eedc1689450895953bc7f96b64859f
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
 DIST servo_arc-0.1.1.crate 9817 BLAKE2B 88586ca0c969df8bfb3a04ba4a689606995876434877a2cd48a72b26451deb6fdcf65273aa9b03948adcbc66b2450301840910e5c4162b993535d69585c62128 SHA512 59d531dcf7a9191b8462ce395e713194994714b65275c0af412186f862be169d0c6fc5d86603332a1aacd8af9ace934dc78531b9cb576cf8179ec35709225447
-DIST setuptools-rust-1.5.1.gh.tar.gz 293895 BLAKE2B 039e1fc36e4d1d49bf930c01c124cb98a5e0d6d913ba6b96bea9121457a855446e3ac3a3b3be471fcf4fb8849e38ff7dc41a9f4ddc400f78f723ba3e0bfed571 SHA512 0a763f371b88f3d22ff0dced8dc23d29534130a70133b63fa9097f7466957e13ee1ac812bbdea1a46ac3effb39a2d4349f1314e6cb0d20dfba407e07d37c7c14
 DIST setuptools-rust-1.5.2.gh.tar.gz 294274 BLAKE2B b0de905facd0fe110c25c037980826b09d64bab625be0a5be53ff981d37b02bba2b0aa3458ff0a95cdb1fb4ecdbafe08236167b76c1606c534dd8a4e04d68287 SHA512 e80d1296fd09c24b644d821e981261153ff19ae62d978fc8ee81c78e440d215f9d1e91e33d758effb94fcb64985937445940f2e2f032ad1b8c2aa39be79cf19d
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
@@ -80,6 +74,5 @@ DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD setuptools-rust-1.5.1.ebuild 3212 BLAKE2B aded7568d241e6ae09bcffd5378365a395e472ee33a3ca3a0c1040a3e7036361e14aca32f6d2cba46bf6b61b9ea52098ba66bd7311a0bda8ff8b283984cd7acc SHA512 5cf29bffae0f68610bb7498820f87a42a10b1cdc9cc707d9282e8ae33610c19c716a56d5063a146d302389b9f45b56cb98105ff83e115657305b6c3c30e87e18
 EBUILD setuptools-rust-1.5.2.ebuild 3244 BLAKE2B df7c8607fd3eb91db25d607b26c9b8b627620e9f688eb0dd38021a4a10c923547cc41671a9918c902b3b683e46d280985bea9a7b21dca067361c0e7a74cba25f SHA512 cbcdc75f387b0869ca1864bff50f21b1632a7632b6b85f0761e9d48d06d2d8554fae7af9148b230e71680d63f9bf8a96a5331cdb691d1d057d7d84dd2d219afc
 MISC metadata.xml 476 BLAKE2B c8f0ef0779f0a4412a7d9b97e1bb03e3bfb3c031209f489a100b30402d99224014e379712989afd0cb76c85be301dcf9a51e21e8f9195262c5920dd1db0703d1 SHA512 af74755e9e8fb61cbded2dc3e63cd20f95393ef2650bed9f81e299f7759ae79c63b45df8048cd0fe25397ec7db10156be681fa5278606a20481f78d5279b815b
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.5.1.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.5.1.ebuild
deleted file mode 100644
index 948cfcc46b3c..000000000000
--- a/dev-python/setuptools-rust/setuptools-rust-1.5.1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-CRATES="
-	bitflags-1.3.2
-	byteorder-1.4.3
-	cfg-if-1.0.0
-	convert_case-0.4.0
-	cssparser-0.27.2
-	cssparser-macros-0.6.0
-	derive_more-0.99.17
-	dtoa-0.4.8
-	dtoa-short-0.3.3
-	futf-0.1.5
-	fxhash-0.2.1
-	getrandom-0.1.16
-	html5ever-0.25.1
-	indoc-1.0.4
-	instant-0.1.12
-	itoa-0.4.8
-	kuchiki-0.8.1
-	lazy_static-1.4.0
-	libc-0.2.121
-	lock_api-0.4.6
-	log-0.4.14
-	mac-0.1.1
-	markup5ever-0.10.1
-	matches-0.1.9
-	new_debug_unreachable-1.0.4
-	nodrop-0.1.14
-	once_cell-1.10.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	phf-0.8.0
-	phf_codegen-0.8.0
-	phf_generator-0.8.0
-	phf_macros-0.8.0
-	phf_shared-0.10.0
-	phf_shared-0.8.0
-	ppv-lite86-0.2.16
-	precomputed-hash-0.1.1
-	proc-macro2-1.0.36
-	proc-macro-hack-0.5.19
-	pyo3-0.16.5
-	pyo3-build-config-0.16.5
-	pyo3-ffi-0.16.5
-	pyo3-macros-0.16.5
-	pyo3-macros-backend-0.16.5
-	quote-1.0.16
-	rand-0.7.3
-	rand_chacha-0.2.2
-	rand_core-0.5.1
-	rand_hc-0.2.0
-	rand_pcg-0.2.1
-	redox_syscall-0.2.11
-	rustc_version-0.4.0
-	scopeguard-1.1.0
-	selectors-0.22.0
-	semver-1.0.6
-	serde-1.0.136
-	servo_arc-0.1.1
-	siphasher-0.3.10
-	smallvec-1.8.0
-	stable_deref_trait-1.2.0
-	string_cache-0.8.3
-	string_cache_codegen-0.5.1
-	syn-1.0.89
-	target-lexicon-0.12.3
-	tendril-0.4.3
-	thin-slice-0.1.1
-	unicode-xid-0.2.2
-	unindent-0.1.8
-	utf-8-0.7.6
-	wasi-0.9.0+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit distutils-r1 cargo
-
-DESCRIPTION="A plugin for setuptools to build Rust Python extensions"
-HOMEPAGE="
-	https://github.com/PyO3/setuptools-rust/
-	https://pypi.org/project/setuptools-rust/
-"
-SRC_URI="
-	https://github.com/PyO3/setuptools-rust/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? ( $(cargo_crate_uris ${CRATES}) )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/rust
-	<dev-python/semantic_version-3[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-python_test() {
-	local examples=(
-		html-py-ever
-		namespace_package
-		rust_with_cffi
-	)
-	for example_dir in ${examples[@]}; do
-		pushd examples/${example_dir} >/dev/null || die
-		einfo "Running ${example_dir} test"
-		esetup.py build --build-lib=build/lib
-
-		case ${example_dir} in
-			html-py-ever)
-				pushd tests >/dev/null || die
-				local -x PYTHONPATH=../build/lib
-				${EPYTHON} run_all.py || die "Tests failed with ${EPYTHON}"
-				popd >/dev/null || die
-				;;
-			*)
-				pushd build/lib >/dev/null || die
-				epytest ../../tests
-				popd >/dev/null || die
-				;;
-		esac
-
-		rm -rf build || die
-		popd >/dev/null || die
-	done
-}
diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
index 2398c5edae6f..feefd3e51410 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -1,3 +1,3 @@
 DIST treq-22.2.0.tar.gz 72922 BLAKE2B ab4637c801e5e777f81f6e6a6e12e36ef47e052a4103eb70bf4e10d3fb44b60f144f32734625b4babb375acc96e3cad1895634d3d2fc08ac3095769180e65328 SHA512 465a02481a51ac246ac85f561f2e7a59d97aeeda9f0953dd83678ff836802a187a6aedcce830a9e3095a9c72227bd06113610c3be0967f1362a645a31278bde0
-EBUILD treq-22.2.0-r1.ebuild 1147 BLAKE2B b4633f061fe0fb1ce042759ca5eeece1290eeb5afe29d233f83905f693160bc0ac4fc5dd192444497ee44c389796f5951162a87d88bf21137e2be056892078fd SHA512 172a330b81610b2b70d9119bf7b6f49908993f5b96117417e7070f1a0fd5993d103d77886880259db89e695ef525994c931fb45a63920270e016a2df7b42742b
+EBUILD treq-22.2.0-r1.ebuild 1147 BLAKE2B 2b7d72317bcf194c0f7355ac007b26c88670c155e74dd8a7934e0381c30e5279b32a1b6ddf465b491aa3a1047e56616c72eefba7b9ea3dd0cc676f9de558c643 SHA512 db683296a8ebfc0af6a81f2f80906c952d7cf50f3c3dfc598ceab085966f5fe9073be251dc409c5e35281bfe2ab9965707925dcaced4644c7eba52c0664e29b7
 MISC metadata.xml 781 BLAKE2B a50fa9d74c53d5c948cfd940ff1e454a2aa9c44bf29c8e39495007ddab02e212a979f757335fae531ceae43743342a02a4ae049b5b12425ba779293c6977eb07 SHA512 1d45744f461efe3cd03802e3886dee60a19eb508b681e3235817f478dd98ca164c822194f03b05891e0000e3d09af4790e8b10e07f3e303abf9ad308712ca9b6
diff --git a/dev-python/treq/treq-22.2.0-r1.ebuild b/dev-python/treq/treq-22.2.0-r1.ebuild
index 02970f97aa02..738cd26e7b9b 100644
--- a/dev-python/treq/treq-22.2.0-r1.ebuild
+++ b/dev-python/treq/treq-22.2.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 53052eb8929c..eb0d84f572f7 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,9 +1,3 @@
-AUX uvloop-0.15.3-uint64-thread-id.patch 1548 BLAKE2B 2d1af0cd42f1911e2296db843bace2c3281e9defff1b174a7ca3c2bf651af2b9149b4066e9e252b216a33751591e0e15afec035142c35dac2bce7683c52a48e7 SHA512 0ae9fd1210d80f8efdf1d29b84450c60578848467b49616e9c5e71476779972e94ccebe13d99e74cef99ea59cf50617a8152a1768a0c14b812036310b403a55c
-DIST uvloop-0.15.3.tar.gz 2094066 BLAKE2B 77ae4634ee31211dba13f41aede4480d70271e042a30a1268e9ad18f5de2b296b84931fb6b2022d2351f33521a84264f74cbc30caa5ff84b0f429bc9f1d426a0 SHA512 5687371a13509bdac0ef7a5ca0f7c78b54d0d9225cbf68cebc6d4fdf3807c2e3346579f5440eb0ff6578088780cc5efb09fba114da0bc0e60ad3f607d9df652f
-DIST uvloop-0.16.0.tar.gz 2129067 BLAKE2B 8a5a5c760b1036428483d2cf1f509784aa61cb69388720775c9555bdb0ce19341cb58fc051ab6f92066a3478acf729513dafafd79f31115b064bf1d3660479de SHA512 dd6dcec38f7f94dc0cf0123302fd6fe404428196b452a80a8258a207654e3f67e210233be3d649668c22b48390232d0347706b1d87fb50016287142c742b806d
 DIST uvloop-0.17.0.tar.gz 2279973 BLAKE2B 7ccbf3b8e723e36c1010a70e256de0ad1a9728fe10b3538e05c57157b16ea7e5369347c855cd1460e49f89197ebb05628c4b6fcd7e50c623b1aaa5890ac64b5f SHA512 861d7f28ad879ecbfa40d53b9626e38660f02618fd433edbd5a8ea5100a17ade042a26549def04bc23f928aca3adc83d62503f0548038cd400284f5654003ee4
-EBUILD uvloop-0.15.3-r1.ebuild 1393 BLAKE2B 025fce332c25bb7e1fb1188ad9257a8d807da11c71a3b6bcf02b3bcdb54b22b0522cbe0ebf3ee7a2bacc90342d6820ea6952473e45baf9dd92e7638dc1a545ae SHA512 b6e13f27b6b06046c133c0af0d55a03a211c5a56cbf8eb37fe8f6b33b4e8a3440f2353f50485dfe415145f0c17b1b6f24329d5fa16524d86baae68cba3ab4a64
-EBUILD uvloop-0.15.3.ebuild 1193 BLAKE2B fc992ae7c17888c29828b7cd7b56c77c8465e914b85b62935e1b2392448a9c5bd6ba19b59d10168ab7255761aea277922d56522007ba8212e4b774072d3124a0 SHA512 779c79417e4b2ef607e96619600c2a4f996957408e0ebebb9fa900e144aa20f409ae72ea9b9c05ab3dd90711a67edf3f424187551eedafdbd77ebae6e950c62c
-EBUILD uvloop-0.16.0.ebuild 1418 BLAKE2B 5ee1d50ac599e891886a6a2b9e72a93a2e0da3d327cb6d645e01b0ee02ddf05c5ca3a941144a5b98af6618c313dae561a5903f2099be11de8b82044d7d386014 SHA512 9ca8fadb5a77f5888479828f225b378c9f501e2fa520a646cfa46c7b44cba8981f846d9862c983fffadb0db7e7f2f7d33656a665d95ee8fff1e391e8c73266cb
 EBUILD uvloop-0.17.0.ebuild 1842 BLAKE2B adcf5bcefe09bccca8d35adda876393d3068c20e9b51a0f9bc21fc4ac2d1cef753bba15dba5bcf785b95754d53205f0701d4e821d0bc9fbde500b7d54a12632c SHA512 6e5eedc5495201f54250e44ac80d61589cc9f828df8b97f8234a42e2a7a0cb9a19c72c22279aba8bc57b5088add1f99f2c4ce153c36321d21ac516a63f1d7810
 MISC metadata.xml 527 BLAKE2B 2db44bdfb681fcce35ef35f13155293ac3fdffa12a695b654ed8acc608cf1f769243136e66b6b2c1afd57caa7e59a66a60d34631c37a4b98a474bd0635fcbaa3 SHA512 02540835a23405c467293395fa7984741e02ca1aca75f527edd3b988d307b41db0f729d5cc0b3a826a652fb7104dec7be86a9a57f4d5646d2af87255cc2d90de
diff --git a/dev-python/uvloop/files/uvloop-0.15.3-uint64-thread-id.patch b/dev-python/uvloop/files/uvloop-0.15.3-uint64-thread-id.patch
deleted file mode 100644
index a74fedd308e9..000000000000
--- a/dev-python/uvloop/files/uvloop-0.15.3-uint64-thread-id.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 732df28f0739d84c687d3e6d81995dafa18ac775 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 28 Jul 2021 09:21:00 +0200
-Subject: [PATCH] Revert 32-bit thread ID hack
-
-Apparently the hack used to fix 32-bit platforms actually breaks 64-bit
-platforms using large thread IDs (e.g. sparc).
-
-Reverts: b5b4abb16ba558cf957cf40120dfd4937c53aea5
----
- uvloop/includes/stdlib.pxi | 2 +-
- uvloop/loop.pyx            | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/uvloop/includes/stdlib.pxi b/uvloop/includes/stdlib.pxi
-index adf9806..21d69e6 100644
---- a/uvloop/includes/stdlib.pxi
-+++ b/uvloop/includes/stdlib.pxi
-@@ -135,7 +135,7 @@ cdef int ssl_SSL_ERROR_WANT_READ = ssl.SSL_ERROR_WANT_READ
- cdef int ssl_SSL_ERROR_WANT_WRITE = ssl.SSL_ERROR_WANT_WRITE
- cdef int ssl_SSL_ERROR_SYSCALL = ssl.SSL_ERROR_SYSCALL
- 
--cdef uint64_t MAIN_THREAD_ID = <uint64_t><int64_t>threading.main_thread().ident
-+cdef uint64_t MAIN_THREAD_ID = <uint64_t>threading.main_thread().ident
- cdef threading_Thread = threading.Thread
- 
- cdef int subprocess_PIPE = subprocess.PIPE
-diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx
-index d9b5aaa..96c9cde 100644
---- a/uvloop/loop.pyx
-+++ b/uvloop/loop.pyx
-@@ -707,7 +707,7 @@ cdef class Loop:
-             return
- 
-         cdef uint64_t thread_id
--        thread_id = <uint64_t><int64_t>PyThread_get_thread_ident()
-+        thread_id = <uint64_t>PyThread_get_thread_ident()
- 
-         if thread_id != self._thread_id:
-             raise RuntimeError(
--- 
-2.32.0
-
diff --git a/dev-python/uvloop/uvloop-0.15.3-r1.ebuild b/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
deleted file mode 100644
index c52b01da9204..000000000000
--- a/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
-HOMEPAGE="https://github.com/magicstack/uvloop"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 arm arm64 ppc ppc64 -riscv sparc"
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libuv-1.11.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
-
-PATCHES=(
-	"${FILESDIR}"/${P}-uint64-thread-id.patch
-)
-
-python_prepare_all() {
-	cat <<-EOF >> setup.cfg || die
-		[build_ext]
-		use_system_libuv=1
-	EOF
-
-	# flake8 only
-	rm tests/test_sourcecode.py || die
-	# TODO: broken by cythonize
-	rm tests/test_cython.py || die
-	# force cythonization
-	rm uvloop/loop.c || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_ext --inplace build_sphinx
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/uvloop/uvloop-0.15.3.ebuild b/dev-python/uvloop/uvloop-0.15.3.ebuild
deleted file mode 100644
index 53214c0c6779..000000000000
--- a/dev-python/uvloop/uvloop-0.15.3.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_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
-HOMEPAGE="https://github.com/magicstack/uvloop"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libuv-1.11.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	cat <<-EOF >> setup.cfg || die
-		[build_ext]
-		use_system_libuv=1
-	EOF
-
-	# flake8 only
-	rm tests/test_sourcecode.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_ext --inplace build_sphinx
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/uvloop/uvloop-0.16.0.ebuild b/dev-python/uvloop/uvloop-0.16.0.ebuild
deleted file mode 100644
index b01168428710..000000000000
--- a/dev-python/uvloop/uvloop-0.16.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
-HOMEPAGE="https://github.com/magicstack/uvloop"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 -riscv sparc x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libuv-1.11.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
-
-PATCHES=(
-	"${FILESDIR}"/uvloop-0.15.3-uint64-thread-id.patch
-)
-
-python_prepare_all() {
-	cat <<-EOF >> setup.cfg || die
-		[build_ext]
-		use_system_libuv=1
-	EOF
-
-	# flake8 only
-	rm tests/test_sourcecode.py || die
-	# TODO: broken by cythonize
-	rm tests/test_cython.py || die
-	# force cythonization
-	rm uvloop/loop.c || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_ext --inplace build_sphinx
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
-	distutils-r1_python_install_all
-}