Updating liguros repo

59 files changed, 387 insertions, 613 deletions

diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index c03190ff1eb6..537e6111c12c 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,2 +1 @@
 DIST absl-py-0.10.0.tar.gz 234053 BLAKE2B c7d85d7b351ec5d67ac5e98d5103b91ee7b91d3e01b15fff86ead2e177ba596719af8668f2ec1dd81b278557d902a90705803f5bd6aa7576b302641129eed050 SHA512 92862cc7997f469d7121746d1a8f8fcf99a4983eb033dc936e2ef22bcab896950a5e2bd8ce7fe6660b761cc16a39145104a7e2ba3588f38cde1964505d0265c3
-DIST absl-py-0.8.1.tar.gz 220234 BLAKE2B 5ce5bc83bf456794f1e38a00ac7c52397e262c8d69e35248b008a5f682fdd8d1cfc33fc5313783644a6baa0be7f32660c4eb2b0e72d86259f40abbfbc1eb868b SHA512 84f751dde2bf725e08adfb8bd34e3d43a13bf557d2c2e3b3fc98ec4fca78c8a17a714cd7804cdeae86dbf758c5021d1d92c688df25f7eb83e633c312303efd36
diff --git a/dev-python/absl-py/absl-py-0.10.0.ebuild b/dev-python/absl-py/absl-py-0.10.0.ebuild
index 967b71450030..8a5662f2e7bb 100644
--- a/dev-python/absl-py/absl-py-0.10.0.ebuild
+++ b/dev-python/absl-py/absl-py-0.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/abseil/abseil-py/archive/pypi-v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/absl-py/absl-py-0.8.1.ebuild b/dev-python/absl-py/absl-py-0.8.1.ebuild
deleted file mode 100644
index 8a5662f2e7bb..000000000000
--- a/dev-python/absl-py/absl-py-0.8.1.ebuild
+++ /dev/null
@@ -1,22 +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="Abseil Python Common Libraries"
-HOMEPAGE="https://github.com/abseil/abseil-py"
-SRC_URI="https://github.com/abseil/abseil-py/archive/pypi-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/abseil-py-pypi-v${PV}"
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 7213c1eeb527..aa73c7e8653c 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,2 +1,3 @@
 DIST arrow-0.15.8.tar.gz 92220 BLAKE2B 8650d31b5b75c6222d86b5e13f253ae6baff66e91044a74235eda4589a47ebf680b31e2007fb13c83287402ffeaa446437aace9124637e6952ef139388aa51fa SHA512 93d161cbeb48636f2e3f91ebcc51cddbb3b21175ae31f5d9251a22358c7d1934663a8e47a82efd8773bf30c28efefcd8d2a3baf581fe191777cd41f12f29d4d2
 DIST arrow-0.16.0.tar.gz 94403 BLAKE2B 9d2ad18732cce5bafdb628a2e9b825e6d1ebd94f7848391c0a0752a802a7e2e8a34afe0da7474df0265c4a83016530a1c070f4f1629c8fee8172812a53a3a7af SHA512 e48316bd31a86d640e50987010bd56c6859e972522e753c00d83730f1ce4764716eb9a22c4aa9aa0d64949f25acb7e1a3479ce0e1c62058fcb887a442f2247d6
+DIST arrow-0.17.0.tar.gz 97411 BLAKE2B d908f9e98b4046aa8afbde992e108106e0cb81d5d37a556ace06585b7d354fa75338e5c4e4263ece0d8d043f29f3909e3c200b2c79c744a4bd13319764667998 SHA512 30ab01c66ef1dfb7fb35dc8609ca19039fa3e37638ff0df681d0ffc9dbc832e9d3a577d9a45fc70ff3e74aacb6198b37e61ada22854572c57c27d7ecbef09caa
diff --git a/dev-python/arrow/arrow-0.17.0.ebuild b/dev-python/arrow/arrow-0.17.0.ebuild
new file mode 100644
index 000000000000..c5fd310a4d29
--- /dev/null
+++ b/dev-python/arrow/arrow-0.17.0.ebuild
@@ -0,0 +1,32 @@
+# 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="Better dates and times for Python"
+HOMEPAGE="https://github.com/crsmithdev/arrow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' tox.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index b054b18ed5f3..867daa3743b1 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -6,6 +6,7 @@ DIST boto3-1.15.1.tar.gz 335146 BLAKE2B d2d008dcb2059b120f142aaf588264122d1e84b4
 DIST boto3-1.15.10.tar.gz 336021 BLAKE2B 71a8bcfd115c0066931e616d1d3678d51ba09460b3c36bf83d838cb0708a7f06afab8b94757a52c055cee51bfbaf1044b086621da16fd6e367cf728aec9080af SHA512 79c12baf5aebb8f2e7048d9713cbb73f2fd100ba8aaabc740757c1bab30e5626fde57b1553ed365dc65b0094513b5a6f305607ce48d62ecd8d5df183ee3db412
 DIST boto3-1.15.11.tar.gz 336108 BLAKE2B 9fdc00c194698c047ba7e42dbe8eedd3952fdb65f089deffa1ddb3468102c24b12cd000ed50793dbe2df492e93d12fa697b6541bddda917be80899a65fb2185a SHA512 4fbd08f5479de86aa95463c4d8c23e7d5a3af05effa752214968b9ea9ea652ce74b727206140eac46bc096f5e013a99223ce0820972872b24fcb447a6c28a806
 DIST boto3-1.15.12.tar.gz 336150 BLAKE2B c6817e39fb19cd40f7cdcf6140303bd1993ec115e4ed9d0379d3fb05d31115abb964df86d5532cf3325a313957006565718945c2b07fb482d241e45a61659134 SHA512 a12cbfdd7664263ce1a2cba40d13b8a1b82fda9acf113c547e660adba46c31f382cce018ebc47686d5c65763ba5507757504ef00a4c5f2f12d3ff161b5badb14
