Updating liguros repo

49 files changed, 537 insertions, 185 deletions

diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 7eca849b769a..2b69a81c52cd 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,2 +1,3 @@
+DIST autobahn-20.12.1.tar.gz 1269156 BLAKE2B ff763accde6a2929fd777364c926132b8317d80f137d67768bf192fb72f45597ac115824783f01debacc773dcc9a60325692ac420e55b6f67f4ebc2cdc6187ae SHA512 df7c7065e050efb5f315055c05aa9b4fcf8636e7208f17b583ed0823a071c6484adcf610308e83df3b5bbb91a4df19266e739abc8405e34483b1bf3d9f2c74c7
 DIST autobahn-20.4.3.tar.gz 938992 BLAKE2B 259d18f4aa46f7eaeac75811c1c193f3046aca5c5e37627d9ac62eeaa3dc944d05a8d87a558e241bdef56c799be4d89f65d4c8ee7c1a2be20f892896227eb5f9 SHA512 c34f29951b8f9ff5161851cf3a7e964de136f6091b0231a8e78e7fe74cb085077be5078cee352b2c27412d9aa4303de1eb85aa1890b4fb583575638a9c47c6fb
 DIST autobahn-20.7.1.tar.gz 1260579 BLAKE2B 925d148836348c068d179d4871267bf79c8c42d27cacc6be09cca11396dbd213a5b86344142df886d4ff69d1214a86b49900ca3552bcdb640377cb0d6af7d0f0 SHA512 e2c241194da90ada86a2804683cb063320f75a69b76ddc016349c11614e7f298619c2eeba4fcccb8f8d65d84375681fb339d9f92f94f45f1015f4f12fa0c39b0
diff --git a/dev-python/autobahn/autobahn-20.12.1.ebuild b/dev-python/autobahn/autobahn-20.12.1.ebuild
new file mode 100644
index 000000000000..869a0f56a285
--- /dev/null
+++ b/dev-python/autobahn/autobahn-20.12.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+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/cbor-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cbor2-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.9.2[${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/snappy-0.5[${PYTHON_USEDEP}]
+	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-20.4.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
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	echo "Testing all, cryptosign using twisted"
+	export USE_TWISTED=true
+	cd "${BUILD_DIR}"/lib || die
+	"${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
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache || die
+}
diff --git a/dev-python/autobahn/metadata.xml b/dev-python/autobahn/metadata.xml
index 7b30dba080d8..044d8807003b 100644
--- a/dev-python/autobahn/metadata.xml
+++ b/dev-python/autobahn/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<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>
diff --git a/dev-python/chardet/chardet-4.0.0.ebuild b/dev-python/chardet/chardet-4.0.0.ebuild
index e9bc2eb1c1d3..4c56b5615369 100644
--- a/dev-python/chardet/chardet-4.0.0.ebuild
+++ b/dev-python/chardet/chardet-4.0.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
@@ -12,19 +12,12 @@ DESCRIPTION="Universal encoding detector"
 HOMEPAGE="https://github.com/chardet/chardet https://pypi.org/project/chardet/"
 SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-# SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-# PyPI tarball is missing test.py: https://github.com/chardet/chardet/pull/118
-
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 
-DEPEND="
+BDEPEND="
 	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-pytest-4.patch
-)
-
 distutils_enable_tests pytest
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index 610d52b41b1c..62b3839afdfc 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1 +1,2 @@
 DIST cx_Freeze-6.1.tar.gz 92474 BLAKE2B 5341b30b202ab96c34c82e5b12dc6a99ebaf429b6a4b6356a55c5d4fefae7504fd017cb5d29cd1601a6affca0e8e8aa1e01ececbf57011f9235b4c516b21a772 SHA512 029753e8b9eafdad383254af0f7296052c124b662473f4453b6bda0ea500430642d93941a59c23df1d0bbbee462f7d61390b5f66c946372c96bf41ea6ffbc685
+DIST cx_Freeze-6.4.2.tar.gz 108571 BLAKE2B 742d2491154706f51ebb3e072428afac1ce5c647f2b8cb6325ea166bbedc1852503ad40e56a532345f1e2a045532620cdad24622e19ecb12d9577cf57abd291d SHA512 4c9a92b6f8dc458f82abb144171b18db1349e75b237f707ca37b7b68527508e8fb3adcf5d7b142922709727501fdc46f16a01619b29e98a6af1a0c09f9306b82
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.4.2.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.4.2.ebuild
new file mode 100644
index 000000000000..300da8ed3cd0
--- /dev/null
+++ b/dev-python/cx_Freeze/cx_Freeze-6.4.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Create standalone executables from Python scripts"
+HOMEPAGE="https://cx-freeze.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	# bug #491602
+	"${FILESDIR}/${PN}-6.4.2-buildsystem.patch"
+)
+
+# Test folder is missing needed content
diff --git a/dev-python/cx_Freeze/files/cx_Freeze-6.4.2-buildsystem.patch b/dev-python/cx_Freeze/files/cx_Freeze-6.4.2-buildsystem.patch
new file mode 100644
index 000000000000..5d23a8ded944
--- /dev/null
+++ b/dev-python/cx_Freeze/files/cx_Freeze-6.4.2-buildsystem.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index fd24ec9..068119f 100755
+--- a/setup.py
++++ b/setup.py
+@@ -68,8 +68,6 @@ class build_ext(distutils.command.build_ext.build_ext):
+             # PY_LDFLAGS_NODIST = "-flto -Wl,-export_dynamic -g"
+             if get_config_var("PY_LDFLAGS_NODIST"):
+                 extraArgs.extend(get_config_var("PY_LDFLAGS_NODIST").split())
+-            else:
+-                extraArgs.append("-s")
+         self.compiler.link_executable(
+             objects,
+             fullName,
diff --git a/dev-python/dataclasses/Manifest b/dev-python/dataclasses/Manifest
index 558e8a943c25..9610838fc5fe 100644
--- a/dev-python/dataclasses/Manifest
+++ b/dev-python/dataclasses/Manifest
@@ -1 +1,2 @@
 DIST dataclasses-0.7.tar.gz 35690 BLAKE2B 8d3c60d1e2ad4c9ceb3c502fa74f8fdae75717e52c698984b6def96e867cae633864de711856a69992df6a207617d17d7116f5e0daa7d757076dc8b97d7e0e9b SHA512 ff921237a99bac21e091ff253824eb07eb09be7e7ec02b869da9c68c35141fc1bee526b3d2942963bac7762827438ea8fdc89fa72404991b78d1d063a3c18661
+DIST dataclasses-0.8.tar.gz 36581 BLAKE2B fb4cad844f00157a8affc85a0c5d949d7d44fd67ca8083262247af46d93be189628c4ab7b37d34dea983059615603342d50d8b9d0ab75f5365463a337d312b6a SHA512 81b27dd10077084ca82b0a3cbbcee428a5c5cb2e6ade5de46a39731507c2d6f93f9038b704e6555c850044683516a0d130b95a14c91881d04b0bd2c496ca8d6a
diff --git a/dev-python/dataclasses/dataclasses-0.8.ebuild b/dev-python/dataclasses/dataclasses-0.8.ebuild
new file mode 100644
index 000000000000..08b9fdaf45f0
--- /dev/null
+++ b/dev-python/dataclasses/dataclasses-0.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# this is a backport. do not add extra impls
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A backport of the dataclasses module for Python 3.6"
+HOMEPAGE="
+	https://pypi.org/project/dataclasses/
+	https://github.com/ericvsmith/dataclasses"
+SRC_URI="
+	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+src_test() {
+	cd test || die
+	distutils-r1_src_test
+}
+
+distutils_enable_tests unittest
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 6900f0a2792f..9773bdf6d15a 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,2 +1,2 @@
-DIST denonavr-0.9.5.tar.gz 94016 BLAKE2B b6a013e6831600316dd4e1e33caec7da18774e17a1e9423dd2ae989c4f787cac471e21e2de06db0e01427345234a87825e298dc27881f21fbf69a720bbb04df4 SHA512 798fe126ab3c57ef285f45978e3b06ff5fab99eb3fc47e277c2d2eeb1786ac30fc09de8d23f2b4f59a1240bc2df4fca8e6946baf5135e051f387d1195a070ac7
 DIST denonavr-0.9.7.tar.gz 101839 BLAKE2B d44600e6963c2e17ffc12f203926b522d2bf2d9a853e4f061583158fb087b8fb5dbc43be835aa639ffe11391aa494a8b061b2c177bccfc2568781b304547e311 SHA512 2b8a8224ec46b90d2256d7d516801c6ae18b4434a0ee901b0a9aa80cc0481216fa33566bf33d41928f0112361b165bbe40e5f44b65cd17f09beb7cb3f4d9d803
+DIST denonavr-0.9.8.tar.gz 101850 BLAKE2B b02a18d1f61547e7e63fbd51a72de57803ec6e78232be0027fb6b77176fa872227afcb5a414b0cb92ca4373116a5c6ec4975fea73ae272742ec399e4c0e3ad81 SHA512 30ca12ffffcf66b45c17434c96e496fe61af5cd42aa85dcb25502f6a21593ec4d884937d52726a430b405d9807ad024456e48e144a759ea1351fccc906a95af3
diff --git a/dev-python/denonavr/denonavr-0.9.5.ebuild b/dev-python/denonavr/denonavr-0.9.8.ebuild
index f7231b3b430b..f7231b3b430b 100644
--- a/dev-python/denonavr/denonavr-0.9.5.ebuild
+++ b/dev-python/denonavr/denonavr-0.9.8.ebuild
diff --git a/dev-python/denonavr/metadata.xml b/dev-python/denonavr/metadata.xml
index 7e6816d2091e..ce38e1a69cc1 100644
--- a/dev-python/denonavr/metadata.xml
+++ b/dev-python/denonavr/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">denonavr</remote-id>
 		<remote-id type="github">scarface-4711/denonavr</remote-id>
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 9ba86992d664..d60a7b85c864 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,2 +1,2 @@
 DIST eventlet-0.26.1.tar.gz 398200 BLAKE2B f14024d0825fb5530929766c63dceea7446057d9ad5dfb98ab013e96cab9b0eef5440f2d4d7ceeef17691c8a2a9055cac2b93fb23653a6facba4967c4e7cb0b3 SHA512 55b9b214130d0482ea005ea570a5aa3eafdf66e6d315a95c5ba60186a2d9a9df5c2638c86d886968954ce39e5ac2153e1f9e11631e6aef237078c3776af7d6c5
-DIST eventlet-0.29.1.tar.gz 400673 BLAKE2B 2b317e0c445a7b9c7f96147c033b1a6b4b4d27eeaebe0d40102b4e25d7825861db15e9d77cf6c9e6795e1bc946b1a613d5bb4ffa60a7077c39d575f01bdd8506 SHA512 194544e8fafeb0847673abd84c8fbc876bb407bb76cb86c5a8a92fdb7571d3585e895f0063375e43b74de81b47e49cd6002f5b7a4f266d37bacc1b23e9ce4ef3
+DIST eventlet-0.30.0.tar.gz 401035 BLAKE2B 94a272ce810b28c00fc8a468f160e38f3c58c98750455e5eb096c266c46257a7e30e0278a6a8f509e47e6ab40297129ccf52b347a723037f9cc9b85a3e06a203 SHA512 c2ba283063333e9e74536dcda33276f98f74051ea0e9c8669506d2e3b11715f37cd5963af6130f14761a42cc6c8346e59c756efe2cef0ea3547dc30ccb8bf0fb
diff --git a/dev-python/eventlet/eventlet-0.29.1.ebuild b/dev-python/eventlet/eventlet-0.30.0.ebuild
index cd71f19d3c4a..956b8ddabacc 100644
--- a/dev-python/eventlet/eventlet-0.29.1.ebuild
+++ b/dev-python/eventlet/eventlet-0.30.0.ebuild
@@ -27,8 +27,8 @@ DEPEND="doc? ( >=dev-python/python-docs-2.7.6-r1:2.7 )
 		dev-python/nose[${PYTHON_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/eventlet-0.25.1-tests.patch"
-	"${FILESDIR}/${P}-tests.patch"
+	"${FILESDIR}/${PN}-0.25.1-tests.patch"
+	"${FILESDIR}/${PN}-0.30.0-tests-socket.patch"
 )
 
 distutils_enable_sphinx doc
@@ -51,6 +51,7 @@ python_prepare_all() {
 
 python_test() {
 	unset PYTHONPATH
+	export TMPDIR="${T}"
 	nosetests -v || die
 }
 
diff --git a/dev-python/eventlet/files/eventlet-0.29.1-tests.patch b/dev-python/eventlet/files/eventlet-0.29.1-tests.patch
deleted file mode 100644
index 3cd20823899d..000000000000
--- a/dev-python/eventlet/files/eventlet-0.29.1-tests.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://github.com/eventlet/eventlet/issues/646
-From 087ba743c7af8a40ac1e4e2ec89409eee3b4233e Mon Sep 17 00:00:00 2001
-From: Tim Burke <tim.burke@gmail.com>
-Date: Mon, 2 Nov 2020 16:09:46 -0800
-Subject: [PATCH] py39: Add _at_fork_reinit method to Semaphores
-
-CPython expects to be able to call such a method on RLocks, Conditions,
-and Events in threading; since we may monkey-patch threading to use
-Semaphores as locks, they need the method, too.
-
-Addresses #646
----
- eventlet/semaphore.py   |  5 +++++
- tests/semaphore_test.py | 21 +++++++++++++++++++++
- 2 files changed, 26 insertions(+)
-
-diff --git a/eventlet/semaphore.py b/eventlet/semaphore.py
-index 18b5b05f4..5e2b5e32f 100644
---- a/eventlet/semaphore.py
-+++ b/eventlet/semaphore.py
-@@ -39,6 +39,7 @@ def __init__(self, value=1):
-         if value < 0:
-             msg = 'Semaphore() expect value >= 0, actual: {0}'.format(repr(value))
-             raise ValueError(msg)
-+        self._original_value = value
-         self.counter = value
-         self._waiters = collections.deque()
- 
-@@ -51,6 +52,10 @@ def __str__(self):
-         params = (self.__class__.__name__, self.counter, len(self._waiters))
-         return '<%s c=%s _w[%s]>' % params
- 
-+    def _at_fork_reinit(self):
-+        self.counter = self._original_value
-+        self._waiters.clear()
-+
-     def locked(self):
-         """Returns true if a call to acquire would block.
-         """
-diff --git a/tests/semaphore_test.py b/tests/semaphore_test.py
-index d6c11d1f6..cf6a29daf 100644
---- a/tests/semaphore_test.py
-+++ b/tests/semaphore_test.py
-@@ -42,6 +42,27 @@ def test_timeout_non_blocking(self):
-         sem = eventlet.Semaphore()
-         self.assertRaises(ValueError, sem.acquire, blocking=False, timeout=1)
- 
-+    def test_reinit(self):
-+        # py39+ expects locks to have a _at_fork_reinit() method; since we
-+        # patch in Semaphores in eventlet.green.thread, they need it, too
-+        sem = eventlet.Semaphore()
-+        sem.acquire()
-+        sem._at_fork_reinit()
-+        self.assertEqual(sem.acquire(blocking=False), True)
-+        self.assertEqual(sem.acquire(blocking=False), False)
-+
-+        sem = eventlet.Semaphore(0)
-+        sem.release()
-+        sem._at_fork_reinit()
-+        self.assertEqual(sem.acquire(blocking=False), False)
-+
-+        sem = eventlet.Semaphore(2)
-+        sem.acquire()
-+        sem._at_fork_reinit()
-+        self.assertEqual(sem.acquire(blocking=False), True)
-+        self.assertEqual(sem.acquire(blocking=False), True)
-+        self.assertEqual(sem.acquire(blocking=False), False)
-+
- 
- def test_semaphore_contention():
-     g_mutex = eventlet.Semaphore()
diff --git a/dev-python/eventlet/files/eventlet-0.30.0-tests-socket.patch b/dev-python/eventlet/files/eventlet-0.30.0-tests-socket.patch
new file mode 100644
index 000000000000..4dd309c68a38
--- /dev/null
+++ b/dev-python/eventlet/files/eventlet-0.30.0-tests-socket.patch
@@ -0,0 +1,13 @@
+Let's use TMPDIR as the base for this test's unix socket to help it pass.
+We set TMPDIR in the ebuild to ${T}.
+--- a/tests/backdoor_test.py
++++ b/tests/backdoor_test.py
+@@ -47,7 +47,7 @@ class BackdoorTest(tests.LimitedTestCase):
+         self._run_test_on_client_and_server(client, serv)
+ 
+     def test_server_on_unix_socket(self):
+-        SOCKET_PATH = '/tmp/eventlet_backdoor_test.socket'
++        SOCKET_PATH = os.getenv('TMPDIR', '/tmp') + '/eventlet_backdoor_test.socket'
+         if os.path.exists(SOCKET_PATH):
+             os.unlink(SOCKET_PATH)
+         listener = socket.socket(socket.AF_UNIX)
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 006cef2f42b0..2faf35dee409 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -3,3 +3,4 @@ DIST importlib_metadata-2.0.0.tar.gz 29289 BLAKE2B 4ec24db057006affe1dee20e021a4
 DIST importlib_metadata-3.1.0.tar.gz 29246 BLAKE2B 2144e10601e089e26e1d85269ed067d505de8ca86071524e038e87850420f42701b36fad5e1fe01529230333d5f23e0882f17a279bacfa39da335f3d968987dd SHA512 24d20d7658c2d15d2207d3660bd181016a16d0a2e3c86b8e86f7f95baab18f01f1a8753942d15ab648a40431bfc6db7d5109339575ef1a50802403eb580baede
 DIST importlib_metadata-3.1.1.tar.gz 32217 BLAKE2B 85155574f554146d89fedbaeffa5b5842c5c76f98d0f8488a019cded9fc7e45323b31a9cb612f81c379feb822a0e5a44f86566510c5bccaa344cbe10ef8676e9 SHA512 a0a3fc0c4cb08ba5676ae144a2176e9b2e02d122a09c1be67fe0c1e1c8304aeac4f624fa060898b20f99f67f9cfee2bdf1177d82cd12e5879edfa268e02cdce3
 DIST importlib_metadata-3.2.0.tar.gz 32793 BLAKE2B e99fc4544ec64bc320754b1bac80ab021fd4212930cb2b28fc44cd6f6c9691214fce2fc408aa65147ae45df589e5ad64d4681e29620a16ffd1d3231faebde077 SHA512 3e744ebaa4606477252243b6e473c33b70332879385719835a4187d5edad135f0f9076c26e4843aea4497c2a5a2b51fa7b5654e9ff97a8f5ec3808053dccc734
+DIST importlib_metadata-3.3.0.tar.gz 33549 BLAKE2B 6646cf7f8dbbeeadd7b4e9e572a59c14e2f17444dcd84aef817e27b299cbc3f0fa868657a59221a42ea8c49c5cc75e9e170a787df3e3014808d19eff1f89debf SHA512 af2215405b0f7e120d2745f3736d021174e611ad226abe64b496192a210e85786e78560349f1188deb3bffbfceb36385e9fbac20f4447aafb025a1d735c333ac
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild
new file mode 100644
index 000000000000..05a98db2f94c
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Included in Python >= 3.8
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Skip a test that requires pep517 which is not in the tree
+	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 83d9ec04a493..9834a43946fc 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1 +1,2 @@
 DIST iniconfig-1.0.0.tar.gz 7807 BLAKE2B a77c4d8c6f549db911110505ac5a367be5175adbb580211d4aded14d1108e189fd6d6a229ac4e0e742baafa9b037d58c2bbc810897c8b274c07493c518ef752e SHA512 639a4e765637110f69627fb18a5e719b6d648e5549fd857168183d97da7880434d447c9af1e254dd2aa5d0e36cbd3f5c4ffabf8a949ed3d6294002e7e1b2f6e1
+DIST iniconfig-1.1.1.tar.gz 8104 BLAKE2B 31301484887018a6aa75c944e2f8643f85b2433534ae46a8da893a113f2376eca14cbee88095a3784d1c52f26d4c748260c1df59c46b8f94cd342038f93242e8 SHA512 c9341db7e3ec2204b6a674fca7824cbeb492e3576d5ac3f084b234c82842b28f2f6acbfdb812e183f4334a95b990551f942a4caf548f5ce7ef14885f931535ee
diff --git a/dev-python/iniconfig/iniconfig-1.1.1.ebuild b/dev-python/iniconfig/iniconfig-1.1.1.ebuild
new file mode 100644
index 000000000000..8475ca2ee691
--- /dev/null
+++ b/dev-python/iniconfig/iniconfig-1.1.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Brain-dead simple config-ini parsing"
+HOMEPAGE="https://github.com/RonnyPfannschmidt/iniconfig"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/isort/isort-5.6.3.ebuild b/dev-python/isort/isort-5.6.3.ebuild
index 8aecfef0e0a9..9b346fc3971e 100644
--- a/dev-python/isort/isort-5.6.3.ebuild
+++ b/dev-python/isort/isort-5.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 3b685547eb2e..549be477b1bd 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,2 +1,3 @@
 DIST M2Crypto-0.35.2.tar.gz 1117706 BLAKE2B efa15e023be7755b94c642bb23eade912edcbbb76bcdfed3414d27937cd705ec4c83069ca620fe20e58e126549ba7f98e84f6f8330b78133a8a8b953d18f467b SHA512 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36
 DIST M2Crypto-0.36.0.tar.gz 1127584 BLAKE2B 5cdbbb11ff67d4ddffb2853a72383f3c7f1e1aa53ab84166aeda4fbea1b0d7f506761bb07bf8cb5b36f94bdbeb2ea2b46e0693da8355f81b4bf5c4c1c1cc18b1 SHA512 5b7d6d10c943ff0e09e0e9748d5578e7e0f7659a73de4ba49481152bca05871aef2bfbb869e1636a7cebcf2dd8b9f67fb0d299a833d1d4ebd538031c35d7bca1
+DIST M2Crypto-0.37.1.tar.gz 1247031 BLAKE2B 3628150b8da15d7356298b6e52e0d8fa7875921a184a0eba3a97eff0588c9e0fee340c92fd486919057d900d6e3b2b711174dde9761fe247848f92ac6434df0a SHA512 9a5e0220704b4897a9ca7efa4b3b57447b9175c52e8039a85bff7bb1a43b709c69f3c8b5903df461f8de39d3f8a20f9bf494df6f5882771846adfe2c03fbea9e
diff --git a/dev-python/m2crypto/m2crypto-0.37.1.ebuild b/dev-python/m2crypto/m2crypto-0.37.1.ebuild
new file mode 100644
index 000000000000..d6abdd5b698e
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.37.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs
+
+MY_PN="M2Crypto"
+DESCRIPTION="A Python crypto and SSL toolkit"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="libressl test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-lang/swig-2.0.9
+	test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-0.31.0.patch"
+)
+
+swig_define() {
+	local x
+	for x; do
+		if tc-cpp-is-true "defined(${x})"; then
+			SWIG_FEATURES+=" -D${x}"
+		fi
+	done
+}
+
+src_prepare() {
+	# TODO
+	sed -e 's:test_server_simple_timeouts:_&:' \
+		-i tests/test_ssl.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	# setup.py looks at platform.machine() to determine swig options.
+	# For exotic ABIs, we need to give swig a hint.
+	local -x SWIG_FEATURES=
+
+	# https://bugs.gentoo.org/617946
+	swig_define __ILP32__
+
+	# https://bugs.gentoo.org/674112
+	swig_define __ARM_PCS_VFP
+
+	distutils-r1_python_compile --openssl="${ESYSROOT}"/usr
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index b1ce22da1f2e..aa1a821a9f47 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -1,2 +1,2 @@
 DIST mock-3.0.5.gh.tar.gz 67887 BLAKE2B b9c49b3627275889d73aff9ea9c7925093f9cafb304448b2f06eda2fff26152a031aafb4844537e4d58bc112709e59a44e08d32602776386a30d039743def29c SHA512 9ab4f0c794f5701ba1367d982cf79a5662d4233753d12ed9c88ae20282db1f44be73f84c4d9f6d03ff64926b8c1b6d0c9a79b2a4724a3eb36c247ffd4ab03e2d
-DIST mock-4.0.2.gh.tar.gz 79450 BLAKE2B 529d8564a8f236b428745838fbc3bfd1cfc540a5feb5527653b7d4becb6ff118056bb301cb186964570c50588b42b7be22338c8c2b844c932284fdc359648add SHA512 348b67a62d1937de1778e3030fb4940bb11c58e839d212a75924aa94ed9a993b47b04612de92f073ec3fe4af4be15468e843f70a2d94bb31edb0a4c57cb46cc6
+DIST mock-4.0.3.gh.tar.gz 80318 BLAKE2B bc0dc8b97129eaa2f0f9c89898157ea5de398f59f4e2ebc07318cf745b74d1f1bcc989774600ec88ce1956f9fe16f9464f101ea5df5cd23b3a58b432d19feb8a SHA512 adfdab253eb3bc1b6cb767c58ffa3a8a5c5f88da0f04ea6680e0d87da59177972d2d99bfe0a770ac2ed4f809ca6a090a9d0f789eea8f4365ef2c54f8e8792e89
diff --git a/dev-python/mock/mock-4.0.2.ebuild b/dev-python/mock/mock-4.0.3.ebuild
index ea859e662d9d..ea859e662d9d 100644
--- a/dev-python/mock/mock-4.0.2.ebuild
+++ b/dev-python/mock/mock-4.0.3.ebuild
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index e32e9ba2b1cf..6a0fd07fa5a5 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,2 +1,3 @@
 DIST msgpack-0.6.2.tar.gz 119062 BLAKE2B 6b20a0d31b811ae66e66dbfaacec6f0cf2152b2937423b78f3e6244bfa49c87767788c5ee1db41b9020801b8777a4c15b1fe1853182718adf622bc7e1bff858e SHA512 95b92e3d35e0500dd4256d18bf76e586e57cc66319b4459ac5daef599277a5049177a89ad86e291dbdc4c7a918901a89d9218353ddc4a7d0b399e8a98afef363
 DIST msgpack-1.0.0.tar.gz 232331 BLAKE2B ab7b3aede06c31e0cf70a7f7fbdf2b1dddd89aa2d5d9847b11117c66a2f4572ac468674cdbcaf79bc571278f02429d223aeeb0ea8cb50c31ad251142642cc05f SHA512 6dc168b111cd37807e8e8a09840d1b116d7f38d56f4622b9d36ab7dbd983ebe2f34e763f48c6348148c6945c9f1c9a0f83f5f03e12d12bc18f7b8e0cbd669f87
+DIST msgpack-1.0.1.tar.gz 123151 BLAKE2B 4f040d6e292c588f20043e0091702e9a848d94357784ec7ef7a2ed2d1b5a08cae0bfea4a16cbb67e32b071260f25a43b0507d154ba7f6e180e65a60e3a2b4e9c SHA512 87412cc4022ce7ec82cfe376fbb3c663e5b7a430c2178cacbfe95b35489d95f314bdaf83a6170a7956f42939535ada3c5cbe45c6d7c105410494fe7e9a5cb870
diff --git a/dev-python/msgpack/msgpack-1.0.1.ebuild b/dev-python/msgpack/msgpack-1.0.1.ebuild
new file mode 100644
index 000000000000..ad6d2599da80
--- /dev/null
+++ b/dev-python/msgpack/msgpack-1.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="MessagePack (de)serializer for Python"
+HOMEPAGE="https://msgpack.org
+	https://github.com/msgpack/msgpack-python/
+	https://pypi.org/project/msgpack/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x64-macos"
+IUSE="+native-extensions"
+
+BDEPEND="
+	native-extensions? (
+		$(python_gen_cond_dep '>=dev-python/cython-0.16[${PYTHON_USEDEP}]' 'python*')
+	)
+	test? (	dev-python/six[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove pre-generated cython files
+	rm msgpack/{_packer,_unpacker,_cmsgpack}.pyx || die
+
+	if ! use native-extensions ; then
+		sed -i -e "/have_cython/s:True:False:" setup.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mypy/mypy-0.790.ebuild b/dev-python/mypy/mypy-0.790.ebuild
index 9b99d6f5da43..9c381d875228 100644
--- a/dev-python/mypy/mypy-0.790.ebuild
+++ b/dev-python/mypy/mypy-0.790.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
index 96bace9cfc12..3186a87c54b0 100644
--- a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index 4ece3fe2d8bb..fdf9ceeef8ec 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1 +1,2 @@
 DIST pyenchant-3.1.0.gh.tar.gz 75012 BLAKE2B dde78c4f8e986be7e7b4f82979bc446d68a88c3289d472948bb704120fb0dfc3064b8fd46b1883724b0084eefb9e52dfd522bcda290ed5e7a99ae62c948f828c SHA512 d2bf872c15fca1e2c1aa8de06a9ee2c0e6128a69f728383ae9b91fb0ead2d66f804388671cc8156716e240548c29da41eb6c0678dd889012009c690bd078a7de
+DIST pyenchant-3.2.0.gh.tar.gz 75395 BLAKE2B bff9d4d5038252473fd7673758ecf1304f74f96514d984f5b6cd052042d0b2cf6fe2e149e3675777899107794c9d2fe1c630e87b031f38512ed2499ee1053f34 SHA512 63ca44aea9e7af3fecf554dc6156513c42d278a92170bd6b88b71a737def2e9fe7f7d2ecafd5fea2b860b4d5de55c9e8a6e4b30a58d6f28533bba71cc407850c
diff --git a/dev-python/pyenchant/pyenchant-3.2.0.ebuild b/dev-python/pyenchant/pyenchant-3.2.0.ebuild
new file mode 100644
index 000000000000..974bc2033c38
--- /dev/null
+++ b/dev-python/pyenchant/pyenchant-3.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Enchant spellchecking system"
+HOMEPAGE="https://github.com/pyenchant/pyenchant
+	https://pypi.org/project/pyenchant/"
+SRC_URI="
+	https://github.com/pyenchant/pyenchant/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="app-text/enchant:*"
+BDEPEND="
+	test? (
+		app-dicts/myspell-en
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pylama/pylama-7.7.1-r1.ebuild b/dev-python/pylama/pylama-7.7.1-r1.ebuild
index 0940937997dd..888dff5c06d2 100644
--- a/dev-python/pylama/pylama-7.7.1-r1.ebuild
+++ b/dev-python/pylama/pylama-7.7.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pynest2d/pynest2d-4.8.0.ebuild b/dev-python/pynest2d/pynest2d-4.8.0.ebuild
index 660c8d29853c..41f96e7ceb54 100644
--- a/dev-python/pynest2d/pynest2d-4.8.0.ebuild
+++ b/dev-python/pynest2d/pynest2d-4.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Ultimaker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE=""
 
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 5c3319f523c1..3a48efaff2ff 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,2 +1,3 @@
 DIST pytools-2020.4.3.tar.gz 62980 BLAKE2B 692d3aec649c89e473754ceeb13d141df6709f287ae45ae793d84de4321ba13a7fca766456a99f2134e81be4e3a084169f0e1f8f8b9595182efbaab89aefb616 SHA512 4f162114fee298812c0f63b0af1c4113fa1636b6dd4bb750b18decb60d7ad89adc2e460b9861c46ee1c8e11ca3ec437836ff173abe4436ba7784f18b1d6455a6
+DIST pytools-2020.4.4.tar.gz 61208 BLAKE2B e124ae0f2c6be9c760ac178f2043e2d63af7e1eaa79e343b52dc183724bac7e869185d14d43a79efb91cfc55f39c81747581c61badbcb8cbd3d02d6e9a9a79a0 SHA512 32dc47a5a6c39c806c0bc4ffc34a41a1bb51ada537dbba36cfefad7f4370793879b3cb143b37d6fd3542aad0d64ac663cca4c8f7a05db36a9522e9919a1ef3d1
 DIST pytools-2020.4.tar.gz 67157 BLAKE2B 57fd583a7d5cc1337e20fedb5bc1c53c4025a01e7d4e3a5b05a0770a86e2bcabdde31dd535321215cf1bf2c7f3ed0b54e2407583bea63b63ca5b829f590a00be SHA512 66dea0d67c99c152edd7cd44e1262b6d163f065f5a4b697a5997f7453145af8fb0539d8eafa606fa18128908ce933c724b51bd1a76a6f7ab02e27db24496dc4c
diff --git a/dev-python/pytools/pytools-2020.4.4.ebuild b/dev-python/pytools/pytools-2020.4.4.ebuild
new file mode 100644
index 000000000000..cb1dd7a7c86e
--- /dev/null
+++ b/dev-python/pytools/pytools-2020.4.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE='sqlite'
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="https://mathema.tician.de/software/pytools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index c191c7bc40e9..4ded01287b40 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,2 +1,3 @@
 DIST setuptools_scm-4.1.2.tar.gz 48784 BLAKE2B 258fab119d3c37c17bd173e4ac34d338a222cee5f55f6b4756f2cb7feeb09e366f8578eead56caeeebc02d1b048199c0b560609e5aecacb23870398ae86f0cf7 SHA512 3d9d1e0479f00f6159b57f9e5b24e34df035d2009ec50d3779c77b1246aabc6d816f2a2d3e6651791316009e39dfcc8a1b84b779077c39501b9de5740abe6af6
 DIST setuptools_scm-5.0.0.tar.gz 51575 BLAKE2B 60f1faefe48eda74836ad4927fa851b014a7ead7da1dcd04d102052944fb4f48e18680b9e334d2c3578fa610b3ef7efc76bb0cfc9feb0fe51868290a7abcf180 SHA512 4e8dcb1528e48e76804e3c5eec97f2052b509b672d2671545e1dcd6a1c9604bfd1ad32fc7aecc5f4c48841dda0e36b083632463b2f14b263e857482ab4df19f6
+DIST setuptools_scm-5.0.1.tar.gz 51679 BLAKE2B 33f43b437b675291ded4408dd5e68ffbf4615938f963516c0047ead023b2f2a50b28a0d91c7c72a8bdff678d9b8b292aeec36bf418b43f8d039f13560b1fbeb6 SHA512 055403539a26caeb119f3d6623e7b32ef52ccc11a39757fdd9b265ba191265346be5a062a5926a381ba47bbd1a666ffa632653ee6055050689cc38fe0f90cd0f
diff --git a/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild
new file mode 100644
index 000000000000..a7bf379f055a
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+	https://github.com/pypa/setuptools_scm/
+	https://pypi.org/project/setuptools-scm/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	!!<dev-python/setuptools_scm-2
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		dev-vcs/git
+		!sparc? ( dev-vcs/mercurial ) )"
+
+python_prepare_all() {
+	# network access
+	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
+	# all fetch specific setuptools versions
+	rm testing/test_setuptools_support.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sudsds/metadata.xml b/dev-python/sudsds/metadata.xml
index a56745df0223..c4e7a7e3d49d 100644
--- a/dev-python/sudsds/metadata.xml
+++ b/dev-python/sudsds/metadata.xml
@@ -8,5 +8,5 @@
 	<longdescription lang="en">
 		A lightweight SOAP python client for consuming Web Services. Czech NIC labs fork.
 	</longdescription>
-	<origin>kit-fixups</origin>
+	<origin>calculatelinux-overlay</origin>
 </pkgmetadata>
diff --git a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
index 054a9f5306c4..ac0d6b9c7860 100644
--- a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
+++ b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
@@ -17,4 +17,4 @@ KEYWORDS="amd64 x86"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/tree-sitter/tree-sitter-0.2.0.ebuild b/dev-python/tree-sitter/tree-sitter-0.2.0.ebuild
index 861c4cfa2399..696d9e5f152f 100644
--- a/dev-python/tree-sitter/tree-sitter-0.2.0.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.2.0.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 23434ac64934..a7c35f1fb5d7 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,3 +1,4 @@
 DIST wheel-0.35.1.gh.tar.gz 63563 BLAKE2B d1432a638b91e821cb9b9fc748567b9ad18bbfd4737cee915ee3e2c585c4758e79bcf163edac56a09f9e356d81a057214c8e84c5c75b45505c67aa761e97fe3f SHA512 34cd6d1a649842abd895418c0183e68f44e228be905041e1dd8562987fbab8aa617da9b78479cb8d56fb6bb8714ec1085b87640c385bfc933e215f6e33ccf55b
 DIST wheel-0.36.0.gh.tar.gz 65186 BLAKE2B 384dea20a6fdc2e9cc581c1e30814ac84285b8ca2ac5588fc837a1e27add493dedd38ead643776d1353a98cafa45a609e9655168fd09944cfe016d99e357fcd2 SHA512 1f851dfc18fa96d67bb96c61eec15999c46ea77c490173b71121810480f3c30f2de770a2e6e0712d04f35c91fcadbb276b05968e2b5db76dea882929f555f983
 DIST wheel-0.36.1.gh.tar.gz 65846 BLAKE2B 906bd8887ab0efc6542547c603d613e6b12e4ea56e8d037c3a4532e064f3d337cd5c161e2c2557cc832262a42eeda2850303f1d92e8de45f44321ebc9d47c955 SHA512 1f9a27604b0fa0d1ae4782bdba57956a70d74a9a736f4c41481b417cd1e8a86938705555c37835ffe1a061ef55f8adad3475bfc20e2c1fd8de8083dd5c72cca0
+DIST wheel-0.36.2.gh.tar.gz 67999 BLAKE2B 0bb6742ddb25a5b94f94fd071dfe63ae5fa555731625b4b8ca2c7abb1a255e24590ae9ea250ada0473fcd74f19bdca7e529f8eda1a79d8e394d8b339bd2a257a SHA512 23f3dd0540ecc8e762f37a4bb69713abe99125a605c03b1a3412cec910fb7a6cea3eee3910d7c98122b276170a17414c9132b57b57a30a4ba1283cea8f9e20fa
diff --git a/dev-python/wheel/wheel-0.36.2.ebuild b/dev-python/wheel/wheel-0.36.2.ebuild
new file mode 100644
index 000000000000..0475f2c77666
--- /dev/null
+++ b/dev-python/wheel/wheel-0.36.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="https://pypi.org/project/wheel/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed \
+		-e 's:--cov=wheel::g' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	if ! python_is_python3; then
+		# install fails due to unicode in paths
+		ewarn "Testing is broken with py2.7, please test externally"
+		return
+	fi
+
+	distutils_install_for_testing --via-root
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/wsaccel/Manifest b/dev-python/wsaccel/Manifest
index 4e029850745d..91766826cb0b 100644
--- a/dev-python/wsaccel/Manifest
+++ b/dev-python/wsaccel/Manifest
@@ -1 +1,2 @@
 DIST wsaccel-0.6.2_p20170108.zip 21344 BLAKE2B ecb8ef7888fb2ca8e6566d2b3fcbd3911a0df5a8c9f4be86a3cffb95afc31603c2477bd983f9d24ee7cf48c33cbcfb10068c38640ee2a888f46402756313cf29 SHA512 d0cf13360bd6cc0b51b8bee1d36a8ee544816c318e828bf6129ff85827636642cfebae4ef0e99d841cdf64f6c67006a649994804aa42d3d76e977a861aafb3b9
+DIST wsaccel-0.6.3.tar.gz 9723 BLAKE2B 75da0f27e07b52ed730d239ef807da7ba9dd342144ca2e78c32dc09b20c1ebfc006aa9969b1f811d172ca18b75533a4560a29112e56d6dfd472117a0d072fc8e SHA512 0fe97c7fa94cec1b9cf019507f55ce633a9b4bda86329937cddcfa25ba94755010813688cda77ee4fea1c50918e45cd50770bb27e7583e630c46e84d27c155da
diff --git a/dev-python/wsaccel/wsaccel-0.6.3.ebuild b/dev-python/wsaccel/wsaccel-0.6.3.ebuild
new file mode 100644
index 000000000000..774553bcb166
--- /dev/null
+++ b/dev-python/wsaccel/wsaccel-0.6.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Accelerator for ws4py, autobahn and tornado"
+HOMEPAGE="https://pypi.org/project/wsaccel/ https://github.com/methane/wsaccel"
+SRC_URI="https://github.com/methane/wsaccel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 9d4b9a60cdee..53282ff96824 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,4 +1,2 @@
-DIST xarray-0.12.1.tar.gz 1745116 BLAKE2B f38380503347a17cfe11e930b5e275912fb4fb3f02de057e61b21ad1515c8f5e2d5c28007ebb20cecda0f4398b7c71ce239fb3d6f25a79600f5da509f0976359 SHA512 f9e8033b9387ec4175c9d65199aff9cdfc442abb9d2736fb47ab6170ab1e1860b4eb693317a64dad560ab6974f08f7c13f24ecf24c087154ae2d71203e584426
-DIST xarray-0.16.0.tar.gz 1987841 BLAKE2B 9e191d0c8416b3cbeac484b4bdb12a702314bd6bb982c958f346152ce31832f901c257c59adeca6d32f513de62245648610fd21f4d2ba0e9d6360239c2c4134a SHA512 25a4c967d316eac97389ac4f7e43483655ba93bec0af0f338416f8cd9493dc22b6709c7c66640dc5021f70438d2e26c8f419bda178bb6f27f951b8515b2610fc
 DIST xarray-0.16.1.tar.gz 2007111 BLAKE2B 426485a921669e2a5c92eec143d5470c5fabcbe9c0ec440c39b27b3b95aa2e87d494397c3b3ad69b0856a2c467b025beccd188aee40a5b96a5d411bb2d66ada6 SHA512 b02dc0a0993c1a41b839d693fb1b3639cfe2a449ae53da39adac01a19749e7945217716a8a07bedd9ef4d63f333a0ac4ce3fed6a8da9042468fdce2290656321
 DIST xarray-0.16.2.tar.gz 2018053 BLAKE2B 3b95c688a3979323b93ec46c9f218795fbf9df56a7ba1459a507ac36379b3240c351cbb3f1907a204199c6c0c4c0c1c516552548d1e03fb987ad718561aa9772 SHA512 f6cd3eee2012e3b544874388c4824e911ce5d213cd393bf01b10deb9742a1168f41629e4f1e49220228771cac920980eaa98a599a6d62c383dd3da7b3bfe0dd8
diff --git a/dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch b/dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch
deleted file mode 100644
index 62798cbcb5ba..000000000000
--- a/dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/xarray/tests/test_variable.py b/xarray/tests/test_variable.py
-index 290c7a6e..d49a048e 100644
---- a/xarray/tests/test_variable.py
-+++ b/xarray/tests/test_variable.py
-@@ -373,6 +373,7 @@ class VariableSubclassTestCases(object):
-             assert v[0].values == np.asarray(data)[0]
-             assert np.asarray(v[0]) == np.asarray(data)[0]
- 
-+    @pytest.mark.skip("Fails on Gentoo")
-     def test_equals_all_dtypes(self):
-         for v, _ in self.example_1d_objects():
-             v2 = v.copy()
diff --git a/dev-python/xarray/xarray-0.12.1.ebuild b/dev-python/xarray/xarray-0.12.1.ebuild
deleted file mode 100644
index 4ea49b4f500a..000000000000
--- a/dev-python/xarray/xarray-0.12.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="https://xarray.pydata.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.19.2[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/dask-0.18.2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10.8-skip-broken-test.patch"
-)
-
-python_test() {
-	pytest -v || die
-}
diff --git a/dev-python/xarray/xarray-0.16.0.ebuild b/dev-python/xarray/xarray-0.16.0.ebuild
deleted file mode 100644
index 66b8779783e4..000000000000
--- a/dev-python/xarray/xarray-0.16.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pkg_resources use in code
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="https://xarray.pydata.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41.2[${PYTHON_USEDEP}]"
-# note: most of test dependencies are optional
-BDEPEND="
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-#	"${FILESDIR}/${PN}-0.10.8-skip-broken-test.patch"
-)
diff --git a/dev-python/xarray/xarray-0.16.1.ebuild b/dev-python/xarray/xarray-0.16.1.ebuild
index 81b10852e10a..562a713aec5b 100644
--- a/dev-python/xarray/xarray-0.16.1.ebuild
+++ b/dev-python/xarray/xarray-0.16.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]