gentoo resync : 22.12.2021

4 files changed, 84 insertions, 3 deletions

diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index d989b87c1925..aae934c0aff2 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,3 +1,5 @@
 DIST httpx-0.19.0.tar.gz 1667455 BLAKE2B b8d4cb0b6e7f643b62b507930ccf1534d73d93261cab9281ef57d6392f00da325e897d5339aebacfa07aeae8278d3a81b78d6501a1587ffeaef68cc5087bfdaa SHA512 3b327f07d62cf0430672d4f1a4f884618e588496f049522de327f5c34f7260eb21739b7f1fbd6f43a21962bc8737547f3eddbc22751546647f56c9cd7212840a
-EBUILD httpx-0.19.0.ebuild 1855 BLAKE2B 159c2c051f1f013cfc5b2a81092173ae41f642498c73eccf3d704140be4b83b5542d16a607283679417ac9234d738a27bcd02010feaf46e1de3247a8dde366cb SHA512 6baf835094b28e8ebbce53842c354740d97b91f2fcc7a1bc6700fb4dee11e909ec42436d39e4605af5ee0c3eac33f13204f03f2e63d7a734e943dd6ddde7c414
-MISC metadata.xml 445 BLAKE2B ad37f769e6ead3490624a9a4ce9eab3ba0c040adcb11c52e306fa13dcae8e3ae779efae6b5b3528890de6a9d440657d3bd3fce2004a1774ae88920a7cd05c66b SHA512 73af0d42f1735eecd27559c58514a20d85d775f59500cfc6e7b87d759a4b9951317c62eae2a990df63b80747255510bf970f05295c4548d1a81cd1cc7b7c2b81
+DIST httpx-0.21.1.tar.gz 2155133 BLAKE2B c3c800657abaed461ab6f44e3cd9799be4b6499070a5db2ee8d5d61c776d86591c74192eb1c88d4072dc361ea4c9448a3ed061c715fa4504fc931fdd96ccde62 SHA512 a4f737f6c6ae909fd3ea811e0ff3b78ed6496da8d797ef49746f744216e055f8225d613fe935d5e2780aa1b233053ad436e8849eef578e662ca8ee34513ad12e
+EBUILD httpx-0.19.0.ebuild 1862 BLAKE2B da0efba0380fef0876d7b5bd389372f5ffe15487384447ef47982f0c58ec1475f48e0d5a4150aeaab7a92a3848a892b208dd38bf2725a27d5dd41e3d6c60e385 SHA512 f4a670603c4e6dbd0795580b2b6645e2f701c52a3eb776fbb31abdb1fafec49388888468b36fcee2f46b053dfddbbec2ba3bde36582b8c112116383439564f14
+EBUILD httpx-0.21.1.ebuild 2021 BLAKE2B 97f01bb5a571fdb8f6af0f9c8f2980862c95860a46682600f683d2da35e33f9a0278606cdd61c84bd97de09b9339711f0c51064e3a076bc3570d0a0f7aa1aba5 SHA512 d4fa31fd69abbf41c4cbb2eb2e7eba4c4d9d941335d30cc4850a47f7c2950a5e957783f147691d9784a2b1335b19b9447c411b0e4b019e4344938f6ef5469d9c
+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
index e739250c670f..b876bd14e6e3 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 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/dev-python/httpx/httpx-0.21.1.ebuild b/dev-python/httpx/httpx-0.21.1.ebuild
new file mode 100644
index 000000000000..9419278e27c2
--- /dev/null
+++ b/dev-python/httpx/httpx-0.21.1.ebuild
@@ -0,0 +1,76 @@
+# 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"
+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/metadata.xml b/dev-python/httpx/metadata.xml
index bc0ee8c44b9a..ed555c30e50a 100644
--- a/dev-python/httpx/metadata.xml
+++ b/dev-python/httpx/metadata.xml
@@ -11,4 +11,7 @@
 		<remote-id type="github">encode/httpx</remote-id>
 		<bugs-to>https://github.com/encode/httpx/issues</bugs-to>
 	</upstream>
+	<use>
+		<flag name="cli">Install the CLI "httpx" client.</flag>
+	</use>
 </pkgmetadata>