gentoo christmass resync : 25.12.2020

7 files changed, 100 insertions, 212 deletions

diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index ba86a233ac6d..7117a11bd9fd 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,12 +1,7 @@
-DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40189561fa0ea393a8a2515b24da9a2a383aeec35b55bdd2a9954d3d585450d759548358ed91ecfdb9ec03d391b6 SHA512 9939e9e7c4da30b5effb334969cd835c9d0404a136761098203c699570aab02e63fb3f1b4ab680def0bc0906fabe5f0782ab94cf3095ff10ccf9b3c371653cf2
+AUX urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch 3500 BLAKE2B ed204b228bbe0410fab37bc8d8ae6cb8f4849f3e31c17548e77bb0984712e298a7a5c486664debebcacd19dd1ac46371d583019a6ba279e5ead3a1d09f6b7a49 SHA512 e52cc96e11be6050df1c40f3c024de89423b5ffe4bdbcd98a0dd775354c999cf2ee9c99835b2b7b3c194bf8c15aed6a8b62b81c6c9d142afd1227614c50d88be
 DIST urllib3-1.25.11.tar.gz 260300 BLAKE2B 06bd2107bad479e36c6474f95567c3ecb119d18b193b358df9e345e4d09392366255b21597b26fbf2374220b921cc2117a1972f88021c3a6ebac3844a319acbe SHA512 58f77edb9ced62cbac7b0baf2651c07f9f413267f103730ee25f08c5d4d0bf52a2ace02f58841bcd55652db677c7a1dc9a756681e7e32d590bc69d8b93e8f173
-DIST urllib3-1.26.0.tar.gz 291709 BLAKE2B e750bcd28c6205cb8e7f12c2a1c6123d48979877b206914fc122f67ff6cdf3e16e5d7ee0ffae1f4af40f028075f9592cdebf8856ca7e29b541283a8023afbf0d SHA512 5e5a78486cded9a378532a094818cfcaf6ec621d3aefbffac4c78f130798ee06f08e47d14f3d154274a502c8c1e3963a12d65030ba6109108ed786202637bd42
-DIST urllib3-1.26.1.tar.gz 286708 BLAKE2B 19f210a56850e9754faa7a7a309292ba69450ba3ca232bc42f10e1f163eb72e7430eb233d8a0ee1cf97acbdfa132b2e515561e67fade3806347e04e6c7869db2 SHA512 5fbb28e190ecf58aae0932994bc1adb1542041bf96f176a9ece22bd6ee8d4ae8dc8f40dea77359601b704025e65c65ca27137f65d3d47fac3fc796b7bbd112f3
 DIST urllib3-1.26.2.tar.gz 286877 BLAKE2B dc5884e2561fae476ba8695cf9e50abb63d8dfc45ad6219d07ba30ecae48e5f27fbdd9a324c0e71f739555c90a3653f18eda513f2ea45b76abcd8c6c714ec0f7 SHA512 4de7cf844ed0deb83c4129e1b1742eafefe95035dd7ffbeaeaaccabca8bd361de9fa240882ea4dec16a7f0b5c5684416656f0d58bea15e7aefd4132024a25c9e
-EBUILD urllib3-1.24.2-r1.ebuild 1703 BLAKE2B e1804f51aa6a97428113bf331bae402b83ab2cc0003da78c7d4971e460a51ed21e46d1b305817729197b23bbfecaedcfd8f9472ab1ec23efa0a3a93a7683f6c4 SHA512 da2e961ef19fbabe39d9a60b292e4880c7ae36bd2c072c0b1aa4bc13afa249f31548b0177522773b23d04cb5ecc1d52861a366c26c42fd0a776906c13e5b30ae
 EBUILD urllib3-1.25.11.ebuild 1881 BLAKE2B f2a921171089005271e27668bd1c48f67443dbe116319da9f43fec2b235045b5ed5ebd5f4349aa0c48e0f45f9b11b7ffde5a1ecfcb8d1c675b2ca95cd578c8cf SHA512 11762392c093a018d44cdfe6b31ae885614e326e61f81461cc22da982d1b98713fbf9597c20dad9ca8b04fb7568c8aa1e1abdabeb542abe9ebe13c8f565a2440
