gentoo resync : 20.03.2022

3 files changed, 2 insertions, 80 deletions

diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 51d19378eff4..78ca8683cab9 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,5 +1,3 @@
-DIST httpx-0.21.3.tar.gz 2157078 BLAKE2B 08a9328a7350534abe646f0bf60bd15600a1cb3eb8d06578c87ed9a7d4e55efdddd2be597650cddec9f6456e89a1b159f3e23aa657f379f78157c12670cdadb0 SHA512 0a551de52954db5ed2c33d1b5c172607516031a7c86c0f235bd04f12f4cf82f63980a9f53115dac801748b0c282890b3ed4a53b2c912adbd245c10ad61dbf67e
 DIST httpx-0.22.0.gh.tar.gz 2157682 BLAKE2B bb08a7c4b72478d24264c0dca5630205ff386af73294dca66dcd12b646de602ad64e308feedaabd58742cb7a9d799fa23cd2f922e685e74f8181e1b5e9f1c4ee SHA512 a7360f5355f75f07425b42d49697e480319f3fe606d4601bb6d64b870c8a8fce6fad8bd857ef422fc48e6141201307ee94876d5bc54a68557c7dc32ce8f1451b
-EBUILD httpx-0.21.3.ebuild 2013 BLAKE2B 14043bdc42c5b3a1dc352836273f935b6c0ffe034e5aa58965d8ce7d422712d8a6fbeb3ec14a1e4ad60b62a1ef80755f84481bbe0eecaeef32ed68f9e780a5bd SHA512 e87c99ff77474483c607933152cfc053efd5768cec2a85b0a4f187c14f608d4c11c331a89e7f7b778d6a5695c2833c5cd2c772752068c106971ca9bbd8736e80
-EBUILD httpx-0.22.0-r1.ebuild 2349 BLAKE2B 80073590fe425876072dfe5434955f7031c9091d0838dabdf1f7b1dc26cdb9910815f5d01185cba835d98f4ca811688b6e8ec33474b51730ce7be37d5d41cf0a SHA512 bee92cbc6d8288cc5cbd800103b56e353a2ddb01e211ceb7457730e3f5e615e34398140d4343079aa58ff530630af6481164d22ed4c0a37c190c15a45ff4be2f
+EBUILD httpx-0.22.0-r1.ebuild 2347 BLAKE2B c93a7eca057f2579bae1d9527173c3a6c2ce273bc546a871a6726fa294d47d17b23e339f2cdb4aa69c3b2b398d12468c03f505835759894bf9fd2d31185a1b71 SHA512 c53027397ff0bc118f7031e5f9f481b227e3e5f4b13ec2dd05101d74b842ef5cadbaf02950f699e33e5322178111430b054544794664c33bd1a282a4c25c855c
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/httpx-0.21.3.ebuild b/dev-python/httpx/httpx-0.21.3.ebuild
deleted file mode 100644
index 76f9b5757e4e..000000000000
--- a/dev-python/httpx/httpx-0.21.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 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 hppa ppc ppc64 ~riscv sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/charset_normalizer[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	=dev-python/httpcore-0.14*[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
-	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
-	cli? (
-		=dev-python/click-8*[${PYTHON_USEDEP}]
-		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		=dev-python/rich-10*[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/h2[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	if ! use cli; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/client/test_proxies.py::test_async_proxy_close
-		tests/client/test_proxies.py::test_sync_proxy_close
-
-		# Result change in charset-normalizer-2.0.7+
-		'tests/test_decoders.py::test_text_decoder[data3-iso-8859-1]'
-		'tests/models/test_responses.py::test_response_no_charset_with_iso_8859_1_content'
-	)
-	local EPYTEST_IGNORE=()
-
-	use cli || EPYTEST_IGNORE+=(
-		tests/test_main.py
-	)
-
-	epytest
-}
diff --git a/dev-python/httpx/httpx-0.22.0-r1.ebuild b/dev-python/httpx/httpx-0.22.0-r1.ebuild
index d4b99a44ad3a..638410ba75dd 100644
--- a/dev-python/httpx/httpx-0.22.0-r1.ebuild
+++ b/dev-python/httpx/httpx-0.22.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
 IUSE="cli"
 
 RDEPEND="