+DIST boto3-1.15.13.tar.gz 336233 BLAKE2B d82c38c4021c4f76ba5aa37c2b6328cd4870c3d64b343d2ccf4d441c231243ff369d91ec56b45380ca19b1b35a3934c548bca41a61832a7ca519e4119911c383 SHA512 5e50a212f1b47c79e75d3f2dc6ace0984c82041c11a8c87c831cf3ed2452234089b3f91be05af5342893ae377ad3e119e5e2b5f329cf200a877a46f418b55cc1
 DIST boto3-1.15.2.tar.gz 335231 BLAKE2B f1eb144da7afc1cf630cdc1f61880d094186a37d46556ae361da278fd3045a119dcb09c3d08387a019ca88d6502fa8710a5e5733cd9dc9056676ef17853d76e2 SHA512 6866e0d6a50d11495e5f2a33a392b0edbe1ff6625235b26b5d6028f7c2c7089d78febe17b982f65dc2564254800a23409247ac09716b099f09f3751c5b7f47b5
 DIST boto3-1.15.3.tar.gz 335286 BLAKE2B 05c9ef757b8d227ae06a22e78d978821ff50da719f122ac025940b2e1ac5728d6bac044d4bfab95c56ac8c363efd7abfe3de2b3fd65d423ab53dbdfc60b910da SHA512 dfecfc075896ce84fd58d0437b84a6a794af69ff3e598b35b43f83b2b5ef57b88f96ef62a0d6505d5fe7fef0401513c8ecf0dfcaa22e4575510acd3ece191901
 DIST boto3-1.15.4.tar.gz 335401 BLAKE2B 42ee1f2cf1e82338ea59a40b95aa5c76abae51aacf325ae845f407ccbc3caf1b3901bca48036889ad6307f96c257259cce39784a3f52ec6ff03c0c6c5633c654 SHA512 14626faa3943b65a215b8f1bce24f217e69421cdfd40caaf7de0fec13ca9b5b25c5e290c27672b2a6bc41316917224209110e2efd5be817de7273f93ae5764ce
diff --git a/dev-python/boto3/boto3-1.15.13.ebuild b/dev-python/boto3/boto3-1.15.13.ebuild
new file mode 100644
index 000000000000..12584b2fba42
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.13.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 1b5a73715f6f..f59c49fa93c0 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -6,6 +6,7 @@ DIST botocore-1.18.1.tar.gz 6839699 BLAKE2B 188c5a05345fc7c4d4c05b3a8d9b675b5c21
 DIST botocore-1.18.10.tar.gz 6899351 BLAKE2B 4de11277fd8df8436818cd50d946e7e53191fb698a3d7bab034112445e8d66aec74dc17ed6c93bce636f29f3e455d2b08cdc56bec3a3e794d9e12e7fd5e0ccee SHA512 4a9ceaf2a0380c804b066d4c13703d4cae598c87c1f7f14b3e967a79cf829ad2e5aac39e5182db3bfff93c3289ab60571774710eee7e4ba544e20b37feb7fcc3
 DIST botocore-1.18.11.tar.gz 6903038 BLAKE2B 07115ca9106997f9185fe84ef0ce8dd415e7d3c00cddddf28302cd97ecc9a13161de3285f1a959998feb4ff3f8643d056f7ac511edfebe71d6e3267c04e3f34e SHA512 bfd6cc012df3599889979bb1771f6c37b35eec9c5b0c909ab13593764839292b044edfc9557a351e4b380b398fba2e1b169c4e7ad1b12acec07eb45efd853ace
 DIST botocore-1.18.12.tar.gz 6913367 BLAKE2B 243b30d32e229d72d659ebf2b27b57a69042f488c8ca43e00f82e6b64e2c09665e129894b972ce806ea0bd0a89a295d0545d1d53e0cd3246d2dafcdb2e43f56c SHA512 173e5b3ed7de93362ea69e581b236b551dfeec7f8a57652ca04347f334e5163f5adf52acd20a2aef0cfe20f157d0a5b13f09ca4c92bf603f6a3f22d517cf6306
+DIST botocore-1.18.13.tar.gz 6919052 BLAKE2B 52ef86c31e0b92221058ad2eb43eafe2953c59d1ed21d033f855961b409f43a77cfd72cce297b9752e230cb9953ed55febd3b0bdf44c99733472868b7e3db8dc SHA512 b3cf534d679533e43dee05d6c6e89271b88bd11185abf3790effe8df3b698e1d79a96d3d23b51f943861f975a3c883d9318e085b8ceda8d9dc454f6f0c50b9e7
 DIST botocore-1.18.2.tar.gz 6843154 BLAKE2B 77f4cbccd6a686cfbdb2f25fafb9f2210c0e23de72fb40403f905711ec5d073b92cfd003d39406d273feb0bfb90e2ab594f2bb9c1564b5b0879efdf3bcfa47e3 SHA512 f4fec4caf3b4ebca8a593d58827fb4377c2458b7ebccb53ccd830df5423a2021ecebd534d2fe276662f8d8e91078bb5adbf611a52baa29c8ab3526d9c7b975ac
 DIST botocore-1.18.3.tar.gz 6846755 BLAKE2B 3f6709cac832dff1ba07c2e8b4c235b5bcdf305c9851eedea2ce5f7847d0be93d7e9cbcb1765add47aaec1d0c1c31cdd2c88542a984af570140ffb7fe30d8388 SHA512 a8831b1549a768cea9d550dc2dc3c1c8afc03e018d2ce246569bed35cb9ce25bcb18689d066dc5b6e6dcc69db93e0b0957b32cb68c101127e01cfe3fbfa9fe08
 DIST botocore-1.18.4.tar.gz 6850892 BLAKE2B 013319b1055db5a65f25b4d11c0ae97e6eb58a8976eafea98c80a33c756b8715d69fddb86c900e9c3c1a6447d05a7afd2f11a155db5f6cbcefc5f80fccbf680c SHA512 c84b7c5dcb78101d6d04bea2a4453e2c47711133bf4ee1e96c6bea18a0b3de7c41021bfe5ac501eeb2b35d50bfe8782ee29d931adf79ae77a45a2f3b117716df
diff --git a/dev-python/botocore/botocore-1.18.13.ebuild b/dev-python/botocore/botocore-1.18.13.ebuild
new file mode 100644
index 000000000000..12940d28a2af
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.13.ebuild
@@ -0,0 +1,59 @@
+# 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/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"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || 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/cbor2/cbor2-5.1.2.ebuild b/dev-python/cbor2/cbor2-5.1.2.ebuild
index b67c21438f27..b1cec2c864cb 100644
--- a/dev-python/cbor2/cbor2-5.1.2.ebuild
+++ b/dev-python/cbor2/cbor2-5.1.2.ebuild
@@ -15,7 +15,7 @@ RESTRICT="!test? ( test )"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~x86"
+KEYWORDS="~amd64 arm arm64 x86"
 
 DEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 6ae521128a7e..3a7d24071751 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -3,3 +3,4 @@ DIST cfn-python-lint-0.35.1.tar.gz 4501826 BLAKE2B 84da0965fc198ce7b8f955a7d43f9
 DIST cfn-python-lint-0.36.0.tar.gz 4879599 BLAKE2B a79a12290e20f4db1e45b29df0486d3b69f3c028f35cae8e8ba9ab5da191c1a5f7fed6bc339d24e3212faab7a05a82e859a79135847eb90b0161fe0aa7b8c995 SHA512 286c8e614ee083981105a74f09b4c75454ae6eef48812ac59852374bea5dfc0d111b006bb67c50e42fa2a1eeb54ce6f25b8bf0f06624da236344e9bbadf4ce1c
 DIST cfn-python-lint-0.36.1.tar.gz 4963743 BLAKE2B 31efc227bf2b5aafff0365d0ca949e4007684dd896e6e8a75afb692a260e05f6b134b9cc822855c99edec7398a1cdd767a71557ef7178ff9054c4e737a5a5ec5 SHA512 4682b7a010875df2322856e9a01aa547fcce171c5bb7531ee35d92bcf0cfc523f78b4180fcc6a6c4a1460d5b517e834ce0e0026fa6c2f6afb9ebf3b3c46434bd
 DIST cfn-python-lint-0.37.0.tar.gz 4990073 BLAKE2B 447e7685f5ae7d4a610512729d2ecda48f4838f2b2f22ae80cdfef53d52cd929953014f2f2779ca7d340ed88287bf6b4f221e3be3b69b10335fb6716104f44ca SHA512 4ef0763c0995baf196098aa1499b22400cf5fd44f1f519d391314c6e199091a22b2179d1b1cabae6cddc27a85673c294fc65c02b92d864a9546ceb5c42264590
