Updating liguros repo

54 files changed, 157 insertions, 783 deletions

diff --git a/dev-python/arrow/arrow-0.17.0.ebuild b/dev-python/arrow/arrow-0.17.0.ebuild
index c5fd310a4d29..ee63838dcf8c 100644
--- a/dev-python/arrow/arrow-0.17.0.ebuild
+++ b/dev-python/arrow/arrow-0.17.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/asgiref/asgiref-3.3.0.ebuild b/dev-python/asgiref/asgiref-3.3.0.ebuild
index af4dc1019162..4f691de47ae1 100644
--- a/dev-python/asgiref/asgiref-3.3.0.ebuild
+++ b/dev-python/asgiref/asgiref-3.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 BDEPEND="
 	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 30ca93759793..34828df66cd2 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,2 +1 @@
-DIST bpython-0.19.tar.gz 216564 BLAKE2B a0b469ae28965e7926838b2d520aed0199a39ad5d9d5650e34446601e6e5f023a6c09cbdd85a30b2873dc72b5ef5774c483d5f627accaf29dce7e6f8628cc1df SHA512 7c746848671d5de0b63f0284d2af87c12480fa1ae3e89eb10093ab5dfd42f926171f29bd8bcc19fe173fc58f7eff7276da4639d580836f0d112dc5e85000dc55
 DIST bpython-0.20.tar.gz 224127 BLAKE2B 6b7334f6657e27eff3f48468ee4eed64b69f9ba9ce92881a28ff57a5d5e60948b30fca689adc7a3aac088d2aa1316bfd43509f4f8d80b4822e8990f2753a2059 SHA512 13c04bd9b9ce0bd1b3775295e249e0505abe3be6c601dc9d90455863fd8bc178abb3fe98b05586c6298ea9308a6b062907abf2979b37b08e4341439b0311a565
diff --git a/dev-python/bpython/bpython-0.19.ebuild b/dev-python/bpython/bpython-0.19.ebuild
deleted file mode 100644
index 9ffdfba27f3b..000000000000
--- a/dev-python/bpython/bpython-0.19.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/curtsies-0.2.11[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
-	"
-# sphinx is used implicitly to build manpages
-BDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
-
-distutils_enable_sphinx doc/sphinx/source --no-autodoc
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -e 's:test_exec_dunder_file:_&:' \
-		-e 's:test_exec_nonascii_file_linenums:_&:' \
-		-i bpython/test/test_args.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bpython/bpython-0.20.ebuild b/dev-python/bpython/bpython-0.20.ebuild
index fc7a66d6b3a4..9ffdfba27f3b 100644
--- a/dev-python/bpython/bpython-0.20.ebuild
+++ b/dev-python/bpython/bpython-0.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/cbor2/cbor2-5.2.0.ebuild b/dev-python/cbor2/cbor2-5.2.0.ebuild
index 73f8d6a91af6..a20ffb8bc23b 100644
--- a/dev-python/cbor2/cbor2-5.2.0.ebuild
+++ b/dev-python/cbor2/cbor2-5.2.0.ebuild
@@ -16,7 +16,7 @@ RESTRICT="!test? ( test )"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.38.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.38.0.ebuild
index 76cb0d12eb97..faf53135ca9d 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.38.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.38.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 23da91a52108..dd7113cef16a 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1 +1,2 @@
 DIST cheroot-8.4.4.tar.gz 107753 BLAKE2B 4e5d9c3a101876d76696a2e6e3c191f199810e734e25cdc07aac69c102eb28b90033c6fa749569e140c01dbd08a4b06f067b4f47d34ef483d48731c6372ee5eb SHA512 18e2c198a537abd740a868fc4055c1e1e0501392c5518ec345669d02511dac2d59aa2abe2670ffb1800c5aae7032b11445488ecf7fd63d02d5923ed08b82f216
+DIST cheroot-8.4.5.tar.gz 109443 BLAKE2B f8dd7a053304c6be559862028ef306c742c015e98c236f3e154f863c3abbf7d261f85b9a7e880ba9f51e6a8bf25cdf96ed6f45f7758657ecbdc4d6b7dde7f6a9 SHA512 2e8c84a67e24772dfeea7fbb397807e6553912d32392c393ec85181ccb381b1f4d3e38cc2366710a5c789869cbc6d15a79bd1b20b6d3845e5c08496b4f4b0e9e
diff --git a/dev-python/cheroot/cheroot-8.4.5.ebuild b/dev-python/cheroot/cheroot-8.4.5.ebuild
new file mode 100644
index 000000000000..233a4ba09ff3
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.4.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
+HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
+SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jaraco-context[${PYTHON_USEDEP}]
+		dev-python/jaraco-text[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
+	sed -e '/setuptools_scm/d' -i setup.cfg || die
+	sed -e '/--cov/d' \
+		-e '/--testmon/d' \
+		-e '/--numproc/d' \
+		-i pytest.ini || die
+
+	# broken
+	sed -e '/False.*localhost/d' \
+		-i cheroot/test/test_ssl.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild b/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
deleted file mode 100644
index 70a96d394522..000000000000
--- a/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Distutils command to view/validate packages's rst text long_descriptions."
-HOMEPAGE="https://github.com/collective/collective.checkdocs"
-SRC_URI="mirror://pypi/${PN:0:1}/collective.checkdocs/collective.checkdocs-${PV}.zip"
-S="${WORKDIR}/collective.checkdocs-${PV}"
-
-LICENSE="GPL-2"  # until https://github.com/collective/collective.checkdocs/issues/8 is fixed
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/docutils[${PYTHON_USEDEP}]"
diff --git a/dev-python/debtcollector/debtcollector-2.2.0.ebuild b/dev-python/debtcollector/debtcollector-2.2.0.ebuild
index 089ab628c477..7cfda0026d02 100644
--- a/dev-python/debtcollector/debtcollector-2.2.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/empy/empy-3.3.4.ebuild b/dev-python/empy/empy-3.3.4.ebuild
index 3146e1591213..575dc9c28c20 100644
--- a/dev-python/empy/empy-3.3.4.ebuild
+++ b/dev-python/empy/empy-3.3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.alcyone.com/software/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc x86"
 IUSE="doc"
 
 python_test() {
diff --git a/dev-python/graphviz/graphviz-0.14.2.ebuild b/dev-python/graphviz/graphviz-0.14.2.ebuild
index b12ff93264b3..bb227a7f08c8 100644
--- a/dev-python/graphviz/graphviz-0.14.2.ebuild
+++ b/dev-python/graphviz/graphviz-0.14.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://graphviz.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="media-gfx/graphviz"
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 6803a04b8649..d60dee5ddaf6 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1 +1,2 @@
 DIST hiredis-1.0.1.tar.gz 54460 BLAKE2B 90bdbd99f47b0765636dbeee9fc3cbb9c71fd7ba752a0d58ab9c2c9d2ee93bfc1a343465618d1127703ae09a4870d6691d7d5b52f59150849a448eae73c6a1d3 SHA512 8aa5e29b09f42826d746857d55b8042b40ffa3977386b0f8b2ea1b2ede0c28337f3df4bbd177192d8873570810bc9d0987f1f2b29f094f27adaa4aaf409c3a6b
+DIST hiredis-1.1.0.tar.gz 54620 BLAKE2B 9991745d277e87efe836c1c8eabb2016ce401e2be52c7e1b3a154350776fae6fd3c49e3096da57231e42c57bf36ba692ce26bc993d0923b5246376d8694ad058 SHA512 ad37868376de91303c15ffe6109dc7fadb4f458efdd44b7ddc0a410937a389b8e062ab7d36b1aec3fe324ecafe6b1e5e6b92f547cbf619251dad22a28e02ee9c
diff --git a/dev-python/hiredis/hiredis-1.0.1-r1.ebuild b/dev-python/hiredis/hiredis-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..8e84e217d314
--- /dev/null
+++ b/dev-python/hiredis/hiredis-1.0.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python extension that wraps hiredis"
+HOMEPAGE="https://github.com/pietern/hiredis-py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="system-libs"
+
+DEPEND="system-libs? ( dev-libs/hiredis:0/0.14 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use system-libs && PATCHES+=(
+		"${FILESDIR}"/${P}-system-libs.patch
+		"${FILESDIR}"/${P}-api-0.14.patch
+	)
+	default
+}
+
+python_test() {
+	cd test
+	"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
+}
diff --git a/dev-python/hiredis/hiredis-1.0.1.ebuild b/dev-python/hiredis/hiredis-1.0.1.ebuild
index 1031abb68df7..bde16f819154 100644
--- a/dev-python/hiredis/hiredis-1.0.1.ebuild
+++ b/dev-python/hiredis/hiredis-1.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
-DEPEND=">=dev-libs/hiredis-0.14:="
+DEPEND="dev-libs/hiredis:0/0.14"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
diff --git a/dev-python/hiredis/hiredis-1.1.0.ebuild b/dev-python/hiredis/hiredis-1.1.0.ebuild
new file mode 100644
index 000000000000..90148fb3b827
--- /dev/null
+++ b/dev-python/hiredis/hiredis-1.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python extension that wraps hiredis"
+HOMEPAGE="https://github.com/pietern/hiredis-py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+python_test() {
+	cd test
+	"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
+}
diff --git a/dev-python/hiredis/metadata.xml b/dev-python/hiredis/metadata.xml
index 4399fcc7d289..285da38ba1b3 100644
--- a/dev-python/hiredis/metadata.xml
+++ b/dev-python/hiredis/metadata.xml
@@ -13,5 +13,8 @@
     <remote-id type="pypi">hiredis</remote-id>
     <remote-id type="github">pietern/hiredis-py</remote-id>
   </upstream>
