Updating liguros repo

50 files changed, 103 insertions, 601 deletions

diff --git a/dev-python/backports-functools-lru-cache/Manifest b/dev-python/backports-functools-lru-cache/Manifest
deleted file mode 100644
index 46a85ff90f01..000000000000
--- a/dev-python/backports-functools-lru-cache/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST backports.functools_lru_cache-1.6.1.tar.gz 12426 BLAKE2B 361cc71e0a18e6d578ac007d4990c2f7ae86a5753c25da378a7a3cfbece63b088278fc998adfea3eccaa51146659d658cdd7ce4e4e19d6d2fd7639f8df0a7262 SHA512 5764cc6ed83dc4abc2a7e5f8b5bb30c7b7554aafcbb6dfcececdb3646fe9298a8c1791a02112238ec94a0e383855bdec43bf9094f40b57124d0a0c9aa7c67f88
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild
deleted file mode 100644
index 8ee0b1ba39dc..000000000000
--- a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-MY_PN="${MY_PN//-/_}"
-DESCRIPTION="Backport of functools.lru_cache from Python 3.3"
-HOMEPAGE="https://github.com/jaraco/backports.functools_lru_cache"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8 and friends
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	# avoid a collision with dev-python/backports
-	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/backports-functools-lru-cache/metadata.xml b/dev-python/backports-functools-lru-cache/metadata.xml
deleted file mode 100644
index 8e1a495510b6..000000000000
--- a/dev-python/backports-functools-lru-cache/metadata.xml
+++ /dev/null
@@ -1,20 +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>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">backports.functools_lru_cache</remote-id>
-		<remote-id type="github">jaraco/backports.functools_lru_cache</remote-id>
-		<bugs-to>https://github.com/jaraco/backports.functools_lru_cache/issues</bugs-to>
-		<changelog>https://github.com/jaraco/backports.functools_lru_cache/blob/master/CHANGES.rst</changelog>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/cliapp/Manifest b/dev-python/cliapp/Manifest
deleted file mode 100644
index 7381c049d84f..000000000000
--- a/dev-python/cliapp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cliapp-1.20180812.1.tar.gz 55134 BLAKE2B 184fb65751ce9960f98a62beaeb7ecd4f55cc8bfc9f5dea568900b7be5f5b42277d5ea8b23c20f73c73ab67d605234fe0a5e28660647a985c0de19de0b625ff1 SHA512 61b6f36abb3eefb1c52752e8eb1048c1629c86aa269fcac9c5ee4d875031a040c9c3824131f953dc9bfe568e9e99202750c2e8c11791afe3fce1c1872ce2510d
diff --git a/dev-python/cliapp/cliapp-1.20180812.1.ebuild b/dev-python/cliapp/cliapp-1.20180812.1.ebuild
deleted file mode 100644
index deac89f8095b..000000000000
--- a/dev-python/cliapp/cliapp-1.20180812.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Framework for Unix-like command line programs"
-HOMEPAGE="https://liw.fi/cliapp/"
-SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	addwrite /proc/self/comm
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v -p '*_tests.py' || die
-}
diff --git a/dev-python/cliapp/metadata.xml b/dev-python/cliapp/metadata.xml
deleted file mode 100644
index 3d4429370ed8..000000000000
--- a/dev-python/cliapp/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/configparser/Manifest b/dev-python/configparser/Manifest
deleted file mode 100644
index df28e8937373..000000000000
--- a/dev-python/configparser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST configparser-3.5.0.tar.gz 39573 BLAKE2B 100baa33268376e44bc8f7f8e875e93f081baf71226fd84430823617805c0c983e49b5ba08261ba0d73e92d30e0151a9ef9733031673e16fc4012f4020881298 SHA512 490b9f7807bce02667f41a48389b51f550818d2bd4296b528833d65d4b04bdbe5b906e7584e55eee4495405267a697ba26a056e6504fe6b3f8cf07ea8f55f7d3
diff --git a/dev-python/configparser/configparser-3.5.0-r1.ebuild b/dev-python/configparser/configparser-3.5.0-r1.ebuild
deleted file mode 100644
index ee27710666fa..000000000000
--- a/dev-python/configparser/configparser-3.5.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Backport of Python-3 built-in configparser"
-HOMEPAGE="https://pypi.org/project/configparser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/configparser/metadata.xml b/dev-python/configparser/metadata.xml
deleted file mode 100644
index 8ae52518720f..000000000000
--- a/dev-python/configparser/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">configparser</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/coverage-test-runner/Manifest b/dev-python/coverage-test-runner/Manifest
deleted file mode 100644
index 5b81a0cd8c31..000000000000
--- a/dev-python/coverage-test-runner/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST coverage-test-runner-1.15.tar.gz 21243 BLAKE2B 37ae1748e9bc43994c7f59de0551b732b1b8b29a06f0a8a7ee03a31538a34758bd14715d29c26372c37218dde70c980339f42211b142c8a4841d3f016d65dc1d SHA512 a78219c30dfcbf46778a52da2291da0fff5ead42c133c4a28cc7f685111ba1bf2eca303e3f995ba19d30c5eb10605aba0665a8f9e6a4c17a4337a2a1234eb2f9
diff --git a/dev-python/coverage-test-runner/coverage-test-runner-1.15.ebuild b/dev-python/coverage-test-runner/coverage-test-runner-1.15.ebuild
deleted file mode 100644
index 78181e126558..000000000000
--- a/dev-python/coverage-test-runner/coverage-test-runner-1.15.ebuild
+++ /dev/null
@@ -1,24 +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="fail Python program unit tests unless they test everything"
-HOMEPAGE="https://liw.fi/coverage-test-runner/"
-SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-python/coverage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	emake check
-}
diff --git a/dev-python/coverage-test-runner/metadata.xml b/dev-python/coverage-test-runner/metadata.xml
deleted file mode 100644
index 3d4429370ed8..000000000000
--- a/dev-python/coverage-test-runner/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/enum34/Manifest b/dev-python/enum34/Manifest
deleted file mode 100644
index 152bf25af8c8..000000000000
--- a/dev-python/enum34/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST enum34-1.1.6.tar.gz 40048 BLAKE2B 3960e78f27f3ebf70e9aac5c4ced87d974cc61e5d9afe5d787188e3e877eece18153036035187e4d7ad63bf2a54c1c393f0f46f5ef7bcc9b67658b4ea441bb7b SHA512 51652525adc37bd1af1d81933f965dba9c508838d9f759c80ca1392991515a29c2c0263264a4e175b37a6ba11dca68c354774e448b19ef1bdba96be5474d93ec
diff --git a/dev-python/enum34/enum34-1.1.6-r1.ebuild b/dev-python/enum34/enum34-1.1.6-r1.ebuild
deleted file mode 100644
index e1f60607c57f..000000000000
--- a/dev-python/enum34/enum34-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3.4 Enum backported"
-HOMEPAGE="https://pypi.org/project/enum34/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" enum/test.py || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local DOCS=( enum/doc/. enum/README )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/enum34/metadata.xml b/dev-python/enum34/metadata.xml
deleted file mode 100644
index 7b6d6ce47c0f..000000000000
--- a/dev-python/enum34/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">enum34</remote-id>
-    <remote-id type="cpe">cpe:/a:python:enum34</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/functools32/Manifest b/dev-python/functools32/Manifest
deleted file mode 100644
index 4b0bc4425f25..000000000000
--- a/dev-python/functools32/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST functools32-3.2.3-2.tar.gz 31171 BLAKE2B 6f228a7ae4977f333a4979b583e636394691036670f8ab330450153e77262929d981dd0988dc00ab245df6dd0667f5ae12d296bc72513a4ed5b031159e332a7f SHA512 ad944019f4aefde292b6872bfe06862d01920a2f44adf8740c36ed51d16d879be7638591aaddf9dac4ec83b6f05bbf81972d5f32854abedcce3dde080459f7f7
diff --git a/dev-python/functools32/functools32-3.2.3.ebuild b/dev-python/functools32/functools32-3.2.3.ebuild
deleted file mode 100644
index 6993f79f21fa..000000000000
--- a/dev-python/functools32/functools32-3.2.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of the functools module from Python 3"
-HOMEPAGE="https://pypi.org/project/functools32/ https://github.com/MiCHiLU/python-functools32"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}-2.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2.4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}"/${P}-2
-
-python_test() {
-	"${PYTHON}" test_functools32.py || die
-}
diff --git a/dev-python/functools32/metadata.xml b/dev-python/functools32/metadata.xml
deleted file mode 100644
index eb1d3dbc8c40..000000000000
--- a/dev-python/functools32/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">functools32</remote-id>
-		<remote-id type="github">MiCHiLU/python-functools32</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/futures/Manifest b/dev-python/futures/Manifest
deleted file mode 100644
index 0f527c83e239..000000000000
--- a/dev-python/futures/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST futures-3.1.1.tar.gz 26471 BLAKE2B 53c7678cec213351bc1c172de857c60bbcc392f24a0a6d1fba42eb6190f82d8f01977f8b830e9db5ba0628eb50f2d6dcf0d0421c4b06e42adbd1d429c0c28281 SHA512 7ccb041271ed2688591942f46ab2d2c92d806efbd5209ff9aba77c6d5d3c1a1495fccbeb1718d914894b0b8d936438687e8f3cc22b7ab6625fb518321084ead3
-DIST futures-3.2.0.tar.gz 27320 BLAKE2B b2a6c380955ce29fd434e30897d39d1fe1dbe758ec663bb243c4891849f3e45cf5eba10b71a9e6a028b32f20f876d5662188ec387d442492c7f4b73463b2f728 SHA512 e8c08ebc38d7397b5c2a5dc8c22567af1a1b6d5ce6fb8c189f663fb25b96f1ebcbade1ec0a95e9970dfac73606ecd5d7c6f79cc010fd62930a5b005d9babdde0
diff --git a/dev-python/futures/futures-3.1.1.ebuild b/dev-python/futures/futures-3.1.1.ebuild
deleted file mode 100644
index 8085a350f0a7..000000000000
--- a/dev-python/futures/futures-3.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of the concurrent.futures package from Python 3.2"
-HOMEPAGE="https://pypi.org/project/futures/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux"
-IUSE="doc"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" test_futures.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES )
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/futures/futures-3.2.0.ebuild b/dev-python/futures/futures-3.2.0.ebuild
deleted file mode 100644
index 0f7e38207bd3..000000000000
--- a/dev-python/futures/futures-3.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of the concurrent.futures package from Python 3.2"
-HOMEPAGE="https://github.com/agronholm/pythonfutures https://pypi.org/project/futures/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" test_futures.py || 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/futures/metadata.xml b/dev-python/futures/metadata.xml
deleted file mode 100644
index fe6bd5c7f063..000000000000
--- a/dev-python/futures/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">agronholm/pythonfutures</remote-id>
-		<remote-id type="pypi">futures</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 44ce0808f8a1..f9d20f094091 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -8,3 +8,4 @@ DIST hypothesis-python-5.36.2.tar.gz 9088227 BLAKE2B 578c28d045f3b3f288d43765d55
 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
 DIST hypothesis-python-5.37.3.tar.gz 9092178 BLAKE2B 1d7caae90176ce62a235679bf55ae4142bb9647195e10271321891bc45d25ac5e90e4fcc6cb00af3018f69f99ac408256b72280af67e42d2c74ca66cb63d3c4c SHA512 d2c7a7a0799eb5468d38e4b15d793ff37a52b02afffe4726078daf62cb3530f1f8fbc605b20ae4120440b63bbcbc57ba85aee78945eeaca6b105b6940e3cbb51
+DIST hypothesis-python-5.37.4.tar.gz 9092324 BLAKE2B 95ea82c1a64eaa63f0dc662a9c34a51245dc5ebdd95faffe336bce64f02947031e4b8b09eccf45cdb1f5ba851cbc66bcb0baeab74063b9572527c7b3159abd71 SHA512 7eb5299bb9a3206773dda56f560e6ec41f49d052b03782e1c10cd2d5fd62dd8757ccd7ba201612769c8ee5326602af5f1ae1bc0626d88b1f30bae0c610fd42be
diff --git a/dev-python/hypothesis/hypothesis-5.37.4.ebuild b/dev-python/hypothesis/hypothesis-5.37.4.ebuild
new file mode 100644
index 000000000000..31c848539467
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.37.4.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/ipaddress/Manifest b/dev-python/ipaddress/Manifest
deleted file mode 100644
index 2c77b8c807b7..000000000000
--- a/dev-python/ipaddress/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ipaddress-1.0.23.tar.gz 32958 BLAKE2B 96f8f3065aaa082c67c5468598e78bf928653588333f8f96c47aafea30c6aa5e3abf419f98e6388b9791a8f7e679f7fb31f36bb1d6a274a19b0e8ea434a8cbc1 SHA512 340e2a8698df1868038f55889671442eba17f06ec3f493759d8d0a9bf406eefbe1f67c14ca616f52e5bf2280942dcece7e89fb19de0923bee1ee20e60f48896e
diff --git a/dev-python/ipaddress/ipaddress-1.0.23.ebuild b/dev-python/ipaddress/ipaddress-1.0.23.ebuild
deleted file mode 100644
index 1d4fb753963b..000000000000
--- a/dev-python/ipaddress/ipaddress-1.0.23.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="IPv4/IPv6 manipulation library, backport of the ipaddress module"
-HOMEPAGE="https://github.com/phihag/ipaddress"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i 's:unittest.main():unittest.main(verbosity=2):' \
-		test_ipaddress.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" test_ipaddress.py || die
-}
diff --git a/dev-python/ipaddress/metadata.xml b/dev-python/ipaddress/metadata.xml
deleted file mode 100644
index 6cfd199fbae6..000000000000
--- a/dev-python/ipaddress/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">ipaddress</remote-id>
-    <remote-id type="github">phihag/ipaddress</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index e5b7f5799d33..cbecdb657033 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1 +1,2 @@
 DIST mongomock-3.20.0.tar.gz 109297 BLAKE2B 9045a74b4478f00ce4959b6890d5e5aedcbfd7dfddbfc8b7f77c60e64bfeef7c2bfc80c5e30a085fce7f5cf1411465c3551e585b0bc521f55597cc5806c977b1 SHA512 37b96634790eccd9874a68e7d74b234576ce928fdbd8705a7b1cf09d7c3dd69af5adab15ff6be5efefccbbf6e994f836e7b18fef5ae7e825fd22117449b6b983
