gentoo auto-resync : 27:10:2023 - 02:38:08

10 files changed, 169 insertions, 6 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 1307c13cb54d..60e299d9b2e6 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 364d5d657cdc..dab923513e55 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1,7 @@
+AUX aiohttp-3.8.6-brotlicffi.patch 1187 BLAKE2B fa565cea0a3a6ad118c1e1af7677cc393199e671a8a87d856b217b31024368248cb2df0515702867ea72f581c795658a70151a3004a718b3dffb9e16baf45269 SHA512 b3b4dc632ef0aa2045c90120c6110675e7df898bd858201eaba1b07c5551d32b37bfabb3685b7a31792e1b3b0dcb9c6d258ac4c6a8bfbbf65a8beeea96bf08fd
 DIST aiohttp-3.8.5.tar.gz 7358303 BLAKE2B e1a7df12380cded655a57735527607cc95661da99fe4a5c1aec40a2586deecee97592c9ea5e9bd43621bf069fe87f00d7bef712fab2b84783e14ff229495a7c6 SHA512 613dfe836c511832c68eadbd0a76882ec362ff956937aa913fc7567b7e3e1ac2085a70a1eca42fb016f38c076a131b506b22f26879ad06b077cb4a85e9dcd8db
 DIST aiohttp-3.8.6.tar.gz 7352172 BLAKE2B 4dc602abb4f9bd7c65bda7d11cde3e703bbc7786fb3f8ef36922caef42912b2c10a198ebdcecd3fcd022c3a9a729766a2023636f756a8fa10663bf988554f967 SHA512 43f1dd6670d90aefee7f0f30411b13c643ea684815b493cc4437e5f1981f4fdf4b718a40543d7c3c8c70d8b27470b8f3bf1609e46146362e0490ce0990a057f5
 EBUILD aiohttp-3.8.5.ebuild 2832 BLAKE2B 1d9b5196e844fd201e1d28217e39554f627a2035119edab7e809e65ede573353c047fd2b4f94309e190a7f82044901439bdc935f817f878938c10c522736035e SHA512 bf3f241e24f65dfbefe3c2be95dd0d471e8c048b9534964613659456f913f1cf0afa2b5c20b7f11e61b84aff43608e1b1a47004b4cd65b9fc8bbafbc4563c787
