Updating liguros repo

36 files changed, 91 insertions, 575 deletions

diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 23fe030fffe5..9f3a52e7c90a 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -2,3 +2,4 @@ DIST aws-sam-translator-1.27.0.tar.gz 795259 BLAKE2B e28bad80f5353002a2279149efd
 DIST aws-sam-translator-1.28.1.tar.gz 798846 BLAKE2B 6cb554f81f13e6a2196d2fbc64a043a855ecc6c8f5d3e2bb87ef41969b5ef804c2920e3d2f099ce1e1ebb697a2f3c49539e9c63514f15c2acab0cc109ba20ea1 SHA512 6404c908d281e5ac7cf6d61211fc584f7293d4d8d3d509d4386a12e056b684e498ed66fcfc299fbfcabdd12a770c9e56a5fb53c37d06412c60fb28c1f20dfdf6
 DIST aws-sam-translator-1.29.0.tar.gz 805869 BLAKE2B 89054fa7e2488b53daf73a78ae130ad4217775403855d19e22a922f841a36a5a476351f3eec08f1f4b269b12a7e5df1fcd72e301f8ee03896e049becac25c40e SHA512 906107a558dce3a48a263d350d0f475710fa2c5cec38bff2b01c747fc8a0b13851fc3b3c2a4e498c5f7977501215dbee753e455c64508d95754e076ffd8b1089
 DIST aws-sam-translator-1.30.0.tar.gz 810821 BLAKE2B cb7d13162512f793c33f617290d36ad78d2410ad225835ae175192b7e57ae29745a247e08f9b34a158837aca57a4f30bcb9f90f0c4b902ef238ba4e99a0f80ff SHA512 a521994bbbf461a7a28dc8861a751e9495c0684c7462bb5da6459dffbc69917291f2ca6d0480a6dc0264d954c37fccff8c9b3691992d2fe082ce981d31af21da
+DIST aws-sam-translator-1.30.1.tar.gz 810865 BLAKE2B 2039e0724d05f7f9d8372b149f04427e0bd1a8a9b503e6dc49ee76cb4e7678d8f759317c43922d190a2bb55a446feffcbf448cdbc9343538b5c77d81b5545e5f SHA512 8fcdf0843f52c8424a78540cf2a9c3922070bcd34a2e0001a17b89b19b471dfbfc4fcd48211b80292d2f7b76eb2881152c68c4d4b56499ab38942c025226d49e
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.30.1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.30.1.ebuild
new file mode 100644
index 000000000000..0378f91f6aa7
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.30.1.ebuild
@@ -0,0 +1,44 @@
+# 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=bdepend
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	# don't install tests
+	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index a74c4fd99f83..913f34df72d0 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1 +1,2 @@
 DIST denonavr-0.9.5.tar.gz 94016 BLAKE2B b6a013e6831600316dd4e1e33caec7da18774e17a1e9423dd2ae989c4f787cac471e21e2de06db0e01427345234a87825e298dc27881f21fbf69a720bbb04df4 SHA512 798fe126ab3c57ef285f45978e3b06ff5fab99eb3fc47e277c2d2eeb1786ac30fc09de8d23f2b4f59a1240bc2df4fca8e6946baf5135e051f387d1195a070ac7
+DIST denonavr-0.9.6.tar.gz 101801 BLAKE2B bfdaee53f91624e953b3d509ab31b8012ce6afc1d55f683d52af9787b0954425866e96c43609e15294b6e4969ca358bee5524a53ceaf87c3e984694c0cb4a137 SHA512 9e862e63a816661643e3b01e0e0d8b4d700d3ce26716525e5dfe85a2387b732a8c71c11447500b1bcdd0b21cf1b689212a81a3d41aba242dc902fb47a5a98867
diff --git a/dev-python/denonavr/denonavr-0.9.6.ebuild b/dev-python/denonavr/denonavr-0.9.6.ebuild
new file mode 100644
index 000000000000..866f06419219
--- /dev/null
+++ b/dev-python/denonavr/denonavr-0.9.6.ebuild
@@ -0,0 +1,30 @@
+# 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} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automation Library for Denon AVR receivers"
+HOMEPAGE="https://github.com/scarface-4711/denonavr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/osprofiler/Manifest b/dev-python/osprofiler/Manifest
index 6d1be18261f2..4905b442a887 100644
--- a/dev-python/osprofiler/Manifest
+++ b/dev-python/osprofiler/Manifest
@@ -1,2 +1 @@
-DIST osprofiler-2.6.0.tar.gz 80518 BLAKE2B bc45f9bf3378b75a8c702ab1bf9ba40e9f6d77bba808882c7c504adb4f1c295449ab2cc19d128cdec7ebb3120a3d0c49eb77e1769625bafa216e32b3304c6f1e SHA512 3c911961b3107f28bc7b625738d6afb0098d87b891603d1a41be5cfea2b21eb0a3358f3f2fc5cfa0f9b32287f59d732c4ade8ae3436fe46095fa220b5bfb7a15
 DIST osprofiler-3.4.0.tar.gz 86842 BLAKE2B 78a679424023f7cd20a0c6c5825747e3c108e977b44985e2f106b8e82d9cfb44f84b3662df531c64cf09fd4ce313c8a457b803ca820291d58f4f2bacb51eff81 SHA512 d88c0c68eee693a799f4e52a447dd7a4b79f7eddeb1c82bf41cdf3be6457c1b1116b6caa19530de4df376a1cbc26f4094835c3ef7110016d3d9ba989f8e8e41c
diff --git a/dev-python/osprofiler/osprofiler-2.6.0.ebuild b/dev-python/osprofiler/osprofiler-2.6.0.ebuild
deleted file mode 100644
index f77531a8f8b4..000000000000
--- a/dev-python/osprofiler/osprofiler-2.6.0.ebuild
+++ /dev/null
@@ -1,30 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Profiler Library"
-HOMEPAGE="https://launchpad.net/osprofiler"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/osprofiler/osprofiler-3.4.0.ebuild b/dev-python/osprofiler/osprofiler-3.4.0.ebuild
index a3134c86b4d6..61a388f16350 100644
--- a/dev-python/osprofiler/osprofiler-3.4.0.ebuild
+++ b/dev-python/osprofiler/osprofiler-3.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pbr/pbr-5.5.0-r1.ebuild b/dev-python/pbr/pbr-5.5.0-r1.ebuild
index 79bd6bda7992..27258cc2b490 100644
--- a/dev-python/pbr/pbr-5.5.0-r1.ebuild
+++ b/dev-python/pbr/pbr-5.5.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-6.0.2.ebuild b/dev-python/pytest/pytest-6.0.2.ebuild
index aa0515fa1f1d..018ea0197674 100644
--- a/dev-python/pytest/pytest-6.0.2.ebuild
+++ b/dev-python/pytest/pytest-6.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-blazarclient/Manifest b/dev-python/python-blazarclient/Manifest
index f08ea8be36f9..4706c1788db8 100644
--- a/dev-python/python-blazarclient/Manifest
+++ b/dev-python/python-blazarclient/Manifest
@@ -1,2 +1 @@
-DIST python-blazarclient-2.1.0.tar.gz 32950 BLAKE2B cdad6f6e60e95ba97fff6a3d54e642679e2ba203d1aadcadb8190c9fda38dab27808ffbddcfa41852dc72504e9009ec62863991f832d086d70e22bf9652151b5 SHA512 a5d2749969d354ff96b4f223d49f69333a874f167e62663edf4209879b3783d1272dc591157b5a8d1b25206e7c796aa4e0d5966de74aac4429c2ebd9670d1987
 DIST python-blazarclient-3.1.1.tar.gz 36460 BLAKE2B b19595a3cf52da6d298e5006eada7a68c28f396c8143bbed2f22b45e910d136b54bf3d3fde95bd4fc02887bffd206d10629e923e7d81289af643e44b751c0926 SHA512 91cf8004f83494299e11d8c419f183c45726a1b9baec09ffdb719ff8db3cb91967c24a4ac684e227c87015bc00733b03fb132e34fe2fdc773164373e3fd10561
