Updating liguros repo

34 files changed, 565 insertions, 7 deletions

diff --git a/dev-python/GitPython/GitPython-3.1.8.ebuild b/dev-python/GitPython/GitPython-3.1.8.ebuild
new file mode 100644
index 000000000000..514877b42995
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.8.ebuild
@@ -0,0 +1,58 @@
+# 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 distutils-r1
+
+TEST_P=GitPython-${PV}
+GITDB_P=gitdb-4.0.5
+SMMAP_P=smmap-3.0.4
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+	test? (
+		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+
+	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
+	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb || die
+	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
+
+	cd "${T}"/test || die
+	rm -r test/performance || die
+	# tests requiring network access
+	sed -i -e 's:test_fetch_error:_&:' test/test_remote.py || die
+	rm test/test_installation.py || die
+	# broken apparently (also fails in git clone)
+	sed -e 's:test_rev_parse:_&:' \
+		-i test/test_repo.py || die
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 80aa74ae8042..5bc06661877b 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,4 +1,6 @@
 DIST GitPython-3.1.7.gitbundle 8821099 BLAKE2B 96b6cb8cce9778099001d9c3066b9d3b7f4c3c4b4283e521f7b41e93cf5f3990a8758853c261e3458cd6a8c8c48661526e1dd2ce2208e02d3ee895358a135b4a SHA512 c311a464e79c769be92b08a216d52487a47af6c8807e880b6c2225d04eb7cd772808a6675660a2e727ce3ddf47746203646fb96f9a947d4ae2ad4b916f8dc984
 DIST GitPython-3.1.7.tar.gz 169134 BLAKE2B aba0464b18bfbcfd5e219c6483a1af70cb89da45d26e41e18a26b661985d2ab414e72b60a5366a9dd1ff0603876907a7fd642bc49bae01973ef6c8ba7906ec31 SHA512 7c434312be303288b58fabea4d6a84bf417dfff60d61695384af594e5f1231efc8d79d250aa63e04263b4c9aa4f19efceb98c5eea1a466fb0b433113ddb4af46
+DIST GitPython-3.1.8.gitbundle 4418113 BLAKE2B b6c2154b8f1eadc005055c8c04a9c2ee5e9b365bcbb258cf24d676aa5e1d7f598c26c5404606f8c48d2e2165615e6cf4b3006f071cc3a3bb2047990d232f16d2 SHA512 d506bc72ae10227fde57c8497ad41a2da9e9b4613b3b98ca6a0d48cf8286bdc3e9d71284a5fededd2df075042a12dd8074e07c32defda707865c129dc83b7247
+DIST GitPython-3.1.8.tar.gz 170582 BLAKE2B 0ca3111ce09259b9b071d43b06715b187a6f428dd81002c57215c60e720447007220536f51d681c5468ebe91a4144769b57f6a8c80d29683c26f0f07d984d765 SHA512 8848b58738d7dd33b8c3186d9db0eb41a6e428050f4fe170351e42c941c9586ba4999bf5083fbbe2b7ce73a668a0f62cfb19be013f470c7b8f0733d07d9bee32
 DIST gitdb-4.0.5.gitbundle 1497722 BLAKE2B 8ee85368db7f408f96f0b48250f1ed96c8df28b0439d355ce2eecbdcc5dc94382883510c57142e7e4b6ba7cd8e82b1140eca538b45692dbe8c55bce32e1b5b4f SHA512 2c55a8e402a61ebcc362a8aee4a6154705d8ff2f5e582d13c855562dd074427681f4147641fe76681b76c99ec46040c7577dfca8bbfd575fc52772a9a6f17326
 DIST smmap-3.0.4.gitbundle 276552 BLAKE2B 2d17b927b2c644d2f1984168ee99fe5a9a58392401ac0b2894a1d5e5f9c292f32311a7a5d7669bd93c642ff791f4801d61ef3236c1dafa1434e99a17fd8751f6 SHA512 6deb282c6ece3b556c59c458b5242ff362b903441db63c005a0ab1ac055b3f974f9b34f30e0a4a41ef9246696e08b191254f72db61a8f24d4eb2f0e48a08937b
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 334860444467..bae9ebbcaa64 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 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DEPEND="
 	app-crypt/argon2:=
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 1be5fd0d1eba..bdd129a9498c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,3 +3,4 @@ DIST boto3-1.14.31.tar.gz 300720 BLAKE2B 9dbd002e299c629f28037572c615a00612c8077
 DIST boto3-1.14.46.tar.gz 301815 BLAKE2B e389e7e0cd9ed0907fd13a948bf37e00040e32029d7720f5a720c8c9cb3cf1fb157bb665032b4ba594b3b5f50129088f26f004535fc4f8fe72f32ab0be6ce9b9 SHA512 aa1aa0155fcaaaddcfc24697211e8f5a69eab1282a185f0cb76b02d63d1426c02ca3be71be980214484a351159f6bcc34c3422cd11b9a556d67802c01a06aed0
 DIST boto3-1.14.49.tar.gz 301978 BLAKE2B ab27aab54b7e1b531ae063e3a84691820208d5d229664d07aaba4c184d5344eb2a620bd2cf4cd4dc4555cf014926c56c89ee29a9832d7ede4fa46b025914a135 SHA512 bc66702f869cb41c6c6dc7d6f82eb09c962122e108d02daf2c4ee408b7a805193f2f4f9af0c5c96775c8a79975142d1154a32c2fe86b0c6aacd18617ff2934c8
 DIST boto3-1.14.52.tar.gz 302219 BLAKE2B 97b93e7e203aba7e0dad8bdace83ac41fb85b5880473721543160dc19da52559db3e095edfea8e0946a8915e1a3c396de598b76a35221a64226d602199b8301e SHA512 f65473d91d45bfbd036413b63ee62688bdf9318a09fb81d7e83d5655b785a7b6b626ec7b61ddc1fef8f3fc46c7acb7becefb632d4ae931335a4568451596673d
+DIST boto3-1.14.55.tar.gz 302397 BLAKE2B 61785df9bfbe0668ff7b0537bb86b119ab3a98dc41cbe5118f550c81bb08cbec3c68249d9bffa1420088cd5b6a2aff2267dbeb16e52275e632ba88c8e709c8f3 SHA512 d51b0716f5148b5765e90d0a60146b5b06013e4a789eacfb798e5a4c114d4a8b9b07f5d74c0fa0b50b79e1704b7893d709bf87c9a2dd1d184bd477dbecd21a38
diff --git a/dev-python/boto3/boto3-1.14.55.ebuild b/dev-python/boto3/boto3-1.14.55.ebuild
new file mode 100644
index 000000000000..12584b2fba42
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.55.ebuild
@@ -0,0 +1,56 @@
+# 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="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 8c9028da93f7..2ad75524352e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,3 +3,4 @@ DIST botocore-1.17.31.tar.gz 6665851 BLAKE2B dbc89d1216f9fda89c6185baccfdf2878c2
 DIST botocore-1.17.46.tar.gz 6738493 BLAKE2B 2e5ee1241af91c19cef0ac575c5ad68d46277e8b2f0f1f719428f7b4026303a47e48b8a8240c1121cfe35c6310be5fde3f0cfa2aa3f3321249811eb510b47f94 SHA512 a11de252454477d478f2b5d0b5978b24961baa3942936ef5990c421709d0b8081e8dbf020b76cce5c3c43d3fe0467cedf5441918767163712e0ad178c9cba80d
 DIST botocore-1.17.49.tar.gz 6765351 BLAKE2B c5c40c37d1f1f0f1d7e059a1b88025039be6021723d244725de28d453789a51b19c4feed35d7c862a8238e5d2b4d77fb83f0b0052ce7a7b31c26e024b7be4321 SHA512 912a25c98fa08a89aa8511f00a83712525eaa11a1c8137da3e569a993c54d2c2a3c9566ff88f91cede34dc1d1b155f21ac037f2396b3b3339ddc2c2be7c400d1
 DIST botocore-1.17.52.tar.gz 6778122 BLAKE2B 4afb88a7990ca4cd04f113a75f00dcc26569102a3a3b8ad991073577178a86b56b607888ed8d70569affb03fc77d3f89060a1a34059dd33a457eff4f3c31eb5e SHA512 97de510725dcc2db9c57d7e9415f5c22fc30a2737c3785ffc32e53a56cb542dec06468b3a06bf03ae0ae2eb913628b68ca104b1e8f211e5c580606422e5f3267
+DIST botocore-1.17.55.tar.gz 6781012 BLAKE2B d9dac6d32ae6226bf80c79651f0d56c1b916a9e4b696c99c2921aae9759ff2c86df1f4682902ff4313d018c6514e24718228cd13219cdbd784b828faf3a8fc10 SHA512 941e773932db1a9fddf8476485c9b979803596a02017fa44c88667e833acd0b84fe8a2f9211c7791a20f08e947d93354bb995f03d915543ab5d24ebad683cbaf
diff --git a/dev-python/botocore/botocore-1.17.55.ebuild b/dev-python/botocore/botocore-1.17.55.ebuild
new file mode 100644
index 000000000000..b111030cd3da
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.55.ebuild
@@ -0,0 +1,62 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 83ea55b58d67..56e317afe09f 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -2,3 +2,4 @@ DIST cmd2-1.2.1.tar.gz 623518 BLAKE2B 69aebdb6350c453001b6101988d9b0d3d96ca7970c
 DIST cmd2-1.3.4.tar.gz 641801 BLAKE2B 0d85cad11613aec5d58d9130f4edb46b038abe3ba02aa84570cb5c34100d02f7b5d0fa92cbc49a71d3be19b15f5b380e42d4eac28a609fac4f1e9d0c8b85fc34 SHA512 a8fcb7448e5afde392921ad15c0848c3396b91922f10fcee925721860ee74f678fbf43d334091e201b9e6612e4d70825762a03a870f2e4aa1f82a43b37c5800c
 DIST cmd2-1.3.5.tar.gz 642337 BLAKE2B 85003cbe6161b280421ef05280171d4c76092240b6b060651be58dd7ca25562ef5666760d5261bd6e94d76598b24861eb1986ec8046813f698d2d789682b2b1d SHA512 39d0142eaf238005787786e2033187d512073872a032d5bd973f81ef07cbc43a660c2c0c44175115ba25892aba9407789c21864ad19ea2ff287a44f37da6929b
 DIST cmd2-1.3.8.tar.gz 643320 BLAKE2B ca9eb089c4d1a5922d3f762e9fe118168349c807b770265d2e565a183447b938f08da578e0dc7de4a59a52fc39df2b53a63c84c1d86efd75c0ba58950bbe9a9a SHA512 af2b56234e0b257c4de564d46f4be83b56c37fd903ee737e825779558e44a9b60164bac1c0bc35a79c8aa1ba80155331c496c310e5ecad94f984673a30ef6976
+DIST cmd2-1.3.9.tar.gz 652521 BLAKE2B 709ccbf6e9f7aefb0c746e3e2e1880de649f8aa7cfd6165f0f18117af8f8001b0caca86eed4e8ec8748367bea7bc06032462606affbb7defeeb0e96e8c6d99c0 SHA512 82c5153c2edf688ac964f407170e646c7066c309bb05cd42cacfb5b873bc4b0301341352699f10862e4c6744a37b87df5ac96478096ad80c03e89203d3dfe13a
diff --git a/dev-python/cmd2/cmd2-1.3.9.ebuild b/dev-python/cmd2/cmd2-1.3.9.ebuild
new file mode 100644
index 000000000000..557a79fa9c87
--- /dev/null
+++ b/dev-python/cmd2/cmd2-1.3.9.ebuild
@@ -0,0 +1,48 @@
+# 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 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:test_which_editor_good:_&:' tests/test_cmd2.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 648c98ab3d68..ee39fd3cfc11 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,3 +1,4 @@
 DIST elementpath-1.4.6.tar.gz 121815 BLAKE2B 09014fc503c8a3a6a6865572fa48c515af19fc009512369d8e761ca5b4e516de1add7eb14c0681114331c4a8ef08cccb5fac8f4ce2b436523780cb4e41e2dc00 SHA512 ac1d7fc0ab07f22fa02550ac77f4067b5564f78619bf98d6fda257751d6404684622580002d69beb769fc471500ee0c08f6095b05ddc6b7d81276dc8e158c40b
 DIST elementpath-2.0.0.tar.gz 149239 BLAKE2B 6963429ee127ef2a293da6706e6d1bc13be4d864d7da3d7169dd81d0a430156684f0977076182ec7aff7622940dbc341b84fab3eb488bbe6470476c4d30b6d4a SHA512 bb29c9cf30e9a414f9ddc7e29d3ae09af74302ed9c0bb98332b4fe01bab2e043cd5adb59b20a0730218d79b9f2ae42e9f2ad3ed7e4d0ae8ffde1800c96ee00a9
 DIST elementpath-2.0.1.tar.gz 186127 BLAKE2B db2e566e3032881d9db57d3951371dd4321baf3c3246a1a882c8a1ee9dafee2c2e4c2e8bb35cea7452ed51779a91c85976847cb46f18c1c6683c7c501961b2ed SHA512 77bf895c9d509dec57dd9770ebddf8ad58eca4aaee46c3372fead2d0a5109ff27e183d29a5bd5ef1a2ad203c6c64387b11b8bc0b2e96786843d24faadc3274ad
+DIST elementpath-2.0.2.tar.gz 189956 BLAKE2B 7d7b612a1271b322eef504952bc6fb5089bdafa3276745668c156229b66c80b8fb8070de56c84988af22ee3586a5b420481bd9141b598d436525ac2a78d25f5e SHA512 eeb4876525ab06857e30cd04e234a66c7396e6aea48a6bfdd158354591fd8b7e8fcb65cbcafd73c274a5590d8fe1844a62e1d86baae4d55dbf7545e8377d49d1
diff --git a/dev-python/elementpath/elementpath-2.0.2.ebuild b/dev-python/elementpath/elementpath-2.0.2.ebuild
new file mode 100644
index 000000000000..063ecddcd3b2
--- /dev/null
+++ b/dev-python/elementpath/elementpath-2.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-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 )
+inherit distutils-r1
+
+DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+HOMEPAGE="https://github.com/sissaschool/elementpath
+	https://pypi.org/project/elementpath/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/flask-security/flask-security-3.4.3.ebuild b/dev-python/flask-security/flask-security-3.4.3.ebuild
index ddd91469e280..8aea974e5161 100644
--- a/dev-python/flask-security/flask-security-3.4.3.ebuild
+++ b/dev-python/flask-security/flask-security-3.4.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cachetools[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 0511e73ca580..4bb1b0a35935 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -8,3 +8,4 @@ DIST hypothesis-python-5.29.0.tar.gz 9070261 BLAKE2B 38781893d6fdf68deae890a150c
 DIST hypothesis-python-5.29.3.tar.gz 9070885 BLAKE2B 6e106fbc6ed6719c787083c85e3047c49af94478148f4038b59d4ae130b272cffa86a2c117fd2a4f6a798255aa33b0f4714ec08baaf8fb1d5f1d0fb8d4de336a SHA512 fb820057ec257d4dd749f0c6caf10bdcc1e3a090c788900f159456620bec6bd2130e9ffad0ced0155a9f97e2186ed397fa72dbd5548b132ac2c129735c1e716d
 DIST hypothesis-python-5.29.4.tar.gz 9071060 BLAKE2B 0668f3c7859fae7024c15f693b1f56ce8d02d6f3b8187d24b2d84e38e7bdb73c0824d2b02cfecc6b40bdfbbb1c91c0aa83d40848c499a97ab7e9223aaa6c78d4 SHA512 9da4b487fd3c56540a20e2fbff635704f0720f422d8a398d0accd24a1fb9517476b0d29135b9113a96e8dc98fcfc31cc53215ad82cb727be54e4e77b44d4c8e4
 DIST hypothesis-python-5.30.0.tar.gz 9071239 BLAKE2B 7d46bc588d35bee187d9c19fafb41b290edb0e4b40022bfcdf502f96631aca7afe3beb6c4f27df27784ab1ef9903df7747284253906140835429e62b19eb1904 SHA512 03423b48aee71eceb84d838433351b48abf041ed1a9b617ea3e0059e8046f1cafd327e4ed4ec65c7893340602ea7d21572b3a8bbd059b27e1d0c9b867a6938b0
+DIST hypothesis-python-5.30.1.tar.gz 9074506 BLAKE2B 00ee6b7244e9bb41d019234838090801f35d57e3ed0d8b1ef454d721841b1ee7833232e001b7ac1d27a9a36d727459ec1581e1f7486e57219eb23065f128254b SHA512 c81caad3e6ee28a9045947e441b28a401ae859b4f16fbfbcdf31b0b83ee30386e3f2c372ed848b14d17b1981b4a0b222b75556bd98950458d14a3cfe0d1075a9
diff --git a/dev-python/hypothesis/hypothesis-5.30.1.ebuild b/dev-python/hypothesis/hypothesis-5.30.1.ebuild
new file mode 100644
index 000000000000..bd78daca5ed4
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.30.1.ebuild
@@ -0,0 +1,63 @@
+# 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} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils multiprocessing
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{6..9})
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/pony/pony-0.7.13.ebuild b/dev-python/pony/pony-0.7.13.ebuild
index 2e485d8dbb50..0ca73342d499 100644
--- a/dev-python/pony/pony-0.7.13.ebuild
+++ b/dev-python/pony/pony-0.7.13.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
new file mode 100644
index 000000000000..af8b1dec4dd4
--- /dev/null
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -0,0 +1 @@
+DIST pytest-salt-factories-0.92.0.tar.gz 112049 BLAKE2B 054ec70df87bb1c1ccd4217ddf66b1efa1329d95c72cc40a633b5516afbe5bc80b4210560438e039def40a5c4aec3730a36f83c7911fd3a12a7bd5d33d388986 SHA512 308a446c870528437967eb5b3167861818311683dd9c4f55af8aa1766cde29ab438e5bf0ba922933d893f1a5469af4b827c422e59adb12cb2b422302550dfdd5
diff --git a/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.92.0-setup.patch b/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.92.0-setup.patch
new file mode 100644
index 000000000000..d8d1a915a789
--- /dev/null
+++ b/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.92.0-setup.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index d7cab46..1321f06 100644
+--- a/setup.py
++++ b/setup.py
+@@ -51,7 +51,7 @@ setup(
+     url="https://github.com/saltstack/pytest-salt-factories",
+     description="Pytest Salt Plugin",
+     long_description=read("README.rst"),
+-    packages=find_packages(),
++    packages=find_packages(exclude=['tests', 'tests.*']),
+     cmdclass=versioneer.get_cmdclass(),
+     install_requires=parse_requirements(),
+     extras_require={"docker": ["docker"], "salt": ["salt>=3000.1"]},
diff --git a/dev-python/pytest-salt-factories/metadata.xml b/dev-python/pytest-salt-factories/metadata.xml
new file mode 100644
index 000000000000..a2d4a9d82a81
--- /dev/null
+++ b/dev-python/pytest-salt-factories/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="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-0.92.0.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-0.92.0.ebuild
new file mode 100644
index 000000000000..ccdae42d3b19
--- /dev/null
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-0.92.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 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="The new generation of the pytest-salt Plugin"
+HOMEPAGE="https://github.com/saltstack/pytest-salt-factories"
+SRC_URI="https://github.com/saltstack/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pytest-4.6.6[${PYTHON_USEDEP}]
+	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? ( >=app-admin/salt-3000.0[${PYTHON_USEDEP}] )
+"
+
+# pytest just bombs
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/pytest-salt-factories-0.92.0-setup.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 5b892325ced7..200fac40e72c 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,2 +1,3 @@
 DIST qtconsole-4.7.5.tar.gz 424850 BLAKE2B e2d2ba50ce57b13504bdf8ad1ee3374b76abc980f0b74dfe1177c3f066ba24382bc51f8d3db2614a8d74b198ed20f01fac67c288602ae6e31fe90165e63ab9e9 SHA512 ee57ad2de5b840ee4e7f439be08a3c82fd39ef1bf6113b7eda95fa1aabd132c799ff584a2ac7f7e2c89df4bcd9a9409bbaeee108a6bb49e6197d2e3395336ad7
 DIST qtconsole-4.7.6.tar.gz 424919 BLAKE2B d973b3b94dfad1b38603695e22927bcdcb8a4f2db9f4a638d5fe6a83c24061153dbaa36c26e632708953af32a015af1d40ecbf175dd5314a3b954b15a6625cc0 SHA512 e4e12eb90533e922786b5b6517fba5d9c4dfedf00547f1403c8cd65fb464f5c1a13517df69924e4428e9a8a811dfc359a7768fbaa90adbe02d79cba9a5aa852e
+DIST qtconsole-4.7.7.tar.gz 425068 BLAKE2B 61fa3bede2d531e294e8a272287885ffeff095bca8b998b2a28fd3f4d912b20aa30807fe7d4caf15f8594e7820e037b3c9955ad76e9dd5eb1da2cbe00ca9a941 SHA512 1f04d54138f37b32c112db2cbbc8f79dc16b13bf5dffcc3dd872d43d48ef9ed5454d660e4fab08ccd71344153de391d91558edd0f71a2b626da47779f0f0bb53
diff --git a/dev-python/qtconsole/qtconsole-4.7.7.ebuild b/dev-python/qtconsole/qtconsole-4.7.7.ebuild
new file mode 100644
index 000000000000..1a9c10d1922e
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-4.7.7.ebuild
@@ -0,0 +1,46 @@
+# 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(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
+"
+BDEPEND="
+	test? (
+		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
+	)
+"
+# required by removed tests:
+#		dev-python/pytest-qt[${PYTHON_USEDEP}]
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO: these tests require virtx; however, running under virtx
+	# causes pytest to segv on exit (even though tests pass)
+	rm qtconsole/tests/test_00_console_widget.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/redis-py/metadata.xml b/dev-python/redis-py/metadata.xml
index f76f11741ffb..4e32cef72eb3 100644
--- a/dev-python/redis-py/metadata.xml
+++ b/dev-python/redis-py/metadata.xml
@@ -14,5 +14,6 @@
     <remote-id type="pypi">redis</remote-id>
     <remote-id type="github">andymccurdy/redis-py</remote-id>
   </upstream>
+  <stabilize-allarches/>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/redis-py/redis-py-3.5.3.ebuild b/dev-python/redis-py/redis-py-3.5.3.ebuild
index e728852a8d57..fc00044d098c 100644
--- a/dev-python/redis-py/redis-py-3.5.3.ebuild
+++ b/dev-python/redis-py/redis-py-3.5.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rq/metadata.xml b/dev-python/rq/metadata.xml
index cdf89d81a84f..7c240ef7f51a 100644
--- a/dev-python/rq/metadata.xml
+++ b/dev-python/rq/metadata.xml
@@ -16,5 +16,6 @@
 		<remote-id type="github">rq/rq</remote-id>
 		<remote-id type="pypi">rq</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/rq/rq-1.5.0.ebuild b/dev-python/rq/rq-1.5.0.ebuild
index 1789b99173ea..bf64010f33eb 100644
--- a/dev-python/rq/rq-1.5.0.ebuild
+++ b/dev-python/rq/rq-1.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index a155b46f675d..4795bf4eddde 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1 +1,2 @@
 DIST ruamel.yaml-0.16.10.tar.gz 147033 BLAKE2B 35e5b0a1bd5a42ee539e66309dbca64bccd9570da427631d230c77d9cc09dc28637abb787c441b4fe8f8f17d9b6b313607887ce79eb631ce8b265cc18570e8fd SHA512 f124575a5054f993d5826d03aa7a9500a1084c5201be1517be36e587bfc60ea4d13b29dbdb3e62bfbd309fe9992590fd0a5028a43f0fd26a5a5cbc9f3dcf423b
+DIST ruamel.yaml-0.16.11.tar.gz 147379 BLAKE2B 777b880a425111b3331008ee8cd9c6555b1a8f22057aab67f3e94289ec89ddd51036d1e1a3302fa5ead4d5a2b061074d1c82375673a3657ef4ec58675d5dbb77 SHA512 84cbabf4dada27bd4088dde17ddd8397b7ac7c75c18775fa76a42894de1573829ed1aa9ec1f5d510ff040a2e1f007293e4873ed7efc066d51edc29a4dc4a4153
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.11.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.11.ebuild
new file mode 100644
index 000000000000..9a2e90a7671b
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.11.ebuild
@@ -0,0 +1,29 @@
+# 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 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml/ https://sourceforge.net/p/ruamel-yaml"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+
+RDEPEND="dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_P}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sentry-sdk/metadata.xml b/dev-python/sentry-sdk/metadata.xml
index 45b73c6ce908..6aa3e740df54 100644
--- a/dev-python/sentry-sdk/metadata.xml
+++ b/dev-python/sentry-sdk/metadata.xml
@@ -12,5 +12,6 @@
 	<upstream>
 		<remote-id type="pypi">sentry-sdk</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild
index 73e3d36da371..61141dcf4743 100644
--- a/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/sentry-python-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index ae116aa5a277..c8cac70defc8 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,2 +1,3 @@
 DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
 DIST setuptools-49.6.0.zip 2188590 BLAKE2B b789386d31c0d5cbc0c899d24e9af35baad371b698b488ed46b768e8831bae7245b391971e1e402799bc555475c1d8b78bd59a224c26bc78ba68b122a06e0154 SHA512 aad6e74b0e276da0f79c9429860a6d1c7860a30e9a02ce55527abbe7671366640423a1e5476da9ecadfc62ae1bf803cb0c664e2a09cf7619a9c8ac3965b9cf31
+DIST setuptools-50.1.0.zip 2168599 BLAKE2B ebfedb9607dd45f638b689ad73714575a584b112b55f9764d2e72333ded7b9170878b76bc92465fdc4ff60a9ff830c9994efc7d1f0195fd5bf8b50c87e7f8fb4 SHA512 b5b0fa45bf87d567847b0a5275cc06f3847f53282832b8b5a0084412c16f558a9db9b8084e27a34b0e99081275bc714acd494731dd487f5850b7ad59257e5cfc
diff --git a/dev-python/setuptools/setuptools-50.1.0.ebuild b/dev-python/setuptools/setuptools-50.1.0.ebuild
new file mode 100644
index 000000000000..48c25396dd75
--- /dev/null
+++ b/dev-python/setuptools/setuptools-50.1.0.ebuild
@@ -0,0 +1,72 @@
+# 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} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+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="
+	app-arch/unzip
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	# xpass-es for me on py3
+	#sed -e '/xfail.*710/s:(:(six.PY2, :' \
+	#	-i setuptools/tests/test_archive_util.py || die
+
+	# avoid pointless dep on flake8
+	sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
+
+	# disable the code disabling non-existing coverage plugin
+	sed -i -e 's:cov = .*:return:' conftest.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index dc6a0694b74f..52b4107fddaa 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,2 +1,3 @@
 DIST traitlets-4.3.3.tar.gz 89838 BLAKE2B 04b50fabdc312c427f0cff6d4e8be0a5afcafe6d5a7a5804fb37e6f92b867e6a9c6401c23b7cdd7b0a6372eadaf3e8350018db5d21c5cbc546390138932a2820 SHA512 a7ae0276e5234d6d428908e1ec74c0b92f2b1b73e37402ad154151c41ef6e4aaaad53e8990d4233d8023c31d919e4ea66f100a82324abcb0e6ffb92283fd3c9e
 DIST traitlets-5.0.2.tar.gz 120788 BLAKE2B 9cb4f7527f97329cefba2b4a581e9208dfeb80fa87d4950373da5b57193179dc94384631eae473c08c23e6631cdcddebcbff991fc2f36dd07eead53b09800c0b SHA512 f92ef784b213b7e29830a4948a6d1bd7eecc928b45ab1fa393e4da85f4603f2236bf27f7f6659f0778fec51f9d82a18cb0fdf5a283fd6edd5de21aec7e5b2579
+DIST traitlets-5.0.3.tar.gz 120885 BLAKE2B 53dfcddf8be609b1150c422f350aabda7056531055dd34c31bae9ee46aa6d16c9f269cfaf3c88c38cdf8e7f23bbb4a8933af3bfc8eeb869749070017fe005307 SHA512 c464fce509601d5ad71d9287f8c21f9386a1b826b141d45f605113c78aca06cd1f6d0adbd80b34dee41b9b8b64d7a020f1ecaeeb633231b1972c6a58aedd6824
diff --git a/dev-python/traitlets/traitlets-5.0.3.ebuild b/dev-python/traitlets/traitlets-5.0.3.ebuild
new file mode 100644
index 000000000000..075423d0bfec
--- /dev/null
+++ b/dev-python/traitlets/traitlets-5.0.3.ebuild
@@ -0,0 +1,24 @@
+# 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 configuration system for Python applications"
+HOMEPAGE="https://github.com/ipython/traitlets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	"
+
+distutils_enable_sphinx docs \
+	dev-python/ipython_genutils
+distutils_enable_tests pytest
diff --git a/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild b/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
index d218b552f991..0310b3b24f90 100644
--- a/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
+++ b/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
@@ -16,6 +16,6 @@ S=${WORKDIR}/zxcvbn-python-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest