gentoo resync : 02.02.2022

4 files changed, 21 insertions, 72 deletions

diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index c5bd6a950c70..51d19378eff4 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,7 +1,5 @@
-DIST httpx-0.19.0.tar.gz 1667455 BLAKE2B b8d4cb0b6e7f643b62b507930ccf1534d73d93261cab9281ef57d6392f00da325e897d5339aebacfa07aeae8278d3a81b78d6501a1587ffeaef68cc5087bfdaa SHA512 3b327f07d62cf0430672d4f1a4f884618e588496f049522de327f5c34f7260eb21739b7f1fbd6f43a21962bc8737547f3eddbc22751546647f56c9cd7212840a
-DIST httpx-0.21.1.tar.gz 2155133 BLAKE2B c3c800657abaed461ab6f44e3cd9799be4b6499070a5db2ee8d5d61c776d86591c74192eb1c88d4072dc361ea4c9448a3ed061c715fa4504fc931fdd96ccde62 SHA512 a4f737f6c6ae909fd3ea811e0ff3b78ed6496da8d797ef49746f744216e055f8225d613fe935d5e2780aa1b233053ad436e8849eef578e662ca8ee34513ad12e
 DIST httpx-0.21.3.tar.gz 2157078 BLAKE2B 08a9328a7350534abe646f0bf60bd15600a1cb3eb8d06578c87ed9a7d4e55efdddd2be597650cddec9f6456e89a1b159f3e23aa657f379f78157c12670cdadb0 SHA512 0a551de52954db5ed2c33d1b5c172607516031a7c86c0f235bd04f12f4cf82f63980a9f53115dac801748b0c282890b3ed4a53b2c912adbd245c10ad61dbf67e
-EBUILD httpx-0.19.0.ebuild 1862 BLAKE2B da0efba0380fef0876d7b5bd389372f5ffe15487384447ef47982f0c58ec1475f48e0d5a4150aeaab7a92a3848a892b208dd38bf2725a27d5dd41e3d6c60e385 SHA512 f4a670603c4e6dbd0795580b2b6645e2f701c52a3eb776fbb31abdb1fafec49388888468b36fcee2f46b053dfddbbec2ba3bde36582b8c112116383439564f14
-EBUILD httpx-0.21.1.ebuild 2021 BLAKE2B 97f01bb5a571fdb8f6af0f9c8f2980862c95860a46682600f683d2da35e33f9a0278606cdd61c84bd97de09b9339711f0c51064e3a076bc3570d0a0f7aa1aba5 SHA512 d4fa31fd69abbf41c4cbb2eb2e7eba4c4d9d941335d30cc4850a47f7c2950a5e957783f147691d9784a2b1335b19b9447c411b0e4b019e4344938f6ef5469d9c
-EBUILD httpx-0.21.3.ebuild 2021 BLAKE2B 872c7de3d09855bdc2c2294e25858664c2e3d16a0d06d6f7c40284f4abce0877ae6b42ba84ce43b1f28c1734b9816763bc6d23d93cf3a35916854ea0be4da9ac SHA512 7ced5b855a9ee84d8c55514fdbc97584e3e004077b62187d328fed1a72123f401420aebc7289a2993bfe3152c7ccb45c317e434613e6bc51bb6d4ead776a700d
+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
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/httpx-0.19.0.ebuild b/dev-python/httpx/httpx-0.19.0.ebuild
deleted file mode 100644
index b876bd14e6e3..000000000000
--- a/dev-python/httpx/httpx-0.19.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2021 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"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/charset_normalizer[${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/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
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/client/test_proxies.py::test_async_proxy_close
-	tests/client/test_proxies.py::test_sync_proxy_close
-	# known to fail, unimportant test
-	"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
-)
-
-python_prepare_all() {
-	# increase timeout for slower systems
-	sed -e 's/pool=/&10*/' -i tests/test_timeouts.py || die
-	# trio does not support py3.10
-	sed -e '/^import trio/d' -i tests/concurrency.py || die
-	sed -e '/pytest.param("trio", marks=pytest.mark.trio)/d' -i tests/conftest.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/httpx/httpx-0.21.3.ebuild b/dev-python/httpx/httpx-0.21.3.ebuild
index 3171fdff7f8b..76f9b5757e4e 100644
--- a/dev-python/httpx/httpx-0.21.3.ebuild
+++ b/dev-python/httpx/httpx-0.21.3.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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/httpx/httpx-0.21.1.ebuild b/dev-python/httpx/httpx-0.22.0-r1.ebuild
index 9419278e27c2..d4b99a44ad3a 100644
--- a/dev-python/httpx/httpx-0.21.1.ebuild
+++ b/dev-python/httpx/httpx-0.22.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,17 +7,20 @@ EAPI=8
 # DOCS_BUILDER="mkdocs"
 # DOCS_DEPEND="dev-python/mkdocs-material"
 # DOCS_AUTODOC=1
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 # docs
+inherit distutils-r1 optfeature # 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"
+SRC_URI="
+	https://github.com/encode/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cli"
 
 RDEPEND="
@@ -30,7 +33,7 @@ RDEPEND="
 	cli? (
 		=dev-python/click-8*[${PYTHON_USEDEP}]
 		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		=dev-python/rich-10*[${PYTHON_USEDEP}]
+		<dev-python/rich-12[${PYTHON_USEDEP}]
 	)
 "
 BDEPEND="
@@ -40,6 +43,7 @@ BDEPEND="
 		dev-python/h2[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/pytest-trio[${PYTHON_USEDEP}]
+		dev-python/socksio[${PYTHON_USEDEP}]
 		dev-python/trio[${PYTHON_USEDEP}]
 		dev-python/trustme[${PYTHON_USEDEP}]
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
@@ -50,6 +54,7 @@ BDEPEND="
 distutils_enable_tests pytest
 
 src_prepare() {
+	sed -i -e '/rich/s:==10[.][*]:<12:' setup.py || die
 	if ! use cli; then
 		sed -i -e '/console_scripts/d' setup.py || die
 	fi
@@ -74,3 +79,9 @@ python_test() {
 
 	epytest
 }
+
+pkg_postinst() {
+	optfeature "HTTP/2 support" dev-python/h2
+	optfeature "SOCKS proxy support" dev-python/socksio
+	optfeature "Decoding for brotli compressed responses" dev-python/brotlicffi
+}