+DIST mongomock-3.21.0.tar.gz 116340 BLAKE2B 5f6ff23bce50e2104a7772dd692e6341398b2fe4b8be07391285074e680661228ec50368e437fec201fb62eaafb5fa588c2cf27f9554602403fea3cf0eaabc55 SHA512 777d5eb7a4ffb2caa569149c600c0eb3bde2737d734f0f934787ee10af571771be201c9cb44b3464ef550e48c035de3ed31cabb2ddac9c0cb864516256cf5c2f
diff --git a/dev-python/mongomock/mongomock-3.21.0.ebuild b/dev-python/mongomock/mongomock-3.21.0.ebuild
new file mode 100644
index 000000000000..e34c7a3e568f
--- /dev/null
+++ b/dev-python/mongomock/mongomock-3.21.0.ebuild
@@ -0,0 +1,31 @@
+# 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="Library to help testing Python code that interacts with MongoDB via Pymongo"
+HOMEPAGE="https://github.com/mongomock/mongomock https://pypi.org/project/mongomock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	>=dev-python/pymongo-3.10.1[${PYTHON_USEDEP}]
+	>=dev-python/sentinels-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]"
+
+src_test() {
+	# Use NO_LOCAL_MONGO to disable tests that need a MongoDB instance.
+	# TZ=UTC needed for date/time tests to pass
+	TZ=UTC NO_LOCAL_MONGO=1 distutils-r1_src_test
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/numpy/numpy-1.19.2.ebuild b/dev-python/numpy/numpy-1.19.2.ebuild
index c8a1137cf342..785761051d3f 100644
--- a/dev-python/numpy/numpy-1.19.2.ebuild
+++ b/dev-python/numpy/numpy-1.19.2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/pathlib/Manifest b/dev-python/pathlib/Manifest
deleted file mode 100644
index 06065bbcfe6f..000000000000
--- a/dev-python/pathlib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pathlib-1.0.1.tar.gz 49298 BLAKE2B 918b363ebd4101fce50927dd83200cf94b44d820e9f422489be8b06cb5dfe732aa9373b936606a07efbfe0c624b685d1c9efe8851ba74aa60df9f45c08cd33be SHA512 d85e45dfcc85ce75a7e7b609163dc8c75c688f279c1833510185f280af5501e473376dc09bddc6a804d1fcc3177a939db85af37b7b8d5b183b9bc2b85b3b0f8b
diff --git a/dev-python/pathlib/metadata.xml b/dev-python/pathlib/metadata.xml
deleted file mode 100644
index 86b56165dc8d..000000000000
--- a/dev-python/pathlib/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pathlib</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
deleted file mode 100644
index 2d31ebdb200a..000000000000
--- a/dev-python/pathlib/pathlib-1.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=5
-
-# In Python 3.4, pathlib is now part of the standard library.
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Object-oriented filesystem paths"
-HOMEPAGE="https://pathlib.readthedocs.org/"
-SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-python_test() {
-	"${PYTHON}" test_pathlib.py || die
-}
diff --git a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
index 75936b562405..f2be55f3d41d 100644
--- a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ia64 x86"
+KEYWORDS="amd64 arm64 ~ia64 ~sparc x86"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pyogg/Manifest b/dev-python/pyogg/Manifest
deleted file mode 100644
index 6936b42048f1..000000000000
--- a/dev-python/pyogg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pyogg-1.3-r1.tar.gz 24094 BLAKE2B 5d9819d744564d99570cd43957c182e6bd7630c8447e44029357cd182bf9a4838a593f7de3bcdcc352c8ec99bfd7b80c6cc418608e4d5075804a73fe811b6e2a SHA512 aac8ac880080b3a0b7008fd52115b0790892a41abc36155fbd7b6b363f0bb0ed14b2c839cafe28233f17fed34f1511d3218db09df728bab6510c7f81e028577f
diff --git a/dev-python/pyogg/metadata.xml b/dev-python/pyogg/metadata.xml
deleted file mode 100644
index ad7081983829..000000000000
--- a/dev-python/pyogg/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="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pyogg/pyogg-1.3-r2.ebuild b/dev-python/pyogg/pyogg-1.3-r2.ebuild
deleted file mode 100644
index a3ad30e4bafb..000000000000
--- a/dev-python/pyogg/pyogg-1.3-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Python bindings for the ogg library"
-HOMEPAGE="https://www.andrewchatham.com/pyogg/"
-# Grumble. They changed the tarball without changing the name..
-#SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}-r1.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=media-libs/libogg-1.0"
-RDEPEND="${DEPEND}"
-
-DOCS=( COPYING ChangeLog )
-
-python_configure_all() {
-	tc-export CC
-	"${PYTHON}" config_unix.py --prefix /usr || die "Configuration failed"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/doc/${PF}/examples
-	doins test/*
-}
diff --git a/dev-python/python-fchksum/Manifest b/dev-python/python-fchksum/Manifest
deleted file mode 100644
index a1361c2355c5..000000000000
--- a/dev-python/python-fchksum/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-fchksum-1.7.1.tar.gz 26724 BLAKE2B 63385862b770c30098f80912c37b9e559fa4a1f400dcc30777cc8af4fe8abc2f658e41fc33035d7c6f04624960b499b04ae03257656589cd24986cd7f8273f5d SHA512 59b561e2938c41bcda2b98eb3fa0670be3fd85f8cb67368132ce239cac21760a5e9a5a05be2429992fa480ccd2e2aa457df7b4a07e709acbe42be9b1559f3060
diff --git a/dev-python/python-fchksum/files/python-fchksum-1.7.1-md5-align.patch b/dev-python/python-fchksum/files/python-fchksum-1.7.1-md5-align.patch
deleted file mode 100644
index 1adfa627fdd8..000000000000
--- a/dev-python/python-fchksum/files/python-fchksum-1.7.1-md5-align.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-the alignment of resbuf is not guaranteed, so use memcpy to move
-the bytes in/out.  on arches which can do unaligned accesses, this
-will generate the same code.
-
-patch by Mike Frysinger
-
---- a/md5.c
-+++ b/md5.c
-@@ -74,10 +74,13 @@ md5_read_ctx (ctx, resbuf)
-      const struct md5_ctx *ctx;
-      void *resbuf;
- {
--  ((md5_uint32 *) resbuf)[0] = SWAP (ctx->A);
--  ((md5_uint32 *) resbuf)[1] = SWAP (ctx->B);
--  ((md5_uint32 *) resbuf)[2] = SWAP (ctx->C);
--  ((md5_uint32 *) resbuf)[3] = SWAP (ctx->D);
-+  md5_uint32 swap;
-+#define set(i, c) { swap = SWAP (ctx->c); memcpy (resbuf + (i * 4), &swap, 4); }
-+  set (0, A);
-+  set (1, B);
-+  set (2, C);
-+  set (3, D);
-+#undef set
- 
-   return resbuf;
- }
diff --git a/dev-python/python-fchksum/metadata.xml b/dev-python/python-fchksum/metadata.xml
deleted file mode 100644
index ad7081983829..000000000000
--- a/dev-python/python-fchksum/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="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild b/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
deleted file mode 100644
index a47f93859e7c..000000000000
--- a/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to find the checksum of files"
-HOMEPAGE="https://code.fluffytapeworm.com/projects"
-SRC_URI="http://code.fluffytapeworm.com/projects/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-md5-align.patch )
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index 508cc4132a09..29265cfd33c5 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1 +1 @@
-DIST rosdistro-0.8.2.tar.gz 61328 BLAKE2B 2eb9c4ffc7eedaa040c48d3eb914ea08540adc4ff76ef83eb0fcf8d3d83989b499408953d76c7e9e7951488b269eb9bb3cd6b9db15650924e9c814c7aac60a6b SHA512 b96565dc8fbc000ed6b18285b04b435c7e3455b1e0938c7959cdd7f78749e1a0cf02b2eecba47077bec512d4f8b22923012a6496fb06a5d58ae97a859f8bc6c3
+DIST rosdistro-0.8.3.tar.gz 61665 BLAKE2B 2d5084409d8222cd277a710a06616fa914a35fb6750e32df7bdee6b7b0285df1b15648b8255cda4aa5867dba3611c5ea294db4711ebf2cc38a11648092623aab SHA512 19e248497b4001c522a84a52d768bc9f20a08020c88574d1a8345cf2173dc2aadd8a1480d4fddf2285ac579ee69dd0b6d4b930333cd6a9cbe32708efed2e5747
diff --git a/dev-python/rosdistro/rosdistro-0.8.2.ebuild b/dev-python/rosdistro/rosdistro-0.8.3.ebuild
index 177a0088eafb..35bf601a5669 100644
--- a/dev-python/rosdistro/rosdistro-0.8.2.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.8.3.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rosdistro/rosdistro-9999.ebuild b/dev-python/rosdistro/rosdistro-9999.ebuild
index 177a0088eafb..35bf601a5669 100644
--- a/dev-python/rosdistro/rosdistro-9999.ebuild
+++ b/dev-python/rosdistro/rosdistro-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/subprocess32/Manifest b/dev-python/subprocess32/Manifest
deleted file mode 100644
index a7d9550cd5cb..000000000000
--- a/dev-python/subprocess32/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST subprocess32-3.5.4.tar.gz 97373 BLAKE2B 712b6545684fc7908a24ffae94d0967e168773a3b52a0701828ee2741255919927d24972a3c0579dadb5b187a63429d2a24e089e535bd3c41d6f48adc27b1166 SHA512 c811bdb5842d9f5ed9e51df4d13ba39045fbe98ca6e90a2c8138e68e44c2a55a2f0f3eb3e77e26caa3f88c360584912b001a0ca37ba68ac6c946c68c7a37d29a
diff --git a/dev-python/subprocess32/metadata.xml b/dev-python/subprocess32/metadata.xml
deleted file mode 100644
index eee3c0c888bb..000000000000
--- a/dev-python/subprocess32/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">subprocess32</remote-id>
-    <remote-id type="github">google/python-subprocess32</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/subprocess32/subprocess32-3.5.4.ebuild b/dev-python/subprocess32/subprocess32-3.5.4.ebuild
deleted file mode 100644
index d94fbc6e13ea..000000000000
--- a/dev-python/subprocess32/subprocess32-3.5.4.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=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A backport of the subprocess module from Python 3.2/3.3 for use on 2.x"
-HOMEPAGE="https://github.com/google/python-subprocess32"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	"${PYTHON}" test_subprocess32.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/ttystatus/Manifest b/dev-python/ttystatus/Manifest
deleted file mode 100644
index e531933fee8e..000000000000
--- a/dev-python/ttystatus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ttystatus-0.36.tar.gz 30766 BLAKE2B 4fbb298a86472305a01ed7a8a41cbbea3f0e1677c8f5b349e71631d3474a59cbd65d114f55ad64339804ecb97bfc3e745cd93d09bc110c2c32f53404f898ecd8 SHA512 0005d18834eca702e4c96ab85216e3bb06fadf58555641405b2657b9f296b750d1084947d1a39c4e2c0bf0711ff859df06f1e859d6e82af41d2945e980529dcc
diff --git a/dev-python/ttystatus/metadata.xml b/dev-python/ttystatus/metadata.xml
deleted file mode 100644
index 3d4429370ed8..000000000000
--- a/dev-python/ttystatus/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/ttystatus/ttystatus-0.36.ebuild b/dev-python/ttystatus/ttystatus-0.36.ebuild
deleted file mode 100644
index dd20b044eb98..000000000000
--- a/dev-python/ttystatus/ttystatus-0.36.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} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Terminal progress bar and status output for command line"
-HOMEPAGE="https://liw.fi/ttystatus/"
-SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v -p '*_tests.py' || die
-}