gentoo resync : 29.12.2022

4 files changed, 32 insertions, 39 deletions

diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 7c06b81a8603..00868d572959 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,5 +1,4 @@
-DIST websockets-10.2-src.tar.gz 302766 BLAKE2B 2313bab904de3671f973191f1c43d275ede44c87811d82f22c6bd76145610ba5d4ba4d7a1b3a564bfc8c4a9b7921b2edc640af9304733e85deac1e728f0050f3 SHA512 b8c7fbe627e1c411112b0d66e561aa9bcf15d6de07a9cccd203211e0e6af49762774e09f8c5f4523fe214731ae7a96ed4b63639c7ed66fee062cdda3e5fba350
+AUX websockets-10.3-py311.patch 1065 BLAKE2B 16e66f28b0b1bd68b28bafd91ff83fd72d295ff52fa53420ec4a9be31ae66c4b0f4e515b8c62feba616cd6d3650af30566c97f157dec469f2f3de5e584eb0b7f SHA512 94c34e96b9d6ee75599be33bb246ac21a41763f51dc59255632273f8d46d0553f275c9e888615adda93047ab65eeb577dab64a5153c1cb3155c27f9618c0c961
 DIST websockets-10.3.gh.tar.gz 304375 BLAKE2B db6075304613ff74ad5928a0c57e90a7d418ac0b9532adba4c6a17b3c3f1982cc94db8ac4c0da5f65343a915f3b2e7ccedce4e6d5d4960cb72fc93c3db6e041c SHA512 75a11dd7605808954c5f59decda5b115db73de96ed4023d8d7ee3c9966551a9ded2d771f76b086c76f49b0787f19349dadcd9010eb5fea8eeddf3d9bba1c6cbb
-EBUILD websockets-10.2.ebuild 950 BLAKE2B 4e304c034032266851bd97e317baa7cadced76323d98557a151625b46daa33835254f54ca16ab4eb18fc3442ec0700fb7d1f9d5f1f669696b00cf21761fc64bb SHA512 3382b8cf490a986eeb288da00e37daee9e03f0076c48d972e80f1d01c0c7e7c35fdb1dc55789cd45a6a1632d832d2f9085f438c89b3167caa4593dbce24f2e5b
-EBUILD websockets-10.3.ebuild 834 BLAKE2B e5b15bbd2ab7bca7b35b806cde51d742082b7ad144ca74c7147c0edd8a9a822707ce0dad9a4ee6149931f39612b419cd491cbb35b10a5e649d1ffaa62c66de18 SHA512 80272c06d6e25b49d6a2f6500d62663138d479e59871e3ebf227b0c9de756e227dc4cb212f6fd8dc62159cea2284e484b85e4a2dc6ec33df6a30fcafedfd2d27
+EBUILD websockets-10.3.ebuild 871 BLAKE2B b97e0aee91257ce1bb254f0e81017bc49d488d332d6206ad3dd9a429218f6d7f9ba0d185b6bc59160f638a4e0d1b81caa046e70afa9829bd3f615a1006f420c6 SHA512 d25050228fe2fcffad26943fa4b54e4cefedb73e4894cdab4e301e5f5d942e53edb769daa7cea808e09c29c85f0da202f52fa209339dd6ada1e87e56a2682154
 MISC metadata.xml 488 BLAKE2B 06ed81aa4ffa49d1951a8ef639752bc701d798fa531737d4cb367ca198e65178f430d6b1e7f3b24ffcc332343dd58a0cc8ff5f2632a225e6c0f36ee50148aebd SHA512 8335bde47d396c018b32db406e18636edd7f3fe5704c901888d56690ec726aeb7d6f9e42fb7dbb1869c78b494c9cbc17ded3ca78b7576d6fdc0a8097bf996f60
diff --git a/dev-python/websockets/files/websockets-10.3-py311.patch b/dev-python/websockets/files/websockets-10.3-py311.patch
new file mode 100644
index 000000000000..d15eb2d32f81
--- /dev/null
+++ b/dev-python/websockets/files/websockets-10.3-py311.patch
@@ -0,0 +1,24 @@
+diff --git a/tests/legacy/test_client_server.py b/tests/legacy/test_client_server.py
+index f9de70c..05070c8 100644
+--- a/tests/legacy/test_client_server.py
++++ b/tests/legacy/test_client_server.py
+@@ -426,6 +426,10 @@ class CommonClientServerTests:
+                 self.used_for_read = True
+                 return super().recv(*args, **kwargs)
+ 
++            def recv_into(self, *args, **kwargs):
++                self.used_for_read = True
++                return super().recv_into(*args, **kwargs)
++
+             def send(self, *args, **kwargs):
+                 self.used_for_write = True
+                 return super().send(*args, **kwargs)
+@@ -1299,6 +1303,8 @@ class ClientServerOriginTests(ClientServerTestsMixin, AsyncioTestCase):
+         self.assertEqual(self.loop.run_until_complete(self.client.recv()), "Hello!")
+ 
+ 
++@unittest.skipIf(sys.version_info[:2] >= (3, 11),
++                 "asyncio.coroutine has been removed in Python 3.11")
+ class YieldFromTests(ClientServerTestsMixin, AsyncioTestCase):
+     @with_server()
+     def test_client(self):
diff --git a/dev-python/websockets/websockets-10.2.ebuild b/dev-python/websockets/websockets-10.2.ebuild
deleted file mode 100644
index 4287b1679bd3..000000000000
--- a/dev-python/websockets/websockets-10.2.ebuild
+++ /dev/null
@@ -1,34 +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=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for building WebSocket servers and clients in Python"
-HOMEPAGE="https://websockets.readthedocs.io/"
-SRC_URI="
-	https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very fragile to speed
-		tests/legacy/test_protocol.py::ServerTests::test_local_close_receive_close_frame_timeout
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_utils.py::SpeedupsTests::test_apply_mask_non_contiguous_memoryview
-		tests/legacy/test_client_server.py::SecureClientServerTests::test_http_request_ws_endpoint
-	)
-
-	epytest tests
-}
diff --git a/dev-python/websockets/websockets-10.3.ebuild b/dev-python/websockets/websockets-10.3.ebuild
index 8ae85335baa3..d71d754cb413 100644
--- a/dev-python/websockets/websockets-10.3.ebuild
+++ b/dev-python/websockets/websockets-10.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -21,10 +21,14 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}/${P}-py311.patch"
+)
+
 python_test() {
 	local EPYTEST_DESELECT=(
 		# very fragile to speed