Updating liguros repo

21 files changed, 263 insertions, 232 deletions

diff --git a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
index 052eabde8e0f..de8eb2b2ca8a 100644
--- a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="
 	app-crypt/argon2:=
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index fe5e0b8e0b5b..7eca849b769a 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,2 +1,2 @@
-DIST autobahn-18.3.1.tar.gz 213042 BLAKE2B 2f5eb92212f57d2301dbac1108a81cbbd339da4cb5527e3eb55f1ae7dcb951fed3cb7c643e76beaa0a83d623fe96f9eebcf7945e10efb0773e102d0234ebc479 SHA512 3d122cfb54eff0697cf60cd155a07699c6f6b39e573616c247ea79e65e6fa0a86d505ea8bc4f4755dbf266fb8bc7fadabb4338aeb1b9e6a2f0503e1b4d25e2e6
 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.4.3.ebuild b/dev-python/autobahn/autobahn-20.4.3.ebuild
index d51a8251bdf6..0bc19e4ed308 100644
--- a/dev-python/autobahn/autobahn-20.4.3.ebuild
+++ b/dev-python/autobahn/autobahn-20.4.3.ebuild
@@ -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 196034169c4d..f8ec18c6ee91 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_{5,6,7,8,9} )
+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/metadata.xml b/dev-python/autobahn/metadata.xml
index c9f94f8f13df..af81c4c05acb 100644
--- a/dev-python/autobahn/metadata.xml
+++ b/dev-python/autobahn/metadata.xml
@@ -1,13 +1,17 @@
 <?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>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index 6fabc98b8578..33be12f9019f 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1 +1,2 @@
 DIST bitstring-3.1.6.tar.gz 751557 BLAKE2B e35735fac2f99832585e909b48faecec2c03f0bf41cb73d1eb1361269811c32a921c8f61762e107b2065adba38bbb40103e53909ed14dd84814eb323b73bc911 SHA512 d78d91f92f60044948199e4fa5ec48c8007268f725e5230d6c8be44a6ced578e61a2c2f8751822f191a909057f38d358a8c944f357a5f9ea98adb6baae3a0da2
