From 95076aaed8d8410c8ba5763a5deeafbac25c796a Mon Sep 17 00:00:00 2001
From: "Andreas Billmeier (@Home/mbp)" <b@edevau.net>
Date: Sun, 17 Dec 2023 12:19:49 +0100
Subject: [PATCH] dev-python/yarl: re-add 1.9.2 from main repo

Closes: https://git.edevau.net/onkelbeh/HomeAssistantRepository/issues/2545
Signed-off-by: Andreas Billmeier <b@edevau.net>
---
 dev-python/yarl/Manifest          |  4 +--
 dev-python/yarl/yarl-1.8.1.ebuild | 45 ------------------------
 dev-python/yarl/yarl-1.9.2.ebuild | 57 +++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 47 deletions(-)
 delete mode 100644 dev-python/yarl/yarl-1.8.1.ebuild
 create mode 100644 dev-python/yarl/yarl-1.9.2.ebuild

diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 7d53d28b0..c420acfcc 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,3 +1,3 @@
-DIST yarl-1.8.1.gh.tar.gz 109912 BLAKE2B c7390b78abb5074dd29e96848a77fdb31f6224e99d2bcfd5a28a8bd08881f5ff82cf55b2f54c97324d005a0fb3823732a9ed6bd3f1d837e4ac2341b89e2adb30 SHA512 267523216832c2bc83d92a42e621ff519d427e20c1ee84ac657e13f696a2df2259c837486f192d87944f5ebb834beea60ace791eb4c9c632fd7e552eb5dadf1b
-EBUILD yarl-1.8.1.ebuild 910 BLAKE2B 68d8fc7b158dd40cb8dd08f9a2b39544b17ade53772f742ddf951d29dfcb55daee99bada90676a797d8ace257092842d72cd3cb3abfab2fe99203cbf6d4b0a88 SHA512 ecf4dcc5136ed7fa3c2a3c937d61466993cfef4e0408086a253340deabe8f46e9cfe56bfc8cdce8560cf12ba84d9904515ec4d783ed85d49ac04daf7ac01ba2e
+DIST yarl-1.9.2.tar.gz 184673 BLAKE2B bb94131059d0cfaf88f04d62a44181245ebcb660cb44904f0b7e8d497905a16d0026aeff454b8179fab5342c6bf9c8d6aadade0d9f7c70321c71bbcc3998e9a3 SHA512 ffbb6df94220bb1561333f1ad69a70334328e2273ec5e91c2741f6fd5ca2f6dd38d5b5f617728797fce490accc2394a406a5f9b5b665af4746746229af0d7c5f
+EBUILD yarl-1.9.2.ebuild 1270 BLAKE2B 526c1a8b931ca8579917d32fc1a14e4b78dc4189aaf2147ab34e88a1ffac019fc9777f39b9bb3bf9054a17800745ae084229c6f9f64d230b6534ca3638ad4dff SHA512 4224cbfbad20b9450c3654659754c9868f02eb87ee9623c6da075564cf488681c80666208e0d7c8576d51cadcfa140fcdcf91b568a826bbf9862ec490bdde77c
 MISC metadata.xml 510 BLAKE2B b71d4ef6572b9b92c69edb95ca9db8c207ad5f98a7e9c6efc594406d2166700ea248472ba0940ec831c92337f1941d630b4852fcbd824d4b769a5add93c7803d SHA512 b6aa9af1d899f091ba0e8d7aa7a3f778d0e195d769c42c4a40ef9badd568241f0e0c682493ecdd5989af75e3f7774f6a4530df513cdbc96659960ae7f1da1873
diff --git a/dev-python/yarl/yarl-1.8.1.ebuild b/dev-python/yarl/yarl-1.8.1.ebuild
deleted file mode 100644
index 94d7e6777..000000000
--- a/dev-python/yarl/yarl-1.8.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="
-	https://github.com/aio-libs/yarl/
-	https://pypi.org/project/yarl/
-"
-SRC_URI="
-	https://github.com/aio-libs/yarl/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-python_configure() {
-	> .install-cython || die
-	emake cythonize
-}
-
-python_test() {
-	cd tests || die
-	epytest --override-ini=addopts=
-}
diff --git a/dev-python/yarl/yarl-1.9.2.ebuild b/dev-python/yarl/yarl-1.9.2.ebuild
new file mode 100644
index 000000000..2c4d4a0ef
--- /dev/null
+++ b/dev-python/yarl/yarl-1.9.2.ebuild
@@ -0,0 +1,57 @@
+# 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} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="
+	https://github.com/aio-libs/yarl/
+	https://pypi.org/project/yarl/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+src_configure() {
+	set -- cython -3 yarl/_quoting_c.pyx
+	echo "${*}" >&2
+	"${@}" || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if [[ ${EPYTHON} == python3.12 ]]; then
+		EPYTEST_DESELECT+=(
+			# tests for seemingly invalid addresses, unlikely to affect
+			# real world use
+			# https://github.com/aio-libs/yarl/issues/876
+			tests/test_url.py::test_ipv6_zone
+			tests/test_url.py::test_human_repr_delimiters
+			tests/test_url_parsing.py::TestHost::test_masked_ipv4
+			tests/test_url_parsing.py::TestHost::test_strange_ip
+			tests/test_url_parsing.py::TestUserInfo::test_weird_user3
+		)
+	fi
+
+	cd tests || die
+	epytest --override-ini=addopts=
+}