gentoo auto-resync : 24:06:2024 - 00:11:52

3 files changed, 7 insertions, 72 deletions

diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 1722a284b452..9fe77359f475 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,9 +1,8 @@
-AUX streamlink-6.7.2-validator.patch 2637 BLAKE2B 91b6c0f12b584c0908f0d4092d87cb50feefbdc3ff563d7585c5713547ffbb54614b7970435664d3a0cae7c1b7ae69edaa7bd15ff19a4169c9bc5ff02f0edfe5 SHA512 fe9d12e5d7bbdee7f778ac344494ec0fca6489509a92627b6305b425d1f594337a8b495c61c87f90356a9aaf97996b6b9b2b804f1b08f1ca3358ad2dec1cdea8
-DIST streamlink-6.7.2.tar.gz 741037 BLAKE2B b6ecea883a8b09e524a28ebdee083bb5f1e563605ef16fb3adebba03194ad3f1d8f9dc902cfe80372dc53c5778f1ddc9695680b5cd4a87277b646fc15fffd7e2 SHA512 251e0b03c39dae980367e8a5b6ffcb1c279b0874eeaeff31d9d4486917b759ef27ba2bd5bba0bc74691237e429981f3748002e0ef49befe8c7be69160856ecfe
 DIST streamlink-6.7.3.tar.gz 742832 BLAKE2B 5f03a036c3f2170d25e43618f36d7b937e8063f15a965f45d8cc6033b49899b15c19af23aa2a845f8aec74341932721b792dad6bff70400f0dea24a19f1415ed SHA512 0955faab177bcdd0f66500f837124bf0f426829cb5c847fa18bb85aa3fcd7c27a750bab13f3e247b5187e9561713330b582b10729d82984d98081856e976ae65
 DIST streamlink-6.7.4.tar.gz 744387 BLAKE2B bd8fb9af560fbe164a63fd1b698100765c716b44b6f3364e6ad072f69d0fdee9d22dd0fda6c297f249915c9a60f10e2089228a8c19244a7ef18b5809632bf96a SHA512 266c66626624814d708a228d4e2e62c443c3973fb139632a88086619c755fa80d97fad077a2a7383f9beb3e2f4464274beb0bb446b85f6f63d6704a88a9c2e29
-EBUILD streamlink-6.7.2-r1.ebuild 3586 BLAKE2B 84da1643f580ee83c3c21d10ea05938c8f19508f0174d7c078712df5f6e87974935ca102d409158c76d326079f23aa03a1090fd61e567072672fe8a78d22126d SHA512 8b35abad170e51449321c60d238dc956fd9f567ec0342ad10da21f2e1d7671379f8523d227bc1d5b544815fbc7ba258638dc9c49c94eb476da26f7050cbda6a5
+DIST streamlink-6.8.1.tar.gz 748765 BLAKE2B bf42375bc37432c66e8d2c9d8c3b31cfbda8c990bc4d7b83970198c4f60b5dc30d5ce3daf339bb842bc058955edff55df16da4f4cc0362410eaaff1bb6d74e28 SHA512 51cb03ca2414ec64f95704833568bb48aaae458e77f6ef3f4d858b564908cff4944c07a0b4d3bb648a0fe2bbb6a43a7964333878e31aef0b2a6ff3b9048b8e1d
 EBUILD streamlink-6.7.3.ebuild 3511 BLAKE2B dbb535f5f5379b3c4fdc8d63782a517631764df5381cdbad9ddac1279670b174f2b90ce71b8640a51ddc1f4e58feddbdcb5e929d16efd232a83a38da475d9a4b SHA512 e8d23d97c4333ad15590fba842174a9ce91901ca76491e9cafd8517584c9e52df40ba99b24a1282abaa7fd55b83e66d17f707050ba6061511ebad791159c9fa3
 EBUILD streamlink-6.7.4.ebuild 3467 BLAKE2B 86cce8c49e044677799d05283a625b9255bb7a8f87df22dc95481a65cef2db6f863f1263a01c84240c59cd85bc3830d75ac6a31c018f9c23ea708c39973647d6 SHA512 6544c612555ba1d853adac93114be7093ac3d33443ab4bcdb272c64e9e3f85d3a644dbab5708d652bf128f7d3fa8ebb3a4ed9b88de8a904ed173e27b1fe0728e
+EBUILD streamlink-6.8.1.ebuild 3467 BLAKE2B 86cce8c49e044677799d05283a625b9255bb7a8f87df22dc95481a65cef2db6f863f1263a01c84240c59cd85bc3830d75ac6a31c018f9c23ea708c39973647d6 SHA512 6544c612555ba1d853adac93114be7093ac3d33443ab4bcdb272c64e9e3f85d3a644dbab5708d652bf128f7d3fa8ebb3a4ed9b88de8a904ed173e27b1fe0728e
 EBUILD streamlink-9999.ebuild 3467 BLAKE2B 86cce8c49e044677799d05283a625b9255bb7a8f87df22dc95481a65cef2db6f863f1263a01c84240c59cd85bc3830d75ac6a31c018f9c23ea708c39973647d6 SHA512 6544c612555ba1d853adac93114be7093ac3d33443ab4bcdb272c64e9e3f85d3a644dbab5708d652bf128f7d3fa8ebb3a4ed9b88de8a904ed173e27b1fe0728e
 MISC metadata.xml 398 BLAKE2B 43aa67d43256cecb95b788e4bab999f73b7b624fa1af0432aa87ffa94071f09e29eab6733468d6607eeb7aa9f81030610dfbcd849f9cb9196d80181ea5712f74 SHA512 2db05f8a1196e44e632b4ee1d85f804d295eb53141cf176e85cbe90cc30e0fee382a5e798e4cc7fd63557d60687d05a671533c2188a2fcf497f6e95292190149
