gentoo resync : 25.08.2020

6 files changed, 64 insertions, 197 deletions

diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 8d654c20d92e..f58c975822f5 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,8 +1,5 @@
-AUX autobahn-18.3.1-Fix-cs-test-955.patch 3736 BLAKE2B eece2b356181b4dac4849dacf555b5c64499f8484ca959c402cd124badccb8d5e8aea20d2310c8f5920d3dbde8854dcdf2c2abd93dd9e0effa8808eed3c78ea0 SHA512 380e3641d5b203a0f9dbdeca21dd7dc0802bf8675271a847824a5059c3867cd92a5f51db90414e74c0749337db191df9693a9d36562b16ed090bb9a508c7b66b
-DIST autobahn-17.5.1.tar.gz 205144 BLAKE2B a026381330d062059f23bd0fe20de12bf227fec45c816ce41a05d81951a2cb263e70ec3a5cee265ea3cc1f6910975903b493a767dce64c5bbb13be077561cabd SHA512 904f8f4c527a6c1c7840ea8634d0c0a47141458500c6d29f4aa1f05ff51f91c65a451b7c447201cbdf5e255c4c2d07509efa106790217b09398e7d50c1d85382
-DIST autobahn-18.3.1.tar.gz 213042 BLAKE2B 2f5eb92212f57d2301dbac1108a81cbbd339da4cb5527e3eb55f1ae7dcb951fed3cb7c643e76beaa0a83d623fe96f9eebcf7945e10efb0773e102d0234ebc479 SHA512 3d122cfb54eff0697cf60cd155a07699c6f6b39e573616c247ea79e65e6fa0a86d505ea8bc4f4755dbf266fb8bc7fadabb4338aeb1b9e6a2f0503e1b4d25e2e6
 DIST autobahn-20.4.3.tar.gz 938992 BLAKE2B 259d18f4aa46f7eaeac75811c1c193f3046aca5c5e37627d9ac62eeaa3dc944d05a8d87a558e241bdef56c799be4d89f65d4c8ee7c1a2be20f892896227eb5f9 SHA512 c34f29951b8f9ff5161851cf3a7e964de136f6091b0231a8e78e7fe74cb085077be5078cee352b2c27412d9aa4303de1eb85aa1890b4fb583575638a9c47c6fb
-EBUILD autobahn-17.5.1-r2.ebuild 1746 BLAKE2B 58518e8cd04b6c01710a01d8b269496ce0c08b7fa9513e3f7f767e6012b3bf8d65dda993ce68e65f0c1ea17ba75bda36b11770a35e8d84241c7b0f80c5c0336d SHA512 6b5d81c6a25161d515acb187d1cc319399e81886af2806074d40e3c626ed4f51681d16b4ed9478ae941ebc4e028bb3fafe3fb9974398fb0ae81553307302ef82
-EBUILD autobahn-18.3.1.ebuild 2112 BLAKE2B 35fb84e5a25f80ea08dc8994d940b19ae9758bf1120b2b70d2bc2280e1b29efa6a1f3a8d01917c27d593a7e602ebbc64af236f05b9e279d5820e3d965c414fd2 SHA512 2ce04471413d1252d58cf43e80d65be5c2d0b3049426b0863387d624762b5a9fc1060d8d9a7d657d1d4e9b54dd6a16174ab5e40c4e7962158958e57270152bf3
-EBUILD autobahn-20.4.3.ebuild 2437 BLAKE2B b3c6a2728146163423cd42ba36c7b01c8045bad291e74201ef8ef1fb5a39b811ff38bea73c9107da40af5ad8fb36a8d0e4d3d606e5167617192f17df8bba60a6 SHA512 067080cb643272e9ea8626bc0d4c3e9415ae730b8162f1f9efcdc95318ab84f957900cb263d0dcfd1befd3ea9bd9db98a68c330551bf0bc378f6e2c455051076
-MISC metadata.xml 397 BLAKE2B 2953764a2489f28c0ac996cc8ddb805720cd037ab685d342421b9f735eca7a794c830d551159c4a58e8c22c2101dd7180b298d3b28dd936f651834b9bf3a1838 SHA512 730d7bf2c742cba64c8d64117c928d4712efb46b87b71dfc9195f0a014c26c778c653ddf1386b3e274ed556c30c28347ce4502b0fc2447fc8c51b0a65941bc00
+DIST autobahn-20.7.1.tar.gz 1260579 BLAKE2B 925d148836348c068d179d4871267bf79c8c42d27cacc6be09cca11396dbd213a5b86344142df886d4ff69d1214a86b49900ca3552bcdb640377cb0d6af7d0f0 SHA512 e2c241194da90ada86a2804683cb063320f75a69b76ddc016349c11614e7f298619c2eeba4fcccb8f8d65d84375681fb339d9f92f94f45f1015f4f12fa0c39b0
+EBUILD autobahn-20.4.3.ebuild 2451 BLAKE2B 3d5427b1164f94073c6da8724f11b9af14135f07bca9d2659c1d865fa646288cd50e980d51543cba6a53f039ebe12b17d30a692e96e90f324b135b7ae6502a33 SHA512 ea12ce096373c081376e66c26552e9f5a67822ed926a91e0726b9dba980cecdc9b8052aa2724fbe2a43d50e04cc0346d96d34b2c88f67ad157bd49f312bd54da
+EBUILD autobahn-20.7.1.ebuild 3001 BLAKE2B 425c79f8a968758816845df5888ca59910e3b2f5e0752304c5ae4a8d4bdd90e9317b2710125153d1ef33e0643dd90b4bcfad1936721a9070756de5a9ea0090ce SHA512 48425fe2c81bddc4fc16a55aa275e084a21e3f711fb5e5414c15c121ec60ff501b2310d1d3854d4a490a1c2bc98e24f18deb917412ea121e568e487a2dcea915
+MISC metadata.xml 555 BLAKE2B 35f1b962dcae81339cc00ddec0d51e0addfc78fe7263471bef713b512b75b90d0e88ee49d5757e8670c689bcc549ae6c4efb43f80423a1c3c87ddbe25fa7ce5b SHA512 d81264ea358930680a128403fc2f54173033a30c70969cd0e22790e0f78f30f7e6e575c3f671500e0da3fd0c13dd08a83ef6bc9b500b7121c8dc4e02a79c8702
diff --git a/dev-python/autobahn/autobahn-17.5.1-r2.ebuild b/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
deleted file mode 100644
index ff8c6a009590..000000000000
--- a/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 versionator
-
-MY_P="${PN}-$(replace_version_separator 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"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-IUSE="crypt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/lz4-0.7.0[${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-16.0.0
-	)
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.6.0-r2[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/u-msgpack-2.1[${PYTHON_USEDEP}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${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}]
-	)"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	#esetup.py test
-	cd "${BUILD_DIR}"/lib || die
-	py.test -v || 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/autobahn-20.4.3.ebuild b/dev-python/autobahn/autobahn-20.4.3.ebuild
index e3bfba3353da..61cfc0c4b7cd 100644
--- a/dev-python/autobahn/autobahn-20.4.3.ebuild
+++ b/dev-python/autobahn/autobahn-20.4.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="crypt test"
 RESTRICT="!test? ( test )"
 
@@ -39,7 +39,7 @@ RDEPEND="
 		>=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
+		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
 	)
 	"
 DEPEND="${RDEPEND}
diff --git a/dev-python/autobahn/autobahn-18.3.1.ebuild b/dev-python/autobahn/autobahn-20.7.1.ebuild
index 9be3fd5f6a50..4b6e54bf13c2 100644
--- a/dev-python/autobahn/autobahn-18.3.1.ebuild
+++ b/dev-python/autobahn/autobahn-20.7.1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
-inherit distutils-r1 versionator
+inherit distutils-r1
 
-MY_P="${PN}-$(replace_version_separator 3 -)"
+MY_P=${PN}-$(ver_rs 3 -)
 
 DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
 HOMEPAGE="https://pypi.org/project/autobahn/
@@ -17,19 +18,21 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="crypt test"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="crypt scram test xbr"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cbor2-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
 	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.6.0-r2[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/u-msgpack-2.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-20.3.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? (
@@ -37,37 +40,61 @@ RDEPEND="
 		>=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-16.0.0
+		>=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}]
 	)
 	"
 DEPEND="${RDEPEND}
 	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}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
 
-PATCHES=(
-	"${FILESDIR}/${P}-Fix-cs-test-955.patch"
-)
-
 S="${WORKDIR}"/${MY_P}
 
+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
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	echo "Testing all, cryptosign using twisted"
 	export USE_TWISTED=true
 	cd "${BUILD_DIR}"/lib || die
-	py.test -v || die
-	echo "RE-testing cryptosign using asyncio"
-	export USE_TWISTED=false
+	"${EPYTHON}" -m twisted.trial autobahn || die
+	unset USE_TWISTED
+	echo "RE-testing cryptosign and component_aio using asyncio"
 	export USE_ASYNCIO=true
 	py.test -v autobahn/wamp/test/test_cryptosign.py || die
+	py.test -v autobahn/wamp/test/test_component_aio.py || die
+	unset USE_ASYNCIO
 	rm -r .pytest_cache || die
 }
 
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# delete the dropin.cache so we don't have collisions if it exists
+	rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache > /dev/null
+}
+
 pkg_postinst() {
 	python_foreach_impl twisted-regen-cache || die
 }
diff --git a/dev-python/autobahn/files/autobahn-18.3.1-Fix-cs-test-955.patch b/dev-python/autobahn/files/autobahn-18.3.1-Fix-cs-test-955.patch
deleted file mode 100644
index a62f48569ce1..000000000000
--- a/dev-python/autobahn/files/autobahn-18.3.1-Fix-cs-test-955.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 604bc53a3beec173020c944ce9cb38afca2a9126 Mon Sep 17 00:00:00 2001
-From: Tobias Oberstein <tobias.oberstein@crossbario.com>
-Date: Fri, 9 Mar 2018 10:37:31 +0100
-Subject: [PATCH] Fix cs test (#955)
-
-* encode test string
-
-* already an instance
-
-* add extra deps (encryption)
-
-* add extra deps
-
-* deactivate py 3.3, tx < 15.4
-
-* systematic version coverage
-
-* fix coverage (hopefully)
-
-* another try
-
-* actually need to yield, as a future is returned
----
- .travis.yml                           | 58 ++++++++++++++++++++++++++++++++---
- Makefile                              |  3 ++
- autobahn/asyncio/rawsocket.py         |  2 +-
- autobahn/wamp/test/test_cryptosign.py | 18 +++++++++--
- tox.ini                               | 32 ++++++++++---------
- 5 files changed, 89 insertions(+), 24 deletions(-)
-
-diff --git a/autobahn/asyncio/rawsocket.py b/autobahn/asyncio/rawsocket.py
-index 130a8e41..bbb83337 100644
---- a/autobahn/asyncio/rawsocket.py
-+++ b/autobahn/asyncio/rawsocket.py
-@@ -408,7 +408,7 @@ class WampRawSocketClientProtocol(WampRawSocketMixinGeneral, WampRawSocketMixinA
-     @property
-     def serializer_id(self):
-         if not hasattr(self, '_serializer'):
--            self._serializer = self.factory._serializer()
-+            self._serializer = self.factory._serializer
-         return self._serializer.RAWSOCKET_SERIALIZER_ID
- 
-     def get_channel_id(self, channel_id_type=u'tls-unique'):
-diff --git a/autobahn/wamp/test/test_cryptosign.py b/autobahn/wamp/test/test_cryptosign.py
-index 700ca3cc..78f8d556 100644
---- a/autobahn/wamp/test/test_cryptosign.py
-+++ b/autobahn/wamp/test/test_cryptosign.py
-@@ -25,9 +25,21 @@
- ###############################################################################
- 
- from __future__ import absolute_import
-+
- import hashlib
-+import os
-+
- from mock import Mock
- 
-+import txaio
-+
-+if os.environ.get('USE_TWISTED', False):
-+    txaio.use_twisted()
-+elif os.environ.get('USE_ASYNCIO', False):
-+    txaio.use_asyncio()
-+else:
-+    raise Exception('no networking framework selected')
-+
- from autobahn.wamp.cryptosign import _makepad, HAS_CRYPTOSIGN
- from autobahn.wamp import types
- from autobahn.wamp.auth import create_authenticator
-@@ -59,14 +71,14 @@ def setUp(self):
-         self.key = SigningKey.from_ssh_data(keybody)
-         self.privkey_hex = self.key._key.encode(encoder=HexEncoder)
-         m = hashlib.sha256()
--        m.update("some TLS message")
-+        m.update("some TLS message".encode())
-         self.channel_id = m.digest()
- 
-     def test_valid(self):
-         session = Mock()
-         session._transport.get_channel_id = Mock(return_value=self.channel_id)
-         challenge = types.Challenge(u"ticket", dict(challenge="ff" * 32))
--        signed = self.key.sign_challenge(session, challenge)
-+        signed = yield self.key.sign_challenge(session, challenge)
-         self.assertEqual(
-             u'9b6f41540c9b95b4b7b281c3042fa9c54cef43c842d62ea3fd6030fcb66e70b3e80d49d44c29d1635da9348d02ec93f3ed1ef227dfb59a07b580095c2b82f80f9d16ca518aa0c2b707f2b2a609edeca73bca8dd59817a633f35574ac6fd80d00',
-             signed.result,
-@@ -81,7 +93,7 @@ def test_authenticator(self):
-         session = Mock()
-         session._transport.get_channel_id = Mock(return_value=self.channel_id)
-         challenge = types.Challenge(u"cryptosign", dict(challenge="ff" * 32))
--        reply = authenticator.on_challenge(session, challenge)
-+        reply = yield authenticator.on_challenge(session, challenge)
-         self.assertEqual(
-             reply.result,
-             u'9b6f41540c9b95b4b7b281c3042fa9c54cef43c842d62ea3fd6030fcb66e70b3e80d49d44c29d1635da9348d02ec93f3ed1ef227dfb59a07b580095c2b82f80f9d16ca518aa0c2b707f2b2a609edeca73bca8dd59817a633f35574ac6fd80d00',
diff --git a/dev-python/autobahn/metadata.xml b/dev-python/autobahn/metadata.xml
index 6ea7ef02739b..72fb58a68e09 100644
--- a/dev-python/autobahn/metadata.xml
+++ b/dev-python/autobahn/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>dolsen@gentoo.org</email>
-        <name>Brian Dolbec</name>
-    </maintainer>
-  <upstream>
-    <remote-id type="pypi">autobahn</remote-id>
-    <remote-id type="github">crossbar/autobahn</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</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>
+		<remote-id type="pypi">autobahn</remote-id>
+		<remote-id type="github">crossbar/autobahn</remote-id>
+	</upstream>
 </pkgmetadata>