diff --git a/dev-python/python-blazarclient/python-blazarclient-2.1.0.ebuild b/dev-python/python-blazarclient/python-blazarclient-2.1.0.ebuild
deleted file mode 100644
index f4b1acc75758..000000000000
--- a/dev-python/python-blazarclient/python-blazarclient-2.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="This is a client for the OpenStack Blazar API"
-HOMEPAGE="https://github.com/openstack/python-blazarclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-blazarclient/python-blazarclient-3.1.1.ebuild b/dev-python/python-blazarclient/python-blazarclient-3.1.1.ebuild
index b8e2156c49e7..3128fec6acb8 100644
--- a/dev-python/python-blazarclient/python-blazarclient-3.1.1.ebuild
+++ b/dev-python/python-blazarclient/python-blazarclient-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-ceilometerclient/Manifest b/dev-python/python-ceilometerclient/Manifest
index 2e0cbde682e2..fdf59a4db633 100644
--- a/dev-python/python-ceilometerclient/Manifest
+++ b/dev-python/python-ceilometerclient/Manifest
@@ -1,2 +1 @@
-DIST python-ceilometerclient-2.6.2.tar.gz 94001 BLAKE2B ef2d3411df3920ed6a2417dc2201b8df4242770215514415422a6f7a783a933f25fa8565497a7d8a32dc14bfd159973d6c10e9dc0bf4b1798fb9205452493822 SHA512 547df2616adbe437a751026554bf11e74ba753a3bc905fa71621d47accabcf6d4e1a67ad2516af91b5ba9600d4721a1f4bce730862fb18b63249d5334a78972d
 DIST python-ceilometerclient-2.9.0.tar.gz 95460 BLAKE2B c78320609944d69c74db038b4cb8dfff8ab065ae01fb05afc79715c4694ce872506d156cff3e0e8762e9b4231d1325558dd2340a04768a74f09e1fdb0b153d68 SHA512 ca03ce55fe628503bf7c5c187fb7a697962443708c0c3753ebe19ed9c20633ff3df57dd92f498f252a158e23312dc51fa694a46be46b23ff7430447d5afeb85f
diff --git a/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2-r2.ebuild b/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2-r2.ebuild
deleted file mode 100644
index 7c1fc2583151..000000000000
--- a/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2-r2.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_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="This is a client library for Ceilometer built on the Ceilometer API"
-HOMEPAGE="https://github.com/openstack/python-ceilometerclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.1.0
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-ceilometerclient/python-ceilometerclient-2.9.0.ebuild b/dev-python/python-ceilometerclient/python-ceilometerclient-2.9.0.ebuild
index 1a0978366838..4d569b231dd6 100644
--- a/dev-python/python-ceilometerclient/python-ceilometerclient-2.9.0.ebuild
+++ b/dev-python/python-ceilometerclient/python-ceilometerclient-2.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 4cc0e733cac3..9497122b8371 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,2 +1 @@
-DIST python-keystoneclient-4.0.0.tar.gz 313891 BLAKE2B 886f354ea29b4bb8886bde1c337e619403f81ee608079777f1e96bf55e936fb7bef48194d721b14857043e1c878f2f2c925483dc0641bb5c25afd6af1536fce9 SHA512 6c094327b4c8bcb32c42463a3abe412230c514c59a5b45387da99689385780f530669979b6aa06ee03450a1386ff089bfc69c24c625e56ed46ab093e6f58153f
 DIST python-keystoneclient-4.1.1.tar.gz 316920 BLAKE2B f42ab0648f43fc6424cb502a996c7f81e688171aea4c94ae664d128d31eed04c6936e763ed996af990dda6dbc42d2cc7fcb0aeb8638b75133609521e704d2b55 SHA512 a88f992dfdb196a66ad3b173ac8f7c006524225d426c240e1ed27ae4007df5d5e74251e273c11316ba451f6fb31de6250e51203e70dec670f7f1e0b65d24fdd1
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.0.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.0.0.ebuild
deleted file mode 100644
index f0fc6b8aa635..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-4.0.0.ebuild
+++ /dev/null
@@ -1,43 +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="Client Library for OpenStack Identity"
-HOMEPAGE="https://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-RESTRICT="test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-#PATCHES=(
-#)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.1.1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.1.1.ebuild
index 19dfc759fdd1..89b5aaad73dd 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-4.1.1.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-4.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-magnumclient/Manifest b/dev-python/python-magnumclient/Manifest
index da99480a5397..5952eaeb321e 100644
--- a/dev-python/python-magnumclient/Manifest
+++ b/dev-python/python-magnumclient/Manifest
@@ -1,2 +1 @@
-DIST python-magnumclient-2.12.0.tar.gz 106073 BLAKE2B aec03c74429b1934ea46aa8109f4f779aa06281136eab2ad422c851ca347f6703faec9feadb7bc49423b4e335cfedb3ebecaddaba7c9cdb32e8a8ca0de9118ca SHA512 a6d8790b87801ca313bb119e75490cb2913a11558925b6a49e276a7bfed102cf8e575f344fce8e31223f835c4961c50c2918844689ef88ef34c72c8a1032f340
 DIST python-magnumclient-3.2.1.tar.gz 114288 BLAKE2B c8ed1d6ab2744fb082d33fab121594fa23a53523dfe74ad636e46681c52f3f9084ff5ced0dcdbd6f3cab219a093265da897b8b3b978d0fbb379765d123db348e SHA512 9c84e382e0be411100648ba4a33f33e45133dbfc75bf28945b97064998fe8c1bb0149970a8938498aefd322c87b87d6fa7b69286bb7ec336b40f6fbc9e31dbbc
