gentoo resync : 14.12.2020

3 files changed, 80 insertions, 14 deletions

diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index ce87121dd9a8..ba86a233ac6d 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -7,5 +7,6 @@ EBUILD urllib3-1.24.2-r1.ebuild 1703 BLAKE2B e1804f51aa6a97428113bf331bae402b83a
 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
-MISC metadata.xml 548 BLAKE2B 47edce866bd0c727c4b945630c97f2944c34f8e81c43bdbe57e28c4859dd3e681c64eb2d3b75101ad41c85587890ddbc819a2fd04188331dd5fad23a1d9d0ba9 SHA512 014f625e8de5ea3f00628fe360db47dde9dc82efd0b11218b4118a20b7638bd4e6ac14253888073740c0dca4a19a196567cc2af1864d52f3e1c959389c77c9d2
+MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/metadata.xml b/dev-python/urllib3/metadata.xml
index c5e3b54263ca..7e9d137e62a8 100644
--- a/dev-python/urllib3/metadata.xml
+++ b/dev-python/urllib3/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <use>
-    <flag name="brotli">Enable support for brotli compression</flag>
-  </use>
-  <upstream>
-    <remote-id type="pypi">urllib3</remote-id>
-    <remote-id type="github">shazow/urllib3</remote-id>
-    <remote-id type="cpe">cpe:/a:urllib3:urllib3</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<use>
+		<flag name="brotli">Enable support for brotli compression</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">urllib3</remote-id>
+		<remote-id type="cpe">cpe:/a:urllib3:urllib3</remote-id>
+		<remote-id type="github">urllib3/urllib3</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/urllib3/urllib3-1.26.2-r1.ebuild b/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
new file mode 100644
index 000000000000..2345ae630e33
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
@@ -0,0 +1,65 @@
+# 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 ~s390 ~sparc ~x86 ~x64-macos"
+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/brotlicffi[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlicffi[\${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})
+	)
+"
+
+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
+}