gentoo resync : 20.03.2022

6 files changed, 12 insertions, 185 deletions

diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 9277dc67bcbf..c9cd7364c0ab 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,11 +1,3 @@
-DIST httpcore-0.13.7.tar.gz 64734 BLAKE2B e6c4b1720ce4bf62689995d3e1c648c4702bb416f3b3586eb8dd2f0cfd2155046e64181c4c04e65f721a5f0fcbc23b5ffd01c2930c7c69d37ee4c36e37b7d0d4 SHA512 0cc48828d0710066b3ef89998ec85975285763ac63a8b59106952ef2dac5a02dac71e7e106c4b6ea1022eb4d06a9cb5ee3e634eb564bad49c5508beff75279d6
-DIST httpcore-0.14.3.tar.gz 64650 BLAKE2B 140c55af60f54ff13db958cecef50af2b8857837c00c2e5b1ec48d8866bc08146f608864a3dcaed0014505ba0ea10b8d457a763ecf434a0d40a2e11debdd4003 SHA512 05e92109839c2e2f7ec81fea9507fb15a12d1bf6ae92048170953b1cb0139237b81c892feff1bc3840e06887e8916cadcc4124725874344524e45e3640a00379
-DIST httpcore-0.14.4.tar.gz 68463 BLAKE2B cc6c17da3b97c2a8fb9edb0aeb6247904240748645f605b2f3c84194fc06bab10f568ce21b8beaf1dee9a8d68166f1691e00f17e44d89efce0a18a6fbd91d5a5 SHA512 4dfb2d0dd10df1de45f4e78ddedddf02bf500a81a0132919894bd5c07f02a2975ce589ba3f6d79dd92ec882128f86f338bd32f35cdecb6618307e446ed369310
-DIST httpcore-0.14.5.tar.gz 74227 BLAKE2B 8e54b6b40d35a9228b96682d87651a6d3967441b74f3544a21b378620b417b48978f51d25b1980d87fad4748537036c6f2a4751e8b58e622c7c76389ff1afb67 SHA512 1705cf83df3ead454065e2ed4c300697c5d0a6609846a3eadfca2af2d9c1578f951c2f4bf3ac018c3cc984d2d2ccd39c4b2de781747588a6116eebe1007afff0
-DIST httpcore-0.14.6.tar.gz 75303 BLAKE2B 408d140e754cf765809af2549d0ae8a076c63ef9df8358596fd893e2a744c95353fa1f8cadaafc5ca9b4710a87db6c27bdae1f5913f83a7d69c7b9b45192e994 SHA512 a3e2474619fec999150c5e2adb475e000b1d2de4ec84a9e93788e816717cd699f0ddc3494ec9e6f07cb1c6a95d74d39a83799ac4fd07d02a8fab72a1253b97ba
-EBUILD httpcore-0.13.7.ebuild 2313 BLAKE2B 9db573d0b47b5ee5bb72a62c9a6d6252bcff472f65869c0128679c088bb1a8554eba78975fe65c9b91f4b6b3063c0a102b5f55d13f87c3e9a869cd5d705a82fa SHA512 e391456b9ce1bbe3bf17b90af599e036db2f5c394d9cf0afcb487f1e74cd1114e1eee341a52bc76d5cce752270099b5f8f976cb466d35627ab65858719cd3e27
-EBUILD httpcore-0.14.3.ebuild 893 BLAKE2B 350608f1ff48eeeace6bea27be0c6648f65664d39ba1f109a45e32082961722cff19b1e54cbb24d6352262d010f844627e43e06e8c82e43fe82b7d618b7d039e SHA512 8254dcd8cedd0fc39f5db20dc5264effe58cde13a83387842756949f6e43f544f72343f77f7bc581860aac04a9e9c7c9d8854bb0dba26da06ac76e469ba7158a
-EBUILD httpcore-0.14.4.ebuild 901 BLAKE2B 2d32262d4e40e0fdd5cece3eb4bea760d259103562e0c0b4cb1435348926d730d0cf05b61c5b8558566971322cb483a0e57375855fb46c6239f11cb65daabef8 SHA512 e86bc03f6842dae44677cc1a32f5bb12ca8238b0906c45a5c51ae4be39ec0cd473c3cef7bfa3a36727d85a62ef45696ee6799e2c0bb146a5913cc95b888a2066
-EBUILD httpcore-0.14.5.ebuild 1018 BLAKE2B b9dd15d010f6fd2983e73762484f65381be4ab3603ceb20ee75e75087b8d51070039c7044c841be27d9e0ae457e69dafab98bf1d8c9c3fd8406d4dcb57128553 SHA512 0a9c55dca4f0a8e6ddefb405f4f72815a3c1ed45d66b45f99564cd2cbed7c18615efccbe5e8395843a2bad4b3ce3289ac94c4c0e7c211fbc5030088319dd1f6c
-EBUILD httpcore-0.14.6.ebuild 1051 BLAKE2B 9a51f70fe506708add1720c541cf060c1934d8078836b39ae8664de28ac10cf712c7703d0a8ba7f37a13048eb2e23c3f2ee5a39770027898df95cf6c1cd60a91 SHA512 7e07cd3a32adcd82e951acc10776ec3225a55635bef8cbe9dedd0ab730c6f585c919f0e0784429a94f1ebe2d47d5e7b8a7a6be8b08518eb29a4d66d684fcdfe4
+DIST httpcore-0.14.7.gh.tar.gz 75844 BLAKE2B 50d5fac7f44996cc5a08b4f994c2109b173e5b9fea080c8740309b799421d012a70280a84fffe93e290bf425e5ee6eb1bfcb74aff81fa7e737c21f25019e6664 SHA512 6865e97f9b84846bb4e9304ea358b0a28d66fd2d1e244e8a2a439ee446a294ecbc68ac07d5a718fd1c3eceaa44a391d7a8f7f2ca659f1674eb17a90f39987d48
+EBUILD httpcore-0.14.7-r1.ebuild 1140 BLAKE2B 0b17339ff819039a984df5ac749a1b7df59a9356b71e4cb8321aec069d050ac371c20725c34b09e712f4a997a19049591c70cb16184c313f39fcc0d3fabe1ac6 SHA512 88b63904706904361b168c056a3a478230f33ca5672d44c879c386b96c02f36c59efbc7b07fe9376e14b3e57ca2855217fafd9e011fcad21c61db13f30930802
 MISC metadata.xml 454 BLAKE2B f8a48d9ab81e5f74623dd0c8490e5de5cc711fda7f4614932e7ac6caa80bd23436037ddf9327d6bddc3d39c8b601b4ee74a85c0a10bacb20514cbf8278e34d1f SHA512 af962141bd55f51b27e0d4b61bcf7d5426e816df4f8c65be257d8fddd597664afe04e78ebe7e11caaebf06ae4fe17b88f568dc440403865ba6b8e3b47d796aa6