diff --git a/dev-python/python-magnumclient/python-magnumclient-2.12.0.ebuild b/dev-python/python-magnumclient/python-magnumclient-2.12.0.ebuild
deleted file mode 100644
index ad1c02f76334..000000000000
--- a/dev-python/python-magnumclient/python-magnumclient-2.12.0.ebuild
+++ /dev/null
@@ -1,46 +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="A client for the OpenStack Magnum API"
-HOMEPAGE="https://github.com/openstack/python-magnumclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-magnumclient/python-magnumclient-3.2.1.ebuild b/dev-python/python-magnumclient/python-magnumclient-3.2.1.ebuild
index d795ed08d49b..cbd8b8ad018e 100644
--- a/dev-python/python-magnumclient/python-magnumclient-3.2.1.ebuild
+++ b/dev-python/python-magnumclient/python-magnumclient-3.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-mistralclient/Manifest b/dev-python/python-mistralclient/Manifest
index 9bf50039ab2f..b529cef7a108 100644
--- a/dev-python/python-mistralclient/Manifest
+++ b/dev-python/python-mistralclient/Manifest
@@ -1,2 +1 @@
-DIST python-mistralclient-3.8.1.tar.gz 95616 BLAKE2B bc7185522b24e30321c5f57b6bc31cf239873343bce66e901e8928aedbc3caef36102a8ee67e01f6b46f77cc0d708006ac69ec4147a22b72e52e01441e39eec4 SHA512 ccde34b3ac6e12137d57dbfce597a8f9c43824a8b2450af15ab065fe03469edf0787a2b91c8e5e1da78de5d9d4d20213701e992d4c41e61c459fd987461d5298
 DIST python-mistralclient-4.1.1.tar.gz 97257 BLAKE2B 8f58cc59f782d05111b1eb009ba06dc8dd356841ffdc75a4af2fde0492eafce4d728fe8e947e7ef80f4049c3889587ab2926294acd90191dbfc26f6a643cb2c6 SHA512 4f1f5d558ef4711b0ff7da565b0eefc9e3e32d4014d0b9c808370e0e0a00d759aa4f35a7f116f95db00d43277d614aea9fb57200e15c2c0258a48c8e828910e3
diff --git a/dev-python/python-mistralclient/python-mistralclient-3.8.1.ebuild b/dev-python/python-mistralclient/python-mistralclient-3.8.1.ebuild
deleted file mode 100644
index 1cfb75ce0cfa..000000000000
--- a/dev-python/python-mistralclient/python-mistralclient-3.8.1.ebuild
+++ /dev/null
@@ -1,41 +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="A client for the OpenStack Mistral API"
-HOMEPAGE="https://github.com/openstack/python-mistralclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-mistralclient/python-mistralclient-4.1.1.ebuild b/dev-python/python-mistralclient/python-mistralclient-4.1.1.ebuild
index c61d70720d7c..4dbf1cbe8c11 100644
--- a/dev-python/python-mistralclient/python-mistralclient-4.1.1.ebuild
+++ b/dev-python/python-mistralclient/python-mistralclient-4.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
diff --git a/dev-python/python-monascaclient/Manifest b/dev-python/python-monascaclient/Manifest
index 260530e2ad82..f52fb2dbafb1 100644
--- a/dev-python/python-monascaclient/Manifest
+++ b/dev-python/python-monascaclient/Manifest
@@ -1,2 +1 @@
-DIST python-monascaclient-1.15.0.tar.gz 46868 BLAKE2B fe78e21e0324f6a4b95d8583c43a9bf166896b3e610ad884d278208cd3e5597038c7a04b96f5e3ad6913e2a23c13dbcb4937bed05982a12c154cccae6698adda SHA512 d9378d01d78742e26abfc82ffcb13d64451ce10e6d3182a03893f21bcc76e9b961c3daaed6d9635b6bc709e5782f44e20485b53468bb2d825d64b18c6b9bca50
 DIST python-monascaclient-2.2.1.tar.gz 51569 BLAKE2B f8c245867cd80530df0ba873d13465c364dd3f09003e7248497e102f88186ea18833598013fa3eb6b7015e37854036521edfb2850445d3db7d052e068477bdc1 SHA512 6a533c5fefdb31446aea62c997f69588c2c005f6ea4b419959381f623cc74b4fc4b0eeefccf7b305f1526a75ce86b91570338386f6dc959c31ce9f0b1e1022a2
