gentoo resync : 05.12.2021

8 files changed, 18 insertions, 323 deletions

diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 1c5c9c6b8d7b..bffd49f94698 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,12 +1,5 @@
-AUX werkzeug-2.0.1-py310.patch 2951 BLAKE2B d820edb9a7e8d94e1783b3a5e2dcb1a12993b00bba92593257447063073a8f9ae0787241ffd2c80776906bb28089c463b32996b7602aa9ba4a15234eec8986a0 SHA512 5f0692374be1af49dd14c8793ee827fe584e5f3d81845f7b57050c3c2ddfd7bd61812ce5d5be527c26562cbfa2c1dd0cf3932fe8e8019f8cd4e48d1d2c8c1e15
-AUX werkzeug-2.0.1-test-warning.patch 2830 BLAKE2B 292f19ade3dec20def690e56caa5191bb4a8df730c6e7476b1b26aaa52de362c0804e4d03919b6df957f51b75a735546c748553b2d90862e597381edc87d7265 SHA512 7e640954110367c631f534cb3355544fa792fc841e3f70c8de0db31a088f3b05cc81094f935b0b1b3a45c0b173115a86126f525ba8963bfaf9f96cb6d60e24b1
 DIST werkzeug-1.0.1.gh.tar.gz 907482 BLAKE2B d2dcdce8b1bcbb177b52b0915f2c0ac17d235dee3c77b23e81e4b35412d1f53a194d3c7c7f2a5c065ade99797effe72cc464cf6980b12c761a8a919338021660 SHA512 ba82120fb3e96e3a1334c6452d5ba1950fc016d2d147d643bbc2168ccec496f1dea799982ae8c578167155082c0bdbda5d56a23f64b4b6865f97e90e22df022e
-DIST werkzeug-2.0.0.gh.tar.gz 894475 BLAKE2B 608de444944fa0bd35c0244a30967446abb8f0d05a8cd49f09707c368b6f9649b299f427fa7bc2e54628cf3eb688c399e420ecd54f12d7eab9cb063c7c740b07 SHA512 8c8e36a58fe53ac4ad3152a34145c726a9145782262b9d47be7bfe9a8e127666b0d0c0c50d305277a153298644732efe37e3785ceaa5b11394adfeb70d86e70d
-DIST werkzeug-2.0.1.gh.tar.gz 894795 BLAKE2B cef0c6d704604d8b63d9e9d1ef8f232f97cae6654a4284b66ba7cd97f850df725d644ea11ed898a53f69668247545de86a9c44bc381606c700f4e2611fea7699 SHA512 721a6c3cf8f803c80873f68d94b273da2ddda79b5e83d9283b9af3d3c971bb8c7ac7828c7a60c33b9bded7b05f063810df12fc266ee7d264dc6261100fc97708
 DIST werkzeug-2.0.2.gh.tar.gz 896727 BLAKE2B 15506d57a8545eb45cb0f4efb78bcc4dfc1faa68910f09dfdd14f4bbb2404078247a7f61475c5fff9058a1557f7f6541eec262fb274e7ed82e1a82b9f644cf8b SHA512 789f210546c089e8a437a379e516147fd854806357938bd559a61855182143bdeca967c86a41d004e6adb119d31e4493e3c36e74aff989ee9cd08e48d1428dd9
