11 files changed, 175 insertions, 96 deletions
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/cryptography/Manifest b/dev-python/cryptography/Manifest
index 2ee12db6a763..b4b1017569c5 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,4 +1,6 @@
 DIST cryptography-2.8.tar.gz 504516 BLAKE2B 3a853bf59a752acee9e9607f3f35f3815701c6068a1ffa5b6604ec648a31a5d4e31f13a1b19f3156c703313800242d8b06dd71a54a4eb0cc68481dea894002f3 SHA512 bf3ca44123c693b0602be19445925f9efebd46c469909e47b7907d57141fb6bd99268c33e1fe3f42a08ab8b4edd4f98f21b6a682f530352313334dfd31ba91e7
 DIST cryptography-2.9.tar.gz 517211 BLAKE2B 3889812dadce01f09c509f5bcdf26405fd1cd2de7064cdbf0f68338894cf65dfe0c6a607867db614b35ad11da4546af2371cf59836dbbbd3037db84241cf71ec SHA512 7db2846b901e42ddc4caa9851235e5a0894ef702d4c4692eb60fcae17bc4e7833782a8001679ea41b78f9273d7d68a4b85810248590e12ca33cfade3208e2849
+DIST cryptography-3.0.tar.gz 534725 BLAKE2B f6f4d5cfcf42a9ca2288bdc7c61bd0ae2f98999868951798f358d6ec9dbbcddb31102b0954f983bb9c118df53a8483e74aa2395ce366a9a97b6b9164b0044bd2 SHA512 4fca5d0e59f02f23c7e2d5c80f86e4cf36eeeb9a128e7b3332a91aa0b9dcdd3282a882a88ea34ffba1e91687eb6d1fc1042774f1e30970e9bf56ee701c32ac15
 DIST cryptography_vectors-2.8.tar.gz 35102030 BLAKE2B 8e98e12bab31a2097a72c849f52ee93b9b684a8923c140722419154471bd695c6287ff4498c9fe326662c7d9a9f5d9ebaa55dc4d5a0d8180a6827ae244464006 SHA512 d328082d3a65b8036d396172d7e42c753c842e9310850a77c6ccd99c9905d48bbc3e3319d216013c1370b8439f0f8056749ae94b1abf9a5b7088435acdeed7fb
 DIST cryptography_vectors-2.9.tar.gz 35140661 BLAKE2B 870245659f6a64566f823116d8b4ba017981eb41148e9dcde9cac372eb6703a7b4580040b487cd8773160d5bd989fa9d5bb1788ac550b28e76bde8c9f6cd56c7 SHA512 025ed48855f182b926e3eeb5dca1033eb7f43c419bd6ea71accfed38b4d9ef4cbbf5af60bc28a39e3d6723de2d4091bd226e30c0e572a2e0d43a95a12c1bb7a2
+DIST cryptography_vectors-3.0.tar.gz 35156155 BLAKE2B 987fa88873bb3ec9745a150906e868c1aea14bb9e618c5c65348deb4e8618f89b15a8d70ea6ed0760649505f5649dd2fbf1e40fadad193faf3a92922ed234025 SHA512 a24c6f25c0acf79cea534fc86d61d9697c004a18204043457cf1a955751e8313893c63258f82ada523a9608b7ec0e5a7a7047ddcbd20e0c55d7c6392bc61c24f
diff --git a/dev-python/cryptography/cryptography-3.0.ebuild b/dev-python/cryptography/cryptography-3.0.ebuild
new file mode 100644
index 000000000000..fe10e90a0a11
--- /dev/null
+++ b/dev-python/cryptography/cryptography-3.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+VEC_P=cryptography_vectors-${PV}
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz )"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="libressl idna test"
+RESTRICT="!test? ( test )"
+
+# the openssl 1.0.2l-r1 needs to be updated again :(
+# It'd theb be able to go into the || section again
+#=dev-libs/openssl-1.0.2l-r1:0
+# the following is the original section, disallowing bindist entirely
+#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= )
+	libressl? ( >=dev-libs/libressl-2.9.1:0= )
+	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/enum34[${PYTHON_USEDEP}]
+		dev-python/ipaddress[${PYTHON_USEDEP}]
+	' -2)
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+	' 'python*')
+	"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P}
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
index 927d7f8bec0c..2910c222ba69 100644
--- a/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-freezegun/Manifest b/dev-python/pytest-freezegun/Manifest
index ba7dfadd97b4..4033e7c882b5 100644
--- a/dev-python/pytest-freezegun/Manifest
+++ b/dev-python/pytest-freezegun/Manifest
@@ -1 +1,2 @@
 DIST pytest-freezegun-0.4.1.gh.tar.gz 6809 BLAKE2B 258fcc5976c50dbc923ebbf7ba552b2ff2a058e5864f9b2c4a1339e585e0e245ba2346ff65a284fed71fec388a48dbf66e81a752d3b53b65897f3a687e05ed92 SHA512 42cebf13538e9a8aa992555e086886210dfb40b95fd8a4bb8bb79c5968e08aafa1979ff3cb28425993b71f5df91d77012946e36f14ad512a9d3d856eddb5fe3e