diff --git a/net-misc/streamlink/files/streamlink-6.7.2-validator.patch b/net-misc/streamlink/files/streamlink-6.7.2-validator.patch
deleted file mode 100644
index 8dc69d62616a..000000000000
--- a/net-misc/streamlink/files/streamlink-6.7.2-validator.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://github.com/streamlink/streamlink/pull/5932
-https://github.com/streamlink/streamlink/commit/0466622dc0bd13db972f6a00d2e2bda31ad50229
-
-Quoting the PR:
-"""
-Since Python 3.11.9 / 3.12.3 / 3.13.0a6, urllib.parse.parse_qsl() now raises a TypeError
-if the input is not a str, is truthy and can't be passed to memoryview(), like integers for example,
-hence the test failure which previously just checked an invalid input to that validation schema.
-"""
-
-From 51c13ddd45f83384cf7800a881127ad74dec3bb8 Mon Sep 17 00:00:00 2001
-From: bastimeyer <mail@bastimeyer.de>
-Date: Tue, 9 Apr 2024 21:36:03 +0200
-Subject: [PATCH] plugin.api.validate: check parse_qsd() input type
-
----
- src/streamlink/plugin/api/validate/_validators.py |  6 +++++-
- tests/test_api_validate.py                        | 11 +++++++++--
- 2 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/src/streamlink/plugin/api/validate/_validators.py b/src/streamlink/plugin/api/validate/_validators.py
-index 69135b74919..e99d305733f 100644
---- a/src/streamlink/plugin/api/validate/_validators.py
-+++ b/src/streamlink/plugin/api/validate/_validators.py
-@@ -651,4 +651,8 @@ def validator_parse_qsd(*args, **kwargs) -> TransformSchema:
-     :raise ValidationError: On parsing error
-     """
- 
--    return TransformSchema(_parse_qsd, *args, **kwargs, exception=ValidationError, schema=None)
-+    def parser(*_args, **_kwargs):
-+        validate(AnySchema(str, bytes), _args[0])
-+        return _parse_qsd(*_args, **_kwargs, exception=ValidationError, schema=None)
-+
-+    return TransformSchema(parser, *args, **kwargs)
-diff --git a/tests/test_api_validate.py b/tests/test_api_validate.py
-index ceff9bc1dde..c328116d27b 100644
---- a/tests/test_api_validate.py
-+++ b/tests/test_api_validate.py
-@@ -1343,13 +1343,20 @@ def test_success(self):
-             validate.parse_qsd(),
-             "foo=bar&foo=baz&qux=quux",
-         ) == {"foo": "baz", "qux": "quux"}
-+        assert validate.validate(
-+            validate.parse_qsd(),
-+            b"foo=bar&foo=baz&qux=quux",
-+        ) == {b"foo": b"baz", b"qux": b"quux"}
- 
-     def test_failure(self):
-         with pytest.raises(ValidationError) as cm:
-             validate.validate(validate.parse_qsd(), 123)
-         assert_validationerror(cm.value, """
--            ValidationError:
--              Unable to parse query string: 'int' object has no attribute 'decode' (123)
-+            ValidationError(AnySchema):
-+              ValidationError(type):
-+                Type of 123 should be str, but is int
-+              ValidationError(type):
-+                Type of 123 should be bytes, but is int
-         """)
- 
- 
diff --git a/net-misc/streamlink/streamlink-6.7.2-r1.ebuild b/net-misc/streamlink/streamlink-6.8.1.ebuild
index 73d54972af03..6d9015879476 100644
--- a/net-misc/streamlink/streamlink-6.7.2-r1.ebuild
+++ b/net-misc/streamlink/streamlink-6.8.1.ebuild
@@ -26,20 +26,21 @@ fi
 LICENSE="BSD-2 Apache-2.0"
 SLOT="0"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 # See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep
-# See https://github.com/streamlink/streamlink/pull/5895 re exceptiongroup dep
 RDEPEND="
 	media-video/ffmpeg
 	$(python_gen_cond_dep '
+		dev-python/exceptiongroup[${PYTHON_USEDEP}]
+	' 3.10)
+	$(python_gen_cond_dep '
 		dev-python/certifi[${PYTHON_USEDEP}]
 		|| (
 			dev-python/chardet[${PYTHON_USEDEP}]
 			dev-python/charset-normalizer[${PYTHON_USEDEP}]
 		)
-		dev-python/exceptiongroup[${PYTHON_USEDEP}]
 		>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
 		dev-python/isodate[${PYTHON_USEDEP}]
 		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
@@ -73,14 +74,10 @@ if [[ ${PV} == 9999* ]]; then
 	"
 fi
 
-PATCHES=(
-	"${FILESDIR}"/${P}-validator.patch
-)
-
 distutils_enable_tests pytest
 
 python_test() {
-	# Skip tests requiring <dev-python/pytest-8.0.0 which is currently masked
+	# Skip tests requiring <dev-python/pytest-8.0.0
 	# https://github.com/streamlink/streamlink/pull/5901
 	EPYTEST_DESELECT+=(
 		tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception