gentoo auto-resync : 25:12:2022 - 20:05:44

3 files changed, 2 insertions, 82 deletions

diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 3c001750e286..a5752df802ca 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,5 +1,3 @@
-DIST urllib3-1.26.12.tar.gz 299806 BLAKE2B 17c1f02382101b5a44fbc456344befe671c9579f6208ea307866ae0e2fabbe017fdd4b751a6053a6d014bf007f114ca4fc81e2149c9814ab5bef057ffcbce2d0 SHA512 c34bc2cb92ff5fb4e27948b6b8bf286d1f3993d8e399a7dc99e8c1cb07b364f16f9c8d6fc3e5e22e6f2d9285454a945174a9a1de3cb0fcf08e673ba316bc5469
 DIST urllib3-1.26.13.tar.gz 300476 BLAKE2B 495b6077d8a18347d731dcc69989688c2fed325a5ff89a7faa6eb1c17255d5748c54036292080e0e86842536f0d518da011a5bd64bd7f1064702d34985621af6 SHA512 022cbd10d91aa95d21293743dc1c36d4ed2dd3f95e60cab53b0aa3c1be489c7eafbc90c4cc7f6b67011ef4752fedb18c33d64a063542fdc525888b39e127b775
-EBUILD urllib3-1.26.12.ebuild 2306 BLAKE2B 2398a3c08c5bd5885a62dfbc935b48e240d770da2ad11d0b42c10f36a107680a1b8c8b489334e59be87745d2b5f31f1c2cb53d8a5e34bc98359351d78d970cd2 SHA512 4f1a1c98fe418200996f92d07f2eec9a21cb1e81793ef159ac26eba661d5ceded27c2c11ba9931c7bd8fdb6495ef40f48325a561b7e9b27b774d15a099b24867
-EBUILD urllib3-1.26.13.ebuild 2314 BLAKE2B c5fd97af9304bff028e10c55bfb886b0abe0f1ee836ab881f206b40fc1568f30594576c7909f4a75f16da63c186b12e66413361ec00c382ce1ac6ec50342df6f SHA512 274340afa8c5b6c115c68a2d7d87679649b87b97ce7f4bf3241d76cb8674a16b9cd6ce4c0653196d1950c8e5a933b19689cb865fe0026fc8f13fece3f49f5d91
+EBUILD urllib3-1.26.13.ebuild 2306 BLAKE2B 2398a3c08c5bd5885a62dfbc935b48e240d770da2ad11d0b42c10f36a107680a1b8c8b489334e59be87745d2b5f31f1c2cb53d8a5e34bc98359351d78d970cd2 SHA512 4f1a1c98fe418200996f92d07f2eec9a21cb1e81793ef159ac26eba661d5ceded27c2c11ba9931c7bd8fdb6495ef40f48325a561b7e9b27b774d15a099b24867
 MISC metadata.xml 531 BLAKE2B 3ddfea4b8817c827437a79abae8cf4e9cda95addb1c6505ef13018587720bba0cf0788041c0b4cc8b25f319e7cb1c94117ae25b3cbb567f24373e8e89bedaa7b SHA512 7e7191f0338c4c47f01bdceb3d2c6ed94de2241e77fb3be6cbf3ecf8a0682730392a9ee5adf24304d9a322acc06bd84f4f90f1dddcb258cb2e9ba0de9952b693
diff --git a/dev-python/urllib3/urllib3-1.26.12.ebuild b/dev-python/urllib3/urllib3-1.26.12.ebuild
deleted file mode 100644
index 5a13659e40eb..000000000000
--- a/dev-python/urllib3/urllib3-1.26.12.ebuild
+++ /dev/null
@@ -1,78 +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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} 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/
-	https://pypi.org/project/urllib3/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~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 )"
-
-# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
-# dependencies. Do not add them to RDEPEND. They should be unnecessary with
-# modern versions of python (>= 3.2).
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${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/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-		" python3_{8..11})
-	)
-"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unbundle urllib3
-	rm src/urllib3/packages/six.py || die
-	find -name '*.py' -exec sed -i \
-		-e 's:\([.]*\|urllib3\.\)\?packages\.six:six:g' \
-		-e 's:from \([.]*\|urllib3\.\)\?packages import six:import six:g' \
-		{} + || die
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	# please keep in sync with BDEPEND!
-	if ! has "${EPYTHON}" python3.{8..11}; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# unstable (relies on warning count)
-		test/with_dummyserver/test_proxy_poolmanager.py::TestHTTPProxyManager::test_proxy_verified_warning
-	)
-	has "${EPYTHON}" python3.{8..10} && EPYTEST_DESELECT+=(
-		test/contrib/test_pyopenssl.py::TestPyOpenSSLHelpers::test_get_subj_alt_name
-	)
-
-	epytest
-}
diff --git a/dev-python/urllib3/urllib3-1.26.13.ebuild b/dev-python/urllib3/urllib3-1.26.13.ebuild
index f8b0529965dd..5a13659e40eb 100644
--- a/dev-python/urllib3/urllib3-1.26.13.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.13.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~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 )"