+DIST pytest-freezegun-0.4.2.gh.tar.gz 7058 BLAKE2B 1c89979d85dbdedf87a26de57d1cfe120ed52831e8d69c42b6117ac49c9eb7376bab018a23ca10b582fc583ca61a03930a86878c141b0c5bf4d807552484fe70 SHA512 2bea7746e4e6a7f2a979cbc5c6d7a2576e0e2631a4e1d5abb7f27f76d6c32b0520a277474c092c5e05ce257f2ba19091918f67e28b7a2da1d5829037c6b70c55
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
new file mode 100644
index 000000000000..6425d8e683a4
--- /dev/null
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Easily freeze time in pytest test + fixtures"
+HOMEPAGE="https://github.com/ktosiek/pytest-freezegun"
+SRC_URI="
+	https://github.com/ktosiek/pytest-freezegun/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/freezegun[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index d1ac5c90fb05..b8c3894a9e21 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,2 +1,3 @@
 DIST python-nbxmpp-0.6.10.tar.bz2 1063786 BLAKE2B 6d7295a5e6f926cbca709e0774ae8c141e20293c723f3a431a52bacc64639e7cee5820b4e070fae35397a5e5d8c76089d5d1966bf53cef8f0da462134321df6e SHA512 0982a6035ee30edfe9f7d5cc11dcc870ad1dddca851fffc2c26088cd28083f56f5c57df49dcd28b5e6967f02aef03e0ad2f7b2036a908748c66e5e7510e6c7ed
 DIST python-nbxmpp-1.0.0.tar.bz2 111378 BLAKE2B 1dd0fff8e14bb438727a05ba0bd3db3613d91fa08f593cae3e77aec6240ece41a403a324aa3fee89e3173703f185e65e875aa1a49d877d2fc0235d664af9d083 SHA512 4eb1c4ec33ea4008b8ef4cf57e2a7a63450008974ae109af70455a49e716ea5ad612629fb2c7e0b06e69a77ee28b592a089469a645ecdd1bc2160a907804c2ac
+DIST python-nbxmpp-1.0.1.tar.bz2 112700 BLAKE2B ea0d271961a7e15a374cafa42678429b9f3395a8921f7cb92ff20664adf17f0482235240f0f849e8492d20aeb23d99eabfb1375eaeb48d55bf81aed4e3d702a6 SHA512 f3bda30b08e48ce59c19b705d45efe13286b4f8a27f44a60fe5759f9e7915beb655166d240ed1f875615f5995764a28a3c5f676e84068aab870f32ecb7d684a5
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild
new file mode 100644
index 000000000000..368a67cd0b61
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
+SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/python-nbxmpp-nbxmpp-${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index e2b88c48bce5..1f7a9aa59aa7 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1 +1,2 @@
+DIST xcffib-0.10.0.tar.gz 84641 BLAKE2B 06f0ccd420437e11e1aff8d6c7111185d9ff8ed08e40ccab13fed2431134671c55722e0a7a72773cde8518a6c3d4ef14de1a99f0c61d85e9a8feff41545c626a SHA512 2d0a6e7c6b8b43e82f1621a8408ba951e67239099bc947a6da62a6735ff6584ba422e55659969093d51f6de53fe4a400b330def1e6b9eb2c698d82ffc9ff81e4
 DIST xcffib-0.9.0.tar.gz 83063 BLAKE2B 898fbce1ff503a9ad64a4c34778e0b5ffef531cf2ad04327f1890c87adb5f91287465e39a981a3c5a628c048b8acbb38bac3b0b76a58c3bbe45ab34c9a5eacf5 SHA512 e5891f080fcf1df596c37bb64a70e0de4a41d83b4675dac3b1c128656ab1b09d865e3ab0bfe0e5cc523e89a75dc6127dfc455ab66ca543ba6eeae9ee5bdae168
diff --git a/dev-python/xcffib/files/xcffib-0.10.0-testing.patch b/dev-python/xcffib/files/xcffib-0.10.0-testing.patch
new file mode 100644
index 000000000000..7c075ae9811c
--- /dev/null
+++ b/dev-python/xcffib/files/xcffib-0.10.0-testing.patch
@@ -0,0 +1,23 @@
+diff --git a/xcffib/testing.py b/xcffib/testing.py
+index ef0268a..0662fcf 100644
+--- a/xcffib/testing.py
++++ b/xcffib/testing.py
+@@ -31,11 +31,14 @@ def lock_path(display):
+ def find_display():
+     display = 10
+     while True:
+-        f = open(lock_path(display), "w+")
+         try:
+-            fcntl.flock(f.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
+-        except OSError:
+-            f.close()
++            f = open(lock_path(display), "w+")
++            try:
++                fcntl.flock(f.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
++            except:
++                f.close()
++                raise
++        except OSError:
+             display += 1
+             continue
+         return display, f
diff --git a/dev-python/xcffib/xcffib-0.10.0.ebuild b/dev-python/xcffib/xcffib-0.10.0.ebuild
new file mode 100644
index 000000000000..a262df200992
--- /dev/null
+++ b/dev-python/xcffib/xcffib-0.10.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
+HOMEPAGE="https://github.com/tych0/xcffib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+DEPEND="x11-libs/libxcb"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
+	' 'python*')
+	dev-python/six[${PYTHON_USEDEP}]
+	${DEPEND}"
+BDEPEND="
+	test? (
+		x11-base/xorg-server[xvfb]
+		x11-apps/xeyes
+	)"
+
+distutils_enable_tests nose
+
+PATCHES=(
+	"${FILESDIR}"/${P}-testing.patch
+)
+
+src_prepare() {
+	touch test/__init__.py || die
+	distutils-r1_src_prepare
+}