-EBUILD werkzeug-1.0.1-r1.ebuild 1352 BLAKE2B 8e8cc3e15bb6f78ff783fcb03ddc54bae9abed4b25012e71766902b9d2bdb3699c53a71608b95b58a625ce6091d61d2745524a38a6f44dcb77490c5d720f2261 SHA512 329fa7ed8319d7eec1321369ad4e19cc345d21a5ab3f5d954bf2bc17a0c1b6336baaa52081086cb08e0dfe9ce032c44e207d25c0de868d8a2b24e88afbd8e3d2
-EBUILD werkzeug-2.0.0.ebuild 1015 BLAKE2B dbbafdea67df22156976230b705228f23f5fde4d3f8e98c932b032f7ae498e8b41dbac7e70d67b98eb3886c0739ba79309ef41d1d24207e9d3014c37a715d585 SHA512 66002c896e3c4b0c204a7e7d9c5cc5686165c8343d3c92cb8350064504dd6528b6739dd77a3e806c4e5a7e336b8e87f5648d29b19d3d16442dba4977ed45d434
-EBUILD werkzeug-2.0.1-r1.ebuild 1169 BLAKE2B 2a32953488b2934bf6e7548a023156689dd1c36ec6d95cf8d1305ce6f5028ed7dcb591b4f9ccd82adbf60929502a39b191011b95c4badbc84fd7d448186bb64a SHA512 f367265ef139ac60bd6cef591cedc53b2eb6ae47be8432f9ee1c191c4b39bccb085d433795ba43cd62ada1007b280c34f4923ce984930b7296714916830199ca
-EBUILD werkzeug-2.0.1.ebuild 1015 BLAKE2B dbbafdea67df22156976230b705228f23f5fde4d3f8e98c932b032f7ae498e8b41dbac7e70d67b98eb3886c0739ba79309ef41d1d24207e9d3014c37a715d585 SHA512 66002c896e3c4b0c204a7e7d9c5cc5686165c8343d3c92cb8350064504dd6528b6739dd77a3e806c4e5a7e336b8e87f5648d29b19d3d16442dba4977ed45d434
-EBUILD werkzeug-2.0.2.ebuild 1088 BLAKE2B 40a807dea22ac1f499fc4d9b8eb375d07b0d21967c75aea6388a80c9f059aeff2923b96c68e798faf3774b2b5cc011712c0133fac9f123c667db4e3aaf933f3e SHA512 d614c0bc6dedf3c5e7f737c2aa5281e24fa95d62396ff1431e6c132d07bb9d50147db23a3ec41956e1855afed2780b14202f01a45fb4c9d66d6b2fa3ff4fa60e
+EBUILD werkzeug-1.0.1-r1.ebuild 1391 BLAKE2B 38d11b9aa090f534d7b48d796281d517b9e9f109b587d52f07aaf87404a58c67f3a59b1b5494ad3fb1636327bf705f8fc90d1657c49456530ef6c54c8334644c SHA512 abd534057abb560b7fe9809c3575c17529b255cf6a1aca65a159f8b46b6e3d9f4e21a226f1d5460e8a49ec1dcd9224bde5d27df468922d487044fca3891462a3
+EBUILD werkzeug-2.0.2.ebuild 1381 BLAKE2B c4f2aa9078f22af4ca7927fdb41844a27e34a2c3d77e770a3030954475f893c2668bcd0d3a1603271a1b5cb6204feb0c0f60313c2fd02d1b8a427395921f7f6b SHA512 870d40855114e58a8e839f6c368461e29035bb9d3698e1e7a7289c7a0ce90b394ad603a92efe816c5a1d8d7fb08ec042486a34797c4fd332ac3d42bc72d3b79f
 MISC metadata.xml 368 BLAKE2B 81932229098620395623f9149ac974f19fae9b65ad09943ee5c5d8d03c1e37e76061291c959fe5f004f531a244b3bb335c2a43dd66949c0be43493e45674d0e3 SHA512 67e5b5fea8052c0723820125271ea031ad984e0fe2af21d2423fc559bdc51dfe1d40f2fa5fe11e6d2b8b32216e716900080b859aad146c079ad2b390dd9844cf
