gentoo xmass resync : 25.12.2021

4 files changed, 3 insertions, 112 deletions

diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 6bf880065ed0..e5ea0efe50f0 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,5 +1,3 @@
 DIST autobahn-21.11.1.tar.gz 365165 BLAKE2B 91a12bf1fa9acd056246d86675c76fbcdb4de8914f4ab5e2c8ec06cf8e822cc1a72f8a7b39b520405cce32e2f32024ebbaa48ba024e1dc71b50da4e6f8913e19 SHA512 5a23272046ef67821e86c6bfe766273b3ba73a75fbc51c7864c2ab83ffb8d4e119022980f8b71c453118bf15b26ede8042aa0114e54caebbfb33555208093ac2
-DIST autobahn-21.3.1.tar.gz 351296 BLAKE2B d018c8820a1accc779decdb8d392d3ff6225f80674b468145a8f29b275d6f0b1021a226dc8bc72915a792591e6d4ae8d6a33a96cf705241990ac401c8342e2c5 SHA512 dd6bf6eba6f2880860c6fa42e3925bb15d36bfb9d2354ddeb0165972848e81a308723b7f9dcd6ec3426b6286f71cb2da453590810e5d891523d92acf9fd64c52
-EBUILD autobahn-21.11.1.ebuild 3785 BLAKE2B 6e018eafc9dee4e89e2e772cf93c89db9ae8faa152e2c853c4a66d256ca095354f5d5b147fe0cffbcd8366aa08a4007d7b4efec1cf4ffb103ec2c98718950cfd SHA512 99a56b08bf145c01db1a7aa2637d5e7bfc10dd22f8c9fa17909ff1a8debcda69388ab6aeb4374754928263f23cfd3c76748242ddc7b2d6f2a0e5325ff756aeb7
-EBUILD autobahn-21.3.1.ebuild 3215 BLAKE2B d8ccb2dd8d0416405bcb7ed60d743865bdb77e43d994e3b42542166d708c0589d7466dfcf6b6dd7326d3173beac446a5c6a890d17ce58ac055661b067dec5b22 SHA512 a81983cbdbbcaee49e53fb59f0a39dcdfc7e1f2ae7271853bb7e5af2dcecad32d9342bb0972e6f3a377424b99923d79ccc3d3b0093d2b6aa5ef63913fb0899eb
-MISC metadata.xml 666 BLAKE2B 97509f8466cf0c3ebdb3e167bb9bcc71b9cf27f065f4f7a3cd40111282ada3433ed23e6ad52e735205d165342c7895adb85461939de797d17a1569267189adef SHA512 3cbf58119fce3e9f097f785ff8fc760c675190fcc3a4569a6667b29cc8d1a4a977cfbc2564e227ab0463e6406061ea6e16a2f94f34d5c51a5f2bf391da54c673
+EBUILD autobahn-21.11.1.ebuild 3781 BLAKE2B 79d993bf0786e339d01350c147328059106034c34802a4ee84652580e36caeadd4bd4791aef6852eab30c8bf47a6e342d32f277796f4332c3ceb2dbe3afc0144 SHA512 7ce7daf204d5c1eef5f91e4f1ab78ae4df142ec3f7da889929481c27c85e6e12610fd0052ed3cadbb7a90876d133621d02b61ed4b41aeaf2419d5e2142a136a5
+MISC metadata.xml 596 BLAKE2B 07cc4fbcb4c6fde6b1bb49a0a30fa8d2ef7ff4424397e29053a6ac89d87acd9fa7b1897c5381910d53f590192945a89a5b987fcdb9595e42f67f23333010a0ba SHA512 4d4cecf09593ec201711b13de1820e59f007f745b41611471ec737da4d679323787ac06a3a987cede9bf2c8dff71c9dbcb197e6a9c9109cf4d3a34d9247f9962
diff --git a/dev-python/autobahn/autobahn-21.11.1.ebuild b/dev-python/autobahn/autobahn-21.11.1.ebuild
index 6df62a763f96..b7a20a890e04 100644
--- a/dev-python/autobahn/autobahn-21.11.1.ebuild
+++ b/dev-python/autobahn/autobahn-21.11.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="test xbr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/autobahn/autobahn-21.3.1.ebuild b/dev-python/autobahn/autobahn-21.3.1.ebuild
deleted file mode 100644
index bb29fec98698..000000000000
--- a/dev-python/autobahn/autobahn-21.3.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=${PN}-$(ver_rs 3 -)
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
-	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="crypt scram test xbr"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
-	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/ujson-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
-	)
-	scram? (
-		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/argon2-cffi[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	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 's/# regenerate Twisted plugin cache/# DO NOT regenerate Twisted plugin cache in Gentoo\nexit()/' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	einfo "Testing all, cryptosign using twisted"
-	local -x USE_TWISTED=true
-	cd "${BUILD_DIR}"/lib || die
-	"${EPYTHON}" -m twisted.trial autobahn || die
-	unset USE_TWISTED
-	einfo "RE-testing cryptosign and component_aio using asyncio"
-	local -x USE_ASYNCIO=true
-	pytest -vv autobahn/wamp/test/test_wamp_cryptosign.py || die
-	pytest -vv autobahn/wamp/test/test_wamp_component_aio.py || die
-	unset USE_ASYNCIO
-	rm -r .pytest_cache || die
-	rm -f "${BUILD_DIR}"/lib/twisted/plugins/dropin.cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl twisted-regen-cache || die
-}
-
-pkg_postrm() {
-	python_foreach_impl twisted-regen-cache || die
-}
diff --git a/dev-python/autobahn/metadata.xml b/dev-python/autobahn/metadata.xml
index 5822dba04825..67c2b1b9d76d 100644
--- a/dev-python/autobahn/metadata.xml
+++ b/dev-python/autobahn/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Python</name>
 	</maintainer>
 	<use>
-		<flag name="scram">Add support for WAMP-SCRAM authentication</flag>
 		<flag name="xbr">Add support for XBR decentralized data markets and etherium blockchain</flag>
 	</use>
 	<upstream>