Adding metadata

5 files changed, 180 insertions, 67 deletions

diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index f25bd5f134d8..20b4a4cc0bed 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,3 +1,4 @@
 DIST aiohttp-3.11.14.tar.gz 7676994 BLAKE2B e8e048c01db9600df3bdc7bdc6e5066094b4575d08fef3ec7d0a78763a701cd3501dce435b80d3fbea28d2e7bf4110a5cc9e0ccec2bc3745835cadcb27528404 SHA512 38e51d3640b533d9bd639a59657bf7affbfc0b1a9dc40d77175d6528044e23b1e524589b9a10e0159eb8f9ba29e96b3e67529a9d11f1c53760a70800d813d13f
 DIST aiohttp-3.11.15.tar.gz 7676625 BLAKE2B 02a5230bd9d038f0e90e4b63e69502a8f2445b781e0b4ff6e40657d7c0d49ddce011ba28c3ddc03cd75a4e205d3544af15f9944f9908064d6f9b922862cc8ab0 SHA512 deeaed7f204fef23641d076d1fd455ebe97173726e2cfc47f82fffc654c51e975fb3012ac78bf60181771e001f3e6f3aac67e2bfc9ed9291ff6d92873969eb0e
 DIST aiohttp-3.11.16.tar.gz 7676826 BLAKE2B ae430c8d5e3c84442c95f6c485be2ca69df00b7dd2047ed34d7825c0f250b71ca1490140a1aff8b3dfcdb2af367958e59c94c60b288b7f534b1e1b0457debc10 SHA512 890f576d5ec8c364f8db29b1c4a540cd39cf61fa1fd17ec70049a8c1bf401745d8326e2b7b51bbbc7a2569bfe42f7aab022c23be186bb67f064a32ed16af18dd
+DIST aiohttp-3.11.17.tar.gz 7679092 BLAKE2B 1eabacddbbf03c22a156c30641c6b476760b12dd19b2f0d2e8fc066c60cee0c84745f8636257a356a87dab5b06d6f845a67c58da6abaeb513ae7bac86f8f3d9e SHA512 c514e772957e5b20da398bd38682ba10f43e1697a4f743c85fe5242437a0d7010a13b918b071a1bbe9e62c56cd58f76e5470056f917a23734449f9f2de225d78
diff --git a/dev-python/aiohttp/aiohttp-3.11.16-r1.ebuild b/dev-python/aiohttp/aiohttp-3.11.16.ebuild
index ac46aa05fc35..a0fbae8f985c 100644
--- a/dev-python/aiohttp/aiohttp-3.11.16-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.11.16.ebuild
@@ -17,15 +17,10 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+native-extensions test-rust"
 
-DEPEND="
-	$(python_gen_cond_dep '
-		native-extensions? ( net-libs/llhttp:= )
-	' 'python3*')
-"
-RDEPEND="${DEPEND}
+RDEPEND="
 	>=dev-python/aiodns-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/aiohappyeyeballs-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
@@ -62,10 +57,6 @@ BDEPEND="
 
 DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.11.16-devendor-llhttp.patch
-)
-
 EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
@@ -75,8 +66,6 @@ src_prepare() {
 	# xfail_strict fails on py3.10
 	sed -i -e '/--cov/d' -e '/pytest_cov/d' -e '/xfail_strict/d' setup.cfg || die
 	sed -i -e 's:-Werror::' Makefile || die
-	# remove the bundled llhttp, we use the system one
-	rm -r vendor/llhttp || die
 
 	distutils-r1_src_prepare
 }