diff --git a/dev-python/werkzeug/files/werkzeug-2.0.1-py310.patch b/dev-python/werkzeug/files/werkzeug-2.0.1-py310.patch
deleted file mode 100644
index 56a0166d334d..000000000000
--- a/dev-python/werkzeug/files/werkzeug-2.0.1-py310.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 584f3cff7d5cb8a588189ae1137b814cf5c47e05 Mon Sep 17 00:00:00 2001
-From: David Lord <davidism@gmail.com>
-Date: Wed, 19 May 2021 20:01:58 -0700
-Subject: [PATCH] address deprecation warnings from Python 3.10b1
-
----
- tests/conftest.py   |  5 ++++-
- tests/test_local.py | 34 +++++++++++++++++++++++++---------
- 2 files changed, 29 insertions(+), 10 deletions(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 3b5cbd71c..4ad1ff23e 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -66,7 +66,10 @@ def connect(self, **kwargs):
- 
-         if protocol == "https":
-             if "context" not in kwargs:
--                kwargs["context"] = ssl.SSLContext()
-+                context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-+                context.check_hostname = False
-+                context.verify_mode = ssl.CERT_NONE
-+                kwargs["context"] = context
- 
-             return http.client.HTTPSConnection(self.addr, **kwargs)
- 
-diff --git a/tests/test_local.py b/tests/test_local.py
-index 537fc32fb..b5c392890 100644
---- a/tests/test_local.py
-+++ b/tests/test_local.py
-@@ -12,6 +12,18 @@
- from werkzeug import local
- 
- 
-+if sys.version_info < (3, 7):
-+
-+    def run_async(coro):
-+        return asyncio.get_event_loop().run_until_complete(coro)
-+
-+
-+else:
-+
-+    def run_async(coro):
-+        return asyncio.run(coro)
-+
-+
- def test_basic_local():
-     ns = local.Local()
-     ns.foo = 0
-@@ -55,9 +67,11 @@ async def value_setter(idx):
-         await asyncio.sleep(0.02)
-         values.append(ns.foo)
- 
--    loop = asyncio.get_event_loop()
--    futures = [asyncio.ensure_future(value_setter(idx)) for idx in [1, 2, 3]]
--    loop.run_until_complete(asyncio.gather(*futures))
-+    async def main():
-+        futures = [asyncio.ensure_future(value_setter(i)) for i in [1, 2, 3]]
-+        await asyncio.gather(*futures)
-+
-+    run_async(main())
-     assert sorted(values) == [1, 2, 3]
- 
-     def delfoo():
-@@ -118,9 +132,11 @@ async def task():
-         ls.push(1)
-         assert len(ls._local.stack) == 2
- 
--    loop = asyncio.get_event_loop()
--    futures = [asyncio.ensure_future(task()) for _ in range(3)]
--    loop.run_until_complete(asyncio.gather(*futures))
-+    async def main():
-+        futures = [asyncio.ensure_future(task()) for _ in range(3)]
-+        await asyncio.gather(*futures)
-+
-+    run_async(main())
- 
- 
- @pytest.mark.skipif(
-@@ -571,7 +587,7 @@ async def get():
-     async def main():
-         return await p
- 
--    out = asyncio.get_event_loop().run_until_complete(main())
-+    out = run_async(main())
-     assert out == 1
- 
- 
-@@ -599,7 +615,7 @@ async def main():
- 
-         return out
- 
--    out = asyncio.get_event_loop().run_until_complete(main())
-+    out = run_async(main())
-     assert out == [2, 1, 0]
- 
- 
-@@ -623,4 +639,4 @@ async def main():
-         assert p.value == 2
-         return True
- 
--    assert asyncio.get_event_loop().run_until_complete(main())
-+    assert run_async(main())
diff --git a/dev-python/werkzeug/files/werkzeug-2.0.1-test-warning.patch b/dev-python/werkzeug/files/werkzeug-2.0.1-test-warning.patch
deleted file mode 100644
index 3bb14ab6ba42..000000000000
--- a/dev-python/werkzeug/files/werkzeug-2.0.1-test-warning.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 4201d0f6d1b337a0e69900a79042215896eede4a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 19 Jun 2021 09:51:43 +0200
-Subject: [PATCH] Fix warning tests to work correctly without -Werror
-
-Use pytest.warns() instead of pytest.raises() to test for warnings,
-in order to make these tests work correctly without -Werror.  This does
-not change the behavior with -Werror.
-
-While -Werror is useful for package maintainers / CI, it is problematic
-for testing on end user systems.  For end users, it is important whether
-the particular version of package is going to work on their setup,
-not whether it does not use anything that's deprecated but still
-working.
----
- CHANGES.rst            |  2 ++
- tests/test_wrappers.py | 12 ++++++------
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/CHANGES.rst b/CHANGES.rst
-index 8fa1e454..9a05145f 100644
---- a/CHANGES.rst
-+++ b/CHANGES.rst
-@@ -5,6 +5,8 @@ Version 2.1.0
- 
- Unreleased
- 
-+-   Fix warning tests to work correctly without -Werror
-+
- 
- Version 2.0.2
- -------------
-diff --git a/tests/test_wrappers.py b/tests/test_wrappers.py
-index 3ac80003..fe8c01f3 100644
---- a/tests/test_wrappers.py
-+++ b/tests/test_wrappers.py
-@@ -1633,29 +1633,29 @@ def test_response_mixins_deprecated(cls):
-     class CheckResponse(cls, wrappers.Response):
-         pass
- 
--    with pytest.raises(DeprecationWarning, match=cls.__name__):
-+    with pytest.warns(DeprecationWarning, match=cls.__name__):
-         CheckResponse()
- 
- 
- def test_check_base_deprecated():
--    with pytest.raises(DeprecationWarning, match=r"issubclass\(cls, Request\)"):
-+    with pytest.warns(DeprecationWarning, match=r"issubclass\(cls, Request\)"):
-         assert issubclass(wrappers.Request, wrappers.BaseRequest)
- 
--    with pytest.raises(DeprecationWarning, match=r"isinstance\(obj, Request\)"):
-+    with pytest.warns(DeprecationWarning, match=r"isinstance\(obj, Request\)"):
-         assert isinstance(
-             wrappers.Request({"SERVER_NAME": "example.org", "SERVER_PORT": "80"}),
-             wrappers.BaseRequest,
-         )
- 
--    with pytest.raises(DeprecationWarning, match=r"issubclass\(cls, Response\)"):
-+    with pytest.warns(DeprecationWarning, match=r"issubclass\(cls, Response\)"):
-         assert issubclass(wrappers.Response, wrappers.BaseResponse)
- 
--    with pytest.raises(DeprecationWarning, match=r"isinstance\(obj, Response\)"):
-+    with pytest.warns(DeprecationWarning, match=r"isinstance\(obj, Response\)"):
-         assert isinstance(wrappers.Response(), wrappers.BaseResponse)
- 
- 
- def test_response_freeze_no_etag_deprecated():
--    with pytest.raises(DeprecationWarning, match="no_etag"):
-+    with pytest.warns(DeprecationWarning, match="no_etag"):
-         Response("Hello, World!").freeze(no_etag=True)
- 
- 
--- 
-2.32.0
-
diff --git a/dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild b/dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild
index 06a02a9a926f..a22e39af6191 100644
--- a/dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild
+++ b/dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild
@@ -26,10 +26,12 @@ RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
 DEPEND="
 	test? (
 		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		!alpha? ( !hppa? ( !ia64? (
+			dev-python/cryptography[${PYTHON_USEDEP}]
+		) ) )
 	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/werkzeug/werkzeug-2.0.0.ebuild b/dev-python/werkzeug/werkzeug-2.0.0.ebuild
deleted file mode 100644
index 1605d4dbfa38..000000000000
--- a/dev-python/werkzeug/werkzeug-2.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://werkzeug.palletsprojects.com/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug"
-SRC_URI="
-	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		!hppa? ( !ia64? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' 'python*')
-		) )
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/watchdog[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# the default portage tempdir is too long for AF_UNIX sockets
-	local -x TMPDIR=/tmp
-	epytest -p no:httpbin tests
-}
diff --git a/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild b/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
deleted file mode 100644
index 16a9a2ce257f..000000000000
--- a/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://werkzeug.palletsprojects.com/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug/"
-SRC_URI="
-	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		!hppa? ( !ia64? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' 'python*')
-		) )
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/watchdog[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-	"${FILESDIR}"/${P}-test-warning.patch
-)
-
-python_test() {
-	distutils_install_for_testing --via-venv
-
-	# the default portage tempdir is too long for AF_UNIX sockets
-	local -x TMPDIR=/tmp
-	epytest -p no:httpbin tests
-}
diff --git a/dev-python/werkzeug/werkzeug-2.0.1.ebuild b/dev-python/werkzeug/werkzeug-2.0.1.ebuild
deleted file mode 100644
index 1605d4dbfa38..000000000000
--- a/dev-python/werkzeug/werkzeug-2.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://werkzeug.palletsprojects.com/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug"
-SRC_URI="
-	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		!hppa? ( !ia64? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' 'python*')
-		) )
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/watchdog[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# the default portage tempdir is too long for AF_UNIX sockets
-	local -x TMPDIR=/tmp
-	epytest -p no:httpbin tests
-}
diff --git a/dev-python/werkzeug/werkzeug-2.0.2.ebuild b/dev-python/werkzeug/werkzeug-2.0.2.ebuild
index a3124ca8879c..2393f1d4daef 100644
--- a/dev-python/werkzeug/werkzeug-2.0.2.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.0.2.ebuild
@@ -17,11 +17,10 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
 		!hppa? ( !ia64? (
 			$(python_gen_cond_dep '
 				dev-python/greenlet[${PYTHON_USEDEP}]
@@ -30,11 +29,23 @@ BDEPEND="
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
 		dev-python/watchdog[${PYTHON_USEDEP}]
+		!alpha? ( !hppa? ( !ia64? (
+			dev-python/cryptography[${PYTHON_USEDEP}]
+		) ) )
 	)"
 
 distutils_enable_tests pytest
 
 python_test() {
+	local EPYTEST_DESELECT=()
+	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			"tests/test_serving.py::test_server[https]"
+			tests/test_serving.py::test_ssl_dev_cert
+			tests/test_serving.py::test_ssl_object
+		)
+	fi
+
 	distutils_install_for_testing --via-venv
 
 	# the default portage tempdir is too long for AF_UNIX sockets