diff --git a/dev-python/python-monascaclient/python-monascaclient-1.15.0.ebuild b/dev-python/python-monascaclient/python-monascaclient-1.15.0.ebuild
deleted file mode 100644
index f88441c68ada..000000000000
--- a/dev-python/python-monascaclient/python-monascaclient-1.15.0.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="A client for the OpenStack Monasca API"
-HOMEPAGE="https://github.com/openstack/python-monascaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-monascaclient/python-monascaclient-2.2.1.ebuild b/dev-python/python-monascaclient/python-monascaclient-2.2.1.ebuild
index 887d40869abb..df5576ca1a6d 100644
--- a/dev-python/python-monascaclient/python-monascaclient-2.2.1.ebuild
+++ b/dev-python/python-monascaclient/python-monascaclient-2.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
diff --git a/dev-python/python-novaclient/python-novaclient-17.2.1.ebuild b/dev-python/python-novaclient/python-novaclient-17.2.1.ebuild
index 37bb9d9dc104..425f8de8c4c7 100644
--- a/dev-python/python-novaclient/python-novaclient-17.2.1.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-17.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-vitrageclient/Manifest b/dev-python/python-vitrageclient/Manifest
index 414cf8473828..745fe2d5db14 100644
--- a/dev-python/python-vitrageclient/Manifest
+++ b/dev-python/python-vitrageclient/Manifest
@@ -1,2 +1 @@
-DIST python-vitrageclient-4.0.1.tar.gz 47671 BLAKE2B 6e1e72d0de1cddf9f72d1ff6bdb2261f4f2295a1fdd6ebe0e9ff497b48ea545ea999d7ac7bc79adabbbdebbb3b1b36e853d083d3b6c6e9875fe44bc36f76acf4 SHA512 607d669a4ccddc0eb938c26cc4f2b2cdaac8976a7c2b774b8ce49df6bd2e5fbe4ecf210eef008d49e3d1689a686bc6e0820c3b0a11f353a2711b9b2cc743c9e1
 DIST python-vitrageclient-4.1.1.tar.gz 48885 BLAKE2B 87bbd0174567c142a38901ddf5a4f785e4a9eac9a9e22c3af6f101ead69695e6f9324e52c86c0f526e4120c2f6e807ff8719b017c38de8aad3f59ed4ebf8c2c2 SHA512 2d6758045e4250ceda55e991286e9391ccb9ec154a8802f2aa3faf81d4021b2a8b3be13cefe38df965cae4b2b094592185362780b14e32dcf7cfdc7a13d005af