+DIST bitstring-3.1.7.tar.gz 407574 BLAKE2B aef290b174ca4cfb756778683e956ba083a8a51cc77d6232477318f91d6d1aee495967722e97a090353032ab99db97f72f3e4d5835e6a841c5076f788ffff456 SHA512 57a48cf279f1e0e2ea8e1ce436cd8c256325f6f9e9ad340b8c28c2954712faf8473e5779aeff4d66b4c596dbeb4cb39ea3328d5c22dcb4d8b0ee0a7098023561
diff --git a/dev-python/bitstring/bitstring-3.1.7.ebuild b/dev-python/bitstring/bitstring-3.1.7.ebuild
new file mode 100644
index 000000000000..aebe8af19b74
--- /dev/null
+++ b/dev-python/bitstring/bitstring-3.1.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure Python module for creation and analysis of binary data"
+HOMEPAGE="https://github.com/scott-griffiths/bitstring"
+SRC_URI="https://github.com/scott-griffiths/${PN}/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests unittest
+
+DOCS=( README.rst release_notes.txt )
+
+src_test() {
+	cd test || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index ed17baf3f95f..c63bf83536d9 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1 +1,2 @@
 DIST cheroot-8.3.0.tar.gz 100557 BLAKE2B f5f2fd8a11a1a8660fc37030d501e93787be46dbb79cae89cb4f6915cbf3975453c0ced6ec3bc0ebfc7dc77d555f7d86ed01bd751df6b0227cac3b1b11a82ab5 SHA512 29ff39f043b1a08b9ef653a41761ac4b97de4141cf15c5394f95736d28f7fad4c501d666fe7ff61f40c55b087d022784c7fe09c995c901040b7f2a8ed16b7d14
+DIST cheroot-8.3.1.tar.gz 104332 BLAKE2B ac79a5e84c534456067b83f11bd72cb34c0e3c850e49c69e0ff329cbe71fd4331397a38bc3b354529a8c4daea6e527733965ba8aafb33fb67e29e6a714b345cb SHA512 5aed493904d7e60118ae4b9498c10d48da553b3cbc1d713e3e870d771a7b669988d55bb0aa3223436cacdbc2249538be759a9145cf655603fbe5b88ee10e94dd
diff --git a/dev-python/cheroot/cheroot-8.3.1.ebuild b/dev-python/cheroot/cheroot-8.3.1.ebuild
new file mode 100644
index 000000000000..9ad274d40f1e
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.3.1.ebuild
@@ -0,0 +1,51 @@
+# 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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
+HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
+SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jaraco-context[${PYTHON_USEDEP}]
+		dev-python/jaraco-text[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
+	sed -e '/setuptools_scm/d' -i setup.cfg || die
+	sed -e '/--cov/d' \
+		-e '/--testmon/d' \
+		-e '/--numproc/d' \
+		-i pytest.ini || die
+
+	# broken
+	sed -e '/False.*localhost/d' \
+		-i cheroot/test/test_ssl.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index 78e5a91758fe..2fef7adc80be 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,3 +1 @@
-DIST hcloud-python-1.6.3.tar.gz 71575 BLAKE2B a6c969d713d1351bba0cebef8752abbbf0805b4a39eedc918767ccf60d590ac8259e1405a25c2c563923146d52ae1318d6362cbaee311bfe04bea5afcc18951b SHA512 dec3f16197de9f02c2707601e1cad40289d3ccbd6256887da50b84fb8fe6b0fb98f708c9ba0cfc2ff1308a53b9997cfda579df3ec79a1d28686a3c43f4124e74
-DIST hcloud-python-1.7.0.tar.gz 71683 BLAKE2B 43dfda161505d9aa486487a028dff9406e77f3c33efe935c13faf19503d1cd98a136703939408b0faf50633c1a40bbd5c43d90a6373acb38e8a0d61bf715a02a SHA512 d8fac8b74862d5f59f50ddac4f675c409f0bb5b51b16c6db094acae2323214c623bdb459c7fe0e74bb21fc88aa61e551b951cfa6c7de4504a4bf31c7f9481f2e
 DIST hcloud-python-1.8.1.tar.gz 87532 BLAKE2B d5e2b5d2aef96508042189d650ef0c6793ca8747a99f20c591c63dbeed497576ef6cf268f75cdc5551b9b3469f1087d5d2ad167af77a93ab321cc9c70d1bb65b SHA512 e26976abe77149db53ea8a35e53de85e0acc3b2021ecbfb1a3a634230d2324e2fb212f54cfcb7a96993b4776d305a247b29aa883053958db881a794f431858bd
diff --git a/dev-python/hcloud-python/hcloud-python-1.6.3-r1.ebuild b/dev-python/hcloud-python/hcloud-python-1.6.3-r1.ebuild
deleted file mode 100644
index 6cf14837b40f..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.6.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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="Official Hetzner Cloud python library"
-HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
-SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples"
-
-COMMON_DEPEND=">=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-2.9[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	<dev-python/requests-2.23[${PYTHON_USEDEP}]"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
-	<dev-python/future-0.19[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
-
-distutils_enable_tests pytest
-
-src_test() {
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	rm -fr tests/integration
-	default
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.6.3-r2.ebuild b/dev-python/hcloud-python/hcloud-python-1.6.3-r2.ebuild
deleted file mode 100644
index ec021b09fde8..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.6.3-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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="Official Hetzner Cloud python library"
-HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
-SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples"
-
-COMMON_DEPEND=">=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-2.9[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	<dev-python/requests-2.23[${PYTHON_USEDEP}]"
-
-BDEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
-	<dev-python/future-0.19[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
-
-distutils_enable_tests pytest
-
-src_test() {
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	rm -fr tests/integration
-	default
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.6.3.ebuild b/dev-python/hcloud-python/hcloud-python-1.6.3.ebuild
deleted file mode 100644
index 1cada1a5aa6c..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.6.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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="Official Hetzner Cloud python library"
-HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
-SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc examples"
-
-COMMON_DEPEND=">=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-2.9[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	<dev-python/requests-2.23[${PYTHON_USEDEP}]"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
-	<dev-python/future-0.19[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.7.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.7.0.ebuild
deleted file mode 100644
index edbbcab4305c..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.7.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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="Official Hetzner Cloud python library"
-HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
-SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples"
-
-COMMON_DEPEND=">=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-2.9[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	<dev-python/requests-2.23[${PYTHON_USEDEP}]"
-
-BDEPEND="${COMMON_DEPEND}
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme
-	)
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/isort[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
-	<dev-python/future-0.19[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
-
-distutils_enable_tests pytest
-
-src_test() {
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	rm -fr tests/integration
-	default
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.8.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.8.1.ebuild
index 2abe16dea39c..f780748e0971 100644
--- a/dev-python/hcloud-python/hcloud-python-1.8.1.ebuild
+++ b/dev-python/hcloud-python/hcloud-python-1.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc examples"
 
 COMMON_DEPEND=">=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
new file mode 100644
index 000000000000..521629f10e57
--- /dev/null
+++ b/dev-python/jaraco-context/Manifest
@@ -0,0 +1 @@
+DIST jaraco.context-3.0.0.tar.gz 12901 BLAKE2B b0a18d8799de211c9827a708302798372dff06767fbac08f4bff8ed48e1dde4cca8d3896a3c4dccd186efdc4d80ffe2b972a05e8f351ec53dcd0c7dec45cfcea SHA512 fd48a9af65edea3212c194758ba1a8fc2d7efc35f7eaec959a7f327ad46d1bf15f295af29d62726f813d35baaeaff35bc3fcd6e27a0e0f272232772e1cb87c17
diff --git a/dev-python/jaraco-context/files/jaraco-context-3.0.0-useless-deps.patch b/dev-python/jaraco-context/files/jaraco-context-3.0.0-useless-deps.patch
new file mode 100644
index 000000000000..3b69581ab2b5
--- /dev/null
+++ b/dev-python/jaraco-context/files/jaraco-context-3.0.0-useless-deps.patch
@@ -0,0 +1,62 @@
+From e3a1f344c296f9d6193f4bf2ac1e0cdafcddce0e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 20 Jul 2020 18:11:31 +0200
+Subject: [PATCH] Make jaraco.apt & yg.lockfile imports optional
+
+Handle missing jaraco.apt & yg.lockfile modules more gracefully,
+delaying the error until dependency_context is actually used.  These
+two modules are only used by the dependency_context, and this context
+can only work on apt-based systems, so there is no point in forcing
+the extraneous dependencies on systems that do not use apt where
+jaraco.context is being installed for other context managers.
+---
+ jaraco/context.py | 19 ++++++++++++++++---
+ 1 file changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/jaraco/context.py b/jaraco/context.py
+index 0b5b1bc..13dfdf6 100644
+--- a/jaraco/context.py
++++ b/jaraco/context.py
+@@ -13,8 +13,15 @@ try:
+ except Exception:
+     import contextlib as contextlib2
+ 
+-import jaraco.apt
+-import yg.lockfile
++try:
++    import jaraco.apt as apt
++except ImportError:
++    apt = None
++
++try:
++    import yg.lockfile
++except ImportError:
++    yg = None
+ 
+ 
+ __metaclass__ = type
+@@ -131,6 +138,12 @@ def dependency_context(package_names, aggressively_remove=False):
+     """
+     installed_packages = []
+     log = logging.getLogger(__name__)
++    if apt is None:
++        log.error("jaraco.apt not found installed")
++        raise ImportError("jaraco.apt not found installed")
++    if yg is None:
++        log.error("yg.lockfile not found installed")
++        raise ImportError("yg.lockfile not found installed")
+     try:
+         if not package_names:
+             logging.debug('No packages requested')
+@@ -144,7 +157,7 @@ def dependency_context(package_names, aggressively_remove=False):
+                 stderr=subprocess.STDOUT,
+             )
+             log.debug('Aptitude output:\n%s', output)
+-            installed_packages = jaraco.apt.parse_new_packages(
++            installed_packages = apt.parse_new_packages(
+                 output, include_automatic=aggressively_remove
+             )
+             if not installed_packages:
+-- 
+2.27.0
+
diff --git a/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild b/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
new file mode 100644
index 000000000000..fcddfb323fb3
--- /dev/null
+++ b/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# upstream uses bad template
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Context managers by jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.context"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-useless-deps.patch
+)
+
+python_prepare_all() {
+	# used only for apt support that's irrelevant to Gentoo
+	sed -i -e '/jaraco\.apt/d' -e '/yg\.lockfile/d' setup.cfg || die
+	# pytest plugins
+	sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	distutils-r1_python_install
+}
diff --git a/dev-python/jaraco-context/metadata.xml b/dev-python/jaraco-context/metadata.xml
new file mode 100644
index 000000000000..76e7dba25fee
--- /dev/null
+++ b/dev-python/jaraco-context/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
index 3e91d7091f35..2eca6a36f891 100644
--- a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
@@ -15,8 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-REPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-BDEPEND="${REPEND}
+RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
diff --git a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
index 3a7a66d4996a..7a7a3b06304c 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r2.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=no
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )