gentoo auto-resync : 17:08:2024 - 12:23:44

4 files changed, 2 insertions, 170 deletions

diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 337e264f32a3..acad15f16426 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,6 +1,3 @@
-AUX autobahn-23.6.2-pytest-asyncio.patch 1705 BLAKE2B 580b7721e899dfe1c9f48c7c90d626803d6af59c6878e363c793bedf9deef9f877de4f368bf380137bd609cd26243448ef075c2473eba39ebf2bdd990140f58c SHA512 d6e290b153a683c138f4df87c72906f19d17f73eb07b382a7b6a0cf106e2a505f0abe49e720a4af2ca37a37a21555d3da6ea4db5df232f1896bc9943e233e0f5
-DIST autobahn-23.6.2.tar.gz 480814 BLAKE2B fb4a2e8510a51e2e70289d98eb54b3b06aba6e011eb8ad4ac2fb6e706d7be313f60a785a8366ff47500a6ad58f5645eedbeb4c831087ab531d8650129ec08c45 SHA512 5935203277d17aab3f80e6edf700ff173fe7e23622b9d2617f91e080f56b078f947f907289f008b5eb21b1346142274616baad4a36629f49dafe409d6fdb931a
 DIST autobahn-24.4.2.tar.gz 482700 BLAKE2B e94026e0cfbb3a3ba2a494ac50e851ed1c35a842dd6b5ce2ac437a19fa0d30061d16b0965831ce57067d6682df256e5140d67e0e9b4d71cc1dbcc16287ffbed1 SHA512 2caffa9a49e3661e665a4e2641b96ff48581264654cb35ebc2e8a67620ce81bd330895bb12a098488676ab74c8275e601f45357840ca074c3c6a3d7247e563e9
-EBUILD autobahn-23.6.2.ebuild 3842 BLAKE2B 952b020001266cdcbb9711387aa47ea84501ae9e6c5a084f3411c4499da58c5c2d5cd4f58ee7ad61bb721c0141da08cb36a7871eb61a79eb2863c37399c999cf SHA512 ec3b22a0e56c7161fda265e8b9c061e0759730d7efdff9d38f3b3b09cdaa5546eb1ae1c0bb9818ad434496db9897ddda1ed3423cd18bd385c84e25ae9bd26a85
-EBUILD autobahn-24.4.2.ebuild 3885 BLAKE2B 1ae189c6765111f255b66777f38a0a76f4560ef5f58fbb5554346930c3a3cda0e483d4efd3a2f32311a03f0b2842aaa02e8115bb524a6d7b021d91527b1aad82 SHA512 3bf098167004c2083234db226c785f8bced8a85b9733ae32d44e04c3a1d5e69a7a9de8a7812747f299ffbc9dababd73585ac6a44a0c1c98d9e1c228f1dd9f15f
+EBUILD autobahn-24.4.2.ebuild 3881 BLAKE2B 469a081afbf520659eb8ec055b020d25cdfcf5bee60b4938e1fb35c1cc370f9283bf6d5a7550bfb39170209c60bf2401a5fcdc208cbbac8aa5a510266e6093c1 SHA512 e7d5bc8d5db259b28ddf346136ec2586c1fea0c34a72cc11ec603b2350593ddd8b69f6017090f91919a1c50285d834597fcc71c053670473ac89a3c7c3c2cb01
 MISC metadata.xml 490 BLAKE2B 8a89cd7548ec88a59515e5dc51748571a789dfd3fa937ccb85cd17a2cde6e0852374cbc70a115a8dba7df4216e41de74c9e9bc561d53cf65799169078e540028 SHA512 1069d3412e87c310b6067e35bcfd4d54f4b944ab98948dfc5053831d62a41d9656fd127a9366ea432cd90c35ced1e8ed913783f1e9494ffba4a28a20fbc465b4
diff --git a/dev-python/autobahn/autobahn-23.6.2.ebuild b/dev-python/autobahn/autobahn-23.6.2.ebuild
deleted file mode 100644
index de4ff8467e6d..000000000000
--- a/dev-python/autobahn/autobahn-23.6.2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2024 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 optfeature pypi
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="
-	https://github.com/crossbario/autobahn-python/
-	https://pypi.org/project/autobahn/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86"
-IUSE="test xbr"
-RESTRICT="!test? ( test )"
-
-# The order of deps is based on their appearance in setup.py
-# All extra deps should be included in test and in optfeature
-RDEPEND="
-	>=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-20.3.0[${PYTHON_USEDEP}]
-	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}]
-		>=dev-python/python-snappy-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
-		>=dev-python/ujson-4.0.2[${PYTHON_USEDEP}]
-		>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
-		>=dev-python/flatbuffers-22.12.06[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
-		>=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
-		>=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
-		>=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
-
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		# https://github.com/crossbario/autobahn-python/pull/1634
-		"${FILESDIR}/${P}-pytest-asyncio.patch"
-	)
-
-	if use xbr ; then
-		eerror "***************"
-		eerror "Required xbr dependencies are incomplete in Gentoo."
-		eerror "So this functionality will not yet work"
-		eerror "Please file a bug if this feature is needed"
-		eerror "***************"
-	else
-		# remove xbr components
-		export AUTOBAHN_STRIP_XBR="True"
-	fi
-
-	# avoid useless rust dependency
-	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
-
-	# remove twisted plugin cache regen in setup.py
-	# to fix tinderbox sandbox issue
-	sed -e '/import/s:reactor:__importmustfail__:' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf autobahn || die
-
-	einfo "Testing all, cryptosign using twisted"
-	local -x USE_TWISTED=true
-	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
-	unset USE_TWISTED
-
-	einfo "RE-testing cryptosign and component_aio using asyncio"
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x USE_ASYNCIO=true
-	epytest -p asyncio --pyargs \
-		autobahn.asyncio.test.test_aio_{raw,web}socket \
-		autobahn.wamp.test.test_wamp_{cryptosign,component_aio}
-	unset USE_ASYNCIO
-
-	rm -f twisted/plugins/dropin.cache || die
-}
-
-pkg_postinst() {
-	optfeature "C-based WebSocket acceleration" "dev-python/wsaccel"
-	optfeature "non-standard WebSocket compression support" \
-		"dev-python/python-snappy"
-	optfeature "accelerated WAMP serialization support" \
-		"dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson"
-	optfeature "TLS transport encryption" \
-		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/qrcode dev-python/service-identity"
-	optfeature "WAMP-SCRAM authentication" \
-		"dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
-	optfeature "native SIMD acceleration" "dev-python/cffi"
-
-	python_foreach_impl twisted-regen-cache
-}
-
-pkg_postrm() {
-	python_foreach_impl twisted-regen-cache
-}
diff --git a/dev-python/autobahn/autobahn-24.4.2.ebuild b/dev-python/autobahn/autobahn-24.4.2.ebuild
index 02db640a0eb7..f5904aea182f 100644
--- a/dev-python/autobahn/autobahn-24.4.2.ebuild
+++ b/dev-python/autobahn/autobahn-24.4.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86"
 IUSE="test xbr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/autobahn/files/autobahn-23.6.2-pytest-asyncio.patch b/dev-python/autobahn/files/autobahn-23.6.2-pytest-asyncio.patch
deleted file mode 100644
index 2cdbd863231b..000000000000
--- a/dev-python/autobahn/files/autobahn-23.6.2-pytest-asyncio.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5ab94618723c488df640ae0777ac5a16ee1ab369 Mon Sep 17 00:00:00 2001
-From: David Hotham <david.hotham@microsoft.com>
-Date: Sat, 13 Apr 2024 05:27:01 +0100
-Subject: [PATCH] unit test fixes (#1634)
-
----
- autobahn/wamp/test/test_wamp_component_aio.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/autobahn/wamp/test/test_wamp_component_aio.py b/autobahn/wamp/test/test_wamp_component_aio.py
-index 168933ea5..2de9bf358 100644
---- a/autobahn/wamp/test/test_wamp_component_aio.py
-+++ b/autobahn/wamp/test/test_wamp_component_aio.py
-@@ -35,7 +35,7 @@
- 
-     @pytest.mark.skipif(sys.version_info < (3, 5), reason="requires Python 3.5+")
-     @pytest.mark.asyncio(forbid_global_loop=True)
--    def test_asyncio_component(event_loop):
-+    async def test_asyncio_component(event_loop):
-         orig_loop = txaio.config.loop
-         txaio.config.loop = event_loop
- 
-@@ -72,11 +72,11 @@ def done(f):
-             txaio.config.loop = orig_loop
-             assert comp._done_f is None
-         f.add_done_callback(done)
--        return finished
-+        await finished
- 
-     @pytest.mark.skipif(sys.version_info < (3, 5), reason="requires Python 3.5+")
-     @pytest.mark.asyncio(forbid_global_loop=True)
--    def test_asyncio_component_404(event_loop):
-+    async def test_asyncio_component_404(event_loop):
-         """
-         If something connects but then gets aborted, it should still try
-         to re-connect (in real cases this could be e.g. wrong path,
-@@ -151,4 +151,4 @@ def done(f):
-                 finished.set_result(None)
-                 txaio.config.loop = orig_loop
-             f.add_done_callback(done)
--            return finished
-+            await finished