diff --git a/dev-python/python-vitrageclient/python-vitrageclient-4.0.1.ebuild b/dev-python/python-vitrageclient/python-vitrageclient-4.0.1.ebuild
deleted file mode 100644
index 627f7aae57c7..000000000000
--- a/dev-python/python-vitrageclient/python-vitrageclient-4.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Vitrage API"
-HOMEPAGE="https://github.com/openstack/python-vitrageclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/Babel-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/networkx-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pydot-1.4.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-vitrageclient/python-vitrageclient-4.1.1.ebuild b/dev-python/python-vitrageclient/python-vitrageclient-4.1.1.ebuild
index 4fb435db3960..c5dbca807436 100644
--- a/dev-python/python-vitrageclient/python-vitrageclient-4.1.1.ebuild
+++ b/dev-python/python-vitrageclient/python-vitrageclient-4.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 20950bd9d595..efb9b0bf0edb 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,3 +1,2 @@
-DIST pyzmq-19.0.1_p20200608.tar.gz 390927 BLAKE2B d70a2f615782cc5a53ed2ffab4d5549bc5d15cc1e0e63f640a357fe8575ca327a5976a3e8b11d97c236a31ca17025f37fe423d166b684b5c4aafc139a0941492 SHA512 7f077ed3858c226eb1e3f5e51dfb5d4b517ec94357b37cc66d17cfe2543786b86627ce7eb4c12785a2709a499af998d02642d972c119a637df3cec5201e909d1
 DIST pyzmq-19.0.2.tar.gz 390927 BLAKE2B d70a2f615782cc5a53ed2ffab4d5549bc5d15cc1e0e63f640a357fe8575ca327a5976a3e8b11d97c236a31ca17025f37fe423d166b684b5c4aafc139a0941492 SHA512 7f077ed3858c226eb1e3f5e51dfb5d4b517ec94357b37cc66d17cfe2543786b86627ce7eb4c12785a2709a499af998d02642d972c119a637df3cec5201e909d1
 DIST pyzmq-20.0.0.gh.tar.gz 393041 BLAKE2B 1f22f556f5d0f2755c2e56411fdb9f583bbdfad6315e4e72fbaa1fb18d0ad5436ee0ee8d17497641421cea3f4e1b53b8ff85bf7ced96c8f1c80db0be901ca3d5 SHA512 30359e501e76d6ec14175622d6c970d9ec0f227b372d2b1c6e6650be812dd47017b797a016f5a2da83f72d00536e64d2f005a38003c9a1b4fbb7266f2640782d