diff --git a/dev-python/httpcore/httpcore-0.13.7.ebuild b/dev-python/httpcore/httpcore-0.13.7.ebuild
deleted file mode 100644
index d6cbf811e975..000000000000
--- a/dev-python/httpcore/httpcore-0.13.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-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/anyio-3*[${PYTHON_USEDEP}]
-	<dev-python/h11-0.13[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# trio is not in the tree, anyio is causing tons of test failures
-	# (probably insisting on using trio)
-	sed -i 's/^@pytest.mark.\(anyio\|trio\)/@pytest.mark.skip/' \
-		tests/async_tests/test_*.py || die
-	sed -i '/^import trio/d' tests/utils.py || die
-	# pproxy is not in the tree, the associated fixture
-	# must be disabled to prevent errors during test setup
-	sed -i 's/def proxy_server().*/&\n    pytest.skip()/' \
-		tests/conftest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local skipped_tests=(
-		# Require Internet access or hypercorn (not in the tree)
-		tests/test_threadsafety.py::test_threadsafe_basic
-		tests/sync_tests/test_interfaces.py::test_http_request
-		tests/sync_tests/test_interfaces.py::test_https_request
-		tests/sync_tests/test_interfaces.py::test_http2_request
-		tests/sync_tests/test_interfaces.py::test_closing_http_request
-		tests/sync_tests/test_interfaces.py::test_connection_pool_get_connection_info
-		tests/sync_tests/test_interfaces.py::test_max_keepalive_connections_handled_correctly
-		tests/sync_tests/test_interfaces.py::test_explicit_backend_name
-		tests/sync_tests/test_interfaces.py::test_connection_timeout_tcp
-		tests/sync_tests/test_interfaces.py::test_broken_socket_detection_many_open_files
-		tests/sync_tests/test_retries.py::test_no_retries
-		tests/sync_tests/test_retries.py::test_retries_exceeded
-		tests/sync_tests/test_retries.py::test_retries_enabled
-		# Require hypercorn
-		tests/sync_tests/test_interfaces.py::test_connection_timeout_uds
-	)
-	epytest ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/httpcore/httpcore-0.14.3.ebuild b/dev-python/httpcore/httpcore-0.14.3.ebuild
deleted file mode 100644
index ddb66b448ee5..000000000000
--- a/dev-python/httpcore/httpcore-0.14.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-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/anyio-3*[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.13[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/httpcore/httpcore-0.14.4.ebuild b/dev-python/httpcore/httpcore-0.14.4.ebuild
deleted file mode 100644
index e5dcbd6373f9..000000000000
--- a/dev-python/httpcore/httpcore-0.14.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-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/anyio-3*[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.13[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/httpcore/httpcore-0.14.5.ebuild b/dev-python/httpcore/httpcore-0.14.5.ebuild
deleted file mode 100644
index 09aca91e42a5..000000000000
--- a/dev-python/httpcore/httpcore-0.14.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-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/anyio-3*[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.13[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "SOCKs support" dev-python/socksio
-}
diff --git a/dev-python/httpcore/httpcore-0.14.6.ebuild b/dev-python/httpcore/httpcore-0.14.7-r1.ebuild
index 914ec401500b..396c0c27cbe0 100644
--- a/dev-python/httpcore/httpcore-0.14.6.ebuild
+++ b/dev-python/httpcore/httpcore-0.14.7-r1.ebuild
@@ -10,16 +10,18 @@ inherit distutils-r1 optfeature
 
 DESCRIPTION="A minimal low-level HTTP client"
 HOMEPAGE="https://www.encode.io/httpcore/"
-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 hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
 	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.13[${PYTHON_USEDEP}]
+	<dev-python/h11-0.14[${PYTHON_USEDEP}]
 	<dev-python/h2-5[${PYTHON_USEDEP}]
 	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
 "
@@ -36,6 +38,11 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	sed -i -e '/h11/s:,<0.13::' setup.py || die
+	distutils-r1_src_prepare
+}
+
 pkg_postinst() {
 	optfeature "SOCKS support" dev-python/socksio
 }