gentoo auto-resync : 10:12:2022 - 15:20:44

4 files changed, 2 insertions, 164 deletions

diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 29621bfc8948..8bfb638cb9d6 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,6 +1,3 @@
-AUX httpx-0.23.0-cgi.patch 2002 BLAKE2B 3f7c7e2a85d812d1a6cbd96a21b5d9716581b59528f651facd1c1b4f4b692aef24c1e8ef8d90315dd34dfbb84914c2cf23dce95499f401ad333632d15a6bfc0b SHA512 26c02d8c7bd6c50c72533e114377950d3f58a1ebe23193d8d6424c03c5f0efafb2f81dc155b5c16572dacd71bb2ad2aaea19816982a61ee19f2b531192796324
-DIST httpx-0.23.0.gh.tar.gz 2160686 BLAKE2B 036c66b2c3f743cd069716297f331f0d75043a98180b9db3e156c5692ae8bf9c68d1db87169953a7f44aaf7ee8554d0166f70b508f77b7ff4b0ebc0500bc02ad SHA512 3cfdf2b3b2f15967a1eec0be05ed947c5e18a46576b68a9cbfd5147dfd4736cb7c389f5431732b93f3a11f3ec6c6f25f7cbb3d96d845f00b58e2b8dae047c1d5
 DIST httpx-0.23.1.gh.tar.gz 2161798 BLAKE2B ee01771377bbfebbc4a9346280c8d59508c78295e61b6f9d60a07099e44dfb0fc208d37b68f511bbbacb48438cf6daa73ef82d7a7ae75470409c8346ddad0ad5 SHA512 3fe280b6d3cb1a12bdd502e7bd432588375f9cebfcd9e071acb6e851866a56d84a715428599a297f5df43d73997b2a0c02ba1a12b3e32d292b2051161a350751
-EBUILD httpx-0.23.0-r1.ebuild 2240 BLAKE2B 008a5e77c120facb896e0d0249d07cd98ece5e03b27df435d6f85f510e699d592d19386a6aaf848b5fb7f9b3108fd8a59dea4e8cb914ed9604f7d93254502f69 SHA512 2d7190ff15fb361f7200f09bcabe8fa223b0cd40bfb27a3b19ff43eee2c0fc22a2b7f9ed36819c0f404d5d10fb75c3ba534188ba4d721b0240d78665d1a66766
-EBUILD httpx-0.23.1-r1.ebuild 2178 BLAKE2B 08ffbb1627836d78872b5717c88f063a56ba2155c0107967a91bf145d27e25ed81e84c8b7cc379521e873ce82b1cc9b3ac5fddfbdce23c7a7cc4f27f1cb6a72e SHA512 8bd2e7dda0011ba5108c1b30bad511ba66d5784e062ccdae5d1e3841d83f7d5423b3a22522e062e90f8755a2e11917cc1b7494baa66fcaa4c65d6dd62e64f7eb
+EBUILD httpx-0.23.1-r1.ebuild 2170 BLAKE2B 351d8ae5566b7b7341540df0f28dbfb7689531343a0291eab21086cb2400380414f6c24dda191c0209a6d7d21fe8f6facea443a2d5c88e7791648073a7641752 SHA512 c228cd845319691d1c7c0678e18c5d6d81956b08e10e63bc27351938ca0fefda440f5446a7e60253429dc6999dbd95c86f1dcc334bd01c3b53d8f0edb748e133
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/files/httpx-0.23.0-cgi.patch b/dev-python/httpx/files/httpx-0.23.0-cgi.patch
deleted file mode 100644
index ba9a7aebda2d..000000000000
--- a/dev-python/httpx/files/httpx-0.23.0-cgi.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From f13ab4d288d0b790f6f1c515a6c0ea45e9615748 Mon Sep 17 00:00:00 2001
-From: Florimond Manca <florimond.manca@protonmail.com>
-Date: Thu, 25 Aug 2022 12:23:04 +0200
-Subject: [PATCH] Replace cgi which will be deprecated in Python 3.11 (#2309)
-
-* Replace cgi which will be deprecated in Python 3.11
-
-* Update httpx/_utils.py
----
- httpx/_models.py | 8 ++------
- httpx/_utils.py  | 9 +++++++++
- 2 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/httpx/_models.py b/httpx/_models.py
-index fd1d7fe9a..7a3b5885d 100644
---- a/httpx/_models.py
-+++ b/httpx/_models.py
-@@ -1,4 +1,3 @@
--import cgi
- import datetime
- import email.message
- import json as jsonlib
-@@ -47,6 +46,7 @@
-     normalize_header_key,
-     normalize_header_value,
-     obfuscate_sensitive_headers,
-+    parse_content_type_charset,
-     parse_header_links,
- )
- 
-@@ -608,11 +608,7 @@ def charset_encoding(self) -> typing.Optional[str]:
-         if content_type is None:
-             return None
- 
--        _, params = cgi.parse_header(content_type)
--        if "charset" not in params:
--            return None
--
--        return params["charset"].strip("'\"")
-+        return parse_content_type_charset(content_type)
- 
-     def _get_content_decoder(self) -> ContentDecoder:
-         """
-diff --git a/httpx/_utils.py b/httpx/_utils.py
-index e01c050df..ecce4f417 100644
---- a/httpx/_utils.py
-+++ b/httpx/_utils.py
-@@ -1,4 +1,5 @@
- import codecs
-+import email.message
- import logging
- import mimetypes
- import netrc
-@@ -209,6 +210,14 @@ def parse_header_links(value: str) -> typing.List[typing.Dict[str, str]]:
-     return links
- 
- 
-+def parse_content_type_charset(content_type: str) -> typing.Optional[str]:
-+    # We used to use `cgi.parse_header()` here, but `cgi` became a dead battery.
-+    # See: https://peps.python.org/pep-0594/#cgi
-+    msg = email.message.Message()
-+    msg["content-type"] = content_type
-+    return msg.get_content_charset(failobj=None)
-+
-+
- SENSITIVE_HEADERS = {"authorization", "proxy-authorization"}
- 
- 
diff --git a/dev-python/httpx/httpx-0.23.0-r1.ebuild b/dev-python/httpx/httpx-0.23.0-r1.ebuild
deleted file mode 100644
index 674754d2796c..000000000000
--- a/dev-python/httpx/httpx-0.23.0-r1.ebuild
+++ /dev/null
@@ -1,91 +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
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1 optfeature # docs
-
-DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
-HOMEPAGE="
-	https://www.python-httpx.org/
-	https://github.com/encode/httpx/
-	https://pypi.org/project/httpx/
-"
-SRC_URI="
-	https://github.com/encode/httpx/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	=dev-python/httpcore-0.15*[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
-	cli? (
-		=dev-python/click-8*[${PYTHON_USEDEP}]
-		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		<dev-python/rich-13[${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/socksio[${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() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-cgi.patch
-	)
-
-	# unpin deps
-	sed -i -e 's:==[0-9.*]\+::' -e 's:,<[0-9.]\+::' setup.py || die
-	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
-	)
-	local EPYTEST_IGNORE=()
-
-	use cli || EPYTEST_IGNORE+=(
-		tests/test_main.py
-	)
-
-	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
-}
diff --git a/dev-python/httpx/httpx-0.23.1-r1.ebuild b/dev-python/httpx/httpx-0.23.1-r1.ebuild
index 94aea019b8e3..b285ead69c05 100644
--- a/dev-python/httpx/httpx-0.23.1-r1.ebuild
+++ b/dev-python/httpx/httpx-0.23.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="