gentoo resync : 25.09.2021

4 files changed, 2 insertions, 108 deletions

diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 01c7a28667b0..2ae842e2a363 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,6 +1,3 @@
-AUX httpx-0.18.2-big-endian.patch 2009 BLAKE2B 889f4636c88029778fc7f56b6635543794de81c60b3ef704e577a62ef8d8a1d3eccd19c80c3f6a9870f6b6aca98f4e3692e5ac31be800c707ad5bf91d73b6ece SHA512 3cc62f6b5a039f1c7c79854a95991e750162419d9c5f21a8fdf4d009f19a0694c711bec4aba7cfcfe17c08d98e8fabbe2ab4531ea58a4f5050867cf4f440c836
-DIST httpx-0.18.2.tar.gz 1666756 BLAKE2B 3d1e25d503ae5306150c157bc83afdac9a475110d042e041b58de448a0dcfd75de3f4c15836b838dc799cd5f8b7e0d646e43bbe107ffad87d51ff016afe585cd SHA512 727974e5d5924fdd653987dd4f528d27bb2653085b01ef5efcdac39dc92ef2ed586f872c202349aa31105ad970cff914de4315c2d79338a6aa18bebb8126f392
 DIST httpx-0.19.0.tar.gz 1667455 BLAKE2B b8d4cb0b6e7f643b62b507930ccf1534d73d93261cab9281ef57d6392f00da325e897d5339aebacfa07aeae8278d3a81b78d6501a1587ffeaef68cc5087bfdaa SHA512 3b327f07d62cf0430672d4f1a4f884618e588496f049522de327f5c34f7260eb21739b7f1fbd6f43a21962bc8737547f3eddbc22751546647f56c9cd7212840a
-EBUILD httpx-0.18.2.ebuild 1685 BLAKE2B 090ca06828527429791ca9f9a05a5ba585ead7c8653def22c18d3d83b555656f36f97e9dced4e94540eca083da0a10a8248ff710b768e9fec0a24d9a156f56c4 SHA512 9c9130ccf7927018c39a34dc9e9d8903c1132ddfb7805b68e7e5987a6384681c75e8a34181d5529860834c7b659b08d8966fd0371864d88974ffd3b07d15ed1d
-EBUILD httpx-0.19.0.ebuild 1641 BLAKE2B 6cf13505d6bfeae48533408a9ca0affc69878f4dba2eeae9075b96d078415575eee95eef54e4b91daaf8c2dc88417e1b1b57a132359aa5c68ffeb1ebf6a30a71 SHA512 3de4c68898b2b6ab881dfefdddacc827a28f775d51c6da83eebfa598b024c06633e06cb020b49c68537309376a8dab17b8a1c6ff0cf5a83411b53ee45a7e800a
+EBUILD httpx-0.19.0.ebuild 1634 BLAKE2B f94f2c428f6c516651c66b4ae37e65d5b34c0f548dee88a984a9eb716c97c89b6fa540a3b3a3e894f9ddc3a9ff83eda37bbbaee640bab5684b621cedfc15de1d SHA512 3b084ac8cfeb5cfdd63880925b3413e5604e0387724288780ba9a23ca5963c4d8ccbc2c7ba1d3f64af4d5c0813b991dbb06315bb682e81f02439d08fb38d6a60
 MISC metadata.xml 445 BLAKE2B ad37f769e6ead3490624a9a4ce9eab3ba0c040adcb11c52e306fa13dcae8e3ae779efae6b5b3528890de6a9d440657d3bd3fce2004a1774ae88920a7cd05c66b SHA512 73af0d42f1735eecd27559c58514a20d85d775f59500cfc6e7b87d759a4b9951317c62eae2a990df63b80747255510bf970f05295c4548d1a81cd1cc7b7c2b81
diff --git a/dev-python/httpx/files/httpx-0.18.2-big-endian.patch b/dev-python/httpx/files/httpx-0.18.2-big-endian.patch
deleted file mode 100644
index 794609d86a50..000000000000
--- a/dev-python/httpx/files/httpx-0.18.2-big-endian.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 88a0a85ff795d8c23d5cd2cd113eeac957cc818a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 5 Aug 2021 17:35:54 +0200
-Subject: [PATCH] Fix JSON wrong encoding tests on big endian platforms
-
-Fix test_json_without_specified_encoding_*_error tests on big endian
-platforms.  The tests wrongly assume that data encoded as "utf-32-be"
-can not be decoded as "utf-32".  This is true on little endian platforms
-but on big endian platforms "utf-32" is equivalent to "utf-32-be".
-To avoid the problem, explicitly decode as "utf-32-le", as this should
-trigger the expected exception independently of platform's endianness.
----
- tests/models/test_responses.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/models/test_responses.py b/tests/models/test_responses.py
-index f1815dc..b7c2d57 100644
---- a/tests/models/test_responses.py
-+++ b/tests/models/test_responses.py
-@@ -735,7 +735,7 @@ def test_json_without_specified_encoding_decode_error():
-     content = json.dumps(data).encode("utf-32-be")
-     headers = {"Content-Type": "application/json"}
-     # force incorrect guess from `guess_json_utf` to trigger error
--    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32"):
-+    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32-le"):
-         response = httpx.Response(
-             200,
-             content=content,
-@@ -750,7 +750,7 @@ def test_json_without_specified_encoding_value_error():
-     content = json.dumps(data).encode("utf-32-be")
-     headers = {"Content-Type": "application/json"}
-     # force incorrect guess from `guess_json_utf` to trigger error
--    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32"):
-+    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32-le"):
-         response = httpx.Response(200, content=content, headers=headers)
-         with pytest.raises(json.decoder.JSONDecodeError):
-             response.json()
--- 
-2.32.0
-
diff --git a/dev-python/httpx/httpx-0.18.2.ebuild b/dev-python/httpx/httpx-0.18.2.ebuild
deleted file mode 100644
index a91225037d51..000000000000
--- a/dev-python/httpx/httpx-0.18.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Docs builder mkdocs not keyworded on all these arches yet
-# DOCS_BUILDER="mkdocs"
-# DOCS_DEPEND="dev-python/mkdocs-material"
-# DOCS_AUTODOC=1
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 # docs
-
-DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
-HOMEPAGE="https://www.python-httpx.org/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	=dev-python/httpcore-0.13*[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
-	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/hyper-h2[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/encode/httpx/pull/1781
-	"${FILESDIR}"/${P}-big-endian.patch
-)
-
-python_prepare_all() {
-	# trio is not currently in the tree
-	sed -i '/^import trio/d' tests/concurrency.py || die
-	sed -i '/pytest.param("trio", marks=pytest.mark.trio)/d' tests/conftest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		# Internet
-		tests/client/test_proxies.py::test_async_proxy_close
-		tests/client/test_proxies.py::test_sync_proxy_close
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/httpx/httpx-0.19.0.ebuild b/dev-python/httpx/httpx-0.19.0.ebuild
index 72dc4fb1f17f..37c507397757 100644
--- a/dev-python/httpx/httpx-0.19.0.ebuild
+++ b/dev-python/httpx/httpx-0.19.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]