gentoo resync : 13.11.2021

3 files changed, 2 insertions, 66 deletions

diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index f173dfe6e69d..62007d56687c 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,6 +1,4 @@
 AUX requests-2.26.0-test.patch 1328 BLAKE2B 4f9e66505a4acfe7b4bd62c6c95c28fc01eb9fd7d09e151aef7da27fb105d5038ddc99c3d838c7a166d769223ff18ed0517e961ffa345459b4350ccdfa21b50d SHA512 89a4cf8d03f2bf8308cba1a6ed97b4f2340a2b9512636f2244f5f9cb6bae00300e73b58bbe53fad1d9c9e4e2e8e3298fa6741190869cfd4799e3be9bc56b0bc0
-DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
 DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
-EBUILD requests-2.25.1-r2.ebuild 1674 BLAKE2B 6efa6716415cf24e9bfc2b001bf2aab3ef7c10032921fb5e43fde6824a6202856eb5282b6dbda13206e1b19a7ec22e542b0721abb2688671f2a475dff6d33882 SHA512 3632026495ee62d4e17596d18d8f7ab78dcf1cb21646f1c04e2baaaaafc3925515c4018581ef47b86abac87e63ab74277fa43557f15446f12f06d6c79cc988a6
-EBUILD requests-2.26.0.ebuild 1598 BLAKE2B 1ec0e672bf5a6e367da6a3d6df9c4c158f26551d24f1799765f6281794f6d3c5c6f448e72a1fea223bc380e7498ddad7aa86c5fcfc75c2c25db2e6dcb15fda89 SHA512 d83216ea4a95b0bdc2701c34d43840f375f5381f51a5df14dd221c247fd9e8d548a9f078420c2a21ded976c6cdb96f76cb8e85482974c8be238588670b394c91
+EBUILD requests-2.26.0.ebuild 1603 BLAKE2B f02390a2ffdc36395ddcc7294e2cf04dbf1a5879ccd5397b7e42666cee4c7aa155ac1139715e6c3d635b3c8498cfb708b3bc38f89c083c908799a265a8a89159 SHA512 818b30044b8cdd909659548349589e96553177905e12ae678d1baa25bd7cf2834a25108aa42aafe4c8404f42597b342dd7de4d5534cba27475f00d5888d2eae2
 MISC metadata.xml 770 BLAKE2B a085a3bdbcc34c2297ad7d5a0e811c553aa77f12bba1ee8164cf63af2cd86adcef7b6080c984ea73a417ec690252540a0fc6072ee97b068b70f0f695696fc65c SHA512 de5c6a99ae18955f25895a93911570d41cb458eaaa9dc8b6edd09021c6dff3dda7bc2611d090b933837f83b8a7035769bb275bb844e1ac91b89a088dde3c7222
diff --git a/dev-python/requests/requests-2.25.1-r2.ebuild b/dev-python/requests/requests-2.25.1-r2.ebuild
deleted file mode 100644
index f2de501b6bac..000000000000
--- a/dev-python/requests/requests-2.25.1-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="socks5"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
-	<dev-python/chardet-5[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${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}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# allow idna-3
-	sed -i -e '/idna/s:<3:<4:' setup.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local deselect=(
-		# Internet
-		requests/__init__.py::requests
-		requests/api.py::requests.api.request
-		requests/models.py::requests.models.PreparedRequest
-		requests/sessions.py::requests.sessions.Session
-		tests/test_requests.py::TestRequests::test_https_warnings
-		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
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index 246ec4493d40..911ddfa1be0d 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.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 ~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="