Merge updates from master

109 files changed, 275 insertions, 2539 deletions

diff --git a/dev-python/py-gfm/Manifest b/dev-python/py-gfm/Manifest
index e78fce202d67..eda48d5ecc32 100644
--- a/dev-python/py-gfm/Manifest
+++ b/dev-python/py-gfm/Manifest
@@ -1,2 +1 @@
-DIST py-gfm-0.1.1.tar.gz 7326 BLAKE2B 9439a3bbfea66c43e9d4a8a1bbf51aec1029009510a39ad187d98555ae3b7ea9a9ebdb467d7ba220ff189350bb72fa91bc72b5baf19da5aaba64131d74ef744a SHA512 af10b15bb2b565904a8383f8e87d9f83cfbf55a5d20ac258759e74d1fa227a2224381ea9bf3f49c4ecb8718d195fabdae372fe572611428ae82b925a92bba7b5
 DIST py-gfm-0.1.4.tar.gz 21015 BLAKE2B a3060453ce9b2c0a4c3112f003439527c03b7b0be439b63620575e95265d8a65c1053546f9cacf19b6006ef2cbcfe5d8dae762740ce6e6aa035706a94bc611d1 SHA512 4730035b8a6168b6d2987a4a5f9a0ca70564e6797b7c88ec43f04152fa77c5a396f204b6143fc0bb3a53ab364b6d11b2274663b8b64d4640afba2a21cd1e3c6a
diff --git a/dev-python/py-gfm/py-gfm-0.1.1.ebuild b/dev-python/py-gfm/py-gfm-0.1.1.ebuild
deleted file mode 100644
index 712eaacb1ebb..000000000000
--- a/dev-python/py-gfm/py-gfm-0.1.1.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=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Github-Flavored Markdown for Python-Markdown"
-HOMEPAGE="https://github.com/google/py-gfm"
-SRC_URI="https://github.com/google/py-gfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index 046eb652deb8..095f1cd05aba 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,2 +1 @@
-DIST pyelftools-0.24.tar.gz 411874 BLAKE2B 304721cc440599d6436366c14a17d7e3132464686cdd870257a0180dd5f292a23c50a4e654966552d643875ac2683fda8584684cfeb611a3f22f02f73852a288 SHA512 5169617f9a8446ffc21dfc44ee185a388c8945a0296bdc6752483b0756888dccb10e3ee88e529d101cf31a4595de924b5c95f5459d5ee4448f57c0c4f2c56887
 DIST pyelftools-0.25.tar.gz 499493 BLAKE2B 941b21526d1225a4effa25d8f0245b326d5ec652cea6741240613c19af61e03a537fe363dd4c10a90760a7ddc6201e20dd83b6825ad185ae21696be6f4d1e52f SHA512 06ead53ada32676161193d7e5cdb3b9e4c1910dcb34f77a544f53445651f8118b582716bf8c5cc54efb21b1ddbbcdb4b41c533350af3c41553d103c7fc74702f
diff --git a/dev-python/pyelftools/pyelftools-0.24-r1.ebuild b/dev-python/pyelftools/pyelftools-0.24-r1.ebuild
deleted file mode 100644
index 6fe5be5f5353..000000000000
--- a/dev-python/pyelftools/pyelftools-0.24-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=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
-HOMEPAGE="https://pypi.org/project/pyelftools/ https://github.com/eliben/pyelftools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-python_test() {
-	# readelf_tests often fails due to host `readelf` changing output format
-	local t
-	for t in all_unittests examples_test ; do
-		"${PYTHON}" ./test/run_${t}.py || die "Tests fail with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyelftools/pyelftools-0.24.ebuild b/dev-python/pyelftools/pyelftools-0.24.ebuild
deleted file mode 100644
index 5cd8d0edaf96..000000000000
--- a/dev-python/pyelftools/pyelftools-0.24.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
-HOMEPAGE="https://pypi.org/project/pyelftools/ https://github.com/eliben/pyelftools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-python_test() {
-	# readelf_tests often fails due to host `readelf` changing output format
-	local t
-	for t in all_unittests examples_test ; do
-		"${PYTHON}" ./test/run_${t}.py || die "Tests fail with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyelftools/pyelftools-0.25.ebuild b/dev-python/pyelftools/pyelftools-0.25.ebuild
index 407d24a1f842..9386dcb3df0b 100644
--- a/dev-python/pyelftools/pyelftools-0.25.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 python_test() {
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 770422b95967..fb574d96922a 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,4 +1,3 @@
 DIST pyfakefs-3.7.1.tar.gz 179420 BLAKE2B 46f902527c2c69af1d7d5e296a25d5415b4fba68d4ed76d7bc138e4b2d53dbd4bf7dc6fd75a8e5277eccb9740c67d5fdf5b640fbc577f22690ee32db434c3676 SHA512 910cef89443546c9a5f600cbe06cbdc396ac82d15d852768c06c2f97e764b05ee9fe9bea7687404a9a962924bd33c45d9de2a04b448fe6350d8cc31c4e163dfc
 DIST pyfakefs-3.7.2.tar.gz 180195 BLAKE2B f1e76b652fc67f630fb45798974dc22455e9e99509829fbcaa479f36887c90207d7b6f087e89c9e113bb44df8c4221dc4676129663740812a9426d84a1d47401 SHA512 33bdbf7e21f1135c0ee048943a4b7dffec96e018285e4ee2e6a1c6a7f9e595e27348c83af3803d80322e7fd12a59985a6bf6342aa6211ba95c74ffa20929fb5a
-DIST pyfakefs-4.0.1.tar.gz 177542 BLAKE2B 05fe75da0f7525a51f01740c9c83e5cd1f9c565947439ea4c55a7c859b9952539b77a3c3754498d594aa83c77fbcf058131a0cacdba5218d6073de7775e58bf9 SHA512 cf87b8fd8e0c8948f2923e001a61790148b22898538ce190dbb6e13ba4ec5850e95a576d08c7aee94fd342becebf1e50c91bdecf6679a54300ae045b25509a73
 DIST pyfakefs-4.0.2.tar.gz 177627 BLAKE2B a52bd900466203af6170bb9ce92f1e5f73f246d576f12390f5b52224de34fa69a3a4c426319b701953f040e343bcf267e20ea2a33df62c4a46f6397f760330aa SHA512 ba14cbc278ece50142d441b7731b01ba316ba9f11e5d442476e12b8b678490aace9578eb3b2fa2e47d6805795ceaf85574d3c5fb992a098585597c7e96d7143a
diff --git a/dev-python/pyfakefs/pyfakefs-4.0.1.ebuild b/dev-python/pyfakefs/pyfakefs-4.0.1.ebuild
deleted file mode 100644
index 6851f87bd31c..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 030d4604c267..409aea85cb9c 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,2 +1 @@
-DIST pyflakes-1.6.0.tar.gz 48184 BLAKE2B a5762c23521aa68ea92537fbc2903bb7af64faf8d1fafc97e48e003f529f8c16ae8dca444c9122fc5c50618fec7120b2f2b2e6682e1d86e502ab49096cb42bfc SHA512 7e9c2aad6ebed638a1354cef51c7e1f68b25e59f8caf4694997a9afecd7cd8baa629a9363297ac0d961430f007fd22dcae7dae1bcbd7838a3b5d4285063bc7c5
 DIST pyflakes-2.1.1.tar.gz 58072 BLAKE2B 68dccddae2a9dc77f2d1f1251c80e2552935281b6b79e55fd2a0805cb30bf5e1c227b60a7e1f55f5f92ac42dfd18a69eb0b76ce06f43ac1c48dde3921817a271 SHA512 7ebf5843b38146305c1063e070480fea8ec3b47fa1be546b1fafaeb242a688a5a001f978e7257fd71d5905b9a338b466ef17c7330725191587e9c40ba632c3f8
diff --git a/dev-python/pyflakes/pyflakes-1.6.0.ebuild b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
deleted file mode 100644
index 876f5a0f54d6..000000000000
--- a/dev-python/pyflakes/pyflakes-1.6.0.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=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pyformance/Manifest b/dev-python/pyformance/Manifest
index eb27933535b8..675193548324 100644
--- a/dev-python/pyformance/Manifest
+++ b/dev-python/pyformance/Manifest
@@ -1,3 +1,2 @@
-DIST pyformance-0.3.4.tar.gz 19394 BLAKE2B 4bd141df5b3264ae8abb5b5314fcba93aeeab960e4d1d70631a3d5ac072f94a2da48b480f74c446124fb9fbd54a8ffad9c75b2352509aaf991025a02bf736648 SHA512 5dbc83da62bf66767eaaf316824cf5683488d8ee594b72baee327c4ef594f84b5aed07654da483aff29bee98605e5265425be88c165a4bb06e7bdddbbf28e440
 DIST pyformance-0.4-patches.tar.xz 3500 BLAKE2B 511001e9011db5ef25b802739dca51337d039193a9d3322bbf94bcb120bbbeff2e1a818217970a1a97d77cd8d7da462792248910acbb3ef586704596276b7056 SHA512 858cefd6c8b151db10c63e0d8117cd6c226bd153103993040909e8fd2ab7a41a7770a2ae6de0f395a4f9f6cce3213d7ecabc0bf647657ee04fc10d76f51e07e3
 DIST pyformance-0.4.tar.gz 20683 BLAKE2B d818832b7ff43a7e1db888bdb7dc333a532c7d3365dd472f9dbb3300f676cd3cc8f82f8d1c444aa277404ff8e72843eca35e3905542700ea37b1dad3e05c8b4c SHA512 a03324977b40f5097ae4608dd7c36bdbd2a20b261c9d3e32d1be19e5fca50e17fcc24df781b6c3ab60314534368c5e9cf08bc3863d4d2d7ecc59f9af26f8d20e
diff --git a/dev-python/pyformance/pyformance-0.3.4.ebuild b/dev-python/pyformance/pyformance-0.3.4.ebuild
deleted file mode 100644
index 65e0604698fb..000000000000
--- a/dev-python/pyformance/pyformance-0.3.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Performance metrics, based on Coda Hale's Yammer metrics"
-HOMEPAGE="https://pyformance.readthedocs.org/ https://github.com/omergertel/pyformance/ https://pypi.org/project/pyformance/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}] )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-python_prepare() {
-	sed -i -e "s/find_packages()/find_packages(exclude=['tests'])/" setup.py || die
-	sed -i -e "s/URLError, err/URLError as err/" ${PN}/reporters/influx.py || die
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/pyformance/pyformance-0.4.ebuild b/dev-python/pyformance/pyformance-0.4.ebuild
deleted file mode 100644
index 0092fe0ab5a3..000000000000
--- a/dev-python/pyformance/pyformance-0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Performance metrics, based on Coda Hale's Yammer metrics"
-HOMEPAGE="https://pyformance.readthedocs.org/ https://github.com/omergertel/pyformance/ https://pypi.org/project/pyformance/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}] )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-python_prepare() {
-	sed -i -e "s/find_packages()/find_packages(exclude=['tests'])/" setup.py || die
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 4740c1c3f0c9..b3ae74d328f3 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,2 +1 @@
-DIST pygame-1.9.3.tar.gz 2974541 BLAKE2B 38ba1f85d845cf33202819705ad564168fb3bc7041731d50d8c3f6bf1c55bebf41202f8ae9e4c4ba52cabe7335a9df13d7724104015b49842dc7f7aa7b0bfd19 SHA512 8920c598a97b4ff8602391517f070b67263bacb6330e13ea5d7d5432ee592a7c984fe986837b90a032da3d4e717f9df0cc99f0fb39f1cbde1b4f6a4c132feffe
 DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f361e9e0296b5c7d57c5949d3434a040d028249c5b8f3c865ac3dcdbb32e6f0b223186678595a8625213ba2a17 SHA512 d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0
diff --git a/dev-python/pygame/pygame-1.9.3.ebuild b/dev-python/pygame/pygame-1.9.3.ebuild
deleted file mode 100644
index 771b5b844792..000000000000
--- a/dev-python/pygame/pygame-1.9.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit flag-o-matic distutils-r1 virtualx
-
-DESCRIPTION="Python bindings for SDL multimedia library"
-HOMEPAGE="http://www.pygame.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86"
-IUSE="doc examples midi X"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=media-libs/sdl-image-1.2.2[png,jpeg]
-	>=media-libs/sdl-mixer-1.2.4
-	>=media-libs/sdl-ttf-2.0.6
-	>=media-libs/smpeg-0.4.4-r1
-	midi? ( media-libs/portmidi )
-	X? ( >=media-libs/libsdl-1.2.5[X,video] )
-	!X? ( >=media-libs/libsdl-1.2.5 )"
-RDEPEND="${DEPEND}"
-
-DOCS=( WHATSNEW )
-
-# various module import and data path issues
-RESTRICT=test
-
-python_configure() {
-	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" "${EPYTHON}" config.py -auto
-
-	if ! use X; then
-		sed -e "s:^scrap :#&:" -i Setup || die "sed failed"
-	fi
-
-	# Disable automagic dependency on PortMidi.
-	if ! use midi; then
-		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
-	fi
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" virtx "${EPYTHON}" -m pygame.tests
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Bug #497720
-	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/*
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-}
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index c4ece9e20ee3..115de33ac521 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,2 +1 @@
-DIST pyghmi-1.0.22.tar.gz 123267 BLAKE2B 8cfa716d04411dc5228d86cf8813ddb4fb61b7bfeb6618f0182fe42c7ed1deb46e876e085a732d69b3c7390c37a8bc62a3bf15313166574ec98ccefa784b97eb SHA512 9e3bc6b5f33d5496d7e58d2ea558d20d45a7690d493f2d1ad56fdd5570279a38e8934d8425c3d3207d8001da85a9a0b1319463b802fa9f121db7448aa919bddc
 DIST pyghmi-1.5.5.tar.gz 195830 BLAKE2B de7acc04e4b33f9a623cbe1afcd0caf869dea3e635df5e7ee1c609ac223cd6bf203735da54b6fe0e9f9a98e2371077f6e2d29dea60112014d58477195e798118 SHA512 9f1e1e0f0cf88c0ff794a29e4116b20dcf5eae141c1eefb6c5b8e3fae948fe6f928cd98dc4b95248c5cddab1cea3b841818e3255ec85c11d5c039dcc2c315cbb
diff --git a/dev-python/pyghmi/pyghmi-1.0.22-r1.ebuild b/dev-python/pyghmi/pyghmi-1.0.22-r1.ebuild
deleted file mode 100644
index d825c3250b25..000000000000
--- a/dev-python/pyghmi/pyghmi-1.0.22-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of IPMI protocol"
-HOMEPAGE="https://github.com/openstack/pyghmi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
-#636824 older versions of cli_helpers break the build
-DEPEND="${RDEPEND}
-	!<dev-python/cli_helpers-1.0.0
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		dev-python/subunit[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed '/^pycrypto>=2\.6$/d' -i requirements.txt || die
-}
-
-python_test() {
-	esetup.py testr --coverage || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 63a00627e864..7a18ca650963 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,4 +1,2 @@
-DIST Pygments-2.3.1.tar.gz 3124216 BLAKE2B 99a5f96a2d2f9deb1a6b6ad94a21ab7f517cde47b1e91b67ce594732004cf99db51b1240e0270473f87f5d8a435172545b9fa3449a2ddc113faf5aaef6c34f73 SHA512 2c36cb42f8dd62e04b7664b5e87f951a8428ccbb6dbe5b5b43d8c7e6923ada0ab55a231bb8e9ed79eb5a85344ed64d3acc8e7bc991ab1f49c58eb612b8002c1e
-DIST Pygments-2.4.2.tar.gz 9405880 BLAKE2B 20a955fce2b06ab12bd4ede4da9308f1cc5f2286391146fd83f3d598cd38ae66e7df3c1d779c8f6f5de67ad92d032ff02fef8f41141edb007e2f24d3586d82e6 SHA512 c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66
 DIST Pygments-2.5.2.tar.gz 20263984 BLAKE2B fab5d11458bcb3bd9a825026f119c0bde6f672b00704f3d5db24ce050b959f0c1a34544642fc1b5911f6ae12a9b595a2cbedadc791d6a3e8c83da1a1add60471 SHA512 d6715ca26cdb68d4c771bb530b2395805025c14c78d9099b033d3410ea239c41033fb611e43e39cbaa4ac38078a09324d8cfde42269129be0a096dcc13586859
 DIST Pygments-2.6.1.tar.gz 3303050 BLAKE2B 105f43301d2e7348937345519fe04817fa5baa5de4d0b9b0e9096d34612018bb992721df58a24008b009c0690054ac02c18c57b6b1a8a68039f9b4d20b5900a6 SHA512 0d793bb6eabe43645541347e44932ee50ccd4309f40e7a327422bcbe57d40a7cb8bbf2fb0911744ed6f316c6c08f4216462be88d79192a2ea004d6da51329932
diff --git a/dev-python/pygments/files/pygments-2.2.0-pep479.patch b/dev-python/pygments/files/pygments-2.2.0-pep479.patch
deleted file mode 100644
index 28d40e9566a2..000000000000
--- a/dev-python/pygments/files/pygments-2.2.0-pep479.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# HG changeset patch
-# User Miro Hrončok <miro@hroncok.cz>
-# Date 1530720528 -7200
-# Branch py37
-# Node ID 933b5f6afe35e6d554f46085a4e62dc5bf413c87
-# Parent  7941677dc77d4f2bf0bbd6140ade85a9454b8b80
-PEP 479: Raising StopIteration from a generator is now an error
-
-So we return instead. Fix needed for Python 3.7.
-
-Fixes https://bitbucket.org/birkenfeld/pygments-main/issues/1457
-
-diff --git a/pygments/lexers/lisp.py b/pygments/lexers/lisp.py
---- a/pygments/lexers/lisp.py
-+++ b/pygments/lexers/lisp.py
-@@ -2327,13 +2327,13 @@
-             token = Name.Function if token == Literal else token
-             yield index, token, value
- 
--        raise StopIteration
-+        return
- 
-     def _process_signature(self, tokens):
-         for index, token, value in tokens:
-             if token == Literal and value == '}':
-                 yield index, Punctuation, value
--                raise StopIteration
-+                return
-             elif token in (Literal, Name.Function):
-                 token = Name.Variable if value.istitle() else Keyword.Type
-             yield index, token, value
-diff --git a/pygments/lexers/sql.py b/pygments/lexers/sql.py
---- a/pygments/lexers/sql.py
-+++ b/pygments/lexers/sql.py
-@@ -347,7 +347,10 @@
-             # Emit the output lines
-             out_token = Generic.Output
-             while 1:
--                line = next(lines)
-+                try:
-+                    line = next(lines)
-+                except StopIteration:
-+                    return
-                 mprompt = re_prompt.match(line)
-                 if mprompt is not None:
-                     # push the line back to have it processed by the prompt
diff --git a/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch b/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch
deleted file mode 100644
index bb7c6074ff9d..000000000000
--- a/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User WAKAYAMA Shirou <shirou.faw@gmail.com>
-# Date 1500298269 -32400
-# Node ID 1a78f58afb5066cf35b04676d0d5ffbb18d5d540
-# Parent  7941677dc77d4f2bf0bbd6140ade85a9454b8b80
-Change to docutils.parsers in sphinxext.
-
-From Sphinx 1.7, sphinx.utils.compat will be removed.
-
-diff --git a/pygments/sphinxext.py b/pygments/sphinxext.py
---- a/pygments/sphinxext.py
-+++ b/pygments/sphinxext.py
-@@ -16,7 +16,7 @@
- 
- from docutils import nodes
- from docutils.statemachine import ViewList
--from sphinx.util.compat import Directive
-+from docutils.parsers.rst import Directive
- from sphinx.util.nodes import nested_parse_with_titles
- 
- 
-
diff --git a/dev-python/pygments/metadata.xml b/dev-python/pygments/metadata.xml
index c3ac451b5ed0..1af0e3d5058b 100644
--- a/dev-python/pygments/metadata.xml
+++ b/dev-python/pygments/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<longdescription>Pygments is a syntax highlighting package written in Python. Pygments can output to html, bbcode, latex, rtf and other formats.</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Pygments</remote-id>
 		<remote-id type="bitbucket">birkenfeld/pygments-main</remote-id>
diff --git a/dev-python/pygments/pygments-2.3.1.ebuild b/dev-python/pygments/pygments-2.3.1.ebuild
deleted file mode 100644
index a76b57598725..000000000000
--- a/dev-python/pygments/pygments-2.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1 bash-completion-r1
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		virtual/ttf-fonts
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-	# With pypy3 there is 1 error out of 1556 tests when run as is and
-	# (SKIP=8, errors=1, failures=1) when run with 2to3; meh
-	nosetests --verbosity=3 -w "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.4.2.ebuild b/dev-python/pygments/pygments-2.4.2.ebuild
deleted file mode 100644
index 8f27abd2d8b2..000000000000
--- a/dev-python/pygments/pygments-2.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1 bash-completion-r1
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="https://pygments.org/ https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		virtual/ttf-fonts
-	)"
-
-distutils_enable_sphinx doc
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-	nosetests --verbosity=3 -w "${BUILD_DIR}"/tests ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.5.2.ebuild b/dev-python/pygments/pygments-2.5.2.ebuild
index 78623806f39e..ea1d0519ad92 100644
--- a/dev-python/pygments/pygments-2.5.2.ebuild
+++ b/dev-python/pygments/pygments-2.5.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 5b9e19f64c7f..d604ba749b3f 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,3 +1,2 @@
-DIST PyGreSQL-5.0.4.tar.gz 637569 BLAKE2B 3f7bddb8b5e455ca4f181d254d4d125b89a64d7aaa1440b9ab5d916c395b9d93fc9814269992c134b6fd8a81f436752dbe4d7c06125e683a5257361d428c6a6f SHA512 f177ca3b023c007dafe80369b86a1742ff334137e493c3c19ac8bda0181d2543cd2431b8ab8d2d43f30d681121324bc4f236a9ebbddf1e927b071db7c9b34ea6
 DIST PyGreSQL-5.0.6.tar.gz 648481 BLAKE2B 7e1d96b5c09a3d2f0e412504be27fcfa557804ace8a4c24d657f586a8e647f5001da943543d49f6d2bdec48a34017b7379305fb760436065ba7f36ce981d85c2 SHA512 fb42f462d749f824f52dd424464ecc3591e615e7e0d220a63a217797aeb3f05379fab071480946d09779dbdb9028351a596160989066589dde1be18f7d320ac8
 DIST PyGreSQL-5.1.tar.gz 642216 BLAKE2B 4f3ff4e59c47d86007884b41355ec5cbc3893ba21e3e5b7a354aab698dde947622ba4b7a1590325ae36f132759e26f37868844c3c21605ead068261129331453 SHA512 d36be0f121c20469193600c551e15b430fdc9e44db00e4ae7adb4985697ddc5653f52fb642b0f3de8316fb916616d07ac1ef03e1e6b20043b7cace131b232a3a
diff --git a/dev-python/pygresql/pygresql-5.0.4.ebuild b/dev-python/pygresql/pygresql-5.0.4.ebuild
deleted file mode 100644
index 94062a1af335..000000000000
--- a/dev-python/pygresql/pygresql-5.0.4.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
-
-POSTGRES_COMPAT=( 9.{4..6} 10 )
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 postgres
-
-MY_P="PyGreSQL-${PV}"
-
-DESCRIPTION="A Python interface for the PostgreSQL database"
-HOMEPAGE="http://www.pygresql.org/"
-SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc sparc x86"
-IUSE=""
-
-REQUIRED_USE="${POSTGRES_REQ_USE}"
-
-DEPEND="${POSTGRES_DEP}"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	local DOCS=( docs/*.rst docs/community/* docs/contents/tutorial.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyinsane/Manifest b/dev-python/pyinsane/Manifest
index 8fbb94bd5928..057519063577 100644
--- a/dev-python/pyinsane/Manifest
+++ b/dev-python/pyinsane/Manifest
@@ -1,3 +1 @@
-DIST pyinsane-2.0.10.tar.gz 327159 BLAKE2B ae63e08fc557513ccac0633fac47bb29b3c8a023c481289ec60724f5fcdae0827e02d5f37d3f104d454ebcb1d1a7681248866461bce6201f056c988f858aa0d3 SHA512 bb882ab51c1e6cea7cad75851ffe5918ee08467d4772d27c23a0c5ec9f2dea3ee7d83601ae35e56e2f717ff7683cec5a45aa47b2a4e167fe4dddb9db3229a3b1
-DIST pyinsane2-2.0.12.tar.gz 56107 BLAKE2B 81085e414f162c4fe3623e05b904c35864b95c8ceb5aa25cb92aa87086d4ee44f9f1bea58239373217e93793bfba0d8bb894ab75d69d6c213741cf6e53721284 SHA512 72fc87d5c7eab078f4a9694569c5759046587a8439820fadfe1b8899b7445e063f9fc2f3e93a86b1f9329f729466a5e19b86e46c128caf9ac8b143cfd9e17817
 DIST pyinsane2-2.0.13.tar.gz 57172 BLAKE2B 26081f7df1d4077f2580f8968c20a88092446136f441fab16a8bc1e34ffc9d5e11221c6a3f74a111f66f839d3cea5ed7518ebe4321b563cba1f3cb3a6053bf74 SHA512 613ea6aae00df550089a691ef6cdd00ea00324ad3a02e35bcb1cd1b0723e34afe9692828100115432e5df9c7bef09f861ce3e1d06915c02c007f92bc8030a91b
diff --git a/dev-python/pyinsane/pyinsane-2.0.10.ebuild b/dev-python/pyinsane/pyinsane-2.0.10.ebuild
deleted file mode 100644
index 601103ec150e..000000000000
--- a/dev-python/pyinsane/pyinsane-2.0.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the Sane API and abstration layer"
-HOMEPAGE="https://github.com/openpaperwork/pyinsane"
-SRC_URI="https://github.com/openpaperwork/pyinsane/archive/${PV}.tar.gz -> ${P}.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
-
-python_prepare_all() {
-	sed -e "/'nose>=1.0'/d" \
-		-e "s/find_packages()/find_packages(exclude=['examples','tests'])/" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyinsane/pyinsane-2.0.12-r1.ebuild b/dev-python/pyinsane/pyinsane-2.0.12-r1.ebuild
deleted file mode 100644
index 5dba14178755..000000000000
--- a/dev-python/pyinsane/pyinsane-2.0.12-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-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/pykka/Manifest b/dev-python/pykka/Manifest
index bf4cddfd4278..35ce1fa09aab 100644
--- a/dev-python/pykka/Manifest
+++ b/dev-python/pykka/Manifest
@@ -1,2 +1 @@
-DIST Pykka-1.2.1.tar.gz 46252 BLAKE2B 48d351924874c3a26436643aef1bdeede1dc008b1edad67a4dca5aa29b13d421fd1643d1e9ec23bbe9ba16e638911b382389df878a2b53f7826ebf3d9058adaf SHA512 22eaa735915e33146d8a3fa3f9dd5ea1dd608e7ad45ab21721a108b01ddf058b4cd00da67b762a95ede650c9ba1a79ee3d6fd22a491bc7ff348a56b7c0139cfd
 DIST Pykka-2.0.2.tar.gz 51858 BLAKE2B 62132a3ded257d44d9504258418abc73ec9cc09353ab8e1948c9910fc11f67f770510b2dc7cf122db9af9ff62091757b648dce69cbdab0ffc17567169749d0d2 SHA512 98b2e6122dc5158da489265cf7cf9e358bfa432d0a0eaab9f50a07c0050083afb19aad494e4cd27347c376947eafb7d9796909c18e3648ef1bf0685bd6384e5b
diff --git a/dev-python/pykka/pykka-1.2.1.ebuild b/dev-python/pykka/pykka-1.2.1.ebuild
deleted file mode 100644
index 13ddfa3a12b7..000000000000
--- a/dev-python/pykka/pykka-1.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python implementation of the actor model"
-HOMEPAGE="https://www.pykka.org/en/latest/ https://github.com/jodal/pykka"
-SRC_URI="mirror://pypi/P/Pykka/Pykka-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/Pykka-${PV}
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index 6ebe796606c5..feb43bfc373d 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,2 +1 @@
-DIST pykwalify-1.5.2.tar.gz 42965 BLAKE2B a4c0479e12975e3b603c9293bbce04564415c07ffad88b54784aa6e723465c097f50a732bf2925833f80fc5e6c86cdd39b72ebd76f4b1ba118e9e2991e2dc2ae SHA512 1ec425f4a755dfd6e94b7e6ed098b49919e4d0de46c984e73c6452370ecb8898dc00cc383b01b27153b0d5e12dd6f5d1df4f6324e1e4f9413ed7a4d1565c5d50
 DIST pykwalify-1.7.0.tar.gz 69402 BLAKE2B ad2ecafad8457509a5517917cd3bbb078a244a9ef96e5560efc4f6b0c4a3939df7f20a9e3e72e43be97edb8af6315d49e2c2f3248aaf17d3c4f0962f60132185 SHA512 d0db48814712dc26eeac8f00ee0751a006c8b00521c9829e3c1a4ecedd6083194e9e28da1ed3c13eaff30d9b5c3dd1dbb499ba8864251400e34c23911110d848
diff --git a/dev-python/pykwalify/pykwalify-1.5.2.ebuild b/dev-python/pykwalify/pykwalify-1.5.2.ebuild
deleted file mode 100644
index 5afa8ea89c6b..000000000000
--- a/dev-python/pykwalify/pykwalify-1.5.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
-HOMEPAGE="https://pypi.org/project/pykwalify/ https://github.com/Grokzen/pykwalify"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/docopt-0.6.2
-	>=dev-python/pyyaml-3.11
-	>=dev-python/python-dateutil-2.4.2
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4.0-S.patch )
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/pylibacl/Manifest b/dev-python/pylibacl/Manifest
index 6c928c50eea5..dc3f852491c4 100644
--- a/dev-python/pylibacl/Manifest
+++ b/dev-python/pylibacl/Manifest
@@ -1,2 +1 @@
-DIST pylibacl-0.5.0.tar.gz 23886 BLAKE2B fdc447701d2856a460ad6cf5d4a31e9334cf5cda668af7d44c780bfb3320d2aa9d58e44d43d2b43b134a9fbac76d657a03f9190fd0c8ce1b6f4061da93cee56a SHA512 c12390b6a0ca73fd351b84860a9d68d74126dbcd8656916d677a39002a6e4abbac704d450b0b0118bba40987cdd11cc11ad14008de39dac8dc9ca7587ae54c46
 DIST pylibacl-v0.5.3.tar.gz 32792 BLAKE2B 005785dda2b7933ff71dd1296b1d4315a6492fc893aba56136c775f78b9aa3bd8f9d4898bbe0160fac53a306329977ddaecd073739531ba42dd0b6cc622b9eef SHA512 ea648acc3df9e1cf2fd68576b0b691a353b257d00b74fc80aa7f60089b9dbc912452ebe6b84da2930cac888b9047740530dd0e38b4d5be52c37fc6d3a29a7ce2
diff --git a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild b/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
deleted file mode 100644
index 894668c1b9a2..000000000000
--- a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="POSIX ACLs (Access Control Lists) for Python"
-HOMEPAGE="https://pylibacl.k1024.org/
-	https://pypi.org/project/pylibacl/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="sys-apps/acl"
-DEPEND="${RDEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-# Tests are missing in the tarball.
-RESTRICT="test"
-
-python_test() {
-	if ! "${PYTHON}" test/test_acls.py; then
-		eerror
-		eerror "If you got the following errors:"
-		eerror "\"IOError: [Errno 95] Operation not supported\","
-		eerror "then you should remount the filesystem containing"
-		eerror "build directory with \"acl\" option enabled."
-		eerror
-		die "Tests fail with ${EPYTHON}"
-	fi
-}
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index f98ddd40cd53..68a4f2e095a6 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1,2 +1 @@
-DIST pylibmc-1.5.1.tar.gz 69525 BLAKE2B 5039ad7d99a5ca57bd6cf7f00c77cc8bba122fe5852de164df34a71b4f5d1e4fcb428e749a66d384691b74f30b99e000f5cb9cd6479af2fc324d885b0fa59aa7 SHA512 efc40fae9721a6be589f87b66109132d4656725f718e1d63d7d25b9b27790b7c00fc3c7e4e47235895b7127cebc64229ddb284d23d0d903d3a510da7e1ce4549
 DIST pylibmc-1.6.1.tar.gz 72061 BLAKE2B ebaa6f9dfc341d862a8b46bbbf0db1420ff400cb40390f7bee6bf198ff941ad7967b578040ffe1209721ea84a163a39649108a2a23f3dadc2d579db740b2ccf3 SHA512 a3874435389486b29bab5f1d29e5c179d67655d90995bb27fcb7cd46ce7eb3b60117b94f901602f8a65dc0e587d5f8edfcf15e259effd439411adb58ddb7065e
diff --git a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
deleted file mode 100644
index a8c201bb4de2..000000000000
--- a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Libmemcached wrapper written as a Python extension"
-HOMEPAGE="http://sendapatch.se/projects/pylibmc/ https://pypi.org/project/pylibmc/"
-# One image is missing from the doc at PyPI
-# https://github.com/lericson/pylibmc/pull/221
-SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/libmemcached-0.32"
-# Older sphinx versions fail to compile the doc
-# https://github.com/sphinx-doc/sphinx/issues/3266
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-1.5.1-r1[${PYTHON_USEDEP}] )
-	test? (
-		net-misc/memcached
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -e "/with-info=1/d" -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		# This variable is added to sys.path
-		# but it does not seem to be useful
-		PYLIBMC_DIR="." emake -C docs
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	memcached -d -p 11219 -u nobody -l localhost -P "${T}/m.pid" || die
-	MEMCACHED_PORT=11219 nosetests
-	local ret=${?}
-	kill "$(<"${T}/m.pid")" || die
-	[[ ${ret} == 0 ]] || die "Tests fail with ${EPYTHON}!"
-}
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index 712a14d57534..dc88cd80e216 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,2 +1 @@
-DIST pymediainfo-4.0.tar.gz 432284 BLAKE2B 1159f48f28f0a3473327830e56a27fcd14dc9d9dceeac6f90d52a048229d87e97d3b88ef865eefe454c8cebf55148981b2e88127e863682e00992d56c2906048 SHA512 988f0d8a212bc5893925bd96a5b41a1a2c8e9508c747e7aa1106f3a065ad5707a7ed9de71264d74ba6637a2b8efbdeeed3677d779167bb90f643d40f81c5a74e
 DIST pymediainfo-4.1.tar.gz 432848 BLAKE2B e4bac2b43ee7c6ecb978bb08eb5c7070f458b7a00607c0a1d68a5e74d4f6393d7bb44d7e3471a4ab83bc45e19e4f3ab6b7779c28c16845c27a4895d76fa34d64 SHA512 08ffca0c3179aa6dff5b3007faaec1f1a2f372b2995824039021f41b2c772a2a13370c1dbd37d2408d023be497cff71dd6f46b09c8989f168976d75723cd7722
diff --git a/dev-python/pymediainfo/pymediainfo-4.0.ebuild b/dev-python/pymediainfo/pymediainfo-4.0.ebuild
deleted file mode 100644
index d65479d3514f..000000000000
--- a/dev-python/pymediainfo/pymediainfo-4.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around the mediainfo library"
-HOMEPAGE="https://github.com/sbraz/pymediainfo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/libmediainfo
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/alabaster[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Skip a test which requires network access
-	pytest -vv tests/test_pymediainfo.py -k "not MediaInfoURLTest" \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index 4964ec1ecd1b..da11990270ae 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,6 +1,2 @@
 DIST pymongo-3.10.1.tar.gz 715892 BLAKE2B df1f8ae34366ea9de633be7e1ca103a2bc704a18a9b23cb1fbdbc8d116e939d4d5462e18a076149d93dcb8ada9f4737ed2d61b08803b546dce89dca4b2416689 SHA512 5a73ac17ef6f6783a573facd90879dbefa0c95d69123bc67c1a6af0987cb5786f637b8fa81a6810387acc34829a4cde33b848ac0f7b08f7d07faa90a8e13b595
-DIST pymongo-3.4.0.tar.gz 583303 BLAKE2B 2031b52731db8c5def167b2aceb4e1d064f0ff2391f71d2507cfc03ab932b4e1150d61a7b039b6183f5aa305e5e562110709a858174f37f0523d44d50d7c642c SHA512 c59dcc08803f23134aa4a86605fab0f5c59b829325b632fc1e0149f20018a544b3d65f3c1fda6066248cd258715339b1771ca8d40c38be02c301f5b6421abd1b
-DIST pymongo-3.5.1.tar.gz 1332463 BLAKE2B d581409a4b6cdede3e126e31747d34ed0e238919163ed442477ae51765ebdd1ebfb53fc94f7f1f53161c2019bf9db46640730aa54f19af6af25a37c95372308d SHA512 67526bcc27233b85226d7ef6aacce6dfb848efc88730fb8207c3b610f3943ac813f6c2842b7e514d733a65a2b7ea4f255574732e42372551b1b333e3437fd82f
-DIST pymongo-3.7.1.tar.gz 723014 BLAKE2B fd0be64f01006405f30e8d96e5edc0d565a8b67ec057a27b6143b4dd0592e2302efea65b6e3d4898d12e196b1efe01787aa608d8564573a83bfd193c703ba0c4 SHA512 34f7448c90a0741d1c80e5924d53e70d5c4bf74d140ea50cef1a519e11b7429dc8551ddb868ec4c02351da6619924ae0d4f7bfc12ef4fa9635c81e2f69aea30f
-DIST pymongo-3.7.2.tar.gz 628611 BLAKE2B 4eac5f11c8cd9a1bf8e0553a1fc3ec8f0a4bec0fd6b04dd75fe85da7315baa0e81a3c2b2aa4eba351aa4206aae974bce263f0630ac8828d8a982c4902cf7f518 SHA512 4d1dfe03d94f381f27cfb5c8dd4f75ecbab90567fdc4dd594b880031e68825eda6285c8b261a4c9d76fb7ccc92c91e27ae2f696525f7732b1f0084794042a33d
 DIST pymongo-3.9.0.tar.gz 701117 BLAKE2B c13b53f06fa1788f65de46b6a05474355e312a1cdd7798610b300c1a7bb9964d32243da52a4dad61d5b50e736c717f5549f61b28c06e1024505bdd3ec04ab99a SHA512 3ac8831ffd82c27bfbf8429a38fe26aed177ba68b89d0ddf043adfde326b8c01eea9be449bb985421f42677fab4dd5ab44e1c1c9eeb3aff41d792c660fe23e0b
diff --git a/dev-python/pymongo/pymongo-3.4.0.ebuild b/dev-python/pymongo/pymongo-3.4.0.ebuild
deleted file mode 100644
index 370d58e2bb4f..000000000000
--- a/dev-python/pymongo/pymongo-3.4.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-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 ~hppa x86"
-IUSE="doc kerberos test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-db/mongodb-2.6.0
-	)
-"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-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
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
-}
-
-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}" --smallfiles --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
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pymongo/pymongo-3.5.1.ebuild b/dev-python/pymongo/pymongo-3.5.1.ebuild
deleted file mode 100644
index 9d451611d6c1..000000000000
--- a/dev-python/pymongo/pymongo-3.5.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-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}] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-db/mongodb-2.6.0
-	)
-"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-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
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
-}
-
-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}" --smallfiles --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
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pymongo/pymongo-3.7.1.ebuild b/dev-python/pymongo/pymongo-3.7.1.ebuild
deleted file mode 100644
index 15d6079ea086..000000000000
--- a/dev-python/pymongo/pymongo-3.7.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-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}] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-db/mongodb-2.6.0
-	)
-"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-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
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
-}
-
-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}" --smallfiles --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
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pymongo/pymongo-3.7.2.ebuild b/dev-python/pymongo/pymongo-3.7.2.ebuild
deleted file mode 100644
index b3549a7429a7..000000000000
--- a/dev-python/pymongo/pymongo-3.7.2.ebuild
+++ /dev/null
@@ -1,120 +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_{6,7} )
-
-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}] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-db/mongodb-2.6.0
-	)
-"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-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
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
-}
-
-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}" --smallfiles --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
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pympler/Manifest b/dev-python/pympler/Manifest
index 27c2724d1bea..d392bb939e94 100644
--- a/dev-python/pympler/Manifest
+++ b/dev-python/pympler/Manifest
@@ -1,2 +1 @@
-DIST pympler-0.5.tar.gz 263627 BLAKE2B 5ce881664e2d57d1a7a9b87238cfc6657fd35a140e6ab906b55ca6e0ac91fc8a74377d4db21706708c55773f8ca65d3578c101669ba409339418e09ca53d0fb2 SHA512 254b758df70bafe57f315a973de0caeef6cd616bd0cc7b4475c74c3a9a94f52b3ac3da3f073483db3560cd0060536c95ed1297007c24dfe8db89fd893ff1409c
 DIST pympler-0.6.tar.gz 267267 BLAKE2B 84a8df3177d0defed949869bec9342beb4336c912be5539c597388207abcbc53fa5218da34b16a872dca804ff559a448dc092b4d33396d570164311c1808765a SHA512 891822ce0a76377d74aa99dd2ce8b21a364084f0bc03ab6d6fe505597a0e182dde459b218dff8e0e6a753e1d88ba9f01b3a4b97be31a20e73a93d6c6fee66e1b
diff --git a/dev-python/pympler/metadata.xml b/dev-python/pympler/metadata.xml
index b7d64a47521f..a403ca47e620 100644
--- a/dev-python/pympler/metadata.xml
+++ b/dev-python/pympler/metadata.xml
@@ -12,6 +12,7 @@ Python application, detailed insight in the size and the lifetime of Python
 objects can be obtained. Undesirable or unexpected runtime behavior like 
 memory bloat and other "pymples" can easily be identified.
 </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">Pympler</remote-id>
     <remote-id type="github">pympler/pympler</remote-id>
diff --git a/dev-python/pympler/pympler-0.5.ebuild b/dev-python/pympler/pympler-0.5.ebuild
deleted file mode 100644
index 1026066d1f6e..000000000000
--- a/dev-python/pympler/pympler-0.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="Pympler"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Memory profiling for Python applications"
-HOMEPAGE="https://pypi.org/project/Pympler/ https://github.com/pympler/pympler"
-SRC_URI="https://github.com/pympler/pympler/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# The PyPi tarball is missing the documentation
-#SRC_URI="mirror://pypi/P/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/bottle[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND} )"
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		sphinx-build -b html doc/{source,html} || die
-	fi
-}
-
-python_test() {
-	esetup.py try
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pympler/pympler-0.6.ebuild b/dev-python/pympler/pympler-0.6.ebuild
index ebabbbd13655..595d8e83ba12 100644
--- a/dev-python/pympler/pympler-0.6.ebuild
+++ b/dev-python/pympler/pympler-0.6.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
@@ -18,7 +19,7 @@ SRC_URI="https://github.com/pympler/pympler/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pynvim/Manifest b/dev-python/pynvim/Manifest
index a5468934c753..d09a29511c37 100644
--- a/dev-python/pynvim/Manifest
+++ b/dev-python/pynvim/Manifest
@@ -1,2 +1 @@
-DIST pynvim-0.4.0.tar.gz 53443 BLAKE2B de37fde43e90e8277f3c69cedde9226e929f122cc2ff3030766fa716069114bffb27ea9489f2de87c69d3e7a8e0ecc22397a94168cee542d37dc827dc3ed3d13 SHA512 4b3b0e295181cf8886850477d01daba1cba8ac456aedadc5b3881b0b4910724450c4e7774282f6edf3e322792b697ae8e925f40b2a0b181a95eee48aef42a97a
 DIST pynvim-0.4.1.tar.gz 52340 BLAKE2B 4efddfbb8d1eb10aeb53b77f665d6ee186f697cc9cb6b3be2001468755a80b0a3bd4e105fda498e1310be9f65da3a0a8b12209c46a7122bb70f860c0a91c12a0 SHA512 78cb343ad02603a0d1c8f56079b46a9d341d8808a19112e758e5299994fe12a433cd61a4dbbaf0d5ffe00c676bcff844a53e910093efb862ad48cc4b4326f7de
diff --git a/dev-python/pynvim/pynvim-0.4.0.ebuild b/dev-python/pynvim/pynvim-0.4.0.ebuild
deleted file mode 100644
index f76d791236f1..000000000000
--- a/dev-python/pynvim/pynvim-0.4.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_{6,7,8} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python client for Neovim"
-HOMEPAGE="https://github.com/neovim/pynvim"
-SRC_URI="https://github.com/neovim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DEPEND="
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	virtual/python-greenlet[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	${DEPEND}
-	app-editors/neovim"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -r -i "/^msgpack/d ; s:[\"']pytest-runner[\"'](,|)::" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
index 0b8dd725279b..92dfa12d0477 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -1,4 +1 @@
-DIST pyocr-0.5.3.tar.gz 18067 BLAKE2B f7e668630f0227d1e3df90de673f7c7b437f0c7ac0c5fb567ea1633df0184870d4472d5c2c4c48e7b65ebd8fa6516ae04409643910a527eb4a17ce2cfc00e504 SHA512 bc1010fab290e96a973dbdd6a4fe7ffae3bed0ecdf20615dc609e4a784faf9668c2673c2398626a3b08f1d840d1aa07661506d35343ae122ad2666f6a7107ba5
-DIST pyocr-0.6.tar.gz 17826 BLAKE2B bc7239a5a9d07f55650247d0586bc0856c8f0be6aa549d2816a3703559fffc8b53aee5e23b9e5a24a2e1c655d5c605c73dbaff9fd3129fe08ffbd6f24709b07b SHA512 f517f5c9180cd1cbf0faa56f733a8b6015abb4af25647f513f95022dd72ee0ba07350475b238dff810a35677278f457dfbf9448a50b9c275fa4f1aa08f4a4c2f
 DIST pyocr-0.7.2.tar.gz 65376 BLAKE2B 065084c19c7722e590c5f20abe5248b2be0c76dab864b4a4e2c457770ff61dec84df7254f19e4926753f39a5d1ed0618ed87827b85773ab96a51e3f7798c656f SHA512 002c3302ed20e19e06dc6fd995ce30150fb95650824df9e0a3d6b2bdcb4c0ae3f2295342c2df44e0d5a9c9bbf5432f47a9d7562e4866b87738ac3436a8c0dec9
-DIST pyocr-0.7.tar.gz 67838 BLAKE2B a5bb88ca981cf2bc68344d739ce35eaa7db26cae28c581cd72a7855e67ac668ea064ff2a71845ededa640a8e9a54fc0aaba464527cc43acea5eb4edf3812bd9a SHA512 054f3190eaaafea0e2b591af2220af519d8a2fe3c623417e4b84c52faf9d98339570e896983713e9fbb54087f5eb4afe0b1d6f56e43ea894f7206a7c17203438
diff --git a/dev-python/pyocr/pyocr-0.5.3.ebuild b/dev-python/pyocr/pyocr-0.5.3.ebuild
deleted file mode 100644
index 3d3deb7c592c..000000000000
--- a/dev-python/pyocr/pyocr-0.5.3.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_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
-HOMEPAGE="https://github.com/openpaperwork/pyocr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-IUSE="cuneiform +tesseract"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="cuneiform? ( app-text/cuneiform )
-	tesseract? ( app-text/tesseract )
-	dev-python/pillow
-	dev-python/six"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="|| ( cuneiform tesseract )"
-
-RESTRICT="test" # reguires tesseract[l10n_fr,l10n_en,l10n_jp]
diff --git a/dev-python/pyocr/pyocr-0.6.ebuild b/dev-python/pyocr/pyocr-0.6.ebuild
deleted file mode 100644
index 3ba44f6491c6..000000000000
--- a/dev-python/pyocr/pyocr-0.6.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_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
-HOMEPAGE="https://github.com/openpaperwork/pyocr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-IUSE="cuneiform +tesseract"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="cuneiform? ( app-text/cuneiform )
-	tesseract? ( app-text/tesseract )
-	dev-python/pillow
-	dev-python/six"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="|| ( cuneiform tesseract )"
diff --git a/dev-python/pyocr/pyocr-0.7.ebuild b/dev-python/pyocr/pyocr-0.7.ebuild
deleted file mode 100644
index 5c9f5232af77..000000000000
--- a/dev-python/pyocr/pyocr-0.7.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_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
-HOMEPAGE="https://github.com/openpaperwork/pyocr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-IUSE="cuneiform +tesseract"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="cuneiform? ( app-text/cuneiform )
-	tesseract? ( app-text/tesseract )
-	dev-python/pillow
-	dev-python/six"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]"
-
-REQUIRED_USE="|| ( cuneiform tesseract )"
diff --git a/dev-python/pyodbc/Manifest b/dev-python/pyodbc/Manifest
index ebf807f23fa4..2a7f9a316580 100644
--- a/dev-python/pyodbc/Manifest
+++ b/dev-python/pyodbc/Manifest
@@ -1,2 +1 @@
-DIST pyodbc-4.0.16.tar.gz 204168 BLAKE2B 6e3ee7bad91f26992264edbac9db946d0c290a7a0ea7843ad4a13cc03aaec19272f91ec611e812bf9ccf86267d04ed3e69e07ede1482f5892a29343d39f543d0 SHA512 53f80ee7333210a1e20e89aa17ca7c2b57363826ac09069213454951ae35f8de689535c05b2278783e8b4a71d178860c3e1efebf51980343a59a9b190e41dda5
 DIST pyodbc-4.0.23.tar.gz 215152 BLAKE2B 856c7222394b2a8efa4bae173189bf4753c800f1fc98c8054766243400574b3ddb4e45841892b6baf87c5f872de5c78c7a1a3d6b48c3aef9d38a68653ba14fab SHA512 1788fd1118e40449af730a99427c3188a01ec85592bc2dcc7a49fdf0d4332e27add62cfc5e6c20d635064d8ff28eb8b800621d8127e309ffcac4aba144b49049
diff --git a/dev-python/pyodbc/pyodbc-4.0.16.ebuild b/dev-python/pyodbc/pyodbc-4.0.16.ebuild
deleted file mode 100644
index a7c00a8be7c1..000000000000
--- a/dev-python/pyodbc/pyodbc-4.0.16.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="python ODBC module to connect to almost any database"
-HOMEPAGE="https://github.com/mkleehammer/pyodbc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="mssql"
-
-RDEPEND=">=dev-db/unixODBC-2.3.0
-	mssql? ( >=dev-db/freetds-0.64[odbc] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_configure_all() {
-	append-cxxflags -fno-strict-aliasing
-}
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
deleted file mode 100644
index 7ca6bce20653..000000000000
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Accelerate module for PyOpenGL"
-HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL-accelerate/"
-MY_PN="PyOpenGL-accelerate"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/pyopengl[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/pyotherside/Manifest b/dev-python/pyotherside/Manifest
index 19fa9f8ebd76..1636dd27521a 100644
--- a/dev-python/pyotherside/Manifest
+++ b/dev-python/pyotherside/Manifest
@@ -1,3 +1 @@
-DIST pyotherside-1.5.4.tar.gz 183745 BLAKE2B 3dad2486dbc3d2632999aff0a7a7af41f6fefcae011bd1dd92b491b4403bbd62adb9a8520af627d5f96644f4fb25e89ee8fb49277723d5f80521d2add984008d SHA512 feaf95e0c981a8fb8b3a57926f48f803584a371752e7f1d2f3c739ee220960df33ad4ca2a38322f3e56d4f8fde193bd7342105303d847b2f532937e8bf2c3b65
-DIST pyotherside-1.5.8.tar.gz 184812 BLAKE2B 6d6688ded2c726edf12a82611953a8124c49f904ab41a26a733eb74ff9fa071a4dcde4f3a2a21c424feebf6d85a0e5b3bf6179f3b48bb3828449ce1e5e6262ad SHA512 ff82bf693a239560001baa622c3854dbc920310573f4e565f247ac79a8ed717446231bc9a9d4990e9b8cb4032ca05d0c5ec9a1c87341be09238a62d005e6ac0f
 DIST pyotherside-1.5.9.tar.gz 185230 BLAKE2B 7130f17f29ed07cefc641d77631db46d08f3bd836c8517427e38fb454cbf34c2e875bb46798b3d785aa68064c24f154ed166617cde263f722e77eac6d0903980 SHA512 62c171b273b921d8e0220c7b73f0ff95a0a911eb3785cc37f3dab2ec624e54301ac5fbccfb57cac6a4bee967728624d4738b03aff0c5762452b99674cdff6ab2
diff --git a/dev-python/pyotherside/pyotherside-1.5.4.ebuild b/dev-python/pyotherside/pyotherside-1.5.4.ebuild
deleted file mode 100644
index 38f0db95337d..000000000000
--- a/dev-python/pyotherside/pyotherside-1.5.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit qmake-utils python-single-r1
-
-DESCRIPTION="Asynchronous Python 3 Bindings for Qt 5"
-HOMEPAGE="https://github.com/thp/pyotherside https://thp.io/2011/pyotherside/"
-SRC_URI="https://github.com/thp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-# Requires active X display
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e "s/qtquicktests//" pyotherside.pro || die
-
-	default
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/dev-python/pyotherside/pyotherside-1.5.8.ebuild b/dev-python/pyotherside/pyotherside-1.5.8.ebuild
deleted file mode 100644
index 810fffe8af51..000000000000
--- a/dev-python/pyotherside/pyotherside-1.5.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit qmake-utils python-single-r1
-
-DESCRIPTION="Asynchronous Python 3 Bindings for Qt 5"
-HOMEPAGE="https://github.com/thp/pyotherside https://thp.io/2011/pyotherside/"
-SRC_URI="https://github.com/thp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-# Requires active X display
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e "s/qtquicktests//" pyotherside.pro || die
-
-	default
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/dev-python/pyotp/pyotp-2.2.6.ebuild b/dev-python/pyotp/pyotp-2.2.6.ebuild
deleted file mode 100644
index cf29b9d0c728..000000000000
--- a/dev-python/pyotp/pyotp-2.2.6.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_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="PyOTP is a Python library for generating and verifying one-time passwords."
-HOMEPAGE="https://github.com/pyotp/pyotp https://pypi.org/project/pyotp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index 446e08a733d0..cf6a79c6692c 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,5 +1 @@
-DIST pyparsing-2.2.0.tar.gz 1232522 BLAKE2B 59420548fcee047e2b385d76b8ce034807eb3ac0fcdc9929f656cf4b81436c96c37d206b5d6b90ee6892e402df6b939fe9e793384d4cbe0618c8d06d5197586d SHA512 6a409f429d40a5ac202d144e4150de2c80d7c7120147f603f72a4a99797d48c50822a6437f590ec5ae4418d51aa1f6b1d4e5d95a57e19bec0a127b04e4937008
-DIST pyparsing_2.3.0.tar.gz 624393 BLAKE2B 9fd9bee7742953d455ea34310ef1668df0a7633642deb4eeff507439228ae018e4ba99d3476c5cfe374a908b58b0311527ae5f04ddec8eb7e219a2a9d4cbc8ce SHA512 2a4de9b208ee3c557fb6d050d5c3c20e35a11b21d35996fce5a0876d4f52952072bed7ae2ed157ae0ba388543dc554f4828a1da22712ae7d9f0d38a16b0a546e
-DIST pyparsing_2.3.1.tar.gz 619405 BLAKE2B 4c1b9abe6ce6e511a998eff19eb32c835144473bfe47204880f43979b1ad72f5c73ff72bfc17fcaa3cf2a9b52875f184b122927cc0d9f9eca5cc4facdc4a119d SHA512 8c0e2c7a7dc7ec12f3e7c260bde25a33f325af89d9bc2329b7882ebd8a3f506fb06a36fdaba0fd8ed48040d5b7fc5288c41b01f2df84459a9980a035cb213dd0
-DIST pyparsing_2.4.0.tar.gz 625419 BLAKE2B 5555a255cbfcbb076fe4d385b2da967bc44a7110acdd1a4715fb3e22db2a3f5b7bef1ad61423f6d0419cd8cb403abe222e426a96ea755044d04e0105c2798317 SHA512 2888b60c2518b19979e00b01ea499c45cd0a98affe0551f80ea7985acd649d62b4e231e142d3efd65cdcd9e3a0182680bfe1c4d98e310fa2ac476f37ac4ff344
 DIST pyparsing_2.4.6.tar.gz 647543 BLAKE2B f6c93fa1e9a7ece4cf6abcc74dae0c96becaf7f50eed5437a6410166e80768c17d429fa2d1e4d1958b2a7c5ad6ffd18218c5160bb0ebe03ae2963014612eecf3 SHA512 475b77f469d2051fb067796849f7c7d3df145f2c6cefc708c904a5b0af22661b4c229c521c2cac3c94621dde9bda6b28e428a8e31d936df6d4596d993263981e
diff --git a/dev-python/pyparsing/files/pyparsing-2.2.0-distutils.patch b/dev-python/pyparsing/files/pyparsing-2.2.0-distutils.patch
deleted file mode 100644
index 6fa4a30d92ad..000000000000
--- a/dev-python/pyparsing/files/pyparsing-2.2.0-distutils.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Force distutils to be used instead of falling back to it after trying
-setuptools in order to avoid bootstrap issues.
-
---- pyparsing-2.2.0/setup.py
-+++ pyparsing-2.2.0/setup.py
-@@ -4,10 +4,7 @@
- 

- # Setuptools depends on pyparsing (via packaging) as of version 34, so allow

- # installing without it to avoid bootstrap problems.

--try:

--    from setuptools import setup

--except ImportError:

--    from distutils.core import setup

-+from distutils.core import setup

- 

- import sys

- import os

diff --git a/dev-python/pyparsing/metadata.xml b/dev-python/pyparsing/metadata.xml
index 9a57fea5295c..84f7a71eb750 100644
--- a/dev-python/pyparsing/metadata.xml
+++ b/dev-python/pyparsing/metadata.xml
@@ -12,6 +12,7 @@
     classes that client code uses to construct the grammar directly in
     Python code.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="sourceforge">pyparsing</remote-id>
     <remote-id type="pypi">pyparsing</remote-id>
diff --git a/dev-python/pyparsing/pyparsing-2.2.0.ebuild b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
deleted file mode 100644
index d361c4fe6c4b..000000000000
--- a/dev-python/pyparsing/pyparsing-2.2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.org/project/pyparsing/"
-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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples"
-
-# not contained in the tarball
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}"/${P}-distutils.patch )
-
-python_install_all() {
-	local HTML_DOCS=( HowToUsePyparsing.html )
-	if use doc; then
-		HTML_DOCS+=( htmldoc/. )
-		dodoc docs/*.pdf
-	fi
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	${PYTHON} unitTests.py || die
-}
-
-pkg_preinst() {
-	_remove_egg_info() {
-		local pyver="$("${PYTHON}" -c 'import sys; print(sys.version[:3])')"
-		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			einfo "Removing ${egginfo}"
-			rm -r "${egginfo}" || die
-		fi
-	}
-	python_foreach_impl _remove_egg_info
-}
diff --git a/dev-python/pyparsing/pyparsing-2.3.0.ebuild b/dev-python/pyparsing/pyparsing-2.3.0.ebuild
deleted file mode 100644
index 40d6df647e97..000000000000
--- a/dev-python/pyparsing/pyparsing-2.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-# pypi releases and generated github tarballs lack tests
-#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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-# setuptools currently vendors its own copy of pyparsing to avoid bootstrapping
-# issues so depend on it here for consistency
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${PN}-${MY_P}
-
-python_test() {
-	"${PYTHON}" unitTests.py || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyparsing/pyparsing-2.3.1.ebuild b/dev-python/pyparsing/pyparsing-2.3.1.ebuild
deleted file mode 100644
index d1656de438ad..000000000000
--- a/dev-python/pyparsing/pyparsing-2.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-# pypi releases and generated github tarballs lack tests
-#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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-# setuptools currently vendors its own copy of pyparsing to avoid bootstrapping
-# issues so depend on it here for consistency
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${PN}-${MY_P}
-
-python_test() {
-	"${PYTHON}" unitTests.py || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyparsing/pyparsing-2.4.0.ebuild b/dev-python/pyparsing/pyparsing-2.4.0.ebuild
deleted file mode 100644
index b24dee689cbd..000000000000
--- a/dev-python/pyparsing/pyparsing-2.4.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-# pypi releases and generated github tarballs lack tests
-#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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-# setuptools currently vendors its own copy of pyparsing to avoid bootstrapping
-# issues so depend on it here for consistency
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${PN}-${MY_P}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyparsing/pyparsing-2.4.6.ebuild b/dev-python/pyparsing/pyparsing-2.4.6.ebuild
index ed0744fb4209..248ad10b5a2a 100644
--- a/dev-python/pyparsing/pyparsing-2.4.6.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~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="examples"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
index 3c6291e667a0..326c0ade048b 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -1,5 +1,2 @@
 DIST pyparted-3.10.7.tar.gz 99879 BLAKE2B f2d03415ec7623fbe25aeab70e53646aa5e576e9f20ac41ffe6c859be9572874579f5720b8d05191107f4143e2c6dd14d83a05798a345fa0ed8a81ce2634f599 SHA512 c57fed2a8d04511b12891fd59b6dd6840439aada7e5ebeab14a56e6e4f201c249046ee87d9d25af1b3f02960994efb0a2973f25928a9df85d48bbd1bc196ab07
-DIST pyparted-3.11.2.tar.gz 101318 BLAKE2B 0c79535d6f3a269d5dfdd6c31ec80569d8c7432cd058f90999ebfd61ef727762a395d902539c49744108e92ba1a351c1ec939c02188869bed6c808551a843f92 SHA512 de6e7387e3eb9c9cb11e01f475d2749d2ce22ec2f11386df20cafcf83f7e431828f2db936f29c717e42694ff390a592598893633156a21aa7c8d5700a3c9ece9
-DIST pyparted-3.11.3.tar.gz 105305 BLAKE2B 271d0ed91c187c66219f06e91def5e868d81494241a2e9137676162ffa388523f5cccb3ec6dfed655cb59da1ca56e7fde3bb9fafa227b86d8f7b279759fe237b SHA512 b10a89d076a27a074d606101dccb62176299dd8f9da75a5a4bf9c8a6683d2873b649d948736e991e4cfa21d43a54e7d2934da8e539ce8626ae5fd47e892ae286
-DIST pyparted-3.11.4.tar.gz 105345 BLAKE2B 55d41d44e286b6b737aeb65880996f8b69c99286cea672512a2f64118f346b38436de8e15fee45bf5ba8151155142a995e310549c6f3d47600351760d514dd3d SHA512 d0603235a0cfce6c93520eb8577f47f51c76016c396ed85cfa57777dfe0cf06c32605c91d7d0252e8910025347e1d3ebdec8c77d4b9db13ed380b7fdf0113de6
 DIST pyparted-3.11.6.tar.gz 105633 BLAKE2B 8c74fb3521f94cf726365e91954c56a60bc418c0e18c3401dc525f942169b1c03ade5fa35d5053daf4a4568b373e9a8771e50c76ea5b51c2f6351ce62ed2bb21 SHA512 8c3a86efb21c212a8f227ae324896552f45568b8facdd76729f5acf15bf7d691c1b9ab9e46885e4fa4e0c4c7d60314e2abfcbff212e5dc158d27ce716dbd50fa
diff --git a/dev-python/pyparted/pyparted-3.11.2.ebuild b/dev-python/pyparted/pyparted-3.11.2.ebuild
deleted file mode 100644
index d3ac7bb90e10..000000000000
--- a/dev-python/pyparted/pyparted-3.11.2.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_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for sys-block/parted"
-HOMEPAGE="https://github.com/rhinstaller/pyparted/"
-SRC_URI="https://github.com/rhinstaller/pyparted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-	>=sys-block/parted-3.1
-	dev-python/decorator[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.10.3-greater.patch
-)
-
-python_test() {
-	emake test
-}
diff --git a/dev-python/pyparted/pyparted-3.11.3.ebuild b/dev-python/pyparted/pyparted-3.11.3.ebuild
deleted file mode 100644
index 5dcdba1e16b1..000000000000
--- a/dev-python/pyparted/pyparted-3.11.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,8} )
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python bindings for sys-block/parted"
-HOMEPAGE="https://github.com/rhinstaller/pyparted/"
-SRC_URI="https://github.com/rhinstaller/pyparted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=sys-block/parted-3.1
-	dev-python/decorator[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	append-cflags -fcommon
-	default
-}
diff --git a/dev-python/pyparted/pyparted-3.11.4.ebuild b/dev-python/pyparted/pyparted-3.11.4.ebuild
deleted file mode 100644
index 5dcdba1e16b1..000000000000
--- a/dev-python/pyparted/pyparted-3.11.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,8} )
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python bindings for sys-block/parted"
-HOMEPAGE="https://github.com/rhinstaller/pyparted/"
-SRC_URI="https://github.com/rhinstaller/pyparted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=sys-block/parted-3.1
-	dev-python/decorator[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	append-cflags -fcommon
-	default
-}
diff --git a/dev-python/pypcap/Manifest b/dev-python/pypcap/Manifest
index 0974563ddf0b..8ac8623068fe 100644
--- a/dev-python/pypcap/Manifest
+++ b/dev-python/pypcap/Manifest
@@ -1,3 +1 @@
-DIST pypcap-1.2.1.tar.gz 141506 BLAKE2B 66fb9e96f0e7741b4c1b22a54b2d42a952742315b3e054680ca03b7e4f3761331f62b96eee759a4c2419c256cc2e909e040046522c43ed80cc31d19bb98927ab SHA512 987ae06b8aa53047c31bb316d5301a03ab86fe7882394b07cbfd22da78a2f515706485f39b07c0073c549159616605fe2b03ace33e2067c7cdaa4ba9c4f33ae6
-DIST pypcap-1.2.2.tar.gz 141606 BLAKE2B 7611a7c61e23d2a20a0575dca5404e5c1edd6ba84f072ef0bdc303f35a6b26e69f1e0cf29f6d1a75c6934a84956f57cbc3fdffb39d6122882dc93231e243e3b2 SHA512 fa5b2ba37cafa83b9586d52345bba62ab6203c46a97a7b114ce166864be0e0947737d5bb79d9c12e054255aa9cb9f675a152c78b7e7b1c5a63dd6b54575b7282
 DIST pypcap-1.2.3.tar.gz 151087 BLAKE2B c40e83d46b37deb4064877dfcf64582ff5da272a0d416b51faa43c4bd20625b473c624818aad70238f9429fac2455ae5b0516279faf1612f76f289b53d55417e SHA512 e4f701b6637fbcaf847d72eddc1ed344438008c2f8cbd334c9ce5fe17c9ec36f1f2cb1a146a218b8e464a7eb9a57217a8834a82a035ee96c3c1b56ec70e53bff
diff --git a/dev-python/pypcap/files/pypcap-1.1.6-mktemp.patch b/dev-python/pypcap/files/pypcap-1.1.6-mktemp.patch
deleted file mode 100644
index 9bc3f3639c9f..000000000000
--- a/dev-python/pypcap/files/pypcap-1.1.6-mktemp.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/pcap_ex.c
-+++ b/pcap_ex.c
-@@ -11,6 +11,7 @@
- # include <string.h>
- # include <signal.h>
- # include <unistd.h>
-+# include <stdlib.h>
- #endif
- 
- #include <pcap.h>
-@@ -290,7 +291,7 @@
- 	char ebuf[PCAP_ERRBUF_SIZE];
- 	int ret = -1;
- 	
--	mktemp(path);
-+	mkstemp(path);
- 	if ((f = fopen(path, "w")) != NULL) {
- 		hdr.magic = 0xa1b2c3d4;
- 		hdr.version_major = PCAP_VERSION_MAJOR;
diff --git a/dev-python/pypcap/pypcap-1.2.1.ebuild b/dev-python/pypcap/pypcap-1.2.1.ebuild
deleted file mode 100644
index e182ed45ee84..000000000000
--- a/dev-python/pypcap/pypcap-1.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified object-oriented Python extension module for libpcap"
-HOMEPAGE="https://github.com/pynetwork/pypcap https://pypi.org/project/pypcap/"
-SRC_URI="https://github.com/pynetwork/pypcap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.6-mktemp.patch
-)
-
-python_compile() {
-	local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
diff --git a/dev-python/pypcap/pypcap-1.2.2.ebuild b/dev-python/pypcap/pypcap-1.2.2.ebuild
deleted file mode 100644
index e182ed45ee84..000000000000
--- a/dev-python/pypcap/pypcap-1.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified object-oriented Python extension module for libpcap"
-HOMEPAGE="https://github.com/pynetwork/pypcap https://pypi.org/project/pypcap/"
-SRC_URI="https://github.com/pynetwork/pypcap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.6-mktemp.patch
-)
-
-python_compile() {
-	local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
diff --git a/dev-python/pypeg2/pypeg2-2.15.2.ebuild b/dev-python/pypeg2/pypeg2-2.15.2.ebuild
deleted file mode 100644
index 38c58e7481c7..000000000000
--- a/dev-python/pypeg2/pypeg2-2.15.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-MY_PN=pyPEG2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="An intrinsic PEG Parser-Interpreter for Python"
-HOMEPAGE="https://fdik.org/pyPEG/
-	https://bitbucket.org/fdik/pypeg/
-	https://pypi.org/project/pyPEG2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-2.15.1-test.patch )
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pyprof2calltree/Manifest b/dev-python/pyprof2calltree/Manifest
index 260a36b16fe4..a7476c489766 100644
--- a/dev-python/pyprof2calltree/Manifest
+++ b/dev-python/pyprof2calltree/Manifest
@@ -1,2 +1 @@
-DIST pyprof2calltree-1.4.0.tar.gz 7784 BLAKE2B e8b9ecd857930406bb3b7f7851913a68f1e3433f3b42c262922b5d5b0fbfa692078fdad811d4ca358f7c74d14320c914cfa779ed0b9da8c4fcd7d8e021fd3319 SHA512 b1acba29cd4e5112012eeeffdac53900688a28707306ef3a8a3827f7422c35bc921d59d33db3209db923bb8640014e7d9d7d819eafbcb19e0cf7e6159537bded
 DIST pyprof2calltree-1.4.4.tar.gz 8797 BLAKE2B 0929728d3a6de1cc40e54bd4581bb4b64875a4d7f3ccef725300d40d2b3fd175d8ff462591357e32a471e5c3a4c5c51ac7e9c81c2e857050745a748bc4117d8a SHA512 7ffc228e542a568cb421394035660623415495472b5b3659a35b02c7ccccb7f578dc872d2bb1daf4fdfcd44134e1ad9b5ce3a18f49b15dd4aeb3b5f1201a28d8
diff --git a/dev-python/pyprof2calltree/files/pyprof2calltree-1.4.0-py3-test.patch b/dev-python/pyprof2calltree/files/pyprof2calltree-1.4.0-py3-test.patch
deleted file mode 100644
index a91818fca60c..000000000000
--- a/dev-python/pyprof2calltree/files/pyprof2calltree-1.4.0-py3-test.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 582eeeaa930639ccfe9b789b057f170824edd73a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 17 May 2017 20:53:29 +0200
-Subject: [PATCH] tests: Fix StringIO import for Python 3
-
-Python 3 no longer provides a 'cStringIO' module. Use StringIO from 'io'
-module instead.
----
- tests/test_integration.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_integration.py b/tests/test_integration.py
-index e6f432c..cf02a4f 100644
---- a/tests/test_integration.py
-+++ b/tests/test_integration.py
-@@ -3,7 +3,10 @@ import pstats
- import unittest
- 
- from .profile_code import top, expected_output
--from cStringIO import StringIO
-+try:
-+    from cStringIO import StringIO
-+except ImportError:
-+    from io import StringIO
- from pyprof2calltree import CalltreeConverter
- 
- class MockTimeProfile(cProfile.Profile):
--- 
-2.13.0
-
diff --git a/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild b/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild
deleted file mode 100644
index f341bae4d0e2..000000000000
--- a/dev-python/pyprof2calltree/pyprof2calltree-1.4.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=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="convert python profile data to kcachegrind calltree form"
-HOMEPAGE="https://pypi.org/project/pyprof2calltree/"
-# pypi tarball lacks tests
-SRC_URI="https://github.com/pwaller/pyprof2calltree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/pyprof2calltree-1.4.0-py3-test.patch
-)
-
-python_test() {
-	"${PYTHON}" -m tests.test_integration || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 49db60200e99..b4cd5f54f220 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,3 +1 @@
-DIST pyquery-1.2.13.tar.gz 44032 BLAKE2B df257c6116b3f8804627a0b4a6556445c644410acdf008fe9afd08136a0a7f47d66b99071cce61a1569853ec9c3c38d20ca66aec0950532e94949b36d4814c3e SHA512 39a2bfe6f1eaefb6d1a78f73e5bdb4d12a9e223b26f6aff0f979ceaa68005ab08e41bdf11fe808489d22e0506e558621982dc59fa2164cd1e3d8168b0ef8ceb6
-DIST pyquery-1.4.0.tar.gz 45215 BLAKE2B cb748c09524f6cc6b22c9712370da754495c31b159a44f02e9b5f00e4e94295d7259d224e63066297e6efd74f0b43a508a56d1df4f4150727cd261b959402e9a SHA512 523bc058fc93332b13840a7249bce5a449b0029f6434043a739a2f24abdd89efb314da8795f1b2be2d7e4464a8e4bdf6b061d768b895d0dd1630f44ee341f37f
 DIST pyquery-1.4.1.tar.gz 47983 BLAKE2B eb8d0ca59122734a4c715c33f40fd0b5fcc8edcabe9e41649ddf332feb1df603f8527a668aa7b9d78974b3d049e774355296644abd9b4d426d96e6e3c7a74065 SHA512 e2bfbbf51f99a408e9696a2b9c15f8875813847a10b5bd93c4c7a6886ac1b3ae6c7883ec4fb64e9bccab2127617843961e181044fe927f3c80c8ac363ed86141
diff --git a/dev-python/pyquery/files/pyquery-1.4.0-network-tests.patch b/dev-python/pyquery/files/pyquery-1.4.0-network-tests.patch
deleted file mode 100644
index 337728794bb9..000000000000
--- a/dev-python/pyquery/files/pyquery-1.4.0-network-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Disable test that requires a network connection.
-
---- a/tests/test_pyquery.py
-+++ b/tests/test_pyquery.py
-@@ -613,10 +613,10 @@
-         self.s.shutdown()
- 
- 
--class TestWebScrappingEncoding(TestCase):
--
--    def test_get(self):
--        d = pq(u'http://ru.wikipedia.org/wiki/Заглавная_страница',
--               method='get')
--        print(d)
--        self.assertEqual(d('#pt-login').text(), u'Войти')
-+#class TestWebScrappingEncoding(TestCase):
-+#
-+#    def test_get(self):
-+#        d = pq(u'http://ru.wikipedia.org/wiki/Заглавная_страница',
-+#               method='get')
-+#        print(d)
-+#        self.assertEqual(d('#pt-login').text(), u'Войти')
diff --git a/dev-python/pyquery/pyquery-1.2.13-r1.ebuild b/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
deleted file mode 100644
index 6bb67c3ab83b..000000000000
--- a/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A jQuery-like library for python"
-HOMEPAGE="https://github.com/gawel/pyquery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
-	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )"
-
-python_prepare_all() {
-	# Disable tests needing a network connection
-	sed -i -e "s/HAS_REQUEST = True/HAS_REQUEST = False/" tests/test_pyquery.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
-}
diff --git a/dev-python/pyquery/pyquery-1.2.13.ebuild b/dev-python/pyquery/pyquery-1.2.13.ebuild
deleted file mode 100644
index bc7b1a1f0eac..000000000000
--- a/dev-python/pyquery/pyquery-1.2.13.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A jQuery-like library for python"
-HOMEPAGE="https://github.com/gawel/pyquery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
-	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )"
-
-python_prepare_all() {
-	# Disable tests needing a network connection
-	sed -i -e "s/HAS_REQUEST = True/HAS_REQUEST = False/" tests/test_pyquery.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
-}
diff --git a/dev-python/pyquery/pyquery-1.4.0.ebuild b/dev-python/pyquery/pyquery-1.4.0.ebuild
deleted file mode 100644
index 38283e43fea9..000000000000
--- a/dev-python/pyquery/pyquery-1.4.0.ebuild
+++ /dev/null
@@ -1,42 +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_{6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A jQuery-like library for python"
-HOMEPAGE="https://github.com/gawel/pyquery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
-	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )"
-
-PATCHES=( "${FILESDIR}/${P}-network-tests.patch" )
-
-python_test() {
-	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
-}
diff --git a/dev-python/pyrfc3339/Manifest b/dev-python/pyrfc3339/Manifest
index 553274a80ba5..fac81e9f9c13 100644
--- a/dev-python/pyrfc3339/Manifest
+++ b/dev-python/pyrfc3339/Manifest
@@ -1,2 +1 @@
-DIST pyRFC3339-1.0.tar.gz 9325 BLAKE2B 4a02f2b128c34315def13500c2864d3198ba327fe3a39f04e14085d5dd945ffb31487c12d07e63e18c5946a14d8e380be8d85e7bea6b4df39f50550e6121379c SHA512 abcfcfcf516ab60214dc11de618d37415da2177387f51f85da99ef18b8cc0d37ed55f0ea6ba3e61292ce5a319838f322e01c1c9f3c0c4edb8341b4b135e575e3
 DIST pyRFC3339-1.1.tar.gz 5290 BLAKE2B d3094a22b6903937ae5cfee1210f04b65eb05dd606fe1d3245dca8ec0719ca1a079b720568d8c8e87fea691cebe1944098f99913b97a04570f06354a883e5694 SHA512 958b7761fab590aa42bb57a955c5d834441f717796a452b60df21663099dcf2fc046afe60f8157fd0f1edfd95c5e9c9c5349ab10ca4078d210fc63d848496a2f
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
deleted file mode 100644
index 2895f47e8cc5..000000000000
--- a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{3_6,3_7})
-
-inherit distutils-r1
-MY_PN=pyRFC3339
-
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Generates and parses RFC 3339 timestamps"
-HOMEPAGE="https://github.com/kurtraschke/pyRFC3339"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index 4fb2efd665ee..093f5db1b3c3 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -1,3 +1,2 @@
 DIST Pyro4-4.77.tar.gz 479025 BLAKE2B 20c7b53cea55b77efea11cd7b74a1cfcc45ad721ba45e039947f1d869291bfcb054f16bc48fb5ad21386fe7d47785514ff94953b1bcf893266c2c41015bba589 SHA512 52a9f90cec8c5e23ec30ddb69484a15bb86d61024d1bc718d075e01678a3d9655a1ed21f18da1891c121bf0e95282fb1151762b2fdb826a6408056079d2b1a66
-DIST Pyro4-4.78.tar.gz 490988 BLAKE2B 0fbd7129557d2b1603176a34106f9e287faa6e1725eeede7a7427c0b975f2c4e136dc4ce1573e826c43211a903fee0d7baca85fb8ae58360da7869a3309a1a2d SHA512 7a95828f6c8d9d94b8a5263c63263335c3bfaa54c5e527bd8e61d2bc00d4cdb3c4c6a92155af189401b892a6729ad91dad207e389ff43ee342a011b95ddc90e5
 DIST Pyro4-4.79.tar.gz 490917 BLAKE2B 421fa2d0b32c27c44d11adb7c89e24cfd7a79c10ae40827407d3d8965e98b7d5126168e5b00b042c4bd94800d3e73fc8febdbbbf2b82d3046584ea88106c4734 SHA512 03e75537c7943e1044b7e6623ead934e3004b023ffc6d364472868e0895e3819c4b3c92d1610018ab1466262f32681e69a91d360c33b17e687861c8c742bdf72
diff --git a/dev-python/pyro/pyro-4.78.ebuild b/dev-python/pyro/pyro-4.78.ebuild
deleted file mode 100644
index 456079265b51..000000000000
--- a/dev-python/pyro/pyro-4.78.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN="Pyro4"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Distributed object middleware for Python (RPC)"
-HOMEPAGE="https://pypi.org/project/Pyro4/
-	https://github.com/irmen/Pyro4"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-python/pyro:0
-	>=dev-python/serpent-1.27[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/cloudpickle-1.2.1[${PYTHON_USEDEP}]
-		dev-python/dill[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests requiring network connection.
-	rm tests/PyroTests/test_naming.py || die
-	sed \
-		-e "s/testStartNSfunc/_&/" \
-		-i tests/PyroTests/test_naming2.py || die
-
-	sed \
-		-e "s/testBroadcast/_&/" \
-		-e "s/testGetIP/_&/" \
-		-i tests/PyroTests/test_socket.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/. )
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index 517c980dc831..dc2b61ac657f 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,3 +1 @@
-DIST pyroute2-0.4.12.tar.gz 562555 BLAKE2B a0101026d7dfb128a4e88d840a593357683636213a00a236ddc3497c9f4df107078ef2d59a9ba99045c4d7a8a95a1bd69fecd8a2f93937bc9e9983fda547fda9 SHA512 d666c29cfb8da1e13748976030dc5ec153d2740f6df7f279a6e9fc4ec9b6ad60462c2a2b57905c4a4c8566da1de30dca0bb24b3b6c5a97bb729c074584270e2a
-DIST pyroute2-0.4.21.tar.gz 577795 BLAKE2B 721f0e7958d50de356a424a5f87ab895e95fb0d630c070fb674c6da276d189a7c72f051eb4747ab889230f6c1ab1cf473f2d734255f4d178cc87eaf332538fd1 SHA512 e8cf2c66d63e4549fd4c0d5ed1b503fc72eb5eb6026b959e1b783aad66cad475118a645f5ca394a1a77e7cb0557d12565857db8e0f1b1cbe8c666be957a7a88e
 DIST pyroute2-0.5.5.tar.gz 702481 BLAKE2B 7d9db1efe0d76e5fbca3f07d0ce666f919001fa26c220bd432c719aa6fc3a4d0148ea6357ed84cd5d0a6e47069994f35d2501365115b9c497674159098c2e5e5 SHA512 c7166e667b6fd21eefd34a01a0bba8467f3ae4d9526af32d5a6e96747c8aac7590da1097f1ca9b12390158e90ddfd6ff9f68c85765abbe179e8761658dda6b86
diff --git a/dev-python/pyroute2/metadata.xml b/dev-python/pyroute2/metadata.xml
index 23c656d2c235..883f1278953b 100644
--- a/dev-python/pyroute2/metadata.xml
+++ b/dev-python/pyroute2/metadata.xml
@@ -9,9 +9,6 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
-	<longdescription lang="en">
-	Pyroute2 is a pure Python netlink and Linux network configuration library.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">pyroute2</remote-id>
 		<remote-id type="github">svinota/pyroute2</remote-id>
diff --git a/dev-python/pyroute2/pyroute2-0.4.12.ebuild b/dev-python/pyroute2/pyroute2-0.4.12.ebuild
deleted file mode 100644
index f9693f0ed719..000000000000
--- a/dev-python/pyroute2/pyroute2-0.4.12.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_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure Python netlink and Linux network configuration library."
-HOMEPAGE="https://github.com/svinota/pyroute2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND=""
diff --git a/dev-python/pyroute2/pyroute2-0.4.21.ebuild b/dev-python/pyroute2/pyroute2-0.4.21.ebuild
deleted file mode 100644
index f9693f0ed719..000000000000
--- a/dev-python/pyroute2/pyroute2-0.4.21.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_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure Python netlink and Linux network configuration library."
-HOMEPAGE="https://github.com/svinota/pyroute2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND=""
diff --git a/dev-python/pyroute2/pyroute2-0.5.5.ebuild b/dev-python/pyroute2/pyroute2-0.5.5.ebuild
deleted file mode 100644
index 4612ac6789f8..000000000000
--- a/dev-python/pyroute2/pyroute2-0.5.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure Python netlink and Linux network configuration library."
-HOMEPAGE="https://github.com/svinota/pyroute2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/pysendfile/pysendfile-2.0.1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
deleted file mode 100644
index f6b36937bb61..000000000000
--- a/dev-python/pysendfile/pysendfile-2.0.1.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=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python interface to the sendfile(2) system call"
-HOMEPAGE="https://github.com/giampaolo/pysendfile"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Testsuite abandonned due to demanding starting a local web type server
diff --git a/dev-python/pyshark/Manifest b/dev-python/pyshark/Manifest
index fddea2e21391..4d7c054878a3 100644
--- a/dev-python/pyshark/Manifest
+++ b/dev-python/pyshark/Manifest
@@ -1,2 +1 @@
-DIST pyshark-0.3.7.2.tar.gz 27232 BLAKE2B b93ee24fb29990b0ab455935e773e4844c26761c2515d1254c8e72d24d70be95aa17a590cc1f5b39bb5f76db624fb7c40d06e64731948ee75a5b8e2008830968 SHA512 dbd97665fae7d3067582bf7616e025b0c5e5fa14cacdaca59c89b4e70feb3017f2d8c7d899a70c0c8707589e4735b9283914bb6ccbf432e9072c64d7e957bc15
 DIST pyshark-0.4.2.3.tar.gz 29363 BLAKE2B 91463f725eb893c3c7f7442eec5e0a8304bb8f2ecbd0ea80582c49bfd8538a5fcdb1d5d1ab2373f8e67684c78c8852af697dadf8ff041d42f8ff18a8954a6248 SHA512 bbef857dad5e5141e0ec7c04dba9faca81b17d67a7151959e9935577428cd1415e173e9c7ededff46f8621bcbbdfbe7a96ca5cfd65d7143fb6f235c0167964b6
diff --git a/dev-python/pyshark/pyshark-0.3.7.2-r1.ebuild b/dev-python/pyshark/pyshark-0.3.7.2-r1.ebuild
deleted file mode 100644
index 9f355c1a2537..000000000000
--- a/dev-python/pyshark/pyshark-0.3.7.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A Python wrapper for tshark output parsing"
-HOMEPAGE="https://pypi.org/project/pyshark/ https://github.com/KimiNewt/pyshark"
-# pypi tarball is missing tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/KimiNewt/pyshark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# See pyshark.egg-info/requires.txt
-RDEPEND="
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/logbook[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/trollius[${PYTHON_USEDEP}]
-	net-analyzer/wireshark[tshark]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${P}/src"
-
-python_prepare_all() {
-	# Test fails unless portage can execute /usr/bin/dumpcap
-	# https://github.com/KimiNewt/pyshark/issues/197
-	rm "${WORKDIR}/${P}/tests/capture/test_inmem_capture.py" || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${WORKDIR}/${P}/tests" || die
-	py.test -v || die
-}
diff --git a/dev-python/pysmi/Manifest b/dev-python/pysmi/Manifest
index d653584a4b72..5550566f7aa1 100644
--- a/dev-python/pysmi/Manifest
+++ b/dev-python/pysmi/Manifest
@@ -1,3 +1 @@
-DIST pysmi-0.1.3.tar.gz 78325 BLAKE2B 8f82d86e096a47944eccbd4b7ef846f3d9ca155f3f6e0790eecad88cf872c20a725a4071c8c2b9295fc348fa20efbd41ae7d0479cbd4ffe054e9956a6b6784f1 SHA512 d321fbbc68e4b6b2b18de5c1215dc450ad2ba2ea6c70cbeee9d981d2e2106b59582eae42b09da72bc02af789f7f58a6fc97712869b74f0137d8f7fd7238b2211
-DIST pysmi-0.3.1.tar.gz 93003 BLAKE2B 91fa382aa693d8849299baf27a2fe10116441cc0661aa553321d9b5584e64751df547172f185e207a7eb0c6438ded60a0acef5aa51263cc1f29219dd8cdef2fc SHA512 b7ffff85689a1f99c53fdfecaed3d9dc1b5c3685388695e715cde9b42eb8511aac8a47b04dcce243c0fb09a4823a799d80a0033ed576637356b991c71bc660c8
 DIST pysmi-0.3.4.tar.gz 93985 BLAKE2B 71b0ed936c196381f895b4f56e8e2e328ac274b08801a77b404b964201e00f8da2cbce2719414da358a4feb7992a3d04e732942f6e7006a0cceea4496f96b758 SHA512 720c8948a590130583d6ea388f0ade5d3bfe9e845821add7ffbf1b5495b5fe00b768ffb94f67b82465c6d86234f5306c6e1a5c2e49f4825bb9c31a0df629f7bd
diff --git a/dev-python/pysmi/pysmi-0.1.3.ebuild b/dev-python/pysmi/pysmi-0.1.3.ebuild
deleted file mode 100644
index d31475e12dfe..000000000000
--- a/dev-python/pysmi/pysmi-0.1.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Python Lex & Yacc"
-HOMEPAGE="https://github.com/etingof/pysmi"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/ply[${PYTHON_USEDEP}]
-"
-DEPEND=""
diff --git a/dev-python/pysmi/pysmi-0.3.1.ebuild b/dev-python/pysmi/pysmi-0.3.1.ebuild
deleted file mode 100644
index 6ac3e68b21d5..000000000000
--- a/dev-python/pysmi/pysmi-0.3.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Python Lex & Yacc"
-HOMEPAGE="https://github.com/etingof/pysmi"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index 424da309276b..b1faf3eb20f7 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,3 +1,2 @@
 DIST pysol_cards-0.8.6.tar.gz 17674 BLAKE2B b46c2a39b04e339e7e9a548cfb4e7f06e49969bbdfd9dc35f2662973bae60e52b576bc2174c86fa9ed33d69703257690d9d024b9ca474a4bbd028c5ec958b5e2 SHA512 da446e0deed0f8ff60a4da82a8bce5d1884d35e52ee887a6b07b82fa6fbf04b07d1758b8039532db5163f89395239295f6eec1f278cd183b22e41f1e90416040
-DIST pysol_cards-0.8.7.tar.gz 19469 BLAKE2B 94e438a9b0bb94c5657ddda92f45cc7b4f950ecfca43128ff6ef360c5066763ffe7d5ad86272aad343f5a42f66b9d71c412ba007cd0b7f39e6adef176bc2d5dc SHA512 835e03e110ff99e8eaa226b1d4f93e1ffe529b9311ec3e45f9884981f9956b0e5092f264426c80e94bea9f1ca57803f10d47a1fa2b587dcd04baf6bac4a015c0
 DIST pysol_cards-0.8.8.tar.gz 19517 BLAKE2B 0c088ba16023e4c8343c41cda4d1270550dd90f3223e3b52367e9247621d7df6020a85f9a82d6216b3707adb0eb91b13b292dd34cdf8aafc340643cba3ce67e7 SHA512 a6aa6f2dd0bbc7be89210d0f7d75db27684c3c7b511a0c9779e166f5c4431afa4a15a911de857e429ff31a7d5ff2f405f19da82986edfd4eeafe3283a5abd0fa
diff --git a/dev-python/pysol_cards/pysol_cards-0.8.7.ebuild b/dev-python/pysol_cards/pysol_cards-0.8.7.ebuild
deleted file mode 100644
index d64c0f21607b..000000000000
--- a/dev-python/pysol_cards/pysol_cards-0.8.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Deal PySol FreeCell cards"
-HOMEPAGE="https://pypi.org/project/pysol-cards/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	dev-python/random2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pysrt/pysrt-1.1.1-r1.ebuild b/dev-python/pysrt/pysrt-1.1.1-r1.ebuild
deleted file mode 100644
index 955fccde2c85..000000000000
--- a/dev-python/pysrt/pysrt-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library used to edit or create SubRip files"
-HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b5a1ac908e14..38c07e14ff75 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,5 @@
 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
+DIST portage-2.3.79.tar.bz2 1038675 BLAKE2B 7a6cff28fa1d4b54607e9416914ab534d250718b082a9789a36be057933867a8a3befd7c99d404b058f67b92c6ee975323c37251fe89d3e3e46865daf0fea25e SHA512 23101644185fb7c6eff12f015d442599b3af744f7b13dcb630f47a7f27c1392c46bd4aa5fa32d403dcf058cc3cc1d56cef00fd8c34dda811388eb268761c0797
 DIST portage-2.3.89.tar.bz2 1048621 BLAKE2B 1353f0697a977eb395abd857c8cc43c839912f4bd31436c6620d10e3dc29dc32ee9970478ad0f569b02f14989c48a7d956a233c7db22e172897a49a98fd2a94d SHA512 fa453d3134139fc1f435d6388aa7d6271cd680d08ea1736269a917c12500bb463a81afc956ddd0045e98784bcdbb6541c333be6ff0c2a00feeb482b637f08e98
 DIST portage-2.3.94.tar.bz2 1050104 BLAKE2B 8e812e4f56f5dd94cab6d806f83ae4db5507192860f5d74f43f409586def75642378416ab34371adbe9718bcd77298d9fa5f2b0d2d5e79ce18bf71a5287f0b00 SHA512 7f04fa6b0e5cc38dbb21df9fdf0efc0e4ced7f040fa9c34cab367f0bb514571e536b5fc6ea841ad89cb6934ecf6adc370160ed6e0a9bbd5fb280add9ca3c29ed
 DIST portage-2.3.95.tar.bz2 1050834 BLAKE2B 0864f0887cc2f35d2f56300a040672d4f76f310784b843dbea70c358489ab4f5d385fd92d5b48292b6f2067c0e7a2e30088b44bec71c542c56c15cd12d709826 SHA512 971dd3455f9e2156bb92c474f0d4bf6a1443995a3a243ed7d3499aebbdd8cfe4c9e16668c7fec45ec4546cddd1b437d81d704f4d26e7f5af03f1ccd164aceb46
diff --git a/sys-apps/portage/portage-2.3.79.ebuild b/sys-apps/portage/portage-2.3.79.ebuild
new file mode 100644
index 000000000000..9a5f7d08584d
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.79.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 python3_8 )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+SLOT="0"
+IUSE="build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	:
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f ! -name etc-update -print0)
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	python_setup
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-libs/ldb/ldb-2.0.8.ebuild b/sys-libs/ldb/ldb-2.0.8.ebuild
index 088655213faf..c4654f0379d3 100644
--- a/sys-libs/ldb/ldb-2.0.8.ebuild
+++ b/sys-libs/ldb/ldb-2.0.8.ebuild
@@ -17,7 +17,6 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="doc +ldap +lmdb python test"
 
 RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( python )"
 
 RDEPEND="
 	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
@@ -38,7 +37,8 @@ DEPEND="dev-libs/libxslt
 	${RDEPEND}
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )"
 
 WAF_BINARY="${S}/buildtools/bin/waf"
 
diff --git a/sys-libs/ldb/ldb-2.0.9.ebuild b/sys-libs/ldb/ldb-2.0.9.ebuild
index 0054406aec48..484c8a1afd84 100644
--- a/sys-libs/ldb/ldb-2.0.9.ebuild
+++ b/sys-libs/ldb/ldb-2.0.9.ebuild
@@ -17,7 +17,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~
 IUSE="doc +ldap +lmdb python test"
 
 RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( python )"
 
 RDEPEND="
 	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
@@ -38,7 +37,8 @@ DEPEND="dev-libs/libxslt
 	${RDEPEND}
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )"
 
 WAF_BINARY="${S}/buildtools/bin/waf"
 
diff --git a/sys-libs/ldb/ldb-2.1.1.ebuild b/sys-libs/ldb/ldb-2.1.1.ebuild
index c8b8d6555867..e1deb520305b 100644
--- a/sys-libs/ldb/ldb-2.1.1.ebuild
+++ b/sys-libs/ldb/ldb-2.1.1.ebuild
@@ -17,7 +17,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~
 IUSE="doc +ldap +lmdb python test"
 
 RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( python )"
 
 RDEPEND="
 	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
@@ -38,7 +37,8 @@ DEPEND="dev-libs/libxslt
 	${RDEPEND}
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )"
 
 WAF_BINARY="${S}/buildtools/bin/waf"