gentoo resync : 23.09.2020

4 files changed, 4 insertions, 93 deletions

diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 943ecb1a4584..07889759d8ed 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,7 +1,5 @@
 DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40189561fa0ea393a8a2515b24da9a2a383aeec35b55bdd2a9954d3d585450d759548358ed91ecfdb9ec03d391b6 SHA512 9939e9e7c4da30b5effb334969cd835c9d0404a136761098203c699570aab02e63fb3f1b4ab680def0bc0906fabe5f0782ab94cf3095ff10ccf9b3c371653cf2
 DIST urllib3-1.25.10.tar.gz 256875 BLAKE2B 3f2ad2cb3ac9a09f73c1ec03e89aa7313055afa443c53ec82fd9227348859566e20ca33b803972134be24eeed070c63b98e6ae75efde4006e2a4bb7b4cf3f054 SHA512 5718dab472a476bfd555753758ceef46c81dc358131205b6db05d186a66f397dc07252eda1622d12586390ccf14e8e17acdb9486c17cb7d34e323287a67373af
-DIST urllib3-1.25.9.tar.gz 254921 BLAKE2B bd78d7a1de71ffe3b1f62352bb49f94fd402870f57e86ae07ea5462706c19b0ae1f8e23a7e8a4a83482b57e007cb95f5ae242d179cec7e9568fcb440b9d95b82 SHA512 505f1d9137e469a48ee0de417f2be36946cf1d9bbcf1233280be399a6c6d8650b5b3c6cfcf884b04e0156974da703f48843381b9aab377738a2e60f7d2d3799b
-EBUILD urllib3-1.24.2.ebuild 1786 BLAKE2B 3c413607941e08872efa7f4f598e69d6a858adea7505b183ae2efeb7bf418edf8b06fbd04d0f3aa640a50f9ee18616f8b5186f382fb8fc6f250a667348c7d088 SHA512 4f217cb09fc22adb26371a336d42c274be4ca2aa1e8ea5404b8ac97f573b7d7f6c577b8e12a5f9281e1df39e4967614c8f9d9aa626c3544bef20c86053f1a95e
-EBUILD urllib3-1.25.10.ebuild 2112 BLAKE2B 0e8f86ee6e056d6e9028c703cd961915c686d77098d725a92d9e73cf9ebfaa0b53a14605fd5b305b0bf26bca80b4c47896cb2ad02894734e7b56c4709b2bb506 SHA512 a0f3caaaf922cff812af68889f9ee4fb985ab200c621af420a48002d5ab7108375cba7f178ae779d2536a7e080e9c1bbff3e8004e245639465baa866d323702d
-EBUILD urllib3-1.25.9.ebuild 2106 BLAKE2B 365be3ed3d45043b7f2bb1f8c414570d412273c879984c1d9ab41f486f0e8a39867414f0d11afb0758f7620086da92ff134739852de82cd3bc5af2b7e094e164 SHA512 3c9b415e8aaf9ea37d7ba4643ce5efef645d4e00b4c687295eb3057acb9e95e4dd23043107a269bb64b21e78dfe991e55129bf7f707a5d0684793fa441868a79
+EBUILD urllib3-1.24.2-r1.ebuild 1703 BLAKE2B e1804f51aa6a97428113bf331bae402b83ab2cc0003da78c7d4971e460a51ed21e46d1b305817729197b23bbfecaedcfd8f9472ab1ec23efa0a3a93a7683f6c4 SHA512 da2e961ef19fbabe39d9a60b292e4880c7ae36bd2c072c0b1aa4bc13afa249f31548b0177522773b23d04cb5ecc1d52861a366c26c42fd0a776906c13e5b30ae
+EBUILD urllib3-1.25.10-r1.ebuild 1825 BLAKE2B f5fcc6c6d4d30ac9fc662a20b1b704f93b121eac2ad5ec6b64b3334103895332534e61cc97bfe0bc0d0a21bfa4233ff0fec4867c5e4668727221ac2924359249 SHA512 03df099e433b5a6e4f02893944da25bce5af5a8f3f13730e3067cbd816e4c5233dd67b803b8de0a4d59c156e9437ef86b587e48351e605f87e1ebe04cef3d1ee
 MISC metadata.xml 548 BLAKE2B 47edce866bd0c727c4b945630c97f2944c34f8e81c43bdbe57e28c4859dd3e681c64eb2d3b75101ad41c85587890ddbc819a2fd04188331dd5fad23a1d9d0ba9 SHA512 014f625e8de5ea3f00628fe360db47dde9dc82efd0b11218b4118a20b7638bd4e6ac14253888073740c0dca4a19a196567cc2af1864d52f3e1c959389c77c9d2
diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2-r1.ebuild
index 82e560366169..e2c7aedf4805 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -25,9 +25,6 @@ RDEPEND="
 	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/ipaddress[${PYTHON_USEDEP}]
-	' -2)
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/urllib3/urllib3-1.25.10.ebuild b/dev-python/urllib3/urllib3-1.25.10-r1.ebuild
index 911f80d2650d..e6ad8daf3d3d 100644
--- a/dev-python/urllib3/urllib3-1.25.10.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.10-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -25,9 +25,6 @@ RDEPEND="
 	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/ipaddress[${PYTHON_USEDEP}]
-	' -2)
 	brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
 "
 BDEPEND="
@@ -64,11 +61,6 @@ python_test() {
 	local -x CI=1
 	# 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}"
 			;;
diff --git a/dev-python/urllib3/urllib3-1.25.9.ebuild b/dev-python/urllib3/urllib3-1.25.9.ebuild
deleted file mode 100644
index 7281a44b4413..000000000000
--- a/dev-python/urllib3/urllib3-1.25.9.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 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 ppc ppc64 ~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}]
-	$(python_gen_cond_dep '
-		dev-python/ipaddress[${PYTHON_USEDEP}]
-	' -2)
-	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/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
-		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
-}