gentoo resync : 14.05.2020

4 files changed, 4 insertions, 76 deletions

diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 5204a7b7e11f..fefa58bb8d27 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,8 +1,6 @@
 AUX requests-2.22.0-pytest-4.patch 1076 BLAKE2B 2631f9b2e0586072e3a16e132099bab467ccbcd2020ea41ca49299688e2f88127e0b7e67545eb62659ac2729ca02b46d1e5a8c015c1d6cdd6a5ee0f8170cd483 SHA512 1de7c78c51be49e4004decd28d40e183a44c15b1e321c41595abc114ddb829ad54fc02dfb573a620cfe71f0996b78c822cb37cd68b3fb2d8e395b5f829227496
 DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
-DIST requests-2.22.0.tar.gz 113406 BLAKE2B 36e1fa106f30af3d560c11edab3cd8f7e79116378c6f4d505052c8b19021846a22b4631567859b23331e7c9413896e77d7fc3288cd3af586f5f99da21c9181a6 SHA512 8b8e9da8a0c816fb4ff39be89ac7e1a9d5a99503ed93e44a0d78b28818f1c0eb253b151972a144151a616ba1b4bc5595245458a8268c5161391db54f740ac9a5
 DIST requests-2.23.0.tar.gz 114327 BLAKE2B 75bdf83e117e9f67c2032609ed5c20582f743519ab8364dd6b12685efd6b6e438f1c155fe9d3df87e48608747f59df6d99698d1f68e5df6c0cbced9e7d1a9b37 SHA512 a0f7db5cc9ce67af9f6f81b72e41491735a102f2a1da2fbde98e279846e2140cd26b6370aa5ec79c148c397885a7ae2bbce45c4587215f510dd02b8ac57cb46e
 EBUILD requests-2.21.0-r1.ebuild 1423 BLAKE2B 99f0a4cfe05110aae07cc2f37614331a31a0434d2210329c01bc3625e692c2b87e2ebaabfb1f614ebfa5bf1a561c2a0de84699d4c05baa877e59b03bcb9d80e7 SHA512 c086ec4cbc080d4e650dff189482d84cffbf3ad3a0cc7bcaa2cf95c09a8b78f70839dd414ce35fa7b5b35cc22e69927844cc07ca9d58384944f49c1ad950039f
-EBUILD requests-2.22.0.ebuild 1874 BLAKE2B 4bdec775cc16a0d15a9dc70dfd541dc3a4f5b64daf406ad1cfdeb30b1a354866237ae15b21db41b6340e45c6a8866a0f81fce91e18012ca3ca80b6c10f8ae34e SHA512 1bb06571906ef540c19fdfb720331bd366b3cc51b74b717fa9a40baa6c4abd39c4ee0bc45100d49a887b32220815ec90469389201b460a5577d74018bc25c8a4
-EBUILD requests-2.23.0.ebuild 1752 BLAKE2B b8ed0c29d603606822513dfbf0d2234605c5b7d99c7f734a31052b4156906b9b8877c0530a3df21634de39f191ad0433c9486552e2b540ffa8224994d3985d34 SHA512 eb86971cb496faf84108f90ca1246d00a02d6367c080784e71bdde5fed0dc9bea3ca4432c1075a930a44379ab0a1403982aa1b747a3bf786c910573620bd1faa
-MISC metadata.xml 674 BLAKE2B 8670395eb334921eeaa21367eaf1c7d3770c11a166dc680bcb9b99a05da91d797baec8ef3c0596c40143f732e427c322a75ea75da1a2e7d99e56426be077b35e SHA512 7aa5c27d949a076b09b4c2b9e905124047d9ececc40d9c3fd225c6405aa084db96cab585956db9885b115cd24c6c153ae853187872e77e7d44ae5790c323bac9
+EBUILD requests-2.23.0.ebuild 1765 BLAKE2B 10ca4135f493ab8fc341af3caf62515f49e5e3ef0014ad7f405ac050ad58399e028f5f28539fd6002fc51a751fa7a585ecbe397cffccaa997f9b69861d125a90 SHA512 a61a58ff570996e6631c3352cae17f613e918478ae269c421991a53595d32f72c4546a16d271b06259a424d3f69fa623acfd9aaf277213f62275fc51d6dfa4be
+MISC metadata.xml 744 BLAKE2B 19542f217a9eef39ef564113f3ca4e4c6d443f15cbddbeaf3f6f388a883bc5c4c580f3f3a9d61c72e2f3176cad8550045b3c22a845c8ffe0a5489fbcd579e9a2 SHA512 4f2d9ed98b518691b0153f35b7e46cb065e2b89a738a337c5204b3da484df4a148cd8f770dfa631ee002db9468512f165ca9c5e0bd505a367adbb59d4a6b3ec9
diff --git a/dev-python/requests/metadata.xml b/dev-python/requests/metadata.xml
index 7f45ae4e314e..6d040d3d3b6c 100644
--- a/dev-python/requests/metadata.xml
+++ b/dev-python/requests/metadata.xml
@@ -13,5 +13,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">requests</remote-id>
+    <remote-id type="cpe">cpe:/a:python-requests:requests</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/requests/requests-2.22.0.ebuild b/dev-python/requests/requests-2.22.0.ebuild
deleted file mode 100644
index eaa68e841286..000000000000
--- a/dev-python/requests/requests-2.22.0.ebuild
+++ /dev/null
@@ -1,71 +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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="socks5 +ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
-	<dev-python/chardet-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	<dev-python/idna-2.9[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.26[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-	ssl? (
-		>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
-	)
-"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-			dev-python/pytest-mock[${PYTHON_USEDEP}]
-			>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-		' python{2_7,3_{5,6,7}})
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/requests-2.22.0-pytest-4.patch
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# strip tests that require some kind of network
-	sed -e 's:test_connect_timeout:_&:' \
-		-e 's:test_total_timeout_connect:_&:' \
-		-i tests/test_requests.py || die
-	# probably pyopenssl version dependent
-	sed -e 's:test_https_warnings:_&:' \
-		-i tests/test_requests.py || die
-}
-
-python_test() {
-	# tests hang with pypy & pypy3
-	[[ ${EPYTHON} == pypy* ]] && continue
-	# TODO: reenable when deps are ready
-	[[ ${EPYTHON} == python3_8 ]] && continue
-
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/requests/requests-2.23.0.ebuild b/dev-python/requests/requests-2.23.0.ebuild
index cb39af6fa5a3..98a4fe63b324 100644
--- a/dev-python/requests/requests-2.23.0.ebuild
+++ b/dev-python/requests/requests-2.23.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="socks5 +ssl test"
 RESTRICT="!test? ( test )"