gentoo auto-resync : 09:03:2025 - 01:48:35

4 files changed, 2 insertions, 147 deletions

diff --git a/dev-python/h2/Manifest b/dev-python/h2/Manifest
index 57732e686d55..97e0b69023a3 100644
--- a/dev-python/h2/Manifest
+++ b/dev-python/h2/Manifest
@@ -1,6 +1,3 @@
-AUX h2-4.1.0-python3.11-tests.patch 3883 BLAKE2B 34dc1a9491af3a99b1df712664cb7eac39a18310178376f959f98fb5b55dfc34811cd2ea6468550093857a562f3a8450ee86ec84cfe805d56b46852f4bcd17c1 SHA512 b9c03e35020641e5ae37eb6a6f444c8dca76617e8ac8872b2ad34bd6ddfe7890ee7c485df5cd94215be1018b7b1fda32118e9d5a5ed469fabf8fe621f675103e
-DIST h2-4.1.0.tar.gz 2145593 BLAKE2B d4494ee58b97c3fb28f3480df3ecee9d8a0b6eec7165c692a6d33664eaf4e7a78a3e97f6644ba75a6bc1b67dfc3b6d0e431b90c6fe70ce4d4f3e22259419ace7 SHA512 89553cf1343de14b681706ac254b7e714574c777c6c81c934a00edc4f8fdde26f78fb90b4aebd9feec7893f4d1b68cf30dc9a404dd048cedbbfab3145720edc5
 DIST h2-4.2.0.tar.gz 2150682 BLAKE2B aee7821baf722dd9765c5a8ec22b33fa50b50183660212a4fe981d8e02b7afdad6b21166d3ad8656d336f9553c33c0ee8b4fd9a8d9cf370ff95d82f5333ea63d SHA512 a88a06ad7511cbc3870e8477aa3a4f1ab79c9db0ab1e71578c6e5be1bbc22d2d0a7b6878a8c18bd8b2cb22f1df9e46fe3e3c7223f44fa01f8d25f5f5bad28983
-EBUILD h2-4.1.0-r1.ebuild 861 BLAKE2B f09b77fc6220c34cc5a58a32e7924875f61b83f9f8591257262b721e2aa325aaa0fb46211c3ecc8f1c3258a2e64c46e481c1d325646a4aaa9aac423c8092a808 SHA512 4b0962c9e4ce7627b71a7c3cc4509eca3d5d3b1ffce79da65bd10d258f42a89ea65f07351e4ced1a929c7d3d8b467362bd1b34b7d8a05fe004ba7a42a56d78dd
-EBUILD h2-4.2.0.ebuild 876 BLAKE2B 2723c54ffc6eca0415fdce4ec2bb6fb0198e5fbdafd72a7458c1d03f49ff45a3b4ba689ee22f5961d4cfd25de35dda716061ed3a4742f17a5a9e60601ab82f7a SHA512 e3e8dd554852e8b9489a5eb6e57e0591b1c342b1f3288d0370f9159197afb6f82bcde1d9b225822f16ae9fdc26160f827db27e45955c25026717b9fec6191651
+EBUILD h2-4.2.0.ebuild 868 BLAKE2B d9a18e55ce8bcb37b34387596573c92098adc46cc47fa3ac9d6169639e4389b371d4dc24d3a615ed2f4f6fe65db68204c0696d149ec96f3527beedd5bcb296c8 SHA512 03f5c4538bae2b846fe06d2ddfdda2f97ac4fc6e238025c2ab0b33e0a976bba21e9763a8713df43fd22c4c29e5a15c66de83897e18f4b5a301ceddc68e33ff87
 MISC metadata.xml 749 BLAKE2B 56c11f66a8328e3cee57d2636d05fa9804be171e8790cb316799ee8bd84e00e2377b8a9ba913544a13fc89cd7e3120e0c58d3580be1156bd1af5e0d73d3fc89f SHA512 ab91ee344efed7c64fa87c427123758d8b872aa4bea5661c8fde7a94ff4b197d49a1b1133d4c7fce0d9165a09e299ad238f51cebe7439a80ad2bd5ca82edd540
diff --git a/dev-python/h2/files/h2-4.1.0-python3.11-tests.patch b/dev-python/h2/files/h2-4.1.0-python3.11-tests.patch
deleted file mode 100644
index c444e6a5007a..000000000000
--- a/dev-python/h2/files/h2-4.1.0-python3.11-tests.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-https://github.com/python-hyper/h2/commit/eabe727282e7a7aa3254773292f86cf341bdc597
-
-From eabe727282e7a7aa3254773292f86cf341bdc597 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
-Date: Sun, 3 Jul 2022 12:05:05 +0200
-Subject: [PATCH] Fix repr() checks for Python 3.11
-
-In Python 3.11, repr() was modified, this commit fixes the
-assertions to match the new repr() behavior.
-
-Fix #1268
---- a/test/test_events.py
-+++ b/test/test_events.py
-@@ -207,11 +207,18 @@ def test_remotesettingschanged_repr(self):
-                 ),
-         }
- 
--        assert repr(e) == (
--            "<RemoteSettingsChanged changed_settings:{ChangedSetting("
--            "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, "
--            "new_value=32768)}>"
--        )
-+        if sys.version_info >= (3, 11):
-+            assert repr(e) == (
-+                "<RemoteSettingsChanged changed_settings:{ChangedSetting("
-+                "setting=4, original_value=65536, "
-+                "new_value=32768)}>"
-+            )
-+        else:
-+            assert repr(e) == (
-+                "<RemoteSettingsChanged changed_settings:{ChangedSetting("
-+                "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, "
-+                "new_value=32768)}>"
-+            )
- 
-     def test_pingreceived_repr(self):
-         """
-@@ -249,10 +256,16 @@ def test_streamreset_repr(self):
-         e.error_code = h2.errors.ErrorCodes.ENHANCE_YOUR_CALM
-         e.remote_reset = False
- 
--        assert repr(e) == (
--            "<StreamReset stream_id:919, "
--            "error_code:ErrorCodes.ENHANCE_YOUR_CALM, remote_reset:False>"
--        )
-+        if sys.version_info >= (3, 11):
-+            assert repr(e) == (
-+                "<StreamReset stream_id:919, "
-+                "error_code:11, remote_reset:False>"
-+            )
-+        else:
-+            assert repr(e) == (
-+                "<StreamReset stream_id:919, "
-+                "error_code:ErrorCodes.ENHANCE_YOUR_CALM, remote_reset:False>"
-+            )
- 
-     def test_pushedstreamreceived_repr(self):
-         """
-@@ -284,11 +297,18 @@ def test_settingsacknowledged_repr(self):
-                 ),
-         }
- 
--        assert repr(e) == (
--            "<SettingsAcknowledged changed_settings:{ChangedSetting("
--            "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, "
--            "new_value=32768)}>"
--        )
-+        if sys.version_info >= (3, 11):
-+            assert repr(e) == (
-+                "<SettingsAcknowledged changed_settings:{ChangedSetting("
-+                "setting=4, original_value=65536, "
-+                "new_value=32768)}>"
-+            )
-+        else:
-+            assert repr(e) == (
-+                "<SettingsAcknowledged changed_settings:{ChangedSetting("
-+                "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, "
-+                "new_value=32768)}>"
-+            )
- 
-     def test_priorityupdated_repr(self):
-         """
-@@ -318,10 +338,16 @@ def test_connectionterminated_repr(self, additional_data, data_repr):
-         e.last_stream_id = 33
-         e.additional_data = additional_data
- 
--        assert repr(e) == (
--            "<ConnectionTerminated error_code:ErrorCodes.INADEQUATE_SECURITY, "
--            "last_stream_id:33, additional_data:%s>" % data_repr
--        )
-+        if sys.version_info >= (3, 11):
-+            assert repr(e) == (
-+                "<ConnectionTerminated error_code:12, "
-+                "last_stream_id:33, additional_data:%s>" % data_repr
-+            )
-+        else:
-+            assert repr(e) == (
-+                "<ConnectionTerminated error_code:ErrorCodes.INADEQUATE_SECURITY, "
-+                "last_stream_id:33, additional_data:%s>" % data_repr
-+            )
- 
-     def test_alternativeserviceavailable_repr(self):
-         """
-
diff --git a/dev-python/h2/h2-4.1.0-r1.ebuild b/dev-python/h2/h2-4.1.0-r1.ebuild
deleted file mode 100644
index 46b99db75231..000000000000
--- a/dev-python/h2/h2-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
-HOMEPAGE="
-	https://python-hyper.org/projects/h2/en/stable/
-	https://github.com/python-hyper/h2/
-	https://pypi.org/project/h2/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/hyperframe-6.0[${PYTHON_USEDEP}]
-	<dev-python/hyperframe-7[${PYTHON_USEDEP}]
-	>=dev-python/hpack-4.0[${PYTHON_USEDEP}]
-	<dev-python/hpack-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python3.11-tests.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/h2/h2-4.2.0.ebuild b/dev-python/h2/h2-4.2.0.ebuild
index ad90d2aa68eb..c05c7814a039 100644
--- a/dev-python/h2/h2-4.2.0.ebuild
+++ b/dev-python/h2/h2-4.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/hyperframe-6.1[${PYTHON_USEDEP}]