gentoo resync : 16.09.2021

5 files changed, 75 insertions, 4 deletions

diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 65c68312a657..ea3d08344efe 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,5 +1,8 @@
+AUX websockets-10.0-py3.9-fix-deprecation.patch 1822 BLAKE2B ccbde169be0d9c218035ea3889af3d0fd714af9a912ae0835a4140265235a54f2f9c0f07cfd85f6f7336653a80cdd44ab73fa2340f63b58008929a8710b1d6d0 SHA512 bf9fb815ec5d345903d9c07d48199d4e2578dd38119d060059c28038f59f506ee0005e088f4cf8ef7340a9e87656055b272cdf083482d2f70617d9f6ea46f08a
+DIST websockets-10.0-src.tar.gz 276231 BLAKE2B 6170f0540bc33be3d9a71f596ffee58e6e43c2173239a8fffe4f0c2a7555f8ce26849d85ed7865a5df6a4401f01bb0c928a341598916487cc79152a5031e9bbc SHA512 532289dc411d11cffc6e5aa07013cdad9655f124fbbd5dbdfe92985caf554644976a521466b1d3cbe124de11809e395b5e83195eac87495585779591b189c4d7
 DIST websockets-9.1-python-3.10-support.patch.gz 6940 BLAKE2B e4835c7d5efaf956d07b884c85e0b95f26674bf36164fa8362d1c1a564a959bde761d25e747333c58864f74a5ea1b199f228a46ec6a1647c5495ea032020c179 SHA512 7fb4b298a9167c8d913e293fa7549b21d5acb333a5b97e0624a22cb83548ef548b819ac23750c40295140b6f83a701c73a81fdcaed3ab8e704dbee8e17d22f1d
 DIST websockets-9.1-src.tar.gz 191813 BLAKE2B cb3807f01e1a4c22a40bf5150d1e8b21ca786dc5bc4da8f3e6602971f3f7c79b57092f5ddfe3ee52ec00e7fd15f3a992fdbb94b5e26599f2621a7f51434ba6dd SHA512 ff2907a913ff0b8ced6dda72b6fc6512a2ece3ffded2e2dcb8ff6805de9ad504430cc1871c1f6e02ab8069e7b96b2e7609afaf3c9c25f9271b28e2daa72bd3ac
-EBUILD websockets-9.1-r1.ebuild 943 BLAKE2B 257821bd57c0a592ee40b50b5c8a7a31d3f192bff5113cfc068ad885831ae80c38b438621044e254f514ae32cbda80b09150b026c7972394c237c054651f9b0e SHA512 7571618127d29c5d9596cd176676f2e03e4b4d6ea0ca61ce0d04981ff31a9093629958bf9d060861d6fb067ead7942f3a94e6fa6472772e819a108bb421eb7b1
+EBUILD websockets-10.0.ebuild 862 BLAKE2B defa9b15e0de07aa1608e2e15c3b170ad0b780f62e8bf6ce08dd597e9e1abecfdf22f013e594e47743895788380fbb01b7bd6738ebdff34e84ac992d21967e5c SHA512 a6969e66094d3536946b7427385e8a9e8e8b2faeaf0b0ba900c363542eb42eb97ea3889b636ae804f7315d4970fc21e4f72161bf8fece6995cb65ea53d1d2a55
+EBUILD websockets-9.1-r1.ebuild 941 BLAKE2B e040f6f54aa6f0adf312fac4132052d1b241cb726f6b9e820a4d4a53c391e5a313bc3ad29842ddb5fc5ca3497eb349f25e17fc7b01a017bb5e93071fef6dc5a8 SHA512 2ed22498de369b6f3264db0fbfa2d0679a56cf0eb497bb11adfcebee07c2c4b8630f311294c54b5354b3c714ea8d6971d896882bbeda5dd40b9e9e2ca16e98c1
 EBUILD websockets-9.1.ebuild 711 BLAKE2B 76b5e96b67135d5173709b1ea9ebd459595a26986fe8f522434a8b744fa5b7faf21e80480323b0573ceb4b4656c9e65d3ee91000937d184a99a50c5bc5697c78 SHA512 c097db15bf8ece86b4595078699f9644ab2026dd215288fdf202aff356c88d3bace38539cc280f4efcd2c467d0d17d26e4ca1ad278e4b7f89498fa2fbf034f93
-MISC metadata.xml 487 BLAKE2B 7d67f4b4e650d1cc83e80eb7ad5020ef997f92997d94f19274b7e0c794f9efdb3d085faa8582321f0732cf489a5358310368a2e22b8e471d815bc9b09a16f47e SHA512 6b88582ba918dd95faa5b7e3d4aeb59f7ff455a509c018c61f61a1d2e9f69734c9d02c9d666447ea787f771fd13b44f7a54b0e6147703187a7a9fe9fccf186e2
+MISC metadata.xml 488 BLAKE2B 06ed81aa4ffa49d1951a8ef639752bc701d798fa531737d4cb367ca198e65178f430d6b1e7f3b24ffcc332343dd58a0cc8ff5f2632a225e6c0f36ee50148aebd SHA512 8335bde47d396c018b32db406e18636edd7f3fe5704c901888d56690ec726aeb7d6f9e42fb7dbb1869c78b494c9cbc17ded3ca78b7576d6fdc0a8097bf996f60
diff --git a/dev-python/websockets/files/websockets-10.0-py3.9-fix-deprecation.patch b/dev-python/websockets/files/websockets-10.0-py3.9-fix-deprecation.patch
new file mode 100644
index 000000000000..bbfb500b9094
--- /dev/null
+++ b/dev-python/websockets/files/websockets-10.0-py3.9-fix-deprecation.patch
@@ -0,0 +1,35 @@
+--- a/tests/legacy/test_client_server.py
++++ b/tests/legacy/test_client_server.py
+@@ -229,7 +229,6 @@ class ClientServerTestsMixin:
+             and "remove loop argument" not in expected_warnings
+         ):  # pragma: no cover
+             expected_warnings += ["There is no current event loop"]
+-        self.assertDeprecationWarnings(recorded_warnings, expected_warnings)
+
+     def start_client(
+         self, resource_name="/", user_info=None, deprecation_warnings=None, **kwargs
+@@ -255,7 +254,6 @@ class ClientServerTestsMixin:
+             and "remove loop argument" not in expected_warnings
+         ):  # pragma: no cover
+             expected_warnings += ["There is no current event loop"]
+-        self.assertDeprecationWarnings(recorded_warnings, expected_warnings)
+
+     def stop_client(self):
+         try:
+@@ -457,16 +455,12 @@ class CommonClientServerTests:
+             with warnings.catch_warnings(record=True) as recorded_warnings:
+                 unix_server = unix_serve(default_handler, path, loop=self.loop)
+                 self.server = self.loop.run_until_complete(unix_server)
+-            self.assertDeprecationWarnings(recorded_warnings, ["remove loop argument"])
+
+             try:
+                 # Like self.start_client() but with unix_connect()
+                 with warnings.catch_warnings(record=True) as recorded_warnings:
+                     unix_client = unix_connect(path, loop=self.loop)
+                     self.client = self.loop.run_until_complete(unix_client)
+-                self.assertDeprecationWarnings(
+-                    recorded_warnings, ["remove loop argument"]
+-                )
+                 try:
+                     self.loop.run_until_complete(self.client.send("Hello!"))
+                     reply = self.loop.run_until_complete(self.client.recv())
diff --git a/dev-python/websockets/metadata.xml b/dev-python/websockets/metadata.xml
index 3380b2dc868e..b162fa66f853 100644
--- a/dev-python/websockets/metadata.xml
+++ b/dev-python/websockets/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
diff --git a/dev-python/websockets/websockets-10.0.ebuild b/dev-python/websockets/websockets-10.0.ebuild
new file mode 100644
index 000000000000..a03d8206adea
--- /dev/null
+++ b/dev-python/websockets/websockets-10.0.ebuild
@@ -0,0 +1,33 @@
+# 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="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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+distutils_enable_tests unittest
+
+PATCHES=(
+	# Fails checks for deprecations warnings on py3.9 for the loop argument
+	"${FILESDIR}/${P}-py3.9-fix-deprecation.patch"
+)
+
+src_prepare() {
+	# these fail due to timeouts on slower hardware
+	sed -e 's:test_keepalive_ping_with_no_ping_timeout:_&:' \
+		-e 's:test_keepalive_ping(:_&:' \
+		-i tests/legacy/test_protocol.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/websockets/websockets-9.1-r1.ebuild b/dev-python/websockets/websockets-9.1-r1.ebuild
index a68c4559025f..79f4bfdd411a 100644
--- a/dev-python/websockets/websockets-9.1-r1.ebuild
+++ b/dev-python/websockets/websockets-9.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 distutils_enable_tests unittest