+DIST cfn-python-lint-0.37.1.tar.gz 5005775 BLAKE2B f393f4b871a8782e81f71a1a2d011d5d59dee287fa305d1b6c82ac366e7975e5ff02ce96949501ed883c2b86cc6547d148d19d5153bf1b77a675a1b8c33ba96d SHA512 8e2d3419142527431835f935f96bea972057eb471894ddc2b3867ce3cbe490d540fe9b1490b79c84042eba8e5f997cab1aae5aff862aaefeda38351babb04a2f
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.37.1.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.37.1.ebuild
new file mode 100644
index 000000000000..17c526935121
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.37.1.ebuild
@@ -0,0 +1,45 @@
+# 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="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" -m unittest discover -v ||
+		die "tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 8c69544daeeb..b1053896a62f 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,2 +1 @@
-DIST cloudpickle-1.5.0.tar.gz 50992 BLAKE2B 8536362d455c5688134ce22d0bb2c5786da17336c8a907e8cf9e39833df03a6061ac901e45e85907a54e8d9b404f21132d4d944adf925a9056f0334eaca50904 SHA512 75356e3e5ade2ee5941b4cea576f1ffbab5d9b1a86eff23dc9275974f592c947d0b3b29d335b4dc38be16e36c89c8fc65b2883ae90923960e605502c777d9816
 DIST cloudpickle-1.6.0.tar.gz 52743 BLAKE2B 9007ebd4464adc0cb203e596cb756176d17ede5cfb90d172e11630df3e0a93dba471d8b20aaf750701cbbf1fdfb4a5faf24a75f8df82aecb4b77bd62c8979027 SHA512 3b663a013d1512b732b13f38bdf2d5d89704a73577c9fee2a6e808882d42ecc1bdb3589b1cc61279ec621b6dac27d8e223b2fd839442e2d5994892f04d015535
diff --git a/dev-python/cloudpickle/cloudpickle-1.5.0.ebuild b/dev-python/cloudpickle/cloudpickle-1.5.0.ebuild
deleted file mode 100644
index 970201f85c92..000000000000
--- a/dev-python/cloudpickle/cloudpickle-1.5.0.ebuild
+++ /dev/null
@@ -1,31 +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="Extended pickling support for Python objects"
-HOMEPAGE="
-	https://pypi.org/project/cloudpickle/
-	https://github.com/cloudpipe/cloudpickle/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH=${PYTHONPATH}:tests/cloudpickle_testpkg
-	# -s unbreaks some tests
-	# https://github.com/cloudpipe/cloudpickle/issues/252
-	pytest -svv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild b/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild
index 95a39c24a351..970201f85c92 100644
--- a/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 36b1274a546b..07fcbb9f6a86 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,6 +1,6 @@
-DIST dask-2.23.0.tar.gz 2840133 BLAKE2B 2fe8e4007acf2bbd8bfab889e4d912a15518318dc019573ce6deb7f3a64504608e1e27c3bd9c6766dd98a071ed075065da9beda3f2e5fef27c7bfc9918516d0a SHA512 6ce0f1471357cfa4f5c7f2e2ab31009e68d3e5de363569867d67038ae2e1a9c69552797fb232fb92deafc3b57aa040df9e60669c1856cbb53505a905c4f4b052
 DIST dask-2.25.0.tar.gz 2842089 BLAKE2B 048a116a60dd98c7c1f3800426af13c2d8d116772a6b3133823b9a78ae6fcd34ab32dbfb9ae8db9eb6c948bce381e5d6e91caaab78203ae56159493ed7689038 SHA512 0d6e8e8c1efbaa4dc77e1a505e5c2df45eefc43868ce923ec674c5f768f12beb30e06c8712f621e44a826fc11f86fd50e60f0f6a78e261d74273f73b49503301
 DIST dask-2.26.0.tar.gz 2852574 BLAKE2B 66abba9ef32bee11249557e38eee7e60d2988f098904bd867e5e9ad110d735c1a3b3f10829c58fdca5400f078fc569822e7e73f0e9c6894dbbfa41b46d521f61 SHA512 07daf541570e9e30fcb97f607b9629761d14de58fcb4b89fd01f9688690af1b55b80e3e62eefc54942d47da5fcb9d3c4aa6bca0b76f4bf60e664054515e18fcb
 DIST dask-2.27.0.tar.gz 2852785 BLAKE2B 7be6704269f21891ed6a3289ee16827a1494591f7024d158e88001d4e10f263409e33f9c0e14e21ec8fed3d6798a6b011e8cfffec4659d6b07d2c4b31355c6a6 SHA512 afa7454e208cdfd482ff971aeda8db6364408661c1230c7e33fc05e63dfbe3e26e899415af0e4625a642dab15a29fce9c432d24d21e8a3bf7760f6ae304fc371
 DIST dask-2.28.0.tar.gz 2858331 BLAKE2B 9adbae83559a1a5a218aacb575ec6e4007cc0bcebf4f2ddac4a2bc23de2be74887ee41ff341c05e0e1612a42d4b3bd5d7ca072b58f7cbc9fa516d8c45f7f0ae2 SHA512 f36b1cc843b0ef7efdae0af1ffdc91ac251cfcbd63160379f479f55005b93e111818f782db2a7ecf8e6bbd63ea48661a178d1c2ca74473a4d477025bb955cbcd
 DIST dask-2.29.0.tar.gz 2857095 BLAKE2B 463d3e6edfa868b18be1c6f9919d07ded3d05036c2a90cd8845c1102cef67320f5b400c00188d5188ba393a0bd36fcfd234db75e6815f773f3a43abdba6875e0 SHA512 013cbfd31c5f59fdf56b0700ce2c0cd63dcaf653fdf2ddd8f083af84f13a38a1f09f6ce63fb7aa8cdc0786314b8a36144a8d186fb0d8af8ee8e81358bf4e1ab7
+DIST dask-2.30.0.tar.gz 2858866 BLAKE2B ea5e1e50f9bef2ca81765ee1228ea661ea01355f4c2a495e916388cb757dc089c519eb83372abc2ece16c8ec27e3b7f7fe56a302eddfdc6c0e79247db9c1b65e SHA512 d410fcfc7e30f510bc42e9547bac912609420919489e161408d436fb26c3998eba6bfc9e4845d90b3e8589ecc317ee4bf141e2740108840f2e5a420eb20655ef
diff --git a/dev-python/dask/dask-2.25.0.ebuild b/dev-python/dask/dask-2.25.0.ebuild
index ce2731364bfb..4d00305371eb 100644
--- a/dev-python/dask/dask-2.25.0.ebuild
+++ b/dev-python/dask/dask-2.25.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/dask-2.23.0.ebuild b/dev-python/dask/dask-2.30.0.ebuild
index e793b1c9b450..de09ea3a0bc6 100644
--- a/dev-python/dask/dask-2.23.0.ebuild
+++ b/dev-python/dask/dask-2.30.0.ebuild
@@ -12,8 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="distributed"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
@@ -24,13 +23,11 @@ RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-	distributed? (
-		>=dev-python/distributed-2.0[${PYTHON_USEDEP}]
-	)
 "
 BDEPEND="
 	dev-python/toolz[${PYTHON_USEDEP}]
 	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
 		dev-python/numexpr[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
@@ -40,15 +37,7 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	# flaky
-	sed -e 's:test_time_rolling_methods:_&:' \
-		-i dask/dataframe/tests/test_rolling.py || die
-	distutils-r1_src_prepare
-}
-
 python_test() {
-	pytest -vv -m "not network" \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+	pytest -vv -m "not network" ||
 		die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/dask/metadata.xml b/dev-python/dask/metadata.xml
index da5caf702f49..87f1bec38787 100644
--- a/dev-python/dask/metadata.xml
+++ b/dev-python/dask/metadata.xml
@@ -18,8 +18,5 @@
   <upstream>
     <remote-id type="pypi">dask</remote-id>
   </upstream>
-  <use>
-    <flag name="distributed">Add support for distributed computing</flag>
-  </use>  
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index 5d64f223c3f0..f264f07cb952 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1 +1,2 @@
 DIST django-otp-1.0.0.gh.tar.gz 63813 BLAKE2B 17e771f11ddfe4c1667b29da7e6bdbf542796ce48d9f5898e1399603c373bee04a2b6d2d96d8b3295adf07ac245f7e5ad4baf3f6f63f6fe9ce350482a6cc06e8 SHA512 66bce779c5ce98c8b0f64bafa98d8be26a2175678b413bc5e8a80a2157d4b843c217aed7cb7b64fb423184c7dcff5967fa352dd233c404dc51082ec7e94792f7
+DIST django-otp-1.0.1.gh.tar.gz 66717 BLAKE2B 6eb24baf21667af5fe5200a91d320884b1fa37b78def9b543b3411f75de97226d0f40ce53f06391d7cfc9f5ad4020a14e472f9a1abe89844778ef69a2f3b5b72 SHA512 981d374ed4dacf3edd33dc1437465de7458ec243e1ace0b87425ec2b01a51fe4cee3545d1bbe53d7c924c5981b76f7ca77b5da2cf5d6f170f2f7435cff991337
diff --git a/dev-python/django-otp/django-otp-1.0.1.ebuild b/dev-python/django-otp/django-otp-1.0.1.ebuild
new file mode 100644
index 000000000000..1537bd8dd0ba
--- /dev/null
+++ b/dev-python/django-otp/django-otp-1.0.1.ebuild
@@ -0,0 +1,36 @@
+# 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="Django framework adding two-factor authentication using one-time passwords"
+HOMEPAGE="https://github.com/django-otp/django-otp/"
+SRC_URI="
+	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	local -x PYTHONPATH=test:${PYTHONPATH}
+	local -x DJANGO_SETTINGS_MODULE=test_project.settings
+	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index dd1943184eec..265518b7d460 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,2 +1 @@
-DIST dominate-2.5.1.tar.gz 37524 BLAKE2B de210047127db4d078bece1d6c979fcc67897ff2f75ab4b949f03a1ef04832d6e2330063edc022704ad6b28fb6b38930b2e8d837c821ca39a697e1e915789f09 SHA512 85f25a1f2506bcb9ff9cdff699aabe7cfdd4ec690d53624b99642472299cb8b3947ce6f215ff913aa5a80e61d31b92c09f01f03c8f5b04e0d60b92098790953e
 DIST dominate-2.5.2.tar.gz 37704 BLAKE2B 1e55d1be457b6d1ea1f377734da3d48e7b400d6ee60093f09b42a8e094de3d303dd2285cf7883ddfbf5b47e6eaa7bd40194a945942c8afba8321f2fbdd0cb642 SHA512 d54d3b2c76e6e3d287715b2f583b3a8822a2d3556a549f728dd235bfc7c76159750cc78651d17cf8d3d5cb98929b2c54c2eae0861449882b0449235a7fbbdb55
diff --git a/dev-python/dominate/dominate-2.5.2.ebuild b/dev-python/dominate/dominate-2.5.2.ebuild
index cf1e0be34824..fe4570ffcaab 100644
--- a/dev-python/dominate/dominate-2.5.2.ebuild
+++ b/dev-python/dominate/dominate-2.5.2.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/flask-appconfig/Manifest b/dev-python/flask-appconfig/Manifest
deleted file mode 100644
index c4ebe695477a..000000000000
--- a/dev-python/flask-appconfig/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST flask-appconfig-0.11.1.tar.gz 14545 BLAKE2B 71cb3252707ee546aaa16ed36f1c605c5e90d49070a64aa381f23fcc1fa9147724a8794b8530738115c3b0505537487c63b3131c586b4383884b58f6141cd515 SHA512 9ebc42be5ef247b1f14b85f7b65600a1595ecdc70e792c0cd495347254b07675a3b7a306df8d2f2663626ceafa4ce7700f6f26cd0f1bcd974ba6bbab293847ee
diff --git a/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild b/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
deleted file mode 100644
index d663d4578494..000000000000
--- a/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
+++ /dev/null
@@ -1,54 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Configures Flask applications in a canonical way"
-HOMEPAGE="https://github.com/mbr/flask-appconfig"
-# PyPI tarballs don't include tests
-# https://github.com/mbr/flask-appconfig/pull/4
-SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/alabaster[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
-	# These conflict with recent flask versions, #589548
-	sed -i '/entry_points={/,/},$/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/flask-appconfig/metadata.xml b/dev-python/flask-appconfig/metadata.xml
deleted file mode 100644
index 4fae9caf03f6..000000000000
--- a/dev-python/flask-appconfig/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sbraz@gentoo.org</email>
-		<name>Louis Sautier</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">flask-appconfig</remote-id>
-		<remote-id type="github">mbr/flask-appconfig</remote-id>
-		<bugs-to>https://github.com/mbr/flask-appconfig/issues</bugs-to>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 4cefd67cee87..49da0490d598 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -6,3 +6,4 @@ DIST hypothesis-python-5.36.0.tar.gz 9086288 BLAKE2B 9deba5f50168185d5e9ef35a47b
 DIST hypothesis-python-5.36.1.tar.gz 9086877 BLAKE2B 4b71daa1e9417d8249364292ca1dcbdbb31d041e2f5627776bb2d2d4493be82c85201d000e187e5cc445c79612f5918a5ac71a2787bbc0c21eff83d4c27b0dc3 SHA512 97d0446ba5660c189e60b47b8f782818525fcc1c5c1d64eec997b85d5ae47fc7d52771439b5c249002380ffe7d95696728f81efe513993ff90c8e192e2ceca8d
 DIST hypothesis-python-5.36.2.tar.gz 9088227 BLAKE2B 578c28d045f3b3f288d43765d556f1e7bbde661684b71f6379df3eba516d8ece86f31a38a414e676532f6ecb8a1ee69ac77d207a8637eaef8b9a86584d3292eb SHA512 d6792d5b9f60aea6181018c69eaa12982ef0ab353bff3f46bc987a4633a15b655ed04ee8ae3aca7dbd9e23cf5f85e4a95e455082f4035e246342b72e2dafe258
 DIST hypothesis-python-5.37.0.tar.gz 9091454 BLAKE2B 2e51479f872dca6834d6cf8c2815e20cdb53c8968c3f5e5f6144a34c040e7dce9627c578ee072b21252b64af0507f361e4d5dfd3b65f8eb1abef9bfdac6d49ea SHA512 66e6f7a8ae11e9a8c8da79aa433d151733e07038ea37f211773972596bedaa227e8492fe7b9f363ea92ffcfd8c3e5a0a5364e04be22aab010a20544d3abcc93a
+DIST hypothesis-python-5.37.1.tar.gz 9091568 BLAKE2B 7f4ffdb680ba473ffb16bb201b9664184cb43b04a2993cbd379c7f91a8ff8ec78eb36e9e54740d38656d8e6681ada220d1b0845aab7c931558003143e8e60aef SHA512 57101d12cf81641cb47ee2b9da9a4a3233ea4eec178d16c16778b4ce869e70463ca1381d983abd48382fe8eb4d0f8f8e4ea41f7b3b6c9e71b73c4a119cba85f8
diff --git a/dev-python/hypothesis/hypothesis-5.37.1.ebuild b/dev-python/hypothesis/hypothesis-5.37.1.ebuild
new file mode 100644
index 000000000000..31c848539467
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.37.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 optfeature
+
+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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~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/matterhook/Manifest b/dev-python/matterhook/Manifest
index 9f6ba1a33e06..60369b785ff6 100644
--- a/dev-python/matterhook/Manifest
+++ b/dev-python/matterhook/Manifest
@@ -1,2 +1 @@
-DIST matterhook-0.1.tar.gz 3150 BLAKE2B 841b64875d3ecc55c5056a15e07e8c46ac13ec48f1fd2752ec0c3934608172c8970cc4ad6ce984e227bef811aaee9ca2fc352afbf4e4925a6930adf798edbdd3 SHA512 1c9d264fb80b7d6d746f8379c869903e80f0b4a134efb3ca571630fdbe53eb7b1ac244470f7c2f8229cfe54e7597594427e253f35f0b103fc4c4123a935c5193
 DIST matterhook-0.2.tar.gz 4458 BLAKE2B 83dae9d38eaa9de3abdca4925378475660ab6f9571565f9275425cb9579397c2f3d106735d4268b7045d6af2572bdb8e1f60aa89030b1fa44c4c5c1b19fcd106 SHA512 aa476a00a5b571c5c8bb21eccc5b1c325e0932da7e4f8095e3ad29356afd4716384abfa9e4927a820e6d1fcf8e62a516943f6372d90cd7a9e76d0292c352c483
diff --git a/dev-python/matterhook/matterhook-0.1-r1.ebuild b/dev-python/matterhook/matterhook-0.1-r1.ebuild
deleted file mode 100644
index 6f92de7b9577..000000000000
--- a/dev-python/matterhook/matterhook-0.1-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Interact with Mattermost incoming webhooks easily"
-HOMEPAGE="https://github.com/numberly/matterhook"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/matterhook/matterhook-0.2.ebuild b/dev-python/matterhook/matterhook-0.2.ebuild
index 7a979741a27c..6f92de7b9577 100644
--- a/dev-python/matterhook/matterhook-0.2.ebuild
+++ b/dev-python/matterhook/matterhook-0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/mini-amf/Manifest b/dev-python/mini-amf/Manifest
deleted file mode 100644
index d1d1666a4739..000000000000
--- a/dev-python/mini-amf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mini-amf-0.9.1.tar.gz 117016 BLAKE2B 22133a2a6f44ea8d485874924e6175383dfc9301d9bba193e4d9d2fd901671c64be3665617c02223dbd2075141071deed142e804a77816ae11ac4d00e72a870c SHA512 8487baa551a68f7882aedaa8b809089bf2e767b0055f292dab4074d48ed442cabc250297ded91daa2f2a1dcb950ddab5ddff60466ec84ab739a240b8e2665be0
diff --git a/dev-python/mini-amf/files/mini-amf-0.9.1-setuptools-46-fix.patch b/dev-python/mini-amf/files/mini-amf-0.9.1-setuptools-46-fix.patch
deleted file mode 100644
index 932aa3fc8fab..000000000000
--- a/dev-python/mini-amf/files/mini-amf-0.9.1-setuptools-46-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/setup.py.orig	2020-03-18 11:44:06.137323823 +0200
-+++ b/setup.py	2020-03-18 11:43:55.230585230 +0200
-@@ -4,7 +4,7 @@
- # See LICENSE.txt for details.
- 
- import os.path
--from setuptools import Feature, setup
-+from setuptools import setup
- import sys
- 
- try:
-@@ -42,34 +42,6 @@
- """
- 
- 
--class AccelFeature(Feature):
--    def __init__(self, have_cython):
--        self.have_cython = have_cython
--        self.extensions = []
--
--        Feature.__init__(
--            self,
--            description="optional C accelerator modules (broken)",
--            standard=False,
--            available=have_cython,
--            ext_modules=self.extensions
--        )
--
--    def include_in(self, dist):
--        if not self.have_cython:
--            sys.stderr.write(
--                "ERROR: Cython is required to compile accelerator modules.\n")
--            sys.exit(1)
--
--        sys.stderr.write(
--            "WARNING: Accelerator modules are broken.\n"
--            "WARNING: You should only use --with-accel "
--            "if you are trying to fix them.\n")
--
--        self.extensions.extend(cythonize("miniamf/_accel/*.pyx"))
--        Feature.include_in(self, dist)
--
--
- def get_version():
-     """
-     Retrieve the version number from miniamf/_version.py.  It is
-@@ -147,7 +119,6 @@
-             "miniamf", "miniamf._accel", "miniamf.adapters", "miniamf.util"
-         ],
-         install_requires=["six", "defusedxml"],
--        features={"accel": AccelFeature(have_cython)},
-         test_suite="tests",
-         zip_safe=True,
-         extras_require={
diff --git a/dev-python/mini-amf/metadata.xml b/dev-python/mini-amf/metadata.xml
deleted file mode 100644
index 54a516b9c74d..000000000000
--- a/dev-python/mini-amf/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>juippis@gentoo.org</email>
-    <name>Joonas Niilola</name>
-  </maintainer>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/mini-amf/mini-amf-0.9.1-r1.ebuild b/dev-python/mini-amf/mini-amf-0.9.1-r1.ebuild
deleted file mode 100644
index a24f59a0e23f..000000000000
--- a/dev-python/mini-amf/mini-amf-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Minimal AMF encoder and decoder for Python"
-HOMEPAGE="https://pypi.python.org/pypi/Mini-AMF"
-SRC_URI="https://github.com/zackw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
-
-distutils_enable_sphinx doc
-
-PATCHES=( "${FILESDIR}"/mini-amf-0.9.1-setuptools-46-fix.patch )
-
-python_test() {
-	coverage run --source=miniamf setup.py test || die
-}
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
index b0f258e760f4..90eb1b5d6efe 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/python/${PN}"
 	EGIT_COMMIT="master"
 else
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3.ebuild
deleted file mode 100644
index 907ae258519c..000000000000
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="https://www.mypy-lang.org/"
-SRC_URI="https://github.com/python/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-if [ "${PV}" == "9999" ]; then
-inherit git-r3
-EGIT_REPO_URI="https://github.com/python/${PN}"
-EGIT_COMMIT="master"
-else
-EGIT_REPO_URI="${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
-	${RDEPEND}
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover tests -v || die "tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numexpr/numexpr-2.7.2.ebuild b/dev-python/numexpr/numexpr-2.7.2.ebuild
index 1402b78693e3..3e2c9eee56c3 100644
--- a/dev-python/numexpr/numexpr-2.7.2.ebuild
+++ b/dev-python/numexpr/numexpr-2.7.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
diff --git a/dev-python/ordered-set/Manifest b/dev-python/ordered-set/Manifest
index 0048e047c476..6a47305a6928 100644
--- a/dev-python/ordered-set/Manifest
+++ b/dev-python/ordered-set/Manifest
@@ -1 +1,2 @@
 DIST ordered-set-4.0.1.tar.gz 10607 BLAKE2B e9bb24f8709c73099b83ee27abe30193ff1b530cd92fe3f2a43bc25212542d80e459fe404aa97aa7447ef52ea239153d427087f1ed517a7e7c8e18d68f27d0f2 SHA512 6ebe758efba7b847cce4a06001e84bf4a60728ae5d088cd7e3a2ebab86a6f5aa6a421bfda1cea0e8751bafd60eac1b3f2ec14e74a7b71f469dc7851aafe52235
+DIST ordered-set-4.0.2.tar.gz 10658 BLAKE2B c07a4f48a6b0bf74ab11dc25a2d85c401bbcde825b63ff4d6e3e6ee12139f22d803bda3db57937ad3760c0c665f0ec3b44bcaab832c2604148dd0add350f515c SHA512 d7031ae90fdaf116c27415170a7197be34ff4b977a03684a6fb53dc453845a97cd32b9666ed3ae58fb7bc722ff3b2b4f2e156578841033759b490b359a5619b4
diff --git a/dev-python/ordered-set/metadata.xml b/dev-python/ordered-set/metadata.xml
index d25a7e6666be..fb7199d5f38a 100644
--- a/dev-python/ordered-set/metadata.xml
+++ b/dev-python/ordered-set/metadata.xml
@@ -6,5 +6,17 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>ddenoncin@gmail.com</email>
+		<name>David Denoncin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">LuminosoInsight/ordered-set</remote-id>
+		<remote-id type="pypi">ordered-set</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/dominate/dominate-2.5.1.ebuild b/dev-python/ordered-set/ordered-set-4.0.2.ebuild
index db9435ea2c66..14092ec7338a 100644
--- a/dev-python/dominate/dominate-2.5.1.ebuild
+++ b/dev-python/ordered-set/ordered-set-4.0.2.ebuild
@@ -2,16 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
-DESCRIPTION="Library for creating and manipulating HTML documents using an elegant DOM API"
-HOMEPAGE="https://github.com/Knio/dominate"
+DESCRIPTION="A mutable set that remembers the order of its entries"
+HOMEPAGE="https://github.com/LuminosoInsight/ordered-set"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-3+"
+LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pygame/pygame-2.0.0_pre10.ebuild b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
index 025ab1a7622e..a431c5ecccd6 100644
--- a/dev-python/pygame/pygame-2.0.0_pre10.ebuild
+++ b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyinsane/Manifest b/dev-python/pyinsane/Manifest
deleted file mode 100644
index 057519063577..000000000000
--- a/dev-python/pyinsane/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pyinsane2-2.0.13.tar.gz 57172 BLAKE2B 26081f7df1d4077f2580f8968c20a88092446136f441fab16a8bc1e34ffc9d5e11221c6a3f74a111f66f839d3cea5ed7518ebe4321b563cba1f3cb3a6053bf74 SHA512 613ea6aae00df550089a691ef6cdd00ea00324ad3a02e35bcb1cd1b0723e34afe9692828100115432e5df9c7bef09f861ce3e1d06915c02c007f92bc8030a91b
diff --git a/dev-python/pyinsane/metadata.xml b/dev-python/pyinsane/metadata.xml
deleted file mode 100644
index e89e297bfe6d..000000000000
--- a/dev-python/pyinsane/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>voyageur@gentoo.org</email>
-    <name>Bernard Cafarelli</name>
-  </maintainer>
-  <longdescription lang="en">
-Python implementation of the Sane API (using ctypes) and abstration layer.
-
-The code is divided in 3 layers:
-
- * rawapi : Ctypes binding to the raw Sane API
- * abstract : An Object-Oriented layer that simplifies the use of the Sane API and try to avoid possible misuse of the Sane API. When scanning, it also takes care of returning a Pillow image.
- * abstract_th : The Sane API is not thread-safe and cannot be used in a multi-threaded environment easily. This layer solves this problem by using a fully dedicated thread.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">pyinsane2</remote-id>
-    <remote-id type="github">openpaperwork/pyinsane</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pyinsane/pyinsane-2.0.13.ebuild b/dev-python/pyinsane/pyinsane-2.0.13.ebuild
deleted file mode 100644
index 76dec6deee70..000000000000
--- a/dev-python/pyinsane/pyinsane-2.0.13.ebuild
+++ /dev/null
@@ -1,33 +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
-
-MY_PN="${PN}2"
-
-DESCRIPTION="Python implementation of the Sane API and abstration layer"
-HOMEPAGE="https://github.com/openpaperwork/pyinsane"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="media-gfx/sane-backends
-	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RESTRICT="test" # Tests require at least one scanner with a flatbed and an ADF
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-python_prepare_all() {
-	sed -e "/'nose>=1.0'/d" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pylatex/Manifest b/dev-python/pylatex/Manifest
index 9a089da0738d..65c065d5f204 100644
--- a/dev-python/pylatex/Manifest
+++ b/dev-python/pylatex/Manifest
@@ -1 +1,2 @@
 DIST pylatex-1.3.3.tar.gz 300639 BLAKE2B ac8fad8fa7e6e821cda168f3ae8ffb5acec21d688761b153ef2f9383b6a2f2ac7daea65f04389eb1ba3152fc50176d73cb814a78d2b5250ead2c6647eb96635a SHA512 12f51805996d84840f68844b79384ce4d2c29dde4db06f73b8887fe012abeaa4b9c5cf5e449132e626132b50ba26f014a899d548e3c0def25289671fd92e41a6
+DIST pylatex-1.4.0.tar.gz 301148 BLAKE2B 4d1fa6add43556b7b2c1ff13b3bc2130d06018499197c3d1f40c9180f4346e774d69c2a356d5eab6c8686957ebafac71a78506553cf7cd3cd57d03c0e0ffffd1 SHA512 0d9ab3e733c50b5a4dd7a6758193645c5532c9153972bbed244e3f7e2d6a946bd36af428197f9cdd1a3256f4cc0db5dc78248973f9b330684ce8651c4a59ad91
diff --git a/dev-python/pylatex/pylatex-1.4.0.ebuild b/dev-python/pylatex/pylatex-1.4.0.ebuild
new file mode 100644
index 000000000000..f7b9a7e488dc
--- /dev/null
+++ b/dev-python/pylatex/pylatex-1.4.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="PyLaTeX"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A Python library for creating LaTeX files and snippets"
+HOMEPAGE="https://github.com/JelteF/PyLaTeX"
+SRC_URI="https://github.com/JelteF/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/ordered-set[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+BDEPEND+="
+	test? (
+		dev-python/quantities[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		app-text/texlive
+		dev-texlive/texlive-latexextra
+	)"
+
+python_install_all() {
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/"${PF}"/examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	optfeature "compiling generated files" "app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience"
+	optfeature "matplotlib support" dev-python/matplotlib
+	optfeature "numpy support" dev-python/numpy
+	optfeature "quantities support" dev-python/quantities
+}
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index 6f8dcf99ef18..1c64e496958d 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,2 +1 @@
-DIST pymongo-3.10.1.tar.gz 715892 BLAKE2B df1f8ae34366ea9de633be7e1ca103a2bc704a18a9b23cb1fbdbc8d116e939d4d5462e18a076149d93dcb8ada9f4737ed2d61b08803b546dce89dca4b2416689 SHA512 5a73ac17ef6f6783a573facd90879dbefa0c95d69123bc67c1a6af0987cb5786f637b8fa81a6810387acc34829a4cde33b848ac0f7b08f7d07faa90a8e13b595
 DIST pymongo-3.11.0.tar.gz 771691 BLAKE2B 5ae5b78caac335656c1005666c5633882da517c512bbfdb0df2c4569ec5060fa9623a23f48ffcf0c6ab2cdc69f6534f36ef18c929047bbb22cfbe9055a0881b7 SHA512 4f8a185013cbb3c07774d3c6aecc9e97dabb4ba55176fa8a51e17bcdb7cbbebaacd16304e580b4c6aeb26aad964401249313b59dde3c5c248c4496d64d18b22c
diff --git a/dev-python/pymongo/pymongo-3.10.1.ebuild b/dev-python/pymongo/pymongo-3.10.1.ebuild
deleted file mode 100644
index 8b92600566bf..000000000000
--- a/dev-python/pymongo/pymongo-3.10.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
-inherit check-reqs distutils-r1
-
-DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa x86"
-IUSE="doc kerberos test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		>=dev-db/mongodb-2.6.0
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_sphinx doc
-
-reqcheck() {
-	if use test; then
-		# During the tests, database size reaches 1.5G.
-		local CHECKREQS_DISK_BUILD=1536M
-
-		check-reqs_${1}
-	fi
-}
-
-pkg_pretend() {
-	reqcheck pkg_pretend
-}
-
-pkg_setup() {
-	reqcheck pkg_setup
-}
-
-src_prepare() {
-	# network-sandbox probably
-	rm test/test_srv_polling.py || die
-	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
-		-i test/test_client.py || die
-	# relies on exact exception message
-	sed -e 's:abstract methods:abstract:' \
-		-i test/test_custom_types.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Yes, we need TCP/IP for that...
-	local DB_IP=127.0.0.1
-	local DB_PORT=27000
-
-	export DB_IP DB_PORT
-
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-
-	# Now, the hard part: we need to find a free port for mongod.
-	# We're just trying to run it random port numbers and check the log
-	# for bind errors. It shall be noted that 'mongod --fork' does not
-	# return failure when it fails to bind.
-
-	mkdir -p "${dbpath}" || die
-	while true; do
-		ebegin "Trying to start mongod on port ${DB_PORT}"
-
-		LC_ALL=C \
-		mongod --dbpath "${dbpath}" --nojournal \
-			--bind_ip ${DB_IP} --port ${DB_PORT} \
-			--unixSocketPrefix "${TMPDIR}" \
-			--logpath "${logpath}" --fork \
-		&& sleep 2
-
-		# Now we need to check if the server actually started...
-		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-			# yay!
-			eend 0
-			break
-		elif grep -q 'Address already in use' "${logpath}"; then
-			# ay, someone took our port!
-			eend 1
-			: $(( DB_PORT += 1 ))
-			continue
-		else
-			eend 1
-			eerror "Unable to start mongod for tests. See the server log:"
-			eerror "	${logpath}"
-			die "Unable to start mongod for tests."
-		fi
-	done
-
-	local failed
-	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
-	pushd "${BUILD_DIR}"/../ > /dev/null
-	if [[ "${EPYTHON}" == python3* ]]; then
-		2to3 --no-diffs -w test
-	fi
-	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index a5e9f3e9241f..ab2f423b22ee 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,2 +1 @@
 DIST pytest-django-3.10.0.gh.tar.gz 68995 BLAKE2B dcc9ddceda88c32dab559c065feb347582e72ec5fcd9929cb2bde091bd5c89bbe09879901daf5dc0adc7e38921de5b4989e0d1bbefaa5eb1cdce1dfd2ef58a11 SHA512 7f66fa9287fb80082018613ec3b15a0da3f7a13075e85f0a2eff9e13358c993e56245c441d952d13f232bf7e49a05c799b4affbb844e90abaac736d86bb0a6c9
-DIST pytest-django-3.9.0.tar.gz 70498 BLAKE2B 0f3cf7ffd528f00dd0c7dd6babcb64833ec3684c7b62dcb8757b0f90cdcdddabffdbff240774ed6fb2a294e27da2acd7f396298ff2884be6e5b4c8d9c632d008 SHA512 92985e66f47c91363d19fe2bfe8ccab14212be577692f90923dbbae4c8d406cf698796d485af2b721863392810fc07c6f11ada0c61589cd1861f0d34a732effe
diff --git a/dev-python/pytest-django/pytest-django-3.10.0.ebuild b/dev-python/pytest-django/pytest-django-3.10.0.ebuild
index cd35ef7035c4..fa080250cd93 100644
--- a/dev-python/pytest-django/pytest-django-3.10.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-3.10.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/pytest-django/pytest-django-3.9.0.ebuild b/dev-python/pytest-django/pytest-django-3.9.0.ebuild
deleted file mode 100644
index 4b262d927c71..000000000000
--- a/dev-python/pytest-django/pytest-django-3.9.0.ebuild
+++ /dev/null
@@ -1,26 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django plugin for py.test"
-HOMEPAGE="https://pypi.org/project/pytest-django/ https://pytest-django.readthedocs.org https://github.com/pytest-dev/pytest-django"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
-"
-
-# not all test dependencies are packaged and this package isn't worth it.
-RESTRICT="test"
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index 8a32572980f7..560c21c868e9 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -1,2 +1 @@
-DIST python-mpd-1.0.0.tar.gz 60032 BLAKE2B 9293dfc85363f83041b1d73046dabe6a3243a63de495ba630eedbda96d1b080cfb1cc635801794a91103bbd4b9145733d63ce3ad252748d01ed596cd3b0f7895 SHA512 5fab12d082be39ac4a3477ea10b5d1fa350ceac23c97fb12a46f6cd0cfa6a83999f31528d6d7f74c1ffe67f4e63dfbe8fd3debcf917a6e3705bcf84a55a458ce
 DIST python-mpd-1.1.0.tar.gz 61104 BLAKE2B 274a829a3fc1404a4e3beb4df3eb563c1f781325590702761d3b3b5bc42e3cd9f63809aab14bb98e4879c10ccd55bb9d7306485ec22d37538cc2e36006a3039a SHA512 65b17ae34b2c731b7d45801211e49eacfc18239d5575075be0c11ace350da19b82dd151fefc42077454a988d3deb1b489471f739ddea2d915cb3c241669dbe32
diff --git a/dev-python/python-mpd/python-mpd-1.0.0-r1.ebuild b/dev-python/python-mpd/python-mpd-1.0.0-r1.ebuild
deleted file mode 100644
index 5aa604a35d49..000000000000
--- a/dev-python/python-mpd/python-mpd-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python MPD client library"
-HOMEPAGE="https://github.com/Mic92/python-mpd2"
-SRC_URI="https://github.com/Mic92/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-SLOT="0"
-IUSE="examples +twisted"
-
-REQUIRED_USE="test? ( twisted )"
-
-RDEPEND="twisted? ( dev-python/twisted[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.rst doc/{changes.rst,commands_header.txt} doc/topics/. )
-
-S="${WORKDIR}/${PN}2-${PV}"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	pytest mpd/tests.py -vv || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use examples && dodoc -r examples/.
-}
diff --git a/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild b/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild
index 6d539d3b2504..5aa604a35d49 100644
--- a/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild
+++ b/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/Mic92/python-mpd2"
 SRC_URI="https://github.com/Mic92/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 SLOT="0"
 IUSE="examples +twisted"
 
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index fa46d4c925e8..8f1ffcb456ee 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,2 +1 @@
-DIST requests-cache-0.4.12.zip 44767 BLAKE2B f328d8ae8e3377af626030a6e3617c78e488024fa4ada9894576d339e571ba8ee6d905612ddc2802810bbeffbd8c94d90c743889e80fbf21418a7c67c5a005f6 SHA512 784d630eec99b607596d6ebcb7e51b0b4ed612b131437000391ecea6f3a684d1f61d169d57266ffc044a3939dcd4e7d6f85b9538165ae3613b1d3e55f18585fd
 DIST requests-cache-0.5.2.tar.gz 31159 BLAKE2B 4fca146a751064baf70954a71df64dbb7f8c9a4e27fec5dbea3620496ce78e7ccfb3785fb63705f513ff6fa938376b0c6acc4a2f584856060b1bc8388517df46 SHA512 355cc571a46b768615606a907a69ed065b3c4b5e74bb6c311abc7a28d9406f32fdea1db0dfd2b1c32dcdc82ed817ef7e0b30086c069de57307254617604c5177
diff --git a/dev-python/requests-cache/requests-cache-0.4.12-r1.ebuild b/dev-python/requests-cache/requests-cache-0.4.12-r1.ebuild
deleted file mode 100644
index ae60cb29504a..000000000000
--- a/dev-python/requests-cache/requests-cache-0.4.12-r1.ebuild
+++ /dev/null
@@ -1,26 +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
-
-HOMEPAGE="https://pypi.org/project/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-# Portage only has versions of request >= minimum border
-RDEPEND=">=dev-python/requests-2.6[${PYTHON_USEDEP}]"
-DEPEND="
-	app-arch/unzip"
-
-distutils_enable_sphinx docs
-# Testsuite excels in tests connecting to the network via local server daemons
-#distutils_enable_tests setup.py
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index b4787846e528..de04d9ea377e 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/dev-python/ssl-fetch/ssl-fetch-9999.ebuild b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
index 57449d5ec7aa..88a83f31e781 100644
--- a/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=no
 
 EGIT_BRANCH="master"