gentoo resync : 20.03.2022

6 files changed, 2 insertions, 204 deletions

diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 5f56d3ad93b6..9d90b95518ca 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,9 +1,3 @@
-AUX requests-2.26.0-test.patch 1328 BLAKE2B 4f9e66505a4acfe7b4bd62c6c95c28fc01eb9fd7d09e151aef7da27fb105d5038ddc99c3d838c7a166d769223ff18ed0517e961ffa345459b4350ccdfa21b50d SHA512 89a4cf8d03f2bf8308cba1a6ed97b4f2340a2b9512636f2244f5f9cb6bae00300e73b58bbe53fad1d9c9e4e2e8e3298fa6741190869cfd4799e3be9bc56b0bc0
-AUX requests-2.26.0-trustme-dep.patch 1134 BLAKE2B c432d6edf75d37e62d529ce06ea5dc0ba88593f7c7b40900388bbfc2b8d8503870fe4226c256d36de9ca42f3b638ed5ea11176cb22ffe2e5d4828418e21619f6 SHA512 9f9383836d0bf5dd4f86ccf7e6f5d6d8f4601a68f42465958f431a8cc471d74584f616d1145fe21ae26c6b182a95758593a947b3dca7ad6fcd5f868421e182f2
-DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
-DIST requests-2.27.0.tar.gz 108487 BLAKE2B a24e9071d39b8677309c5a847910cfb8bf91b22b522bebc8166e9fb3a36ce9783bb23ad725d43aa19da5cf3a1b11bfc21766a2995ba9810b6c973b03a7acdd1b SHA512 9d43c637bebb1b98fc25f895308673153686ef0b97e5d568526fb63c348dc939fab620fd7c550fef0a2977e98a466c8dae0710cef5b969b28b9a4f3a1f9940f5
 DIST requests-2.27.1.tar.gz 106758 BLAKE2B a7fed53998fa61b3d03abd254a0cee76450c5b60d76f80aa6b91f32dca1dae5d2c51987b3d3f2138d72c50790e35c36cb03eb5974554ac4eb1a902eff79b5bdd SHA512 e51916abea8125254c5ee72c97e84a73e6981cab09961486873387522d2ce041ee3fe8fa2ff0b9bbe6707eefdc05145e9adcf127bcd999dea127acdfabd5312f
-EBUILD requests-2.26.0.ebuild 1806 BLAKE2B 986e2e35b139c752321d3d3034c8fa474531abafa2d3855f9ab3be0e6f86fab99565b2e98fc17fe82252a65e892bdda986373ffc63043953ca3eaf0b29623eb2 SHA512 c64c06742ba604d261512b92082984b6b1ad6534cc4de96f71efdbb7407ff94fbe6b42c303d6450d6f402e52576e55d515d60e148b4d7ef2e9a358f7f7a31a66
-EBUILD requests-2.27.0.ebuild 1732 BLAKE2B a7d032736c07d988f3e4553cc2454fbea11db684fb7d5044803ed67f1ed05ab773bd0a7d7e02d13ec4a365f5819ab451f659931e42161d9a898bdc3c190965fa SHA512 73810ad0ce77e28e8210c52511d3fae26cfc895577d248cc85e520ea22a0093e64edae7c14d95bbe34808fa94fb84186904e697e13ebc7e829c42a9d49bf4a8c
-EBUILD requests-2.27.1.ebuild 1732 BLAKE2B a7d032736c07d988f3e4553cc2454fbea11db684fb7d5044803ed67f1ed05ab773bd0a7d7e02d13ec4a365f5819ab451f659931e42161d9a898bdc3c190965fa SHA512 73810ad0ce77e28e8210c52511d3fae26cfc895577d248cc85e520ea22a0093e64edae7c14d95bbe34808fa94fb84186904e697e13ebc7e829c42a9d49bf4a8c
+EBUILD requests-2.27.1.ebuild 1724 BLAKE2B 8efb36f5c57b1aa267be65f715c2b88a22dee3159a49e6fe9d81db58704c82dee443b90d56ae55d2823f04a32e744a58702535fb33e0722af47a5427c35a94b0 SHA512 8e01172080338cc1823eea5a33e8f6a98036db97fd80f1ed53b336bbfd4514c9612a5fe205a925f34e3f01656266ad680c6dfee4d75d29cfbf50d4752d8efb41
 MISC metadata.xml 770 BLAKE2B a085a3bdbcc34c2297ad7d5a0e811c553aa77f12bba1ee8164cf63af2cd86adcef7b6080c984ea73a417ec690252540a0fc6072ee97b068b70f0f695696fc65c SHA512 de5c6a99ae18955f25895a93911570d41cb458eaaa9dc8b6edd09021c6dff3dda7bc2611d090b933837f83b8a7035769bb275bb844e1ac91b89a088dde3c7222
diff --git a/dev-python/requests/files/requests-2.26.0-test.patch b/dev-python/requests/files/requests-2.26.0-test.patch
deleted file mode 100644
index 6bbf78871713..000000000000
--- a/dev-python/requests/files/requests-2.26.0-test.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6552e5374c335d62ba960a74b5b978897c823376 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 10:33:22 +0200
-Subject: [PATCH] Fix creating non-listening sockets in tests on some platforms
-
-Fix the listen() invocation for the test server not to pass a backlog
-value of zero.  The value of zero means no backlog which effectively
-means that the socket can not accept any connections.  This does not
-matter for the majority of platforms since the value is only advisory
-and the platform tends to go with a bigger backlog anyway.  However,
-a few platforms (e.g. alpha or riscv Linux) do take the value literally,
-and therefore the tests fail since they are unable to connect to
-the server.  Let Python use a 'default reasonable value' instead.
----
- tests/testserver/server.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/testserver/server.py b/tests/testserver/server.py
-index 132221f7c4..92dcb6cb1a 100644
---- a/tests/testserver/server.py
-+++ b/tests/testserver/server.py
-@@ -78,7 +78,7 @@ def run(self):
-     def _create_socket_and_bind(self):
-         sock = socket.socket()
-         sock.bind((self.host, self.port))
--        sock.listen(0)
-+        sock.listen()
-         return sock
- 
-     def _close_server_sock_ignore_errors(self):
diff --git a/dev-python/requests/files/requests-2.26.0-trustme-dep.patch b/dev-python/requests/files/requests-2.26.0-trustme-dep.patch
deleted file mode 100644
index 5542bb68da90..000000000000
--- a/dev-python/requests/files/requests-2.26.0-trustme-dep.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 55da533a87afe188282b7f8dfbadeb30c21743d8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 27 Nov 2021 10:33:35 +0100
-Subject: [PATCH] Defer the trustme import until inside the fixture
-
-Move the trustme import from global scope into the nosan_server fixture
-in order to make it possible to deselect the test via command-line
-when trustme is not available.
----
- tests/conftest.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 099462cf52..4f9b2641b4 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -13,7 +13,6 @@
- 
- import pytest
- from requests.compat import urljoin
--import trustme
- 
- 
- def prepare_url(value):
-@@ -38,6 +37,10 @@ def httpbin_secure(httpbin_secure):
- 
- @pytest.fixture
- def nosan_server(tmp_path_factory):
-+    # delay importing until the fixture in order to make it possible
-+    # to deselect the test via command-line when trustme is not available
-+    import trustme
-+
-     tmpdir = tmp_path_factory.mktemp("certs")
-     ca = trustme.CA()
-     # only commonName, no subjectAltName
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
deleted file mode 100644
index 82d85a0a8333..000000000000
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="https://requests.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="socks5"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	dev-python/charset_normalizer[${PYTHON_USEDEP}]
-	<dev-python/idna-4[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test.patch
-	"${FILESDIR}"/${P}-trustme-dep.patch
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet (doctests)
-		requests/__init__.py::requests
-		requests/api.py::requests.api.request
-		requests/models.py::requests.models.PreparedRequest
-		requests/sessions.py::requests.sessions.Session
-		# require IPv4 interface in 10.* range
-		tests/test_requests.py::TestTimeout::test_connect_timeout
-		tests/test_requests.py::TestTimeout::test_total_timeout_connect
-		# TODO: openssl?
-		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
-	)
-
-	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_requests.py::TestRequests::test_https_warnings
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/requests/requests-2.27.0.ebuild b/dev-python/requests/requests-2.27.0.ebuild
deleted file mode 100644
index eac11c53b979..000000000000
--- a/dev-python/requests/requests-2.27.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="https://requests.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="socks5"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	dev-python/charset_normalizer[${PYTHON_USEDEP}]
-	<dev-python/idna-4[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet (doctests)
-		requests/__init__.py::requests
-		requests/api.py::requests.api.request
-		requests/models.py::requests.models.PreparedRequest
-		requests/sessions.py::requests.sessions.Session
-		# require IPv4 interface in 10.* range
-		tests/test_requests.py::TestTimeout::test_connect_timeout
-		tests/test_requests.py::TestTimeout::test_total_timeout_connect
-		# TODO: openssl?
-		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
-	)
-
-	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_requests.py::TestRequests::test_https_warnings
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/requests/requests-2.27.1.ebuild b/dev-python/requests/requests-2.27.1.ebuild
index eac11c53b979..43ac7fa5fa3c 100644
--- a/dev-python/requests/requests-2.27.1.ebuild
+++ b/dev-python/requests/requests-2.27.1.ebuild
@@ -15,7 +15,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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="socks5"
 
 RDEPEND="