-EBUILD urllib3-1.26.0.ebuild 1890 BLAKE2B a25bbbeb8323df1d49b70a64693cae36153a7d7b8a1c146fe3f61db1fc402ec2ee119ca98da4c7d564c2956b3b1bd9c8efa55a86c84d5351397e64e0c737059c SHA512 40d5958b457670f4e37daa87276ff82a83feeb3cd611fc0b847960c3a339ca3d1860dfeac9fc00628eb2e63e09827a7b022e85f1685419d7e46184689a5465d0
-EBUILD urllib3-1.26.1.ebuild 1890 BLAKE2B a25bbbeb8323df1d49b70a64693cae36153a7d7b8a1c146fe3f61db1fc402ec2ee119ca98da4c7d564c2956b3b1bd9c8efa55a86c84d5351397e64e0c737059c SHA512 40d5958b457670f4e37daa87276ff82a83feeb3cd611fc0b847960c3a339ca3d1860dfeac9fc00628eb2e63e09827a7b022e85f1685419d7e46184689a5465d0
-EBUILD urllib3-1.26.2-r1.ebuild 1825 BLAKE2B a3bc60046df89ddfc65f3beefa400a03c8b4d01bf9c8b95defea674e5637469323e8310b2cd893973bc13ed3d97cf42076a2a6f07e8e15a9cc53f618ee46d885 SHA512 1393694dd64fd19f4b823cbad68027e65a96402c425ae2c818a74f1b4b466af48f0450a73711f30e6c90aba2e4eb2e5394341ecd7f95aea99e9c903a7ff86d6a
-EBUILD urllib3-1.26.2.ebuild 1828 BLAKE2B 3a27af42833ea21292351a0d1fb903f5a5da4d270028a2ea5034932e416b4b6c1eee05b3f73515c5b8635d7154f4829c23fb1e45a1379e0005470db96e593cb8 SHA512 89b717a8434b6833994381b095ece61ae7cd89cfa70c68441ae3119cc1c277f6718903f19c6ae36fb8ed3bce40dd308a81e28edff90ba78ba46385bea079d1f5
+EBUILD urllib3-1.26.2-r1.ebuild 1993 BLAKE2B af6aec80e62401c1db9352b74249d2de87f6fe99896a9058103af0a4e7a885d11b592470e41c1a303a1f240cc41759129a3c1f9d56df78368c625d420bae1f89 SHA512 95b94b68441f94fc1f2f6097bc67869a564200f82db750d22d1761cfff01e2826d9c75a4bd4f7eafddc922c2338991e21aad9f5c37113b018d560df2e50333ee
+EBUILD urllib3-1.26.2.ebuild 1893 BLAKE2B de0cfb0f72a9375e580714f22f3a9b48cab98f26e502c2fe7f60a3b234f3680dbb0bf822e7beb58af39f8d3fb855f6da1f9a5948a81299a75e5bf8f4c25003db SHA512 e104a327e434c6d56fdbabc1d431bd3a34cd267225aae1f4578b79d1cbba64026520de7ee636b8e3d45b5b0280cf59f0b701bb312afee01efa82eb13b7bf668e
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/files/urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch b/dev-python/urllib3/files/urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch
new file mode 100644
index 000000000000..2af65e84f016
--- /dev/null
+++ b/dev-python/urllib3/files/urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch
@@ -0,0 +1,87 @@
+Fixes a hang on test_proxy_rejection.
+https://github.com/urllib3/urllib3/commit/087d4de8487379033970898866625c00e0d51c85.patch
+
+From 087d4de8487379033970898866625c00e0d51c85 Mon Sep 17 00:00:00 2001
+From: Quentin Pradet <quentin.pradet@gmail.com>
+Date: Tue, 3 Nov 2020 17:15:50 +0400
+Subject: [PATCH] Fix test_proxy_rejection even with two localhost entries
+
+---
+ test/contrib/test_socks.py | 34 +++++++++++++++++++++++++++++++---
+ 1 file changed, 31 insertions(+), 3 deletions(-)
+
+diff --git a/test/contrib/test_socks.py b/test/contrib/test_socks.py
+index 1966513c1..ed716f188 100644
+--- a/test/contrib/test_socks.py
++++ b/test/contrib/test_socks.py
+@@ -1,8 +1,12 @@
++from __future__ import absolute_import
++
+ import socket
+ import threading
++from socket import getaddrinfo as real_getaddrinfo
+ from test import SHORT_TIMEOUT
+ 
+ import pytest
++import socks as py_socks
+ 
+ from dummyserver.server import DEFAULT_CA, DEFAULT_CERTS
+ from dummyserver.testcase import IPV4SocketDummyServerTestCase
+@@ -87,6 +91,26 @@ def _address_from_socket(sock):
+         raise RuntimeError("Unexpected addr type: %r" % addr_type)
+ 
+ 
++def _set_up_fake_getaddrinfo(monkeypatch):
++    # Work around https://github.com/urllib3/urllib3/pull/2034
++    # Nothing prevents localhost to point to two different IPs. For example, in the
++    # Ubuntu set up by GitHub Actions, localhost points both to 127.0.0.1 and ::1.
++    #
++    # In case of failure, PySocks will try the same request on both IPs, but our
++    # handle_socks[45]_negotiation functions don't handle retries, which leads either to
++    # a deadlock or a timeout in case of a failure on the first address.
++    #
++    # However, some tests need to exercise failure. We don't want retries there, but
++    # can't affect PySocks retries via its API. Instead, we monkeypatch PySocks so that
++    # it only sees a single address, which effectively disables retries.
++    def fake_getaddrinfo(addr, port, family, socket_type):
++        gai_list = real_getaddrinfo(addr, port, family, socket_type)
++        gai_list = [gai for gai in gai_list if gai[0] == socket.AF_INET]
++        return gai_list[:1]
++
++    monkeypatch.setattr(py_socks.socket, "getaddrinfo", fake_getaddrinfo)
++
++
+ def handle_socks5_negotiation(sock, negotiate, username=None, password=None):
+     """
+     Handle the SOCKS5 handshake.
+@@ -334,7 +358,8 @@ def request_handler(listener):
+             with pytest.raises(NewConnectionError):
+                 pm.request("GET", "http://example.com", retries=False)
+ 
+-    def test_proxy_rejection(self):
++    def test_proxy_rejection(self, monkeypatch):
++        _set_up_fake_getaddrinfo(monkeypatch)
+         evt = threading.Event()
+ 
+         def request_handler(listener):
+@@ -429,7 +454,9 @@ def request_handler(listener):
+             assert response.data == b""
+             assert response.headers["Server"] == "SocksTestServer"
+ 
+-    def test_socks_with_invalid_password(self):
++    def test_socks_with_invalid_password(self, monkeypatch):
++        _set_up_fake_getaddrinfo(monkeypatch)
++
+         def request_handler(listener):
+             sock = listener.accept()[0]
+ 
+@@ -592,7 +619,8 @@ def request_handler(listener):
+             response = pm.request("GET", "http://example.com")
+             assert response.status == 200
+ 
+-    def test_proxy_rejection(self):
++    def test_proxy_rejection(self, monkeypatch):
++        _set_up_fake_getaddrinfo(monkeypatch)
+         evt = threading.Event()
+ 
+         def request_handler(listener):
diff --git a/dev-python/urllib3/urllib3-1.24.2-r1.ebuild b/dev-python/urllib3/urllib3-1.24.2-r1.ebuild
deleted file mode 100644
index e2c7aedf4805..000000000000
--- a/dev-python/urllib3/urllib3-1.24.2-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/shazow/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" 'python3*')
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/alabaster \
-	dev-python/mock
-
-python_prepare_all() {
-	# skip appengine tests
-	rm -r test/appengine || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# FIXME: get tornado ported
-	case ${EPYTHON} in
-		python2*)
-			ewarn "Tests are being skipped for Python 2 in order to reduce the number"
-			ewarn "of circular dependencies for Python 2 removal.  Please test"
-			ewarn "manually in a virtualenv."
-			;;
-		python3*)
-			pytest -vv || die "Tests fail with ${EPYTHON}"
-			;;
-	esac
-}
diff --git a/dev-python/urllib3/urllib3-1.26.0.ebuild b/dev-python/urllib3/urllib3-1.26.0.ebuild
deleted file mode 100644
index d690d8c84ad2..000000000000
--- a/dev-python/urllib3/urllib3-1.26.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlipy[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{6,7,8,9})
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/alabaster \
-	dev-python/mock
-
-python_prepare_all() {
-	# https://github.com/urllib3/urllib3/issues/1756
-	sed -e 's:10.255.255.1:240.0.0.0:' \
-		-i test/__init__.py || die
-	# tests failing if 'localhost.' cannot be resolved
-	sed -e 's:test_dotted_fqdn:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	case ${EPYTHON} in
-		python3*)
-			pytest -vv || die "Tests fail with ${EPYTHON}"
-			;;
-	esac
-}
diff --git a/dev-python/urllib3/urllib3-1.26.1.ebuild b/dev-python/urllib3/urllib3-1.26.1.ebuild
deleted file mode 100644
index d690d8c84ad2..000000000000
--- a/dev-python/urllib3/urllib3-1.26.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlipy[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{6,7,8,9})
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/alabaster \
-	dev-python/mock
-
-python_prepare_all() {
-	# https://github.com/urllib3/urllib3/issues/1756
-	sed -e 's:10.255.255.1:240.0.0.0:' \
-		-i test/__init__.py || die
-	# tests failing if 'localhost.' cannot be resolved
-	sed -e 's:test_dotted_fqdn:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	case ${EPYTHON} in
-		python3*)
-			pytest -vv || die "Tests fail with ${EPYTHON}"
-			;;
-	esac
-}
diff --git a/dev-python/urllib3/urllib3-1.26.2-r1.ebuild b/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
index 2345ae630e33..434b386f83d6 100644
--- a/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
@@ -41,6 +41,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-test_proxy_rejection-test-hang.patch"
+)
+
 python_prepare_all() {
 	# https://github.com/urllib3/urllib3/issues/1756
 	sed -e 's:10.255.255.1:240.0.0.0:' \
diff --git a/dev-python/urllib3/urllib3-1.26.2.ebuild b/dev-python/urllib3/urllib3-1.26.2.ebuild
index 88cad5ac5164..e67900b27bd2 100644
--- a/dev-python/urllib3/urllib3-1.26.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
@@ -41,6 +41,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-test_proxy_rejection-test-hang.patch"
+)
+
 python_prepare_all() {
 	# https://github.com/urllib3/urllib3/issues/1756
 	sed -e 's:10.255.255.1:240.0.0.0:' \