+  <use>
+    <flag name="system-libs">Use dev-libs/hiredis from system</flag>
+  </use>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 6937abd709dc..ee30d63b065e 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,7 +1,3 @@
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
-DIST Markdown-3.1.1.tar.gz 294136 BLAKE2B 9fd024f64f7aaa774a49f60e312e47bbc2ff0f368f083e4dfd0c38d1f12839dfcf3455f1d0c8cb0b9c851fe0d3a779c70784859f1682703bd6022d57b6548235 SHA512 78f089f2eef5c73d683ac96fd20c87145e243d12b0f230b9b0228b995035fbb084dde40be788679c63637f05956487ad520cc9dd61d133926bf13521aa600090
-DIST Markdown-3.2.2.tar.gz 299658 BLAKE2B c5a0337b6633ac3d795885d138ee3c078e36fdcacee659d8908ecdb839e0496c06ac8c721efd16183f03026ebf681e8382cdadd28d910abf5c021fdef9237e2a SHA512 72ce79b0daed4df2d09a458dad24da3e303143307640fb15d15cb10edc6c641d422dcf5043380c1572c4b9ed8f5fc11ec52e28928d8215d687309e4ce9ae3d7c
 DIST Markdown-3.3.1.tar.gz 317115 BLAKE2B 8c46dec8717cfdd03bd32b48071af042ca25508ca39d2a747a85d8c3044889d374b2f37ba6eba577c776c415d74c2f832810842faa19ff2febe596405a0a9157 SHA512 b1e53fe903612f8defbaf31f1f40a5ba4c58670ffb49cce8cf39fbe3a6445072520b7fe23eff594a8583a030b12d6295f124a13e4b58cad311d5d11ec699b4c6
-DIST Markdown-3.3.2.tar.gz 318351 BLAKE2B bfab4d9ef98b691311949e842ab0550625d6e97a8006207c44746dd45e42ac58fa22a1efcc25c0e74f110046edeb3e61e1321af3dc359ae1f703e78915d64f20 SHA512 9c486d1816196d96cd4c5fcf0e128002b7fd8e2ab1b0ffce0d9c4aaf616a7acc044044d6932b2005ae508f760f7112c81acb3cf1315e8e9d51e36058582989ca
 DIST Markdown-3.3.3.tar.gz 319531 BLAKE2B b7a527a7d202ee955106ecddb75541285589cb006a0cb3e587f06bb06aa3be8bdf8e976a35cc2ca63b2f085a8b462f8e8d5fad84710561dc105e533939c04204 SHA512 b8e42c1471d155be6cc9aa0b6ce649454b09d36df1de51ef7e45043ae3c1c87b9b09e1fae4c680a771bee52e7fa8ea82548b78b2ffb1d38e85785f0b0de25b36
-DIST Markdown-3.3.tar.gz 315253 BLAKE2B 35fbe7f03b9261e1506bb5b2ebb19cfd37e6f1ad2ad6f5464b90c850bec642a5518a6470db640bbf6ded8b589bdfbd83bd0482724b6be6e89dba133d0122d721 SHA512 3f6e29b917135638fba703c3711c8f7baec544293a93bcf3554cad7dbd6a9678a49408c202e70f2cd41813f6a7ec0ff856e1c3888355b1321eb2801eb9552a1c
diff --git a/dev-python/markdown/markdown-3.1.1-r1.ebuild b/dev-python/markdown/markdown-3.1.1-r1.ebuild
deleted file mode 100644
index 7188a918977e..000000000000
--- a/dev-python/markdown/markdown-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-
-IUSE="doc"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-RESTRICT="test"
-
-S="${WORKDIR}/${P^}"
-
-python_install_all() {
-	use doc && dodoc -r docs/
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-3.2.2.ebuild b/dev-python/markdown/markdown-3.2.2.ebuild
deleted file mode 100644
index 9c5a1c29c304..000000000000
--- a/dev-python/markdown/markdown-3.2.2.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc"
-
-# importlib_metadata is only necessary for <python:3.8 according to setup.py
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-"
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && dodoc -r docs/
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-3.3.2.ebuild b/dev-python/markdown/markdown-3.3.2.ebuild
deleted file mode 100644
index 3ec244d13c00..000000000000
--- a/dev-python/markdown/markdown-3.3.2.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc"
-
-# importlib_metadata is only necessary for <python:3.8 according to setup.py
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-"
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && dodoc -r docs/
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-3.3.ebuild b/dev-python/markdown/markdown-3.3.ebuild
deleted file mode 100644
index d5df89d4bab8..000000000000
--- a/dev-python/markdown/markdown-3.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc"
-
-# importlib_metadata is only necessary for <python:3.8 according to setup.py
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-"
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/markdown-3.3-pygments-2.7.patch
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && dodoc -r docs/
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/matplotlib/matplotlib-3.3.3.ebuild b/dev-python/matplotlib/matplotlib-3.3.3.ebuild
index 29933816c356..2518025b9e40 100644
--- a/dev-python/matplotlib/matplotlib-3.3.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
 #	dev-python/pycxx
@@ -44,7 +44,6 @@ RDEPEND="
 	media-libs/freetype:2
 	media-libs/libpng:0
 	>=media-libs/qhull-2013
-	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
 	cairo? (
 		dev-python/cairocffi[${PYTHON_USEDEP}]
 	)
@@ -67,6 +66,9 @@ RDEPEND="
 	qt5? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)