+EBUILD aiohttp-3.8.6-r1.ebuild 2891 BLAKE2B 2783e0c384163b6e01dd0b62a22dee97bcfa9e6a30f1d962a41136ca5591049685c2c103dc8ff7662cf1b0671de7a8c48d226e7ffe2887166e5c2c7798953d3b SHA512 c3bf74f79fa4793d71252d25f0e1e6fdc97600e91a0ae04ff086e3d1fc8c478f55162a69fc40d5fd62e2699b1ffab25f0b1912e76c5536ed5e5072a1e2b81fc6
 EBUILD aiohttp-3.8.6.ebuild 2876 BLAKE2B 0a9abc97eb9f7c067d01b6856871593ba95b4a221b0f1542b66da6ff3cc6bae2be09fa4975e70032cef6e2c734ec958a8098a63766ce8c2247abb60b563b578b SHA512 1e7c9d2d009700af9c9fbb71e8b687414ff5f603db7916c2b58fb18f740411c8d3e5854dca398d1502eb43ac34f069caf60de25298a3d22f94750f03b7a83295
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.8.6-r1.ebuild b/dev-python/aiohttp/aiohttp-3.8.6-r1.ebuild
new file mode 100644
index 000000000000..626addcde05a
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.8.6-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="HTTP client/server for asyncio"
+HOMEPAGE="
+	https://github.com/aio-libs/aiohttp/
+	https://pypi.org/project/aiohttp/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/async-timeout-4.0.0_alpha3[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	dev-python/brotlicffi[${PYTHON_USEDEP}]
+	<dev-python/charset-normalizer-4[${PYTHON_USEDEP}]
+	>=dev-python/charset-normalizer-2.0[${PYTHON_USEDEP}]
+	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+		test-rust? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-brotlicffi.patch"
+	)
+
+	# increase the timeout a little
+	sed -e '/abs_tol=/s/0.001/0.01/' -i tests/test_helpers.py || die
+
+	# xfail_strict fails on py3.10
+	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
+
+	# which(1)... also -Werror, sigh
+	sed -i -e 's:which:command -v:' -e 's:-Werror::' Makefile || die
+
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	# workaround missing files
+	mkdir requirements tools || die
+	> requirements/cython.txt || die
+	> tools/gen.py || die
+	chmod +x tools/gen.py || die
+	# force rehashing first
+	emake requirements/.hash/cython.txt.hash
+	> .update-pip || die
+	> .install-cython || die
+	emake cythonize
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# proxy is not packaged
+		tests/test_proxy_functional.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_client_session.py::test_client_session_timeout_zero
+		# broken by irrelevant deprecation warnings
+		tests/test_circular_imports.py::test_no_warnings
+		# TODO
+		tests/test_client_session.py::test_request_tracing_url_params
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			# upstream unconditionally blocks building C extensions
+			# on PyPy3 but the test suite needs an explicit switch,
+			# sigh
+			local -x AIOHTTP_NO_EXTENSIONS=1
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked
+	rm -rf aiohttp || die
+	epytest -n "$(makeopts_jobs)" --forked
+}
diff --git a/dev-python/aiohttp/files/aiohttp-3.8.6-brotlicffi.patch b/dev-python/aiohttp/files/aiohttp-3.8.6-brotlicffi.patch
new file mode 100644
index 000000000000..20e3c7ea0e5d
--- /dev/null
+++ b/dev-python/aiohttp/files/aiohttp-3.8.6-brotlicffi.patch
@@ -0,0 +1,46 @@
+From 4d60891531637aed2fdc50a5dff4809d7d9b3f32 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 20 Sep 2023 15:28:37 +0200
+Subject: [PATCH] [3.9] Support brotlicffi alternatively to brotli (#7611)
+ (#7620)
+
+---
+ aiohttp/http_parser.py    | 5 ++++-
+ tests/test_http_parser.py | 5 ++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/aiohttp/http_parser.py b/aiohttp/http_parser.py
+index 91e01f43..521ff5db 100644
+--- a/aiohttp/http_parser.py
++++ b/aiohttp/http_parser.py
+@@ -49,7 +49,10 @@ else:
+     from typing_extensions import Literal
+ 
+ try:
+-    import brotli
++    try:
++        import brotlicffi as brotli
++    except ImportError:
++        import brotli
+ 
+     HAS_BROTLI = True
+ except ImportError:  # pragma: no cover
+diff --git a/tests/test_http_parser.py b/tests/test_http_parser.py
+index 4b185c9e..dc373ea8 100644
+--- a/tests/test_http_parser.py
++++ b/tests/test_http_parser.py
+@@ -21,7 +21,10 @@ from aiohttp.http_parser import (
+ )
+ 
+ try:
+-    import brotli
++    try:
++        import brotlicffi as brotli
++    except ImportError:
++        import brotli
+ except ImportError:
+     brotli = None
+ 
+-- 
+2.42.0
+
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index f3ab05a78577..c142b823d5d9 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,3 +1,3 @@
 DIST httpx-0.25.0.gh.tar.gz 2169337 BLAKE2B 632a11917c35150be4aa9a946ae90493ba19b37697f97f82c36334a1004c57e9c256af54bcd0afbc2d5a67bd48f28c578285dd48473c8ccfd4b1c11e2c6bc069 SHA512 0be0f7ed53061d1dd9e0010d5a10adc6508bd49bf51e5ccf44f0aa2f54bdd067e3a7d1f37dfab80d3d374984aca2f20c346e46b8bc518826ce3371abc7291ee3
-EBUILD httpx-0.25.0.ebuild 2110 BLAKE2B 50918488e99d8d84af61624c6853fe05a2eb144cce7dc145cace0f81ad8279a8982c15a6d9fac2e5e832387b0c5135404a19a1f18b11465d233d0dd2baef685e SHA512 dc6c56ec5cc26c5e646ca5ec7e72d5281885078533a46906cb4d101f6b74df26d5d1744f58b261da49eaa11c6b5a138674362a724de4601a261763073ec1ca83
+EBUILD httpx-0.25.0.ebuild 2206 BLAKE2B 690e1315316e1ff5f0d1cb79f645dd255156ec69990b013e17ebf50b5b49ce7e77ae7c4ee5ff0f5f1cd46d0c94d81a66f6d6239cb2d93be09437676a3bf84b5f SHA512 3546e54bfd458f124cab9706b740d4feb478c5c94b799cd38267e1b8c99af68b730610b19a081fda4449059ec3f3865ebd17a7b4c6ce5be982934cfcf4f73e60
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/httpx-0.25.0.ebuild b/dev-python/httpx/httpx-0.25.0.ebuild
index f705e90d5cef..d1530d4041e9 100644
--- a/dev-python/httpx/httpx-0.25.0.ebuild
+++ b/dev-python/httpx/httpx-0.25.0.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
 BDEPEND="
 	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
 	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
 		dev-python/anyio[${PYTHON_USEDEP}]
 		dev-python/brotlicffi[${PYTHON_USEDEP}]
 		dev-python/chardet[${PYTHON_USEDEP}]
@@ -60,6 +59,11 @@ src_prepare() {
 		sed -i -e '/^httpx =/d' pyproject.toml || die
 	fi
 	sed -i -e '/rich/s:,<14::' pyproject.toml || die
+
+	# use brotlicffi instead of brotli in tests
+	sed -i -e 's:import brotli:import brotlicffi as brotli:' \
+		tests/test_decoders.py || die
+
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/pefile/Manifest b/dev-python/pefile/Manifest
index a5972bf30f39..f6444f0fb927 100644
--- a/dev-python/pefile/Manifest
+++ b/dev-python/pefile/Manifest
@@ -1,4 +1,4 @@
 DIST pefile-2023.2.7.gh.tar.gz 74852 BLAKE2B ddca4b8ef37af829bb1757eb4c4ba9f46c3914e05e6c13e13a8e5a3c88a608aba486deec9338400fddae4591867c0c7dcf7325cee14d42b1bb724751a3a2a7f0 SHA512 241d9846954f094ed39e61d80e7d8c1612829ec909650175e75657f9cf69c9bef9e2a115d4106bb14757125c0ffaa3e93abfb2f078e80326e78ac5818c7c2fd3
-EBUILD pefile-2023.2.7.ebuild 838 BLAKE2B 53e1040d169e77f3a4400e361f7011a68bcac822256cc444ccd199466510a446f4cfa6799e90f5060ae427a4ae8024283738e0881e857f20fb0ab2682e949c3e SHA512 c391fda735de6273a866c2fb6ea64ab1387af02db7a7c8c91c81861095c0166df43799dbbdc45dfac82533d9ca844f0f28bcd2bc858274314b469a92db4cc102
+EBUILD pefile-2023.2.7.ebuild 844 BLAKE2B f976ab91b9fadfd8f3fba7973e9eb7eb7f30f96cdf5cf2b4b0d300b95f5a890d712be4aaea57facc55c7d2d770429d29cd740d0ec8c265af8a5ecf04cf58fdda SHA512 94892822aaef699c0a2450a627ec7d5c1924b5074237d347cadc6ab682e2bdf10483eb19c22455187310816fb5c176c681b7e3bd5375182f2eaa4b5d1bf5a878
 EBUILD pefile-9999.ebuild 836 BLAKE2B fd3f2ca2b6f9f5b42443c3a47b9ba64d26ab552602565cdf360094599ad02a74d1daa36dd2a9e88375e087ecf73430af8224b9ae5f14acd4e6047d32e78f0f0c SHA512 10b9f573116781d03d852744338872bd9e3bad1293c79539f84837791036acefb5e5bc805d414d4602171640438518756c9351f0f4c6395bd79c6feb1523cf51
 MISC metadata.xml 766 BLAKE2B 8cd0206bb0cc7de9a76159851092c27b5e7c6d8294a136de2dd74e51da9062f6daa67c2421c173b6125758a9f350b84b03e2a85fa2029beb50032aa034f08c3a SHA512 7c3e9d6d89108b17a722c805353a9c457ccb5a5233bfca7145f82a37ab0337405c84a1e806d9fba77dbee779dd06cb18f7272399277d377aa84dcafc470156bf
diff --git a/dev-python/pefile/pefile-2023.2.7.ebuild b/dev-python/pefile/pefile-2023.2.7.ebuild
index 6d55f8726035..2f55fd3023a6 100644
--- a/dev-python/pefile/pefile-2023.2.7.ebuild
+++ b/dev-python/pefile/pefile-2023.2.7.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/pypy3_10/Manifest b/dev-python/pypy3_10/Manifest
index 09fdcfcb11d9..83bf1d0fe2c3 100644
--- a/dev-python/pypy3_10/Manifest
+++ b/dev-python/pypy3_10/Manifest
@@ -1,7 +1,7 @@
 DIST pypy3.10-gentoo-patches-7.3.12_p5.tar.xz 15404 BLAKE2B d9aa579b82f6bfafc3bdbd1f818d9cc85e3d33e6e72ec8dd65486e6239184dbd6720af1819493016c03e0898dec0c4f4fe361ef4ecdc63a365bc37a9452f1d2a SHA512 a705dd608d2a0027979d20301ec23aebc4a1ff20a826f2572fbdd702b079303797926e3908fd2afd7d4b0d165ffc1f4988a1c5181dd0f8ce7a7a2cc725630e23
-DIST pypy3.10-gentoo-patches-7.3.13.tar.xz 4776 BLAKE2B 9f0ef159c8aa2d3edb5ee0e14be694c4a7c1165d70b16e9b13b6e59da7334354cc8593186a2ff47d4a0ce8c76abdf4a3c12ec3ffdd7a90cc4f30b39c259c3ee7 SHA512 86bfbf7f26f259c0850074c9062544ee091f7a65359cb17dae3ec287841e7a812d7185cb552f3546acdde3965efe0e6c0fb728c30b64779fca10be2f7c4d634f
+DIST pypy3.10-gentoo-patches-7.3.13_p1.tar.xz 5068 BLAKE2B 2dd739a0ec9fc358a1fa1c278d06ed30f63f01565a593abc8b6f6bc14a5210ae3b6d541558b61ec97aad4f520e362310b825409ac46698846e66adbabcc805e7 SHA512 4ba5b2aa173b70ace6ee01ba4b870ab7baceea0b2fc6b0592787f80493c3f76ed0c662e0c86e9043c1bff981aec0268c7122d5a59d592bdb99cd8224953c8b2f
 DIST pypy3.10-v7.3.12-src.tar.bz2 23009064 BLAKE2B ad45d90de9ae51803ebcfa202763889f92f7e5c2939331433a496e53ca67dd6eeaf9c61e16cb648945409dff3c6dd6b8a2a01dfe1bed6cd6a9df98f112bff181 SHA512 080520c7de267e17a2823f06cd0a15c108a2c32fc296d6e24782050eb546fa74852d948ede2c381dba110774121b20efc3a07b553acd0ac0db4a844dfc09069e
 DIST pypy3.10-v7.3.13-src.tar.bz2 23067819 BLAKE2B 6e2bfd83bcf16feef006dad39ab6d8f452418ee6bc4043edaa590db702f39275e775004bdba762736a901da94cb5274cd34f2811461048d46ac0f4af04158702 SHA512 16fbc76558152b3eadca999d56197a6bf906cbb7bb75035ccd3501372af0f0c22533d22ba231a40b7c02afa11f0d692a6ae85ba6d5e1607b737b8c68209b7c43
 EBUILD pypy3_10-7.3.12_p5.ebuild 6027 BLAKE2B 9f9310a65a17ed5cf3cb74c4158ab922a6a3b582b582ccf354f771491ebb28c632cf71744fcc2a783ba153438b11faadf5f48f1fbba44a01d0da433b728491cf SHA512 638cc9f939341d93489fcce30acec54ef8a03b3af0c6418bd6ef353e901270cba10cc9c36268042fb331b8e1dfb94b49e1ef544b5719e954b0146064e1573c86
-EBUILD pypy3_10-7.3.13-r1.ebuild 6150 BLAKE2B 05cd89e1afdacc9f33afb3f93a3f5d55b8ec1108ddc2307c250ea3633d223d0d8345608364326df7698d5ebf8baf6a9e3ce4243a0b8fe2d011d8a0e9fce0007e SHA512 d2f3854b34d603cf3ecebedbf7741039b84fbcdd2770d9b6cd0e962a2ec078e5c1d865b0a40c4c403cc573481bccce6b12dec1f247aae7abe6599b9941fd63b2
+EBUILD pypy3_10-7.3.13_p1.ebuild 6150 BLAKE2B 05cd89e1afdacc9f33afb3f93a3f5d55b8ec1108ddc2307c250ea3633d223d0d8345608364326df7698d5ebf8baf6a9e3ce4243a0b8fe2d011d8a0e9fce0007e SHA512 d2f3854b34d603cf3ecebedbf7741039b84fbcdd2770d9b6cd0e962a2ec078e5c1d865b0a40c4c403cc573481bccce6b12dec1f247aae7abe6599b9941fd63b2
 MISC metadata.xml 531 BLAKE2B 0f727c7ced9fb24ba0dc0b41d51c177b3711de33b838bf46cfdde5d8b751de9694873c13fe8153747f2cb533c078c54f004ee84b1c3c57b6f8d62128ffb9dba2 SHA512 331b66647a58047ded4bcf1529e3ca16b21cbb37afa82d8be0a4b6ad605e17bf3f1478fad1ea3b9c970bdf5162cb41e6adcb029a261fcbf894e807998b9219f6
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.13-r1.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.13_p1.ebuild
index eadc6fd3034c..eadc6fd3034c 100644
--- a/dev-python/pypy3_10/pypy3_10-7.3.13-r1.ebuild
+++ b/dev-python/pypy3_10/pypy3_10-7.3.13_p1.ebuild