diff --git a/dev-python/aiohttp/aiohttp-3.11.17.ebuild b/dev-python/aiohttp/aiohttp-3.11.17.ebuild
new file mode 100644
index 000000000000..06772b8404ff
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.11.17.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2025 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_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 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="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+native-extensions test-rust"
+
+DEPEND="
+	native-extensions? (
+		$(python_gen_cond_dep '
+			net-libs/llhttp:=
+		' 'python3*')
+	)
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/aiodns-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohappyeyeballs-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	dev-python/brotlicffi[${PYTHON_USEDEP}]
+	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/propcache-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.17.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		<dev-python/async-timeout-6[${PYTHON_USEDEP}]
+		>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	native-extensions? (
+		dev-python/cython[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python3*')
+		test-rust? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-3.11.17-unbundle-llhttp.patch"
+	)
+
+	distutils-r1_src_prepare
+
+	# increase the timeout a little
+	sed -e '/abs=/s/0.001/0.01/' -i tests/test_helpers.py || die
+	# xfail_strict fails on py3.10
+	sed -i -e '/--cov/d' -e '/pytest_cov/d' -e '/xfail_strict/d' setup.cfg || die
+	sed -i -e 's:-Werror::' Makefile || die
+	# remove vendored llhttp
+	rm -r vendor || die
+}
+
+python_configure() {
+	# check for .install-cython, so that we do this only once
+	if [[ ! -f .install-cython && ${EPYTHON} != pypy3 ]] &&
+		use native-extensions
+	then
+		# force rehashing first
+		emake requirements/.hash/cython.txt.hash
+		> .update-pip || die
+		> .install-cython || die
+		emake cythonize
+	fi
+}
+
+python_compile() {
+	# implicitly disabled for pypy3
+	if ! use native-extensions; then
+		local -x AIOHTTP_NO_EXTENSIONS=1
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# proxy is not packaged
+		tests/test_proxy_functional.py
+		# python_on_whales is not packaged
+		tests/autobahn/test_autobahn.py
+		# benchmarks
+		tests/test_benchmarks_client.py
+		tests/test_benchmarks_client_request.py
+		tests/test_benchmarks_client_ws.py
+		tests/test_benchmarks_cookiejar.py
+		tests/test_benchmarks_http_websocket.py
+		tests/test_benchmarks_http_writer.py
+		tests/test_benchmarks_web_fileresponse.py
+		tests/test_benchmarks_web_middleware.py
+		tests/test_benchmarks_web_response.py
+		tests/test_benchmarks_web_urldispatcher.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
+	)
+
+	# upstream unconditionally blocks building C extensions
+	# on PyPy3 but the test suite needs an explicit switch
+	if [[ ${EPYTHON} == pypy3* ]] || ! use native-extensions; then
+		local -x AIOHTTP_NO_EXTENSIONS=1
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin
+	rm -rf aiohttp || die
+	epytest -m "not internal and not dev_mode" \
+		-p rerunfailures --reruns=5
+}
diff --git a/dev-python/aiohttp/files/aiohttp-3.11.16-devendor-llhttp.patch b/dev-python/aiohttp/files/aiohttp-3.11.16-devendor-llhttp.patch
deleted file mode 100644
index 26aa843ad936..000000000000
--- a/dev-python/aiohttp/files/aiohttp-3.11.16-devendor-llhttp.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://src.fedoraproject.org/rpms/python-aiohttp/raw/bceb660b835a4aaffd763a261cb2cd2392ee06db/f/0001-Unbundle-llhttp.patch
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
-Date: Wed, 16 Feb 2022 13:57:57 +0100
-Subject: [PATCH] Unbundle llhttp
-
-Modified a little by arthurzam@gentoo.org to force cythonize
-
---- a/aiohttp/_cparser.pxd
-+++ b/aiohttp/_cparser.pxd
-@@ -1,7 +1,7 @@
- from libc.stdint cimport int32_t, uint8_t, uint16_t, uint64_t
-
-
--cdef extern from "../vendor/llhttp/build/llhttp.h":
-+cdef extern from "llhttp.h":
-
-     struct llhttp__internal_s:
-         int32_t _index
---- a/setup.py
-+++ b/setup.py
-@@ -27,23 +27,21 @@ if IS_GIT_REPO and not (HERE / "vendor/llhttp/README.md").exists():
- # NOTE: makefile cythonizes all Cython modules
-
- extensions = [
--    Extension("aiohttp._websocket.mask", ["aiohttp/_websocket/mask.c"]),
-+    Extension("aiohttp._websocket.mask", ["aiohttp/_websocket/mask.pyx"]),
-     Extension(
-         "aiohttp._http_parser",
-         [
--            "aiohttp/_http_parser.c",
--            "aiohttp/_find_header.c",
--            "vendor/llhttp/build/c/llhttp.c",
--            "vendor/llhttp/src/native/api.c",
--            "vendor/llhttp/src/native/http.c",
-+            "aiohttp/_http_parser.pyx",
-         ],
--        define_macros=[("LLHTTP_STRICT_MODE", 0)],
--        include_dirs=["vendor/llhttp/build"],
-     ),
--    Extension("aiohttp._http_writer", ["aiohttp/_http_writer.c"]),
-+    Extension("aiohttp._http_writer", ["aiohttp/_http_writer.pyx"]),
-     Extension("aiohttp._websocket.reader_c", ["aiohttp/_websocket/reader_c.c"]),
- ]
-
-+if not NO_EXTENSIONS:
-+    from Cython.Build import cythonize
-+    extensions = cythonize(extensions, force=True, language_level=3)
-+
-
- build_type = "Pure" if NO_EXTENSIONS else "Accelerated"
- setup_kwargs = {} if NO_EXTENSIONS else {"ext_modules": extensions}
---
-2.48.1
-
diff --git a/dev-python/aiohttp/files/aiohttp-3.11.17-unbundle-llhttp.patch b/dev-python/aiohttp/files/aiohttp-3.11.17-unbundle-llhttp.patch
new file mode 100644
index 000000000000..500377eb46e6
--- /dev/null
+++ b/dev-python/aiohttp/files/aiohttp-3.11.17-unbundle-llhttp.patch
@@ -0,0 +1,31 @@
+diff --git a/aiohttp/_cparser.pxd b/aiohttp/_cparser.pxd
+index c2cd5a92f..1b3be6d4e 100644
+--- a/aiohttp/_cparser.pxd
++++ b/aiohttp/_cparser.pxd
+@@ -1,7 +1,7 @@
+ from libc.stdint cimport int32_t, uint8_t, uint16_t, uint64_t
+ 
+ 
+-cdef extern from "../vendor/llhttp/build/llhttp.h":
++cdef extern from "llhttp.h":
+ 
+     struct llhttp__internal_s:
+         int32_t _index
+diff --git a/setup.py b/setup.py
+index c9a2c5c85..fe1a8101f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -33,12 +33,9 @@ extensions = [
+         [
+             "aiohttp/_http_parser.c",
+             "aiohttp/_find_header.c",
+-            "vendor/llhttp/build/c/llhttp.c",
+-            "vendor/llhttp/src/native/api.c",
+-            "vendor/llhttp/src/native/http.c",
+         ],
+         define_macros=[("LLHTTP_STRICT_MODE", 0)],
+-        include_dirs=["vendor/llhttp/build"],
++        libraries=["llhttp"],
+     ),
+     Extension("aiohttp._http_writer", ["aiohttp/_http_writer.c"]),
+     Extension("aiohttp._websocket.reader_c", ["aiohttp/_websocket/reader_c.c"]),