+	webagg? (
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+	)
 	wxwidgets? (
 		$(python_gen_cond_dep '
 			dev-python/wxpython:*[${PYTHON_USEDEP}]
@@ -95,6 +97,7 @@ BDEPEND="
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
 		x11-libs/gtk+:3[introspection]
 	)
 "
diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml
index 54e256c4254d..d37c7607af24 100644
--- a/dev-python/matplotlib/metadata.xml
+++ b/dev-python/matplotlib/metadata.xml
@@ -18,6 +18,7 @@
 	<use>
 		<flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
 		<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
+		<flag name="webagg">Enable webagg backend that uses <pkg>www-servers/tornado</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="pypi">matplotlib</remote-id>
diff --git a/dev-python/objgraph/Manifest b/dev-python/objgraph/Manifest
index 9074170ea254..bb3f46dbadb4 100644
--- a/dev-python/objgraph/Manifest
+++ b/dev-python/objgraph/Manifest
@@ -1,2 +1 @@
-DIST objgraph-3.4.1.tar.gz 634602 BLAKE2B 17424fa5b6b079e9b0dabdfb5facc88fef67bb3742252fd986b19cb0b674c40f335e0372cb08a86e89d42cce0d504830c24471e0d34483925b33d44f45859445 SHA512 174e097cd9f9b5bd2e83a389d2ce3bd05a1754c1535923cc75f59a3281a292b50014501f093ccf1b2350fdbb34757af950636819227e39cdad2f64cb7de5ebb8
 DIST objgraph-3.5.0.tar.gz 638591 BLAKE2B 7a0ee6c9ee1d8417f7b322f19a397ea2452ed592ebbc07afc1378e86b5bad3895ed2e4a20d92a5f4b0215f68fc7440f85852303585a3161497a85d41d4c4e550 SHA512 da29202871bad06f2caa9cc297e7bf9a15af4c89e23baf9c271764e0ce93ff9557cd5c21d0bf39b425713460dbe2dbc8468d70c6bfcc1c3ff8b1b4d4a7923858
diff --git a/dev-python/objgraph/objgraph-3.4.1.ebuild b/dev-python/objgraph/objgraph-3.4.1.ebuild
deleted file mode 100644
index f3c4849fc721..000000000000
--- a/dev-python/objgraph/objgraph-3.4.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Draws Python object reference graphs with graphviz"
-HOMEPAGE="https://mg.pov.lt/objgraph/"
-SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="media-gfx/graphviz"
-BDEPEND="test? ( media-gfx/xdot )"
-
-PATCHES=(
-	"${FILESDIR}/objgraph-3.4.1-tests.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/* )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 551b78b77e5b..ffb588bfb63d 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,2 +1 @@
-DIST Paste-3.4.6.tar.gz 630593 BLAKE2B c1bfa58be8bc182878f0e67c89b09896152e1be993f301bc3ff1fd2673439146f3e95b0e2247d6c3cf43c346f67c7fdaf8a7721dfd0967f71d6346fbf62bab4a SHA512 64cf2abdd40850704060b3a07d1999dcfd05e19bf27270f7918c5c8683a4b1638d04da13d09f9f671b8acf069e26872d5932d5f0ed7022fd5cdc6bbda7602433
 DIST Paste-3.5.0.tar.gz 638021 BLAKE2B 6c8d856733245a7eef5782f8d6c1fe35093f5247cc76e86ab308f2d98a99ebaaef5309a9c402f1334707e042b52e52d7801723e9404ad0ae454b756b9df31dfb SHA512 a9f596d6fcd95f915990c16830caeb9c9a03412447597258c67a003fd485e2efd27798f2eb2de9978ac529292af4b55136de554bfb501e90f6185f55a6b0531b
diff --git a/dev-python/paste/paste-3.4.6.ebuild b/dev-python/paste/paste-3.4.6.ebuild
deleted file mode 100644
index 44687dd38848..000000000000
--- a/dev-python/paste/paste-3.4.6.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=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-MY_P="Paste-${PV}"
-DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
-HOMEPAGE="https://pypi.org/project/Paste/"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
-
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	# TODO: 'Address already in use'
-	sed -e 's:test_address_family_v4:_&:' \
-		-i tests/test_httpserver.py || die
-
-	# Remove a test that runs against the paste website.
-	rm -f tests/test_proxy.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index 8c886f14f1dc..a05022e30e5e 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,2 +1 @@
-DIST pastedeploy-2.1.0.tar.gz 32240 BLAKE2B 1672e3b48a287f57e9e7fca082e4cd07cea770db1c2ae0012a83dc8ec927d83bf94461a69c7afdbed082c72506eb46c0c5db15e5f0bc24ad7a4212efb9f6696e SHA512 2c639b5ad07faee013ff3fe37d0e3c6ca7b56ed0960dbcaf133c05d51a7f29d6a2f35118bd8faea4d9aca90438c43d8046a340833878e4b925f32142df169c97
 DIST pastedeploy-2.1.1.tar.gz 32339 BLAKE2B d11affa480e5c9b7be53d0431090e4ec9d66f8862b1aadf6a993a09f9c952380d7698eaa7442614936a8316e2ac50404a096bf64bb3ef31f55cbee35b5982166 SHA512 0109e30cb5ae9bdd7f06a79f6236c90f96c3bcfe507258572b1329796a1821486d9762d954673ccbac76ee63c6a69e64fe5e2cae5402fecf4a5affe88cf46930
diff --git a/dev-python/pastedeploy/pastedeploy-2.1.0.ebuild b/dev-python/pastedeploy/pastedeploy-2.1.0.ebuild
deleted file mode 100644
index 39f4cc8ee969..000000000000
--- a/dev-python/pastedeploy/pastedeploy-2.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="PasteDeploy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="https://pypi.org/project/PasteDeploy/"
-# pypi tarball does not include tests
-SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz ->  ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i 's:"pytest-runner"::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use doc && dodoc docs/*.txt
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 92f5bf29dd8a..14990f7926ab 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,2 +1 @@
-DIST pylast-3.3.0.tar.gz 40209 BLAKE2B 45725d8424a54ac03b53a6c7fe79febb0038c07ee6c2685d7b66f29933f91fb4ea55818be1d02f8fb1126758acd1d9ce3366e8a7d84fe3082b9b3003a9b948b3 SHA512 8b0c089896d7efb37bdf3a701d150b0f94f386715eb73122a4a7618f5b1a514f9f7577e8c7c84eacb36b18e69aa064220403a578d0544344ab11e87e1b46695a
 DIST pylast-4.0.0.tar.gz 40044 BLAKE2B 89402027494d608bffc4738857d8a7728175cf29a68af259aec1d6ab3755c5e02268bbacac2ff9bd8d8c6490b86ae200aeed59f34c764a4c2f90ea59cb732070 SHA512 093845c718269ed5a0b5223182e60192a71e2fed9270fec453b96b0b2a5488a0c5a8f6386edb42ed183b97cb7ea00397b4491ff72cbf72f9e7d42dc90fae66e7
diff --git a/dev-python/pylast/metadata.xml b/dev-python/pylast/metadata.xml
index 21393b95c17b..564474029f62 100644
--- a/dev-python/pylast/metadata.xml
+++ b/dev-python/pylast/metadata.xml
@@ -1,25 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
-  <longdescription lang="en">
-    Python interface to last.fm and other api-compatible websites
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Python interface to last.fm and other api-compatible websites
 
-    Features:
-    * Simple public interface.
-    * Access to all the data exposed by the Last.fm webservices.
-    * Scrobbling support.
-    * Full object-oriented design.
-    * Proxy support.
-    * Internal caching support for some webservices calls (disabled by default).
-    * No extra dependencies but python itself.
-    * Support for other API-compatible networks like Libre.fm
-    * Python3-friendly (Starting from 0.5).
-  </longdescription>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">pylast</remote-id>
-    <remote-id type="github">pylast/pylast</remote-id>
-  </upstream>
+		Features:
+		* Simple public interface.
+		* Access to all the data exposed by the Last.fm webservices.
+		* Scrobbling support.
+		* Full object-oriented design.
+		* Proxy support.
+		* Internal caching support for some webservices calls (disabled by default).
+		* No extra dependencies but python itself.
+		* Support for other API-compatible networks like Libre.fm
+		* Python3-friendly (Starting from 0.5).
+	</longdescription>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pylast</remote-id>
+		<remote-id type="github">pylast/pylast</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/pylast/pylast-3.3.0.ebuild b/dev-python/pylast/pylast-3.3.0.ebuild
deleted file mode 100644
index 906b882aea69..000000000000
--- a/dev-python/pylast/pylast-3.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to last.fm and other api-compatible websites"
-HOMEPAGE="https://github.com/pylast/pylast"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/flaky[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 099f297e9dee..a3ca45b1d138 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,2 +1 @@
-DIST pylint-2.5.3.tar.gz 684449 BLAKE2B 7b494f5334376ff571fd8971851198d037e87c5be83d0123fcb108701489769785164bb077eb10b4851c89b82dadc40c510186eaf03be1621c4d78c79dffbceb SHA512 03fcd893d361b66794f17433e90df108099fee2eccb35507c7f61befb8db846f0242e5ce2b4ee63727c9cc780a376c3b93d5af3186f884a4fdaad68b224ed7d2
 DIST pylint-2.6.0.tar.gz 680289 BLAKE2B f7d4159478f667a3234beefd148857f26c8f7ea3aae3bfa70fa06fe2a8d86fcf22a0727a9fa5d8fc3de4aa0bb7a4d6e13bf68029f359122762d1e0d24a0b715b SHA512 02881fe14401bbe946618ef947c8db320a6c8dd93626402260d60468538ce67b61d1e8b921bfb1a6020514dd392e9b0021c97ddb60b45866c2d2241224f93f08
diff --git a/dev-python/pylint/files/pylint-2.5.3-no-pytest-runner.patch b/dev-python/pylint/files/pylint-2.5.3-no-pytest-runner.patch
deleted file mode 100644
index f4cc6be360de..000000000000
--- a/dev-python/pylint/files/pylint-2.5.3-no-pytest-runner.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 92d059ff..cbc5b881 100644
---- a/setup.py
-+++ b/setup.py
-@@ -67,7 +67,6 @@ else:
- 
- 
- needs_pytest = {"pytest", "test", "ptr"}.intersection(sys.argv)
--pytest_runner = ["pytest-runner"] if needs_pytest else []
- 
- 
- def ensure_scripts(linux_scripts):
-@@ -151,7 +150,6 @@ def install(**kwargs):
-         extras_require=extras_require,
-         test_suite="test",
-         python_requires=">=3.5.*",
--        setup_requires=pytest_runner,
-         tests_require=["pytest"],
-         **kwargs
-     )
diff --git a/dev-python/pylint/pylint-2.5.3.ebuild b/dev-python/pylint/pylint-2.5.3.ebuild
deleted file mode 100644
index 4e171c678b72..000000000000
--- a/dev-python/pylint/pylint-2.5.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-# entry_points is added via **kwargs in a dict
-_DISTUTILS_SETUPTOOLS_WARNED=1
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/astroid-2.3.3[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	dev-python/mccabe[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/six[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-	"${FILESDIR}/${PN}-2.5.3-no-pytest-runner.patch"
-	"${FILESDIR}/${PN}-2.5.3-tests.patch"
-)
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# we don't want to run the benchmarking tests
-	rm -f tests/benchmark/test_baseline_benchmarks.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	doman man/{pylint,pyreverse}.1
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	# Optional dependency on "tk" USE flag would break support for Jython.
-	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." 'dev-lang/python[tk]'
-}
diff --git a/dev-python/pylint/pylint-2.6.0.ebuild b/dev-python/pylint/pylint-2.6.0.ebuild
index e4ff3606e0e8..58a48ea2e267 100644
--- a/dev-python/pylint/pylint-2.6.0.ebuild
+++ b/dev-python/pylint/pylint-2.6.0.ebuild
@@ -62,8 +62,3 @@ python_install_all() {
 
 	distutils-r1_python_install_all
 }
-
-pkg_postinst() {
-	# Optional dependency on "tk" USE flag would break support for Jython.
-	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." 'dev-lang/python[tk]'
-}
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index 2625c26febc1..bb98457d43ed 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,2 +1 @@
-DIST pypiserver-1.3.2.tar.gz 505905 BLAKE2B 4e62d11cf280524d532e793d3ffc4dc59f1e72c6aba2ed6bd0d70f86104162dc60377b56e08676ab03326c33885acae698dc60b435426b195f13bf9f60bb7b8c SHA512 de823376f7711bfdaff3a1acefae37e1d7528802203929b8aeb8790c2b1c466badaf5a1d5084100bc37f41636d2cdfc2038cd3ad9805d15ca42c80834760b4da
 DIST pypiserver-1.4.2.tar.gz 511019 BLAKE2B fe9a41c35d601ee20f2cfe0773ce341b8c8fe387a2b825d1e6d669d5f358846b436158beb8a1222fa33cf1841cad5aceacc0f5063f899445ad15ca9eb5b8efd7 SHA512 8597a6a7e83cb3f5ead3418ee91167e1764c123b244c05397fa892c8ebe84b58569f27ce85cd9849d6a41d20342de21cf9cc46e00b233d9d94d0540470e1c49b
diff --git a/dev-python/pypiserver/pypiserver-1.3.2.ebuild b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
deleted file mode 100644
index 8f298dd0c90f..000000000000
--- a/dev-python/pypiserver/pypiserver-1.3.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Minimal PyPI server"
-HOMEPAGE="https://github.com/pypiserver/pypiserver"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.25.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/passlib[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.3[${PYTHON_USEDEP}]
-		dev-python/twine[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e "/tox/d" setup.py || die
-
-	# https://github.com/pypiserver/pypiserver/issues/312
-	sed -e 's:test_root_count:_&:' \
-		-i tests/test_app.py || die
-	sed -e 's:test_hash_algos:_&:' \
-		-e 's:test_pipInstall_openOk:_&:' \
-		-e 's:test_pipInstall_authedOk:_&:' \
-		-i tests/test_server.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 766993d5d430..4d67ee2f3808 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,3 +1,2 @@
-DIST pytest-xprocess-0.13.1.tar.gz 10273 BLAKE2B 0c2a8bdf5e31543b32ada50f2bb5e1a09b45de820064807bf41321638d11d6b6fea28fd2a8c795e7bc6f7ac7370a3e78988e8aee318fad9df194fd3b06cce7cd SHA512 e0ab9e13d7f90ffca1bb3646e5789582806519ff5e665e13ed0db00896d799a7828b39e7657e947783d15ec1a961b33c1c981e39069dd298bf352826dbdc496f
 DIST pytest-xprocess-0.15.0.tar.gz 13512 BLAKE2B 97ffef1e63f50ad2a1651f1791663f99e39c8fd8fc63427534efa5d60c9a4d856b7e036cd03faed73a1ba609716595ceeefe63604403a2bbd8a13407612a6402 SHA512 d2c7f6859b1696a8cb4445396376ce36bdcfdc8677fd97def716f240ae243c954f4110a3e500315a7f0c7f7ab7c337bf6749cbd1df3485db9fb95f42c2ffd181
 DIST pytest-xprocess-0.16.0.tar.gz 17218 BLAKE2B 60411ed5af2add7f7c7f6b6e2074f9703cdae8a450c65eda483635a1cf8f60a3dbd84218d9e99bb3783ae00ba50b3449335df92397dab0fc7281ea72d3f5696b SHA512 3cf5d05c6693ebddc91fb2ad62eacd5b8f231e78ee82908b20268367649d6d73f0c1fbbf93a31f97feabe8bddf02cb176b2ffb9f6de4387b46cd0b97ad3c3eea
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.13.1-r1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.13.1-r1.ebuild
deleted file mode 100644
index 30226ab6cd45..000000000000
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.13.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage external processes across test runs"
-HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
index b9c6d50f844d..5c641f31ecab 100644
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
+++ b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild b/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild
index ea6b298179c3..3a4eee464b3c 100644
--- a/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index 68ceaccf3907..319143004d09 100644
--- a/dev-python/routes/Manifest
+++ b/dev-python/routes/Manifest
@@ -1,2 +1 @@
-DIST Routes-2.4.1.tar.gz 182403 BLAKE2B 21a079616e1533af8fae44b0ad428b3309e5e8d1e27dddddbf3632cb3e1f5286225aec73246012a8c7c22d59d755be27f10fa09ab6ee6b34f71c6c540dfd36e4 SHA512 b0566f10ca83af0459e9c59fa2217bdc5ebf349d944396bcb21ffa731ad189c642e409381979cb5da3153630c24f20aa974a99711f16aca9f91413976af2bb04
 DIST Routes-2.5.1.tar.gz 190905 BLAKE2B e1498d0a26c7ebb1ee423ad211221f648d5bab4d37effac8c34a5f5189558a62c3ab34780f98f6a1620a261efc6085afd54f0827ac0e7a80217de7ae2226580a SHA512 06ec9a8426ced86524096703de47e3da2fa08bd0ed8c962d451b4338966804245b5074077021fb58a5afcb63acd6dcffa05a89703b8b54841a69a4cdff12b755
diff --git a/dev-python/routes/routes-2.4.1-r1.ebuild b/dev-python/routes/routes-2.4.1-r1.ebuild
deleted file mode 100644
index 9b7f494c4bb9..000000000000
--- a/dev-python/routes/routes-2.4.1-r1.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=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Routes"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A re-implementation of Rails routes system, mapping URLs to Controllers/Actions"
-HOMEPAGE="https://routes.readthedocs.io/en/latest/ https://pypi.org/project/Routes/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/repoze-lru-0.3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? ( dev-python/webob[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests nose
-distutils_enable_sphinx doc
-
-# The testsuite appears to be held back by the author
-
-# https://github.com/bbangert/routes/issues/42 presents a patch
-# for the faulty docbuild converted to sed stmnts
-python_prepare_all() {
-	# The default theme in sphinx switched to classic from shpinx-1.3.1
-	if has_version ">=dev-python/sphinx-1.3.1"; then
-		sed -e "s:html_theme_options = {:html_theme = 'classic'\n&:" \
-			-i docs/conf.py || die
-	else
-		sed -e "s:html_theme_options = {:html_theme = 'default'\n&:" \
-			-i docs/conf.py || die
-	fi
-	sed -e "s:changes:changes\n   todo:" \
-		-i docs/index.rst || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 7c7c854b721d..227bee587f62 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,2 +1 @@
-DIST tox-3.19.0.tar.gz 296499 BLAKE2B cad41c7791108ecdf6efc7bca99623c66d1d8ffbb2b06688eb84e575f14958ba2b497e0035ccc331fc8e0ce667824cba2c8dd37488ac48b3c16902c7b546074b SHA512 7a542282dc2fdef7ab8aff04372aeeeaad54b83bd7f1022c1c60465604d67a5984abcea7d409b8593b646192407c78cb88422aa4dfd11fb2a2d9da520aeafb39
 DIST tox-3.20.1.tar.gz 297516 BLAKE2B 2a13059bce229f30670e247b17ffd03d4b0d907b2fa7eb7d2f6848ada8d81e1a0aad983748c4346dfa61877f88edd22e4616ed20efcbd15da34fdc1c87b4439a SHA512 0989cc3dfd25eb3d1236d973d490f12c81273c93e84140b54342217eb73dd944f446c7ce9fe228b644d764b94300f1c6ccaf94e442d0e34835d05de84cccabd6
diff --git a/dev-python/tox/tox-3.19.0.ebuild b/dev-python/tox/tox-3.19.0.ebuild
deleted file mode 100644
index fe54ef353f99..000000000000
--- a/dev-python/tox/tox-3.19.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' python3_{5,6,7} pypy3)
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# broken without internet
-	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
-		tests/unit/session/test_provision.py || die
-	sed -i -e 's:test_provision_interrupt_child:_&:' \
-		tests/integration/test_provision_int.py || die
-	# broken with our mock version (?)
-	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
-		tests/unit/test_venv.py || die
-	# broken with Gentoo Python layout
-	sed -i -e 's:test_tox_get_python_executable:_&:' \
-		-e 's:test_find_alias_on_path:_&:' \
-		tests/unit/interpreters/test_interpreters.py || die
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index ba3d0b2776fd..7c0d67ea2f13 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,3 +1,2 @@
 DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
-DIST ujson-3.2.0.tar.gz 7128952 BLAKE2B 7e4c409eb8e87d542d37595439ded5c85e934e87a18987e18dce5ab0aebd5f9431b8a2c12ebaa467da928c3158d03325a40a9ae65230e39c93106d65b098c407 SHA512 8915e17acbd9650964dc9ae4f8a89021af921fac8f77f5456fdb8c0d6ceaa02767891d070c515c926deef76efb210a969c573e387ae62c15b2c8be761f6adb70
 DIST ujson-4.0.1.tar.gz 7128868 BLAKE2B 159496bfa2b7efff744c1f725c5a8c362c6baac20518d440e5827ec8af1a9a77b4e060126d9b35b39baae079f7092e64d49d0cd23a637174a4bca261203939d6 SHA512 11fb28166afab30e29d71070c91cfb78245eed704a769bf6fb0871c267135fac3fa1042c4ac875dcb870f8a00615e6bcc8fdcd0168edd5ccbae6437605b4df0d
diff --git a/dev-python/ujson/ujson-3.2.0.ebuild b/dev-python/ujson/ujson-3.2.0.ebuild
deleted file mode 100644
index 6f18869947ba..000000000000
--- a/dev-python/ujson/ujson-3.2.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=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
-HOMEPAGE="https://pypi.org/project/ujson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytz[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ujson/ujson-4.0.1.ebuild b/dev-python/ujson/ujson-4.0.1.ebuild
index 10777209e9b3..6f18869947ba 100644
--- a/dev-python/ujson/ujson-4.0.1.ebuild
+++ b/dev-python/ujson/ujson-4.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index 689c02bcb00c..8bc3f60270bc 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,2 +1 @@
-DIST vcrpy-4.1.0.tar.gz 330122 BLAKE2B a7a2516d4dfcc01da801fb8685ea3b56f50ce474d35477ae36785ea1bfbae113bd3c18fb3faadb13fc81c37fa1d282a84bc60fdd27f4fc4a1f3e952312d7bc5f SHA512 7ad5517cd52f6f31448db9b608d8a7b274741727487ede21b7f80e4060e3ddbb34c731166f67ae7136c86a8d3e7fd23128e035a148f18f771066bfa71319624f
 DIST vcrpy-4.1.1.tar.gz 329508 BLAKE2B b6981150a8fd742301e0d7897d84855c741c97307bbb5c5751680f3d33d69d6333a18d714fcc14cb018f5dd6c02e840e1313136660c4459e2755d448fc0b07e9 SHA512 afa1904bff37bfd2d278ed49fa3982a357eb6bb113818b532044da0f11a9dd877cc152d7f0d81d88bdc0f870521b1241f6aecf959f668211904e3c6c7cea4ad8
diff --git a/dev-python/vcrpy/vcrpy-4.1.0.ebuild b/dev-python/vcrpy/vcrpy-4.1.0.ebuild
deleted file mode 100644
index 9d1c17a24235..000000000000
--- a/dev-python/vcrpy/vcrpy-4.1.0.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=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
-HOMEPAGE="https://github.com/kevin1024/vcrpy"
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# tests requiring Internet
-	rm tests/integration/test_aiohttp.py || die
-	sed -e 's:test_flickr_should_respond_with_200:_&:' \
-		-e 's:test_amazon_doctype:_&:' \
-		-i tests/integration/test_wild.py || die
-	sed -e 's:testing_connect:_&:' \
-		-i tests/unit/test_stubs.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/yarl/yarl-1.6.2.ebuild b/dev-python/yarl/yarl-1.6.2.ebuild
index a7221a922b1a..b2083f19f565 100644
--- a/dev-python/yarl/yarl-1.6.2.ebuild
+++ b/dev-python/yarl/yarl-1.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]