diff --git a/dev-python/pyzmq/files/pyzmq-19.0.0-tests.patch b/dev-python/pyzmq/files/pyzmq-19.0.0-tests.patch
deleted file mode 100644
index f56e7c6d3a5d..000000000000
--- a/dev-python/pyzmq/files/pyzmq-19.0.0-tests.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-diff --git a/zmq/tests/test_auth.py b/zmq/tests/test_auth.py
-index 003f171..9d882b6 100644
---- a/zmq/tests/test_auth.py
-+++ b/zmq/tests/test_auth.py
-@@ -191,6 +191,7 @@ class TestThreadAuthentication(BaseAuthTestCase):
-         client.close()
-         server.close()
- 
-+    @pytest.mark.skip("sometimes hangs")
-     def test_curve(self):
-         """threaded auth - CURVE"""
-         self.auth.allow('127.0.0.1')
-@@ -309,6 +310,7 @@ class TestThreadAuthentication(BaseAuthTestCase):
- 
- 
-     @skip_pypy
-+    @pytest.mark.skip("fails with cffi")
-     def test_curve_user_id(self):
-         """threaded auth - CURVE"""
-         self.auth.allow('127.0.0.1')
-diff --git a/zmq/tests/test_constants.py b/zmq/tests/test_constants.py
-index 6b4d0c9..d527b06 100644
---- a/zmq/tests/test_constants.py
-+++ b/zmq/tests/test_constants.py
-@@ -91,6 +91,7 @@ class TestConstants(TestCase):
-                         self.fail("Shouldn't have: zmq.%s=%s" % (name, value))
- 
-     @pytest.mark.skipif(not zmq.DRAFT_API, reason="Only test draft API if built with draft API")
-+    @pytest.mark.skip("fails with cffi")
-     def test_draft(self):
-         zmq_version = zmq.zmq_version_info()
-         for version, new_names in constant_names.draft_in.items():
-diff --git a/zmq/tests/test_draft.py b/zmq/tests/test_draft.py
-index 5bb9e29..934ed50 100644
---- a/zmq/tests/test_draft.py
-+++ b/zmq/tests/test_draft.py
-@@ -20,6 +20,7 @@ class TestDraftSockets(BaseZMQTestCase):
-         super(TestDraftSockets, self).setUp()
-     
- 
-+    @pytest.mark.skip("fails with cffi")
-     def test_client_server(self):
-         client, server = self.create_bound_pair(zmq.CLIENT, zmq.SERVER)
-         client.send(b'request')
-@@ -29,6 +30,7 @@ class TestDraftSockets(BaseZMQTestCase):
-         reply = self.recv(client)
-         assert reply == b'reply'
- 
-+    @pytest.mark.skip("fails with cffi")
-     def test_radio_dish(self):
-         dish, radio = self.create_bound_pair(zmq.DISH, zmq.RADIO)
-         dish.rcvtimeo = 250
-diff --git a/zmq/tests/test_message.py b/zmq/tests/test_message.py
-index d3a6aa8..9ce622c 100644
---- a/zmq/tests/test_message.py
-+++ b/zmq/tests/test_message.py
-@@ -18,6 +18,7 @@ import zmq
- from zmq.tests import BaseZMQTestCase, SkipTest, skip_pypy, PYPY
- from zmq.utils.strtypes import unicode, bytes, b, u
- 
-+import pytest
- 
- # some useful constants:
- 
-@@ -71,7 +72,7 @@ class TestFrame(BaseZMQTestCase):
-             m = zmq.Frame(s)
-             b = m.bytes
-             self.assertEqual(s, m.bytes)
--            if not PYPY:
-+            if not PYPY and False:
-                 # check that it copies
-                 self.assert_(b is not s)
-             # check that it copies only once
-@@ -94,6 +95,7 @@ class TestFrame(BaseZMQTestCase):
-             self.assertEqual(len(s), len(m))
- 
-     @skip_pypy
-+    @pytest.mark.skip("seems to be broken")
-     def test_lifecycle1(self):
-         """Run through a ref counting cycle with a copy."""
-         for i in range(5, 16):  # 32, 64,..., 65536
-@@ -130,6 +132,7 @@ class TestFrame(BaseZMQTestCase):
-             del s
- 
-     @skip_pypy
-+    @pytest.mark.skip("seems to be broken")
-     def test_lifecycle2(self):
-         """Run through a different ref counting cycle with a copy."""
-         for i in range(5, 16):  # 32, 64,..., 65536
-@@ -166,6 +169,7 @@ class TestFrame(BaseZMQTestCase):
-             del s
-     
-     @skip_pypy
-+    @pytest.mark.skip("fails with cffi")
-     def test_tracker(self):
-         m = zmq.Frame(b'asdf', copy=False, track=True)
-         self.assertFalse(m.tracker.done)
-@@ -186,6 +190,7 @@ class TestFrame(BaseZMQTestCase):
-         self.assertRaises(ValueError, zmq.MessageTracker, m)
-     
-     @skip_pypy
-+    @pytest.mark.skip("fails with cffi")
-     def test_multi_tracker(self):
-         m = zmq.Frame(b'asdf', copy=False, track=True)
-         m2 = zmq.Frame(b'whoda', copy=False, track=True)
-@@ -222,6 +227,7 @@ class TestFrame(BaseZMQTestCase):
-         self.assert_(m.buffer is m.buffer)
-     
-     @skip_pypy
-+    @pytest.mark.skip("fails with cffi")
-     def test_memoryview_shape(self):
-         """memoryview shape info"""
-         if sys.version_info < (3,):
-@@ -331,6 +337,7 @@ class TestFrame(BaseZMQTestCase):
-             B = numpy.frombuffer(msg, A.dtype).reshape(A.shape)
-             assert_array_equal(A, B)
- 
-+    @pytest.mark.skip("fails with cffi")
-     def test_frame_more(self):
-         """test Frame.more attribute"""
-         frame = zmq.Frame(b"hello")
-diff --git a/zmq/tests/test_security.py b/zmq/tests/test_security.py
-index b73234d..8fdea48 100644
---- a/zmq/tests/test_security.py
-+++ b/zmq/tests/test_security.py
-@@ -9,6 +9,8 @@ import contextlib
- import time
- from threading import Thread
- 
-+import pytest
-+
- import zmq
- from zmq.tests import (
-     BaseZMQTestCase, SkipTest, PYPY
-@@ -114,6 +116,7 @@ class TestSecurity(BaseZMQTestCase):
-         client.connect("%s:%i" % (iface, port))
-         self.bounce(server, client, False)
- 
-+    @pytest.mark.skip("fails with cffi")
-     def test_plain(self):
-         """test PLAIN authentication"""
-         server = self.socket(zmq.DEALER)
-@@ -201,6 +204,7 @@ class TestSecurity(BaseZMQTestCase):
-         # verify that it is equal to the known public key
-         self.assertEqual(derived_public, public)
-          
-+    @pytest.mark.skip("fails with cffi")
-     def test_curve(self):
-         """test CURVE encryption"""
-         server = self.socket(zmq.DEALER)
-diff --git a/zmq/tests/test_socket.py b/zmq/tests/test_socket.py
-index 3046663..dcc66d0 100644
---- a/zmq/tests/test_socket.py
-+++ b/zmq/tests/test_socket.py
-@@ -221,6 +221,7 @@ class TestSocket(BaseZMQTestCase):
-         self.assertEqual(rcvd, [b'b'])
-     
-     @skip_pypy
-+    @pytest.mark.skip("test hangs")
-     def test_tracker(self):
-         "test the MessageTracker object for tracking when zmq is done with a buffer"
-         addr = 'tcp://127.0.0.1'
-@@ -363,6 +364,7 @@ class TestSocket(BaseZMQTestCase):
-         s.close()
-         self.assertTrue(s.closed)
-     
-+    @pytest.mark.skip("fails with cffi")
-     def test_poll(self):
-         a,b = self.create_bound_pair()
-         tic = time.time()
-@@ -502,6 +504,7 @@ class TestSocket(BaseZMQTestCase):
-         self.assertEqual(events, [])
- 
-     # Travis can't handle how much memory PyPy uses on this test
-+    @pytest.mark.skip("test hangs")
-     @mark.skipif(
-         (
-             pypy and on_travis
-@@ -536,6 +539,7 @@ class TestSocket(BaseZMQTestCase):
-         assert view[0] == byte
-         assert view[-1] == byte
- 
-+    @pytest.mark.skip("fails with cffi")
-     def test_custom_serialize(self):
-         a, b = self.create_bound_pair(zmq.DEALER, zmq.ROUTER)
-         def serialize(msg):
diff --git a/dev-python/pyzmq/pyzmq-19.0.1_p20200608.ebuild b/dev-python/pyzmq/pyzmq-19.0.1_p20200608.ebuild
deleted file mode 100644
index d4494d00e8df..000000000000
--- a/dev-python/pyzmq/pyzmq-19.0.1_p20200608.ebuild
+++ /dev/null
@@ -1,64 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit flag-o-matic distutils-r1 toolchain-funcs
-
-EGIT_COMMIT="dd4dac055152d47c829034224cdecf594c7b3f12"
-DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="
-	https://www.zeromq.org/bindings:python
-	https://pypi.org/project/pyzmq/
-	https://github.com/zeromq/pyzmq/"
-SRC_URI="
-	https://github.com/zeromq/pyzmq/archive/${EGIT_COMMIT}.tar.gz
-		-> ${P}.tar.gz"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+draft"
-
-DEPEND="
-	>=net-libs/zeromq-4.2.2-r2:=[drafts]
-"
-RDEPEND="${DEPEND}
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/cffi:=[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/pyzmq-19.0.0-tests.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	"dev-python/numpydoc"
-
-python_prepare_all() {
-	# probably broken with new numpy
-	sed -i -e 's:test_buffer_numpy:_&:' zmq/tests/test_message.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	tc-export CC
-	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
-}
-
-python_compile() {
-	esetup.py cython --force
-	distutils-r1_python_compile
-}
diff --git a/dev-python/pyzmq/pyzmq-19.0.2.ebuild b/dev-python/pyzmq/pyzmq-19.0.2.ebuild
index a081f95140a7..96cb3ae51a94 100644
--- a/dev-python/pyzmq/pyzmq-19.0.2.ebuild
+++ b/dev-python/pyzmq/pyzmq-19.0.2.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/traitlets/traitlets-5.0.5.ebuild b/dev-python/traitlets/traitlets-5.0.5.ebuild
index a17438ddd90a..46fd38afed87 100644
--- a/dev-python/traitlets/traitlets-5.0.5.ebuild
+++ b/dev-python/traitlets/traitlets-5.0.5.ebuild
@@ -19,6 +19,7 @@ RDEPEND="
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	"
 
-distutils_enable_sphinx docs \
-	dev-python/ipython_genutils
+distutils_enable_sphinx docs/source \
+	dev-python/ipython_genutils \
+	dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest