gentoo resync : 29.12.2022

3 files changed, 21 insertions, 17 deletions

diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 6d4844fd021a..77959b79fb93 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,5 +1,5 @@
-DIST autobahn-22.3.2.tar.gz 376020 BLAKE2B 5d7b776c24541b08363942ed1868d5e7a2ccb4f99edc1ad722d3d68417852f324e79afa5ec8cc0251499ba27c078087ba40be744d657b562f5f1c431492705b6 SHA512 a33619bb7624f56bf571a4c61d11290316554c5c5a23724c6d5624f1e8e673dfc6a8e12ea3b17f809306a14f45e982b3425a23efb123003b575b248718c9a299
 DIST autobahn-22.4.2.tar.gz 396061 BLAKE2B da51f53f138ff6935f55561305c9cb0b29dcfef27fa63f32beac867f8aec2149a681f2dcbea6f30423e5571bf0fbf18fe13604c11d1accf78629c714bcbbc754 SHA512 9d803a699dd370b25e6c1601e635fe60a8e24f33245008bfe271d34ba47e70b7fab8c555a2c68a5255515a51e56476a63bfb0c9d98ed3687b71317ab46efc5ec
-EBUILD autobahn-22.3.2.ebuild 3751 BLAKE2B 90a1aebc176b9bb0c4acbddbcd1a2ca0e986a1777e5e759b4a19999bac246664032223b5e85f68fac64de9ff272d769db207741378e6f357d9d501ecbae3ad41 SHA512 a212034378ecaf84ea5bc714e7daf339b3ce5b201316891fd17f4acc6ab8a07dd5d78393664b80edfc504d3207c1dc185d9cf0d46bb0fc01776861aa4fc052d2
-EBUILD autobahn-22.4.2.ebuild 3755 BLAKE2B c39c6f86301b4d595e5236755b05bacc4ecce3cac1eeb82d80eaded33d242a4c7ecd711bd97e8a1c3b2e7a323513e40d755537dcffdf2477e1f914ae44a69f0d SHA512 91ab857cc3483a66f1b44e06d8f80a486dc64abb325638746fd97a5467a595b345de9e2ce325ca0349eaad765e53845c8bf513a49d7692dd5d6ee18b592ac93a
+DIST autobahn-22.5.1.tar.gz 435571 BLAKE2B 5e596102b639228d95cea027a0e7187adc4f0910afbd3c5753c0408e070a37b911362eba64c79ce6201000e59381de0941619bef152ca2d784a2c19f1a67a36f SHA512 c27c0f1a782c53df7c152c8043a8e5502f19944e9d5a6ab4a95d02016dfbba70a770f1f4969b75995beed852191bde288d80d1336d56fba1eea190d6590ca642
+EBUILD autobahn-22.4.2.ebuild 3683 BLAKE2B 5f0f9de97ffb069ef5b02af03ecb8b3e752b74548e10051ac57670511a9627d4ac8edc0eaa5a4ad036e39f9f63bac6fa40a819181433dab5ad743f9ecc854eb3 SHA512 9699e16e5e344f12775c5e0d03a3bfab69dcf92f49cd3fd1da2f77c6a200491b4070640a240c476459518e11f9bd4ab450beaa2318bf995b937ef127fed199e4
+EBUILD autobahn-22.5.1-r1.ebuild 3685 BLAKE2B 38a2c5e862d2d284444ca0e7483914cd7dda97303580fc85c65e2c3f99596baa5208db8480f199681e02be6cebdd2d21f79369d3af9b5a61126a25b936b3a9e2 SHA512 8c729eb36a389c05c262181e6b2e49a43cbe7873172155a60cfd994ef13e9554c185095529bd8edda6cbfddba140686be7aebec7d7825f03eeb1c3f80ff9d262
 MISC metadata.xml 596 BLAKE2B 07cc4fbcb4c6fde6b1bb49a0a30fa8d2ef7ff4424397e29053a6ac89d87acd9fa7b1897c5381910d53f590192945a89a5b987fcdb9595e42f67f23333010a0ba SHA512 4d4cecf09593ec201711b13de1820e59f007f745b41611471ec737da4d679323787ac06a3a987cede9bf2c8dff71c9dbcb197e6a9c9109cf4d3a34d9247f9962
diff --git a/dev-python/autobahn/autobahn-22.4.2.ebuild b/dev-python/autobahn/autobahn-22.4.2.ebuild
index a15603075d58..230dbd5485c6 100644
--- a/dev-python/autobahn/autobahn-22.4.2.ebuild
+++ b/dev-python/autobahn/autobahn-22.4.2.ebuild
@@ -11,15 +11,17 @@ inherit distutils-r1 optfeature
 MY_P=${PN}-$(ver_rs 3 -)
 
 DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
+HOMEPAGE="
 	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
+	https://github.com/crossbario/autobahn-python/
+	https://pypi.org/project/autobahn/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 IUSE="test xbr"
 RESTRICT="!test? ( test )"
 
@@ -47,7 +49,6 @@ BDEPEND="
 		>=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/pyqrcode-1.2.1[${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}]
@@ -82,15 +83,16 @@ python_prepare_all() {
 }
 
 python_test() {
+	rm -rf autobahn || die
+
 	einfo "Testing all, cryptosign using twisted"
 	local -x USE_TWISTED=true
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
 	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
 	unset USE_TWISTED
 
 	einfo "RE-testing cryptosign and component_aio using asyncio"
 	local -x USE_ASYNCIO=true
-	epytest autobahn/wamp/test/test_wamp_{cryptosign,component_aio}.py
+	epytest --pyargs autobahn.wamp.test.test_wamp_{cryptosign,component_aio}
 	unset USE_ASYNCIO
 
 	rm -f twisted/plugins/dropin.cache || die
diff --git a/dev-python/autobahn/autobahn-22.3.2.ebuild b/dev-python/autobahn/autobahn-22.5.1-r1.ebuild
index 6280c160e0bd..1d5606fe61ec 100644
--- a/dev-python/autobahn/autobahn-22.3.2.ebuild
+++ b/dev-python/autobahn/autobahn-22.5.1-r1.ebuild
@@ -4,22 +4,24 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 optfeature
 
 MY_P=${PN}-$(ver_rs 3 -)
 
 DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
+HOMEPAGE="
 	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
+	https://github.com/crossbario/autobahn-python/
+	https://pypi.org/project/autobahn/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="test xbr"
 RESTRICT="!test? ( test )"
 
@@ -47,7 +49,6 @@ BDEPEND="
 		>=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/pyqrcode-1.2.1[${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}]
@@ -82,15 +83,16 @@ python_prepare_all() {
 }
 
 python_test() {
+	rm -rf autobahn || die
+
 	einfo "Testing all, cryptosign using twisted"
 	local -x USE_TWISTED=true
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
 	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
 	unset USE_TWISTED
 
 	einfo "RE-testing cryptosign and component_aio using asyncio"
 	local -x USE_ASYNCIO=true
-	epytest autobahn/wamp/test/test_wamp_{cryptosign,component_aio}.py
+	epytest --pyargs autobahn.wamp.test.test_wamp_{cryptosign,component_aio}
 	unset USE_ASYNCIO
 
 	rm -f twisted/plugins/dropin.cache || die
@@ -102,7 +104,7 @@ pkg_postinst() {
 	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/pyqrcode dev-python/service_identity"
+		"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"