Updating liguros repo21.1.2

1616 files changed, 11822 insertions, 17697 deletions

diff --git a/dev-python/Babel/Babel-2.8.0-r2.ebuild b/dev-python/Babel/Babel-2.8.0-r2.ebuild
deleted file mode 100644
index 4cc5dc189bf7..000000000000
--- a/dev-python/Babel/Babel-2.8.0-r2.ebuild
+++ /dev/null
@@ -1,35 +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,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="https://babel.pocoo.org/ https://pypi.org/project/Babel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py39.patch
-)
-
-src_test() {
-	local -x TZ=UTC
-	distutils-r1_src_test
-}
diff --git a/dev-python/Babel/Babel-2.8.1.ebuild b/dev-python/Babel/Babel-2.8.1.ebuild
index dc7c7e2744e8..775be2f974fa 100644
--- a/dev-python/Babel/Babel-2.8.1.ebuild
+++ b/dev-python/Babel/Babel-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
@@ -27,6 +27,7 @@ distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}"/Babel-2.8.0-py39.patch
+	"${FILESDIR}"/Babel-2.9.0-pypy3.patch
 )
 
 src_test() {
diff --git a/dev-python/Babel/Babel-2.9.0.ebuild b/dev-python/Babel/Babel-2.9.0.ebuild
index be45b134becf..4596c26afa86 100644
--- a/dev-python/Babel/Babel-2.9.0.ebuild
+++ b/dev-python/Babel/Babel-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 53cefd9bb2bf..3615a35606f0 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,3 +1,2 @@
-DIST Babel-2.8.0.tar.gz 8444381 BLAKE2B ea3757182464770f47d3253e77bece7b64c84558e7a19fc55759198bfa55c6d8156d27e9de7b796b62eefd93e458c7e00b2014dd23e4ed7383f5bc9785d1a332 SHA512 f9687b36176c146a8ace073197111463d24fca343bb1dbee8b0e37a7f37b68b4cd77ffbe3bf14a20f8f64c701aa860e0b5e6076658a95dbee2556f0688d68d91
 DIST Babel-2.8.1.tar.gz 8471453 BLAKE2B bc2e66a3c1c77e5b190cdb3f53d149268b6f49adde3040cbe6a3dd8eb98f6caffb3988232e76083e606186a87b9ee6b2b5352de89b7bc43d4f72905f1f594127 SHA512 ed39ad01b873d40d0bc611739761d412ff442b2df3d4c2363ec24501547da678cb752f640a02470c8513073a76c468c27fc16248820c779ef7adbe14d0f07199
 DIST Babel-2.9.0.tar.gz 8682986 BLAKE2B 0e1e8fe647fdd27230ee9c97f0994772bd5877f262f9cd00eb450445c5780b278249f87d50f98c5ca3fa5eca287c6b4fc74c5e082c522c250d640912f0ebc581 SHA512 250d1a19741eb0d1bda9d6b862f2d4779b6c67f10b8e045f450a271a16587e30f26f35ccccfea8ca13bb519582d2ef83569fa4381d0590fb9b61bf3ebf67e5f6
diff --git a/dev-python/Faker/Faker-5.5.1.ebuild b/dev-python/Faker/Faker-5.5.1.ebuild
new file mode 100644
index 000000000000..dff1b71bc2b7
--- /dev/null
+++ b/dev-python/Faker/Faker-5.5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="a Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]"
+DEPEND=""
+BDEPEND="test? (
+	dev-python/freezegun[${PYTHON_USEDEP}]
+	dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+# Specific test dependency for one country post code tests
+PATCHES=( "${FILESDIR}"/${PN}-5.5.1-ukposttest.patch )
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
new file mode 100644
index 000000000000..a1955ece9999
--- /dev/null
+++ b/dev-python/Faker/Manifest
@@ -0,0 +1 @@
+DIST Faker-5.5.1.tar.gz 1045964 BLAKE2B d0e06b0994fec1b1fbbfbc8cabb12f9a3666894304c673a8e7cc27bb52a7bf66bef8d110665b459a1c43e2b5f0d93e59f793f00279b123ff25c36ba4b4ed2cac SHA512 58d240801d72bbb884d1788931621e4ae9fa4e3ea749af90d9703fe99af23c38c86902970574838135398305877e8d196d18dc14eeb71cfe9c9c6390fbf511cb
diff --git a/dev-python/Faker/files/Faker-5.5.1-ukposttest.patch b/dev-python/Faker/files/Faker-5.5.1-ukposttest.patch
new file mode 100644
index 000000000000..5ff925613ac3
--- /dev/null
+++ b/dev-python/Faker/files/Faker-5.5.1-ukposttest.patch
@@ -0,0 +1,33 @@
+diff -Naur Faker-5.5.1.orig/tests/providers/test_address.py Faker-5.5.1/tests/providers/test_address.py
+--- Faker-5.5.1.orig/tests/providers/test_address.py	2021-01-07 17:08:37.000000000 +0100
++++ Faker-5.5.1/tests/providers/test_address.py	2021-01-12 22:07:13.748206737 +0100
+@@ -4,8 +4,6 @@
+ 
+ import pytest
+ 
+-from ukpostcodeparser.parser import parse_uk_postcode
+-
+ from faker.providers.address.cs_CZ import Provider as CsCzAddressProvider
+ from faker.providers.address.da_DK import Provider as DaDkAddressProvider
+ from faker.providers.address.de_AT import Provider as DeAtAddressProvider
+@@ -375,20 +373,6 @@
+             assert re.fullmatch(r'(?:Apt\.|Suite) \d{3}', secondary_address)
+ 
+ 
+-class TestEnGb:
+-    """Test en_GB address provider methods"""
+-
+-    def test_postcode(self, faker, num_samples):
+-        for _ in range(num_samples):
+-            assert isinstance(parse_uk_postcode(faker.postcode()), tuple)
+-
+-    def test_county(self, faker, num_samples):
+-        for _ in range(num_samples):
+-            county = faker.county()
+-            assert isinstance(county, str)
+-            assert county in EnGbAddressProvider.counties
+-
+-
+ class TestEnUS:
+     """Test en_US address provider methods"""
+ 
diff --git a/dev-python/namespace-jaraco/metadata.xml b/dev-python/Faker/metadata.xml
index 718957b24a69..c5a4813431a8 100644
--- a/dev-python/namespace-jaraco/metadata.xml
+++ b/dev-python/Faker/metadata.xml
@@ -2,13 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>sbraz@gentoo.org</email>
-		<name>Louis Sautier</name>
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">Faker</remote-id>
+		<remote-id type="github">joke2k/faker</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/GitPython/GitPython-3.1.12.ebuild b/dev-python/GitPython/GitPython-3.1.12.ebuild
new file mode 100644
index 000000000000..a3b92dbe1745
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.12.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+TEST_P=GitPython-${PV}
+GITDB_P=gitdb-4.0.5
+SMMAP_P=smmap-3.0.4
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+	test? (
+		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+src_test() {
+	git config --global user.email "travis@ci.com" || die
+	git config --global user.name "Travis Runner" || die
+
+	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
+	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb || die
+	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
+
+	cd "${T}"/test || die
+	TRAVIS=1 ./init-tests-after-clone.sh || die
+	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
+	rm -r test/performance || die
+	# tests requiring network access
+	sed -i -e 's:test_fetch_error:_&:' test/test_remote.py || die
+	rm test/test_installation.py || die
+	# broken with git 2.30+
+	sed -i -e 's:test_index_file_diffing:_&:' test/test_index.py || die
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index e0a3f6916b77..b12d3e4aee09 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,4 +1,6 @@
 DIST GitPython-3.1.11.gitbundle 4421698 BLAKE2B 96a4be2b12149c34f0e81580cb8906920a107f9856da585779f8d13590fb14c838a5e73d8831692ea81dd0ed73e17cdab1020b50cb49c7f193d54c1e838d9385 SHA512 64a443e0c517627045d98f7a60b6cdd817f6af3d12f5619cca7c4e24f9ce42018c2aca427365d633e4aaeb5e99d99a944d85b2286c34be1c17e85e441d9693c3
 DIST GitPython-3.1.11.tar.gz 170908 BLAKE2B b327f38bbe9d92caf8b5ba6f3c1e353ad00bad2c3e7b3ae59991eaee5a5dd9f228fd80b86fd7e908fa71563e369d7340070ddc0e093549bfc8378cdf20ba9723 SHA512 fe4baf9c8b3668f29fbc476ec2ba0a8d58a50ffe596b9f3037ddb4cb5c0c7faf0d34c6efac7567074f1b28b866e42dad19c91a5381eef606d3b3ff74b77649de
+DIST GitPython-3.1.12.gitbundle 8721154 BLAKE2B d00ba18e53797ebc2067de8422506db0fafc27860cd3f99a36ad4740956518cfcab98d8211d595e1347c22df3d0ac13557881f471829c429db1527099f53438e SHA512 c84c76668bbc593998cf834d18d0207ae282cf0fd6fd22e5491435884855bb2b6699b61e51b35e6bbcfc4cd2f3c15aa9b435115fe5b0957ab4c63c7aa640ed6b
+DIST GitPython-3.1.12.tar.gz 171126 BLAKE2B e74a613f5269893f29f41add6f39c34497613b728b14c4c65c5fcbd52bee52a2ef53c4db3bc63f843ce4ec1e63f3988029852e9195677db32b704d0429480130 SHA512 4a2915991831fcf0dc0326d9e9be0f06fba1e93560d07c19fad5cbcb9ff04262e7d2225c5174a8c2f55e4c44b1c027bec4ff61d7dc137d8bf110ab96026742cc
 DIST gitdb-4.0.5.gitbundle 1497722 BLAKE2B 8ee85368db7f408f96f0b48250f1ed96c8df28b0439d355ce2eecbdcc5dc94382883510c57142e7e4b6ba7cd8e82b1140eca538b45692dbe8c55bce32e1b5b4f SHA512 2c55a8e402a61ebcc362a8aee4a6154705d8ff2f5e582d13c855562dd074427681f4147641fe76681b76c99ec46040c7577dfca8bbfd575fc52772a9a6f17326
 DIST smmap-3.0.4.gitbundle 276552 BLAKE2B 2d17b927b2c644d2f1984168ee99fe5a9a58392401ac0b2894a1d5e5f9c292f32311a7a5d7669bd93c642ff791f4801d61ef3236c1dafa1434e99a17fd8751f6 SHA512 6deb282c6ece3b556c59c458b5242ff362b903441db63c005a0ab1ac055b3f974f9b34f30e0a4a41ef9246696e08b191254f72db61a8f24d4eb2f0e48a08937b
diff --git a/dev-python/GridDataFormats/GridDataFormats-0.5.0.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.5.0.ebuild
new file mode 100644
index 000000000000..1b6ac494f96c
--- /dev/null
+++ b/dev-python/GridDataFormats/GridDataFormats-0.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Reading and writing of data on regular grids in Python"
+HOMEPAGE="https://pypi.org/project/GridDataFormats/ https://github.com/MDAnalysis/GridDataFormats"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/GridDataFormats/Manifest b/dev-python/GridDataFormats/Manifest
index 1648d3597884..f6520d47367d 100644
--- a/dev-python/GridDataFormats/Manifest
+++ b/dev-python/GridDataFormats/Manifest
@@ -1 +1,2 @@
 DIST GridDataFormats-0.4.0.tar.gz 63643 BLAKE2B cbc0bc259c30c9eccf61b11a7ed6e8004979fe2adb2b049f137caddbb71190291011664462c2c1aa4fe2baf822102d59d3079e9e48620b76d37a4812ca150328 SHA512 b480293e2dd17cb484336aa1469a8f0e739fbe7d925190f6a6502e96d0ab26a36271b0a0676c711716abd3e025e86fbec961cf965e950f89be167e0a83ef904c
+DIST GridDataFormats-0.5.0.tar.gz 1982315 BLAKE2B b230fd2843ab6a5826ee425fb3fad9a0d5d75a292aa3b6b150e76fa515b68000efb8e1b4140619c0c489f34ac7e3ce6d979e97526c212caf3e808be07b33afcd SHA512 9cae1fe0f4f27bd966c1563831f8a9257ecbe14a7a6f011753355070449515b9b0ad1f31867c2c199c9703aebd5a3b40a03c1276f3bb6ff51447f7a870fdefe8
diff --git a/dev-python/HeapDict/HeapDict-1.0.0.ebuild b/dev-python/HeapDict/HeapDict-1.0.0.ebuild
deleted file mode 100644
index 80f6fe57a73b..000000000000
--- a/dev-python/HeapDict/HeapDict-1.0.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Heap with decrease-key and increase-key operations"
-HOMEPAGE="https://stutzbachenterprises.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/HeapDict/Manifest b/dev-python/HeapDict/Manifest
deleted file mode 100644
index a31c06d4fce3..000000000000
--- a/dev-python/HeapDict/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HeapDict-1.0.0.tar.gz 7713 BLAKE2B 19aedc2e7a61c74b93aa8883603520bc6ffeebae4ac4c4a4003023bf6b1c65ff55f9ef571a3e61ea92620a18eed281ad603a61e1df4f03a8811096e9f0964ab9 SHA512 1210acd3a6f3e091132d8b87963ec46c81d3141e1788c2a127fe348a9052d73225036aeabffc6a2089c7811b8571a43477055b746df6b128a645123862076bb5
diff --git a/dev-python/HeapDict/metadata.xml b/dev-python/HeapDict/metadata.xml
deleted file mode 100644
index cf2b3c1afbf5..000000000000
--- a/dev-python/HeapDict/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>
-    heapdict implements the MutableMapping ABC, meaning it works pretty much like a regular Python dict.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">HeapDict</remote-id>
-    <remote-id type="github">dask/zict</remote-id>    
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/MechanicalSoup/Manifest b/dev-python/MechanicalSoup/Manifest
index 0e84d9339704..3c645248837a 100644
--- a/dev-python/MechanicalSoup/Manifest
+++ b/dev-python/MechanicalSoup/Manifest
@@ -1 +1,2 @@
 DIST MechanicalSoup-0.12.0.tar.gz 44505 BLAKE2B 7c303f7ae4dea12157d5c845a4dcdc6923e76d3565debd88d2f43e2cfc29a503feb6accb969839a39b1c4071b029f53908a12902a5c4f175f0383da227224c55 SHA512 6cce80ea5a90e7f19f2b13749f6ee48222d973af66cb350ac867a554580b0d619defe5a93741e6ec8aa808c585a8c01703158c7484521ac069977388de8bb7e3
+DIST MechanicalSoup-1.0.0.tar.gz 47572 BLAKE2B eace6cc4eaf50f01f8a7816d4d87a9345676b6921c8fe46b3280ac83463b241b2e6175b91ee1a5f907635c07ee8cf66324cb2e7938736b81e9a4f849f9159548 SHA512 00e2c5220c065b517301d9381a9bc5019f6f75dc5951a5ab4427fd7939b296b6b33a20b8f8a7e82c6feed2c9100e3481f38a424d63065883d71a6927119ad88c
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-1.0.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-1.0.0.ebuild
new file mode 100644
index 000000000000..2c3f818dcb00
--- /dev/null
+++ b/dev-python/MechanicalSoup/MechanicalSoup-1.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A python library for automating interaction with websites"
+HOMEPAGE="https://pypi.org/project/MechanicalSoup/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/beautifulsoup-4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/requests-mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# Override pytest options to skip coverage and flake8
+	sed -i -e '/^addopts =/d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+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/PyContracts/PyContracts-1.8.14-r1.ebuild b/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
index 929ecbb9dd85..269f69087e66 100644
--- a/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 44fa66eabf28..c031e657979d 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,2 +1 @@
-DIST PyGithub-1.53.gh.tar.gz 3026570 BLAKE2B 7204c5934b94d5629b38e841a9c9011ea561ca8aa8d3d169915975fb02fe8db059fcb521d11bbb2350a806457d98abbfe36a19c4e5f633c82cdf06b8b7203c6d SHA512 f98d013d5fdf31ee59405c52edb35942ca5a3d2c1ff9653c71f03871bb28d0c247412bfc2593991026ddb989e1a33dfe91d19b4ebb1e89386b54493d51071768
-DIST PyGithub-1.54.gh.tar.gz 3117061 BLAKE2B d180b9c0192ad22b84cb17ff6c9a7c4ad4d490c149549515727a0f1ab4e572461d461cdcd4138a0d9f03f26b0a689579bd7ec875896330a3c43e5cfb45411dc7 SHA512 c716df1f6dc64ea6bc56db82b0f0263dc0ec29994ea9fa967c22a0eee07c4ccd206f14168e36df7d913cfa387ecca703cd2331cd549bd42ebbec0e33ecd15c44
+DIST PyGithub-1.54.1.gh.tar.gz 3117667 BLAKE2B 1cf44acf8e69674dee8440162151236eead3af78e2ea9d1c57d7c9217b7249fbc1d8ca10f15e79f8f27ae9cd5ad126376b1702ac4d9758e4f0b0acf6e85eab22 SHA512 72aecef168c8741b773560bee31b0b6159abeea97cc9f659363ff9204eed610686fdaf6461dab0c643adf00140a53aa86d70b9011b39522650aa872f02e5e67e
diff --git a/dev-python/PyGithub/PyGithub-1.53.ebuild b/dev-python/PyGithub/PyGithub-1.54.1.ebuild
index f71ffb968439..502cb654e02a 100644
--- a/dev-python/PyGithub/PyGithub-1.53.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.54.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
+	<dev-python/pyjwt-2[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/PyGithub/PyGithub-1.54.ebuild b/dev-python/PyGithub/PyGithub-1.54.ebuild
deleted file mode 100644
index 73504cb8411a..000000000000
--- a/dev-python/PyGithub/PyGithub-1.54.ebuild
+++ /dev/null
@@ -1,28 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="https://github.com/PyGithub/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/PyICU/PyICU-2.6.ebuild b/dev-python/PyICU/PyICU-2.6.ebuild
index 2bf1a788f1f0..2b30e2a7548d 100644
--- a/dev-python/PyICU/PyICU-2.6.ebuild
+++ b/dev-python/PyICU/PyICU-2.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-libs/icu:="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/PyQt5-python2/PyQt5-python2-5.14.2-r1.ebuild b/dev-python/PyQt5-python2/PyQt5-python2-5.14.2-r2.ebuild
index 9a47115577a2..9a47115577a2 100644
--- a/dev-python/PyQt5-python2/PyQt5-python2-5.14.2-r1.ebuild
+++ b/dev-python/PyQt5-python2/PyQt5-python2-5.14.2-r2.ebuild
diff --git a/dev-python/PyQt5-sip-python2/PyQt5-sip-python2-4.19.22.ebuild b/dev-python/PyQt5-sip-python2/PyQt5-sip-python2-4.19.22-r1.ebuild
index c87f6c45c2f0..019b360a5bd9 100644
--- a/dev-python/PyQt5-sip-python2/PyQt5-sip-python2-4.19.22.ebuild
+++ b/dev-python/PyQt5-sip-python2/PyQt5-sip-python2-4.19.22-r1.ebuild
@@ -11,11 +11,8 @@ HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
 
 MY_PN=sip
 MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${MY_PN}/${MY_P}.tar.gz
+	http://mirror.yandex.ru/calculate/source/${MY_PN}/${MY_P}.tar.gz"
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 954521b840fa..fe53d1c65bc1 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1 +1,2 @@
 DIST PyQt5-5.15.1.tar.gz 3264559 BLAKE2B 20060297c52aa5d07ba28b50440bd3623b8648eef8502693f8175af9ba4edf9238b9be71c696ea2589556ad70e70e868dc9c286466af22867ab51d5c66e613db SHA512 a7378dd53337c58f5ba7e9f7510b57fe4affe578b68975ce1dd7ba5c2a1c77d08d51d11078ce782aab09509df934eb3e4d0588de87391f74ad99f9624644cc4e
+DIST PyQt5-5.15.2.tar.gz 3265445 BLAKE2B 7712d68aa54cf9e6836863d7aa645151254d79621e115ed314ba63c371d5e24577a0392311b31a73e45af45baa29eca1d7e9a03874beac1fbf043fa703af69f9 SHA512 6d48d2ed907b436131d46b0513d82e1069c76e873d395e4a6c0832ae3a20621b92d3abece046c5fcd14cb818d50ffb369153fca1ce9341f0db1b8c479b94e621
diff --git a/dev-python/PyQt5/PyQt5-5.15.2.ebuild b/dev-python/PyQt5/PyQt5-5.15.2.ebuild
new file mode 100644
index 000000000000..b6e197e26f6c
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.15.2.ebuild
@@ -0,0 +1,190 @@
+# 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,10} )
+inherit multibuild python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# TODO: QtNfc, QtQuick3D, QtRemoteObjects, QtTextToSpeech
+IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
+	multimedia network networkauth opengl positioning printsupport sensors serialport
+	sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns"
+
+# The requirements below were extracted from configure.py
+# and from the output of 'grep -r "%Import " "${S}"/sip'
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( gui )
+	declarative? ( gui network )
+	designer? ( widgets )
+	help? ( gui widgets )
+	location? ( positioning )
+	multimedia? ( gui network )
+	networkauth? ( network )
+	opengl? ( gui widgets )
+	positioning? ( gui )
+	printsupport? ( gui widgets )
+	sensors? ( gui )
+	serialport? ( gui )
+	sql? ( widgets )
+	svg? ( gui widgets )
+	testlib? ( widgets )
+	webchannel? ( network )
+	webkit? ( gui network printsupport widgets )
+	websockets? ( network )
+	widgets? ( gui )
+	xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.15:5"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	location? ( >=dev-qt/qtlocation-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
+	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	webkit? ( dev-qt/qtwebkit:5[printsupport] )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.23[${PYTHON_USEDEP}]
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pyqt_use_enable() {
+	use "$1" || return
+
+	if [[ $# -eq 1 ]]; then
+		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
+	else
+		shift
+		echo ${@/#/--enable=}
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			$(usex debug '--debug --qml-debug --trace' '')
+			--verbose
+			--confirm-license
+			--qmake="$(qt5_get_bindir)"/qmake
+			--bindir="${EPREFIX}/usr/bin"
+			--qsci-api
+			--enable=QtCore
+			--enable=QtXml
+			$(pyqt_use_enable bluetooth)
+			$(pyqt_use_enable dbus QtDBus)
+			$(usex dbus '' --no-python-dbus)
+			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
+			$(usex declarative '' --no-qml-plugin)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(usex gles2-only '--disable-feature=PyQt_Desktop_OpenGL' '')
+			$(pyqt_use_enable gui)
+			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable location)
+			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
+			$(pyqt_use_enable network)
+			$(pyqt_use_enable networkauth QtNetworkAuth)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable positioning)
+			$(pyqt_use_enable printsupport QtPrintSupport)
+			$(pyqt_use_enable sensors)
+			$(pyqt_use_enable serialport QtSerialPort)
+			$(pyqt_use_enable sql)
+			$(usex ssl '' '--disable-feature=PyQt_SSL')
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webchannel QtWebChannel)
+			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
+			$(pyqt_use_enable websockets QtWebSockets)
+			$(pyqt_use_enable widgets)
+			$(pyqt_use_enable x11extras QtX11Extras)
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake to respect toolchain and build flags
+		eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		local tmp_root=${D}/${PN}_tmp_root
+		# parallel install fails because mk_distinfo.py runs too early
+		emake -j1 INSTALL_ROOT="${tmp_root}" install
+
+		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
+		local exe
+		for exe in pylupdate5 pyrcc5 pyuic5; do
+			python_doexe "${bin_dir}/${exe}"
+			rm "${bin_dir}/${exe}" || die
+		done
+
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+		rm -r "${uic_dir}"/port_v2 || die
+
+		multibuild_merge_root "${tmp_root}" "${D}"
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 300b3bc08a7f..3e54fe3f290e 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1 +1,2 @@
 DIST PyQtWebEngine-5.15.1.tar.gz 48520 BLAKE2B d4e4fcfb1066fcc274f4b3c8ccd7380435b9391586e3396fb5aa95ad7443c168ea9be3b85ec93e2dc28285aca18718afeb1487cb2c4ad5ed1a4f4d03010107ec SHA512 1efbea43bfd4a6de1c7aa2ab2ca124c4278b6b7ea0d6073c64a7ad83df676759d0747421cae5214017e3c61d8edddf9766f93660e13eee5d407a24fd11d8c21f
+DIST PyQtWebEngine-5.15.2.tar.gz 48608 BLAKE2B a03f77b0cde0d1031e8f1c4c6b5d13a342c28cf814ebaaf4a2cdb4608ce40cdd8163783932abc76cda583c0fed7191653b537598a9ab65f6509ef88008538e31 SHA512 7e6d95833b1a9e5bb5275eff01e1923419da35d13862fc4cbb231cbf950ed45e628bc7e161b0b6b66c718ee439a1a8e66dd754cee9adcdf69ab1b8ffab58901e
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild
new file mode 100644
index 000000000000..d7213068cc24
--- /dev/null
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild
@@ -0,0 +1,75 @@
+# 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,10} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for QtWebEngine"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtwebengine:5[widgets]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--qmake="$(qt5_get_bindir)"/qmake
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Fix parallel install failure
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \
+			${PN}.pro || die
+
+		# Run eqmake to respect toolchain and build flags
+		eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+}
diff --git a/dev-python/abydos/Manifest b/dev-python/abydos/Manifest
new file mode 100644
index 000000000000..574f09097b0e
--- /dev/null
+++ b/dev-python/abydos/Manifest
@@ -0,0 +1 @@
+DIST abydos-0.5.0.tar.gz 21321759 BLAKE2B 1f14675f42e849e5e1563dd858bfb2bf040e25b0f90cb3da9986492378892bedd0f23eea990cd65d804aececb350b0e90fb27921382a8df8b91e55d7f820c27e SHA512 28aeea4ba16ea88b077e8b9902f5d8b3a650eeced489687daf9af0e4aa437eaee6c8eeb0747dd5a8f95291594064a1221cc1da2dfa989978bcc870045fee3531
diff --git a/dev-python/abydos/abydos-0.5.0.ebuild b/dev-python/abydos/abydos-0.5.0.ebuild
new file mode 100644
index 000000000000..2452a0ea812c
--- /dev/null
+++ b/dev-python/abydos/abydos-0.5.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abydos NLP/IR library"
+HOMEPAGE="https://github.com/chrislit/abydos"
+SRC_URI="https://github.com/chrislit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Requires access to the internet
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/deprecation[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/nltk[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+# Extension error: You must configure the bibtex_bibfiles setting
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-bibtex
+
+python_prepare_all() {
+	# do not depend on pytest-cov
+	sed -i -e '/addopts/d' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/abydos/metadata.xml b/dev-python/abydos/metadata.xml
new file mode 100644
index 000000000000..afec9e8d384c
--- /dev/null
+++ b/dev-python/abydos/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">abydos</remote-id>
+		<remote-id type="github">chrislit/abydos</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/aiocontextvars/Manifest b/dev-python/aiocontextvars/Manifest
deleted file mode 100644
index 11ae3a9e04d9..000000000000
--- a/dev-python/aiocontextvars/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aiocontextvars-0.2.2.tar.gz 17329 BLAKE2B 96c77d6222456b84a99454d60aa5f30d8256297f716d729398a07a3d9bcfa4a64fa44d183163c47deccda75d5e761140aecb6d5f5df2865e1c52f9cd6682cce8 SHA512 87de2be27217b664615ebfec2b4bd4da8542913649ce2b4f23357e7d8b07c9776d633f7f781caedc6eb4e261bdd762228486ab69d6b776e40013942e593f19bf
diff --git a/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild b/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
deleted file mode 100644
index 53b2aece18fe..000000000000
--- a/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# this is a backport, do not add extra impls
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Asyncio support for PEP-567 contextvars backport"
-HOMEPAGE="https://github.com/fantix/aiocontextvars"
-SRC_URI="https://github.com/fantix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-DEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/contextvars[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's|'\''pytest-runner'\'',\?||' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aiodns/aiodns-2.0.0-r1.ebuild b/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
index b044b0be522d..36fad09cdda1 100644
--- a/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
+++ b/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 # Tests fail with network-sandbox, since they try to resolve google.com
 RESTRICT="test"
diff --git a/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild b/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild
index 160caaef8fbd..85649f355101 100644
--- a/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -140,6 +140,10 @@ python_prepare_all() {
 	sed -e 's:test_proxy_https_bad_response:_&:' \
 		-i tests/test_proxy_functional.py || die
 
+	# newer chardet works too
+	sed -e 's|chardet>=2.0,<4.0|chardet>=2.0|' \
+		-i setup.py aiohttp.egg-info/requires.txt || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
index 3e5e040e421a..75621da5f2df 100644
--- a/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -70,6 +70,10 @@ python_prepare_all() {
 	sed -e 's:test_mark_formdata_as_processed:_&:' \
 		-i tests/test_formdata.py || die
 
+	# newer chardet works too
+	sed -e 's|chardet>=2.0,<4.0|chardet>=2.0|' \
+		-i setup.py aiohttp.egg-info/requires.txt || die
+
 	# takes a very long time, then fails
 	rm tests/test_pytest_plugin.py || die
 
diff --git a/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
index 650a71daedc4..c95c54cdde94 100644
--- a/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
 
 RDEPEND="
 	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
@@ -71,6 +71,10 @@ python_prepare_all() {
 	sed -e 's:test_mark_formdata_as_processed:_&:' \
 		-i tests/test_formdata.py || die
 
+	# newer chardet works too
+	sed -e 's|chardet>=2.0,<4.0|chardet>=2.0|' \
+		-i setup.py aiohttp.egg-info/requires.txt || die
+
 	# takes a very long time, then fails
 	rm tests/test_pytest_plugin.py || die
 
diff --git a/dev-python/aiohttp/aiohttp-3.7.3.ebuild b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
index e78a5c582e06..e23e6dd684b0 100644
--- a/dev-python/aiohttp/aiohttp-3.7.3.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 RDEPEND="
 	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
@@ -71,6 +71,10 @@ python_prepare_all() {
 	sed -e 's:test_mark_formdata_as_processed:_&:' \
 		-i tests/test_formdata.py || die
 
+	# newer chardet works too
+	sed -e 's|chardet>=2.0,<4.0|chardet>=2.0|' \
+		-i setup.py aiohttp.egg-info/requires.txt || die
+
 	# takes a very long time, then fails
 	rm tests/test_pytest_plugin.py || die
 
diff --git a/dev-python/aiorpcX/Manifest b/dev-python/aiorpcX/Manifest
index 5988ae20fe58..6c03ad241fa9 100644
--- a/dev-python/aiorpcX/Manifest
+++ b/dev-python/aiorpcX/Manifest
@@ -1 +1,2 @@
 DIST aiorpcX-0.18.4.gh.tar.gz 65500 BLAKE2B 8c84ace1e2bc974e68702e25efe126f7f69dd7451f438ccd924ee8be3c0cccc5c9b3d116bf2d0a755b013bdfe61a398d856031970e5ae82b571af09551231bed SHA512 d4df1343f575af72dff31f1794485c0cbb5b6c31d6d933b07cc8375a1418ad4fb81b2649b3c60adaaeab75b7a5d959838accc38269373310eb07895acf4c9496
+DIST aiorpcX-0.18.5.gh.tar.gz 65622 BLAKE2B 68b91e2cfb869c6971efb525fd35132c38ab9092362944fa77476bdb33f076f8415a079d97238e2c4ffbc6c9df596b468c2b6640389a11d1607b1a99aa8dc68d SHA512 5eb8417ce2ffb70208aec79e44ee0d8671c4cf86745f2d8061cf013c4ad17f83db68ed3ed43ef61df196e4ef073a21f9a4e22df46b00ce3054babf98dfcd1eaf
diff --git a/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild b/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild
new file mode 100644
index 000000000000..442b4db29c49
--- /dev/null
+++ b/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild
@@ -0,0 +1,28 @@
+# 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,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
+HOMEPAGE="https://pypi.org/project/aiorpcX/
+	https://github.com/kyuupichan/aiorpcX/"
+SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
+	-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/uvloop[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index 39861ac51fc7..0ebcc14deed0 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,2 +1 @@
-DIST ansi2html-1.5.2.tar.gz 27124 BLAKE2B 0d02e8cea46622c4d2cbd06f06fd31b3c7e93d61f6b9eadb37815d2ee490b6ce4233fb019f175f61465ef89520a944bbe14543627a6421a64304b58dc038c0ca SHA512 163d5784d04e6eea0847676b967051382fa74a354c19462d1b73980fd1b0a7eb45ce1f1bd88cca803356e7767ccab1bbce6de4152c98aec98534f4ed7d65a83f
 DIST ansi2html-1.6.0.tar.gz 36053 BLAKE2B deb63c6c9f431ff225cfcbbd2995f0fce9535736dba7d8c92f1f2e51d525640e69bc4269ab073438239edb35815288fa17b2d69c89cca7627ba2b5096009611f SHA512 35e5fb6cee96fe41a658c005734a58b08bc05e8ad5903ad18684c316bdad351a70c534b4162416225bc2ca774d01b4ac1bb8a8dad3170d0738aa7b3daf46b3c0
diff --git a/dev-python/ansi2html/ansi2html-1.5.2-r2.ebuild b/dev-python/ansi2html/ansi2html-1.5.2-r2.ebuild
deleted file mode 100644
index 598296ec21de..000000000000
--- a/dev-python/ansi2html/ansi2html-1.5.2-r2.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_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	doman man/${PN}.1
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ansi2html/ansi2html-1.6.0.ebuild b/dev-python/ansi2html/ansi2html-1.6.0.ebuild
index f38b2d6f7627..675894198003 100644
--- a/dev-python/ansi2html/ansi2html-1.6.0.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="doc"
 
 RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/appdirs/appdirs-1.4.4-r1.ebuild b/dev-python/appdirs/appdirs-1.4.4-r1.ebuild
index bcaeba588c44..2c5ad6ca65ad 100644
--- a/dev-python/appdirs/appdirs-1.4.4-r1.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.4.4-distutils.patch )
 
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 6ecdda59174a..e93f068f90bc 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,3 +1 @@
-DIST argcomplete-1.12.0.tar.gz 53625 BLAKE2B 29b4f620537a087629c63dc71c6a0101d40967145680518b566b9c81e3e744c5d73e1ed016795f0ea4338be4e8f20b7df1968e388e1ff09308e012ed1ba6d0c0 SHA512 5e21e3caf1dcee661c0dadf28d7b127147325475fe3ae569fae8797a762c34b55125df9f52de8d76f0aa6dd4efdac260a358b325a7659beae02b1dedab501c18
-DIST argcomplete-1.12.1.tar.gz 53677 BLAKE2B 85c5d75b59875b6fe5bb932ed05916f3af23ef64b993544c69ae431d9e6b5d8c23a9bd35d76b570538ce8e722a6ffc8cbcbfbc9209fbf29ddb000c60a809c03c SHA512 236871966361ac781c04f52c02d90c20badabad12d34bd7c5cb1cf1a74d442f9147e04b320530b55abc0490f7bcd11494cdc13ed5c339c91737f1c979010d096
 DIST argcomplete-1.12.2.tar.gz 53861 BLAKE2B 59a8472818aef4967cb978302bd98b206b206beaf37ac7743b1e3460e3f184e4fe2dccbb48e1b436dfd1127248d3fa2f10ace81ba35c744d93adb5efedd7e470 SHA512 3099507eac285b396df1c02d7e7bdedc1dd26aaf599a81147ebaabe211a97362ddb94533c9bc733d30a9fe84fcb9d6b52794e4c12f99f881b320280d0d1479f0
diff --git a/dev-python/argcomplete/argcomplete-1.12.0-r1.ebuild b/dev-python/argcomplete/argcomplete-1.12.0-r1.ebuild
deleted file mode 100644
index 2b262f492e17..000000000000
--- a/dev-python/argcomplete/argcomplete-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,35 +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,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.org/project/argcomplete/"
-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 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		<dev-python/importlib_metadata-2[${PYTHON_USEDEP}]
-	' -2 python3_{5,6,7} pypy3)"
-# pip is called as an external tool
-BDEPEND="
-	test? (
-		app-shells/fish
-		app-shells/tcsh
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pip-19
-	)"
-
-python_test() {
-	"${EPYTHON}" test/test.py -v || die
-}
diff --git a/dev-python/argcomplete/argcomplete-1.12.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.12.2-r1.ebuild
index d1a94a277c93..4312d7ee1503 100644
--- a/dev-python/argcomplete/argcomplete-1.12.1-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.12.2-r1.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		<dev-python/importlib_metadata-3[${PYTHON_USEDEP}]
+		<dev-python/importlib_metadata-4[${PYTHON_USEDEP}]
 	' -2 python3_{5,6,7} pypy3)"
 # pip is called as an external tool
 BDEPEND="
diff --git a/dev-python/argcomplete/argcomplete-1.12.2.ebuild b/dev-python/argcomplete/argcomplete-1.12.2.ebuild
deleted file mode 100644
index c3a23ac772b9..000000000000
--- a/dev-python/argcomplete/argcomplete-1.12.2.ebuild
+++ /dev/null
@@ -1,35 +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,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.org/project/argcomplete/"
-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 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		<dev-python/importlib_metadata-3[${PYTHON_USEDEP}]
-	' -2 python3_{5,6,7} pypy3)"
-# pip is called as an external tool
-BDEPEND="
-	test? (
-		app-shells/fish
-		app-shells/tcsh
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pip-19
-	)"
-
-python_test() {
-	"${EPYTHON}" test/test.py -v || die
-}
diff --git a/dev-python/arpeggio/Manifest b/dev-python/arpeggio/Manifest
index 707e6994db08..69f6b25de0b3 100644
--- a/dev-python/arpeggio/Manifest
+++ b/dev-python/arpeggio/Manifest
@@ -1,2 +1 @@
 DIST Arpeggio-1.10.0.tar.gz 766416 BLAKE2B 75898c5be536998a12ec0efb8ca0729913e9ac7ac8481f614cb1bfd5332015bd2c22722cc6836511e1b77d933fe497538db1a00804e2cbf409af7cc153ba15c6 SHA512 368c478114ddedbf40c94b4e656945063df5661deacc9c75780ddca18198a9e3e504718fc6c9a1e84c11c5c8f2b454584d1cfc5a14ea2b783e97b8e317047023
-DIST arpeggio-1.9.2.tar.gz 761920 BLAKE2B ba8c8a5cb8965325c1c3be68a481e024b0ab703d5f60fd9ccb2589fe5efe2618fd24f2b9bc36823005897c83e233bc97372a0e3d2010cf2e2399b96aec58feb5 SHA512 fa1057caaa0b5d26937c6e5aed719f64b293d3332e3ce0277a586bd48ca136792a4811c292fd87f2e58148874e008a6f2f621630052c5dfaf0e0efe2e8039353
diff --git a/dev-python/arpeggio/arpeggio-1.10.0.ebuild b/dev-python/arpeggio/arpeggio-1.10.0.ebuild
index 1f81b3ff0711..6071adb0b1ec 100644
--- a/dev-python/arpeggio/arpeggio-1.10.0.ebuild
+++ b/dev-python/arpeggio/arpeggio-1.10.0.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P^}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/arpeggio/arpeggio-1.9.2.ebuild b/dev-python/arpeggio/arpeggio-1.9.2.ebuild
deleted file mode 100644
index 60866163d058..000000000000
--- a/dev-python/arpeggio/arpeggio-1.9.2.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
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-MY_PN=Arpeggio
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Parser interpreter based on PEG grammars"
-HOMEPAGE="https://pypi.org/project/Arpeggio/ https://github.com/igordejanovic/Arpeggio"
-SRC_URI="https://github.com/igordejanovic/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/memory_profiler[${PYTHON_USEDEP}]
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -e 's:packages=find_packages(:\0exclude=["examples", "examples.*"]:' \
-		-e "s:\\(setup_requires=\[\\)'pytest-runner'\\(\],\\):\\1\\2:" \
-		-i setup.py || die
-}
-
-python_test() {
-	pytest -vv || die "Testing failed"
-}
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 76cce639fab0..b4d6dbca0146 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,2 +1 @@
-DIST asgiref-3.3.0.tar.gz 26945 BLAKE2B bdb1154175f95fc068fd1841a69ec9c5e782c212d9649aef0b9ca7592987f88d23311149f573febd76e5ab6fea4e6087a8c5e6e9e2edb4dab37d34ff3d180845 SHA512 fbb66af8f0e2bbeed31ae6ac358f045c0eef6cdeec6edbaf358f7551ff24e69233cfbc898b60ac9d16d747a9fb7e10a8b203065602140c025b2ae7d4d7229def
 DIST asgiref-3.3.1.tar.gz 27197 BLAKE2B 1a883ed8b87dd1214ffb7672796159684f04a9a38d75562df38455ea039667f877020263b4577a3f6f7cfdfa0aae2a2074781db669f10c5b639a5009ee4c94b3 SHA512 2d709e8b0ea8b9f11f485ee438cfbbfe8a832de1aa37094a6339cfff23c2605ec79f691320c42bebf46f3bddb005ebb6857d17a8ad641c87a149536cc65984e6
diff --git a/dev-python/asgiref/asgiref-3.3.0.ebuild b/dev-python/asgiref/asgiref-3.3.0.ebuild
deleted file mode 100644
index 4da6836aa1b7..000000000000
--- a/dev-python/asgiref/asgiref-3.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-BDEPEND="
-	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.3.1.ebuild b/dev-python/asgiref/asgiref-3.3.1.ebuild
index 00bc06517a12..a5f706334eda 100644
--- a/dev-python/asgiref/asgiref-3.3.1.ebuild
+++ b/dev-python/asgiref/asgiref-3.3.1.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/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index e5efbfd9097f..e47867e63666 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,2 +1 @@
-DIST asn1crypto-0.24.0.gh.tar.gz 641322 BLAKE2B eb30afd0d2579f44ee4f556139357dc7622691bdc2067df913a4412cd3dca8372b85d84e3a3cbef6ba83648bf4ef55d7e8614992e2abb019301c92d24b15a926 SHA512 426cc380903b4dd7aadd7b831e3a11ee3442c961a33b856d4aa8d9060e829f2e0ad905a60c4d6504569718fe2cee01d9be31628c89ef030bc34281e381c898e8
 DIST asn1crypto-1.4.0.gh.tar.gz 672812 BLAKE2B 7545d424c244c04c2639df45e0bb56c50de95d0a7ee1e56933720dd7215c2be2608ac7889e2e901785592592e9ac6cb116fff3cd00536903c392a9e3912fc08a SHA512 989e4e0650252c29477d71263549b99f2c51c87f0768c20264b3de65f32edd8e7922e8af23bb1a7e29567a4ad8c4c5d596cdf7db3c766352c7f19d4f93361cd0
diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
deleted file mode 100644
index 5400b6458037..000000000000
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ /dev/null
@@ -1,27 +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,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python ASN.1 library with a focus on performance and a pythonic API"
-HOMEPAGE="https://github.com/wbond/asn1crypto/ https://pypi.org/project/asn1crypto/"
-# pypi tarball does not have tests
-SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild b/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
index 0eff2768f556..49ffbf3570d1 100644
--- a/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,6 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests unittest
diff --git a/dev-python/asn1crypto/metadata.xml b/dev-python/asn1crypto/metadata.xml
index 1d2f88634649..42c7d364a0c6 100644
--- a/dev-python/asn1crypto/metadata.xml
+++ b/dev-python/asn1crypto/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">asn1crypto</remote-id>
 		<remote-id type="github">wbond/asn1crypto</remote-id>
diff --git a/dev-python/atpublic/Manifest b/dev-python/atpublic/Manifest
index a613070f15a6..33894b1b4cb1 100644
--- a/dev-python/atpublic/Manifest
+++ b/dev-python/atpublic/Manifest
@@ -1 +1,2 @@
 DIST atpublic-1.0.tar.gz 13611 BLAKE2B b5ce4cbbe950943c001e25c3f0c1fe6c25a99a96e4c630844a409cb0ae9a2e7d8fae8d010864364bb2bc948ce78ed17bef5c1f1ca1435faca439f62521bcc719 SHA512 f9e6f7bbbe12d86df5bc849c432e789fb55c6d19b9d6b3fb2462ea38aa8ad6602504a30a95ec14e001f62709ae5e11ae29258b9cb7a71eaa48879f9cb0cb19d8
+DIST atpublic-2.1.2.tar.gz 16298 BLAKE2B c388743e2348b9143926f4c3a5e7908382799b6728d1768fcc5779eae93d45b5741ec080b5255de39be14a2a3a9e2fecc657802f91df1df8e626910582785a9b SHA512 cfde028756f56c7ca83b91e7d8653cee4575fb581669ee02c56a08c92ae2a6c1e51db76b6def1959354d3e931418a4dd09b78236268170d8c79620477836fe08
diff --git a/dev-python/atpublic/atpublic-2.1.2.ebuild b/dev-python/atpublic/atpublic-2.1.2.ebuild
new file mode 100644
index 000000000000..b2205e06ff1f
--- /dev/null
+++ b/dev-python/atpublic/atpublic-2.1.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A decorator to populate __all__ and the module globals"
+HOMEPAGE="https://gitlab.com/warsaw/public"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov=public::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index f773b184fbd8..2b1370200b29 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,4 +1,3 @@
-DIST autobahn-20.12.1.tar.gz 1269156 BLAKE2B ff763accde6a2929fd777364c926132b8317d80f137d67768bf192fb72f45597ac115824783f01debacc773dcc9a60325692ac420e55b6f67f4ebc2cdc6187ae SHA512 df7c7065e050efb5f315055c05aa9b4fcf8636e7208f17b583ed0823a071c6484adcf610308e83df3b5bbb91a4df19266e739abc8405e34483b1bf3d9f2c74c7
 DIST autobahn-20.12.2.tar.gz 1269167 BLAKE2B f6ea51682c13690002796f2a45bd11fc2f8497eeee25a1786e942111f43f9dc1f7f806281e4dc37d1ed0aa302fc5c5e47a55d876e010580d7a08eb5ac7534ed0 SHA512 aa6d5e77ba6129931a07cad13f839d5c76267b8126a05ade4ed1c7183ce019faf6656105a853515b543e5ac34ab20d02821b29aa68eb51c385880ad3919d1dcc
-DIST autobahn-20.4.3.tar.gz 938992 BLAKE2B 259d18f4aa46f7eaeac75811c1c193f3046aca5c5e37627d9ac62eeaa3dc944d05a8d87a558e241bdef56c799be4d89f65d4c8ee7c1a2be20f892896227eb5f9 SHA512 c34f29951b8f9ff5161851cf3a7e964de136f6091b0231a8e78e7fe74cb085077be5078cee352b2c27412d9aa4303de1eb85aa1890b4fb583575638a9c47c6fb
+DIST autobahn-20.12.3.tar.gz 1268873 BLAKE2B 44dcaf9d19af89382dfdef9f40a0177486298d451697b973c7a65b44c71c764295afd01ac6333b7a8c5be0348713f38c36884564e148b2941bb42372f07d0e89 SHA512 ad77e476e2eab0039c0a2c98d5851d6237fa7f6a5dfd6b79bd88668dc498bf1b47bb1bcc26ff16e4087cc82aefb0082c8a74afc68b01be48c6140f3aa4ded5b3
 DIST autobahn-20.7.1.tar.gz 1260579 BLAKE2B 925d148836348c068d179d4871267bf79c8c42d27cacc6be09cca11396dbd213a5b86344142df886d4ff69d1214a86b49900ca3552bcdb640377cb0d6af7d0f0 SHA512 e2c241194da90ada86a2804683cb063320f75a69b76ddc016349c11614e7f298619c2eeba4fcccb8f8d65d84375681fb339d9f92f94f45f1015f4f12fa0c39b0
diff --git a/dev-python/autobahn/autobahn-20.12.1.ebuild b/dev-python/autobahn/autobahn-20.12.3.ebuild
index 869a0f56a285..05cd3ed7b0f7 100644
--- a/dev-python/autobahn/autobahn-20.12.1.ebuild
+++ b/dev-python/autobahn/autobahn-20.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,7 @@ IUSE="crypt scram test xbr"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
 	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/cbor2-5.1.0[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.9.2[${PYTHON_USEDEP}]
@@ -82,8 +83,8 @@ python_test() {
 	unset USE_TWISTED
 	echo "RE-testing cryptosign and component_aio using asyncio"
 	export USE_ASYNCIO=true
-	py.test -v autobahn/wamp/test/test_cryptosign.py || die
-	py.test -v autobahn/wamp/test/test_component_aio.py || die
+	py.test -v autobahn/wamp/test/test_wamp_cryptosign.py || die
+	py.test -v autobahn/wamp/test/test_wamp_component_aio.py || die
 	unset USE_ASYNCIO
 	rm -r .pytest_cache || die
 }
diff --git a/dev-python/autobahn/autobahn-20.4.3.ebuild b/dev-python/autobahn/autobahn-20.4.3.ebuild
deleted file mode 100644
index b9e2b859c16a..000000000000
--- a/dev-python/autobahn/autobahn-20.4.3.ebuild
+++ /dev/null
@@ -1,84 +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,9,10} )
-
-inherit distutils-r1
-
-MY_P=${PN}-$(ver_rs 3 -)
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
-	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="crypt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cbor2-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
-	>=dev-python/txaio-20.3.1[${PYTHON_USEDEP}]
-	>=dev-python/ujson-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
-	)
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	echo "Testing all, cryptosign using twisted"
-	export USE_TWISTED=true
-	cd "${BUILD_DIR}"/lib || die
-	"${EPYTHON}" -m twisted.trial autobahn || die
-	unset USE_TWISTED
-	echo "RE-testing cryptosign and component_aio using asyncio"
-	export USE_ASYNCIO=true
-	py.test -v autobahn/wamp/test/test_cryptosign.py || die
-	py.test -v autobahn/wamp/test/test_component_aio.py || die
-	unset USE_ASYNCIO
-	rm -r .pytest_cache || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# delete the dropin.cache so we don't have collisions if it exists
-	rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache > /dev/null
-}
-
-pkg_postinst() {
-	python_foreach_impl twisted-regen-cache || die
-}
-
-pkg_postrm() {
-	python_foreach_impl twisted-regen-cache || die
-}
diff --git a/dev-python/autobahn/autobahn-20.7.1.ebuild b/dev-python/autobahn/autobahn-20.7.1.ebuild
index 7c464f020529..86aeefb7179a 100644
--- a/dev-python/autobahn/autobahn-20.7.1.ebuild
+++ b/dev-python/autobahn/autobahn-20.7.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="crypt scram test xbr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index ece3e7fbf071..0afa23359727 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,7 +1,2 @@
-DIST aws-sam-translator-1.27.0.tar.gz 795259 BLAKE2B e28bad80f5353002a2279149efd1e1e3e4575445c45cb275dd0896986633b6968c0a47487a08a056303e629289f9584a11c813a9bc134a3c261bb235d696aeb5 SHA512 e1c7c5fc0e7f4554f6122479da928f45642f6d2573141c8c1f1b6283a1d4419e58deadb298a12ee1d48daa24af2fef71879865af858f5b890648b1594f9c4e2c
-DIST aws-sam-translator-1.28.1.tar.gz 798846 BLAKE2B 6cb554f81f13e6a2196d2fbc64a043a855ecc6c8f5d3e2bb87ef41969b5ef804c2920e3d2f099ce1e1ebb697a2f3c49539e9c63514f15c2acab0cc109ba20ea1 SHA512 6404c908d281e5ac7cf6d61211fc584f7293d4d8d3d509d4386a12e056b684e498ed66fcfc299fbfcabdd12a770c9e56a5fb53c37d06412c60fb28c1f20dfdf6
-DIST aws-sam-translator-1.29.0.tar.gz 805869 BLAKE2B 89054fa7e2488b53daf73a78ae130ad4217775403855d19e22a922f841a36a5a476351f3eec08f1f4b269b12a7e5df1fcd72e301f8ee03896e049becac25c40e SHA512 906107a558dce3a48a263d350d0f475710fa2c5cec38bff2b01c747fc8a0b13851fc3b3c2a4e498c5f7977501215dbee753e455c64508d95754e076ffd8b1089
-DIST aws-sam-translator-1.30.0.tar.gz 810821 BLAKE2B cb7d13162512f793c33f617290d36ad78d2410ad225835ae175192b7e57ae29745a247e08f9b34a158837aca57a4f30bcb9f90f0c4b902ef238ba4e99a0f80ff SHA512 a521994bbbf461a7a28dc8861a751e9495c0684c7462bb5da6459dffbc69917291f2ca6d0480a6dc0264d954c37fccff8c9b3691992d2fe082ce981d31af21da
-DIST aws-sam-translator-1.30.1.tar.gz 810865 BLAKE2B 2039e0724d05f7f9d8372b149f04427e0bd1a8a9b503e6dc49ee76cb4e7678d8f759317c43922d190a2bb55a446feffcbf448cdbc9343538b5c77d81b5545e5f SHA512 8fcdf0843f52c8424a78540cf2a9c3922070bcd34a2e0001a17b89b19b471dfbfc4fcd48211b80292d2f7b76eb2881152c68c4d4b56499ab38942c025226d49e
-DIST aws-sam-translator-1.31.0.tar.gz 813078 BLAKE2B ae87944bcfe7481db62c0556e1f20defbe5890bebd9b6bc8fe4f597b1ff463ec6382384832451becf5a49361149102a31316ca83e5933d12e0e7e18c9861b9c9 SHA512 fd2b775d2127cce9d78cd3c7ac4dd19f88a94be474f94e4db2486dc96bc88d9a3f621a80bd6dd0b9d70a42df32f3a9164c234a44ce69f84913aa6f4c59ae3682
 DIST aws-sam-translator-1.32.0.tar.gz 817649 BLAKE2B 34d606bb294700dac1d3385d173d737d3259f460d0ead302521eb4e2660d3781c49ce5db71e1721245068efdac03eefcfe8963d4915d1e1c60fd783880a95bc9 SHA512 e4adce238434983c56b69960fd673db88edf5b3e4f9356ca4dae508f5a7a8e6bbd3c84050ee606e1fbd578d8f58c5d8196890187e058b7ae2bc8249dbb8ac0d4
+DIST aws-sam-translator-1.33.0.tar.gz 817801 BLAKE2B 6e50f299b077f6d0240ee4db80450f766589c5349c323cd846c9ef42dc08bfcb7f8f80099c7d1ecf940d3ba1c2e4628842bf4b1f12e8fcc6c83100f5a375125d SHA512 72fadce4851d782e37e786132d98bcc364c92a1fa48addf715f0d2cf28e286e8cb8835de05fccc67c153d45ed8ba9fd3b7445333f8d96cd70b6c854b8b34c5d6
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.27.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.27.0.ebuild
deleted file mode 100644
index 448af770e389..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.27.0.ebuild
+++ /dev/null
@@ -1,44 +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,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
-		-i pytest.ini || die
-
-	# don't install tests
-	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.28.1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.28.1.ebuild
deleted file mode 100644
index fcb2e80cc543..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.28.1.ebuild
+++ /dev/null
@@ -1,44 +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,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
-		-i pytest.ini || die
-
-	# don't install tests
-	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.30.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.30.0.ebuild
deleted file mode 100644
index fcb2e80cc543..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.30.0.ebuild
+++ /dev/null
@@ -1,44 +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,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
-		-i pytest.ini || die
-
-	# don't install tests
-	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.30.1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.30.1.ebuild
deleted file mode 100644
index fcb2e80cc543..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.30.1.ebuild
+++ /dev/null
@@ -1,44 +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,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
-		-i pytest.ini || die
-
-	# don't install tests
-	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.31.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.31.0.ebuild
deleted file mode 100644
index fcb2e80cc543..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.31.0.ebuild
+++ /dev/null
@@ -1,44 +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,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
-		-i pytest.ini || die
-
-	# don't install tests
-	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
index 3514a65b6656..7616f2f08536 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,13 +7,14 @@ DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
 DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/aws/serverless-application-model
+	https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.29.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.33.0.ebuild
index fcb2e80cc543..83cf8947e7f2 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.29.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.33.0.ebuild
@@ -7,8 +7,9 @@ DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
 DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/aws/serverless-application-model
+	https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
@@ -19,6 +20,7 @@ RDEPEND="
 	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
 	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/aws-sam-translator/metadata.xml b/dev-python/aws-sam-translator/metadata.xml
index 8df3848ea60e..90b35c100a1b 100644
--- a/dev-python/aws-sam-translator/metadata.xml
+++ b/dev-python/aws-sam-translator/metadata.xml
@@ -11,9 +11,9 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">awslabs/serverless-application-model</remote-id>
+		<remote-id type="github">aws/serverless-application-model</remote-id>
 		<remote-id type="pypi">aws-sam-translator</remote-id>
-		<bugs-to>https://github.com/awslabs/serverless-application-model/issues</bugs-to>
+		<bugs-to>https://github.com/aws/serverless-application-model/issues</bugs-to>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/backports-csv/Manifest b/dev-python/backports-csv/Manifest
deleted file mode 100644
index a655a289fb5b..000000000000
--- a/dev-python/backports-csv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST backports.csv-1.0.7.tar.gz 20836 BLAKE2B c9360890f4ace39564072afa6ee32d5ee5682f1703fbe87eea8b4a04c5575ab5bd63a813f0a86d3c5945429fb9e56693db38a80dec098e4ed7701684f1006570 SHA512 5b82b79ea865381a738f1d77a472d97118f853290fb4fd787537a8dcc7247b33cf8cf507519ad88d55419efa97f86ba9ef3f003b067b1f9cff87e08c2395969b
diff --git a/dev-python/backports-csv/backports-csv-1.0.7.ebuild b/dev-python/backports-csv/backports-csv-1.0.7.ebuild
deleted file mode 100644
index 3f7631793f07..000000000000
--- a/dev-python/backports-csv/backports-csv-1.0.7.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=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Backport of Python 3's 'csv' module"
-HOMEPAGE="https://github.com/ryanhiebert/backports.csv https://pypi.org/project/backports.csv/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	"${EPYTHON}" tests.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/backports-os/Manifest b/dev-python/backports-os/Manifest
deleted file mode 100644
index c248a5bc8d54..000000000000
--- a/dev-python/backports-os/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST backports-os-0.1.1.tar.gz 11359 BLAKE2B 8c1f9ba4d62d9b6b625d31c902feb7532919a0a42064133ef07756a3806a6423a479f5b3c4c9824ebb421a9e1901d8932aa024ced7dd7700119236c186d11137 SHA512 d17c5f6146401fa96c02f2d848d515a5d1dd587ee2199b5e45c177e1853e21e7e7c205a4d89322c5aada71e3a7b34bc7f9afe8183625f76e4ba26aedf2150268
diff --git a/dev-python/backports-os/backports-os-0.1.1.ebuild b/dev-python/backports-os/backports-os-0.1.1.ebuild
deleted file mode 100644
index d4bdff62d74e..000000000000
--- a/dev-python/backports-os/backports-os-0.1.1.ebuild
+++ /dev/null
@@ -1,41 +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,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Backport of new features in Python's os module"
-HOMEPAGE="https://github.com/PiDelport/backports.os"
-SRC_URI="https://github.com/PiDelport/backports.os/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/backports[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${P/-/.}"
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install
-	# main namespace provided by dev-python/backports
-	rm "${D}/$(python_get_sitedir)"/backports/__init__.py* || die
-	rm -rf "${D}/$(python_get_sitedir)"/backports/__pycache__ || die
-}
diff --git a/dev-python/backports-os/metadata.xml b/dev-python/backports-os/metadata.xml
deleted file mode 100644
index b8c9e356f959..000000000000
--- a/dev-python/backports-os/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pacho@gentoo.org</email>
-		<name>Pacho Ramos</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">backports.os</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
index a9bbb37bea7f..9fed2ac991fe 100644
--- a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild
+++ b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -38,6 +38,12 @@ BDEPEND="
 # pytest-subtests
 distutils_enable_tests unittest
 
+PATCHES=(
+	# fix segv in py3.8.7rc1+
+	# https://github.com/pganssle/zoneinfo/pull/97
+	"${FILESDIR}"/${P}-py38.patch
+)
+
 python_test() {
 	if [[ ${EPYTHON} == pypy3 ]]; then
 		# pypy3.6 does not support dataclasses, and the backport
diff --git a/dev-python/backports-zoneinfo/files/backports-zoneinfo-0.2.1-py38.patch b/dev-python/backports-zoneinfo/files/backports-zoneinfo-0.2.1-py38.patch
new file mode 100644
index 000000000000..dbe9695a9a53
--- /dev/null
+++ b/dev-python/backports-zoneinfo/files/backports-zoneinfo-0.2.1-py38.patch
@@ -0,0 +1,22 @@
+From 0e42cc3999b4e3833b5f3f41857b8c1e3c9143f3 Mon Sep 17 00:00:00 2001
+From: Pablo Galindo <pablogsal@gmail.com>
+Date: Mon, 21 Dec 2020 02:02:34 +0000
+Subject: [PATCH] Decrement the refcount of _PyLong_One in the correct branch
+
+---
+ lib/zoneinfo_module.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/zoneinfo_module.c b/lib/zoneinfo_module.c
+index e0c72d3..07ef603 100644
+--- a/lib/zoneinfo_module.c
++++ b/lib/zoneinfo_module.c
+@@ -616,7 +616,7 @@ zoneinfo_fromutc(PyObject *obj_self, PyObject *dt)
+             Py_DECREF(args);
+             Py_DECREF(kwargs);
+             Py_DECREF(replace);
+-#ifndef ATLEAST_37
++#ifdef ATLEAST_37
+             Py_DECREF(one);
+ #endif
+ 
diff --git a/dev-python/backports/Manifest b/dev-python/backports/Manifest
deleted file mode 100644
index 78c35159489d..000000000000
--- a/dev-python/backports/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST backports-1.0.tar.gz 2070 BLAKE2B 7fad9ef13abdc5bab550ddf62061a952991ff601642f5e03359c3ba2bf20d923701d86aed178dce530c60870efd33a4a2b4b2498802c78df73d406bc496239fb SHA512 069e155209d6036dec09000e4543abea9383f13b229a7259b1d3d02fff4b51be1a32c766dee434215c8a5209afc5e7d24163d188a77cec7d354d34170665bd37
diff --git a/dev-python/backports/backports-1.0-r1.ebuild b/dev-python/backports/backports-1.0-r1.ebuild
deleted file mode 100644
index 5463fef13085..000000000000
--- a/dev-python/backports/backports-1.0-r1.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Namespace for backported Python features"
-HOMEPAGE="https://pypi.org/project/backports/"
-SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-RDEPEND="!<dev-python/backports-lzma-0.0.2-r1"
diff --git a/dev-python/backports/metadata.xml b/dev-python/backports/metadata.xml
deleted file mode 100644
index 692a7394d59d..000000000000
--- a/dev-python/backports/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">backports</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
index fadf7bacd69a..5de33284ed24 100644
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@@ -1 +1,2 @@
 DIST backrefs-4.5.0.tar.gz 5995247 BLAKE2B ce3d33b91ab307811e555689a2ece0ba47e53d8245fd4fa367156a76893c5ca342cb47d014a3c94c6f30ebb32487fb36975a2fa6c7acf0a626305d05e0d80048 SHA512 c1e30a78c2e7a86efce1670000612b6450b6cae78f8c799cec6832aa88e4145fee6ffc3e1b8c54b55091f7c21ea4b09c1ee36af852bb51973434b593273e04a8
+DIST backrefs-4.6.tar.gz 5995313 BLAKE2B 5bc6c6b496dc74f1a73a155b7825a134ef84458c0396bc2e678e93432c37b1355f782331fce978dee1c9968cc683c3821ae8975bbd20d4e19896277a6bf5b0c8 SHA512 96aeba6aab34ea14a48c430b00e242b3468054cfccfdab00a66071434e65df4378caffc32f47eded48b5054f7bfcd0caaa04bf103b9fa282ddb5c6119c46f88f
diff --git a/dev-python/backrefs/backrefs-4.6.ebuild b/dev-python/backrefs/backrefs-4.6.ebuild
new file mode 100644
index 000000000000..ef7b8f86691a
--- /dev/null
+++ b/dev-python/backrefs/backrefs-4.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-material
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Wrapper around re or regex that adds additional back references"
+HOMEPAGE="
+	https://github.com/facelessuser/backrefs/
+	https://pypi.org/project/backrefs/
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
index b24df4aec6a7..2b2f0128808a 100644
--- a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
diff --git a/dev-python/bcrypt/bcrypt-3.2.0.ebuild b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
index 4352af2a1a3c..b8f22e13dfb0 100644
--- a/dev-python/bcrypt/bcrypt-3.2.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
diff --git a/dev-python/billiard/Manifest b/dev-python/billiard/Manifest
deleted file mode 100644
index a85d3d00ba3d..000000000000
--- a/dev-python/billiard/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST billiard-3.6.0.0.tar.gz 151342 BLAKE2B 46e29ae54144f3b4ebf3fbb4a5bdbba29662d3a6b292cbfef526618237103fd833d10eefe03211141264424590b33ddcd8722616d36ab4e2405198628cc29d5a SHA512 0a71de026d2a781b83fe2c549ecbfe9b6fbd574d8067fc46ba7eca6b76633a123620853d22696df3563d050043cfe75b14b4b69bf5217e0af964aaa0bcbe08ff
diff --git a/dev-python/billiard/billiard-3.6.0.0.ebuild b/dev-python/billiard/billiard-3.6.0.0.ebuild
deleted file mode 100644
index 2d9968ba54c1..000000000000
--- a/dev-python/billiard/billiard-3.6.0.0.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,7,8,9,10} pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python multiprocessing fork"
-HOMEPAGE="https://pypi.org/project/billiard/ https://github.com/celery/billiard"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	>=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}]
-	test? (
-		!!<dev-python/celery-4.3.0
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)"
-# The usual req'd for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx --builder="html" --source-dir=Doc/
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( build/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/binaryornot/Manifest b/dev-python/binaryornot/Manifest
index c49467b8579f..9e37c8c0ebdb 100644
--- a/dev-python/binaryornot/Manifest
+++ b/dev-python/binaryornot/Manifest
@@ -1 +1 @@
-DIST binaryornot-0.4.4.tar.gz 372361 BLAKE2B cb2099313f602915bacd5b463642f16430fcb0ab62dcaae546cb854780996526fb777c0b730b4b89e664ec7f995ddd2d2f632cfbac2dadca45958cfd1dd7a410 SHA512 31dfb79bb5847e12487d94519a357dece4572f7ed064686d53a49c2de5a51d6441be64523c98cca6221ed89be5bf26e54866dd3b79ac8d89fd5019a5b4d75a45
+DIST binaryornot-0.4.4.r1.tar.gz 371054 BLAKE2B 4a70e22eba51a266987308e8d1b4571ace5760f945920194a1a61f4336f33dcb655c4f0b1f760aa3502834d29a1a64ac62657e5d73eac8f1d7d02edf71db8af9 SHA512 379e71b41824b9389ea02c64223e26c57694d07b749c197e3a6b9f10558c8d502e9b93a13ae6c3a4bca49064ffc650ce822073dc312fb06e50e06b8a3f04f419
diff --git a/dev-python/binaryornot/binaryornot-0.4.4-r1.ebuild b/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
index 493f89a66ec0..d06797deac83 100644
--- a/dev-python/binaryornot/binaryornot-0.4.4-r1.ebuild
+++ b/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Ultra-lightweight pure Python package to guess whether a file is binary or text"
 HOMEPAGE="https://github.com/audreyfeldroy/binaryornot"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.r1.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -23,8 +23,6 @@ DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
 PATCHES=(
 	# https://github.com/audreyr/binaryornot/commit/38dee57986c6679d9936a1da6f6c8182da3734f8
 	"${FILESDIR}"/${P}-tests.patch
-	# Version number has not been updated to 0.4.4
-	"${FILESDIR}"/${P}-fix-version-number.patch
 )
 
 distutils_enable_tests unittest
diff --git a/dev-python/binaryornot/files/binaryornot-0.4.4-fix-version-number.patch b/dev-python/binaryornot/files/binaryornot-0.4.4-fix-version-number.patch
deleted file mode 100644
index 05d6ed0b7449..000000000000
--- a/dev-python/binaryornot/files/binaryornot-0.4.4-fix-version-number.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 68a4f5b..a0c9e14 100755
---- a/setup.py
-+++ b/setup.py
-@@ -13,7 +13,7 @@ with open('README.rst') as readme_file:
- with open('HISTORY.rst') as history_file:
-     history = history_file.read().replace('.. :changelog:', '')
- 
--version = '0.4.3'
-+version = '0.4.4'
- 
- if sys.argv[-1] == 'publish':
-     os.system('python setup.py sdist bdist_wheel upload')
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index e8bdd9e77276..9cbd9400b124 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1 +1,3 @@
+DIST blosc-1.10.0.tar.gz 845312 BLAKE2B 15f367f1420f56e64ec01e74d7320adc194db11d15bd26a2b78c59c88a6127f1d2b5fc7bd53e02a6d0cad785c87cf79bb909dec62982b5ee8620c92ccdd80249 SHA512 f071d131966acd74cf71f8688ae9830091ee12a92399e8736f2b2cc2243bc022f9fd194c60493e912aef87a54202813a67a8f9bddd90c1c44631205d58c3f3e3
+DIST blosc-1.10.1.tar.gz 858162 BLAKE2B 768ae6d438d9fe05589460dcaeea77dbf2e0212bbc67388c6df1b9fc6bd1921e8cd79da2039cd4300cd91923d7988f8c4741ea1dbd5ebfa13e48f3ade678ac09 SHA512 06e393efa3fc7060205a483787eb4c5befe75dfdd6321b37c43ed7830dccf4d622bd88451e97da663ed9dc9302c30d7486315de9aff6351721862e2eceddd9a3
 DIST blosc-1.9.2.tar.gz 816897 BLAKE2B 7d1a2d925500c8ddb93975dd785c03b91dec2716a438915d5dfdb739c650de8a47ed80eb25fc55357e69b586c446c5af61212e0a4fba8158839a66849309f478 SHA512 a8f53afb7fb1bb742e2daa03015b636d4dbb1fd073be079022364ec67035c9e6ee372ab07f7ce06579b85d9fcaedd2a11f30b9cf5b2bd1d1ea62cf32a8aa3c1f
diff --git a/dev-python/blosc/blosc-1.10.0.ebuild b/dev-python/blosc/blosc-1.10.0.ebuild
new file mode 100644
index 000000000000..8d81ccad8ac8
--- /dev/null
+++ b/dev-python/blosc/blosc-1.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="High performance compressor optimized for binary data"
+HOMEPAGE="https://python-blosc.blosc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-libs/c-blosc-1.19.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/scikit-build[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
+PATCHES=(
+	"${FILESDIR}"/blosc-1.10.0-unbundle.patch
+)
+
+python_prepare_all() {
+	export BLOSC_DIR="${EPREFIX}/usr"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" -m blosc.test -v || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
diff --git a/dev-python/blosc/blosc-1.10.1.ebuild b/dev-python/blosc/blosc-1.10.1.ebuild
new file mode 100644
index 000000000000..8d81ccad8ac8
--- /dev/null
+++ b/dev-python/blosc/blosc-1.10.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="High performance compressor optimized for binary data"
+HOMEPAGE="https://python-blosc.blosc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-libs/c-blosc-1.19.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/scikit-build[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
+PATCHES=(
+	"${FILESDIR}"/blosc-1.10.0-unbundle.patch
+)
+
+python_prepare_all() {
+	export BLOSC_DIR="${EPREFIX}/usr"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" -m blosc.test -v || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
diff --git a/dev-python/blosc/files/blosc-1.10.0-unbundle.patch b/dev-python/blosc/files/blosc-1.10.0-unbundle.patch
new file mode 100644
index 000000000000..0ea6740f9c07
--- /dev/null
+++ b/dev-python/blosc/files/blosc-1.10.0-unbundle.patch
@@ -0,0 +1,38 @@
+From b2935461d889eac99fa1bdfb04a96f1c3a23c4c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 24 Dec 2020 01:06:23 +0100
+Subject: [PATCH] build against system blosc
+
+---
+ blosc/CMakeLists.txt | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/blosc/CMakeLists.txt b/blosc/CMakeLists.txt
+index 7f06f28..fcf7db0 100644
+--- a/blosc/CMakeLists.txt
++++ b/blosc/CMakeLists.txt
+@@ -1,19 +1,9 @@
+ # Todo: c-blosc provides a CMake package configuration file that we can build
+ # against if blosc is available on the system, etc.
+-# find_package(blosc)
+-# if(NOT blosc_FOUND)
+-set(BUILD_STATIC ON CACHE BOOL "Build a static version of the blosc library.")
+-set(BUILD_SHARED ON CACHE BOOL "Build a shared library version of the blosc library.")
+-set(BUILD_TESTS OFF CACHE BOOL "Build test programs form the blosc compression library")
+-set(BUILD_BENCHMARKS OFF CACHE BOOL "Build benchmark programs form the blosc compression library")
+-set(BLOSC_IS_SUBPROJECT OFF CACHE BOOL "Blosc is subproject")
+-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+-add_subdirectory(c-blosc)
+-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/c-blosc/blosc")
+-
++find_package(blosc)
+ 
+ add_library(blosc_extension MODULE blosc_extension.c)
+-target_link_libraries(blosc_extension blosc_static)
++target_link_libraries(blosc_extension blosc)
+ python_extension_module(blosc_extension)
+ 
+ add_custom_command(
+-- 
+2.29.2
+
diff --git a/dev-python/blurb/Manifest b/dev-python/blurb/Manifest
index 5a052f8be822..a0f8718dd83b 100644
--- a/dev-python/blurb/Manifest
+++ b/dev-python/blurb/Manifest
@@ -1 +1,2 @@
 DIST blurb-1.0.7.tar.gz 21248 BLAKE2B 931a0db30447f5a41c956f15dac2bd967efd8a85d4837782e02af24edc31dec03d3fab27f22db1dafe334dcfc79b133cf99092fc28b59c190b1182d1f897e0bb SHA512 d84fdc0a7ecec1207a58a748f6d33343504d0b090166c91b05e9b3c2eb125fff890194539204386bdc7a1e0a595d2cb80d54d873045941491d26ca85cb55ac98
+DIST blurb-1.0.8.tar.gz 21519 BLAKE2B 4e76fad58821662b0a97dbde63e0fe7f3e82676ea1f22a3effdc118a014fff2b17995252bca900f495d66df36712122e7a50e95b3ebfcff7d39f8d005ef8456d SHA512 63bba016cfc293923da1cf7cc5f64e8881bf28237faf9908a484d55ff435df71c30544a751e0f167ed82d1f363dca48f53be67a25adc3ebc728c88b31186abac
diff --git a/dev-python/blurb/blurb-1.0.8.ebuild b/dev-python/blurb/blurb-1.0.8.ebuild
new file mode 100644
index 000000000000..d077072a98ea
--- /dev/null
+++ b/dev-python/blurb/blurb-1.0.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Tool to create and manage NEWS blurbs for CPython"
+HOMEPAGE="https://github.com/python/core-workflow/tree/master/blurb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/blurb-setuptools.patch"
+)
diff --git a/dev-python/blurb/metadata.xml b/dev-python/blurb/metadata.xml
index 07be1f2052a5..ac0a75bd6502 100644
--- a/dev-python/blurb/metadata.xml
+++ b/dev-python/blurb/metadata.xml
@@ -8,6 +8,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		blurb is a tool designed to rid CPython core development of the scourge of
 		Misc/NEWS conflicts.
diff --git a/dev-python/boto/boto-2.49.0-r3.ebuild b/dev-python/boto/boto-2.49.0-r3.ebuild
index 470baf6f8bb5..f0f9a8db6074 100644
--- a/dev-python/boto/boto-2.49.0-r3.ebuild
+++ b/dev-python/boto/boto-2.49.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 PATCHES=(
 	# taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=909545
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index a2115a889bac..50ef59032559 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,14 +1,10 @@
-DIST boto3-1.15.18.tar.gz 336927 BLAKE2B 0ddc7fbd0fffcbeafeee7b9aa0f699087369f315551e243175793c82d95c97dbbe8997d5fc280e9fed18612d1058d858a7b34b0b1b4ac7905774009beb62c0a6 SHA512 2dc88c27bafe7ff2f2b00be94c37e7cabc94f09ca0ccb898a5d29cd8087bb1945d226ed5d87e955250775038fc039740e68d93662b465e99a16cfebfd2fa2944
-DIST boto3-1.16.16.tar.gz 338959 BLAKE2B e34c14b89ddd402e4ca7037e1fdbb5121ff9eb2c7fefb67eabadb378cc4f8e5f5ddc3c933d366d086155b4b16319ed9e7d85af21bca1da0f17be3c2171dc9c1a SHA512 b0d0cf8877ac66e28f925c3eda6e02c845c8753c96ebb8684d7eb3a3e82ac6323ae8775715bcf7c70889921e53b0224561460cbc0c95ae56a17d606c75245971
-DIST boto3-1.16.20.tar.gz 339432 BLAKE2B fefe33be5baca95880a52856a6d6fb166895951b7eb83500420ef07058d91b465c2acc4ea5eb72a46b4de013fcd9136df2d60398cb75a46f199415ff43e366bb SHA512 7e88a70d7ae9065c3b749510b3bbfc36e2645abedf173cd8be79666895ede34f98c9a33bbe43b05843a4c809a29b4d2d925fd2398ab778f0f096597e98b204bc
-DIST boto3-1.16.21.tar.gz 339637 BLAKE2B 122025941b38dd94ccea22a5561ccac29f3033320da4e3f332a1200c84215bef1a320dc36ce59733265816d867c409449a32830df4f20fa08f943ca754fb9257 SHA512 b811e153b9c356e9e414e8a82076000d885e29778273d9e839d73e2b35405d23ae8236bb57c657c0f2ee6def48636bf024548cdc0f6e5e642c7b97d97b76307a
-DIST boto3-1.16.22.tar.gz 339781 BLAKE2B d6703055d57f9d3486218efc3014439a1ca1335d28281793ddcf2c37dd42c1557e85503841e0d7306168d0eb546dbfc16fabeb53a7a00ee32b3b10e74cbfff94 SHA512 dd0df65efea8dc2138b1bfa3a1eb4e40c8e3408f34a36b38cd51346debb01a3e5179b841adbef6cf6fe1535adee9f09d19ff40ae284cfd3c2fabb42a4113f5a6
-DIST boto3-1.16.23.tar.gz 339889 BLAKE2B 0a41c084beba187a89ddf8a743c6dc4f3663aebae035468a76967e4b732abdad496bb2f0a516b5af76affa18f99d4c1a3405d0e152fb41fb1fae22a6728542e6 SHA512 942b0a540cdd6ed744bc1b4285ca8d9e3121193a59717fa247431d232f25cf042625abf82709cecef20611feb68735415be2e3187ebd4e6a1efd7488c0db14ff
-DIST boto3-1.16.24.tar.gz 340133 BLAKE2B c1d195d5c6859686b2cbc9cfd772e43b6a052b138d792b896f0fea1b25eb1667d26f09369f6fcb2bfddaaaf8f994f14d2a6e6456aa098af5dbb6ddd8df503118 SHA512 55582c76ffd1d6f3d021c7ab89b6a93ea3bf3597312957497de4c8a226657414271385224e2808aecaa90b0e48f21b7fb8a62462df1cf26f142a7ecd5064f55c
-DIST boto3-1.16.25.tar.gz 340338 BLAKE2B 1ad36d77c3b1e6e67dbd8148b995d4299fceb1fa6993d0bb7d58f432252be13383fba00ee7199bb4a855d98264598c5a9cfc0aab3c8a5416a98e93b3e729843a SHA512 1e7a4d72735137b19a4b1e6f2621c33bf1fe9af860cc37021206f2eb422061092a00cae0e25f9ed44b74ef6fc01b48ba6f3e047c664085fac5dfb880dee3e620
-DIST boto3-1.16.26.tar.gz 340309 BLAKE2B df2c193b5e40f52381a4214fd5c6db9dcb0f32e3bdedf78b1ea16d166b9831c06b871809d1f0673bb3cd2838cb1f722a18a4c25a8c21fa20e5f7c14df9a7efb3 SHA512 1063702783e07a4e5a5ddce3611e57e993c284a09c026dab8af56be7a7a8ac157da2b636b808f58f0aa7940f90a7e36e439b8497713d4f95964dda13684b3795
-DIST boto3-1.16.28.tar.gz 340709 BLAKE2B 3c5520531efbb5e20f679f28f4c60964a7be38a0601f73dc0fa5ab3e2cb96939d985c1ebc20869b3fd2f556e9da836fdce4d92377fb9168eccd13cbcffd7c8c6 SHA512 72c10598560ad8d227250274fb296f11e6a1c417f8430221fd8a85e920c8a783be77193dd83ac53dc5000c2ea27c8ff626a5ef3cdee0a467237e732dd6442cdd
-DIST boto3-1.16.29.tar.gz 340743 BLAKE2B 1ef74d98aecf8dfd46bc340984d65e5dc2a70f320149b6bab18588a8371d0da6c93102da96f12950d0730c871fb6f13c7441f7ca148f974cb8678bd01b3af24a SHA512 59f8dba245c7525e4ddeec121d85919310e2bd6cf90419c19612434beff66bab4cca22968347512b0f9f2563ff3ee4d85e2d01bf10ce175c3a12a9a09c2e09a6
 DIST boto3-1.16.30.tar.gz 340801 BLAKE2B fcf87b43d2c18ecf1e9d7f0c8c423143e44777a6249a9893d0ebb4016703a9d87a157ed71fca98c8bd73419e6dd2bd2621d42406220e67e6dd462e1088837334 SHA512 66d3e4ae6296b1fbd31187228246c99e472ccfba756d6ca304eca134271d43dd80d1bc35af1fb63336a7c63f2341212329dde307cbbb2dce25e2aa0705c6a436
 DIST boto3-1.16.36.tar.gz 341458 BLAKE2B 7e4cf667cd59caa8433226eb6914412370bfa4c002f6f5d992fe49c93528d59d5740de6c8782af71d94461ea704a36d8ed46ccadfbf83982504ab507aab9b058 SHA512 06d9c6e721d1ab529e6a598b14ba6f740bec32a8165582853149b9aa294f0a272d0da4222f0dc7ef83055d91b4b0a0176e65bb34784990aca43e44db43650a2d
-DIST boto3-1.16.9.tar.gz 337905 BLAKE2B ed01e28fd7e62e5e5028307c93f92004bfbecffa77bc2ba1d6574b92ec2c515d910eb5107ac5ee03e0aca909f97f379aa65b5f839c8067634fa69266c58de33f SHA512 7343b8432788ef981819f91fe2ba27c4ec3947d01ff55914f7c89607250ecf60db2da8d25c8a2c7001ef546a9abed4cb744c5937ca09497aa1a983049648bd5e
+DIST boto3-1.16.43.tar.gz 342444 BLAKE2B 1a367fa252eab6738533c7bec2bc370dcc206f25c4290ea34632ef82a0e308aa4521af7bd2e9755782b3b66b438c528e67f55f7238183ffff2318bfb7361e924 SHA512 1cd757a2751e48b9075f99724a9980d882751542f5a7794a4cbddc46f82a1bbf00b8e0908e0cd2db16726636750d591aee26b00004a454c35d24ab79de9c80b9
+DIST boto3-1.16.50.tar.gz 342744 BLAKE2B a6581acbdb07f2d8ce21ddf384b471d281d58910366dee0669f0f726118eabd52de8a4fe129915b9044bd484950155c32fa4f4941e1ef6ce55249213ba29f2f3 SHA512 de483be833917a2c478c0fe651ffe4143dc6c742e259711a955be41a8b76197353b295526695ca800bb860b95e0378dc461119bfa163c4be0faa3b6c2ccfc097
+DIST boto3-1.16.51.tar.gz 342794 BLAKE2B e344c4a2c6b1c43e0f2f9207541a7e00963829f9398cb36ab8a90544a486a638d2f88552fde5b006388692463de6c93fec6b16a64e43874fc173f82af3d8272c SHA512 5bd66801121aff3526d742dd79b48b1d502b76c0319183660d22532a5abb31b6faf616ddb2af774519e8e5eb89616be85e478325497ed6af8635e02786d0c78f
+DIST boto3-1.16.52.tar.gz 342838 BLAKE2B 62ab3b2bd72369e08d514fb712eb6653c247e774fbfb579f1293ec1a42752d7321011cf75a054cd625846e72b1b5b6490b1d8bd48f5a2ed818fcf6ac060c0857 SHA512 6a80ee0181f5def2595e7a2d07e7a29e32c23b2d91908338c43fc4794be3d69504cdf8cec7372cdca09004dddb45ae49772404f59a222af4e3eb0bb869cdaf98
+DIST boto3-1.16.53.tar.gz 342896 BLAKE2B 28f3fde4e029944d839c9bb46f8d0e0603dc1dc890cd157ade2687a5566b00ae77ef19c0835341cf92d12b8fca2d5290508456f1938789aa2689ac7a5673550e SHA512 f73cc6b78fdeedd25c7976ab1df681dce438bfe40f03cf74a3bbdb1d0b54b4203d650cd72263325fd9f1dbbb60445dfeb619c070debf711da7ab696eacd5a464
+DIST boto3-1.16.54.tar.gz 342962 BLAKE2B 8c17e156c127349f35e85f82980be5c79618bd43f896effbf07c7c847bd7d5e9ff2dce3db9dd4a414515e50139b1373c1d275ce3408e9c749e084185d0610fdf SHA512 cd1e290cf2aeea0abbe5504995e945c9e259ccc7f5dffbbe4037680405a26fb04ab466517b5273f2b372126a6627a9ff49574a19ad3cf740ff28628a8bd2621c
+DIST boto3-1.16.55.tar.gz 343080 BLAKE2B 4569d9caf329a3fc1870d88f85b208568cef12cc8b38382a342215fc517a251669dd92e82926a9b8a1c4e7298efad71c9d27d27633a92657c638be25884f8444 SHA512 4076ee3e91142f555975e0b543b365dce715a7eb6b35d6834f309556f63dca5a4a22205b04c2596c49e09e4b092ab1fa49a33ed6af05c215cce5519a5ece7cf9
+DIST boto3-1.16.56.tar.gz 344547 BLAKE2B da32affd031a7efd7f55ec390f657d02caaf37d5c226ed811934e101dee1fcdc6df8b678ddaa181cdec140ad70525ff0a462885eee21f924040b1f2051d0f1f0 SHA512 2f35d4331db005ecb8dca5c780ebb2347242564f541e5b9585f0645e113255aeb8dff2210ecc42a2768f2b58c6731d59d6cb5eb7ac143e7aafd2bf21eae7d7ab
diff --git a/dev-python/boto3/boto3-1.15.18.ebuild b/dev-python/boto3/boto3-1.15.18.ebuild
deleted file mode 100644
index ee70e5bf6d88..000000000000
--- a/dev-python/boto3/boto3-1.15.18.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.16.24.ebuild b/dev-python/boto3/boto3-1.16.24.ebuild
deleted file mode 100644
index af8cbcbae607..000000000000
--- a/dev-python/boto3/boto3-1.16.24.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.16.25.ebuild b/dev-python/boto3/boto3-1.16.25.ebuild
deleted file mode 100644
index af8cbcbae607..000000000000
--- a/dev-python/boto3/boto3-1.16.25.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.16.26.ebuild b/dev-python/boto3/boto3-1.16.26.ebuild
deleted file mode 100644
index af8cbcbae607..000000000000
--- a/dev-python/boto3/boto3-1.16.26.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.16.28.ebuild b/dev-python/boto3/boto3-1.16.28.ebuild
deleted file mode 100644
index af8cbcbae607..000000000000
--- a/dev-python/boto3/boto3-1.16.28.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.16.29.ebuild b/dev-python/boto3/boto3-1.16.29.ebuild
deleted file mode 100644
index af8cbcbae607..000000000000
--- a/dev-python/boto3/boto3-1.16.29.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.16.30.ebuild b/dev-python/boto3/boto3-1.16.30.ebuild
index af8cbcbae607..ed20a9d55fa0 100644
--- a/dev-python/boto3/boto3-1.16.30.ebuild
+++ b/dev-python/boto3/boto3-1.16.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.16.16.ebuild b/dev-python/boto3/boto3-1.16.43.ebuild
index af8cbcbae607..af8cbcbae607 100644
--- a/dev-python/boto3/boto3-1.16.16.ebuild
+++ b/dev-python/boto3/boto3-1.16.43.ebuild
diff --git a/dev-python/boto3/boto3-1.16.23.ebuild b/dev-python/boto3/boto3-1.16.50.ebuild
index af8cbcbae607..2df16964cdb0 100644
--- a/dev-python/boto3/boto3-1.16.23.ebuild
+++ b/dev-python/boto3/boto3-1.16.50.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/boto3/boto3-1.16.20.ebuild b/dev-python/boto3/boto3-1.16.51.ebuild
index af8cbcbae607..2df16964cdb0 100644
--- a/dev-python/boto3/boto3-1.16.20.ebuild
+++ b/dev-python/boto3/boto3-1.16.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/boto3/boto3-1.16.21.ebuild b/dev-python/boto3/boto3-1.16.52.ebuild
index af8cbcbae607..2df16964cdb0 100644
--- a/dev-python/boto3/boto3-1.16.21.ebuild
+++ b/dev-python/boto3/boto3-1.16.52.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/boto3/boto3-1.16.22.ebuild b/dev-python/boto3/boto3-1.16.53.ebuild
index af8cbcbae607..2df16964cdb0 100644
--- a/dev-python/boto3/boto3-1.16.22.ebuild
+++ b/dev-python/boto3/boto3-1.16.53.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/boto3/boto3-1.16.54.ebuild b/dev-python/boto3/boto3-1.16.54.ebuild
new file mode 100644
index 000000000000..2df16964cdb0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.54.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.16.55.ebuild b/dev-python/boto3/boto3-1.16.55.ebuild
new file mode 100644
index 000000000000..2df16964cdb0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.55.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.16.56.ebuild b/dev-python/boto3/boto3-1.16.56.ebuild
new file mode 100644
index 000000000000..2df16964cdb0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.56.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.16.9.ebuild b/dev-python/boto3/boto3-1.16.9.ebuild
deleted file mode 100644
index ee70e5bf6d88..000000000000
--- a/dev-python/boto3/boto3-1.16.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index c332fcea1ee0..d35b8aafb55d 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,14 +1,10 @@
-DIST botocore-1.18.18.tar.gz 6942407 BLAKE2B e58183d5aa79a210d82c1dc21806c9c86f993498055c52742e4c1ef2f697ae1faf120b9edf8efeb229dad3f3230f0847b534ac071a1e4d32136eacc3c18c7c84 SHA512 a92a20c86390905f22c10e3ba649008b7c9ccab147b6b3aecc89f26dc891aaf38a974fd8ba1f792a38ac89a98dba64a949741445abf7db133f60189d1e8da31e
-DIST botocore-1.19.16.tar.gz 7009239 BLAKE2B d582538f25c500297ab8a5ce3f054a5ba2f94d0d5f37d0aeee934943854bb5fc429e33040b56d1e06cfd93a51bd917c96dac9432c5b84d59513b47af52285ac1 SHA512 d36b580e0ad56143b9b36679d17910fcdb49ec132143441d6a078797f79bec1fd6f06b2afb8542e16e844fb892c2902aeab1cfcf66a8ddb9ecbcc92be4ced29d
-DIST botocore-1.19.20.tar.gz 7055105 BLAKE2B f25a6aff2073d8fa8de0c787b34239ee434c0616b2666b7191c5303e6d76389c883aca9a2b03243caf989f270f981bb69873ddbbf21a6afdd1073d8a6bb959dd SHA512 24c0e6e6a67d03374f86608762030e42cd14f2010763c57ed06d74a6a514a81dd25f9681bec890795ed6ec1f488aafeaeb3175e7264deb72438dde35e6e8398d
-DIST botocore-1.19.21.tar.gz 7060392 BLAKE2B 2539996a3aed89d9e76143c4e899cc09b278ef5fb23ea3b8cacc4af4a3b5287043f193e40ab07937147db70085aef688c8fe432124a0c0fe89f1ae7e2f003bec SHA512 43a656c29944dc3b0c84f321d251b3d135634ac8cd639a9c13a1f04a0e0e1421bd0c2ed8200f7e032faab6b45d7ea64f03991a90e5db837542501ae9f1843d6e
-DIST botocore-1.19.22.tar.gz 7073938 BLAKE2B 41ec38e7abdff5e6fd4530dd39522a13d10c7048564002f5c4c99f9c13cf25b3b4a108ca651bee44f1e00d0b8b560e7c364021793a7fd50e3501ef54c153960e SHA512 69efd9f01cb9cb83d4234be6ad46d2f2584bfd274a96c27279c96d717de4ea83e8bb1b92baa29b06aacf21e0af9e40ab216e5ac7ffe004cc4a53bfcf6c32f59e
-DIST botocore-1.19.23.tar.gz 7090433 BLAKE2B c5b6801e169b7c0325b33b005be0e4096442d5f9e09e7223d6668cdbd7a68b977284b4e660be5dfbf30ae661202691866dff2b3b1639d7467b3ff21ed6c90702 SHA512 9e984c48109f17126e380b0194e998c65ef02cba83ce3be6b3398a5913a41e23607779c82b90814d8193abdeb3a6cecedb443a6fc5d8d6b7ccb68ed0a0e0bc37
-DIST botocore-1.19.24.tar.gz 7111127 BLAKE2B 61f368b4e8dad8d3a03d2a73cef68f7971bbe3a2173c55689eeacc166a983c8986039f62222884176f05df13002e31868ca498664f46452362f289bd44d8df2c SHA512 42ca145f9e47b61715c816add725758dcf617c663dcd0beee29e66a28047d3bd7908ce10b7614afe9111a539e74f436286b876c107bc3591f5689619939a4551
-DIST botocore-1.19.25.tar.gz 7125010 BLAKE2B 18c03d1e61beb5b92fa958cbd6ad10d6048b51fd6b244187cfd27be0b3a0132bc2cdd0598d933cfde62a5f9cf92d2ddd2a0b7e269ace6e3319a3e37af2037bc9 SHA512 0cc4b015957330fbc5654b33953943c845c955a8fabb7b33672d496d68fe0e8783b1ba3254695bcdb7fa4b3775464f5c09af04e09931e38ba95710a6f0aa8320
-DIST botocore-1.19.26.tar.gz 7124956 BLAKE2B 6091c9536de9a3171a2327ca1d1531799fa28af48870e37de8251b42a947a7f26881ee787964cd95a070acdcb4f3b634a816ab74a519b72287e61ad11aadeaa0 SHA512 bfdf3ff4fce1463fd1cb6fc2f8a97782d68388668b6dc3ffd0a0a3fac3d0f6b7da645c0a0d2d9183096c44b8b99dc2a0a9e1a29a7bc4b7ff0cbbbc3fb066f191
-DIST botocore-1.19.28.tar.gz 7208608 BLAKE2B eab5731c530747421186c3e24cc0cb0f5b120b37e4a4d587a5ec0b118d138ff13fb9608bd028a3182aa353f188f56f0c2a05c918aafc8d79eaa87ba89d5b4265 SHA512 71de40c171b1aabdcad159b2e6817740e793a29eda99c6cdad28643bc444a26fbcd7594d927bfbe031c4e4c8b74826ba51efb37376f5a70d8a2591c524a2301a
-DIST botocore-1.19.29.tar.gz 7219708 BLAKE2B c5468be09300edf1acfb82780ad026ad78537b641b9f8f9384c41397e293a51559259c64925dac2852b888a28b49c23b7802b2c3adaca097424029fe9717044c SHA512 674f76a443541ff3665dbb1834ac69f8776e497526001db9bd229f22ea2137452c3bf954d8a6b74a732bd9e7212545cae19c9058357a38c357ed09d89c9c1cc5
 DIST botocore-1.19.30.tar.gz 7224700 BLAKE2B 50712be7e6e4a8a22607d567a8d227bbc6d9a7156c245a9faa5adf0e94364d5e5738dd558534e072d071e88315fd79555454fd5f36dfb5d309effca6a39f2247 SHA512 8d9a0becad072ac01e04c1709e8851344bbcd35ecb6c269cace7c229e3b2e48b8fd91ca31be96c67831030a75a63027e8700772601a65eb529bcfd8a58434b6c
 DIST botocore-1.19.36.tar.gz 7291325 BLAKE2B d1f79298a0f47d704418cac8390a5d500b1f300fc9bdbc0b215a3630adb70c29a951c6dff2a6ebfde42872cbc3af4c442d09fa0233b2c957521e6a5e05816c60 SHA512 420ad7c59496b2b74ba6ecde8dc40ac3e47c5676335f7471448fcdde5b70bda3bd7516963788d8a7a940aaa9cf488b6529e6fbd2842806f58520cd8e2dc15a60
-DIST botocore-1.19.9.tar.gz 6972834 BLAKE2B 3407c056c7995cc1ccb1b5b4c5b3a6254e38672b52e7889a7a022520283416e4dfcabd05c8ca0ed78e4624c7a20c9f43bfde87a76d7a72660b4c95256e4f9ca4 SHA512 8433f22ae7652e524a82da8d2ccda48da9eef44788333898b7526335d57a7757b80754f0d5c6a2c84ec3bde2ec9fc7da5cf872cbda7286f620b4f4878fe9a583
+DIST botocore-1.19.43.tar.gz 7374325 BLAKE2B 7def5221bee4774a6b8a33e6499e499588ff18f8b144e669bdf9b01ae4a3e370e3aed5a3a960360123e57299da9b0293aa8da9108fe114f8ae34521b2920f479 SHA512 a1b97cbb779d8c8fe3495dd18d3d635e38c5c49e5b5fb31b7764029cf3063a7fda44711defc45783b3afb844bead46e686705af57472a7ff27af8b7e21645ad5
+DIST botocore-1.19.50.tar.gz 7382888 BLAKE2B 7de2ef7a7d051427191b13cdd47d3ebd9b4de505e3e17aa7dfb42de9a5eebffa2f06317a559631d219acc4380cc68c7dcfa1d6b0dc9cb123b2fa0315dd81df4e SHA512 7d1a8ff53e22fc265d8ac6492c0607f8948c9aa5862abaded93c605c3a3e4e98e535308e5ec1500a480636e03dbc3d849ec2b1dbf0efb22dffa841ce1cb551f9
+DIST botocore-1.19.51.tar.gz 7385977 BLAKE2B 505dd818f001b11f248582ec0f24bb7aac2e0d9bd343670d23eeb7ec14420bb7b97835a737de9464ffe5d76a43d311feee0e19860b35fddfc8398da4d00739b3 SHA512 03209809f75a5916df03d312fb877a3e129a8677ebd4e7785bbf8311a55823fe6c8faa62c78908fe0d003dd1695e0593a961d73c98dec2a8a7260ce53d6603cf
+DIST botocore-1.19.52.tar.gz 7386245 BLAKE2B 53e21b0c3e39bb3c7219e785b79a167e082f7de7a6c54b2c0e5c53f565c41f76042a9ccd1e2c7ae2e68e19ac2c43d9ce104f1ecfd6c606dead2533a319c969af SHA512 deb827631ffbed9980adc47f05e96d800dc2c65f67a156bbe29e3cd34e612169fc4169e173d06fb9fe42c92ddb1e5041dbd02ad838b80f82657b5bd851aa8fba
+DIST botocore-1.19.53.tar.gz 7387325 BLAKE2B 3432c9d71f7a021184c2ac99be9213015951d1bba445788dcb388a518b62a96a4d3871577d5e97f4f86f7b0830a009155667b05a960b1d06642599e3d4d484e4 SHA512 ffe1da3076e656c36f4c59c12fa9f466e63b6bbc0365f7ecb78a6dc6941eb3748d676188c2b0e5a2d23d21e5cb03daf2893aa04561e183dc931070fae77eea9f
+DIST botocore-1.19.54.tar.gz 7387625 BLAKE2B f3d6a36e5659fb96bdffdf3b7dfdde29c7af7f8437a1ba9722fd1b7c7c817d6a2e54500a6cce4784b7cff4e06342d317615cba048347ddd284dec978d5159e0e SHA512 1f5e0af14bb3e6ff57070580c72caeadfbdf64b8e24951053d991120ddd0d835e025d1211bfeff0f4932821e0c36f82514168ce785a316aac5ebee1feb073e6f
+DIST botocore-1.19.55.tar.gz 7389560 BLAKE2B 887b78625ef9a1d526850d2dba65d4dd4c9dc913ba6716e457d74ede4483a4e77fc401fc102f37150acec9f3d66511543615d73c5a380a354915b964dead1e8e SHA512 fd86ac2770bfebb3618faf3ccbbe003526dc97a0c233465eb26f83e9946a8710377c27811d8c8869b2cb8eec4f183555a47131968f57ab80529279d287ed9642
+DIST botocore-1.19.56.tar.gz 7390812 BLAKE2B 3bec12ce19f39f12a72f7f59f226568cb5af59d6f9a40447a7a1fdc0f27eea06d0cfe5a5b12d2152189b700ddaa016592e95059fa42208c590cb698c568c2d63 SHA512 76988a7ddc588dba48f2444a99159247a0f178c67378fcb6eac51e3f5cfd0ab385960f0fb68bbc483f79e74c9b891070d34a39e9566eb8c24ce903b9ae24dfa5
diff --git a/dev-python/botocore/botocore-1.18.18.ebuild b/dev-python/botocore/botocore-1.18.18.ebuild
deleted file mode 100644
index a52d48c2b0bb..000000000000
--- a/dev-python/botocore/botocore-1.18.18.ebuild
+++ /dev/null
@@ -1,59 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.19.24.ebuild b/dev-python/botocore/botocore-1.19.24.ebuild
deleted file mode 100644
index 7bbd989ca3a9..000000000000
--- a/dev-python/botocore/botocore-1.19.24.ebuild
+++ /dev/null
@@ -1,59 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.19.25.ebuild b/dev-python/botocore/botocore-1.19.25.ebuild
deleted file mode 100644
index 7bbd989ca3a9..000000000000
--- a/dev-python/botocore/botocore-1.19.25.ebuild
+++ /dev/null
@@ -1,59 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.19.26.ebuild b/dev-python/botocore/botocore-1.19.26.ebuild
deleted file mode 100644
index 7bbd989ca3a9..000000000000
--- a/dev-python/botocore/botocore-1.19.26.ebuild
+++ /dev/null
@@ -1,59 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.19.28.ebuild b/dev-python/botocore/botocore-1.19.28.ebuild
deleted file mode 100644
index 7bbd989ca3a9..000000000000
--- a/dev-python/botocore/botocore-1.19.28.ebuild
+++ /dev/null
@@ -1,59 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.19.29.ebuild b/dev-python/botocore/botocore-1.19.29.ebuild
deleted file mode 100644
index 7bbd989ca3a9..000000000000
--- a/dev-python/botocore/botocore-1.19.29.ebuild
+++ /dev/null
@@ -1,59 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.19.30.ebuild b/dev-python/botocore/botocore-1.19.30.ebuild
index 7bbd989ca3a9..4c682b6b25d3 100644
--- a/dev-python/botocore/botocore-1.19.30.ebuild
+++ b/dev-python/botocore/botocore-1.19.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.19.16.ebuild b/dev-python/botocore/botocore-1.19.43.ebuild
index 7bbd989ca3a9..7bbd989ca3a9 100644
--- a/dev-python/botocore/botocore-1.19.16.ebuild
+++ b/dev-python/botocore/botocore-1.19.43.ebuild
diff --git a/dev-python/botocore/botocore-1.19.23.ebuild b/dev-python/botocore/botocore-1.19.50.ebuild
index 7bbd989ca3a9..9d681f87244c 100644
--- a/dev-python/botocore/botocore-1.19.23.ebuild
+++ b/dev-python/botocore/botocore-1.19.50.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/botocore/botocore-1.19.20.ebuild b/dev-python/botocore/botocore-1.19.51.ebuild
index 7bbd989ca3a9..9d681f87244c 100644
--- a/dev-python/botocore/botocore-1.19.20.ebuild
+++ b/dev-python/botocore/botocore-1.19.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/botocore/botocore-1.19.21.ebuild b/dev-python/botocore/botocore-1.19.52.ebuild
index 7bbd989ca3a9..9d681f87244c 100644
--- a/dev-python/botocore/botocore-1.19.21.ebuild
+++ b/dev-python/botocore/botocore-1.19.52.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/botocore/botocore-1.19.22.ebuild b/dev-python/botocore/botocore-1.19.53.ebuild
index 7bbd989ca3a9..9d681f87244c 100644
--- a/dev-python/botocore/botocore-1.19.22.ebuild
+++ b/dev-python/botocore/botocore-1.19.53.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/botocore/botocore-1.19.54.ebuild b/dev-python/botocore/botocore-1.19.54.ebuild
new file mode 100644
index 000000000000..9d681f87244c
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.54.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.19.55.ebuild b/dev-python/botocore/botocore-1.19.55.ebuild
new file mode 100644
index 000000000000..9d681f87244c
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.55.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.19.56.ebuild b/dev-python/botocore/botocore-1.19.56.ebuild
new file mode 100644
index 000000000000..9d681f87244c
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.56.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.19.9.ebuild b/dev-python/botocore/botocore-1.19.9.ebuild
deleted file mode 100644
index 7c0432536c5f..000000000000
--- a/dev-python/botocore/botocore-1.19.9.ebuild
+++ /dev/null
@@ -1,59 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index b40f921fa196..81c2815a03e3 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,2 +1 @@
-DIST bottle-0.12.18.tar.gz 71557 BLAKE2B a34cc1ab9a2a8505b7fda8bbddbae30b4e6c4829cae53f0f886237a21fdfa7f2b2463b216d7a16464539f41bdce4c1dabb5cc66027b8fdd19b10e9a78a3cdbb5 SHA512 db8a341cd80d755205518bb9eac5b79dca9e541ab3ad9d9d57f891d895f7df75a8facd16b068cbdf7c4f884f35e384449f4cbd565a43e9c5d000d3a9f5b7dcb0
 DIST bottle-0.12.19.tar.gz 73142 BLAKE2B e59d7a507d3401869ba4953a48274062fc56226afa2f7aad596b4ef4352e4a79cea2d224dfe32d7ce014e4f4a3ba088d0e7a0886f64a84bb6b78571e953fa3c3 SHA512 e5d2f6a32d1b89ae3cc9607456c0614db2b58882c6d36273d695c51d3d77b1858cac4d914dbf19bca3b74be68c197aa6473f162e40d9b7ae2af3a084a28c2637
diff --git a/dev-python/bottle/bottle-0.12.18-r1.ebuild b/dev-python/bottle/bottle-0.12.18-r1.ebuild
deleted file mode 100644
index 900b2eaad597..000000000000
--- a/dev-python/bottle/bottle-0.12.18-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="https://pypi.org/project/bottle/ https://bottlepy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/mako[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.12.8-py3.5-backport.patch
-)
-
-python_prepare_all() {
-	sed -i -e '/scripts/d' setup.py || die
-
-	# Remove test file requring connection to network
-	rm test/test_server.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# A few odd fails in the suite under pypy
-	# https://github.com/bottlepy/bottle/issues/714
-	"${EPYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Templating support" dev-python/mako
-	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
-	elog "we do as most other distros and do not install the script anymore."
-	elog "If you do want/have to call it directly rather than through your app,"
-	elog "please use the following instead:"
-	elog '  `python -m bottle`'
-}
diff --git a/dev-python/bottle/bottle-0.12.19.ebuild b/dev-python/bottle/bottle-0.12.19.ebuild
index d0478c9e9b18..900b2eaad597 100644
--- a/dev-python/bottle/bottle-0.12.19.ebuild
+++ b/dev-python/bottle/bottle-0.12.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/bottle/metadata.xml b/dev-python/bottle/metadata.xml
index 3ba321c03488..e836b2d75a9f 100644
--- a/dev-python/bottle/metadata.xml
+++ b/dev-python/bottle/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">bottle</remote-id>
   </upstream>
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index d1518f5cbe4d..68f1f88354c6 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,2 +1 @@
 DIST bpython-0.20.1.tar.gz 223953 BLAKE2B b26ee6e4d41609e9a04a013d90f4ae7f598ba28028d9982a77aa7f11887a60c39855e875ae004b416e375b0c906e066a22a18f0251d2e7192d690fe03afe51c7 SHA512 ff69b175afbb1f050f1aa481966bbc32580b3d113a886f49a97fa8f01e3c8c0edf2c0075785fc61ac616168c97d61ee7daeed85d0b08f1317fb774f7ad6bf439
-DIST bpython-0.20.tar.gz 224127 BLAKE2B 6b7334f6657e27eff3f48468ee4eed64b69f9ba9ce92881a28ff57a5d5e60948b30fca689adc7a3aac088d2aa1316bfd43509f4f8d80b4822e8990f2753a2059 SHA512 13c04bd9b9ce0bd1b3775295e249e0505abe3be6c601dc9d90455863fd8bc178abb3fe98b05586c6298ea9308a6b062907abf2979b37b08e4341439b0311a565
diff --git a/dev-python/bpython/bpython-0.20.1.ebuild b/dev-python/bpython/bpython-0.20.1.ebuild
index 5cbbbc0ea05b..664a7e69f9b6 100644
--- a/dev-python/bpython/bpython-0.20.1.ebuild
+++ b/dev-python/bpython/bpython-0.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/bpython/bpython-0.20.ebuild b/dev-python/bpython/bpython-0.20.ebuild
deleted file mode 100644
index 6aea0efd29f2..000000000000
--- a/dev-python/bpython/bpython-0.20.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_{6,7,8,9,10} )
-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/metadata.xml b/dev-python/bpython/metadata.xml
index 9f9c3fc6839d..5327d3876822 100644
--- a/dev-python/bpython/metadata.xml
+++ b/dev-python/bpython/metadata.xml
@@ -12,7 +12,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">bpython</remote-id>
-		<remote-id type="bitbucket">bobf/bpython</remote-id>
 		<remote-id type="github">bpython/bpython</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 95a7506660d5..b3eb870a03e4 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1 +1,3 @@
 DIST breathe-4.22.1.tar.gz 76241 BLAKE2B 1b410eefe47610abf2e55bba86d13169449a03be2503839fa7a0f4f351e79d2e5f24d208c95d06a58e2d8cacef55ef52ea5921d5d71ce50b94fb0eed207918a2 SHA512 3b49819821356929a18d8ad9e25edd93d91661f3baea452121afb74308e11afa9a3cc96e31a063d380cfc1b0973ac646d5917279d9b56131be25dbb13dd632bf
+DIST breathe-4.25.0.tar.gz 76814 BLAKE2B 5a31d8a85ffdff0d4e2547e541246046c1088247672e289bd90d3d9ef30970ae00160f375b0a3b805f8ce01f023d0df4bb2327136b4c4d330dd729a51d990556 SHA512 e3e21efd724f10c64194a3294a240f607b83d3ba425cc0c4c514810d6d34977df808c23d3005c10acd7abb914a910ecdd98123b247f0d1065e1f5fe266bd35da
+DIST breathe-4.25.1.tar.gz 76931 BLAKE2B 3f910042f3822e5887da8239ba1a65bf7b1c8903a514c359ad64c58928fe8fe6b867a99351e18fb394a0a56aa0dbecc040203406a1e64961266fbd69aaddacfa SHA512 417adc7facbd5ec9eb69ec79028987fde537cbd928e3d552e7020377b683816b1b670614daa24c2047d711043f0a9116a09e8c1ca7aecb82db97b1f6fac872d8
diff --git a/dev-python/breathe/breathe-4.22.1.ebuild b/dev-python/breathe/breathe-4.22.1.ebuild
index 4c3b69fba306..d91d9223eab4 100644
--- a/dev-python/breathe/breathe-4.22.1.ebuild
+++ b/dev-python/breathe/breathe-4.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/breathe/breathe-4.25.0.ebuild b/dev-python/breathe/breathe-4.25.0.ebuild
new file mode 100644
index 000000000000..d8666ff65a60
--- /dev/null
+++ b/dev-python/breathe/breathe-4.25.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx Doxygen renderer"
+HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-doc/doxygen
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-fontsextra
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+"
diff --git a/dev-python/breathe/breathe-4.25.1.ebuild b/dev-python/breathe/breathe-4.25.1.ebuild
new file mode 100644
index 000000000000..d8666ff65a60
--- /dev/null
+++ b/dev-python/breathe/breathe-4.25.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx Doxygen renderer"
+HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-doc/doxygen
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-fontsextra
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+"
diff --git a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
index 5b671d1a5fef..4d4377eff533 100644
--- a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-arch/brotli:=
diff --git a/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild b/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
index 8d5eac524fcd..b769a3fd29a0 100644
--- a/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
+++ b/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # module name collision with app-arch/brotli
 RDEPEND="
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 405c500854b4..24805577e20b 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1 +1,2 @@
 DIST bsddb3-6.2.7.tar.gz 437325 BLAKE2B ed7931a32766338c5674cc017a8528d30acf9397443f270bf93974c9ed7ae4abdc6b704d85d48f68e0c4b6d85c4ad71edf891e342e5f9b9a597453140adde742 SHA512 edd85fb697142ac152a10a299899c52b637a3b1e3d28d913c61f9de91ef292fc2055daeb18fca62242284b4189a61d5bf318aca6e2966849879043a46db000e0
+DIST bsddb3-6.2.9.tar.gz 230475 BLAKE2B 68c7c498d581dd5ca860060a3152f7ae135bbc75d00714764446d071e8ea88d303a73d1aa411db1ff8fc922aa6d486632fe38bef3596550150ed511a97fc9c9c SHA512 9e878ef865cba608fafe4274b660234927b9106323c3e4ddd728682b0f11b3c7edb9a3dd56cdfe8665eba890df4121695c9710b95bb2f43b8a0be3ec4050f61e
diff --git a/dev-python/bsddb3/bsddb3-6.2.7.ebuild b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
index bd588e5104df..0311592613c3 100644
--- a/dev-python/bsddb3/bsddb3-6.2.7.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/bsddb3/bsddb3-6.2.9.ebuild b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
new file mode 100644
index 000000000000..b9c0be9e239b
--- /dev/null
+++ b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit db-use distutils-r1
+
+DESCRIPTION="Python bindings for Berkeley DB"
+HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<sys-libs/db-6.3:=
+	|| (
+		sys-libs/db:6.2
+		sys-libs/db:6.1
+		sys-libs/db:5.3
+		sys-libs/db:5.1
+		sys-libs/db:4.8
+		sys-libs/db:4.7
+	)"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	# This list should be kept in sync with setup.py.
+	if [[ -z ${DB_VER} ]]; then
+		for DB_VER in 6.2 6.1 5.3 5.1 4.8 4.7; do
+			has_version "sys-libs/db:${DB_VER}" && break
+		done
+	fi
+
+	# Force version.
+	sed -e "s/db_ver = None/db_ver = (${DB_VER%.*}, ${DB_VER#*.})/" \
+		-e "s/dblib = 'db'/dblib = '$(db_libname ${DB_VER})'/" \
+		-i setup2.py setup3.py || die
+
+	# Adjust test.py to look in build/lib.
+	sed -e "s/'lib.%s' % PLAT_SPEC/'lib'/" \
+		-i test2.py test3.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# These are needed for both build and install.
+	export BERKELEYDB_DIR="${EPREFIX}/usr"
+	export BERKELEYDB_INCDIR="$(db_includedir ${DB_VER})"
+	export BERKELEYDB_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=1
+}
+
+python_test() {
+	PYTHONPATH=Lib3 "${EPYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index b539f518d3d4..4e25d9d8c648 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1 +1,2 @@
 DIST cachetools-4.1.1.tar.gz 23574 BLAKE2B 5777d243ae87635766811fd2aea8789f9f1674ae3a7ddcc08bb3c8d4345002d65cdbd00cbaf75ba801dccffb1896a75688a6e97f984e1d498a93726854398196 SHA512 254e8821feaaf4fff656aa2beaf0b2c1c6dbe8698148be783bb18a6476f758061471906e4774f47bd8722dbbbc09745088a8f61eb5c455fbe85ef17a3816ce7d
+DIST cachetools-4.2.0.tar.gz 24713 BLAKE2B 06488dbc37f99081ed0dd3784f35d3471a57a7674b9bc9aff5eb366b06e65179bd17ac409abee3e13e4040fb8b4824a1591b0a3db3e8b8621d7d2d3e3aec6561 SHA512 d573d0ad9a6371d25526dc5de8db31f701419ced2206109e101faeb0f867fdaf2ebeaa7f0b92554b9e5b3486253a314863d818a53ba9211824aa8a46618f7052
diff --git a/dev-python/ordered-set/ordered-set-4.0.1.ebuild b/dev-python/cachetools/cachetools-4.2.0.ebuild
index d83235365b3a..7db6f3c761f4 100644
--- a/dev-python/ordered-set/ordered-set-4.0.1.ebuild
+++ b/dev-python/cachetools/cachetools-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
 
-DESCRIPTION="A mutable set that remembers the order of its entries"
-HOMEPAGE="https://github.com/LuminosoInsight/ordered-set"
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.org/project/cachetools/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 0279ca0bc0db..507cb439c5a2 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,2 +1 @@
-DIST cairocffi-1.1.0.tar.gz 68744 BLAKE2B 604812572bb1a39ab52e41e03714acc93ddc7532e07ac36b693f53ad71cf0bcfd5d2f3bceb56b8e352fe7f179b174a244238b9cfcee690cbc0cb96e5b2934c75 SHA512 a9bc9ec5be767388aad9d06cc3b386b474dbacf097d3558b4033834cfb2f5418eede2f4b4080bec7e4725c6821f6e54d6c3366e8c4ee73bd3fa1cf444b395197
 DIST cairocffi-1.2.0.tar.gz 70393 BLAKE2B b5cc69ec2805524e8f66a6234c4e19502181fad18c754379d91b05c2d2a88c82742f2b2057afcaac93f4d23ee64b41b2e84f029b6cb4ce2e7b3fa81ae0e8a485 SHA512 0f5b58ae85b2cc880bfb8ede6cbfe4905737211dab5b080815eb59f7cdd9c580367b9e00e7216d68ea9cbb84bda3f21ddcbccb2e744b86d6da8b991cffb96caf
diff --git a/dev-python/cairocffi/cairocffi-1.1.0.ebuild b/dev-python/cairocffi/cairocffi-1.1.0.ebuild
deleted file mode 100644
index c97593411185..000000000000
--- a/dev-python/cairocffi/cairocffi-1.1.0.ebuild
+++ /dev/null
@@ -1,35 +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,9,10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
-HOMEPAGE="https://github.com/Kozea/cairocffi"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
-	' 'python*')
-	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
-	x11-libs/cairo:0=[X,xcb(+)]
-	x11-libs/gdk-pixbuf[jpeg]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-tests.patch
-	"${FILESDIR}"/${PN}-1.0.2-test-deps.patch
-)
-
-python_test() {
-	virtx pytest -vv --pyargs cairocffi
-}
diff --git a/dev-python/cairocffi/cairocffi-1.2.0.ebuild b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
index bea1abea263f..79eb93e36513 100644
--- a/dev-python/cairocffi/cairocffi-1.2.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cairocffi/files/cairocffi-1.0.2-test-deps.patch b/dev-python/cairocffi/files/cairocffi-1.0.2-test-deps.patch
deleted file mode 100644
index d6da32523d79..000000000000
--- a/dev-python/cairocffi/files/cairocffi-1.0.2-test-deps.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Remove unnecessary test deps.
-
---- cairocffi-1.0.2/setup.cfg
-+++ cairocffi-1.0.2/setup.cfg
-@@ -36,16 +36,10 @@
- packages = find:
- setup_requires = 
- 	cffi >= 1.1.0
--	pytest-runner
- 	setuptools
- install_requires = 
- 	cffi >= 1.1.0
- 	setuptools >= 39.2.0
--tests_require = 
--	pytest-cov
--	pytest-flake8
--	pytest-isort
--	pytest-runner
- python_requires = >= 3.5
- 
- [options.package_data]
-@@ -58,11 +52,6 @@
- doc = 
- 	sphinx
- 	sphinx_rtd_theme
--test = 
--	pytest-runner
--	pytest-cov
--	pytest-flake8
--	pytest-isort
- xcb = 
- 	xcffib >= 0.3.2
- 
-@@ -74,7 +63,6 @@
- test = pytest
- 
- [tool:pytest]
--addopts = --flake8 --isort
- norecursedirs = build dist .cache .eggs .git
- 
- [flake8]
diff --git a/dev-python/cbor/cbor-1.0.0-r1.ebuild b/dev-python/cbor/cbor-1.0.0-r1.ebuild
index 6ff9b45f77ae..894e9a154836 100644
--- a/dev-python/cbor/cbor-1.0.0-r1.ebuild
+++ b/dev-python/cbor/cbor-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/cbor2/cbor2-5.2.0.ebuild b/dev-python/cbor2/cbor2-5.2.0.ebuild
index f4147dd85ebb..bf0f745231d1 100644
--- a/dev-python/cbor2/cbor2-5.2.0.ebuild
+++ b/dev-python/cbor2/cbor2-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
deleted file mode 100644
index 3bdbcf607c3b..000000000000
--- a/dev-python/celery/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST celery-4.3.0.tar.gz 1434073 BLAKE2B 47d9d461a9bf3d3418a7cb37684f53cce58ef1d1bee928e74cc8b6ff8e9bfde19d99a59d7a8ef7b638efa24263d5b35f50c774fb5f81e9c693c9d3c6242015ac SHA512 6a4f99857c2b329eddb5200934b2c83bc2377b5b89ccbcfed548d8f52cff40800db7b94ea321f74e932ea4be42a546fb9b515569266435cecdbe204a0a891b2f
diff --git a/dev-python/celery/celery-4.3.0.ebuild b/dev-python/celery/celery-4.3.0.ebuild
deleted file mode 100644
index 44334e586abc..000000000000
--- a/dev-python/celery/celery-4.3.0.ebuild
+++ /dev/null
@@ -1,123 +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,9,10} )
-
-inherit bash-completion-r1 distutils-r1 optfeature
-
-DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
-HOMEPAGE="https://celeryproject.org/ https://pypi.org/project/celery/"
-# The pypi tarball lacks CONTRIBUTING.rst required for documentation build.
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/celery/celery/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# There are a number of other optional 'extras' which overlap with those of kombu, however
-# there has been no apparent expression of interest or demand by users for them. See requires.txt
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/kombu-5.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/billiard-3.6.0[${PYTHON_USEDEP}]
-	<dev-python/billiard-4.0.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	>=dev-python/vine-1.3.0[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	test? ( ${RDEPEND}
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.24.1[${PYTHON_USEDEP}]
-		>=dev-python/pymongo-3.7[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3.1[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-3.2.0[${PYTHON_USEDEP}]
-		>=dev-db/redis-2.8.0
-		>=dev-python/boto-2.13.3[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.4.6[${PYTHON_USEDEP}]
-		>=dev-python/moto-1.3.7[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-		>=dev-python/unittest2-0.5.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_celery-2.0[$(python_gen_usedep 'python3*')]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	)"
-
-# testsuite needs it own source
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Loosen requirements
-	sed -e 's|==|>=|' \
-		-e 's|pytest>=4.3.1,<4.4.0|pytest>=4.3.1|' \
-		-i requirements/*.txt || die
-
-	# Suppress KeyError: 'refdoc'
-	sed -e 's|^[[:space:]]*return domain.resolve_xref(env, node\['\''refdoc'\''\], app.builder,$|            if '\''refdoc'\'' not in node:\n                return None\n\0|' \
-		-i docs/_ext/celerydocs.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup -3
-		mkdir docs/.build || die
-		emake -C docs html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	# Main celeryd init.d and conf.d
-	newinitd "${FILESDIR}/celery.initd-r2" celery
-	newconfd "${FILESDIR}/celery.confd-r2" celery
-
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	newbashcomp extra/bash-completion/celery.bash ${PN}
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "zookeeper support" dev-python/kazoo
-	optfeature "msgpack support" dev-python/msgpack
-	#optfeature "rabbitmq support" dev-python/librabbitmq
-	#optfeature "slmq support" dev-python/softlayer_messaging
-	optfeature "eventlet support" dev-python/eventlet
-	#optfeature "couchbase support" dev-python/couchbase
-	optfeature "redis support" dev-db/redis dev-python/redis-py
-	optfeature "gevent support" dev-python/gevent
-	optfeature "auth support" dev-python/pyopenssl
-	optfeature "pyro support" dev-python/pyro:4
-	optfeature "yaml support" dev-python/pyyaml
-	optfeature "memcache support" dev-python/pylibmc
-	optfeature "mongodb support" dev-python/pymongo
-	optfeature "sqlalchemy support" dev-python/sqlalchemy
-	optfeature "sqs support" dev-python/boto
-	#optfeature "cassandra support" dev-python/cassandra-driver
-}
diff --git a/dev-python/celery/files/celery.confd-r2 b/dev-python/celery/files/celery.confd-r2
deleted file mode 100644
index d5ba2f7c9951..000000000000
--- a/dev-python/celery/files/celery.confd-r2
+++ /dev/null
@@ -1,51 +0,0 @@
-# /etc/conf.d/celery
-
-##############################################################################
-# GLOBAL CONFIGURATION
-
-# User and group
-#CELERY_USER="celery"
-#CELERY_GROUP="celery"
-
-# This is generaly a good idea to set the environment correctly
-# because a lot of python package try to use HOME on init
-#export HOME="/var/lib/myproject"
-
-# Full path to the python project directory.
-#CELERY_PROJDIR="/var/lib/myproject"
-
-##############################################################################
-# CELERYD
-
-# Start the Celery worker daemon
-#CELERYD_ENABLED="yes"
-
-# celeryd notes
-#CELERYD_NODES="celery"
-
-# celeryd options
-# Example: set a 5 minute hard time limit for tasks, disable queue process prefetching and specify an app module from CELERY_PROJDIR
-#CELERYD_OPTS="--time-limit=300 -Ofair -A celeryapp"
-
-# Location and level of the celeryd log file
-#CELERYD_LOG_FILE=/var/log/celery/celeryd@%n.log
-#CELERYD_LOG_LEVEL="INFO"
-
-# Location of the celeryd pid file
-#CELERYD_PID_FILE=/run/celery/celeryd@%n.pid
-
-##############################################################################
-# CELERYBEAT
-
-# Start the Celery task scheduler daemon
-#CELERYBEAT_ENABLED="yes"
-
-# celerybeat options
-#CELERYBEAT_OPTS=""
-
-# Location and level of the celerybeat log file
-#CELERYBEAT_LOG_FILE=/var/log/celery/celerybeat.log
-#CELERYBEAT_LOG_LEVEL="INFO"
-
-# Location of the celerybeat pid file
-#CELERYBEAT_PID_FILE=/run/celery/celerybeat.pid
diff --git a/dev-python/celery/files/celery.initd-r2 b/dev-python/celery/files/celery.initd-r2
deleted file mode 100644
index f34c136691b0..000000000000
--- a/dev-python/celery/files/celery.initd-r2
+++ /dev/null
@@ -1,205 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the BSD license
-
-extra_started_commands="reload"
-
-depend() {
-	need net
-	use rabbitmq redis logger dns
-}
-
-CELERYD_ENABLED=${CELERYD_ENABLED:-"no"}
-CELERYD_PID_FILE=${CELERYD_PID_FILE:-"/run/celery/celeryd@%n.pid"}
-CELERYD_LOG_FILE=${CELERYD_LOG_FILE:-"/var/log/celery/celeryd@%n.log"}
-CELERYD_LOG_LEVEL=${CELERYD_LOG_LEVEL:-"INFO"}
-CELERYD_NODES=${CELERYD_NODES:-"celery"}
-
-CELERYBEAT_ENABLED=${CELERYBEAT_ENABLED:-"no"}
-CELERYBEAT_PID_FILE=${CELERYBEAT_PID_FILE:-"/run/celery/celerybeat.pid"}
-CELERYBEAT_LOG_FILE=${CELERYBEAT_LOG_FILE:-"/var/log/celery/celerybeat.log"}
-CELERYBEAT_LOG_LEVEL=${CELERYBEAT_LOG_LEVEL:-"INFO"}
-
-export CELERY_LOADER
-
-CELERYD_MULTI=${CELERYD_MULTI:-"celery multi"}
-CELERYCTL=${CELERYCTL:-"celery"}
-CELERYBEAT=${CELERYBEAT:-"celery beat"}
-
-CELERYD_OPTS="${CELERYD_OPTS}"
-CELERYBEAT_OPTS="${CELERYBEAT_OPTS} -f ${CELERYBEAT_LOG_FILE} -l ${CELERYBEAT_LOG_LEVEL}"
-
-create_dirs() {
-	local logfile="${1}"
-	local pidfile="${2}"
-	local logdir=$(dirname ${logfile})
-	local piddir=$(dirname ${pidfile})
-
-	checkpath -d -q -m 0750 -o ${CELERY_USER:-"root"}:${CELERY_GROUP:-"root"} ${logdir} ${piddir}
-}
-
-[ -n "${CELERY_USER}" ] && DAEMON_OPTS="${DAEMON_OPTS} --uid=${CELERY_USER}"
-[ -n "${CELERY_GROUP}" ] && DAEMON_OPTS="${DAEMON_OPTS} --gid=${CELERY_GROUP}"
-
-checkconfig() {
-	if [ ! -c /dev/null ]; then
-		eerror "/dev/null is not a character device!"
-		return 1
-	fi
-
-	if [ -z "${CELERY_PROJDIR}" ]; then
-		eerror "Missing CELERY_PROJDIR variable"
-		return 1
-	fi
-
-	yesno "${CELERYD_ENABLED}" && \
-		create_dirs "${CELERYD_LOG_FILE}" "${CELERYD_PID_FILE}"
-
-	yesno "${CELERYBEAT_ENABLED}" && \
-		create_dirs "${CELERYBEAT_LOG_FILE}" "${CELERYBEAT_PID_FILE}"
-
-	return 0
-}
-
-celery_chdir() {
-	[ -n "${CELERY_PROJDIR}" ] && cd "${CELERY_PROJDIR}"
-}
-
-wait_pid () {
-	local pidfile=${1}
-	local timeout=${STOPTIMEOUT:-"10"}
-	local PID=$(cat "${pidfile}" 2>/dev/null)
-
-	while [ -n "${PID}" ] && [ "${timeout}" -ge 1 ]; do
-		kill -0 ${PID} 2>/dev/null || break
-		kill -TERM "${PID}"
-		timeout=$((${timeout} - 1))
-		sleep 0.5
-	done
-
-	[ "${timeout}" -lt 1 ] && return 1
-	[ -f ${pidfile} ] && rm -f ${pidfile}
-	return 0
-}
-
-# celeryd
-start_workers() {
-	yesno "${CELERYD_ENABLED}" || return 0
-
-	${CELERYD_MULTI} start ${CELERYD_NODES} ${DAEMON_OPTS} \
-				--pidfile="${CELERYD_PID_FILE}" \
-				--logfile="${CELERYD_LOG_FILE}" \
-				--loglevel="${CELERYD_LOG_LEVEL}" \
-				${CELERYD_OPTS}
-}
-
-stop_workers() {
-	yesno "${CELERYD_ENABLED}" || return 0
-
-	local timeout=${STOPTIMEOUT:-"10"}
-
-	${CELERYD_MULTI} stop ${CELERYD_NODES} --pidfile="${CELERYD_PID_FILE}" || return 1
-
-	# Wait for each node
-	for node in ${CELERYD_NODES}; do
-		local pidfile=${CELERYD_PID_FILE/\%n/${node}}
-		local PID=$(cat "${pidfile}" 2>/dev/null)
-		while [ -n "${PID}" ] && [ "${timeout}" -ge 1 ]; do
-		kill -0 ${PID} 2>/dev/null || break
-		timeout=$((${timeout} - 1))
-		sleep 0.5
-		done
-	done
-
-	[ "${timeout}" -lt 1 ] && return 1
-	return 0
-}
-
-restart_workers() {
-	yesno "${CELERYD_ENABLED}" || return 0
-
-	${CELERYD_MULTI} restart ${CELERYD_NODES} ${DAEMON_OPTS} \
-		--pidfile="${CELERYD_PID_FILE}" \
-		--logfile="${CELERYD_LOG_FILE}" \
-		--loglevel="${CELERYD_LOG_LEVEL}" \
-		${CELERYD_OPTS}
-}
-
-# celerybeat
-start_beat() {
-	yesno "${CELERYBEAT_ENABLED}" || return 0
-
-	ebegin "Starting celerybeat"
-	${CELERYBEAT} ${CELERYBEAT_OPTS} ${DAEMON_OPTS} --detach \
-		--pidfile="${CELERYBEAT_PID_FILE}"
-	eend ${?}
-}
-
-
-stop_beat() {
-	yesno "${CELERYBEAT_ENABLED}" || return 0
-
-	ebegin "Stopping celerybeat"
-	if [ -f "${CELERYBEAT_PID_FILE}" ]; then
-		wait_pid "${CELERYBEAT_PID_FILE}"
-	else
-		ewarn "not running"
-	fi
-	eend ${?}
-}
-
-
-start() {
-	local cr=0
-
-	checkconfig || return 1
-
-	ebegin "Starting ${SVCNAME}"
-	eindent
-
-	celery_chdir && \
-		start_workers && \
-		start_beat || cr=1
-
-	eoutdent
-	eend ${cr}
-}
-
-stop() {
-	local cr=0
-
-	checkconfig || return 1
-
-	ebegin "Stopping ${SVCNAME}"
-	eindent
-
-	celery_chdir
-	stop_workers || cr=1
-	stop_beat || cr=1
-
-	eoutdent
-	eend ${cr}
-}
-
-reload() {
-	local cr=0
-
-	checkconfig || return 1
-
-	ebegin "Restarting ${SVCNAME}"
-	eindent
-
-	celery_chdir
-	restart_workers || cr=1
-	stop_beat && start_beat || cr=1
-
-	eoutdent
-	eend ${cr}
-}
-
-status() {
-	checkconfig || return 1
-
-	celery_chdir && \
-		${CELERYCTL} status
-}
diff --git a/dev-python/celery/metadata.xml b/dev-python/celery/metadata.xml
deleted file mode 100644
index 175f72876ac8..000000000000
--- a/dev-python/celery/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">celery</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/certifi-python2/Manifest b/dev-python/certifi-python2/Manifest
new file mode 100644
index 000000000000..dd748ac592ee
--- /dev/null
+++ b/dev-python/certifi-python2/Manifest
@@ -0,0 +1 @@
+DIST certifi-shim-10001.tar.gz 4061 BLAKE2B 183c573b958921877b14e38e9e26842e8a4f1c1617979a30b65ef1e2bbf001e5ff0aab830e4399906a7d21fb3c71ac12b1e757e4d283aae16cced8e7de7c2a1d SHA512 93beea61e579b2b414bd37c63eba49365e0a1a62304e0c7ac920bedaf5d72cb095a4a46b2240b3c2e6ee31e5b91cd520ae8348b6a8033212d11bbca31db6750c
diff --git a/dev-python/certifi-python2/certifi-python2-10001.ebuild b/dev-python/certifi-python2/certifi-python2-10001.ebuild
new file mode 100644
index 000000000000..f9b1553424c9
--- /dev/null
+++ b/dev-python/certifi-python2/certifi-python2-10001.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+MY_P=certifi-shim-${PV}
+DESCRIPTION="Thin replacement for certifi using system certificate store"
+HOMEPAGE="
+	https://github.com/mgorny/certifi-shim
+	https://pypi.org/project/certifi"
+SRC_URI="
+	https://github.com/mgorny/certifi-shim/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="CC0-1.0"
+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"
+RESTRICT="test"
+
+RDEPEND="
+	!dev-python/certifi[python_targets_python2_7]
+	app-misc/ca-certificates"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	sed -i -e "s^/etc^${EPREFIX}/etc^" certifi/core.py || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	rm -r ${D}/usr/share
+}
+
diff --git a/dev-python/xlutils/metadata.xml b/dev-python/certifi-python2/metadata.xml
index 1d478bbdc3d4..2f3570e552c9 100644
--- a/dev-python/xlutils/metadata.xml
+++ b/dev-python/certifi-python2/metadata.xml
@@ -5,8 +5,9 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
-    <remote-id type="pypi">xlutils</remote-id>
+    <remote-id type="pypi">certifi</remote-id>
   </upstream>
-	<origin>gentoo-staging</origin>
+	<origin>calculatelinux-overlay</origin>
 </pkgmetadata>
diff --git a/dev-python/cffi-python2/cffi-python2-1.14.0-r3.ebuild b/dev-python/cffi-python2/cffi-python2-1.14.0-r4.ebuild
index 4394fcd07e52..74e4795f6e0d 100644
--- a/dev-python/cffi-python2/cffi-python2-1.14.0-r3.ebuild
+++ b/dev-python/cffi-python2/cffi-python2-1.14.0-r4.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1 toolchain-funcs
 MY_PN=cffi
 MY_P=$MY_PN-$PV
@@ -27,6 +27,7 @@ RDEPEND="${DEPEND}
 	!dev-python/cffi[python_targets_python2_7]
 	dev-python/pycparser-python2[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
 	virtual/pkgconfig"
 
 distutils_enable_sphinx doc/source
diff --git a/dev-python/cffi/cffi-1.14.0-r3.ebuild b/dev-python/cffi/cffi-1.14.0-r3.ebuild
index dbc1d805756c..8736a66c2776 100644
--- a/dev-python/cffi/cffi-1.14.0-r3.ebuild
+++ b/dev-python/cffi/cffi-1.14.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cffi/cffi-1.14.4.ebuild b/dev-python/cffi/cffi-1.14.4.ebuild
index 399ed97ae739..e9f1b915b3b0 100644
--- a/dev-python/cffi/cffi-1.14.4.ebuild
+++ b/dev-python/cffi/cffi-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 9a6c78270f43..4442475a3ff7 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1,4 +1,5 @@
-DIST cfn-python-lint-0.39.0.tar.gz 5096885 BLAKE2B 50fe41b1dd533c10a011d4729e78241d0153389cd9eda2c887181b62341d5ff38eba223606c2f9e725dfb1a6c934b5f044a236fb2044368a413d434eefd097c4 SHA512 d48116aeefd996943aa1408c76574ec137e96447c7b8950bb1726ff00819611ad6179a8af820ee4d16f493455cf55110e90b78b6d4325036e955529dedf7807f
-DIST cfn-python-lint-0.41.0.tar.gz 5192401 BLAKE2B 1f4c491446b552272cb9fea46d9d07ca559a4ac7526730663b0824d3ba631a333128ca45b2dbbe637286b0495d0198c45ce19b662bb1448125c919ab4fed57b1 SHA512 3ece6a39666dee395c78fed8e23d9228ec7e0cca67d9216b709300bccf48605903252202cb7d05e7c9b9122be11ed4ca39540aba891359633f1772af72a73fa6
-DIST cfn-python-lint-0.42.0.tar.gz 5307120 BLAKE2B f54c4ae7fcefa6b56714a0cfdf89d9fbce20078daac0784c6169dfbe1a110da699e37b526f306ed9734504fb3387c660ccb997748579b65afe01438124361383 SHA512 ce2e6a0031e3d67953da6f5dc96f0b155f1a1144bee75a8a476490eca69fdb700c8a3d6fd89b0afa4c8d724956e5f86bc48417035d7c94f3eed00abda47f9931
 DIST cfn-python-lint-0.43.0.tar.gz 5329573 BLAKE2B 94ea659e3df02fb3b269984cdf6d879d0e2719aadf3c95f15c2982606cde220493da0a7e34e16538170f96a2611e8693dbad73033bd842e91de613c8cdcb2009 SHA512 fdde4cdffd01d1e8011f44b4eaec0bfe28f2189f53bdc3054d563cf4657c5f828751d8a12e2050d8e04687fe05bf768b5db8cbd27d2ed1c5e0d8967ede70d0ae
+DIST cfn-python-lint-0.44.0.tar.gz 5339555 BLAKE2B 880f03384247f4d6af1e87850b367bdc0846e00205aa943480a3028760115e36b3f6180f536a7b16b9a1aaf9f824ceaea5ab69b7adb1da3f345506c0268b55c0 SHA512 15ee6cc0cb373f7104d9c32acb06433b5669ae89997de010f1c4f382514481f1c6b87ceb387236275299e13e63aae1a5345e71ee934f2d99c1b66e566e1ef245
+DIST cfn-python-lint-0.44.1.tar.gz 5339578 BLAKE2B 7982cba9fe422a8323c6ea270bd7ff5f41800cc16ceaa39d9fc01c2929cda5cca3b19c45de50ca8338a56aad001c834e16bfbd0ab59140381b5189e28965ba38 SHA512 b7f9ad598411d89979334aa79c7b4667ede28eef82b0b546977ba10f33f57e89366d1448e8ceeb3f28a2e53b33a409c439c3faf7d10f53fc5819f6b8693e117d
+DIST cfn-python-lint-0.44.2.tar.gz 5515542 BLAKE2B 9da951dc7faa000d2abd1610595e463045079e5a2e73ad59779fb715f32fca39c1cef189484d62de3bc57a48b7776f5cebcc21c39948b7d73e394b89a4cebba9 SHA512 ca0cba19f930960711676ec285b10e0b60ff36359326098d5040bd2fd8f7ca6cfee985544c4bf94770baefa0e50eecead45c4d769ff3587031c3bf463f26355f
+DIST cfn-python-lint-0.44.3.tar.gz 5591470 BLAKE2B 7d8f6763023a86d528f132b36b9b860b726241576037a1dd92a296f4b5ec5389ffe24e4a41a8f504ae8351b9dafc166d96ae3b17b90ac23062af2159baa36220 SHA512 a3c5fa435ed9afce32336d01cfc6c94d1965dc5c296601aba75064fdaecda9df5bfaf2976837729b56f00bc3e8cea7fe8cd5141c58335091a35dbec31a630b69
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.43.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.43.0.ebuild
index 439b81c417ed..17b8653b3b80 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.43.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.43.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/cfn-python-lint/cfn-python-lint-0.41.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.0.ebuild
index 439b81c417ed..439b81c417ed 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.44.0.ebuild
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.1.ebuild
index 439b81c417ed..439b81c417ed 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.44.1.ebuild
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.2.ebuild
index c7655b4bb29d..439b81c417ed 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.44.2.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/cfn-python-lint/cfn-python-lint-0.44.3.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.3.ebuild
new file mode 100644
index 000000000000..b0cefcddd0c5
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.44.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cftime/Manifest b/dev-python/cftime/Manifest
new file mode 100644
index 000000000000..2a651f051b41
--- /dev/null
+++ b/dev-python/cftime/Manifest
@@ -0,0 +1 @@
+DIST cftime-1.3.0.tar.gz 55668 BLAKE2B c233a3d45305476f422ca93f89348b7b3c018b10c0fa42d6649001b7bcdb4d26d230322108def41818449ec78dc531261b52d09252306fb5889ac4011af33828 SHA512 07f79e902142e8a314c9d09af08ea752454e490c3027ee44853f78c725305bf11cad90bd331edd204defded11e7f29173df9bef70ab805a28b745cc0afdd4685
diff --git a/dev-python/cftime/cftime-1.3.0.ebuild b/dev-python/cftime/cftime-1.3.0.ebuild
new file mode 100644
index 000000000000..62d7c828fe0e
--- /dev/null
+++ b/dev-python/cftime/cftime-1.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Time-handling functionality from netcdf4-python"
+HOMEPAGE="https://pypi.org/project/cftime"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e "/--cov/d" setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/aiocontextvars/metadata.xml b/dev-python/cftime/metadata.xml
index 976192776919..ebd158eede3e 100644
--- a/dev-python/aiocontextvars/metadata.xml
+++ b/dev-python/cftime/metadata.xml
@@ -2,11 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>python@gentoo.org</email>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">aiocontextvars</remote-id>
-		<remote-id type="github">fantix/aiocontextvars</remote-id>
+		<remote-id type="pypi">cftime</remote-id>
+		<remote-id type="github">Unidata/cftime</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
index cdc6c50e3e21..b26630f1d721 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/chardet/chardet-3.0.4-r1.ebuild b/dev-python/chardet/chardet-3.0.4-r1.ebuild
index 508e6f50d343..7849d84a378e 100644
--- a/dev-python/chardet/chardet-3.0.4-r1.ebuild
+++ b/dev-python/chardet/chardet-3.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 DEPEND="
 	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
diff --git a/dev-python/chardet/chardet-4.0.0.ebuild b/dev-python/chardet/chardet-4.0.0.ebuild
index 4c56b5615369..f655fdafea4f 100644
--- a/dev-python/chardet/chardet-4.0.0.ebuild
+++ b/dev-python/chardet/chardet-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
diff --git a/dev-python/chardet/metadata.xml b/dev-python/chardet/metadata.xml
index 7db341520a52..450e0d5d1738 100644
--- a/dev-python/chardet/metadata.xml
+++ b/dev-python/chardet/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">chardet</remote-id>
     <remote-id type="github">chardet/chardet</remote-id>
diff --git a/dev-python/cheetah3/Manifest b/dev-python/cheetah3/Manifest
index 78ba6d24f981..d2a51d68201b 100644
--- a/dev-python/cheetah3/Manifest
+++ b/dev-python/cheetah3/Manifest
@@ -1,2 +1 @@
-DIST cheetah3-3.2.4.tar.gz 315044 BLAKE2B 5cb36364f424acf87593b3f18b5709d1a161dd3fb9bc1f4cfb6fe7c22d2515c852d5d7d0215692274ffe5437267e3232fcfae3d76c592cf66d8927fabdf37953 SHA512 64fbe95fe8d5f3185168ba780e106a46caa0656272235168df603eff50dd6e476eed041658a1e11ae12ee10d148a001c32a23677a1ee6da5b6d43e20e4d1e36e
 DIST cheetah3-3.2.6.tar.gz 2481158 BLAKE2B cb8ad192ae9caf0d1284294b323cf4a918cd2fc951bae25867d69a3dd7933728056b76fbf52a22d34f290056a96cce7d9ccbeb2404f2f0bb782f8db8b7453e47 SHA512 abf74def695018a79cb1364f60e402e7e0095a4d2f069decfbddf42501d865b70451ebc7b52abc67aa23e57276d7a3b8c2894a9571876e15db43cd1358f74d31
diff --git a/dev-python/cheetah3/cheetah3-3.2.4.ebuild b/dev-python/cheetah3/cheetah3-3.2.4.ebuild
deleted file mode 100644
index e8a167e20f08..000000000000
--- a/dev-python/cheetah3/cheetah3-3.2.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=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="Python-powered template engine and code generator"
-HOMEPAGE="https://www.cheetahtemplate.org/ https://pypi.org/project/Cheetah3/"
-SRC_URI="https://github.com/CheetahTemplate3/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 x86"
-SLOT="0"
-
-RDEPEND="
-	dev-python/markdown[${PYTHON_USEDEP}]
-	!dev-python/cheetah
-"
-BDEPEND="${RDEPEND}"
-
-DOCS=( ANNOUNCE.rst README.rst TODO )
-
-python_prepare_all() {
-	# Disable broken tests.
-	sed \
-		-e "/Unicode/d" \
-		-e "s/if not sys.platform.startswith('java'):/if False:/" \
-		-e "/results =/a\\    sys.exit(not results.wasSuccessful())" \
-		-i Cheetah/Tests/Test.py || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp -r "${S}/Cheetah/Tests/ImportHooksTemplates" \
-		"${BUILD_DIR}/lib/Cheetah/Tests/ImportHooksTemplates" || die
-
-	"${EPYTHON}" Cheetah/Tests/Test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cheetah3/cheetah3-3.2.6.ebuild b/dev-python/cheetah3/cheetah3-3.2.6.ebuild
index 30c8728dfb8a..8250d7f8ab5d 100644
--- a/dev-python/cheetah3/cheetah3-3.2.6.ebuild
+++ b/dev-python/cheetah3/cheetah3-3.2.6.ebuild
@@ -7,11 +7,11 @@ DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
 DESCRIPTION="Python-powered template engine and code generator"
-HOMEPAGE="https://www.cheetahtemplate.org/ https://pypi.org/project/Cheetah3/"
+HOMEPAGE="https://cheetahtemplate.org/ https://pypi.org/project/Cheetah3/"
 SRC_URI="https://github.com/CheetahTemplate3/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index ed2121521e38..ab822216c15f 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,4 +1 @@
-DIST cheroot-8.4.4.tar.gz 107753 BLAKE2B 4e5d9c3a101876d76696a2e6e3c191f199810e734e25cdc07aac69c102eb28b90033c6fa749569e140c01dbd08a4b06f067b4f47d34ef483d48731c6372ee5eb SHA512 18e2c198a537abd740a868fc4055c1e1e0501392c5518ec345669d02511dac2d59aa2abe2670ffb1800c5aae7032b11445488ecf7fd63d02d5923ed08b82f216
-DIST cheroot-8.4.5.tar.gz 109443 BLAKE2B f8dd7a053304c6be559862028ef306c742c015e98c236f3e154f863c3abbf7d261f85b9a7e880ba9f51e6a8bf25cdf96ed6f45f7758657ecbdc4d6b7dde7f6a9 SHA512 2e8c84a67e24772dfeea7fbb397807e6553912d32392c393ec85181ccb381b1f4d3e38cc2366710a5c789869cbc6d15a79bd1b20b6d3845e5c08496b4f4b0e9e
-DIST cheroot-8.4.8.tar.gz 111377 BLAKE2B be020dd45fef980e7e7b10e19f1ff2bf076ddd30578a31371afd7b9c85a644d0fb4c4836401f17be8df3307071f3337359f611f9cb6d28b17fb5b7723d6b6f7d SHA512 fa0362d29adbcf0b06038d209e33d722ff2f0766d8f2dd46c8ca217195ef5b30bb51400a9615f11cc136683b146ab2c21c3f1974cb4e7ad55488762e31da40f5
 DIST cheroot-8.5.0.tar.gz 112163 BLAKE2B f7105f7c2d5433b90832dff6404120f153783b644b5acab72a915899fd138df1ee9ecde6d4148a66472cfb31802e58d684256524a212c65c1c42a22ab7783ce2 SHA512 3e781bfaea0b1d0b339ddb1ef871505c7eb0f4a67873f3207ec3cbb703392f579de90785c196d77f7a484b675de1438def4ad91109e70ad5894d26e55c645a01
diff --git a/dev-python/cheroot/cheroot-8.4.4.ebuild b/dev-python/cheroot/cheroot-8.4.4.ebuild
deleted file mode 100644
index f20c7a9f56f0..000000000000
--- a/dev-python/cheroot/cheroot-8.4.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-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/cheroot/cheroot-8.4.5.ebuild b/dev-python/cheroot/cheroot-8.4.5.ebuild
deleted file mode 100644
index 66f2387e1a8c..000000000000
--- a/dev-python/cheroot/cheroot-8.4.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-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/cheroot/cheroot-8.4.8.ebuild b/dev-python/cheroot/cheroot-8.4.8.ebuild
deleted file mode 100644
index 66f2387e1a8c..000000000000
--- a/dev-python/cheroot/cheroot-8.4.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-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/cheroot/cheroot-8.5.0.ebuild b/dev-python/cheroot/cheroot-8.5.0.ebuild
index 57f6fe5e9b98..28e710f74a56 100644
--- a/dev-python/cheroot/cheroot-8.5.0.ebuild
+++ b/dev-python/cheroot/cheroot-8.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index d36c99982c35..07cacd71fa2f 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,4 +1,5 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
+DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-python/clang-python/clang-python-11.0.1_rc1.ebuild b/dev-python/clang-python/clang-python-11.0.1.ebuild
index 67e212aefbf7..f81a1782012e 100644
--- a/dev-python/clang-python/clang-python-11.0.1_rc1.ebuild
+++ b/dev-python/clang-python/clang-python-11.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/clang-python/clang-python-11.0.1.9999.ebuild b/dev-python/clang-python/clang-python-11.1.0_rc1.ebuild
index 67e212aefbf7..2f2f8087f297 100644
--- a/dev-python/clang-python/clang-python-11.0.1.9999.ebuild
+++ b/dev-python/clang-python/clang-python-11.1.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/cleo/Manifest b/dev-python/cleo/Manifest
new file mode 100644
index 000000000000..86a6d75da698
--- /dev/null
+++ b/dev-python/cleo/Manifest
@@ -0,0 +1 @@
+DIST cleo-0.8.1.tar.gz 96220 BLAKE2B 57971f6254a31ecf5101d89e96607b5915ab5138d727279d445172b89a10acd6b76619d344973fa2bdbc320866fa1dbdf05c889f4eca879839fa6bcbbad0af7c SHA512 9cd470063db9866a526f0bb8619d772c585377d5b1a662e0f94bad9fb9c853598b176444ca1ac0fadec82992196c471646504d6a28d4dcd1171433b8d160be9c
diff --git a/dev-python/cleo/cleo-0.8.1.ebuild b/dev-python/cleo/cleo-0.8.1.ebuild
new file mode 100644
index 000000000000..684e1b864797
--- /dev/null
+++ b/dev-python/cleo/cleo-0.8.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python tool for building testable command-line interfaces"
+HOMEPAGE="https://github.com/sdispater/cleo"
+SRC_URI="https://github.com/sdispater/cleo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/clikit[${PYTHON_USEDEP}]
+		dev-python/crashtest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cleo/metadata.xml b/dev-python/cleo/metadata.xml
new file mode 100644
index 000000000000..5865c0e76f66
--- /dev/null
+++ b/dev-python/cleo/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jakov.smolic@sartura.hr</email>
+    <name>Jakov Smolic</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sdispater/cleo</remote-id>
+    <remote-id type="pypi">cleo</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild b/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
index 3d5b116aa36f..335e3006aecb 100644
--- a/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
diff --git a/dev-python/cli_helpers/cli_helpers-9999.ebuild b/dev-python/cli_helpers/cli_helpers-9999.ebuild
index 92ce2f01810a..fe5cacdc8479 100644
--- a/dev-python/cli_helpers/cli_helpers-9999.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-9999.ebuild
@@ -18,8 +18,7 @@ KEYWORDS=""
 RDEPEND="
 	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/tabulate-0.8.2[${PYTHON_USEDEP}]
 	dev-python/wcwidth[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 6a03bc74cc1f..1804ae8328b6 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,2 +1 @@
-DIST cliff-3.4.0.tar.gz 78990 BLAKE2B d7d8209e2fe24614cde6d3e113eb0dbbba981addef045fe318143e71f9a240188c0fb74e831d868b31b6dafb4289f7beabfbb5fe1dade1df196f670c53a55549 SHA512 d625588f4eed0aeee549b4a21e604f1cb886b8c10a12df7c546a5292223ec5bf9067352b4d326d5710673dab56eec47e2fb46c9c5d5df6e9fbf026d030bcde1c
 DIST cliff-3.5.0.tar.gz 82997 BLAKE2B f169770a0a956e6091e56eccda8d10906bee09bdb03b474f3b17837b3eda858f3afd21beae1d6945bcdabfa89fc1555d13d70ddd0454a10fe05bfb63c8de75e7 SHA512 215f22e5dd2c4c17bd0f19866189b6b247377a7d5bddeb4a07b7536af7545bd0440b5fb0a98474fc018e3b12f6695f60028c012f3e7eeb6498b20f2923939d08
diff --git a/dev-python/cliff/cliff-3.4.0.ebuild b/dev-python/cliff/cliff-3.4.0.ebuild
deleted file mode 100644
index d55970db1095..000000000000
--- a/dev-python/cliff/cliff-3.4.0.ebuild
+++ /dev/null
@@ -1,41 +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,9,10} )
-# TODO: revert to rdepend once this is merged
-# https://github.com/openstack/cliff/pull/3
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/openstack/cliff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cliff/cliff-3.5.0.ebuild b/dev-python/cliff/cliff-3.5.0.ebuild
index a13bbb4f101e..32894659bd0d 100644
--- a/dev-python/cliff/cliff-3.5.0.ebuild
+++ b/dev-python/cliff/cliff-3.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
diff --git a/dev-python/clikit/Manifest b/dev-python/clikit/Manifest
new file mode 100644
index 000000000000..cfef6b02db15
--- /dev/null
+++ b/dev-python/clikit/Manifest
@@ -0,0 +1 @@
+DIST clikit-0.6.2.tar.gz 72115 BLAKE2B b72f245128c698375f97139cf245bdc8c017e3e2d142f6e3183a42620b23a024531e5b14f05163c6defa9ee54c52c19a64932c62484f2ec8da5c75ea1b7d3d27 SHA512 6f6e436b2161349ce03c705df594e564dbc594b03370dfd62e3b1c8f2accbbc12a1cda881ca392a096435ee243e4f772589ce6f6dfbd3af63d1656d49c3fcb04
diff --git a/dev-python/clikit/clikit-0.6.2.ebuild b/dev-python/clikit/clikit-0.6.2.ebuild
new file mode 100644
index 000000000000..c38b4320eeb7
--- /dev/null
+++ b/dev-python/clikit/clikit-0.6.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Group of utilities to build beautiful and testable command line interfaces"
+HOMEPAGE="https://github.com/sdispater/clikit"
+SRC_URI="https://github.com/sdispater/clikit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/pastel[${PYTHON_USEDEP}]
+	dev-python/pylev[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-python/crashtest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# skip failing test
+	rm tests/utils/test_terminal.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/clikit/metadata.xml b/dev-python/clikit/metadata.xml
new file mode 100644
index 000000000000..762cc581a09a
--- /dev/null
+++ b/dev-python/clikit/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jakov.smolic@sartura.hr</email>
+    <name>Jakov Smolic</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sdispater/clikit</remote-id>
+    <remote-id type="github">clikit</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index e78a95c95c43..f5be79496964 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,3 +1 @@
-DIST cmd2-1.3.11.tar.gz 657770 BLAKE2B 829023a4ebd2c2034dbbcd276720476ef9e19a0869bdd2dcc18f2b7cb58bf7c9874b9c56c60d6ba15f7458327d768bce5f07890054361b58574697cf8408cfd6 SHA512 bd640a38723cfb7886b74631ded288fee87026fe718db48ea71a1eb3cb61cea514dda2c4ccd1df95b5ade3c8f8a4a14be3dd9d6722c59260a5fe7c4dfba30f24
-DIST cmd2-1.3.8.tar.gz 643320 BLAKE2B ca9eb089c4d1a5922d3f762e9fe118168349c807b770265d2e565a183447b938f08da578e0dc7de4a59a52fc39df2b53a63c84c1d86efd75c0ba58950bbe9a9a SHA512 af2b56234e0b257c4de564d46f4be83b56c37fd903ee737e825779558e44a9b60164bac1c0bc35a79c8aa1ba80155331c496c310e5ecad94f984673a30ef6976
 DIST cmd2-1.4.0.tar.gz 660494 BLAKE2B 1a7d5efef704cf3011affa99303233ad9d16e09d16bbe9319324599e6d69b1a664556e9ed406f2a34bfc6021a6d1607a44fd4df9cedbd6688826e0bfe8d91b77 SHA512 1f35e9773578a1d2ea1255cd697754b126c1e90486e84319c0f86ee409ed22bfbc267ff1d3b9af1072985337c9cbc51eac4e288281146d9c20b54c8b364f1547
diff --git a/dev-python/cmd2/cmd2-1.3.11.ebuild b/dev-python/cmd2/cmd2-1.3.11.ebuild
deleted file mode 100644
index 102f1b7a1573..000000000000
--- a/dev-python/cmd2/cmd2-1.3.11.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
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:test_which_editor_good:_&:' tests/test_cmd2.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/cmd2/cmd2-1.3.8.ebuild b/dev-python/cmd2/cmd2-1.3.8.ebuild
deleted file mode 100644
index 0481ec3ca447..000000000000
--- a/dev-python/cmd2/cmd2-1.3.8.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
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:test_which_editor_good:_&:' tests/test_cmd2.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/cmd2/cmd2-1.4.0.ebuild b/dev-python/cmd2/cmd2-1.4.0.ebuild
index 56764a3fb263..86d98a97edc8 100644
--- a/dev-python/cmd2/cmd2-1.4.0.ebuild
+++ b/dev-python/cmd2/cmd2-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
@@ -24,9 +24,21 @@ RDEPEND="
 		>=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}]
 	' python3_{6,7})
 "
+# pyperclip uses clipboard backends in the following preference order:
+# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
+# klipper is known to be broken in Xvfb, and therefore causes test
+# failures.  to avoid them, we must ensure that one of the backends
+# preferred to it is available (i.e. xclip or xsel) + which(1).
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		sys-apps/which
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
index 2110d738cb86..159a7c3813c2 100644
--- a/dev-python/colorlog/Manifest
+++ b/dev-python/colorlog/Manifest
@@ -1 +1,2 @@
 DIST colorlog-3.1.4.tar.gz 14424 BLAKE2B 0434c92044c623dc4b9be4ae3ddc491ccda3db7725894d07125ed19e8f8ae184d8cae27a7adb424e799cf092e66c17089eb193686ef710b5a4789f2f7c75dde6 SHA512 9333e8e5a3237cf3f43d0a86cf93c6252ed52031e685342a1afc411568407a77840946620da429dc384c8f77f7e540339632f15a417ce00a13b40b2d51f1c730
+DIST colorlog-4.7.2.tar.gz 28764 BLAKE2B 35cfba0aa03879786a41eb09601f0b4227c5fbaca91f560810e4a4626d9b3a15b8072df06315f81739d27b410c587a062132d5315bd1e0db059baecf757709d7 SHA512 103640e0a4bff6bd81d26c1019fe954f52870947c0b68b3b2a85f178c8f50040e3eeafe08b2a25aa130433c1c8f144b722e4f3795fcbcc0ed4c2386cee626884
diff --git a/dev-python/colorlog/colorlog-4.7.2.ebuild b/dev-python/colorlog/colorlog-4.7.2.ebuild
new file mode 100644
index 000000000000..486cf17e0ba0
--- /dev/null
+++ b/dev-python/colorlog/colorlog-4.7.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Log formatting with colors"
+HOMEPAGE="https://pypi.org/project/colorlog/ https://github.com/borntyping/python-colorlog"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/commonmark/commonmark-0.9.1.ebuild b/dev-python/commonmark/commonmark-0.9.1.ebuild
index b72fb4adcbf9..baee3d2eda92 100644
--- a/dev-python/commonmark/commonmark-0.9.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/configobj/configobj-5.0.6-r1.ebuild b/dev-python/configobj/configobj-5.0.6-r1.ebuild
index 5380b85097c7..2446dd2edd12 100644
--- a/dev-python/configobj/configobj-5.0.6-r1.ebuild
+++ b/dev-python/configobj/configobj-5.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/DiffSK/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/contextvars/Manifest b/dev-python/contextvars/Manifest
deleted file mode 100644
index a401aecd212e..000000000000
--- a/dev-python/contextvars/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST contextvars-2.4.tar.gz 9253 BLAKE2B b46466e44f836561024b69bd648613654336a41f964ced77ab29e2fa20b43b19f0c6b5b72d31ccf208c8b74ad54fa1898ac1c09b24b124ec53a5970019910553 SHA512 391c12f163854a21d6422afd9464e8896c02b5cb5e2c567550907a16b7970d4e2d02cd360851bba103efd64062669596eacadc7421432198c61054837b57b223
diff --git a/dev-python/contextvars/contextvars-2.4.ebuild b/dev-python/contextvars/contextvars-2.4.ebuild
deleted file mode 100644
index 746ef2161015..000000000000
--- a/dev-python/contextvars/contextvars-2.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# this is a backport, do not add extra impls
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Backport of Python 3.7 contextvars module (PEP 567) for Python 3.6"
-HOMEPAGE="https://github.com/MagicStack"
-SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-RDEPEND="dev-python/immutables[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/contextvars/metadata.xml b/dev-python/contextvars/metadata.xml
deleted file mode 100644
index ef79283f87dc..000000000000
--- a/dev-python/contextvars/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">contextvars</remote-id>
-		<remote-id type="github">MagicStack/contextvars</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 58828571fd2c..1e2551dd0fbd 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,2 +1,3 @@
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
+DIST coverage-5.3.1.tar.gz 684457 BLAKE2B 82c8e311d85a6f758c46767957199e94099838e3c340f5da1472813a2877293245583cb190acc0139cddf3363ee5f299fb42f955c59912b80d9d1ece8cfb09fa SHA512 981ebc9f9490efe613edd68afdef83cb161b303e6de266335ffd2d1d3634bd5a088cbff249b0243071b55cb4f31b4b0c7537b5764660ccc86a7059307badd571
 DIST coverage-5.3.tar.gz 693632 BLAKE2B 9daa3a0fd7f8c3ff7c9d68603e11a0a419d3ab50e3c3fb6be5b694aa1f7566040e1212b7175dfa4f71a0a309db325c00f94a85e0e9e755ae8c4f09c499d0daf4 SHA512 f40a21c394b1a72118965f702ae2b8e09c4e0b2fe92709aedf1de4c8074cd9c2cae0ed4860fbb863e4e5479f1067ff806d7051f7683d6b324de9945c0cacfc39
diff --git a/dev-python/coverage/coverage-4.5.4.ebuild b/dev-python/coverage/coverage-4.5.4.ebuild
index 554d6a30c7e4..a8440e9dedaf 100644
--- a/dev-python/coverage/coverage-4.5.4.ebuild
+++ b/dev-python/coverage/coverage-4.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9,10}} pypy{,3} )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/coverage/coverage-5.3.1.ebuild b/dev-python/coverage/coverage-5.3.1.ebuild
new file mode 100644
index 000000000000..981bf6f2e6a1
--- /dev/null
+++ b/dev-python/coverage/coverage-5.3.1.ebuild
@@ -0,0 +1,69 @@
+# 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,10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+#IUSE="test"
+# The tests are impossible to appease.  Please run them externally
+# via tox.  Or fix the ebuild if you have hours of time to spend
+# on something utterly useless.
+RESTRICT="test"
+
+#BDEPEND="
+#	test? (
+#		dev-python/PyContracts[${PYTHON_USEDEP}]
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/hypothesis[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+#	)
+#"
+
+src_prepare() {
+	# avoid the dep on xdist, run tests verbosely
+	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+	local bindir=${TEST_DIR}/scripts
+
+	pushd tests/eggsrc >/dev/null || die
+	distutils_install_for_testing
+	popd >/dev/null || die
+
+	"${EPYTHON}" igor.py zip_mods || die
+	PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer py || die
+
+	# No C extensions under pypy
+	if [[ ${EPYTHON} != pypy* ]]; then
+		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
+		PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer c || die
+	fi
+
+	# clean up leftover "egg1" directory
+	rm -rf build/lib/egg1 || die
+}
diff --git a/dev-python/crashtest/Manifest b/dev-python/crashtest/Manifest
new file mode 100644
index 000000000000..901bd190262b
--- /dev/null
+++ b/dev-python/crashtest/Manifest
@@ -0,0 +1 @@
+DIST crashtest-0.3.1.tar.gz 16223 BLAKE2B b90465ee736ec0d9c378ed16327fe5bbddf19066a64a2a9d1c454f38eac5321235cafeb20756b2018e1dfea0e07726696084b8965a2543edc5e9fe0d79c33db1 SHA512 1ec80159416e820336d2217c2327f26638e235797ac73edc96fc5e568e2d9fa6e8746e11acde71953a960247f73a6ed9540e3f01c96d3a65f2071dc3e6be5be6
diff --git a/dev-python/crashtest/crashtest-0.3.1.ebuild b/dev-python/crashtest/crashtest-0.3.1.ebuild
new file mode 100644
index 000000000000..c242561dcef8
--- /dev/null
+++ b/dev-python/crashtest/crashtest-0.3.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python library that makes exceptions handling and inspection easier"
+HOMEPAGE="https://github.com/sdispater/crashtest"
+SRC_URI="https://github.com/sdispater/crashtest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/crashtest/metadata.xml b/dev-python/crashtest/metadata.xml
new file mode 100644
index 000000000000..c46e0fae2104
--- /dev/null
+++ b/dev-python/crashtest/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jakov.smolic@sartura.hr</email>
+    <name>Jakov Smolic</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sdispater/crashtest</remote-id>
+    <remote-id type="pypi">crashtest</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 8ec8faffd0e1..d19450f06cb1 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1 +1,3 @@
 DIST croniter-0.3.30.tar.gz 18122 BLAKE2B d15e19167eabf935ca12ad2b277b9b97459248c3a47982346070b4500b45f8296beeabf76c5ceb9bbff579ab2d713392c82446b234a6f4b4f6e8317adc67613d SHA512 1e7f5da56991281a16919abbb386a20a8437604bbe0e57d12726d5f19c1c038e9b320a900471b1d4dad9f5dfd0eeb85ced17232a4907e50025592a293a5a8ad1
+DIST croniter-0.3.37.tar.gz 29607 BLAKE2B dfa466f8557e47c282cf7a7399b1364dd272a313d40b4c9a57e60de9e4bd174312cec24126679994ddce3c320b24d89db4b4395736e344e2a3df5fd13188f7b2 SHA512 733412d6263d5261e05139861465602016925716abe04b82218b370e82ca7cdf7418113d911fe693fc7242fdb686580970b60609de28b3b7f4330a91c721a551
+DIST croniter-1.0.1.tar.gz 29720 BLAKE2B 74583e170bc2bcd504ea323a50f0421157dd2e064a8ffa6a3dd0098084f3d4fe86427373cfc851d8d859a08473e9ff1ae4b3c38a46fad5886534a9638cf1a2bb SHA512 2ea3e4f13c8b95c15249ae95c3295e80983cd1713a4d89b931da7f6f712809e4625916c231418d30f419b69caf9f0465cf3f0b5acc3d5468e8a43e1029cdf6cb
diff --git a/dev-python/croniter/croniter-0.3.37.ebuild b/dev-python/croniter/croniter-0.3.37.ebuild
new file mode 100644
index 000000000000..e7839a81f432
--- /dev/null
+++ b/dev-python/croniter/croniter-0.3.37.ebuild
@@ -0,0 +1,28 @@
+# 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,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to provide iteration for datetime object"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-1.0.1.ebuild b/dev-python/croniter/croniter-1.0.1.ebuild
new file mode 100644
index 000000000000..07d2e4bef24c
--- /dev/null
+++ b/dev-python/croniter/croniter-1.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to provide iteration for datetime object"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cryptography-python2/cryptography-python2-2.9-r2.ebuild b/dev-python/cryptography-python2/cryptography-python2-2.9-r3.ebuild
index e7e6a4759271..771ef7951c10 100644
--- a/dev-python/cryptography-python2/cryptography-python2-2.9-r2.ebuild
+++ b/dev-python/cryptography-python2/cryptography-python2-2.9-r3.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1 flag-o-matic
 MY_PN=cryptography
 MY_P=$MY_PN-$PV
@@ -32,18 +33,13 @@ RDEPEND="
 	!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= )
 	libressl? ( >=dev-libs/libressl-2.8:0= )
 	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
 	>=dev-python/six-python2-1.4.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/enum34[${PYTHON_USEDEP}]
-		dev-python/ipaddress[${PYTHON_USEDEP}]
-	' -2)
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-python2-1.8:=[${PYTHON_USEDEP}]
-	' 'python*')
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+	dev-python/enum34[${PYTHON_USEDEP}]
+	dev-python/ipaddress[${PYTHON_USEDEP}]
+	>=dev-python/cffi-python2-1.8:=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 1914b61c708f..7315e52b65c6 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,6 +1,4 @@
 DIST cryptography-3.2.1.tar.gz 540994 BLAKE2B 667f09ac81423ecdc84c8646f0d02ee3a2955f55d35623e59c07696810a93c47332f7f8d877918eeeb6581d8e02bde3b70aae8e9d32be7ffbc8011e5e7e382a9 SHA512 e3f1806693c24aadc3ef0df374ce1845760e87ad7c243226b75e80820b50bdc0760e4bb5f6ce26d62a6d23736b3109f72cd30b52ae2a36b26ec5656ec96c6175
-DIST cryptography-3.2.tar.gz 540815 BLAKE2B be4edd5d4cd9564e8622284ff9b1d3a7cc7d6e46cfa790d8e1cfa1ce389c5d628e39b056dc5cba3b94ab3fa45603df73a7b4ebd9d1c70fc88c457780f6616311 SHA512 0096e6408b5868cc0b5e6f67945e4200bb943a00ac803546048fa4d332f81af4a224b2d67b911ee8da1ad086120935d7d557fc70a739ecffb22f408ee9b8d09e
 DIST cryptography-3.3.1.tar.gz 539756 BLAKE2B a3eb52d756565ae83d9f2e06045be1d3439a2464b633a9a168101796a448d7c7531e8247862f7996d04500347d32dcebf6b1352e9c9f2e4f0d8008d4bbd000dc SHA512 62192fe0fd3bb8844ccc0056ab72a42b038db2a4ecb0928543c520b85e1de93066dab0d604acf23d37395d68172b9618f81c6022a59ec49725bc1862096d15d1
 DIST cryptography_vectors-3.2.1.tar.gz 35168164 BLAKE2B 77af3be0dbd7393da7cd59600086041b78fe20339018a637fc1cf3600c7cd08cf2e565c79ccb47f4719a4b0f01cf2ab2db00c025805443b333dd7fdf3aa835a7 SHA512 44ff756a6ece9700f7657f8ba92417e95bf273cf500f1dab2141de5b2af6e61840d65c37b766abd752c76025ead1550bfc7b7340ce5774c75fd0bb8ac768cdd8
-DIST cryptography_vectors-3.2.tar.gz 35168065 BLAKE2B ebd915eee9b91bd61445bcb442d3052972b1463132b8e63343832baa27c25566e22ca9f50c9d4ea73cb12185f9228144eaac4bf5cc68a3bd79f347fe2d021adc SHA512 bb0d00c8a66fd328ef38b0008519856a14d35b6fd634a6f67ea5530775d36538fbd326326c3f0cd962b1a008c21f2aded4d733f97bc12577679ed8be67b858bc
 DIST cryptography_vectors-3.3.1.tar.gz 35168171 BLAKE2B 72cf5d79773a728c16847e3e62f8ce444526c051d7562467446d3e59c66064568fdfcbfb1fd35419fd79079ff9a02a2f3a97f870f7adef6cc9a0fd23b4edf514 SHA512 a102535bd3cf72118106ca7268d5a9921738d41f81247940c550961d61cb0d1869095b7891c39e8dc15816f7d38230622846747b4b7a3f226f09306cf86220bd
diff --git a/dev-python/cryptography/cryptography-3.2.1.ebuild b/dev-python/cryptography/cryptography-3.2.1.ebuild
index c94c8e54c479..7ba6ac258616 100644
--- a/dev-python/cryptography/cryptography-3.2.1.ebuild
+++ b/dev-python/cryptography/cryptography-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 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 ~x64-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 ~x64-solaris"
 IUSE="libressl idna"
 
 RDEPEND="
diff --git a/dev-python/cryptography/cryptography-3.2.ebuild b/dev-python/cryptography/cryptography-3.2.ebuild
deleted file mode 100644
index f7402e5ccd46..000000000000
--- a/dev-python/cryptography/cryptography-3.2.ebuild
+++ /dev/null
@@ -1,53 +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,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 multiprocessing
-
-VEC_P=cryptography_vectors-${PV}
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? ( mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz )"
-
-LICENSE="|| ( Apache-2.0 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 ~x64-solaris"
-IUSE="libressl idna"
-
-RDEPEND="
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
-	' 'python*')
-	"
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-DEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= )
-	libressl? ( >=dev-libs/libressl-2.9.1:0= )
-	"
-RDEPEND+=${DEPEND}
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P}
-	pytest -vv -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-3.3.1.ebuild b/dev-python/cryptography/cryptography-3.3.1.ebuild
index 2519876383c0..f71966dfea5e 100644
--- a/dev-python/cryptography/cryptography-3.3.1.ebuild
+++ b/dev-python/cryptography/cryptography-3.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 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 ~x64-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 ~x64-solaris"
 IUSE="libressl idna"
 
 RDEPEND="
diff --git a/dev-python/cssselect2/Manifest b/dev-python/cssselect2/Manifest
index d4fab74516d4..f2658b88e1a1 100644
--- a/dev-python/cssselect2/Manifest
+++ b/dev-python/cssselect2/Manifest
@@ -1,2 +1 @@
-DIST cssselect2-0.3.0.tar.gz 29534 BLAKE2B d7426d72c52ab2cbdbadfb935b3d4f1f23cbc960c94d6691a8f97c9935e0c8d6212e9e2c1c5b00df6fd450216a3deb2c7308c032821f9ef7fbb4d488a7728c8f SHA512 ae59314654d1c1ddf982b77521de7743d1496145a1367f51e02b6067d6757940e7ccb50b67959630f472972473a1e87cec8dfbc8eeb68ad5f16465a36b1447be
 DIST cssselect2-0.4.1.tar.gz 32756 BLAKE2B 86915c39aa5b72ebcdba25b3ac23f59a0fb6c6109019d68e8ce8846572d9412a3cc76cdf9e8b2163605cb942183019eb9170df9a4e61476d703eaf612381a903 SHA512 feafeec3dbe3157ee452d94cd391a09cfcb48ca8bd1563c117c77c9ceb01102c4989611ede39e433ec25d3ddda98a94c4589ccb290b79c729683e673763b42ac
diff --git a/dev-python/cssselect2/cssselect2-0.3.0.ebuild b/dev-python/cssselect2/cssselect2-0.3.0.ebuild
deleted file mode 100644
index 206b84663d89..000000000000
--- a/dev-python/cssselect2/cssselect2-0.3.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="https://cssselect2.readthedocs.io/en/latest/
-	https://pypi.org/project/cssselect2/
-	https://github.com/Kozea/cssselect2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# junk deps
-	sed -i -e '/^addopts/d' -e '/pytest-runner/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cssselect2/cssselect2-0.4.1.ebuild b/dev-python/cssselect2/cssselect2-0.4.1.ebuild
index 5a6a78edeb53..9fed504be5b7 100644
--- a/dev-python/cssselect2/cssselect2-0.4.1.ebuild
+++ b/dev-python/cssselect2/cssselect2-0.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/tinycss2[${PYTHON_USEDEP}]
diff --git a/dev-python/ctypesgen/Manifest b/dev-python/ctypesgen/Manifest
deleted file mode 100644
index dea8d15714bb..000000000000
--- a/dev-python/ctypesgen/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ctypesgen-1.0.2.tar.gz 119413 BLAKE2B 27bc387ccbcd62cd164aef544129ead58248272251d2e2737f7fd65f22b92def3b62845a92dab4e1ba3faf030a002b4f2a67bfb0492ffb6298ddba9d7a2ba0f3 SHA512 d5168f72a04878d64b43c096f84f2a32663d481d7ac37f78d706f11aa09b68fe267af476885232a8c64be0f33dec20937e11bbfdef6231ecef1b19eae592d638
diff --git a/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild b/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
deleted file mode 100644
index 26cd1bc24ee7..000000000000
--- a/dev-python/ctypesgen/ctypesgen-1.0.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=7
-
-# pkg compiles fine with py3_{8,9} but tests fail
-# https://github.com/davidjamesca/ctypesgen/issues/90
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper generator for ctypes"
-HOMEPAGE="https://github.com/davidjamesca/ctypesgen"
-SRC_URI="https://github.com/davidjamesca/ctypesgen/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-python_test() {
-	"${PYTHON}" "${PN}/test/testsuite.py" || die "Test ${f} fails with ${EPYTHON}"
-}
diff --git a/dev-python/ctypesgen/metadata.xml b/dev-python/ctypesgen/metadata.xml
deleted file mode 100644
index 9ab739bdd2df..000000000000
--- a/dev-python/ctypesgen/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">davidjamesca/ctypesgen</remote-id>
-		<remote-id type="pypi">ctypesgen</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 006dde91f835..ef7923fb57f9 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,2 +1 @@
-DIST curtsies-0.3.0.tar.gz 47120 BLAKE2B 51d6bf5686c275690c6b906e7eba642aebd54dccb106463a9b1733e2174fa26a30b8365a17d6cfa18244fb74693364a3aa5184a17f2460425a57fb8912d6bcaf SHA512 b1fc09a4e9aefe09b878a5c710ef86c90f93895a8ed40b40a3c13b24a2dfc1fe771ace11c20e3fed4fcdd0bed8b9615ee3c2bcf200fa34fbfb895a4a7b57b14c
 DIST curtsies-0.3.4.tar.gz 52733 BLAKE2B 5345005e1a650fbc94db29464f26c9cc615509a64f6287f3d3c9ca69b063e6adaf6af95e292c1bee3a2290abd6b98cd0dcc3a01405b4ab63ee5db4f8570b6e51 SHA512 5f65af34f6dd13491acf65311516ed90e57d99f681032ab6b4753710953f5285b012a09de6c56d28ccd5bc942c9886076f04287cddf955ba424205a5c44785b2
diff --git a/dev-python/curtsies/curtsies-0.3.0-r2.ebuild b/dev-python/curtsies/curtsies-0.3.0-r2.ebuild
deleted file mode 100644
index ba8b555c8b0f..000000000000
--- a/dev-python/curtsies/curtsies-0.3.0-r2.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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Curses-like terminal wrapper, with colored strings"
-HOMEPAGE="https://github.com/thomasballinger/curtsies"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
-	>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyte[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
-
-PATCHES=( "${FILESDIR}"/${PN}-typing.patch )
diff --git a/dev-python/curtsies/curtsies-0.3.4.ebuild b/dev-python/curtsies/curtsies-0.3.4.ebuild
index 1258e0a1e325..5cde2c0bbccf 100644
--- a/dev-python/curtsies/curtsies-0.3.4.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/curtsies/files/curtsies-typing.patch b/dev-python/curtsies/files/curtsies-typing.patch
deleted file mode 100644
index 28ab09f89fe9..000000000000
--- a/dev-python/curtsies/files/curtsies-typing.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -r -U2 curtsies-0.3.0.orig/setup.py curtsies-0.3.0/setup.py
---- curtsies-0.3.0.orig/setup.py	2018-02-14 05:54:06.000000000 +0700
-+++ curtsies-0.3.0/setup.py	2019-02-26 17:10:07.076471372 +0700
-@@ -42,5 +42,4 @@
-           'blessings>=1.5',
-           'wcwidth>=0.1.4',
--          'typing',
-       ],
-       tests_require = [
diff --git a/dev-python/curtsies/metadata.xml b/dev-python/curtsies/metadata.xml
index 88305912d677..3c2546567d0e 100644
--- a/dev-python/curtsies/metadata.xml
+++ b/dev-python/curtsies/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">curtsies</remote-id>
     <remote-id type="github">thomasballinger/curtsies</remote-id>
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index 62b3839afdfc..6dbe8b8495e8 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,2 +1 @@
-DIST cx_Freeze-6.1.tar.gz 92474 BLAKE2B 5341b30b202ab96c34c82e5b12dc6a99ebaf429b6a4b6356a55c5d4fefae7504fd017cb5d29cd1601a6affca0e8e8aa1e01ececbf57011f9235b4c516b21a772 SHA512 029753e8b9eafdad383254af0f7296052c124b662473f4453b6bda0ea500430642d93941a59c23df1d0bbbee462f7d61390b5f66c946372c96bf41ea6ffbc685
 DIST cx_Freeze-6.4.2.tar.gz 108571 BLAKE2B 742d2491154706f51ebb3e072428afac1ce5c647f2b8cb6325ea166bbedc1852503ad40e56a532345f1e2a045532620cdad24622e19ecb12d9577cf57abd291d SHA512 4c9a92b6f8dc458f82abb144171b18db1349e75b237f707ca37b7b68527508e8fb3adcf5d7b142922709727501fdc46f16a01619b29e98a6af1a0c09f9306b82
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.1.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.1.ebuild
deleted file mode 100644
index f1557c4c1b7b..000000000000
--- a/dev-python/cx_Freeze/cx_Freeze-6.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=6
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Create standalone executables from Python scripts"
-HOMEPAGE="https://cx-freeze.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.2-buildsystem.patch" # bug #491602
-)
-# test folder missing half the source content.
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.4.2.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.4.2.ebuild
index 300da8ed3cd0..f0e97d77ab36 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.4.2.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 PATCHES=(
 	# bug #491602
diff --git a/dev-python/cx_Freeze/files/cx_Freeze-5.0.2-buildsystem.patch b/dev-python/cx_Freeze/files/cx_Freeze-5.0.2-buildsystem.patch
deleted file mode 100644
index 6289bb2df2c2..000000000000
--- a/dev-python/cx_Freeze/files/cx_Freeze-5.0.2-buildsystem.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Nov 19 11:20:21 UTC 2013
-
-Respect LDFLAGS, remove stripping.
-Fixes Gentoo bug #491602
-
---- a/setup.py
-+++ b/setup.py
-@@ -95,7 +95,6 @@
-                 extraArgs.extend(vars["BASEMODLIBS"].split())
-             if vars["LOCALMODLIBS"]:
-                 extraArgs.extend(vars["LOCALMODLIBS"].split())
--            extraArgs.append("-s")
-         self.compiler.link_executable(objects, fullName,
-                 libraries = libraries,
-                 library_dirs = libraryDirs,
diff --git a/dev-python/cx_Freeze/metadata.xml b/dev-python/cx_Freeze/metadata.xml
index d11234000952..fb5a9eb9328b 100644
--- a/dev-python/cx_Freeze/metadata.xml
+++ b/dev-python/cx_Freeze/metadata.xml
@@ -11,7 +11,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">marcelotduarte/cx_Freeze</remote-id>
-		<remote-id type="pypi">cx_Freeze</remote-id>
+		<remote-id type="pypi">cx-Freeze</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/cycler/cycler-0.10.0-r1.ebuild b/dev-python/cycler/cycler-0.10.0-r1.ebuild
index 3664b84a8f31..7186d17fa1e6 100644
--- a/dev-python/cycler/cycler-0.10.0-r1.ebuild
+++ b/dev-python/cycler/cycler-0.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cython-python2/Manifest b/dev-python/cython-python2/Manifest
new file mode 100644
index 000000000000..a5e08409004e
--- /dev/null
+++ b/dev-python/cython-python2/Manifest
@@ -0,0 +1 @@
+DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
diff --git a/dev-python/cython/cython-0.29.15.ebuild b/dev-python/cython-python2/cython-python2-0.29.21-r2.ebuild
index b838ba42a280..a80cedc13829 100644
--- a/dev-python/cython/cython-0.29.15.ebuild
+++ b/dev-python/cython-python2/cython-python2-0.29.21-r2.ebuild
@@ -1,48 +1,45 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9,10}} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1 toolchain-funcs elisp-common
 
+MY_PN=cython
+MY_P=$MY_PN-$PV
+
 DESCRIPTION="A Python to C compiler"
 HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
 	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="emacs"
+RESTRICT="test"
 
 RDEPEND="
+	!dev-python/cython[python_targets_python2_7]
 	emacs? ( >=app-editors/emacs-23.1:* )
 "
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python3*')
-	)"
+BDEPEND="
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
+	${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
 )
 
-SITEFILE=50cython-gentoo.el
+S="${WORKDIR}/${MY_PN}-${PV}"
 
-distutils_enable_sphinx docs
+SITEFILE=50cython-gentoo.el
 
 python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
 	# Python gets confused when it is in sys.path before build.
 	local -x PYTHONPATH=
 
@@ -69,6 +66,8 @@ python_install_all() {
 		elisp-install ${PN} Tools/cython-mode.*
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
+	rm -r ${D}/usr/share
+	rm -r ${D}/usr/bin
 }
 
 pkg_postinst() {
diff --git a/dev-python/cython-python2/files/50cython-gentoo.el b/dev-python/cython-python2/files/50cython-gentoo.el
new file mode 100644
index 000000000000..e6dcc6a6d7fb
--- /dev/null
+++ b/dev-python/cython-python2/files/50cython-gentoo.el
@@ -0,0 +1,11 @@
+;;; site-lisp configuration for cython-mode
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload  'cython-mode "cython-mode" "Major mode for editing Cython files" t)
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.pyx\\'" . cython-mode))
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.pxd\\'" . cython-mode))
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.pxi\\'" . cython-mode))
diff --git a/dev-python/cython-python2/files/cython-0.29.14-sphinx-update.patch b/dev-python/cython-python2/files/cython-0.29.14-sphinx-update.patch
new file mode 100644
index 000000000000..3f426754f6f1
--- /dev/null
+++ b/dev-python/cython-python2/files/cython-0.29.14-sphinx-update.patch
@@ -0,0 +1,13 @@
+diff --git a/docs/conf.py b/docs/conf.py
+index 10662e28c..a84e0b928 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -41,7 +41,7 @@ highlight_language = 'cython'
+ extensions = [
+     'ipython_console_highlighting',
+     'cython_highlighting',
+-    'sphinx.ext.pngmath',
++    'sphinx.ext.imgmath',
+     'sphinx.ext.todo',
+     'sphinx.ext.intersphinx',
+     'sphinx.ext.autodoc'
diff --git a/dev-python/cython-python2/files/cython-0.29.21-spawn-multiprocessing.patch b/dev-python/cython-python2/files/cython-0.29.21-spawn-multiprocessing.patch
new file mode 100644
index 000000000000..0aa7212b9a34
--- /dev/null
+++ b/dev-python/cython-python2/files/cython-0.29.21-spawn-multiprocessing.patch
@@ -0,0 +1,29 @@
+Needed to prevent a loop while calling cythonize on macOS - or any platform
+defaulting to the 'spawn' method, as Python 3.8 does on Darwin.
+
+https://github.com/cython/cython/pull/3263
+From 15ae78bb74a856836dd64828326f4f0812d36520 Mon Sep 17 00:00:00 2001
+From: Marcel Bargull <marcel.bargull@udo.edu>
+Date: Fri, 6 Dec 2019 18:21:19 +0100
+Subject: [PATCH] Disable parallel cythonization for "spawn" start method.
+
+---
+ Cython/Build/Dependencies.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/Cython/Build/Dependencies.py b/Cython/Build/Dependencies.py
+index 593e00a6ef..f9b9c15bc5 100644
+--- a/Cython/Build/Dependencies.py
++++ b/Cython/Build/Dependencies.py
+@@ -1073,6 +1073,11 @@ def copy_to_build_dir(filepath, root=os.getcwd()):
+ 
+     if N <= 1:
+         nthreads = 0
++    if nthreads:
++        import multiprocessing
++        if multiprocessing.get_start_method() == 'spawn':
++            print('Disabling parallel cythonization for "spawn" process start method.')
++            nthreads = 0
+     if nthreads:
+         import multiprocessing
+         pool = multiprocessing.Pool(
diff --git a/dev-python/cython-python2/metadata.xml b/dev-python/cython-python2/metadata.xml
new file mode 100644
index 000000000000..a729c7c60421
--- /dev/null
+++ b/dev-python/cython-python2/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Cython is a language that makes writing C extensions for the Python
+		language as easy as Python itself. It's based on Pyrex, but supports
+		more cutting edge functionality and optimizations.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">Cython</remote-id>
+		<remote-id type="github">cython/cython</remote-id>
+	</upstream>
+	<origin>calculatelinux-overlay</origin>
+</pkgmetadata>
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 52ea40b8df0a..a5e08409004e 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,2 +1 @@
-DIST cython-0.29.15.gh.tar.gz 2075879 BLAKE2B e6322656c819c6b09e235c32d2b520e8fe917c864047d028dd67041e70251025f14accbd76499b7b9290d0424989adf89321f251526e66a892bdc243ba80ba7f SHA512 bd0872359d31a41750353bb0d7f03c2a40aa2bf6e492148e693321cef15b02ae4f8d5f5a00efde7216f09a6ac06f2bb3ded9d00e27ad0cfc53605f3a9ef55af8
 DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
diff --git a/dev-python/cython/cython-0.29.21-r1.ebuild b/dev-python/cython/cython-0.29.21-r1.ebuild
index 4282ab37958c..38985ee179ad 100644
--- a/dev-python/cython/cython-0.29.21-r1.ebuild
+++ b/dev-python/cython/cython-0.29.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/cython-0.29.21.ebuild b/dev-python/cython/cython-0.29.21.ebuild
index 84d3ba8ac1eb..a6a650356d36 100644
--- a/dev-python/cython/cython-0.29.21.ebuild
+++ b/dev-python/cython/cython-0.29.21.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9,10}} pypy{,3} )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs elisp-common
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cytoolz/Manifest b/dev-python/cytoolz/Manifest
deleted file mode 100644
index 412ca4fc07f8..000000000000
--- a/dev-python/cytoolz/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cytoolz-0.10.0.tar.gz 475069 BLAKE2B aabd1bee4ee5b17640cc1e4126920c4e21893286315e3e4a5e968fb52dab371ade7a00f3082a704dbaeeb00af5ccb3cb9743fd66a3d23ad5879503f66c4f0c49 SHA512 62e90837125fae5dc6b96ac13a7fc2193604cd1250173b8e24ba3e65571e9394369cad07e39e7e6e42da0e3dab04db98193ba55195267c49447cc7ec0ff7b840
diff --git a/dev-python/cytoolz/cytoolz-0.10.0.ebuild b/dev-python/cytoolz/cytoolz-0.10.0.ebuild
deleted file mode 100644
index 4c147244aa64..000000000000
--- a/dev-python/cytoolz/cytoolz-0.10.0.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_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Cython implementation of Toolz: High performance functional utilities"
-HOMEPAGE="https://pypi.org/project/cytoolz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Informed by author the dep in toolz is not only required but the
-# tests are version sensitive.
-# https://github.com/pytoolz/cytoolz/issues/57
-RDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/toolz-0.8[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib/ > /dev/null || die
-	PYTHONPATH=.:${PN} nosetests --with-doctest ${PN} || die "tests failed under ${EPYTHON}"
-	popd > /dev/null || die
-}
diff --git a/dev-python/cytoolz/metadata.xml b/dev-python/cytoolz/metadata.xml
deleted file mode 100644
index 845e5ca7d8d5..000000000000
--- a/dev-python/cytoolz/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">cytoolz</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index b9fedc023188..8fe900353a79 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1 +1,2 @@
 DIST dask-2.30.0.tar.gz 2858866 BLAKE2B ea5e1e50f9bef2ca81765ee1228ea661ea01355f4c2a495e916388cb757dc089c519eb83372abc2ece16c8ec27e3b7f7fe56a302eddfdc6c0e79247db9c1b65e SHA512 d410fcfc7e30f510bc42e9547bac912609420919489e161408d436fb26c3998eba6bfc9e4845d90b3e8589ecc317ee4bf141e2740108840f2e5a420eb20655ef
+DIST dask-2021.1.0.tar.gz 3634608 BLAKE2B 1fb74ade53ad919496c3a33452eab70492704e73c9a172d5e1451217d5a3931acad3dc48587945807bbf5096bf6674e54d3bb7d1aa3d903ee47c1c203595fa1d SHA512 a65423fa401859bb7ecd569a6a593d2fa7a7be33b4804a95b8c57e90e1be9bf2f7610a3b1b55bf760e0f618c30193cdd5a28aea3710fb69c0947b7f3793051aa
diff --git a/dev-python/dask/dask-2021.1.0.ebuild b/dev-python/dask/dask-2021.1.0.ebuild
new file mode 100644
index 000000000000..7c058d3aa742
--- /dev/null
+++ b/dev-python/dask/dask-2021.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv -m "not network" ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dataclasses/Manifest b/dev-python/dataclasses/Manifest
deleted file mode 100644
index 9610838fc5fe..000000000000
--- a/dev-python/dataclasses/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST dataclasses-0.7.tar.gz 35690 BLAKE2B 8d3c60d1e2ad4c9ceb3c502fa74f8fdae75717e52c698984b6def96e867cae633864de711856a69992df6a207617d17d7116f5e0daa7d757076dc8b97d7e0e9b SHA512 ff921237a99bac21e091ff253824eb07eb09be7e7ec02b869da9c68c35141fc1bee526b3d2942963bac7762827438ea8fdc89fa72404991b78d1d063a3c18661
-DIST dataclasses-0.8.tar.gz 36581 BLAKE2B fb4cad844f00157a8affc85a0c5d949d7d44fd67ca8083262247af46d93be189628c4ab7b37d34dea983059615603342d50d8b9d0ab75f5365463a337d312b6a SHA512 81b27dd10077084ca82b0a3cbbcee428a5c5cb2e6ade5de46a39731507c2d6f93f9038b704e6555c850044683516a0d130b95a14c91881d04b0bd2c496ca8d6a
diff --git a/dev-python/dataclasses/dataclasses-0.7.ebuild b/dev-python/dataclasses/dataclasses-0.7.ebuild
deleted file mode 100644
index eed995347b80..000000000000
--- a/dev-python/dataclasses/dataclasses-0.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# this is a backport. do not add extra impls
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A backport of the dataclasses module for Python 3.6"
-HOMEPAGE="
-	https://pypi.org/project/dataclasses/
-	https://github.com/ericvsmith/dataclasses"
-SRC_URI="
-	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-distutils_enable_tests unittest
diff --git a/dev-python/dataclasses/dataclasses-0.8.ebuild b/dev-python/dataclasses/dataclasses-0.8.ebuild
deleted file mode 100644
index 08b9fdaf45f0..000000000000
--- a/dev-python/dataclasses/dataclasses-0.8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# this is a backport. do not add extra impls
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A backport of the dataclasses module for Python 3.6"
-HOMEPAGE="
-	https://pypi.org/project/dataclasses/
-	https://github.com/ericvsmith/dataclasses"
-SRC_URI="
-	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-distutils_enable_tests unittest
diff --git a/dev-python/dataclasses/metadata.xml b/dev-python/dataclasses/metadata.xml
deleted file mode 100644
index 941bc0a34a89..000000000000
--- a/dev-python/dataclasses/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">dataclasses</remote-id>
-		<remote-id type="github">ericvsmith/dataclasses</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/dbus-python2/dbus-python2-1.2.16.ebuild b/dev-python/dbus-python2/dbus-python2-1.2.16-r1.ebuild
index 9ad8a19066e9..7b31780c9c38 100644
--- a/dev-python/dbus-python2/dbus-python2-1.2.16.ebuild
+++ b/dev-python/dbus-python2/dbus-python2-1.2.16-r1.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit autotools python-r1
 MY_PN=dbus-python
 MY_P=$MY_PN-$PV
@@ -30,6 +31,7 @@ RDEPEND="${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 "
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 76345a823f4e..8d5867303185 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1 +1,4 @@
 DIST dbusmock-0.19.tar.gz 72567 BLAKE2B 973cfa02d1aec29f2151ce077471c49f7def3cee079eb975bbc1abca39cc6d391f5dc4aed40fcd9c9db3fcc25429e689f130dc495b94428b73c64f3c650a9c3a SHA512 9f49cb1818c0de8b774d4ccd0eed35de3b0a95de669e70539699237b5cdfee993da7747dc28375c8f1c26fac83d948b7ce25107d866e28b833b556c6f654706c
+DIST dbusmock-0.20.0.tar.gz 72228 BLAKE2B 704287414bf562bcda9c25c6febd6c4a7b0123c1c38dcbe00f5448dc94784eb6002825975f03b8633e253dd63b18126026c9630aa98fcd891d7e40eba207f123 SHA512 26660439801dbd4c2cdc146d67fa465ecfdfbe4dba4fbd163e0f00af415247d0ff502122d0a850b5bd6dde9f296dea601dcb180ba4bdd5d58966ee4ccdef8999
+DIST python-dbusmock-0.21.0.tar.gz 68184 BLAKE2B 3a9ecac8677d0c48f458ae6b39d3fd38aca0bc85ea666f0806f6fb463161cd983ef83af6b0c9f68ace64d4f3a28920f71265d75aa5a6bf8dc61a506ab6f8b67d SHA512 46acfdb7598a99f2daf8ab00677e558bc499c092b44f3231f1371b4aa99393d2bdcfdc8d2181236362932c89c0d94a283e6e985c61cf284652f55ec192f8de1f
+DIST python-dbusmock-0.22.0.tar.gz 68626 BLAKE2B 51b897ad95bc547afe6cd59abed243dcaecd3c6ce8c47825f3a2eeaf7364c5aba04d23247c876f748b071f30753a86da954493bc63f0ae503085974e7e769658 SHA512 2c3430f4178a16acc376ce582f4a1a9bbe8b917efcd7eee58dab85ee3addf60ba355ae9e7b318ec2cdf7ca771183c37d16520a1e5bcab8414c66e2d2a36d26fe
diff --git a/dev-python/dbusmock/dbusmock-0.20.0.ebuild b/dev-python/dbusmock/dbusmock-0.20.0.ebuild
new file mode 100644
index 000000000000..587f1697dc3e
--- /dev/null
+++ b/dev-python/dbusmock/dbusmock-0.20.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# broken by bluez5?
+	rm tests/test_bluez4.py || die
+	# needed for unittest discovery
+	> tests/__init__.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/dbusmock/dbusmock-0.21.0.ebuild b/dev-python/dbusmock/dbusmock-0.21.0.ebuild
new file mode 100644
index 000000000000..2d61b6bd501c
--- /dev/null
+++ b/dev-python/dbusmock/dbusmock-0.21.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# needed for unittest discovery
+	> tests/__init__.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/dbusmock/dbusmock-0.22.0.ebuild b/dev-python/dbusmock/dbusmock-0.22.0.ebuild
new file mode 100644
index 000000000000..2d61b6bd501c
--- /dev/null
+++ b/dev-python/dbusmock/dbusmock-0.22.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# needed for unittest discovery
+	> tests/__init__.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index b40722009cdb..63004c6aac5f 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1 +1,2 @@
 DIST defcon-0.6.0.tar.gz 403682 BLAKE2B c85cf4f846cab3f7543dcec885221e9f828cdf56fb1a373c9d06b27a29c1ab22fc9702d2ce561af97e3d4aa3b03712538ce0b29a0042fa4a0fea6f11eacba69b SHA512 b981c87d2355dc83b5da0ea4879707336ade8ea4d6ca2bc13da064367938579f2a60dfa5b1c0fd3629f4a2de97676e4f02f30f99a6116049cc2a10abd13a3d7b
+DIST defcon-0.7.2.tar.gz 424146 BLAKE2B 6a3cc6c4bd8ccf030cda5fdaa3d7d2ba8aabc74daf71ce9a006de015d459ff0e5d876d584e7873fba7349a2941490db8d0ebd9a9c880e80db534b231639d3147 SHA512 9cf402b6626b75222e351d11afcde3e0c8be88b3ceb6ed4ff68cc3762b636905b61f31ece288f4d7e5273b6cd2b044661188a39fde1941e1bb5b483b23f3b42e
diff --git a/dev-python/defcon/defcon-0.7.2.ebuild b/dev-python/defcon/defcon-0.7.2.ebuild
new file mode 100644
index 000000000000..554bba3ce09c
--- /dev/null
+++ b/dev-python/defcon/defcon-0.7.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A set of UFO based objects for use in font editing applications"
+HOMEPAGE="https://github.com/robotools/defcon"
+SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/fonttools-3.31.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/fs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild b/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
index 9be731ab740c..a507e3c2b86d 100644
--- a/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${P/_/.}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 9773bdf6d15a..f08e4cca8e5b 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,2 +1,4 @@
+DIST denonavr-0.9.10.tar.gz 102045 BLAKE2B 2b0cde47d5ea50b218b04b696756d003494ff92f99ba88509312e1a2a8ce19f0bdc0c51671a7097fa1e7d7f63194d6435ddcfb31d902bf855368d69643c4c64a SHA512 8e0bb6a25eb38e798759dbee301371691c1b34e934054897d65d8829b7f7593044522fe4667c005abcf428ed1234016fb8bbf083e05c51502f722e4d8df3b155
 DIST denonavr-0.9.7.tar.gz 101839 BLAKE2B d44600e6963c2e17ffc12f203926b522d2bf2d9a853e4f061583158fb087b8fb5dbc43be835aa639ffe11391aa494a8b061b2c177bccfc2568781b304547e311 SHA512 2b8a8224ec46b90d2256d7d516801c6ae18b4434a0ee901b0a9aa80cc0481216fa33566bf33d41928f0112361b165bbe40e5f44b65cd17f09beb7cb3f4d9d803
 DIST denonavr-0.9.8.tar.gz 101850 BLAKE2B b02a18d1f61547e7e63fbd51a72de57803ec6e78232be0027fb6b77176fa872227afcb5a414b0cb92ca4373116a5c6ec4975fea73ae272742ec399e4c0e3ad81 SHA512 30ca12ffffcf66b45c17434c96e496fe61af5cd42aa85dcb25502f6a21593ec4d884937d52726a430b405d9807ad024456e48e144a759ea1351fccc906a95af3
+DIST denonavr-0.9.9.tar.gz 101902 BLAKE2B de30ad9520781eaa66a651f8a77ed88c76daa191f0de716f2cc00e21a8c8ae8883c5aa0c32167754062517763f903949626e04342a2342894a632cb9b94d2e20 SHA512 45d3b4fc6f8487caed0911ff7dd90dd28482de688429b8d0fae68db9a5d78959005ab2aab1b34eab34e964f4e82bccb6d57aadea367f81fc4a7927e54d771728
diff --git a/dev-python/denonavr/denonavr-0.9.10.ebuild b/dev-python/denonavr/denonavr-0.9.10.ebuild
new file mode 100644
index 000000000000..ad8d3b90498f
--- /dev/null
+++ b/dev-python/denonavr/denonavr-0.9.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automation Library for Denon AVR receivers"
+HOMEPAGE="https://github.com/scarface-4711/denonavr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/denonavr/denonavr-0.9.9.ebuild b/dev-python/denonavr/denonavr-0.9.9.ebuild
new file mode 100644
index 000000000000..f7231b3b430b
--- /dev/null
+++ b/dev-python/denonavr/denonavr-0.9.9.ebuild
@@ -0,0 +1,30 @@
+# 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,10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automation Library for Denon AVR receivers"
+HOMEPAGE="https://github.com/scarface-4711/denonavr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index 559a01991a54..7c981b680703 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1 +1,2 @@
 DIST deprecated-1.2.10.gh.tar.gz 2967353 BLAKE2B 941fa81dd27940be4fde1219a9fe127777354aa2054b15178cade4a859b01f8dff426e0da8161bac580ff6446b44767f3207b474bb5f555826239db039085497 SHA512 4bd53b759d04ab15c74a4c147b2c69c73aed6e40555acf0e84cf0c5b7ffe248da234bd1311c5629f9357d50bc08e55e81363340dcfdabe88933525bcc7859a70
+DIST deprecated-1.2.11.gh.tar.gz 2968469 BLAKE2B 5b1b8872e8786897a51ff96a659ceef0deed81b3cf02edc1f69b6ee504a3c4510621b56678dd28fa795231dfe8481daf3a77bb151ee117fe0541af1983412548 SHA512 343f62a7a658569de885ac923a1de7f7b4cc5bf63d27d1b13474795ca38cc52932e35133b45d05c1b42d498af56f5945fad5c49b3cbdebda70337294da5d84c4
diff --git a/dev-python/deprecated/deprecated-1.2.11.ebuild b/dev-python/deprecated/deprecated-1.2.11.ebuild
new file mode 100644
index 000000000000..e1edd7466234
--- /dev/null
+++ b/dev-python/deprecated/deprecated-1.2.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Python @deprecated decorator to deprecate old API"
+HOMEPAGE="https://github.com/tantale/deprecated"
+SRC_URI="
+	https://github.com/tantale/deprecated/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=()
+
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_deprecated.py::test_respect_global_filter
+		tests/test_deprecated_class.py::test_class_respect_global_filter
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/deprecation/deprecation-2.1.0.ebuild b/dev-python/deprecation/deprecation-2.1.0.ebuild
index 5ada09684bee..d18a422ec2ab 100644
--- a/dev-python/deprecation/deprecation-2.1.0.ebuild
+++ b/dev-python/deprecation/deprecation-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/diff-cover/Manifest b/dev-python/diff-cover/Manifest
deleted file mode 100644
index 188a60e4e3fa..000000000000
--- a/dev-python/diff-cover/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST diff-cover-2.3.0.tar.gz 76738 BLAKE2B 467d8ed3cb2f4b0f76ad6b1928a87ad6f75ce46e555c061e30b56fc4856089fb270670ad9f704b9dc407e5c6cab2cf881696bd263befafbe3863bcda4ccd4ac2 SHA512 c47d64e1695596ba1244d687cdbbd6edf391b0c4a18b2550004bcfc36ce8798ef9e6a059e726e52eff45251b3bb27cca873be493c37b3b7eab9dec02f99953f6
diff --git a/dev-python/diff-cover/diff-cover-2.3.0.ebuild b/dev-python/diff-cover/diff-cover-2.3.0.ebuild
deleted file mode 100644
index af524fb0b393..000000000000
--- a/dev-python/diff-cover/diff-cover-2.3.0.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
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically find diff lines that need test coverage"
-HOMEPAGE="https://github.com/Bachmann1234/diff-cover"
-SRC_URI="https://github.com/Bachmann1234/diff-cover/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/jinja-2.7.1[${PYTHON_USEDEP}]
-	dev-python/jinja2_pluralize[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-	)"
-
-MY_PN=${PN/-/_}
-S=${WORKDIR}/${MY_PN}-${PV}
-
-python_prepare_all() {
-	# TypeError: test_parse_range_notation() takes exactly 2 arguments (1 given)
-	sed -e 's|test_parse_range_notation|_\0|' \
-		-i "${MY_PN}/tests/test_diff_cover_main.py" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/diff-cover/metadata.xml b/dev-python/diff-cover/metadata.xml
deleted file mode 100644
index dcb36dcab3f3..000000000000
--- a/dev-python/diff-cover/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">diff_cover</remote-id>
-		<remote-id type="github">Bachmann1234/diff-cover</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild b/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
index 09f6e1fab883..32161590eb4d 100644
--- a/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
+++ b/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/django-rq/Manifest b/dev-python/django-rq/Manifest
index 92060c487fe5..e4fa75e6a66b 100644
--- a/dev-python/django-rq/Manifest
+++ b/dev-python/django-rq/Manifest
@@ -1 +1,2 @@
 DIST django-rq-2.3.2.tar.gz 41038 BLAKE2B 837a8f819e9a91763b2d4ec961257d429e6d686fbaaa181d7fbe41efd9e08d958c5c340e4e1a4c8f0ef4063e985d3df82d8ea2c6a7cdea872b330dd545660e31 SHA512 8cf59aae163034240bfecda5f332dcc590813445cb2fc14bee15459ec8d4c50a36ab56865b3ce9360968451695e7a6d5eca5da26ef63c29dbc9dd58af8f16b98
+DIST django-rq-2.4.0.tar.gz 42455 BLAKE2B b60268625e8d57f1975c47df1dff72599fcab9eba0b43020196329cfc3c5447ce1bf9082338143f3f1d31434a8407d7a0e00b4dca64f2797ec54983930200798 SHA512 b1eec3f7e906bb4e553501940b9913727c8b21509fa10dd98ab5ad9f5625aaadd3f9c749824ad130005ac2a2ad8d27e8c8834466334f9bc09c438fcbd1cff344
diff --git a/dev-python/django-rq/django-rq-2.4.0.ebuild b/dev-python/django-rq/django-rq-2.4.0.ebuild
new file mode 100644
index 000000000000..b2ad416e3d7a
--- /dev/null
+++ b/dev-python/django-rq/django-rq-2.4.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="An app that provides django integration for RQ (Redis Queue)"
+HOMEPAGE="https://github.com/rq/django-rq"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/django-2.0[${PYTHON_USEDEP}]
+	>=dev-python/rq-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django-rq/metadata.xml b/dev-python/django-rq/metadata.xml
index 2415b6fc5fc3..d81661a03ebf 100644
--- a/dev-python/django-rq/metadata.xml
+++ b/dev-python/django-rq/metadata.xml
@@ -5,7 +5,9 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="github">rq/django-rq</remote-id>
 		<remote-id type="pypi">django-rq</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index d96f1b18353c..4475355a7561 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,12 +1,8 @@
-DIST Django-2.2.16.tar.gz 8884774 BLAKE2B e65074c44e35921f6c40ca9e2a5fee53ce9a956a7503b96a33c8dbb4588bb0928d2e2b605f1117c3c75cdc84d6c7d1bfe52f4e7888fbe300adb5411a55b0ac27 SHA512 eabcdfc17e27c579001e4739268abd13bebbb018db1a7dbe4fb8482d32320b85bd16b3b18428084c0df947094f23f7cb4b12a3a55bc370748d7d8746af22bc3b
 DIST Django-2.2.17.checksum.txt 2438 BLAKE2B 5d9454884110f1debec7fa1644b13be43b9b6b8d3f333a05df823332c94a6f4a220791bf0cc7d139baf5aac856443a4b211dd8e98d23d4cc62d1d6ce7ebd69c8 SHA512 0dc71edfe3264d3353238124dc5374aac07fb73ede167a52f16bf3b147bf351651f4197a1fe5027dca23ad144755fff6447f06d8cdf11126184cf5e291c90402
 DIST Django-2.2.17.tar.gz 8885492 BLAKE2B 30046adc54c31e0e8dac3c573da58e8536246ba6fc5675ec5ad5efc4b170331b893ffe766e7eb404b445d5b37e018e1ac9e2b8e659a5f10c4c165ec9ef5c00d1 SHA512 4ba1e12332cafaa49a087494f9e85e992a414ad153ef935fcf50f1a533ac9c7049a421140552f77b3dbf41c51a4f42aca13dc5f8f479049c21037c541a34320b
-DIST Django-3.0.10.tar.gz 8958332 BLAKE2B 0ff17da9d9175b080d81e334e46ec6daaec5e4cd48f5d9a614c84b448a6d4b93d304b3fd25bcee665d65f589a8f94cf83f002bbd7a27975d23e3516286784e01 SHA512 fcce2815f966a5eb0f7986c16d065b352c73ea2ea4fc1422d440487d84162c5a93aa45b9173ba5d62d6caee2e976a9ac818f228b47ed7f4f50deda27bac995e9
 DIST Django-3.0.11.checksum.txt 2438 BLAKE2B df936992a02e5a34b26e91654962507d973f8831c1eebada4cbdb578f83fba974532867b9f20828afc2467c2521e117b8dd543cde6f664d3c122a95207c50608 SHA512 a7b98d102775cc7854b0c242507d4ff8778984dc8b2e269352103249d6d1c5cea7e6eb8dbe08700b19ad4428e30c469e0e959a622ea4ce3198a75f72b2bb8871
 DIST Django-3.0.11.tar.gz 8958879 BLAKE2B 078ffde9ae186ae8add2136c303ba38a1b38525481b2272384b8a1bb3428dcf6a31991a86b2078aea6cf250808af399acac5461a33c8e1fda5d6bc552eac478f SHA512 d24e8167f3f871f24ea5e288557a49d71f9b5c398c84e8434d5d3dc224ef62775121a016ad89e997fabe88893adc3a83176211d5b9a9730ec23d37d256aa4fb0
-DIST Django-3.1.1.tar.gz 9250616 BLAKE2B 220c53873a70bb30f0ea9b48a70ba71b2de517c11f238e6dc2be20b0e85c99dfdb2ea3b9cfe7b164c7141e0857f19d9d8f93390d7ef36bf34e915ccdb449e8f6 SHA512 5da4282c2ae712ecb2da654a99d46cd60c99aced90f75e681d5a0765b8c08669f27b6c38287bfe7bac028f12ae0643e2be06742752bdc83c62daf82fee60281f
-DIST Django-3.1.2.tar.gz 9387482 BLAKE2B 77e330b4b42f85ef416e90a2690c6315f2a8d30b5705f64b86f62daabe3ff60b24d9fcf8a1276e7425e5cf0e03833a5ca601d15dc3e1aa32f7b5d7a9792302da SHA512 39115e942c26c9af27c4079f590e15caa86cc5c0e012873d7be23809e39de178b2dd935919dee21bbee153bccb17463abcece1db3b1f7dfa95b7b55879488876
-DIST Django-3.1.3.checksum.txt 2429 BLAKE2B 7184da75a1da2c615c78a892c8331ff4abfec86e1ae93f8a74c836988d97ecafbbadaecffd352904c01b40a840a80f4d24e8b48f2570054a2349ef6c58bb43e3 SHA512 ecb1de139b05e697253e0b09fd15b692050be647cceb30d8f1482613d0c3393a3017460aabd7ff71ad1de2a8c70cc9276525d7a2a9285540a052805c969f55d8
-DIST Django-3.1.3.tar.gz 9253273 BLAKE2B 9284b637ea39e028ebabe44de50dacfe6a89621fcc5eea73b7f470fc998faeb361da428be8f3f3e349f25b8629b5a350f3a5b7c35ea50183b285daf63d8944a7 SHA512 0f49316dc61a299a257313c27051852e948337491047bacb2221c9c753a5cf4bafb2ed686311ad5345dd3045260331afccb013c21503891538340225a469d1ad
 DIST Django-3.1.4.checksum.txt 2466 BLAKE2B 635ddd40b542890aef29f53df0fad172e48450081f57c72042a71bb5de654b1d1f5f7ce0c588b1070a203e1d4afe3a1ed19431dd23a2a67cd510d4072c79a00f SHA512 729b771008489bbf0563002e438ef88abb2a14b2c29f307cb2db9c75450f30ac8bd4920bf0493dbec06b3640fc0d4b6817e8a054af1028ad065bd321c761a6c3
 DIST Django-3.1.4.tar.gz 9392125 BLAKE2B b583442de50c358e70a49b9ef557d43211e6faee17933a44012dbb9f0dac3ccbf0a91e01a2b8b798fff7ae05100199e9e9c94a81748b41ea13e49d12bb510617 SHA512 02cfaabb25e5f932dcbf659faba2f0afe298e4bee4f510f7adebfff181bdd13c3a0b08e8ce379bcc59326d904be8699db4ce31065d93566b93cad758365207f5
+DIST Django-3.1.5.checksum.txt 2428 BLAKE2B 69347177b3c8c592a0b9df832c8f0abebdd4f1ff420f95f63310eb41d3614b241dc8f01b71abfec12faa006a8e69310d31cd68425f57ecf7a02948e83c65e0b3 SHA512 93d3e0de057518b60d9da2c1193ec59a8601f53b5d81a09fa4f6866336fbff85b81c01711eb07544fce30fe17e6dec89e5a5d6a66a929d451bca77cfe172bf19
+DIST Django-3.1.5.tar.gz 9257571 BLAKE2B 0ec618753d922e64b2f0e75506843383568c0013a8f7528cf10e9ee49ffc7be8a3effda39c27497510728a16d276db5c620bab22b5a001a86cafdb4d4e2560ea SHA512 b8f0e034fcd282d6e4a9e42565da5d5f4750c900264bed10e72b8c1866370f75fd1bc856d22950e1d3ad03229c38559989a26ccc9f1252ea31d407410134a548
diff --git a/dev-python/django/django-2.2.16.ebuild b/dev-python/django/django-2.2.16.ebuild
deleted file mode 100644
index 1dd2f2000f80..000000000000
--- a/dev-python/django/django-2.2.16.ebuild
+++ /dev/null
@@ -1,80 +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,9,10} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-	"${FILESDIR}"/django-gettext-0.21.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	elog
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-2.2.17.ebuild b/dev-python/django/django-2.2.17.ebuild
index cf5252089091..cf583cec0890 100644
--- a/dev-python/django/django-2.2.17.ebuild
+++ b/dev-python/django/django-2.2.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-3.0.10-r1.ebuild b/dev-python/django/django-3.0.10-r1.ebuild
deleted file mode 100644
index 4e9552ee2f33..000000000000
--- a/dev-python/django/django-3.0.10-r1.ebuild
+++ /dev/null
@@ -1,88 +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,9,10} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/asgiref[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
-	"${FILESDIR}"/django-gettext-0.21.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-src_prepare() {
-	# do not bind to a specific version
-	# https://bugs.gentoo.org/750695
-	sed -i -e 's:asgiref ~= 3.2:asgiref:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	elog
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-3.0.11.ebuild b/dev-python/django/django-3.0.11.ebuild
index c4cf7f34fe8a..1090ba752520 100644
--- a/dev-python/django/django-3.0.11.ebuild
+++ b/dev-python/django/django-3.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-3.1.1-r1.ebuild b/dev-python/django/django-3.1.1-r1.ebuild
deleted file mode 100644
index a3a4a3339d81..000000000000
--- a/dev-python/django/django-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,88 +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,9,10} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/asgiref[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-	"${FILESDIR}"/django-gettext-0.21.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-src_prepare() {
-	# do not bind to a specific version
-	# https://bugs.gentoo.org/750695
-	sed -i -e 's:asgiref ~= 3.2.10:asgiref:' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	elog
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-3.1.2-r1.ebuild b/dev-python/django/django-3.1.2-r1.ebuild
deleted file mode 100644
index e3d49662e44f..000000000000
--- a/dev-python/django/django-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,88 +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,9,10} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/asgiref[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-	"${FILESDIR}"/django-gettext-0.21.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-src_prepare() {
-	# do not bind to a specific version
-	# https://bugs.gentoo.org/750695
-	sed -i -e 's:asgiref ~= 3.2.10:asgiref:' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	elog
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-3.1.4.ebuild b/dev-python/django/django-3.1.4.ebuild
index c9deb38c3f2d..bfa89b599876 100644
--- a/dev-python/django/django-3.1.4.ebuild
+++ b/dev-python/django/django-3.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-3.1.3.ebuild b/dev-python/django/django-3.1.5.ebuild
index ae2a21e35c60..c8dadeed9936 100644
--- a/dev-python/django/django-3.1.3.ebuild
+++ b/dev-python/django/django-3.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,12 +45,11 @@ BDEPEND="
 		dev-python/tblib[${PYTHON_USEDEP}]
 		sys-devel/gettext
 	)
-	verify-sig? ( app-crypt/openpgp-keys-django )
+	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
 "
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-	"${FILESDIR}"/django-gettext-0.21.patch
 )
 
 distutils_enable_sphinx docs --no-autodoc
@@ -68,13 +67,6 @@ src_unpack() {
 	default
 }
 
-src_prepare() {
-	# do not bind to a specific version
-	# https://bugs.gentoo.org/750695
-	sed -i -e 's:asgiref ~= 3.2.10:asgiref:' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
 python_test() {
 	# Tests have non-standard assumptions about PYTHONPATH,
 	# and don't work with ${BUILD_DIR}/lib.
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 30c14b535b94..1018bfd4179d 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,2 +1,3 @@
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
 DIST dnspython-2.0.0.tar.gz 221903 BLAKE2B 540fb5fb12791dad6bae4007a77201092c8d5e64b7d82b23d5e3d16f48b49f73c90b85a6c8a83fa056a35cf7975ea2ad4a030f2b1fb1b87948bf1703adabb9d6 SHA512 3b38850fcacb0dd25ac0345201474f297c402617e8d706f3061c42172d697103075098e62ca0ac4e0e29967e00407f32f41789ac7bf070fba5aec0af9882e0fb
+DIST dnspython-2.1.0.tar.gz 279625 BLAKE2B ac90f1c9b50a00924326437e08513df04f3cf6dddee8b5ce58e628beab625d00c2dcdcc89e4b4da2c0366e650a5d8e87eb010942303215d3095e35f2010d4928 SHA512 eb3ab812eb8769b4780055b801e4f89beb1cb3d3e5a4855e583dca83b794eb7fca8fc3ef401eea7c16c34452e801dec5a2c59304f4041a68c7214dea6076435a
diff --git a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild b/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
index ae9638c2f160..60812210523f 100644
--- a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
diff --git a/dev-python/dnspython/dnspython-2.0.0.ebuild b/dev-python/dnspython/dnspython-2.0.0.ebuild
index 937f5e7b4697..da779ee88329 100644
--- a/dev-python/dnspython/dnspython-2.0.0.ebuild
+++ b/dev-python/dnspython/dnspython-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/dnspython/dnspython-2.1.0.ebuild b/dev-python/dnspython/dnspython-2.1.0.ebuild
new file mode 100644
index 000000000000..6fd283c0966b
--- /dev/null
+++ b/dev-python/dnspython/dnspython-2.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="DNS toolkit for Python"
+HOMEPAGE="https://www.dnspython.org/
+	https://pypi.org/project/dnspython/"
+SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/network_avail/s:True:False:' \
+		tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 877b4c76fa86..c77f1f1c0695 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,2 +1 @@
-DIST docker-py-4.3.1.tar.gz 236548 BLAKE2B 2934410e9360ac0a0ea4a038fe75728252804c3ffc2dfb614d217a1771d6c61b50c93b1848df5c34f3bf6b6ad2fb98fc5295165c6a482895b6e7c8ef29bc658a SHA512 f82d8681edc866e73dcc0557a2be7ccfcb68e6add3cfd034d62f9639646c5d396e8e2b29df2b42006ee92adc8b432ca6a80bf2a10b54af42f33fe5ea8ed4a912
 DIST docker-py-4.4.0.tar.gz 246544 BLAKE2B d19b923499bb32f85728f88e479db330f442ddc32da06cad6f56cfff3386a020e45a0ede1afff635ce3d0e2d5e9112b0a4022969f75647eb6e57c13ef1bd6cb0 SHA512 8882a6547570d64c4cf9db7e1bd5ad13dca9a5b439631f3436587aecc1ed3386b230f9b6f82c07d9614f7d29d918ec6a3733fa6af6d8784a698e1b8459d4dcbc
diff --git a/dev-python/docker-py/docker-py-4.3.1.ebuild b/dev-python/docker-py/docker-py-4.3.1.ebuild
deleted file mode 100644
index b07868c5e90a..000000000000
--- a/dev-python/docker-py/docker-py-4.3.1.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_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-RDEPEND="
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	'dev-python/recommonmark' \
-	'>=dev-python/sphinx-1.4.6'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# localhost has a better chance of being in /etc/hosts
-	sed -e 's:socket[.]gethostname():"localhost":' \
-		-i tests/unit/api_test.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-4.4.0.ebuild b/dev-python/docker-py/docker-py-4.4.0.ebuild
index 28bf444430e3..b07868c5e90a 100644
--- a/dev-python/docker-py/docker-py-4.4.0.ebuild
+++ b/dev-python/docker-py/docker-py-4.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 RDEPEND="
 	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
diff --git a/dev-python/docker-pycreds/Manifest b/dev-python/docker-pycreds/Manifest
deleted file mode 100644
index 6f56b7fb67df..000000000000
--- a/dev-python/docker-pycreds/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST docker-pycreds-0.4.0.tar.gz 8754 BLAKE2B 22aba2a2a7c92c4e0fa7fec5df1a17fabd9320440922f542a4e8dabf90ec71b9b8ff744a7ef1d46e7d720862624c721f5d2e4057edb48a85e329665c477b6406 SHA512 ca5f68ef2405cc57c0b54224d4f8199c9a4c9217d78f627bffeb950998b09a69b608d1e365cac6859661346fd078c3d081828bb4ff2e18bf7a9384451ae2225a
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild
deleted file mode 100644
index 33db5f08f15d..000000000000
--- a/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild
+++ /dev/null
@@ -1,19 +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,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the docker credentials store API"
-HOMEPAGE="https://github.com/shin-/dockerpy-creds/"
-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=">=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
index ad5f7e1ffbe0..9e58bcb60e57 100644
--- a/dev-python/docutils-glep/docutils-glep-1.2.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/docutils/docutils-0.16-r1.ebuild b/dev-python/docutils/docutils-0.16-r1.ebuild
index ae41906ef53c..eb460a33d4c8 100644
--- a/dev-python/docutils/docutils-0.16-r1.ebuild
+++ b/dev-python/docutils/docutils-0.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 17f68369bf68..247a12232cbf 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,3 +1 @@
-DIST dogpile.cache-1.0.2.tar.gz 351221 BLAKE2B 7cca7e0c260ca68fb26c0db5b736de1e3586f22a14558b8b294dfd12452cd55d70eb75b7a01041001d1d8f5300d4b7d5b5c9ff9e52dc066514d908ae188a6f97 SHA512 b49e9005916636aff0a25b9158923ea9362b3edf1f42704d06e65b14892d0cdb6b1da7d620f10d752efb1ae1987a9187b0f642cc30d07de3fc961921e1794a87
-DIST dogpile.cache-1.1.0.tar.gz 365988 BLAKE2B c21b52d23566a9d1b607374a77e2b7cc0ff0705d02cd3fddee1f6110555cf082fc9e516ba37e8ddaf7c70253dd28301cc89c3d3ef5405728859263e2a763608c SHA512 48627e4124bd25678059985c49ffde75d49d987c429d1e9a02ddd60a77b20e41899da30ae78e0f2891ff76a9c3d72a6ec782e829d659c3048cdbc921022ebb55
 DIST dogpile.cache-1.1.1.tar.gz 366464 BLAKE2B 95887bd73cce4cc8b017cee43182d94efeacdaa91ce94907e18c0e9a762065abb334866bd592f5e2010eb07fd33a049e330b4b925a4c9d8e14e22dee5f802446 SHA512 86d5620c746e48fc596137cdba85d91fb65def9f9dd13f85bbe5d9411db257edfcf119b8787673aa37efb965ce2895063906c1518c8b432af8b0ac16cec7941b
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild
deleted file mode 100644
index ba58cc680f46..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild
+++ /dev/null
@@ -1,35 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
-HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
-SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
-S="${WORKDIR}/dogpile.cache-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# https://github.com/sqlalchemy/dogpile.cache/pull/193
-	"${FILESDIR}/${P}-pytest6.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.0.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.0.ebuild
deleted file mode 100644
index 5cf4d451b486..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-1.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
-HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
-SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
-S="${WORKDIR}/dogpile.cache-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.1.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.1.ebuild
index 5cf4d451b486..ef3adada5533 100644
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.1.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch b/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch
deleted file mode 100644
index cc8154822544..000000000000
--- a/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 625f73ce189b43541636dc40d8d0e4cd4f9a1386
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Sat Oct 31 02:23:06 2020 +0100
-
-    Support pytest 6
-    
-    See https://docs.pytest.org/en/stable/deprecations.html#node-construction-changed-to-node-from-parent
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 10afafb..0b2a1e4 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -26,6 +26,6 @@ def is_unittest(obj):
- 
- def pytest_pycollect_makeitem(collector, name, obj):
-     if is_unittest(obj) and not obj.__name__.startswith("_"):
--        return UnitTestCase(name, parent=collector)
-+        return UnitTestCase.from_parent(collector, name=name)
-     else:
-         return []
diff --git a/dev-python/doit/files/doit-0.32.0_pytest5.4.patch b/dev-python/doit/files/doit-0.32.0_pytest5.4.patch
deleted file mode 100644
index 58dd154859cb..000000000000
--- a/dev-python/doit/files/doit-0.32.0_pytest5.4.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 159b7baebfefeacb443f55f2d12cbf0876628cbc Mon Sep 17 00:00:00 2001
-From: Eduardo Schettino <schettino72@gmail.com>
-Date: Wed, 22 Apr 2020 04:48:36 +0800
-Subject: [PATCH] fix tests for pytest 5.4
-
----
- dev_requirements.txt     |  2 +-
- tests/conftest.py        | 22 +++++++---------------
- tests/test_dependency.py |  4 ++--
- 3 files changed, 10 insertions(+), 18 deletions(-)
-
-diff --git a/dev_requirements.txt b/dev_requirements.txt
-index 1e31e4f..f16ba86 100644
---- a/dev_requirements.txt
-+++ b/dev_requirements.txt
-@@ -2,6 +2,6 @@
- # $ pip install --requirement dev_requirements.txt
- 
- pyflakes
--pytest>=4.0
-+pytest>=5.4.1
- coverage>=4.0
- doit-py>=0.4.0
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 5c4da9f..9eab396 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -78,12 +78,9 @@ def remove_db(filename):
-     'dbm.ndbm': ['.db'],
- }
- 
--def dep_manager_fixture(request, dep_class):
--    # copied from tempdir plugin
--    name = request._pyfuncitem.name
--    name = py.std.re.sub("[\W]", "_", name)
--    my_tmpdir = request.config._tmpdirhandler.mktemp(name, numbered=True)
--    dep_file = Dependency(dep_class, os.path.join(my_tmpdir.strpath, "testdb"))
-+def dep_manager_fixture(request, dep_class, tmp_path_factory):
-+    filename = str(tmp_path_factory.mktemp('x', True) / 'testdb')
-+    dep_file = Dependency(dep_class, filename)
-     dep_file.whichdb = whichdb(dep_file.name) if dep_class is DbmDB else 'XXX'
-     dep_file.name_ext = db_ext.get(dep_file.whichdb, [''])
- 
-@@ -97,18 +94,13 @@ def remove_depfile():
- 
- 
- @pytest.fixture
--def dep_manager(request):
--    return dep_manager_fixture(request, DbmDB)
-+def dep_manager(request, tmp_path_factory):
-+    return dep_manager_fixture(request, DbmDB, tmp_path_factory)
- 
- 
- @pytest.fixture
--def depfile_name(request):
--    # copied from tempdir plugin
--    name = request._pyfuncitem.name
--    name = py.std.re.sub("[\W]", "_", name)
--    my_tmpdir = request.config._tmpdirhandler.mktemp(name, numbered=True)
--    depfile_name = (os.path.join(my_tmpdir.strpath, "testdb"))
--
-+def depfile_name(request, tmp_path_factory):
-+    depfile_name = str(tmp_path_factory.mktemp('x', True) / 'testdb')
-     def remove_depfile():
-         remove_db(depfile_name)
-     request.addfinalizer(remove_depfile)
-diff --git a/tests/test_dependency.py b/tests/test_dependency.py
-index 3fc2a14..f84e002 100644
---- a/tests/test_dependency.py
-+++ b/tests/test_dependency.py
-@@ -68,8 +68,8 @@ def test_sqlite_import():
- # create a separate fixture to be used only by this module
- # because only here it is required to test with all backends
- @pytest.fixture(params=[JsonDB, DbmDB, SqliteDB])
--def pdep_manager(request):
--    return dep_manager_fixture(request, request.param)
-+def pdep_manager(request, tmp_path_factory):
-+    return dep_manager_fixture(request, request.param, tmp_path_factory)
- 
- 
- 
diff --git a/dev-python/doit/files/doit-0.32.0_unpickable.patch b/dev-python/doit/files/doit-0.32.0_unpickable.patch
deleted file mode 100644
index d96da6cd73c6..000000000000
--- a/dev-python/doit/files/doit-0.32.0_unpickable.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From df4dc1c6a92d9f50cfe7f56d9507eca5bc56870e Mon Sep 17 00:00:00 2001
-From: Stefano Rivera <stefano@rivera.za.net>
-Date: Sun, 2 Feb 2020 13:02:58 +0100
-Subject: [PATCH] Replace recursive knot with explicitly unpicklable object
-
-Python 3.8 was able to pickle the previously unpicklable. Instead of
-relying on limits, let's raise an explicit error.
-
-Fixes: #341
----
- tests/test_runner.py | 13 ++++---------
- 1 file changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/tests/test_runner.py b/tests/test_runner.py
-index 51c8a61..a9029e8 100644
---- a/tests/test_runner.py
-+++ b/tests/test_runner.py
-@@ -577,17 +577,12 @@ def non_top_function(): return 4
-         t2 = pickle.loads(t1p)
-         assert 4 == t2.actions[0].py_callable()
- 
--    @pytest.mark.xfail('PLAT_IMPL == "PyPy"')  # pypy can handle it :)
-     def test_not_picklable_raises_InvalidTask(self):
--        # create a large enough recursive obj so pickle fails
--        d1 = {}
--        last = d1
--        for x in range(400):
--            dn = {'p': last}
--            last = dn
--        d1['p'] = last
--
-         def non_top_function(): pass
-+        class Unpicklable:
-+            def __getstate__(self):
-+                raise pickle.PicklingError("DO NOT PICKLE")
-+        d1 = Unpicklable()
-         t1 = Task('t1', [non_top_function, (d1,)])
-         pytest.raises(InvalidTask, runner.JobTask, t1)
- 
diff --git a/dev-python/duecredit/Manifest b/dev-python/duecredit/Manifest
index 94832067ac07..178d06d501bb 100644
--- a/dev-python/duecredit/Manifest
+++ b/dev-python/duecredit/Manifest
@@ -1 +1,2 @@
 DIST duecredit-0.7.0.tar.gz 66131 BLAKE2B 3f32c1a4e62d4650d6914f4e124907170a50d63900fbb009b870b3f9c9eace27b76500e655cb74caea0ce22cfadd62f81a84a438c1cb82092502661f1d4e0c03 SHA512 a32ead3e0710323d5ab3283a3b2d1cb03e03bf925f78fdb3b5182079851127b8b674492bd402667e57ec113d1ec05f9c3490642f8d0fba6a8f3ddfd706a052c1
+DIST duecredit-0.8.0.tar.gz 68211 BLAKE2B 4c25bf2284d8be5f92c3f7589b6a787c97618476f60cf4a9dc7a063c2f85208b8d6da84630d63fdc7a3920cf6639940184b6e516eb76a692be72b91bd484001b SHA512 1924c626003f0a97652ff24c29822b872e66ae8cbaeaf93877319c76bd7c2b2a5a85ba659a9485460d56c41bc25ae0e14230e0a30bd028402cb7d814b4aeeea3
diff --git a/dev-python/duecredit/duecredit-0.8.0.ebuild b/dev-python/duecredit/duecredit-0.8.0.ebuild
new file mode 100644
index 000000000000..6da28b358a8e
--- /dev/null
+++ b/dev-python/duecredit/duecredit-0.8.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Publications (and donations) tracer"
+HOMEPAGE="https://github.com/duecredit/duecredit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/citeproc-py-0.4[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/citeproc-py[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dugong/Manifest b/dev-python/dugong/Manifest
deleted file mode 100644
index b49469c6cb8f..000000000000
--- a/dev-python/dugong/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dugong-3.7.3.tar.bz2 206720 BLAKE2B 41dd349336ae37dd290c88233a4a1eed283a774a072396a03b0b97fe3aaca95a4aa90b2951ebc3d59c517221b1b1b77f90d64538f5a17fcc84fa927650af1fdb SHA512 b20b720fa18789ff137524b67dd7339ec3ad532cff164c03c74d38accc72e035d33ebe97df028f75d7d904f3d0d460f99edf7cf45abf9c4849a5a3a05529a7a4
diff --git a/dev-python/dugong/dugong-3.7.3.ebuild b/dev-python/dugong/dugong-3.7.3.ebuild
deleted file mode 100644
index 35db4a28e22b..000000000000
--- a/dev-python/dugong/dugong-3.7.3.ebuild
+++ /dev/null
@@ -1,36 +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,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for communicating with HTTP 1.1 servers"
-HOMEPAGE="https://github.com/python-dugong/python-dugong/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		|| (
-			dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-			>=dev-python/pytest-3.3.0[${PYTHON_USEDEP}]
-		)
-	)"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index ba8c44fd8d7c..de1999352cd0 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1 +1,2 @@
+DIST dulwich-0.20.15.tar.gz 391841 BLAKE2B 8db19f84154dff0851fd16bc534d92b506c93a93d7180079bc9829a2c81bbb25b04b234770e62ddab82440973d0702b8523896a9db90d771d8cc915b6321cdaa SHA512 a4e746099a90ea2d7eb5f0309508a4f625d41732bdda78997fab07b38ea2ecbd2c2aed08c8ef05b1b73fe3e2ba9b8c8cbf02270f8edbc6235d66cdee0317365c
 DIST dulwich-0.20.6.tar.gz 388660 BLAKE2B 1a193d03e0f21a9fdd125617823742b87e9bea74c73734da10eb79f1ecbec0263cb90224f78413c724db8998f4d06ff6c448e7a6d50ce760ba1545f3321b95d8 SHA512 2f11ce9a1c716fb4242f1f93fce92f756bd93ed8f0951fc2e6b3fb18b0a495b0f372966149fca587efcafc0eaf00e9fbfcfd957442a96cc2004eb66cb7f0773e
diff --git a/dev-python/dulwich/dulwich-0.20.15.ebuild b/dev-python/dulwich/dulwich-0.20.15.ebuild
new file mode 100644
index 000000000000..b6200e85084b
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.20.15.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend  # tests use setuptools, setup uses if found
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="
+	https://github.com/dulwich/dulwich/
+	https://pypi.org/project/dulwich/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		!hppa? ( !ia64? (
+			dev-python/gevent[${PYTHON_USEDEP}]
+			dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		) )
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/python-fastimport[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# remove interference from the tests that do stuff like user.name
+	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
+		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
+	# Do not use make check which rebuilds the extension and uses -Werror,
+	# causing unexpected failures.
+	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
+		|| 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/dulwich/dulwich-0.20.6.ebuild b/dev-python/dulwich/dulwich-0.20.6.ebuild
index fe5237da64c0..485d49c55495 100644
--- a/dev-python/dulwich/dulwich-0.20.6.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dulwich/metadata.xml b/dev-python/dulwich/metadata.xml
index 5ed8a1413410..e512e1434069 100644
--- a/dev-python/dulwich/metadata.xml
+++ b/dev-python/dulwich/metadata.xml
@@ -5,10 +5,14 @@
     <email>grobian@gentoo.org</email>
     <name>Fabian Groffen</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">dulwich</remote-id>
-    <remote-id type="github">jelmer/dulwich</remote-id>
-    <bugs-to>https://github.com/jelmer/dulwich/issues</bugs-to>
+    <remote-id type="github">dulwich/dulwich</remote-id>
+    <bugs-to>https://github.com/dulwich/dulwich/issues</bugs-to>
   </upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.16-r1.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.16-r1.ebuild
new file mode 100644
index 000000000000..003448d333e3
--- /dev/null
+++ b/dev-python/ebuildtester/ebuildtester-0.1.16-r1.ebuild
@@ -0,0 +1,34 @@
+# 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,10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
+HOMEPAGE="https://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emulation/docker
+	sys-fs/fuse
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
+}
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index a336cefe2176..046eef54f9d1 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,2 +1 @@
-DIST ecdsa-0.16.0.tar.gz 125851 BLAKE2B d7fce3fdb0b6e37edb62482bdfc1df6b02f9fba677a6370dd3cb19f04be9cac62900d8347b318bf1d1e39b2af5672d0dde620dedf7b2ed6aefad3392df5279fa SHA512 94ccefe19899a5e56393bb0e6624e9af66bdc60ad370d65900a24a0465c430a3a001ed9c25970e48834cb25ca730bc9279af98d17ecd3ad66189c64c8f864b42
 DIST ecdsa-0.16.1.tar.gz 126935 BLAKE2B 84e04c0afe076c009a88f7ef1a0193329e3d4945e34c752b869cbf449667c424341fae7da2e7c908b773c6f4ab495d29dd40aa3a9be35b0c03d315ac330dc3e0 SHA512 935416ff25a71b1e6fe442b11e8d2c1463b1652d539274e094112a4847c2c749ff58eb9f5ed108ed5613b7363d3f2b1c07ba3d01af8cfed4e1b4bec407d3f5a6
diff --git a/dev-python/ecdsa/ecdsa-0.16.0-r1.ebuild b/dev-python/ecdsa/ecdsa-0.16.0-r1.ebuild
deleted file mode 100644
index f594bb746939..000000000000
--- a/dev-python/ecdsa/ecdsa-0.16.0-r1.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,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ECDSA cryptographic signature library in pure Python"
-HOMEPAGE="https://github.com/warner/python-ecdsa"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/gmpy[${PYTHON_USEDEP}]
-	' 'python*')
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pluggy[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ecdsa/ecdsa-0.16.1.ebuild b/dev-python/ecdsa/ecdsa-0.16.1.ebuild
index 37ff2c2e5fdc..337f654e1eff 100644
--- a/dev-python/ecdsa/ecdsa-0.16.1.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="ECDSA cryptographic signature library in pure Python"
-HOMEPAGE="https://github.com/warner/python-ecdsa"
+HOMEPAGE="https://github.com/tlsfuzzer/python-ecdsa/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/ecdsa/metadata.xml b/dev-python/ecdsa/metadata.xml
index cc7d1ab43db6..78d11dac04ab 100644
--- a/dev-python/ecdsa/metadata.xml
+++ b/dev-python/ecdsa/metadata.xml
@@ -8,7 +8,7 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">ecdsa</remote-id>
-    <remote-id type="github">warner/python-ecdsa</remote-id>
+    <remote-id type="github">tlsfuzzer/python-ecdsa</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/editorconfig-core-py/Manifest b/dev-python/editorconfig-core-py/Manifest
index 2b84215896ed..5034dc7bbd9f 100644
--- a/dev-python/editorconfig-core-py/Manifest
+++ b/dev-python/editorconfig-core-py/Manifest
@@ -1,2 +1,3 @@
 DIST editorconfig-core-py-0.12.0.tar.gz 24801 BLAKE2B 10901b1595965139dbc3aa3227f335c2128b2ea83204ed88b0e799021f7c215fd13c3e2246cb9197ecb7c918aca2d6e9269d94298aa0665432ab091630a29dd6 SHA512 29c5f58bd7293052e4b1fbfbadcf4a148eb939558494d599bafd46151a4fb5af9cd07dcef477db9a709a0ea63dec0dd7e9d4071779f8ca6e3bd137268cc22f72
+DIST editorconfig-core-py-0.12.3.tar.gz 19261 BLAKE2B 58cac122cfee19527bc45def7e923da50982de0e2cd443cf67dd824c050fb12352b85a5679815a701bc5b8d88a089a0a98280c364730086d01b80f119ad996a4 SHA512 005d0698c410c8865d177a1e891b5c51b15255f36303b116fddbbbc08e309d1d60ca3003d27e6fd8455e53c5956db0c29e298f22f4b10950e1f7c56c7c6e0ab3
 DIST editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz 7900 BLAKE2B 9ebdb5e522948bc9e86ea84435ccaa11585a8a12f4cd6fe54c64d78917281c913568351767d8077623b1196d84206d1c2d0126a0510f70df484c1b55d829028b SHA512 ae5424b4926d6cb127cb3da473400ced4f7ccf224f7baa8bc5bde0317cc045bb7b99738a56efe5fd0e5a0fbe39b997b9fb1739d24713e7f83b58e987c5e56a32
diff --git a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
new file mode 100644
index 000000000000..43bf0ab35a3d
--- /dev/null
+++ b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
@@ -0,0 +1,47 @@
+# 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,9,10} )
+inherit cmake distutils-r1
+
+TESTVER="abb579e00f2deeede91cb485e53512efab9c6474"
+DESCRIPTION="Clone of EditorConfig core written in Python"
+HOMEPAGE="https://editorconfig.org/"
+SRC_URI="https://github.com/${PN%-core-py}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://github.com/${PN%-core-py}/${PN%-core-py}-core-test/archive/${TESTVER}.tar.gz -> ${PN%-core-py}-core-test-${TESTVER}.tar.gz
+	)"
+
+LICENSE="PYTHON BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!<app-vim/editorconfig-vim-0.3.3-r1
+	cli? ( !app-text/editorconfig-core-c[cli] )"
+
+src_prepare() {
+	if use test; then
+		mv "${WORKDIR}"/${PN%-core-py}-core-test-${TESTVER}/* "${S}"/tests || die
+	fi
+	if ! use cli; then
+		sed -i -e '/editorconfig\.__main__/d' setup.py || die
+	fi
+
+	cmake_src_prepare
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+	cmake_src_test
+}
diff --git a/dev-python/editorconfig-core-py/metadata.xml b/dev-python/editorconfig-core-py/metadata.xml
index 120e70c8ecc1..31e1deb01b64 100644
--- a/dev-python/editorconfig-core-py/metadata.xml
+++ b/dev-python/editorconfig-core-py/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="cli">Install command line interface as well as python library</flag>
 	</use>
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1-r1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1-r2.ebuild
index e87a50d73fc8..d6e3264cfae2 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1-r1.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1-r2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	>=dev-python/certifi-2019.9.11[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.24.2[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.25[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.26[${PYTHON_USEDEP}]
 	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index cf0b25bf1bf4..dfa40c7f78df 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,2 +1,2 @@
-DIST elementpath-2.0.4.tar.gz 191601 BLAKE2B fc2f29a737c180fb04cc289b8cd9149b7a4f3c317a5efd746c42658aa6fbfe5cb78b957f517ba9a9e8650cc1ba0ee885a723695a8a107ec4cc05328828f5cf21 SHA512 b114ebe054eb6f46e261ae2a39c8126b86abafba26803eee676731d8d46d613daf5493215873ae96c9b098f6ebf9961a1ac777ddc0a1e2b1e4a3ca924d74c213
 DIST elementpath-2.0.5.tar.gz 194557 BLAKE2B 0c2571eff6fd850f42d2e3cd30598a5764d2f3a81f9cad756eda82e1212337e344314d60203d06b19200537aa8027e4c902de4df746b4e838fe42a1db39f25bb SHA512 c4fd4b360c88870ccb4102e7bca29cd979262b706b795b2a9314853543cd0a40c0ea4bebbac9cff9aaa0fcfefe107f574b41822be7e3c7328bb163c2bdc53283
+DIST elementpath-2.1.1.tar.gz 199609 BLAKE2B d28364e355c760b0e3b0f0695b1b4af1e05439546ab6413b29cecac934de1d4e6fa091c7e3d4d4f5da43e147b6d930fde4a3e2e9fcfeda1e646a91d27fd83dd5 SHA512 77414f37aecbe44d44cb51fdfcdad630d35fe00d6ff14dcc819851b5d844ba7f266026f6763aa70265c11cca922fb78f565d0fb33f41749594a9f256fa44ac1a
diff --git a/dev-python/elementpath/elementpath-2.0.5.ebuild b/dev-python/elementpath/elementpath-2.0.5.ebuild
index f0bdefa2c61d..3356f8987c5a 100644
--- a/dev-python/elementpath/elementpath-2.0.5.ebuild
+++ b/dev-python/elementpath/elementpath-2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/elementpath/elementpath-2.0.4.ebuild b/dev-python/elementpath/elementpath-2.1.1.ebuild
index baca09b9f042..88ad17d6cb56 100644
--- a/dev-python/elementpath/elementpath-2.0.4.ebuild
+++ b/dev-python/elementpath/elementpath-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/enum34/enum34-1.1.6-r1.ebuild b/dev-python/enum34/enum34-1.1.6-r2.ebuild
index c9d21763f50f..0a801a3f9bb1 100644
--- a/dev-python/enum34/enum34-1.1.6-r1.ebuild
+++ b/dev-python/enum34/enum34-1.1.6-r2.ebuild
@@ -5,6 +5,7 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 DESCRIPTION="Python 3.4 Enum backported"
@@ -16,7 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools-python2[${PYTHON_USEDEP}]"
 
 python_test() {
 	"${PYTHON}" enum/test.py || die "Tests failed under ${EPYTHON}"
diff --git a/dev-python/eventlet/eventlet-0.30.0.ebuild b/dev-python/eventlet/eventlet-0.30.0.ebuild
index 956b8ddabacc..5f4809b3bb60 100644
--- a/dev-python/eventlet/eventlet-0.30.0.ebuild
+++ b/dev-python/eventlet/eventlet-0.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/exdown/Manifest b/dev-python/exdown/Manifest
index 120fe115bbf0..b48b52eb6334 100644
--- a/dev-python/exdown/Manifest
+++ b/dev-python/exdown/Manifest
@@ -1 +1 @@
-DIST exdown-0.7.0.tar.gz 4592 BLAKE2B 00d53d19a44775a486b2f2133dfc7956e0dc724397e4c2729ab20123aea4841b4f450d28d89b5ee93a540b775099e70d1eb4a9917bec88be784d916518b06c0d SHA512 25c99e219d722ba1280119b7affd4bc83aa2e3b83ad60f74a7dca24c0f64a14acd3d4a0b116474cc4a3d3e4507c7b1300d9afecc14d2e3f400a5d4234334c5ee
+DIST exdown-0.7.1.tar.gz 4863 BLAKE2B 819e66bed1028a98293a4f30ec6dc70a8360bd018821e332719793b4c72e60f0ec09391825ee0c6eb5f4e1132f1c22d48fe0dc19fe8c42253e92a833b7821340 SHA512 4cd0abc734850b5bf8b4531f4c690400d0f5fa6a9e6efbd3e20f75f646f0373f47a04a1655ac86d95a0d6d55019a174e0361d3bdda91bdb9197e8d64ffadcab6
diff --git a/dev-python/exdown/exdown-0.7.0.ebuild b/dev-python/exdown/exdown-0.7.1.ebuild
index 7a5e5dfaa1d8..7a5e5dfaa1d8 100644
--- a/dev-python/exdown/exdown-0.7.0.ebuild
+++ b/dev-python/exdown/exdown-0.7.1.ebuild
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index cac75ae3aa6c..3a57de7529d0 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1 +1,2 @@
 DIST executing-0.5.3.gh.tar.gz 303234 BLAKE2B cb9de0492c4aa31b53310abf65d97df888278671fbf24e5dc2f3f4b00fd22d233fae2265bffe240c092c5b67bfca1e69ec1c4eaa937a0d4c90bedced1f156e2a SHA512 faf591de8e6354300fb572065bda304c3cbc529725b4044ad4f4ca1f86d892da21598ba7245059824e27894937d46e4ef9ef5962a9d7dff78e4144a3e0e6b388
+DIST executing-0.5.4.gh.tar.gz 330687 BLAKE2B 10f526dfb3a9f72dda788af97547e011425a56d1af73c30f5704fb8d348beb4e4538e118355dd415ec6125507ca9b2b015c02dc0bd81a2ef732a60aafb89f12a SHA512 3953ee1f6667c32fea28f964b395d53e99fa7869e27495a241f70179577865ec430ddfa07776995b6b1aaddd660adf6c6b61a8e8931589c0faeea94743fbc209
diff --git a/dev-python/executing/executing-0.5.4.ebuild b/dev-python/executing/executing-0.5.4.ebuild
new file mode 100644
index 000000000000..a8c5904967b8
--- /dev/null
+++ b/dev-python/executing/executing-0.5.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Get information about what a Python frame is currently doing"
+HOMEPAGE="
+	https://github.com/alexmojaki/executing/
+	https://pypi.org/project/executing/"
+SRC_URI="
+	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# asttokens is optional runtime dep
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	# Kill off useless wheel dep
+	sed -i -e 's/wheel; //' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# this test explodes when collected by pytest
+	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
+	pytest -vv tests/test_pytest.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/extras/extras-1.0.0-r1.ebuild b/dev-python/extras/extras-1.0.0-r1.ebuild
index d951ee9481b1..92dca977b8c0 100644
--- a/dev-python/extras/extras-1.0.0-r1.ebuild
+++ b/dev-python/extras/extras-1.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index 6118e2465d78..24c1833e6248 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,3 +1,4 @@
 DIST eyeD3-0.8.11.tar.gz 215807 BLAKE2B e289a274198a4adceb0ec3b77a5c79f50faaa320edecdf07d1d2af3b5519f0c884c8cef146b124fd172d74626f70af2b689dd536ade1a68ed27fedff840513ee SHA512 ed147fbe6ce88319cdbfc752e1ddbcb141180bdd87854c209c621956bc52395c5ba442d929016419620c0b230f5b8a3e1fa638b73c7cf329405425148f953c9c
 DIST eyeD3-0.9.5.tar.gz 222657 BLAKE2B 3932c1b07e0961773a1cccaebec116c3b51a8c4560850661e8725efb3f4c5716b43ba610e35a2682f94b0e3b72513fbf108ffbc8c436a52977c308ad82e59400 SHA512 be89a2070b8cd5d70b25ff24e508c35e4e0ad20bfbe7bc91e4119614c1359cbc7a4ba812066b608f310abfd027d34b7bfa13f9dae8f3ab54f3ecfc9ce47c07e4
+DIST eyeD3-0.9.6.tar.gz 250445 BLAKE2B 11f8bef4b17af07f08144e922634e4c6e467bd8856da9d445a70006b5bf32d442a52e234845a3f146129403fcc16047cc759102b93c433a0466bf0afd9576230 SHA512 0c993e9bf0a27ca41a8a2964a3347a6b0ffa472f833b3dada39ae09a5a2b40e0afb6bfd8c0ea5ed71d3dc2bf3cd062c1fb5fe79abe6ad867221b779786247173
 DIST eyeD3-test-data.tgz 97281754 BLAKE2B 9b667a5f8be157ace06d773d575c08f4a8e8b7a7b81ba9cb39b1e2c924b2e3f98597607ed3076b13150e02ef7768e89d1ff8a9913021e5f4b9ac6b59344ed397 SHA512 937971dcefc53812c59adb97df27d200e92de04e12391c735ab85cd547e2a168aa1212d88c206ec71ac2fa85a504a9faa91dcc444b45149aca7c8f3a794e9a95
diff --git a/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild b/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild
index 8c2d8a17ba7c..df6832475554 100644
--- a/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]"
diff --git a/dev-python/eyeD3/eyeD3-0.9.5.ebuild b/dev-python/eyeD3/eyeD3-0.9.5.ebuild
index f46be1ab30f6..fcc194adcc6e 100644
--- a/dev-python/eyeD3/eyeD3-0.9.5.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="amd64 arm hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/deprecation[${PYTHON_USEDEP}]
diff --git a/dev-python/eyeD3/eyeD3-0.9.6.ebuild b/dev-python/eyeD3/eyeD3-0.9.6.ebuild
new file mode 100644
index 000000000000..d3c41e2ab770
--- /dev/null
+++ b/dev-python/eyeD3/eyeD3-0.9.6.ebuild
@@ -0,0 +1,46 @@
+# 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,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for manipulating ID3 (v1 + v2) tags in Python"
+HOMEPAGE="https://eyed3.nicfit.net/"
+SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://eyed3.nicfit.net/releases/eyeD3-test-data.tgz )"
+
+LICENSE="GPL-2"
+SLOT="0.7"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/deprecation[${PYTHON_USEDEP}]
+	dev-python/filetype[${PYTHON_USEDEP}]"
+# note: most of the deps are optional runtime deps / plugin deps
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pylast[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# requires unpackaged factory-boy, doesn't seem to relevant
+	# to anything but eyeD3 usage with factory-boy
+	rm tests/test_factory.py || die
+	# requires unpackaged grako
+	rm tests/test_display_plugin.py || die
+
+	if use test; then
+		mv "${WORKDIR}"/eyeD3-test-data tests/data || die
+	fi
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/eyeD3/metadata.xml b/dev-python/eyeD3/metadata.xml
index fab2e444461a..d2b70f207ad1 100644
--- a/dev-python/eyeD3/metadata.xml
+++ b/dev-python/eyeD3/metadata.xml
@@ -10,7 +10,8 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">eyeD3</remote-id>
+		<remote-id type="pypi">eyed3</remote-id>
+		<remote-id type="github">nicfit/eyeD3</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index da15d3e30829..da5d1c5cd15a 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,2 +1 @@
-DIST fakeredis-1.4.4.gh.tar.gz 65483 BLAKE2B 500346bb96d2c1308d0565a006ca037784ff25670fd313c94df13f0ceb6d90dbec044c71c95bdabbd593823e26b47a8f8f2a2f7f5b3fa9307b9ccea407b2872c SHA512 04b85675b088e698f11edf8727b88544640cac0caa0048f009371a4c9a9ebc17443d8f03c9ead20ca40608f618c4d394cd6ba4c9d1e5e59b058713756856e450
 DIST fakeredis-1.4.5.gh.tar.gz 66197 BLAKE2B f0f36d1e209673f7722849e835c2a33fac9f7e8bfb1294ecf2e69478295f14af514d0fc4a5732a20ce099333b136d682591fef031ce90d6262fa8c9025cbfa2e SHA512 e16ae5c5947a924b0c9c40ae68efebad5cccea9f88d1b5c3f1677e1ccb8c1fa75dbafc9b413c2359b774f3043c387ff91ecd4e2e21204036883175944338d59b
diff --git a/dev-python/fakeredis/fakeredis-1.4.4.ebuild b/dev-python/fakeredis/fakeredis-1.4.4.ebuild
deleted file mode 100644
index b7d3568bb21e..000000000000
--- a/dev-python/fakeredis/fakeredis-1.4.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/jamesls/fakeredis/
-	https://pypi.org/project/fakeredis/"
-SRC_URI="
-	https://github.com/jamesls/fakeredis/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-RDEPEND="
-	dev-python/redis-py[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local excludes=(
-		# tests for use with aioredis, not packaged in ::gentoo
-		--ignore test/test_aioredis.py
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-
-	pytest -vv "${excludes[@]}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fakeredis/fakeredis-1.4.5.ebuild b/dev-python/fakeredis/fakeredis-1.4.5.ebuild
index bdbf8d6c06be..b7d3568bb21e 100644
--- a/dev-python/fakeredis/fakeredis-1.4.5.ebuild
+++ b/dev-python/fakeredis/fakeredis-1.4.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/redis-py[${PYTHON_USEDEP}]
diff --git a/dev-python/falcon/metadata.xml b/dev-python/falcon/metadata.xml
index c9fa86ef91bb..55a3ab915780 100644
--- a/dev-python/falcon/metadata.xml
+++ b/dev-python/falcon/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="cython">Build cython-based python modules</flag>
 	</use>
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index a97a14a81fc5..ac904baef6b8 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1 +1,2 @@
 DIST fasteners-0.15.tar.gz 17898 BLAKE2B 58da6de627024f6b50d2f35caddfa126ee5d45ea89e16c5f14f7c42fa72e47ca9f98e1f46806b6f5e06401b25132e89113043806db1b13c2d0a095a09aa9aa69 SHA512 756f2ee8aa82ec6fd548d6e4320123b7c0bede834d4e58ff9031e004a8d9d0c23f7df4026ec4195799baa459720ca02d69a981a4aae54713e190a71152f2df9b
+DIST fasteners-0.16.tar.gz 24824 BLAKE2B 5072c1e0633bcf83ad71176dd7f9e2a2179ce4abdddee4bdcfa28f90d7f617759dc855e7fd91afb8b734d5b455d2597e748c169538780927e4d17c93e829453c SHA512 aac91be8f732bcda238c40317359c7faaad632b26473eff940fef0c6c2c227cd83942122c0ec26da236ca8c19d3024798590244ec761c2d2700ffdc7142533da
diff --git a/dev-python/fasteners/fasteners-0.16.ebuild b/dev-python/fasteners/fasteners-0.16.ebuild
new file mode 100644
index 000000000000..3cd1e28d5998
--- /dev/null
+++ b/dev-python/fasteners/fasteners-0.16.ebuild
@@ -0,0 +1,28 @@
+# 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,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package that provides useful locks"
+HOMEPAGE="https://github.com/harlowja/fasteners"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	>=dev-python/monotonic-0.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/diskcache[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/faulthandler-python2/faulthandler-python2-3.0.ebuild b/dev-python/faulthandler-python2/faulthandler-python2-3.0-r1.ebuild
index 4af1e9e8142e..93cbe124c964 100644
--- a/dev-python/faulthandler-python2/faulthandler-python2-3.0.ebuild
+++ b/dev-python/faulthandler-python2/faulthandler-python2-3.0-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 MY_PN=faulthandler
@@ -19,7 +20,7 @@ KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 RESTRICT="test"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools-python2[${PYTHON_USEDEP}]"
 RDEPEND="
 	!dev-python/${MY_PN}[python_targets_python2_7]
 "
diff --git a/dev-python/feedparser/feedparser-5.2.1-r1.ebuild b/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
index 311c4af274f6..25aea248728f 100644
--- a/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
+++ b/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # sgmllib is licensed under PSF-2.
 LICENSE="BSD-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 # Tests have issues with chardet installed, and are just kind of buggy.
diff --git a/dev-python/feedparser/feedparser-5.2.1.ebuild b/dev-python/feedparser/feedparser-5.2.1.ebuild
index cfd6a0bf12b3..31a48074e7a0 100644
--- a/dev-python/feedparser/feedparser-5.2.1.ebuild
+++ b/dev-python/feedparser/feedparser-5.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # sgmllib is licensed under PSF-2.
 LICENSE="BSD-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/feedparser/feedparser-6.0.2.ebuild b/dev-python/feedparser/feedparser-6.0.2.ebuild
index 10b80177dc3c..5839227b83f8 100644
--- a/dev-python/feedparser/feedparser-6.0.2.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.2.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/filetype/filetype-1.0.7.ebuild b/dev-python/filetype/filetype-1.0.7.ebuild
index 5b4368445644..f6ac36a93215 100644
--- a/dev-python/filetype/filetype-1.0.7.ebuild
+++ b/dev-python/filetype/filetype-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 PATCHES=( "${FILESDIR}/${P}-examples.patch" )
 
diff --git a/dev-python/fixtures/fixtures-3.0.0-r1.ebuild b/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
index ee048ae58e6f..58356a6c567e 100644
--- a/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
+++ b/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 93cecbab8ec4..998ffb90421e 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,3 +1 @@
-DIST flake8-3.8.1.tar.gz 157166 BLAKE2B cc8b2dc11f78a6b9c62662086cc190a29a0a4e5a228d4823de8e2f3f327cea3e5df4db220faf9cc14fa34e3825b7d1e4fc4ccf9d1205b437903f327f3ebfa7bb SHA512 f73a306be7d8e5bc48dd9d6d8f8cdee07a90c6c38ee7bd37a21f4be23f1812e4a1e214cc75ca1a324f40e750312b5d7ed573ff49d673f9a1f33aad188b108add
-DIST flake8-3.8.3.tar.gz 162305 BLAKE2B 7211c9ff99ce2e8e3094e6a7a1917ee1b3d61902a45408b9c84f077097af8d1b0571e27209ed78409c9931ff53fdb660f81d1886773b8ef74ceb0bd3de60420c SHA512 007158ea5caf60ff84e935f1b74a5f746fba00991c8808395ff72126dc1a8c8e135badc6f1f383027349076b8f3e146e9d0af27b6e24cdf97390463fd69ad940
 DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0
diff --git a/dev-python/flake8/files/flake8-3.8.3-pytest6.patch b/dev-python/flake8/files/flake8-3.8.3-pytest6.patch
deleted file mode 100644
index 78e7391d0379..000000000000
--- a/dev-python/flake8/files/flake8-3.8.3-pytest6.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 91b09d5b376cfb8afd4b6af5b407f57aa42011c7
-Author: Miro Hrončok <miro@hroncok.cz>
-Date:   Mon Jul 20 13:18:23 2020 +0200
-
-    Tests: Add a value to mocked entry_points, so pytest 6+ can log it
-    
-    Pytest 6.0.0rc1 attempts to log a repr of our mocked entry_point,
-    but it fails, becasue the repr metohod expects a valua attribute:
-    
-    Reproducer:
-    
-        $ tox -e py38 --force-dep 'pytest==6.0.0rc1'
-        ...
-        Traceback (most recent call last):
-          File "/usr/lib/python3.8/logging/__init__.py", line 1081, in emit
-            msg = self.format(record)
-          File "/usr/lib/python3.8/logging/__init__.py", line 925, in format
-            return fmt.format(record)
-          File "/usr/lib/python3.8/logging/__init__.py", line 664, in format
-            record.message = record.getMessage()
-          File "/usr/lib/python3.8/logging/__init__.py", line 369, in getMessage
-            msg = msg % self.args
-          File "/tmp/flake8/.tox/py38/lib/python3.8/site-packages/flake8/plugins/manager.py", line 44, in __repr__
-            self.name, self.entry_point.value
-          File "/tmp/flake8/.tox/py38/lib/python3.8/site-packages/mock/mock.py", line 632, in __getattr__
-            raise AttributeError("Mock object has no attribute %r" % name)
-        AttributeError: Mock object has no attribute 'value'
-
-diff --git a/tests/integration/test_checker.py b/tests/integration/test_checker.py
-index eaab5c3..0acdb6e 100644
---- a/tests/integration/test_checker.py
-+++ b/tests/integration/test_checker.py
-@@ -100,6 +100,7 @@ def mock_file_checker_with_plugin(plugin_target):
-     entry_point = mock.Mock(spec=['load'])
-     entry_point.name = plugin_target.name
-     entry_point.load.return_value = plugin_target
-+    entry_point.value = 'mocked:value'
- 
-     # Load the checker plugins using the entry point mock
-     with mock.patch.object(
diff --git a/dev-python/flake8/flake8-3.8.1.ebuild b/dev-python/flake8/flake8-3.8.1.ebuild
deleted file mode 100644
index 1c4aee8f4a98..000000000000
--- a/dev-python/flake8/flake8-3.8.1.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
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		${PDEPEND}
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-# Sphinx and friends are not keyworded for all arches, repoman complains
-#distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	# don't treat warnings as errors when running tests
-	sed -r -i '/^[[:space:]]*error[[:space:]]*$/ d' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/flake8/flake8-3.8.3-r1.ebuild b/dev-python/flake8/flake8-3.8.3-r1.ebuild
deleted file mode 100644
index 423edcd34da4..000000000000
--- a/dev-python/flake8/flake8-3.8.3-r1.ebuild
+++ /dev/null
@@ -1,41 +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,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		${PDEPEND}
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-pytest6.patch" )
-
-distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
diff --git a/dev-python/flake8/flake8-3.8.4.ebuild b/dev-python/flake8/flake8-3.8.4.ebuild
index 88d554ffa0cc..fe297143f40a 100644
--- a/dev-python/flake8/flake8-3.8.4.ebuild
+++ b/dev-python/flake8/flake8-3.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 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-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND="
diff --git a/dev-python/flask-api/metadata.xml b/dev-python/flask-api/metadata.xml
index d217e38f4d8b..9e221d25fab6 100644
--- a/dev-python/flask-api/metadata.xml
+++ b/dev-python/flask-api/metadata.xml
@@ -13,6 +13,7 @@
         <email>python@gentoo.org</email>
         <name>Python</name>
     </maintainer>
+    <stabilize-allarches/>
     <upstream>
         <remote-id type="github">flask-api/flask-api</remote-id>
         <remote-id type="pypi">Flask-API</remote-id>
diff --git a/dev-python/flask-assets/metadata.xml b/dev-python/flask-assets/metadata.xml
index cf655c103295..c8e1d52d60a6 100644
--- a/dev-python/flask-assets/metadata.xml
+++ b/dev-python/flask-assets/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">miracle2k/flask-assets</remote-id>
 		<remote-id type="pypi">Flask-Assets</remote-id>
diff --git a/dev-python/flask-compress/flask-compress-1.8.0.ebuild b/dev-python/flask-compress/flask-compress-1.8.0.ebuild
index a7df5d065c59..2e41176eada1 100644
--- a/dev-python/flask-compress/flask-compress-1.8.0.ebuild
+++ b/dev-python/flask-compress/flask-compress-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/flask-debug/metadata.xml b/dev-python/flask-debug/metadata.xml
index 29362ce5fca3..395e5bf88804 100644
--- a/dev-python/flask-debug/metadata.xml
+++ b/dev-python/flask-debug/metadata.xml
@@ -5,6 +5,7 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-Debug</remote-id>
 		<remote-id type="github">mbr/Flask-Debug</remote-id>
diff --git a/dev-python/flask-gravatar/metadata.xml b/dev-python/flask-gravatar/metadata.xml
index 689f58ab8c45..28032495764d 100644
--- a/dev-python/flask-gravatar/metadata.xml
+++ b/dev-python/flask-gravatar/metadata.xml
@@ -9,6 +9,7 @@
 		<email>titanofold@gentoo.org</email>
 		<name>Aaron W. Swenson</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-Gravatar</remote-id>
 		<remote-id type="github">zzzsochi/Flask-Gravatar</remote-id>
diff --git a/dev-python/flask-mail/metadata.xml b/dev-python/flask-mail/metadata.xml
index d19799ccd8b2..11ffa2f36ae2 100644
--- a/dev-python/flask-mail/metadata.xml
+++ b/dev-python/flask-mail/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-Mail</remote-id>
 	</upstream>
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index a3b109c54e12..9cf3ed1324f2 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1 +1,2 @@
 DIST Flask-Migrate-2.5.2.tar.gz 12127 BLAKE2B 4c30cd5a3e59c890b0b3e397845cfd1424cdbdec1340793f406fb2e77cc3dc1c7eda777498d75e2250d09a310f28aea1b6ff5248df1ea151ff62bd7c7acabe72 SHA512 9c20fef77c1e0cd2a3ff14bdac48117e3d1610fe9417c928e111fa9c5761a63e67154dedbe83247bbea0f62796203bac61f4193478431607e26bdb253ee0892b
+DIST Flask-Migrate-2.5.3.tar.gz 12652 BLAKE2B 4a43cb3849ffa31afa00031ffbdfc130d07a8282184ca43c58a9b49fe94c456ee46a735fd6df9f9e3fa00ae0c82c1688852a68f2bf278afc5b08d64b31a473e7 SHA512 f26db1c6ceddceb635cce4259b4508ecc8dc26dbfa67397205668883129835840050d909337a73712d3b1ff3e0bbfab74f5ac94c2ac472ec64f86e64789107ac
diff --git a/dev-python/flask-migrate/flask-migrate-2.5.3.ebuild b/dev-python/flask-migrate/flask-migrate-2.5.3.ebuild
new file mode 100644
index 000000000000..557b0276ca63
--- /dev/null
+++ b/dev-python/flask-migrate/flask-migrate-2.5.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_PN="Flask-Migrate"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
+HOMEPAGE="https://pypi.org/project/Flask-Migrate/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( >=dev-python/flask-script-0.6[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/flask-migrate/metadata.xml b/dev-python/flask-migrate/metadata.xml
index 563a997b93d2..a51ab156761c 100644
--- a/dev-python/flask-migrate/metadata.xml
+++ b/dev-python/flask-migrate/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-Migrate</remote-id>
 	</upstream>
diff --git a/dev-python/flask-mongoengine/Manifest b/dev-python/flask-mongoengine/Manifest
index 5082bdcff310..29f5321ac665 100644
--- a/dev-python/flask-mongoengine/Manifest
+++ b/dev-python/flask-mongoengine/Manifest
@@ -1,2 +1 @@
-DIST flask-mongoengine-0.9.5.gh.tar.gz 120281 BLAKE2B 454602e7e7f26db731379b01492c6cb1adf01369fd268236407c57753aeb68f17ce62d4c2e665e493d3c7c632e4f263af02b59e6580893afcc7b8659247fb42f SHA512 3588ae25e2f3643f5e240990f424b4f3754cea2f880b7b454c98afb3ea98fd81b783d74a45cf685fe59cfa8159b1ac39e840071f364ce98fb1a25cc9a09e0d5f
 DIST flask-mongoengine-1.0.0.gh.tar.gz 123516 BLAKE2B 5dd6cf1d774973ef1883d824bdf467b53306773eff5f7016f6440a7ec55648012755a1270b8fca0974aff00dfb189c0f3f7d6985a01c098729517c0018513c8b SHA512 bd95a8248a972a41c92dc2711f866420aabba56062322801e473e0b347c95ad47da39439992ba6cf23a0981c422ae84756af3af95d1171acd6b321f9cbc63085
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-0.9.5.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-0.9.5.ebuild
deleted file mode 100644
index 79e92f353324..000000000000
--- a/dev-python/flask-mongoengine/flask-mongoengine-0.9.5.ebuild
+++ /dev/null
@@ -1,41 +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,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Flask support for MongoDB and with WTF model forms"
-HOMEPAGE="https://pypi.org/project/flask-mongoengine/"
-SRC_URI="
-	https://github.com/MongoEngine/flask-mongoengine/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# TODO: make it spawn a local mongodb instance
-RESTRICT="test"
-
-RDEPEND=">=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/mongoengine-0.7.10[${PYTHON_USEDEP}]
-	dev-python/flask-wtf[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs
-distutils_enable_tests nose
-
-python_prepare_all() {
-	sed -i -e '/test_requirements/d' setup.py || die
-	sed -i -e '/rednose/d' setup.cfg || die
-
-	# TODO: investigate; new pymongo, wtforms?
-	sed -e 's:test_connection_default:_&:' \
-		-i tests/test_basic_app.py || die
-	sed -e 's:test_unique_with:_&:' \
-		-i tests/test_forms.py || die
-	sed -e 's:test_mongomock:_&:' \
-		-i tests/test_connection.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-1.0.0.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-1.0.0.ebuild
index c03a9dff5f39..ea346b12bab2 100644
--- a/dev-python/flask-mongoengine/flask-mongoengine-1.0.0.ebuild
+++ b/dev-python/flask-mongoengine/flask-mongoengine-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # TODO: make it spawn a local mongodb instance
 RESTRICT="test"
 
diff --git a/dev-python/flask-nav/metadata.xml b/dev-python/flask-nav/metadata.xml
index 8671ee657c37..c6345c0788ac 100644
--- a/dev-python/flask-nav/metadata.xml
+++ b/dev-python/flask-nav/metadata.xml
@@ -5,6 +5,7 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">flask-nav</remote-id>
 		<remote-id type="github">mbr/flask-nav</remote-id>
diff --git a/dev-python/flask-paginate/Manifest b/dev-python/flask-paginate/Manifest
index 3a28f339eaf8..7a48d44bb85e 100644
--- a/dev-python/flask-paginate/Manifest
+++ b/dev-python/flask-paginate/Manifest
@@ -1 +1,2 @@
 DIST flask-paginate-0.7.0.tar.gz 119358 BLAKE2B 24c1f3bc77853c9c96bb72d3364e73845f8fd0870606dd96b4261861430bef864a6830dd793f4f6e8a9371c89342dda88c5f976d79ff4a1bec7d687614b2014a SHA512 11c335c08c6a9c32999e5b8ba7a76c1fb04769e5ab679b550efc87497446edbaa1e3ccb62a4c238a0b5585f7ba4067e43f158ae123c3b118db84b90cb5d4f219
+DIST flask-paginate-0.8.0.tar.gz 119687 BLAKE2B 0c73f1d72938fe2cb322ec53e1ce3df083c81f1b2bc58f150af1e602c7e435aaa844534283f83337cd9840f8ece69620de9e63e3f8017f848b5dc2fb54f19848 SHA512 1958dbf5675b24ae175098c740e08cc3aa9d2088f6f10768083a740fba3a87cf4b5255ddbc5fe72d286fb04817f527fba9fca5b09af2929851c5ac1eefe3b4d7
diff --git a/dev-python/flask-paginate/flask-paginate-0.8.0.ebuild b/dev-python/flask-paginate/flask-paginate-0.8.0.ebuild
new file mode 100644
index 000000000000..8bc43d1dbc48
--- /dev/null
+++ b/dev-python/flask-paginate/flask-paginate-0.8.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Pagination support for flask"
+HOMEPAGE="https://flask-paginate.readthedocs.io"
+SRC_URI="https://github.com/lixxu/flask-paginate/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv tests/tests.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-paginate/metadata.xml b/dev-python/flask-paginate/metadata.xml
index 099bcd1c6c11..240963b578ca 100644
--- a/dev-python/flask-paginate/metadata.xml
+++ b/dev-python/flask-paginate/metadata.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
 	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">lixxu/flask-paginate</remote-id>
 		<remote-id type="pypi">flask-paginate</remote-id>
diff --git a/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild b/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
index 45bd93d737cc..0f8378316b53 100644
--- a/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
+++ b/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DISTUTILS_IN_SOURCE_BUILD=1
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1 eapi7-ver
+inherit distutils-r1
 
 MY_PV=$(ver_cut 1-2)
 
@@ -14,18 +14,14 @@ HOMEPAGE="https://github.com/miguelgrinberg/flask-paranoid/"
 SRC_URI="https://github.com/miguelgrinberg/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-
 SLOT="0"
-
 KEYWORDS="amd64 x86"
 IUSE="test"
+
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
diff --git a/dev-python/flask-paranoid/metadata.xml b/dev-python/flask-paranoid/metadata.xml
index 83d0fc41e0b8..b06124b5c3fe 100644
--- a/dev-python/flask-paranoid/metadata.xml
+++ b/dev-python/flask-paranoid/metadata.xml
@@ -9,6 +9,7 @@
 		<email>titanofold@gentoo.org</email>
 		<name>Aaron W. Swenson</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-Paranoid</remote-id>
 		<remote-id type="github">miguelgrinberg/flask-paranoid</remote-id>
diff --git a/dev-python/flask-principal/metadata.xml b/dev-python/flask-principal/metadata.xml
index e2564b3b5802..2950337f1812 100644
--- a/dev-python/flask-principal/metadata.xml
+++ b/dev-python/flask-principal/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-Principal</remote-id>
 		<remote-id type="github">mattupstate/flask-principal</remote-id>
diff --git a/dev-python/flask-script/flask-script-2.0.6.ebuild b/dev-python/flask-script/flask-script-2.0.6.ebuild
index 5a1ae593ba9c..4e9fe2692bd3 100644
--- a/dev-python/flask-script/flask-script-2.0.6.ebuild
+++ b/dev-python/flask-script/flask-script-2.0.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
diff --git a/dev-python/flask-script/metadata.xml b/dev-python/flask-script/metadata.xml
index 407c7d71cf5a..695f6d7821a9 100644
--- a/dev-python/flask-script/metadata.xml
+++ b/dev-python/flask-script/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-Script</remote-id>
 	</upstream>
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index 5deb9a83f5a6..03260ea67c0d 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1 +1,2 @@
 DIST flask-security-3.4.4.gh.tar.gz 348525 BLAKE2B 77a851c2549be9ce8612e3b186ad2d83d272b277f286885da491f3f0fe99e8836d145749ae137f1e75625c34b2214270ba4d24f1bfaa514012064dd38f083230 SHA512 1c1a4f079199704d7a2a4e11351cd199e3a790f5d0c7f68b240c299e83b129227fac4ca00caf45401efbf14520c1d65d3b710b85e8f53b495283b94a164f97a2
+DIST flask-security-3.4.5.gh.tar.gz 348928 BLAKE2B 9890227e9775c4a28fc364affb0bf767407463d514f6dc3cd359dd8a026e8325d943a547f294f6363a276f9e7d97336c526dd45f4549c7cfaff2d6ef9ef0316a SHA512 f9ac7f46b2e1ab7dbb44ba925b01e16304e8f8d6d5d56f4e558d07b80dfffa59f04c2597e17c00a7d7ae11be3a97c78ccf8d79993b7451be4a7f75f85bc89f6f
diff --git a/dev-python/flask-security/flask-security-3.4.4.ebuild b/dev-python/flask-security/flask-security-3.4.4.ebuild
index 210180046090..661c3556e503 100644
--- a/dev-python/flask-security/flask-security-3.4.4.ebuild
+++ b/dev-python/flask-security/flask-security-3.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,6 +39,7 @@ BDEPEND="
 		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
 		>=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}]
 		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/mongomock-3.19.0[${PYTHON_USEDEP}]
 		>=dev-python/peewee-3.11.2[${PYTHON_USEDEP}]
 		>=dev-python/phonenumbers-8.11.1[${PYTHON_USEDEP}]
@@ -59,7 +60,7 @@ PATCHES=(
 
 src_prepare() {
 	sed -i -e '/setup_requires/d' setup.py || die
-	sed -e 's:--cov flask_security::' \
+	sed -e 's@--cov flask_security@-p no:httpbin@' \
 		-e 's:--cov-report term-missing::' \
 		-e 's:--black::' \
 		-e 's:--flake8::' \
diff --git a/dev-python/flask-security/flask-security-3.4.5.ebuild b/dev-python/flask-security/flask-security-3.4.5.ebuild
new file mode 100644
index 000000000000..661c3556e503
--- /dev/null
+++ b/dev-python/flask-security/flask-security-3.4.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Simple security for Flask apps"
+HOMEPAGE="
+	https://github.com/Flask-Middleware/flask-security/
+	https://pypi.org/project/Flask-Security-Too/"
+SRC_URI="
+	https://github.com/Flask-Middleware/flask-security/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	dev-python/cachetools[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
+	>=dev-python/python-email-validator-1.0.5[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/argon2-cffi-19.1.0[${PYTHON_USEDEP}]
+		>=dev-python/bcrypt-3.1.5[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/mongomock-3.19.0[${PYTHON_USEDEP}]
+		>=dev-python/peewee-3.11.2[${PYTHON_USEDEP}]
+		>=dev-python/phonenumbers-8.11.1[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.8.4:2[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
+		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
+		' python3_{6,7})
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.3-optional-deps.patch
+)
+
+src_prepare() {
+	sed -i -e '/setup_requires/d' setup.py || die
+	sed -e 's@--cov flask_security@-p no:httpbin@' \
+		-e 's:--cov-report term-missing::' \
+		-e 's:--black::' \
+		-e 's:--flake8::' \
+		-e 's:--cache-clear::' \
+		-i pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	esetup.py compile_catalog
+}
diff --git a/dev-python/flask-sphinx-themes/metadata.xml b/dev-python/flask-sphinx-themes/metadata.xml
index 7ecae78fb24e..4b23dc1de8ce 100644
--- a/dev-python/flask-sphinx-themes/metadata.xml
+++ b/dev-python/flask-sphinx-themes/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">Flask-Sphinx-Themes</remote-id>
     <remote-id type="github">pallets/flask-sphinx-themes</remote-id>
diff --git a/dev-python/flatbuffers/flatbuffers-1.12.ebuild b/dev-python/flatbuffers/flatbuffers-1.12.ebuild
index b7db6f1decc2..35954e4bc295 100644
--- a/dev-python/flatbuffers/flatbuffers-1.12.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/flufl-i18n/Manifest b/dev-python/flufl-i18n/Manifest
index 82d120c4cfec..1fe6181654fd 100644
--- a/dev-python/flufl-i18n/Manifest
+++ b/dev-python/flufl-i18n/Manifest
@@ -1 +1,2 @@
 DIST flufl-i18n-2.0.2.tar.gz 19106 BLAKE2B 407f69708234e4c24403733c752ed79dfc0ff7d269a325c2d599ac00a0de077dfe63078fd050556f683008296885f397a59ea42b6d0692549856535166e63805 SHA512 05d9283bed456ee8d48704dc595f514e13b0c74096df177ed49bf178987baeee014ddc4331cc7d36edffbee1dcb58fcae152c2cb317b7ce73d9630864b98f1cd
+DIST flufl.i18n-3.1.4.tar.gz 24058 BLAKE2B 1652ea9d0ff7b853298b3647da0fa4c692b9f227f42873194dcff00b119316f425012c534bbd5df87125517bf12cdd7a6d5eaa807f1bacf7c6c82967e8880adb SHA512 02de410e1ca911e2c452b5dd48868c8c409817b867c58dbebdda6aff6dfe4d09b2f7ac4c293cbc1306eb5caa17c1f5a63e9d8c0ee59e8e41058ce0a4517257ea
diff --git a/dev-python/flufl-i18n/flufl-i18n-3.1.4.ebuild b/dev-python/flufl-i18n/flufl-i18n-3.1.4.ebuild
new file mode 100644
index 000000000000..0f4e5677a2ca
--- /dev/null
+++ b/dev-python/flufl-i18n/flufl-i18n-3.1.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="A high level API for Python internationalization"
+HOMEPAGE="https://gitlab.com/warsaw/flufl.i18n"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov=flufl::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/flufl-lock/Manifest b/dev-python/flufl-lock/Manifest
index 76f79e11cd35..5110585fe579 100644
--- a/dev-python/flufl-lock/Manifest
+++ b/dev-python/flufl-lock/Manifest
@@ -1 +1,2 @@
 DIST flufl-lock-5.0.1.tar.gz 27788 BLAKE2B 2651898e881719f24bc61e14f697877ca39f2747fadf52de1a5fc917b26e23001df5f0a4ea2e48271da69198e1a1336e69cc0167a4f46fddd21f464b355fa4ca SHA512 f937fb6c7f7bef2b85674225f83f3162f34db3fe2df3d9a896f772c4489c3e0611361e3d1d9efda7727112d780f31022d3045d3a3b8e78e9412aca2f2418ca24
+DIST flufl.lock-5.0.4.tar.gz 29486 BLAKE2B 3fc6c3bfdac3c877c82f9f56e739342604be9f855a42a99bd06e5fb89fe8b3bc4cabd2e357e8e0992f7aa3f5ec7ea4a18e1f59a05beeeed7074a72440d3f6b9b SHA512 c08d8115c836f7523887d86539e9f11a2007913936fd8a4a116a610b648adf289fb086e8904b2163a6af7449e92a6edf9fad09fb770a34473768ffc4d8eb146e
diff --git a/dev-python/flufl-lock/flufl-lock-5.0.4.ebuild b/dev-python/flufl-lock/flufl-lock-5.0.4.ebuild
new file mode 100644
index 000000000000..e2948e57ec3d
--- /dev/null
+++ b/dev-python/flufl-lock/flufl-lock-5.0.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="NFS-safe file locking with timeouts for POSIX systems"
+HOMEPAGE="https://gitlab.com/warsaw/flufl.lock"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov=flufl::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 6b829947816e..9bdeb5f33271 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,2 +1,2 @@
-DIST fonttools-4.1.0.tar.gz 2253792 BLAKE2B 470207d74404851aa111142ad8541d45820ded0212029867c289f2e7741d4b41b4ac824f65555a23d4f3dcc974428537cd319a8787bc4d80f2fb67561a21d1ee SHA512 3d9485cd34b5ea3dfdcc26474e0b21a96811b84eda16341c39165aea72bb09c3cf3360a069b316ae6575a399e26f6518c199180caec7bb959f245ced7ca45e3b
 DIST fonttools-4.18.1.tar.gz 2498166 BLAKE2B 9ea9fd372c71883e37756c9b0b5bcd193782d49a99df37e7245f788362b284af8e5b9456c31b1c6b84fb6cccd8bce0339e95c87cecc008f0130e47a40c74bfe5 SHA512 d87c466e87ffa70bb15ee40f889b25e1187d51a1074b6e47a259d5984d51d7ce988ef50db91796fcbd06b5692b2c627d0a4cd76e3be6d0da348c0872ff01317c
+DIST fonttools-4.18.2.tar.gz 2499129 BLAKE2B 1ae93418121942e4303e4b138b192a30195d25c87e8c6204b508cc6a5b7a87608fcde7acbb6a2e8fb3c71ea59938827dabbe1556b7edad537523f6f0b3615696 SHA512 ceec3656c674ff5c43f4dc7cdf1468ddaf5c8bbe569d865fb015a9251ac089caedcf3dcea82c93a0c367576fcd7d65451642a6ab5d3093d941aa391b50070d53
diff --git a/dev-python/fonttools/fonttools-4.18.1.ebuild b/dev-python/fonttools/fonttools-4.18.1.ebuild
index fd020bfebe8a..526747c102cb 100644
--- a/dev-python/fonttools/fonttools-4.18.1.ebuild
+++ b/dev-python/fonttools/fonttools-4.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 RESTRICT="!test? ( test )"
 IUSE="test"
 
diff --git a/dev-python/fonttools/fonttools-4.1.0.ebuild b/dev-python/fonttools/fonttools-4.18.2.ebuild
index 8caa574e939c..fd020bfebe8a 100644
--- a/dev-python/fonttools/fonttools-4.1.0.ebuild
+++ b/dev-python/fonttools/fonttools-4.18.2.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="xml(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 virtualx
 
@@ -14,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 RESTRICT="!test? ( test )"
 IUSE="test"
 
diff --git a/dev-python/fonttools/metadata.xml b/dev-python/fonttools/metadata.xml
index 3b6043b796d6..b50790dd70cb 100644
--- a/dev-python/fonttools/metadata.xml
+++ b/dev-python/fonttools/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>fonts@gentoo.org</email>
-		<name>Fonts</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
diff --git a/dev-python/freezegun/freezegun-1.0.0-r1.ebuild b/dev-python/freezegun/freezegun-1.0.0-r1.ebuild
index ed37434eddb5..b139f747ec3e 100644
--- a/dev-python/freezegun/freezegun-1.0.0-r1.ebuild
+++ b/dev-python/freezegun/freezegun-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index 5c4f7750914d..fc730ee9d102 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1 +1,2 @@
 DIST fs-2.4.11.tar.gz 163986 BLAKE2B 953e50da7002512029c0a1a8e7fe8be3a7c31fc48e2c66f0fe7d71dc908aab734f724e09c16074c3e4cdd86c9c2e1a847aa21176af07311012090375a3a6808e SHA512 fe4596bf213f9b1721cd3c665e6af180d6617eea07afbaa9d83847dc3f7dfe64bca16c8ccb337d48bbb49bf0d2fef90903e3c4aecc63f61faac6a2b6f6c59cf6
+DIST fs-2.4.12.tar.gz 165536 BLAKE2B 9212ffc1f2d5c315091116770e045e4c5365690d61ca34c3f4a9ce82764c4ba5be6af886e62c8baaf57ab461539a02aa042d50a9dcf314b0894710953571d37f SHA512 8b4727ea21cb9e1b69e31688c46f0732bb1536490549e353c1f88ab0c794b867c5212d1003b094cc86f562108ab4a7ee9dbc7e9aa5dc1349371de583277eb93d
diff --git a/dev-python/fs/fs-2.4.12.ebuild b/dev-python/fs/fs-2.4.12.ebuild
new file mode 100644
index 000000000000..5d34834481bf
--- /dev/null
+++ b/dev-python/fs/fs-2.4.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature
+
+MY_PN="pyfilesystem2"
+DESCRIPTION="Filesystem abstraction layer"
+HOMEPAGE="
+	https://pypi.org/project/fs/
+	https://docs.pyfilesystem.org
+	https://www.willmcgugan.com/tag/fs/
+"
+# Tests from the PyPI tarball are broken
+# https://github.com/PyFilesystem/pyfilesystem2/issues/364
+SRC_URI="https://github.com/PyFilesystem/pyfilesystem2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pyftpdlib[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "S3 support" dev-python/boto
+	optfeature "SFTP support" dev-python/paramiko
+	optfeature "Browser support" dev-python/wxpython
+}
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index bb16f1f98989..068df8d26c89 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1 +1,2 @@
 DIST filesystem_spec-0.8.2.tar.gz 238399 BLAKE2B f64f153dd303bd3ec44e5010507704b5cbb50a89ad4a7a2e50b38b139219896be543bcff0fe0a99e06f015450f4b0334a641fabeeeb23583b14665ef8f089159 SHA512 e30badc56871ef20cf4b2ce0f6353b4125632d9e253f68d4b08535c9e1ac5fe428745315cee89a9536bfd1b308a28cc65fff555a7b9d9511225357bf790b9aac
+DIST filesystem_spec-0.8.5.tar.gz 255904 BLAKE2B df400276dbc53a453e9e9a00acb2e93a86a5f239237533bab036a16bd48d6d709f68241febe75f6f72281162ba4a563a087405a1064e18805ce2501095d778fb SHA512 20001fd02348f15e764a9e20eab98267f6746bd7e86187914d3db3098061aa62cb296595c3519696ae1e99ef896d49df0fcec846aaf6e5c281dd1a344ef6c393
diff --git a/dev-python/fsspec/files/fsspec-0.8.2-test-cleanup.patch b/dev-python/fsspec/files/fsspec-0.8.2-test-cleanup.patch
new file mode 100644
index 000000000000..8227c2d23c66
--- /dev/null
+++ b/dev-python/fsspec/files/fsspec-0.8.2-test-cleanup.patch
@@ -0,0 +1,80 @@
+From f933694238f78fbef91367d5051d515e0f9d0635 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 16 Dec 2020 11:32:04 +0100
+Subject: [PATCH] clean up properly after test_git
+
+Restore original directory after test_git.  Otherwise, next tests
+are run in non-existing directory and fail:
+
+[...]
+>           cwd = os.getcwd()
+E           FileNotFoundError: [Errno 2] No such file or directory
+
+/usr/lib/python3.9/site-packages/gunicorn/util.py:443: FileNotFoundError
+
+While at it, reflow the logic so that the temporary directory is always
+cleaned, even if the test fails in middle of setup.
+---
+ fsspec/implementations/tests/test_git.py | 42 +++++++++++++-----------
+ 1 file changed, 22 insertions(+), 20 deletions(-)
+
+diff --git a/fsspec/implementations/tests/test_git.py b/fsspec/implementations/tests/test_git.py
+index 562b228..4cd4c3f 100644
+--- a/fsspec/implementations/tests/test_git.py
++++ b/fsspec/implementations/tests/test_git.py
+@@ -10,30 +10,32 @@ pygit2 = pytest.importorskip("pygit2")
+ 
+ @pytest.fixture()
+ def repo():
++    orig_dir = os.getcwd()
+     d = tempfile.mkdtemp()
+-    os.chdir(d)
+-    subprocess.call("git init", shell=True, cwd=d)
+-    subprocess.call("git init", shell=True, cwd=d)
+-    subprocess.call('git config user.email "you@example.com"', shell=True, cwd=d)
+-    subprocess.call('git config user.name "Your Name"', shell=True, cwd=d)
+-    open(os.path.join(d, "file1"), "wb").write(b"data0")
+-    subprocess.call("git add file1", shell=True, cwd=d)
+-    subprocess.call('git commit -m "init"', shell=True, cwd=d)
+-    sha = open(os.path.join(d, ".git/refs/heads/master"), "r").read().strip()
+-    open(os.path.join(d, "file1"), "wb").write(b"data00")
+-    subprocess.check_output('git commit -a -m "tagger"', shell=True, cwd=d)
+-    subprocess.call('git tag -a thetag -m "make tag"', shell=True, cwd=d)
+-    open(os.path.join(d, "file2"), "wb").write(b"data000")
+-    subprocess.call("git add file2", shell=True)
+-    subprocess.call('git commit -m "master tip"', shell=True, cwd=d)
+-    subprocess.call("git checkout -b abranch", shell=True, cwd=d)
+-    os.mkdir("inner")
+-    open(os.path.join(d, "inner", "file1"), "wb").write(b"data3")
+-    subprocess.call("git add inner/file1", shell=True, cwd=d)
+-    subprocess.call('git commit -m "branch tip"', shell=True, cwd=d)
+     try:
++        os.chdir(d)
++        subprocess.call("git init", shell=True, cwd=d)
++        subprocess.call("git init", shell=True, cwd=d)
++        subprocess.call('git config user.email "you@example.com"', shell=True, cwd=d)
++        subprocess.call('git config user.name "Your Name"', shell=True, cwd=d)
++        open(os.path.join(d, "file1"), "wb").write(b"data0")
++        subprocess.call("git add file1", shell=True, cwd=d)
++        subprocess.call('git commit -m "init"', shell=True, cwd=d)
++        sha = open(os.path.join(d, ".git/refs/heads/master"), "r").read().strip()
++        open(os.path.join(d, "file1"), "wb").write(b"data00")
++        subprocess.check_output('git commit -a -m "tagger"', shell=True, cwd=d)
++        subprocess.call('git tag -a thetag -m "make tag"', shell=True, cwd=d)
++        open(os.path.join(d, "file2"), "wb").write(b"data000")
++        subprocess.call("git add file2", shell=True)
++        subprocess.call('git commit -m "master tip"', shell=True, cwd=d)
++        subprocess.call("git checkout -b abranch", shell=True, cwd=d)
++        os.mkdir("inner")
++        open(os.path.join(d, "inner", "file1"), "wb").write(b"data3")
++        subprocess.call("git add inner/file1", shell=True, cwd=d)
++        subprocess.call('git commit -m "branch tip"', shell=True, cwd=d)
+         yield d, sha
+     finally:
++        os.chdir(orig_dir)
+         shutil.rmtree(d)
+ 
+ 
+-- 
+2.29.2
+
diff --git a/dev-python/fsspec/fsspec-0.8.2.ebuild b/dev-python/fsspec/fsspec-0.8.2.ebuild
index cdced8546e35..8739553cf731 100644
--- a/dev-python/fsspec/fsspec-0.8.2.ebuild
+++ b/dev-python/fsspec/fsspec-0.8.2.ebuild
@@ -31,6 +31,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/fsspec-0.8.2-test-cleanup.patch
+)
+
 src_test() {
 	git config --global user.email "you@example.com" || die
 	git config --global user.name "Your Name" || die
diff --git a/dev-python/fsspec/fsspec-0.8.5.ebuild b/dev-python/fsspec/fsspec-0.8.5.ebuild
new file mode 100644
index 000000000000..208198fba4b9
--- /dev/null
+++ b/dev-python/fsspec/fsspec-0.8.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_P=filesystem_spec-${PV}
+
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="https://github.com/intake/filesystem_spec/
+	https://pypi.org/project/fsspec/"
+SRC_URI="
+	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/fsspec-0.8.2-test-cleanup.patch
+)
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	# sftp and smb require server started via docker
+	pytest -vv \
+		--ignore fsspec/implementations/tests/test_sftp.py \
+		--ignore fsspec/implementations/tests/test_smb.py ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
index 92f92c14e9aa..6fcca8b572e0 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/funcsigs/Manifest b/dev-python/funcsigs/Manifest
deleted file mode 100644
index 07d79033be2a..000000000000
--- a/dev-python/funcsigs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST funcsigs-1.0.2.tar.gz 27947 BLAKE2B 3006d46018ae040b930e397c3f11575ae0ef18a8b2c9b6c10075804d83d23bea1fb81179de85180146673e0bd4c775a68c0ff624cdaceb1894efe5b2c8fd753c SHA512 4e583bb7081bb1d6c0fe5a6935ca03032d562b93ef5c11b51a72ce9e7ac12902451cc2233c7e6f70440629d88d8e6e9625965ee408100b80b0024f3a6204afda
diff --git a/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch b/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch
deleted file mode 100644
index f4ecec3b6137..000000000000
--- a/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/tests/test_inspect.py b/tests/test_inspect.py
-index 98d6592..3a2a1f2 100644
---- a/tests/test_inspect.py
-+++ b/tests/test_inspect.py
-@@ -8,6 +8,7 @@ import unittest2 as unittest
- 
- import funcsigs as inspect
- 
-+import platform
- 
- class TestSignatureObject(unittest.TestCase):
-     @staticmethod
-@@ -409,7 +410,7 @@ def test_signature_on_decorated(self):
-                       Ellipsis))
- """)
- 
--    if sys.version_info[0] > 2:
-+    if sys.version_info[0] > 2 and platform.python_implementation() != "PyPy":
-         exec("""
- def test_signature_on_class(self):
-     class C:
-@@ -493,41 +494,44 @@ def test_signature_on_class(self):
-                       Ellipsis))
- """)
- 
--    def test_signature_on_callable_objects(self):
--        class Foo(object):
--            def __call__(self, a):
--                pass
-+    if platform.python_implementation() != "PyPy":
-+        exec("""
-+def test_signature_on_callable_objects(self):
-+    class Foo(object):
-+        def __call__(self, a):
-+            pass
- 
--        self.assertEqual(self.signature(Foo()),
--                         ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
--                          Ellipsis))
-+    self.assertEqual(self.signature(Foo()),
-+                     ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
-+                      Ellipsis))
- 
--        class Spam(object):
--            pass
--        with self.assertRaisesRegex(TypeError, "is not a callable object"):
--            inspect.signature(Spam())
-+    class Spam(object):
-+        pass
-+    with self.assertRaisesRegex(TypeError, "is not a callable object"):
-+        inspect.signature(Spam())
- 
--        class Bar(Spam, Foo):
--            pass
-+    class Bar(Spam, Foo):
-+        pass
- 
--        self.assertEqual(self.signature(Bar()),
--                         ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
--                          Ellipsis))
-+    self.assertEqual(self.signature(Bar()),
-+                     ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
-+                      Ellipsis))
- 
--        class ToFail(object):
--            __call__ = type
--        with self.assertRaisesRegex(ValueError, "not supported by signature"):
--            inspect.signature(ToFail())
-+    class ToFail(object):
-+        __call__ = type
-+    with self.assertRaisesRegex(ValueError, "not supported by signature"):
-+        inspect.signature(ToFail())
- 
--        if sys.version_info[0] < 3:
--            return
-+    if sys.version_info[0] < 3:
-+        return
- 
--        class Wrapped(object):
--            pass
--        Wrapped.__wrapped__ = lambda a: None
--        self.assertEqual(self.signature(Wrapped),
--                         ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
--                          Ellipsis))
-+    class Wrapped(object):
-+        pass
-+    Wrapped.__wrapped__ = lambda a: None
-+    self.assertEqual(self.signature(Wrapped),
-+                     ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
-+                      Ellipsis))
-+""")
- 
-     def test_signature_on_lambdas(self):
-         self.assertEqual(self.signature((lambda a=10: a)),
diff --git a/dev-python/funcsigs/funcsigs-1.0.2-r2.ebuild b/dev-python/funcsigs/funcsigs-1.0.2-r2.ebuild
deleted file mode 100644
index 10112e8d4f44..000000000000
--- a/dev-python/funcsigs/funcsigs-1.0.2-r2.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,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python function signatures backport from PEP362 for Python 2.7-3.5"
-HOMEPAGE="https://pypi.org/project/funcsigs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	# This patch disables some tests for pypy as they do not work as expected.
-	# This has been reported upstream
-	# https://github.com/testing-cabal/funcsigs/issues/10
-	"${FILESDIR}/${P}-fix-pypy3-tests.patch"
-)
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/funcsigs/metadata.xml b/dev-python/funcsigs/metadata.xml
deleted file mode 100644
index 1134def95f66..000000000000
--- a/dev-python/funcsigs/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">funcsigs</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/funcy/Manifest b/dev-python/funcy/Manifest
index cf683c3bbd66..9b181f1cc7e2 100644
--- a/dev-python/funcy/Manifest
+++ b/dev-python/funcy/Manifest
@@ -1,2 +1,2 @@
-DIST funcy-1.10.1.tar.gz 29657 BLAKE2B fb2de795a5564f7009ff5717b8eadc3cb24a2cd4c30b9b9627861d7c8bcffdc1ea27f480c2895b8733f6dd965fbf9ee0fd7f12f8bbd3cf5f0d291829bc852f4b SHA512 123a5a828bd3cdbd38926923eb3979c4e5bca246da93179321eb1619df22cf6f722b5971d1309a1bdee2eeb362fc7fa85c6769a60efdd668350bf6c7d95e184c
 DIST funcy-1.14.tar.gz 548493 BLAKE2B fff352d0e0d685fb51fb30302542c2e8893209df1e01912efae06821fbc885b05ab3fea8786d6924b48ddf32cc6bdd6def5e90db1ff949b005437b5d3771c3c0 SHA512 0c7daf1a6d87f56663ae0d37cc65654c79646c313ec530ac57e6ee8de04849b8846556fda10dd762f92e44a5ffa54d32880bed4cd77cec99ae865de0203d123a
+DIST funcy-1.15.tar.gz 605884 BLAKE2B dbcfe02981a09b2914096c7df9e0f37582dd4250bced71df92a1b10ce655291470f5ecb32ea4557307ba075e121d3199e0928566f9c25256c391ab821363023b SHA512 6e54da954bf11de55251a2732e9cee5617947322ea16a6a918ff3c5d7cb448756d29a39c4e997186cadc30d24270ccf4e6d21af9f108ebaabaed68e0be96f624
diff --git a/dev-python/zict/zict-0.1.4.ebuild b/dev-python/funcy/funcy-1.14-r1.ebuild
index 1a4185ade1b2..9d04567a0959 100644
--- a/dev-python/zict/zict-0.1.4.ebuild
+++ b/dev-python/funcy/funcy-1.14-r1.ebuild
@@ -2,29 +2,30 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
-DESCRIPTION="Mutable mapping tools"
-HOMEPAGE="https://github.com/dask/zict/"
+DESCRIPTION="A collection of fancy functional tools focused on practicality"
+HOMEPAGE="https://github.com/Suor/funcy"
 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 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/HeapDict[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${RDEPEND}
 	test? (
-		dev-python/HeapDict[${PYTHON_USEDEP}]
-		dev-python/lmdb[${PYTHON_USEDEP}]
+		dev-python/whatever[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
 python_test() {
-	py.test || die
+	distutils_install_for_testing --via-root
+	pytest || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/funcy/funcy-1.14.ebuild b/dev-python/funcy/funcy-1.14.ebuild
index ef4fd7c71310..1a1071e7e7b0 100644
--- a/dev-python/funcy/funcy-1.14.ebuild
+++ b/dev-python/funcy/funcy-1.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/funcy/funcy-1.15.ebuild b/dev-python/funcy/funcy-1.15.ebuild
new file mode 100644
index 000000000000..77998fdb776a
--- /dev/null
+++ b/dev-python/funcy/funcy-1.15.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A collection of fancy functional tools focused on practicality"
+HOMEPAGE="https://github.com/Suor/funcy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/whatever[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	distutils_install_for_testing --via-root
+	pytest || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/future/future-0.18.2-r1.ebuild b/dev-python/future/future-0.18.2-r1.ebuild
index 47e4510507f3..8f277caeacb5 100644
--- a/dev-python/future/future-0.18.2-r1.ebuild
+++ b/dev-python/future/future-0.18.2-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 # TODO: restore numpy when python2.7 is gone
diff --git a/dev-python/genshi/genshi-0.7.3-r1.ebuild b/dev-python/genshi/genshi-0.7.3-r1.ebuild
index 1ef8803e8c36..7d1bbad6d9ae 100644
--- a/dev-python/genshi/genshi-0.7.3-r1.ebuild
+++ b/dev-python/genshi/genshi-0.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples"
 
 S="${WORKDIR}/${P^}"
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 9e3a056b3cbc..83afcc3dd583 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1 +1,4 @@
+DIST gevent-20.12.0.tar.gz 5898634 BLAKE2B a73129c7d393aedcd84b6e62c890c3b306722876a1ea4c96485096ce2ea7d1db5f03c77ea77a2c35ef41c7a96183246316c577735bcf4b25fb41095282c64d38 SHA512 76c75128ba2b33e47bd85ef2788387aa6d47d230ef9aeac4bceee03e8a2555dd204c321de7d1779fe4f44503e4fca5dce3b43c1922238da994faed0d78e5c4c1
+DIST gevent-20.12.1.tar.gz 5908977 BLAKE2B fd3536de1ca518e889868537cfb856d022ec2be8f5f658cddb06b9797841333a475d2c4d7eb3f97ecd715a19999804e724f8126b189087582452a88076bf5d12 SHA512 63bf8d63ed0eeed63b5ae6b58a2a0a36bb4a606d7d76f51cb59d5b76aa639296264a01455699cfb6abee53c958368c17f4c6bfca1543d04f9d750637b113046b
 DIST gevent-20.9.0.tar.gz 5806581 BLAKE2B 6b1b653fa6e22539e049a9bba3d3a2b9d798a5555ce4ba60ce33ecbdf14bb5201967d22d677e1ce3170129b0763fddfcc5991347186fb102d10ae39e22538c44 SHA512 966efc945b623df2521fffadca3b7e56cae1efe6de904a724765e0593389e8b1305094baa6fbc9f4fa376b1157d0f230b01e2a90de21e4b9650614363edec9f4
+DIST gevent-21.1.0.tar.gz 5928692 BLAKE2B d3187523a8740c1a2d3c2aef9d20b4e49b87fafef9e4e5bfe551f2cce790a2d9149597bad3c13b7e18da6bfb0dd4a0d516ef340faf0536a11b987f8e3e78b8ac SHA512 a38cfa952514cf0132651aa94afa119573c292bd4d4772405fbdddf3c72d3bd83e36e2b2eb0f4dd569580a04a4e52cb8ef7bb43191a4a447761edf481b5b2525
diff --git a/dev-python/gevent/gevent-20.12.0.ebuild b/dev-python/gevent/gevent-20.12.0.ebuild
new file mode 100644
index 000000000000..4c4a3a4ce592
--- /dev/null
+++ b/dev-python/gevent/gevent-20.12.0.ebuild
@@ -0,0 +1,86 @@
+# 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,9,10} )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libev-4.31:=
+	dev-libs/libuv:=
+	>=net-dns/c-ares-1.12:=
+	>=dev-python/greenlet-0.4.17
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+#RESTRICT="test"
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_test() {
+	cd src/gevent/tests || die
+	# TODO: figure out how to make them work and not hang
+#	GEVENT_RESOLVER=ares \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=dnspython \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=thread \
+#		"${EPYTHON}" -m gevent.tests \
+#		--verbose \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${EPYTHON}" -m gevent.tests \
+		--verbose \
+		-uall,-network \
+		--config known_failures.py \
+		test__*subprocess*.py || die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/gevent/gevent-20.12.1.ebuild b/dev-python/gevent/gevent-20.12.1.ebuild
new file mode 100644
index 000000000000..4c4a3a4ce592
--- /dev/null
+++ b/dev-python/gevent/gevent-20.12.1.ebuild
@@ -0,0 +1,86 @@
+# 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,9,10} )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libev-4.31:=
+	dev-libs/libuv:=
+	>=net-dns/c-ares-1.12:=
+	>=dev-python/greenlet-0.4.17
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+#RESTRICT="test"
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_test() {
+	cd src/gevent/tests || die
+	# TODO: figure out how to make them work and not hang
+#	GEVENT_RESOLVER=ares \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=dnspython \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=thread \
+#		"${EPYTHON}" -m gevent.tests \
+#		--verbose \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${EPYTHON}" -m gevent.tests \
+		--verbose \
+		-uall,-network \
+		--config known_failures.py \
+		test__*subprocess*.py || die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/gevent/gevent-21.1.0.ebuild b/dev-python/gevent/gevent-21.1.0.ebuild
new file mode 100644
index 000000000000..d0d75fc3f40c
--- /dev/null
+++ b/dev-python/gevent/gevent-21.1.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 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,9,10} )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libev-4.31:=
+	dev-libs/libuv:=
+	>=net-dns/c-ares-1.12:=
+	>=dev-python/greenlet-0.4.17
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+#RESTRICT="test"
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_test() {
+	cd src/gevent/tests || die
+	# TODO: figure out how to make them work and not hang
+#	GEVENT_RESOLVER=ares \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=dnspython \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=thread \
+#		"${EPYTHON}" -m gevent.tests \
+#		--verbose \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${EPYTHON}" -m gevent.tests \
+		--verbose \
+		-uall,-network \
+		--config known_failures.py \
+		test__*subprocess*.py || die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/gevent/metadata.xml b/dev-python/gevent/metadata.xml
index 24cc31a92916..5e54a5e8ccbe 100644
--- a/dev-python/gevent/metadata.xml
+++ b/dev-python/gevent/metadata.xml
@@ -6,7 +6,7 @@
     <name>Python</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">surfly/gevent</remote-id>
+    <remote-id type="github">gevent/gevent</remote-id>
     <remote-id type="pypi">gevent</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index f79e41f622b7..ac58fe5b04b5 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,2 +1 @@
-DIST geventhttpclient-1.4.4.tar.gz 57620 BLAKE2B 20b60cfa7e8221b050bfd95a6e23c2f3eee87c0df1e93171719c7ba1804e88c918471cdd01cf4c6020fb6d44d0a1b911ee09dd44cc1e150b5d18d6052f2904cf SHA512 c6a8580707f3178a3a55eb638b9e3f36f82aecbd8a5ce044f0b8c167d88ad2bec584275bed6b720a5f7a546b0ffd113bec28dd2e1ff4290c60f0b5e13542b737
 DIST geventhttpclient-1.4.5.tar.gz 58183 BLAKE2B 48d44048e7040552824ed19ac49c6dda41536ffded56bae0d942c06f111a327a1d571872f35f388853b479ea1aaa6de518f86e7ee72e362360492530ade65131 SHA512 9ffe00c79b145dab104e1dce336e072060f315d9bee880daf64b5f1f52e661d810dab9a60286320a7d30cf0e794465f201c039cc31fe7ec325cdb3a8350c9f7d
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.4-r1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.4-r1.ebuild
deleted file mode 100644
index 86c5fc6fda5a..000000000000
--- a/dev-python/geventhttpclient/geventhttpclient-1.4.4-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_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A high performance, concurrent HTTP client library for Python using gevent"
-HOMEPAGE="https://github.com/gwik/geventhttpclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/gevent[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Skip SNI tests which require dpkt
-	sed -i '/^import dpkt.ssl/d' src/geventhttpclient/tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local skipped_tests=(
-		# Require dpkt
-		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_host_in_ssl
-		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_header_in_ssl
-		src/geventhttpclient/tests/test_ssl.py::test_explicit_sni_in_ssl
-	)
-	# Append to sys.path to avoid ImportError
-	# https://bugs.gentoo.org/667758
-	# Skip tests which require internet access
-	pytest --import-mode=append -vv ${skipped_tests[@]/#/--deselect } \
-		-m "not online" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild
index 1554e61ae01c..d64e27117e3a 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/dev-python/gitdb2/Manifest b/dev-python/gitdb2/Manifest
deleted file mode 100644
index 2d74781ebfa6..000000000000
--- a/dev-python/gitdb2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gitdb2-2.0.3.tar.gz 392632 BLAKE2B c1313a8f571706cfb651dc114df98e85e385fbd7df40688386faf290cf177d282e6e3760ee43eb54d1562582755b6070a992f1f55a1821fef1e0e015f5cd09b0 SHA512 4be643b933b47f5511702aa9df5c3210847f059dff9a4794779040660cd60c5af7de5072eb18bc17971edba9a5551e9ba51dbe360194b7d454ee4f23348c8063
diff --git a/dev-python/gitdb2/gitdb2-2.0.3.ebuild b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
deleted file mode 100644
index 740304cc08f0..000000000000
--- a/dev-python/gitdb2/gitdb2-2.0.3.ebuild
+++ /dev/null
@@ -1,57 +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,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="GitDB is a pure-Python git object database"
-HOMEPAGE="
-	https://github.com/gitpython-developers/gitdb
-	https://pypi.org/project/gitdb2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-python/gitdb[${PYTHON_USEDEP}]
-	>=dev-python/smmap2-2.0.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-src_test() {
-	local i
-
-	mkdir "${T}"/repo || die
-	cd "${T}"/repo || die
-
-	for (( i = 0; i < 2500; ++i )); do
-		echo "${i}" > file"${i}" || die
-	done
-
-	git init || die
-	git config user.email "you@example.com" || die
-	git config user.name "Your Name" || die
-	git add -A || die
-	git commit -q -m ".." || die
-	git clone --bare "${T}"/repo "${T}"/repo.git || die
-	cd "${S}" || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	#TRAVIS=1 disables performance tests which rely on the gitdb repo
-	local -x TRAVIS=1
-	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/gitdb2/metadata.xml b/dev-python/gitdb2/metadata.xml
deleted file mode 100644
index 3cb910293be3..000000000000
--- a/dev-python/gitdb2/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">gitdb2</remote-id>
-    <remote-id type="github">gitpython-developers/gitdb</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index f3ce28c71547..19b5e349d597 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,2 +1,3 @@
 DIST google-api-core-1.17.0.tar.gz 98660 BLAKE2B 7959f429dbbfd8de658b11d0ee5be253cb53d930f8b37a140dbdc89a0d25ecdc640fc91476138471603efbe1e6078d668bc3f0e06c1fb1481960970a6f5632dc SHA512 fd609ce85bde22b09653bf46dd7bcc504ed93b19f8832c28f1d26ecb38a01e00380bd715191152a8d109e8c3235951b60525d4692fb4ba0eccb11a3b1df58cd2
 DIST google-api-core-1.24.0.tar.gz 129718 BLAKE2B 08bb8aef03d5f5cbc96c06c01d103e1e569f15bad5084ba24a5e13f732b10d9d97a299fe22db7dfdaea73809e9458b811de87a028f77dcb00ca62fc069af63b1 SHA512 9517e86389edb824fe178128003fa245857de47f4b2416e0a345b66e02fe5fb109b7a72f2e9adfd52478862165548ce6945761a5a2ca02eda4a0187ca608760b
+DIST google-api-core-1.25.0.tar.gz 130928 BLAKE2B be7864046b2d04ecbbcf368803e77eb472a06cbb0f1601e8c95209bbdbeff6a335a5cc7f75fd89e8e9a91b566aa5d50a9b06ebad4c65c59f54de9d5c7a2951e7 SHA512 d8a1f973ad5bece84fe413528491a37d89ca39d9638a8508ec0cf8359cc238ea62c76e2563cb5ef995e4d0997dd3e4aa1feda7d0e48c21f85851a50f7f90404c
diff --git a/dev-python/google-api-core/google-api-core-1.25.0.ebuild b/dev-python/google-api-core/google-api-core-1.25.0.ebuild
new file mode 100644
index 000000000000..0d247aad2687
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-1.25.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="https://github.com/googleapis/python-api-core
+	https://googleapis.dev/python/google-api-core/latest"
+SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P//google/python}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-api-core/metadata.xml b/dev-python/google-api-core/metadata.xml
index 9c4b30449546..ed92687a572a 100644
--- a/dev-python/google-api-core/metadata.xml
+++ b/dev-python/google-api-core/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">google-api-core</remote-id>
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index a31de1663821..4a95bd631668 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,2 +1 @@
-DIST google-auth-1.20.1.tar.gz 107375 BLAKE2B 2f57cd9752c46891c59ed13e2ec8c6f98e5b3cd07d329769a78872877a17580c1ff5bb9da0381ef9bd4b6b9f72f04125ef71102543cfe1dc7bc3b09a5d5d9039 SHA512 6aad44b58c71f96c686606d6e8b6f273c64ce1559737920ccc31ad761442cad7f5fab19a59daee9408b284405a00c2de769c00221ac91bcfdd48851dba6f680f
 DIST google-auth-1.24.0.tar.gz 120351 BLAKE2B b0a78ad87622bc806cce72847d5dad3844afe080ffbcd822575dab6208952806360bed4e8756133d5b4fe2755f6cbeeb239b8f51634dd3d4cede9346372b689a SHA512 3e678dd946eb6c3c865cd35df1480a96ed35cf14b973f2239c5213b223a6569b4a9642609ac51243af75c662a08bbf0518d8592db97af297cf67c52b83019e30
diff --git a/dev-python/google-auth/google-auth-1.20.1.ebuild b/dev-python/google-auth/google-auth-1.20.1.ebuild
deleted file mode 100644
index e70df7038423..000000000000
--- a/dev-python/google-auth/google-auth-1.20.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/google-auth-library-python https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# delete stray files included in the tarball
-	find "${S}"/tests -name '*.pyc' -delete || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-1.24.0.ebuild b/dev-python/google-auth/google-auth-1.24.0.ebuild
index 718fca9387bb..88e4d1589e40 100644
--- a/dev-python/google-auth/google-auth-1.24.0.ebuild
+++ b/dev-python/google-auth/google-auth-1.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,12 +9,14 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Google Authentication Library"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/google-auth-library-python https://pypi.org/project/google-auth/"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/google-auth/metadata.xml b/dev-python/google-auth/metadata.xml
index 3960cb0145a7..12630dae7363 100644
--- a/dev-python/google-auth/metadata.xml
+++ b/dev-python/google-auth/metadata.xml
@@ -8,7 +8,7 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">google-auth</remote-id>
-		<remote-id type="github">GoogleCloudPlatform/google-auth-library-python</remote-id>
+		<remote-id type="github">googleapis/google-auth-library-python</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index 33b26cd26986..eba7a6ec3e6e 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,2 +1 @@
-DIST googleapis-common-protos-1.51.0.tar.gz 35176 BLAKE2B 517004426bb04dc58b85a43fc4268407bbb3a5b6abc1949bda39e03a08a506e727e2bd1741180dc03695b09f4f094c55fe836d275b2c2de146459c399f584355 SHA512 31b6754d5541de4a6ce13e1e54dc54ee29c8153b57de3d0faf40bb236b6af9bee0516957f4b1f64f4404d713e3185126ef782a7825747fede827a8a8e604e303
 DIST googleapis-common-protos-1.52.0.tar.gz 39383 BLAKE2B 0b2a21b62c1e48cec91b6fe0d141baa1c1081b621c27d60d0a045932388d8c1b8c1eaee3219cdc3af1919b19358e6ec759e109865367b1b7879b3af05f7ec9be SHA512 470d949379a6aa21875b1c5851de54391847f89136b0b7ee84ac68931388a6294f53be167b6095265b2c2c0f30c7d8c71a4e5a546638670d24a9bd544538ff1a
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
deleted file mode 100644
index 9f3842cc3cda..000000000000
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="python classes generated from the common protos in the googleapis repository"
-HOMEPAGE="https://pypi.org/project/googleapis-common-protos/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
-
-# no tests as this is all generated code
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.52.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.52.0.ebuild
index 47423952d5e7..8023415d6798 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.52.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.52.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/graph-tool/metadata.xml b/dev-python/graph-tool/metadata.xml
index dfb4c0cc18a9..5f12fedefccd 100644
--- a/dev-python/graph-tool/metadata.xml
+++ b/dev-python/graph-tool/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>chr@chymera.eu</email>
+		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<upstream>
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index 92fee8679bd4..ff6c67433ce8 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,2 +1,2 @@
-DIST graphviz-0.14.2.zip 184157 BLAKE2B 668c200964867f416e2b15454793fdd0673a110461a85764699727b0430c812e18fb4285e031f5f611ff86bd205cbf927c695015d55ac169a594e616ab74067a SHA512 a8bcf395ebed7c43f5355bc167aae157c6eddb127860a6fb58eba0d882235e04a33a5bcf589245f484e3af9dce5eff8a5893ced73203901c92afd92c4f5b05be
 DIST graphviz-0.15.zip 183103 BLAKE2B 81d4a121ca2654e6c08570ede7a1f5ef580b6a281358bf32f4178898fc12cfae21b10ce8f4f6fba4644e3275162cc09dbf5ae287a114fb8503be98d6a2fbf728 SHA512 c2a77f0d52595a70b4f8ccd906907453b59622560f0ff84e267e874f5a1dc9a4b721192d236b0519ee7ec85bae9b225b9919ae51bcf599c93bd5816934afd6cc
+DIST graphviz-0.16.zip 193031 BLAKE2B abedbe170eaf9d3ad83f91b5ad13aa9fbda8669ac19ebbd1087aeab3f9401b0b8e6557313e04d791451ee501c75bc2843d89d1a0f789a219b0db771467b4b8bb SHA512 7896901decf712657d4cb16fad58eab8492e1476e60a32b1a7fa37ede2e9c47ed31c00b7dedcaafdee291e2cfe6b2e2affa352282665782829fd3fb2f30bdf92
diff --git a/dev-python/graphviz/graphviz-0.15.ebuild b/dev-python/graphviz/graphviz-0.15.ebuild
index 17ffc2e59e1d..f2208e89042d 100644
--- a/dev-python/graphviz/graphviz-0.15.ebuild
+++ b/dev-python/graphviz/graphviz-0.15.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"
@@ -21,6 +21,7 @@ BDEPEND="
 	test? ( ${RDEPEND}
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-mock-1.8[${PYTHON_USEDEP}]
+		media-gfx/graphviz[gts,pdf]
 	)
 "
 
diff --git a/dev-python/graphviz/graphviz-0.14.2.ebuild b/dev-python/graphviz/graphviz-0.16.ebuild
index ba2174239689..66f39b6bbef2 100644
--- a/dev-python/graphviz/graphviz-0.14.2.ebuild
+++ b/dev-python/graphviz/graphviz-0.16.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"
@@ -21,6 +21,7 @@ BDEPEND="
 	test? ( ${RDEPEND}
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-mock-1.8[${PYTHON_USEDEP}]
+		media-gfx/graphviz[gts,pdf]
 	)
 "
 
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index f87324766557..7ec4497a33b9 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1 +1,2 @@
 DIST greenlet-0.4.17.tar.gz 61381 BLAKE2B fd5b8ed72acd390f3d5fe3ca1d5894bc47278b1f0e04e4fe5c6015c60dfb3109e766dc6072bf85b96760f673a1af08cd546171906800a1221a216899077a908e SHA512 41afd80a6cd5e9cf9c8149016f24d0944d2651288d50094ef04bb6759202903c436af639872d7aab631ed8fe13aad7d4405beb428415b198a3ba30a96d4bd3de
+DIST greenlet-1.0.0.tar.gz 84525 BLAKE2B b5b7094a3dd7b6426fb93fb147077e98e7313700be7a94c221cda3df3bb12f5322f0cea786b77b7b6500e5e97f71ba19b2c32535ccdbdf8a14c3db049cc2850a SHA512 7b615792c340e0eb8ca61bd09bde48ed15110d97254910bd8598312e15adb7267ba795e9e6b52f0998db27d8413d2e1aa9e977511c0d09cd3a5583b37475f882
diff --git a/dev-python/greenlet/greenlet-1.0.0.ebuild b/dev-python/greenlet/greenlet-1.0.0.ebuild
new file mode 100644
index 000000000000..759433c1abb8
--- /dev/null
+++ b/dev-python/greenlet/greenlet-1.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Note: greenlet is built-in in pypy
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Lightweight in-process concurrent programming"
+HOMEPAGE="https://pypi.org/project/greenlet/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_sphinx doc --no-autodoc
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v greenlet.tests ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 8b912edf166e..51b51c2339f2 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,2 +1 @@
-DIST grpcio-1.28.1.tar.gz 19511346 BLAKE2B 01ebdeddcba5efbb67880693ede04ccd828771fe73def24a91d882c28f5cf6f14215daca212df1d8bb9372f385aff1e31418870437c87343f218e7b78a06b04c SHA512 12feaee3816a5e7b20b648a144d37f7e550a057112f5460bc4ec016885461951148cd4d2900fbfc905f76059ef29ae4c4d1d5a3216e5e3a2d17048c8b45f394f
 DIST grpcio-1.32.0.tar.gz 20809917 BLAKE2B e28cb44d09fd775b9b6dc87dcd52bf7f144643b09912ff8b76bf39cb250743f90bc7e3769252d47f205f9532157ae68b6ac0a9202158cb14e7b9ad448d951656 SHA512 f802a7b83bd166502fdcbfaf162652adcda36da1b2e91b5073e3b3d97d38191fe989a6dcbec6c1bf27fff162633e54bdbdb20a92e74e14280fac4576baa92157
diff --git a/dev-python/grpcio/grpcio-1.28.1.ebuild b/dev-python/grpcio/grpcio-1.28.1.ebuild
deleted file mode 100644
index 2491ba2eff37..000000000000
--- a/dev-python/grpcio/grpcio-1.28.1.ebuild
+++ /dev/null
@@ -1,37 +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,9,10} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/setup.py-respect-cc.patch" )
-
-python_configure_all() {
-	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio/grpcio-1.32.0-r1.ebuild b/dev-python/grpcio/grpcio-1.32.0-r1.ebuild
index a57088d6f6d4..437df9525909 100644
--- a/dev-python/grpcio/grpcio-1.32.0-r1.ebuild
+++ b/dev-python/grpcio/grpcio-1.32.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist]
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index f12001a1319a..77c49e76468e 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1 +1,2 @@
 DIST gsd-v1.5.3.tar.gz 240114 BLAKE2B 076d888f03350fba2388c907787354e878a1536c7d85c759eb3513102ee2abffe2c9313a6e9e208726d66d6324dac02ae70d8872342f9bcb162ad13d9a23dbc3 SHA512 893db74dc481da47d6c51ea0d0d9faefbe164edfaeb5a2ed73e25acbd9dc42c3cf28cbc0d9257c6bf0cc0e9911ab85cfa72997886350c0e7c125d30636ec432a
+DIST gsd-v2.4.0.tar.gz 112743 BLAKE2B d35a1108cb12f58f8b6cc980c156ae2dceb0c0d2c4d41d35ae29bae1bc342654e148616e64a6dfcb07bdbb1156299d8d05914d028dfb877979c8a17f299feb06 SHA512 47e136018d813f48c5d78cc31786a5bb33992f488a4d907b450a570bb90f9ffeb233e82f9686d09aeb3541fca1518294d5bf63c6a896635f30ad369350012458
diff --git a/dev-python/gsd/gsd-2.4.0.ebuild b/dev-python/gsd/gsd-2.4.0.ebuild
new file mode 100644
index 000000000000..246b162cb351
--- /dev/null
+++ b/dev-python/gsd/gsd-2.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="GSD - file format specification and a library to read and write it"
+HOMEPAGE="https://github.com/glotzerlab/gsd"
+SRC_URI="https://github.com/glotzerlab/gsd/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}"
+
+S="${WORKDIR}/${PN}-v${PV}"
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index 7c2572a027b8..301b399768d2 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1 +1,2 @@
 DIST guessit-3.1.1.tar.gz 147605 BLAKE2B 3b11747b652e922aada12ce771c1e91e8842c78c221ac39c068488ae6cae95ebc6d9f6d8849aaef11d522e2c7d6e6f8e34981179e48d9db649e811c5fa2e52ef SHA512 6a02c4024d286cf49c62e072bcb616a052cec1ce51d364b17cea1768504c4ecebba914a3bf5beda9a61dca0e7764c8642cb5b918a20fb25cdd7120ad1667825f
+DIST guessit-3.2.0.tar.gz 147286 BLAKE2B 0ab249eb82204fd58a6d6c960b11b2009a3055ae91a91c244192a2bd9832e7356f444a6b4291cf56d55a4c9a1cd0ccec22d527114d61f9f5888a8439918ba6bc SHA512 5eaa0ad8cdf60812bebf10af51f62095baa70f48b66a052002fceb0d705daab3b8bcd2cb0fc3d18b63b9f4aa8118b9d85283bebdcfdb8ed4204e1b7e2b5ae78c
diff --git a/dev-python/guessit/guessit-3.2.0.ebuild b/dev-python/guessit/guessit-3.2.0.ebuild
new file mode 100644
index 000000000000..ac40d9001c6f
--- /dev/null
+++ b/dev-python/guessit/guessit-3.2.0.ebuild
@@ -0,0 +1,38 @@
+# 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,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for guessing information from video filenames"
+HOMEPAGE="https://github.com/guessit-io/guessit
+	https://pypi.org/project/guessit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
+	>=dev-python/rebulk-3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Disable benchmarks as they require unavailable pytest-benchmark.
+	rm guessit/test/test_benchmark.py || die
+	sed -i -e "s|'pytest-benchmark',||g" setup.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index 5978c097d3e7..9ae4e0ec8302 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1 +1,2 @@
 DIST h11-0.11.0.tar.gz 97509 BLAKE2B 51e4eee959f36775317ac67450c80a6484309efcdd5adad3737d2d80ab5d9808d5d8aeb0118aa79f88848c052c330542ebfb4c03b96bdd805015fd9ad9f9fd41 SHA512 13dba59afd949d715fd693e5224e57dea5c923eb91b0981a5b5987bbe6e6e00e32552e1602353a48458615a8dd21f2a561961747ae15291eb3462fe42cef3f82
+DIST h11-0.12.0.tar.gz 98121 BLAKE2B 8e510461e0256a49166ad3b11394d715634d036642629b216f0c94785245909fc3d9ab89ba3048b857f1ae030cae7ed0b3195745739d80c74028a85848a762db SHA512 ba2a2c185af270185ba5e1fd80ec9308e35afcd60a125a77cbeae2669f462983d063339371312f154a7c80c154ac97796ab36782b36549235435dcfd81b93421
diff --git a/dev-python/sybil/sybil-2.0.0.ebuild b/dev-python/h11/h11-0.12.0.ebuild
index 265c8c70fbef..1af25da8d45b 100644
--- a/dev-python/sybil/sybil-2.0.0.ebuild
+++ b/dev-python/h11/h11-0.12.0.ebuild
@@ -1,13 +1,14 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
 inherit distutils-r1
 
-DESCRIPTION="Automated testing for the examples in your documentation"
-HOMEPAGE="https://github.com/cjw296/sybil"
+DESCRIPTION="A pure-Python implementation of HTTP/1.1 inspired by hyper-h2"
+HOMEPAGE="https://github.com/python-hyper/h11/ https://pypi.org/project/h11/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index 821ff7c7cd4a..8d1b8e5080f5 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,2 +1 @@
 DIST hcloud-python-1.10.0.tar.gz 82155 BLAKE2B a22ad24863f416b039a04d9e82675fa7923303d73aff6045a2247fc755db1740cfd98418a84758a15eb96ff666bc6e395a969cf59a234571414087fb03cd533f SHA512 c16e070c39e514faf002f7c78ed8fca6ac762775a75bb1a04f3033f6cd9ca6424b595dbd636ad451bce1eb5b52214373ddd29513937c42c84b4a0a7d2e84fb3f
-DIST hcloud-python-1.9.0.tar.gz 88885 BLAKE2B 455f955caddd8e72d02df57da2e08f395b9845f9658b73dd9f96b1fd73d7793fa13319d8365903599c000a803c9374dee7b50c5ad2a9ba449027d3dc602601fe SHA512 6da2a3eb7e4a4d7f13137167199f01f370210e6c139f0cd8a8e447ea3f14101d4b37b104ed387b1713ad62351ae72c8add7970e878571caa4242e6e347ef8833
diff --git a/dev-python/hcloud-python/hcloud-python-1.10.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.10.0.ebuild
index 7c8358bb7aba..a9a1b7113b54 100644
--- a/dev-python/hcloud-python/hcloud-python-1.10.0.ebuild
+++ b/dev-python/hcloud-python/hcloud-python-1.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc examples"
 
 COMMON_DEPEND=">=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
diff --git a/dev-python/hcloud-python/hcloud-python-1.9.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.9.0.ebuild
deleted file mode 100644
index a9a1b7113b54..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.9.0.ebuild
+++ /dev/null
@@ -1,55 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
-SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc examples"
-
-COMMON_DEPEND=">=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]"
-
-BDEPEND="${COMMON_DEPEND}
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme
-	)
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/isort[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
-
-distutils_enable_tests pytest
-
-src_test() {
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	rm -fr tests/integration
-	default
-}
diff --git a/dev-python/hgdistver/Manifest b/dev-python/hgdistver/Manifest
deleted file mode 100644
index 70d6062df6be..000000000000
--- a/dev-python/hgdistver/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hgdistver-0.25.tar.gz 9879 BLAKE2B 71caa059359b8ea1be58b6463b260741586ab81e6d8afac5dcadbb35604a564b947032ae645cec683a3c692de8307b23f7abea40d0a1f3802b5257870b7e3e02 SHA512 3fef872af3c8fffb3ba612d2505260468b510c17219257640a4bcf3dc6568fdf59eb3cc544ef41b7eab32ee6cedcd81bfffce753c98bbc7d1e538fe4937d039c
diff --git a/dev-python/hgdistver/hgdistver-0.25.ebuild b/dev-python/hgdistver/hgdistver-0.25.ebuild
deleted file mode 100644
index e896b3973673..000000000000
--- a/dev-python/hgdistver/hgdistver-0.25.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="utility lib to generate python package version infos from mercurial tags"
-HOMEPAGE="https://pypi.org/project/hgdistver/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/mercurial
-	)"
-RDEPEND=""
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/hgdistver/metadata.xml b/dev-python/hgdistver/metadata.xml
deleted file mode 100644
index 07f6f115f26a..000000000000
--- a/dev-python/hgdistver/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">hgdistver</remote-id>
-    <remote-id type="bitbucket">RonnyPfannschmidt/hgdistver</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index d60dee5ddaf6..3504fdc829af 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,2 +1 @@
-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
deleted file mode 100644
index b3d2f71538e3..000000000000
--- a/dev-python/hiredis/hiredis-1.0.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_{6,7,8,9,10} )
-
-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
deleted file mode 100644
index badb8c56a91b..000000000000
--- a/dev-python/hiredis/hiredis-1.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,9,10} )
-
-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="dev-libs/hiredis:0/0.14"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-system-libs.patch
-	"${FILESDIR}"/${P}-api-0.14.patch
-)
-
-python_test() {
-	cd test
-	"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
-}
diff --git a/dev-python/hiredis/hiredis-1.1.0.ebuild b/dev-python/hiredis/hiredis-1.1.0.ebuild
index 69a69db6e55a..b4c77ac06754 100644
--- a/dev-python/hiredis/hiredis-1.1.0.ebuild
+++ b/dev-python/hiredis/hiredis-1.1.0.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/pietern/hiredis-py"
+HOMEPAGE="https://github.com/redis/hiredis-py/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="system-libs"
 
 DEPEND="system-libs? ( dev-libs/hiredis:0/0.14 )"
@@ -27,6 +27,6 @@ src_prepare() {
 }
 
 python_test() {
-	cd test
+	cd test || die
 	"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
 }
diff --git a/dev-python/hiredis/metadata.xml b/dev-python/hiredis/metadata.xml
index 285da38ba1b3..6d50eacf774f 100644
--- a/dev-python/hiredis/metadata.xml
+++ b/dev-python/hiredis/metadata.xml
@@ -11,7 +11,7 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">hiredis</remote-id>
-    <remote-id type="github">pietern/hiredis-py</remote-id>
+    <remote-id type="github">redis/hiredis-py</remote-id>
   </upstream>
   <use>
     <flag name="system-libs">Use dev-libs/hiredis from system</flag>
diff --git a/dev-python/httpbin/httpbin-0.7.0-r1.ebuild b/dev-python/httpbin/httpbin-0.7.0-r1.ebuild
deleted file mode 100644
index 890cc432f1a8..000000000000
--- a/dev-python/httpbin/httpbin-0.7.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP Request and Response Service"
-HOMEPAGE="https://github.com/postmanlabs/httpbin
-	https://pypi.org/project/httpbin/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/brotlipy[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.14.1[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	# do not import raven if it's not going to be used
-	# (upstream removed it completely in git anyway)
-	"${FILESDIR}"/httpbin-0.7.0-optional-raven.patch
-	# fix tests with new versions of werkzeug
-	"${FILESDIR}"/httpbin-0.7.0-test-werkzeug.patch
-)
-
-distutils_enable_tests unittest
diff --git a/dev-python/httpbin/httpbin-0.7.0-r2.ebuild b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
index 0aedd6b3f510..235f59a0c1d7 100644
--- a/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/brotlicffi[${PYTHON_USEDEP}]
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index bad5cea5721b..b76e6e579dc4 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,3 +1,2 @@
-DIST httpretty-0.9.6.tar.gz 7147633 BLAKE2B e1d02ddfce5ca987c6ef1a17723544f86a8573c2a6a26ec197072021e52015efce5064af21bfbe1ec03f3ac11c21717a80f114b5be2526b113e3bc0a608702f4 SHA512 bc1c64d34370209c732bc12dd9935600b647507ab2c8f18c85f348e9b5e853618ba39e10e5a073b35036e6cbe3db2cb7a342a721d0e4affa81fe178fd0b75d92
-DIST httpretty-1.0.2.tar.gz 399185 BLAKE2B 033e954fccf6a351c09dac3c1585ddc65f064eca109dfd8f499fd510ea09ba3ce5198d3f4b54fb832b47425ab721ddc1b2da596b6066028bda1f0a1303cdc0ed SHA512 f9ef1c82f4fe3a31696e06228cea512664c5118b3c32910d7810d1fcf16b05d31b9b55db7bb6bd64967aadb162a2952757627439769db9117164b8248de9049c
 DIST httpretty-1.0.3.tar.gz 411707 BLAKE2B b2211457c937e19f8110bc28446a2b78a8042a742341c0492589def7447e819f051d301e9d254260778f349302ccf6fc163a9f2280a55af925ae353752450320 SHA512 a6349257376c12198d0bf7923245c34f6b8a0889946ba0c2551fd3379a8d9a8e4610de81c66f945656c1879ad3fb1485f2f4148634fcc4e156b9f0a59f7dd758
+DIST httpretty-1.0.5.tar.gz 414946 BLAKE2B 8bbaac3d53fbf5744f7bf8ef952bd9305112934af24809a233ef0446886e09b7d2a897e69aded12d9e715580305d729609365b0be55f8d324cc48e6aa0699d75 SHA512 2e5f4834848ab1a0b84230f000afb0409b30b3cc1769d36ad61f712f56abc8d6076e7507598f791fe343ce282cf9e26939add71ef794ead2836badfc2321d6bb
diff --git a/dev-python/httpretty/httpretty-0.9.6.ebuild b/dev-python/httpretty/httpretty-0.9.6.ebuild
deleted file mode 100644
index 01a31fccd4c6..000000000000
--- a/dev-python/httpretty/httpretty-0.9.6.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,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-)"
-
-python_prepare_all() {
-	# remove useless deps
-	sed -i -e '/randomly/d' -e '/rednose/d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/httpretty/httpretty-1.0.3.ebuild b/dev-python/httpretty/httpretty-1.0.3.ebuild
index b07468e2c4d9..e73333c97d5e 100644
--- a/dev-python/httpretty/httpretty-1.0.3.ebuild
+++ b/dev-python/httpretty/httpretty-1.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/httpretty/httpretty-1.0.2-r1.ebuild b/dev-python/httpretty/httpretty-1.0.5.ebuild
index 57977654ac69..033b32f166cb 100644
--- a/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
+++ b/dev-python/httpretty/httpretty-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/httpstat/Manifest b/dev-python/httpstat/Manifest
deleted file mode 100644
index 89394e69be18..000000000000
--- a/dev-python/httpstat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST httpstat-1.3.0.tar.gz 97358 BLAKE2B e80a3bd6a6bf7dec1e045e39e9b4491cb81623fa432e32f238fedb71a97fcbd3c362d3211b5cee85e8ed293bc7493d8eb262a0821e473f0a7c8df3f2b8c6fa3e SHA512 6620f7d2da8740da9febdc5d0a177890cc5e85a3a41445c3182f6a8906cad05a475b7547737e60331957a5f48e668194d9592f4e53005a5666ef99b704afbc91
diff --git a/dev-python/httpstat/files/httpstat-1.2.1-gentoo-tests.patch b/dev-python/httpstat/files/httpstat-1.2.1-gentoo-tests.patch
deleted file mode 100644
index 2ce199a94b75..000000000000
--- a/dev-python/httpstat/files/httpstat-1.2.1-gentoo-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-- Testscript doesn't need to run tests for multiple python implementations,
-  PM will take care of that.
-
-- Disabling test which requires specific locales.
-
---- a/httpstat_test.sh
-+++ b/httpstat_test.sh
-@@ -19,8 +19,7 @@ function title() {
- http_url="google.com"
- https_url="https://http2.akamai.com"
- 
--for pybin in python python3; do
--#for pybin in python; do
-+for pybin in python; do
-     echo
-     echo "# Test in $pybin"
- 
-@@ -40,9 +39,9 @@ for pybin in python python3; do
-     main_silent $https_url
-     assert_exit 0
- 
--    title "comma decimal language (ru_RU)"
--    LC_ALL=ru_RU main_silent $http_url
--    assert_exit 0
-+    #title "comma decimal language (ru_RU)"
-+    #LC_ALL=ru_RU main_silent $http_url
-+    #assert_exit 0
- 
-     title "HTTPSTAT_DEBUG"
-     HTTPSTAT_DEBUG=true main $http_url | grep -q 'HTTPSTAT_DEBUG=true'
diff --git a/dev-python/httpstat/httpstat-1.3.0.ebuild b/dev-python/httpstat/httpstat-1.3.0.ebuild
deleted file mode 100644
index 3751cf73dc9e..000000000000
--- a/dev-python/httpstat/httpstat-1.3.0.ebuild
+++ /dev/null
@@ -1,28 +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,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="httpstat visualizes cURL statistics in a way of beauty and clarity"
-HOMEPAGE="https://github.com/reorx/httpstat"
-SRC_URI="https://github.com/reorx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="net-misc/curl:*"
-
-# Requires access to google.com and http2.akamai.com
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.1-gentoo-tests.patch )
-
-python_test() {
-	./httpstat_test.sh || die
-}
diff --git a/dev-python/httpstat/metadata.xml b/dev-python/httpstat/metadata.xml
deleted file mode 100644
index f050192c9c04..000000000000
--- a/dev-python/httpstat/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://github.com/reorx/httpstat/issues</bugs-to>
-		<remote-id type="github">reorx/httpstat</remote-id>
-		<remote-id type="pypi">httpstat</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 837989d96cfa..4884437c0e85 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,2 +1 @@
-DIST humanize-3.1.0.tar.gz 54352 BLAKE2B 0e25f4f7f01244f5b24a33c54546c2b2d82e0e069d2cabbe67ff0e5f8e2bc9d3aa2eb7f4d63d4a01dc8ff4ddcfee030b33015ede00d769dfafccb6c2af95171a SHA512 71cb2766a791481f4dc5e02b77357e8e4e7332e533ee055a207cf145f2b2f9041c5bc4ce25f061f0cc1498f37edbc6243f63b888a322c0cf19e5216e120542dc
 DIST humanize-3.2.0.tar.gz 53976 BLAKE2B 2e9347418ffa103c6a66583136aa0c79bce669b48fcbc01bf482ba16659af14d4b4a88e78167e8013a8ede6467ed7b7f5eea8f46ed4234294a79b0c63fabd17c SHA512 448919e762e0ecc95f5a7158e0dd8bc028d173ee236be8e15fd0283741af037af1bcdc671ed83b0c16c1998dc0a70debf11cb1c349085530e458bc7aa2f6dde4
diff --git a/dev-python/humanize/humanize-3.1.0.ebuild b/dev-python/humanize/humanize-3.1.0.ebuild
deleted file mode 100644
index 2bd16ee4d9ef..000000000000
--- a/dev-python/humanize/humanize-3.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# The package uses pkg_resources to determine its version
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/humanize/humanize-3.2.0.ebuild b/dev-python/humanize/humanize-3.2.0.ebuild
index f7c2754b14a7..fa2f785a7a39 100644
--- a/dev-python/humanize/humanize-3.2.0.ebuild
+++ b/dev-python/humanize/humanize-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index 94926bbd5d4b..e528cc8bc8d5 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -1 +1,2 @@
 DIST hyperlink-20.0.1.tar.gz 140291 BLAKE2B ee8c741d4cb87e4a577e1c9a45614f5f47e086f27b60a75897b66684ab5927da73ccaba47b16b770f0277a52351cc732cf74762e29c83644c220ed59c67a18d0 SHA512 f935c09d35baf8a8a3c8d4dc6aaf64135d13dda4636187f5d47f3fe4de675498efa29cd93d802c0912db2fa371d0e58213767b1c3c42e5a14bb837ea96a72193
+DIST hyperlink-21.0.0.tar.gz 140743 BLAKE2B d432692172dc5cbb4f7cc1dbbfaf87871f0d9b2519334d112841abf8d958232516249472611e986b20e6fd298f5013db38f214fa332e1b121bd80a420b4cc614 SHA512 9e0e9273dde1b0a41329a74fbb26c4f327b87f387ee64b9a2ab641ca5cc8b9ea0516884415e9adf1d4880ae9c053a5cba2c550fc508bb56fddb44a543d5da860
diff --git a/dev-python/hyperlink/hyperlink-21.0.0.ebuild b/dev-python/hyperlink/hyperlink-21.0.0.ebuild
new file mode 100644
index 000000000000..395eec9099cc
--- /dev/null
+++ b/dev-python/hyperlink/hyperlink-21.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A featureful, correct URL for Python"
+HOMEPAGE="https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	dev-python/idna[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# suppresses hypothesis health checks
+	local -x CI=1
+	distutils-r1_src_test
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 56ee4a0bf079..c7d237a8cf9a 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,9 +1,4 @@
-DIST hypothesis-python-5.24.4.tar.gz 9054743 BLAKE2B 5c64c86ed58d8f0e4a07390b1b1b5e405878b9632bf14233e0515ad9d98ec6ddcc57bf39be6b61f53739d34e393b3af64c0d362880019d29a649a9523a0204e3 SHA512 147f4fa47b54bf3ec4dfcebf2a6c98cee26ea6780244ef99e181bada65978375ca7731ed05cb98f1b92f7a44a357faae374d97d489ec6e2318ff94e526cd9a40
-DIST hypothesis-python-5.41.1.tar.gz 9095771 BLAKE2B 29c5c091f4b827d1f1e6276d0401c1a673077304b3ee8b0252536c3eeda066a4cfa764856edb222ba6cbaebb424b08aebc8d8ec00c5e0d445774b1c62ed98593 SHA512 b1f02e32e6c5bdb6ca0a338901715508a03d2734898c673c5b3a5b25dee34922d7fbfcc2534b0c658d003d5de3e97abecb5a9b4f00ada0cc85c457b4b870a873
-DIST hypothesis-python-5.41.3.tar.gz 9095982 BLAKE2B 3a1b7052b3f71d1f8139101d16f2f74c2d434514a201b7e04e5452ac2c5fbe7288d592c0020769f3a48f73347cdce53f507ab65db7bfb4f3823d0f7997e48058 SHA512 974dee6040222fa55729257cea4e3c4c049625a2a5dfddbc12667dbd58dfe31718474ce8e9de81519e998c7a0c8ff01920e0aa2bca9fb7100754e985177f4b69
-DIST hypothesis-python-5.41.4.tar.gz 9098296 BLAKE2B ef471172039251129d03faea722fc190135ed3d2e94a9bc6d4ad4f9676bc819e641dd0c893352168425ce987128e73d8844f622e57a7c161d33f75ea0f4b7312 SHA512 215f2e4479eca10d8ca590ffe0623f8994c7061fddabfe2737d0f3bba2f403042ad8e75730361417a1c9c32d3e261c8daa84032f6963ef6526e6b0067a156658
-DIST hypothesis-python-5.41.5.tar.gz 9098660 BLAKE2B 6caa742d34a3a2aeb6c6fdec3f8772e5221e1d0b2becc1362b657d383387f2a1152756222cfe86ffbb3e23a53e395050a16325d74ec9e03822a5c0020505b38e SHA512 b220a48e5746bacc6fa257f79feed0dc2c0a9f66862aba74806fb1ac3d06f380620410c9c46c377c50e4fa7c3171d5b31ce2759e7a3e0e2abd0920b237242dd6
-DIST hypothesis-python-5.43.0.tar.gz 9103047 BLAKE2B c9c8262fb32dfdb48b52ad11cd18f907d488802f1af04d7677e260abf24598afd5f89bf3f1a42c919460d5ea48b1d6979da5215ef9877260c601b133076bbd05 SHA512 129760a9c58f264e25c403fcacf9e1ab41267faee637856230341a91d6965a6c2fd05b9a8a12b6977377f8abc26ed7151384ad08195b03ddf62e8445b216eacf
-DIST hypothesis-python-5.43.1.tar.gz 9103292 BLAKE2B aa718b98c7a0e16322cbde38f0768e5ccf6716e2cd08aa97b5ed4d36c7ed9565e5ccba76443d74d253adff557918400ec384ee39c630523a31356c80dce15622 SHA512 428a7f1cfb379ebb3d3bea01727ad1633d2e591bea00de15d7967856af8b1aaa9371d278e51be9a0a902adaeff63215a2e87205309f058e371f6ad331737a11f
-DIST hypothesis-python-5.43.2.tar.gz 9103806 BLAKE2B 7ef4bfdcd12782a3445d5094ab5111b305743c1c11afd33f3f615e6fd863192cff37c9df7b42052a83d55ee16d570adfb08f1e1c610697f2c2a3295cf09528fa SHA512 c348568f00ce66c6cb53398a7f9b471ffa686cb9c4a4180ac00ba0edae76404c0a7e182f5df8a3c0738b9379f79bfb4b89fdb94bfe3529313a9a3c243a2658ae
-DIST hypothesis-python-5.43.3.tar.gz 9103991 BLAKE2B e374edf17571c33e48dc8d259db2fb23b9cc358f56189ebd60f3e9141ade7759eede1bdbd91d924f144a20b1ea0b7ec19817559b7f82a90f026ac101a7feeabd SHA512 392fb794fc5ba06acd1e465cf1500f742d8b056148540778f1ec9c5065be66c0f514f0fa6872337869079636c71235d51d4c6722a63b03037b689edd6f09809f
+DIST hypothesis-python-5.43.4.tar.gz 9104105 BLAKE2B 08b8c9ac7ac72afcc4556ae2167af7b4ab79d505da8c9f6a11c91d211f26ccf320c8f5ed41458f5e34f75614ad4aecdbf6df62275868dc079c037390dcbc9e08 SHA512 065e1bdd878eab35f38105e8da3f5cf108670a51fd48ea1996bebedf8c8a152386d0eb5284ed43d4e588695a408b3a455a2e4757430e31bb5dbf0ece1f64d294
+DIST hypothesis-python-5.49.0.tar.gz 9103591 BLAKE2B 158cbc38f6f2407d437656a7b94b5826193d427e06eca59d91b3fe85667282ec3392d72e7bbdf2bd952a495871a86814275883e2dcbc80758fcb3e68936d6d20 SHA512 96b7f98e7d87f82dac52a7b2de2bc0c29507cee05ee9a93f838e090e45a9f484ca75db1ab83ab52361b27e4e0f2747914ec09324fc188f6100c3397b1596778c
+DIST hypothesis-python-6.0.1.tar.gz 9104122 BLAKE2B c4702a2c94fb5ecfc44543b70995150090949067ca986f5671a936d5da651e2e1ed072457ed1238ae04549709019722f7501ff7c2a37c46da3d25b43fa416b08 SHA512 3981a40ba61ca38140582f46b1ebb1ac2fc0816e8210c37ddc91249515d035534208c6ba926f367607bbd79792383eb166c1f4710a8a5ba5e04876383ac44644
+DIST hypothesis-python-6.0.2.tar.gz 9104422 BLAKE2B 1f932e2e2c7f3b3f56863fecfeafe3d811fbc19dbb459b3e7497fb14d6b6ef73bf4c7c60957a4170594805e443a4730d5a0561fb2e6cb3ba10da801ef655a8b9 SHA512 7d3689c6964f5158b4ab7b638d43c44b145080e47b832405c50971ea986b2c78c9be648de78c9783c6adc34e117b90b2c2e4b684783a68acc6bdff51ee085248
diff --git a/dev-python/hypothesis/hypothesis-5.24.4.ebuild b/dev-python/hypothesis/hypothesis-5.24.4.ebuild
deleted file mode 100644
index e3d951b17b38..000000000000
--- a/dev-python/hypothesis/hypothesis-5.24.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-src_prepare() {
-	# avoid pytest-xdist dep for one test
-	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
-		tests/pytest/test_statistics.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv tests/cover tests/pytest tests/quality ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.41.1.ebuild b/dev-python/hypothesis/hypothesis-5.41.1.ebuild
deleted file mode 100644
index cb743f545faa..000000000000
--- a/dev-python/hypothesis/hypothesis-5.41.1.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,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="cli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{6..9})
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.41.3.ebuild b/dev-python/hypothesis/hypothesis-5.41.3.ebuild
deleted file mode 100644
index 0fafcf71e669..000000000000
--- a/dev-python/hypothesis/hypothesis-5.41.3.ebuild
+++ /dev/null
@@ -1,68 +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,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-IUSE="cli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{6..9})
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	local -x PYTHONPATH="${BUILD_DIR}/install/lib"
-	esetup.py install \
-		--root="${BUILD_DIR}/install" \
-		--install-lib=lib
-
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.43.1.ebuild b/dev-python/hypothesis/hypothesis-5.43.1.ebuild
deleted file mode 100644
index eb74be2fa846..000000000000
--- a/dev-python/hypothesis/hypothesis-5.43.1.ebuild
+++ /dev/null
@@ -1,64 +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,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-IUSE="cli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{6..9})
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.43.2.ebuild b/dev-python/hypothesis/hypothesis-5.43.2.ebuild
deleted file mode 100644
index eb74be2fa846..000000000000
--- a/dev-python/hypothesis/hypothesis-5.43.2.ebuild
+++ /dev/null
@@ -1,64 +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,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-IUSE="cli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{6..9})
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.41.5.ebuild b/dev-python/hypothesis/hypothesis-5.43.4.ebuild
index eb74be2fa846..51e94f5001a5 100644
--- a/dev-python/hypothesis/hypothesis-5.41.5.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.43.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
@@ -35,7 +35,7 @@ BDEPEND="
 		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		<dev-python/pytest-6.2[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		!!<dev-python/typing-3.7.4.1
 	)
diff --git a/dev-python/hypothesis/hypothesis-5.43.3.ebuild b/dev-python/hypothesis/hypothesis-5.49.0.ebuild
index 307da417cfd4..9c1c85cb43dc 100644
--- a/dev-python/hypothesis/hypothesis-5.43.3.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.49.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ BDEPEND="
 		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		<dev-python/pytest-6.2[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		!!<dev-python/typing-3.7.4.1
 	)
diff --git a/dev-python/hypothesis/hypothesis-5.43.0.ebuild b/dev-python/hypothesis/hypothesis-6.0.1.ebuild
index eb74be2fa846..9c1c85cb43dc 100644
--- a/dev-python/hypothesis/hypothesis-5.43.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
@@ -35,7 +35,7 @@ BDEPEND="
 		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		<dev-python/pytest-6.2[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		!!<dev-python/typing-3.7.4.1
 	)
diff --git a/dev-python/hypothesis/hypothesis-5.41.4.ebuild b/dev-python/hypothesis/hypothesis-6.0.2.ebuild
index eb74be2fa846..9c1c85cb43dc 100644
--- a/dev-python/hypothesis/hypothesis-5.41.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
@@ -35,7 +35,7 @@ BDEPEND="
 		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		<dev-python/pytest-6.2[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		!!<dev-python/typing-3.7.4.1
 	)
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index 5e36bfbf8643..f17c09e45ce1 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1 +1,3 @@
 DIST idna-2.10.tar.gz 175616 BLAKE2B 2b109491a5751811e6e85244133a1c66b04b577441c250e600a9cb58511f4a0350f9dc386c64ce40464bf644c7434187c61e747c8e9a422443a740ebb766fe22 SHA512 83b412de2f79a4bc86fb4bdac7252521b9d84f0be54f4fb1bde1ee13a210bbfa4b1a98247affbc7921046fb117a591316c12694c1be72865767646554c5207ac
+DIST idna-3.0.tar.gz 180786 BLAKE2B f802465ccad978600af0f6b2aeacf4fa56957ccb73625ba374663bebc5a507986589c54b7a81c7303fcb97f8fac11695fa6e159236d61e6e29c110b8a8a66143 SHA512 2ed384e75fb3d873a19c6ee49915a48a757b3617227015f92f5e21b130cf30816ce3abf25d9ffd8931e080e645416fb0551b1be18a2d0233e02bce2e4b6556f3
+DIST idna-3.1.tar.gz 181601 BLAKE2B 1cacc2ad93de4e7f3e4faff72496dd17162a042558c6771d4ed39c68c33087633d6bdd141df3d4f867befde16acdfa82aeb0d70c36b1b1c62bbd0b3b446aed63 SHA512 23c02520d00a99855d552a9b9def529f0baeec7d27e8036c544dd654ade15243fd5c9e5ad02e73b83a9ca3bb335ab2584233d17345a6a5e6d5ac089e8ac81e8a
diff --git a/dev-python/idna/idna-3.0.ebuild b/dev-python/idna/idna-3.0.ebuild
new file mode 100644
index 000000000000..aabee37a3a2b
--- /dev/null
+++ b/dev-python/idna/idna-3.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
+HOMEPAGE="https://github.com/kjd/idna https://pypi.org/project/idna/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/idna/idna-3.1.ebuild b/dev-python/idna/idna-3.1.ebuild
new file mode 100644
index 000000000000..aabee37a3a2b
--- /dev/null
+++ b/dev-python/idna/idna-3.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
+HOMEPAGE="https://github.com/kjd/idna https://pypi.org/project/idna/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/ifaddr/Manifest b/dev-python/ifaddr/Manifest
index d75dbe3f297e..19948e6ff084 100644
--- a/dev-python/ifaddr/Manifest
+++ b/dev-python/ifaddr/Manifest
@@ -1,2 +1 @@
-DIST ifaddr-0.1.6.tar.gz 6526 BLAKE2B d30b955d42d0266a197214bbe16ff2a8b11e33b4305ae9ed128fca6719e2c86026c97b278b0abaf5f5f35f4c9b744e5b500b4a4c1783dede0ebd4aedff62803f SHA512 911f81c32e808b9e61f7e98b8c67dc9b40cb64de864843cd7239f08538c9ff7cd45c8f16428b2ce200ea5f213a539c7ed8479432e02feb5e82e917f838ee0cb6
 DIST ifaddr-0.1.7.tar.gz 9281 BLAKE2B 3f7d29b69462cbf592899f1b4035685d1e9bb4535b104e6e59b41fd51c4c2681d2502ad190dae633891aec90818bb330c1f8ea403be22d154d9e7de8a5a80dab SHA512 9a428dd6bb022c8f483b77df9e9301f96e9ba64207eda8b3956a7ca5993bfe97f222c451149851135d379db1a819c75d0834566f3b6501456b2f237b0645e300
diff --git a/dev-python/ifaddr/ifaddr-0.1.6.ebuild b/dev-python/ifaddr/ifaddr-0.1.6.ebuild
deleted file mode 100644
index da6460fbd019..000000000000
--- a/dev-python/ifaddr/ifaddr-0.1.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Enumerate IP addresses on the local network adapters"
-HOMEPAGE="https://github.com/pydron/ifaddr"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND=""
diff --git a/dev-python/ifaddr/ifaddr-0.1.7.ebuild b/dev-python/ifaddr/ifaddr-0.1.7.ebuild
index f79aa68bf3a7..01f76bec620a 100644
--- a/dev-python/ifaddr/ifaddr-0.1.7.ebuild
+++ b/dev-python/ifaddr/ifaddr-0.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/ifaddr/metadata.xml b/dev-python/ifaddr/metadata.xml
index 6460791d90ef..251e3d7a982f 100644
--- a/dev-python/ifaddr/metadata.xml
+++ b/dev-python/ifaddr/metadata.xml
@@ -8,6 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<!-- not suitable for ALLARCHES - uses cdll -->
 	<upstream>
 		<remote-id type="pypi">ifaddr</remote-id>
 	</upstream>
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
index ce6063ee0044..db0eeed3ed47 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -1 +1,2 @@
 DIST ijson-3.1.1.tar.gz 124875 BLAKE2B 6f20efa076cf9e9a9f22eec65c7658440cc2ddffc2bf88054025f76f2df48e395d1c11a52501a45e7b5301448ce5874fb3e62d9111963f49f976ee68836c39d1 SHA512 c693444ac757c3b6e1f762d4a877a82b11ccaaecc922d34b868d236a78d9cf8f8648cb6d1188f0444caf61a0758f3080d3bfbd79c1ee51114bbd7c0a34bc633e
+DIST ijson-3.1.3.tar.gz 125658 BLAKE2B 3866c89b3dab6f55138b51d52c55a1b2c83e4e26d98e08724cd3d96ccb28a7d2a5fb1889e59f499cfe3b4ee8642933f88fbb18111ac94a8195a97109fbf8a08f SHA512 f4da9e44cc42fac7d9eeb6ba897ba7c3b477e07b4fb6e91abda59a83638d29dc41a845ba9ff5907130657a78ccfb788a6b88d8026f58b2095174e6939e25ef8a
diff --git a/dev-python/ijson/ijson-3.1.3.ebuild b/dev-python/ijson/ijson-3.1.3.ebuild
new file mode 100644
index 000000000000..fee6a9d6c736
--- /dev/null
+++ b/dev-python/ijson/ijson-3.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+MY_PV="${PV//_p/.post}"
+DESCRIPTION="Iterative JSON parser with a Pythonic interface"
+HOMEPAGE="
+	https://github.com/ICRAR/ijson
+	https://pypi.org/project/ijson/
+"
+SRC_URI="https://github.com/ICRAR/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/yajl"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/imageio/metadata.xml b/dev-python/imageio/metadata.xml
index b3bfa7f59caa..33d03730b6b3 100644
--- a/dev-python/imageio/metadata.xml
+++ b/dev-python/imageio/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chr@chymera.eu</email>
+		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index fd1395e88db9..32af7afb8659 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,2 +1 @@
-DIST imagesize-1.1.0.tar.gz 1275201 BLAKE2B 32169ccbfee5080d98b7304a2eb7c437d223a9e538281bd0a9ae1e35f5defb71d1abb7e6307057f7e41d199eda402ee91a2a91eb3d9f74cb8fb1df5c4c966072 SHA512 11af71a5120decb88450d1bc7609e25e560e448fcaef72c273690ffe3ad06856e6a172e20738a8dd5650efe1ba8d599e797692eb5cae2b7d74a71f1f55438a03
 DIST imagesize-1.2.0.tar.gz 1274955 BLAKE2B 20293418635362f7360d2f02299f9392a96ca09773c97dd8eed38ca424008fa9d71139bbaf8d61e0daf5dbc90f3c46af9ee60d26e9fb1c2479eb8875ebcb7305 SHA512 c82a7fe433064c3a60ed664bad8ce4e602c527bcf2f7c9ab9be6ed650654626d9e0907028b2b0c5a484712bc989335b2b4f66494c8d445f5043ed4c2bc519700
diff --git a/dev-python/imagesize/imagesize-1.1.0.ebuild b/dev-python/imagesize/imagesize-1.1.0.ebuild
deleted file mode 100644
index e293e1d9fc3c..000000000000
--- a/dev-python/imagesize/imagesize-1.1.0.ebuild
+++ /dev/null
@@ -1,18 +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,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python module for getting image size from png/jpeg/jpeg2000/gif files"
-HOMEPAGE="https://github.com/shibukawa/imagesize_py"
-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 ~riscv s390 sparc x86 ~x64-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/imagesize/imagesize-1.2.0.ebuild b/dev-python/imagesize/imagesize-1.2.0.ebuild
index 1390286d910f..e293e1d9fc3c 100644
--- a/dev-python/imagesize/imagesize-1.2.0.ebuild
+++ b/dev-python/imagesize/imagesize-1.2.0.ebuild
@@ -13,6 +13,6 @@ 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 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/imagesize/metadata.xml b/dev-python/imagesize/metadata.xml
index 2ae1195f9841..286ee9374ba8 100644
--- a/dev-python/imagesize/metadata.xml
+++ b/dev-python/imagesize/metadata.xml
@@ -4,6 +4,7 @@
   <maintainer type="project">
     <email>python@gentoo.org</email>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">imagesize</remote-id>
     <remote-id type="github">shibukawa/imagesize_py</remote-id>
diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
index f0c7713f8662..50295fae8cf1 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -1 +1,2 @@
 DIST imapclient-2.1.0.tar.gz 85925 BLAKE2B 9725be7988c4bec105fda73389241e39e6c006bccd8130125b280041d13becd6a71a1832763171daf25dfb4e7b4a7fc86c0a3afa93216c3dc4370b19348c0a5e SHA512 57e5824504f2667cf41ac4983130e16a5ea73ea37f29cdb16295eb725b56eda55db26a12e380acb579ef6b8540d38ae6badac5dd5b644d4419cbe9151f634e70
+DIST imapclient-2.2.0.tar.gz 89505 BLAKE2B 448e8c736cd80f261c50dd7d6fe88498bf988e475f8135bf7079021d0154904741ab8af28c0ede817ec1bd8c7bd329b1c891c24e37c3466d68287afa02d636c7 SHA512 ace8f55e0f7f4dbb9127b2bbf26cce4c12dce40357cf8127aa6e377321d5156f91f913bd4d4ca57bd5b7f0c86ae5d0b7fdf352b74a6edb7d607f46aa45a144a2
diff --git a/dev-python/imapclient/imapclient-2.2.0.ebuild b/dev-python/imapclient/imapclient-2.2.0.ebuild
new file mode 100644
index 000000000000..3836910c76c2
--- /dev/null
+++ b/dev-python/imapclient/imapclient-2.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library"
+HOMEPAGE="https://github.com/mjs/imapclient"
+SRC_URI="https://github.com/mjs/imapclient/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx doc/src
+distutils_enable_tests unittest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index 6f7f80440c7b..2d6325690102 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -1 +1,2 @@
 DIST iminuit-1.3.8.tar.gz 496459 BLAKE2B 71920535b48ea135b34c9f55b0ac0aecc290ff68dd9a27e549ad643caabb4722899ed8eb3e413850ceb965910c39452c59c3ff4cb93416e4f945534f9a518071 SHA512 4c0069389a5e53b6e082ef82e56226427fdfd66c51b6c5bc488ebb2b113fd98ab6494d26c94f97255eec775e6441bda5c506b402ad13ad8698c361742e8cbc60
+DIST iminuit-2.2.1.tar.gz 371183 BLAKE2B 3b7f1c2930a490c458d1f5659e7cadabe782b74d4426a1b16c56acb3f3c2fc3c413d6765156ae681cf838d184db674d5f66fb419324b43c5a91944b8f6190eb5 SHA512 21f04b82c646c4bd6a9e5cc1b8bd0503e1693e994bef83f57595935733cc238231f57337a38fb15abc62782228de73b960b39ae46250a4124ea4f7fca8d8c5b9
diff --git a/dev-python/iminuit/iminuit-2.2.1.ebuild b/dev-python/iminuit/iminuit-2.2.1.ebuild
new file mode 100644
index 000000000000..cd3713e0fd5a
--- /dev/null
+++ b/dev-python/iminuit/iminuit-2.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/iminuit/iminuit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SLOT="0"
+LICENSE="MIT LGPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	  dev-python/ipython[${PYTHON_USEDEP}]
+	  dev-python/matplotlib[${PYTHON_USEDEP}]
+	  dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	virtx pytest
+}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 2faf35dee409..c40bf9f21e0a 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,6 +1,2 @@
-DIST importlib_metadata-1.7.0.tar.gz 29233 BLAKE2B a8cd97a384ab06201025fcbdc401fb25788c2eb1dd4f1697ca00e79634cbce32b984cb8a7c2aeacfb0871f92857d08f3ce9c3ae43d698df7401db91add07b6ca SHA512 31f7cda6a1149ca2040032945b19b55d2e97ef8be67db1423c2c2cbb79da3dead46338f3c9eb03b46f9202fca08ed7bf388adc25d34903ddff4b2873c8a89aba
-DIST importlib_metadata-2.0.0.tar.gz 29289 BLAKE2B 4ec24db057006affe1dee20e021a47d385770b1aa905db4ff4223d59f19b53dc85c21475875074664a84a0fb6994493735f5e098d38f938816ebc69dced7a40d SHA512 3f789d717f04f7649dd4a75895669b4f9b875671937035c1c76bd089504afff8c2ba5bfb6a91096ba29eccadc88dca98ea1da5107772fd2053541db15c52b16a
-DIST importlib_metadata-3.1.0.tar.gz 29246 BLAKE2B 2144e10601e089e26e1d85269ed067d505de8ca86071524e038e87850420f42701b36fad5e1fe01529230333d5f23e0882f17a279bacfa39da335f3d968987dd SHA512 24d20d7658c2d15d2207d3660bd181016a16d0a2e3c86b8e86f7f95baab18f01f1a8753942d15ab648a40431bfc6db7d5109339575ef1a50802403eb580baede
-DIST importlib_metadata-3.1.1.tar.gz 32217 BLAKE2B 85155574f554146d89fedbaeffa5b5842c5c76f98d0f8488a019cded9fc7e45323b31a9cb612f81c379feb822a0e5a44f86566510c5bccaa344cbe10ef8676e9 SHA512 a0a3fc0c4cb08ba5676ae144a2176e9b2e02d122a09c1be67fe0c1e1c8304aeac4f624fa060898b20f99f67f9cfee2bdf1177d82cd12e5879edfa268e02cdce3
-DIST importlib_metadata-3.2.0.tar.gz 32793 BLAKE2B e99fc4544ec64bc320754b1bac80ab021fd4212930cb2b28fc44cd6f6c9691214fce2fc408aa65147ae45df589e5ad64d4681e29620a16ffd1d3231faebde077 SHA512 3e744ebaa4606477252243b6e473c33b70332879385719835a4187d5edad135f0f9076c26e4843aea4497c2a5a2b51fa7b5654e9ff97a8f5ec3808053dccc734
 DIST importlib_metadata-3.3.0.tar.gz 33549 BLAKE2B 6646cf7f8dbbeeadd7b4e9e572a59c14e2f17444dcd84aef817e27b299cbc3f0fa868657a59221a42ea8c49c5cc75e9e170a787df3e3014808d19eff1f89debf SHA512 af2215405b0f7e120d2745f3736d021174e611ad226abe64b496192a210e85786e78560349f1188deb3bffbfceb36385e9fbac20f4447aafb025a1d735c333ac
+DIST importlib_metadata-3.4.0.tar.gz 33841 BLAKE2B e2ac38c0f6fc5ecf78d3a4018715282b176f448e0a9f2cb16320812c1f9ca18f797b2ddfa85a96d83f6ff9540b486abcd8b5a38fa7f9261abbde4a88962e765d SHA512 d17aae60ca79ddb3c2e60218144e7a3e055b2807e8ca4e55f0d0c1ae428323ab7d832e4178dd05a60f1de2f157497a6261afa7baa8f91bec85d042303869fb67
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.7.0-r2.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.7.0-r2.ebuild
deleted file mode 100644
index 5bcac116eade..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,41 +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,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://importlib-metadata.readthedocs.io/"
-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"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx "${PN}/docs" \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# remove dep on setuptools_scm
-	sed -e 's:test_find_local:_&:' \
-		-i importlib_metadata/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-2.0.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-2.0.0.ebuild
deleted file mode 100644
index 344fa0d485dd..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-2.0.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
-
-# Included in Python >= 3.8
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://importlib-metadata.readthedocs.io/"
-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"
-
-RDEPEND="dev-python/zipp[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx "${PN}/docs" \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' \
-		-i importlib_metadata/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild
deleted file mode 100644
index 951f58ea8d70..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Included in Python >= 3.8
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-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 ~x64-macos"
-
-RDEPEND="dev-python/zipp[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.1.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.1.1.ebuild
deleted file mode 100644
index 422c471e17aa..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-3.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Included in Python >= 3.8
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-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 ~x64-macos"
-
-RDEPEND="dev-python/zipp[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild
index 05a98db2f94c..d692c07b3f1b 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.2.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.4.0.ebuild
index 05a98db2f94c..8b2843259c48 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.2.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index ee4416ed4dc7..af54641eefed 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,2 +1,3 @@
-DIST importlib_resources-1.5.0.tar.gz 23660 BLAKE2B aed7a2d730f945505083812355a63d3a88e07b057cf46394f3475135143e535e33dc3ebded24d233797020c805dc35decf5c5ce53758798b093f03f2951daa87 SHA512 34d14c1ff3121cc6f9ef1d3d4417831e3476e9facfcc9b35152c28a59a2c75d7723f171f4b48852f79ec46cbf54b066580745744bc54d349e2bfe12a353a9aed
 DIST importlib_resources-3.3.0.tar.gz 29000 BLAKE2B 5fb87c6e15f01733567fef060607da0625d32e415e294cfd5db94fb26e13d257763f2d3795c19ee7d10fc1fdc579fc0c34a484d28aff32c20553d18fafc7b850 SHA512 1fc03c9d141a094ca6ae0acb9ff0668a3f3aa76b47ce2149691b1d85d37a3ba9d329dbafd8b94961c537a4982cea1bd3ee34bac069819c51d725208f45b24172
+DIST importlib_resources-4.1.1.tar.gz 30821 BLAKE2B 440adde5ce8604c3dddc6c59f730890b4832076f3f7d5c1f9b46ed4d4fe1d80d714a2f393ae1a1b386ef20812090c7370858ca9d3920bc115a6cedb0d2000c8f SHA512 e277d375f800e8d1be317f90344c10b2848a0f7e0b3b6f28014b71d4b92b496137aa84b8ad865a3b93c983d20d827f18c6baf0d6c540882622b0903bebaae303
+DIST importlib_resources-5.0.0.tar.gz 30603 BLAKE2B 66a22891e28e282919ed3847e69d36655ab8052f4f6c743ceb43456bc5447348302b61e5e3d3553d006fbab45c706882680265613497eedcc97c732a1776183a SHA512 eff23d8d365f105069910efe6e95f63a7e6c2cea7ca707cf4085c6d9f9c4f28065a1ad937d06ab3549a0ac25da5fa950af7b56a52d892125265252e0b79bf7f9
diff --git a/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild b/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild
index 0f342f744d6e..ca933d3c5d24 100644
--- a/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild
@@ -14,7 +14,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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/importlib_resources/importlib_resources-1.5.0-r2.ebuild b/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild
index d50011ab86a8..0f342f744d6e 100644
--- a/dev-python/importlib_resources/importlib_resources-1.5.0-r2.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild
@@ -9,22 +9,15 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://importlib-resources.readthedocs.io/en/latest/"
+HOMEPAGE="https://github.com/python/importlib_resources"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/contextlib2[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		dev-python/singledispatch[${PYTHON_USEDEP}]
-		dev-python/typing[${PYTHON_USEDEP}]
-	' -2)
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
 		dev-python/zipp[${PYTHON_USEDEP}]
 	' pypy3 python3_{6,7})
 "
@@ -35,14 +28,3 @@ BDEPEND="
 
 distutils_enable_tests unittest
 distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
-
-python_compile() {
-	distutils-r1_python_compile
-	if ! python_is_python3; then
-		rm "${BUILD_DIR}/lib/importlib_resources/_py3.py" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/importlib_resources/importlib_resources-5.0.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.0.0.ebuild
new file mode 100644
index 000000000000..c96fbe4d7788
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/zipp[${PYTHON_USEDEP}]
+	' pypy3 python3_{6,7})
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/importlib_resources/metadata.xml b/dev-python/importlib_resources/metadata.xml
index 528b6532f321..c20fc1ae9e8b 100644
--- a/dev-python/importlib_resources/metadata.xml
+++ b/dev-python/importlib_resources/metadata.xml
@@ -18,7 +18,7 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">python/importlib_resources</remote-id>
-		<remote-id type="pypi">importlib_resources</remote-id>
+		<remote-id type="pypi">importlib-resources</remote-id>
 		<bugs-to>https://github.com/python/importlib_resources/issues</bugs-to>
 		<doc>https://importlib-resources.readthedocs.io/</doc>
 	</upstream>
diff --git a/dev-python/indexed_gzip/metadata.xml b/dev-python/indexed_gzip/metadata.xml
index 85746780bd85..b50d2a993dc6 100644
--- a/dev-python/indexed_gzip/metadata.xml
+++ b/dev-python/indexed_gzip/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chr@chymera.eu</email>
+		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index c25924b8c25c..6ecdc2154e48 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,2 +1 @@
-DIST inflect-4.1.0.tar.gz 72200 BLAKE2B c15f6b0d5d93050283dfc4d691e9fdbc26bb2f71573d6b397834e87af62f3afb8f5cdb0448c531de37e84729c0c6ae0cf4ea7a7b081a9dd784f7c06b962d7def SHA512 9a2ba4777f01475390976f3ac28f046d39d1f86cfdafd161cc7c8d33526aca35d44e6598ccf2a0b68d3511a64b67ed0991b51c78bda8f279cd706fd29a3fa514
 DIST inflect-5.0.2.tar.gz 71323 BLAKE2B 42b2524b00a8b71aca6f164de9b57708be172ce63bc62480e951d082bd68f082ad2fadb502321a5fc97ffa3af95f26935d0de855144863b9bd1dfbdf3bdae516 SHA512 ea97ec4a4a1a94a6218e60c20d63e483026beb1901abe2fa69f186a823f8a786b9a82af231fc42bf705146f650fdbfa5ff660cfbe821eceb53891ef2e91eaec3
diff --git a/dev-python/inflect/inflect-4.1.0.ebuild b/dev-python/inflect/inflect-4.1.0.ebuild
deleted file mode 100644
index 4c1640d7b74d..000000000000
--- a/dev-python/inflect/inflect-4.1.0.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=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="https://github.com/jazzband/inflect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9' dev-python/alabaster
-
-python_test() {
-	# Override pytest options to skip flake8
-	pytest -vv tests --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/inflect/inflect-5.0.2.ebuild b/dev-python/inflect/inflect-5.0.2.ebuild
index 89a48f32d168..26b563eca2bf 100644
--- a/dev-python/inflect/inflect-5.0.2.ebuild
+++ b/dev-python/inflect/inflect-5.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 9834a43946fc..3aec5a70f66c 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,2 +1 @@
-DIST iniconfig-1.0.0.tar.gz 7807 BLAKE2B a77c4d8c6f549db911110505ac5a367be5175adbb580211d4aded14d1108e189fd6d6a229ac4e0e742baafa9b037d58c2bbc810897c8b274c07493c518ef752e SHA512 639a4e765637110f69627fb18a5e719b6d648e5549fd857168183d97da7880434d447c9af1e254dd2aa5d0e36cbd3f5c4ffabf8a949ed3d6294002e7e1b2f6e1
 DIST iniconfig-1.1.1.tar.gz 8104 BLAKE2B 31301484887018a6aa75c944e2f8643f85b2433534ae46a8da893a113f2376eca14cbee88095a3784d1c52f26d4c748260c1df59c46b8f94cd342038f93242e8 SHA512 c9341db7e3ec2204b6a674fca7824cbeb492e3576d5ac3f084b234c82842b28f2f6acbfdb812e183f4334a95b990551f942a4caf548f5ce7ef14885f931535ee
diff --git a/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch b/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch
deleted file mode 100644
index f8fca367b342..000000000000
--- a/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From da205253f0d78204900ec82b6cb2cb0afd9f1254 Mon Sep 17 00:00:00 2001
-From: Stanislav Levin <slev@altlinux.org>
-Date: Thu, 8 Aug 2019 19:43:12 +0300
-Subject: [PATCH] Fix Pytest 5 errors
-
-This fixes
-"""
-pytest.PytestDeprecationWarning: raises(..., 'code(as_a_string)')
-is deprecated, use the context manager form or use `exec()` directly.
-"""
-
-Fixes: https://github.com/RonnyPfannschmidt/iniconfig/issues/6
-Signed-off-by: Stanislav Levin <slev@altlinux.org>
----
- test_iniconfig.py | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/test_iniconfig.py b/test_iniconfig.py
-index 27fd53f..fe12421 100644
---- a/test_iniconfig.py
-+++ b/test_iniconfig.py
-@@ -150,27 +150,25 @@ def test_iniconfig_from_file(tmpdir):
-     assert list(config.sections) == ['metadata']
-     config = IniConfig(path, "[diff]")
-     assert list(config.sections) == ['diff']
--    py.test.raises(TypeError, "IniConfig(data=path.read())")
-+    with pytest.raises(TypeError):
-+        IniConfig(data=path.read())
- 
- 
- def test_iniconfig_section_first(tmpdir):
--    excinfo = py.test.raises(ParseError, """
-+    with pytest.raises(ParseError) as excinfo:
-         IniConfig("x", data='name=1')
--    """)
-     assert excinfo.value.msg == "no section header defined"
- 
- 
- def test_iniconig_section_duplicate_fails():
--    excinfo = py.test.raises(ParseError, r"""
-+    with pytest.raises(ParseError) as excinfo:
-         IniConfig("x", data='[section]\n[section]')
--    """)
-     assert 'duplicate section' in str(excinfo.value)
- 
- 
- def test_iniconfig_duplicate_key_fails():
--    excinfo = py.test.raises(ParseError, r"""
-+    with pytest.raises(ParseError) as excinfo:
-         IniConfig("x", data='[section]\nname = Alice\nname = bob')
--    """)
- 
-     assert 'duplicate name' in str(excinfo.value)
- 
--- 
-2.28.0
-
diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
deleted file mode 100644
index a6294fbdb83e..000000000000
--- a/dev-python/iniconfig/iniconfig-1.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Brain-dead simple config-ini parsing"
-HOMEPAGE="
-	https://github.com/RonnyPfannschmidt/iniconfig
-	"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pytest-5.patch
-)
diff --git a/dev-python/iniconfig/iniconfig-1.1.1.ebuild b/dev-python/iniconfig/iniconfig-1.1.1.ebuild
index 8475ca2ee691..b7f085d0a86d 100644
--- a/dev-python/iniconfig/iniconfig-1.1.1.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/iniconfig/metadata.xml b/dev-python/iniconfig/metadata.xml
index c2f60d3fa0da..93a6b196e4ce 100644
--- a/dev-python/iniconfig/metadata.xml
+++ b/dev-python/iniconfig/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">iniconfig</remote-id>
 	</upstream>
diff --git a/dev-python/ipaddr/metadata.xml b/dev-python/ipaddr/metadata.xml
index ea83610cb518..a257f5ebb999 100644
--- a/dev-python/ipaddr/metadata.xml
+++ b/dev-python/ipaddr/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>maksbotan@gentoo.org</email>
-    <name>Maxim Koltsov</name>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/ipaddress/ipaddress-1.0.23.ebuild b/dev-python/ipaddress/ipaddress-1.0.23-r1.ebuild
index 6ccbd60cd8c3..24d9bcaf56ed 100644
--- a/dev-python/ipaddress/ipaddress-1.0.23.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.23-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 DESCRIPTION="IPv4/IPv6 manipulation library, backport of the ipaddress module"
@@ -16,7 +17,7 @@ LICENSE="PSF-2"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools-python2[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
 	sed -i 's:unittest.main():unittest.main(verbosity=2):' \
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index aa59bad3590b..3616699e9b47 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1 +1,3 @@
 DIST ipykernel-5.3.4.tar.gz 108656 BLAKE2B ee2ff12e0a3fae853dfb16235bd14bbfe16b670ac93c572ff4e3867d5d2c451ed4f4800f3e501caf857405d0efb73a671c2966ea0fe53aa41f1e59ff68424cb9 SHA512 6865cb4cb1979e79ed532fabd59e55bd860df996f557e4c05b69fe7baf60301d70dc0657248bf75102285c68be6212787180b548d5125029991605f05d0d812f
+DIST ipykernel-5.4.2.tar.gz 111450 BLAKE2B 0eece34722e5233f0baaef6119dbc15e35c736579c67da02d4d8528f816c0ea4cf65d8fa16b09b820a4c91c023ba7c61acd720d0f5e9b9a43a66099cdb613036 SHA512 4e6085a1656764b7e1e2787f4c89a08d65fb8280b0435874b16de4f70e43f5091783a1b546c7cab6d6354e208bae062bd9403980777c5727b41a4f8f7cf45f21
+DIST ipykernel-5.4.3.tar.gz 111751 BLAKE2B 01e4af9fe94599c912d6d6504ee4af9666b05155b43031aced3acf7512bd8b67689fdbdadea505d961ab569d313d92992cf7b50791a38bbe1bd3d67ab2a844de SHA512 4959de99ecca609f8123c01dc9904711a03cf0de5a388b9e04aa3ec0be985b6f37ac64bce2fe395039b16b7b54ad0632fef04fec30f2439d05499d8afbfd5258
diff --git a/dev-python/ipykernel/ipykernel-5.3.4.ebuild b/dev-python/ipykernel/ipykernel-5.4.2.ebuild
index d74a8f25d2d9..e9a0db16f495 100644
--- a/dev-python/ipykernel/ipykernel-5.3.4.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.4.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
@@ -14,20 +15,28 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 RDEPEND="
-	>=dev-python/ipython-6[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-"
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}] )"
+	)"
 
 distutils_enable_tests pytest
+
+python_prepare_all() {
+	# skip tests that require numpy, also some of them fail
+	# https://github.com/ipython/ipykernel/issues/574
+	rm ipykernel/tests/test_serialize.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/ipykernel/ipykernel-5.4.3.ebuild b/dev-python/ipykernel/ipykernel-5.4.3.ebuild
new file mode 100644
index 000000000000..df5fa806ff4d
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-5.4.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		<dev-python/jedi-0.17.3
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# skip tests that require numpy, also some of them fail
+	# https://github.com/ipython/ipykernel/issues/574
+	rm ipykernel/tests/test_serialize.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild b/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
deleted file mode 100644
index 85695b153112..000000000000
--- a/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
+++ /dev/null
@@ -1,62 +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,9,10} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Interactive Parallel Computing with IPython"
-HOMEPAGE="https://ipyparallel.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# About tests and tornado
-# Upstreams claims to work fine with tornado 5, and it's indeed possible to
-# launch a cluster with tornado 5 installed, but tests definitely don't run with
-# tornado 5 installed. Upstreams CI runs with tornado 4. This is why we limit
-# ourselves to <tornado-5 when running tests.
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-BDEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/ipython[test]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-src_prepare() {
-	# TODO: investigate
-	sed -e 's:test_unicode:_&:' \
-		-e 's:test_temp_flags:_&:' \
-		-i ipyparallel/tests/test_view.py || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	optfeature "Jupyter Notebook integration" dev-python/notebook
-}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index ef7fbc6147ec..b0267afcb39d 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,2 +1 @@
-DIST ipython-7.16.1.tar.gz 5136303 BLAKE2B 9baf42c9befa50d78eec29d012aeae7f01886f29642a01845afd4a96d0efb7a4df5b14b68aeeb22d1d621e5427b219f717688a1d5074a6e70ad0509c7ca73a46 SHA512 60259fd6270b0355be67b4f620a58b56ae86e69e14debe2df86df6118548f2290ab3927b8dfab20db1ebd675df697d05eb6994b93625a7b8b6ea07112ddf63bd
 DIST ipython-7.19.0.tar.gz 5225775 BLAKE2B 1909d8336e7fc90959da4ca33ad7edcb8c2dec0a5aa20ca6f643ef53482fe7bf0d52e2bbec7cf97e72a1fd4d37af45ba01166febb25f35b52d69ffc062f0f0e8 SHA512 5350a125da3050acaea4899939a3b9d779009a2f5769fc9f3aa514ce029df050069ef9310d3255ad62f28912b4dec39207267248d3a2c3e9131cffd691322622
diff --git a/dev-python/ipython/ipython-7.16.1.ebuild b/dev-python/ipython/ipython-7.16.1.ebuild
deleted file mode 100644
index 8b08ddae7fd4..000000000000
--- a/dev-python/ipython/ipython-7.16.1.ebuild
+++ /dev/null
@@ -1,135 +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,9,10} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${CDEPEND}
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	distutils_install_for_testing
-	pushd "${TEST_DIR}" >/dev/null || die
-	"${TEST_DIR}"/scripts/iptest || die
-	popd >/dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-7.19.0.ebuild b/dev-python/ipython/ipython-7.19.0-r1.ebuild
index a025490ca262..43c5bd279fbc 100644
--- a/dev-python/ipython/ipython-7.19.0.ebuild
+++ b/dev-python/ipython/ipython-7.19.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ RESTRICT="!test? ( test )"
 CDEPEND="
 	dev-python/backcall[${PYTHON_USEDEP}]
 	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.10[${PYTHON_USEDEP}]
+	<dev-python/jedi-0.18[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
 	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index a50dd9207c01..0ff8d02c3b1e 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1 +1,3 @@
 DIST ipywidgets-7.5.1.tar.gz 5656334 BLAKE2B 8bd98f523b619bea02e01ae5faffb08040dc5011905dd69510728b02736e66444b3c3cdf1e7272884c1df97f610aff790063f783e1d0939786669ef39cd1fc94 SHA512 856b3e4dad331766eff6e5f1fd31984a4b6ede5c678ffd51a4896f6448dac53ba181ccec2821f10e07e0f1095318427affe19f1420d0337bc3d37ef1e0a9ea0d
+DIST ipywidgets-7.6.2.tar.gz 4066260 BLAKE2B b0d75d83108336bac204c24d2a67e88a200939cd8308d99bdb3842916387266f24607726ce0b8781b4a8b6330b9e26bf1eeeeebcaf7588b74980d5bc6603e1b8 SHA512 a8c25ee82e0b0752f850a314fd9a05bbcdd098c9fbe8a0cf0b23e097380beaf7fc916e555fe1597a45bd0085efebc40593da66ef1408114fc6d3085467d95183
+DIST ipywidgets-7.6.3.tar.gz 4072376 BLAKE2B 095226ef6a9ee0821b875dc117afe4155132b6b2d94da71b937959c1c4e9f33fa2837d8b736a47caed77c4c52fbb95d8afb5db9e58e99e567a34d6c8cf39afa3 SHA512 7b3506b43214948d73f4f2c55af81ceacff3d7cccc167dd32c72df6bffb8b1b1f8bdbfac7162d343858f723e7b3f3a1cd78f20c2f93b14a8eb39125ae2aee7b4
diff --git a/dev-python/ipywidgets/ipywidgets-7.5.1.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.2.ebuild
index 9b1e2bd247cb..0f13295bd61a 100644
--- a/dev-python/ipywidgets/ipywidgets-7.5.1.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.6.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
@@ -14,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/ipywidgets/ipywidgets-7.6.3.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.3.ebuild
new file mode 100644
index 000000000000..add9bf793990
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-7.6.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="https://ipywidgets.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-3.5.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/iso8601/iso8601-0.1.12-r1.ebuild b/dev-python/iso8601/iso8601-0.1.12-r1.ebuild
index 76b0bd6a83b0..9caf5f3e0574 100644
--- a/dev-python/iso8601/iso8601-0.1.12-r1.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/isodate/isodate-0.6.0-r1.ebuild b/dev-python/isodate/isodate-0.6.0-r1.ebuild
index 504048089338..b0d353a63840 100644
--- a/dev-python/isodate/isodate-0.6.0-r1.ebuild
+++ b/dev-python/isodate/isodate-0.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index b716e2ff9e4b..313bd85ef40b 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,3 +1,3 @@
-DIST isort-4.3.15.tar.gz 67949 BLAKE2B e78960518928cd74c15733bbc14bf066798ecbcc3e906754c10e352e7b88843451a1d0616d1b450100c77e95974f863951d640c9568277e867fcdfba8f44abdb SHA512 a5774d4f3c49c978e9043e52681e80011591422e60178d72074142725d9d7fa5065553686fd42bffe9e71b38b2b5bdaaa6f20e32cd8dbe33beb9431c397d78e5
 DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687
 DIST isort-5.6.3.tar.gz 161712 BLAKE2B ffbc2977016807d2bd5b1644377efad021af2ad27fd0e27feae1e5dfdfd112c7b5bf4b296ebf47ea6bfcbfe7f56cf3bfa8e1e7cf03963935660e678223397afb SHA512 fa2d9be306d03fc802aab3915bee2c41f4fe0c28353d9d99aa6604755e1602027cd81afca92b4302f80497c88a9dcb2701ec02ca55a5f9a2866669a68368d957
+DIST isort-5.7.0.tar.gz 169353 BLAKE2B bafd6a0ce81ed80a3c1ad53ce320361ef11bc01a78211ad13b7947aafddd4d9bb5a4fbf65ec01d4c90dce7ebd0a2e3b1c4dcad729b1e27b1dd2c5c90c802eecf SHA512 ae5ff56394f495f6bd86f7581e0f8a67264671553b344b9dc2c5ba0b37f483ae500ebba9882ff5c315b913a689901b17de2eac403e0b4240f913c9e1864bab9f
diff --git a/dev-python/isort/isort-4.3.15.ebuild b/dev-python/isort/isort-4.3.15.ebuild
deleted file mode 100644
index 1dc4f0ee7275..000000000000
--- a/dev-python/isort/isort-4.3.15.ebuild
+++ /dev/null
@@ -1,15 +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,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
diff --git a/dev-python/isort/isort-4.3.21_p2-r1.ebuild b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
index 7b10d2429fdf..b67b15bae157 100644
--- a/dev-python/isort/isort-4.3.21_p2-r1.ebuild
+++ b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/pipfile[${PYTHON_USEDEP}]
diff --git a/dev-python/isort/isort-5.6.3.ebuild b/dev-python/isort/isort-5.6.3.ebuild
index 9b346fc3971e..15edcd712a76 100644
--- a/dev-python/isort/isort-5.6.3.ebuild
+++ b/dev-python/isort/isort-5.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	test? (
@@ -31,7 +31,8 @@ distutils_enable_tests pytest
 
 python_test() {
 	# Some tests run the "isort" command
-	distutils_install_for_testing
+	distutils_install_for_testing --via-root
+
 	local skipped_tests=(
 		# Fails without -s, run it separately to avoid unnecessary output
 		tests/unit/test_importable.py
diff --git a/dev-python/isort/isort-5.7.0.ebuild b/dev-python/isort/isort-5.7.0.ebuild
new file mode 100644
index 000000000000..e5041221d6a4
--- /dev/null
+++ b/dev-python/isort/isort-5.7.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A python utility/library to sort imports"
+HOMEPAGE="https://pypi.org/project/isort/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/black[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pylama[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Some tests run the "isort" command
+	distutils_install_for_testing --via-root
+
+	local skipped_tests=(
+		# Fails without -s, run it separately to avoid unnecessary output
+		tests/unit/test_importable.py
+		# Excluded from upstream's test script
+		tests/unit/test_deprecated_finders.py
+		# Require "example_isort_formatting_plugin", we're not going
+		# to add an example package just to run a few tests
+		tests/unit/test_literal.py::test_value_assignment_list
+		tests/unit/test_ticketed_features.py::test_isort_supports_formatting_plugins_issue_1353
+		tests/unit/test_ticketed_features.py::test_isort_literals_issue_1358
+		# Same here: requires "example_shared_isort_profile"
+		tests/unit/test_ticketed_features.py::test_isort_supports_shared_profiles_issue_970
+	)
+	pytest -s tests/unit/test_importable.py \
+		|| die "Tests failed with ${EPYTHON}"
+	pytest -vv tests/unit ${skipped_tests[@]/#/--deselect } \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 8a812fbe2520..60dae7e2fbd7 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1 +1,2 @@
 DIST jaraco.collections-3.0.0.tar.gz 16439 BLAKE2B ff3690d85d91da8d88945e9ab8d16d13c7d0f67a9334f706701f9b392d8cffdd9450b2d6051a92799564cfc81310e45f50368ab729a0b68c08a9c8b0ccd9627d SHA512 c6c5d28fe4b3940c81c68bf877249805db3f508d83a0071947c7a5596d3636631df91cc6e87802b0fa6cd5c8bdd1ef2f39b924471666b44d2147cb64ad1533ad
+DIST jaraco.collections-3.1.0.tar.gz 18206 BLAKE2B c420b3c65c048840f2957ebff0e69a7e2d3db515801a54d829bc2dd9f77b804066ef15766c915b764a148eaa945fc9a30576bb00a645f4c124c031b6ccc64184 SHA512 9a3e4e60cd497ee2ed4a092bd823ecffe0d20293dd9ba491fd2c4e5df2481042efa8ba52503b001e11908982608852a0588cd70b4957d0551c066be97389652c
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild
new file mode 100644
index 000000000000..87066eb91585
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/jaraco-collections-3.0.0-pypy.patch"
+)
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index 117c32e879cd..41828748bfb1 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1 +1,2 @@
 DIST jaraco.envs-2.0.0.tar.gz 10018 BLAKE2B 8ad47fb7cb8f68081bba0e83368fe3a2f069130153b78be375a7a4543cf85e00ca1e365f9fb5a76d54f771879e87ff4737fe2991a9c520a9f86f21cf5d9aa8ce SHA512 f121c25ecce75beece7ed7218e69616f7cec6e493f9734b8ce040368d0fedc1ca4d7d343ba41c1367451a744f28ed98d9d2f3abc4610bfa8709fc29480c5ccbd
+DIST jaraco.envs-2.1.0.tar.gz 10207 BLAKE2B 80a2888ab655b1c524a80d33f8c15b08257b2d4415bbc30ce0d60f8f4a019f8f1e0f05cefcb2b4f64688a0e6ccabb227c5824c27c6f63f6ecb926e0dc1ad208c SHA512 e9cbe17a86bdcda17ba1378373d729d850a2a4b0d0924a059dea0fc448964d55522da99a27c507475973b5d3cbc822ca184ebdb877207019f1daf6d5fffcb7d7
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.1.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.1.0.ebuild
new file mode 100644
index 000000000000..c6f0639f68a0
--- /dev/null
+++ b/dev-python/jaraco-envs/jaraco-envs-2.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Classes for orchestrating Python (virtual) environments."
+HOMEPAGE="https://github.com/jaraco/jaraco.envs"
+SRC_URI="mirror://pypi/${MY_P::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/path-py[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' 'python3_[67]')"
+# toml is required by setuptools_scm
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+
+# there are no actual tests, just flake8 etc
+RESTRICT="test"
+
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	distutils-r1_python_install
+}
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 9750f4674e3f..65f55115ad66 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1 +1,2 @@
 DIST jaraco.functools-3.0.1.tar.gz 16996 BLAKE2B 8cad1532753ae5c941038d4b8cda17b49f2d131405bb010d3747ecafc1ea4f72ad2c91b1ce2c499cd2885b18a9fe2cd1ac1bf06d58ed6f13a7a379cf9deb0e66 SHA512 96696839d3405e571bd0120443c5494f13d737b7e0fd9324a7a003c88ff45bdaa89a717c81b9c5ecb4eded9781ba2c05f4735e5cf24c1d1c162fc3d55d38eedb
+DIST jaraco.functools-3.1.0.tar.gz 17006 BLAKE2B 0807138aee76c5ad5b09b0887aa4f294248380d2171e272b70e7de2eb59a39c775c534c6123ec3f38987073c25ffe899a56020bc5a6047109c110f7ceec32ec3 SHA512 81a56d3325106e65889f90137d2f3ab57198e2b5905dbe067a056057dee98ca8a715fc46384f9ab15a081d5d7fd309d69ffb77be9c2b24a9a8eda817fbc0b1e3
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.1.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.1.0.ebuild
new file mode 100644
index 000000000000..5278ead8f8a4
--- /dev/null
+++ b/dev-python/jaraco-functools/jaraco-functools-3.1.0.ebuild
@@ -0,0 +1,47 @@
+# 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,10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional functions used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.functools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index 711d1beef0f6..19d71b5d79c4 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1 +1,2 @@
 DIST jaraco.logging-3.0.0.tar.gz 10739 BLAKE2B c5cad0b6d7702a1216869dd0cd388d51a0a8e7bd24000108ef818623b54d23ce1adf0de2e017b869d764342484bf25d676ee18af9647b82964933ebb184cec0e SHA512 bc0edeef6223d0eb78110d51159a70afd16542e830e3cd37dec7628e582bce44218cd7669c03c41125db9824b6fc774f608dd7f6540224659f4dc2f1927d681c
+DIST jaraco.logging-3.1.0.tar.gz 11801 BLAKE2B 858f0930b7e04ea6f1e3d13b3d7be1056ad9efa901857ded3759e450e151c8485feb1cb6eb91c8ebf7be53c649bc818759009394b20f606fd5551c82ce0d1e61 SHA512 ce9a9cbad6d6bb448615eac986d361f9c6ff477b1209e85433f12a49055a9e30125cd49bebcf915a08b8efe0732439a8e1d336e63f6454369b3e846a9a1383ba
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
new file mode 100644
index 000000000000..5a26dfbeb340
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
@@ -0,0 +1,42 @@
+# 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,10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
+HOMEPAGE="https://github.com/jaraco/jaraco.logging"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/tempora[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index 5a0354192675..e92712967a67 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,2 +1,2 @@
-DIST jaraco.packaging-8.1.0.tar.gz 15322 BLAKE2B c354bec458a319bd9df0667c155203efa5c3de2d95218d0dd3a5878011d2d8fef694a490a2bac0035bff8daa18d1a3447c2c8dab7c0bd7bb09b62969f91d4709 SHA512 99996765cb047f2f0416d6afc4ff6ee0d84d03da0e07c7a7121518fbaf668f587c044f567c1d66a455372897ec1634ba5ee490552ac92064ca072e20b8f60a3b
 DIST jaraco.packaging-8.1.1.tar.gz 14580 BLAKE2B 6ec709571d74a9c840652b565e42b5301ab1ad71df823df6fb972c110d7bc0dbfdbae0dd3cc7123b29076a42de0d2b716ef2bab8dd58ffeb2563a868d90bdc90 SHA512 c0724e8694c3019bf3be24d99c7cde6dca65851e288ae027eb0b0fdfde9e1260804db3f8690b3bf69abd1e1e50733178c0387a859b0d634e8096dc49537f5877
+DIST jaraco.packaging-8.2.0.tar.gz 15295 BLAKE2B bfa8ca1547586122a5e142681be573ff0c7b95e0a5f5df25cf32dbafb4cd105509d6f7dcd9673e9f31bfe9284811721d778596a5ca3d25e41c9b1d88e8eb90d0 SHA512 469eecdc0648a0262e901462c3447450b1e3ca229ffd3747ebfedc7f80e84ff293680ff84bce0d83ee356bfa35fd0db64c7b0d61e02bad191bcdb5713c770789
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.1.1-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.1.1-r1.ebuild
index e056737df92c..9e60a3d59920 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.1.1-r1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r2.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.2.0.ebuild
index e58e781f6e96..ecfda56dde49 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r2.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.2.0.ebuild
@@ -16,36 +16,27 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
 "
 
 distutils_enable_sphinx docs '>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
 
 python_test() {
-	# Skip one test which requires network access
 	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv -k "not test_revived_distribution" \
-		--override-ini="addopts=--doctest-modules" \
+	pytest -vv --override-ini="addopts=--doctest-modules" \
 		|| die "tests failed with ${EPYTHON}"
 }
 
 # https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
 python_install() {
 	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
-	# note: eclass may default to --skip-build in the future
-	distutils-r1_python_install --skip-build
+	distutils-r1_python_install
 }
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 2871515814e1..30a465d95af4 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1 +1,2 @@
 DIST jaraco.text-3.2.0.tar.gz 14279 BLAKE2B aa8c8903bac61db3d1017408e1aa525f66060422c27b754af343a64e586b64c6623b66881bea62b9b2e89821a40c933d54c9a8cddc7bda08ac108ad08a9524dc SHA512 4107ef1078b44714b6ee5fb6ebd2bb7c35415debc6eaedd8bc18a70a2936cc7c7757acd7b3fac9587201ef52a25d9b29e49f2385a0a08afffb1d0c3de6ecc377
+DIST jaraco.text-3.4.0.tar.gz 15427 BLAKE2B 4f9584b9824c4d73ac9c75bc153048466d826fb37e8240ebec12181c837bca0d8f79a3e1dce25117f4c3e361a48a1566419d2555d430fcb792b5e40eede2713b SHA512 074b963c9ccf020409a28d7ef0053d5b221f9a3b16003ca9eac663f70b1a909b4523f9e5aba606f77108723157f237602f7c9f5079a782c8bfa9fdbbb553cf28
diff --git a/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild
new file mode 100644
index 000000000000..3ffe16632d88
--- /dev/null
+++ b/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild
@@ -0,0 +1,44 @@
+# 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,10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Text utilities used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.text"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	distutils-r1_python_install
+}
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index c0f227eb9fa5..a83fc82dd24e 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,4 +1,5 @@
 DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25fdfd8b8e3071fd5a0cc0eebd62b3e9e8b77d29c5e4e8d1e0297fc466cc7e0c49771750b609fff49516e2aa1499c198b SHA512 c3e89f02a22561b5446e1cc0f01be791767984b5791fe5bd362ec6128e2ba7b32e921f9ee719a80ace05f7f0c84a912731700b457761f64617c1415cd232c7da
 DIST jedi-0.17.1.tar.gz 472489 BLAKE2B 7486925cb307f6a25538c2f5d52763802222561cfc4beca1637e433f4450b06ef328204e75779b6b2ac4ca2cfcf5ab647daecd329941ca6fb0ae2a5dd2bd8b5f SHA512 0a9d552d2b4c45730c9cccf06ebb434b159b755acea0dbaddf5f628dccf8e9c752e03d151258e377b817f1a25fb9ca8e0289dbd2da290f55dc719883413b65cf
 DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557993fd33e246a1fb516992a16a7382db9e18e0c0414ff5d927008c8148e9bbd8ee0dbd62368d01a31611c326 SHA512 cd96faa6f9cd6e8ad8b9a52ceaa6a84f30c8ced51b20d621932f0babf1b90bbc445fbe5ffd11a4f0e356bf20bdd1da756ccc3574e5fc978883de72dfdb519977
+DIST jedi-0.18.0.tar.gz 462786 BLAKE2B 35021ed1566fffc24056060f16b8a0aa6f8b6e382f716ff5978711fd66340e96f4e0b628463aadead5605db32cfc20df06a6c53a9b435658f1c455a6212da6e5 SHA512 fcee84496285a0b0b1cf1f3827593d0603bd87c84baf725cc7bdbf594979f49729b18a29b7465848413bdd3a5670fcc41187dd3eadbd9750d77788c5a9408dbf
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
diff --git a/dev-python/jedi/jedi-0.18.0.ebuild b/dev-python/jedi/jedi-0.18.0.ebuild
new file mode 100644
index 000000000000..7ba3493dc927
--- /dev/null
+++ b/dev-python/jedi/jedi-0.18.0.ebuild
@@ -0,0 +1,70 @@
+# 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,10} )
+
+inherit distutils-r1
+
+TYPESHED_P="typeshed-jedi_v0.16.0"
+DJANGO_STUBS_P="django-stubs-v1.5.0"
+
+DESCRIPTION="Autocompletion library for Python"
+HOMEPAGE="https://github.com/davidhalter/jedi"
+SRC_URI="
+	https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/davidhalter/typeshed/archive/${TYPESHED_P#typeshed-}.tar.gz
+		-> ${TYPESHED_P}.tar.gz
+	https://github.com/davidhalter/django-stubs/archive/${DJANGO_STUBS_P#django-stubs-}.tar.gz
+		-> ${DJANGO_STUBS_P/v/}.tar.gz"
+
+LICENSE="MIT
+	test? ( Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="=dev-python/parso-0.8*[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# upstream includes these as submodules ...
+	rmdir "${S}"/jedi/third_party/{django-stubs,typeshed} || die
+	mv "${WORKDIR}/${DJANGO_STUBS_P/v/}" \
+		"${S}/jedi/third_party/django-stubs" || die
+	mv "${WORKDIR}/${TYPESHED_P}" \
+		"${S}/jedi/third_party/typeshed" || die
+
+	# don't run doctests, don't depend on colorama
+	sed -i "s:'docopt',:: ; s:'colorama',::" setup.py || die
+	sed -i "s: --doctest-modules::" pytest.ini || die
+
+	# test_complete_expanduser relies on $HOME not being empty
+	> "${HOME}"/somefile || die
+
+	# TODO: investigate
+	sed -e 's:test_local_import:_&:' \
+		-i test/test_utils.py || die
+	sed -e '/with sqlite3\.connect/,+2d' \
+		-i test/completion/stdlib.py || die
+	rm test/completion/django.py || die
+
+	# these tests fail with various pytest<->python version combinations
+	rm test/completion/pytest.py || die
+
+	# tests relying on pristine virtualenv
+	# this relies on test* not matching anything else
+	sed -e "/#\? \['test'\]/,+1d" \
+		-i test/completion/on_import.py || die
+	# this one's broken by 'path' module (dev-python/path-py)
+	sed -e 's:test_os_issues:_&:' \
+		-i test/test_inference/test_imports.py || die
+	sed -e 's:test_venv_and_pths:_&:' \
+		-i test/test_inference/test_sys_path.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 281f9670e7f8..9a0370021b93 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,2 +1 @@
-DIST jeepney-0.4.3.tar.gz 28121 BLAKE2B 2c9b5b5ec26a9af25d28af602827c73c8ec9377a88a4aa79b9a986675c1ef3f195763a338f3efa4ee371f7751dcf05a9f9cfed06c8d6677d81da3699773d5561 SHA512 bfb12c9259a57324759f8be44d1faf2c0535762e72db5f1370e64cb144c0fc537c9bc9cfb9b075932fb3a20e3ef4e0c990c10905cc5a69e3fb088e8de4193689
 DIST jeepney-0.6.0.tar.gz 49513 BLAKE2B e5f9b5104cf07dbcd2d40c2d22b690dfd56c456ab56daf44f4abee83f0bfe7e1dfbad797348044d51e3dc20fbc6ce68bf8df54f9c1e46d7a86ceb22d3ab30f8d SHA512 140be9dd28ed853d2d41b6a8bbeb2f22c0270ce7bf33b943ec2ac010db17d4f06e253fa8637fbbb3044fe9ffdbfa1e15f0c663eb44bdd538f8c47c2e7dab3ca5
diff --git a/dev-python/jeepney/jeepney-0.4.3.ebuild b/dev-python/jeepney/jeepney-0.4.3.ebuild
deleted file mode 100644
index 026cefb675eb..000000000000
--- a/dev-python/jeepney/jeepney-0.4.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, pure Python DBus protocol wrapper"
-HOMEPAGE="https://gitlab.com/takluyver/jeepney"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-BDEPEND="
-	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-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/jeepney/jeepney-0.6.0.ebuild b/dev-python/jeepney/jeepney-0.6.0.ebuild
index 3fec84e8f710..302339d7f9f8 100644
--- a/dev-python/jeepney/jeepney-0.6.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/jinja/jinja-2.11.2-r1.ebuild b/dev-python/jinja/jinja-2.11.2-r1.ebuild
index c8b2f386040f..7d32cfc72d26 100644
--- a/dev-python/jinja/jinja-2.11.2-r1.ebuild
+++ b/dev-python/jinja/jinja-2.11.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/joblib/joblib-1.0.0.ebuild b/dev-python/joblib/joblib-1.0.0.ebuild
index 31a9ed6b3883..726f1c0016d6 100644
--- a/dev-python/joblib/joblib-1.0.0.ebuild
+++ b/dev-python/joblib/joblib-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/josepy/josepy-1.5.0.ebuild b/dev-python/josepy/josepy-1.5.0.ebuild
index afb67f1dc00d..28dc384af428 100644
--- a/dev-python/josepy/josepy-1.5.0.ebuild
+++ b/dev-python/josepy/josepy-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index 436f4168cc3d..b7ac2914bf2f 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,3 +1 @@
-DIST jsonpatch-1.26.tar.gz 24440 BLAKE2B 345831bd9a9fc1902d0959685ed2dbbc0bf04d191bbc78567d27283e9ae52f7e22f50e9f400461300d1c3388712afa51d4d6a2ddd0a06dbc0a1b576b02bfe807 SHA512 1ab25c8e091cd0b772062a8c448fee4772081d8bd715489b2f7a76e4c0bdff8b26dd38b26c3037cf9bdf8780b97e62a20b6a5bdc43f43af16fdae51d1291bf52
-DIST jsonpatch-1.27.tar.gz 26599 BLAKE2B b3481b4dd01d4fc6c2ad129141fb2b72d53d04744da54c1e4c989b2869113c15862d1ec5c84390758ad495ac36a9156f0e7b730ad091f96f6cb42fe96dde7fcd SHA512 297ca02d114e6b199bd516f69dca147fbe309f0a1b031046859271720645322607236f97b489c242575f7e1ad3cab0c68b1b7f11894c5af82be24013e376c0a4
 DIST jsonpatch-1.28.tar.gz 26829 BLAKE2B 1dee89500be23c49e5d7fdcaacb05da7ea089b691e133c5187c9558d378ae3714ad7fc6f164d0b7eea7b3cf1afefa39b7748a4637b0456051fab086e0e8f15d0 SHA512 2884cb95307cb607c8cd80e688491b4449f953e43e5b232d4d57d7249c590652ecae0856806ade6bf2807a04180e992fd2cdf61590ac058d573d653382bf7a28
diff --git a/dev-python/jsonpatch/jsonpatch-1.26.ebuild b/dev-python/jsonpatch/jsonpatch-1.26.ebuild
deleted file mode 100644
index f1d5ea0dd440..000000000000
--- a/dev-python/jsonpatch/jsonpatch-1.26.ebuild
+++ /dev/null
@@ -1,28 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04"
-HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
-SRC_URI="https://github.com/stefankoegl/python-json-patch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/python-json-patch-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${RDEPEND} )
-"
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
-	"${EPYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpatch/jsonpatch-1.27.ebuild b/dev-python/jsonpatch/jsonpatch-1.27.ebuild
deleted file mode 100644
index 384ae87b8ac0..000000000000
--- a/dev-python/jsonpatch/jsonpatch-1.27.ebuild
+++ /dev/null
@@ -1,28 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04"
-HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
-SRC_URI="https://github.com/stefankoegl/python-json-patch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/python-json-patch-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${RDEPEND} )
-"
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
-	"${EPYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpatch/jsonpatch-1.28.ebuild b/dev-python/jsonpatch/jsonpatch-1.28.ebuild
index 384ae87b8ac0..061171242f04 100644
--- a/dev-python/jsonpatch/jsonpatch-1.28.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/python-json-patch-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 0d00e1a606ab..4fc4056dcef2 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,2 +1,2 @@
-DIST jsonpickle-1.4.1.tar.gz 104564 BLAKE2B a3ad6f9c712f39153186b6ccdef515581012ad4ba1251dcb094074f2093eb4b158b9357bdf2e8668073cb21dc3bf6dd2fc3a0058c8597252c558a797432068b9 SHA512 ed6bf3472c59ba907a973c5c6f05de13dbfc75eef103796b8f8a63d388f769527f22667ca8761092d1649ff2caf5a73de0593e370df3e7fcabe06e73b265da35
 DIST jsonpickle-1.4.2.tar.gz 104745 BLAKE2B af12141c867cd3dbecace5b7bc637b554c51c245d4f584c4d94e73e694b74f66fc59a65a62b7a0af361a7a8010b9398a9b04ee838c4f76c168b21dba6f2c9542 SHA512 a6da661a69daefbc9393a4a4c88aa1da1b8bd687b6eeaed3d833ce1683bd1fa9d7943fdeecfe927e0492945ee2910b6f2d5e53ddb2b928b21f7b099ab79d45e9
+DIST jsonpickle-1.5.0.tar.gz 106088 BLAKE2B dcd35979a428180f10611638c831b083d9b8307729a0b19fe89b283c30ecac58477bd6a66e89c31e214dd2f100385d9933dc00d506e1f9bbb4b6ea9c3a0eaed3 SHA512 7828ded98173cb10908a9d60fa6b3f358add360d738cd85a90f012ca24b15c6bbb19c611027bdb0a4d25fe0649978ae59ff08fb7b717ef503a9916152aa6f849
diff --git a/dev-python/jsonpickle/files/jsonpickle-1.4.1-importlib-metadata.patch b/dev-python/jsonpickle/files/jsonpickle-1.4.1-importlib-metadata.patch
deleted file mode 100644
index eefb41d73d7c..000000000000
--- a/dev-python/jsonpickle/files/jsonpickle-1.4.1-importlib-metadata.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 7e5752de7d49f222cec5107aa5044fa8f8ffbb39 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Wed, 22 Apr 2020 20:38:28 +0200
-Subject: [PATCH] Use importlib.metadata from the standard library on Python
- 3.8+
-
-Fixes https://github.com/jsonpickle/jsonpickle/issues/303
----
- jsonpickle/version.py | 7 ++++++-
- setup.cfg             | 2 +-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/jsonpickle/version.py b/jsonpickle/version.py
-index 01c83c4..92b44b2 100644
---- a/jsonpickle/version.py
-+++ b/jsonpickle/version.py
-@@ -1,5 +1,10 @@
-+import sys
-+
- try:
--    import importlib_metadata as metadata
-+    if sys.version_info < (3, 8):
-+        import importlib_metadata as metadata
-+    else:
-+        from importlib import metadata
- except (ImportError, OSError):
-     metadata = None
- 
-diff --git a/setup.cfg b/setup.cfg
-index 9f0eab2..46707ec 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -36,7 +36,7 @@ packages = find:
- include_package_data = true
- python_requires = >=2.7
- install_requires = 
--	importlib_metadata
-+	importlib_metadata; python_version<"3.8"
- setup_requires = setuptools_scm[toml] >= 3.4.1
- 
- [options.extras_require]
--- 
-2.28.0
-
diff --git a/dev-python/jsonpickle/jsonpickle-1.4.2.ebuild b/dev-python/jsonpickle/jsonpickle-1.4.2.ebuild
index 71db10312808..97c743063b68 100644
--- a/dev-python/jsonpickle/jsonpickle-1.4.2.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-1.4.2.ebuild
@@ -13,7 +13,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="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild b/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
index 73ec01c138d3..8760f1dc8ae3 100644
--- a/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,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="doc test"
 RESTRICT="!test? ( test )"
 
@@ -35,14 +35,12 @@ BDEPEND="
 distutils_enable_sphinx "docs/source"
 distutils_enable_tests pytest
 
-PATCHES=(
-	"${FILESDIR}"/jsonpickle-1.4.1-importlib-metadata.patch
-)
-
 python_prepare_all() {
 	# too many dependencies
 	rm tests/pandas_test.py || die
 	sed -e '/pandas/ d' -i tests/runtests.py || die
+	# broken with gmpy
+	rm tests/ecdsa_test.py || die
 
 	sed -i -e 's:--flake8 --black --cov --cov-append::' pytest.ini || die
 
diff --git a/dev-python/jsonpickle/metadata.xml b/dev-python/jsonpickle/metadata.xml
index 20819624f0eb..1f7a58083143 100644
--- a/dev-python/jsonpickle/metadata.xml
+++ b/dev-python/jsonpickle/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jsonpickle</remote-id>
     <remote-id type="github">jsonpickle/jsonpickle</remote-id>
diff --git a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
index 51b66e6c14e9..7fe53ff76072 100644
--- a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/jsonschema/jsonschema-3.2.0.ebuild b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
index 650f470ec767..a00aa60c43e2 100644
--- a/dev-python/jsonschema/jsonschema-3.2.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 BDEPEND="
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 366d8f094858..4a81c337adee 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1 +1,3 @@
+DIST jupyter_client-6.1.10.tar.gz 293620 BLAKE2B 87052ae5b07195a6a51d6308b06d0543850e23a7494602c61811270b8eea619b9337ee0e9069f9d905f1397aa5fc48710b5a894b21fb0328d397168508d34dbc SHA512 8a6d63b95e95e3230882ea67892fe87a24b43d0e85aa910ff8056c2067bb2bc2640d1896f851d0441234f9db27c2a876925988d141b2ed35287ae3e0e5b1eacb
+DIST jupyter_client-6.1.11.tar.gz 293651 BLAKE2B 73a8567927c452a6a6a591eed04d592c6bb52211214e6d27ae816a2ce07a61c3f80991a2209b42c1d679ff6d3ead564f6ac97e6500473e0e5bd86bad83db07c1 SHA512 3cd6c3d299ea7097b04ad88b08dad8c23d90c5feee18bf441434a6069151b85717c4d00d2c186c463995d26383442c4f63c86565b1606e60afb61426515f9a11
 DIST jupyter_client-6.1.6.tar.gz 292265 BLAKE2B 46f5b814577c8b1351ce42eb3de4a3032bb2917512f0c9cfc07fddc991698e192b628c03a9ce0d98817dfebcf4af0386fa4ee656b524f54c36de64781af3b8dd SHA512 9a443a2b4a86d823d1403a05d359b50ca95efb8e1dd992d331699e3fe2b46e5d4190cc55aa5d110a384fc0bb94abceaa4e36f67c0f7ce5a33f9ef3b11e682522
diff --git a/dev-python/jupyter_client/files/jupyter_client-6.1.6-msgpack-1.patch b/dev-python/jupyter_client/files/jupyter_client-6.1.6-msgpack-1.patch
new file mode 100644
index 000000000000..34a95d04ac78
--- /dev/null
+++ b/dev-python/jupyter_client/files/jupyter_client-6.1.6-msgpack-1.patch
@@ -0,0 +1,28 @@
+From bb973fa33952c1a803097852c031b3979dae607c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 22 Dec 2020 09:38:13 +0100
+Subject: [PATCH] Fix test_session with msgpack-1
+
+Replace the encoding parameter with raw=False to fix test_session
+with msgpack-1.0.0+.  The encoding parameter was already deprecated
+in msgpack-0.6.2, and raw=False is compatible with that version too.
+---
+ jupyter_client/tests/test_session.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/jupyter_client/tests/test_session.py b/jupyter_client/tests/test_session.py
+index d0ec662..45be9a9 100644
+--- a/jupyter_client/tests/test_session.py
++++ b/jupyter_client/tests/test_session.py
+@@ -304,7 +304,7 @@ class TestSession(SessionTestCase):
+ 
+         session = ss.Session(
+             pack=msgpack.packb,
+-            unpack=lambda buf: msgpack.unpackb(buf, encoding='utf8'),
++            unpack=lambda buf: msgpack.unpackb(buf, raw=False),
+         )
+         self._datetime_test(session)
+ 
+-- 
+2.29.2
+
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.6-r1.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.10.ebuild
index 429bbdadb515..41cbc9e27cfa 100644
--- a/dev-python/jupyter_client/jupyter_client-6.1.6-r1.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-6.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,16 +15,17 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/async_generator[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
+	<dev-python/jedi-0.17.3[${PYTHON_USEDEP}]
 	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="
 	test? (
 		dev-python/ipykernel[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.11.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.11.ebuild
new file mode 100644
index 000000000000..9e14253d2053
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-6.1.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/async_generator[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		<dev-python/jedi-0.17.3[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.6-r2.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.6-r2.ebuild
index 429bbdadb515..7350034b6d2e 100644
--- a/dev-python/jupyter_client/jupyter_client-6.1.6-r2.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-6.1.6-r2.ebuild
@@ -32,3 +32,7 @@ DEPEND="${RDEPEND}
 	)"
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-msgpack-1.patch
+)
diff --git a/dev-python/jupyter_client/metadata.xml b/dev-python/jupyter_client/metadata.xml
index 6014e144ddc4..20ebd402cad4 100644
--- a/dev-python/jupyter_client/metadata.xml
+++ b/dev-python/jupyter_client/metadata.xml
@@ -17,7 +17,7 @@
   </longdescription>
   <stabilize-allarches/>
   <upstream>
-    <remote-id type="pypi">jupyter_client</remote-id>
+    <remote-id type="pypi">jupyter-client</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild b/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild
deleted file mode 100644
index 5b1b76bb5355..000000000000
--- a/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild
+++ /dev/null
@@ -1,37 +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,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Core common functionality of Jupyter projects"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinxcontrib-github-alt
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# rely on imports working without PYTHONPATH
-	sed -e 's:test_not_on_path:_&:' \
-		-e 's:test_path_priority:_&:' \
-		-i jupyter_core/tests/test_command.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter_core/metadata.xml b/dev-python/jupyter_core/metadata.xml
index 97170cd46e3c..d1d54e5a5770 100644
--- a/dev-python/jupyter_core/metadata.xml
+++ b/dev-python/jupyter_core/metadata.xml
@@ -15,7 +15,7 @@
     inhertited by other projects. It doesn't do much on its own.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">jupyter_core</remote-id>
+    <remote-id type="pypi">jupyter-core</remote-id>
     <remote-id type="github">jupyter/jupyter_core</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 4ab3abad6a4c..32f37e4cca41 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,2 +1,3 @@
-DIST keyring-21.4.0.tar.gz 73591 BLAKE2B ad8fe71a6a8bd3180b01ce3ca0372f9d1dc493d3eb58ced707d1869284d21ceaffaab314c1304b58461d771fa1a4a5981ec8fbcfaf333d602bdef7985d8799eb SHA512 149f1706296c830605d0ff2eddacf3d531c3d80f694465785d83e2af1d55a49204a2112db840522d4de10cd012073cafe571638e2c39a2f61c308821fe5ec901
 DIST keyring-21.5.0.tar.gz 45885 BLAKE2B 73fe60f0d414cad3b36e0c995b63f048f75358b9f4d389f41ae3a32d68c82ccb9d1fe76d9bd375d06519bcebb8ad9aa34ba98676bf37f3c5a10d9424c161e074 SHA512 25cbbcac0810829e48e6ff4c9497b8c9f3c03011047e76a6901f6c422d6eb1711e535233a90d96f8dc16a77352d4228114f3b447d9e196184a9d87402658f5bd
+DIST keyring-21.7.0.tar.gz 46998 BLAKE2B 469d2de254ed88604a40a4e05c001f50986f55296d35b54969cfa8612473cbd5184f36bd6babdfb6631ab908e03f81858434b7e52471a2d366f97293c2c0ed93 SHA512 8fc5e8f0f0cf2a336c6ce900d59fcd31b4ec270d62559a1c2b4c36803428532b463bad0b2ace9af33b6fb0d50de94229449c4ef4042287ecaa8f1fac37c5faf8
+DIST keyring-21.8.0.tar.gz 47639 BLAKE2B 3b8b11cd7ea121f9d8544a5775d9f62de23613da0265f0d815687ad311f4a7b6ed431142682df3059fbe43a342c6151871782a850c416a5b50c1df14a64d609a SHA512 4acadf421946644466b5c43481eddd111170185ba3993f4fec38cad0129259bd17aebad4dc2e2d2e88e84aa814e62d37b39efe7385ccd569e40a5291d5f4ae40
diff --git a/dev-python/keyring/keyring-21.5.0.ebuild b/dev-python/keyring/keyring-21.5.0.ebuild
index 8718ebbd922e..0d8bf0f4836e 100644
--- a/dev-python/keyring/keyring-21.5.0.ebuild
+++ b/dev-python/keyring/keyring-21.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/keyring/keyring-21.4.0.ebuild b/dev-python/keyring/keyring-21.7.0.ebuild
index e7c3ecc95194..8718ebbd922e 100644
--- a/dev-python/keyring/keyring-21.4.0.ebuild
+++ b/dev-python/keyring/keyring-21.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/keyring/keyring-21.8.0.ebuild b/dev-python/keyring/keyring-21.8.0.ebuild
new file mode 100644
index 000000000000..8718ebbd922e
--- /dev/null
+++ b/dev-python/keyring/keyring-21.8.0.ebuild
@@ -0,0 +1,45 @@
+# 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,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	dev-python/jeepney[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3 python3_{5,6,7})
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/jaraco-packaging \
+	dev-python/rst-linker
+
+python_prepare_all() {
+	sed -i -e 's:--flake8 --black --cov --mypy::' pytest.ini || die
+	rm tests/backends/test_kwallet.py || die
+
+	distutils-r1_python_prepare_all
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index e61b858df983..64dabc32e1cf 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,2 +1 @@
-DIST kiwisolver-1.3.0.tar.gz 86440 BLAKE2B 931a230909a7778aac3bc93fb24538c7b9e0a3cf1dea33fcf374fd6576d56b80a50597d14c6431f659326222c8810416897fcc9ce2725ca5341891f65aedc5b2 SHA512 64bb475f86e6f409318c5030cd2874bf060c26bf6c1ea62bfb96c1ae27f7326fcd6fc575cbdad7351808d18ae9b9f6664eb312019d432cd6a4c0b8af4fa317b6
 DIST kiwisolver-1.3.1.tar.gz 86948 BLAKE2B 4e03547842e831424aef5be880021aea8d0fef372900bcb9b55f2367fc89f728250b936702fd737807579be34e4ff7489d5669f5113e95612352a293d9f883ea SHA512 0f5c1e516c334d358b8679313035dd45386381965853005271c73e3f4421fb27e3ca5a43b4f2dc85d693f4151427dae9b34d372fe72fcc1a186abd85a54a225a
diff --git a/dev-python/kiwisolver/kiwisolver-1.3.0.ebuild b/dev-python/kiwisolver/kiwisolver-1.3.0.ebuild
deleted file mode 100644
index 01dfcbec94d8..000000000000
--- a/dev-python/kiwisolver/kiwisolver-1.3.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=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
-HOMEPAGE="https://github.com/nucleic/kiwi"
-SRC_URI="https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/kiwi-${PV}
-
-LICENSE="Clear-BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-
-RDEPEND="
-	>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
index 80b731993b65..8a80b1ee37a1 100644
--- a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}"/kiwi-${PV}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
index 01c49f922656..3fd19cac1e60 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/ldap3/Manifest b/dev-python/ldap3/Manifest
index 43b05c8162e3..fa7b29804bbf 100644
--- a/dev-python/ldap3/Manifest
+++ b/dev-python/ldap3/Manifest
@@ -1,2 +1 @@
-DIST ldap3-2.7.tar.gz 956927 BLAKE2B 7cc93df5b807745e6013b62bb35c281934cc7f191fe1ec2c117f23567a99d56557adfe924ad955e89326108136f9021f445a755670ab649d0ae571e0f986683a SHA512 52b9e8632a8d0b5cfdd801d165f72cfa78b6fa56e1c5e1b3b0b44ad1f1d695a55506b324d88af429319bc9b7b2a5d67d8f0eb6b7c305aa06a7ed9fec8aedbd94
 DIST ldap3-2.8.1.tar.gz 961648 BLAKE2B d6cbc52512efbe4f6fe5e7d19ee2ce1af3e03a8d6d08d2235eeff0f00c61fd12583c4b9fb452206ba161961c3438d109fa106a50a0edc858c24f5cd6261b2561 SHA512 f37e76e1008c990290285a757def6fe70e227393fbbdf84eb1130d5fdfd17db724c544848cc424ca7831f8cc9e8d25407fc139981ebd10818064f588adbafebf
diff --git a/dev-python/ldap3/ldap3-2.7.ebuild b/dev-python/ldap3/ldap3-2.7.ebuild
deleted file mode 100644
index 2aef3ed770c3..000000000000
--- a/dev-python/ldap3/ldap3-2.7.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,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client"
-HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.python.org/pypi/ldap3"
-SRC_URI="https://github.com/cannatag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/pyasn1-0.4.8[${PYTHON_USEDEP}]
-"
-# tests require a ldap server and extra configuration
-RESTRICT="test"
-
-distutils_enable_tests nose
diff --git a/dev-python/ldap3/ldap3-2.8.1.ebuild b/dev-python/ldap3/ldap3-2.8.1.ebuild
index 2509c62277f3..6d0803c95e66 100644
--- a/dev-python/ldap3/ldap3-2.8.1.ebuild
+++ b/dev-python/ldap3/ldap3-2.8.1.ebuild
@@ -8,12 +8,14 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client"
-HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.python.org/pypi/ldap3"
+HOMEPAGE="
+	https://github.com/cannatag/ldap3/
+	https://pypi.org/project/ldap3/"
 SRC_URI="https://github.com/cannatag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/pyasn1-0.4.8[${PYTHON_USEDEP}]
diff --git a/dev-python/libnacl/libnacl-1.7.2.ebuild b/dev-python/libnacl/libnacl-1.7.2.ebuild
index a81d74040d7b..7a78649c0b06 100644
--- a/dev-python/libnacl/libnacl-1.7.2.ebuild
+++ b/dev-python/libnacl/libnacl-1.7.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="dev-libs/libsodium"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/libpillowfight/libpillowfight-0.3.0.ebuild b/dev-python/libpillowfight/libpillowfight-0.3.0.ebuild
index 4aef2ee3469b..a0e14f881b27 100644
--- a/dev-python/libpillowfight/libpillowfight-0.3.0.ebuild
+++ b/dev-python/libpillowfight/libpillowfight-0.3.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_PN="pypillowfight"
 
 DESCRIPTION="Small library containing various image processing algorithms"
-HOMEPAGE="https://github.com/openpaperwork/libpillowfight"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libpillowfight"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/libpillowfight/metadata.xml b/dev-python/libpillowfight/metadata.xml
index f1cd734b4ebd..744f43fef5ed 100644
--- a/dev-python/libpillowfight/metadata.xml
+++ b/dev-python/libpillowfight/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">pypillowfight</remote-id>
-    <remote-id type="github">openpaperwork/libpillowfight</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 214dc945e343..2b790760cbc6 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,2 +1 @@
-DIST libtmux-v0.8.3.tar.gz 131928 BLAKE2B 7979dc907d5c7805cf56422aa0fed554c89f0b50cf1f13b150809a1c7e24b0eab125701eada0431212afccc26f6479642c886b3f701c8c2ffc9c3ebb7d08c4cc SHA512 f7c5a84f16b400db672318d3c0b79cd8f328a0096d32349f6ce9360d72eecd75ed9915af5c37950adadd81943130b543716d718366522efee7780813a2c1a5d6
 DIST libtmux-v0.8.5.tar.gz 222445 BLAKE2B 5af148555eb89c66bdc66f3f214967f7e901d9b86ea85e02a9fba64f2eb3559828519ba8120eaee5eb86ec75bee2e599a08384dd096de8dc0969129c58172c1e SHA512 d456725c3ca41a672ee5239bfb5f42a262674638d308fa141627995be8b8fe348bb8713b735eb05c5a3cc73f35fe3f6fac12024f6254c950a3048b2e07606363
diff --git a/dev-python/libtmux/libtmux-0.8.3.ebuild b/dev-python/libtmux/libtmux-0.8.3.ebuild
deleted file mode 100644
index 3222613a86a1..000000000000
--- a/dev-python/libtmux/libtmux-0.8.3.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,7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="python api for tmux"
-HOMEPAGE="https://libtmux.git-pull.com/"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND=">=app-misc/tmux-3.0a"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/alagitpull \
-	dev-python/docutils
-
-python_prepare_all() {
-	# avoid a dependency on sphinx_issues
-	local issues="https://github.com/tmux-python/libtmux/issues/"
-	sed -i "s:'sphinx_issues',::" doc/conf.py || die
-	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
-	rm requirements/doc.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libtmux/libtmux-0.8.5.ebuild b/dev-python/libtmux/libtmux-0.8.5.ebuild
index dce1158a5c87..7762dc3c2a6f 100644
--- a/dev-python/libtmux/libtmux-0.8.5.ebuild
+++ b/dev-python/libtmux/libtmux-0.8.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND=">=app-misc/tmux-3.0a"
 BDEPEND="
diff --git a/dev-python/libtmux/metadata.xml b/dev-python/libtmux/metadata.xml
index f0169b5b01d4..2aa5a52dd7df 100644
--- a/dev-python/libtmux/metadata.xml
+++ b/dev-python/libtmux/metadata.xml
@@ -5,6 +5,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">libtmux</remote-id>
 	</upstream>
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 1e4985e5ee0b..2af3329852d2 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,4 +1,4 @@
-DIST libvirt-python-6.7.0.tar.gz 208597 BLAKE2B 335bd89133b688586a55193635b4b75dabe6dd4a741a450e49067ac8a9b9d9da54787b50c23bc6d5322a7fecbe513422f02450e09d541cb112ccfd499ce18101 SHA512 7d5a7f87abc01285c2030c9408838d4e1496d0d0316b9ab775749e49719fa66c20114aad2bd281d6783e2cb4d47ceac5ac60ac584e881288d0b0d9cc76d5b2cb
+DIST libvirt-python-6.10.0.tar.gz 212567 BLAKE2B 0ba583646c16c8e298a4cde789dca9c0f4920a3ac7e241134e251e5d0fc426a37c297870571acc673de2ce14c3de5bb7069316805581ce33cc044090930dd599 SHA512 bc9d65fa82cf021c0929c8f2760a31de606d52c860d15d1961438fd763131f05fa3f4e12f0030b45ad12c3ae40d84b21167091ae810376487b7aae11c2e3ab2b
 DIST libvirt-python-6.8.0.tar.gz 210034 BLAKE2B 667c2713bf9c0936f444c5b621f5af4e5273deda31496bc01c8834286a0ec0eb1c056006549cc5d129ef597264f8582acee62db3a2fd375daa4ebbceacb8fcc1 SHA512 6d2f82fafd414047cff16f0ad655fefd69c8c0da04be07d27da44e3ab17dd03e4e4ff102be1c30948c361268f57ea312978f9198fd128bfb54a3c1a07150e6af
 DIST libvirt-python-6.9.0.tar.gz 210366 BLAKE2B 384d8ce4d6c91f7185484e3ad35572a3245712c59f416d0f117ce7936d1e6234458c3454a8d773ee287de4d529eae7229e3dd67111df7955369cd36b028be1cc SHA512 d15a80de5418586f769101525464efc88154c9038f59c805030a60b4b711f11f15531f4e1fd01575e1646397342fefa38fca9371e8146157b61f607b3c286fe1
-DIST libvirt-python-6.10.0.tar.gz 212567 BLAKE2B 0ba583646c16c8e298a4cde789dca9c0f4920a3ac7e241134e251e5d0fc426a37c297870571acc673de2ce14c3de5bb7069316805581ce33cc044090930dd599 SHA512 bc9d65fa82cf021c0929c8f2760a31de606d52c860d15d1961438fd763131f05fa3f4e12f0030b45ad12c3ae40d84b21167091ae810376487b7aae11c2e3ab2b
+DIST libvirt-python-7.0.0.tar.gz 214945 BLAKE2B 9ab616fa6336a284dbb1dcebf0be6a06d9ca0c41e83ca403cb335c61ff217e1e9f0343fc915e20e16f3e59adc5c7b1c51e493143c45cd50f48f627ebe2e9c211 SHA512 c56bc53da06a81d330389f684df204d0ae8edb28127eccd81ac551342a0965341d20832f6e2b044e02e9217320349f6f5cb36098c5cc46508a4026fb1e59c4ac
diff --git a/dev-python/libvirt-python/libvirt-python-6.7.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
index 76c134284dd0..36d79238425a 100644
--- a/dev-python/libvirt-python/libvirt-python-6.7.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999* ]]; then
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
@@ -29,11 +29,13 @@ SLOT="0"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
-DEPEND="virtual/pkgconfig"
-BDEPEND="test? (
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-)"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests setup.py
 
diff --git a/dev-python/libvirt-python/libvirt-python-9999.ebuild b/dev-python/libvirt-python/libvirt-python-9999.ebuild
index a9328bf54194..36d79238425a 100644
--- a/dev-python/libvirt-python/libvirt-python-9999.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-9999.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=no
+
 MY_P="${P/_rc/-rc}"
 
 inherit distutils-r1
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS=""
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
@@ -29,14 +29,15 @@ SLOT="0"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
-DEPEND="${RDEPEND}
+BDEPEND="
 	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
 
 python_install_all() {
 	if use examples; then
diff --git a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
index c95640188200..e17418e90ac9 100644
--- a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index d36c99982c35..07cacd71fa2f 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,4 +1,5 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
+DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-python/lit/lit-11.0.1_rc1.ebuild b/dev-python/lit/lit-11.0.1.ebuild
index d2a3a65de8f4..584a11d4c9dc 100644
--- a/dev-python/lit/lit-11.0.1_rc1.ebuild
+++ b/dev-python/lit/lit-11.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-11.0.1.9999.ebuild b/dev-python/lit/lit-11.1.0_rc1.ebuild
index d2a3a65de8f4..c2a432e75125 100644
--- a/dev-python/lit/lit-11.0.1.9999.ebuild
+++ b/dev-python/lit/lit-11.1.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/livereload/Manifest b/dev-python/livereload/Manifest
index 7ccf872191f9..3a64923b8c01 100644
--- a/dev-python/livereload/Manifest
+++ b/dev-python/livereload/Manifest
@@ -1,2 +1 @@
-DIST livereload-2.6.1.tar.gz 28324 BLAKE2B e6b9d107b5848916548e3665461dc90c1a37124496b4066aab45c62c57f0287f23d3883321bc2c67a053f981336c84ff47d1a459c9f10bb8965ea11236d07d2d SHA512 c7f058687c715a46e24537105bae2788395c6664a69f9a78b1c357464818d17826515c66c537ab625ee5eeb99f162b1304006455f4da9b0bab9a67bacf12d3dc
 DIST livereload-2.6.3.tar.gz 29407 BLAKE2B 39f030dbc21bec1b132fd9d43f9072f4c35d23ccdca56819e2c6b35277e9eac9caeeff7052fc766359e34bf415319f809ebd45927bd2cc223be7ac88594feef7 SHA512 ccccb17cb4d835eb9e812f8076f871164f6afb2fdc1aee9e35c5ef2d75be2c0403cee51d4eb30b029d7b35522f357ee8c3e9df926fd93511ba7d010ed2a69e8e
diff --git a/dev-python/livereload/livereload-2.6.1.ebuild b/dev-python/livereload/livereload-2.6.1.ebuild
deleted file mode 100644
index fbda93ddc4b9..000000000000
--- a/dev-python/livereload/livereload-2.6.1.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
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python LiveReload is an awesome tool for web developers"
-HOMEPAGE="https://github.com/lepture/python-livereload"
-SRC_URI="https://github.com/lepture/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="examples"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/python-${P}"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/flask-sphinx-themes
-
-python_prepare_all() {
-	# AssertionError: assert (None, None) == ('/var/tmp/portage/dev-python/livereload-2.6.1/work/livereload-2.6.1/tests/tmp/first/foo',\n None)
-	sed -i -e 's:test_watch_multiple_dirs:_&:' tests/test_watcher.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/livereload/livereload-2.6.3.ebuild b/dev-python/livereload/livereload-2.6.3.ebuild
index 14719e2295a3..a0395b36bdf1 100644
--- a/dev-python/livereload/livereload-2.6.3.ebuild
+++ b/dev-python/livereload/livereload-2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/lepture/python-${PN}/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="examples"
 
diff --git a/dev-python/livereload/metadata.xml b/dev-python/livereload/metadata.xml
index 0e15c6980051..f34c39142800 100644
--- a/dev-python/livereload/metadata.xml
+++ b/dev-python/livereload/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">lepture/python-livereload</remote-id>
 		<remote-id type="pypi">livereload</remote-id>
diff --git a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
index c423d118e903..b3021c777b14 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 BDEPEND=">dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/loky/loky-2.9.0.ebuild b/dev-python/loky/loky-2.9.0.ebuild
index 041648d264f9..c632ce4ab8b1 100644
--- a/dev-python/loky/loky-2.9.0.ebuild
+++ b/dev-python/loky/loky-2.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/lunr/lunr-0.5.8.ebuild b/dev-python/lunr/lunr-0.5.8.ebuild
index 00c6e823ab8c..a0d9e89ea504 100644
--- a/dev-python/lunr/lunr-0.5.8.ebuild
+++ b/dev-python/lunr/lunr-0.5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/yeraydiazdiaz/lunr.py/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/future[${PYTHON_USEDEP}]
diff --git a/dev-python/lunr/metadata.xml b/dev-python/lunr/metadata.xml
index 1a1fadf969c5..02bdfcd6bac4 100644
--- a/dev-python/lunr/metadata.xml
+++ b/dev-python/lunr/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">lepture/python-livereload</remote-id>
 		<remote-id type="pypi">lunr</remote-id>
diff --git a/dev-python/lxml-python2/lxml-python2-4.5.2-r1.ebuild b/dev-python/lxml-python2/lxml-python2-4.5.2-r2.ebuild
index 64939805aa25..1cb4a27ea0df 100644
--- a/dev-python/lxml-python2/lxml-python2-4.5.2-r1.ebuild
+++ b/dev-python/lxml-python2/lxml-python2-4.5.2-r2.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1 optfeature toolchain-funcs
 MY_PN=lxml
 MY_P=$MY_PN-$PV
@@ -28,8 +29,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython-python2[${PYTHON_USEDEP}]
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
 	"
 
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 4237fe3cc16a..09a9b9b6e037 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,2 +1 @@
-DIST lxml-4.6.1.tar.gz 946461 BLAKE2B b1ea8e15af1130b9f9683614bbc2480ec5008ad697f70536a332c1faf4bda4aa9525b2ef5d82d32c415c91e47ab54c7b3cb644e9a2933517946c3fc8ab7ec7c5 SHA512 3cc917e7535ac1be3db8939f72846313267c8b1f0adccc92a2155a160ed7299d0def718bdae1379e42398ca1b959b1130505597febca00f02cb87c8666f1f1c3
 DIST lxml-4.6.2.tar.gz 948652 BLAKE2B df6ec7e183df48c0edc6cce0fbdd6ab78eb8d1b7e8fb81a76bd9f4a24f05923c757d5b21f508be9be50c7bb187927c4e3a66146d480f2d40efc05388d26d3bf5 SHA512 81dcf5cade7b05c0e831beae7cdfbdb21e876fa55b23da98b89cbfa7960a4737efc13346ea3ade22a2448f20e036173cf5e32d43df6656c3231bfba07981f9ed
diff --git a/dev-python/lxml/lxml-4.6.1.ebuild b/dev-python/lxml/lxml-4.6.1.ebuild
deleted file mode 100644
index 585a83d54c05..000000000000
--- a/dev-python/lxml/lxml-4.6.1.ebuild
+++ /dev/null
@@ -1,81 +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,9,10} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
-SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.9.5
-	>=dev-libs/libxslt-1.1.28"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
-)
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-4.6.2.ebuild b/dev-python/lxml/lxml-4.6.2-r1.ebuild
index 585a83d54c05..2f3ac0b5e73e 100644
--- a/dev-python/lxml/lxml-4.6.2.ebuild
+++ b/dev-python/lxml/lxml-4.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
@@ -27,6 +27,14 @@ BDEPEND="
 	virtual/pkgconfig
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/docutils[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
+	)
 	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
 	"
 
@@ -36,6 +44,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
 )
 
+python_check_deps() {
+	use doc || return 0
+	has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pygments[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
+}
+
 python_prepare_all() {
 	# avoid replacing PYTHONPATH in tests.
 	sed -i -e '/sys\.path/d' test.py || die
@@ -55,6 +71,10 @@ python_compile() {
 	distutils-r1_python_compile
 }
 
+python_compile_all() {
+	use doc && emake html
+}
+
 python_test() {
 	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
 	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
index 74fd56f30dfc..a135dc9c4ed7 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -1,2 +1,2 @@
-DIST lz4-3.0.2.tar.gz 152443 BLAKE2B 3bf452b5b5ee65caed13b21fd7c39f32ccdea18e6d900facf74e3271868299a2da258b2b0058efaea12a3b42006f0ad0d17004692c95be951c173fee1a1162be SHA512 c31116ee3cd70241b19bff6c59d1852d4c26ad5f0c9a56cd2ecec58e8c2751773162c7ac6a2d887e8cf537bc869ed8866929164f976849efa3ea041eacc4535a
 DIST lz4-3.1.1.tar.gz 154325 BLAKE2B 2d40728087aea735aeac4d39c415edf94f9aca83c77e4a36fe53f6f32f6c1595c0b1ad97c11f6e58cacafb95e0e12d29336d9f072d4f0d47f2d522f552a368bf SHA512 b6ddcabcb323b88eeff1fa9cb91d379d6435ab51b2b51e080138892fbce57d92c8175e2ae1ef72e8a2f95429aaa4be66a5e8cd9d4dbc5bcd6b44ec26b7df96db
+DIST lz4-3.1.2.tar.gz 153729 BLAKE2B f7d8b1b6dd4ee59d07eb4c2108516f939041bb1f131c62925986c2ad49406222c3eeac5232528979d6277aa5c1a950999f7bb3e984ffe26788e9d92a7eccf2e8 SHA512 bd277baf83a4d7819c2deee64e053fc030c5ccff8d5ea91762bfad2c38d5922f5305f8435b060821e86480be06716fa826cd05f407188077cc20637122e7c397
diff --git a/dev-python/lz4/lz4-3.1.1.ebuild b/dev-python/lz4/lz4-3.1.1.ebuild
index 492d73dbaee3..70149bda2fa7 100644
--- a/dev-python/lz4/lz4-3.1.1.ebuild
+++ b/dev-python/lz4/lz4-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-arch/lz4"
 DEPEND="
diff --git a/dev-python/lz4/lz4-3.0.2.ebuild b/dev-python/lz4/lz4-3.1.2.ebuild
index 232ddc4a342d..8fdd45e9a0b7 100644
--- a/dev-python/lz4/lz4-3.0.2.ebuild
+++ b/dev-python/lz4/lz4-3.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,11 +13,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="app-arch/lz4"
-DEPEND="
-	${RDEPEND}
+RDEPEND="app-arch/lz4:="
+DEPEND=${RDEPEND}
+BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	dev-python/pkgconfig[${PYTHON_USEDEP}]
 	test? (
@@ -25,8 +25,4 @@ DEPEND="
 	)
 "
 
-# known test failure: https://github.com/python-lz4/python-lz4/issues/199
-PATCHES=( "${FILESDIR}/lz4-3.0.2-test-fail-skip.patch"
-)
-
 distutils_enable_tests pytest
diff --git a/dev-python/m2crypto-python2/m2crypto-python2-0.36.0-r1.ebuild b/dev-python/m2crypto-python2/m2crypto-python2-0.36.0-r2.ebuild
index 59098fd9a636..cb3acfb4e594 100644
--- a/dev-python/m2crypto-python2/m2crypto-python2-0.36.0-r1.ebuild
+++ b/dev-python/m2crypto-python2/m2crypto-python2-0.36.0-r2.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1 toolchain-funcs
 
 MY_PN="M2Crypto"
@@ -28,7 +29,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-lang/swig-2.0.9
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
 "
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild b/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
index f73e8e9df3bd..ee2a48eb4918 100644
--- a/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild b/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild
index e785ecf49bc4..40af0bafa21e 100644
--- a/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/dev-python/m2crypto/m2crypto-0.37.1.ebuild b/dev-python/m2crypto/m2crypto-0.37.1.ebuild
index d6abdd5b698e..35593a51de53 100644
--- a/dev-python/m2crypto/m2crypto-0.37.1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.37.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="libressl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 9fd256d67180..82aebf2147e7 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1 +1,2 @@
 DIST Mako-1.1.3.tar.gz 477440 BLAKE2B ffa148815d64f1fbfac0291e6afdbcf967d7445e13f364e1e2a492330ad1cd71a788255776e07bbec95877f65440073ec873b035d6f6fc1293a299b0478524a3 SHA512 a9b94fa34a61e7794b6e4549fa0bada6ff84dfb0d9edb8d5c7f9b95d12184fa4499f42303cfee720b576a9f7e986a57d91ad3aeb26c9f93154dbc08fb2975952
+DIST Mako-1.1.4.tar.gz 479823 BLAKE2B 048c63c6caf493b9809dbcda8d1d697a7a25c8d22e97f439facae64b26d5b8f5f3002ff65529e9599e6069482fa25d6db95d810175f7f674f5af02cbd3f9f5e3 SHA512 4844c1d6c8d0d474b4ca4e1b31d3557747fc7e30f70a1976163a26b46b1b45c4c96ca6101fbef252b4e3bb4a61635d2a2c6d1c2933fde5b82bb1a1306f31ff84
diff --git a/dev-python/mako/mako-1.1.3-r1.ebuild b/dev-python/mako/mako-1.1.3-r1.ebuild
index 552bb1362f8b..510cd7518bbc 100644
--- a/dev-python/mako/mako-1.1.3-r1.ebuild
+++ b/dev-python/mako/mako-1.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/mako/mako-1.1.4.ebuild b/dev-python/mako/mako-1.1.4.ebuild
new file mode 100644
index 000000000000..8372f0947c3f
--- /dev/null
+++ b/dev-python/mako/mako-1.1.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 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,9,10} pypy3 )
+
+inherit distutils-r1 optfeature
+
+MY_P=${P^}
+DESCRIPTION="A Python templating language"
+HOMEPAGE="https://www.makotemplates.org/ https://pypi.org/project/Mako/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/mako-1.1.1-pypy3-test.patch
+)
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	rm -r doc/build || die
+
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	optfeature "caching support" dev-python/beaker
+}
diff --git a/dev-python/markdown/markdown-2.6.11.ebuild b/dev-python/markdown/markdown-2.6.11.ebuild
index 8a4613247c6e..dd254d75d849 100644
--- a/dev-python/markdown/markdown-2.6.11.ebuild
+++ b/dev-python/markdown/markdown-2.6.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc
-~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 RESTRICT="test"
 
diff --git a/dev-python/markdown/markdown-3.3.3.ebuild b/dev-python/markdown/markdown-3.3.3.ebuild
index 603c9f061a2d..731d64fe8bb4 100644
--- a/dev-python/markdown/markdown-3.3.3.ebuild
+++ b/dev-python/markdown/markdown-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 # importlib_metadata is only necessary for <python:3.8 according to setup.py
diff --git a/dev-python/markdown2/metadata.xml b/dev-python/markdown2/metadata.xml
index c40222736d31..ce38e7625ef3 100644
--- a/dev-python/markdown2/metadata.xml
+++ b/dev-python/markdown2/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>maksbotan@gentoo.org</email>
-    <name>Maxim Koltsov</name>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild b/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
index 2da596d69eb6..852088d1ccb1 100644
--- a/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
+++ b/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,6 +17,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index 64a3f2c1aea2..e5b73814dc45 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1 +1,2 @@
+DIST marshmallow-3.10.0.tar.gz 172801 BLAKE2B 1d1f5d531a9704a9b82170347e2c5dd2b3fd4488204a05f9be7705a39e5a6a42342bcce1438484c22944a6fb4470a731825314ed7ced79dbaf9cc195f049d9b2 SHA512 41520a7cfde483ca06a69e49ab04f8972932d0fbf7a6c75ef568779b55d5f2f666aead4c161e03416e9b90fba71fd73b3f14630f0d7050b8a7fe7a4bb50d5bf0
 DIST marshmallow-3.5.1.tar.gz 168839 BLAKE2B 8abf8e8d45d37794c3c615f6dac8ccd0acb76357e92ddaa4c23232b7aefba63db9bd42fb7f13dd99f9ea2ec4c7608459bc36014f9344ab91894176d0f02259c9 SHA512 89b3abce9e31dad6a20cf8ceef62270c8f95cbdf80965b6d29f1728d37d51171a020463da9d0354688183ea07e3f47a0ddab8694da13fe238f11a3dc755d4d6e
diff --git a/dev-python/serpent/serpent-1.30.ebuild b/dev-python/marshmallow/marshmallow-3.10.0.ebuild
index e80dca092f41..be415402c904 100644
--- a/dev-python/serpent/serpent-1.30.ebuild
+++ b/dev-python/marshmallow/marshmallow-3.10.0.ebuild
@@ -6,20 +6,23 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
 
-DESCRIPTION="A simple serialization library based on ast.literal_eval"
-HOMEPAGE="https://pypi.org/project/serpent/ https://github.com/irmen/Serpent"
+DESCRIPTION="A lightweight library for converting complex datatypes to and from native Python datatypes."
+HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-distutils_enable_tests setup.py
-
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
 	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/metadata.xml b/dev-python/marshmallow/metadata.xml
index 4125a09d2906..c90cebec86bd 100644
--- a/dev-python/marshmallow/metadata.xml
+++ b/dev-python/marshmallow/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">marshmallow</remote-id>
 		<remote-id type="github">marshmallow-code/marshmallow</remote-id>
diff --git a/dev-python/matplotlib/files/matplotlib-3.3.3-disable-lto.patch b/dev-python/matplotlib/files/matplotlib-3.3.3-disable-lto.patch
new file mode 100644
index 000000000000..ab377e7f19b2
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-3.3.3-disable-lto.patch
@@ -0,0 +1,25 @@
+From 7382d6205bfdc647a8e47c8e417c991d3822eace Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 4 Jan 2021 10:03:32 +0100
+Subject: [PATCH] Disable -flto
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 6e1d19d..ed85d14 100644
+--- a/setup.py
++++ b/setup.py
+@@ -147,7 +147,7 @@ class BuildExtraLibraries(BuildExtCommand):
+                         ranlib = True
+                     else:
+                         ranlib = shutil.which('llvm-ranlib')
+-        if ranlib and has_flag(self.compiler, '-flto'):
++        if False and ranlib and has_flag(self.compiler, '-flto'):
+             for ext in self.extensions:
+                 ext.extra_compile_args.append('-flto')
+             cppflags.append('-flto')
+-- 
+2.30.0
+
diff --git a/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
index dcfcf31e1f0b..b8dd0395a6bb 100644
--- a/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ RDEPEND="
 	media-fonts/stix-fonts
 	media-libs/freetype:2
 	media-libs/libpng:0
-	>=media-libs/qhull-2013
+	>=media-libs/qhull-2013:=
 	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
 	cairo? (
 		dev-python/cairocffi[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
index bb073a3cc9e4..391690255abe 100644
--- a/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ RDEPEND="
 	media-fonts/stix-fonts
 	media-libs/freetype:2
 	media-libs/libpng:0
-	>=media-libs/qhull-2013
+	>=media-libs/qhull-2013:=
 	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
 	cairo? (
 		dev-python/cairocffi[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.2.ebuild b/dev-python/matplotlib/matplotlib-3.3.2.ebuild
index 993a7312554e..ef041f1cda58 100644
--- a/dev-python/matplotlib/matplotlib-3.3.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,7 +43,7 @@ RDEPEND="
 	media-fonts/stix-fonts
 	media-libs/freetype:2
 	media-libs/libpng:0
-	>=media-libs/qhull-2013
+	>=media-libs/qhull-2013:=
 	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
 	cairo? (
 		dev-python/cairocffi[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.3.ebuild b/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild
index 319ea4d0e88e..4f728d64eb74 100644
--- a/dev-python/matplotlib/matplotlib-3.3.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
@@ -43,7 +43,7 @@ RDEPEND="
 	media-fonts/stix-fonts
 	media-libs/freetype:2
 	media-libs/libpng:0
-	>=media-libs/qhull-2013
+	>=media-libs/qhull-2013:=
 	cairo? (
 		dev-python/cairocffi[${PYTHON_USEDEP}]
 	)
@@ -150,6 +150,7 @@ python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}"/matplotlib-3.3.0-test.patch
 		"${FILESDIR}"/matplotlib-3.3.2-test-extra.patch
+		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
 	)
 
 	# requires jupyter-nbconvert
diff --git a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
index e80f928f58d5..bdbbae5427fe 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-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 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
index 7cedbbae5cd4..29227cb18562 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-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 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/mechanize/mechanize-0.4.5.ebuild b/dev-python/mechanize/mechanize-0.4.5.ebuild
index e5e4a4b2c4af..7c892d5d86e0 100644
--- a/dev-python/mechanize/mechanize-0.4.5.ebuild
+++ b/dev-python/mechanize/mechanize-0.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( BSD ZPL )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 DEPEND=">=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]"
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
index c438816ef5ab..d03e580d4194 100644
--- a/dev-python/micawber/Manifest
+++ b/dev-python/micawber/Manifest
@@ -1 +1,2 @@
 DIST micawber-0.5.1.tar.gz 34210 BLAKE2B cc3be0dfdb52a733ff37f249d589f37812c5f6b641b1dd2092faffcfeff9cd79c3989324def721859584280405a28c046ec98aeee3a89106fec0e3f27ed4fede SHA512 888826ced322a0584d827f7e0c58691281d8147e7c3ca9e940493a8beba41fbf6d005b0ca7c4ee6eb8e9c37edea4fb8244aaea9f553b886b1410d91aecbae4ee
+DIST micawber-0.5.2.tar.gz 34541 BLAKE2B d123e67ed859a60d102c4653776d0440e410f084087bf27fa56f4976e6e1d06d4f5a7d91bb67b45c6fb99657d6b3cdf6145d3153bc13553b9f4e7892cc7e6d24 SHA512 2bca326f884e88b31a1e019f22d5002316d200f7b273cf2a80ed6240e3fcafc2816f351e8f992905d4b60223061fb096469e905d75ef7c1c45b941d744a1a217
diff --git a/dev-python/micawber/micawber-0.5.2.ebuild b/dev-python/micawber/micawber-0.5.2.ebuild
new file mode 100644
index 000000000000..ce1417eff96c
--- /dev/null
+++ b/dev-python/micawber/micawber-0.5.2.ebuild
@@ -0,0 +1,28 @@
+# 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,10} )
+inherit distutils-r1
+
+DESCRIPTION="A small library for extracting rich content from urls"
+HOMEPAGE="https://github.com/coleifer/micawber/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" runtests.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index eace9f0adc8e..9b4da1a12a1e 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,4 +1,4 @@
-DIST miniupnpc-2.1.20201016.tar.gz 97682 BLAKE2B 2c98f71ff7262a24a69a9a4af411dbeb58c20ec4181bca8bbdd61c628bf5bd49f7e9b763b73ffb5d3508b5b545a0c918828ead2a376b57b8ea5051cd7b8e9c13 SHA512 d619f7e205cac68137020fab31e8bdaeebd09eeaca5e42e1e03a9e0085a64d635ec896862a488b0d57798d1e6ce96e2ba5652f60c0b8df9fc866eea90baea152
-DIST miniupnpc-2.1.20201016.tar.gz.sig 543 BLAKE2B b8ddcadb58e7b8dc4646ea1ac4e10331fe70a5b9a27902dd5ad09ac306605160b63f2e21d96eda4aa0f77485800cb9c5aa110f215dbe3536a9f6ec1c4a5e9ed9 SHA512 fb7886d4198bd2ae1eeff293152ff509e7ebe6ff0f9b3c20d5824f7ca9f65091a61db2bc0a8ac9fb0449994aba594cff3bf6c556876dbb47d593ecf8b7b26d10
 DIST miniupnpc-2.2.0.tar.gz 98348 BLAKE2B 3464dc7f0b5416b558d0dd49121f3b851d9808a516c19d4f99fdb205e20149f27ef495d9f8da09ad3a28656580bfc16d1cf99ef993e41e9600cfe427b4a776d2 SHA512 b5bb674f162cae3d9e0205a9cdf6acc1fb334ab8ac5330be924411a8fd46833fb916d09f947d1e40d05224df7df1ecf6d812037185690e5022287c2024eb183f
 DIST miniupnpc-2.2.0.tar.gz.sig 543 BLAKE2B c75dbc54debc77e63ea3534f8f424a3904131893fc31d6485163ee6ecdafdab02fc0db8e290d28c834ac0efc5a37c34cbca7f14e1c78f859d22abc4e0b2ae48f SHA512 54f8cccea5886e06fbdaa04d270c12bd95d219be0b275491d9168f1089b1efe96e8a6f30ebf428091a3bae4bc349c0b8c94a22e94d56845a0a8b9724b1f9f74d
+DIST miniupnpc-2.2.1.tar.gz 99595 BLAKE2B 07736eb15a985096178273c4578bb3f0cbf32a04632196e9c216d10751a6a5b1269af5fe2cbd447d85145746a7a8ce750ce13f674f5d8f9e4f6921b9d58204bf SHA512 62fc0098890980028199dd16e87b13ce23e78b2cc996433799792dc2a4fa9b5e230139593bde5c721f649c14fcee2e4d8a0558976c5506c21ff26deff6c7c907
+DIST miniupnpc-2.2.1.tar.gz.sig 543 BLAKE2B 19da35662cf75d47de9cd16d3d8f767119e3dc04370801bf8893a17cd0af47072456b75bc3415b587371972a7c5c36623665391bbf4b9c655d1da3c0e5b8beb7 SHA512 8b5d41556c66e6330673a63eb3be2397cb057c37f648d950e8dfa0bb00e646f343cfbcbd11a6547198d4fa6b1ca2a82b46724e284ce76e96d96ad6b3b5b41c3f
diff --git a/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
index b047b3596379..b22d1ffff32d 100644
--- a/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.1.ebuild
index b22d1ffff32d..b047b3596379 100644
--- a/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/mkdocs-bootstrap/metadata.xml b/dev-python/mkdocs-bootstrap/metadata.xml
index e29d10b84c17..f8d03abd2abe 100644
--- a/dev-python/mkdocs-bootstrap/metadata.xml
+++ b/dev-python/mkdocs-bootstrap/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">mkdocs-bootstrap</remote-id>
 		<remote-id type="github">mkdocs/mkdocs-bootstrap</remote-id>
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
index 83b72d723b87..b84a55099085 100644
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,6 @@ SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.ebuild
deleted file mode 100644
index f875b60adc6f..000000000000
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.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_{6,7,8,9,10} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Bootstrap theme for MkDocs"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootstrap"
-SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="doc"
-
-DEPEND="dev-python/mkdocs"
-
-python_compile_all() {
-	default
-	if use doc; then
-		mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/mkdocs-bootswatch/metadata.xml b/dev-python/mkdocs-bootswatch/metadata.xml
index 286f63c5122c..4982728de64d 100644
--- a/dev-python/mkdocs-bootswatch/metadata.xml
+++ b/dev-python/mkdocs-bootswatch/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">mkdocs-bootswatch</remote-id>
 		<remote-id type="github">mkdocs/mkdocs-bootswatch</remote-id>
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
index 5f6886e1de0c..3c0e0e1db9c3 100644
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,6 @@ SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1.ebuild
deleted file mode 100644
index ab054fe4b5c3..000000000000
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1.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_{6,7,8,9,10} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Bootswatch themes for MkDocs"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootswatch"
-SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="doc"
-
-DEPEND="dev-python/mkdocs"
-
-python_compile_all() {
-	default
-	if use doc; then
-		mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/mkdocs/metadata.xml b/dev-python/mkdocs/metadata.xml
index 352785960993..8d9db98cbaef 100644
--- a/dev-python/mkdocs/metadata.xml
+++ b/dev-python/mkdocs/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">mkdocs/mkdocs</remote-id>
 		<remote-id type="pypi">mkdocs</remote-id>
diff --git a/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild b/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild
index 7386bb111d0b..4ad67982a696 100644
--- a/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild
+++ b/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/mock/metadata.xml b/dev-python/mock/metadata.xml
index 9106b004b2c4..4ed2fb36215d 100644
--- a/dev-python/mock/metadata.xml
+++ b/dev-python/mock/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">mock</remote-id>
 		<remote-id type="github">testing-cabal/mock</remote-id>
diff --git a/dev-python/mock/mock-4.0.3.ebuild b/dev-python/mock/mock-4.0.3.ebuild
index ea859e662d9d..510ecdd61579 100644
--- a/dev-python/mock/mock-4.0.3.ebuild
+++ b/dev-python/mock/mock-4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index 2d38719ecc65..a92d386ca200 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1,3 +1,3 @@
-DIST mongoengine-0.20.0.tar.gz 311698 BLAKE2B 11bae8d342a77bcc241884beb92d67a6d4f7112d0af3a467196eb94233b003aa27d019ab346140ce7430b4019879c8c86e01f3067677254559243b6d1f0ddc80 SHA512 ef973af9893f6e53811e1a47a131989f5a057af04ab9d512059f968af89fcd23f05d910c7de03330b5f4771db8e11ea2e48060f95ed790f8d238df6c6f7b9306
 DIST mongoengine-0.21.0.tar.gz 320173 BLAKE2B 6c53c8dd967209039a3c2b6e279e6a27cf7073a6284b0df70aff25004c8499e88088d934eadf2e23dc3f43cd2ebc0d3c202cfbee618772b8a794a6ef933a9a75 SHA512 37642e9c9333fb4480262e916d678ef04a1f839b62e7d58528485b7df7cb9b22d3cb0b093084fcb92e331698c7d5bf2411df5d0c6e6b9324748189b9084c3f54
 DIST mongoengine-0.22.0.tar.gz 319893 BLAKE2B dc58cad3a93b5c391012fcbc7f0f9cc372bae970847c629bbe6dd158b8d6d9b032b26c118a7931f51f6754333fdbd890904699417076a84ff295233e33daa48c SHA512 293cf0124c18d4c67ecd70e129ab51a0a29a919fecddffbf24619275012534d7c5cb7ee97a65d933654cd582554a276772dc933b1fba357ddac8d3a295f4fda8
+DIST mongoengine-0.22.1.tar.gz 321227 BLAKE2B 933850eb85623a33b1f8e124b6c8375a9e0448c39f5cf44a3aa5b281746933043873d6ac32997121b15c611b9c1a50a1194fa8f364bae3009339d50f5ca98bb8 SHA512 a5188e854aede8feddc01c2d7cbaedd0af4faf5ac03d28f8df9d6dd2f7ae58d9de81eb9d4f3bb02daafb85b7fdf8d54ba38994af07bb338af2b27940cc3413ed
diff --git a/dev-python/mongoengine/metadata.xml b/dev-python/mongoengine/metadata.xml
index 28858a9fb8e1..d45d7541513f 100644
--- a/dev-python/mongoengine/metadata.xml
+++ b/dev-python/mongoengine/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">MongoEngine/mongoengine</remote-id>
 		<remote-id type="pypi">mongoengine</remote-id>
diff --git a/dev-python/mongoengine/mongoengine-0.21.0.ebuild b/dev-python/mongoengine/mongoengine-0.21.0.ebuild
index 249277aab223..820a9f9e46ce 100644
--- a/dev-python/mongoengine/mongoengine-0.21.0.ebuild
+++ b/dev-python/mongoengine/mongoengine-0.21.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # TODO: make it run a local database server
 RESTRICT="test"
 
diff --git a/dev-python/mongoengine/mongoengine-0.20.0.ebuild b/dev-python/mongoengine/mongoengine-0.22.1.ebuild
index 820a9f9e46ce..63cf2969dbe8 100644
--- a/dev-python/mongoengine/mongoengine-0.20.0.ebuild
+++ b/dev-python/mongoengine/mongoengine-0.22.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 # TODO: make it run a local database server
 RESTRICT="test"
 
@@ -28,10 +28,6 @@ src_prepare() {
 	# TODO: investigate
 	sed -e 's:test_covered_index:_&:' \
 		-i tests/document/test_indexes.py || die
-	# incompatible pillow?
-	sed -e 's:test_image_field_resize:_&:' \
-		-e 's:test_image_field_thumbnail:_&:' \
-		-i tests/fields/test_file_field.py || die
 	# no $eval
 	sed -e 's:test_exec_js_field_sub:_&:' \
 		-e 's:test_exec_js_query:_&:' \
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index 8d99c87e33dc..1ec0678fcff0 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1 +1,3 @@
 DIST mongomock-3.21.0.tar.gz 116340 BLAKE2B 5f6ff23bce50e2104a7772dd692e6341398b2fe4b8be07391285074e680661228ec50368e437fec201fb62eaafb5fa588c2cf27f9554602403fea3cf0eaabc55 SHA512 777d5eb7a4ffb2caa569149c600c0eb3bde2737d734f0f934787ee10af571771be201c9cb44b3464ef550e48c035de3ed31cabb2ddac9c0cb864516256cf5c2f
+DIST mongomock-3.22.0.tar.gz 118915 BLAKE2B 98c90684a58e582601acdb2f112a4d1fbfe043f979b9b07b12649a2928fc813c0d11c8a51851b0fa87c5fdc8615c0b923b36d2557e82bcd8f668a3cfdc03a2e1 SHA512 1033d95620a5a212a698f8f0f90679a1cae7c7fca97448ab7cff223db2cf45a230d4d5c863aecd20445bc9ab189ede188ee756b13f108eef81e088c622385d61
+DIST mongomock-3.22.1.tar.gz 121742 BLAKE2B b325fd917f27712d1fdd35564dd27e02a69a417b40c975b447d1d553a170fb45978303b47878e094c6360930b0293f7353552522b54c9228f8083ea88e672510 SHA512 efd8e46986076fb1b6aa2d68d17b136191bcb90408da305a860a99a86ce06c8377ea5f684902761ceb38b5e914b75f7307e9a73477a3297b502241d7517fc143
diff --git a/dev-python/mongomock/mongomock-3.22.0.ebuild b/dev-python/mongomock/mongomock-3.22.0.ebuild
new file mode 100644
index 000000000000..1290941fce24
--- /dev/null
+++ b/dev-python/mongomock/mongomock-3.22.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to help testing Python code that interacts with MongoDB via Pymongo"
+HOMEPAGE="https://github.com/mongomock/mongomock https://pypi.org/project/mongomock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	>=dev-python/pymongo-3.10.1[${PYTHON_USEDEP}]
+	>=dev-python/sentinels-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]"
+
+src_test() {
+	# Use NO_LOCAL_MONGO to disable tests that need a MongoDB instance.
+	# TZ=UTC needed for date/time tests to pass
+	TZ=UTC NO_LOCAL_MONGO=1 distutils-r1_src_test
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/mongomock/mongomock-3.22.1.ebuild b/dev-python/mongomock/mongomock-3.22.1.ebuild
new file mode 100644
index 000000000000..fd072ff7399b
--- /dev/null
+++ b/dev-python/mongomock/mongomock-3.22.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to help testing Python code that interacts with MongoDB via Pymongo"
+HOMEPAGE="https://github.com/mongomock/mongomock https://pypi.org/project/mongomock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	>=dev-python/pymongo-3.10.1[${PYTHON_USEDEP}]
+	>=dev-python/sentinels-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]"
+
+src_test() {
+	# Use NO_LOCAL_MONGO to disable tests that need a MongoDB instance.
+	# TZ=UTC needed for date/time tests to pass
+	TZ=UTC NO_LOCAL_MONGO=1 distutils-r1_src_test
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 79ae7218d190..efe92adc2181 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,2 +1 @@
-DIST more-itertools-8.5.0.tar.gz 86861 BLAKE2B 6c5d7e0e2bfa89b65636115d5539ca5a36de24b7e0971638721d8fa13f6ad84f0fc64b297b5c3c30d380f78e271f6b6622d72a41ffb8f1941945d5918ec6c78a SHA512 f11a4443d4d5e79fe241fc6e170ae51b08cfb1f1093dddad036e1ba043c30d03c53ab9fccbfb4de97279862c6cfe44759ae88ce6027d871515b032e7d9e435e7
 DIST more-itertools-8.6.0.tar.gz 88371 BLAKE2B 79c9020c641e61d97c350ec9004fabfc4a94969d17c517e421f63f41aedf101217906d5bc1d397dc1ed7666143b15ea7ff0401a2a6b3fccc1d08f3cf9ff55eff SHA512 9fb6cbb1d303c79a1c67d1c473a161d71bc5d88c8ebaf290947c1a6e64c2a224478063c58ffc4d1dfdcb2931bcff9cd165bd8724a9e78e95c6f163000c138a5e
diff --git a/dev-python/more-itertools/more-itertools-8.5.0.ebuild b/dev-python/more-itertools/more-itertools-8.5.0.ebuild
deleted file mode 100644
index c167259dfc1d..000000000000
--- a/dev-python/more-itertools/more-itertools-8.5.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_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-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 ~riscv s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
diff --git a/dev-python/more-itertools/more-itertools-8.6.0.ebuild b/dev-python/more-itertools/more-itertools-8.6.0.ebuild
index a640c9948cfc..f870ee4be460 100644
--- a/dev-python/more-itertools/more-itertools-8.6.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.6.0.ebuild
@@ -13,7 +13,7 @@ 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 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/moviepy/metadata.xml b/dev-python/moviepy/metadata.xml
index ac26d0e0478b..87fbfdf3bb29 100644
--- a/dev-python/moviepy/metadata.xml
+++ b/dev-python/moviepy/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chr@chymera.eu</email>
+		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/mpmath/mpmath-1.1.0.ebuild b/dev-python/mpmath/mpmath-1.1.0.ebuild
index cc62714db953..bfc6eb70f4d8 100644
--- a/dev-python/mpmath/mpmath-1.1.0.ebuild
+++ b/dev-python/mpmath/mpmath-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fredrik-johansson/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gmp matplotlib test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index 6a0fd07fa5a5..945cb82badcf 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,3 +1,4 @@
 DIST msgpack-0.6.2.tar.gz 119062 BLAKE2B 6b20a0d31b811ae66e66dbfaacec6f0cf2152b2937423b78f3e6244bfa49c87767788c5ee1db41b9020801b8777a4c15b1fe1853182718adf622bc7e1bff858e SHA512 95b92e3d35e0500dd4256d18bf76e586e57cc66319b4459ac5daef599277a5049177a89ad86e291dbdc4c7a918901a89d9218353ddc4a7d0b399e8a98afef363
 DIST msgpack-1.0.0.tar.gz 232331 BLAKE2B ab7b3aede06c31e0cf70a7f7fbdf2b1dddd89aa2d5d9847b11117c66a2f4572ac468674cdbcaf79bc571278f02429d223aeeb0ea8cb50c31ad251142642cc05f SHA512 6dc168b111cd37807e8e8a09840d1b116d7f38d56f4622b9d36ab7dbd983ebe2f34e763f48c6348148c6945c9f1c9a0f83f5f03e12d12bc18f7b8e0cbd669f87
 DIST msgpack-1.0.1.tar.gz 123151 BLAKE2B 4f040d6e292c588f20043e0091702e9a848d94357784ec7ef7a2ed2d1b5a08cae0bfea4a16cbb67e32b071260f25a43b0507d154ba7f6e180e65a60e3a2b4e9c SHA512 87412cc4022ce7ec82cfe376fbb3c663e5b7a430c2178cacbfe95b35489d95f314bdaf83a6170a7956f42939535ada3c5cbe45c6d7c105410494fe7e9a5cb870
+DIST msgpack-1.0.2.tar.gz 123033 BLAKE2B 8ecf743f5cae536bde9328974827e48376fdfbcaf4d3493fe295a114fd0de4c7dc2629d67a0abf6ece036131715587d2eeaefde0ea9614779a64015ea7fc2be8 SHA512 afe658c2cd5b443aae8fc3305eb3fd56811130062f95e283e3538cba27949d534de60171a927426fedb23b48a938de3f15d77057beda6c73e5204ef1130cd046
diff --git a/dev-python/msgpack/msgpack-1.0.2.ebuild b/dev-python/msgpack/msgpack-1.0.2.ebuild
new file mode 100644
index 000000000000..d33ff4300343
--- /dev/null
+++ b/dev-python/msgpack/msgpack-1.0.2.ebuild
@@ -0,0 +1,39 @@
+# 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,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="MessagePack (de)serializer for Python"
+HOMEPAGE="https://msgpack.org
+	https://github.com/msgpack/msgpack-python/
+	https://pypi.org/project/msgpack/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x64-macos"
+IUSE="+native-extensions"
+
+# extension code is relying on CPython implementation details
+BDEPEND="
+	native-extensions? (
+		$(python_gen_cond_dep '>=dev-python/cython-0.16[${PYTHON_USEDEP}]' 'python*')
+	)
+	test? ( dev-python/six[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove pre-generated cython files
+	rm msgpack/_cmsgpack.cpp || die
+
+	if ! use native-extensions ; then
+		sed -i -e "/have_cython/s:True:False:" setup.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mss/Manifest b/dev-python/mss/Manifest
index 817cd32adac2..d0510c6caad1 100644
--- a/dev-python/mss/Manifest
+++ b/dev-python/mss/Manifest
@@ -1 +1,2 @@
 DIST mss-6.0.0.tar.gz 90010 BLAKE2B 0e4f0a2dbd720d83c496dc3fe618a2fa8057c378426a5b758ccaa931a819a354732d6ec6d220ec02292d08ddc111bbccf89676f32bd124ba084dbf5e4d1287ed SHA512 751fda0fd988ff14e80d7a8bb35c3ae9101a85f4e37dc297b6fc8ac23f7484faf19b07424081183157c7617c95a41f31f74f2dee0ff3bcc8d6bf1a699732af6d
+DIST mss-6.1.0.tar.gz 90421 BLAKE2B c99bc7a1950215402cc4fe3b512951a723fa1f5ffd8ab747fc29ed8d4e51f786ef84b69e3ef2238d7cf9d6ebb5765dcdb4d1d3cc3e9a2caf66cd658fa6753f5f SHA512 2b84fec6e162480cb608c0ff605f528f3122c8397a81bb0cb6cf9223cdf097a633ea2e29a95925297439dc038a0be4cc628d3455827a8548cb3d8e62cd68d9d7
diff --git a/dev-python/mss/mss-6.1.0.ebuild b/dev-python/mss/mss-6.1.0.ebuild
new file mode 100644
index 000000000000..a326bb808938
--- /dev/null
+++ b/dev-python/mss/mss-6.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="An ultra fast cross-platform multiple screenshots module in python using ctypes"
+HOMEPAGE="https://github.com/BoboTiG/python-mss"
+SRC_URI="https://github.com/BoboTiG/python-mss/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/python-${PN}-${PV}"
+
+BDEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	sys-process/lsof
+)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+
+python_test() {
+	virtx pytest -vv
+}
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index 2a233274983e..260184259127 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,2 +1 @@
-DIST multidict-5.0.0.tar.gz 57790 BLAKE2B cad5cac04ab8ea204bb98199a8b5985bd308f7db59e71514a78f0bc79cd92667f24329b101638d5cd14254187c344549a8ce8dd6c514b322b50bb05dfa15cc6e SHA512 067bad79b331a4b86d023f59af842e5fa99fa50d09df13538a86e6c1c754b1862b8fa812381149f2efcd19f1a7ec6934f583cddf47c635dce909ea8c7847f411
 DIST multidict-5.1.0.tar.gz 58801 BLAKE2B 9b9194447a7d91d673b07e440d5f1d2068c79b15890c63a5ab679016b02471996adc73173bb303c14609b2aec230d8ebda36ab978b22b67c008f6b03e6f663f2 SHA512 7dfc8862048d274f37341dda72d93c0fab6d5463fade4f5e241f5b8bf65dcea5c0b5120376847a77f00c7246e87a1cfe14502b6f64bf97e4d00594fed6735466
diff --git a/dev-python/multidict/multidict-5.0.0.ebuild b/dev-python/multidict/multidict-5.0.0.ebuild
deleted file mode 100644
index 201133f08fad..000000000000
--- a/dev-python/multidict/multidict-5.0.0.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,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs --no-autodoc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't enable coverage or other pytest settings
-	sed -i -e 's:--cov.*::' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/multidict/multidict-5.1.0.ebuild b/dev-python/multidict/multidict-5.1.0.ebuild
index 26aafeb246d9..619277bc1c71 100644
--- a/dev-python/multidict/multidict-5.1.0.ebuild
+++ b/dev-python/multidict/multidict-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 75ba045782b8..c0fe8427dd14 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,3 +1,2 @@
-DIST mypy-0.782.tar.gz 2529814 BLAKE2B c75771fb40524c2c8675236eaaddd6e39d13b4fd4f6f15f279b2e0be75eb0630987cb90f31bd7c65c4a322de4915d3a260e8f6f375b49157fea4b6362316f333 SHA512 f94433f79ea76b53ebb70589ca04ba3f39847050f73cf6deac00a3db13d742613a8ecb1a11fb84a878458025c6776b236b074e93e577c1b597e31d1300974767
 DIST mypy-0.790.tar.gz 2082487 BLAKE2B f8efcb701b4b7533306948721968c9a01ab6c6e56ec99fe6c36e35aca50b52f29f518aee2268a628539a372b8024094ef2d4d87da580b4dd667f41133351596e SHA512 be670456bb64cd197bb6a73832b7e0fd6439ae4af128212328a41cd93d9f644a82e79ffb05bf4695e99bd9788244a24916bf765cf30a6f162cf3b471f45c25b8
 DIST mypy-typeshed-5be9c91.tar.gz 583006 BLAKE2B 08ab2b6d479ccc66493524482051e825c65c0a94ea5cac8e56a8ea1dca85eda6104e4ed3188b7d5ce1ea99058019d66a21a7e270e3ad9df694be67ea1e6a7ce9 SHA512 2912bcf66e0f550941eb9c1f34979644857448a4bec478cfc0d662e9a401ade93ccfb2f57b5348504b4d6f0f23e576da609167f1ec3a0861414fc9c7dea80243
diff --git a/dev-python/mypy/files/mypy-0.782-conftest.patch b/dev-python/mypy/files/mypy-0.782-conftest.patch
deleted file mode 100644
index 08da1b1b690a..000000000000
--- a/dev-python/mypy/files/mypy-0.782-conftest.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/conftest.py b/conftest.py
-new file mode 100644
-index 00000000..83a6689f
---- /dev/null
-+++ b/conftest.py
-@@ -0,0 +1,18 @@
-+import os.path
-+
-+pytest_plugins = [
-+    'mypy.test.data',
-+]
-+
-+
-+def pytest_configure(config):
-+    mypy_source_root = os.path.dirname(os.path.abspath(__file__))
-+    if os.getcwd() != mypy_source_root:
-+        os.chdir(mypy_source_root)
-+
-+
-+# This function name is special to pytest.  See
-+# http://doc.pytest.org/en/latest/writing_plugins.html#initialization-command-line-and-configuration-hooks
-+def pytest_addoption(parser) -> None:
-+    parser.addoption('--bench', action='store_true', default=False,
-+                     help='Enable the benchmark test runs')
diff --git a/dev-python/mypy/files/mypy-0.782-py39-fixes.patch b/dev-python/mypy/files/mypy-0.782-py39-fixes.patch
deleted file mode 100644
index 16c12daecae5..000000000000
--- a/dev-python/mypy/files/mypy-0.782-py39-fixes.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 13ae58ffe8bedb7da9f4c657297f0d61e681d671 Mon Sep 17 00:00:00 2001
-From: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
-Date: Sun, 30 Aug 2020 18:11:57 -0700
-Subject: [PATCH] mypy: get CI green for py39 (#9376)
-
-Due to Python 3.9's new parser, this has a different (and better) error
-message on Python 3.9.
-
-This is effectively a test of typed_ast / ast, so I don't think it
-matters too much. I'm happy to alternatively just get rid of the test
-altogether, or if people feel strongly, come up with a way to run the
-test when run with older Pythons.
-
-Co-authored-by: hauntsaninja <>
----
- .travis.yml                        | 3 ---
- mypy/test/testcheck.py             | 2 ++
- test-data/unit/check-kwargs.test   | 7 -------
- test-data/unit/check-python39.test | 9 +++++++++
- 4 files changed, 11 insertions(+), 10 deletions(-)
- create mode 100644 test-data/unit/check-python39.test
-
-diff --git a/mypy/test/testcheck.py b/mypy/test/testcheck.py
-index 49a85861b6..39a35c7280 100644
---- a/mypy/test/testcheck.py
-+++ b/mypy/test/testcheck.py
-@@ -94,6 +94,8 @@
- # Tests that use Python 3.8-only AST features (like expression-scoped ignores):
- if sys.version_info >= (3, 8):
-     typecheck_files.append('check-python38.test')
-+if sys.version_info >= (3, 9):
-+    typecheck_files.append('check-python39.test')
- 
- # Special tests for platforms with case-insensitive filesystems.
- if sys.platform in ('darwin', 'win32'):
-diff --git a/test-data/unit/check-kwargs.test b/test-data/unit/check-kwargs.test
-index 1dd450caae..a587be3e06 100644
---- a/test-data/unit/check-kwargs.test
-+++ b/test-data/unit/check-kwargs.test
-@@ -53,13 +53,6 @@ f(b=[], a=A())
- class A: pass
- [builtins fixtures/list.pyi]
- 
--[case testGivingSameKeywordArgumentTwice]
--import typing
--def f(a: 'A', b: 'B') -> None: pass
--f(a=A(), b=B(), a=A()) # E: keyword argument repeated
--class A: pass
--class B: pass
--
- [case testGivingArgumentAsPositionalAndKeywordArg]
- import typing
- def f(a: 'A', b: 'B' = None) -> None: pass
-diff --git a/test-data/unit/check-python39.test b/test-data/unit/check-python39.test
-new file mode 100644
-index 0000000000..0e9ec683ae
---- /dev/null
-+++ b/test-data/unit/check-python39.test
-@@ -0,0 +1,9 @@
-+[case testGivingSameKeywordArgumentTwice]
-+# This test was originally in check-kwargs.test
-+# Python 3.9's new parser started producing a different error message here. Since this isn't the
-+# most important test, to deal with this we'll only run this test with Python 3.9 and later.
-+import typing
-+def f(a: 'A', b: 'B') -> None: pass
-+f(a=A(), b=B(), a=A()) # E: "f" gets multiple values for keyword argument "a"
-+class A: pass
-+class B: pass
-From da4430119255ac9205c96d54deb2e2ebed0ce8ce Mon Sep 17 00:00:00 2001
-From: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
-Date: Fri, 31 Jul 2020 09:58:15 -0700
-Subject: [PATCH] mypyc: ignore deprecation (#9107)
-
-PyUnicode_AsUnicodeAndSize has been deprecated since 3.3
-
-Python 3.9 has compiler warnings for this deprecated function, and we
-compile with Werror, causing Python 3.9 builds to fail.
-
-I've just copied over the relevant deprecation ignoring code from the
-original getargs.c (including the TODO, but I can remove that)
-
-Co-authored-by: hauntsaninja <>
----
- mypyc/lib-rt/getargs.c | 27 +++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
-diff --git a/mypyc/lib-rt/getargs.c b/mypyc/lib-rt/getargs.c
-index 32b387c8ab..e6b1a0c937 100644
---- a/mypyc/lib-rt/getargs.c
-+++ b/mypyc/lib-rt/getargs.c
-@@ -18,6 +18,29 @@
-  *    and is responsible for decrefing them.
-  */
- 
-+// These macro definitions are copied from pyport.h in Python 3.9 and later
-+// https://bugs.python.org/issue19569
-+#if defined(__clang__)
-+#define _Py_COMP_DIAG_PUSH _Pragma("clang diagnostic push")
-+#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS \
-+    _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
-+#define _Py_COMP_DIAG_POP _Pragma("clang diagnostic pop")
-+#elif defined(__GNUC__) \
-+    && ((__GNUC__ >= 5) || (__GNUC__ == 4) && (__GNUC_MINOR__ >= 6))
-+#define _Py_COMP_DIAG_PUSH _Pragma("GCC diagnostic push")
-+#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS \
-+    _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-+#define _Py_COMP_DIAG_POP _Pragma("GCC diagnostic pop")
-+#elif defined(_MSC_VER)
-+#define _Py_COMP_DIAG_PUSH __pragma(warning(push))
-+#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS __pragma(warning(disable: 4996))
-+#define _Py_COMP_DIAG_POP __pragma(warning(pop))
-+#else
-+#define _Py_COMP_DIAG_PUSH
-+#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS
-+#define _Py_COMP_DIAG_POP
-+#endif
-+
- #include "Python.h"
- #include "pythonsupport.h"
- 
-@@ -756,6 +779,9 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
-     case 'u': /* raw unicode buffer (Py_UNICODE *) */
-     case 'Z': /* raw unicode buffer or None */
-     {
-+        // TODO: Raise DeprecationWarning
-+_Py_COMP_DIAG_PUSH
-+_Py_COMP_DIAG_IGNORE_DEPR_DECLS
-         Py_UNICODE **p = va_arg(*p_va, Py_UNICODE **);
- 
-         if (*format == '#') {
-@@ -795,6 +821,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
-                                   arg, msgbuf, bufsize);
-         }
-         break;
-+_Py_COMP_DIAG_POP
-     }
- 
-     case 'e': {/* encoded string */
diff --git a/dev-python/mypy/files/mypy-0.782-pytest-6.patch b/dev-python/mypy/files/mypy-0.782-pytest-6.patch
deleted file mode 100644
index 0252d1138807..000000000000
--- a/dev-python/mypy/files/mypy-0.782-pytest-6.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From 3e77959eacf3d445a0cb4db5a4bc6dcf606fc040 Mon Sep 17 00:00:00 2001
-From: Lawrence Chan <llchan@users.noreply.github.com>
-Date: Tue, 4 Aug 2020 18:14:55 -0500
-Subject: [PATCH] Use pytest Node.from_parent if available (#9263)
-
-* Use pytest Node.from_parent if available
-
-* Use pytest Node.from_parent unconditionally (requires pytest 5.4+)
-
-* Bump pytest test requirements
-
-* Require pytest 6.0 and remove unused type ignores
-
-* Make flake8 happy
----
- mypy/test/data.py            | 37 ++++++++++++++++++++++--------------
- mypy/test/helpers.py         |  2 +-
- mypy/test/testfinegrained.py |  2 +-
- mypy/test/testipc.py         |  2 +-
- mypy/test/testparse.py       |  2 +-
- mypy/test/testpep561.py      |  2 +-
- mypy/test/testpythoneval.py  |  2 +-
- mypyc/test/testutil.py       |  2 +-
- pytest.ini                   |  3 +--
- test-requirements.txt        |  9 ++++-----
- 10 files changed, 35 insertions(+), 28 deletions(-)
-
-diff --git a/mypy/test/data.py b/mypy/test/data.py
-index 5484fd99e9..a4f2d798b1 100644
---- a/mypy/test/data.py
-+++ b/mypy/test/data.py
-@@ -9,7 +9,7 @@
- from abc import abstractmethod
- import sys
- 
--import pytest  # type: ignore  # no pytest in typeshed
-+import pytest
- from typing import List, Tuple, Set, Optional, Iterator, Any, Dict, NamedTuple, Union
- 
- from mypy.test.config import test_data_prefix, test_temp_dir, PREFIX
-@@ -160,9 +160,12 @@ def parse_test_case(case: 'DataDrivenTestCase') -> None:
-     case.expected_fine_grained_targets = targets
- 
- 
--class DataDrivenTestCase(pytest.Item):  # type: ignore  # inheriting from Any
-+class DataDrivenTestCase(pytest.Item):
-     """Holds parsed data-driven test cases, and handles directory setup and teardown."""
- 
-+    # Override parent member type
-+    parent = None  # type: DataSuiteCollector
-+
-     input = None  # type: List[str]
-     output = None  # type: List[str]  # Output for the first pass
-     output2 = None  # type: Dict[int, List[str]]  # Output for runs 2+, indexed by run number
-@@ -266,7 +269,7 @@ def repr_failure(self, excinfo: Any, style: Optional[Any] = None) -> str:
-             # call exit() and they already print out a stack trace.
-             excrepr = excinfo.exconly()
-         else:
--            self.parent._prunetraceback(excinfo)
-+            self.parent._prunetraceback(excinfo)  # type: ignore[no-untyped-call]
-             excrepr = excinfo.getrepr(style='short')
- 
-         return "data: {}:{}:\n{}".format(self.file, self.line, excrepr)
-@@ -510,7 +513,9 @@ def pytest_pycollect_makeitem(collector: Any, name: str,
-             # Non-None result means this obj is a test case.
-             # The collect method of the returned DataSuiteCollector instance will be called later,
-             # with self.obj being obj.
--            return DataSuiteCollector(name, parent=collector)
-+            return DataSuiteCollector.from_parent(  # type: ignore[no-untyped-call]
-+                parent=collector, name=name
-+            )
-     return None
- 
- 
-@@ -535,19 +540,23 @@ def split_test_cases(parent: 'DataSuiteCollector', suite: 'DataSuite',
-     for i in range(1, len(cases), 6):
-         name, writescache, only_when, platform_flag, skip, data = cases[i:i + 6]
-         platform = platform_flag[1:] if platform_flag else None
--        yield DataDrivenTestCase(parent, suite, file,
--                                 name=add_test_name_suffix(name, suite.test_name_suffix),
--                                 writescache=bool(writescache),
--                                 only_when=only_when,
--                                 platform=platform,
--                                 skip=bool(skip),
--                                 data=data,
--                                 line=line_no)
-+        yield DataDrivenTestCase.from_parent(
-+            parent=parent,
-+            suite=suite,
-+            file=file,
-+            name=add_test_name_suffix(name, suite.test_name_suffix),
-+            writescache=bool(writescache),
-+            only_when=only_when,
-+            platform=platform,
-+            skip=bool(skip),
-+            data=data,
-+            line=line_no,
-+        )
-         line_no += data.count('\n') + 1
- 
- 
--class DataSuiteCollector(pytest.Class):  # type: ignore  # inheriting from Any
--    def collect(self) -> Iterator[pytest.Item]:  # type: ignore
-+class DataSuiteCollector(pytest.Class):
-+    def collect(self) -> Iterator[pytest.Item]:
-         """Called by pytest on each of the object returned from pytest_pycollect_makeitem"""
- 
-         # obj is the object for which pytest_pycollect_makeitem returned self.
-diff --git a/mypy/test/helpers.py b/mypy/test/helpers.py
-index 46c01114c4..91c5ff6ab2 100644
---- a/mypy/test/helpers.py
-+++ b/mypy/test/helpers.py
-@@ -10,7 +10,7 @@
- from mypy import defaults
- import mypy.api as api
- 
--import pytest  # type: ignore  # no pytest in typeshed
-+import pytest
- 
- # Exporting Suite as alias to TestCase for backwards compatibility
- # TODO: avoid aliasing - import and subclass TestCase directly
-diff --git a/mypy/test/testfinegrained.py b/mypy/test/testfinegrained.py
-index 596391da44..d4ed18cab0 100644
---- a/mypy/test/testfinegrained.py
-+++ b/mypy/test/testfinegrained.py
-@@ -35,7 +35,7 @@
- from mypy.config_parser import parse_config_file
- from mypy.find_sources import create_source_list
- 
--import pytest  # type: ignore  # no pytest in typeshed
-+import pytest
- 
- # Set to True to perform (somewhat expensive) checks for duplicate AST nodes after merge
- CHECK_CONSISTENCY = False
-diff --git a/mypy/test/testipc.py b/mypy/test/testipc.py
-index 1d4829d561..7dd829a590 100644
---- a/mypy/test/testipc.py
-+++ b/mypy/test/testipc.py
-@@ -3,7 +3,7 @@
- 
- from mypy.ipc import IPCClient, IPCServer
- 
--import pytest  # type: ignore
-+import pytest
- import sys
- import time
- 
-diff --git a/mypy/test/testparse.py b/mypy/test/testparse.py
-index e990a403a5..e9ff6839bc 100644
---- a/mypy/test/testparse.py
-+++ b/mypy/test/testparse.py
-@@ -2,7 +2,7 @@
- 
- import sys
- 
--from pytest import skip  # type: ignore[import]
-+from pytest import skip
- 
- from mypy import defaults
- from mypy.test.helpers import assert_string_arrays_equal, parse_options
-diff --git a/mypy/test/testpep561.py b/mypy/test/testpep561.py
-index a8eabd7702..aadf01ae5f 100644
---- a/mypy/test/testpep561.py
-+++ b/mypy/test/testpep561.py
-@@ -1,6 +1,6 @@
- from contextlib import contextmanager
- import os
--import pytest  # type: ignore
-+import pytest
- import re
- import subprocess
- from subprocess import PIPE
-diff --git a/mypy/test/testpythoneval.py b/mypy/test/testpythoneval.py
-index 7586a3854e..e7e9f16183 100644
---- a/mypy/test/testpythoneval.py
-+++ b/mypy/test/testpythoneval.py
-@@ -18,7 +18,7 @@
- import sys
- from tempfile import TemporaryDirectory
- 
--import pytest  # type: ignore  # no pytest in typeshed
-+import pytest
- 
- from typing import List
- 
-diff --git a/mypyc/test/testutil.py b/mypyc/test/testutil.py
-index 18ab39a103..c1ce8626ba 100644
---- a/mypyc/test/testutil.py
-+++ b/mypyc/test/testutil.py
-@@ -7,7 +7,7 @@
- import shutil
- from typing import List, Callable, Iterator, Optional, Tuple
- 
--import pytest  # type: ignore[import]
-+import pytest
- 
- from mypy import build
- from mypy.errors import CompileError
-diff --git a/pytest.ini b/pytest.ini
-index 81586a2370..ed76809091 100644
---- a/pytest.ini
-+++ b/pytest.ini
-@@ -1,6 +1,5 @@
- [pytest]
--# testpaths is new in 2.8
--minversion = 2.8
-+minversion = 6.0.0
- 
- testpaths = mypy/test mypyc/test
- 
diff --git a/dev-python/mypy/mypy-0.782.ebuild b/dev-python/mypy/mypy-0.782.ebuild
deleted file mode 100644
index d3c72c0aa9fd..000000000000
--- a/dev-python/mypy/mypy-0.782.ebuild
+++ /dev/null
@@ -1,58 +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,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="https://www.mypy-lang.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ia64 x86"
-
-# stubgen collides with this package: https://bugs.gentoo.org/585594
-RDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-			>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
-			>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
-			>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-			>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-			>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# The first two patches are backports from upstream commits
-	# They should be removed during the next bump
-	"${FILESDIR}/${P}-py39-fixes.patch"
-	"${FILESDIR}/${P}-pytest-6.patch"
-	# Needed to collect all tests
-	# https://github.com/python/mypy/pull/9543
-	"${FILESDIR}/${P}-conftest.patch"
-)
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# https://github.com/python/mypy/commit/2f291f2e312dd3bf2c05c45da0b032b240bfd7ab
-	# Avoid a big patch by deleting the file manually
-	rm test-data/samples/crawl.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mypy/mypy-0.790.ebuild b/dev-python/mypy/mypy-0.790.ebuild
index 9c381d875228..db30444bdbb4 100644
--- a/dev-python/mypy/mypy-0.790.ebuild
+++ b/dev-python/mypy/mypy-0.790.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
index 97c1ef362e60..274933a9d6f4 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/namespace-google/namespace-google-1-r1.ebuild b/dev-python/namespace-google/namespace-google-1-r1.ebuild
index ff6f454c2faa..aea5c9f6b49c 100644
--- a/dev-python/namespace-google/namespace-google-1-r1.ebuild
+++ b/dev-python/namespace-google/namespace-google-1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
deleted file mode 100644
index 13a2e205ebea..000000000000
--- a/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
+++ /dev/null
@@ -1,35 +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,9,10} pypy3 )
-inherit python-r1
-
-DESCRIPTION="Namespace package declaration for jaraco"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
-IUSE=""
-
-RDEPEND="
-	!<dev-python/jaraco-packaging-5.1
-	${PYTHON_DEPS}
-"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_unpack() {
-	mkdir -p "${S}"/jaraco || die
-	cat > "${S}"/jaraco/__init__.py <<-EOF || die
-		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
-	EOF
-}
-
-src_install() {
-	python_foreach_impl python_domodule jaraco
-}
diff --git a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
index af6e381b3e31..d0d5022bd480 100644
--- a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
+++ b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-zope/namespace-zope-1-r1.ebuild b/dev-python/namespace-zope/namespace-zope-1-r1.ebuild
index 5868b9e49516..d15428d13391 100644
--- a/dev-python/namespace-zope/namespace-zope-1-r1.ebuild
+++ b/dev-python/namespace-zope/namespace-zope-1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index 82a64c89ab93..2496903f72af 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,2 +1 @@
-DIST natsort-7.0.1.tar.gz 139272 BLAKE2B 81f75df0868a0810fbc8fef5a499135b5291adde7561a1b0e6b8a94a7f5afc27cd156939119c24749b1ed6983b4a6d63cada3f4a220e785dc06986db099803ba SHA512 48bfda8a42b951287d984e38c474b71233d56a578d8bec12e657413b3cdb71dd27103acda8dca359d87efd761e775deff0775a81d8dfa18df24c364921028c2b
 DIST natsort-7.1.0.tar.gz 143534 BLAKE2B 3ab6c977aca40330fac0af9e4be36d973e88d931799b3135a81daf0a475988af5cc2f9abb30ade1498aad07d9c986e514c7c8cdbbb63da195a81dded4f6f25da SHA512 41293d70c3dc2214f9dc1c123f31cd7886341ae25c6342ac49f3d53d06ba15ecd8d666f1763fe790848c93668940a81b7e7f1fe896f0b91f180ca557dd922ac3
diff --git a/dev-python/natsort/natsort-7.0.1.ebuild b/dev-python/natsort/natsort-7.0.1.ebuild
deleted file mode 100644
index 6946b2c36b56..000000000000
--- a/dev-python/natsort/natsort-7.0.1.ebuild
+++ /dev/null
@@ -1,25 +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,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Natural sorting for Python"
-HOMEPAGE="https://pypi.org/project/natsort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
-IUSE="test"
-
-DEPEND="test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/natsort/natsort-7.1.0.ebuild b/dev-python/natsort/natsort-7.1.0.ebuild
index 2b426f06d1fe..12704cb65d4f 100644
--- a/dev-python/natsort/natsort-7.1.0.ebuild
+++ b/dev-python/natsort/natsort-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 x86"
 IUSE="test"
 
 DEPEND="test? (
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 5c7f25229538..88f54fefe085 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,2 +1 @@
-DIST nbconvert-5.6.1.tar.gz 703233 BLAKE2B e75d558aee6c66fe8e7455ecf22dbbcd2a0698380ffec80eff15aea6c70bc853daa9ab2fd1d114453bd5dfe7e75617afb9f5c1075704bfadbb59fef34bca88a9 SHA512 0c68adcb9f28ead9ec058fc2e02a9a1e6f65818709c99f7a006a59a7562b5f5ee74afe5287e41568c35542898dc1b43c4543d2386cc05a721b3f99d5cc789435
 DIST nbconvert-6.0.7.tar.gz 896833 BLAKE2B 1b5b39144509aa9f61dc1e9675b112d69ed2e2f9859f3ce7ccfac517d89fff0010062c03ded1c3db571c84dd8d4f8ba12e4851245f370d2e671d24921dd50ab6 SHA512 3c78fa4d777a79a08606a39bb31f6b329dc9d28c1ef2ea9f3253746dce853a295e8fe85b14c65b04762aa5acd5facc879232a375875a2ca6dc9477cc1ab88786
diff --git a/dev-python/nbconvert/files/nbconvert-5.6.1-inkscape-1.patch b/dev-python/nbconvert/files/nbconvert-5.6.1-inkscape-1.patch
deleted file mode 100644
index 1f997a3c3a32..000000000000
--- a/dev-python/nbconvert/files/nbconvert-5.6.1-inkscape-1.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-diff --git a/nbconvert/preprocessors/svg2pdf.py b/nbconvert/preprocessors/svg2pdf.py
-index aff14d9f..de51f3b8 100644
---- a/nbconvert/preprocessors/svg2pdf.py
-+++ b/nbconvert/preprocessors/svg2pdf.py
-@@ -1,4 +1,4 @@
--"""Module containing a preprocessor that converts outputs in the notebook from 
-+"""Module containing a preprocessor that converts outputs in the notebook from
- one format to another.
- """
- 
-@@ -17,11 +17,7 @@ from traitlets import Unicode, default
- 
- from .convertfigures import ConvertFiguresPreprocessor
- 
--if sys.version_info >= (3,3):
--    from shutil import which
--    get_inkscape_path = which('inkscape')
--else:
--    get_inkscape_path = None
-+from shutil import which
- 
- 
- INKSCAPE_APP = '/Applications/Inkscape.app/Contents/Resources/bin/inkscape'
-@@ -46,26 +42,49 @@ class SVG2PDFPreprocessor(ConvertFiguresPreprocessor):
-     def _to_format_default(self):
-         return 'application/pdf'
- 
-+    inkscape_version = Unicode(
-+        help="""The version of inkscpae being used.
-+
-+        This affects how the conversion command is run.
-+        """
-+    ).tag(config=True)
-+
-+    @default('inkscape_version')
-+    def _inkscape_version_default(self):
-+        p = subprocess.Popen([self.inkscape, '--version'],
-+            stdout=subprocess.PIPE,
-+            stderr=subprocess.PIPE)
-+        output, _ = p.communicate()
-+        if p.returncode != 0:
-+            raise RuntimeError("Unable to find inkscape executable --version")
-+        return output.decode('utf-8').split(' ')[1]
-+
-     command = Unicode(
-         help="""The command to use for converting SVG to PDF
--        
-+
-         This string is a template, which will be formatted with the keys
-         to_filename and from_filename.
--        
-+
-         The conversion call must read the SVG from {from_filename},
-         and write a PDF to {to_filename}.
-         """).tag(config=True)
- 
-     @default('command')
-     def _command_default(self):
--        return self.inkscape + \
--               ' --without-gui --export-pdf="{to_filename}" "{from_filename}"'
--    
-+        major_verison = self.inkscape_version.split('.')[0]
-+        export_option = ' --export-filename' if int(major_verison) > 0 else ' --export-pdf'
-+        gui_option = '' if int(major_verison) > 0 else ' --without-gui'
-+
-+        return '{inkscape}{gui_option}{export_option}='.format(
-+            inkscape=self.inkscape, export_option=export_option, gui_option=gui_option
-+        ) + '"{to_filename}" "{from_filename}"'
-+
-     inkscape = Unicode(help="The path to Inkscape, if necessary").tag(config=True)
-     @default('inkscape')
-     def _inkscape_default(self):
--        if get_inkscape_path is not None:
--            return get_inkscape_path 
-+        inkscape_path = which('inkscape')
-+        if inkscape_path is not None:
-+            return inkscape_path
-         if sys.platform == "darwin":
-             if os.path.isfile(INKSCAPE_APP):
-                 return INKSCAPE_APP
-@@ -85,22 +104,22 @@ class SVG2PDFPreprocessor(ConvertFiguresPreprocessor):
-         Convert a single SVG figure to PDF.  Returns converted data.
-         """
- 
--        #Work in a temporary directory
-+        # Work in a temporary directory
-         with TemporaryDirectory() as tmpdir:
--            
--            #Write fig to temp file
-+
-+            # Write fig to temp file
-             input_filename = os.path.join(tmpdir, 'figure.svg')
-             # SVG data is unicode text
-             with io.open(input_filename, 'w', encoding='utf8') as f:
-                 f.write(cast_unicode_py2(data))
- 
--            #Call conversion application
-+            # Call conversion application
-             output_filename = os.path.join(tmpdir, 'figure.pdf')
--            shell = self.command.format(from_filename=input_filename, 
-+            shell = self.command.format(from_filename=input_filename,
-                                    to_filename=output_filename)
--            subprocess.call(shell, shell=True) #Shell=True okay since input is trusted.
-+            subprocess.call(shell, shell=True) # Shell=True okay since input is trusted.
- 
--            #Read output from drive
-+            # Read output from drive
-             # return value expects a filename
-             if os.path.isfile(output_filename):
-                 with open(output_filename, 'rb') as f:
-diff --git a/nbconvert/preprocessors/tests/test_svg2pdf.py b/nbconvert/preprocessors/tests/test_svg2pdf.py
-index c42222c7..d9ccec8c 100644
---- a/nbconvert/preprocessors/tests/test_svg2pdf.py
-+++ b/nbconvert/preprocessors/tests/test_svg2pdf.py
-@@ -4,6 +4,7 @@
- # Distributed under the terms of the Modified BSD License.
- 
- from nbformat import v4 as nbformat
-+from unittest.mock import patch, Mock
- 
- from .base import PreprocessorTestsBase
- from ..svg2pdf import SVG2PDFPreprocessor
-@@ -51,9 +52,9 @@ class Testsvg2pdf(PreprocessorTestsBase):
-         return nbformat.new_notebook(cells=cells)
- 
- 
--    def build_preprocessor(self):
-+    def build_preprocessor(self, **kwargs):
-         """Make an instance of a preprocessor"""
--        preprocessor = SVG2PDFPreprocessor()
-+        preprocessor = SVG2PDFPreprocessor(**kwargs)
-         preprocessor.enabled = True
-         return preprocessor
- 
-@@ -71,4 +72,23 @@ class Testsvg2pdf(PreprocessorTestsBase):
-         preprocessor = self.build_preprocessor()
-         nb, res = preprocessor(nb, res)
-         self.assertIn('application/pdf', nb.cells[0].outputs[0].data)
--        
-+
-+    @patch('subprocess.Popen')
-+    def test_inkscape_version_default(self, mock_popen):
-+        mock_popen().communicate.return_value = (b'Inkscape 0.92.3 (2405546, 2018-03-11)', b'')
-+        mock_popen().returncode = 0
-+
-+        preprocessor = self.build_preprocessor()
-+        self.assertEquals(preprocessor.inkscape_version, '0.92.3')
-+
-+    def test_inkscape_pre_v1_command(self):
-+        preprocessor = self.build_preprocessor(inkscape_version='0.92.3')
-+        self.assertEquals(preprocessor.command, '0.92.3')
-+
-+    def test_inkscape_pre_v1_command(self):
-+        preprocessor = self.build_preprocessor(inkscape='fake-inkscape', inkscape_version='0.92.3')
-+        self.assertEquals(preprocessor.command, 'fake-inkscape --without-gui --export-pdf="{to_filename}" "{from_filename}"')
-+
-+    def test_inkscape_v1_command(self):
-+        preprocessor = self.build_preprocessor(inkscape='fake-inkscape', inkscape_version='1.0beta2')
-+        self.assertEquals(preprocessor.command, 'fake-inkscape --export-filename="{to_filename}" "{from_filename}"')
diff --git a/dev-python/nbconvert/files/nbconvert-5.6.1-py39.patch b/dev-python/nbconvert/files/nbconvert-5.6.1-py39.patch
deleted file mode 100644
index 822c32753f83..000000000000
--- a/dev-python/nbconvert/files/nbconvert-5.6.1-py39.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/nbconvert/filters/strings.py b/nbconvert/filters/strings.py
-index 2673d661..9ae82a13 100755
---- a/nbconvert/filters/strings.py
-+++ b/nbconvert/filters/strings.py
-@@ -19,8 +19,8 @@ except ImportError:
-     from urllib2 import quote  # Py 2
- 
- # defusedxml does safe(r) parsing of untrusted XML data
--from defusedxml import cElementTree as ElementTree
--from xml.etree.cElementTree import Element
-+from defusedxml import ElementTree
-+from xml.etree.ElementTree import Element
- 
- from ipython_genutils import py3compat
- 
-diff --git a/nbconvert/preprocessors/svg2pdf.py b/nbconvert/preprocessors/svg2pdf.py
-index aff14d9f..b689b1bc 100644
---- a/nbconvert/preprocessors/svg2pdf.py
-+++ b/nbconvert/preprocessors/svg2pdf.py
-@@ -105,6 +105,6 @@ class SVG2PDFPreprocessor(ConvertFiguresPreprocessor):
-             if os.path.isfile(output_filename):
-                 with open(output_filename, 'rb') as f:
-                     # PDF is a nb supported binary, data type, so base64 encode.
--                    return base64.encodestring(f.read())
-+                    return base64.encodebytes(f.read())
-             else:
-                 raise TypeError("Inkscape svg to pdf conversion failed")
diff --git a/dev-python/nbconvert/nbconvert-5.6.1.ebuild b/dev-python/nbconvert/nbconvert-5.6.1.ebuild
deleted file mode 100644
index 53e76bdc7981..000000000000
--- a/dev-python/nbconvert/nbconvert-5.6.1.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
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="https://nbconvert.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pebble[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
-		media-gfx/inkscape
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-inkscape-1.patch
-	"${FILESDIR}"/${P}-py39.patch
-)
-
-src_prepare() {
-	# assumes old inkscape output?
-	sed -i -e '/SVG\.ipynb/d' \
-		nbconvert/preprocessors/tests/test_execute.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing bdist_egg
-	cd "${TEST_DIR}"/lib || die
-	pytest -vv --pyargs nbconvert || die
-}
-
-pkg_postinst() {
-	if ! has_version app-text/pandoc ; then
-		einfo "Pandoc is required for converting to formats other than Python,"
-		einfo "HTML, and Markdown. If you need this functionality, install"
-		einfo "app-text/pandoc."
-	fi
-}
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index 441dddd0ea1f..759103f83a54 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,2 +1,4 @@
-DIST nbformat-5.0.7.gh.tar.gz 125328 BLAKE2B fa048ceef9d0612052dcf3180bca4228dba5117c6b0fb642f777bbd35e2b6f868454ae3d793aa0da3904757e42309ac53be19621a62967b719da86ab37d5f052 SHA512 3c1429a232d15d023f161f41cdab3364242f1a026349ea5aaeceba6a80afba981cc512a9f148ae3a0fa856a847c4560cc95abd965cc5d088a9f89c2b61d48fd1
 DIST nbformat-5.0.8.gh.tar.gz 127329 BLAKE2B 6252d35f72fd0af5a89d83e9e48f61baf2656eb6530d4a7b05a5241e7272098992d70d68705da4fb9921ab1939378658b2e6e5f765a453f932e94e9232006a66 SHA512 956add98517f1128d8efacae1f3cf9fe27b4d7acae4a56e14dd6c2942aab39b063170759bc6de67bcedd2e0fd6c7ab1a36aef268f2088644ba31caa936b9359d
+DIST nbformat-5.1.0.gh.tar.gz 152052 BLAKE2B 571d48af8c92b1cff9110935e00f53543d7bbae5ed9a08b516e9ff23366d9db7e4b1fb50dc786f2cd70d7f871baa05b6be86a6f22940724d90d05fdf58449bba SHA512 17c234e7777c170d629c0d3a4d8d7ddf01a754977a5e21357550ff702c5b4e26cd31164b32ced0fb20f3c0953390efd9a7509ed92f6c159fcef8634bd3f6af53
+DIST nbformat-5.1.1.gh.tar.gz 152242 BLAKE2B df5e293ab235156f78e2bf85f1a22e597d8e0a60a6e448c69d4e04b62eed834b078238ad03a67e58ee0f705d1495b2f6c4b42124b8d439adbcb52be7ee91ae36 SHA512 5058c009b5148e6764de942cc43cb4774abad758250f065f9103c94f820de841b72d0f69ad24c38ade0c9fca3df61b7ea51b6097c6c191a2f606d57ef358083f
+DIST nbformat-5.1.2.gh.tar.gz 152275 BLAKE2B 2a0758f33952547e5ef91f0ac0a8b98b97b882a8797c38feff6710a3a0824637f41396b152403e155e1af9805b7a85c189ba2a609076c591562e5f4bb783da29 SHA512 4fd574373c2f325b6d078a062878d139d741d30f9101f3344e0c7fc19bdf714f8ef71994134e76c90e1301102aac55cc490df8344f3ceb407002437f35d03944
diff --git a/dev-python/nbformat/nbformat-5.0.7.ebuild b/dev-python/nbformat/nbformat-5.1.0.ebuild
index 25c2da821d40..50772f88b140 100644
--- a/dev-python/nbformat/nbformat-5.0.7.ebuild
+++ b/dev-python/nbformat/nbformat-5.1.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 PYTHON_REQ_USE='sqlite'
 
@@ -17,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
@@ -27,6 +28,7 @@ RDEPEND="
 	"
 DEPEND="
 	test? (
+		dev-python/fastjsonschema[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
 	)
 	"
diff --git a/dev-python/nbformat/nbformat-5.1.1.ebuild b/dev-python/nbformat/nbformat-5.1.1.ebuild
new file mode 100644
index 000000000000..50772f88b140
--- /dev/null
+++ b/dev-python/nbformat/nbformat-5.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Reference implementation of the Jupyter Notebook format"
+HOMEPAGE="https://jupyter.org"
+# missing on pypi
+SRC_URI="
+	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	test? (
+		dev-python/fastjsonschema[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	"
+
+distutils_enable_sphinx docs \
+	dev-python/numpydoc
+distutils_enable_tests pytest
diff --git a/dev-python/nbformat/nbformat-5.1.2.ebuild b/dev-python/nbformat/nbformat-5.1.2.ebuild
new file mode 100644
index 000000000000..50772f88b140
--- /dev/null
+++ b/dev-python/nbformat/nbformat-5.1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Reference implementation of the Jupyter Notebook format"
+HOMEPAGE="https://jupyter.org"
+# missing on pypi
+SRC_URI="
+	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	test? (
+		dev-python/fastjsonschema[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	"
+
+distutils_enable_sphinx docs \
+	dev-python/numpydoc
+distutils_enable_tests pytest
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index 7f161b48de39..3aac79eb3cd3 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -1,3 +1 @@
-DIST ndg_httpsclient-0.4.0.tar.gz 24038 BLAKE2B 147ba36c966b2220c068ce3376bd84259807f66c57141fee4ed95457333cd9d568d19fd4d3348e7ef25d456e3f7d794f83f8302a15beb16f451aa02ef6181848 SHA512 3c0225a20c25cf0f12f03005bb79e738527c0488bb660c1eb3b55c505a0ef503002d37fcffb3d013e5f91101bdd03080a68d5805d6d29b682cc01bdc9f0e4a19
-DIST ndg_httpsclient-0.4.2.tar.gz 25062 BLAKE2B 740075cf3031547028afa3ec2e005e5430e7fbb5c2bfd444e4051c60a9ac14ecacd3048f87f546516bddc4c0403738aa3ef227b3fd763a48bca28da09a47f707 SHA512 c7d6f442242ce01f69d2386b8ed41e4e5f72a2523ecbe38785c4333405f1b000e298133ccc4169d9685a3dcdcf0b20567c8e4b2dfd36f42721d36c73ee27d90a
 DIST ndg_httpsclient-0.5.1.tar.gz 26665 BLAKE2B 1c7f0a8d41b945d2b2a51cd69397ab0943cb91e25013c931f055c5608bc3a0106a99d9b126e8caaac9f8d9b409ec117631fb23f19dfd3194b783548ce3536050 SHA512 b2b4c1b1df87ea1a94811b9ae831e7bf32af27258f487fd5ec319e0e6e0d79dfdb1f7bfadaf397d0693a8a7f0720df170a7fc946aaf10c82e3957ac5464f672e
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
deleted file mode 100644
index 1c08567b19c0..000000000000
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
-HOMEPAGE="
-	https://github.com/cedadev/ndg_httpsclient/
-	https://pypi.org/project/ndg-httpsclient/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${P/-/_}"
-
-# doc build by Makefile in folder documentation is broken
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
deleted file mode 100644
index 6fa2736d98c9..000000000000
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,64 +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,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
-HOMEPAGE="
-	https://github.com/cedadev/ndg_httpsclient/
-	https://pypi.org/project/ndg-httpsclient/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
-# we need to block the previous versions since incorrect namespace
-# install breaks tests
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		!!<dev-python/ndg-httpsclient-0.4.2-r1
-		dev-libs/openssl:0
-	)"
-
-S="${WORKDIR}/${P/-/_}"
-
-# doc build by Makefile in folder documentation is broken
-
-src_test() {
-	# we need to start a fake https server for tests to connect to
-	( cd ndg/httpsclient/test && sh ./scripts/openssl_https_server.sh ) &
-	local server_pid=${!}
-
-	distutils-r1_src_test
-
-	kill "${server_pid}"
-	wait
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# install the namespace (this is the only package in ::gentoo
-	# using it; we'll split it if we add more)
-	python_moduleinto ndg
-	python_domodule ndg/__init__.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/nest_asyncio/Manifest b/dev-python/nest_asyncio/Manifest
index 41d9ac0e8ed4..38cdd8b4ffc5 100644
--- a/dev-python/nest_asyncio/Manifest
+++ b/dev-python/nest_asyncio/Manifest
@@ -1,2 +1 @@
-DIST nest_asyncio-1.4.2.tar.gz 5991 BLAKE2B 8a7feba9d506002ffa6658188fc1a20e2ac55f6661c2be37be678c6930e906235cdd94b5e359428555d8b9400a810a3483e07b3118b49757464fb9e8195a4cdf SHA512 00581b5dbecd085f2f4534dceb04b894973939c6e209bfae1f4b13b5c608bcf403f590af9694c6973e06dc325a5c7b8dc278f8b83eb5ca125a96074e0046984e
 DIST nest_asyncio-1.4.3.tar.gz 5996 BLAKE2B 399086236427fca6073b95ee898c9bb9ebbc984e36219b9f5bdcaff4d670a51985e1e3ca7597faf8b20ea3cb1610f5ad3fc12a30fe2207dadcd7d784c50679a7 SHA512 8d8e3384238c685211f4ae4e3a5c2d6bb0712880abe71b25287eabaee19deb3d669e6e4f2eead3d76825b460025e0cc4f8dc04197d140503b32563142c4ab596
diff --git a/dev-python/nest_asyncio/metadata.xml b/dev-python/nest_asyncio/metadata.xml
index c0079332124d..3868188f6c2b 100644
--- a/dev-python/nest_asyncio/metadata.xml
+++ b/dev-python/nest_asyncio/metadata.xml
@@ -6,7 +6,7 @@
   </maintainer>
   <stabilize-allarches/>
   <upstream>
-    <remote-id type="pypi">nest_asyncio</remote-id>
+    <remote-id type="pypi">nest-asyncio</remote-id>
     <remote-id type="github">erdewit/nest_asyncio</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
diff --git a/dev-python/nest_asyncio/nest_asyncio-1.4.2.ebuild b/dev-python/nest_asyncio/nest_asyncio-1.4.2.ebuild
deleted file mode 100644
index a45cf49bda6a..000000000000
--- a/dev-python/nest_asyncio/nest_asyncio-1.4.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Patch asyncio to allow nested event loops"
-HOMEPAGE="https://github.com/erdewit/nest_asyncio"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/nest_asyncio/nest_asyncio-1.4.3.ebuild b/dev-python/nest_asyncio/nest_asyncio-1.4.3.ebuild
index 55b8e1fac03c..496ff3bc0b0e 100644
--- a/dev-python/nest_asyncio/nest_asyncio-1.4.3.ebuild
+++ b/dev-python/nest_asyncio/nest_asyncio-1.4.3.ebuild
@@ -8,11 +8,11 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Patch asyncio to allow nested event loops"
-HOMEPAGE="https://github.com/erdewit/nest_asyncio"
+HOMEPAGE="https://github.com/erdewit/nest_asyncio/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/netaddr/metadata.xml b/dev-python/netaddr/metadata.xml
index 7e763e5b36d8..1ef1ed712409 100644
--- a/dev-python/netaddr/metadata.xml
+++ b/dev-python/netaddr/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
index c793eb8953c5..0784f46d5505 100644
--- a/dev-python/netcdf4-python/Manifest
+++ b/dev-python/netcdf4-python/Manifest
@@ -1 +1,2 @@
 DIST netCDF4-1.2.2.tar.gz 679107 BLAKE2B c15ed9332bd8e4bb18c312cd4418add169716ef29b6f5c4b935c880259a6a16c8388ed7c790919bfbbee631e9e96ce4b9a9afaeabb305e4dd32028353e62207d SHA512 e09465d125077e71b8aad4332be844099c7fa29d0ea8f1dd0887f7a5e849ab778361026323466b1d4897bc3d8f8be1818cfa5f426773c765ee9c5f3728ff3da3
+DIST netCDF4-1.5.5.tar.gz 793676 BLAKE2B 15783e359ed65062464874de24b3fabf07c5666f54f979cb4abd5429cb1668df9dc5aee6d96fb171f597b670ac87ac15400549659c82754da60dc9b00ab734cd SHA512 da6ead22ca60900468fbefdb5d1e9486555e73cf4d99096227404094e94cd4d0488320fe4eb2b7944e1183c39817d9e593065297f921016811b7dc6eabb918ef
diff --git a/dev-python/netcdf4-python/files/netcdf4-python-1.5.5-tests.patch b/dev-python/netcdf4-python/files/netcdf4-python-1.5.5-tests.patch
new file mode 100644
index 000000000000..ff0085c7a1f6
--- /dev/null
+++ b/dev-python/netcdf4-python/files/netcdf4-python-1.5.5-tests.patch
@@ -0,0 +1,33 @@
+# tst_diskless.py fails and tst_dap.py requires network
+--- a/test/run_all.py
++++ b/test/run_all.py
+@@ -16,9 +16,6 @@ if python3:
+ else:
+     test_files.remove('tst_unicode3.py')
+     sys.stdout.write('not running tst_unicode3.py ...\n')
+-if __netcdf4libversion__ < '4.2.1' or __has_parallel4_support__ or __has_pnetcdf_support__:
+-    test_files.remove('tst_diskless.py')
+-    sys.stdout.write('not running tst_diskless.py ...\n')
+ if not __has_nc_inq_path__:
+     test_files.remove('tst_filepath.py')
+     sys.stdout.write('not running tst_filepath.py ...\n')
+@@ -29,14 +26,11 @@ if not __has_cdf5_format__ or struct.calcsize("P") < 8:
+     test_files.remove('tst_cdf5.py')
+     sys.stdout.write('not running tst_cdf5.py ...\n')
+ 
+-# Don't run tests that require network connectivity
+-if os.getenv('NO_NET'):
+-    test_files.remove('tst_dap.py');
+-    sys.stdout.write('not running tst_dap.py ...\n')
+-else:
+-    # run opendap test first (issue #856).
+-    test_files.remove('tst_dap.py')
+-    test_files.insert(0,'tst_dap.py')
++test_files.remove('tst_diskless.py')
++sys.stdout.write('not running tst_diskless.py ...\n')
++
++test_files.remove('tst_dap.py');
++sys.stdout.write('not running tst_dap.py ...\n')
+ 
+ # Build the test suite from the tests found in the test files.
+ testsuite = unittest.TestSuite()
diff --git a/dev-python/netcdf4-python/metadata.xml b/dev-python/netcdf4-python/metadata.xml
index f3b8c9ae37bb..88d001f88b75 100644
--- a/dev-python/netcdf4-python/metadata.xml
+++ b/dev-python/netcdf4-python/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription>
-    netcdf4-python is a Python interface to the netCDF C library.
-    netCDF version 4 can read and write files in both the new netCDF 4
-    and the old netCDF 3 format, and can create files that are readable
-    by HDF5 clients. The API modelled after Scientific.IO.NetCDF, and 
-    should be familiar to users of that module.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">netCDF4</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>
+		netcdf4-python is a Python interface to the netCDF C library.
+		netCDF version 4 can read and write files in both the new netCDF 4
+		and the old netCDF 3 format, and can create files that are readable
+		by HDF5 clients. The API modelled after Scientific.IO.NetCDF, and 
+		should be familiar to users of that module.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">netCDF4</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.5.5.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.5.5.ebuild
new file mode 100644
index 000000000000..d4249a600092
--- /dev/null
+++ b/dev-python/netcdf4-python/netcdf4-python-1.5.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1 optfeature
+
+MY_PN="netCDF4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python/numpy interface to the netCDF C library"
+HOMEPAGE="https://unidata.github.io/netcdf4-python/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/cftime[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/hdf5
+	sci-libs/netcdf:=[hdf5]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+S="${WORKDIR}"/${MY_P}
+
+python_test() {
+	cd test || die
+	"${EPYTHON}" run_all.py || die
+}
+
+pkg_postinst() {
+	optfeature "HDF4 support" sci-libs/hdf sci-libs/netcdf[hdf]
+	optfeature "MPI parallel IO support" sci-libs/hdf5[mpi] sci-libs/netcdf[mpi]
+	optfeature "OPeNDAP support" net-misc/curl sci-libs/netcdf[dap]
+}
diff --git a/dev-python/networkx/networkx-2.5.ebuild b/dev-python/networkx/networkx-2.5.ebuild
index a1f4df9eb010..95f94fe1eca2 100644
--- a/dev-python/networkx/networkx-2.5.ebuild
+++ b/dev-python/networkx/networkx-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples extras pandas scipy test xml yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/nltk/nltk-3.5.ebuild b/dev-python/nltk/nltk-3.5.ebuild
index 8c31719fd2dc..54f39bc52c8d 100644
--- a/dev-python/nltk/nltk-3.5.ebuild
+++ b/dev-python/nltk/nltk-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/nltk/nltk/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="tk"
 
 RDEPEND="
diff --git a/dev-python/nodeenv/nodeenv-1.3.5.ebuild b/dev-python/nodeenv/nodeenv-1.3.5-r1.ebuild
index b3d8a0af24d9..2d04a2131745 100644
--- a/dev-python/nodeenv/nodeenv-1.3.5.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.3.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9,10}} pypy{,3} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose-cover3/Manifest b/dev-python/nose-cover3/Manifest
deleted file mode 100644
index d8e5437c776d..000000000000
--- a/dev-python/nose-cover3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nose-cover3-0.1.0.tar.gz 14494 BLAKE2B f122523a7864d440e096f295281a0a3d6c8d979a338240751e309c83d67508c7199f2ce377704e864a01c3128b0999bd1e40080bf9b77858216e1f4512c09b67 SHA512 208dbef5bb46a403cb51a9490e68e2f06c6fb08c016a9e866959f5fef1d091ed5c3e502b4a579566f37016a0b665ff969a14b160c78e0c392452198134c20ef5
diff --git a/dev-python/nose-cover3/metadata.xml b/dev-python/nose-cover3/metadata.xml
deleted file mode 100644
index dc15372c7679..000000000000
--- a/dev-python/nose-cover3/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">nose-cover3</remote-id>
-    <remote-id type="github">ask/nosecover3</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild b/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
deleted file mode 100644
index e5eefc21a759..000000000000
--- a/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Coverage 3.x support for Nose"
-HOMEPAGE="https://github.com/ask/nosecover3 https://pypi.org/project/nose-cover3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild b/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
index 30b8599549b9..8fb949dd3483 100644
--- a/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose-parameterized/Manifest b/dev-python/nose-parameterized/Manifest
deleted file mode 100644
index d5de348c7e73..000000000000
--- a/dev-python/nose-parameterized/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nose-parameterized-0.5.0.tar.gz 10363 BLAKE2B c149af7a4c909ab34ef6da01355b6fe69e5d965aa5b03d323f3207974c888ed5adb8379b3ce043e31baa5bf269e682b966b3a6d46e39a39be777e7bb1ead20dc SHA512 812e3e0a44f1db323f9c134b7438ea5e2c63232b04dc4d8aa59d153253183471784fd4960ffb18f23e14c398e4633515ff933bdfbfdb6954c44af97235d3cf91
diff --git a/dev-python/nose-parameterized/metadata.xml b/dev-python/nose-parameterized/metadata.xml
deleted file mode 100644
index 5bd1fafd1baa..000000000000
--- a/dev-python/nose-parameterized/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    Parameterized testing for nose, parameterized testing for py.test, parameterized testing for unittest.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">nose-parameterized</remote-id>
-    <remote-id type="github">wolever/nose-parameterized</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/nose-show-skipped/Manifest b/dev-python/nose-show-skipped/Manifest
deleted file mode 100644
index b56f35c30fcd..000000000000
--- a/dev-python/nose-show-skipped/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nose-show-skipped-0.1.tar.gz 1768 BLAKE2B d79272ac7fd065fe28b589b3234abf527911326d1fea1c23ba0840650d2741846b188788fa9cbeec4a56a78737ccaf8c781ff1f9ac97a5b1d1d79161ba3ab0dc SHA512 b6f3cbc8fdc6af7f6298ad54a5b06bd053d27197368eef1e006aff438d517dba549154eb3be35996b0bd1c291537729438f52709b76c507e20c496b6e504f5df
diff --git a/dev-python/nose-show-skipped/metadata.xml b/dev-python/nose-show-skipped/metadata.xml
deleted file mode 100644
index 000d88855d27..000000000000
--- a/dev-python/nose-show-skipped/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">nose-show-skipped</remote-id>
-    <maintainer status="unknown">
-      <email>cpcloud@gmail.com</email>
-      <name>Phillip Cloud</name>
-    </maintainer>
-    <remote-id type="github">cpcloud/nose-show-skipped</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
deleted file mode 100644
index 80fa5ee40b1c..000000000000
--- a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
+++ /dev/null
@@ -1,23 +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,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A nose plugin to show skipped tests and their messages"
-HOMEPAGE="https://github.com/cpcloud/nose-show-skipped
-	https://pypi.org/project/nose-show-skipped/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/nose/nose-1.3.7-r6.ebuild b/dev-python/nose/nose-1.3.7-r6.ebuild
deleted file mode 100644
index d026926b11c4..000000000000
--- a/dev-python/nose/nose-1.3.7-r6.ebuild
+++ /dev/null
@@ -1,88 +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=( python{2_7,3_{6,7,8,9,10}} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="
-	https://pypi.org/project/nose/
-	https://nose.readthedocs.io/en/latest/
-	https://github.com/nose-devs/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="coverage examples test"
-RESTRICT="!test? ( test )"
-
-COV_DEP="
-	$(python_gen_cond_dep '
-		dev-python/coverage[${PYTHON_USEDEP}]
-	' python2_7 python3_{6,7,8} pypy3)"
-RDEPEND="
-	coverage? ( ${COV_DEP} )"
-DEPEND="${RDEPEND}
-	test? (
-		!hppa? ( ${COV_DEP} )
-		$(python_gen_cond_dep '
-			dev-python/twisted[${PYTHON_USEDEP}]
-		' python3_{6,7,8})
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python-3.5-backport.patch
-
-	# Patch against master found in an upstream PR, backported:
-	# https://github.com/nose-devs/nose/pull/1004
-	"${FILESDIR}"/${P}-coverage-4.1-support.patch
-
-	"${FILESDIR}"/${P}-python-3.6-test.patch
-)
-
-python_prepare_all() {
-	# Tests need to be converted, and they don't respect BUILD_DIR.
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/test_resolve/_&/g" \
-		-e "s/test_raises_bad_return/_&/g" \
-		-e "s/test_raises_twisted_error/_&/g" \
-		-i unit_tests/test_twisted.py || die "sed failed"
-	# Disable versioning of nosetests script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
-		-i setup.py || die "sed2 failed"
-
-	# fix manpage install path
-	sed -i -e 's:man/:share/&:' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local add_targets=()
-
-	if use test; then
-		add_targets+=( egg_info )
-		python_is_python3 && add_targets+=( build_tests )
-	fi
-
-	distutils-r1_python_compile "${add_targets[@]}"
-}
-
-python_test() {
-	"${EPYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/nose/nose-1.3.7-r7.ebuild b/dev-python/nose/nose-1.3.7-r7.ebuild
index c124d287e34c..a2e003803e54 100644
--- a/dev-python/nose/nose-1.3.7-r7.ebuild
+++ b/dev-python/nose/nose-1.3.7-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="coverage examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index cb1a18eb7795..118816b8fdd7 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1,2 +1 @@
-DIST nose2-0.9.1.tar.gz 152411 BLAKE2B 39f2d992e5cab4b9e5cd4401ea9285884eeeac7d2e126b5aad5582186efa0f325139480a446950019e91a376b5992fea106064e5170c9ea7961f128b895a335c SHA512 48cfe3956a3cb696e344ea03e5e0ac8d52831b8272b7cad2bdee34681d1e4e7968fe9da9b71cc9db40b6edf289509c2af766e73611f3a6f23ebd5062f4d52c9e
 DIST nose2-0.9.2.tar.gz 153381 BLAKE2B 9339a31b664561bd86817a969a64a3d80dacdda3ed25bc0a0b6531812e56c7e2bfaadcad3712d8af1a7ce585e27ff6de54428667e44e7c6b0003db5d52703971 SHA512 9af69f0cc9db2e8ef37d2c4ea4fd2d661a38df73fc984d261a1c7c39fba07e44afdf494f0939362b84a03e80c3d93ee75c9352ef333616bf8ce6e6f019b811fe
diff --git a/dev-python/nose2/metadata.xml b/dev-python/nose2/metadata.xml
index e7d712fc948b..80359ac785c8 100644
--- a/dev-python/nose2/metadata.xml
+++ b/dev-python/nose2/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">nose-devs/nose2</remote-id>
 		<remote-id type="pypi">nose2</remote-id>
diff --git a/dev-python/nose2/nose2-0.9.1-r1.ebuild b/dev-python/nose2/nose2-0.9.1-r1.ebuild
deleted file mode 100644
index 40af547ebf6e..000000000000
--- a/dev-python/nose2/nose2-0.9.1-r1.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
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Next generation unittest with plugins"
-HOMEPAGE="https://github.com/nose-devs/nose2"
-SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.5 )
-"
-DEPEND="
-	>=dev-python/coverage-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.1[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -m nose2.__main__ || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/nose2/nose2-0.9.2.ebuild b/dev-python/nose2/nose2-0.9.2.ebuild
index 0f343dbfbca5..f89ffc6e5bf9 100644
--- a/dev-python/nose2/nose2-0.9.2.ebuild
+++ b/dev-python/nose2/nose2-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 # Failures need investigating
 RESTRICT="test"
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 1f5f605ff0ef..e9dd7c92f81b 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,3 +1,4 @@
 DIST notebook-6.1.3.tar.gz 13806042 BLAKE2B da63fdabd1a71e4247a9e340539e688410a84c58d94049dfb7e8e3fcdc53686a55eb855687df34ff48f599a0c5aececbd9a8e1aa1d2ff7baa2a6da1b4e1bcf24 SHA512 67a8feb01dfb665bb24f3ce1b28212e9bad5a188e8cef1d168c4edaf207cbc16d516f6024ca905f75f1c27ba4890da858c5278a3ee84a4c4ac1bdbf225afa351
-DIST notebook-6.1.4.tar.gz 13933373 BLAKE2B 9e58a9913a3c24bb1cb364863a18993d44496e995dc43dc9a4b428c54a0dddcc8b7c4b444073029d97705f0b3eee37d63bb50eec066b9b5fe4cd0ee48f8df558 SHA512 55637ec76b283429ac8bc1de260529983cf0e4cb0f25b268330fcc1d07c6e75329d2806eaa5f10d149bf80bd11df26592fa71548fa03bdb05a57265221466b57
 DIST notebook-6.1.5.tar.gz 13925632 BLAKE2B ce9d0ee110a158ba0ee3f3199a7cc1c8d53ecb72e8f77f43d2b1e5552b4a0378edca9a987634e12d8429c70595ec4cc226784248d196501b3a04c67e4ba88c85 SHA512 4b0893c805a0494c369b363b7d1c606a1b124869e601eafce1eb4c93ad1436b757c6149bc76c489aa26171412280d69e894b44d7d19141341fb1194a8e2f447b
+DIST notebook-6.1.6.tar.gz 13926673 BLAKE2B 944f92d468ade0f0d3fbe01d46cb2893866fca067b48c6a6cefe653b9941bbde0802c7d9ee17b493bcf6391d1b0a77e710f5b5c8f1d58ec692b40753ac0692e9 SHA512 d1271273ae9cc098d5937a3ac91dc8035b033bb8da799f31c5d71abe48b17579f2fadc8b0ff7134dedda72ac49cc29c5adafaa4ef6f347cc4f6698ab46d83040
+DIST notebook-6.2.0.tar.gz 13927515 BLAKE2B ca752f0cb316b46b71d8451c59c196c324008c296dfc7fbc4ee426ba5b3c1035e90170e46720547a9e3f2cf381ab5e0294185ee1a814d31ffbe6ecf546f229d6 SHA512 217392000ca2d0266137f937fc4d2a1b81ed19217fdbf6550b07453eede8b9a6e15c8fbb1c94f559a7f44ac73dfadcefeae815c186e56bb1e9a30120fe070f3a
diff --git a/dev-python/notebook/metadata.xml b/dev-python/notebook/metadata.xml
index 136d2f14a12b..038343d8c7b1 100644
--- a/dev-python/notebook/metadata.xml
+++ b/dev-python/notebook/metadata.xml
@@ -12,6 +12,7 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">notebook</remote-id>
+    <remote-id type="github">jupyter/notebook</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/notebook/notebook-6.1.5.ebuild b/dev-python/notebook/notebook-6.1.5.ebuild
index b1a3c110839a..b38026e52da7 100644
--- a/dev-python/notebook/notebook-6.1.5.ebuild
+++ b/dev-python/notebook/notebook-6.1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/notebook/notebook-6.1.4.ebuild b/dev-python/notebook/notebook-6.1.6.ebuild
index b38026e52da7..6b7ed50abe1b 100644
--- a/dev-python/notebook/notebook-6.1.4.ebuild
+++ b/dev-python/notebook/notebook-6.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
@@ -38,8 +38,6 @@ RDEPEND="
 # a version constraint.
 BDEPEND="
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
 	)
@@ -49,7 +47,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
 )
 
-distutils_enable_tests pytest
+distutils_enable_tests --install pytest
 
 python_prepare_all() {
 	# disable bundled mathjax
@@ -73,12 +71,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_test() {
-	distutils_install_for_testing
-	local -x PATH=${TEST_DIR}/scripts:${PATH}
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
-
 python_install() {
 	distutils-r1_python_install
 
diff --git a/dev-python/notebook/notebook-6.2.0.ebuild b/dev-python/notebook/notebook-6.2.0.ebuild
new file mode 100644
index 000000000000..4616b199552c
--- /dev/null
+++ b/dev-python/notebook/notebook-6.2.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 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,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+)
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	# require geckodriver
+	rm -r notebook/tests/selenium || die
+	# trash doesn't seem to work for us
+	sed -e 's:test_delete:_&:' \
+		-i notebook/services/contents/tests/test_manager.py || die
+	sed -e 's:test_checkpoints_follow_file:_&:' \
+		-e 's:test_delete:_&:' \
+		-i notebook/services/contents/tests/test_contents_api.py || die
+	# network-sandbox?
+	sed -e 's:test_connections:_&:' \
+		-e 's:test_culling:_&:' \
+		-i notebook/services/kernels/tests/test_kernels_api.py || die
+
+	sed -i -e "/'bdist_egg':/d" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index bb55c8487ed5..848f084a426e 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1 +1,2 @@
 DIST numexpr-2.7.2.gh.tar.gz 118982 BLAKE2B b032f00c36ffadb88cf9a4cd6323137b920bce48ec73f88f006d3186f9a8c1d75a11ceb6bd32f412cba5c10cbe3cb518cdbdb19ef022100fcc408fc82ede9881 SHA512 41946df6d642e226b4a38b11d5db67ef91d63d56b33d3b52f09377c022d236ea4e9a5aaaf380737d18405ee25109260ae60f79d0c9465b95de14465f41c40075
+DIST numexpr-2.7.2.r1.gh.tar.gz 119099 BLAKE2B d424dd89761ecdad3e5a35a5c8b41f089c6eb7c9ca10a4309fb489bb7ab60c0b77863c1675583014265c057e27f3b9584a35e0ac6232044ed5f8b8c32fd330d6 SHA512 d786aeb3597a6b2196e92f364934a0bbc518c7973252c38f1e93c317d55220270b5d61320d7a465c87da979ec68e988b25182d527e0e96aa3a898f20a6997802
diff --git a/dev-python/numexpr/numexpr-2.7.2_p1.ebuild b/dev-python/numexpr/numexpr-2.7.2_p1.ebuild
new file mode 100644
index 000000000000..714dbfde92f1
--- /dev/null
+++ b/dev-python/numexpr/numexpr-2.7.2_p1.ebuild
@@ -0,0 +1,51 @@
+# 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,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
+HOMEPAGE="https://github.com/pydata/numexpr"
+SRC_URI="
+	https://github.com/pydata/numexpr/archive/v${PV%_p*}.tar.gz
+		-> ${P/_p/.r}.gh.tar.gz"
+S=${WORKDIR}/${P%_p*}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mkl"
+
+RDEPEND="
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	mkl? ( sci-libs/mkl )
+"
+
+python_prepare_all() {
+	# TODO: mkl can be used but it fails for me
+	# only works with mkl in tree. newer mkl will use pkgconfig
+	if use mkl; then
+		use amd64 && local ext="_lp64"
+		cat > site.cfg <<- _EOF_ || die
+			[mkl]
+			library_dirs = ${MKLROOT}/lib/em64t
+			include_dirs = ${MKLROOT}/include
+			mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
+			mkl_intel_thread, mkl_core, iomp5
+		_EOF_
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" \
+		-c "import sys,numexpr; sys.exit(0 if numexpr.test().wasSuccessful() else 1)" \
+		|| die
+	pushd >/dev/null || die
+}
diff --git a/dev-python/numpy-python2/metadata.xml b/dev-python/numpy-python2/metadata.xml
index 532f79c8ceb8..3666d238bd90 100644
--- a/dev-python/numpy-python2/metadata.xml
+++ b/dev-python/numpy-python2/metadata.xml
@@ -9,5 +9,5 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-	<origin>gentoo-staging</origin>
+	<origin>calculatelinux-overlay</origin>
 </pkgmetadata>
diff --git a/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild b/dev-python/numpy-python2/numpy-python2-1.16.6-r1.ebuild
index 139742b28cef..007248640a85 100644
--- a/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
+++ b/dev-python/numpy-python2/numpy-python2-1.16.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -8,6 +8,7 @@ PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
 
 MY_PN="numpy"
@@ -24,7 +25,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 RESTRICT="test"
 
@@ -39,7 +40,7 @@ DEPEND="${RDEPEND}"
 
 BDEPEND="
 	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools-python2
 	lapack? ( virtual/pkgconfig )
 "
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 76e9d36d51d9..9879a80cc893 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,8 +1,5 @@
-DIST numpy-1.19.0.zip 7296082 BLAKE2B e388a1b8aa8fa5e23b57c69c5aa5f2b7b286a69fca6007843adbfa374d541ace7875757a302e851bc41194f565390b52777fff13da8166e7a2c6b0a0f3efd29c SHA512 24f8847ff6b72dd44db197fbd80596677f9f3c5afcc87f30c41a4c0a2ccd4ee652ca630a537997ba8fe68c4919fa488e9d8cadd9a310e5356b017f6086055850
-DIST numpy-1.19.1.zip 7301568 BLAKE2B f7c17666d8cd4f477d7946be383d2ff1656c412e23dc49c55f94a6fcb95a6cffe6b4958169b1b27e027a7d674feb96de979d8bba4f1e3d9daef9b72e7f48cafa SHA512 ddc5f5e262d6f7f6e1a8879165860427baa237b6aad5b09d5b943a36bb0d5922424aac4c0e32a2cc3e14087bf6eb671988b6ff6df0d9ab8c89724e093220eead
-DIST numpy-1.19.2.zip 7310530 BLAKE2B a019c64809bd61071a4dd5e10c2cdf6927f392ebe58b45a08529295079bca68a683502aba89847578e122271d2fa4ea6d2d5461f1e58322f550cda863d36125b SHA512 56ae348f08818e30b6675df7d41a2b03687af452d7a96356fccfce2994843c7b61918946381c3af25fe03f209413d0378ee691fc38d805491a12c464e49bb59c
-DIST numpy-1.19.3.zip 7315638 BLAKE2B 77f5ab83bfc69fcdb1c1bc0735e46914619be9e8291eb8ded3d5fa98694080f5272692453803b3924b371611014655f4532c85126c29ce1a84a4b807371cbb17 SHA512 9595e5adbad5debc7edb9fe2d4c511111a92413b6c3e5086c7dfb2f68974c0493d2dd2cb1cb8b07486b1f4fbef324fbdfa54f80a4c4cab66215980a40440f79f
 DIST numpy-1.19.4.zip 7315971 BLAKE2B 4809ad6aaf7f9893ea6ed4c2456f4827aa5728b9dba00ed4c8e517267dd299933ca6c9205e3e31ef61ba25a6c13dde32dbe7d268c2d54391bd532d368bb3c5e8 SHA512 ae8e6b2792022c147159a11188f9702fa9fa9c9707c834da4f21aa43752451509b0a5b8807d93dfa86dff7e95c127dab20e4f372336a66f25f9b56c2869a486f
+DIST numpy-1.19.5.zip 7318340 BLAKE2B a01fd07d8cbfc53c1585b19701f9052fd4b1b4010d24c61e1054352a80343e6644ae6e61ce7565fd9c7c99b9e1174bdd2e685fd5666640d08b1ec9919f86cc8e SHA512 dfe2809b5f486624b4802ea5610822bf7ba80c46dcf8505f69b0267137b01719131f74aa366949954c66796d48ba1b4f74cf0ecc5692a9ebd49e673fb0881ff4
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
diff --git a/dev-python/numpy/numpy-1.19.0.ebuild b/dev-python/numpy/numpy-1.19.0.ebuild
deleted file mode 100644
index a5b61d951dbe..000000000000
--- a/dev-python/numpy/numpy-1.19.0.ebuild
+++ /dev/null
@@ -1,145 +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,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV="1.16.4"
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-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 ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	>=dev-python/cython-0.29.15[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	"${EPYTHON}" -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.19.1.ebuild b/dev-python/numpy/numpy-1.19.1.ebuild
deleted file mode 100644
index f3e63f236617..000000000000
--- a/dev-python/numpy/numpy-1.19.1.ebuild
+++ /dev/null
@@ -1,145 +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,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV="1.16.4"
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	"${EPYTHON}" -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.19.3.ebuild b/dev-python/numpy/numpy-1.19.3.ebuild
deleted file mode 100644
index bce5a7a2df4c..000000000000
--- a/dev-python/numpy/numpy-1.19.3.ebuild
+++ /dev/null
@@ -1,145 +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,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV="1.16.4"
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	"${EPYTHON}" -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.19.4.ebuild b/dev-python/numpy/numpy-1.19.4.ebuild
index 4f205bbab6b8..0fe1317f694c 100644
--- a/dev-python/numpy/numpy-1.19.4.ebuild
+++ b/dev-python/numpy/numpy-1.19.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/numpy/numpy-1.19.2.ebuild b/dev-python/numpy/numpy-1.19.5.ebuild
index b27599637754..759f1d4db502 100644
--- a/dev-python/numpy/numpy-1.19.2.ebuild
+++ b/dev-python/numpy/numpy-1.19.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
 
 DOC_PV="1.16.4"
 DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
+HOMEPAGE="https://numpy.org/"
 SRC_URI="
 	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
 	doc? (
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/numpydoc/numpydoc-0.9.1.ebuild b/dev-python/numpydoc/numpydoc-0.9.1.ebuild
index 863b83cbab4c..1a33bf055b7c 100644
--- a/dev-python/numpydoc/numpydoc-0.9.1.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/olefile/olefile-0.46-r1.ebuild b/dev-python/olefile/olefile-0.46-r1.ebuild
index 3ab9708b4f4b..60d939198378 100644
--- a/dev-python/olefile/olefile-0.46-r1.ebuild
+++ b/dev-python/olefile/olefile-0.46-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx doc
 distutils_enable_tests unittest
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 28137ca67982..19cdb5d81b0d 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1 +1,2 @@
 DIST openpyxl-3.0.5.tar.bz2 2421647 BLAKE2B 60fc12188a608891a63513177e8e3399b3905ee9b4c4ff1631901ce0d99c3e05bc9413813d3c4f7bb9034e1d839f91e9dea5e610795c701a40d99f1011b08c45 SHA512 5f60f746b7b4bd32a018972f7c18adc0552a6d6904fcf1258db3fab28f21aa7b17e386b355ede41365889146e9aaa09911748a26343788477fd72ad5d1264974
+DIST openpyxl-3.0.6.tar.bz2 2423464 BLAKE2B 205db09634730a1da6c24bc8c407b2f3deeac712b4c2cbe69796c538c6911ccb3e7e003617ab9563df12a74d6ca9fb2b1b83d8d75f3b91c168d2053a14c15d66 SHA512 6996800c54746dc41b902cbea378181cdab5db916fd6863c673df25f84f71de67019e34d0034231d7c588bf56be3f8e16b3a52c198dcbe74465d0b088090c24a
diff --git a/dev-python/openpyxl/metadata.xml b/dev-python/openpyxl/metadata.xml
index ee6aea0e7b94..adf8ae82d488 100644
--- a/dev-python/openpyxl/metadata.xml
+++ b/dev-python/openpyxl/metadata.xml
@@ -8,9 +8,9 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">openpyxl</remote-id>
-		<bugs-to>https://foss.heptapod.net/openpyxl/openpyxl/issues</bugs-to>
+		<bugs-to>https://foss.heptapod.net/openpyxl/openpyxl/-/issues</bugs-to>
 		<changelog>https://openpyxl.readthedocs.io/en/stable/changes.html</changelog>
-		<doc>https://openpyxl.readthedocs.io</doc>
+		<doc>https://openpyxl.readthedocs.io/</doc>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/openpyxl/openpyxl-3.0.6.ebuild b/dev-python/openpyxl/openpyxl-3.0.6.ebuild
new file mode 100644
index 000000000000..abacbc642eff
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-3.0.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
+# Upstream doesn't want to include tests in PyPI tarballs
+SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/jdcal[${PYTHON_USEDEP}]
+	dev-python/et_xmlfile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
+	)"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
diff --git a/dev-python/opt-einsum/Manifest b/dev-python/opt-einsum/Manifest
index 8205bd4c324b..b2c14de2115c 100644
--- a/dev-python/opt-einsum/Manifest
+++ b/dev-python/opt-einsum/Manifest
@@ -1,2 +1 @@
-DIST opt_einsum-3.0.1.tar.gz 66204 BLAKE2B a8d2d1246e890d24ea73d129ed1ee99e8fbbca30771c96a48858acb5af5eac93bc73b9e8f1c5f1ece6e0872277de1f01fd1d0f7d27e044fa5f9de09060792565 SHA512 d6c2b95d17f523680e3f849ad2b0a4c36e7102e0540fddee365446bfddad4a26be2aed19060570ac0d1db42ccde8e15f0e7e4c066b9117024a58f8cc8978508a
 DIST opt_einsum-3.3.0.tar.gz 73951 BLAKE2B c8e39c9589bb6b89150fd5699fafd77c5ac6022f66d1b778a55dd61e606067be4b6df85972dd4078df084e34a39463f5e59d69426b0ed9152e93f93798417eea SHA512 f34c58bd3aa4a15794cfc604167c0e3175b9826da2a2449bb48ea5c3095f8215e3f990daec51e77e505a03204201694df1a09360ee51b8a4a793b9844d9c2d5e
diff --git a/dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild b/dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild
deleted file mode 100644
index 23c6c0e8fce8..000000000000
--- a/dev-python/opt-einsum/opt-einsum-3.0.1-r1.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,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Optimized Einsum: A tensor contraction order optimizer"
-HOMEPAGE="https://pypi.org/project/opt-einsum/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-S="${WORKDIR}/${P/-/_}"
-
-BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild b/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
index 24e5eb198247..23c6c0e8fce8 100644
--- a/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
+++ b/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 S="${WORKDIR}/${P/-/_}"
 
diff --git a/dev-python/ordered-set/Manifest b/dev-python/ordered-set/Manifest
index 6a47305a6928..9d297bb65116 100644
--- a/dev-python/ordered-set/Manifest
+++ b/dev-python/ordered-set/Manifest
@@ -1,2 +1 @@
-DIST ordered-set-4.0.1.tar.gz 10607 BLAKE2B e9bb24f8709c73099b83ee27abe30193ff1b530cd92fe3f2a43bc25212542d80e459fe404aa97aa7447ef52ea239153d427087f1ed517a7e7c8e18d68f27d0f2 SHA512 6ebe758efba7b847cce4a06001e84bf4a60728ae5d088cd7e3a2ebab86a6f5aa6a421bfda1cea0e8751bafd60eac1b3f2ec14e74a7b71f469dc7851aafe52235
 DIST ordered-set-4.0.2.tar.gz 10658 BLAKE2B c07a4f48a6b0bf74ab11dc25a2d85c401bbcde825b63ff4d6e3e6ee12139f22d803bda3db57937ad3760c0c665f0ec3b44bcaab832c2604148dd0add350f515c SHA512 d7031ae90fdaf116c27415170a7197be34ff4b977a03684a6fb53dc453845a97cd32b9666ed3ae58fb7bc722ff3b2b4f2e156578841033759b490b359a5619b4
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index a30b3e5b1cb3..3c84b83f80b5 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -1,3 +1 @@
-DIST os-brick-2.8.2.tar.gz 179510 BLAKE2B c72c1f0260fc541a9f6ca9f984b934f718dadd7ec0909a4b2483bb190e1ad587084174a33e1a7c81a52728817286bc3887474ea2c39d7f43e8e71a4a9a4baaef SHA512 0e9237f9baf5338d123bec1b22285ff8c4c31a89d60cf8480985a144c45c2766322cb359f3d548676b2631883664c5797e687bbe4d2d9ec5cd38e10e53d394ff
-DIST os-brick-3.0.1.tar.gz 189358 BLAKE2B 331e06a49afa6d973149425946ffc3fc2b2173cc15faa9b9a6cfb231eb9e806fe10902eb86302c6a020dd4a986f0725550f12b9f54f78b9cd4fd3302d83f5eee SHA512 5283cacd1aef10a7b470d5338801fbf5741ee26ba831d12887f829f7e5744c6a9eb2db4048586214f6ed64de867645e1a6f3b5841fff5328416c5548a66dcd00
 DIST os-brick-4.0.1.tar.gz 192821 BLAKE2B da1037e33288a3a20c6858b8620c5905c9a1d218ab858659bce844445d6b33a9b9c629df21eab68419e755bddebc43bf20afc197eaaf4a29dcd7365d19b27b0b SHA512 7847cae82e1ef726eb1189d93f13325d57abdb52286887d6b55e256d9a9f62b0afe71580c5ff30008f5827ba76cac8e423ee5da0d2d01f5794fa3556a6c2cc64
diff --git a/dev-python/os-brick/os-brick-2.8.2.ebuild b/dev-python/os-brick/os-brick-2.8.2.ebuild
deleted file mode 100644
index 28f1cf4409d4..000000000000
--- a/dev-python/os-brick/os-brick-2.8.2.ebuild
+++ /dev/null
@@ -1,44 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/cinder"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-brick/os-brick-3.0.1.ebuild b/dev-python/os-brick/os-brick-3.0.1.ebuild
deleted file mode 100644
index 14f3890a184c..000000000000
--- a/dev-python/os-brick/os-brick-3.0.1.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
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/cinder"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oset/Manifest b/dev-python/oset/Manifest
new file mode 100644
index 000000000000..db4b815972b0
--- /dev/null
+++ b/dev-python/oset/Manifest
@@ -0,0 +1 @@
+DIST oset-0.1.3.tar.gz 7345 BLAKE2B 1ef3fc6e0acc0bdbabb139a968ada851a0b1f19785b30c1f65bc3205600ae868add111487404b0e71b03cb5c2fce9d3991c32c5b0034ead62da058807efabfe3 SHA512 d34d11e76740c85a41be3d055710fe08afa7de1839ae43d76c152aa5838dad5895f0a0d95c5a2625a94494fc462e08f79a7614756ee5748c35e434176ec21121
diff --git a/dev-python/docker-pycreds/metadata.xml b/dev-python/oset/metadata.xml
index 446e98af52ca..b3d726726087 100644
--- a/dev-python/docker-pycreds/metadata.xml
+++ b/dev-python/oset/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>python@gentoo.org</email>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
-	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">shin-/dockerpy-creds</remote-id>
-		<remote-id type="pypi">docker-pycreds</remote-id>
+		<remote-id type="pypi">oset</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/oset/oset-0.1.3.ebuild b/dev-python/oset/oset-0.1.3.ebuild
new file mode 100644
index 000000000000..5aae37f054df
--- /dev/null
+++ b/dev-python/oset/oset-0.1.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Ordered Set"
+HOMEPAGE="https://pypi.org/project/oset/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 20bac9f4fb16..e8f08a52b5b5 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,2 +1 @@
-DIST oslo-config-8.3.2.tar.gz 148787 BLAKE2B ae3bf5c715d647dc1d5f1c82a6882f3282c87cb622a30ece23eca6453aca997363b6a65d3dc92666d95387c5051c9e9a87f337fa212500607ce6426ce6024847 SHA512 273ce5aeb7aa47b12a0e3a14b9920f7c177854a13c78a2382268e06068f443362088acd105deffc854689af14839c553c62aab983e9b4e29b4e079836b472957
 DIST oslo-config-8.3.3.tar.gz 154910 BLAKE2B d9d3d45d3f9bd191e2be9ef277719d723c35d36006836b2803dfa973283432745d6f11c7d764f2cf4a9ce62098cc0b94ba6aecb364869fd8957ffa309d47bb38 SHA512 6071fbcb4f9e641e6914d676bab3f58cd9e763219bcce0f7de16017a4e1d3a16fcf4296a36c232ac14d8c5c4555f4c433fedc1811e505e62decb0400a9cc2a7c
diff --git a/dev-python/oslo-config/oslo-config-8.3.2.ebuild b/dev-python/oslo-config/oslo-config-8.3.2.ebuild
deleted file mode 100644
index 2ffed5d67407..000000000000
--- a/dev-python/oslo-config/oslo-config-8.3.2.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_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-config/oslo-config-8.3.3.ebuild b/dev-python/oslo-config/oslo-config-8.3.3.ebuild
index cde3f0994c69..2ffed5d67407 100644
--- a/dev-python/oslo-config/oslo-config-8.3.3.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.3.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index 5b8d7a59438a..41177b5d763b 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,2 +1 @@
-DIST oslo.service-2.1.1.tar.gz 81030 BLAKE2B f6221d9e3d7624dccb614b2dbe6529937fd00495db80cddd9412c53fdacd4a5c5a5fe33468ab53c65e0cb741e82519de971f19d662e633f658641c978dcf0b2b SHA512 8d2beba973444eb6ef32c011928376b6ba61388837178f9043105100f05644137d9bf6ae235c4c7260b05d956bfda42890dcd5727dd4d6f9559e7206f7139f95
 DIST oslo.service-2.4.0.tar.gz 80999 BLAKE2B 813c67eceb303d76ef39fecf057a2304966a367704a1a86a00bb2de515ded862a4eb3684f1e0f7dd4a17aca654fc6571243176d53397f8f93b5ee4cf34849d20 SHA512 7942a913c598471e9a828dba5e624ff6829d061692526021b9ae872ab558f119612e8b7b09c43efa7596e8102fbff323f106f755eef9a0ac68324606bb539703
diff --git a/dev-python/oslo-service/oslo-service-2.1.1.ebuild b/dev-python/oslo-service/oslo-service-2.1.1.ebuild
deleted file mode 100644
index 889126c6faec..000000000000
--- a/dev-python/oslo-service/oslo-service-2.1.1.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
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.service/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
-S="${WORKDIR}/oslo.service-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.40.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/yappi-1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 9056064ad0ad..2dfc74497551 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,4 +1,2 @@
-DIST packaging-20.4.tar.gz 74402 BLAKE2B 3c667c1605445aec37d264ec3846a1a6678f13a12aecc09a6d16e09ea27041fcd65d23538acef4f6272ab0458ce479c42906b15cb6eddd9c8001b1970c23e4fc SHA512 d53912041a9950efb5d221fc968adc328c2ef1e54ec9806d2158fd6db1b170e37afb05213f5750b10c59927504083ca3781c958caa0c802b1c7c0fe1ac1682a4
-DIST packaging-20.5.gh.tar.gz 75111 BLAKE2B b088b85fc042b48337878c0f663934f32f90eb792ba53257b1b0879a097ef042b67a9cff56b23f5e0187a3df0f89092e0210939382851f0ae917f6ef00ad73ff SHA512 ef3c4853c30d9635b9372d6861cc0df8f7fc5a1d784e5f3effe3f315da0f24662ac939e70f55c6e9bb8864da95b9f75bc0df093f12c0f5c2af654b5354a5f081
 DIST packaging-20.7.gh.tar.gz 75182 BLAKE2B f3ba27ec33db576273609f28aabb5edab4acd07d8174c96e3a1608eacdc1a571d2ce96cc4e38c50c964ae5a716bbca077effd6dea039b25ac7bd6ce5707ae08b SHA512 4da8f66af066ac92b47664d21af34a02526cd1639cb766927670bec0ac8c7416116834c847678a29862a46faeda7e2f2393744be315cdfbbb8bd55a04ceb942c
 DIST packaging-20.8.gh.tar.gz 76310 BLAKE2B f6a220bf8ed61e4ced5cdb93eac8a83310d5c1abc11861e3eca64ef08e3fa2617a9dedd9006fd833df37da5bd7a33c216fb78b9151b1c72121fbb0a27e7b88d3 SHA512 77c77da9298635274de58b856b8738ab279749f736264212e6ecdeab47db607ea9c6ae696952f0702e9557d1fd2b89c7277a2c81ff55081593f49ebcd6eb74d4
diff --git a/dev-python/packaging/files/packaging-16.8-distutils.patch b/dev-python/packaging/files/packaging-16.8-distutils.patch
deleted file mode 100644
index 84bbb618a6fe..000000000000
--- a/dev-python/packaging/files/packaging-16.8-distutils.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -13,10 +13,7 @@ import re
- # dependency when projects attempt to unbundle stuff from setuptools and pip.
- # Though we don't really support that, it makes things easier if we do this and
- # should hopefully cause less issues for end users.
--try:
--    from setuptools import setup
--except ImportError:
--    from distutils.core import setup
-+from distutils.core import setup
- 
- 
- base_dir = os.path.dirname(__file__)
diff --git a/dev-python/packaging/packaging-20.4-r1.ebuild b/dev-python/packaging/packaging-20.4-r1.ebuild
deleted file mode 100644
index 372a0c9e51a2..000000000000
--- a/dev-python/packaging/packaging-20.4-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=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="https://github.com/pypa/packaging https://pypi.org/project/packaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.8-distutils.patch"
-)
-
-python_test() {
-	pytest --capture=no --strict -vv || die
-}
-
-pkg_preinst() {
-	# https://bugs.gentoo.org/585146
-	cd "${HOME}" || die
-
-	_cleanup() {
-		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
-		local egginfo="${ROOT}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			rm -rv "${egginfo}" || die "Failed to remove egg-info directory"
-		fi
-	}
-	python_foreach_impl _cleanup
-}
diff --git a/dev-python/packaging/packaging-20.5.ebuild b/dev-python/packaging/packaging-20.5.ebuild
deleted file mode 100644
index d1c52a69be66..000000000000
--- a/dev-python/packaging/packaging-20.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="
-	https://github.com/pypa/packaging/
-	https://pypi.org/project/packaging/"
-SRC_URI="
-	https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	pytest --capture=no --strict -vv || die
-}
diff --git a/dev-python/packaging/packaging-20.7.ebuild b/dev-python/packaging/packaging-20.7.ebuild
index d1c52a69be66..e5ff1a92ffc9 100644
--- a/dev-python/packaging/packaging-20.7.ebuild
+++ b/dev-python/packaging/packaging-20.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/packaging/packaging-20.8.ebuild b/dev-python/packaging/packaging-20.8.ebuild
index fe26da3360d4..5bd4270ae15e 100644
--- a/dev-python/packaging/packaging-20.8.ebuild
+++ b/dev-python/packaging/packaging-20.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index ddc65cbc5a03..add027ba5d6b 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1 +1,2 @@
 DIST paho-mqtt-1.5.0.tar.gz 126869 BLAKE2B 2dce27c1fcfe7ae422dc6da76fb58e7901de00c0c349b9715c56a3603da26e1f46af9bb8c0bd982043ba54a2070655b483d251a0a847e1c3afb36bcd4cfcdba8 SHA512 7e52180bf1783ee1f39aa5248730e82fae47fe3db7c4579b0b7207a29f5337c7c0af58d58aac1c265b1ed91fa9c240187d5e3005f55c6e28623e6cbc36750294
+DIST paho-mqtt-1.5.1.tar.gz 144740 BLAKE2B 1c218f1109476fe9b28c26e1113717448377c53a2b9e01437f93d4a29f77e3b61f59492c263f160825ddcce25f907dbf72d3078954cc378d4846afb435d79bba SHA512 7e686bcc702f70c45ab061aa9833d42c4356d5002d27a035a685ca384a5b7d5e9dfd88ac95183816e08dd131463582707acd1d2e0f6de0f7dbbb6a6d0a615c97
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild
new file mode 100644
index 000000000000..3b9f3f223344
--- /dev/null
+++ b/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client class with support for MQTT v5.0, v3.1.1, and v3.1"
+HOMEPAGE="https://www.eclipse.org/paho/index.php?page=clients/python https://github.com/eclipse/paho.mqtt.python"
+SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/paho.mqtt.python-${PV}"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=""
+DEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	) "
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.0-strip-test-dependency.patch"
+)
diff --git a/dev-python/pandas-datareader/metadata.xml b/dev-python/pandas-datareader/metadata.xml
index c7cd41b795e3..b4613c29092e 100644
--- a/dev-python/pandas-datareader/metadata.xml
+++ b/dev-python/pandas-datareader/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chr@chymera.eu</email>
+		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/pandas/pandas-1.1.4-r1.ebuild b/dev-python/pandas/pandas-1.1.4-r1.ebuild
index d780a546a792..639ff61bbd41 100644
--- a/dev-python/pandas/pandas-1.1.4-r1.ebuild
+++ b/dev-python/pandas/pandas-1.1.4-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pandas/pandas-1.1.5.ebuild b/dev-python/pandas/pandas-1.1.5.ebuild
index d780a546a792..03eda4c28303 100644
--- a/dev-python/pandas/pandas-1.1.5.ebuild
+++ b/dev-python/pandas/pandas-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/parameterized/Manifest b/dev-python/parameterized/Manifest
index cc85d7dec7bd..d51c9de032fc 100644
--- a/dev-python/parameterized/Manifest
+++ b/dev-python/parameterized/Manifest
@@ -1 +1,3 @@
 DIST parameterized-0.7.4.tar.gz 23389 BLAKE2B cc1ac334c0209a7471799587e1d35f6d8db84df91f559514bf3067ec8b2110948a6148613efd1d0111a65d43c52f7be16ab56cb69dca339fe7049f64484b7889 SHA512 71c51ad57900f5b1b6f4866c60ba4d23649df7740e7f7e735a2e0faf4810bc8dc552a1647da8c174f8a0b80db7de5727ce24dabc9fee6b4cfe12ee98c18945d7
+DIST parameterized-0.7.5.tar.gz 21830 BLAKE2B 9ec717797f0aed058200ec3359a20d83f3c21f36b112c9395a6d7d20e5a28eb00c683e7829ab3e8ac161cf80d31b820d14edd0567fa569f29aafaabcef008dc0 SHA512 d7d3665f0ffe5449eacce2b0dbb01a0b8a83c0afea8a62320d49e3ed71996d5cb3a8ce51de58c17d41edace18c3491587d012c65d1d8990edf3b6e2553afd3c0
+DIST parameterized-0.8.1.tar.gz 23936 BLAKE2B 3d36b049071907f66ef17dcae0ef9480210344f2466744b2bee8e964f46e2553411a07b233fab032d1acbc2523dc32890bc5e6e4ffc5b37d1fee3f0db3a70cbb SHA512 ad6e31b2bb27623bf070ee5c30686a5bd6a531bc71602f77ca6aa01a77fc246caaacca121098dcbe13b1a174cdcfafa6545bf6e62f6a5337a647821c02fac64a
diff --git a/dev-python/parametrized/parametrized-0.1.ebuild b/dev-python/parameterized/parameterized-0.7.5.ebuild
index 6354a858bd76..b4ff5a682dd9 100644
--- a/dev-python/parametrized/parametrized-0.1.ebuild
+++ b/dev-python/parameterized/parameterized-0.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
diff --git a/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild b/dev-python/parameterized/parameterized-0.8.1.ebuild
index b9a4b9b99638..b4ff5a682dd9 100644
--- a/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild
+++ b/dev-python/parameterized/parameterized-0.8.1.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Parameterized testing with any Python test framework"
-HOMEPAGE="https://github.com/kgrandis/nose-exclude"
+HOMEPAGE="https://github.com/wolever/parameterized"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
 
-python_test() {
-	nosetests -v || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/parametrized/Manifest b/dev-python/parametrized/Manifest
deleted file mode 100644
index d821cf07cf10..000000000000
--- a/dev-python/parametrized/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST parametrized-0.1.tar.gz 2246 BLAKE2B 2d6296434aaed324c3b15492d212a9bae025ab0614d349cd1ddc621189a91e593ab84b7a7c4089d6245bf4b91dd48586cdb0d9eb562b99d8de697e66c19a2713 SHA512 ee9543b1c2f4e313ea3a74d91b97b6339770101b70317754006fde7568292d3f175d923896742339302d5e1e625b2c0f2beb05863c659ac3b81869a3f574f25b
diff --git a/dev-python/paramiko/paramiko-2.7.2.ebuild b/dev-python/paramiko/paramiko-2.7.2.ebuild
index 1f2e6a95fdfa..3a72abe5074b 100644
--- a/dev-python/paramiko/paramiko-2.7.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="examples server"
 
 RDEPEND="
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 3353336f2a49..6e1363e87f8f 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,3 +1,4 @@
 DIST parso-0.7.0.tar.gz 395175 BLAKE2B ac407b711b6229a93864e339b3632563d3fcd7f84e22a43bd89282300b931f58d638ab8a64c441dc183852576261be18a3be471b0824b6e56fb69025cf666d6b SHA512 41ad60b1d7dff682281059aabff0d43ccd3048b6cc6ee3e9e141d4a0a965fd99449f6d3f23689914c1f7bda371e3cc86266775a1c23fb1c430ea689c916fbb71
 DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a2e95fa3f54429633b1c12dc39a4abe237fa46eb629408006777bd1f512cf878025b55119568ac19729b8c19 SHA512 318969a7a941c4a0948e58643b07b6f5c446ea166b3a8e44a556f0677ec9a36d7dc8c6d37ca7bce3f8276ee3d7144e22fbaaeac90c738fb90f7e94a0cf8abf7d
 DIST parso-0.8.0.tar.gz 392579 BLAKE2B b816a9f54aca54fbb8df772d1f6501d55fccef91d3c9bfcddc9f069e1b5a15dee7742bf37dbfd07f26253247a29a42303c4034608c6c9991c97e55acac77b69d SHA512 fe9d1c46cb128d6af9c45f333e49475da795c1ed67572891f4daf08af620814b9db18469be11f771869e0f44acea9446e1419067e1b72affc1cb669a277d6a2c
+DIST parso-0.8.1.tar.gz 393403 BLAKE2B d8d2a025dfb6664d8deeabfc621f4dcf0c6f6e0769dc3a7081888436cce39685f7749ee4ed33c501e3690bec0c8b21d18195d585a8baf5fa8c1b1ae1bfad5680 SHA512 10cc36a4f288d06b8d06bf3995eafe8c6b5d46d0ab01ce6db4557c82f8c64c6792b438a5b7dea570a9690bad586ab4216161268be9c1979b91b3af50e1c8801c
diff --git a/dev-python/parso/parso-0.8.1.ebuild b/dev-python/parso/parso-0.8.1.ebuild
new file mode 100644
index 000000000000..5d5b10004de8
--- /dev/null
+++ b/dev-python/parso/parso-0.8.1.ebuild
@@ -0,0 +1,19 @@
+# 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,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
+HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
+SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/paste/paste-3.5.0.ebuild b/dev-python/paste/paste-3.5.0.ebuild
index aee5baac0067..8e85834bf787 100644
--- a/dev-python/paste/paste-3.5.0.ebuild
+++ b/dev-python/paste/paste-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pastel/Manifest b/dev-python/pastel/Manifest
new file mode 100644
index 000000000000..ad6aaf29e8a7
--- /dev/null
+++ b/dev-python/pastel/Manifest
@@ -0,0 +1 @@
+DIST pastel-0.2.1.tar.gz 125760 BLAKE2B f9b3c29444bb6bd0e710cd80d4e48cdc9099ad6512cd99b0224559b87504f5b61cfcb90165f97b101b8ff5e9f8b7e230878c5cf50ae2b0555447f5be28977cb0 SHA512 585834d035fe208313a77e0c824f6b67630a85697d4aef802800911cb1da72bfd6c9ba47fe5502359bdf244a98b8f6dea300a788ff1cfd56a8bc19eb7b7dcc16
diff --git a/dev-python/pastel/metadata.xml b/dev-python/pastel/metadata.xml
new file mode 100644
index 000000000000..194ff4adee87
--- /dev/null
+++ b/dev-python/pastel/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jakov.smolic@sartura.hr</email>
+    <name>Jakov Smolic</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sdispater/pastel</remote-id>
+    <remote-id type="pypi">pastel</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/pastel/pastel-0.2.1.ebuild b/dev-python/pastel/pastel-0.2.1.ebuild
new file mode 100644
index 000000000000..9cde5e9de3e3
--- /dev/null
+++ b/dev-python/pastel/pastel-0.2.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Bring colors to your terminal"
+HOMEPAGE="https://github.com/sdispater/pastel"
+SRC_URI="https://github.com/sdispater/pastel/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index d304f27e7487..8e8480e537b7 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -1 +1,2 @@
 DIST path-15.0.0.tar.gz 73642 BLAKE2B 186b77b6571dd878a5b64b575289bb5ee549145ccd0c7b858f99c9e3772cf98f2cc7ff5da759e7fa660296abc49c053a388ad95466c51adccce2162c682c6566 SHA512 e41684c576b959e27258f60c0d8b69719c38a5a7a04d9646089aea91227781573368a08f01230dca831732ae687741d22caf52efd9a481378b8d4e77627fe3a5
+DIST path-15.0.1.tar.gz 47662 BLAKE2B ec50e75cd1b24cd017189cb8632340a5e4ebed8517d607a9f26e43c7c75b2b7d62e9a70b6b93ea6db79feb3d100ca535aba7926cfd7317bef1ac290697ea8f90 SHA512 d8ea2a98cf5caad15bc99a740188d6947cb1cdacc1ac7b6164f29f8d78ca8e73258120ff36f100957e3c4c2ca0ed6eaf27c98c4765ededde41b58d98de24f672
diff --git a/dev-python/path-py/path-py-15.0.1.ebuild b/dev-python/path-py/path-py-15.0.1.ebuild
new file mode 100644
index 000000000000..fa4e972df3d1
--- /dev/null
+++ b/dev-python/path-py/path-py-15.0.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+MY_P="path-${PV}"
+
+DESCRIPTION="A module wrapper for os.path"
+HOMEPAGE="https://pypi.org/project/path/ https://github.com/jaraco/path"
+SRC_URI="mirror://pypi/p/path/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	!<dev-python/pytest-shutil-1.7.0-r1
+	!<dev-python/pytest-virtualenv-1.7.0-r1"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -e "s/setup_requires = setuptools_scm/version = '${PV}'/" \
+		-i setup.cfg || die
+
+	# disable fancy test deps
+	sed -e 's: --flake8:: ; s: --black:: ; s: --cov:: ; s: --mypy::' \
+		-i pytest.ini || die
+
+	# fragile test for import time
+	sed -i -e 's:test_import_time:_&:' test_path.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH=. pytest -vv || die
+}
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index 2e6a6ca38c54..0ce452f3842a 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,2 +1 @@
-DIST pathspec-0.8.0.tar.gz 26256 BLAKE2B 3d4f2238c515253d83bfd17a2f3319e38024d4fbb22fb0f078bbcca73d3aff45f246a35752c4039b0d88f204ae49b4467b2d9e3b9134e14a7a171895dac770be SHA512 e0cb1883d11506b3d11963397db98a0fd3411f56df7c3e2ab3ac44116ab53977112bb51d1918591afc48b9c08f9cf997d34beba373aafbfbca2aa8749ffaf6c8
 DIST pathspec-0.8.1.tar.gz 26644 BLAKE2B 3591aabbd62a0fa1908cef5478d74a6d3ba64333a540c124aa6e7d25fbc45d44faa83e0822fa776ccf787d72ec9c2a977daddefa07d5d6fea2c8c6345836350c SHA512 f793ecf9bfb6511420a37fefa5a9dbd79d8e7329c305d6f1ecb4ea90e322825471983b56722c680e418e0bab41204996075c83cfc8ba7c6a0e5e09b1d8fd1d2e
diff --git a/dev-python/pathspec/pathspec-0.8.0.ebuild b/dev-python/pathspec/pathspec-0.8.0.ebuild
deleted file mode 100644
index ff046419f85e..000000000000
--- a/dev-python/pathspec/pathspec-0.8.0.ebuild
+++ /dev/null
@@ -1,18 +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,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility library for gitignore style pattern matching of file paths."
-HOMEPAGE="https://github.com/cpburnz/python-path-specification https://pypi.org/project/pathspec/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE=""
-
-distutils_enable_tests setup.py
diff --git a/dev-python/pathspec/pathspec-0.8.1.ebuild b/dev-python/pathspec/pathspec-0.8.1.ebuild
index 6950239ec5cb..64e5e5770855 100644
--- a/dev-python/pathspec/pathspec-0.8.1.ebuild
+++ b/dev-python/pathspec/pathspec-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/pbr/pbr-5.5.1.ebuild b/dev-python/pbr/pbr-5.5.1.ebuild
index bb2892244908..26fc929bec9b 100644
--- a/dev-python/pbr/pbr-5.5.1.ebuild
+++ b/dev-python/pbr/pbr-5.5.1.ebuild
@@ -15,7 +15,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 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pebble/Manifest b/dev-python/pebble/Manifest
index 6e3d8eb60f13..3cc2b5b8080a 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1 +1,2 @@
 DIST Pebble-4.5.3.tar.gz 23411 BLAKE2B 4e270b0de183074e151f3c7cf8754bd3535efce601c0dfdd5bffbe04a4308aa7db6e6414668471d3af6f1fb374230590d90e2503ba223c2e95b17a2a0d301310 SHA512 e3b17fa6b9ca959560d364e84091e7990921eb9a2aef854c391a5d0e46359b57e5ec1a4239ac97f4c0bb485d0475ad8338c3485c9fdeff7e446a989129738096
+DIST Pebble-4.6.0.tar.gz 23910 BLAKE2B 3a2f1b4cdad898274d53cdfc07b5c933162aef375ae548a39138b50d50376e7f06642dfbff038b431d77715a14414f90fbd77db1c373e988df6afe65cfb5a632 SHA512 445f65cf5a18c864478326ca1198ae49bf5aae3c53e67f68ffdcbdabe3cf16c59468b3d340568986414f45f13684c11da0e3a9fd31f510c391a7fd44cf3dc6e2
diff --git a/dev-python/pebble/pebble-4.6.0.ebuild b/dev-python/pebble/pebble-4.6.0.ebuild
new file mode 100644
index 000000000000..6ce45e081329
--- /dev/null
+++ b/dev-python/pebble/pebble-4.6.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Threading and multiprocessing eye-candy"
+HOMEPAGE="
+	https://pypi.org/project/Pebble/
+	https://pebble.readthedocs.io/
+	https://github.com/noxdafox/pebble"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 770386da5c0c..59cbae45c29b 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1 +1,2 @@
 DIST peewee-3.13.2.tar.gz 871323 BLAKE2B 18fd9729ddd6ce3fe4a6963b697815d44e91b5078ba0b868e6b4f24f4cec9c5b01239d7f414f4f8c0871d3dc6bd5e0e37e218c9438cf1f7461bf729cb74049e4 SHA512 7304473f8e64df7cb2205900cfbdd52346d89e9639dc79ed6e13d5c4c11cc856e39e366772039097dc5ca86b4768fa4670dccd96a85cabfb522c463b31c40a8b
+DIST peewee-3.14.0.tar.gz 877299 BLAKE2B 25d0027354258c3b2a4db0765f8dac23527816c24afdaf20252e244cfec383a4ae4f10a29ea0f801d5c38406f8c17bcc6fef881b4bce96ed45920a8865868e80 SHA512 083bb24952a6d05cd6c8376e185e050df0ab5b37bc553241128b0ed3b0ebdd322d9626c32943658324d413cff8ab0bb2ddf6c84d99a0fbe057c0e5c8ec93d7f9
diff --git a/dev-python/peewee/peewee-3.14.0.ebuild b/dev-python/peewee/peewee-3.14.0.ebuild
new file mode 100644
index 000000000000..c1d8761227c4
--- /dev/null
+++ b/dev-python/peewee/peewee-3.14.0.ebuild
@@ -0,0 +1,35 @@
+# 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,10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? ( dev-python/psycopg[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	"${EPYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pendulum/Manifest b/dev-python/pendulum/Manifest
new file mode 100644
index 000000000000..3e628f72f341
--- /dev/null
+++ b/dev-python/pendulum/Manifest
@@ -0,0 +1 @@
+DIST pendulum-2.1.2.tar.gz 159885 BLAKE2B c95cd131fc95a0d19ef11f180cc42126cb8a6ea3aaf4b3bbedbc5ce4c1b37a6624f2a1be92f1a6fd6b1f14f5d20fa5f32e8230f896ab7a216f02f00e85b98738 SHA512 c367320ade0d10b7eb9c880286176161b925d7df052f7de85ddd169594bbe778776ea74df451f00186df98be3e32b7399c68ca4b40123e2c456206410e3a1ab2
diff --git a/dev-python/pendulum/metadata.xml b/dev-python/pendulum/metadata.xml
new file mode 100644
index 000000000000..ae9875013af0
--- /dev/null
+++ b/dev-python/pendulum/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jakov.smolic@sartura.hr</email>
+    <name>Jakov Smolic</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sdispater/pendulum</remote-id>
+    <remote-id type="pypi">pendulum</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/pendulum/pendulum-2.1.2-r1.ebuild b/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..5b12cfc14d9b
--- /dev/null
+++ b/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Drop-in replacement for the standard datetime class"
+HOMEPAGE="https://pendulum.eustace.io/ https://github.com/sdispater/pendulum"
+SRC_URI="https://github.com/sdispater/pendulum/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Requires timezone information which is not installed by default
+# with dev-python/pytzdata, and otherwise approx. 50 out of 1600
+# tests are failing for now. Keeping the test dependencies 
+# commented for future tests fixups
+RESTRICT="test"
+
+DEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytzdata[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+#BDEPEND="
+#	test? (
+#		dev-python/babel[${PYTHON_USEDEP}]
+#		dev-python/freezegun[${PYTHON_USEDEP}]
+#		dev-python/pytz[${PYTHON_USEDEP}]
+#	)"
+
+# distutils_enable_tests pytest
diff --git a/dev-python/pep8/pep8-1.7.1.ebuild b/dev-python/pep8/pep8-1.7.1.ebuild
index b29324222e94..c7ac8aaa79fa 100644
--- a/dev-python/pep8/pep8-1.7.1.ebuild
+++ b/dev-python/pep8/pep8-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
diff --git a/dev-python/pew/Manifest b/dev-python/pew/Manifest
deleted file mode 100644
index 26140e1b0559..000000000000
--- a/dev-python/pew/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pew-1.1.1.tar.gz 19629 BLAKE2B 9db83eeee873c1a9a542372562cbadda37d6d5d52ed220c7018390291a96ae1adf7e168c4213cbcadad04a6cadb7115aed53eb7a8561a0ee0e58dc9137ac5257 SHA512 9b59ab51d4685b6203a944338d8fc5ab0ac65b442adb7861fb3f2ed7437ef8a02f1f87e234fc70124245625ac7992500c11e51902a98511015e90f1ac5e56b46
diff --git a/dev-python/pew/metadata.xml b/dev-python/pew/metadata.xml
deleted file mode 100644
index d7d235002509..000000000000
--- a/dev-python/pew/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pew</remote-id>
-		<maintainer status="unknown">
-			<email>berdario+pypi@gmail.com</email>
-			<name>Dario Bertini</name>
-		</maintainer>
-		<remote-id type="github">berdario/pew</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pew/pew-1.1.1.ebuild b/dev-python/pew/pew-1.1.1.ebuild
deleted file mode 100644
index 2213002e7c94..000000000000
--- a/dev-python/pew/pew-1.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="tool to manage multiple virtualenvs written in pure python"
-HOMEPAGE="
-	https://github.com/berdario/pew
-	https://pypi.org/project/pew/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=">=dev-python/pythonz-bd-1.11.2[${PYTHON_USEDEP}]
-	>=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-1.11.6[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-clone-0.2.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pexpect-python2/pexpect-python2-4.8.0.ebuild b/dev-python/pexpect-python2/pexpect-python2-4.8.0-r1.ebuild
index 9e98059f6b07..ece6d40fd584 100644
--- a/dev-python/pexpect-python2/pexpect-python2-4.8.0.ebuild
+++ b/dev-python/pexpect-python2/pexpect-python2-4.8.0-r1.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 MY_PN=pexpect
@@ -24,7 +25,9 @@ RESTRICT="test"
 RDEPEND="
 	!dev-python/pexpect[python_targets_python2_7]
 	>=dev-python/ptyprocess-python2-0.5[${PYTHON_USEDEP}]"
-DEPEND=""
+DEPEND="
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
+"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 python_install() {
diff --git a/dev-python/pexpect/pexpect-4.8.0-r1.ebuild b/dev-python/pexpect/pexpect-4.8.0-r1.ebuild
index 646526fd2707..d017e5f64413 100644
--- a/dev-python/pexpect/pexpect-4.8.0-r1.ebuild
+++ b/dev-python/pexpect/pexpect-4.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc examples"
 
 RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 728854b1e544..36ebccc4a7a7 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,4 +1,3 @@
-DIST phonenumbers-8.12.11.tar.gz 2254319 BLAKE2B 2a33978ab0e4e575aefe2f3ed4f5a89ea87f1b38881fa2f4b7a4a38d16c107c62f4e079521d579b8a5419c8b174cf51ae8c530a450b8a8f9ad200b13938f4039 SHA512 e9008086f9cbb13a5772f164b12d3446cd0122556d90522f1e49d0a0155355401f2348a44396c7c26b235e543135471b64c97d67f82406356787c3c636dd181c
-DIST phonenumbers-8.12.12.tar.gz 2257073 BLAKE2B c8e4d20962d53470bfa701ff59ad0d4ddfa5f4913ae2ad2bea83c5b0c3274bddc7ff1c57e555e3b7f877d9230c0fdab5d866e52f9285fdafd773afc2c840f42f SHA512 625746bcf08f4bb5849fda1accf1229a05406439c97228b3f0f38b6fd56a4cd53e719738bed305a9dd89ab94f5f60ff0d9d0dcd3e57d5055daad99cfb94982ac
-DIST phonenumbers-8.12.13.tar.gz 2257015 BLAKE2B 93986ed663b4f78d0b48ff45bf6b5e2b3d360d9efd5a349f05cf24d5a6113d87334be2d72eb03a6925eabd5cd2dafdf51ffc16fe95c73bd164fcfc5bc07d171f SHA512 397eb41e17c0a49c5750bc909fef70d8e2844f872f317a74f306c406fc7d459fe7dc48615dbc82b0144781a89ad376e76fe390688fd227705a016adf19c848be
 DIST phonenumbers-8.12.14.tar.gz 2256560 BLAKE2B 60fdcb14143d4ffb625d1c873a1e262053bb0bc3df6f2576212329726c4578367b817f1166dfbc561669e4e8486a411487627de479e66775968c05574a8beff6 SHA512 fc155095a00d5e776301dde134043dcc60dfdc6812399e92e92f319c568f7e06f3b294833dc385614b14c87cac15aafb76e7c27116445c7d8fc0ec0740314089
+DIST phonenumbers-8.12.15.tar.gz 2256651 BLAKE2B b3a583cb64ea1e4fc278f40cb78c7ad9aa66f1655e4483219f8d1e3384628b9b5cd672c584953c0233743d436fbc6723484d63724e466badf0b3fecf57791b87 SHA512 56c52ab736ce807609c79d5cc3d4e97cb3c5a3e59689cf3112c21ee672c04f095f1727fc37f4e3b1573dbcd4c9ccb00b3a5773c2c383264996e1761f46acfd0c
+DIST phonenumbers-8.12.16.tar.gz 2257000 BLAKE2B 33e513840f1147af9169ae4b01527b07597cd8fd3be2e299c77e79eed75b84c7e8bbe036e5961ddd93efcf4a8bab6e6a5da348800becac66d078947a2c98accb SHA512 4e2162a6fa02170241887f4876ee811d431b0bccb03d9be305478ae48f21f27643da1be238d68f52b50eb72e87f8de4961769500f026cd4bfb2ac291534d1e74
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.11.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.11.ebuild
deleted file mode 100644
index 3522783ce7fc..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.11.ebuild
+++ /dev/null
@@ -1,20 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DOCS=(README.md)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.14.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.14.ebuild
index dbdc3d546aa5..3fa080a3ed5b 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.14.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=(README.md)
 
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.12.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.15.ebuild
index dbdc3d546aa5..dbdc3d546aa5 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.12.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.15.ebuild
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.13.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.16.ebuild
index dbdc3d546aa5..ac8788fcaacf 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.13.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/pid/Manifest b/dev-python/pid/Manifest
index 24b80bb18291..f699585d517d 100644
--- a/dev-python/pid/Manifest
+++ b/dev-python/pid/Manifest
@@ -1,2 +1 @@
-DIST pid-2.2.5.tar.gz 12151 BLAKE2B e681ad7e1d92ca1468f02dc258f12f6ae4899c775108e39c85488d8427132050d34ee79cad979a65d1bbee4cdb3d12b1a851d313547caf28c1f06dec4d0a81b6 SHA512 01cb6af9a81b216af3b2e02c336589f4f1fb29b12dbdbefb817b78255157e175b16862c2bc01412460f9f754f2c7a073c9ec2a907e3290569af8bd9a2ee7081f
 DIST pid-3.0.4.tar.gz 16228 BLAKE2B 386565071646ff5b5152c52a8a0881f54369540abaf34a82be399d5e579c763df81553393a6d9a9659beeec5f6b531c74eef7cd13f6dc6f56ee76783863c52e9 SHA512 71656511a12a27fe0c7106cd82459484071fd7a0d34f187bfd2f59dc484b6a86f2ae840eb04609c5ffb2c1f18dafd831b02c0fee5015cf840e6a1f26f95ec495
diff --git a/dev-python/pid/pid-2.2.5.ebuild b/dev-python/pid/pid-2.2.5.ebuild
deleted file mode 100644
index 35ea238477b1..000000000000
--- a/dev-python/pid/pid-2.2.5.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_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pidfile featuring stale detection and file-locking"
-HOMEPAGE="https://pypi.org/project/pid/ https://github.com/trbs/pid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${P}-fix_tests.patch" )
-
-distutils_enable_tests pytest
diff --git a/dev-python/pid/pid-3.0.4.ebuild b/dev-python/pid/pid-3.0.4.ebuild
index 9b66dfceef8d..798a219568be 100644
--- a/dev-python/pid/pid-3.0.4.ebuild
+++ b/dev-python/pid/pid-3.0.4.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/piexif/metadata.xml b/dev-python/piexif/metadata.xml
index af478d621eff..eb79c1cb3fb4 100644
--- a/dev-python/piexif/metadata.xml
+++ b/dev-python/piexif/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>sping@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">piexif</remote-id>
 		<remote-id type="github">hMatoba/Piexif</remote-id>
diff --git a/dev-python/piexif/piexif-1.1.3-r1.ebuild b/dev-python/piexif/piexif-1.1.3-r1.ebuild
index e7dd8c9ba60a..d81d65d80559 100644
--- a/dev-python/piexif/piexif-1.1.3-r1.ebuild
+++ b/dev-python/piexif/piexif-1.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/piexif/piexif-1.1.3.ebuild b/dev-python/piexif/piexif-1.1.3.ebuild
deleted file mode 100644
index 62f016bbbb9c..000000000000
--- a/dev-python/piexif/piexif-1.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit edos2unix distutils-r1
-
-DESCRIPTION="Exif manipulation with pure Python"
-HOMEPAGE="https://github.com/hMatoba/Piexif
-	https://pypi.org/project/piexif/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip
-	test? ( dev-python/pillow[jpeg] )"
-RDEPEND=""
-
-PATCHES=(
-	# From https://github.com/hMatoba/Piexif/pull/109
-	"${FILESDIR}"/${P}-tests-pillow-7.2.0.patch
-)
-
-src_prepare() {
-	edos2unix tests/s_test.py  # to be able to patch it
-	default
-}
-
-python_test() {
-	"${PYTHON}" setup.py test || die
-}
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 9f84637789b4..a90ccb3d7790 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,2 +1,4 @@
 DIST pikepdf-1.18.0.tar.gz 2351789 BLAKE2B b33b69f57fcd5293814ac880376627b7184ca632e09f668fd274eae6b3640d97699681597470c17abe00ec334ec894a073cc1a1eff91ffa7df572ef78542b429 SHA512 9a04fe6ce145a6f28a180261ac004fc0ce3c525c4e9e7c5eb4bb7dbf8aaa6d3e6f726cec5d20033a5aaa60b793666df52c20f13c8ee7c0c3266fb8e557d69c18
 DIST pikepdf-2.2.0.tar.gz 2363761 BLAKE2B d1a8873a2c41e280dc2880609424742f4454ee226ee30469df067ddf0f5ee98ba6ef2965df75e95c2576e3813bdea7cb6bebfc7a1a7d05696b9da8ec67ef981a SHA512 e80874ece09ce6381079f705ab031b121917485d0968578aeb07a83b70a14bb46d549498357acc4df62b51c33fd75a87f65b74ef64464dcaebba3ff84aaa1843
+DIST pikepdf-2.3.0.tar.gz 2366792 BLAKE2B 3e5d2f460702bbce8ddc22abfb67867b40f75bb59cd30966db9865c96240ef9ad990f295abcd8f5f325a9954500e587afab647da7de3909960859fa3825c4526 SHA512 056bd2e73a7915b42ea170061932e445fff614abd662d935c8735c5fb04fd95e196495bc11dcb3781270c966d94cb93cd972500e6ea4d3ea7333456be3b7dbb6
+DIST pikepdf-2.4.0.tar.gz 2367657 BLAKE2B c6b126f45baef8d3d4bea40851650f6ee2196e60618f490952f74491744b6536a01040de685c5114ec5aad2e8923092498594ae28b9e9f14f2da579816a198e0 SHA512 42af99ed5446171449d46d4dabf444623ce22b81819bbef992735e67a58ed82e343b46779f323b96b35e076014464e50ac0e4f5fd3553482c750488e091b6fd5
diff --git a/dev-python/pikepdf/metadata.xml b/dev-python/pikepdf/metadata.xml
index 99a2582de5ac..fb0f339ff6ed 100644
--- a/dev-python/pikepdf/metadata.xml
+++ b/dev-python/pikepdf/metadata.xml
@@ -5,6 +5,10 @@
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     pikepdf is a Python library for reading and writing PDF files.
     pikepdf is based on QPDF, a powerful PDF manipulation and repair library.
diff --git a/dev-python/pikepdf/pikepdf-2.3.0.ebuild b/dev-python/pikepdf/pikepdf-2.3.0.ebuild
new file mode 100644
index 000000000000..efcf4bd2e7c3
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.3.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/qpdf:0=
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-50[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.35[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? ( >=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		<dev-python/hypothesis-6.0[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		<dev-python/pytest-7[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.10.1[${PYTHON_USEDEP}]
+		<dev-python/pytest-cov-3[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.28[${PYTHON_USEDEP}]
+		<dev-python/pytest-xdist-2.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.3-test.patch )
+
+python_test() {
+	pytest
+}
+
+# When ipython and matplotlib will get python3_8 support, we'll be able to add
+#
+#IUSE="doc"
+#DEPEND="doc? ( dev-python/ipython
+#		dev-python/matplotlib
+#		dev-python/sphinx-1.4
+#		dev-python/sphinx_rtd_theme )"
+#python_compile_all() {
+#	use doc && emake -C docs html
+#}
+#python_install_all() {
+#	use doc && local HTML_DOCS=( docs/_build/html/. )
+#	distutils-r1_python_install_all
+#}
diff --git a/dev-python/pikepdf/pikepdf-2.4.0.ebuild b/dev-python/pikepdf/pikepdf-2.4.0.ebuild
new file mode 100644
index 000000000000..6a19c07407cb
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.4.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 235ce1b38d3a..d10c00986040 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,3 +1 @@
-DIST pillow-7.0.0.tar.gz 37880130 BLAKE2B be940cbdced884c33f2b3979be113b1bc8974814c9532fe80203395184f90eccba1cd9a5017fec1f0c30a21ff06abc46560d5c6d67938dbf640f2e8e08b7e554 SHA512 187173a525d4f3f01b4898633263b53a311f337aa7b159c64f79ba8c7006fd44798a058e7cc5d8f1116bad008e4142ff303456692329fe73b0e115ef5c225d73
-DIST pillow-7.2.0.tar.gz 39125407 BLAKE2B f49015922c34473590740c9fa63435f85f9a517b3295abd2e758941b95162cef0fb1fa2a0e6ee0ac86323709ee3af02888f6e029a1905f13698e82c1f38d5d94 SHA512 ac9c7c8f445b3f67f51bea13fad118d1612c45272c26d33bec286f3c2e198912b934378c4bf986b409aaa2a83d92ff176ee4d25f28701d61746c9cb86d0f412b
-DIST pillow-8.0.1.tar.gz 44614653 BLAKE2B 0f8ec178e92a57a55d575fac61779d39e79ff18032a02ad93aa6eca1211436342944b1a5bbd29979b52f0e2df756936ade4bf637ac3c153b5dda5838b58087ac SHA512 41b4ea786990c834f77ad06b64f465bc8f3a65911cf14bb05f452316fdf504e5e49b2bb50a9346f207187e79f83c5b6d310d703d1588f678b606584b1f27ce6a
+DIST pillow-8.1.0.tar.gz 44929704 BLAKE2B 6b8100f26a746c625851521d7aa3696c4de30b05d2debc07cfcc038c1bc1e73ab1136676d22fccdf17b8d0ecfeb21479168580e5f5a93488c50cbaf1c6533d79 SHA512 1014271d29e98c465e6882ed3f2f915f8955f5ada2a762c671a1f79389b25576ead2d144c6eaf42b4777f14438d15979d78d34dc32d984fd7defb53f0d209957
diff --git a/dev-python/pillow/pillow-7.0.0.ebuild b/dev-python/pillow/pillow-7.0.0.ebuild
deleted file mode 100644
index 62ccc9c97c31..000000000000
--- a/dev-python/pillow/pillow-7.0.0.ebuild
+++ /dev/null
@@ -1,98 +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,9,10} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
-REQUIRED_USE="test? ( jpeg tiff )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/olefile[${PYTHON_USEDEP}]
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	mydistutilsargs=(
-		build_ext
-		--disable-platform-guessing
-		$(use_enable truetype freetype)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jpeg2000)
-		$(use_enable lcms)
-		$(use_enable tiff)
-		$(use_enable imagequant)
-		$(use_enable webp)
-		$(use_enable webp webpmux)
-		$(use_enable zlib)
-	)
-
-	# setup.py sucks at adding the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but this setup.py does stupid things.
-	export \
-		INCLUDE=${ESYSROOT}/usr/include \
-		LIB=${ESYSROOT}/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-7.2.0.ebuild b/dev-python/pillow/pillow-7.2.0.ebuild
deleted file mode 100644
index d7bf4d7de670..000000000000
--- a/dev-python/pillow/pillow-7.2.0.ebuild
+++ /dev/null
@@ -1,100 +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,9,10} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg tiff )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/olefile[${PYTHON_USEDEP}]
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	xcb? ( x11-libs/libxcb )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	mydistutilsargs=(
-		build_ext
-		--disable-platform-guessing
-		$(use_enable truetype freetype)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jpeg2000)
-		$(use_enable lcms)
-		$(use_enable tiff)
-		$(use_enable imagequant)
-		$(use_enable webp)
-		$(use_enable webp webpmux)
-		$(use_enable xcb)
-		$(use_enable zlib)
-	)
-
-	# setup.py sucks at adding the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but this setup.py does stupid things.
-	export \
-		INCLUDE=${ESYSROOT}/usr/include \
-		LIB=${ESYSROOT}/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-8.0.1.ebuild b/dev-python/pillow/pillow-8.1.0.ebuild
index 2be72eaad426..0541afc0b12e 100644
--- a/dev-python/pillow/pillow-8.0.1.ebuild
+++ b/dev-python/pillow/pillow-8.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 129d44595d3a..1ff29c06200a 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,5 +1,4 @@
-DIST pip-20.2.4.tar.gz 8723163 BLAKE2B 4b892950b6752b61af2f6a9d2c0a6f5db124cb7605d6cb9d4787bdbd88911cc6013474dd299f6eb5b1af4a8fa0ab6d3c5253513af182045a50cb463ced8382ea SHA512 649fdc6baa1ebe741717bd1e5ed8f2450d79f8bc0d06f2804c27488be9018f6fa6cc2eccc3ec2801442073f59ac0b8c377612c25116126aa919aa95050f4214f
 DIST pip-20.3.1.tar.gz 8753852 BLAKE2B dbcf719ed6a1e4f39f08c39df0cb4abf4284f6cd68c9fbd1282b17714aff9df9e33dd2a4a1af89f45ce5131a858f7d392c11447fe9aceba9d3be2ebe1529818d SHA512 6061004b51e57e428a7eef02968fbbde02311ee184019c491012758010bffcb49d371c7612bc43cfacf96fe8de37fdcad34e3cadefc46b3b5962b0c716ee5d59
-DIST pip-20.3.2.tar.gz 8757391 BLAKE2B 934e689dd42529269798fbd5e45e7392167492f5c723394f2fca3d12d7fa3408ca1108dd4ed517cd40cf2f20ded5a06344cb23cc22fbcc4eefeef74dd2024762 SHA512 aa794e57f440deb238215141854b58e67a682cd5ca70febde13d8e3b92c9897e7f5ef11be6bd2a9594a8233348e406402b91fd3caaadffc5ff377ede6fc4a480
+DIST pip-20.3.3.tar.gz 8757085 BLAKE2B dce60cd59669929957715d6be70da4924c3a89bb4129f0972516bde8ccca751b4f327dd2f44a06cd0b48d092f8d520d1ec236ee812f768282004b34f1fabb798 SHA512 362d20e5d2665fa6211cf3836ca02a0340fb34ecde1d5902eecae744eb655d7dcfed0bd464e9db186b87b63a7aaf275e43645cf6321bdddd44b62787de84d87b
 DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
 DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
diff --git a/dev-python/pip/pip-20.2.4.ebuild b/dev-python/pip/pip-20.2.4.ebuild
deleted file mode 100644
index a3a9f1aceb1f..000000000000
--- a/dev-python/pip/pip-20.2.4.ebuild
+++ /dev/null
@@ -1,144 +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,9,10} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-SETUPTOOLS_PV="44.0.0"
-WHEEL_PV="0.34.2"
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl
-	)
-"
-# PyPI archive does not have tests, so we need to download from GitHub.
-# setuptools & wheel .whl files are required for testing, exact version is not very important.
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-SLOT="0"
-IUSE="test -vanilla"
-
-# disable-system-install patch breaks tests
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/csv23[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		<dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
-		"${FILESDIR}/${PN}-20.2-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	# TODO
-	rm tests/functional/test_new_resolver_user.py || die
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl \
-			tests/data/common_wheels/ || die
-
-		cp "${DISTDIR}"/wheel-${WHEEL_PV}-py2.py3-none-any.whl \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local -a exclude_tests
-
-	# these will be built in to an expression passed to pytest to exclude
-	exclude_tests=(
-		git
-		svn
-		bazaar
-		mercurial
-		version_check
-		uninstall_non_local_distutils
-		pep518_uses_build_env
-		install_package_with_root
-		install_editable_with_prefix
-		install_user_wheel
-		install_from_current_directory_into_usersite
-		uninstall_editable_from_usersite
-		uninstall_from_usersite_with_dist_in_global_site
-		build_env_isolation
-		user_config_accepted
-	)
-
-	distutils_install_for_testing
-
-	# generate the expression to exclude failing tests
-	local exclude_expr
-	printf -v exclude_expr "or %s " "${exclude_tests[@]}" || die
-	exclude_expr="not (${exclude_expr#or })" || die
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-
-	pytest -vv \
-		-k "${exclude_expr}" \
-		-m "not network" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; import pip.__main__; sys.exit(pip.__main__._main())'
-
-	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-20.3.1.ebuild b/dev-python/pip/pip-20.3.1.ebuild
index 4c1b980cee62..b2135795cf29 100644
--- a/dev-python/pip/pip-20.3.1.ebuild
+++ b/dev-python/pip/pip-20.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/pip/pip-20.3.2.ebuild b/dev-python/pip/pip-20.3.3.ebuild
index 4c1b980cee62..4c1b980cee62 100644
--- a/dev-python/pip/pip-20.3.2.ebuild
+++ b/dev-python/pip/pip-20.3.3.ebuild
diff --git a/dev-python/pipfile/pipfile-0.0.2.ebuild b/dev-python/pipfile/pipfile-0.0.2.ebuild
index 3935c1dc7721..7c914fc3c192 100644
--- a/dev-python/pipfile/pipfile-0.0.2.ebuild
+++ b/dev-python/pipfile/pipfile-0.0.2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 
 inherit distutils-r1
@@ -12,7 +13,7 @@ SRC_URI="https://github.com/pypa/pipfile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="dev-python/toml[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
new file mode 100644
index 000000000000..3b1437a5bd10
--- /dev/null
+++ b/dev-python/pivy/Manifest
@@ -0,0 +1 @@
+DIST pivy-0.6.5.tar.gz 6614159 BLAKE2B 2652feb26137b2deda8b76083d3bd9018303ca0a0236ea97e83e9ff24ddeda30462a25ac1b20b0d3e718fc9f83ae5ebf7116a5c0d94debcc5b6d729792230655 SHA512 6cf0b1ac348336609f42f6a72df7ffdc3e1042a4f8fc6e2b725ca38f09476c70bafa14c1f083d1badeb5b37b974a0fbf5806ea71d44d734b9ab9b125ce7f8695
diff --git a/dev-python/pivy/files/pivy-0.6.4-find-SoQt.patch b/dev-python/pivy/files/pivy-0.6.4-find-SoQt.patch
new file mode 100644
index 000000000000..4d8a6fdd8889
--- /dev/null
+++ b/dev-python/pivy/files/pivy-0.6.4-find-SoQt.patch
@@ -0,0 +1,31 @@
+From 1c9ffef4d85327fe517bdcf7e11c339a4862ba2e Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Wed, 12 Jun 2019 21:21:34 +0200
+Subject: [PATCH] CMakeLists.txt: remove NONE keyword for languages from
+ project definition. This solves a bug where SoQt is not found on Gentoo
+ systems (see https://github.com/waebbl/waebbl-gentoo/issues/42)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Thanks to QÍN Yuhào for coming up with this fix.
+
+Suggested-by: QÍN Yuhào <qinyh18@mails.tsinghua.edu.cn>
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 76d0d06..48bd3c0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-project(pivy_cmake_setup NONE)
++project(pivy_cmake_setup)
+ cmake_minimum_required(VERSION 3.5)
+ 
+ 
+-- 
+2.21.0
+
diff --git a/dev-python/pivy/metadata.xml b/dev-python/pivy/metadata.xml
new file mode 100644
index 000000000000..69fc83b65b9e
--- /dev/null
+++ b/dev-python/pivy/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>fordfrog@gentoo.org</email>
+	<name>Miroslav Šulc</name>
+</maintainer>
+<maintainer type="person">
+	<email>waebbl@gmail.com</email>
+	<name>Bernd Waibel</name>
+</maintainer>
+<use>
+	<flag name="quarter">
+		Use <pkg>media-libs/quarter</pkg> for GUI bindings
+	</flag>
+	<flag name="soqt">
+		Use <pkg>media-libs/SoQt</pkg> for GUI bindings
+	</flag>
+</use>
+<upstream>
+	<remote-id type="github">coin3d/pivy</remote-id>
+</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/pivy/pivy-0.6.5.ebuild b/dev-python/pivy/pivy-0.6.5.ebuild
new file mode 100644
index 000000000000..052f9ce6649e
--- /dev/null
+++ b/dev-python/pivy/pivy-0.6.5.ebuild
@@ -0,0 +1,41 @@
+# 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,10} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Coin3D bindings for Python"
+HOMEPAGE="https://github.com/coin3d/pivy"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
+else
+	SRC_URI="https://github.com/coin3d/pivy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="+quarter soqt"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( quarter soqt )
+"
+
+RDEPEND="
+	>=media-libs/coin-4.0.0
+	quarter? ( media-libs/quarter )
+	soqt? ( >=media-libs/SoQt-1.6.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/swig"
+
+PATCHES=( "${FILESDIR}/${PN}-0.6.4-find-SoQt.patch" )
+
+DOCS=( AUTHORS HACKING NEWS README.md THANKS )
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index 26749b4bc951..9190051e9115 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1 +1,3 @@
 DIST pkginfo-1.5.0.1.tar.gz 34496 BLAKE2B b5a60e3fe2408283afbdebf8efa709b7b1c96b82ddc76b3fbc4d58d544c2170de1434525fe2e324af9864332c6570885b05a3d8ec2c248fbff20984d2ee80a94 SHA512 319bb403970affd5a4222dfdb3d17738630d1350ea84e51ad1bebc6c8c72e0dcfd69a4eaf5e7bd156b8e605d806357922c05cc994dcafb01b7a33c617b2df447
+DIST pkginfo-1.6.1.tar.gz 37124 BLAKE2B 852a37825840fc5d20fe73effa39e1c01e5fd1f1c7b1a0663d0d43d7ac1ae1ec3ae62e0442fb436731a985dbb936ac4651bc4003f14d55e4b51f200b4cf4ccd6 SHA512 51ead9d2d16464eff1e46ccf99b7bcb40897d2526e8f5a0aaf10cb1305271134a1bc0b4524b4559cf0a8ddbb450ba4a9b123a41676f5b6bc2cbe721c7cec52c9
+DIST pkginfo-1.7.0.tar.gz 37209 BLAKE2B 70e2c7d69d4b9b5544017c0b0c388e375060f063a35a3467a420d8819d77eb0e9772735db78c0ad03560aa9e35dd0485945517f305056bd52d435e2462a3878b SHA512 0e41899fac552e6a3c401c7dab3e3cd57f31cc5f052e07537f15b699c85113800edac27d232571ecab4852fab1d73374eca381d1ab70c9a7461bb422ff03de3b
diff --git a/dev-python/pkginfo/pkginfo-1.6.1.ebuild b/dev-python/pkginfo/pkginfo-1.6.1.ebuild
new file mode 100644
index 000000000000..783834dfea82
--- /dev/null
+++ b/dev-python/pkginfo/pkginfo-1.6.1.ebuild
@@ -0,0 +1,28 @@
+# 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,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
+HOMEPAGE="https://pypi.org/project/pkginfo/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+distutils_enable_tests nose
+distutils_enable_sphinx docs
+
+src_prepare() {
+	# TODO
+	sed -i -e 's:test_ctor_w_package_no_PKG_INFO:_&:' \
+		pkginfo/tests/test_installed.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pkginfo/pkginfo-1.7.0.ebuild b/dev-python/pkginfo/pkginfo-1.7.0.ebuild
new file mode 100644
index 000000000000..7d7c64184b86
--- /dev/null
+++ b/dev-python/pkginfo/pkginfo-1.7.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 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,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
+HOMEPAGE="https://pypi.org/project/pkginfo/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests nose
+distutils_enable_sphinx docs
+
+src_prepare() {
+	# TODO
+	sed -i -e 's:test_ctor_w_package_no_PKG_INFO:_&:' \
+		pkginfo/tests/test_installed.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index 3e25f85db560..5f28c863a26b 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1,2 +1,3 @@
 DIST plotly-1.9.6.tar.gz 546722 BLAKE2B 5905af517ef40bc077492f01b49c367c0aa03a96accb86ec072e188a43e463c187a0b9dee3d0df33669aa6d600ed9127b067c7099947e5235331d14ce10bf33c SHA512 7564036ed3745fc06ee7428942e45ca6bfaefa1e47b08a5868a918924268ee632515f1de4bf3e90911234f18a4d85b092ecb6ef9f213b939093dcb433a12dec4
 DIST plotly-4.10.0.tar.gz 6263967 BLAKE2B a78ddf286993621a555cc7f34a5ad0f44e93dcceb9bdac2a20f0cd80257e90485f20b4c89a350a3718b104401d7677a762231c6a774e5c2757a2de1454822875 SHA512 bc32dac7e5621b254c3868e85ed18133ad8341bed5784f707a89242c5e1ef9959afc603a91ccb068aca24032d3ff5b44678811c405d579284334f051f59f93aa
+DIST plotly-4.14.1.tar.gz 6373585 BLAKE2B 8e8d15a7f68bbef835fcbc0048c2457916aad1b10e06c903222030b2b2e1b902e2d42080f8ac2c19928dabd7e1623210930b9f33dededa71dbbb28b2f41f848c SHA512 e052680d0e7344b9f53f1b917dd0b9bc87b0c34300d93b8958ccb35b38f9dc5e7fb4db016d1113df4bae78c419f3d378112c59c3470723ce1349eaadbc5011f8
diff --git a/dev-python/plotly/plotly-4.14.1.ebuild b/dev-python/plotly/plotly-4.14.1.ebuild
new file mode 100644
index 000000000000..6cc1980956ed
--- /dev/null
+++ b/dev-python/plotly/plotly-4.14.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Browser-based graphing library for Python"
+HOMEPAGE="https://plot.ly/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/retrying[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	mkdir -p "${ED}"/etc/ || die
+	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
+	rmdir "${ED}"/usr/etc || die
+}
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index 5e7624fbab41..27ba1f2fe0b1 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,2 +1 @@
-DIST plumbum-1.6.8.tar.gz 309449 BLAKE2B 4112cb99852ebc7e4465ec54bf35a1352ff41a7ac084d3561d23f6da62fb1b25fa65a1f6f118564a677e6b6fde57b52f964a07fb71cae40b7d831ceb1505738e SHA512 2e834b6024ed1892eb91ede95f70641288a76911d58fcb24edaed59d3e54afa72e0533b4510896ecdd5077f70d4d60d9ceb06510c3e6d469afb1befae1961af1
 DIST plumbum-1.6.9.tar.gz 311240 BLAKE2B e5f833a5c762f3e78e5f47649306c7c29e6276b3530ff45fc0c12cc4efd3bf89bad2b6b7f77e4b3e3a0a47671f9b607e667aba8f654c28c05be570e0a7491a07 SHA512 f165f4905ec34cfe072f61fb28b43021ca44c0c3cb1e505faa04332d15920d832bcf084782683c4950113e30a3fa29734846b3b6f31604e1a635c9c125e38ef1
diff --git a/dev-python/plumbum/metadata.xml b/dev-python/plumbum/metadata.xml
index 6d56e7477294..cf90252dda8f 100644
--- a/dev-python/plumbum/metadata.xml
+++ b/dev-python/plumbum/metadata.xml
@@ -14,6 +14,7 @@
     attempting to mimic the shell syntax (shell combinators) where it makes sense,
     while keeping it all Pythonic and cross-platform.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">plumbum</remote-id>
     <remote-id type="github">tomerfiliba/plumbum</remote-id>
diff --git a/dev-python/plumbum/plumbum-1.6.8.ebuild b/dev-python/plumbum/plumbum-1.6.8.ebuild
deleted file mode 100644
index 50990deef942..000000000000
--- a/dev-python/plumbum/plumbum-1.6.8.ebuild
+++ /dev/null
@@ -1,16 +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,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A library for shell script-like programs in python"
-HOMEPAGE="https://plumbum.readthedocs.io/en/latest/ https://github.com/tomerfiliba/plumbum"
-SRC_URI="https://github.com/tomerfiliba/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/dev-python/plumbum/plumbum-1.6.9.ebuild b/dev-python/plumbum/plumbum-1.6.9.ebuild
index 2fba88ce5412..119ba02a2648 100644
--- a/dev-python/plumbum/plumbum-1.6.9.ebuild
+++ b/dev-python/plumbum/plumbum-1.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,5 +12,5 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/dev-python/ply-python2/ply-python2-3.11.ebuild b/dev-python/ply-python2/ply-python2-3.11-r1.ebuild
index 114549f9d559..5d940c638c4d 100644
--- a/dev-python/ply-python2/ply-python2-3.11.ebuild
+++ b/dev-python/ply-python2/ply-python2-3.11-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 MY_PN=ply
@@ -21,6 +22,7 @@ RESTRICT="test"
 PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
 
 RDEPEND="
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
 	!dev-python/ply[python_targets_python2_7]
 "
 
diff --git a/dev-python/ply/ply-3.11-r1.ebuild b/dev-python/ply/ply-3.11-r1.ebuild
index 221b50ca9d81..5e8375f99cd6 100644
--- a/dev-python/ply/ply-3.11-r1.ebuild
+++ b/dev-python/ply/ply-3.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 DOCS=( ANNOUNCE CHANGES TODO )
diff --git a/dev-python/pmw/pmw-2.0.1-r2.ebuild b/dev-python/pmw/pmw-2.0.1-r2.ebuild
index d13ebecb4622..91acced7c794 100644
--- a/dev-python/pmw/pmw-2.0.1-r2.ebuild
+++ b/dev-python/pmw/pmw-2.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="py3"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc test"
 
 DEPEND="!dev-python/pmw:0"
diff --git a/dev-python/pony/Manifest b/dev-python/pony/Manifest
index 0dc616107dc7..97baa57249f1 100644
--- a/dev-python/pony/Manifest
+++ b/dev-python/pony/Manifest
@@ -1,2 +1 @@
-DIST pony-0.7.13.gh.tar.gz 302541 BLAKE2B a1e6f82c6eb72f8626238cbfcc0bc01d1ad3498a75a5ce4c3b8a4511e6d1fbfdd39a239f0462458ae1d64dc9446b338bbaea33d6bbdd861c8d0738e50d58a717 SHA512 431d19e3297ba1cdae5313948123d8b8cd71ee8ad5868b8cc2f5447eb435875fdbcdc3768834b9afe22ce8e4c1abaabeb597f3e6974b00aab33aa61e497d6390
 DIST pony-0.7.14.gh.tar.gz 305795 BLAKE2B a0e056d722a205a00567a230628be6ef8a7fe86f594f91ec0e8bbfc6d6eec17ec1d4cf3f57ad10984b8beb0a90da3010d9a32f2f08dca434af39e20fc6e9126c SHA512 ed27fd697dd14948c282dab6b75e41c9309d0ef4c4cccb0f91e4214e81de52a2de3910e413dfc5495ffcea190a5b50255c45b2beecead84eecb601ba2463d998
diff --git a/dev-python/pony/metadata.xml b/dev-python/pony/metadata.xml
index 90c0bac5bc8a..5c8c57113cde 100644
--- a/dev-python/pony/metadata.xml
+++ b/dev-python/pony/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pony</remote-id>
 	</upstream>
diff --git a/dev-python/pony/pony-0.7.13.ebuild b/dev-python/pony/pony-0.7.13.ebuild
deleted file mode 100644
index 106a79ec26f4..000000000000
--- a/dev-python/pony/pony-0.7.13.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python ORM with beautiful query syntax"
-HOMEPAGE="
-	https://ponyorm.org/
-	https://github.com/ponyorm/pony/"
-SRC_URI="
-	https://github.com/ponyorm/pony/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? ( $(python_gen_impl_dep sqlite) )"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pony/pony-0.7.14.ebuild b/dev-python/pony/pony-0.7.14.ebuild
index f7fe943ed4a6..5d78b5a8664d 100644
--- a/dev-python/pony/pony-0.7.14.ebuild
+++ b/dev-python/pony/pony-0.7.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,11 +16,11 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	test? ( $(python_gen_impl_dep sqlite) )"
+BDEPEND="test? ( $(python_gen_impl_dep sqlite) )"
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
 
 distutils_enable_tests unittest
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 083694583e4e..a8d58512150c 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,2 +1 @@
-DIST portend-2.6.tar.gz 12295 BLAKE2B 307bb77bb7d73e201f00ca203204149bb4fba8a00277da08f804626be4d01b15bdd38ade7a49c7acafd37263cad6e8c62e0eb6e6bdec0d9e10267c1fbf469aa9 SHA512 9e53c668ba9d0ddb2e92d9b4c97d2b8a4d858a6fc44123414ee3c8ac433f51f50a4773ee08f85bb134e49aeace2a17baffd32962d36df0b19b505a2c6634bf7e
 DIST portend-2.7.0.tar.gz 12732 BLAKE2B 147d47295d702e6e4a41da1af91afc72ecb2a29713431aada6c98fe527c96f86a88a845cc1afe6507e2fd0d749e146f8b349df13d2e1fb1ff2c0a12fc7d6bdae SHA512 8c81e524e94c4902806a6d33a2811d405e6024796fdbfb5ee1037a177b0aaed4c1b87b76822eee5ca55e552ffa569f4e619d0c1645f0d10c17f8d721ec73787b
diff --git a/dev-python/portend/portend-2.6.ebuild b/dev-python/portend/portend-2.6.ebuild
deleted file mode 100644
index dc66fc3915d5..000000000000
--- a/dev-python/portend/portend-2.6.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,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="TCP port monitoring utilities"
-HOMEPAGE="https://pypi.org/project/portend/ https://github.com/jaraco/portend"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# avoid a setuptools_scm dependency
-	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
-	sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
-		setup.cfg || die
-
-	# avoid extra test deps
-	sed -i -r 's: --flake8:: ; s: --black:: ; s: --cov::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/portend/portend-2.7.0.ebuild b/dev-python/portend/portend-2.7.0.ebuild
index c60fe55d76f2..d03267e14c2f 100644
--- a/dev-python/portend/portend-2.7.0.ebuild
+++ b/dev-python/portend/portend-2.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pretend/pretend-1.0.9-r1.ebuild b/dev-python/pretend/pretend-1.0.9-r1.ebuild
index b3b9f678b113..fe23e0985ab8 100644
--- a/dev-python/pretend/pretend-1.0.9-r1.ebuild
+++ b/dev-python/pretend/pretend-1.0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/alex/pretend/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/prettytable/metadata.xml b/dev-python/prettytable/metadata.xml
index f79859887c49..58eb8f51feec 100644
--- a/dev-python/prettytable/metadata.xml
+++ b/dev-python/prettytable/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="google-code">prettytable</remote-id>
     <remote-id type="pypi">prettytable</remote-id>
diff --git a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
index 2e6fa3a4c1f2..04bd1a3ab65f 100644
--- a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/prettytable/prettytable-2.0.0.ebuild b/dev-python/prettytable/prettytable-2.0.0.ebuild
index d54600436583..7c553af65293 100644
--- a/dev-python/prettytable/prettytable-2.0.0.ebuild
+++ b/dev-python/prettytable/prettytable-2.0.0.ebuild
@@ -9,12 +9,14 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
-HOMEPAGE="https://github.com/jazzband/prettytable https://pypi.org/project/prettytable"
+HOMEPAGE="
+	https://github.com/jazzband/prettytable/
+	https://pypi.org/project/prettytable/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/process-tests/process-tests-2.1.1.ebuild b/dev-python/process-tests/process-tests-2.1.1.ebuild
index bfaa8355a683..1bf6552493e9 100644
--- a/dev-python/process-tests/process-tests-2.1.1.ebuild
+++ b/dev-python/process-tests/process-tests-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 # There are no tests at all, under TODO
 # see https://pypi.org/project/process-tests/2.0.2/
diff --git a/dev-python/progressbar2/progressbar2-3.53.1.ebuild b/dev-python/progressbar2/progressbar2-3.53.1.ebuild
index 234131b5c16b..d6a2b1f7023b 100644
--- a/dev-python/progressbar2/progressbar2-3.53.1.ebuild
+++ b/dev-python/progressbar2/progressbar2-3.53.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 CDEPEND="!dev-python/progressbar[${PYTHON_USEDEP}]
 	dev-python/python-utils[${PYTHON_USEDEP}]"
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 4da206b11771..e13f01600409 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,2 +1 @@
-DIST prometheus_client-0.8.0.tar.gz 67749 BLAKE2B 570c95de0d4e9e8bd625d55eb3dd450cf933ab7c8b6af74ff56414045f4d845c4a74f60d60e8b29f868801de12ebe2d39b5ac11701071c4998aec66719581b3f SHA512 a9d49bc4dac77168f94edf51344042bc5210b07ed01031dc50e323f86ea8292df7370956a4fbd9d9f85a0857a8ec9abaef30c0c2cd4dc5502df7264816eecc8f
 DIST prometheus_client-0.9.0.tar.gz 68176 BLAKE2B e20f599e6a4d39226e48cafeca879b87389fdb5a6eda401161ce448cb0b46a89ce0cccc1b78e2fc8cb60cc461253345b9ba52809c861f0a187171c33095f625a SHA512 1d68ca35169972c50bb56ede88c47408ee27b3e795fcf03798313aed2dbc5db5532fe6886998c118258b76e431c6e49aa0ac19b9206cad63711901497258aaa5
diff --git a/dev-python/prometheus_client/metadata.xml b/dev-python/prometheus_client/metadata.xml
index 010fa63b8d8b..4fa961d83108 100644
--- a/dev-python/prometheus_client/metadata.xml
+++ b/dev-python/prometheus_client/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">prometheus/client_python</remote-id>
 		<remote-id type="pypi">prometheus-client</remote-id>
diff --git a/dev-python/prometheus_client/prometheus_client-0.8.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.8.0.ebuild
deleted file mode 100644
index d3849c8f85c2..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.8.0.ebuild
+++ /dev/null
@@ -1,21 +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,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus_client/
-	https://github.com/prometheus/client_python"
-SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/client_python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prometheus_client/prometheus_client-0.9.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.9.0.ebuild
index b708b9c0744b..0eeab4b94128 100644
--- a/dev-python/prometheus_client/prometheus_client-0.9.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.9.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/client_python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 07062815046b..2df6f2db4406 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,2 +1,4 @@
 DIST prompt_toolkit-2.0.10.tar.gz 347981 BLAKE2B b95cf000d5249da3710f9b51f72d41c3d552f1d3a35dea5493f565f0f62998d890bf2b81b3376140a4d16a19f2c5fd60eb0cb5f2f58180c176ef1543c6fc4ec2 SHA512 b91292cf43607b3a7018ca29827f0aa9bc90efc064c68faffe02ad28e4bb60f45fc2d25bbfd9a40a383a815cb08596975f08237a498f94a5c088d56d3a0a9803
+DIST prompt_toolkit-3.0.10.tar.gz 3020391 BLAKE2B 397ab28e5a362c84df7286be27be11acd4c6666bf77d63a1042cd76e6a4ee0b8002bad6166d858dfa6f07f8da41c6513c13fe2500b55da1dbc6562038ed974ef SHA512 71cdbe28064f28a2d88f369ee4550cc02b2609841b51d8fa7e8028304e77f34c6feed5d4549d62a3cbce27f95a4ebca1066a6fd869fbffa1799a3dedef2df6f4
 DIST prompt_toolkit-3.0.7.tar.gz 3018359 BLAKE2B c1d1f897a422df599d2bfbbfc53851489bf9f41a7ddb57fb1a03cae8411a7468bd047423922a5e95dcdcfb2730dee38029bdaa15eb7dc92ff47066b4b6edc6cb SHA512 3ee4cf65f175343273eb2c1b76250b35430ac3f3ee7cc61bfbcca86a717fdaaf74c723dba400d872b47b06883bed959b166df33b8960173beb466edf9266ff43
+DIST prompt_toolkit-3.0.9.tar.gz 3019859 BLAKE2B ebde3bd1ecf0f24b98e4f3e173c0a885c47af4a30bc19ce50bdc01636cd095cb7b09f9aacf37fd5f33f92ad2e5adec7f94cc85d5a48264c186a3a7460ef04b7d SHA512 8e9777215b73e1076f82e9733963151bbc4248581298b0f996cc1700db2aa28eaef3fb1a07470706e7569021f5e47ad9bc3a9a93c976fa36b6979552afc522b7
diff --git a/dev-python/prompt_toolkit/metadata.xml b/dev-python/prompt_toolkit/metadata.xml
index ac15f4804b6f..ad7337051c53 100644
--- a/dev-python/prompt_toolkit/metadata.xml
+++ b/dev-python/prompt_toolkit/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <stabilize-allarches/>
   <upstream>
-    <remote-id type="pypi">prompt_toolkit</remote-id>
+    <remote-id type="pypi">prompt-toolkit</remote-id>
     <remote-id type="github">prompt-toolkit/python-prompt-toolkit</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.10.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.10.ebuild
new file mode 100644
index 000000000000..46cd3eff785d
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.9.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.9.ebuild
new file mode 100644
index 000000000000..46cd3eff785d
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
index 783c4cd2466f..f3a618f14ec4 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -24,7 +24,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.4-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.4-r1.ebuild
index aeaff6ee2b37..ec25bd56de70 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.4-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -24,7 +24,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
index 2e6c4e4e2a16..da8b95116735 100644
--- a/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -24,7 +24,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/24"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
index 36b708eed8c7..ff0b1e3d1170 100644
--- a/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -24,7 +24,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/25"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/prov/metadata.xml b/dev-python/prov/metadata.xml
index 9445b09fb704..68fcfa840614 100644
--- a/dev-python/prov/metadata.xml
+++ b/dev-python/prov/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chr@chymera.eu</email>
+		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/psutil/psutil-5.7.0-r1.ebuild b/dev-python/psutil/psutil-5.7.0-r1.ebuild
index 9cd2c6b67c06..5a0a0af9f2de 100644
--- a/dev-python/psutil/psutil-5.7.0-r1.ebuild
+++ b/dev-python/psutil/psutil-5.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psutil/psutil-5.7.2-r1.ebuild b/dev-python/psutil/psutil-5.7.2-r1.ebuild
index 364c69d910d2..f6ae73be26ec 100644
--- a/dev-python/psutil/psutil-5.7.2-r1.ebuild
+++ b/dev-python/psutil/psutil-5.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~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 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psutil/psutil-5.7.3.ebuild b/dev-python/psutil/psutil-5.7.3.ebuild
index b378834d78e8..083ea2b254c9 100644
--- a/dev-python/psutil/psutil-5.7.3.ebuild
+++ b/dev-python/psutil/psutil-5.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~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 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psycopg/psycopg-2.8.5-r1.ebuild b/dev-python/psycopg/psycopg-2.8.5-r1.ebuild
index e933cafea52f..cc2c6543c887 100644
--- a/dev-python/psycopg/psycopg-2.8.5-r1.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/psycopg/psycopg-2.8.6-r1.ebuild b/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
index fac22cce6bbd..d63975c1c9e0 100644
--- a/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ptpython/Manifest b/dev-python/ptpython/Manifest
deleted file mode 100644
index 3cd505f6fb7f..000000000000
--- a/dev-python/ptpython/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ptpython-2.0.6.tar.gz 46980 BLAKE2B b78013d898bb01106315a7aea88f40c0a8ba70571ae8fb5376dcf7d67636f4e3d4d329c5c58dc4c2cdca80ec92313938250224c2560f91eda40bff6c5f59736c SHA512 2d0a84e6515ad2e6523774b1136fdc822aed95e27e6a2d857952b703ea5def86de44166c2cffd8d2151cdf246088959d0a41279cb66b1249a865bff3ad02f4cc
diff --git a/dev-python/ptpython/metadata.xml b/dev-python/ptpython/metadata.xml
deleted file mode 100644
index fe3bae605ac7..000000000000
--- a/dev-python/ptpython/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">ptpython</remote-id>
-    <remote-id type="github">prompt-toolkit/ptpython</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/ptpython/ptpython-2.0.6.ebuild b/dev-python/ptpython/ptpython-2.0.6.ebuild
deleted file mode 100644
index d56c3b303bfa..000000000000
--- a/dev-python/ptpython/ptpython-2.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python REPL build on top of prompt_toolkit"
-HOMEPAGE="https://pypi.org/project/ptpython/ https://github.com/prompt-toolkit/ptpython"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/docopt[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2.0.8[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-2.1.0[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/ptyprocess-python2/ptyprocess-python2-0.6.0.ebuild b/dev-python/ptyprocess-python2/ptyprocess-python2-0.6.0-r1.ebuild
index ee670c4b4c99..917c857c05ef 100644
--- a/dev-python/ptyprocess-python2/ptyprocess-python2-0.6.0.ebuild
+++ b/dev-python/ptyprocess-python2/ptyprocess-python2-0.6.0-r1.ebuild
@@ -20,6 +20,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 RESTRICT="test"
 
 RDEPEND="
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
 	!dev-python/ptyprocess[python_targets_python2_7]
 "
 
diff --git a/dev-python/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
index cee8c8bb6773..6e3aebb0ca90 100644
--- a/dev-python/ptyprocess/Manifest
+++ b/dev-python/ptyprocess/Manifest
@@ -1 +1,2 @@
 DIST ptyprocess-0.6.0.tar.gz 70115 BLAKE2B 02499e560c4df2f852d0951a9acfcb88a2bfe659592ead0304bb6a240e831fb093dd40a457714a8a91d1af70b5364b7af91d2c14c956d8a84d3eeec3eb2a9edf SHA512 b34b6bca977f09d1443b210e338e1300e12d6ef35857f9543b3a116ef3b500ad4844357a7a283321756f886af41bddb1f02b27bf200ef1e82a96fd9e431bed86
+DIST ptyprocess-0.7.0.tar.gz 70762 BLAKE2B 6c72cda3eae7dbf4335af11b6ffe1d46040d01fc5c2599948abf0a4fbd53ea45e9d2833843465dbb868da7b4058a014ed08754bb49888795de221bd54ae092a5 SHA512 791d8f2e79900627215ce80ce67ee9c79173dbc08297c6219d5058f9b80c5e323b93049e6836a70c4073f43548d22e3cf310f2e9948ef12f96bcaa15b0ddb2f3
diff --git a/dev-python/ptyprocess/ptyprocess-0.7.0.ebuild b/dev-python/ptyprocess/ptyprocess-0.7.0.ebuild
new file mode 100644
index 000000000000..5628c04c755f
--- /dev/null
+++ b/dev-python/ptyprocess/ptyprocess-0.7.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Run a subprocess in a pseudo terminal"
+HOMEPAGE="https://github.com/pexpect/ptyprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pure-sasl/Manifest b/dev-python/pure-sasl/Manifest
deleted file mode 100644
index 42770e730f26..000000000000
--- a/dev-python/pure-sasl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pure-sasl-0.6.1.tar.gz 11553 BLAKE2B 17a3728e23b04cfcebd967ec4e40ab40ae72ebd18325579dfac52dbeac58ebee6e467f32a8030214cd976b2ae96e446afbc853c3e4233a61fa149d2910b1ecfc SHA512 f0e34fba460b03fb2348871859f79a21ac27df4be8b125a1652891efacd428a560673f42dff0993e87a3d80439f182e3a6e07b7c968cbfa3c86311c1592822a2
diff --git a/dev-python/pure-sasl/metadata.xml b/dev-python/pure-sasl/metadata.xml
deleted file mode 100644
index 626e9a6a0853..000000000000
--- a/dev-python/pure-sasl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pure-sasl</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/py-smbpasswd/py-smbpasswd-1.0.2.ebuild b/dev-python/py-smbpasswd/py-smbpasswd-1.0.2-r1.ebuild
index d4425c4add7b..3282ad683424 100644
--- a/dev-python/py-smbpasswd/py-smbpasswd-1.0.2.ebuild
+++ b/dev-python/py-smbpasswd/py-smbpasswd-1.0.2-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 MY_P="${PN#py-}-${PV}"
@@ -17,4 +18,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ia64 ppc sparc x86"
 
+DEPEND="
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
+"
+
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/py-ubjson/py-ubjson-0.16.1.ebuild b/dev-python/py-ubjson/py-ubjson-0.16.1.ebuild
index 0125e23cdef3..b0676534854a 100644
--- a/dev-python/py-ubjson/py-ubjson-0.16.1.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/py/py-1.10.0.ebuild b/dev-python/py/py-1.10.0.ebuild
index b945aab341dc..38d4a7ecb414 100644
--- a/dev-python/py/py-1.10.0.ebuild
+++ b/dev-python/py/py-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # This package is unmaintained and keeps being broken periodically.
 RESTRICT=test
 
diff --git a/dev-python/py/py-1.9.0-r2.ebuild b/dev-python/py/py-1.9.0-r2.ebuild
index 96988edc26ed..24e60f338e14 100644
--- a/dev-python/py/py-1.9.0-r2.ebuild
+++ b/dev-python/py/py-1.9.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # This package is unmaintained and keeps being broken periodically.
 RESTRICT=test
 
diff --git a/dev-python/pyGPG/pyGPG-0.2.ebuild b/dev-python/pyGPG/pyGPG-0.2.ebuild
index 524dabb3599a..6ef30f9fa441 100644
--- a/dev-python/pyGPG/pyGPG-0.2.ebuild
+++ b/dev-python/pyGPG/pyGPG-0.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="A python interface wrapper for gnupg's gpg command"
diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest
index d3ed6ae9df15..a1a195d67593 100644
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@@ -1 +1 @@
-DIST pyamg-3.2.1.tar.gz 765723 BLAKE2B 72c59c0fe93363f73d8ba4c6297920dd1ca8406b048cf0357baec5f2390bdb524421a35ef65e790be45b543e9e162067ee8f8f09327b464a4bc5c9cec368b003 SHA512 6be0dd068417389934ce97813321367920abf6f9f5e94ce2df8bd796edc797cedd492c9153b62466f7d68055a05821447dcf21578ccdfe3294766a49a9ac220e
+DIST pyamg-4.0.0.tar.gz 717171 BLAKE2B 16483d829e8a938359827ca8ebe3093c890685244125576e05220910b66e9aeec278472134d10c589e58dfbd363930cdd7ae13d16c9b9d54c1bd5250e66f4677 SHA512 cdd27834c12ef18f023e78b5b946c06bc2c35f73cf65fc4c76da2fab75f23466e6c1a4b3dccb8506be3ada7e0bafda38122d3d7315deebc7959d2e5300d9add1
diff --git a/dev-python/pyamg/files/pyamg-4.0.0-test.patch b/dev-python/pyamg/files/pyamg-4.0.0-test.patch
new file mode 100644
index 000000000000..316d0a2baad4
--- /dev/null
+++ b/dev-python/pyamg/files/pyamg-4.0.0-test.patch
@@ -0,0 +1,14 @@
+Backported from: https://github.com/pyamg/pyamg/commit/6f5e549e6105e18cfff9bf4b5f1834d081fa4510
+Author: Luke Olson
+--- a/pyamg/aggregation/tests/test_smooth.py
++++ b/pyamg/aggregation/tests/test_smooth.py
+@@ -485,6 +485,9 @@ class TestEnergyMin(TestCase):
+                 Bc = ml.levels[1].B
+                 P = ml.levels[0].P.tocsr()
+ 
++                T.eliminate_zeros()
++                P.eliminate_zeros()
++
+                 # P should preserve B in its range, wherever P
+                 # has enough nonzeros
+                 mask = ((P.indptr[1:] - P.indptr[:-1]) >= B.shape[1])
diff --git a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild b/dev-python/pyamg/pyamg-4.0.0.ebuild
index 85993b45605c..27c1aecedaa5 100644
--- a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
+++ b/dev-python/pyamg/pyamg-4.0.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
 inherit distutils-r1
 
 DESCRIPTION="Algebraic multigrid solvers in Python"
@@ -13,20 +13,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+# cannot be enabled by "distutils_enable_tests pytest"
+BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
 
-python_test() {
-	distutils_install_for_testing
-	cd "${T}" || die # need to be away source directory
-	nosetests --verbose pyamg || die
-}
+PATCHES=( "${FILESDIR}"/${P}-test.patch )
diff --git a/dev-python/pyasn1-modules-python2/pyasn1-modules-python2-0.2.8.ebuild b/dev-python/pyasn1-modules-python2/pyasn1-modules-python2-0.2.8-r1.ebuild
index 5eb161d6f70f..ecb1e55cffc7 100644
--- a/dev-python/pyasn1-modules-python2/pyasn1-modules-python2-0.2.8.ebuild
+++ b/dev-python/pyasn1-modules-python2/pyasn1-modules-python2-0.2.8-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 MY_PN=pyasn1-modules
@@ -21,7 +22,9 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp
 RDEPEND="
 	!dev-python/pyasn1-modules[python_targets_python2_7]
 	>=dev-python/pyasn1-python2-0.4.6"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
+"
 
 RESTRICT="test"
 
diff --git a/dev-python/pyasn1-python2/pyasn1-python2-0.4.8.ebuild b/dev-python/pyasn1-python2/pyasn1-python2-0.4.8-r1.ebuild
index 759211778fe4..14c292e99fa0 100644
--- a/dev-python/pyasn1-python2/pyasn1-python2-0.4.8.ebuild
+++ b/dev-python/pyasn1-python2/pyasn1-python2-0.4.8-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 MY_PN=pyasn1
 MY_P=$MY_PN-$PV
@@ -22,6 +23,7 @@ RESTRICT="test"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 RDEPEND="
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
 	!dev-python/pyasn1[python_targets_python2_7]
 "
 
diff --git a/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild b/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
index 0e3ce5f167e1..29123f50bf68 100644
--- a/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/pyatspi/pyatspi-2.36.0.ebuild b/dev-python/pyatspi/pyatspi-2.36.0.ebuild
index 8f138f26f4cf..07350d4a8119 100644
--- a/dev-python/pyatspi/pyatspi-2.36.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.36.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
-	test? ( sys-apps/dbus )
+	test? ( dev-libs/dbus-glib )
 "
 
 src_prepare() {
diff --git a/dev-python/pybind11/pybind11-2.5.0.ebuild b/dev-python/pybind11/pybind11-2.5.0.ebuild
index 2b816f5ada21..69bd1bf9f5d5 100644
--- a/dev-python/pybind11/pybind11-2.5.0.ebuild
+++ b/dev-python/pybind11/pybind11-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pybind11/pybind11-2.6.0.ebuild b/dev-python/pybind11/pybind11-2.6.0.ebuild
index eb1966b8ff8f..1dd654858f14 100644
--- a/dev-python/pybind11/pybind11-2.6.0.ebuild
+++ b/dev-python/pybind11/pybind11-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pybind11/pybind11-2.6.1.ebuild b/dev-python/pybind11/pybind11-2.6.1.ebuild
index b749722dc09a..114d36d682cd 100644
--- a/dev-python/pybind11/pybind11-2.6.1.ebuild
+++ b/dev-python/pybind11/pybind11-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pybtex-docutils/Manifest b/dev-python/pybtex-docutils/Manifest
new file mode 100644
index 000000000000..e82019885523
--- /dev/null
+++ b/dev-python/pybtex-docutils/Manifest
@@ -0,0 +1 @@
+DIST pybtex-docutils-0.2.2.tar.gz 12556 BLAKE2B fac2d669d7e71fdfae75dceae847693f5af00180b9b18a4afa4724578c1bbf66bcf9e89d29f2923d457602602508008ad10f2620ae405322ddce23dfbbd3e275 SHA512 5659d148a71cd1adb7243d06a09872f2a610dfbc3d3bf00b2b433cab0afdf5615646c195a68ee74815b5770654f584b7a994f89d5c0482f4355fbfd925de6a27
diff --git a/dev-python/pybtex-docutils/metadata.xml b/dev-python/pybtex-docutils/metadata.xml
new file mode 100644
index 000000000000..5e2f386b6234
--- /dev/null
+++ b/dev-python/pybtex-docutils/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pybtex-docutils</remote-id>
+		<remote-id type="github">mcmtroffaes/pybtex-docutils</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/pybtex-docutils/pybtex-docutils-0.2.2.ebuild b/dev-python/pybtex-docutils/pybtex-docutils-0.2.2.ebuild
new file mode 100644
index 000000000000..9d57daf366d8
--- /dev/null
+++ b/dev-python/pybtex-docutils/pybtex-docutils-0.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A docutils backend for pybtex"
+HOMEPAGE="https://github.com/mcmtroffaes/pybtex-docutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pybtex[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+
+"
+
+distutils_enable_tests nose
+distutils_enable_sphinx doc
diff --git a/dev-python/pycairo-python2/pycairo-python2-1.18.2.ebuild b/dev-python/pycairo-python2/pycairo-python2-1.18.2-r1.ebuild
index bd2a1eafa503..7dad17d7d500 100644
--- a/dev-python/pycairo-python2/pycairo-python2-1.18.2.ebuild
+++ b/dev-python/pycairo-python2/pycairo-python2-1.18.2-r1.ebuild
@@ -6,6 +6,7 @@ EAPI="7"
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 MY_PN=pycairo
@@ -22,6 +23,7 @@ RESTRICT="test"
 
 RDEPEND="
 	!dev-python/${MY_PN}[python_targets_python2_7]
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
 	>=x11-libs/cairo-1.13.1[svg]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pycairo/pycairo-1.20.0.ebuild b/dev-python/pycairo/pycairo-1.20.0.ebuild
index 7378fc72d500..84ff05e7e2a7 100644
--- a/dev-python/pycairo/pycairo-1.20.0.ebuild
+++ b/dev-python/pycairo/pycairo-1.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pycares/pycares-3.1.1.ebuild b/dev-python/pycares/pycares-3.1.1.ebuild
index 08427315d5d4..c6cf6fc4608f 100644
--- a/dev-python/pycares/pycares-3.1.1.ebuild
+++ b/dev-python/pycares/pycares-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${P/_p/-fix}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 # Tests fail with network-sandbox, since they try to resolve google.com
 RESTRICT="test"
diff --git a/dev-python/pychromecast/metadata.xml b/dev-python/pychromecast/metadata.xml
index 0050fee38336..b97c6ca674ee 100644
--- a/dev-python/pychromecast/metadata.xml
+++ b/dev-python/pychromecast/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
 	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
diff --git a/dev-python/pychromecast/pychromecast-4.1.0.ebuild b/dev-python/pychromecast/pychromecast-4.1.0.ebuild
index 68d477ab4cda..af0bc8910945 100644
--- a/dev-python/pychromecast/pychromecast-4.1.0.ebuild
+++ b/dev-python/pychromecast/pychromecast-4.1.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
-DESCRIPTION="Python module to talk to Google Chromecast."
-HOMEPAGE="https://github.com/balloob/pychromecast"
+DESCRIPTION="Python module to talk to Google Chromecast"
+HOMEPAGE="https://github.com/home-assistant-libs/pychromecast"
 SRC_URI="mirror://pypi/P/PyChromecast/PyChromecast-${PV}.tar.gz"
 S="${WORKDIR}/PyChromecast-${PV}"
 
diff --git a/dev-python/pychroot/Manifest b/dev-python/pychroot/Manifest
index 69cce8bf705f..374595c93e08 100644
--- a/dev-python/pychroot/Manifest
+++ b/dev-python/pychroot/Manifest
@@ -1 +1 @@
-DIST pychroot-0.10.2.tar.gz 23477 BLAKE2B a5145908c565479ba05583e396c669d344193dacaa70b489b152b49cc092cf5f77193324d48917271d01ce67c06ae737815d5c3098d02bc9ed5f1c25c2dca0f9 SHA512 e5ed1b94dc0779890786bb381fba86d13fbcdbc3df411cfcafc868ebb62fe94cf1248d15a20902b4df5dc4420abc0a93fccc7ddcb2f42ad7244a657b5ec99c76
+DIST pychroot-0.10.3.tar.gz 23637 BLAKE2B 9ea0d3fdbabddd2901cf263b9f29eb91a6a6eb732c8973773c69630a320d6e39f458fb4f420f099617ba4f6e43353fe36dc4576cb84bca271a8e7b4db260b36c SHA512 b4d9fab3d2ba9bd5fd9bf6bcb988a1e63ea03aef0c898baf724d51de97943cb41c0223a235f4fa9f733cf737a3089a90006ae5ecb9049d74ec8c78712a1b6e7a
diff --git a/dev-python/pychroot/pychroot-0.10.2.ebuild b/dev-python/pychroot/pychroot-0.10.3.ebuild
index 6cc06fa7b1ad..4bc1e1be66ca 100644
--- a/dev-python/pychroot/pychroot-0.10.2.ebuild
+++ b/dev-python/pychroot/pychroot-0.10.3.ebuild
@@ -24,7 +24,7 @@ RESTRICT="!test? ( test )"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND=">=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]"
+	RDEPEND=">=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]"
 fi
 
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pychroot/pychroot-9999.ebuild b/dev-python/pychroot/pychroot-9999.ebuild
index 6cc06fa7b1ad..4bc1e1be66ca 100644
--- a/dev-python/pychroot/pychroot-9999.ebuild
+++ b/dev-python/pychroot/pychroot-9999.ebuild
@@ -24,7 +24,7 @@ RESTRICT="!test? ( test )"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND=">=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]"
+	RDEPEND=">=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]"
 fi
 
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index bd07145563bc..2b0c4ea3a1b0 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1 +1,2 @@
 DIST pyclipper-1.2.0.tar.gz 53504 BLAKE2B 611a86b4173838dc0c77ad765f1ab9d08e73b147936ec60fae63308d5bb0019b40479222b80565f3d3ba5337c1a436fa63306105bb3a698592160eb8b66f3014 SHA512 2b8966a695fd7916786ab7549f8c867aad1d4879f3d20b87d7a4b6e1fff8a36871a440795548e91256ff89e574c04be4390ffbd05bab6b0bb51441c7f8acf674
+DIST pyclipper-1.2.1.tar.gz 51862 BLAKE2B be59011d44ba4364e3e0d1d789c10f76635a5bc690dad8030104fa7965cc118e3529bf6505e5c4e743a8ff21e0d24129be716cd91e09b7521baa64359de364ab SHA512 0fc411bd8fa33fc3e5a71ec149b720b5c2f2e9a5e704d5e175b5930e0e073bacfd26b68e19c00802ab68e7a8946bdfcacae858e2d6d81b87d85b3747fa4a316b
diff --git a/dev-python/pyclipper/pyclipper-1.2.1.ebuild b/dev-python/pyclipper/pyclipper-1.2.1.ebuild
new file mode 100644
index 000000000000..1a3fac3d184b
--- /dev/null
+++ b/dev-python/pyclipper/pyclipper-1.2.1.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,10} )
+inherit distutils-r1
+
+DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
+HOMEPAGE="https://github.com/fonttools/pyclipper"
+SRC_URI="https://github.com/fonttools/pyclipper/archive/${PV/_p/.post}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_p/.post}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
+}
diff --git a/dev-python/pycparser-python2/pycparser-python2-2.20.ebuild b/dev-python/pycparser-python2/pycparser-python2-2.20-r1.ebuild
index bec5f8b28c8e..f4d8bcc04708 100644
--- a/dev-python/pycparser-python2/pycparser-python2-2.20.ebuild
+++ b/dev-python/pycparser-python2/pycparser-python2-2.20-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 MY_PN=pycparser
@@ -23,7 +24,7 @@ RDEPEND="
 	!dev-python/${MY_PN}[python_targets_python2_7]
 	dev-python/ply-python2:=[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
 	# remove the original files to guarantee their regen
diff --git a/dev-python/pycparser/pycparser-2.20-r1.ebuild b/dev-python/pycparser/pycparser-2.20-r1.ebuild
index b5ec2c92e614..1d3eecb4770f 100644
--- a/dev-python/pycparser/pycparser-2.20-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 03927272fd7d..5c3a1ea1a6e4 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,2 +1 @@
-DIST pycryptodome-3.9.8.tar.gz 15633268 BLAKE2B 8c4f8d4839be0fb09556677514ee6c7f832684f20eb4e355cee87eb5b52a5c09e12712c1865ff89fb5dd6c628ca027374c7cab8a2287aafa4eecedf1095f1a12 SHA512 894e763720df284804fd686d5805980853b86773bb3097bf03d929818b9944e5a257e47414275f302966864751e50ae34dea19ad749910f1ceac31833a53ef7c
 DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B ac89bcc2bbe707cb2a9cf2496a2eb74ff5685f11017d60d67558de7ac6cad5c24c43b4074bff01e99378d7c88462e88e88f363c5329fb800e1a7872ad8a34dab SHA512 a1aad4d52256220fe3d5d7f399c2c5e7338d6eb88058da0571fe1c686d74d33ff4bc1c275d4b9373e0ff22f4ddcded75a25387e76fc65047f8612f8856c1bd4d
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch b/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch
new file mode 100644
index 000000000000..927ad65e7c47
--- /dev/null
+++ b/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch
@@ -0,0 +1,43 @@
+--- a/setup.py	2019-01-19 22:52:55.000000000 +0100
++++ b/setup.py	2019-02-15 15:29:46.960976879 +0100
+@@ -367,11 +367,13 @@ ext_modules = [
+         include_dirs=['src/'],
+         sources=["src/CAST.c"]),
+     Extension("Crypto.Cipher._raw_des",
+-        include_dirs=['src/', 'src/libtom/'],
+-        sources=["src/DES.c"]),
++        include_dirs=['src/'],
++        sources=["src/DES.c"],
++        extra_link_args=["-ltomcrypt"]),
+     Extension("Crypto.Cipher._raw_des3",
+-        include_dirs=['src/', 'src/libtom/'],
+-        sources=["src/DES3.c"]),
++        include_dirs=['src/'],
++        sources=["src/DES3.c"],
++        extra_link_args=["-ltomcrypt"]),
+     Extension("Crypto.Util._cpuid_c",
+         include_dirs=['src/'],
+         sources=['src/cpuid.c']),
+@@ -400,8 +402,9 @@ ext_modules = [
+         include_dirs=['src/'],
+         sources=["src/ARC4.c"]),
+     Extension("Crypto.Cipher._Salsa20",
+-        include_dirs=['src/', 'src/libtom/'],
+-        sources=["src/Salsa20.c"]),
++        include_dirs=['src/'],
++        sources=["src/Salsa20.c"],
++        extra_link_args=["-ltomcrypt"]),
+     Extension("Crypto.Cipher._chacha20",
+         include_dirs=['src/'],
+         sources=["src/chacha20.c"]),
+--- a/src/DES.c	2019-01-19 22:52:55.000000000 +0100
++++ b/src/DES.c	2019-02-15 15:30:27.014967034 +0100
+@@ -39,7 +39,7 @@ FAKE_INIT(raw_des3)
+ 
+ /* Include the actial DES implementation */
+ #define LTC_NO_PROTOTYPES
+-#include "libtom/tomcrypt_des.c"
++#include <tomcrypt.h>
+ 
+ struct block_state {
+     symmetric_key sk;
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.8-r1.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
index d716b7115fb8..44ebac433cfc 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.8-r1.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
@@ -9,21 +9,31 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.pycryptodome.org/
+	https://github.com/Legrandin/pycryptodome/
+	https://pypi.org/project/pycryptodome/"
+SRC_URI="
+	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND="dev-libs/gmp:0
-	virtual/python-cffi[${PYTHON_USEDEP}]
+DEPEND="
+	dev-libs/gmp:0=
+	>=dev-libs/libtomcrypt-1.18.2-r1:="
+BDEPEND="
+	virtual/python-cffi[${PYTHON_USEDEP}]"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
 	!dev-python/pycrypto"
-BDEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
+	"${FILESDIR}/pycryptodome-3.9.9-system-libtomcrypt.patch"
 )
 
 distutils_enable_tests setup.py
@@ -37,5 +47,8 @@ python_prepare_all() {
 	ln src/blowfish.c src/blowfish_eks.c || die
 	ln src/mont.c src/mont_math.c || die
 
+	# make sure we're unbundling it correctly
+	rm -r src/libtom || die
+
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
index 196de1bd4efe..db22e0f7d780 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild b/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild
index cd0d57747846..97ecf7a022a9 100644
--- a/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild
+++ b/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/gmp:0
diff --git a/dev-python/pycryptodomex/pycryptodomex-3.9.9.ebuild b/dev-python/pycryptodomex/pycryptodomex-3.9.9.ebuild
index 9561aed7f5ee..ccd0dd065674 100644
--- a/dev-python/pycryptodomex/pycryptodomex-3.9.9.ebuild
+++ b/dev-python/pycryptodomex/pycryptodomex-3.9.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pycups/pycups-1.9.73-r2.ebuild b/dev-python/pycups/pycups-1.9.73-r2.ebuild
index 3a43c78624d7..153908df6477 100644
--- a/dev-python/pycups/pycups-1.9.73-r2.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://cyberelk.net/tim/data/pycups/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="examples"
 
diff --git a/dev-python/pycurl/pycurl-7.43.0.6.ebuild b/dev-python/pycurl/pycurl-7.43.0.6.ebuild
index 463e1dc8c7c3..ed6040597523 100644
--- a/dev-python/pycurl/pycurl-7.43.0.6.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index 790ba2b09e72..8a78e9bc74a2 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,2 +1 @@
-DIST pydata-sphinx-theme-0.4.0.tar.gz 3276611 BLAKE2B fb260de2ad40f9a3b5e524ef299a5bf2ee9fbe3f36a0b0e365b53a04702f8a5644154535cfa9f1f3c1deced5de8adbbaf5671488b467d3024b9ae3f60a6f7018 SHA512 abe4924277ec41193019e80a26ccb2ce195741fdae9defc9b500ecc2a63ab9070d1eba5a3398415641ef87ccfe8d573ce6fd10eb069e0f13f09891b5b5e2f932
 DIST pydata-sphinx-theme-0.4.1.tar.gz 3279361 BLAKE2B d3538dea9444272f1cb314d8b2bd8656b5114b916f31c4cca078867b02a24c60fc91e5ac367d09335b3ce4b9c9fb44405f61ed70b19ae9fed5d8919fc68f1566 SHA512 dbca1f7bde25c20a5ffb5b37ac808d84c938e6cadb6e0a6bc2d72101993889f4f7be3bdc50488bed1945779d30ca0f131bf74b16be2df00b5fa093f8491fad39
diff --git a/dev-python/pydata-sphinx-theme/metadata.xml b/dev-python/pydata-sphinx-theme/metadata.xml
index fd779357a8dc..cdc7d4b0332a 100644
--- a/dev-python/pydata-sphinx-theme/metadata.xml
+++ b/dev-python/pydata-sphinx-theme/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pydata-sphinx-theme</remote-id>
 	</upstream>
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.0.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.0.ebuild
deleted file mode 100644
index 46056a49a3af..000000000000
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.0.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_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
-HOMEPAGE="https://github.com/pandas-dev/pydata-sphinx-theme"
-SRC_URI="https://github.com/pandas-dev/pydata-sphinx-theme/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? (
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]
-	dev-python/pytest-regressions[${PYTHON_USEDEP}]
-)"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-
-# ModuleNotFoundError: No module named 'plotly' even if dev-python/plotly is installed
-#distutils_enable_sphinx docs dev-python/commonmark dev-python/recommonmark dev-python/numpydoc dev-python/jupyter-sphinx dev-python/plotly
-distutils_enable_tests pytest
-
-python_test() {
-	PYTHONPATH="${S}"
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.1.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.1.ebuild
index 7eb3b8c3b16c..46056a49a3af 100644
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.1.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pandas-dev/pydata-sphinx-theme/archive/v${PV}.tar.gz
 
 LICENSE="BSD-with-disclosure"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="test? (
 	dev-python/beautifulsoup[${PYTHON_USEDEP}]
diff --git a/dev-python/pydecomp/pydecomp-0.3.ebuild b/dev-python/pydecomp/pydecomp-0.3.ebuild
index 046537d19831..3cafd779059e 100644
--- a/dev-python/pydecomp/pydecomp-0.3.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 	S="${WORKDIR}/pyDeComp-${PV}"
 fi
 
diff --git a/dev-python/pydecomp/pydecomp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild
index 664f15207e85..4f37fb3b5fc3 100644
--- a/dev-python/pydecomp/pydecomp-9999.ebuild
+++ b/dev-python/pydecomp/pydecomp-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	S="${WORKDIR}/pyDeComp-${PV}"
 fi
 
diff --git a/dev-python/pydiff/pydiff-0.2-r1.ebuild b/dev-python/pydiff/pydiff-0.2-r1.ebuild
index 6180a3e1e6a8..07fc47fb25b2 100644
--- a/dev-python/pydiff/pydiff-0.2-r1.ebuild
+++ b/dev-python/pydiff/pydiff-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86"
 
 python_test() {
 	"${EPYTHON}" test_pydiff.py || die "Tests failed under ${EPYTHON}"
diff --git a/dev-python/pydns/pydns-3.2.1.ebuild b/dev-python/pydns/pydns-3.2.1.ebuild
index a94740108446..9c2f8d8f42ff 100644
--- a/dev-python/pydns/pydns-3.2.1.ebuild
+++ b/dev-python/pydns/pydns-3.2.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="CNRI"
 SLOT="3"
-KEYWORDS="amd64 hppa ~ia64 ~ppc sparc x86"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc sparc x86"
 IUSE="examples"
 
 # Tests require network access
diff --git a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
index 3186a87c54b0..0f9563cb67e1 100644
--- a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pydot/pydot-1.4.1.ebuild b/dev-python/pydot/pydot-1.4.1.ebuild
index c712c70ffd35..d82dd1ddee73 100644
--- a/dev-python/pydot/pydot-1.4.1.ebuild
+++ b/dev-python/pydot/pydot-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/erocarrera/pydot/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pydotplus/metadata.xml b/dev-python/pydotplus/metadata.xml
index b86cfef00e1f..db5f8b93ddcd 100644
--- a/dev-python/pydotplus/metadata.xml
+++ b/dev-python/pydotplus/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chr@chymera.eu</email>
+		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/pydotplus/pydotplus-2.0.2.ebuild b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
index 0893482ada2c..7021fd1f9412 100644
--- a/dev-python/pydotplus/pydotplus-2.0.2.ebuild
+++ b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
@@ -14,19 +14,16 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pyparsing[${PYTHON_USEDEP}]
-	media-gfx/graphviz
-"
-DEPEND="test? ( ${RDEPEND} )"
+	media-gfx/graphviz"
 
-PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+distutils_enable_tests unittest
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
 
 python_test() {
-	pushd test > /dev/null || die
-		python pydot_unittest.py || die
-	popd > /dev/null || die
+	cd test || die
+	"${EPYTHON}" pydot_unittest.py || die
 }
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index b731483b8aaa..844438749bba 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1 +1,2 @@
 DIST pyelftools-0.26.tar.gz 792390 BLAKE2B 523e6f64205273e8362db92900aebdc05849c5a55d48f75aeae4aa0c58d6dde35ba73c660a5993b211b210fba634360befbdfa90077a140d708c71091918e306 SHA512 dd166f56654592f6a0d7a91bc41c01b9300de6d2f08b204a61ac48eb3f4b3224f89271c5fe66adc41d71a5e2bed8ddfa4ad495098df917623f7aa90c2caffeca
+DIST pyelftools-0.27.tar.gz 3328795 BLAKE2B 74e6e17c68b197d0ecdddedba81a96601003c41a9c095bc72dff7630511705d36d1bc2732005a87ad1420c99497d729c5b771eca7bf5409c0da77d7b348d9c1b SHA512 bb0a00e5500016e3d4f64be0a728e190f84b11a805f78d668b5a74716a30400e6794946f198ef4a3f3b8f64a63deb1b5a96180b09e56b7357b988b28e25fad0a
diff --git a/dev-python/pyelftools/pyelftools-0.27.ebuild b/dev-python/pyelftools/pyelftools-0.27.ebuild
new file mode 100644
index 000000000000..1bfa5221fa61
--- /dev/null
+++ b/dev-python/pyelftools/pyelftools-0.27.ebuild
@@ -0,0 +1,30 @@
+# 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,10} )
+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"
+# PyPI tarball lacks some test files
+SRC_URI="https://github.com/eliben/pyelftools/archive/v${PV}.tar.gz -> ${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/pyenchant/pyenchant-3.2.0.ebuild b/dev-python/pyenchant/pyenchant-3.2.0.ebuild
index 974bc2033c38..c766cee44d2d 100644
--- a/dev-python/pyenchant/pyenchant-3.2.0.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="app-text/enchant:*"
 BDEPEND="
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index e0889292269a..e08a898ac782 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,4 +1,2 @@
-DIST pyfakefs-4.2.1.tar.gz 192910 BLAKE2B dd1826b8fbddb9c9f272cd6fe0a286a41dbcf1bba625cfaef22ea1f17089f6acf346c3a84e56e6ad41f501329c06539bcda72cad670481a3ad770d014ad1e93d SHA512 99ee0ece46ed457dcf98c4c59ee905e58bbfe66e4fadcc3d3d9d725c2ce7b4fae25bc3cf847c85045a828beab52f315ec2ee78e6fea4b23cfe9aaddfd49f1829
-DIST pyfakefs-4.3.0.tar.gz 194821 BLAKE2B f7deca18ad019dba12ac35bac44be339fc1eef0ef609f33b2fa8974f3bd65a25fba043f0afef0e332f9a71f5014444eb7c6e890acbfcfc9c8acb780dc88140a6 SHA512 42c6e9da0f098eeb948fbe3f1f26e8fddfb35d3156543ccc2297cc0fb971a87911a94ca925d2fd12531999fd9314b615f49688a3e9a4aef19522cd08bdabe72a
-DIST pyfakefs-4.3.1.tar.gz 194638 BLAKE2B 752fb2ec88d7468ca439e7124e26b9f111f3b3971a47062b598a0d66c9fc5d8d317716ad73648de727ad6072546fd7b02f7f3a65da45998a20d5f5f3e5999bf1 SHA512 9e1521b7c051ef984329ebe9e2003f72a6f54497dcde46b3fe1b14f282ba436dc17ebd6b8e570714eb1ed8de9f484e6bc94ece0a39985a47f7668f350b5a797f
 DIST pyfakefs-4.3.2.tar.gz 194897 BLAKE2B c3b36e280cb73c4bcd2349382eb67726c19627b0c6dc392a0f38ec7f9f001e5ddbe93734de6d177c68ea1e2213c5c7d06827e3aa12af0c7cd744ba35b8d5df5c SHA512 50479d2ac7b8622ee30c4c2f09cb3d2bdfb315b4eb61eecb37f8946f038ec9048d653250a0f58dcef55b1b8347b040ecd416f61f26ecfdf7b083801114770803
+DIST pyfakefs-4.3.3.tar.gz 194498 BLAKE2B 4ad300889e8c8462f4a237c2a12a9d93cbaaff6e9e6347e667bc366abf9705023eb1838c4291488c10a51d5209810c773edcb08c58e3759ccd9f851b17ea82e1 SHA512 e4cc3603496705216c1ea1448f835a19efa5a1429f3ecd67911ab2dc76d6754af7bb25312a6b15046355af26b8b72528acf68db50960d2eaba8bb3ef80fccaa0
diff --git a/dev-python/pyfakefs/pyfakefs-4.2.1.ebuild b/dev-python/pyfakefs/pyfakefs-4.2.1.ebuild
deleted file mode 100644
index 5c82c39679e5..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.2.1.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_{6,7,8,9,10} pypy3 )
-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 arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.3.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.3.0.ebuild
deleted file mode 100644
index 7044381e625f..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.3.0.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_{6,7,8,9,10} pypy3 )
-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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild b/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
index db5f0a20e3da..ce31d9d838e0 100644
--- a/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyfakefs/pyfakefs-4.3.1.ebuild b/dev-python/pyfakefs/pyfakefs-4.3.3.ebuild
index 7044381e625f..db5f0a20e3da 100644
--- a/dev-python/pyfakefs/pyfakefs-4.3.1.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 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 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyflakes/pyflakes-2.2.0.ebuild b/dev-python/pyflakes/pyflakes-2.2.0.ebuild
index 6fa5998fc663..7875f601328b 100644
--- a/dev-python/pyflakes/pyflakes-2.2.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Should be included in the next release
 PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
diff --git a/dev-python/pyfltk/Manifest b/dev-python/pyfltk/Manifest
deleted file mode 100644
index c2ac84833869..000000000000
--- a/dev-python/pyfltk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pyFltk-1.3.3.tar.gz 946763 BLAKE2B 28798578e7a90f2c3b6d0be22241207b384643ed5269ffb4bb5940d5e8776e59ae3c2b740ba7ef61f0230e037d1b3488adf78d9af69338204df9572218ed8cab SHA512 dd4bbef8e82d455237dd085622e78e046ac522449fe63610ee5405c24d759482a89aeab07435fefb5223db78cc1f810f1eca8355afb1d0ff3e4b5e10b73bef8f
diff --git a/dev-python/pyfltk/files/fltk_wrap.patch b/dev-python/pyfltk/files/fltk_wrap.patch
deleted file mode 100644
index e0c7ba3a4133..000000000000
--- a/dev-python/pyfltk/files/fltk_wrap.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/python/fltk_wrap.cpp
-+++ b/python/fltk_wrap.cpp
-@@ -144,7 +144,9 @@
- # define _SCL_SECURE_NO_DEPRECATE
- #endif
- 
--
-+int _fl_filename_isdir_quick(const char *n)  {
-+    return 0;
-+}
- 
- /* Python.h has to appear first */
- #include <Python.h>
-
diff --git a/dev-python/pyfltk/files/ignore-func.patch b/dev-python/pyfltk/files/ignore-func.patch
deleted file mode 100644
index 4c3ff48fce54..000000000000
--- a/dev-python/pyfltk/files/ignore-func.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://sourceforge.net/p/pyfltk/code/506/
-
---- a/swig/filename.i
-+++ b/swig/filename.i
-@@ -14,6 +14,7 @@
- %ignore fl_alphasort;
- %ignore fl_casealphasort;
- %ignore fl_casenumericsort;
-+%ignore _fl_filename_isdir_quick;
- 
- %include "FL/filename.H"
- 
diff --git a/dev-python/pyfltk/metadata.xml b/dev-python/pyfltk/metadata.xml
deleted file mode 100644
index 7a869692d834..000000000000
--- a/dev-python/pyfltk/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		Python wrapper for the Fast Light Tool Kit cross-platform graphical
-		user-interface library, using SWIG.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">pyfltk</remote-id>
-		<remote-id type="pypi">pyFltk</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
deleted file mode 100644
index d4c13193067e..000000000000
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# FIXME: MakeSwig.py execution should be made work from pyfltk-1.1.5.ebuild
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="pyFltk-${PV}"
-MY_P="pyFltk-${PV}_py3"
-
-DESCRIPTION="Python interface to Fltk library"
-HOMEPAGE="https://sourceforge.net/projects/pyfltk/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> ${MY_PN}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="doc"
-
-DEPEND="
-	>=x11-libs/fltk-1.3.0:1[opengl]
-	!dev-python/pyfltk:1
-	"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_PN}
-
-PATCHES=(
-	"${FILESDIR}"/ignore-func.patch
-	"${FILESDIR}"/fltk_wrap.patch
-	)
-
-python_prepare_all() {
-	# Disable installation of documentation and tests.
-	sed -i -e '/package_data=/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( fltk/docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
index ee12f85e65d7..09ba0c4bf2ea 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index f03c9588b084..938b4edaeb9d 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,3 +1,4 @@
 DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f361e9e0296b5c7d57c5949d3434a040d028249c5b8f3c865ac3dcdbb32e6f0b223186678595a8625213ba2a17 SHA512 d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0
 DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890d2f772e3ef302f243cca67724c6012355644ba60d4cae6de72db6dd61d320177deff6ee83dd355ec4cc33e841b565f7 SHA512 4cee7599fd8a6d31ddd66bfaad3bbb67cb167c1ae339f37e83322d810fea8746e81a191c224a0eeb6cc43a64bf1730ff0886c82f1a4f642e2e656ca9a837bf9e
 DIST pygame-2.0.0.tar.gz 5522621 BLAKE2B 49773979af53595d3ff2db1a18e4bcd217e26db3ec28d6129d2a588f23a1bd5326fa79fab32c25aa796738cde0e68f5741bee58f62432e86f89cd49ee17a8f14 SHA512 3f65924d0e1d2863b84118a4e468b521a289e2cf174405c6f3ee2b2a2ed399cde7f9f310d57c4166351f84caaea02dd7408ee852dbcee7c205bb2955b6078fda
+DIST pygame-2.0.1.tar.gz 5536907 BLAKE2B b27cb9001499a00da62dac0486a72079ff4e60ca609be444b04f547cb2372090da91d2670307ce7068b964458e6ac1284402439bb7809c9735135d5e93a71d78 SHA512 1535a872c43e5f75acdfa7d325fcfa0f0f826e18602b28b228cfdbe068a382678c21568d80873f7af4f0b318e693adb38afa4d632f8294f716a47188abe5245a
diff --git a/dev-python/pygame/pygame-2.0.0.ebuild b/dev-python/pygame/pygame-2.0.0.ebuild
index 22db29776fd0..f163948ec0a2 100644
--- a/dev-python/pygame/pygame-2.0.0.ebuild
+++ b/dev-python/pygame/pygame-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="doc examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygame/pygame-2.0.0_pre10.ebuild b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
index 299aadbcd206..2110ea272e24 100644
--- a/dev-python/pygame/pygame-2.0.0_pre10.ebuild
+++ b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
 IUSE="doc examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygame/pygame-2.0.1.ebuild b/dev-python/pygame/pygame-2.0.1.ebuild
new file mode 100644
index 000000000000..42ea9436d6fe
--- /dev/null
+++ b/dev-python/pygame/pygame-2.0.1.ebuild
@@ -0,0 +1,89 @@
+# 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,10} )
+
+inherit distutils-r1
+
+MY_PV=${PV/_pre/.dev}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="https://www.pygame.org/"
+SRC_URI="
+	https://github.com/pygame/pygame/releases/download/${MY_PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples midi opengl test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freetype
+	>=media-libs/sdl2-image-1.2.2
+	>=media-libs/sdl2-mixer-1.2.4
+	>=media-libs/sdl2-ttf-2.0.6
+	>=media-libs/smpeg2-0.4.4-r1
+	midi? ( media-libs/portmidi )
+	X? ( >=media-libs/libsdl2-1.2.5[opengl?,threads,video,X] )
+	!X? ( >=media-libs/libsdl2-1.2.5[threads] )"
+DEPEND="${RDEPEND}
+	test? (
+		media-libs/sdl2-image[gif,jpeg,png]
+		media-libs/sdl2-mixer[mp3,vorbis,wav]
+	)"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig"
+# util-linux provides script
+BDEPEND="
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)"
+
+src_prepare() {
+	if ! use midi; then
+		rm test/midi_test.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py -auto || die
+
+	# Disable automagic dependency on PortMidi.
+	if ! use midi; then
+		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
+	fi
+}
+
+python_test() {
+	local -x PYTHONPATH=${BUILD_DIR}/install/lib
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=disk
+	distutils_install_for_testing --via-root
+	script -eqc "${EPYTHON} -m pygame.tests" || die
+}
+
+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
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r4.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r4.ebuild
deleted file mode 100644
index 668675c8a939..000000000000
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r4.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
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-PYSDL="${PN}-2.1.0"
-
-DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
-HOMEPAGE="https://github.com/renpy/pygame_sdl2"
-SRC_URI="https://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]"
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	' -3)
-	$(python_gen_cond_dep '
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-	' -2)
-	media-libs/libpng:0=
-	media-libs/libsdl2:=[video]
-	media-libs/sdl2-image:=[png,jpeg]
-	>=media-libs/sdl2-mixer-2.0.2:=
-	media-libs/sdl2-ttf:=
-	virtual/jpeg:0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
-
-PATCHES=( "${FILESDIR}/pygame_sdl2-6.99.12.4-mixer.patch" )
-
-# PyGame distribution for this version has some pregenerated files;
-# we need to remove them
-python_prepare_all()
-{
-	rm -r gen{,3} || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild
index 2b588e27ac77..5de074fef02d 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 PYSDL="${PN}-2.1.0"
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild
index 40d0a295f808..a12f324ffca9 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 PYSDL="${PN}-2.1.0"
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 9267f85a40e5..a2e04b6c2302 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,2 +1 @@
-DIST pygit2-1.3.0.tar.gz 243399 BLAKE2B 273d678b1681bbe969282ed10af640a59d99c421d32f6d25cf7374a6b018fb52f92337929a24bd9348085fb4f359561d21b51728ce66d73a5ee7089eef9b7b4c SHA512 297c6aef27019ca540d7ec9c26da7a5e870a7e5c2e06daa1a038023c4ab32c800b2494970e41a3d576e17e1d2c33402c3116389d9e2ebe1c2def0ba529dbde71
 DIST pygit2-1.4.0.tar.gz 244586 BLAKE2B aa4c04ff22df31270a03107498abe095e99e196711a1939fe6f15d4cae18e94d72f1964850437c5e82d897ca74e951a5b877fb41154f3790c9fb6c926c6cfe0b SHA512 b6b9d5028fd63593e6ecd869735132edeeb55c1fd97664be5d0d5dac0c25f844ce0d981782fad7f47e54555ab1f7fa5e87d1ad8a76340d81e1f908ad4ea1e35a
diff --git a/dev-python/pygit2/pygit2-1.3.0.ebuild b/dev-python/pygit2/pygit2-1.3.0.ebuild
deleted file mode 100644
index f2793e864c7a..000000000000
--- a/dev-python/pygit2/pygit2-1.3.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=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	=dev-libs/libgit2-1.0*
-	dev-python/cached-property[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	pytest -vv hack/test || die
-}
diff --git a/dev-python/pygit2/pygit2-1.4.0.ebuild b/dev-python/pygit2/pygit2-1.4.0.ebuild
index 24b0886648cd..07b790346712 100644
--- a/dev-python/pygit2/pygit2-1.4.0.ebuild
+++ b/dev-python/pygit2/pygit2-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	=dev-libs/libgit2-1.1*
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 747f365ba246..f07a08106567 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,3 +1,4 @@
 DIST pyglet-1.5.10.tar.gz 6417209 BLAKE2B 2c413c111ce3d016ca23186e92b17cb6f67bb904d90ca241eb0f95372a0a9ff8915014f31294a6609e2f35072cb963b6998d791157ede2e2bf01175edeb91582 SHA512 02b3859f2805f703997d7799e324e7debe9375f6c0df211ceff2f750aa7dbbad61b6ece55fbfec111e4f47f0ee6a71881fd73a47bef794a437615ecb42d0f411
 DIST pyglet-1.5.11.tar.gz 6414606 BLAKE2B bc39a611b10a6397f31ce402d0f4be17093e5c37fdbd6bb419156cc00929fd951cfc8e309a0c2a557afba9c567f203956c6ac7fdd1c677d4a5c199c1633e86e4 SHA512 4121fcd45c8d7f500e2bcbaf85e30e39d44b9de165a818455c006964787ad9dcdbb1a670ca72e149a3574ec7c18f113166190acca9a2dec4bef4b5fde856e129
-DIST pyglet-1.5.7.tar.gz 6367378 BLAKE2B 68d4aa673a7463f7da0f4ccb7f413b602f32ecc423438326fc4262a4449fe22dff25a513074611ce2c77c130dfe9cc29e44e54a95169875208731f70803f1a45 SHA512 2c2a06636b1db788241028d1ef2290a774b98721ccc92ceed2b2895bcee81d4aa72b2111896091b54531936513772505b0d43003e412735d606130ed4b08f8c9
+DIST pyglet-1.5.13.tar.gz 6415241 BLAKE2B 784e387072ea7260c5fc3f0c78869e62d42a68b7ca1208318af3dad77d64d6ca8d12b03c040ce1dca8430cbab31f218c2a1782ccfcaaf3637203e1e9638488b8 SHA512 05863b187653cb82d7727d7d33a65d9907030ac97d926d6dac01301817159c31d4a301570f41ad8e2af9e0509f67008b876e7f3460f31c6d58d5548179cba4ea
+DIST pyglet-1.5.14.tar.gz 6414252 BLAKE2B 3e30f4dc80fffbf93a3cc7fa744ba224868dea1d9f1998446a2341fd3ed1c058493c486979aedb8415abe5c8a3f53dc634494f849bf6f3ab6f9ceb0e35cfecd9 SHA512 9b34e80e1b28a2ef0504339b67bdc31e568bf3a3352a9a1d78d3cf87ba84e86e23aec6e524abbca26865082ec2f9da8d7633ba83206f9996d87002faa1269044
diff --git a/dev-python/pyglet/pyglet-1.5.10.ebuild b/dev-python/pyglet/pyglet-1.5.10.ebuild
index ed04cc5b8864..0eb5fda7d3d8 100644
--- a/dev-python/pyglet/pyglet-1.5.10.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${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="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pyglet/pyglet-1.5.11.ebuild b/dev-python/pyglet/pyglet-1.5.11.ebuild
index ed04cc5b8864..abc22dd37d48 100644
--- a/dev-python/pyglet/pyglet-1.5.11.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${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="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pyglet/pyglet-1.5.7-r1.ebuild b/dev-python/pyglet/pyglet-1.5.13.ebuild
index 38a9fc4914e3..0d1837798ecf 100644
--- a/dev-python/pyglet/pyglet-1.5.7-r1.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.13.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1 virtualx xdg-utils
 
 DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="https://www.pyglet.org/"
+HOMEPAGE="https://pyglet.org/"
 SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pyglet/pyglet-1.5.14.ebuild b/dev-python/pyglet/pyglet-1.5.14.ebuild
new file mode 100644
index 000000000000..0d1837798ecf
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.5.14.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="https://pyglet.org/"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	pytest -vv tests/unit || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	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/pygments/Manifest b/dev-python/pygments/Manifest
index d39a8757bbbb..9fad8f2c4ea2 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,2 +1,2 @@
-DIST Pygments-2.7.2.tar.gz 2350457 BLAKE2B 4a67cd34cc41402e485e2bbb827a00f5184c00d26ca6f341c190457134598bd1cccc87a995eee85eb007a98b6d7b9e3e33585d0c1c0bba4289bedb36d22f351d SHA512 cd667e2cb33261060c316e3b92934dae735e2aa6c427b77852d4d18f28941cb369da05adb8540dd9fe3262b3e30e2fd6456e345bccc848be9dbdba20e97ef157
 DIST Pygments-2.7.3.tar.gz 2355381 BLAKE2B a7ae0ce7fefd8e2ec707ca8cf2d01d1b746d233e36c78ec51055f750e1a508240b706be50e5f1260f93fe19e15dc27d8de8c614260783713dc61c3c683b86c57 SHA512 fe58ce0beb3d2fd88b374d7864e93dba41e4e2ad6dca570e284fd76615c5bb4e78459a4b8c4dd5f61603d4bccd5705cebafd7274369d158af149e838ec63f7eb
+DIST Pygments-2.7.4.tar.gz 2325473 BLAKE2B 48e45f8d58e4d06be71cacbfbcbee57c69fe0b4c344c1dde2054912f1b74c67db19c24de2661acab7026ea78420ff90e4596e1a89b783ce79ebea12c8d3a7a60 SHA512 84fb2e0c52e4683d52524ee1d70c11a9ff6cc0b21fe6aa3e1a6c4fac393f87267756b1c04b7c2555799e387b2e9ca7d2e7703ddc1690a642aa263ed27510e030
diff --git a/dev-python/pygments/pygments-2.7.3.ebuild b/dev-python/pygments/pygments-2.7.3.ebuild
index 2dfa7010513f..65683f4fd3fc 100644
--- a/dev-python/pygments/pygments-2.7.3.ebuild
+++ b/dev-python/pygments/pygments-2.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pygments/pygments-2.7.2.ebuild b/dev-python/pygments/pygments-2.7.4.ebuild
index c1b58db45e36..d575d8cdbd15 100644
--- a/dev-python/pygments/pygments-2.7.2.ebuild
+++ b/dev-python/pygments/pygments-2.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	test? (
@@ -29,6 +29,16 @@ BDEPEND="
 distutils_enable_sphinx doc
 distutils_enable_tests pytest
 
+python_test() {
+	local deselect=()
+	# there is a known bug in regex engine of pypy3.7
+	[[ ${EPYTHON} == pypy3 && $(pypy3 --version) == "Python 3.7"* ]] &&
+		deselect+=( tests/test_crystal.py::test_macro )
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 	newbashcomp external/pygments.bashcomp pygmentize
diff --git a/dev-python/pygobject/pygobject-3.34.0-r1.ebuild b/dev-python/pygobject/pygobject-3.34.0-r1.ebuild
index 3df7f64f2f6d..19735084febd 100644
--- a/dev-python/pygobject/pygobject-3.34.0-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.34.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygobject/pygobject-3.36.1-r1.ebuild b/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
index 4592a061f791..828abb5e5a37 100644
--- a/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygobject/pygobject-3.38.0.ebuild b/dev-python/pygobject/pygobject-3.38.0.ebuild
index 75389ee9f7e0..759f937c2b9a 100644
--- a/dev-python/pygobject/pygobject-3.38.0.ebuild
+++ b/dev-python/pygobject/pygobject-3.38.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygraphviz/pygraphviz-1.6.ebuild b/dev-python/pygraphviz/pygraphviz-1.6.ebuild
index f88b4f1f92c3..2c06261d5068 100644
--- a/dev-python/pygraphviz/pygraphviz-1.6.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
 RDEPEND="media-gfx/graphviz"
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index fc6ae068b83b..4ae4f7fa593e 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,2 +1,3 @@
 DIST PyGreSQL-5.2.1.tar.gz 267750 BLAKE2B 6c0d4bcfe4f01bf3214efffa1be274b4a92b5e173094e1afe217aae9a44f88d023b43a2de9d4977fb8ce28d25718cf1cd5d123e8ffc2588f2539b6c03277ec55 SHA512 b304de447c239e4737571b38f0e0761448bd4e313f5b28708aced12cf190f323b85f80d3d87e054b62733add770c7bcd33be644a4f17a96ecc0cf4ab3dba85f3
+DIST PyGreSQL-5.2.2.tar.gz 268818 BLAKE2B 4b74c5496f63208164efa10e70222b63512f3afb928bdc612f9874556ee2084b42a80ba05e9ebc6951c68c1c8a70c71320396aabb20b9d5c00d5edd46e287f3f SHA512 a88af2590a515ece19b7f64796e241c6e7b53c8aef90c6e2ae064298a4c71d44695dcf43e0e84595a704c4fdafb9abe35e1779492d3a9ad3708759215cb188a1
 DIST PyGreSQL-5.2.tar.gz 267557 BLAKE2B 92c2c0810a9b763fc2e9fec2e920ca1e21da4eb4ede5f2e20f66fd385ccc623fd9fe74075c6b995c6ea6348df76dcd723c8e4b6d83afdb53c978c02cc5220e49 SHA512 ce1cd29c714ab863dbdc7dde920f8938b115535ae3a0b54c770d7648f05011a716d604eec2d73c321fe2a408e64bcd9208c204856e5ddb0e0675ef7c076e4da7
diff --git a/dev-python/pygresql/pygresql-5.2.1.ebuild b/dev-python/pygresql/pygresql-5.2.1.ebuild
index 9929bd7c5d02..362f7a8994ee 100644
--- a/dev-python/pygresql/pygresql-5.2.1.ebuild
+++ b/dev-python/pygresql/pygresql-5.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ~sparc ~x86"
 
 DEPEND="${POSTGRES_DEP}"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/pygresql/pygresql-5.2.2.ebuild b/dev-python/pygresql/pygresql-5.2.2.ebuild
new file mode 100644
index 000000000000..13080931bd52
--- /dev/null
+++ b/dev-python/pygresql/pygresql-5.2.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 postgres
+
+MY_P="PyGreSQL-${PV}"
+
+DESCRIPTION="A Python interface for the PostgreSQL database"
+HOMEPAGE="https://pygresql.org/"
+SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="${POSTGRES_DEP}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${PN}-5.2-CFLAGS.patch )
+
+python_install_all() {
+	local DOCS=( docs/*.rst docs/community/* docs/contents/tutorial.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index fd35c16a42c2..6880958cedc0 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1 +1,2 @@
 DIST pyilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
+DIST pyilmbase-2.5.3.tar.gz 27534825 BLAKE2B 4647b4aac074b10c0d1fb35ddb6b5acefca81c0f2debde04987b5df4e290b14b6406fc922949449aaeea7cf4be371a25c93f8fcb9f67c63d65276340bd586a21 SHA512 6da03193d4fea1e97e35008f59304ab408c521ead8495ba411cde5c172cf953be97999971f57398b813d14f1af1d722539a6b74d5ee54b9e74769ea8258d36ba
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.3.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.3.ebuild
new file mode 100644
index 000000000000..d993989e6322
--- /dev/null
+++ b/dev-python/pyilmbase/pyilmbase-2.5.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit cmake python-single-r1
+
+DESCRIPTION="IlmBase Python bindings"
+HOMEPAGE="https://www.openexr.com"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/25"
+KEYWORDS="~amd64 ~x86"
+IUSE="exceptions +numpy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	~media-libs/ilmbase-${PV}:=
+	sys-libs/zlib
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}]
+		numpy? ( >=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-admin/chrpath
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/openexr-${PV}/PyIlmBase"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch
+)
+
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
+		-DPYILMBASE_INSTALL_PKG_CONFIG=ON
+		-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DPython3_INCLUDE_DIR=$(python_get_includedir)
+		-DPython3_LIBRARY=$(python_get_library_path)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use numpy; then
+		python_domodule "${BUILD_DIR}/${EPYTHON/./_}/imathnumpy.so"
+		chmod +x "${D}/$(python_get_sitedir)/imathnumpy.so" || die
+		chrpath -d "${D}/$(python_get_sitedir)/imathnumpy.so" || die
+	fi
+}
diff --git a/dev-python/pyinotify-python2/pyinotify-python2-0.9.6.ebuild b/dev-python/pyinotify-python2/pyinotify-python2-0.9.6-r1.ebuild
index 8fadb25672ff..a4074b4383c4 100644
--- a/dev-python/pyinotify-python2/pyinotify-python2-0.9.6.ebuild
+++ b/dev-python/pyinotify-python2/pyinotify-python2-0.9.6-r1.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 MY_PN=pyinotify
@@ -26,6 +27,7 @@ RESTRICT="test"
 
 RDEPEND="
 	!dev-python/${MY_PN}[python_targets_python2_7]
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
 "
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index 83d65a7066a8..f6338047ad6a 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1 +1,2 @@
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
+DIST PyJWT-2.0.0.tar.gz 56981 BLAKE2B e093bf23beb86a287e494018aed6bd6870d5923697b6502e4269f0b991b28c4ea6a53261b88789b0786b59e03b3d4eb763006becf0666921a81d0528c7677af5 SHA512 1831c93f100cd481e2ea80e23ff9f5114806cc493efc1c42ec6ff3ecc07e716d9ba2557b0b66fd8413946d166eebc1a44c453ec5407dfeef0529d222c9187e45
diff --git a/dev-python/pyjwt/metadata.xml b/dev-python/pyjwt/metadata.xml
index 58a89fcf955e..b79fb958d331 100644
--- a/dev-python/pyjwt/metadata.xml
+++ b/dev-python/pyjwt/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">PyJWT</remote-id>
-    <remote-id type="github">progrium/pyjwt</remote-id>
+    <remote-id type="github">jpadilla/pyjwt</remote-id>
     <remote-id type="cpe">cpe:/a:pyjwt_project:pyjwt</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
diff --git a/dev-python/pyjwt/pyjwt-2.0.0.ebuild b/dev-python/pyjwt/pyjwt-2.0.0.ebuild
new file mode 100644
index 000000000000..a6d2a4170fbf
--- /dev/null
+++ b/dev-python/pyjwt/pyjwt-2.0.0.ebuild
@@ -0,0 +1,41 @@
+# 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,10} )
+
+inherit distutils-r1 optfeature
+
+MY_PN="PyJWT"
+DESCRIPTION="JSON Web Token implementation in Python"
+HOMEPAGE="https://github.com/jpadilla/pyjwt/ https://pypi.org/project/PyJWT/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=""
+DEPEND="
+	test? (
+		>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	find . -name '__pycache__' -prune -exec rm -rf {} + || die
+	find . -name '*.pyc' -delete || die
+
+	# enables coverage, we don't need that
+	rm setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	elog "Available optional features:"
+	optfeature "cryptography" dev-python/cryptography
+}
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index 9e987e39807e..4269f7c5c3a8 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1 +1,2 @@
 DIST PyKerberos-1.3.0.tar.gz 41033 BLAKE2B 5805df2c258a75321dab5fe84fcbf1de706cb7c14a710c914ae4918dd39f79036a4f4033a068982778f73d9f00a4ca45b80e9cfc59c6a246a236f3c6931bacc5 SHA512 ed2644a236993d9737af43be951d57207fc787a74e82f343b265461b456923763610f1ce1b46d7d56f22d6452be1418b98707b8529b22fd8abf299143e52cf69
+DIST PyKerberos-1.3.1.tar.gz 41954 BLAKE2B b95a3473c5803ebcb461db7f2589caa03e92f4cb3ba3a4890a31db99b687aa4c77ae4e58f09ae2339a1fd8acf6fe9ab5797e3b7178dfeb2ee7a95bb851fff402 SHA512 dcadc5c3b095d8bba947a745ac84cc558d7eebad139a0e86260891966786506a7a62600fde93fa14683971e436da8cc5cd3795817b20ba45ce7e39f8c05deb53
diff --git a/dev-python/pykerberos/metadata.xml b/dev-python/pykerberos/metadata.xml
index 2ff8f659ab9a..6dcc32e01561 100644
--- a/dev-python/pykerberos/metadata.xml
+++ b/dev-python/pykerberos/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pykerberos/pykerberos-1.3.0.ebuild b/dev-python/pykerberos/pykerberos-1.3.1.ebuild
index 90bcaf1ed704..fa152b9dc9c6 100644
--- a/dev-python/pykerberos/pykerberos-1.3.0.ebuild
+++ b/dev-python/pykerberos/pykerberos-1.3.1.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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,9,10} )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 MY_P=PyKerberos-${PV}
 DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
 HOMEPAGE="
-	https://trac.calendarserver.org/wiki/PyKerberos
+	https://www.calendarserver.org/PyKerberos.html
 	https://github.com/apple/ccs-pykerberos/
 	https://pypi.org/project/kerberos/"
 SRC_URI="
@@ -19,7 +18,7 @@ S=${WORKDIR}/ccs-pykerberos-${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 # test environment is non-trivial to set up, so just use docker
 # (see python_test below)
 # also for alpha/beta Python releases support:
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index feb43bfc373d..80b7b12f0f9b 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1 +1,2 @@
 DIST pykwalify-1.7.0.tar.gz 69402 BLAKE2B ad2ecafad8457509a5517917cd3bbb078a244a9ef96e5560efc4f6b0c4a3939df7f20a9e3e72e43be97edb8af6315d49e2c2f3248aaf17d3c4f0962f60132185 SHA512 d0db48814712dc26eeac8f00ee0751a006c8b00521c9829e3c1a4ecedd6083194e9e28da1ed3c13eaff30d9b5c3dd1dbb499ba8864251400e34c23911110d848
+DIST pykwalify-1.8.0.tar.gz 62462 BLAKE2B 1593f5e3e15188929574ece60bf6818438258bf024d105ae26323a97a202ac69001a15ca6daaa430970af3659c49da745bcf1f77c23ac72bed2ddca14440d943 SHA512 c77d3072995bb3f61336e725227eeece1dafe2182513e5f67eedeeca3437825b53ac691a991055aad8298db252e2012bc9a61c23d766335fcfbb10a3b587b45d
diff --git a/dev-python/pykwalify/pykwalify-1.8.0.ebuild b/dev-python/pykwalify/pykwalify-1.8.0.ebuild
new file mode 100644
index 000000000000..9fa8f3051938
--- /dev/null
+++ b/dev-python/pykwalify/pykwalify-1.8.0.ebuild
@@ -0,0 +1,34 @@
+# 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,9,10} )
+
+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"
+
+RDEPEND="
+	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-S.patch
+)
diff --git a/dev-python/pylama/pylama-7.7.1-r1.ebuild b/dev-python/pylama/pylama-7.7.1-r1.ebuild
index 888dff5c06d2..a1e4d51cc4d8 100644
--- a/dev-python/pylama/pylama-7.7.1-r1.ebuild
+++ b/dev-python/pylama/pylama-7.7.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 14990f7926ab..aae739022cda 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1 +1,2 @@
 DIST pylast-4.0.0.tar.gz 40044 BLAKE2B 89402027494d608bffc4738857d8a7728175cf29a68af259aec1d6ab3755c5e02268bbacac2ff9bd8d8c6490b86ae200aeed59f34c764a4c2f90ea59cb732070 SHA512 093845c718269ed5a0b5223182e60192a71e2fed9270fec453b96b0b2a5488a0c5a8f6386edb42ed183b97cb7ea00397b4491ff72cbf72f9e7d42dc90fae66e7
+DIST pylast-4.1.0.tar.gz 39592 BLAKE2B ff1f9f025701ebf741e53d96c2ba0c34d7a165d1c248973874484ed0c2e5e24693631f31de516fb4a58ea14014cb38c60fe04b9d116128a6a259346f16085dc2 SHA512 90be1cafb9252c2c19db9b179350269dc8eec82545487394d671d411e4fc2ca10fcd85259874f72c39674474c75274446cd8c64cd5f2274ef98ebf5ba7fbb351
diff --git a/dev-python/pylast/pylast-4.0.0.ebuild b/dev-python/pylast/pylast-4.0.0.ebuild
index a3ba276e8f6d..ebf97542e61e 100644
--- a/dev-python/pylast/pylast-4.0.0.ebuild
+++ b/dev-python/pylast/pylast-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pylast/pylast-4.1.0.ebuild b/dev-python/pylast/pylast-4.1.0.ebuild
new file mode 100644
index 000000000000..a0cad075e74a
--- /dev/null
+++ b/dev-python/pylast/pylast-4.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} 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/pylatex/Manifest b/dev-python/pylatex/Manifest
index 772b2cf8d0ad..a532a7052bb2 100644
--- a/dev-python/pylatex/Manifest
+++ b/dev-python/pylatex/Manifest
@@ -1,2 +1 @@
-DIST pylatex-1.4.0.tar.gz 301148 BLAKE2B 4d1fa6add43556b7b2c1ff13b3bc2130d06018499197c3d1f40c9180f4346e774d69c2a356d5eab6c8686957ebafac71a78506553cf7cd3cd57d03c0e0ffffd1 SHA512 0d9ab3e733c50b5a4dd7a6758193645c5532c9153972bbed244e3f7e2d6a946bd36af428197f9cdd1a3256f4cc0db5dc78248973f9b330684ce8651c4a59ad91
 DIST pylatex-1.4.1.tar.gz 301482 BLAKE2B c68c8bbf70c5099b3c3146922afe94dcf4f90bfc8644fa165ee27835f4a24642645f9849f2f9fd69656dc07dcc4807869275aacf33a1e5b9c59e539801f8e821 SHA512 55a5734e4d239cef4bcaafa0ba64eea013ba3e86d137de5a5f8311d70c949d783e2e7aad24d39d16a6febbe4bddc34e47248068e1328fe3f95f39a7c7019a3a9
diff --git a/dev-python/pylatex/metadata.xml b/dev-python/pylatex/metadata.xml
index 9f55e33da2e9..05a9aa088701 100644
--- a/dev-python/pylatex/metadata.xml
+++ b/dev-python/pylatex/metadata.xml
@@ -10,6 +10,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 	PyLaTeX is a Python library for creating and compiling LaTeX 
 	files or snippets. The goal of this library is being an easy, 
@@ -17,7 +18,7 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">JelteF/PyLaTeX</remote-id>
-		<remote-id type="pypi">pylatex</remote-id>
+		<remote-id type="pypi">PyLaTeX</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/pylatex/pylatex-1.4.0.ebuild b/dev-python/pylatex/pylatex-1.4.0.ebuild
deleted file mode 100644
index eb62d2298bbe..000000000000
--- a/dev-python/pylatex/pylatex-1.4.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="PyLaTeX"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A Python library for creating LaTeX files and snippets"
-HOMEPAGE="https://github.com/JelteF/PyLaTeX"
-SRC_URI="https://github.com/JelteF/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/ordered-set[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-BDEPEND+="
-	test? (
-		dev-python/quantities[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		app-text/texlive
-		dev-texlive/texlive-latexextra
-	)"
-
-python_install_all() {
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/"${PF}"/examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	optfeature "compiling generated files" "app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience"
-	optfeature "matplotlib support" dev-python/matplotlib
-	optfeature "numpy support" dev-python/numpy
-	optfeature "quantities support" dev-python/quantities
-}
diff --git a/dev-python/pylatex/pylatex-1.4.1.ebuild b/dev-python/pylatex/pylatex-1.4.1.ebuild
index 45e3ec70be7a..eb62d2298bbe 100644
--- a/dev-python/pylatex/pylatex-1.4.1.ebuild
+++ b/dev-python/pylatex/pylatex-1.4.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pylev/Manifest b/dev-python/pylev/Manifest
new file mode 100644
index 000000000000..f84c24144c13
--- /dev/null
+++ b/dev-python/pylev/Manifest
@@ -0,0 +1 @@
+DIST pylev-1.2.0.tar.gz 3048 BLAKE2B 3bb8c18350667cd6405ae87afb0bce5c7aa987bb318f6ede0220b268facc2bb06f0c0daedb8cfcc9e7a64f65ac32d75b80e9c2718214925fe9965082f434f47a SHA512 848bda63a3bb5f686944ec1396ad916fe18546fd681a106b7b9641231bed540db6ad9f88f56bbcceb71cedd2c2d7c567295071b1de81f3d10cf115b6459bc793
diff --git a/dev-python/pylev/metadata.xml b/dev-python/pylev/metadata.xml
new file mode 100644
index 000000000000..65c76aa0b15b
--- /dev/null
+++ b/dev-python/pylev/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jakov.smolic@sartura.hr</email>
+    <name>Jakov Smolic</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">toastdriven/pylev</remote-id>
+    <remote-id type="pypi">pylev</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/pylev/pylev-1.2.0.ebuild b/dev-python/pylev/pylev-1.2.0.ebuild
new file mode 100644
index 000000000000..3893f2a50136
--- /dev/null
+++ b/dev-python/pylev/pylev-1.2.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python Levenshtein implementation"
+HOMEPAGE="https://github.com/toastdriven/pylev"
+SRC_URI="https://github.com/toastdriven/pylev/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/pylibacl/pylibacl-0.6.0.ebuild b/dev-python/pylibacl/pylibacl-0.6.0.ebuild
index e157031b4011..ad212fd2b61e 100644
--- a/dev-python/pylibacl/pylibacl-0.6.0.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 RDEPEND="sys-apps/acl"
 DEPEND=${RDEPEND}
diff --git a/dev-python/pyls-black/pyls-black-0.4.6.ebuild b/dev-python/pyls-black/pyls-black-0.4.6.ebuild
index 8d1e7fe03975..e5fd0aa0872e 100644
--- a/dev-python/pyls-black/pyls-black-0.4.6.ebuild
+++ b/dev-python/pyls-black/pyls-black-0.4.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rupert/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/python-language-server[${PYTHON_USEDEP}]
diff --git a/dev-python/pyls-spyder/Manifest b/dev-python/pyls-spyder/Manifest
index c3c63c5cc188..8c1e954a750a 100644
--- a/dev-python/pyls-spyder/Manifest
+++ b/dev-python/pyls-spyder/Manifest
@@ -1 +1,2 @@
 DIST pyls-spyder-0.1.1-gh.tar.gz 7113 BLAKE2B c504c5393527c13d06de579b3e46938dc52012902229e6859e56c3358990f72861682b7a7166658d874b501f9a797db62296d6f5ef30b25e43df73116091d9b6 SHA512 dabc2e3047b97502daaa5f939e75cf6533284bd89c33b29cbb881a3ddafd5b273ff0915645120515740e07dfb4f22c12d47db699b4744599d5edf87e41abe051
+DIST pyls-spyder-0.3.0-gh.tar.gz 8545 BLAKE2B fe2ec3ca6a4440bb9112970550a096389a0969eea9f0cdd631110c19358ac387a97902cc21ee61c8961ef2ee020689c30f7c86f6448bbb40258d730b3cf79cbe SHA512 94ce684d8c7fdb8ece003c1965a001bd745a38086f382e0185f6750edb3103998165a5e2554f065d6364409e5438272e5c256b7b756b971f61f1dd5cbcf3d503
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild
index ff6bd97d612f..0731b22fd5fb 100644
--- a/dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild
+++ b/dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/python-language-server[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/mock )"
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.3.0.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.3.0.ebuild
new file mode 100644
index 000000000000..41375e0abec0
--- /dev/null
+++ b/dev-python/pyls-spyder/pyls-spyder-0.3.0.ebuild
@@ -0,0 +1,22 @@
+# 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,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Spyder extensions for the python language server"
+HOMEPAGE="https://github.com/spyder-ide/pyls-spyder
+	https://pypi.org/project/pyls-spyder/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/mock )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pymetar/Manifest b/dev-python/pymetar/Manifest
index a3d062f23dac..3620b5898697 100644
--- a/dev-python/pymetar/Manifest
+++ b/dev-python/pymetar/Manifest
@@ -1 +1,2 @@
 DIST pymetar-1.1.tar.gz 3162533 BLAKE2B 43cc79a0c8b27f7146a0f89d4271830ace0bd25790e8df006c19205419eabec88b90645d473019951b21952ee67df25261f6eea8c2d58de95e13186ab4bce214 SHA512 3e830065d3201373695c381f45969e7b532d69de8218cb32e107ed72235cd7cff8051e129c6ae4761154ed9d3fca81c530938520d6a54e7bf467cf28ebf9de02
+DIST pymetar-1.2.tar.gz 3163447 BLAKE2B be3e06efa007db46bd90e944ce60d24389f6b8685fcbb66803aca9b46b62cbb23b27e4ef7b2dc47080b6e6c9366acd3ecf13d02ef47ca50705a7631006482002 SHA512 4f19e99f56497b59ca31620a41beb7fd896b4503ed3edd34bafc8e9158895a238cc721e4161c2940abb49b34b1a7cbeb3d97952c4b19361d74a8b3ca56ea2fe7
diff --git a/dev-python/pymetar/pymetar-1.2.ebuild b/dev-python/pymetar/pymetar-1.2.ebuild
new file mode 100644
index 000000000000..2536eb12f4a5
--- /dev/null
+++ b/dev-python/pymetar/pymetar-1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Downloads and decodes to the weather report for a given station ID"
+HOMEPAGE="https://www.schwarzvogel.de/software-pymetar.shtml"
+SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/pymilter-python2/pymilter-python2-0.9.3.ebuild b/dev-python/pymilter-python2/pymilter-python2-0.9.3-r1.ebuild
index e6aeb3f065ed..3a9b932d205c 100644
--- a/dev-python/pymilter-python2/pymilter-python2-0.9.3.ebuild
+++ b/dev-python/pymilter-python2/pymilter-python2-0.9.3-r1.ebuild
@@ -9,6 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 MY_PN=pymilter
 MY_P=$MY_PN-$PV
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 SRC_URI="http://downloads.sourceforge.net/project/${MY_PN}/${MY_PN}/${MY_P}/${MY_P}.tar.gz"
@@ -22,7 +23,9 @@ IUSE=""
 DEPEND="
 	!dev-python/pymilter[python_targets_python2_7]
 	mail-filter/libmilter"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
+"
 
 RESTRICT="test"
 
diff --git a/dev-python/pymongo/pymongo-3.11.1.ebuild b/dev-python/pymongo/pymongo-3.11.1.ebuild
index 5e5d762454fe..b7e58d943b73 100644
--- a/dev-python/pymongo/pymongo-3.11.1.ebuild
+++ b/dev-python/pymongo/pymongo-3.11.1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa x86"
 IUSE="doc kerberos test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pymongo/pymongo-3.11.2.ebuild b/dev-python/pymongo/pymongo-3.11.2.ebuild
index 5e5d762454fe..48922d43413c 100644
--- a/dev-python/pymongo/pymongo-3.11.2.ebuild
+++ b/dev-python/pymongo/pymongo-3.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~x86"
 IUSE="doc kerberos test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pympler/Manifest b/dev-python/pympler/Manifest
deleted file mode 100644
index d392bb939e94..000000000000
--- a/dev-python/pympler/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 749282dba376..000000000000
--- a/dev-python/pympler/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>
-Pympler is a development tool to measure, monitor and analyze the memory 
-behavior of Python objects in a running Python application. By pympling a 
-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>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pympler/pympler-0.6.ebuild b/dev-python/pympler/pympler-0.6.ebuild
deleted file mode 100644
index 5b5079944a9d..000000000000
--- a/dev-python/pympler/pympler-0.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-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/pymysql/Manifest b/dev-python/pymysql/Manifest
index 8ff259cd6036..b4ede1718944 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1 +1,4 @@
 DIST pymysql-0.10.1.tar.gz 86441 BLAKE2B 8e33fbba0544dad68c3eeb5bd538c4bce121222b4660ad06c3c0224b5db6a6c9f45d6697a98d5f0ba20429afa204d46c9ce57a4d9696dbc2a35649c6253a645b SHA512 edc702c54a33350f75648765c60d4cf455449e88818948b018585d557bea280e626d23b1279a410765f2de8e35b3c22ea5c8e0ef3dc72588b674c93a2124a224
+DIST pymysql-1.0.0.tar.gz 85033 BLAKE2B 792b472c2a230e823cca9deed5adc03a004e34b09594d998c1df332769b93dde3f0b84a11f1b1ac83b6be34fe661194d3c780d6a5bb0facf193d2f46a807a7b8 SHA512 52c4ad45f31725bcbb313d4d1bea52bb52c82ad9573a58dd8cca14e844ff9d7e3831debb3bd08d00a07cc32625b15692138947ccd9ad3bed7f869a7bd69357b3
+DIST pymysql-1.0.1.tar.gz 84902 BLAKE2B b6a84f288c016849897d05ce97b87e3d58dc7b08acc8f66df16142d645f70a990c8a0acae9f57ff9f00f5cb58ff77e72c7f2d7ccf76af1c12e694d54b0daa080 SHA512 0c8ca8e3ee3fd1515621875117884120d33e18b36c90b71a6923aa01f482423a47c55ea333169c77e3cceaa2577805f2ebe387acf7f80dc525f605f3b4328906
+DIST pymysql-1.0.2.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638
diff --git a/dev-python/pymysql/pymysql-1.0.0.ebuild b/dev-python/pymysql/pymysql-1.0.0.ebuild
new file mode 100644
index 000000000000..0eb0bc22cbeb
--- /dev/null
+++ b/dev-python/pymysql/pymysql-1.0.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="PyMySQL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pure-Python MySQL Driver"
+HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# TODO: support other mysql variants
+BDEPEND="
+	test? (
+		dev-db/mariadb[server]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Auth tests don't support socket auth
+	find tests/ -name '*_auth.py' -delete || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	if [[ -z "${USER}" ]] ; then
+		# Tests require system user
+		local -x USER="$(whoami)"
+		einfo "USER set to '${USER}'"
+	fi
+
+	local PIDFILE="${T}/mysqld.pid"
+	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
+		einfo "Killing already running mysqld process ..."
+		pkill -F "${PIDFILE}"
+	fi
+
+	if [[ -d "${T}/mysql" ]] ; then
+		einfo "Removing already existing mysqld data dir ..."
+		rm -rf "${T}/mysql" || die
+	fi
+
+	einfo "Creating mysql test instance ..."
+	mkdir -p "${T}"/mysql || die
+	"${BROOT}"/usr/share/mariadb/scripts/mysql_install_db \
+		--no-defaults \
+		--auth-root-authentication-method=normal \
+		--basedir="${BROOT}/usr" \
+		--datadir="${T}"/mysql 1>"${T}"/mysqld_install.log \
+		|| die
+
+	einfo "Starting mysql test instance ..."
+	# TODO: random port
+	mysqld \
+		--no-defaults \
+		--character-set-server=utf8 \
+		--bind-address=127.0.0.1 \
+		--port=43306 \
+		--pid-file="${T}"/mysqld.pid \
+		--socket="${T}"/mysqld.sock \
+		--datadir="${T}"/mysql 1>"${T}"/mysqld.log 2>&1 &
+
+	# wait for it to start
+	local i
+	for (( i = 0; i < 10; i++)); do
+		[[ -S ${T}/mysqld.sock ]] && break
+		sleep 1
+	done
+	[[ -S ${T}/mysqld.sock ]] || die "mysqld failed to start"
+
+	einfo "Configuring test mysql instance ..."
+
+	# create test user for auth tests
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e '
+		INSTALL SONAME "auth_ed25519";
+		CREATE FUNCTION ed25519_password RETURNS STRING SONAME "auth_ed25519.so";
+	' || die "Failed to set up auth_ed25519"
+
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e "
+		SELECT CONCAT('CREATE USER nopass_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"\"),'\";');
+		SELECT CONCAT('CREATE USER user_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"pass_ed25519\"),'\";');
+	" || die "Failed to create ed25519 test users"
+
+	# create test databases
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e '
+		create database test1 DEFAULT CHARACTER SET utf8mb4;
+		create database test2 DEFAULT CHARACTER SET utf8mb4;
+
+		create user test2 identified by "some password";
+		grant all on test2.* to test2;
+
+		create user test2@localhost identified by "some password";
+		grant all on test2.* to test2@localhost;
+	' || die "Failed to create test databases"
+
+	cat > pymysql/tests/databases.json <<-EOF || die
+		[{
+			"host": "localhost",
+			"user": "root",
+			"password": "",
+			"database": "test1",
+			"use_unicode": true,
+			"local_infile": true,
+			"unix_socket": "${T}/mysqld.sock"
+		}, {
+			"host": "localhost",
+			"user": "root",
+			"password": "",
+			"database": "test2",
+			"unix_socket": "${T}/mysqld.sock"
+		}]
+	EOF
+
+	distutils-r1_src_test
+
+	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
+		einfo "Stopping mysql test instance ..."
+		pkill -F "${PIDFILE}"
+	fi
+}
+
+python_test() {
+	local excludes=(
+		# requires some dialog plugin
+		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthThreeAttemptsQuestionsInstallPlugin
+		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthTwoQuestionsInstallPlugin
+	)
+
+	PYTHONPATH=. pytest -vv ${excludes[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pymysql/pymysql-1.0.1.ebuild b/dev-python/pymysql/pymysql-1.0.1.ebuild
new file mode 100644
index 000000000000..7e67a5af2288
--- /dev/null
+++ b/dev-python/pymysql/pymysql-1.0.1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="PyMySQL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pure-Python MySQL Driver"
+HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# TODO: support other mysql variants
+BDEPEND="
+	test? (
+		dev-db/mariadb[server]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Auth tests don't support socket auth
+	find tests/ -name '*_auth.py' -delete || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	if [[ -z "${USER}" ]] ; then
+		# Tests require system user
+		local -x USER="$(whoami)"
+		einfo "USER set to '${USER}'"
+	fi
+
+	local PIDFILE="${T}/mysqld.pid"
+	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
+		einfo "Killing already running mysqld process ..."
+		pkill -F "${PIDFILE}"
+	fi
+
+	if [[ -d "${T}/mysql" ]] ; then
+		einfo "Removing already existing mysqld data dir ..."
+		rm -rf "${T}/mysql" || die
+	fi
+
+	einfo "Creating mysql test instance ..."
+	mkdir -p "${T}"/mysql || die
+	"${BROOT}"/usr/share/mariadb/scripts/mysql_install_db \
+		--no-defaults \
+		--auth-root-authentication-method=normal \
+		--basedir="${BROOT}/usr" \
+		--datadir="${T}"/mysql 1>"${T}"/mysqld_install.log \
+		|| die
+
+	einfo "Starting mysql test instance ..."
+	# TODO: random port
+	mysqld \
+		--no-defaults \
+		--character-set-server=utf8 \
+		--bind-address=127.0.0.1 \
+		--port=43306 \
+		--pid-file="${T}"/mysqld.pid \
+		--socket="${T}"/mysqld.sock \
+		--datadir="${T}"/mysql 1>"${T}"/mysqld.log 2>&1 &
+
+	# wait for it to start
+	local i
+	for (( i = 0; i < 10; i++)); do
+		[[ -S ${T}/mysqld.sock ]] && break
+		sleep 1
+	done
+	[[ -S ${T}/mysqld.sock ]] || die "mysqld failed to start"
+
+	einfo "Configuring test mysql instance ..."
+
+	# create test user for auth tests
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e '
+		INSTALL SONAME "auth_ed25519";
+		CREATE FUNCTION ed25519_password RETURNS STRING SONAME "auth_ed25519.so";
+	' || die "Failed to set up auth_ed25519"
+
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e "
+		SELECT CONCAT('CREATE USER nopass_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"\"),'\";');
+		SELECT CONCAT('CREATE USER user_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"pass_ed25519\"),'\";');
+	" || die "Failed to create ed25519 test users"
+
+	# create test databases
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e '
+		create database test1 DEFAULT CHARACTER SET utf8mb4;
+		create database test2 DEFAULT CHARACTER SET utf8mb4;
+
+		create user test2 identified by "some password";
+		grant all on test2.* to test2;
+
+		create user test2@localhost identified by "some password";
+		grant all on test2.* to test2@localhost;
+	' || die "Failed to create test databases"
+
+	cat > pymysql/tests/databases.json <<-EOF || die
+		[{
+			"host": "localhost",
+			"user": "root",
+			"password": "",
+			"database": "test1",
+			"use_unicode": true,
+			"local_infile": true,
+			"unix_socket": "${T}/mysqld.sock"
+		}, {
+			"host": "localhost",
+			"user": "root",
+			"password": "",
+			"database": "test2",
+			"unix_socket": "${T}/mysqld.sock"
+		}]
+	EOF
+
+	distutils-r1_src_test
+
+	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
+		einfo "Stopping mysql test instance ..."
+		pkill -F "${PIDFILE}"
+	fi
+}
+
+python_test() {
+	local excludes=(
+		# requires some dialog plugin
+		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthThreeAttemptsQuestionsInstallPlugin
+		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthTwoQuestionsInstallPlugin
+	)
+
+	PYTHONPATH=. pytest -vv ${excludes[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pymysql/pymysql-1.0.2.ebuild b/dev-python/pymysql/pymysql-1.0.2.ebuild
new file mode 100644
index 000000000000..7e67a5af2288
--- /dev/null
+++ b/dev-python/pymysql/pymysql-1.0.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="PyMySQL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pure-Python MySQL Driver"
+HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# TODO: support other mysql variants
+BDEPEND="
+	test? (
+		dev-db/mariadb[server]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Auth tests don't support socket auth
+	find tests/ -name '*_auth.py' -delete || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	if [[ -z "${USER}" ]] ; then
+		# Tests require system user
+		local -x USER="$(whoami)"
+		einfo "USER set to '${USER}'"
+	fi
+
+	local PIDFILE="${T}/mysqld.pid"
+	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
+		einfo "Killing already running mysqld process ..."
+		pkill -F "${PIDFILE}"
+	fi
+
+	if [[ -d "${T}/mysql" ]] ; then
+		einfo "Removing already existing mysqld data dir ..."
+		rm -rf "${T}/mysql" || die
+	fi
+
+	einfo "Creating mysql test instance ..."
+	mkdir -p "${T}"/mysql || die
+	"${BROOT}"/usr/share/mariadb/scripts/mysql_install_db \
+		--no-defaults \
+		--auth-root-authentication-method=normal \
+		--basedir="${BROOT}/usr" \
+		--datadir="${T}"/mysql 1>"${T}"/mysqld_install.log \
+		|| die
+
+	einfo "Starting mysql test instance ..."
+	# TODO: random port
+	mysqld \
+		--no-defaults \
+		--character-set-server=utf8 \
+		--bind-address=127.0.0.1 \
+		--port=43306 \
+		--pid-file="${T}"/mysqld.pid \
+		--socket="${T}"/mysqld.sock \
+		--datadir="${T}"/mysql 1>"${T}"/mysqld.log 2>&1 &
+
+	# wait for it to start
+	local i
+	for (( i = 0; i < 10; i++)); do
+		[[ -S ${T}/mysqld.sock ]] && break
+		sleep 1
+	done
+	[[ -S ${T}/mysqld.sock ]] || die "mysqld failed to start"
+
+	einfo "Configuring test mysql instance ..."
+
+	# create test user for auth tests
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e '
+		INSTALL SONAME "auth_ed25519";
+		CREATE FUNCTION ed25519_password RETURNS STRING SONAME "auth_ed25519.so";
+	' || die "Failed to set up auth_ed25519"
+
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e "
+		SELECT CONCAT('CREATE USER nopass_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"\"),'\";');
+		SELECT CONCAT('CREATE USER user_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"pass_ed25519\"),'\";');
+	" || die "Failed to create ed25519 test users"
+
+	# create test databases
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e '
+		create database test1 DEFAULT CHARACTER SET utf8mb4;
+		create database test2 DEFAULT CHARACTER SET utf8mb4;
+
+		create user test2 identified by "some password";
+		grant all on test2.* to test2;
+
+		create user test2@localhost identified by "some password";
+		grant all on test2.* to test2@localhost;
+	' || die "Failed to create test databases"
+
+	cat > pymysql/tests/databases.json <<-EOF || die
+		[{
+			"host": "localhost",
+			"user": "root",
+			"password": "",
+			"database": "test1",
+			"use_unicode": true,
+			"local_infile": true,
+			"unix_socket": "${T}/mysqld.sock"
+		}, {
+			"host": "localhost",
+			"user": "root",
+			"password": "",
+			"database": "test2",
+			"unix_socket": "${T}/mysqld.sock"
+		}]
+	EOF
+
+	distutils-r1_src_test
+
+	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
+		einfo "Stopping mysql test instance ..."
+		pkill -F "${PIDFILE}"
+	fi
+}
+
+python_test() {
+	local excludes=(
+		# requires some dialog plugin
+		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthThreeAttemptsQuestionsInstallPlugin
+		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthTwoQuestionsInstallPlugin
+	)
+
+	PYTHONPATH=. pytest -vv ${excludes[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pynacl/pynacl-1.4.0.ebuild b/dev-python/pynacl/pynacl-1.4.0.ebuild
index cfd6dcd03105..bc28bf06c635 100644
--- a/dev-python/pynacl/pynacl-1.4.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/pynvim/Manifest b/dev-python/pynvim/Manifest
index 34f950b7e820..21211cec4de7 100644
--- a/dev-python/pynvim/Manifest
+++ b/dev-python/pynvim/Manifest
@@ -1,2 +1 @@
-DIST pynvim-0.4.1.tar.gz 52340 BLAKE2B 4efddfbb8d1eb10aeb53b77f665d6ee186f697cc9cb6b3be2001468755a80b0a3bd4e105fda498e1310be9f65da3a0a8b12209c46a7122bb70f860c0a91c12a0 SHA512 78cb343ad02603a0d1c8f56079b46a9d341d8808a19112e758e5299994fe12a433cd61a4dbbaf0d5ffe00c676bcff844a53e910093efb862ad48cc4b4326f7de
 DIST pynvim-0.4.2.tar.gz 52809 BLAKE2B 0bc2c3b509b602d7c46df9c54e867d1833bcadc792d5e1b27e45d99a57c33ff531e85841d8cbccdcb104892a994fcd71ac1c6ba2e86b4785cf890b1f8445d577 SHA512 d24d18fd158b318396cbd4e4ca3a0a304cb12b6790b84fc5f78bbb4aaa4b325d0fea6e281ff3cb27efbec0130d193d4871806750f6d1b792ef8a3558b5c37501
diff --git a/dev-python/pynvim/pynvim-0.4.1.ebuild b/dev-python/pynvim/pynvim-0.4.1.ebuild
deleted file mode 100644
index f6f49816806f..000000000000
--- a/dev-python/pynvim/pynvim-0.4.1.ebuild
+++ /dev/null
@@ -1,27 +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,9,10} 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}]
-	test? ( app-editors/neovim )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -r -i "s:[\"']pytest-runner[\"'](,|)::" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pynvim/pynvim-0.4.2.ebuild b/dev-python/pynvim/pynvim-0.4.2.ebuild
index bf204bbf67b0..04cd81dac244 100644
--- a/dev-python/pynvim/pynvim-0.4.2.ebuild
+++ b/dev-python/pynvim/pynvim-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/neovim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 DEPEND="
 	dev-python/msgpack[${PYTHON_USEDEP}]
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
index 92dfa12d0477..84e7ab7b3e8f 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -1 +1,2 @@
 DIST pyocr-0.7.2.tar.gz 65376 BLAKE2B 065084c19c7722e590c5f20abe5248b2be0c76dab864b4a4e2c457770ff61dec84df7254f19e4926753f39a5d1ed0618ed87827b85773ab96a51e3f7798c656f SHA512 002c3302ed20e19e06dc6fd995ce30150fb95650824df9e0a3d6b2bdcb4c0ae3f2295342c2df44e0d5a9c9bbf5432f47a9d7562e4866b87738ac3436a8c0dec9
+DIST pyocr-0.8.tar.gz 65454 BLAKE2B 881353eebce22cf316cd4375cc8971e740a9a463216a5b49c07c7813340cfa1a9bdd869b84b4c26566deab1551884179ae2fe0184dec73880b716118367803cd SHA512 c8d811001b460a9004a80fbf570df3fe9a6af11e8ca0e90f23e5f3be54f6a54d859f4ad3db126a5216ea557ecb38ebd5dbece91810df2bf3e95f514c39649bce
diff --git a/dev-python/pyocr/metadata.xml b/dev-python/pyocr/metadata.xml
index be2b77921255..d60a50eebe11 100644
--- a/dev-python/pyocr/metadata.xml
+++ b/dev-python/pyocr/metadata.xml
@@ -5,6 +5,9 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
 	<longdescription lang="en">
 Pyocr is an optical character recognition (OCR) tool wrapper for python. That is, it helps using OCR tools from a Python program.
 
@@ -18,7 +21,6 @@ Pyocr can be used as a wrapper for google's Tesseract-OCR or Cuneiform. It can r
 	</use>
 	<upstream>
 		<remote-id type="pypi">pyocr</remote-id>
-		<remote-id type="github">openpaperwork/pyocr</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/pyocr/pyocr-0.7.2.ebuild b/dev-python/pyocr/pyocr-0.7.2.ebuild
index 48d3a02be400..cac2cb67fa65 100644
--- a/dev-python/pyocr/pyocr-0.7.2.ebuild
+++ b/dev-python/pyocr/pyocr-0.7.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
-HOMEPAGE="https://github.com/openpaperwork/pyocr"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/pyocr"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/pyocr/pyocr-0.8.ebuild b/dev-python/pyocr/pyocr-0.8.ebuild
new file mode 100644
index 000000000000..4afe8c8b5efa
--- /dev/null
+++ b/dev-python/pyocr/pyocr-0.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="An optical character recognition (OCR) tool wrapper"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/pyocr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuneiform +tesseract"
+REQUIRED_USE="|| ( cuneiform tesseract )"
+
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]"
+
+# (tests apparently do not require any backend installed)
+distutils_enable_tests unittest
+
+RDEPEND+="
+	cuneiform? ( app-text/cuneiform )
+	tesseract? ( app-text/tesseract )"
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index a19ae22c5c31..a1a65d8419d2 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,3 +1,2 @@
 DIST pyopencl-2020.2.2.tar.gz 352110 BLAKE2B a3bb5f74abbb5d9600651dc0659f2472f7bf91d67cf3474f7306a29ccd3a8249dc952fc1e5b81f0514990e49246d106325a6697559b260a490981541666cb3a7 SHA512 2c4f21d9c0a5d3d53f2a0e4aaa8f85f42fc6fbedc5282cfc107ff047936aa731a973605f5500b56b62d5b580a00e9f2be2aa9a259287291641ca4b4d60c51ca9
-DIST pyopencl-2020.2.tar.gz 351600 BLAKE2B 47a733d7a552f5d1f69a1a9710c3262d50c26651ed9f46146829babe28962e236e2c1b9ba3d3d14207f28bdc562323a94ab4c51dbf5fcf1a0b12282b3c6aff50 SHA512 233bbf2e99507d3a832222cc8149bf7ac17332a550e4867f843fcc2b31104d961a3f0d972b0a1878d4716b2da4548f1390560141cd09cb1ba13300c541b058b9
 DIST pyopencl-2020.3.1.tar.gz 357422 BLAKE2B de9cb6408e957e30f54797ce682ed17f3272dc82019bcd9a744a0696a7e344f47645a3549332da90e0bcc442f7a8ea9c6a12a375875a9728fa9814ca9d1a9b30 SHA512 459d6f060f4203e83276c47bf832f33fc4348dd59904ea55fe2a53684cb7c8eaad45875476d10dcb6653820f9cb1f7e013c6b854410b2040b2dfe847fc1f7658
diff --git a/dev-python/pyopencl/pyopencl-2020.2.2.ebuild b/dev-python/pyopencl/pyopencl-2020.2.2.ebuild
index c62fa56f6b96..a55fe847b53d 100644
--- a/dev-python/pyopencl/pyopencl-2020.2.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2020.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples opengl"
 
 COMMON="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyopencl/pyopencl-2020.2.ebuild b/dev-python/pyopencl/pyopencl-2020.2.ebuild
deleted file mode 100644
index a55fe847b53d..000000000000
--- a/dev-python/pyopencl/pyopencl-2020.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl
-	https://pypi.org/project/pyopencl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples opengl"
-
-COMMON="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${COMMON}
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2017.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=virtual/opencl-2"
-DEPEND="${COMMON}
-	dev-python/pybind11[${PYTHON_USEDEP}]"
-
-# The test suite fails if there are no OpenCL platforms available, and
-# even if there is one (which requires the presence of both an OpenCL
-# runtime *and* hardware supported by it - simply emerging any runtime
-# is not enough) the vast majority of tests end up skipped because by
-# default the portage user hasn't got sufficient privileges to talk
-# to the GPU.
-RESTRICT="test"
-
-python_configure_all() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${EPYTHON}" configure.py \
-		"${myconf[@]}"
-}
-
-python_install_all() {
-	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/pyopencl/pyopencl-2020.3.1.ebuild b/dev-python/pyopencl/pyopencl-2020.3.1.ebuild
index c62fa56f6b96..1b22b8fcb4ea 100644
--- a/dev-python/pyopencl/pyopencl-2020.3.1.ebuild
+++ b/dev-python/pyopencl/pyopencl-2020.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl
+HOMEPAGE="https://mathema.tician.de/software/pyopencl/
 	https://pypi.org/project/pyopencl/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pyopengl-python2/pyopengl-python2-3.1.0.ebuild b/dev-python/pyopengl-python2/pyopengl-python2-3.1.0-r2.ebuild
index 09a4dd7cfb92..b2e29c2b31ce 100644
--- a/dev-python/pyopengl-python2/pyopengl-python2-3.1.0.ebuild
+++ b/dev-python/pyopengl-python2/pyopengl-python2-3.1.0-r2.ebuild
@@ -4,6 +4,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 ORIG_PN=pyopengl
@@ -28,6 +29,6 @@ RDEPEND="
 	x11-libs/libXi
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyopenssl-python2/pyopenssl-python2-19.1.0-r1.ebuild b/dev-python/pyopenssl-python2/pyopenssl-python2-19.1.0-r2.ebuild
index e97cae5653cb..0cb0836a7724 100644
--- a/dev-python/pyopenssl-python2/pyopenssl-python2-19.1.0-r1.ebuild
+++ b/dev-python/pyopenssl-python2/pyopenssl-python2-19.1.0-r2.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1 flag-o-matic
 
 MY_PN=pyOpenSSL
@@ -28,6 +29,7 @@ RESTRICT="test"
 RDEPEND="
 	!dev-python/pyopenssl[python_targets_python2_7]
 	>=dev-python/six-python2-1.5.2[${PYTHON_USEDEP}]
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
 	dev-python/cryptography-python2"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 16ba5b7fa694..847f7caa8a97 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,2 +1,3 @@
 DIST pyOpenSSL-19.1.0.tar.gz 160510 BLAKE2B e6e39f860221a2696aa3fa32ac89ed48e34b18e4accc366a86264d943a15a1b00ba1a0d8349550d1775d25836aa5d214e1e3fe4ec0a9c0f6d5ab00cd9fede633 SHA512 4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916
 DIST pyOpenSSL-20.0.0.tar.gz 173786 BLAKE2B 3fb1e90e20b3e083fc93f6dc8a54fb54e15ceb38c4d2e84e2d7d68bb56f9e3828cd264e3554f25465e858687e74a7f20b91216fb7a0b4b2c656ea86423cd3442 SHA512 26e8a64d53a35434ad4bf5ef50ed5c37d7b92b0db971a2103dcafea56a0b377d67333af630a31405a97cf2cffddde320907b4950ed336a8321391854bcd2c50a
+DIST pyOpenSSL-20.0.1.tar.gz 173736 BLAKE2B 37e1741425a296142d38c20c70f9950eec2bd043fc58e50c9955b98dc6825111328af852d247b154aa120ab42ea9dc2ae8186d350dd0c664cd5920b9a902963e SHA512 e81e0870398b882d77453b02e972559c0be82dbfe87bd8a48a65e8943acc3ea07dc8c3150b88e299c237496043443d1a5832219c337e4436f99ef419b36dd23f
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
index 37e08a31e269..e391b8432d3c 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
new file mode 100644
index 000000000000..2c111d70313b
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
@@ -0,0 +1,51 @@
+# 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,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	https://www.pyopenssl.org/
+	https://pypi.org/project/pyOpenSSL/
+	https://github.com/pyca/pyopenssl/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Requires network access
+	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	local -x TZ=UTC
+	distutils-r1_src_test
+}
diff --git a/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
index 965e6d1fac82..dc2a6904c312 100644
--- a/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2004-2020 Gentoo Authors
+# Copyright 2004-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~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 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 b362f135d675..0e3383b1f6b8 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -1,2 +1 @@
-DIST pyparted-3.11.6.tar.gz 105633 BLAKE2B 8c74fb3521f94cf726365e91954c56a60bc418c0e18c3401dc525f942169b1c03ade5fa35d5053daf4a4568b373e9a8771e50c76ea5b51c2f6351ce62ed2bb21 SHA512 8c3a86efb21c212a8f227ae324896552f45568b8facdd76729f5acf15bf7d691c1b9ab9e46885e4fa4e0c4c7d60314e2abfcbff212e5dc158d27ce716dbd50fa
 DIST pyparted-3.11.7.tar.gz 105671 BLAKE2B ffe7869c7ac85f291314d0381e18ca6a732eca2cee3d31fe31a89b8b1c1c671f97a06a586f235ee67244388ab214a7e51c67951a5c1eb79fb1b448f6a004381c SHA512 147fdc45d47faaee574a7b0268a218eef49be929a147d20adf85cc0302d94e57e98e02072591ca035cad7efe164e7dd87bd1a31504f5cff8575f18d4469dc2b0
diff --git a/dev-python/pyparted/pyparted-3.11.6.ebuild b/dev-python/pyparted/pyparted-3.11.6.ebuild
deleted file mode 100644
index c7005036cef1..000000000000
--- a/dev-python/pyparted/pyparted-3.11.6.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for sys-block/parted"
-HOMEPAGE="https://github.com/dcantrell/pyparted/"
-SRC_URI="https://github.com/dcantrell/pyparted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-
-DEPEND="
-	>=sys-block/parted-3.2
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/decorator[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/six[${PYTHON_USEDEP}] )
-	virtual/pkgconfig
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyparted/pyparted-3.11.7.ebuild b/dev-python/pyparted/pyparted-3.11.7.ebuild
index 16093d389448..7eb32254297e 100644
--- a/dev-python/pyparted/pyparted-3.11.7.ebuild
+++ b/dev-python/pyparted/pyparted-3.11.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dcantrell/pyparted/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 DEPEND="
 	>=sys-block/parted-3.2
diff --git a/dev-python/pypax/pypax-0.9.5.ebuild b/dev-python/pypax/pypax-0.9.5.ebuild
index 2033ffe7b143..460b97d4c458 100644
--- a/dev-python/pypax/pypax-0.9.5.ebuild
+++ b/dev-python/pypax/pypax-0.9.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 	S="${WORKDIR}/elfix-${PV}"
 fi
 
diff --git a/dev-python/pyperclip/pyperclip-1.7.0.ebuild b/dev-python/pyperclip/pyperclip-1.7.0.ebuild
index 2c3a7a7556f8..6835137749ad 100644
--- a/dev-python/pyperclip/pyperclip-1.7.0.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index 782c9939d49d..d08a1ce9c5c2 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,2 +1 @@
 DIST pyphen-0.10.0.tar.gz 1894118 BLAKE2B c33283d6eb3dd7affb52b91826fa0f8fab8ec8f858158e905e8487dc2ad8c77a88e4b25699ed6272d246bcf8a926560e18ec224f59703452ea1ad5c921e4fb4b SHA512 b6d789ca6eb010c1c79b28a9a0e68620ea5600adc43111bed5dbda3cb8b3a4c8c05caa3fb44ea60b0ef4a20272f17cf5e6fe61f0d1e48038395407ff53da7a92
-DIST pyphen-0.9.5.tar.gz 1901384 BLAKE2B 809f7e3c204ab7de87a387909fb0d9aebd3d48586a6b1da8a683a8b1f862e2d2489babfb30c9792acca44c0fe7bd5da39c1508245ec784dce30a4c7124e91152 SHA512 049a62b226e90e568c8f56e756f8fa6fbc74f3bc40d61af8eb05ff2d4404a7b29cef14d4f144d68ed2f2b11eb128491de64536240ba7b76a2d04010c76e10346
diff --git a/dev-python/pyphen/pyphen-0.10.0.ebuild b/dev-python/pyphen/pyphen-0.10.0.ebuild
index c155f01a769d..1c3209e19f7d 100644
--- a/dev-python/pyphen/pyphen-0.10.0.ebuild
+++ b/dev-python/pyphen/pyphen-0.10.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/Kozea/Pyphen"
 
 LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/pyphen/pyphen-0.9.5.ebuild b/dev-python/pyphen/pyphen-0.9.5.ebuild
deleted file mode 100644
index 1c3209e19f7d..000000000000
--- a/dev-python/pyphen/pyphen-0.9.5.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,7,8,9,10} )
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="Python module for hyphenation using hunspell dictionaries"
-MY_PN="Pyphen"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="https://github.com/Kozea/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/Kozea/Pyphen"
-
-LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -v test.py || die
-}
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 995ccc31f868..216aeff98cab 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,2 +1 @@
-DIST pyproject2setuppy-8.tar.gz 9501 BLAKE2B d0c168efa2742732710a7d967ce0783a942d4718ae2be75e6263bb560500527ee11260c9b7362d10cb059171475dc647c0bc97e284554f2e159f470e3eb7f569 SHA512 527e2de790fb02373150db834d1a007a63b71f87ae01fef1dd9fc86a51ac6cafeac28fa3f39a2d484e7a9f84549d0ba285894cf9201f3b2b2a47965be29913cc
 DIST pyproject2setuppy-9.tar.gz 9611 BLAKE2B 448e6ca468c2a5c1097e63316bf1a2da41dfc4a8dfa756553b56ebcbb66c43cce7dd57aeacce45491087b956a01b8ff2707fc5f60ada10a4f496c9c8f7c722c4 SHA512 bd337f392e3dfd686039714687bd8a57b7b946b486f5513bf603e322843a4d8f4c2fdca747e61090f00f3ed4a5284a2b182f064412a3c8e70f278a2be7551d93
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-8.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-8.ebuild
deleted file mode 100644
index 008f7cfea948..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
-HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
-SRC_URI="
-	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
index 0d3c335fcd55..d0ed7d7604de 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 689d3fd9f329..cc5fc3cb870d 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,8 +1,2 @@
-DIST pypy-exe-7.3.1-1.amd64.xpak 13578971 BLAKE2B 6ff3c64ec88813ef68d325cff5e2dae0ef1f79ae33eeac3a09c1b8ee0a24b0447b2c633489311da3d62996d714bd3d5844c3b71b9309766ade2f06b79e20bb64 SHA512 b153a19621a6da51d364868c22e9ba0460d95203787753899ec50efb573b4e7262d323503be801c3c75a724761bcfda90d8d4668d84482e2db32104916bc7671
-DIST pypy-exe-7.3.1-1.x86.xpak 10239654 BLAKE2B 2588e879e2bd3ea41938ec21f55167d118cb493680f8e7aded6d6c01bed6499efd65f7d7f56e305a4ebc2aab02adf9d58fceccb503dd0ff41e93c642baf2191c SHA512 110b202c805729bcd6789ea0f6c7bffe62ab23cbd33fcff572254f56f4da82e25f9f7f617c5a4b3911044c07ea33ae8d17bd8547bb7779ca517b973b553e6b1d
-DIST pypy-exe-7.3.2-1.amd64.xpak 13541084 BLAKE2B 8af5c35d99275a2131d4b6c51f505a9bf3015a144387030c78a490c331f1fb34b69106ad6ed961247b4de6a39d2fde47a1ebad204e3a3569f269ed7ee32559de SHA512 82d99e896954aec8749154e19d42636608403e4c4bece34e72b5804208cb42ed26bfdf4506ab2579a3b74d7cede97ef66b313ae9feeddabbfd79045090dc3035
-DIST pypy-exe-7.3.2-1.x86.xpak 10216001 BLAKE2B 934be623ce1afa9d0bfb1b3725e89d994352c9d57b9807c6fa135a0aabe3c50633566425b25ebf98f1cec8160eadf5305033ac3f3ba4cfff5fb7b39e5d19f9c6 SHA512 9d25f1d82af3ed1c4d046e5f3434d12ed4c02eee4cc8adb64a03159bb48cf114f393bd60c67223447796726f59b622f8462ac439446eb14dcf2e76983da635e8
 DIST pypy-exe-7.3.3-1.amd64.xpak 13533778 BLAKE2B de70f6b47e9908757ae73c047f04fc8081bb422f5ba6c0e9a865dde2c9aebfc881858194b107bb3e0110d61de718fb8fe7db2aac0885bb6adca101b12e6e400f SHA512 f98b86ed44567979234460fc9df7b79477729bdcc233ab8dd3ba991f80a5f32c9111f263ef4df5b2703581431d7f92ee468f057ce95613deaf35176634f253e2
 DIST pypy-exe-7.3.3-1.x86.xpak 10258112 BLAKE2B 55744bb2b68dee5b959c8976ad62b0e8e4d633f2b31003fc14d8bae82b4b55e7927ea1296501207ee2377df456b469ce3594a65a5171c84188ef22b88370a051 SHA512 baa895377c3cbd090971660edf3b634ada20390ed940c72ba2e9fadce30d3c88125f4c52b11d17160a1ba1331e648d2bed37d6d533866ea97d786634b5ecc0a7
-DIST pypy-exe-7.3.3_rc1-1.amd64.xpak 13533939 BLAKE2B 9b959a51e5e896d68d5321ac27f661900eda5407e6682883cea00e6d7363c4a1287044da47a7e750ae93fe9801a8ca3ee4fc9846b679998f3fbddefc19a62593 SHA512 a0c73ec6e300f0f52ac8f8305e92670eec8aacb11f7cb345804f042ae40d514ea1be2b14511422791e46b758437af49e43d409a27fb0087bf881143f6b265f17
-DIST pypy-exe-7.3.3_rc1-1.x86.xpak 10254396 BLAKE2B e3fa75dc753cc64baca69f802f2f52557b4b374801df7ede216c10f485130b2beb321d404e592e5de49d048de89f1a4496e946ebc8e7a831b1de7806d32e99a7 SHA512 6fae90183fea72dd913342fb230aca09091d0ef94f81a62750f39885bbaec78e227eb282372fe9f869ade1abdaac0ee7c93900311d495dc10735fb4573aaf52b
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.1_p1.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.1_p1.ebuild
deleted file mode 100644
index d44223c44fa2..000000000000
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.1_p1.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
-
-inherit pax-utils
-
-MY_P=pypy-exe-${PV/_p/-}
-DESCRIPTION="PyPy executable (pre-built version)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	dev-libs/libffi:0/7
-	virtual/libintl:0/0
-	dev-libs/expat:0/0
-	app-arch/bzip2:0/1
-	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${PV}"
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c-${SLOT}"
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
-	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
-}
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.2.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.2.ebuild
deleted file mode 100644
index cbfcb9fce7dd..000000000000
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.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
-
-inherit pax-utils
-
-MY_P=pypy-exe-${PV}-1
-DESCRIPTION="PyPy executable (pre-built version)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	dev-libs/libffi:0/7
-	virtual/libintl:0/0
-	dev-libs/expat:0/0
-	app-arch/bzip2:0/1
-	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${PV}"
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c-${SLOT}"
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
-	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
-}
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3.ebuild
index cbfcb9fce7dd..5f2d59bc5d26 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	dev-libs/libffi:0/7
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_rc1.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_rc1.ebuild
deleted file mode 100644
index d6efaa6215d5..000000000000
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_rc1.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
-
-inherit pax-utils
-
-MY_P=pypy-exe-${PV}-1
-DESCRIPTION="PyPy executable (pre-built version)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS=""
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	dev-libs/libffi:0/7
-	virtual/libintl:0/0
-	dev-libs/expat:0/0
-	app-arch/bzip2:0/1
-	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${PV}"
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c-${SLOT}"
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
-	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
-}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index d4d8346024c7..482a0b598d93 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,4 +1 @@
-DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
-DIST pypy2.7-v7.3.2-src.tar.bz2 21142873 BLAKE2B e6bcd2dc28ef740962d053753ccd172e3895fc83fe23a319c003248e0986f9805839daddd13a0f480f1e9ee813979742699cb0bc8c42b6b05c193fedf67aea4f SHA512 b40d93d615a27e3a035007307a8ab2b49ff90f3047af914b268a80feb8219d372eca14c04a8b0dea91efb992653457b7c6d088c784de32c414cc48879f2d15fc
 DIST pypy2.7-v7.3.3-src.tar.bz2 20881821 BLAKE2B ce1ecdd1fffe40574c7662da6038b84d2bca47ab168939ef0c12be2c6348317f17a94a3026e7fa53c71601edc153aefd98f770bd148e7af07ca751c0a5fc1252 SHA512 c2b6c44fdcac5f9445fab01572f859228fc286891fd09a4ddb95d283683d805276c853ec8e61fcd04cb9ee811d0e959d19bb03fdd7442c044f28a773633122e7
-DIST pypy2.7-v7.3.3rc1-src.tar.bz2 20933100 BLAKE2B afbf3c15924e6a215b6323fe97e9782912f09ba1e1db6652b37897ead07deaaa97f591a91f3695e958e8e2dee2626bbda94c4043c025b3f52a12279dc66e483c SHA512 0ddbdcf7ef825888ff748ebdd84cb501653e3a4a0e506e35810f9693b5d3b388c2f636396616f0c8fcc96dc806fa02d74830c1f37ca11fdcfdfd32c3bcd1fdd0
diff --git a/dev-python/pypy-exe/files/pypy-7.3.2-ppc64-segfault.patch b/dev-python/pypy-exe/files/pypy-7.3.2-ppc64-segfault.patch
deleted file mode 100644
index c143a3765cdf..000000000000
--- a/dev-python/pypy-exe/files/pypy-7.3.2-ppc64-segfault.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 913e0dae8ac7ce8219a5f31126fee8a794cc314c Mon Sep 17 00:00:00 2001
-From: Armin Rigo <arigo@tunes.org>
-Date: Sat, 26 Sep 2020 09:26:24 +0200
-Subject: [PATCH] oops, fix for test_gc_indexed_box_plus_large_offset
-
----
- rpython/jit/backend/ppc/opassembler.py | 16 +++++++++++-----
- rpython/jit/backend/ppc/regalloc.py    |  4 ++--
- 2 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/rpython/jit/backend/ppc/opassembler.py b/rpython/jit/backend/ppc/opassembler.py
-index b79b18e530..4bbfbba93a 100644
---- a/rpython/jit/backend/ppc/opassembler.py
-+++ b/rpython/jit/backend/ppc/opassembler.py
-@@ -755,13 +755,19 @@ class FieldOpAssembler(object):
-     def _apply_offset(self, index_loc, ofs_loc):
-         # If offset != 0 then we have to add it here.  Note that
-         # mc.addi() would not be valid with operand r0.
--        assert ofs_loc.is_imm()                # must be an immediate...
--        assert _check_imm_arg(ofs_loc.getint())   # ...that fits 16 bits
-         assert index_loc.is_core_reg()
-         assert index_loc is not r.SCRATCH2
--        # (simplified version of _apply_scale())
--        if ofs_loc.value > 0:
--            self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
-+        if ofs_loc.is_imm():
-+            # if it is an immediate, it must fit into 16 bits
-+            assert _check_imm_arg(ofs_loc.getint())
-+            # (simplified version of _apply_scale())
-+            if ofs_loc.value != 0:
-+                self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
-+                index_loc = r.SCRATCH2
-+        else:
-+            # larger immediates are loaded into a register in regalloc.py
-+            assert ofs_loc.is_core_reg()
-+            self.mc.add(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
-             index_loc = r.SCRATCH2
-         return index_loc
- 
-diff --git a/rpython/jit/backend/ppc/regalloc.py b/rpython/jit/backend/ppc/regalloc.py
-index f3ee1129e4..827953cf12 100644
---- a/rpython/jit/backend/ppc/regalloc.py
-+++ b/rpython/jit/backend/ppc/regalloc.py
-@@ -771,7 +771,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc):
-         value_loc = self.ensure_reg(op.getarg(2))
-         assert op.getarg(3).getint() == 1    # scale
-         ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(4))
--        assert ofs_loc.is_imm()  # the arg(4) should always be a small constant
-+        # the arg(4) is often a small constant, but it may be too large
-         size_loc = self.ensure_reg_or_any_imm(op.getarg(5))
-         return [base_loc, index_loc, value_loc, ofs_loc, size_loc]
- 
-@@ -780,7 +780,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc):
-         index_loc = self.ensure_reg(op.getarg(1))
-         assert op.getarg(2).getint() == 1    # scale
-         ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(3))
--        assert ofs_loc.is_imm()  # the arg(3) should always be a small constant
-+        # the arg(3) is often a small constant, but it may be too large
-         self.free_op_vars()
-         res_loc = self.force_allocate_reg(op)
-         size_box = op.getarg(4)
--- 
-GitLab
-
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.1.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.1.ebuild
deleted file mode 100644
index c2949284162c..000000000000
--- a/dev-python/pypy-exe/pypy-exe-7.3.1.ebuild
+++ /dev/null
@@ -1,162 +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,8,9,10} )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy2.7-v${PV/_/}
-DESCRIPTION="PyPy executable (build from source)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy-exe-bin:${PV}"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}"
-BDEPEND="
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-check_env() {
-	if use low-memory; then
-		if ! has_version -b dev-python/pypy &&
-				! has_version -b dev-python/pypy-bin
-		then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
-			die "dev-python/pypy needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using already-installed PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PV}
-	insinto "${dest}"/include/${PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy-c-${PV}"
-}
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild
deleted file mode 100644
index 366ed918ce27..000000000000
--- a/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild
+++ /dev/null
@@ -1,171 +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,8,9,10} )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy2.7-v${PV/_/}
-DESCRIPTION="PyPy executable (build from source)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy-exe-bin:${PV}"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}"
-BDEPEND="
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)"
-
-check_env() {
-	if use low-memory; then
-		if ! has_version -b dev-python/pypy &&
-				! has_version -b dev-python/pypy-bin
-		then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
-			die "dev-python/pypy needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-PATCHES=(
-	"${FILESDIR}"/pypy-7.3.2-ppc64-segfault.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using already-installed PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	if [[ ${EPYTHON} != pypy ]]; then
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PV}
-	insinto "${dest}"/include/${PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy-c-${PV}"
-}
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.3.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.3.ebuild
index e5b3ee6fd720..c6982d59adf4 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.3.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.3_rc1.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.3_rc1.ebuild
deleted file mode 100644
index 28b11495eed9..000000000000
--- a/dev-python/pypy-exe/pypy-exe-7.3.3_rc1.ebuild
+++ /dev/null
@@ -1,167 +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,8,9,10} )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy2.7-v${PV/_/}
-DESCRIPTION="PyPy executable (build from source)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS=""
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy-exe-bin:${PV}"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}"
-BDEPEND="
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)"
-
-check_env() {
-	if use low-memory; then
-		if ! has_version -b dev-python/pypy &&
-				! has_version -b dev-python/pypy-bin
-		then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
-			die "dev-python/pypy needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using already-installed PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	if [[ ${EPYTHON} != pypy ]]; then
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PV}
-	insinto "${dest}"/include/${PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy-c-${PV}"
-}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 8e407250474b..b2aea21c0af0 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,6 +1,2 @@
-DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
-DIST pypy2.7-v7.3.2-src.tar.bz2 21142873 BLAKE2B e6bcd2dc28ef740962d053753ccd172e3895fc83fe23a319c003248e0986f9805839daddd13a0f480f1e9ee813979742699cb0bc8c42b6b05c193fedf67aea4f SHA512 b40d93d615a27e3a035007307a8ab2b49ff90f3047af914b268a80feb8219d372eca14c04a8b0dea91efb992653457b7c6d088c784de32c414cc48879f2d15fc
 DIST pypy2.7-v7.3.3-src.tar.bz2 20881821 BLAKE2B ce1ecdd1fffe40574c7662da6038b84d2bca47ab168939ef0c12be2c6348317f17a94a3026e7fa53c71601edc153aefd98f770bd148e7af07ca751c0a5fc1252 SHA512 c2b6c44fdcac5f9445fab01572f859228fc286891fd09a4ddb95d283683d805276c853ec8e61fcd04cb9ee811d0e959d19bb03fdd7442c044f28a773633122e7
-DIST pypy2.7-v7.3.3rc1-src.tar.bz2 20933100 BLAKE2B afbf3c15924e6a215b6323fe97e9782912f09ba1e1db6652b37897ead07deaaa97f591a91f3695e958e8e2dee2626bbda94c4043c025b3f52a12279dc66e483c SHA512 0ddbdcf7ef825888ff748ebdd84cb501653e3a4a0e506e35810f9693b5d3b388c2f636396616f0c8fcc96dc806fa02d74830c1f37ca11fdcfdfd32c3bcd1fdd0
-DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
 DIST python-gentoo-patches-2.7.18-r1.tar.xz 15500 BLAKE2B 7008b29827dbbd80d4ab8f010ccf9efced99c6b4b9109e4430c0ba269ce53529cb6fedd832502c8d2d3aa21938749cc3591c2545b21c0a59a6e60f8598e84ccc SHA512 e656ab07281fd932b92165674619bbf55ecf410d2937ae4ae771d490b4532540498cc731d30d19c1e8aafd1f64df8a406bbfbb46ea985b3dcd8edb89a0b7f20f
diff --git a/dev-python/pypy/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy/files/5.8.0_all_distutils_cxx.patch
deleted file mode 100644
index f0268e296954..000000000000
--- a/dev-python/pypy/files/5.8.0_all_distutils_cxx.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-From 9bf4611231faa0dc9ae64c6a7a8b55a3290a3ca2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 25 Apr 2017 07:14:11 +0200
-Subject: [PATCH] Fancy patch for distutils C++ support, rebased for pypy5.7
-
-http://bugs.python.org/issue1222585
-http://bugs.gentoo.org/show_bug.cgi?id=599918
----
- _osx_support.py                | 10 ++---
- distutils/cygwinccompiler.py   | 21 ++++++++--
- distutils/emxccompiler.py      | 14 +++++--
- distutils/sysconfig_cpython.py | 26 ++++++++++---
- distutils/sysconfig_pypy.py    | 37 ++++++++++++++----
- distutils/unixccompiler.py     | 55 ++++++++++++++-------------
- 6 files changed, 112 insertions(+), 51 deletions(-)
-
-diff --git a/_osx_support.py b/_osx_support.py
-index d2aaae7..8bcdb05 100644
---- a/_osx_support.py
-+++ b/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # configuration variables that may contain universal build flags,
- # like "-arch" or "-isdkroot", that may need customization for
- # the user environment
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
--                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
--                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
--                            'PY_CORE_CFLAGS')
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
-+                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
-+                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
- 
- # configuration variables that may contain compiler calls
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
- 
- # prefix added to original configuration variable names
- _INITPRE = '_OSX_SUPPORT_INITIAL_'
-diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
-index 767400c..7133097 100644
---- a/distutils/cygwinccompiler.py
-+++ b/distutils/cygwinccompiler.py
-@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler):
-         self.set_executables(compiler='gcc -mcygwin -O -Wall',
-                              compiler_so='gcc -mcygwin -mdll -O -Wall',
-                              compiler_cxx='g++ -mcygwin -O -Wall',
-+                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
-                              linker_exe='gcc -mcygwin',
-                              linker_so=('%s -mcygwin %s' %
--                                        (self.linker_dll, shared_option)))
-+                                        (self.linker_dll, shared_option)),
-+                             linker_exe_cxx='g++ -mcygwin',
-+                             linker_so_cxx=('%s -mcygwin %s' %
-+                                            (self.linker_dll_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler):
-                 raise CompileError, msg
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError, msg:
-                 raise CompileError, msg
- 
-@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler):
-         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
-                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
-                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
-+                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
-                              linker_exe='gcc%s' % no_cygwin,
-                              linker_so='%s%s %s %s'
-                                     % (self.linker_dll, no_cygwin,
-+                                       shared_option, entry_point),
-+                             linker_exe_cxx='g++%s' % no_cygwin,
-+                             linker_so_cxx='%s%s %s %s'
-+                                    % (self.linker_dll_cxx, no_cygwin,
-                                        shared_option, entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/distutils/emxccompiler.py b/distutils/emxccompiler.py
-index a017205..bdc532c 100644
---- a/distutils/emxccompiler.py
-+++ b/distutils/emxccompiler.py
-@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler):
-         # XXX optimization, warnings etc. should be customizable.
-         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-+                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-+                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
--                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
-+                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
-+                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
-+                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
- 
-         # want the gcc library statically linked (so that we don't have
-         # to distribute a version dependent on the compiler we have)
-@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler):
-                 raise CompileError, msg
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError, msg:
-                 raise CompileError, msg
- 
-diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
-index 35f39e4..8dd032d 100644
---- a/distutils/sysconfig_cpython.py
-+++ b/distutils/sysconfig_cpython.py
-@@ -171,10 +171,12 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                            'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SO', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -189,19 +191,27 @@ def customize_compiler(compiler):
-             cxx = os.environ['CXX']
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -210,13 +220,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = so_ext
-diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
-index 368f232..4fe1f08 100644
---- a/distutils/sysconfig_pypy.py
-+++ b/distutils/sysconfig_pypy.py
-@@ -67,6 +67,7 @@ def _init_posix():
-     g['CFLAGS'] = "-DNDEBUG -O2"
-     g['CCSHARED'] = "-fPIC"
-     g['LDSHARED'] = "cc -pthread -shared"
-+    g['LDCXXSHARED'] = "c++ -pthread -shared"
-     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
-     g['AR'] = "ar"
-     g['ARFLAGS'] = "rc"
-@@ -85,6 +86,7 @@ def _init_posix():
-             # just a guess
-             arch = platform.machine()
-         g['LDSHARED'] += ' -undefined dynamic_lookup'
-+        g['LDCXXSHARED'] += ' -undefined dynamic_lookup'
-         g['CC'] += ' -arch %s' % (arch,)
- 
-     global _config_vars
-@@ -168,37 +170,52 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                            'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SO', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
--            if (sys.platform == 'darwin'
-+            if (True
-                     and 'LDSHARED' not in os.environ
-                     and ldshared.startswith(cc)):
-                 # On OS X, if CC is overridden, use that as the default
-                 #       command for LDSHARED as well
-+                # Gentoo: s/OS X/every system/
-                 ldshared = newcc + ldshared[len(cc):]
-             cc = newcc
-         if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
-+            newcxx = os.environ['CXX']
-+            if ('LDCXXSHARED' not in os.environ
-+                    and ldcxxshared.startswith(cxx)):
-+                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
-+            cxx = newcxx
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -207,13 +224,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = so_ext
-diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
-index dee88a5..558b568 100644
---- a/distutils/unixccompiler.py
-+++ b/distutils/unixccompiler.py
-@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler):
-     # are pretty generic; they will probably have to be set by an outsider
-     # (eg. using information discovered by the sysconfig about building
-     # Python extensions).
--    executables = {'preprocessor' : None,
--                   'compiler'     : ["cc"],
--                   'compiler_so'  : ["cc"],
--                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   'linker_so'    : ["cc", "-shared"],
--                   'linker_exe'   : ["cc"],
--                   'archiver'     : ["ar", "-cr"],
--                   'ranlib'       : None,
-+    executables = {'preprocessor'    : None,
-+                   'compiler'        : ["cc"],
-+                   'compiler_so'     : ["cc"],
-+                   'compiler_cxx'    : ["c++"],
-+                   'compiler_so_cxx' : ["c++"],
-+                   'linker_so'       : ["cc", "-shared"],
-+                   'linker_exe'      : ["cc"],
-+                   'linker_so_cxx'   : ["c++", "-shared"],
-+                   'linker_exe_cxx'  : ["c++"],
-+                   'archiver'        : ["ar", "-cr"],
-+                   'ranlib'          : None,
-                   }
- 
-     if sys.platform[:6] == "darwin":
-@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler):
- 
-     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-         compiler_so = self.compiler_so
-+        compiler_so_cxx = self.compiler_so_cxx
-         if sys.platform == 'darwin':
-             compiler_so = _osx_support.compiler_fixup(compiler_so,
-                                                     cc_args + extra_postargs)
-+            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
-+                                                    cc_args + extra_postargs)
-         try:
--            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
--                       extra_postargs)
-+            if self.detect_language(src) == 'c++':
-+                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-+            else:
-+                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-         except DistutilsExecError, msg:
-             raise CompileError, msg
- 
-@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler):
-                 ld_args.extend(extra_postargs)
-             self.mkpath(os.path.dirname(output_filename))
-             try:
--                if target_desc == CCompiler.EXECUTABLE:
--                    linker = self.linker_exe[:]
-+                if target_lang == "c++":
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe_cxx[:]
-+                    else:
-+                        linker = self.linker_so_cxx[:]
-                 else:
--                    linker = self.linker_so[:]
--                if target_lang == "c++" and self.compiler_cxx:
--                    # skip over environment variable settings if /usr/bin/env
--                    # is used to set up the linker's environment.
--                    # This is needed on OSX. Note: this assumes that the
--                    # normal and C++ compiler have the same environment
--                    # settings.
--                    i = 0
--                    if os.path.basename(linker[0]) == "env":
--                        i = 1
--                        while '=' in linker[i]:
--                            i = i + 1
--
--                    linker[i] = self.compiler_cxx[i]
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe[:]
-+                    else:
-+                        linker = self.linker_so[:]
- 
-                 if sys.platform == 'darwin':
-                     linker = _osx_support.compiler_fixup(linker, ld_args)
--- 
-2.12.2
-
diff --git a/dev-python/pypy/pypy-7.3.1-r3.ebuild b/dev-python/pypy/pypy-7.3.1-r3.ebuild
deleted file mode 100644
index 8508153c294f..000000000000
--- a/dev-python/pypy/pypy-7.3.1-r3.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1
-
-MY_P=pypy2.7-v${PV/_/}
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-PATCHSET="python-gentoo-patches-2.7.17-r1"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/73"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		dev-python/pypy-exe:${PV}[bzip2?,ncurses?]
-		dev-python/pypy-exe-bin:${PV}
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy-bin-7.3.0:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}/${PATCHSET}"/0010-use_pyxml.patch
-	popd > /dev/null || die
-
-	# this test relies on pypy-c hardcoding correct build time paths
-	sed -i -e 's:test_executable_without_cwd:_&:' \
-		lib-python/2.7/test/test_subprocess.py || die
-	# broken upstream
-	# see http://buildbot.pypy.org/summary?branch=%3Ctrunk%3E
-	sed -i -e 's:test_alpn_protocols:_&:' \
-		-e 's:test_default_ecdh_curve:_&:' \
-		lib-python/2.7/test/test_ssl.py || die
-	# requires Internet
-	sed -i -e '/class NetworkedTests/i@unittest.skip("Requires networking")' \
-		lib-python/2.7/test/test_ssl.py || die
-
-	eapply_user
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PV} pypy-c || die
-	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( ssl audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	dosym pypy-c-${PV} "${dest}/pypy-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PV}/*; do
-		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy
-	local -x PYTHON=${ED}${dest}/pypy-c-${PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy2.7/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy/pypy-7.3.2.ebuild b/dev-python/pypy/pypy-7.3.2.ebuild
deleted file mode 100644
index 90e8d764f97e..000000000000
--- a/dev-python/pypy/pypy-7.3.2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1
-
-MY_P=pypy2.7-v${PV/_/}
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-PATCHSET="python-gentoo-patches-2.7.18-r1"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		dev-python/pypy-exe:${PV}[bzip2?,ncurses?]
-		dev-python/pypy-exe-bin:${PV}
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy-bin-7.3.0:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}/${PATCHSET}"/0010-use_pyxml.patch
-	popd > /dev/null || die
-
-	# this test relies on pypy-c hardcoding correct build time paths
-	sed -i -e 's:test_executable_without_cwd:_&:' \
-		lib-python/2.7/test/test_subprocess.py || die
-	# requires Internet
-	sed -i -e '/class NetworkedTests/i@unittest.skip("Requires networking")' \
-		lib-python/2.7/test/test_ssl.py || die
-
-	eapply_user
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PV} pypy-c || die
-	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( ssl audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	dosym pypy-c-${PV} "${dest}/pypy-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PV}/*; do
-		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy
-	local -x PYTHON=${ED}${dest}/pypy-c-${PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy2.7/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy/pypy-7.3.3.ebuild b/dev-python/pypy/pypy-7.3.3.ebuild
index dfe53d9ae357..b3f7eefab9de 100644
--- a/dev-python/pypy/pypy-7.3.3.ebuild
+++ b/dev-python/pypy/pypy-7.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
 
 RDEPEND="
diff --git a/dev-python/pypy/pypy-7.3.3_rc1.ebuild b/dev-python/pypy/pypy-7.3.3_rc1.ebuild
deleted file mode 100644
index 74c92f4c6828..000000000000
--- a/dev-python/pypy/pypy-7.3.3_rc1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1
-
-MY_P=pypy2.7-v${PV/_/}
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-PATCHSET="python-gentoo-patches-2.7.18-r1"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/73"
-KEYWORDS=""
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		dev-python/pypy-exe:${PV}[bzip2?,ncurses?]
-		dev-python/pypy-exe-bin:${PV}
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy-bin-7.3.0:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}/7.3.3-distutils-cxx.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply -p2 "${WORKDIR}/${PATCHSET}"/0010-use_pyxml.patch
-	popd > /dev/null || die
-
-	# this test relies on pypy-c hardcoding correct build time paths
-	sed -i -e 's:test_executable_without_cwd:_&:' \
-		lib-python/2.7/test/test_subprocess.py || die
-	# requires Internet
-	sed -i -e '/class NetworkedTests/i@unittest.skip("Requires networking")' \
-		lib-python/2.7/test/test_ssl.py || die
-
-	eapply_user
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PV} pypy-c || die
-	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( ssl audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	dosym pypy-c-${PV} "${dest}/pypy-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PV}/*; do
-		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy
-	local -x PYTHON=${ED}${dest}/pypy-c-${PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy2.7/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 1a0086f2133e..2e406e2b25c4 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,14 +1,4 @@
-DIST pypy3-exe-7.3.1-1.amd64.xpak 11657579 BLAKE2B 1a037b447c7a73ac37bd7c33f4009442dabaf082a844744093dbb0f835b71abad48a6bfb28ebed0b02bb8a86f59f11b351768f152fd5db8b31ee010b14ffde79 SHA512 ee03ac675e6967d306136e79cbbb1554c44a32a21a0756b09dd7c1af84a9b3cb7e69a0094431bf6427271cf2fb1840e62935f53580e8d3eedef54d9bef2994e2
-DIST pypy3-exe-7.3.1-1.x86.xpak 8983621 BLAKE2B 00ea3210e040dd72f169eb2f162f032eb3ddadefd5f114cb4fdb052b40640235f866fc26f577eb22ff64025d2b4234a194529cbac6350aeffa17bb662e98c5b0 SHA512 caa6e4e08c61e3101aa7e971b2aeae04b41c57206327baefeee4a077d09b5bef28ca3518e6823bdf9907ccd4a8ee2b843369ffd87ef0bcb95a66f21ddd87c61e
-DIST pypy3-exe-7.3.2-r1-1.amd64.xpak 11745754 BLAKE2B 16b6b078609b6c6fb9f87c8d6fe477ec29d9e3c51d68996b782cf2e908f46759a42b32dfd8e64a32bfe2488849ce57255cc9a299231f4f6f2dd52a5c11e30367 SHA512 6e4d73b11cd67ad50d01e0db1a800567f723752abaa20bae7e950f3c2cecafd6e2065bd47e69e2b8d96b9ecbb396ed46a21a315d685a0e712bee17aa549a15e9
-DIST pypy3-exe-7.3.2-r1-1.x86.xpak 9030835 BLAKE2B 8fe13acd6bb93a60ed3f4268c1c53e7bb0101c7f68a58ddda4f7cec8fc5d4b3df463de2fbb585adbfb04349a96807a6c34246ceab76e001bfedabaddba90750b SHA512 ab463d5df575b1b8a01fa129f96b1317de37d2a0de83d124d411be63add0a241700a918885ed7128221cadfbb0d3b0d49d32d57ec25c59ec45e26e5bb1c4c0c0
-DIST pypy3-exe-7.3.2_p37-r1-1.amd64.xpak 11864985 BLAKE2B 69fe7b080ec4fe6cf3d0e06c0d7c00c17627259d57ff02a1dc0629374f92f425889a3e40b075f48687af47e97b2504252369bd106011961337fe1708d6e35561 SHA512 673de3083be18d9f62e9586eb0daae3e1a041f245ffb17fabb0b88ee6262cdd3ffd7dc723e6b72eb42057d0bbffbcc82a5c2864e585c5a1b184983445269500e
-DIST pypy3-exe-7.3.2_p37-r1-1.x86.xpak 9126391 BLAKE2B e8b68a1ce9ada6cf9a27dfcac78564d8a3020575ce9d1db7460c8aec8097abb6624bbce594d84556525253de8c620cb8acaf7e381af48d71b97bfdcfc5759a05 SHA512 29172e3d99775af10507167cd84f120677bfa752747b8d11f5434b16aea7eac9aa06bc820949cac132a2bd6e3c69df4da8a8a6bbba9cf4fe01db6cf1b0f725c6
 DIST pypy3-exe-7.3.3-1.amd64.xpak 11716026 BLAKE2B e57bc5e4420bb3d21f8ca9076f1795f33ba79fadb9ef6020a8597ac607e1173a11e440649a5ee7e308155ca28702e95aace36d5772f7ccc1d2c66b605a0c2a1d SHA512 462c1845f4566246df96abd59f2312fcd0ae1a9cf577ed6218aada4a95133f34a93f98a627fea5245ab79d9056fce00a2903503492e8f3e652a05b5832a5b67e
 DIST pypy3-exe-7.3.3-1.x86.xpak 9041169 BLAKE2B 47a2352407387d96214b0e297cc82504afe8b64378a528349a32d751ac3acb068bbf720165dae94582816a0372d85a8e9ccd9f8d5bf03c63a9f5d8cbc9463480 SHA512 c3c44c1448be6d861ca788e17ca79a4fd68fa1751f3d1f47d2570e1d924343e35e106fee30f7da5b3e14a679f5d9048d5bc263a8ef49cac420349acad67530ed
 DIST pypy3-exe-7.3.3_p37-1.amd64.xpak 11868037 BLAKE2B d23aa2c9dabbb1032ffce4176926f6996427dae05095c0842db3ac046e2234aef160cfcb84b9f2d146b76ae7315dd7d9c3c5ac974121ee876128f8977306e513 SHA512 7e26342c64a678058030bb38c29f5534c25694619942a66f4f507a615ee2798e2f631d81345ed269d252a3e68a79536e9248444c72563dddc1dc0a293457c76f
 DIST pypy3-exe-7.3.3_p37-1.x86.xpak 9133686 BLAKE2B ae8e82cf1820e93a08c85177ba1e6547afa4e063277617efc5ce658b890526f546e7e4d5accf37f2189cc8d5203625175fb5413482c21aded7006208a57afc19 SHA512 ec5d3a521cb1d784b1083f86c0693db180f31015b56feca85bb85ab35dd3d461fc96d31ad7aaf8031ec8e0488151fbd3049cac83bc0edac5df99b062b49eb481
-DIST pypy3-exe-7.3.3_rc1-1.amd64.xpak 11732062 BLAKE2B 8e2a6fbfdf3a4ada68a3f7f4993b82ca93e254ab74c3ffe581dd8e813d96663fc172bed75019c1058e48af8b6b0cd6146847e21e854d26d1e54744cc69341d22 SHA512 673765c986b78a6a00ff913c624d9d0868f6471e1f942dfab19c61c027ea459608c76c3c5a88c8a19444e958a6b882839ab10eadc0ee0b5f02df0f6ff203518b
-DIST pypy3-exe-7.3.3_rc1-1.x86.xpak 9036319 BLAKE2B d681c12cd496c9be7aea29bc9b6fbdbe1b30c38cfa511b39eae5ffb1a9b6ff06a5a728685ea8d0c0d2083dc153bd2a0c2d934381d60a1c89ba605abc629bd11c SHA512 f15f267b0e6f6edfee8aa501f9ce486612ccbbe6b60969247b81d1d0ada014704fb383d80fd93f875f2336268131884c513c02cf7396d5388019222edf41bbd1
-DIST pypy3-exe-7.3.3_rc1_p37-1.amd64.xpak 11847540 BLAKE2B b817aac3c6a74295b4ee4c034b17600bb4400b9a50d61ff0dee1a969b68430d9121d92842435cd1e7e97b7540f343a78be95a4d857e0d8ee07c8cb4fe6388b13 SHA512 b6e1d6bbdb9092322e12e6edc190f588aef24dc90b6e332b23b9678cb68b149f4b029bf5f181b076907e9ce50b1114c4965e7636fc8e2077179c0a10e1376e7c
-DIST pypy3-exe-7.3.3_rc1_p37-1.x86.xpak 9131518 BLAKE2B 8ee4b2f2daefa62fa05e4aa1942d9241df7d983dde7200947d28aff584d71ef72be0e20dedcbf830089df20e06408dd4cd70ffc5ac5afa09631f874510e2dce5 SHA512 335bbed2c2ef109513a4f633361fe9e5e8ac5bd3302ddf03095c0692dd4332b61e0b95dad411414daa6c1b5a87ce67c98fa41b4860cfe2b3832bbf5460c4a547
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.1_p1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.1_p1.ebuild
deleted file mode 100644
index 6cd2dada56ef..000000000000
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.1_p1.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
-
-inherit pax-utils
-
-MY_P=pypy3-exe-${PV/_p/-}
-DESCRIPTION="PyPy3 executable (pre-built version)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	dev-libs/libffi:0/7
-	virtual/libintl:0/0
-	dev-libs/expat:0/0
-	app-arch/bzip2:0/1
-	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${PV}"
-
-QA_PREBUILT="
-	usr/lib/pypy3.6/pypy3-c-${SLOT}"
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/lib/pypy3.6/pypy3-c-${SLOT}"
-	pax-mark m "${ED}/usr/lib/pypy3.6/pypy3-c-${SLOT}"
-}
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2-r1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2-r1.ebuild
deleted file mode 100644
index c7525e5712c9..000000000000
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils
-
-MY_P=pypy3-exe-${PV}-r1-1
-DESCRIPTION="PyPy3 executable (pre-built version)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	dev-libs/libffi:0/7
-	virtual/libintl:0/0
-	dev-libs/expat:0/0
-	app-arch/bzip2:0/1
-	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${PV}"
-
-QA_PREBUILT="
-	usr/lib/pypy3.6/pypy3-c-${SLOT}"
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/lib/pypy3.6/pypy3-c-${SLOT}"
-	pax-mark m "${ED}/usr/lib/pypy3.6/pypy3-c-${SLOT}"
-}
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37-r1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37-r1.ebuild
deleted file mode 100644
index df3dd4d62deb..000000000000
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37-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=7
-
-inherit pax-utils
-
-MY_P=pypy3-exe-${PV}-r1-1
-DESCRIPTION="PyPy3 executable (pre-built version)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	dev-libs/libffi:0/7
-	virtual/libintl:0/0
-	dev-libs/expat:0/0
-	app-arch/bzip2:0/1
-	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${PV}"
-
-PYPY_PV=${SLOT%_p*}
-QA_PREBUILT="
-	usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
-	pax-mark m "${ED}/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3.ebuild
index 345dafd4e829..399e5e974ca6 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	dev-libs/libffi:0/7
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_rc1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_rc1.ebuild
deleted file mode 100644
index 42a9408164ef..000000000000
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_rc1.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
-
-inherit pax-utils
-
-MY_P=pypy3-exe-${PV}-1
-DESCRIPTION="PyPy3 executable (pre-built version)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS=""
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	dev-libs/libffi:0/7
-	virtual/libintl:0/0
-	dev-libs/expat:0/0
-	app-arch/bzip2:0/1
-	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${PV}"
-
-QA_PREBUILT="
-	usr/lib/pypy3.6/pypy3-c-${SLOT}"
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/lib/pypy3.6/pypy3-c-${SLOT}"
-	pax-mark m "${ED}/usr/lib/pypy3.6/pypy3-c-${SLOT}"
-}
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_rc1_p37.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_rc1_p37.ebuild
deleted file mode 100644
index f314389ade4a..000000000000
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_rc1_p37.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
-
-inherit pax-utils
-
-MY_P=pypy3-exe-${PV}-1
-DESCRIPTION="PyPy3 executable (pre-built version)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS=""
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	dev-libs/libffi:0/7
-	virtual/libintl:0/0
-	dev-libs/expat:0/0
-	app-arch/bzip2:0/1
-	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${PV}"
-
-PYPY_PV=${SLOT%_p*}
-QA_PREBUILT="
-	usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
-	pax-mark m "${ED}/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 06254507392c..05cd65eecdc9 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,7 +1,2 @@
-DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
-DIST pypy3.6-v7.3.2-src.tar.bz2 22736022 BLAKE2B e2338ac3f7af06b987c43e93eab9ff14d46262143472b0393b30b011fff67d33add45d8198cee7109354e09c52a2540938abeef364b0cf12f2891ca9c7aac2a4 SHA512 ed861a57d6edf1548c061d10295313a05d0ac54fe68a8755211ff76fa2dc78d7b1479c6152dc5d0d1cdce4e247c240c1a2edf59ec8a53d0004ec7713514c9c35
 DIST pypy3.6-v7.3.3-src.tar.bz2 22484684 BLAKE2B a252e3070ec1c7cfd708cd694bd461d56241100463bac5ff7bbcf2d2667e01990ec8b4ceb947449ab1f620d0d5a8984bd8af3e2565555e5f73218e3c35ae1ebd SHA512 3bc9d9cc362f500e9e79c2694fc355706ac44d6dd5b8f5fb4d017d0997581472a9fdda08ccbe45469c7b52facdc0512be07843ba54d1d691fdb37f6628065879
-DIST pypy3.6-v7.3.3rc1-src.tar.bz2 22401663 BLAKE2B 278b71a3b608999ee20b6558598eda453f3a87645965b8b705a11d05784722106c04b405375f62bd8e7ce2968df311314ee1672a2ddecb0f6afc49a3cbe8e670 SHA512 d865125925603e74412be7e750ab403670f05e76f2dfe6280c8b0ef123ed3e2f463d9457b65aa4f84c47a3529b2d3bca84b84307623bf995f60b549c85dcce2d
-DIST pypy3.7-v7.3.2-src.tar.bz2 25060911 BLAKE2B 35ecfee4c64e13539827c65a61e0cd359de4046f77553629cdf63479327c6ad86afd1443caa7a911a6271f496f0f3caf1b919ce91de717d0a71d008927b7f77b SHA512 563a9cf63e818b95aeb14c25b55bb5fb0bf8283f0b9f2bdd9a8833989beb651681f53f52368fb9db2c75fb60be0456eec87d48b557740b57847c4104003cb288
 DIST pypy3.7-v7.3.3-src.tar.bz2 24633503 BLAKE2B 0fb9fbb8866cf661c5b1d8d029fb2bc50737fae097875d0dac86c9ec21dc907093173b350a4f89d2c5a1fbed4c92ca4919f047536b828d4ee35583d615e7ddce SHA512 c98955e72dc0bd0452e4e16e0fe0ab318a34d6d57217ea33349e98ed047597ba97be7d15b41edd4dc85028fcca0a6257a4bb98fe96ce876e41a04df012261f4a
-DIST pypy3.7-v7.3.3rc1-src.tar.bz2 24511164 BLAKE2B 7fba1fde1bb248006f95fbb52dd9f237086f7221b99d6a288c1a32188a76ed76b1908e7f2054fd969b597c422c566214dd1e9ec409e243a776e8fa466fbf2039 SHA512 f98e7d209f75c4fa5645db16e1cc721ba80d44ad76030bd1c412800bb723ba528a83da89c8793a7e105d8391e72eeef7cb0198f9b30041178e90b628f14e5a3e
diff --git a/dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch b/dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch
deleted file mode 100644
index c143a3765cdf..000000000000
--- a/dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 913e0dae8ac7ce8219a5f31126fee8a794cc314c Mon Sep 17 00:00:00 2001
-From: Armin Rigo <arigo@tunes.org>
-Date: Sat, 26 Sep 2020 09:26:24 +0200
-Subject: [PATCH] oops, fix for test_gc_indexed_box_plus_large_offset
-
----
- rpython/jit/backend/ppc/opassembler.py | 16 +++++++++++-----
- rpython/jit/backend/ppc/regalloc.py    |  4 ++--
- 2 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/rpython/jit/backend/ppc/opassembler.py b/rpython/jit/backend/ppc/opassembler.py
-index b79b18e530..4bbfbba93a 100644
---- a/rpython/jit/backend/ppc/opassembler.py
-+++ b/rpython/jit/backend/ppc/opassembler.py
-@@ -755,13 +755,19 @@ class FieldOpAssembler(object):
-     def _apply_offset(self, index_loc, ofs_loc):
-         # If offset != 0 then we have to add it here.  Note that
-         # mc.addi() would not be valid with operand r0.
--        assert ofs_loc.is_imm()                # must be an immediate...
--        assert _check_imm_arg(ofs_loc.getint())   # ...that fits 16 bits
-         assert index_loc.is_core_reg()
-         assert index_loc is not r.SCRATCH2
--        # (simplified version of _apply_scale())
--        if ofs_loc.value > 0:
--            self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
-+        if ofs_loc.is_imm():
-+            # if it is an immediate, it must fit into 16 bits
-+            assert _check_imm_arg(ofs_loc.getint())
-+            # (simplified version of _apply_scale())
-+            if ofs_loc.value != 0:
-+                self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
-+                index_loc = r.SCRATCH2
-+        else:
-+            # larger immediates are loaded into a register in regalloc.py
-+            assert ofs_loc.is_core_reg()
-+            self.mc.add(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
-             index_loc = r.SCRATCH2
-         return index_loc
- 
-diff --git a/rpython/jit/backend/ppc/regalloc.py b/rpython/jit/backend/ppc/regalloc.py
-index f3ee1129e4..827953cf12 100644
---- a/rpython/jit/backend/ppc/regalloc.py
-+++ b/rpython/jit/backend/ppc/regalloc.py
-@@ -771,7 +771,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc):
-         value_loc = self.ensure_reg(op.getarg(2))
-         assert op.getarg(3).getint() == 1    # scale
-         ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(4))
--        assert ofs_loc.is_imm()  # the arg(4) should always be a small constant
-+        # the arg(4) is often a small constant, but it may be too large
-         size_loc = self.ensure_reg_or_any_imm(op.getarg(5))
-         return [base_loc, index_loc, value_loc, ofs_loc, size_loc]
- 
-@@ -780,7 +780,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc):
-         index_loc = self.ensure_reg(op.getarg(1))
-         assert op.getarg(2).getint() == 1    # scale
-         ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(3))
--        assert ofs_loc.is_imm()  # the arg(3) should always be a small constant
-+        # the arg(3) is often a small constant, but it may be too large
-         self.free_op_vars()
-         res_loc = self.force_allocate_reg(op)
-         size_box = op.getarg(4)
--- 
-GitLab
-
diff --git a/dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch b/dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch
deleted file mode 100644
index 68025600b1f5..000000000000
--- a/dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 5ee2925459372a8af805e952f433acd75e426325 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 4 Oct 2020 15:46:23 +0200
-Subject: [PATCH] Fix sethostname() failure when passed bytes
-
-My implementation of sethostname() was broken and failed when passed
-bytes on Python 3. Update the implementation to match CPython -- that
-is, use bytes if provided, or fsencode() when str is provided.
-
---HG--
-branch : py3.6
----
- pypy/module/_socket/interp_func.py        |  8 +++++++-
- pypy/module/_socket/test/test_sock_app.py | 12 ++++++++++++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/pypy/module/_socket/interp_func.py b/pypy/module/_socket/interp_func.py
-index bdc4f1293f..1727e51d51 100644
---- a/pypy/module/_socket/interp_func.py
-+++ b/pypy/module/_socket/interp_func.py
-@@ -392,7 +392,13 @@ if hasattr(rsocket, 'sethostname'):
- 
-         Set the host name.
-         """
--        hostname = space.text_w(w_hostname)
-+        if space.isinstance_w(w_hostname, space.w_bytes):
-+            hostname = space.bytes_w(w_hostname)
-+        elif space.isinstance_w(w_hostname, space.w_unicode):
-+            hostname = space.fsencode_w(w_hostname)
-+        else:
-+            raise oefmt(space.w_TypeError,
-+                        "sethostname() argument 1 must be str or bytes")
-         try:
-             res = rsocket.sethostname(hostname)
-         except SocketError as e:
-diff --git a/pypy/module/_socket/test/test_sock_app.py b/pypy/module/_socket/test/test_sock_app.py
-index fe3efec8e3..355fb8a2a9 100644
---- a/pypy/module/_socket/test/test_sock_app.py
-+++ b/pypy/module/_socket/test/test_sock_app.py
-@@ -210,6 +210,18 @@ def test_getaddrinfo(space, w_socket):
-     assert space.unwrap(w_l) == True
- 
- 
-+def test_sethostname(space, w_socket):
-+    space.raises_w(space.w_OSError, space.appexec,
-+                   [w_socket],
-+                   "(_socket): _socket.sethostname(_socket.gethostname())")
-+
-+
-+def test_sethostname_bytes(space, w_socket):
-+    space.raises_w(space.w_OSError, space.appexec,
-+                   [w_socket],
-+                   "(_socket): _socket.sethostname(_socket.gethostname().encode())")
-+
-+
- def test_unknown_addr_as_object(space, ):
-     from pypy.module._socket.interp_socket import addr_as_object
-     c_addr = lltype.malloc(rsocket._c.sockaddr, flavor='raw', track_allocation=False)
--- 
-GitLab
-
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild
deleted file mode 100644
index 032563a42418..000000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.6-v${PV/_/}
-DESCRIPTION="PyPy3 executable (build from source)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	low-memory? ( dev-python/pypy )
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV}
-	insinto "${dest}"/include/${PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy3-c-${PV}"
-}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild
deleted file mode 100644
index 557e38069d50..000000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.6-v${PV/_/}
-DESCRIPTION="PyPy3 executable (build from source)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	low-memory? ( dev-python/pypy )
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/pypy3-7.3.2-sethostname-bytes.patch
-	"${FILESDIR}"/pypy3-7.3.2-ppc64-segfault.patch
-)
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	if [[ ${EPYTHON} != pypy ]]; then
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV}
-	insinto "${dest}"/include/${PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy3-c-${PV}"
-}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild
deleted file mode 100644
index fd489bbaf6f4..000000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p37}
-MY_P=pypy3.7-v${PYPY_PV/_/}
-DESCRIPTION="PyPy3 executable (build from source)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	low-memory? ( dev-python/pypy )
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/pypy3-7.3.2-sethostname-bytes.patch
-	"${FILESDIR}"/pypy3-7.3.2-ppc64-segfault.patch
-)
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	if [[ ${EPYTHON} != pypy ]]; then
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.7
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV}
-	insinto "${dest}"/include/${PYPY_PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3.ebuild
index c7324db807b7..276ddef3d0c2 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.3.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1.ebuild
deleted file mode 100644
index 91441845243a..000000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.6-v${PV/_/}
-DESCRIPTION="PyPy3 executable (build from source)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS=""
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	low-memory? ( dev-python/pypy )
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	if [[ ${EPYTHON} != pypy ]]; then
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV}
-	insinto "${dest}"/include/${PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy3-c-${PV}"
-}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1_p37.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1_p37.ebuild
deleted file mode 100644
index 2676de68af9d..000000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1_p37.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p37}
-MY_P=pypy3.7-v${PYPY_PV/_/}
-DESCRIPTION="PyPy3 executable (build from source)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS=""
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	low-memory? ( dev-python/pypy )
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	if [[ ${EPYTHON} != pypy ]]; then
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.7
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV}
-	insinto "${dest}"/include/${PYPY_PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 06254507392c..05cd65eecdc9 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,7 +1,2 @@
-DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
-DIST pypy3.6-v7.3.2-src.tar.bz2 22736022 BLAKE2B e2338ac3f7af06b987c43e93eab9ff14d46262143472b0393b30b011fff67d33add45d8198cee7109354e09c52a2540938abeef364b0cf12f2891ca9c7aac2a4 SHA512 ed861a57d6edf1548c061d10295313a05d0ac54fe68a8755211ff76fa2dc78d7b1479c6152dc5d0d1cdce4e247c240c1a2edf59ec8a53d0004ec7713514c9c35
 DIST pypy3.6-v7.3.3-src.tar.bz2 22484684 BLAKE2B a252e3070ec1c7cfd708cd694bd461d56241100463bac5ff7bbcf2d2667e01990ec8b4ceb947449ab1f620d0d5a8984bd8af3e2565555e5f73218e3c35ae1ebd SHA512 3bc9d9cc362f500e9e79c2694fc355706ac44d6dd5b8f5fb4d017d0997581472a9fdda08ccbe45469c7b52facdc0512be07843ba54d1d691fdb37f6628065879
-DIST pypy3.6-v7.3.3rc1-src.tar.bz2 22401663 BLAKE2B 278b71a3b608999ee20b6558598eda453f3a87645965b8b705a11d05784722106c04b405375f62bd8e7ce2968df311314ee1672a2ddecb0f6afc49a3cbe8e670 SHA512 d865125925603e74412be7e750ab403670f05e76f2dfe6280c8b0ef123ed3e2f463d9457b65aa4f84c47a3529b2d3bca84b84307623bf995f60b549c85dcce2d
-DIST pypy3.7-v7.3.2-src.tar.bz2 25060911 BLAKE2B 35ecfee4c64e13539827c65a61e0cd359de4046f77553629cdf63479327c6ad86afd1443caa7a911a6271f496f0f3caf1b919ce91de717d0a71d008927b7f77b SHA512 563a9cf63e818b95aeb14c25b55bb5fb0bf8283f0b9f2bdd9a8833989beb651681f53f52368fb9db2c75fb60be0456eec87d48b557740b57847c4104003cb288
 DIST pypy3.7-v7.3.3-src.tar.bz2 24633503 BLAKE2B 0fb9fbb8866cf661c5b1d8d029fb2bc50737fae097875d0dac86c9ec21dc907093173b350a4f89d2c5a1fbed4c92ca4919f047536b828d4ee35583d615e7ddce SHA512 c98955e72dc0bd0452e4e16e0fe0ab318a34d6d57217ea33349e98ed047597ba97be7d15b41edd4dc85028fcca0a6257a4bb98fe96ce876e41a04df012261f4a
-DIST pypy3.7-v7.3.3rc1-src.tar.bz2 24511164 BLAKE2B 7fba1fde1bb248006f95fbb52dd9f237086f7221b99d6a288c1a32188a76ed76b1908e7f2054fd969b597c422c566214dd1e9ec409e243a776e8fa466fbf2039 SHA512 f98e7d209f75c4fa5645db16e1cc721ba80d44ad76030bd1c412800bb723ba528a83da89c8793a7e105d8391e72eeef7cb0198f9b30041178e90b628f14e5a3e
diff --git a/dev-python/pypy3/pypy3-7.3.1-r3.ebuild b/dev-python/pypy3/pypy3-7.3.1-r3.ebuild
deleted file mode 100644
index 2ec67a501228..000000000000
--- a/dev-python/pypy3/pypy3-7.3.1-r3.ebuild
+++ /dev/null
@@ -1,220 +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,8,9,10} )
-inherit pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.6-v${PV/_/}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/pypy36-pp73"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
-		dev-python/pypy3-exe-bin:${PV}
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy3-bin-7.3.0:0"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		!!dev-python/pytest-forked
-	)"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	# see http://buildbot.pypy.org/summary?branch=py3.6&builder=pypy-c-jit-linux-x86-64
-	sed -i -e 's:test_runeval_step:_&:' \
-		lib-python/3/test/test_bdb.py || die
-	sed -i -e 's:test_crashing_decode_handler:_&:' \
-		lib-python/3/test/test_codeccallbacks.py || die
-	sed -i -e 's:test_jumpy:_&:' \
-		lib-python/3/test/test_dis.py || die
-	sed -i -e 's:test_ast_line_numbers:_&:' \
-		-e 's:test_backslashes_in_string_part:_&:' \
-		lib-python/3/test/test_fstring.py || die
-	sed -i -e 's:test_listdir_bytes_like:_&:' \
-		lib-python/3/test/test_posix.py || die
-	sed -i -e 's:test_auto_history:_&:' \
-		-e 's:test_history_size:_&:' \
-		lib-python/3/test/test_readline.py || die
-	sed -i -e 's:test_pha_optional:_&:' \
-		-e 's:test_pha_required:_&:' \
-		lib-python/3/test/test_ssl.py || die
-	sed -i -e 's:test_eval_bytes_invalid_escape:_&:' \
-		-e 's:test_eval_str_invalid_escape:_&:' \
-		lib-python/3/test/test_string_literals.py || die
-	sed -i -e 's:test_jump_out_of_async_for_block:_&:' \
-		-e 's:test_jump_over_async_for_block_before_else:_&:' \
-		-e 's:test_no_jump_.*wards_into_async_for_block:_&:' \
-		-e 's:test_no_jump_into_async_for_block_before_else:_&:' \
-		-e 's:test_no_jump_from_yield:_&:' \
-		lib-python/3/test/test_sys_settrace.py || die
-	sed -i -e 's:test_circular_imports:_&:' \
-		lib-python/3/test/test_threaded_import.py || die
-
-	# fixed in git
-	sed -i -e 's:test_SOCK_CLOEXEC:_&:' \
-		lib-python/3/test/test_socket.py || die
-
-	# the first one's broken by sandbox, the second by our env
-	sed -i -e 's:test_empty_env:_&:' \
-		-e 's:test_executable:_&:' \
-		lib-python/3/test/test_subprocess.py || die
-
-	# XXX
-	sed -i -e 's:test_locale:_&:' \
-		lib-python/3/test/test_format.py || die
-	sed -i -e 's:test_decompressor_bug_28275:_&:' \
-		lib-python/3/test/test_lzma.py || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die
-	cp -p "${BROOT}"/usr/lib/pypy3.6/include/${PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy3-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	einfo "Installing PyPy ..."
-	dosym pypy3-c-${PV} "${dest}/pypy3-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy3.6/include/${PV}/*; do
-		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c-${PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy3.6/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3/pypy3-7.3.2.ebuild b/dev-python/pypy3/pypy3-7.3.2.ebuild
deleted file mode 100644
index 2f9de4aa6cc5..000000000000
--- a/dev-python/pypy3/pypy3-7.3.2.ebuild
+++ /dev/null
@@ -1,207 +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,8,9,10} )
-inherit pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.6-v${PV/_/}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/pypy36-pp73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
-		dev-python/pypy3-exe-bin:${PV}
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy3-bin-7.3.0:0"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		!!dev-python/pytest-forked
-	)"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	# see http://buildbot.pypy.org/summary?branch=py3.6&builder=pypy-c-jit-linux-x86-64
-	sed -i -e 's:test_jumpy:_&:' \
-		lib-python/3/test/test_dis.py || die
-	sed -i -e 's:test_get_and_set_scheduler_and_param:_&:' \
-		lib-python/3/test/test_posix.py || die
-	sed -i -e 's:test_auto_history:_&:' \
-		-e 's:test_history_size:_&:' \
-		lib-python/3/test/test_readline.py || die
-	sed -i -e 's:test_eval_bytes_invalid_escape:_&:' \
-		-e 's:test_eval_str_invalid_escape:_&:' \
-		lib-python/3/test/test_string_literals.py || die
-	sed -i -e 's:test_jump_out_of_async_for_block:_&:' \
-		-e 's:test_jump_over_async_for_block_before_else:_&:' \
-		-e 's:test_no_jump_.*wards_into_async_for_block:_&:' \
-		-e 's:test_no_jump_into_async_for_block_before_else:_&:' \
-		-e 's:test_no_jump_from_yield:_&:' \
-		lib-python/3/test/test_sys_settrace.py || die
-	sed -i -e 's:test_circular_imports:_&:' \
-		lib-python/3/test/test_threaded_import.py || die
-
-	# the first one's broken by sandbox, the second by our env
-	sed -i -e 's:test_empty_env:_&:' \
-		-e 's:test_executable(:_&:' \
-		-e 's:test_executable_without_cwd:_&:' \
-		lib-python/3/test/test_subprocess.py || die
-
-	# XXX
-	sed -i -e 's:test_locale:_&:' \
-		lib-python/3/test/test_format.py || die
-	sed -i -e 's:test_decompressor_bug_28275:_&:' \
-		lib-python/3/test/test_lzma.py || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die
-	cp -p "${BROOT}"/usr/lib/pypy3.6/include/${PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy3-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	einfo "Installing PyPy ..."
-	dosym pypy3-c-${PV} "${dest}/pypy3-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy3.6/include/${PV}/*; do
-		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c-${PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy3.6/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3/pypy3-7.3.2_p37.ebuild b/dev-python/pypy3/pypy3-7.3.2_p37.ebuild
deleted file mode 100644
index ac7fa39bc9bc..000000000000
--- a/dev-python/pypy3/pypy3-7.3.2_p37.ebuild
+++ /dev/null
@@ -1,178 +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,8,9,10} )
-inherit pax-utils python-any-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p37}
-MY_P=pypy3.7-v${PYPY_PV/_/}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/pypy37-pp73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
-# pypy3.7 is in alpha state and a lot of tests are failing
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
-		dev-python/pypy3-exe-bin:${PV}
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy3-bin-7.3.0:0"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		!!dev-python/pytest-forked
-	)"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}/7.3.2-py37-distutils-cxx.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die
-	cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy3-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	# (--deselect for failing doctests)
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.7
-	einfo "Installing PyPy ..."
-	dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy3.7/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3/pypy3-7.3.3.ebuild b/dev-python/pypy3/pypy3-7.3.3.ebuild
index 2f9de4aa6cc5..64ff09decb6f 100644
--- a/dev-python/pypy3/pypy3-7.3.3.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 SLOT="0/pypy36-pp73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pypy3/pypy3-7.3.3_rc1.ebuild b/dev-python/pypy3/pypy3-7.3.3_rc1.ebuild
deleted file mode 100644
index 3fea77100413..000000000000
--- a/dev-python/pypy3/pypy3-7.3.3_rc1.ebuild
+++ /dev/null
@@ -1,207 +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,8,9,10} )
-inherit pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.6-v${PV/_/}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/pypy36-pp73"
-KEYWORDS=""
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
-		dev-python/pypy3-exe-bin:${PV}
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy3-bin-7.3.0:0"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		!!dev-python/pytest-forked
-	)"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	# see http://buildbot.pypy.org/summary?branch=py3.6&builder=pypy-c-jit-linux-x86-64
-	sed -i -e 's:test_jumpy:_&:' \
-		lib-python/3/test/test_dis.py || die
-	sed -i -e 's:test_get_and_set_scheduler_and_param:_&:' \
-		lib-python/3/test/test_posix.py || die
-	sed -i -e 's:test_auto_history:_&:' \
-		-e 's:test_history_size:_&:' \
-		lib-python/3/test/test_readline.py || die
-	sed -i -e 's:test_eval_bytes_invalid_escape:_&:' \
-		-e 's:test_eval_str_invalid_escape:_&:' \
-		lib-python/3/test/test_string_literals.py || die
-	sed -i -e 's:test_jump_out_of_async_for_block:_&:' \
-		-e 's:test_jump_over_async_for_block_before_else:_&:' \
-		-e 's:test_no_jump_.*wards_into_async_for_block:_&:' \
-		-e 's:test_no_jump_into_async_for_block_before_else:_&:' \
-		-e 's:test_no_jump_from_yield:_&:' \
-		lib-python/3/test/test_sys_settrace.py || die
-	sed -i -e 's:test_circular_imports:_&:' \
-		lib-python/3/test/test_threaded_import.py || die
-
-	# the first one's broken by sandbox, the second by our env
-	sed -i -e 's:test_empty_env:_&:' \
-		-e 's:test_executable(:_&:' \
-		-e 's:test_executable_without_cwd:_&:' \
-		lib-python/3/test/test_subprocess.py || die
-
-	# XXX
-	sed -i -e 's:test_locale:_&:' \
-		lib-python/3/test/test_format.py || die
-	sed -i -e 's:test_decompressor_bug_28275:_&:' \
-		lib-python/3/test/test_lzma.py || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die
-	cp -p "${BROOT}"/usr/lib/pypy3.6/include/${PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy3-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	einfo "Installing PyPy ..."
-	dosym pypy3-c-${PV} "${dest}/pypy3-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy3.6/include/${PV}/*; do
-		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c-${PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy3.6/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3/pypy3-7.3.3_rc1_p37.ebuild b/dev-python/pypy3/pypy3-7.3.3_rc1_p37.ebuild
deleted file mode 100644
index 84cb1fd6efbf..000000000000
--- a/dev-python/pypy3/pypy3-7.3.3_rc1_p37.ebuild
+++ /dev/null
@@ -1,178 +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,8,9,10} )
-inherit pax-utils python-any-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p37}
-MY_P=pypy3.7-v${PYPY_PV/_/}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/pypy37-pp73"
-KEYWORDS=""
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
-# pypy3.7 is in alpha state and a lot of tests are failing
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
-		dev-python/pypy3-exe-bin:${PV}
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy3-bin-7.3.0:0"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		!!dev-python/pytest-forked
-	)"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}/7.3.2-py37-distutils-cxx.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die
-	cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy3-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	# (--deselect for failing doctests)
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.7
-	einfo "Installing PyPy ..."
-	dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy3.7/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 4f3ec79b219b..0eef5930be6d 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,2 +1 @@
-DIST pyquery-1.4.1.tar.gz 47983 BLAKE2B eb8d0ca59122734a4c715c33f40fd0b5fcc8edcabe9e41649ddf332feb1df603f8527a668aa7b9d78974b3d049e774355296644abd9b4d426d96e6e3c7a74065 SHA512 e2bfbbf51f99a408e9696a2b9c15f8875813847a10b5bd93c4c7a6886ac1b3ae6c7883ec4fb64e9bccab2127617843961e181044fe927f3c80c8ac363ed86141
 DIST pyquery-1.4.3.tar.gz 47448 BLAKE2B 32451dfc8f8160207b4be12006ceba3098b8cb344bfa3e80ccf75f8cfca9542614ae78b9bfec773139cbbf12434201f92f8b4738e7d9e6241b3addfeb1bc8dda SHA512 cb61326e38f78763ca15de09e3a56dad776b3d4831b54eabf295db0f9af8bf04599642c73f5db3e3172b86d7b66ba2ef626c8cba2dfb458af6ac432d15ea7cba
diff --git a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
deleted file mode 100644
index 40b40a7cab21..000000000000
--- a/dev-python/pyquery/pyquery-1.4.1-r1.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_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1 optfeature
-
-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 ppc ppc64 s390 sparc x86"
-IUSE="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="
-	test? ( ${RDEPEND}
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)"
-
-RESTRICT+=" !test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/pyquery-1.4.1-network-tests.patch"
-	"${FILESDIR}/pyquery-1.4.1-tests-pypy.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/pyquery/pyquery-1.4.3.ebuild b/dev-python/pyquery/pyquery-1.4.3.ebuild
index 52162fab2950..7d5cc91b1712 100644
--- a/dev-python/pyquery/pyquery-1.4.3.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild b/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild
index 924dbe93bb43..ba6dd384c208 100644
--- a/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pysaml2/files/cve-2020-5390.patch b/dev-python/pysaml2/files/cve-2020-5390.patch
deleted file mode 100644
index bef46808d920..000000000000
--- a/dev-python/pysaml2/files/cve-2020-5390.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 5e9d5acbcd8ae45c4e736ac521fd2df5b1c62e25 Mon Sep 17 00:00:00 2001
-From: Ivan Kanakarakis <ivan.kanak@gmail.com>
-Date: Sat, 4 Jan 2020 00:39:47 +0200
-Subject: [PATCH] Fix XML Signature Wrapping (XSW) vulnerabilities
-
-PySAML2 did not check that the signature in a SAML document is enveloped and thus
-XML signature wrapping (XSW) was effective.
-
-The signature information and the node/object that is signed can be in different places
-and thus the signature verification will succeed, but the wrong data will be used. This
-specifically affects the verification of assertions that have been signed.
-
-This was assigned CVE-2020-5390
-
-Thanks to Alexey Sintsov and Yuri Goltsev from HERE Technologies to report this.
-
-+ + + + + + + +
-
-In more detail:
-
-libxml2 follows the xmldsig-core specification. The xmldsig specification is way too
-general. saml-core reuses the xmldsig specification, but constrains it to use of
-specific facilities. The implementation of the SAML specification is responsible to
-enforce those constraints. libxml2/xmlsec1 are not aware of those constraints and thus
-process the document based on the full/general xmldsig rules.
-
-What is happening is the following:
-
-- xmldsig-core allows the signature-information and the data that was signed to be in
-  different places. This works by setting the URI attribute of the Reference element.
-  The URI attribute contains an optional identifier of the object being signed. (see
-  "4.4.3 The Reference Element" -- https://www.w3.org/TR/xmldsig-core1/#sec-Reference)
-  This identifier is actually a pointer that can be defined in many different ways; from
-  XPath expressions that need to be executed(!), to a full URL that should be fetched(!)
-  in order to recalculate the signature.
-
-- saml-core section "5.4 XML Signature Profile" defines constrains on the xmldsig-core
-  facilities. It explicitly dictates that enveloped signatures are the only signatures
-  allowed. This mean that:
-  * Assertion/RequestType/ResponseType elements must have an ID attribute
-  * signatures must have a single Reference element
-  * the Reference element must have a URI attribute
-  * the URI attribute contains an anchor
-  * the anchor points to the enclosing element's ID attribute
-
-xmlsec1 does the right thing - it follows the reference URI pointer and validates the
-assertion. But, the pointer points to an assertion in another part of the document; not
-the assertion in which the signature is embedded/enveloped. SAML processing thinks that
-the signature is fine (that's what xmlsec1 said), and gets the assertion data from the
-assertion that contains the signature - but that assertion was never validated. The
-issue is that pysaml2 does not enforce the constrains on the signature validation
-facilities of xmldsig-core, that the saml-core spec defines.
-
-The solution is simple; all we need is to make sure that assertions with signatures (1)
-contain one reference element that (2) has a URI attribute (3) that is an anchor that
-(4) points to the assertion in which the signature is embedded. If those conditions are
-met then we're good, otherwise we should fail the verification.
-
-Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com>
----
- src/saml2/sigver.py          | 49 ++++++++++++++++++++++++++++++++++++
- tests/saml2_response_xsw.xml |  6 +++++
- tests/test_xsw.py            | 44 ++++++++++++++++++++++++++++++++
- 3 files changed, 99 insertions(+)
- create mode 100644 tests/saml2_response_xsw.xml
- create mode 100644 tests/test_xsw.py
-
-diff --git a/src/saml2/sigver.py b/src/saml2/sigver.py
-index cbeca41f..c3d298a9 100644
---- a/src/saml2/sigver.py
-+++ b/src/saml2/sigver.py
-@@ -1476,6 +1476,55 @@ def _check_signature(self, decoded_xml, item, node_name=NODE_NAME, origdoc=None,
-         if not certs:
-             raise MissingKey(_issuer)
- 
-+        # saml-core section "5.4 XML Signature Profile" defines constrains on the
-+        # xmldsig-core facilities. It explicitly dictates that enveloped signatures
-+        # are the only signatures allowed. This mean that:
-+        # * Assertion/RequestType/ResponseType elements must have an ID attribute
-+        # * signatures must have a single Reference element
-+        # * the Reference element must have a URI attribute
-+        # * the URI attribute contains an anchor
-+        # * the anchor points to the enclosing element's ID attribute
-+        references = item.signature.signed_info.reference
-+        signatures_must_have_a_single_reference_element = len(references) == 1
-+        the_Reference_element_must_have_a_URI_attribute = (
-+            signatures_must_have_a_single_reference_element
-+            and hasattr(references[0], "uri")
-+        )
-+        the_URI_attribute_contains_an_anchor = (
-+            the_Reference_element_must_have_a_URI_attribute
-+            and references[0].uri.startswith("#")
-+            and len(references[0].uri) > 1
-+        )
-+        the_anchor_points_to_the_enclosing_element_ID_attribute = (
-+            the_URI_attribute_contains_an_anchor
-+            and references[0].uri == "#{id}".format(id=item.id)
-+        )
-+        validators = {
-+            "signatures must have a single reference element": (
-+                signatures_must_have_a_single_reference_element
-+            ),
-+            "the Reference element must have a URI attribute": (
-+                the_Reference_element_must_have_a_URI_attribute
-+            ),
-+            "the URI attribute contains an anchor": (
-+                the_URI_attribute_contains_an_anchor
-+            ),
-+            "the anchor points to the enclosing element ID attribute": (
-+                the_anchor_points_to_the_enclosing_element_ID_attribute
-+            ),
-+        }
-+        if not all(validators.values()):
-+            error_context = {
-+                "message": "Signature failed to meet constraints on xmldsig",
-+                "validators": validators,
-+                "item ID": item.id,
-+                "reference URI": item.signature.signed_info.reference[0].uri,
-+                "issuer": _issuer,
-+                "node name": node_name,
-+                "xml document": decoded_xml,
-+            }
-+            raise SignatureError(error_context)
-+
-         verified = False
-         last_pem_file = None
- 
-diff --git a/tests/saml2_response_xsw.xml b/tests/saml2_response_xsw.xml
-new file mode 100644
-index 00000000..3671eb48
---- /dev/null
-+++ b/tests/saml2_response_xsw.xml
-@@ -0,0 +1,6 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ns0:Response xmlns:ns0="urn:oasis:names:tc:SAML:2.0:protocol" xmlns:ns1="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Destination="http://lingon.catalogix.se:8087/" ID="id-vqOQ72JCppXaBWnBE" InResponseTo="id12" IssueInstant="2019-12-20T12:15:16Z" Version="2.0"><ns1:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">urn:mace:example.com:saml:roland:idp</ns1:Issuer><ns0:Status><ns0:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/></ns0:Status><ns1:Assertion ID="id-SPOOFED_ASSERTION" IssueInstant="2019-12-20T12:15:16Z" Version="2.0"><ns1:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">urn:mace:example.com:saml:roland:idp</ns1:Issuer><ns2:Signature Id="Signature2"><ns2:SignedInfo><ns2:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ns2:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><ns2:Reference URI="#id-Aa9IWfDxJVIX6GQye"><ns2:Transforms><ns2:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ns2:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ns2:Transforms><ns2:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ns2:DigestValue>EWBvQUlrwQbtrAjuUXkSBAVsZ50=</ns2:DigestValue></ns2:Reference></ns2:SignedInfo><ns2:SignatureValue>m4zRgTWleMcx1dFboeiYlbiDigHWAVhHVa+GLN++ELNMFDutuzBxc3tu6okyaNQGW3leu32wzbfdpb5+3RlpGoKj2wPX570/EMJj4uw91XfXsZfpNP+5GlgNT8w/elDmBXhG/KwmSO477Imk0szKovTBMVHmo3QOd+ba//dVsJE=</ns2:SignatureValue><ns2:KeyInfo><ns2:X509Data><ns2:X509Certificate>MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBFMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJg2cms7MqjniT8Fi/XkNHZNPbNVQyMUMXE9tXOdqwYCA1cc8vQdzkihscQMXy3iPw2cMggBu6gjMTOSOxECkuvX5ZCclKr8pXAJM5cY6gVOaVO2PdTZcvDBKGbiaNefiEw5hnoZomqZGp8wHNLAUkwtH9vjqqvxyS/vclc6k2ewIDAQABo4GnMIGkMB0GA1UdDgQWBBRePsKHKYJsiojE78ZWXccK9K4aJTB1BgNVHSMEbjBsgBRePsKHKYJsiojE78ZWXccK9K4aJaFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAJrzqSSwmDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6mrPzGzk3ECbupFnqyREH3+ZPSdk=</ns2:X509Certificate></ns2:X509Data></ns2:KeyInfo></ns2:Signature><ns1:Subject><ns1:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" NameQualifier="" SPNameQualifier="id12">ANOTHER_ID</ns1:NameID><ns1:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><ns1:SubjectConfirmationData InResponseTo="id12" NotOnOrAfter="2019-12-20T12:20:16Z" Recipient="http://lingon.catalogix.se:8087/"/></ns1:SubjectConfirmation></ns1:Subject><ns1:Conditions NotBefore="2019-12-20T12:15:16Z" NotOnOrAfter="2019-12-20T12:20:16Z"><ns1:AudienceRestriction><ns1:Audience>urn:mace:example.com:saml:roland:sp</ns1:Audience></ns1:AudienceRestriction></ns1:Conditions><ns1:AuthnStatement AuthnInstant="2019-12-20T12:15:16Z" SessionIndex="id-eEhNCc5BSiesVOl8B"><ns1:AuthnContext><ns1:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocolPassword</ns1:AuthnContextClassRef><ns1:AuthenticatingAuthority>http://www.example.com/login</ns1:AuthenticatingAuthority></ns1:AuthnContext></ns1:AuthnStatement><ns1:AttributeStatement><ns1:Attribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">staff</ns1:AttributeValue><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">ADMIN</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">HACKER@gmail.com</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Derek</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="surName" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Jeter</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">shortstop</ns1:AttributeValue></ns1:Attribute></ns1:AttributeStatement></ns1:Assertion>
-+<XSW_ATTACK>
-+<ns1:Assertion ID="id-Aa9IWfDxJVIX6GQye" IssueInstant="2019-12-20T12:15:16Z" Version="2.0"><ns1:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">urn:mace:example.com:saml:roland:idp</ns1:Issuer><ns1:Subject><ns1:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" NameQualifier="" SPNameQualifier="id12">ac5b22bb8eac4a26ed07a55432a0fe0da243f6e911aa614cff402c44d7cdec36</ns1:NameID><ns1:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><ns1:SubjectConfirmationData InResponseTo="id12" NotOnOrAfter="2019-12-20T12:20:16Z" Recipient="http://lingon.catalogix.se:8087/"/></ns1:SubjectConfirmation></ns1:Subject><ns1:Conditions NotBefore="2019-12-20T12:15:16Z" NotOnOrAfter="2019-12-20T12:20:16Z"><ns1:AudienceRestriction><ns1:Audience>urn:mace:example.com:saml:roland:sp</ns1:Audience></ns1:AudienceRestriction></ns1:Conditions><ns1:AuthnStatement AuthnInstant="2019-12-20T12:15:16Z" SessionIndex="id-eEhNCc5BSiesVOl8B"><ns1:AuthnContext><ns1:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocolPassword</ns1:AuthnContextClassRef><ns1:AuthenticatingAuthority>http://www.example.com/login</ns1:AuthenticatingAuthority></ns1:AuthnContext></ns1:AuthnStatement><ns1:AttributeStatement><ns1:Attribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">staff</ns1:AttributeValue><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">member</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">foo@gmail.com</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Derek</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="surName" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Jeter</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">shortstop</ns1:AttributeValue></ns1:Attribute></ns1:AttributeStatement></ns1:Assertion>
-+</XSW_ATTACK>
-+</ns0:Response>
-diff --git a/tests/test_xsw.py b/tests/test_xsw.py
-new file mode 100644
-index 00000000..9978c4d3
---- /dev/null
-+++ b/tests/test_xsw.py
-@@ -0,0 +1,44 @@
-+from datetime import datetime
-+from unittest.mock import Mock
-+from unittest.mock import patch
-+
-+from saml2.config import config_factory
-+from saml2.response import authn_response
-+from saml2.sigver import SignatureError
-+
-+from dateutil import parser
-+
-+from pytest import raises
-+
-+from pathutils import dotname
-+from pathutils import full_path
-+
-+
-+XML_RESPONSE_XSW = full_path("saml2_response_xsw.xml")
-+
-+
-+class TestAuthnResponse:
-+    def setup_class(self):
-+        self.conf = config_factory("sp", dotname("server_conf"))
-+        self.ar = authn_response(self.conf, "http://lingon.catalogix.se:8087/")
-+
-+    @patch('saml2.response.validate_on_or_after', return_value=True)
-+    def test_verify_signed_xsw(self, mock_validate_on_or_after):
-+        self.ar.issue_instant_ok = Mock(return_value=True)
-+
-+        with open(XML_RESPONSE_XSW) as fp:
-+            xml_response = fp.read()
-+
-+        self.ar.outstanding_queries = {"id12": "http://localhost:8088/sso"}
-+        self.ar.timeslack = 10000
-+        self.ar.loads(xml_response, decode=False)
-+
-+        assert self.ar.came_from == 'http://localhost:8088/sso'
-+        assert self.ar.session_id() == "id12"
-+        assert self.ar.issuer() == 'urn:mace:example.com:saml:roland:idp'
-+
-+        with raises(SignatureError):
-+            self.ar.verify()
-+
-+        assert self.ar.ava is None
-+        assert self.ar.name_id is None
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index 979f7beaf580..24c2447ca82e 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1 +1,2 @@
 DIST pyscard-1.9.9.tar.gz 145428 BLAKE2B c62d9c2f13d9f19df1b7399509efc9df2baf2da00a9dc0bd9a0b440dcef232beeb0f7da88b12e3fb8ecffeb28f268eaaa04c9d45dc3420a1071835afe7a36c95 SHA512 88c7314c10153f509eb9bf6318e62210c7182e51b531af752a402bf8d05cfa2658cc1a4e7b9385a474038ddfa5a1bfbf1f208fcd9abe02a60161ce7c757c67b2
+DIST pyscard-2.0.0.tar.gz 148326 BLAKE2B ea9e3fbe404dedd7e7290743da4dfe51196beaa7db7ce69ad47316c70afe044cbf3e32666d32786e0d68f225cc6d552b7bb5c79fc62132c6fbee502868d3a205 SHA512 cf2cda96cdbc8f1abc20f969355a9c07698c7c13d826482170f7114962cc683b3c9b8a39aa19b76b6ae1e6c6e8875407bb9fa04908a0b22c96d0b3cbd234fe0b
diff --git a/dev-python/pyscard/pyscard-2.0.0.ebuild b/dev-python/pyscard/pyscard-2.0.0.ebuild
new file mode 100644
index 000000000000..db24efa980cc
--- /dev/null
+++ b/dev-python/pyscard/pyscard-2.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Smart cards support in python"
+HOMEPAGE="https://pyscard.sourceforge.io/
+	https://github.com/LudovicRousseau/pyscard
+	https://pypi.org/project/pyscard/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="sys-apps/pcsc-lite"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/swig"
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	optfeature "Gui support" dev-python/wxpython
+	optfeature "Support of remote readers with Pyro" dev-python/pyro
+}
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index e5534afd9ce5..099907e50a93 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,2 +1 @@
-DIST pyserial-3.4.tar.gz 151657 BLAKE2B cf47aba4a6f3bb2fe39d99e72907496faa1c9f37857810fef4d826cca72c361d0e43dbc33d9cf2291a589bf0193d17355d149e6eb61b4f9e28250207708ef09a SHA512 d71dffc330704e41caac6054adf192bee2f1c119691faf2ea93fe22e8e3ba000dc4a1434293f6f80d05a5577d85b96791f656e28d5c63fb0ce6a6605467a117f
 DIST pyserial-3.5.tar.gz 159125 BLAKE2B 6be1930afc6cfecad54cd7a116a0e93085d166907acb4c2fa5b7b9485ec28cfb6dc9e7ffc13ae5628c344ef0f78c15bdd828b8d51048a484548538cf14b9da20 SHA512 c8df5e50d952d5a6dcf1d9253a6ba953e9763c545a867da66c22c90dfa015aba0194f2a8f29a229d0a5f4dc8bfeeaaab8bcfda4066ed78a18b151bc05e6ae327
diff --git a/dev-python/pyserial/pyserial-3.4.ebuild b/dev-python/pyserial/pyserial-3.4.ebuild
deleted file mode 100644
index 865d033beed6..000000000000
--- a/dev-python/pyserial/pyserial-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=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Serial Port extension"
-HOMEPAGE="https://github.com/pyserial/pyserial https://pypi.org/project/pyserial/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="examples"
-
-DOCS=( CHANGES.rst README.rst )
-
-distutils_enable_sphinx documentation --no-autodoc
-
-python_test() {
-	"${EPYTHON}" test/run_all_tests.py loop:// -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/pyserial/pyserial-3.5.ebuild b/dev-python/pyserial/pyserial-3.5.ebuild
index 66441340fc54..c15ea5b0447b 100644
--- a/dev-python/pyserial/pyserial-3.5.ebuild
+++ b/dev-python/pyserial/pyserial-3.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 IUSE="examples"
 
 DOCS=( CHANGES.rst README.rst )
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
new file mode 100644
index 000000000000..0d5e684462d4
--- /dev/null
+++ b/dev-python/pyside2-tools/Manifest
@@ -0,0 +1 @@
+DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
diff --git a/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch b/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
new file mode 100644
index 000000000000..60de6aa07ee7
--- /dev/null
+++ b/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
@@ -0,0 +1,58 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 20a5e19..575c1df 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,38 +55,6 @@ else()
+     set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}")
+ endif()
+ 
+-install(FILES "${UIC_PATH}"
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+-install(FILES "${RCC_PATH}"
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+-if (EXISTS ${DESIGNER_PATH})
+-    if (APPLE)
+-        install(DIRECTORY "${DESIGNER_PATH}"
+-                DESTINATION bin
+-                FILE_PERMISSIONS
+-                OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-                GROUP_EXECUTE GROUP_READ
+-                WORLD_EXECUTE WORLD_READ)
+-    else()
+-        install(FILES "${DESIGNER_PATH}"
+-                DESTINATION bin
+-                PERMISSIONS
+-                OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-                GROUP_EXECUTE GROUP_READ
+-                WORLD_EXECUTE WORLD_READ)
+-    endif()
+-endif()
+-
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
+                "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+                IMMEDIATE @ONLY)
+@@ -113,14 +81,6 @@ endif()
+ 
+ add_subdirectory(pylupdate)
+ 
+-# pyside2-rcc, pyside2-uic, pyside2-designer, shiboken and pyside2-lupdate entrypoints
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside_tool.py
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+ if (BUILD_TESTS)
+     enable_testing()
+     add_subdirectory(tests)
diff --git a/dev-python/pywinrm/metadata.xml b/dev-python/pyside2-tools/metadata.xml
index b13eb4608a4c..0367211e7125 100644
--- a/dev-python/pywinrm/metadata.xml
+++ b/dev-python/pyside2-tools/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
+		<email>fordfrog@gentoo.org</email>
+		<name>Miroslav Šulc</name>
 	</maintainer>
-
-	<upstream>
-		<remote-id type="pypi">pywinrm</remote-id>
-	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
new file mode 100644
index 000000000000..113f51ca1bd5
--- /dev/null
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake python-r1
+
+MY_P=pyside-setup-opensource-src-${PV}
+
+DESCRIPTION="PySide development tools (pyside2-lupdate with support for Python)"
+HOMEPAGE="https://wiki.qt.io/PySide2"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="${PYTHON_DEPS}
+	>=dev-python/pyside2-${PV}[${PYTHON_USEDEP}]
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+S=${WORKDIR}/${MY_P}/sources/${PN}
+DOCS=( README.md )
+
+# the tools conflict with tools from QT
+PATCHES=(
+	"${FILESDIR}/${P}-dont-install-tools.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	# The tests are only related to the tools that we don't install
+	local mycmakeargs=(
+		-DBUILD_TESTS=OFF
+	)
+
+	pyside-tools_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
+			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+		)
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
+	}
+
+	python_foreach_impl pyside-tools_configure
+}
+
+src_compile() {
+	pyside-tools_compile() {
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
+	}
+
+	python_foreach_impl pyside-tools_compile
+}
+
+src_install() {
+	pyside-tools_install() {
+		python_doexe "${BUILD_DIR}/pylupdate/pyside2-lupdate"
+	}
+
+	python_foreach_impl pyside-tools_install
+
+	doman pylupdate/pyside2-lupdate.1
+	einstalldocs
+}
diff --git a/dev-python/pysimdjson/pysimdjson-3.1.1.ebuild b/dev-python/pysimdjson/pysimdjson-3.1.1-r1.ebuild
index 54d8ac552454..f9707359d3de 100644
--- a/dev-python/pysimdjson/pysimdjson-3.1.1.ebuild
+++ b/dev-python/pysimdjson/pysimdjson-3.1.1-r1.ebuild
@@ -18,6 +18,6 @@ RDEPEND="
 	dev-libs/simdjson
 "
 BDEPEND="
-	dev-python/pybind11[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.6.1[${PYTHON_USEDEP}]
 "
 distutils_enable_tests pytest
diff --git a/dev-python/pyspf/pyspf-2.0.14.ebuild b/dev-python/pyspf/pyspf-2.0.14.ebuild
index 3c0c011e321d..5e9424f9e6b1 100644
--- a/dev-python/pyspf/pyspf-2.0.14.ebuild
+++ b/dev-python/pyspf/pyspf-2.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,19 +17,26 @@ LICENSE="PSF-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="ipv6 test"
+REQUIRED_USE="test? ( ipv6 )"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/authres[${PYTHON_USEDEP}]
-	|| ( dev-python/pydns:3[${PYTHON_USEDEP}]
-		 dev-python/dnspython[${PYTHON_USEDEP}] )"
-
-DEPEND="test? ( ${RDEPEND}
-	dev-python/pyyaml[${PYTHON_USEDEP}] )"
+RDEPEND="
+	dev-python/authres[${PYTHON_USEDEP}]
+	|| (
+		dev-python/pydns:3[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+	)
+"
 
-REQUIRED_USE="test? ( ipv6 )"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
 
 python_test() {
-	pushd test &> /dev/null
+	pushd test &> /dev/null || die
 	"${PYTHON}" testspf.py || die
-	popd &> /dev/null
+	popd &> /dev/null || die
 }
diff --git a/dev-python/pytaglib/pytaglib-1.4.6.ebuild b/dev-python/pytaglib/pytaglib-1.4.6.ebuild
index b5fcd98a07b5..22ac188210ad 100644
--- a/dev-python/pytaglib/pytaglib-1.4.6.ebuild
+++ b/dev-python/pytaglib/pytaglib-1.4.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/supermihi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="media-libs/taglib"
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
index e7047d94bbee..bc47f6d01781 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0"
diff --git a/dev-python/pytest-catchlog/Manifest b/dev-python/pytest-catchlog/Manifest
deleted file mode 100644
index 907bbab5b20e..000000000000
--- a/dev-python/pytest-catchlog/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pytest-catchlog-1.2.2.zip 18028 BLAKE2B aecc020f34010f20ada7a65b069b5f6de79de301dffd765a0f395127582a90e7913057332a760de38e20f273f0b1ff6dd5afb39f5b3ee1d1e2f2f1e4187eb252 SHA512 bbeeb7213898844a7956712992ddaca1e28c52fc5712339b9730f181a124af5ec90b5460981066638658246da4321840a7583ee14eec7c0482e069e2a824d031
diff --git a/dev-python/pytest-catchlog/metadata.xml b/dev-python/pytest-catchlog/metadata.xml
deleted file mode 100644
index 914300ba599d..000000000000
--- a/dev-python/pytest-catchlog/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pytest-catchlog</remote-id>
-		<remote-id type="github">eisensheng/pytest-catchlog</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
deleted file mode 100644
index f325c910ead8..000000000000
--- a/dev-python/pytest-catchlog/pytest-catchlog-1.2.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=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin to catch log messages, fork of pytest-capturelog"
-HOMEPAGE="https://pypi.org/project/pytest-catchlog/ https://github.com/eisensheng/pytest-catchlog"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-python/py-1.1.1[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${COMMON_DEPEND}
-		>=dev-python/pytest-2.7.1[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${COMMON_DEPEND}
-	!dev-python/pytest-capturelog"
-
-python_test() {
-	PYTEST_PLUGINS=${PN/-/_} py.test -v -v test_pytest_catchlog.py || die
-}
diff --git a/dev-python/pytest-django/pytest-django-4.1.0.ebuild b/dev-python/pytest-django/pytest-django-4.1.0.ebuild
index 88ffee151019..8d0ebd87e457 100644
--- a/dev-python/pytest-django/pytest-django-4.1.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
index 6baff98a1a94..8b377bc5f540 100644
--- a/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
+++ b/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
index 766f053251d8..af65ff38f613 100644
--- a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
+++ b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-faulthandler/archive/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index c44588580b2d..e170c2298fb5 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1 +1,4 @@
 DIST pytest-mock-3.3.1.tar.gz 27551 BLAKE2B 9e3602b988c0e27caa295d42d7400cbe7e3e30392511e662fa6ec16ec9fa4ef776d3e64b63b0345d1b520f753c6776103f507f91f0bad022544bfccc510b7e6b SHA512 ffd53974f82f725cf3bdbe750c1deb568ad1a12a67532eca93ff28d80b1cbcd8ebf709985f5473717c9d54345b251c1627c0567821e9e8b9e102db5c16cf7421
+DIST pytest-mock-3.4.0.tar.gz 28115 BLAKE2B 0a7f9098955d57f7121c04f7ab706dd67eb52d8ec0b2254552460eb90b2e3fef3cd3b925cf46619532ffe7bede2f208bf822e465647f3ac4504566c18ff58a75 SHA512 5456b60bdd06a63859232b28aeb79be643e8298e69ae103cb6e194891987e01b17771ad895dfead97fa45531959689fb202bb1ebc9ba44491098760c10d1ef43
+DIST pytest-mock-3.5.0.tar.gz 28903 BLAKE2B 39490d30546ad7419a16309a60cc7a3d8090cb38c11ca89d41034264147501fcd1ca52b26d391425df043b7234a0dc0b1255b973f93c8f40898a19d364df2e77 SHA512 ca85c49144a2dba83b4e3c5cfc5a82ddb631429271a4b87af686ba738f8137fe87db22121e4c04d04038c0bc786a555e882bfea21d667d1ed9f67c21b208d4ce
+DIST pytest-mock-3.5.1.tar.gz 29135 BLAKE2B f9eb37bff0965772919c359ad56a0cdd0cac24fa763685c42ffaa2dfaea183a9c0be480269cbfc80990baaf406021c541b6dccc09602e98c8f731bbd530e928a SHA512 28ab2f239d3dfee134dd4e4fd467109cf3c76cb60aeb537dbc0c21b9a7619d068d54737e33d98c585e9341588fdafba4737ea5f428af37796f55e61ec30373a7
diff --git a/dev-python/pytest-mock/pytest-mock-3.4.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.4.0.ebuild
new file mode 100644
index 000000000000..ef73c45364a2
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-3.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE=""
+
+RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	if has_version dev-python/mock; then
+		# test fails when standalone mock is installed
+		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i tests/test_pytest_mock.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-mock/pytest-mock-3.5.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.5.0.ebuild
new file mode 100644
index 000000000000..dd6f090d9b47
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-3.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE=""
+
+RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	if has_version dev-python/mock; then
+		# test fails when standalone mock is installed
+		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i tests/test_pytest_mock.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-mock/pytest-mock-3.5.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.5.1.ebuild
new file mode 100644
index 000000000000..dd6f090d9b47
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-3.5.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE=""
+
+RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	if has_version dev-python/mock; then
+		# test fails when standalone mock is installed
+		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i tests/test_pytest_mock.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index c6a37346fed9..8e1814254183 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1,2 +1,2 @@
-DIST pytest-regressions-2.0.1.tar.gz 77934 BLAKE2B 4bf9868afd3bae1ab1668a6cb75bbc661336b3bd7dca23b0b6e0ab810cb60645737e45008c74a09f90763869982db5d819f170f6b251d9419681ceee810c4657 SHA512 9c35f356ef2c2914674b022b4a357ec75a4a12c8090c44d959111f1eaa1f10f492f8103098b273292bff08a5957d7f2ae3f0b0bd051438d6467ce1491f234d97
 DIST pytest-regressions-2.0.2.tar.gz 78362 BLAKE2B 67c37c49230d5b84869b0743ef5e4c6b83cc7869ab12832cef9ac4a09c7199d141e064809e6532e325c3b4b22385468ecdde3ea0a021523930c849b78e4bd8f7 SHA512 8c9959a9d84fb6c055b90b38ad6aabdf8e9459931ca50c959f395280199aaa707844330d26b33467119e77f3d50a51d76dd648fdb351de9228c8d54dc047c92e
+DIST pytest-regressions-2.1.1.tar.gz 97596 BLAKE2B a0c62ec1a0c1f66d0539780008a99bcf7fb0f9bd6d73198154c9a1ebe9830679d4fb57f989a2ac03c19cce7ac617db26c07857581d2bf753fbe18358a9edcecc SHA512 488bf42502ad18995c1f1e7f32677c500d14869cc0e2655400610bf18b73f48538025c08fc23758737ebb92deba61b130a1f6f82a75f71d93f03181ccd74a9c4
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.0.1.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.1.1.ebuild
index bee9fb4ea19a..a12c39205f38 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.0.1.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 BDEPEND="test? (
 	dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -29,10 +29,14 @@ RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests pytest
+distutils_enable_tests --install pytest
 distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
 
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
+python_prepare_all() {
+	# Does not work with the panda's version in ::gentoo
+	sed -i -e 's:test_non_numeric_data:_&:' \
+		-e 's:test_non_pandas_dataframe:_&:' \
+		tests/test_dataframe_regression.py || die
+
+distutils-r1_python_prepare_all
 }
diff --git a/dev-python/pytest-salt/Manifest b/dev-python/pytest-salt/Manifest
index 040d7f4ef999..e03d478fdd39 100644
--- a/dev-python/pytest-salt/Manifest
+++ b/dev-python/pytest-salt/Manifest
@@ -1,2 +1 @@
-DIST pytest-salt-2019.2.1.post1.tar.gz 63824 BLAKE2B 684e1dee6df8f7459bfa1747ea017973d72bc69b87d22c65509ecada47469a94ce410034004a5df1396d5ed05557ddec90e34cb18792235babb5e0cf6d72d776 SHA512 7b9939c3bd1cbcb6d6d0b086c39e02deadd8b3c6fcc359924af7fa5afc2e443b927269b82aa5575413e4e6bbc052f4035fb17ab68dac59ea309320c0a647d36d
 DIST pytest-salt-2020.1.27.tar.gz 64141 BLAKE2B 2b9261af2de28f8dce1abcd71b586594075916c8a5dbb27a24f15b9d95a575624be118d1c742f02020d3b968ffa4654cf6cd0dabefffe6876b87a4d1d58c3d60 SHA512 b0632e21f1ea5c3b57eb681cd8b270721cafd270321b708fca65427fc89817ed9e9a4216a520f35988c6866b1ed76ed84838009da9052a11cf8782d4dcf118ba
diff --git a/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild b/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild
deleted file mode 100644
index 92206fbaf89b..000000000000
--- a/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.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_{6,7,8,9,10} )
-MY_PV="${PV/_p/.post}"
-inherit distutils-r1
-
-DESCRIPTION="PyTest Salt Plugin"
-HOMEPAGE="https://github.com/saltstack/pytest-salt"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.2.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..71efc8a7e92a
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild
@@ -0,0 +1,37 @@
+# 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,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
+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 ~x64-macos"
+
+# pytest-xdist >= 2 fails with pytest < 6
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-services-conflict.patch
+)
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index dbd7e63de4a1..244a69782e7b 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,2 +1 @@
-DIST pytest-xprocess-0.16.0.tar.gz 17218 BLAKE2B 60411ed5af2add7f7c7f6b6e2074f9703cdae8a450c65eda483635a1cf8f60a3dbd84218d9e99bb3783ae00ba50b3449335df92397dab0fc7281ea72d3f5696b SHA512 3cf5d05c6693ebddc91fb2ad62eacd5b8f231e78ee82908b20268367649d6d73f0c1fbbf93a31f97feabe8bddf02cb176b2ffb9f6de4387b46cd0b97ad3c3eea
 DIST pytest-xprocess-0.17.0.tar.gz 19186 BLAKE2B 071063267d88d8ddd56c3b8ab7b2e6bebae321ac741e63336721cd13045688cef56909737c73b5cec27805b4f7dd93cdd7f467071966b3d864d0a1f270e821d0 SHA512 c85bb7bd8373b5b5119083fca46b8f173efe3b6f6cde5db8365e567e717f47f6f9230d2cf5ecfddb014aedd628aee75023f4da3077fa3ffb26b3c7bfc61d57c9
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.16.0.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.16.0.ebuild
deleted file mode 100644
index be74ca926bf6..000000000000
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.16.0.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_{6,7,8,9,10} 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/pytest-xprocess/pytest-xprocess-0.17.0.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild
index 600bda459bec..be74ca926bf6 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 1a28961a671a..e0dadfcfa54d 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,3 +2,4 @@ DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
 DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1
 DIST pytest-6.2.0.tar.gz 1101619 BLAKE2B c59d5c23c70aaa7670eb0e96cd5d57c6cdf21f2cdfacc2fb9c01a6baf211f85e5f757d7087589db2dc9a6f0b387ec7b25da5816d4cffc86f6e2c3c08b9f07f59 SHA512 58315bb5f9a696f5196da08912a0f32fd367ea11987d37ff74b0d00d961bb706e0d3604bc7c25a762e4ee66bd46ef4389b50eca11b3109406c169aefff395d51
+DIST pytest-6.2.1.tar.gz 1102958 BLAKE2B 336757fe911e2bfa1041d7d9c1f83ce66418c55bbe0a1accdac45a36ed5ace972f124bc5f68d2847e3d310bcb2e68a8ced04c74e818ff6f1d43c3ba8b915332d SHA512 abd130212411e0a26265aec922958053e41d05d09d14942b75c1ba81d0ad7c5115d851110a257b32f0b05a2d515961ad068a1fd65f7e275cfe65d16150d008a6
diff --git a/dev-python/pytest/pytest-6.2.0.ebuild b/dev-python/pytest/pytest-6.2.0.ebuild
index 161e76e304f4..fb6b915b2e32 100644
--- a/dev-python/pytest/pytest-6.2.0.ebuild
+++ b/dev-python/pytest/pytest-6.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-6.2.1.ebuild b/dev-python/pytest/pytest-6.2.1.ebuild
new file mode 100644
index 000000000000..52b01fb04b29
--- /dev/null
+++ b/dev-python/pytest/pytest-6.2.1.ebuild
@@ -0,0 +1,62 @@
+# 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,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="https://pytest.org/"
+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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+	dev-python/iniconfig[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+# flake cause a number of tests to fail
+DEPEND="
+	>=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+python_prepare_all() {
+	# fragile to warnings from other packages (setuptools)
+	# little value for us to run it
+	sed -i -e 's:test_no_warnings:_&:' \
+		testing/test_meta.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing --via-root
+
+	"${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index 28f4a139e0ff..dfe666214717 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,2 +1 @@
-DIST python-bugzilla-3.0.1.tar.gz 112600 BLAKE2B b8c81b1b3f16e9b180763dcad8615c2847bf11c2a424d1fe4995091b466c202c23c072659066f66830d6d80a96a864e4148daa7a099edd2962f28345b9c9a8af SHA512 b372aa142e9e3eb456f4bba7cbc71056304ae333635c9ae85605bdcae1e5e92e13263500dba0f844c9c577bcede8ea988a753bfe23e016c8da17f3b6e9efdf3f
 DIST python-bugzilla-3.0.2.tar.gz 115324 BLAKE2B 3f64af96bf61d16e720338055391b187f53a968488535e76a5d6e56817030fc1c45f824ed27424b3e7440dc03759e77bcb8d417fa2278aa611b995bea2775f7a SHA512 c4fb79c9ca4d813a5dd9573e9a300aa01ea713fa11d43e2ee7ca13efb4720fed14fff339e9cc1b756505f43348768f0fdaaa8ae0b370640ff70e402f852e9b1a
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.0.1.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.0.1.ebuild
deleted file mode 100644
index bd796807e455..000000000000
--- a/dev-python/python-bugzilla/python-bugzilla-3.0.1.ebuild
+++ /dev/null
@@ -1,25 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
-HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-LICENSE="GPL-2+"
-SLOT="0"
-
-RDEPEND="
-	|| ( dev-python/python-magic[${PYTHON_USEDEP}] sys-apps/file[python,${PYTHON_USEDEP}] )
-	dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
index 9244b1382f78..3eff74cea3e0 100644
--- a/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
 HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.1-r2.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.1-r2.ebuild
index 4ec93bb5d8bf..d9b2306c055c 100644
--- a/dev-python/python-dateutil/python-dateutil-2.8.1-r2.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
index c014acfdc99c..c3915bebb832 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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,9,10} )
-
 inherit distutils-r1
 
 DESCRIPTION="Gettext support, themed icons and scrollkeeper-based documentation in distutils"
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 5ba8afa11981..fd28ddac1231 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -2,4 +2,6 @@ DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709
 DIST python-3.6.12-docs-html.tar.bz2 6013089 BLAKE2B dc1c9f702bdd8be619c3cd6fd0f8cab022b8d7542ace7a7b7f63b9642f693c63b036f03248cf7ea0108ab7e33655379ca906c8ef7c35d8242517ead721a83778 SHA512 da28da84f5e8f889f328fafb4d17beb6cfc52c5703bcf5080cfbaea552f414d6f0a682aaacb2f04fa32e9453a1bdaae8ff108c38a4486170bd0edf1efacafdf7
 DIST python-3.7.9-docs-html.tar.bz2 6285801 BLAKE2B bc76a90bed3f9126a63fc76bc7ec858b90dcf827eb0af19652ee987aa3feeef9de71be0e14b33f98ee5733b9eeecd3d6ec01837fcbab31d505e389ea99d6fd0a SHA512 243327bdcb85b696fccf20b3cb841b398a672f07e34f441323418651ead58ab3346eff39e78501130b5d97e5d87fb72c945a9c4b9082b26577f33bd095791d55
 DIST python-3.8.6-docs-html.tar.bz2 6578280 BLAKE2B efdc62b2d570cbe7e69be1cf118250ee89f1b09af7e7db306970e764dcc9e6f20bda9230fe934ecc0891a1d79370294bc42170713b9471d05f23a468f09015fc SHA512 be0d61a9556fbdd24ab124cfdf220b3bdb537cc02d5896f8f4c75cb73e3cfd5c2947c060d049b57bf5576b4b2d1c7f0f3987070d70ce883dea023e1feab1a630
+DIST python-3.8.7-docs-html.tar.bz2 6583700 BLAKE2B 7509e4bb530f272653f0efcc6582628f80e60ddf143085cc8fb9492a686d8de2be599be3e0a38ae0271526704c04e7bbe0bc064dbbf6712d03b8f4166f6e8cda SHA512 317217948168d870dee57f2b1633c5d3dbd1a54963f5595dda4cccdf902ea48bbc70369f98e2c03958047a76966aabf9842b87adade21bb1fc5ec01c3db694f1
 DIST python-3.9.0-docs-html.tar.bz2 6771373 BLAKE2B 301b8687043277a3d11dc497985769efdeaf33f8af2fc3d52b8a0b50322851402c1a1b273e782db6bd7ac51bbd94f7345c0995d0dd4f4d37bce10351620c6f6e SHA512 d04957f4895ab8f6bef8467d8b5282e0b3e5c453e2168c25123ee7aefd7a3d6d8b918e9f455bbf82913370a00181b8c00998ec2ae67c763aeda237c5b3a42097
+DIST python-3.9.1-docs-html.tar.bz2 6806786 BLAKE2B 0101e59fd25bd57e8abbb9f289b2b48a7db8e4ad9a74e51e3c8977f85a0d5d731624fe61fdc376048166e1ffaadd69c8e97acc677024a9bb711ba958a5c43cef SHA512 aa87b27b895894281b923031af651d26627526f85e61fe09c88be081ff6471ae367364cea176b1e522e065c6ec98372504f769aa1d40382716004f90c3761d97
diff --git a/dev-python/python-docs/python-docs-2.7.18.ebuild b/dev-python/python-docs/python-docs-2.7.18.ebuild
index 2804f868635a..69b83c700c31 100644
--- a/dev-python/python-docs/python-docs-2.7.18.ebuild
+++ b/dev-python/python-docs/python-docs-2.7.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/python-docs/python-docs-3.6.12.ebuild b/dev-python/python-docs/python-docs-3.6.12.ebuild
index 2804f868635a..69b83c700c31 100644
--- a/dev-python/python-docs/python-docs-3.6.12.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/python-docs/python-docs-3.7.9.ebuild b/dev-python/python-docs/python-docs-3.7.9.ebuild
index 2804f868635a..69b83c700c31 100644
--- a/dev-python/python-docs/python-docs-3.7.9.ebuild
+++ b/dev-python/python-docs/python-docs-3.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/python-docs/python-docs-3.8.6.ebuild b/dev-python/python-docs/python-docs-3.8.6.ebuild
index 2804f868635a..69b83c700c31 100644
--- a/dev-python/python-docs/python-docs-3.8.6.ebuild
+++ b/dev-python/python-docs/python-docs-3.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/python-docs/python-docs-3.8.7.ebuild b/dev-python/python-docs/python-docs-3.8.7.ebuild
new file mode 100644
index 000000000000..bfc00bc95def
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.8.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/dev-python/python-docs/python-docs-3.9.0.ebuild b/dev-python/python-docs/python-docs-3.9.0.ebuild
index 16f1d2327d67..69b83c700c31 100644
--- a/dev-python/python-docs/python-docs-3.9.0.ebuild
+++ b/dev-python/python-docs/python-docs-3.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.9.1.ebuild b/dev-python/python-docs/python-docs-3.9.1.ebuild
new file mode 100644
index 000000000000..bfc00bc95def
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.9.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/dev-python/python-dotenv/metadata.xml b/dev-python/python-dotenv/metadata.xml
index 59968d569b92..c9fedbb35a60 100644
--- a/dev-python/python-dotenv/metadata.xml
+++ b/dev-python/python-dotenv/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Gentoo Python Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">python-dotenv</remote-id>
 	</upstream>
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index 979aae20708b..813d1c7e6ac0 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -1,2 +1 @@
-DIST python-email-validator-1.1.1.tar.gz 18497 BLAKE2B a65a5603854920d022062fb4f1575eafe7274e5501ae00fdb58a53a75c6582353ce2c46e20a6a172e7a4a1bbe2b25515b543ace2af4151102c5201ff1ac27132 SHA512 fb4dc5b728adca6041129aa3eecb3efbb358ecf47bf383737936132df7b24c3b9e47e56918d375d8eb4a2535d56ce22c9e03dc126dafd8894911b43fe30f5162
 DIST python-email-validator-1.1.2.tar.gz 19421 BLAKE2B 118165ceed5da6fed377180662496f5bc996f1d3c2201e6a014cae8f66a9ff3f447900aff07f778fdec49cd0c680ad6f9316f30f6c152b7eed4f1f57adc1ba74 SHA512 b40f8ecd65a9a5945a1a84b174398fc495afccd27ad5fcd7b4a03ecd26bcff6dd6ac3b5f75ac200cf2647b92d4defb25afe1dda28f82ed86bd8c2bd82708d0aa
diff --git a/dev-python/python-email-validator/metadata.xml b/dev-python/python-email-validator/metadata.xml
index 198746921202..2d7bd09b0a29 100644
--- a/dev-python/python-email-validator/metadata.xml
+++ b/dev-python/python-email-validator/metadata.xml
@@ -18,6 +18,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">JoshData/python-email-validator</remote-id>
 		<remote-id type="pypi">email-validator</remote-id>
diff --git a/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild b/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild
deleted file mode 100644
index c2a39fbf1fed..000000000000
--- a/dev-python/python-email-validator/python-email-validator-1.1.1.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,7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A robust email syntax and deliverability validation library"
-HOMEPAGE="https://github.com/JoshData/python-email-validator"
-SRC_URI="https://github.com/JoshData/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="CC0-1.0"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# deliverability tests fail within network-sandbox
-	sed -e 's:test_deliverability_:_&:' \
-		-i tests/test_main.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-email-validator/python-email-validator-1.1.2.ebuild b/dev-python/python-email-validator/python-email-validator-1.1.2.ebuild
index 7231c79f312c..6f87447f91a0 100644
--- a/dev-python/python-email-validator/python-email-validator-1.1.2.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/JoshData/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="CC0-1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/python-ethtool/Manifest b/dev-python/python-ethtool/Manifest
deleted file mode 100644
index d42a9219ab7b..000000000000
--- a/dev-python/python-ethtool/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-ethtool-0.14.tar.gz 41945 BLAKE2B d83e40e79481ee5f91f7e097dc4f6f0eb541f88ba83e13c13b3129ece2196ee999f9110310339ebbc2343b814a3b2c80405a3b4ce6931110509a54281b370cd8 SHA512 57a3f2d60dd8309192fc858614645d4e7533c90c03113ffc1eeeb810b86eb71b0a80b4eb209d3452c7624c5318a853de50d9d716d41334bf079e6e3e2490fd4b
diff --git a/dev-python/python-ethtool/files/test-skip-wg-dev.patch b/dev-python/python-ethtool/files/test-skip-wg-dev.patch
deleted file mode 100644
index 435a81ae494d..000000000000
--- a/dev-python/python-ethtool/files/test-skip-wg-dev.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From aa18c4a046ed2b508a87161f886e07c6d3716dd3 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Sat, 2 Feb 2019 14:00:52 -0800
-Subject: [PATCH] tests/test_ethtool.py: skip test_get_active_devices for wg
-
-wg is a wireguard interface and this test fails with
-OSError: [Errno 95] Operation not supported
----
- tests/test_ethtool.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_ethtool.py b/tests/test_ethtool.py
-index 6162cd3..0ff78b1 100755
---- a/tests/test_ethtool.py
-+++ b/tests/test_ethtool.py
-@@ -254,8 +254,8 @@ class EthtoolTests(unittest.TestCase):
- 
-     def test_get_active_devices(self):
-         for devname in ethtool.get_active_devices():
--            # Skip these test on tun devices
--            if devname.startswith('tun'):
-+            # Skip these test on tun and wg devices
-+            if devname.startswith('tun') or devname.startswith('wg'):
-                 continue
-             self._functions_accepting_devnames(devname)
- 
--- 
-2.20.1
-
diff --git a/dev-python/python-ethtool/metadata.xml b/dev-python/python-ethtool/metadata.xml
deleted file mode 100644
index 3223afaa38c2..000000000000
--- a/dev-python/python-ethtool/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		Python bindings for the ethtool kernel interface, that allows querying and
-		changing of Ethernet card settings, such as speed, port, auto-negotiation, and
-		PCI locations.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">ethtool</remote-id>
-		<remote-id type="github">fedora-python/python-ethtool</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/python-ethtool/python-ethtool-0.14.ebuild b/dev-python/python-ethtool/python-ethtool-0.14.ebuild
deleted file mode 100644
index f5b4e5b03d1b..000000000000
--- a/dev-python/python-ethtool/python-ethtool-0.14.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,9,10} )
-
-# TODO: install scripts and their man pages
-
-inherit distutils-r1
-
-DESCRIPTION="Ethernet settings python bindings"
-HOMEPAGE="https://pypi.org/project/ethtool/
-	https://github.com/fedora-python/python-ethtool"
-SRC_URI="https://github.com/fedora-python/python-ethtool/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-libs/libnl:3"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/test-skip-wg-dev.patch )
-
-python_test() {
-	esetup.py test || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index a1b03f58df3c..131f10648e05 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1 +1,2 @@
 DIST python-evdev-1.3.0.tar.gz 85018 BLAKE2B ba5c391631ecf8cc0a46f21830209c59b1217940ff25e051e027bc8896d71965a394f222f4e3d629ba2a2f8056ccbdc0dfaf43a37684d7157c7456d61f2d8314 SHA512 392fb4fabed344e6db4e257d4cfc7043393efda15d940be80b013e4c4e350334148a7b04aa0a7239f824ad2c7e0bb057c5cff1c0f320d30b25b0c9aab65a6891
+DIST python-evdev-1.4.0.tar.gz 86010 BLAKE2B 958d85f852e88a27fd22ec2511ba1367a69141f294d96f55d45fb5da176c539aef09a6c65d31be87581d0176571c7bd1ca84d580e920e460c3ca810d8efa45be SHA512 a98552bb1c5075c73ebb0a2a3a0fb241e061ed476d5342c8e8e23b3da86fa769a7d5d8027cfa243542d8b62efb89a9b1daf1c4768173295cd466714e4c53029d
diff --git a/dev-python/python-evdev/python-evdev-1.4.0.ebuild b/dev-python/python-evdev/python-evdev-1.4.0.ebuild
new file mode 100644
index 000000000000..76b4e2d9cc22
--- /dev/null
+++ b/dev-python/python-evdev/python-evdev-1.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for evdev bindings"
+HOMEPAGE="https://python-evdev.readthedocs.io/"
+SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils-r1_python_compile build_ecodes \
+		--evdev-headers \
+		"${SYSROOT}"/usr/include/linux/input.h:"${SYSROOT}"/usr/include/linux/input-event-codes.h
+}
+
+python_test() {
+	# test_uinput requires write access to /dev/uinput
+	pytest -vv --deselect tests/test_uinput.py ||
+		die "tests failed for ${EPYTHON}"
+}
diff --git a/dev-python/python-fastimport/python-fastimport-0.9.8-r1.ebuild b/dev-python/python-fastimport/python-fastimport-0.9.8-r1.ebuild
index 2b70bacf34a0..71db95b60706 100644
--- a/dev-python/python-fastimport/python-fastimport-0.9.8-r1.ebuild
+++ b/dev-python/python-fastimport/python-fastimport-0.9.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
index ca7c09e451ae..b67edf42ee39 100644
--- a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
+++ b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
index f6e2573f25eb..32c97cef70ea 100644
--- a/dev-python/python-jsonrpc-server/Manifest
+++ b/dev-python/python-jsonrpc-server/Manifest
@@ -1,2 +1 @@
-DIST python-jsonrpc-server-0.3.4.tar.gz 26123 BLAKE2B 5d3c7b910cc91999f7f03a70a1f954decd11801b4dad39cb940625a3456fb69a8e6a146c128d29d347f1513a9f27208f1f39208d3449443be8278e0d175e6598 SHA512 a00af318baf89fe38ececc2080d7b3af8c2476280f9eb89670e5b0d3ceac046573be964bc2882c1b1894edc8ab4cb5fd69366980abe17bb1df857181821bcbd0
 DIST python-jsonrpc-server-0.4.0.tar.gz 26491 BLAKE2B 524dbd0692861bff538d9db06facda4bdad74c84d3c047a374db658adc31eeb799ba0c4b0219597b04c75cd6e2db3968ba0cf4084ba235509c2457c22b3e1497 SHA512 062e5b75253b95e64918a9da86ad7e29d8a29019670e451b9a28d44cde064339953004c343be0e7dd40968ec9fc2420b5722265f56c2db8057d0f1eaf088dacc
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
deleted file mode 100644
index af49b611959b..000000000000
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python 2 and 3 asynchronous JSON RPC server"
-HOMEPAGE="https://github.com/palantir/python-jsonrpc-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
-
-RDEPEND="~dev-python/ujson-1.35[${PYTHON_USEDEP}]"
-
-DEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove-pytest-cov-dep.patch
-	"${FILESDIR}"/${P}-Python-3.8-fixes-for-endpoint-and-tests-37.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index 00ae8568c062..925cd99e9a40 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1,3 +1,2 @@
-DIST python-language-server-0.34.1.tar.gz 70238 BLAKE2B 55ec41875907bb6c09f682c8ce6165e7e2fab5d03c3d4758bcbe658968aeeee7f0316a472efe68ddd87872b0e2d34908c8a7e9528aa5eec6d3359b2565a2cbbc SHA512 12404753f4271ec3606cee535ba8e886037bf0c61cc5c4415358066be837e2248f6393124340551387cba7351dee924b4f5ebc9c4e35b1ab0943067968967a90
-DIST python-language-server-0.35.1.tar.gz 72944 BLAKE2B fe469e5365dec4a2192a2ca2f75fc9f05476434c0f6db26d851521149053455b256678ed98c5f1209d30b262808b615a3f7ac77fb604adf1455203e40f93c96f SHA512 278f281c8c82729ad60db2785b3f4b64568de529edb7a6f1b5683d09838ea43ed79182c50e42210e766b9a3f3c10b0c0256121b9925803c45f9e948f144ca994
 DIST python-language-server-0.36.1.tar.gz 74524 BLAKE2B 3337bf4c91204302b26b2496bc79ae6e0c18143f89ef97861dd91760b27406eba8fc9895a2f00c5c2de3a990eeb8ba29ba10319262466a42b1fb362af809060f SHA512 4a8150cf1334e9b2085e9b4ca7165404f30127339bd0fe8db229924c67933bfcd7827a875136b1694a82d4f447255862df116bc6d74a51df8e1ed82a6875914b
+DIST python-language-server-0.36.2.tar.gz 74499 BLAKE2B 0bf950e236f8f898c3158afc2b3355948340639b607f474654b0334d484170a210b6e81c7508f12368223ae9915ccf19f76a1bcde41503230d8c008ba0818b47 SHA512 ee909d9332ef76c616d727ebfa36e80fd03ab57df8fc57265de21f0105cc0b64a518b2a8a582f88364d03a7d2a66e1030bcf5b3452ad3a891a3141da9b338373
diff --git a/dev-python/python-language-server/python-language-server-0.34.1.ebuild b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
deleted file mode 100644
index 4d54b93a7343..000000000000
--- a/dev-python/python-language-server/python-language-server-0.34.1.ebuild
+++ /dev/null
@@ -1,69 +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,9,10} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="An implementation of the Language Server Protocol for Python"
-HOMEPAGE="https://github.com/palantir/python-language-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	>=dev-python/jedi-0.17.0[${PYTHON_USEDEP}]
-	<dev-python/jedi-0.18.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	>=dev-python/python-jsonrpc-server-0.3.2[${PYTHON_USEDEP}]
-	~dev-python/ujson-1.35[${PYTHON_USEDEP}]
-"
-
-DEPEND="test? (
-	dev-python/autopep8[${PYTHON_USEDEP}]
-	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
-	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-	dev-python/yapf[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dependencie
-	sed -i -e '16,18d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	elog "To get additional features, optional runtime dependencies may be installed:"
-	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-language-server/python-language-server-0.36.1.ebuild b/dev-python/python-language-server/python-language-server-0.36.1.ebuild
index 461e07e738bd..7b5fb183bba3 100644
--- a/dev-python/python-language-server/python-language-server-0.36.1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.36.1.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/python-language-server/python-language-server-0.35.1-r1.ebuild b/dev-python/python-language-server/python-language-server-0.36.2.ebuild
index 5e5b991658e8..dfc4e92376f9 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.36.2.ebuild
@@ -6,7 +6,6 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-
 inherit distutils-r1 optfeature
 
 DESCRIPTION="An implementation of the Language Server Protocol for Python"
@@ -15,7 +14,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? (
@@ -40,7 +39,7 @@ BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
 )"
 
 RDEPEND="
-	>=dev-python/jedi-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
 	<dev-python/jedi-0.18.0[${PYTHON_USEDEP}]
 	dev-python/pluggy[${PYTHON_USEDEP}]
 	>=dev-python/python-jsonrpc-server-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-libevdev/Manifest b/dev-python/python-libevdev/Manifest
index 774520416af4..ea7597caa32c 100644
--- a/dev-python/python-libevdev/Manifest
+++ b/dev-python/python-libevdev/Manifest
@@ -1 +1,2 @@
 DIST python-libevdev-0.8.tar.bz2 30375 BLAKE2B b59a705d49a54d5f98bca3bdf97038128df35294d4e62ffe058021c4da846e75a372660a4beef7e83dbf5b16a4d7d9195547f713bd290b14ca28ecd9291ac641 SHA512 c3c35e82b78f8968c930883a99def348a012a05ea122ac24e757441e81079f7c12bd50d96e8cec7b799a2d775d834859f924e8d1dc5841c718c050287fd1beb0
+DIST python-libevdev-0.9.tar.bz2 31496 BLAKE2B 4802f1528c104b0717f3f3a450e6e704232d5045ac285b96eb3eb690f120969ea0f23eae1da6013b260627f18b3e58e55a5017401928149e9cc581d9a84fad70 SHA512 77dcb18c393fd7962887d477292ec359c65404ae126624dc5ab201528e53b9fab565d5c6acfe2908f4a03a29e09fad862220246b91a92cc5f69768a31d1ca808
diff --git a/dev-python/python-libevdev/python-libevdev-0.8.ebuild b/dev-python/python-libevdev/python-libevdev-0.8.ebuild
index 6f38c4cebf31..70f65dab3f81 100644
--- a/dev-python/python-libevdev/python-libevdev-0.8.ebuild
+++ b/dev-python/python-libevdev/python-libevdev-0.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-libevdev/python-libevdev-0.9.ebuild b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
new file mode 100644
index 000000000000..03cafabf9f90
--- /dev/null
+++ b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrappers for the libevdev library"
+HOMEPAGE="https://gitlab.freedesktop.org/libevdev/python-libevdev"
+SRC_URI="https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? ( dev-libs/libevdev )
+"
+PDEPEND="dev-libs/libevdev"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-linux-procfs/Manifest b/dev-python/python-linux-procfs/Manifest
index cf7f084be080..9c5966272ecc 100644
--- a/dev-python/python-linux-procfs/Manifest
+++ b/dev-python/python-linux-procfs/Manifest
@@ -1 +1,2 @@
 DIST python-linux-procfs-0.6.1.tar.xz 18540 BLAKE2B efda66e0264db15b0c1904b9dca631683d089207abe57d165a25e71f68194c249a22394c997a13a71b0333aa27dbe7ac1b47488f715e22655d0f9217346d7ce7 SHA512 14f7510828d5a3eea1a8267041b604046392dbb8d7980b03b4d10bdefa88a89a5f69acdfea77255ba664c2ef33ce52273490214b3f76d2865e7b1dcc83e8e265
+DIST python-linux-procfs-0.6.3.tar.xz 18808 BLAKE2B 02fdc0349dd456819f67f82d6836a44e3285e16d9654dd52b58ac7d86e48bc559feda18f105db7911ac5f670fd0e6cfd5c6cc69a958a3e8494813ff244f8b06f SHA512 18e42bf12456893740c5ec950ffcca86945b1ff202a6ea3ae6ac800145771a39b4ab7e8bbb440210d48d0fe9de646e334095afd0b20060e2e28ab3fa844f6140
diff --git a/dev-python/python-linux-procfs/python-linux-procfs-0.6.3.ebuild b/dev-python/python-linux-procfs/python-linux-procfs-0.6.3.ebuild
new file mode 100644
index 000000000000..d136157d1e00
--- /dev/null
+++ b/dev-python/python-linux-procfs/python-linux-procfs-0.6.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python classes to extract information from the Linux kernel /proc files"
+HOMEPAGE="
+	https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/
+	https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/"
+SRC_URI="https://cdn.kernel.org/pub/software/libs/python/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index e542f5527179..283444ccdb98 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1 +1,3 @@
 DIST python-magic-0.4.18.gh.tar.gz 856291 BLAKE2B 882c86d3e8995d1e1b6168637a01f4f8bc86f23390b1c67248baf46d16d574a41789938ccdf0acd83db0652678ab0fa0f6e043eb2c4a75743e5d448e80530da5 SHA512 d5f0047c7537ce0598537629c60aa708623480792d489fa003328b5c6c5b0d42748b6e996f27dc2c164c598813fcf19393567e7ea266a9f0718cf2ddafbd33ac
+DIST python-magic-0.4.19.gh.tar.gz 863519 BLAKE2B 2e777612d55256ba955e199fc6734f6e68b8cf996222820192cf9730b2c274b2f6be2d5fe58c92cce741047d77b79b0447c5961a056e1788d924d34cedba1d40 SHA512 1d78077fe02b4ab8c8aa1720064f2b5d19f304310ca88c1fada2dbafa5118820b6d7e3f031e3d7df5394ad480872d8bcd33489fec1ce2e6e0d9d84a7325040f1
+DIST python-magic-0.4.20.gh.tar.gz 863539 BLAKE2B 27f345b138068a44670456209b9f87e9715c475787bcfff396c711cb0f768ee83599b9e6ebbc4c0c73c6867c3653518938b51116d28e3d77a758a6d1b860c7b9 SHA512 3927958a6957177d1a6e8bcbbb3723f489018f9037b619bbf7478ab68ba2ddd52d9a0caf18e6a73671e8e5e1cb8a9efb957756ba9547a7dd66ab6ba293f37826
diff --git a/dev-python/python-magic/python-magic-0.4.18.ebuild b/dev-python/python-magic/python-magic-0.4.18.ebuild
index ee16886a8589..7278b47f5221 100644
--- a/dev-python/python-magic/python-magic-0.4.18.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-magic/python-magic-0.4.19.ebuild b/dev-python/python-magic/python-magic-0.4.19.ebuild
new file mode 100644
index 000000000000..023fc69a8768
--- /dev/null
+++ b/dev-python/python-magic/python-magic-0.4.19.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Access the libmagic file type identification library"
+HOMEPAGE="https://github.com/ahupp/python-magic"
+SRC_URI="
+	https://github.com/ahupp/python-magic/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-apps/file[-python]"
+BDEPEND="
+	test? ( sys-apps/file )
+"
+
+python_test() {
+	local -x LC_ALL=en_US.UTF-8
+	"${EPYTHON}" test/test.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-magic/python-magic-0.4.20.ebuild b/dev-python/python-magic/python-magic-0.4.20.ebuild
new file mode 100644
index 000000000000..023fc69a8768
--- /dev/null
+++ b/dev-python/python-magic/python-magic-0.4.20.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Access the libmagic file type identification library"
+HOMEPAGE="https://github.com/ahupp/python-magic"
+SRC_URI="
+	https://github.com/ahupp/python-magic/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-apps/file[-python]"
+BDEPEND="
+	test? ( sys-apps/file )
+"
+
+python_test() {
+	local -x LC_ALL=en_US.UTF-8
+	"${EPYTHON}" test/test.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-memcached/python-memcached-1.59-r1.ebuild b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
index 11576a8ef04c..0ff4d639aedb 100644
--- a/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/linsomniac/python-memcached/archive/${PV}.tar.gz ->
 
 LICENSE="OSL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
index dea3a027c3a0..607aa961f1c5 100644
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild b/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
index 1954ca69ad80..ed5c9617699e 100644
--- a/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
+++ b/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
+inherit distutils-r1 qmake-utils
 
 DESCRIPTION="Python binding for libpoppler-qt5"
 HOMEPAGE="https://github.com/frescobaldi/python-poppler-qt5"
@@ -21,3 +21,12 @@ RDEPEND="
 	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+
+python_compile() {
+	distutils-r1_python_compile build_ext --qmake-bin=$(qt5_get_bindir)/qmake
+}
+
+python_install() {
+	export PATH=$(qt5_get_bindir):$PATH
+	distutils-r1_python_install
+}
diff --git a/dev-python/python-prctl/Manifest b/dev-python/python-prctl/Manifest
deleted file mode 100644
index 96b511176133..000000000000
--- a/dev-python/python-prctl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-prctl-1.7.tar.gz 25922 BLAKE2B 2d0ccc2174c62a74fcffec1115f3d157b6579c8f7dc138aacecc2d7ee479d71954b04cf1f7d881c1212d1f63c22aad800db07756e2803de2deac7eeb5d0d2742 SHA512 f2a18fc8e9ef469722c6618d5dd6b7b558d4060783e6fb3a8dc868d9ed3fa21ade371f94a4538a24dca92a71f623a96638c96882d9cf0d3d499a9f12dae8538a
diff --git a/dev-python/python-prctl/metadata.xml b/dev-python/python-prctl/metadata.xml
deleted file mode 100644
index b3b1ac9d28ad..000000000000
--- a/dev-python/python-prctl/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">seveas/python-prctl</remote-id>
-		<remote-id type="pypi">python-prctl</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/python-prctl/python-prctl-1.7.ebuild b/dev-python/python-prctl/python-prctl-1.7.ebuild
deleted file mode 100644
index 702b9c48a4cf..000000000000
--- a/dev-python/python-prctl/python-prctl-1.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Control process attributes through prctl"
-HOMEPAGE="https://github.com/seveas/python-prctl"
-SRC_URI="https://github.com/seveas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-libs/libcap"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index 1751c8394142..63fcc4b26f08 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1 +1,3 @@
 DIST python-socks-1.1.0.gh.tar.gz 1358296 BLAKE2B c599095a7f687ba1bba6f0ddbbc8ef2e680cb6be4e5d2250fad88c3a3273fb2044712045b20c5a358ed9dcbaef07e5133b6d672698d8caf4b978c9e633a5df70 SHA512 e38594815e5f943f810862dfe5d07a802601e41e879f68b4fa70c8087be0387a91e99e1b0578f2819557832b5e53be9773043a9617c72017c41e9377c4f35ef1
+DIST python-socks-1.1.2.gh.tar.gz 29948 BLAKE2B c110cd8d5d055aa30a63cdade10e7e67b0d6f0b1b17e76ff40bfb85563c90e026f0169a7e943d1391d75e20d7dd715ab070a6adf9e1e247eccf906d63c324e66 SHA512 c62259e86e7afeba7ee3ef5cdca104846352137e5d5bfa6f475e2ac38b21fe1766aee6a1fcb6b9f725576613ce3d92663fab3682516b96caa3948a05d89333a7
+DIST python-socks-1.2.0.gh.tar.gz 31969 BLAKE2B f967d8100513455533132e7bb276a8f15a8486656c04493cb803640951d2cedaa0b9229386322846ff8992cfd13cf04470b017a615f33392880a4285c9ecd041 SHA512 c5db92b22ef1edef3a22b7ce79975e66f379da2bd8e9a629a15dc2995dfaef3d99d93eaf768ef593b6a7571ad580397290274e319707f36a883a9bcad20434b1
diff --git a/dev-python/python-socks/python-socks-1.1.2.ebuild b/dev-python/python-socks/python-socks-1.1.2.ebuild
new file mode 100644
index 000000000000..e4ed0055394c
--- /dev/null
+++ b/dev-python/python-socks/python-socks-1.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
+HOMEPAGE="
+	https://pypi.org/project/python-socks/
+	https://github.com/romis2012/python-socks/"
+SRC_URI="
+	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# tests rely on connecting to Internet
+RESTRICT="test"
+
+# trio, curio are not packaged
+# asyncio is the only backend we have, so dep on its deps unconditionally
+RDEPEND="dev-python/async_timeout[${PYTHON_USEDEP}]"
+#BDEPEND="
+#	test? (
+#		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+#		dev-python/yarl[${PYTHON_USEDEP}]
+#	)"
+
+#distutils_enable_tests pytest
diff --git a/dev-python/python-socks/python-socks-1.2.0.ebuild b/dev-python/python-socks/python-socks-1.2.0.ebuild
new file mode 100644
index 000000000000..e4a5b571d8c0
--- /dev/null
+++ b/dev-python/python-socks/python-socks-1.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9}  )
+inherit distutils-r1
+
+DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
+HOMEPAGE="
+	https://pypi.org/project/python-socks/
+	https://github.com/romis2012/python-socks/"
+SRC_URI="
+	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# tests rely on connecting to Internet
+RESTRICT="test"
+
+# trio, curio are not packaged
+# asyncio is the only backend we have, so dep on its deps unconditionally
+RDEPEND="dev-python/async_timeout[${PYTHON_USEDEP}]"
+#BDEPEND="
+#	test? (
+#		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+#		dev-python/yarl[${PYTHON_USEDEP}]
+#	)"
+
+#distutils_enable_tests pytest
diff --git a/dev-python/python-stdnum/Manifest b/dev-python/python-stdnum/Manifest
index 6fd6bbf0eda9..253bf45853f9 100644
--- a/dev-python/python-stdnum/Manifest
+++ b/dev-python/python-stdnum/Manifest
@@ -1 +1,2 @@
 DIST python-stdnum-1.14.tar.gz 953637 BLAKE2B 5772fd2284dc9c255b544c6f0d1f4d1ebbaa48547cf1ba9aafb082a4d649ce90574444b298a333c9fbac5e232d2ea144f2e5bbd817fb6e7b78ea66081ed871b2 SHA512 d17643a2e4d8efc5f554c9c114399802e6dae0ff60b6ab0e32ebf6ece7c87a96287dd1c2e68e4fcd97f8ab475a267de5dad41d726470690255a2a0aeddedbb8e
+DIST python-stdnum-1.15.tar.gz 1037630 BLAKE2B 7d4bc086a5c0e272b7c55ed5bead9561375b6410b286c6d1d78e49dfc1473a9021646fbd363cfa532bc3eb1a54284b253f46ab28f60d2d411efa0992772a02a0 SHA512 e6f1d921e8ce64a11f9c5572e7eabc27bd7c71c34017fb795c45fa585701fcc78ff81c15b1a9bd48b8d9975e1fbc354b3923942c6f81e8fe4dfb8f611e3ab9cc
diff --git a/dev-python/python-stdnum/metadata.xml b/dev-python/python-stdnum/metadata.xml
index 4180b93bc2c0..77379138db30 100644
--- a/dev-python/python-stdnum/metadata.xml
+++ b/dev-python/python-stdnum/metadata.xml
@@ -5,6 +5,10 @@
 		<email>cedk@gentoo.org</email>
 		<name>Cédric Krier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<use>
 		<flag name="vies">Enable VIES</flag>
diff --git a/dev-python/python-stdnum/python-stdnum-1.15.ebuild b/dev-python/python-stdnum/python-stdnum-1.15.ebuild
new file mode 100644
index 000000000000..4387f343abb0
--- /dev/null
+++ b/dev-python/python-stdnum/python-stdnum-1.15.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A module to handle standardized numbers and codes"
+HOMEPAGE="https://arthurdejong.org/python-stdnum/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vies"
+
+RDEPEND="
+	vies? (
+		|| (
+			dev-python/zeep[${PYTHON_USEDEP}]
+			dev-python/suds[${PYTHON_USEDEP}]
+		)
+	)"
+
+DOCS=( ChangeLog NEWS README )
+
+distutils_enable_tests nose
diff --git a/dev-python/python-termstyle/Manifest b/dev-python/python-termstyle/Manifest
deleted file mode 100644
index 916c511af9a5..000000000000
--- a/dev-python/python-termstyle/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-termstyle-0.1.10.tar.gz 5025 BLAKE2B af652f560f3c6657ca01080cdaece77af7a1ecdf0758cf777035427197142b04a7d39a249da6eee90dc06cc2d15ca484c8b1d086c8e32e761acb8adc0eeccf3f SHA512 a0ed484da8da10c7fe1b8422a26861fb115dc29c49ce79c113053f913d3371edf6222de1ccf40e6aa34c3cfa9da5805eb3928fb07bfae18a13683621d7547743
diff --git a/dev-python/python-termstyle/files/tests-unicode.patch b/dev-python/python-termstyle/files/tests-unicode.patch
deleted file mode 100644
index 4cb410fa1984..000000000000
--- a/dev-python/python-termstyle/files/tests-unicode.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/test2.py b/test2.py
-index 2d84c37..1331545 100755
---- a/test2.py
-+++ b/test2.py
-@@ -2,4 +2,4 @@
- 
- from termstyle import *
- 
--print green(u"unicod\xe9!")
-+print green(u"unicod\xe9!".encode('utf-8'))
diff --git a/dev-python/python-termstyle/metadata.xml b/dev-python/python-termstyle/metadata.xml
deleted file mode 100644
index 65c58f5c98aa..000000000000
--- a/dev-python/python-termstyle/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="github">timbertson/termstyle</remote-id>
-		<remote-id type="pypi">python-termstyle</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild b/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
deleted file mode 100644
index a19ff0e44050..000000000000
--- a/dev-python/python-termstyle/python-termstyle-0.1.10.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=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="console colouring for python"
-HOMEPAGE="https://gfxmonk.net/dist/0install/python-termstyle.xml"
-SRC_URI="https://github.com/timbertson/${PN#*-}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/termstyle-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/tests-unicode.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ "${EPYTHON}" = "python2.7" ]]; then
-		"${PYTHON}" test2.py || die "test2.py failed under ${EPYTHON}"
-	else
-		"${PYTHON}" test3.py || die "test3.py failed under ${EPYTHON}"
-	fi
-}
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index 0b9fd897533a..a3c4462082c4 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,2 +1,3 @@
 DIST python-utils-2.3.0.tar.gz 19384 BLAKE2B 1746deadc8dbaf49a6499fe9c79d25c2b5cfea68e2d1b7ab6f88aa72807eedcdb338058e24a7822c6360dea36f1a044145572443c57f43f4cfed765a76e48f0b SHA512 482ccf9c635a0cbe603b69488a364d9033f8b7fada279d901725b5bf91ac13b1cd4a6b7e8d5834a9355d97d8b0803397d5e13da2b7ba72f8d8e2f7f39fee027a
 DIST python-utils-2.4.0.tar.gz 22230 BLAKE2B 1c144f62a009a2470ec43341283048842cba61f1b677e8b1d197d3ef39dd1d890b364e63ed8da0b30ad5560d335ab0eb2dfc329ff6dfea86c0f64e909de730b9 SHA512 bfad0ef30383df634b89bb2206a00e45434eff9fee9ba0eeab99361bacfb56f3fb420019608b639713a7e8777870de75becb1d7b48aa09c582df27f9ebe8c512
+DIST python-utils-2.5.1.tar.gz 115307 BLAKE2B 2938b9f188c92d407baf09147338ea2c54b9c70c5a8746f14cd4d4b5026e6bd7bab418c9cde6c99ae4c4072da6967033bf59ed32acb0e21bfb5aacff8640620e SHA512 886ed6c1c7027012c1e5a59dfe3f81ac2b07974cc5869b5cb8f5fc91f8ca733acf0ee03dbb559be69a389228974d713666ced950ec766117075aa5ea781216fb
diff --git a/dev-python/python-utils/metadata.xml b/dev-python/python-utils/metadata.xml
index c7bf1301509a..cae4936d9777 100644
--- a/dev-python/python-utils/metadata.xml
+++ b/dev-python/python-utils/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">python-utils</remote-id>
diff --git a/dev-python/python-utils/python-utils-2.4.0.ebuild b/dev-python/python-utils/python-utils-2.4.0.ebuild
index fe9e77638406..e11d2c22edc6 100644
--- a/dev-python/python-utils/python-utils-2.4.0.ebuild
+++ b/dev-python/python-utils/python-utils-2.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/python-utils/python-utils-2.5.1.ebuild b/dev-python/python-utils/python-utils-2.5.1.ebuild
new file mode 100644
index 000000000000..56e5d6e34044
--- /dev/null
+++ b/dev-python/python-utils/python-utils-2.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of small Python functions & classes"
+HOMEPAGE="https://pypi.org/project/python-utils/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	find . -name '__pycache__' -prune -exec rm -r {} + || die "Cleaning __pycache__ failed"
+	find . -name '*.pyc' -delete || die "Cleaning *.pyc failed"
+	sed -i -e '/--cov/d' -e '/--flake8/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index cfa068ce6e15..d3192658fcb9 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,2 +1 @@
-DIST python-xlib-0.28.tar.bz2 203306 BLAKE2B f8916fd0c62c8b4546f1c381fc9f13b1e86c4ae6da06434b666f4952ae6a28f06389b006d48dc3139f9018cc3c126ab8316b968e64da7b2f4d22bcc2a2c83bb9 SHA512 69c17486ffc465c2f5ca740761f52191b4ba86b1e11b047f146f949d8431a0ad7fb1007b7fe29fd659dc2e7be6facc9ea1d7b1e87cd534ae425555f0d512c4c2
 DIST python-xlib-0.29.tar.bz2 209322 BLAKE2B 4d94d99c8094947ce1acb84f3adc28ab4b6e9d6aaf61317b625e50578ece3800f6462551f8656b194d5635e3e35a5d6fec86d4eb553d7b65684a7f74fdf0dc14 SHA512 6275deb2c1e2068d560c45803e651fef9910b5cb921e043ed8204878a1f885b92122b6af3d4ac33f220231c1933d3150524169d0078f64b74df29a8f617d953a
diff --git a/dev-python/python-xlib/python-xlib-0.28.ebuild b/dev-python/python-xlib/python-xlib-0.28.ebuild
deleted file mode 100644
index 1523cedb4366..000000000000
--- a/dev-python/python-xlib/python-xlib-0.28.ebuild
+++ /dev/null
@@ -1,39 +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,9,10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A fully functional X client library for Python, written in Python"
-HOMEPAGE="https://github.com/python-xlib/python-xlib"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( sys-apps/texinfo )"
-
-# DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests unittest
-
-python_compile_all() {
-	use doc && emake -C doc/info
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_install_all() {
-	use doc && doinfo doc/info/*.info
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-xlib/python-xlib-0.29.ebuild b/dev-python/python-xlib/python-xlib-0.29.ebuild
index 9cb42563a4dc..3785b5235c47 100644
--- a/dev-python/python-xlib/python-xlib-0.29.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="doc"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python2-ldap/python2-ldap-3.2.0.ebuild b/dev-python/python2-ldap/python2-ldap-3.2.0-r1.ebuild
index 3f2035ecb4c2..c9ece8f23309 100644
--- a/dev-python/python2-ldap/python2-ldap-3.2.0.ebuild
+++ b/dev-python/python2-ldap/python2-ldap-3.2.0-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 MY_PN=python-ldap
@@ -37,6 +38,7 @@ RDEPEND="
 # We do not link against cyrus-sasl but we use some
 # of its headers during the build.
 BDEPEND="
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
 	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
 	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
 "
diff --git a/dev-python/python3-saml/Manifest b/dev-python/python3-saml/Manifest
index 23148cdb8a93..69a6b153fe44 100644
--- a/dev-python/python3-saml/Manifest
+++ b/dev-python/python3-saml/Manifest
@@ -1 +1,2 @@
+DIST python3-saml-1.10.0.tar.gz 503005 BLAKE2B 88be9b00082d00c86081432dd6789c0f040e8e210d3d1de218f8bf7a41cf32acce6aa90f92b6e083142a2a5c8f820eb9f8b6e880e742400b8bb83e7eb28db392 SHA512 82d15ef4315d25b38506177cbb4ef095a0546705035491847597b353486e119026c700f5d4d22764c93646f645e13d93d75bd3541c2c5b31343bcee35a42ead3
 DIST python3-saml-1.9.0.tar.gz 497106 BLAKE2B c3b282be835dcd0590125563ed0380bbb5d486aeffd60fa0d6a1e7d22b25ffaa03a1bea555520b1465b27b352df0936d21b919ce73a3671d63f07a52b3efdb37 SHA512 a5171258b917c02f10a0c420a19fe6829a034df1dfd87135351b9c187314dca2f973012f49056f391444aba76306adfd48cd77a859274d5cbd2a8c23a00af78d
diff --git a/dev-python/python3-saml/metadata.xml b/dev-python/python3-saml/metadata.xml
index 1a6678536c89..a2f500152178 100644
--- a/dev-python/python3-saml/metadata.xml
+++ b/dev-python/python3-saml/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">python3-saml</remote-id>
 		<remote-id type="github">onelogin/python3-saml</remote-id>
diff --git a/dev-python/python3-saml/python3-saml-1.10.0.ebuild b/dev-python/python3-saml/python3-saml-1.10.0.ebuild
new file mode 100644
index 000000000000..f1a10c7dfa20
--- /dev/null
+++ b/dev-python/python3-saml/python3-saml-1.10.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="OneLogin's SAML Python Toolkit"
+HOMEPAGE="https://github.com/onelogin/python3-saml
+	https://pypi.org/project/python3-saml/"
+SRC_URI="https://github.com/onelogin/python3-saml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/isodate-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+	>=dev-python/python-xmlsec-1.0.5[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	# unpin deps
+	sed -i -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pythonz-bd/Manifest b/dev-python/pythonz-bd/Manifest
deleted file mode 100644
index b824e97c8b4c..000000000000
--- a/dev-python/pythonz-bd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pythonz-bd-1.11.4.tar.gz 86065 BLAKE2B 1b7710129a6c764693cf3092725e78a7f6321ecf1bd0323644f421ee4f1c3c1a1b6defb805fbb137e58001c9869d9fe9d124978d60127a6672bb54903fd2027b SHA512 de945a1a49094eb6f4f1d0a2dbab4d5e73b60eb4a5d5461c4368fd46e05bf97df7177f7bcecfe963600016f9641e4233ace15a2c231f658ed8eeb771ddb51ab7
diff --git a/dev-python/pythonz-bd/metadata.xml b/dev-python/pythonz-bd/metadata.xml
deleted file mode 100644
index a93a7bd51adb..000000000000
--- a/dev-python/pythonz-bd/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pythonz-bd</remote-id>
-		<maintainer status="unknown">
-			<email>saghul@gmail.com</email>
-			<name>saghul</name>
-		</maintainer>
-		<remote-id type="github">berdario/pythonz</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild b/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
deleted file mode 100644
index e4230942696c..000000000000
--- a/dev-python/pythonz-bd/pythonz-bd-1.11.4.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage python installations in your system, berdario's shallow fork"
-HOMEPAGE="
-	https://github.com/berdario/pythonz/tree/bd
-	https://pypi.org/project/pythonz-bd/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="$(python_gen_cond_dep 'dev-python/resumable-urlretrieve[${PYTHON_USEDEP}]' 'python3*')"
diff --git a/dev-python/pytoml/Manifest b/dev-python/pytoml/Manifest
deleted file mode 100644
index 40c2846be911..000000000000
--- a/dev-python/pytoml/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pytoml-0.1.20.tar.gz 8529 BLAKE2B ebd2ea0ec2ca3477371622a003b6a84d3b108c0a36b76e2fb656a8cc59406c39d0158986aef5aafb39036624871f3185041a1314866f17fda1d28cd8e7cde802 SHA512 9b913219e65e2329302455a1457a39cf5eb37e04c03025dfdbb81db4ffe60b547fb7e64fc961608004900365ccfddb4225042105fa2db8bd2e393fa2797fc24f
-DIST toml-test-b212790a6b7367489f389411bda009e5ff765f20.tar.gz 19525 BLAKE2B 4a0a90406c4388a4834f33b637569d156b1ed6b0006b77b44dfcc6968349b745217ce40405aad5680a690bb9c5ffb2dfd7e716ecf214a7354e7727a212914a72 SHA512 94dc6ddadac2c75095b1a9ef7c4f68e38908bfadba53203b75c29c7aa8d3c387c1f05cf9915c2c63eeee869f4290cdcef4b8768cb36dcd4031168b5af549bb54
diff --git a/dev-python/pytoml/metadata.xml b/dev-python/pytoml/metadata.xml
deleted file mode 100644
index 7a2b1e3dc871..000000000000
--- a/dev-python/pytoml/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">avakar/pytoml</remote-id>
-		<remote-id type="pypi">pytoml</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pytoml/pytoml-0.1.20.ebuild b/dev-python/pytoml/pytoml-0.1.20.ebuild
deleted file mode 100644
index e3b791d64a4e..000000000000
--- a/dev-python/pytoml/pytoml-0.1.20.ebuild
+++ /dev/null
@@ -1,27 +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,9,10} )
-inherit distutils-r1
-
-TOML_TEST_COMMIT="b212790a6b7367489f389411bda009e5ff765f20"
-
-DESCRIPTION="A TOML-0.4.0 parser/writer for Python"
-HOMEPAGE="https://github.com/avakar/pytoml"
-SRC_URI="https://github.com/avakar/pytoml/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/avakar/toml-test/archive/${TOML_TEST_COMMIT}.tar.gz -> toml-test-${TOML_TEST_COMMIT}.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	cp -R ../toml-test-${TOML_TEST_COMMIT}/* test/toml-test/ || die
-	${EPYTHON} test/test.py || die
-}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 3a48efaff2ff..fc14521af6c7 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,3 +1,2 @@
-DIST pytools-2020.4.3.tar.gz 62980 BLAKE2B 692d3aec649c89e473754ceeb13d141df6709f287ae45ae793d84de4321ba13a7fca766456a99f2134e81be4e3a084169f0e1f8f8b9595182efbaab89aefb616 SHA512 4f162114fee298812c0f63b0af1c4113fa1636b6dd4bb750b18decb60d7ad89adc2e460b9861c46ee1c8e11ca3ec437836ff173abe4436ba7784f18b1d6455a6
 DIST pytools-2020.4.4.tar.gz 61208 BLAKE2B e124ae0f2c6be9c760ac178f2043e2d63af7e1eaa79e343b52dc183724bac7e869185d14d43a79efb91cfc55f39c81747581c61badbcb8cbd3d02d6e9a9a79a0 SHA512 32dc47a5a6c39c806c0bc4ffc34a41a1bb51ada537dbba36cfefad7f4370793879b3cb143b37d6fd3542aad0d64ac663cca4c8f7a05db36a9522e9919a1ef3d1
-DIST pytools-2020.4.tar.gz 67157 BLAKE2B 57fd583a7d5cc1337e20fedb5bc1c53c4025a01e7d4e3a5b05a0770a86e2bcabdde31dd535321215cf1bf2c7f3ed0b54e2407583bea63b63ca5b829f590a00be SHA512 66dea0d67c99c152edd7cd44e1262b6d163f065f5a4b697a5997f7453145af8fb0539d8eafa606fa18128908ce933c724b51bd1a76a6f7ab02e27db24496dc4c
+DIST pytools-2021.1.tar.gz 62003 BLAKE2B 2938359365082d9475cfb51586c78d3dce264cf0e8b1cf3fea0c7c688570c6e25c9a558b78977c35331ee89afd23ab7eb44a8702b3908eea160b07747646cc53 SHA512 c365cbb65b756869407f7f053112cb9732aeb138493172f2b90563a4f45e6d993557e54de2165a463931b8e2bd29c3ccd32c059702f21fb59e3dee74c19efd8f
diff --git a/dev-python/pytools/pytools-2020.4.4.ebuild b/dev-python/pytools/pytools-2020.4.4.ebuild
index cb1dd7a7c86e..87d7e057d4e1 100644
--- a/dev-python/pytools/pytools-2020.4.4.ebuild
+++ b/dev-python/pytools/pytools-2020.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytools/pytools-2020.4.ebuild b/dev-python/pytools/pytools-2020.4.ebuild
deleted file mode 100644
index 2deae366f545..000000000000
--- a/dev-python/pytools/pytools-2020.4.ebuild
+++ /dev/null
@@ -1,25 +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,9,10} )
-PYTHON_REQ_USE='sqlite'
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND=">=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2020.4.3.ebuild b/dev-python/pytools/pytools-2021.1.ebuild
index dcc622b21365..efb48472495c 100644
--- a/dev-python/pytools/pytools-2020.4.3.ebuild
+++ b/dev-python/pytools/pytools-2021.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,9 +17,10 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND=">=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytz-python2/pytz-python2-2020.1.ebuild b/dev-python/pytz-python2/pytz-python2-2020.1-r1.ebuild
index 19827940fbb1..2ef835328db8 100644
--- a/dev-python/pytz-python2/pytz-python2-2020.1.ebuild
+++ b/dev-python/pytz-python2/pytz-python2-2020.1-r1.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 MY_PN=pytz
 MY_P=$MY_PN-$PV
@@ -23,6 +24,7 @@ RDEPEND="
 	!dev-python/pytz[python_targets_python2_7]
 	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
 DEPEND="${RDEPEND}
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
 	app-arch/unzip"
 
 PATCHES=(
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 403e47ba5dba..13d5040e6f8e 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1 +1,2 @@
 DIST pytz-2020.4.tar.gz 310941 BLAKE2B 8abe524ccb7ed676c64dbc129ade5d6562980ea28f8939a3a7a406acf16a8a936e79ff630bf37884610e8936dfe96311ecb752f3b79519a126e1f1ac48883842 SHA512 dcbe763bc6e48c52df855fe03a8109dc0656a0e851324c0468f4307e8aff60e577fe0c9f0b062319e90d2f639b96e98edf8346064705e244143386c863a0aa7c
+DIST pytz-2020.5.tar.gz 314194 BLAKE2B c374e0ee803878ad2dde1ef03c108f59f431d645d8067fb9f183b9feb029b4de283477e7f6c146a6d03462bd5cb4fc98118e03601c838f73903f5f7a7d28bf8f SHA512 0845c0b7cefb8732e3016568b17ae73232fe6537bac6da89cb1bf911ba5786ee1be6b5e3aa8767225291e3a7e9afd5b8e40e4051671a3a006f9e2f71c551e13e
diff --git a/dev-python/pytz/files/pytz-2020.5-system-zoneinfo.patch b/dev-python/pytz/files/pytz-2020.5-system-zoneinfo.patch
new file mode 100644
index 000000000000..94bad7e234ac
--- /dev/null
+++ b/dev-python/pytz/files/pytz-2020.5-system-zoneinfo.patch
@@ -0,0 +1,33 @@
+diff --git a/pytz/__init__.py b/pytz/__init__.py
+index a1f75b6..f2a2330 100644
+--- a/pytz/__init__.py
++++ b/pytz/__init__.py
+@@ -92,8 +92,7 @@ def open_resource(name):
+     if zoneinfo_dir is not None:
+         filename = os.path.join(zoneinfo_dir, *name_parts)
+     else:
+-        filename = os.path.join(os.path.dirname(__file__),
+-                                'zoneinfo', *name_parts)
++        filename = os.path.join('/usr/share/zoneinfo', *name_parts)
+         if not os.path.exists(filename):
+             # http://bugs.launchpad.net/bugs/383171 - we avoid using this
+             # unless absolutely necessary to help when a broken version of
+diff --git a/setup.py b/setup.py
+index e31ff2b..ba6926b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -15,14 +15,8 @@ me = 'Stuart Bishop'
+ memail = 'stuart@stuartbishop.net'
+ packages = ['pytz']
+ resources = ['zone.tab', 'locales/pytz.pot']
+-for dirpath, dirnames, filenames in os.walk(os.path.join('pytz', 'zoneinfo')):
+-    # remove the 'pytz' part of the path
+-    basepath = dirpath.split(os.path.sep, 1)[1]
+-    resources.extend([os.path.join(basepath, filename) for filename in filenames])
+ package_data = {'pytz': resources}
+ 
+-assert len(resources) > 10, 'zoneinfo files not found!'
+-
+ setup(
+     name='pytz',
+     version=pytz.VERSION,
diff --git a/dev-python/pytz/pytz-2020.4.ebuild b/dev-python/pytz/pytz-2020.4.ebuild
index 9c9232fc47f4..9022fa8af1a2 100644
--- a/dev-python/pytz/pytz-2020.4.ebuild
+++ b/dev-python/pytz/pytz-2020.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytz/pytz-2020.5.ebuild b/dev-python/pytz/pytz-2020.5.ebuild
new file mode 100644
index 000000000000..16d5511d2c44
--- /dev/null
+++ b/dev-python/pytz/pytz-2020.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND="
+	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+PATCHES=(
+	# Use timezone-data zoneinfo.
+	"${FILESDIR}"/pytz-2020.5-system-zoneinfo.patch
+)
+
+python_test() {
+	"${EPYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytzdata/Manifest b/dev-python/pytzdata/Manifest
new file mode 100644
index 000000000000..774d26b0ce52
--- /dev/null
+++ b/dev-python/pytzdata/Manifest
@@ -0,0 +1 @@
+DIST pytzdata-2020.1.tar.gz 249045 BLAKE2B 6f07a7577edc87030fd70e720b32146e9044a8c6f74d0bafb9239ad666d0d6fd0ac7c3cca070914701af301b1a3368ace2985f8169b9747937fa6ed066be7302 SHA512 fd154bfbe90ce07a90f769063b772234036d2627c1e6d78a465d9ddbc894e50cb9d821c04ebff1a7cc6a327266f7843fe54e5592d37c41db023329d6e0f668c2
diff --git a/dev-python/backports-csv/metadata.xml b/dev-python/pytzdata/metadata.xml
index 6dd96cc8c0b0..8b1e40becf2c 100644
--- a/dev-python/backports-csv/metadata.xml
+++ b/dev-python/pytzdata/metadata.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>grknight@gentoo.org</email>
-    <name>Brian Evans</name>
+    <email>jakov.smolic@sartura.hr</email>
+    <name>Jakov Smolic</name>
   </maintainer>
   <maintainer type="project">
-    <email>python@gentoo.org</email>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">ryanhiebert/backports.csv</remote-id>
-    <remote-id type="pypi">backports.csv</remote-id>
+    <remote-id type="github">sdispater/pytzdata</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/pytzdata/pytzdata-2020.1.ebuild b/dev-python/pytzdata/pytzdata-2020.1.ebuild
new file mode 100644
index 000000000000..3757c534f1f9
--- /dev/null
+++ b/dev-python/pytzdata/pytzdata-2020.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="The Olson timezone database for Python"
+HOMEPAGE="https://github.com/sdispater/pytzdata"
+SRC_URI="https://github.com/sdispater/pytzdata/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/cleo[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyudev/pyudev-0.22.0.ebuild b/dev-python/pyudev/pyudev-0.22.0.ebuild
index d53151f60dbe..796424b05193 100644
--- a/dev-python/pyudev/pyudev-0.22.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~sparc x86"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index eb720b30f3ce..e2c488bba2b9 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,2 +1 @@
-DIST pyusb-1.0.2.tar.gz 68694 BLAKE2B 8910d9d6d7abd8b0dddf725ad9cc745ce5b06f69a4824a86ed9783918d0fc88d438674852288654964c4555d8278f22d3daab679149c64ea8a6fd3dd2f1cf284 SHA512 6a264b796e17612004196a7a526a7c6df99feac9062f8354540221016411a78a65d413731aea2fc1206ed5ea2b84787078898b9ca3754164f1dfe2a9878b75a5
 DIST pyusb-1.1.0.tar.gz 78752 BLAKE2B ee541afedca7d5dca345c6addee2702ccb7408bb9a2d8b23fe1eb47f067a93309599894e364c0bdcef3e5348bd13cc39f240257efd4664679017f61b87853217 SHA512 0769670e6ebd8b31f2494258eca5d6e470ad3cb17663cc14b8b3a8136ea24caa23f86d81c60c501b88a9bc94b0de6a45aac43c6c5f140e65fd03a589b4d18179
diff --git a/dev-python/pyusb/pyusb-1.0.2-r1.ebuild b/dev-python/pyusb/pyusb-1.0.2-r1.ebuild
deleted file mode 100644
index f43ac498947d..000000000000
--- a/dev-python/pyusb/pyusb-1.0.2-r1.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,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="USB support for Python"
-HOMEPAGE="https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/"
-SRC_URI="https://github.com/walac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-# pypi releases don't include tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE=""
-
-### This version is compatible with both 0.X and 1.X versions of libusb
-DEPEND="virtual/libusb:=
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-DOCS="README.rst docs/tutorial.rst"
-
-python_test() {
-	cd tests || die
-	"${PYTHON}" testall.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pyusb/pyusb-1.1.0.ebuild b/dev-python/pyusb/pyusb-1.1.0.ebuild
index ed268bd32bf4..edccc2d7798f 100644
--- a/dev-python/pyusb/pyusb-1.1.0.ebuild
+++ b/dev-python/pyusb/pyusb-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 
 ### This version is compatible with both 0.X and 1.X versions of libusb
 DEPEND="virtual/libusb:="
diff --git a/dev-python/pywinrm/Manifest b/dev-python/pywinrm/Manifest
deleted file mode 100644
index 34b3cabdd80e..000000000000
--- a/dev-python/pywinrm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pywinrm-0.4.1.tar.gz 36391 BLAKE2B 13b4db5292648fb497a4b85f6051ea2ea880ec9c1bd5970673e983b217c0787ccd0e1e504c8af12b0c4941294a440ef0449f968ba446254558a10df69bbcccdf SHA512 0eaeb190d37f055c10d1bd8ae1414da4a7396351fd6286b1e5ffc22b8f8ed589c03e2cbf1c287e5ea8fc00c08012a206657cecb77ec69cd373ff462c3b18e3d7
diff --git a/dev-python/pywinrm/pywinrm-0.4.1.ebuild b/dev-python/pywinrm/pywinrm-0.4.1.ebuild
deleted file mode 100644
index 9cd90e1bc83e..000000000000
--- a/dev-python/pywinrm/pywinrm-0.4.1.ebuild
+++ /dev/null
@@ -1,25 +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,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Windows Remote Management through Python"
-HOMEPAGE="https://pypi.org/project/pywinrm/"
-SRC_URI="mirror://pypi/p/pywinrm/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-credssp[${PYTHON_USEDEP}]
-	dev-python/requests-kerberos[${PYTHON_USEDEP}]
-	dev-python/requests-ntlm[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyxDamerauLevenshtein/Manifest b/dev-python/pyxDamerauLevenshtein/Manifest
new file mode 100644
index 000000000000..ac37d80b03bc
--- /dev/null
+++ b/dev-python/pyxDamerauLevenshtein/Manifest
@@ -0,0 +1 @@
+DIST pyxDamerauLevenshtein-1.6.1.tar.gz 60737 BLAKE2B b03e80dadd7d748b2788a85b84bc0fe088905ace412b71302176a2cf5a23b1f109af50f7e5393b4dce42bfa99bebb2793376bf40e24b5ac4d3cc5e9076c1e899 SHA512 941c621035719e42402c59d7baa602b3147caf7564a4771e4e301c70e04534f72c21f13eb0e15f4382f5eae1aa149ba09e3223c6292588facce43d6cf4af91c8
diff --git a/dev-python/pyxDamerauLevenshtein/metadata.xml b/dev-python/pyxDamerauLevenshtein/metadata.xml
new file mode 100644
index 000000000000..ed2522888257
--- /dev/null
+++ b/dev-python/pyxDamerauLevenshtein/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyxDamerauLevenshtein</remote-id>
+		<remote-id type="github">gfairchild/pyxDamerauLevenshtein</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.6.1.ebuild b/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.6.1.ebuild
new file mode 100644
index 000000000000..bf68122dff66
--- /dev/null
+++ b/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.6.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements the Damerau-Levenshtein edit distance algorithm for Python in Cython"
+HOMEPAGE="https://github.com/gfairchild/pyxDamerauLevenshtein"
+SRC_URI="https://github.com/gfairchild/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index 2e121df910ad..0e1aee75e057 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -1 +1,2 @@
 DIST pyxattr-0.7.1.tar.gz 30580 BLAKE2B 748ce0610ebc1a074dee87dffc67a88e1def0ea467f13758d2d85f9f5c37954586d85dfb8ceb1b77f4ef637295d57a153849b00d773e2e79b06902974fe01663 SHA512 093cb3f9b9637194b9737c07da7dde45b3d5083ec16a9209af80d30c86da8f93badff5aada395415be3dd48da73004286e47d0aa0671c95e65b0492d02e86009
+DIST pyxattr-0.7.2.tar.gz 31550 BLAKE2B 3505300d7a50dc305068740379bb8edbefa29f228c797e2e74467a51f4b0a6b740203f89b8ed461218978214213a6cd778107f58eb07a64d6b45e25d0fb769ea SHA512 fb9b36d5d2fb9ab674daf40d6f5c7dbe50d847dcb6d9955d270ef3aed2d8e3540f8feebd934009f47d63f3c55882846a20f7ed733b0d0c004e7a1984e7106206
diff --git a/dev-python/pyxattr/pyxattr-0.7.1.ebuild b/dev-python/pyxattr/pyxattr-0.7.1.ebuild
index c0f41812c6d0..548e701c8afd 100644
--- a/dev-python/pyxattr/pyxattr-0.7.1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 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"
 
 RDEPEND="sys-apps/attr:="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pyxattr/pyxattr-0.7.2.ebuild b/dev-python/pyxattr/pyxattr-0.7.2.ebuild
new file mode 100644
index 000000000000..8da1914c7ad4
--- /dev/null
+++ b/dev-python/pyxattr/pyxattr-0.7.2.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,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to xattr"
+HOMEPAGE="https://pyxattr.k1024.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://pyxattr.k1024.org/downloads/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="sys-apps/attr:="
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/recommonmark
+
+python_prepare_all() {
+	sed -i -e 's:, "-Werror"::' setup.py || die
+	# Bug 548486
+	sed -e "s:html_theme = 'default':html_theme = 'classic':" \
+		-i doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index 40a65a9d7675..58dc0a82e5ba 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1 +1,2 @@
 DIST pyxdg-rel-0.26.tar.gz 68435 BLAKE2B a95948db17da9909554e82c0ccf590c3f94ec26d1e34d5ba335868233a649368c08ef30cc19e878310ef038e5bdb6d18cd0e15e9413d9c54b70931f25844ee8c SHA512 0c11bccb74b8c0d98f3c63c318d35d08e1c3bbea128bf7b82792e1bdc0a60c8c4d6414b0612b19296cfb48f7951dfc6dd55ac8d23238e370e7faf6c4f64d1fb6
+DIST pyxdg-rel-0.27.tar.gz 75385 BLAKE2B 44c275ad7f698ffea6963f67bdce46e4faed5c7ae7f6a5aeb03f31dba6358c07263ea826458982cc4f88c0e163c2732f5b498a8d38b5881433e5321cfb181ac6 SHA512 fa3b046ce741574a6c71ef9d1e57752f6c9775431110f6ea38dc851780b5e1f9033eabeb15c67c91bc9bef68bf8f545a25ef856c60e16ab2c4fcbbb053d8341e
diff --git a/dev-python/pyxdg/metadata.xml b/dev-python/pyxdg/metadata.xml
index 3519532c1520..6f9ea3dbd6d0 100644
--- a/dev-python/pyxdg/metadata.xml
+++ b/dev-python/pyxdg/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <doc lang="en">https://pyxdg.readthedocs.org/en/latest/</doc>
     <bugs-to>https://bugs.freedesktop.org/</bugs-to>
diff --git a/dev-python/pyxdg/pyxdg-0.26-r2.ebuild b/dev-python/pyxdg/pyxdg-0.26-r2.ebuild
index b9257ceb9579..f19bbd3c9728 100644
--- a/dev-python/pyxdg/pyxdg-0.26-r2.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.26-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyxdg/pyxdg-0.27.ebuild b/dev-python/pyxdg/pyxdg-0.27.ebuild
new file mode 100644
index 000000000000..880c050e59e9
--- /dev/null
+++ b/dev-python/pyxdg/pyxdg-0.27.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-rel-${PV}"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python module to deal with freedesktop.org specifications"
+HOMEPAGE="https://freedesktop.org/wiki/Software/pyxdg https://cgit.freedesktop.org/xdg/pyxdg/"
+SRC_URI="https://github.com/takluyver/${PN}/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+distutils_enable_tests nose
diff --git a/dev-python/pyxml/pyxml-0.8.4-r3.ebuild b/dev-python/pyxml/pyxml-0.8.4-r4.ebuild
index be9b84f0f2f4..85d95dce22a6 100644
--- a/dev-python/pyxml/pyxml-0.8.4-r3.ebuild
+++ b/dev-python/pyxml/pyxml-0.8.4-r4.ebuild
@@ -4,6 +4,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1 eutils
 
 MY_P=${P/pyxml/PyXML}
@@ -20,7 +21,9 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 
-DEPEND=">=dev-libs/expat-1.95.6"
+DEPEND="
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
+	>=dev-libs/expat-1.95.6"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild b/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
index 339e33f96d43..6afbaa837e20 100644
--- a/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x64-solaris ~x86-solaris"
 IUSE="examples +libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml:= )"
diff --git a/dev-python/pyzmq/pyzmq-19.0.2.ebuild b/dev-python/pyzmq/pyzmq-19.0.2.ebuild
index bc7918238527..a6dcabac65de 100644
--- a/dev-python/pyzmq/pyzmq-19.0.2.ebuild
+++ b/dev-python/pyzmq/pyzmq-19.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/pyzmq/pyzmq-20.0.0.ebuild b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
index 0959a38f03f4..f45af39006f2 100644
--- a/dev-python/pyzmq/pyzmq-20.0.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 1c9a8bd81f47..0b3102843cf3 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1 +1,2 @@
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
+DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
new file mode 100644
index 000000000000..ad1067a43b79
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
@@ -0,0 +1,78 @@
+# 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,10} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for QScintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+
+MY_PN=QScintilla
+MY_P=${MY_PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/PyQt5-5.12[gui,printsupport,widgets,${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	~x11-libs/qscintilla-${PV}:=
+"
+DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}/Python
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--pyqt=PyQt5
+			--qmake="$(qt5_get_bindir)"/qmake
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Fix parallel install failure
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \
+			${MY_PN}.pro || die
+
+		# Run eqmake to respect toolchain and build flags
+		eqmake5 -recursive ${MY_PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+}
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index 21a4cbeda98f..e556e62a62f6 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1 +1,2 @@
 DIST QtAwesome-1.0.1.tar.gz 878654 BLAKE2B e654db2210b15274e200bf9ef783b6c8706833129162cc615cbded10a3ee440fae23497dfa327cb6af31664370f90ee46f5d2986d7e5dd6d27b5430a1558c3ce SHA512 edc8f1b7f8dc8d06b7a108300eb72e47e9601be7e16cf774e7efea888e583168f5aa8afe015e83156cd40bda5007b52ef38f914f232fdd1b5eb2683256f1de74
+DIST QtAwesome-1.0.2.tar.gz 878664 BLAKE2B 55f6d527e83165a91918ec6200a9becad99ace56b2906fa216dd8b0179c5948418954a1d0151d1524dc2d02e00c943311e4d2c28cd4d89fc7f325f0b6fb3edf5 SHA512 22bd2a96000d94d1e72259a559b21fee0a442c02751b983df29a1b64f8c5b7057905d8281108ef591cbb2ba71bd1294ad647f00468b7ea28a67466ec2fff0d4f
diff --git a/dev-python/qtawesome/qtawesome-1.0.2.ebuild b/dev-python/qtawesome/qtawesome-1.0.2.ebuild
new file mode 100644
index 000000000000..0a6aa9e63605
--- /dev/null
+++ b/dev-python/qtawesome/qtawesome-1.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 virtualx
+
+MY_PN="QtAwesome"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
+HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-fonts/fontawesome
+	dev-python/QtPy[${PYTHON_USEDEP},gui]
+"
+
+DEPEND="test? ( dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source
+
+python_test() {
+	virtx pytest -vv
+}
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index fac35920fd45..2cf66dd3157b 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,4 +1,2 @@
 DIST qtconsole-4.7.6.tar.gz 424919 BLAKE2B d973b3b94dfad1b38603695e22927bcdcb8a4f2db9f4a638d5fe6a83c24061153dbaa36c26e632708953af32a015af1d40ecbf175dd5314a3b954b15a6625cc0 SHA512 e4e12eb90533e922786b5b6517fba5d9c4dfedf00547f1403c8cd65fb464f5c1a13517df69924e4428e9a8a811dfc359a7768fbaa90adbe02d79cba9a5aa852e
-DIST qtconsole-4.7.7.tar.gz 425068 BLAKE2B 61fa3bede2d531e294e8a272287885ffeff095bca8b998b2a28fd3f4d912b20aa30807fe7d4caf15f8594e7820e037b3c9955ad76e9dd5eb1da2cbe00ca9a941 SHA512 1f04d54138f37b32c112db2cbbc8f79dc16b13bf5dffcc3dd872d43d48ef9ed5454d660e4fab08ccd71344153de391d91558edd0f71a2b626da47779f0f0bb53
-DIST qtconsole-5.0.0.tar.gz 424609 BLAKE2B 0aacc5e274a8a77da6e6891d823fe2a7710a7022f4633ef7a2edd843da5ea314884713356e92016a0dbb58b38ec90bda72fa63f11699c719e1bfa1e64ca61978 SHA512 4fa6a45c7171af57f893eff8bf2cbf5466c7235c2134c8be071e47253f3ad84b951e4c52a1e996fb1fb0233a57400972c524569baf31874f6f84896a6c443823
 DIST qtconsole-5.0.1.tar.gz 424682 BLAKE2B 46f2cdea799786d7b2e9385a5b73ac397925eef9c2403f4d9ebd4ce89241cc1ca6ec494450759db4e017c16abc525505dacaa7452018379da5343c2b1cf24f86 SHA512 4fa7629c68ab7554c20bd8ef885bf4073d64d4c211a0d9035faaa7e4122bd5d182fb97773c8a41f215f9e299309ace591081a0673370b55c796b241211bb4ccc
diff --git a/dev-python/qtconsole/qtconsole-4.7.7.ebuild b/dev-python/qtconsole/qtconsole-4.7.7.ebuild
deleted file mode 100644
index 92020ed2c7b6..000000000000
--- a/dev-python/qtconsole/qtconsole-4.7.7.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=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-BDEPEND="
-	test? (
-		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by removed tests:
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-src_prepare() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	rm qtconsole/tests/test_00_console_widget.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/qtconsole/qtconsole-5.0.0.ebuild b/dev-python/qtconsole/qtconsole-5.0.0.ebuild
deleted file mode 100644
index 645bccc338f9..000000000000
--- a/dev-python/qtconsole/qtconsole-5.0.0.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
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-BDEPEND="
-	test? (
-		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by the tests that are removed:
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-src_prepare() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	rm qtconsole/tests/test_00_console_widget.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/qtconsole/qtconsole-5.0.1.ebuild b/dev-python/qtconsole/qtconsole-5.0.1.ebuild
index 645bccc338f9..a824c5c09ce2 100644
--- a/dev-python/qtconsole/qtconsole-5.0.1.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
diff --git a/dev-python/quex/metadata.xml b/dev-python/quex/metadata.xml
index af6614bb6459..689424332080 100644
--- a/dev-python/quex/metadata.xml
+++ b/dev-python/quex/metadata.xml
@@ -21,5 +21,8 @@
 		command line.
 		generate state transition graphs of the generated engines.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">quex</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/ratelimit/metadata.xml b/dev-python/ratelimit/metadata.xml
index e4fe2fcb43de..930504ae2824 100644
--- a/dev-python/ratelimit/metadata.xml
+++ b/dev-python/ratelimit/metadata.xml
@@ -7,7 +7,7 @@
 		from banning your applications by conforming to set rate limits.
 	</longdescription>
 	<maintainer type="person">
-		<email>chr@chymera.eu</email>
+		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/re-assert/re-assert-1.1.0.ebuild b/dev-python/re-assert/re-assert-1.1.0.ebuild
index e0c200d0337f..04d56c9761e4 100644
--- a/dev-python/re-assert/re-assert-1.1.0.ebuild
+++ b/dev-python/re-assert/re-assert-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~x64-macos"
 
 RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index c6ef32d93290..c1383fc5248a 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1 +1,2 @@
 DIST readthedocs-sphinx-ext-2.1.1.tar.gz 10181 BLAKE2B 01ca34befd0f18bb747d7f843e0cc394e19db4fe471f2bb21617b6dbdf4c1ad9721047185561f9bfbd8f770e1fefd5b560e65d7c5e2675c1bc8d74e08252eeb1 SHA512 5594e375133477ecdc1d22a78c0d4dac73c5e8c1715f4309a9674497ef860b07e8872bb4ba471fbffacd8bd22bc49741b8df54ad9ca9bb474acd9cdee72c8969
+DIST readthedocs-sphinx-ext-2.1.2.tar.gz 11709 BLAKE2B 9386d9c849c4287a0f52ce054e33d22afed0426b5d775a03c90b7c18021f2a2a9429334dc0231ec8d28d3b4437dcf4e3faf57a0c1e46cfb4690893b96560fa3a SHA512 c1fa8a2c1b1d50aa5039c0592a0960b1162c31f58769754a7fdbe4d85557428f3e0a3a509012077210d30d79a28463ab0624855036ffb45d0977e9e0e666622a
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.2.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.2.ebuild
new file mode 100644
index 000000000000..88610c3aacf5
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Code specific for Read the Docs and Sphinx"
+HOMEPAGE="https://github.com/readthedocs/readthedocs-sphinx-ext"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+PDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${PDEPEND} )"
+
+# unittest should be sufficient but tests are very verbose, so pytest's
+# output capture is most welcome
+distutils_enable_tests pytest
diff --git a/dev-python/rebulk/Manifest b/dev-python/rebulk/Manifest
index 6af83f502536..3f40831c0651 100644
--- a/dev-python/rebulk/Manifest
+++ b/dev-python/rebulk/Manifest
@@ -1 +1,3 @@
 DIST rebulk-2.0.1.tar.gz 258115 BLAKE2B d19210911cf89cb7c371819e384da95c2159eb92abf9f027cbdf1803a18054c556e73364ae10c5bb0b5007cbdb2156b2118d22d6e278b6a02055bacbcbdbc322 SHA512 7d453b7ba952994dec3258aa95a3f6090e6f8afb5a674c1b5e54e036f41022b887d3d65d21f2023ae6e2596cce3baf52d33fc23708498a4f0aef26d3594c8289
+DIST rebulk-3.0.0.gh.tar.gz 252364 BLAKE2B 669f25fa4cf25d4de426552eafd1f3463c05e42eb6f587b8c15d0d319c9c81e515d8461c5c412bd89a483d619374af0a93849deb0ccb3af9ccd7617ebd908504 SHA512 eb474b8b8509f291938bc3c96ef591b8233a41b9eb28f7957f3d20e098140ac6d80a1337c6ff1c89eeea4c34f94eb37af811d2200a8f2a574fc93b8fa1ea3c5d
+DIST rebulk-3.0.1.gh.tar.gz 252585 BLAKE2B ff10847d9743972c65a6a5ae3efe77acf0364770c2998401ac08d22a829bc25caf1e0c2a7decd0c2546d2bceb05b094cbd9d9cfcc7127d433b8c30fd6084c5bb SHA512 21d022bb564a416885139aa673b3fc8b762817df12d8868a2a0e8d99cc813b781d04bad4372e5ac0dbbe6239d879c506639dd87c89f92faf078ff306239d6b6d
diff --git a/dev-python/rebulk/rebulk-3.0.0.ebuild b/dev-python/rebulk/rebulk-3.0.0.ebuild
new file mode 100644
index 000000000000..0da0b17a9a3e
--- /dev/null
+++ b/dev-python/rebulk/rebulk-3.0.0.ebuild
@@ -0,0 +1,30 @@
+# 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,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library that performs advanced searches in strings"
+HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.org/project/rebulk/"
+SRC_URI="
+	https://github.com/Toilal/rebulk/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove base64-encoded zip archive with pytest.
+	rm runtests.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/rebulk/rebulk-3.0.1.ebuild b/dev-python/rebulk/rebulk-3.0.1.ebuild
new file mode 100644
index 000000000000..0da0b17a9a3e
--- /dev/null
+++ b/dev-python/rebulk/rebulk-3.0.1.ebuild
@@ -0,0 +1,30 @@
+# 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,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library that performs advanced searches in strings"
+HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.org/project/rebulk/"
+SRC_URI="
+	https://github.com/Toilal/rebulk/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove base64-encoded zip archive with pytest.
+	rm runtests.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/recommonmark/recommonmark-0.6.0.ebuild b/dev-python/recommonmark/recommonmark-0.6.0.ebuild
index a36866f76ee8..e59bf27e4694 100644
--- a/dev-python/recommonmark/recommonmark-0.6.0.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index d371b403131f..fb2f7d6f986a 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,2 +1 @@
-DIST redis-py-3.3.11.tar.gz 131072 BLAKE2B 6becafba3da22bae796a4a9ba55d11a61d9ed1a8b693a734d4ef3f0e463c0c39a05c01546225f69eb36a788779d6e45d0136e1a6d6856ec63c3dd07994b5db9a SHA512 a32327fcebc6242367c0eda6c6dcd1a15d5d575527af2e9de0d76e05bc4afc7402566d9254e467663b81907a310731af3041236b6b135f3b8ff1429a502c1000
 DIST redis-py-3.5.3.tar.gz 141112 BLAKE2B b953d553a3cfa2d6ba6f5aa35dfaf93865acbfad0e901a96082c3b1c027dc23b6ceedde185f24e86772522fbbf4f0a4d18e115a6b40aff6a65450bbe397d5c07 SHA512 eae6ac6b3e0f1366a9c29e5e2d9a5210e4627e62e3006159b1c290f36cd9c1c2c12cafe0944f7a010e04632b517874f230aa9411491993b7ecf2080546217206
diff --git a/dev-python/redis-py/redis-py-3.3.11.ebuild b/dev-python/redis-py/redis-py-3.3.11.ebuild
deleted file mode 100644
index 841549fb21d1..000000000000
--- a/dev-python/redis-py/redis-py-3.3.11.ebuild
+++ /dev/null
@@ -1,64 +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,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="redis"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="https://github.com/andymccurdy/redis-py"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? (
-		dev-db/redis
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.7.0[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Make sure that tests will be used from BUILD_DIR rather than cwd.
-	mv tests tests-hidden || die
-
-	# Correct local import patch syntax
-	sed \
-		-e 's:from .conftest:from conftest:' \
-		-e 's:from .test_pubsub:from test_pubsub:' \
-		-i tests-hidden/test_*.py \
-		|| die
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use test; then
-		cp -r tests-hidden "${BUILD_DIR}"/tests || die
-	fi
-}
-
-python_test() {
-	local sock="${T}/redis.sock"
-
-	"${EPREFIX}/usr/sbin/redis-server" - <<- EOF
-		daemonize yes
-		pidfile "${T}/redis.pid"
-		unixsocket ${sock}
-		EOF
-
-	PYTHONPATH="${S}:${S}/tests-hidden"
-	esetup.py test --verbose
-	kill $(<"${T}/redis.pid")
-}
diff --git a/dev-python/rednose/Manifest b/dev-python/rednose/Manifest
deleted file mode 100644
index a55133a85c10..000000000000
--- a/dev-python/rednose/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rednose-0.4.3.tar.gz 6046 BLAKE2B 0486d4743d0aecbbcc49cbee108e3d6841d6f3f4e6165614c96122dc9b9a626ad56cea9703f04adad83db3a2dcd934896eed93ad5ebd30c9a7f6711e3e1be375 SHA512 e0169599f251cd90a2906e489b870e7d10322a82253a3a814bc71aa257bea34bd5eb833b637dbae3128f8f37df79929aa4d6331e246654c83eb16118d637182a
diff --git a/dev-python/rednose/metadata.xml b/dev-python/rednose/metadata.xml
deleted file mode 100644
index 179a45c3e741..000000000000
--- a/dev-python/rednose/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!--maintainer-needed-->
-  <upstream>
-    <remote-id type="pypi">rednose</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/rednose/rednose-0.4.3.ebuild b/dev-python/rednose/rednose-0.4.3.ebuild
deleted file mode 100644
index 4ac1a93548e0..000000000000
--- a/dev-python/rednose/rednose-0.4.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="coloured output for nosetests"
-HOMEPAGE="https://gfxmonk.net/dist/0install/rednose.xml"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE=""
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	dev-python/colorama[${PYTHON_USEDEP}]
-	>=dev-python/python-termstyle-0.1.7[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index af0b297829d8..42118ba8b139 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,3 +1,5 @@
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
-DIST reportlab-3.5.48.tar.gz 2890211 BLAKE2B bf0cde9b9e80459caee37949dc90a777a56da5d2c8e6dde09bddbdac2f2c55031d92b3c7c6346b6f563904525020c0e4f666b5e2effdd761c81412df21ec60eb SHA512 ce31cb7e9e2226cb6d59d446f90c1df94f0f84077d298f7ba862f5c75995afa20fa077b1ee1ab9a145c9276cee0d75fe61237e001ad0e5b96dfb0027adff3db7
 DIST reportlab-3.5.56.tar.gz 2899527 BLAKE2B 83f14c472a8675449e2f50f806fc5136fceb2c2f307ebd2d34ecad98ce6a67f62971869e05b7d4fe7017b5e728d21d16037ef6f04c3639b0cec8069851e46b64 SHA512 49bafe1b1f0067df1d76a8e61b35ec7062dfffa608f6086241dfa589244bef5784180de7c3d86dc62334282a40a012f7579f5c3cec3c4b0387ba2c482a04c010
+DIST reportlab-3.5.57.tar.gz 2901465 BLAKE2B ecb0459414d359b8feb048ad34cfd782a6913f2e254f6d8832dd076fe63fda82d24c4dda28da9c0cc6765c284d51a45d44459d225899574625212c33800116dc SHA512 d325e389ddd7d3c4d98e462956a3c4b7237c9219728577a1e0599a137d19a27205b223fd13c5c260e2968c435bc06b2e4745945ac056926543a47e52868e21db
+DIST reportlab-3.5.58.tar.gz 2903638 BLAKE2B ac19bda75e111266b35a939fc64ac44de4ad69dc7a7cbf9fdabc233e28f33589ba97dc5082cd38d5b8d11a2c7aaab0bac69a1453d8661fd26017f8e07299c2e8 SHA512 949b50f65ca305f79fbb06e7e7b1ebfb6546864892f764a3440eaed0a95ac001a71d3685e8702032573ed60893b9529bd2356b1d5419882058a3b9aab986cb64
+DIST reportlab-3.5.59.tar.gz 2904089 BLAKE2B ab9bdbc8decda8f858c49a7ffe5ed919a2ca971a20967be45bdb780d9480aa474462c76f886756b433cee3ccd4d78e245334dc6a600c8e19c28ad79befe14705 SHA512 c862acb10f4eaed877321afadb52615132dcda0976e648e1767c32cd0398fc2763048f274d31da6088cb824311e8a28fee048cd6e98411e70583cfb36d0050ca
diff --git a/dev-python/reportlab/reportlab-3.5.56.ebuild b/dev-python/reportlab/reportlab-3.5.56.ebuild
index a51750dbbaf6..0dc9b92615d9 100644
--- a/dev-python/reportlab/reportlab-3.5.56.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.56.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/reportlab/reportlab-3.5.48.ebuild b/dev-python/reportlab/reportlab-3.5.57.ebuild
index e8f5f3d87d26..a51750dbbaf6 100644
--- a/dev-python/reportlab/reportlab-3.5.48.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.57.ebuild
@@ -17,20 +17,20 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	media-libs/freetype
-	media-libs/libart_lgpl:=
+	media-libs/libart_lgpl
 	sys-libs/zlib:="
 RDEPEND="
 	${DEPEND}
 	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
 BDEPEND="
-	test? ( ${RDEPEND} )
-	app-arch/unzip"
+	app-arch/unzip
+	test? ( ${RDEPEND} )"
 
 distutils_enable_sphinx docs/source
 
diff --git a/dev-python/reportlab/reportlab-3.5.58.ebuild b/dev-python/reportlab/reportlab-3.5.58.ebuild
new file mode 100644
index 000000000000..c83ddde8da39
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.5.58.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip
+	test? ( ${RDEPEND} )"
+
+distutils_enable_sphinx docs/source
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	# tests requiring Internet access
+	sed -i -e 's:test0:_&:' \
+		tests/test_platypus_general.py \
+		tests/test_platypus_images.py || die
+	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/reportlab/reportlab-3.5.59.ebuild b/dev-python/reportlab/reportlab-3.5.59.ebuild
new file mode 100644
index 000000000000..c83ddde8da39
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.5.59.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip
+	test? ( ${RDEPEND} )"
+
+distutils_enable_sphinx docs/source
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	# tests requiring Internet access
+	sed -i -e 's:test0:_&:' \
+		tests/test_platypus_general.py \
+		tests/test_platypus_images.py || die
+	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 1466b6610d0b..4123a69f944b 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,2 +1,3 @@
 DIST requests-2.24.0.tar.gz 115071 BLAKE2B ae98be1d023b2a7b883e15a7a5d214ecbf482234e9de6bfc9cd06d1f04d1b57d101d41a2c6fdd07b7a6b468875463514841d2e023391ac8ae0797a2cb58b3424 SHA512 46ca8ab70eb39be8398c242404b9b3ffb6baddd5c78eaad125b55c719154eb8c7b6a737a8dc587b0cb51b3b9a074abaa8b2ff347a64d38f4f90cdba4db16a119
 DIST requests-2.25.0.tar.gz 101897 BLAKE2B 5de8f4f5059915f929ebb71d8209bfefbe95bb381544ed0b6875cc01cb958e6fe8861cd8321143463da5dd872ad4ff8c828008bcd6409b41857c4d2037db3f67 SHA512 dd13ccb6bcd95bdd31a414dba67e5a0914ff172ae6f5d255849837e8e2a7e404e3c02fc3d07e5ff6dc81c12d0fe56c3b83bc62bc377dd3f504b00b97b144db74
+DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
diff --git a/dev-python/requests/requests-2.25.1.ebuild b/dev-python/requests/requests-2.25.1.ebuild
new file mode 100644
index 000000000000..827b33105702
--- /dev/null
+++ b/dev-python/requests/requests-2.25.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="https://requests.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="socks5 +ssl"
+
+RDEPEND="
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
+	<dev-python/chardet-5[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	<dev-python/idna-3[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
+	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+	ssl? (
+		>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# strip tests that require some kind of network
+	sed -e 's:test_connect_timeout:_&:' \
+		-e 's:test_total_timeout_connect:_&:' \
+		-i tests/test_requests.py || die
+	# probably pyopenssl version dependent
+	sed -e 's:test_https_warnings:_&:' \
+		-i tests/test_requests.py || die
+	# doctests rely on networking
+	sed -e 's:--doctest-modules::' \
+		-i pytest.ini || die
+}
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 0fea3dc43fed..259ec90dd8d5 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,2 +1 @@
-DIST responses-0.12.0.tar.gz 26527 BLAKE2B 71769b683f9c672d52844803e76ff66def61a2a56f788d93cfbad5a7e0f967b003244ee32f83430a97f7726c732b4e8b25baf65ec35535da1a6d609e4cfefe7c SHA512 484076f7942ff12977f06bcc850f1afcc9ae70ca2b7986a647c972893562d28cf3cd7226c87d8f5588fa4500be34dd5be0c7d1df6b8ddcd134455540d3dbe6d9
 DIST responses-0.12.1.tar.gz 27123 BLAKE2B 2c77e3ac48e7430e2c91321a946c09746953b3aa2a93aff1ad277f849bc57fe8033d405cd0c391111ba31e523ecb2dfa5bc475519fb1224dff5247925eb54616 SHA512 cc840920895c5ab02b546d6441636197e93c4dc7346a801a14d663a30a761d78a0be73e820cdd5963e52d882958d9ea7873df6fcd6c032d99a230109b5c0ddb8
diff --git a/dev-python/responses/responses-0.12.0.ebuild b/dev-python/responses/responses-0.12.0.ebuild
deleted file mode 100644
index 4118e74e4271..000000000000
--- a/dev-python/responses/responses-0.12.0.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_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility for mocking out the Python Requests library"
-HOMEPAGE="https://github.com/getsentry/responses"
-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 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/responses/responses-0.12.1.ebuild b/dev-python/responses/responses-0.12.1.ebuild
index 3b04b6d2b255..4118e74e4271 100644
--- a/dev-python/responses/responses-0.12.1.ebuild
+++ b/dev-python/responses/responses-0.12.1.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 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/resumable-urlretrieve/Manifest b/dev-python/resumable-urlretrieve/Manifest
deleted file mode 100644
index cd50cb930018..000000000000
--- a/dev-python/resumable-urlretrieve/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST resumable-urlretrieve-0.1.5.tar.gz 320035 BLAKE2B 1cffa81020c120b289145d52a7d3dfae1d4868545242cae583350c9d9e3acc7f923af7e1d8b9349a781b2d2eba4f28a8d27220bdc1cc64ab07d079039be9ba87 SHA512 d9af75ac3301aefa0773731539075ff3ecd0614ba48ac7de4a84817b676dfcdcc68e67cf02329d4adc62629b173cd2b8efc525c0f48fa686b267a75c29143aec
diff --git a/dev-python/resumable-urlretrieve/metadata.xml b/dev-python/resumable-urlretrieve/metadata.xml
deleted file mode 100644
index 3b6282506708..000000000000
--- a/dev-python/resumable-urlretrieve/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">resumable-urlretrieve</remote-id>
-		<maintainer status="unknown">
-			<email>berdario+pypi@gmail.com</email>
-			<name>Dario Bertini</name>
-		</maintainer>
-		<remote-id type="github">berdario/resumable-urlretrieve</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild b/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
deleted file mode 100644
index 9ad85f01031d..000000000000
--- a/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
+++ /dev/null
@@ -1,23 +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,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Small library to fetch files over HTTP and resuming their download"
-HOMEPAGE="
-	https://github.com/berdario/resumable-urlretrieve
-	https://pypi.org/project/resumable-urlretrieve/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
index 3dbd7dec8c8f..f4086e7a0f52 100644
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ b/dev-python/retrying/retrying-1.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rholder/retrying/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=">=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
index 9a854795c26c..ee94ab6263c8 100644
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/naimetti/rfc3339-validator/archive/v0.1.2.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
 	dev-python/strict-rfc3339[${PYTHON_USEDEP}]"
diff --git a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
index ab14e09b4a0b..9e497ce16139 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="dev-python/rfc3987[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
diff --git a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
index 37540fbd452d..c34b27d4a19b 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 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=""
 
 RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
diff --git a/dev-python/roman/Manifest b/dev-python/roman/Manifest
index cb3b5870da74..951d57716ea5 100644
--- a/dev-python/roman/Manifest
+++ b/dev-python/roman/Manifest
@@ -1,2 +1 @@
-DIST roman-3.2.tar.gz 7156 BLAKE2B ba7233366ab9bea9f0de4ab02ddbff4a3fbcc35792165d59f291dc837f4a8a7e681f1be89bcbb9746beb88fd7ae57b4ab57934e8d72a73bbdf223840e37cc18e SHA512 142904551745c8b7874d52c8d04f483b0c18b18ba8bc3d3a51fcf509e09b3a3f8a28d0b88bdd8282957bf3d698b1bab86de7fb4808cde9b0e5cfb910deca35ab
 DIST roman-3.3.tar.gz 7577 BLAKE2B 651d30154e01c9bc61326581c5600efb5f717b2c21cb6345d51ba5aa44d79bff00e66492d3962ed4c9682103a9c00af8205ae9d90b30b9a3f13dc2d18e6f1592 SHA512 8d2952640519052ce629a3881cb871448fc7921eb5f45525305c43ef9fb2672062d0ca96ab16d7aaa95f5eebcad028fdcf519f224f3631734fbb6a4a314f3a49
diff --git a/dev-python/roman/metadata.xml b/dev-python/roman/metadata.xml
index 550f8b505b0a..13528291a463 100644
--- a/dev-python/roman/metadata.xml
+++ b/dev-python/roman/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">roman</remote-id>
   </upstream>
diff --git a/dev-python/roman/roman-3.2.ebuild b/dev-python/roman/roman-3.2.ebuild
deleted file mode 100644
index cc35f070033a..000000000000
--- a/dev-python/roman/roman-3.2.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_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An Integer to Roman numerals converter"
-HOMEPAGE="https://pypi.org/project/roman/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	cp "${S}/src/tests.py" . || die "copying test file failed"
-	esetup.py test
-}
diff --git a/dev-python/roman/roman-3.3.ebuild b/dev-python/roman/roman-3.3.ebuild
index 4caba218e087..ba1fd6b13b45 100644
--- a/dev-python/roman/roman-3.3.ebuild
+++ b/dev-python/roman/roman-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests setup.py
 
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 5fc4e2db8c19..d974435341f9 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,2 +1 @@
-DIST rope-0.17.0.tar.gz 248629 BLAKE2B 7c9276b5f400dfa9661f81d365eac150a124620824d400131d5da7361475e5a2d548c8b53a88e61e7ae6e483a47c8ca4b8ca773235e209e8c6fb47b0088327fd SHA512 c27a17fdf73ed0ae85fe417132acd999452ae88a7b779d84fdf73134094fd34510ae08017dc24ddd7c34cb70353b5a43021229b88819002371790e7717b8ae46
 DIST rope-0.18.0.tar.gz 249828 BLAKE2B 2aac0541936c671f9b70528da28b2c016f14c7a3e5f368aecb6a3f2a39d2b447d70943bf00b7a49702f5d341504da7398ca5b1240d625275f749de1e530fb178 SHA512 9f706da345866447ff7e4027e6f9f0719d4b823253155881efcdd3a9e9a6f42fa9e194cd9547df4a6f752ae0cec739045e52bb7edd5cfa04ad4079fe06808298
diff --git a/dev-python/rope/rope-0.17.0.ebuild b/dev-python/rope/rope-0.17.0.ebuild
deleted file mode 100644
index 78708d8a171c..000000000000
--- a/dev-python/rope/rope-0.17.0.ebuild
+++ /dev/null
@@ -1,41 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="https://github.com/python-rope/rope"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc"
-
-# Dependency for docbuild documentation which is not noted in
-# setup.py, using standard docutils builds docs successfully.
-DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	if use doc; then
-		pushd docs > /dev/null || die
-		mkdir build || die
-		local i
-		for i in ./*.rst; do
-			rst2html.py $i > ./build/${i/rst/html} || die
-		done
-		popd > /dev/null || die
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rope/rope-0.18.0.ebuild b/dev-python/rope/rope-0.18.0.ebuild
index 627f26715a17..ebaae99c4479 100644
--- a/dev-python/rope/rope-0.18.0.ebuild
+++ b/dev-python/rope/rope-0.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc"
 
diff --git a/dev-python/routes/routes-2.5.1.ebuild b/dev-python/routes/routes-2.5.1.ebuild
index 8e40d0839639..2a8d5b33ced1 100644
--- a/dev-python/routes/routes-2.5.1.ebuild
+++ b/dev-python/routes/routes-2.5.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 
 inherit distutils-r1
@@ -16,7 +17,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
@@ -31,7 +32,7 @@ BDEPEND="
 	)"
 
 distutils_enable_tests nose
-distutils_enable_sphinx doc
+distutils_enable_sphinx docs
 
 # The testsuite appears to be held back by the author
 
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index 80cea268e618..b5a1ba137268 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,2 +1,3 @@
-DIST rpyc-4.1.4.tar.gz 1251969 BLAKE2B 8d77d6c80fb69d96847878830c8fd0b8333223b8a2f13389de250bea6c8d9fc79477ee9ddd738776c1f1fdb4ed6d9d349a2d5cbdf3dd4486fe9b11113df0fedd SHA512 50b146fa07c213ad51cc3ba5e29264e5c16a6061fb109b94b9183582399495697c73c38e6e4958989a90080a88155bb140bf8e1ca43e0c6fb1f72eda2795d71f
 DIST rpyc-4.1.5.tar.gz 1252268 BLAKE2B 3669b10e7b9dc28feec33cb8472e74087fb31801564fcd9d9230f88a44dca8c7100a6134ad5c0e4974b8252e6c2f8d33877550facfe5f6c21d8a388e38c9e9f7 SHA512 27f67c7e7bf6f1e94815b3124f300da5f1317e7b454280953d85eca8c7146afc33937ac66a1bb8ac2344b73532ae232b190a647ef90aa723b8b5173b96877454
+DIST rpyc-5.0.0.tar.gz 1257159 BLAKE2B cc1b9465745b22ba8d21a11c1f1b874e62acda6ee706591d4cf4389e5be36c3b39b24e6790356f8f5c5ad03c9739a3f835abd5e50768403e35731afa78bc608c SHA512 dadacd7bfa5c564843fbad377b7f346f582640e91b8d3ce1625e537625d448f902104b376203d026fcd08b1a89ddc8cfe2259fa035a16f0184d227543fbc465f
+DIST rpyc-5.0.1.tar.gz 1258657 BLAKE2B 84d0bee67004928c26a1765a26267e3e8eb5dc09a8fd53c1d75ca691cf313a7563398626b7e89a8893415294721623206204784da01444708edb56aec8101719 SHA512 57b0d6b2dba33c7f6c9d204b4deae8ab08ed56e5799aa2c7ae4bcb8ab98486055090e3079d8b0d615fcd517111a6e02893dff85607aaca5497ae76429abe3148
diff --git a/dev-python/rpyc/metadata.xml b/dev-python/rpyc/metadata.xml
index 0c4a0861fcdc..f2520688fec1 100644
--- a/dev-python/rpyc/metadata.xml
+++ b/dev-python/rpyc/metadata.xml
@@ -9,10 +9,18 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">rpyc</remote-id>
 		<remote-id type="pypi">rpyc</remote-id>
-		<remote-id type="github">tomerfiliba/rpyc</remote-id>
+		<remote-id type="github">tomerfiliba-org/rpyc</remote-id>
 	</upstream>
+	<use>
+		<flag name="numpy">Run tests depending on
+			<pkg>dev-python/numpy</pkg>, <pkg>dev-python/pandas</pkg>
+		</flag>
+		<flag name="gdb">Run tests depending on <pkg>sys-devel/gdb</pkg>
+		</flag>
+	</use>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/rpyc/rpyc-4.1.5.ebuild b/dev-python/rpyc/rpyc-4.1.5.ebuild
index 994352b42b14..ab5ab1e49f47 100644
--- a/dev-python/rpyc/rpyc-4.1.5.ebuild
+++ b/dev-python/rpyc/rpyc-4.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,11 +8,11 @@ inherit distutils-r1
 
 DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
 HOMEPAGE="https://rpyc.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/tomerfiliba/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rpyc/rpyc-4.1.4.ebuild b/dev-python/rpyc/rpyc-5.0.0.ebuild
index 9018918336e5..4645ccdc49a1 100644
--- a/dev-python/rpyc/rpyc-4.1.4.ebuild
+++ b/dev-python/rpyc/rpyc-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,12 +7,14 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="https://rpyc.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/tomerfiliba/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
+	https://pypi.org/project/rpyc/
+	https://github.com/tomerfiliba-org/rpyc"
+SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rpyc/rpyc-5.0.1.ebuild b/dev-python/rpyc/rpyc-5.0.1.ebuild
new file mode 100644
index 000000000000..ab6f6c4503ec
--- /dev/null
+++ b/dev-python/rpyc/rpyc-5.0.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
+HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
+	https://pypi.org/project/rpyc/
+	https://github.com/tomerfiliba-org/rpyc"
+SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# USE flags gdb, numpy are used *only* to run tests depending on these packages
+IUSE="test numpy gdb"
+RESTRICT="!test? ( test )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
+	gdb? ( sys-devel/gdb )"
+
+RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]
+	dev-python/gevent[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	# Windows specific test
+	rm tests/test_win32pipes.py || die "rm tests/test_win32pipes.py failed"
+
+	# These tests require running sshd
+	rm tests/test_ssh.py tests/test_deploy.py || die "rm test_ssh.py test_deploy.py failed"
+
+	# This test requires internet access
+	rm tests/test_registry.py || die "rm test_registry.py failed"
+
+	if ! use numpy
+	then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
+	fi
+
+	if ! use gdb
+	then rm tests/test_gdb.py || die "rm test_gdb.py failed"
+	fi
+}
+
+python_test() {
+	# for some reason, when tests are run via pytest or nose, some of them hung
+	pushd tests > /dev/null || die "pushd tests failed"
+	for x in test_*.py
+	do ${PYTHON} ${x} || die "${x} failed"
+	done
+	popd > /dev/null
+}
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index c6250e6d280c..b7de45f4d770 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,2 +1 @@
-DIST rq-1.6.1.tar.gz 572668 BLAKE2B 4a1990492ed0c5e999fa918cdf49c03cf664e809b74f75c0aa941a72d9f3f45481e66c0d04780b88efa8e8ac2a8a94b11a0ad620d4c5f99e8abb3582db28e3d3 SHA512 8fc5f0cb87fb43fd6a0981dfb24a21d858e2d9fb2003c955d6d83b33a10b3cbaa713c11e422a91b4e020073d931fd3942530f3368fc8688dcff1a71fbe83fb15
 DIST rq-1.7.0.tar.gz 579373 BLAKE2B 835868a294478af07b9fa97fef14b0f2013abe125263efa15c4988eeaf564ee61ab2e8d68842c730a0f8b02a19a4d66f328828fb939a05b9d3b36996688192e0 SHA512 4027a8e1474cc350cf539ecf5734c2f851ef4e61bf0e106e44f359736f4f1ec4e690af97a119d12b1b7614b38ec4da286acff98b718ef604b5c367b3cc2af741
diff --git a/dev-python/rq/files/rq-1.5.0-no-install-tests.patch b/dev-python/rq/files/rq-1.5.0-no-install-tests.patch
deleted file mode 100644
index 0c7aa7aacc4c..000000000000
--- a/dev-python/rq/files/rq-1.5.0-no-install-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index ac40818..b67b25c 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,7 +36,7 @@ setup(
-     description='RQ is a simple, lightweight, library for creating background '
-                 'jobs, and processing them.',
-     long_description=__doc__,
--    packages=find_packages(exclude=['tests']),
-+    packages=find_packages(exclude=['tests*']),
-     include_package_data=True,
-     zip_safe=False,
-     platforms='any',
diff --git a/dev-python/rq/rq-1.6.1.ebuild b/dev-python/rq/rq-1.6.1.ebuild
deleted file mode 100644
index 56c0afd42807..000000000000
--- a/dev-python/rq/rq-1.6.1.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
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
-SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	elog "Spawning Redis"
-	elog "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
-
-python_test() {
-	# Tests needing rqworker:
-	# TestWorkerSubprocess::test_run_access_self, test_run_empty_queue, test_run_scheduled_access_self
-	distutils_install_for_testing
-	PATH="${BUILD_DIR}/test/scripts:${PATH}" pytest -vv || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/rq/rq-1.7.0.ebuild b/dev-python/rq/rq-1.7.0.ebuild
index baf13724f9e0..56c0afd42807 100644
--- a/dev-python/rq/rq-1.7.0.ebuild
+++ b/dev-python/rq/rq-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index acb17cff5e28..2e39bd35d952 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1 +1 @@
-DIST python-rsa-version-4.2.gh.tar.gz 63280 BLAKE2B 1260fe2a0f34c16b3cd2e18bc642da2e9c6caad851920a4c010aaad31959d0baab397356cd2437eb4a9091b3f524760f45b8d46ff9a207be009b2613615681c1 SHA512 a4df2de41d252a42627e96298b044a50953c429b5062f02cc7b64a7e17f75b09bb8b0f9b371353e639d1daec7775c20f20348f45baf00f591514c54e1315f044
+DIST python-rsa-version-4.7.gh.tar.gz 64870 BLAKE2B 1e8c8c1a2c4261fdfacf5c83a76b0828dd2fabd26c0a76c0d39e7043a3005058e74a50c1d8f6ed705f5a47ab5d7c077587061ff097cad87424a2e82a8b478b3f SHA512 a88c8f04860e8babe762eb70e6096c55fbb4bbde43525564ecc719f5e6c56fdb65fa7b82a907c6de529a8effea26b1f6f8ffa3440dab99bff97664f7ce5fe31a
diff --git a/dev-python/rsa/metadata.xml b/dev-python/rsa/metadata.xml
index ed36844c6ef4..eb576cdaeba6 100644
--- a/dev-python/rsa/metadata.xml
+++ b/dev-python/rsa/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">rsa</remote-id>
   </upstream>
diff --git a/dev-python/rsa/rsa-4.2.ebuild b/dev-python/rsa/rsa-4.7.ebuild
index b6a0dab713e8..63d7f31a1102 100644
--- a/dev-python/rsa/rsa-4.2.ebuild
+++ b/dev-python/rsa/rsa-4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,9 @@ inherit distutils-r1
 
 MY_P=python-rsa-version-${PV}
 DESCRIPTION="Pure-Python RSA implementation"
-HOMEPAGE="https://stuvel.eu/rsa https://pypi.org/project/rsa/"
+HOMEPAGE="
+	https://stuvel.eu/rsa/
+	https://pypi.org/project/rsa/"
 SRC_URI="
 	https://github.com/sybrenstuvel/python-rsa/archive/version-${PV}.tar.gz
 		-> ${MY_P}.gh.tar.gz"
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
index fd31fa15d255..bbf7d783ae58 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="!<dev-python/ruamel-yaml-0.16.0"
 
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
index 8a8649486fa9..d225b3ec443a 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/s3fs/Manifest b/dev-python/s3fs/Manifest
deleted file mode 100644
index bd242f8580d8..000000000000
--- a/dev-python/s3fs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST s3fs-0.4.2.tar.gz 57527 BLAKE2B 74836547c270e00daeed55321a4d685a638a30a27ab65ea34ceaf55e0c44f1fac66a0802e602c052a5abc8e4a7bca778df7167751a6cf7a177f6a382012741de SHA512 7571a2d3ad998aab7dceb334bfcdb27035f21bfca04fd0828e75c1d860c2662f0a1c8c49317dabdbf2d7c21371c5dd6983a5aea760d2f71bff5ab0dfa9c9a14a
diff --git a/dev-python/s3fs/metadata.xml b/dev-python/s3fs/metadata.xml
deleted file mode 100644
index 8b2547baed3c..000000000000
--- a/dev-python/s3fs/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Gentoo Python Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">s3fs</remote-id>
-    <remote-id type="github">dask/s3fs</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/s3fs/s3fs-0.4.2.ebuild b/dev-python/s3fs/s3fs-0.4.2.ebuild
deleted file mode 100644
index 988166b04390..000000000000
--- a/dev-python/s3fs/s3fs-0.4.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=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pythonic file interface to S3"
-HOMEPAGE="https://s3fs.readthedocs.io/en/latest/"
-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 )"
-
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/fsspec[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# requires internet access
-	sed -e 's:test_anonymous_access:_&:' \
-		-i s3fs/tests/test_s3fs.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index 5f15032716f6..4d0490345971 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1 +1,2 @@
 DIST s3transfer-0.3.3.tar.gz 118872 BLAKE2B a8e10a135052a29cbc5949bd8dc82d0b7f76840e6dbc6ba5ccdfe23757d363476f1dc330cee36ceb88e5c5287f644a27ed50b518a346f1b6b8ae38a9ca5576c9 SHA512 e258958b47812d8620ea6ef604dadb2a13beef9bbed005e8d38153039a291099786a3cec68511f2ff4372ff57f60440ca700b6783967484d8284b4ad0c1ae754
+DIST s3transfer-0.3.4.tar.gz 118954 BLAKE2B 71436d3c8921650dfd2c3aec8a0ddbb2cdee8bb82da605b7a7cc38af112eccb9e2742720c597e01aff57fdd067f8a16a9789f5d5b56dd13f84977607e16ef470 SHA512 012b50cebff200dff3a424241bd0a1aa32bf88cb57a4e3a4616d96aac7c8d5d07e7bfee3a298195f55630d01925d27a3063701d915c6bd080dc2e9f7c01880e9
diff --git a/dev-python/s3transfer/s3transfer-0.3.4.ebuild b/dev-python/s3transfer/s3transfer-0.3.4.ebuild
new file mode 100644
index 000000000000..bf0c84e64195
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.3.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
+
+PATCHES=(
+	"${FILESDIR}"/s3transfer-0.3.3-py38.patch
+)
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/scandir/scandir-1.10.0-r2.ebuild b/dev-python/scandir/scandir-1.10.0-r2.ebuild
index 39827feea308..dd0c618bb712 100644
--- a/dev-python/scandir/scandir-1.10.0-r2.ebuild
+++ b/dev-python/scandir/scandir-1.10.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_test() {
 	"${EPYTHON}" test/run_tests.py -v || die "tests failed under ${EPYTHON}"
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index dd57f9badef1..43540d9367ac 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -13,3 +13,6 @@ DIST scipy-1.5.3.tar.gz 25234560 BLAKE2B 734f29b7e3f6591b265ec43e173d1303683e2fc
 DIST scipy-1.5.4-html.zip 23175279 BLAKE2B 79cf621daa4c41414cd6d52364481ff5df4a21232bc37a5c60f9e63b60e9ad9b07a1603865fd60b2041375ae12791d761fe5d3cbd1f5c0977a37e8bf497c1e3c SHA512 eb93b2ae1dcb916bfbe77ac0ccb7f7f66af3ad3965d397c84dfbc725af08060dccf3fb0988961bf2051f0236c64066dd28f01d85484babb3ee997a9d0bab8069
 DIST scipy-1.5.4-ref.pdf 33467477 BLAKE2B d7a110258d6fe0430c380b34e2053b6b0ef8da7a6b3bee35314d55beae887afb32d01479f1ad6b8bf6847c2225890c20c118e3fd692dae55292793f38b484a9d SHA512 7f98b5014553f73880fe18d942684b8282c6aefb90b329865b65d45cfa0cffac0a8808e970af291a96e4d326ec8b284dc4385ffa5469049b4f643be8642329e7
 DIST scipy-1.5.4.tar.gz 25237512 BLAKE2B 719cfecd6794b037dc636793ba38a3b39f5fd1a44ce2fd2cf2418b0ca6d1a7898b34c4cf684752fdde635107744773c796b998418d5a983450b70beb461e32df SHA512 d23f68911a8880f87767819750d4d175ba8f9c72fcb9b8080305ee65722c046d4485fde4f0c85cc53c46247dd99813afe675a38b3b0569a683ddc2c2e021b8fc
+DIST scipy-1.6.0-html.zip 23941941 BLAKE2B 3222e9b1e1aeebfd1ab0f8d179d25c25d6ab26a54c3d6c7f12d5cb24dd59af216685cb1db1d11980ca32c8e14595a1753b69438d8c7504f7c4fc1b386e1c944d SHA512 42cd5595e1f260bcd14d5ce159d9acd0eaefbcb1401270b90efe48b0e743681361dba5ee410e5932533bca03c19daaacb6042ef8edea9b2cccd5dae21a612072
+DIST scipy-1.6.0-ref.pdf 34332184 BLAKE2B 948a03372797915e47d5e8ce44a32dcacb3448a20e06c5233d3362f0f04f228e8f7505aa918dbbd9a50ad64adb7a17181acab6a726ab251b8e8acf245a1550d6 SHA512 fe4c316f91cffb10d14207882ceb7a1d3711b03ad74857d771d0ec244caad60f878902f7279f6688c947fd415762abbb5a7082c810dd85c73385e8f58fbc056c
+DIST scipy-1.6.0.tar.gz 27275413 BLAKE2B f65fca81a21a3077ead119123fc3bb2ed96aaacfee6f291473ef6780c291f3e9fee88d86501d4cb966f1d601fb7f0656956134f0437eb8fefb8030e762c363a5 SHA512 995ffaf56b713cdd4bdb98d8525b892e9ad84a511878b43213cb71a67f34d87c111da36cf1e0b044c75c0d5af64bfde4ad0f3e9c5e71cae2dbf053251f37064e
diff --git a/dev-python/scipy/scipy-1.1.0.ebuild b/dev-python/scipy/scipy-1.1.0.ebuild
index eaf6bf6eee86..1fd3513d6cdb 100644
--- a/dev-python/scipy/scipy-1.1.0.ebuild
+++ b/dev-python/scipy/scipy-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 CDEPEND="
 	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
diff --git a/dev-python/scipy/scipy-1.4.1.ebuild b/dev-python/scipy/scipy-1.4.1.ebuild
index 840372b10b7a..8845ece545e8 100644
--- a/dev-python/scipy/scipy-1.4.1.ebuild
+++ b/dev-python/scipy/scipy-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/scipy/scipy-1.5.2.ebuild b/dev-python/scipy/scipy-1.5.2.ebuild
index c686b026e636..86a2e65b531d 100644
--- a/dev-python/scipy/scipy-1.5.2.ebuild
+++ b/dev-python/scipy/scipy-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/scipy/scipy-1.5.3.ebuild b/dev-python/scipy/scipy-1.5.3.ebuild
index 1c0b74249dd8..9d6716065073 100644
--- a/dev-python/scipy/scipy-1.5.3.ebuild
+++ b/dev-python/scipy/scipy-1.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/scipy/scipy-1.5.4.ebuild b/dev-python/scipy/scipy-1.5.4.ebuild
index 1c0b74249dd8..9d6716065073 100644
--- a/dev-python/scipy/scipy-1.5.4.ebuild
+++ b/dev-python/scipy/scipy-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/scipy/scipy-1.6.0.ebuild b/dev-python/scipy/scipy-1.6.0.ebuild
new file mode 100644
index 000000000000..f2f1428e8f08
--- /dev/null
+++ b/dev-python/scipy/scipy-1.6.0.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://docs.scipy.org/doc/${P}/${PN}-html-${PV}.zip -> ${P}-html.zip
+		https://docs.scipy.org/doc/${P}/${PN}-ref-${PV}.pdf -> ${P}-ref.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-python/numpy-1.16.5[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${P}-html.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF || die
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	# TODO
+	sed -e 's:test_magic_square_sparse_no_presolve:_&:' \
+		-i scipy/optimize/tests/test_linprog.py || die
+	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
+		-i scipy/stats/tests/test_continuous_basic.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile \
+		${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
+	PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${P}-ref.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "    echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}
diff --git a/dev-python/seaborn/Manifest b/dev-python/seaborn/Manifest
index d46d1a6f131a..0878fd4b2ba9 100644
--- a/dev-python/seaborn/Manifest
+++ b/dev-python/seaborn/Manifest
@@ -1 +1 @@
-DIST seaborn-0.10.1.tar.gz 193770 BLAKE2B f23271b222d409464853ab8f853e17e462890d6f00ca222bcc40d681ff815ef9f1e545e8693f2d33ceeaed51bd6e21ff7edb72835813d4813fffebfa80c84e00 SHA512 167d44d7d64936e15e6c9061cc6bd53a40c0a3e4d619f936ae58de745d5f5273ee8acbd470d3ac155639aac072356a2c2655dff511c4be7d041c3528ab35386f
+DIST seaborn-0.11.1.tar.gz 261397 BLAKE2B b281da14eea5e9038af0d79ed07531d0006294d63ff4cabc308a460f1107a7d045793383d200dd2dd63e18b43cea838dfe245b675dbc5c308960c105348e5e26 SHA512 ea33cfdad8c01986291e07b906011f4104995f26a88b2775e155fe4abc28f6f5e224b15d4150a246ef1e134d72bd3dc6f534f7c0d370ca99d5f15cd84e10ccde
diff --git a/dev-python/seaborn/metadata.xml b/dev-python/seaborn/metadata.xml
index abd6b84a979b..8c458ad2998f 100644
--- a/dev-python/seaborn/metadata.xml
+++ b/dev-python/seaborn/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chr@chymera.eu</email>
+		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/seaborn/seaborn-0.10.1.ebuild b/dev-python/seaborn/seaborn-0.11.1.ebuild
index a457084c6036..1dded300d9d6 100644
--- a/dev-python/seaborn/seaborn-0.10.1.ebuild
+++ b/dev-python/seaborn/seaborn-0.11.1.ebuild
@@ -14,27 +14,23 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
-	<dev-python/matplotlib-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.22.0[${PYTHON_USEDEP}]
-	dev-python/patsy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
 	dev-python/statsmodels[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.0.1[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
 "
 
+distutils_enable_tests pytest
+
 python_test() {
 	cat > matplotlibrc <<- EOF || die
 	backend : Agg
 	EOF
-	pytest -vv || die
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index 24c0b7818448..9c33b0c437f7 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,3 +1,2 @@
-DIST SecretStorage-3.1.2.tar.gz 17848 BLAKE2B 3d108f98fd0c26958860aa65554a21924822a5d51a90ae20c5496792f4571babbdfd2aec5b70d1bdd908498ad1b61606130d5db2900406ae85f8e3367ad3013f SHA512 c132b21556c55b5912354fd27b6062d32c0f510234f7fe57f6e8e0acb08393ad95e0896967b577de97821387cd714e62b657359230296449e4e0a7ae5a797803
 DIST SecretStorage-3.2.0.tar.gz 19311 BLAKE2B 06c3d6137d814f6c2f0cd35927b84c33e09d3c934e4dabfefaa682f3b220045b223aaf06ec970ccc0d39a7388cf13579338299136d13ad2c1b57bf064c278096 SHA512 668f3847f573e1756ffa3a38c278e6d4895223553830d49969e979003d04ca04fb5eaf8dfcc616086a6020f6a73fbe71f7041d4c4ee574205f00fbde945298e9
 DIST SecretStorage-3.3.0.tar.gz 19352 BLAKE2B 8e870d4e95b585f4c5e78d9b11327f21ff909b746f035115bd75bde499f2161c0e1ab3640b3861fc54af67dd7d305f794a855430389c207bfef129f7c0439a9e SHA512 d33c11b98824d214eb67c5b11a7fe0d14af084edfebc1d83204bcfd167258fbc07be8c1de8824ec984d83d07bfd66271c44f751784429e574cb240b5add70e16
diff --git a/dev-python/secretstorage/secretstorage-3.1.2.ebuild b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
deleted file mode 100644
index e76890855198..000000000000
--- a/dev-python/secretstorage/secretstorage-3.1.2.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_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="SecretStorage"
-
-DESCRIPTION="Python bindings to FreeDesktop.org Secret Service API."
-HOMEPAGE="https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( !hppa? ( !sparc? (
-		gnome-base/gnome-keyring
-		sys-apps/dbus
-	) ) )
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-src_test() {
-	case ${ARCH} in
-		hppa|sparc)
-			einfo "gnome-keyring is not supported on ${ARCH}, skipping tests"
-			return
-			;;
-	esac
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	dbus-run-session "${EPYTHON}" -m unittest discover -v -s tests \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/secretstorage/secretstorage-3.2.0.ebuild b/dev-python/secretstorage/secretstorage-3.2.0.ebuild
index fa1417cac2c5..e76890855198 100644
--- a/dev-python/secretstorage/secretstorage-3.2.0.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.2.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/secretstorage/secretstorage-3.3.0.ebuild b/dev-python/secretstorage/secretstorage-3.3.0.ebuild
index b9aec197a099..d65f0625b8c1 100644
--- a/dev-python/secretstorage/secretstorage-3.3.0.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index e64e77905b5d..2432bd74a927 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,3 +1 @@
-DIST sentry-sdk-0.19.1.tar.gz 186747 BLAKE2B ae26751ac2e640b86b3c7426829e699cfdbd1c35e70edf0f1f835e35da82f658990a5f61adc4e7b93b032f6c9824d0df90bb2146f125c1fb846c3436228d5516 SHA512 dd4234a36920893e55026ba5ab8b1476cbc91b035a4b4c78f9dcf29cc8e232dc49c6f7312b8fb3d64cf469552d08ef5cadb65d3a7fb58ba73b87e43375c27c8d
-DIST sentry-sdk-0.19.4.tar.gz 205992 BLAKE2B fdf7d1a29a04be01bc3b7dd7ef7ee0ad33bb03241d9c62e152aa829b2faddb52e7307705ec4f7d89db912ac625de477999167ea66372bcf9304caef31fb65aa4 SHA512 bc8d23b6767a1809ecb4d43becbe266f1e068cfb953cbad280313e54fd3d679308eace42fd880f356bac2f216894e45ee1b51eb2fc74f73f9e433bae406a2a37
 DIST sentry-sdk-0.19.5.tar.gz 206164 BLAKE2B 9d7ce2a64fcb511c659188dc18bc4af18052c0f12ff5d31848f341ef20cbc6c9cf1102d17e6e8d8b741eb8000f94978f840f3ec66b43367820e0ccce97b1fd1b SHA512 082ace137656e8cc8317e70cf4fe9823ccf8cc3ed7b54af059990cede72179924a36896a31a806de4adbbf3bd66e54d5385eb630c047b929583e32c39ed69d61
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.19.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.19.1.ebuild
deleted file mode 100644
index eb444a5734d2..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-0.19.1.ebuild
+++ /dev/null
@@ -1,85 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
-SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		<dev-python/dnspython-2[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/aiocontextvars[${PYTHON_USEDEP}]
-			dev-python/contextvars[${PYTHON_USEDEP}]
-		' python3_6)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# tests require Internet access
-		--deselect tests/integrations/stdlib/test_httplib.py
-		--deselect tests/integrations/requests/test_requests.py
-		# wtf is it supposed to do?!
-		--deselect tests/integrations/gcp/test_gcp.py
-		# fails on py3.6, hangs on py3.7+
-		--deselect
-		'tests/test_transport.py::test_transport_works[eventlet'
-		# TODO
-		--deselect
-		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-		--deselect
-		tests/test_client.py::test_databag_depth_stripping
-		--deselect
-		tests/test_client.py::test_databag_string_stripping
-		--deselect
-		tests/test_client.py::test_databag_breadth_stripping
-		# test_filename: apparently unhappy about pytest being called pytest
-		--deselect 'tests/utils/test_general.py::test_filename'
-		# test_circular_references: apparently fragile
-		--deselect
-		'tests/integrations/threading/test_threading.py::test_circular_references'
-	)
-	[[ ${EPYTHON} == python3.6 ]] && deselect+=(
-		# broken with contextvars on py3.6
-		--deselect
-		'tests/utils/test_contextvars.py::test_leaks[greenlet]'
-		--deselect
-		'tests/test_transport.py::test_transport_works[greenlet'
-	)
-
-	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
-	# Needs to detect sentry-sdk in the installed modules
-	distutils_install_for_testing
-
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.19.4.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.19.4.ebuild
deleted file mode 100644
index c434d2cc5b61..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-0.19.4.ebuild
+++ /dev/null
@@ -1,87 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
-SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		<dev-python/dnspython-2[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/aiocontextvars[${PYTHON_USEDEP}]
-			dev-python/contextvars[${PYTHON_USEDEP}]
-		' python3_6)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# tests require Internet access
-		--deselect tests/integrations/stdlib/test_httplib.py
-		--deselect tests/integrations/requests/test_requests.py
-		# wtf is it supposed to do?!
-		--deselect tests/integrations/gcp/test_gcp.py
-		# fails on py3.6, hangs on py3.7+
-		--deselect
-		'tests/test_transport.py::test_transport_works[eventlet'
-		# TODO
-		--deselect
-		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-		--deselect
-		tests/test_client.py::test_databag_depth_stripping
-		--deselect
-		tests/test_client.py::test_databag_string_stripping
-		--deselect
-		tests/test_client.py::test_databag_breadth_stripping
-		# test_filename: apparently unhappy about pytest being called pytest
-		--deselect 'tests/utils/test_general.py::test_filename'
-		# test_circular_references: apparently fragile
-		--deselect
-		'tests/integrations/threading/test_threading.py::test_circular_references'
-	)
-	[[ ${EPYTHON} == python3.6 ]] && deselect+=(
-		# broken with contextvars on py3.6
-		--deselect
-		'tests/utils/test_contextvars.py::test_leaks[greenlet]'
-		--deselect
-		'tests/test_transport.py::test_transport_works[greenlet'
-	)
-
-	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
-	# Needs to detect sentry-sdk in the installed modules
-	distutils_install_for_testing
-
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild
index c434d2cc5b61..deca92626360 100644
--- a/dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/sentry-python-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/serpent/Manifest b/dev-python/serpent/Manifest
index b593b42dfc6e..78fcd8bb6c83 100644
--- a/dev-python/serpent/Manifest
+++ b/dev-python/serpent/Manifest
@@ -1,2 +1 @@
 DIST serpent-1.30.2.tar.gz 24182 BLAKE2B 9a7f492dbd06331e7e0b7c264fff2c0b184258565d43773eb75dcdd53b8d74df60995439060af0514904043528757201b8fcea4c9bfa56237efe77849abc582e SHA512 1cbc490deae3fb81c59abf74a98437e8c31f1ad88ce31a96c7ae48f344701dfcd67e973d2829cf793c405c6c1930cb7f15dec129c0a0e1b475286dd4f219ff99
-DIST serpent-1.30.tar.gz 24046 BLAKE2B 8a803c9a47ffc9432eb6a48f78d5eb295ad477eef0c24a21c886aaca2cf4e63decf6b1f00d5f71528d867ecbe5789de0c2d19777d651d612f7378f3587a34ab8 SHA512 7ed44f21c9c3079f3423636bb833c49e3eebc89fa4cb6947b01f7cb6cf0161f7a0bf7e8508cef61d9a5475900e3c49d1e72e38cc24614ee99cac449e8b28b975
diff --git a/dev-python/serpent/metadata.xml b/dev-python/serpent/metadata.xml
index cbc5863d65e7..5c92c6bc7ec3 100644
--- a/dev-python/serpent/metadata.xml
+++ b/dev-python/serpent/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">serpent</remote-id>
 		<remote-id type="github">irmen/Serpent</remote-id>
diff --git a/dev-python/serpent/serpent-1.30.2.ebuild b/dev-python/serpent/serpent-1.30.2.ebuild
index ab427af6642e..ba60080cac52 100644
--- a/dev-python/serpent/serpent-1.30.2.ebuild
+++ b/dev-python/serpent/serpent-1.30.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index dfbced9240ed..c5723b7e71e5 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,3 +1 @@
-DIST setproctitle-1.1.10.tar.gz 24042 BLAKE2B acd4ef33ab2a200b5d102fe5ceb78df03deeee47eb5a3c7b50f0a44e095953e5a4e2230278b6b4a5010472e4a5a18b81accbff0461e3a642be478b880d98114e SHA512 c976c5b86f59bc6d0f840f495b8256813169d3d7b9edae70207a24d62e1240bfec954fdc4f67b429ae124e3dc74efd7193404785643a52b2d57b55028bb3c533
 DIST setproctitle-1.2.1.tar.gz 23628 BLAKE2B a50f078a08d2828b03b3cde261af419f88e08045fc18230be017c642c2d4e1b4fb6809e1e2230160d46ba24ba893beb1f95f125b93e7d1b9aacd4ed333bfea7e SHA512 c11f756a61501c4126e6bba5d931a3fb26294d2a55255c717f0e3c3b72184841452195ddf04fb6e8b686d26caa36cb5e13fbd66c66c151c54981a9edc620da1e
-DIST setproctitle-1.2.tar.gz 23454 BLAKE2B 4a69566e48a2985ae8add0341feba26f062d8345dd773570e0500795e43b349777d4bf557bd8b88d9cec37850c129009823a1f87ed6261a9709e84c8a6f56868 SHA512 7dc84ac0fc028ca71e786622aa6b649961feb816e0f03a3d52ab7b1a5d7edc0c932695687f1f5487d27104535a3db0c48d12fd69859478a604dbf60c615f4e01
diff --git a/dev-python/setproctitle/files/setproctitle-1.2-pypy3.patch b/dev-python/setproctitle/files/setproctitle-1.2-pypy3.patch
deleted file mode 100644
index 01d4b0e4dd53..000000000000
--- a/dev-python/setproctitle/files/setproctitle-1.2-pypy3.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b13b7254fa10b4ba461c03b0f1f03858a2368bdc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 25 Nov 2020 09:29:18 +0100
-Subject: [PATCH] Fix skipping embedded tests with pypy
-
-Fix skipping embedded tests by using the 'skipif' decorator.  The tests
-need to be skipped early, as otherwise they error out trying to
-initialize pyconfig fixture.
----
- tests/setproctitle_test.py | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/tests/setproctitle_test.py b/tests/setproctitle_test.py
-index 5d73733..7b679df 100644
---- a/tests/setproctitle_test.py
-+++ b/tests/setproctitle_test.py
-@@ -340,12 +340,10 @@ print(os.popen("ps -x -o pid,command 2> /dev/null").read())
- 
- 
- @pytest.mark.embedded
-+@pytest.mark.skipif(IS_PYPY, reason="skip test, pypy")
- def test_embedded(pyrun, spt_directory):
-     """Check the module works with embedded Python.
-     """
--    if IS_PYPY:
--        pytest.skip("skip test, pypy")
--
-     if not os.path.exists("/proc/%s/cmdline" % os.getpid()):
-         pytest.skip("known failure: '/proc/PID/cmdline' not available")
- 
-@@ -371,11 +369,9 @@ print(os.popen("ps -x -o pid,command 2> /dev/null").read())
- 
- 
- @pytest.mark.embedded
-+@pytest.mark.skipif(IS_PYPY, reason="skip test, pypy")
- def test_embedded_many_args(pyrun, spt_directory):
-     """Check more complex cmdlines are handled in embedded env too."""
--    if IS_PYPY:
--        pytest.skip("skip test, pypy")
--
-     if not os.path.exists("/proc/%s/cmdline" % os.getpid()):
-         pytest.skip("known failure: '/proc/PID/cmdline' not available")
- 
--- 
-2.29.2
-
diff --git a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
deleted file mode 100644
index 26c246cb9796..000000000000
--- a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
+++ /dev/null
@@ -1,34 +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,9,10} pypy3 )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-python_configure_all() {
-	2to3 -w --no-diffs tests || die
-}
-
-python_test() {
-	if [[ ${EPYTHON} != pypy* ]]; then
-		# prepare executable for embedded interpreter test
-		# (skipped with pypy)
-		rm -f tests/pyrun3 || die
-		emake \
-			CC="$(tc-getCC)" \
-			PYINC="$(python_get_CFLAGS)" \
-			PYLIB="$(python_get_LIBS)" \
-			tests/pyrun3
-	fi
-
-	"${EPYTHON}" tests/setproctitle_test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/setproctitle/setproctitle-1.2.1.ebuild b/dev-python/setproctitle/setproctitle-1.2.1.ebuild
index 579320785a47..21f3648d16bd 100644
--- a/dev-python/setproctitle/setproctitle-1.2.1.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/setproctitle/setproctitle-1.2.ebuild b/dev-python/setproctitle/setproctitle-1.2.ebuild
deleted file mode 100644
index c7a6bcababdf..000000000000
--- a/dev-python/setproctitle/setproctitle-1.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=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pypy3.patch
-)
diff --git a/dev-python/setuptools-python2/Manifest b/dev-python/setuptools-python2/Manifest
new file mode 100644
index 000000000000..fc93866d99a1
--- /dev/null
+++ b/dev-python/setuptools-python2/Manifest
@@ -0,0 +1 @@
+DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
diff --git a/dev-python/setuptools/setuptools-46.4.0-r3.ebuild b/dev-python/setuptools-python2/setuptools-python2-46.4.0-r3.ebuild
index d0223688cc16..045a730f06ad 100644
--- a/dev-python/setuptools/setuptools-46.4.0-r3.ebuild
+++ b/dev-python/setuptools-python2/setuptools-python2-46.4.0-r3.ebuild
@@ -4,41 +4,37 @@
 EAPI=7
 # Set to 'manual' to avoid triggering install QA check
 DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9,10}} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
 
+MY_PN=setuptools
+MY_P=$MY_PN-$PV
+
 DESCRIPTION="Collection of extensions to Distutils"
 HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
+RESTRICT="test"
+
+RDEPEND="
+	!dev-python/${MY_PN}[python_targets_python2_7]
+"
 
 BDEPEND="
 	app-arch/unzip
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' -3)
-	)
 "
 # installing plugins apparently breaks stuff at runtime, so let's pull
 # it early
 PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	' -3)"
+	dev-python/certifi-python2
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 # Force in-source build because build system modifies sources.
 DISTUTILS_IN_SOURCE_BUILD=1
@@ -83,3 +79,8 @@ python_install() {
 	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
 	distutils-r1_python_install
 }
+
+python_install_all() {
+	rm -r ${D}/usr/share/doc
+	rm -r ${D}/usr/bin
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index dd980078d013..9750163fc121 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,3 +1,6 @@
-DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
 DIST setuptools-50.3.0.zip 2169216 BLAKE2B 029ea0159de270af0078a4661c696b93681b33dcc475640c7626f5a40bf1bb4759e5915948696c03b76dca10bdc4e790e2e9ef9628f41abca9a6aa48adcb72f6 SHA512 f67a2b7d639e03bf8b3815133e128902a559baf689afdd5893844ddc7c83505d727a6bb30ced1f78c4d2719dd405d2f4c527576bfa14dd9cb50c8ec4a479683e
 DIST setuptools-51.0.0.zip 2059134 BLAKE2B 449e87e413490181136ffa80a109e68b086fd0b1b56b2391e8cc612fb4c9cd4bb89acf05b464a5fa86c3984d3f22bc103dc9a21a2948598b7a17f770c4037008 SHA512 ec8c8a43ef176b5a4029f42c900690c1b9cb304efeb2cf8d36f3f2cb4343af4c1b1770f83ffb0e80ef237f58e6eeb233a97d6b3b8c6c6a2557bc4f14ccff9e90
+DIST setuptools-51.1.0.tar.gz 2050951 BLAKE2B 58890bf458ffab84f93e68393a092c2b2eeaf28e9e443c9a3cf50fb4bbb371bfe28032d08c5ce92fc0b28ad3f9b718f02542f948560b2a8a57af1ada9e77a949 SHA512 914f0d7692f519b658a55e1c7d96b93a45f34c1682c564c6232cd3771db15c91cfee7118ed61f1ae4655a1afe34c9a9c37f293eb6408eeeeeae9eaa6f3760324
+DIST setuptools-51.1.1.tar.gz 2051053 BLAKE2B 182c8c4b4d3bb8caea8cb1812aaff929d7687942d3c469a7f6e0a68a0c5d3d001be2b42d0d131171815359f2c1d59a7b997c5deab657d2ec99c369c6b27ba03f SHA512 ef08f0ecd0b4a255a8e43c2785c2a1ce76f807322c3358b7955d2ea814f9fa3f52962f7cd0431439ef9ee910fd44922d1be1888c350703031cfcab8db0f60ce7
+DIST setuptools-51.1.2.tar.gz 2051107 BLAKE2B a9f1d5dac6bed7b8744f1a3f023398312f6e3696ea68a84bdb252afca3e88b8617ae632384c18cf49906b1ec97f78f467ec158cc09e1842055b5089e154e0429 SHA512 cdfdb3c3666239268ab225704d1a887f027c297262521ee8d55af547cbcef0931656997cc86f4f9a871df6028974bd90b9eea6177c02bf34f98297415b9c410f
+DIST setuptools-51.3.1.tar.gz 2057167 BLAKE2B 4077e117c33c5eaad4de2bc66db0432dc14064de3f4a55e853541b09475bec81b9a07c3baec77a1574ed7912f3db2c6a83b7dcffbbe9bbffb15de13a928e6280 SHA512 5ae96ce0595bdaaa86fbe916e79b545db5a18278f150da2a38a83e43e891bbce8d4f03975ef0d7c6138b3ebcdb16fcfa4dae80a970007c8c60683fd57edc998e
diff --git a/dev-python/setuptools/setuptools-50.3.0.ebuild b/dev-python/setuptools/setuptools-50.3.0.ebuild
index 95e918bc80df..b991a0ebd419 100644
--- a/dev-python/setuptools/setuptools-50.3.0.ebuild
+++ b/dev-python/setuptools/setuptools-50.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools/setuptools-51.0.0.ebuild b/dev-python/setuptools/setuptools-51.0.0.ebuild
index 297d66935a3d..5e7eabfd6bab 100644
--- a/dev-python/setuptools/setuptools-51.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-51.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools/setuptools-51.1.0.ebuild b/dev-python/setuptools/setuptools-51.1.0.ebuild
new file mode 100644
index 000000000000..bfeb722f164f
--- /dev/null
+++ b/dev-python/setuptools/setuptools-51.1.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing --via-root
+	local deselect=(
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+	)
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv setuptools ${deselect[@]/#/--deselect } ||
+		die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-51.1.1.ebuild b/dev-python/setuptools/setuptools-51.1.1.ebuild
new file mode 100644
index 000000000000..e73b58003619
--- /dev/null
+++ b/dev-python/setuptools/setuptools-51.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+	distutils_install_for_testing --via-root
+	local deselect=(
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		# this one's unhappy about pytest-xdist but one test is not worth
+		# losing the speed gain
+		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
+	)
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-51.1.2.ebuild b/dev-python/setuptools/setuptools-51.1.2.ebuild
new file mode 100644
index 000000000000..e73b58003619
--- /dev/null
+++ b/dev-python/setuptools/setuptools-51.1.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+	distutils_install_for_testing --via-root
+	local deselect=(
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		# this one's unhappy about pytest-xdist but one test is not worth
+		# losing the speed gain
+		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
+	)
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-51.3.1.ebuild b/dev-python/setuptools/setuptools-51.3.1.ebuild
new file mode 100644
index 000000000000..e73b58003619
--- /dev/null
+++ b/dev-python/setuptools/setuptools-51.3.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+	distutils_install_for_testing --via-root
+	local deselect=(
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		# this one's unhappy about pytest-xdist but one test is not worth
+		# losing the speed gain
+		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
+	)
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_scm/setuptools_scm-4.1.2-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-4.1.2-r1.ebuild
index 24338d14bf05..8787e3589b39 100644
--- a/dev-python/setuptools_scm/setuptools_scm-4.1.2-r1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-4.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools_scm/setuptools_scm-5.0.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-5.0.0.ebuild
index a7bf379f055a..a5c93b1496d9 100644
--- a/dev-python/setuptools_scm/setuptools_scm-5.0.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild
index a7bf379f055a..a5c93b1496d9 100644
--- a/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
index 89171f538617..60fc32778298 100644
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
index 0a788108ab5b..af5d6932efba 100644
--- a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
+++ b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
diff --git a/dev-python/shutilwhich/Manifest b/dev-python/shutilwhich/Manifest
deleted file mode 100644
index 9e83f97654f0..000000000000
--- a/dev-python/shutilwhich/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST shutilwhich-1.1.0.tar.gz 2300 BLAKE2B 0b510fe364991bcb1b2a627368e0aba23550a60dd0c8f892dbf25b5f23696f49ceedec487d91cc6a5acaffe28c29f635bacc633cc3c3377799fa8c75bd8bcd4d SHA512 94001875c428ce1ad1c92e5f5be1ed497630ac0e2221dbb93fde8438f128f4f2663a0a13e17b94852e4813aadec694fa21c24f647500e8053c89ec610eb7fe21
diff --git a/dev-python/shutilwhich/metadata.xml b/dev-python/shutilwhich/metadata.xml
deleted file mode 100644
index 2417ab895207..000000000000
--- a/dev-python/shutilwhich/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<maintainer>
-			<email>git@marcbrinkmann.de</email>
-			<name>Marc Brinkmann</name>
-		</maintainer>
-		<remote-id type="pypi">shutilwhich</remote-id>
-		<remote-id type="github">mbr/shutilwhich</remote-id>
-	</upstream>
-	<longdescription>
-		shutilwhich will monkey-patch the shutil package, so from that 
-		point on you can simply import the which function.  On Python 
-		3.3 and above, the module never do anything but return the 
-		stdlib shutil.which function.
-	</longdescription>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
deleted file mode 100644
index 7c0d8cdc45b2..000000000000
--- a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
+++ /dev/null
@@ -1,20 +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,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A copy & paste backport of Python 3.3's shutil.which function"
-HOMEPAGE="https://pypi.org/project/shutilwhich/ https://github.com/mbr/shutilwhich"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/simplebayes/Manifest b/dev-python/simplebayes/Manifest
index 17d1ed2b6eb0..b1783ce7c375 100644
--- a/dev-python/simplebayes/Manifest
+++ b/dev-python/simplebayes/Manifest
@@ -1 +1,2 @@
 DIST simplebayes-1.5.7.tar.gz 19260 BLAKE2B 373820a19c1a3188f0dfb57cbe6ac8e27fc6a96e9d1686d698a1f109122afd5240715678d965d843482de3c12b8b806157acef17008d4c6fac0103b343dd44d7 SHA512 417af72db13418e5a9df2fdb642fc63ed3eb4fbbf88cc7252a9e3603d31e35ccb68ae5838d8bb7d77554c1820a9db8aa944c639af4eb6418babb9d360ef3ddbc
+DIST simplebayes-1.5.8.tar.gz 5972 BLAKE2B f942ccde5f449d0ef8ef56fb83a07a8ab0421f43e5af40a3be30822a5d7299b9a0cb1d46397a55bcf7fecc92e40f49404f5bf29467acf7957fbce8619625b58b SHA512 0e39110432db561208cf147bccbdb66f64176a78c0e9ce8495a423ed0d6a027b45deb111d3c872faa10e158fcdaa5380f03a5e0602fecea1a0f00e528e19cfe1
diff --git a/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild b/dev-python/simplebayes/simplebayes-1.5.8.ebuild
index be5a6c68daa7..90894e5cf2e6 100644
--- a/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild
+++ b/dev-python/simplebayes/simplebayes-1.5.8.ebuild
@@ -2,30 +2,28 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
 inherit distutils-r1
 
-DESCRIPTION="High-level SASL client written in pure Python"
-HOMEPAGE="https://github.com/thobbs/pure-sasl"
+DESCRIPTION="memory-based, optional-persistence naive bayesian text classifier"
+HOMEPAGE="https://github.com/hickeroar/simplebayes"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
 DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
 	)"
 
-# tests aren't in dist tarball
-RESTRICT="test"
-
 python_test() {
-	nosetests -v || die
+	nosetests tests/ || die "test failed under ${EPYTHON}"
 }
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
index 38c9811b9e3d..17c61ea64c27 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="ZPL"
 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/dev-python/simplejson/simplejson-3.17.2-r1.ebuild b/dev-python/simplejson/simplejson-3.17.2-r1.ebuild
index af76934b45ba..38ed964f919d 100644
--- a/dev-python/simplejson/simplejson-3.17.2-r1.ebuild
+++ b/dev-python/simplejson/simplejson-3.17.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DOCS=( README.rst CHANGES.txt )
 
diff --git a/dev-python/sip-python2/sip-python2-4.19.22-r1.ebuild b/dev-python/sip-python2/sip-python2-4.19.22-r2.ebuild
index 383b6a266a48..af062b7b5160 100644
--- a/dev-python/sip-python2/sip-python2-4.19.22-r1.ebuild
+++ b/dev-python/sip-python2/sip-python2-4.19.22-r2.ebuild
@@ -11,11 +11,8 @@ HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
 
 MY_PN=sip
 MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${MY_PN}/${MY_P}.tar.gz
+	http://mirror.yandex.ru/calculate/source/${MY_PN}/${MY_P}.tar.gz"
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
diff --git a/dev-python/six-python2/six-python2-1.15.0.ebuild b/dev-python/six-python2/six-python2-1.15.0-r1.ebuild
index 9ff690dc1799..b7861552df2d 100644
--- a/dev-python/six-python2/six-python2-1.15.0.ebuild
+++ b/dev-python/six-python2/six-python2-1.15.0-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 MY_PN=six
@@ -20,6 +21,10 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+BDEPEND="
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
+"
+
 RDEPEND="
 	!dev-python/six[python_targets_python2_7]
 "
diff --git a/dev-python/six/six-1.15.0-r1.ebuild b/dev-python/six/six-1.15.0-r1.ebuild
index 18b9cb30d4ad..693f39deabbe 100644
--- a/dev-python/six/six-1.15.0-r1.ebuild
+++ b/dev-python/six/six-1.15.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_sphinx documentation --no-autodoc
 distutils_enable_tests pytest
diff --git a/dev-python/slixmpp/slixmpp-1.5.2.ebuild b/dev-python/slixmpp/slixmpp-1.5.2.ebuild
index d8d3c57f2d55..ad1de29bc9e2 100644
--- a/dev-python/slixmpp/slixmpp-1.5.2.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DEPEND="
diff --git a/dev-python/smmap2/Manifest b/dev-python/smmap2/Manifest
deleted file mode 100644
index e9ab9098a19a..000000000000
--- a/dev-python/smmap2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST smmap2-2.0.3.tar.gz 23049 BLAKE2B 225ffddb4461caa5cbfee210d086ff62d8d7b2a809640cc972ec831fae16bb4fec0418fde30d86308e84369128a2024d1480e38e85e758dba3550b3469db019d SHA512 f5623247fbdb6b0e94bbfe7104ffd84ee4563a0c32781256d92d46fd23e05280d7a0e3952a573b6834e253e9b68175784babc36d91ab61edf6d0d072830e1fde
diff --git a/dev-python/smmap2/metadata.xml b/dev-python/smmap2/metadata.xml
deleted file mode 100644
index b9e140c7b9aa..000000000000
--- a/dev-python/smmap2/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">smmap2</remote-id>
-    <remote-id type="github">gitpython-developers/smmap</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/smmap2/smmap2-2.0.3.ebuild b/dev-python/smmap2/smmap2-2.0.3.ebuild
deleted file mode 100644
index 9c78c4ec56d2..000000000000
--- a/dev-python/smmap2/smmap2-2.0.3.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,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of a sliding window memory map manager"
-HOMEPAGE="
-	https://pypi.org/project/smmap2/
-	https://github.com/gitpython-developers/smmap"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 arm64 x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	!dev-python/smmap[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/snakeoil/snakeoil-0.8.9.ebuild b/dev-python/snakeoil/snakeoil-0.8.9.ebuild
index b2d544d32d27..043d0e21bc31 100644
--- a/dev-python/snakeoil/snakeoil-0.8.9.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.8.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snappy/Manifest b/dev-python/snappy/Manifest
index a354f60ae458..92766f356ce0 100644
--- a/dev-python/snappy/Manifest
+++ b/dev-python/snappy/Manifest
@@ -1 +1,2 @@
 DIST python-snappy-0.5.1.tar.gz 15252 BLAKE2B eede689d51123968bdea64b8c89dc1fcb7f700fcd4e5869339717657ea6db88cacfcdaf59f00899773c65953c16ae271c5a6e03d6a17be16ca1e3dddf2b37cd3 SHA512 95a6389c58790aaeff61419bb9f183a29ad801733cae8144a67eb6203a8ebf6c6790bea7c025b37588dc98ebd2fed20f37857d2f30199f507f52653d2475c16b
+DIST python-snappy-0.6.0.tar.gz 21344 BLAKE2B ed5b3796a6af9b2196a1cd5353cefb808a878b324d2eae6f83fca12400365c069ed38ad50d790d6201ae9584128371a655ac2003708d324fe227e0153ddaca5d SHA512 185f43fa3adef2a5ec7468f993b83d356dbd76b3340badd308ff2350352b004c4c9528b73282407ebc4f6e1c23a03c1b9abd9f3915b04771ad9b011d7163a63c
diff --git a/dev-python/snappy/snappy-0.6.0.ebuild b/dev-python/snappy/snappy-0.6.0.ebuild
new file mode 100644
index 000000000000..fbae883590ac
--- /dev/null
+++ b/dev-python/snappy/snappy-0.6.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_PN=python-${PN}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python library for the snappy compression library from Google"
+HOMEPAGE="https://pypi.org/project/python-snappy/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+DEPEND=">=app-arch/snappy-1.0.2:="
+RDEPEND=${DEPEND}
+
+python_test() {
+	cp test*.py "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	"${EPYTHON}" -m unittest -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/soaplib/soaplib-1.0.0-r4.ebuild b/dev-python/soaplib/soaplib-1.0.0-r5.ebuild
index 4ec79ff795b0..781192f74866 100644
--- a/dev-python/soaplib/soaplib-1.0.0-r4.ebuild
+++ b/dev-python/soaplib/soaplib-1.0.0-r5.ebuild
@@ -5,6 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1 eutils python-r1
 
 DESCRIPTION="A simple library for writing soap web services."
@@ -21,7 +22,7 @@ RDEPEND="
 	dev-python/pytz-python2
 "
 DEPEND="${RDEPEND}
-	dev-python/setuptools
+	dev-python/setuptools-python2
 "
 
 S="${WORKDIR}/soaplib-soaplib-2801978"
diff --git a/dev-python/sortedcollections/Manifest b/dev-python/sortedcollections/Manifest
deleted file mode 100644
index 8a17344c46da..000000000000
--- a/dev-python/sortedcollections/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sortedcollections-0.5.3.tar.gz 7021 BLAKE2B fdef18b938502f0fc7ce1683977b0982c23aa915d79b6bac30cf9cd74aa19af695f2aacb658a8411304497f28d270e9ba95bbdbcc47220f0302cd376edf312d9 SHA512 e0076017d1a97d7dc18b02bc4e3739c535ab001260be739fab2784cb58deac4323957fe21b4c679f55a790d864ca696695a603298709225b04eae740d859ab28
diff --git a/dev-python/sortedcollections/metadata.xml b/dev-python/sortedcollections/metadata.xml
deleted file mode 100644
index aeb81f008059..000000000000
--- a/dev-python/sortedcollections/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">sortedcollections</remote-id>
-    <remote-id type="github">grantjenks/sortedcollections</remote-id>    
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild b/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
deleted file mode 100644
index 6a93ced83952..000000000000
--- a/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
+++ /dev/null
@@ -1,21 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to sort collections and containers"
-HOMEPAGE="https://www.grantjenks.com/docs/sortedcontainers/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index 8963ca2c913f..5de1ab09278b 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -1,2 +1 @@
-DIST python-sortedcontainers-2.2.2.gh.tar.gz 9228894 BLAKE2B 358a2028a00748c89046069ed7ff075350d4a93f98521b48a72ba466719fd8b1eaa023f4c9d93beec1538315518f7fcc8b5b02478b1506c65fafa3840081b668 SHA512 413212aa35a80d24ec208caf19314dcc42dae207ec4ea8fdd7dc240c6fbf17372cb4c3e2209f6e40094419fa3eeb2fc9b23ad8bd7fb4e6fdaca46fd2fb248281
 DIST python-sortedcontainers-2.3.0.gh.tar.gz 9228968 BLAKE2B cdff8230d4e4ac42a89ed3192666ebf22cd48a4475f1dc173cffb0339c7f27e9cdfde1fb631daadf04adf2c00bed8a924e1202712d0ebcbd591f5542de863461 SHA512 0488e2f9f07ea7e4737ade69441f02614b63cfccb32a71af4e5953001bfa840d2e113a36a0a0a6d4c1e7fdd920ac3937b0baaea522d742547a4d81a99b8d1a6c
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.2.2-r1.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.2.2-r1.ebuild
deleted file mode 100644
index 0757cf519b25..000000000000
--- a/dev-python/sortedcontainers/sortedcontainers-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,28 +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,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python library to sort collections and containers"
-HOMEPAGE="https://www.grantjenks.com/docs/sortedcontainers/
-	https://pypi.org/project/sortedcontainers/
-	https://github.com/grantjenks/python-sortedcontainers/"
-SRC_URI="
-	https://github.com/grantjenks/python-sortedcontainers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH=.
-	pytest -vv --ignore docs/conf.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
index 9363436e5f97..79aa41acb36c 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index e2fbb2a156dc..b85ec7128837 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,2 +1 @@
-DIST soupsieve-2.0.1.tar.gz 96436 BLAKE2B 00fe9390569886181d484c5eb3f2a14352c16c3807d4e2eca8b5fe0ff0fdc1ec77fcf6b32885d76f3a085c149848bdeafa1fd2cabdd4fe4742fc175c34aa72c4 SHA512 f4ef4deee81bb31952e1d3216250712f09b425e7a2253e15bd1b38cb74b680e421e7d086a8770737898f6b57867f07f2dd07b8a98108d05e338bce92b274b85f
 DIST soupsieve-2.1.0.tar.gz 98150 BLAKE2B 37f6ef00f42d164ef57be88135e8a942166f53a39ed5643d6ae0468916a66be04c79e4e70da6ad38f8adf6fac41cb8bccb7edcfabd7e1a07083ab8a043d5203a SHA512 19cd4ee596d189a001bbaf9f047e6c9eff569e2149ef5424bfe55c9b4325d856c957de87d55510335f748aab322dbb847b06b48931fbdeadbcc3790259c69eb1
diff --git a/dev-python/soupsieve/soupsieve-2.0.1.ebuild b/dev-python/soupsieve/soupsieve-2.0.1.ebuild
deleted file mode 100644
index 4c307fd02856..000000000000
--- a/dev-python/soupsieve/soupsieve-2.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,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A modern CSS selector implementation for BeautifulSoup"
-HOMEPAGE="https://github.com/facelessuser/soupsieve
-	https://pypi.python.org/pypi/soupsieve"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT+=" !test? ( test )"
-
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/soupsieve/soupsieve-2.1.0.ebuild b/dev-python/soupsieve/soupsieve-2.1.0.ebuild
index 96572fd46a3f..ce09cdbc94d2 100644
--- a/dev-python/soupsieve/soupsieve-2.1.0.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT+=" !test? ( test )"
 
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
index ad7e7049e923..c4da8020274b 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
@@ -15,7 +15,7 @@ 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 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
index 4ff34bd7c275..e5e804395e0d 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
@@ -16,4 +16,4 @@ SRC_URI="https://github.com/ryan-roemer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index 2e04380e3250..5631d932eb2f 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,2 +1,3 @@
 DIST sphinx-gallery-0.3.1.tar.gz 88807 BLAKE2B 79218a1f438e2b8607c52b14f098c0136cb4d5ce15a12d82bdb3caf0c7c1090e7c4f210437fc660d8d4d19bf87bbaa2ec3c208d2dc8a77ad9deea5b5cefa3c05 SHA512 c51eaaef63a7496e223a4541d0560f694420b6ac4b2cde3779c405f0ab92d34aef7a37e4c41da9e59bd8a050c8d3eed330df3799e76a60ae35cdbc6f7c9cb8c1
 DIST sphinx-gallery-0.8.1.tar.gz 6502920 BLAKE2B 35f6bfe6039910518c21dadcdb7d814f4400baf3996ee5df21ff6a16b8fe87b0ec0355073b854e9b07ab7f2aced6d2de4453b9ebb2aa142506e9cbfebb99ea4c SHA512 0e77b75fe1d9c44d68235603529c116fad0460156d59f6b2f41ff299e42074930694f1768d99fe585428734617d18e1f1379fdc14e359b0274d1614c092141f6
+DIST sphinx-gallery-0.8.2.tar.gz 6530210 BLAKE2B ba1500b9870d89c686dd1afbcab4797e15944cbda4d8d2faf02bb65435fa4208bf7dfae70285c920ad2f3b82bc085b06629fb3d2807462f92e75be91ef1e81a8 SHA512 52dfcf320d1e53b2ee985482af5cee63582b26aa6f3969f2d83e6ffb9503712f5d1a865c849c4b2111f7fd4349cefb158874d8faa323e4e7d73bf547a26f3a93
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild
new file mode 100644
index 000000000000..5568c00f58cc
--- /dev/null
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension to automatically generate an examples gallery"
+HOMEPAGE="
+	https://sphinx-gallery.github.io/
+	https://github.com/sphinx-gallery/sphinx-gallery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/joblib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov-report= --cov=sphinx_gallery::' setup.cfg || die
+
+	# tests require internet
+	sed -e 's:test_embed_code_links_get_data:_&:' \
+		-i sphinx_gallery/tests/test_docs_resolv.py || die
+	sed -e 's:test_run_sphinx:_&:' \
+		-e 's:test_embed_links_and_styles:_&:' \
+		-i sphinx_gallery/tests/test_full.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
index b9dea6b4e22d..a7446e5ee193 100644
--- a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
+++ b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sloria/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/sphinx-panels/Manifest b/dev-python/sphinx-panels/Manifest
index 33ef93edc04f..be1b8c623fff 100644
--- a/dev-python/sphinx-panels/Manifest
+++ b/dev-python/sphinx-panels/Manifest
@@ -1 +1,2 @@
 DIST sphinx-panels-0.4.1.tar.gz 393088 BLAKE2B 3ba183710d211ddc623791dfa1994e08a65a2a3b4c3cda44bba7c13da255dd32c571a3637961bb901dadddfd7d06e7304eb7c489bcdcce8a05452efa151830f3 SHA512 a86377197682fe456d4d1d94571dfcb41bd09b086b79b3fd06a2d170aa97392130315f95534c04160e202cf8674bcd4005893dd306b2a1210647708863d22517
+DIST sphinx-panels-0.5.2.tar.gz 400415 BLAKE2B af103b3a10032590def4b41c650e9023fe94ec6e2fe764a09237cad4d928b1ff429a7a385770f2d07724897413f001ae4037c6e8638b3a9c1d63362c361fd999 SHA512 6d4eb566623543d0553790136e420e3f3a23e06f38b64642e2bb535a5401a954719135a9af89b3655190aebcd35024cecd40b887e7b2bb1394a2a575447316c0
diff --git a/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild b/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild
new file mode 100644
index 000000000000..bb7e2d827627
--- /dev/null
+++ b/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild
@@ -0,0 +1,26 @@
+# 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,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A sphinx extension for creating panels in a grid layout"
+HOMEPAGE="https://github.com/executablebooks/sphinx-panels"
+SRC_URI="https://github.com/executablebooks/sphinx-panels/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? ( dev-python/pytest-regressions[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
index ee425e361d54..1e07708f9100 100644
--- a/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
index a52f2eb89294..13e118e396af 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
@@ -13,5 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
index f63159b8fd0b..7f7d1334403c 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 0fd3af4507bd..6ae9dd89f18f 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,3 +1,4 @@
 DIST Sphinx-2.4.4.tar.gz 5966973 BLAKE2B 727a75eb4ec33beadf80b22cdd8dda02a53f4da4aea10ee18ecae658a69a9bb797f83b0d11b41b8405bf18b2472ea7fd501bea85382c20c5f2a9d5b14a032428 SHA512 cd35b7ebdf4eb41fb3a58706333ca4328fbf9b37999ad1bcc751f9769f0a294464e4def019a403fcd2204ca963ef641c35c957a4145eb50af07573d21df8c74d
-DIST Sphinx-3.2.1.tar.gz 5970067 BLAKE2B 6158d31390c9b07aa3abcdc4eb7ed827cf2160192a2c53ad845f07d5027cc4bd65264ea1114e78e06f9652a8788a8d0e992a8988382787a05bf507a73618cd96 SHA512 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb
 DIST Sphinx-3.3.1.tar.gz 5979919 BLAKE2B 4eb9d8c9dccfd83690252ad6be05a3e69006e1e801bb0b37b77fb6ccf998f3a2fd99a90eba890cfb2baa5545ac0c2734fcd72d602fc2d1091e6754337f241b34 SHA512 bb1fb0780b741c0162ca014cb996dcdaac06985d14b6cc645a835679d7cf2680912784a815a027caf3fe902f721f9707bc9e9daaaf2c2d43051d31fe00584f78
+DIST Sphinx-3.4.2.tar.gz 5996867 BLAKE2B 4ab0989d521702a5e84148d12f57c2332d27519807de1aa33fff3a17813c8be0247e413c768cd3062c4c52372607cc6f5f16ca0a2ff46cbb8e73db4dd7270796 SHA512 7af39a6c40f54018cce59c2407af278bcbfbded305742918d053e75ae7bdc3a1ea8cc615fd554c9f9581c84723cf5f70ebed8916c54215c5024cf63e31dd3a0e
+DIST Sphinx-3.4.3.tar.gz 5997116 BLAKE2B 73a488564d5889bfc6d7f6f797aa3b144b03cf5f086a4543c3f4b2a452b353f4d799b80a14a0d4118e227660b7f9367fe8f3a2e91f6127cdca489cf4fad215f3 SHA512 2e085e00c722f3aaf34552eefc3842daf5443f7b8a11afa850db1e31ad81d5ff7f579622b91f982b21708fa6379907bac4fe72d42dc05859a3f62c75298facaa
diff --git a/dev-python/sphinx/sphinx-2.4.4.ebuild b/dev-python/sphinx/sphinx-2.4.4.ebuild
index 46405878cbdf..f1060a33d3cb 100644
--- a/dev-python/sphinx/sphinx-2.4.4.ebuild
+++ b/dev-python/sphinx/sphinx-2.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc latex test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx/sphinx-3.2.1.ebuild b/dev-python/sphinx/sphinx-3.3.1-r1.ebuild
index 6ad49b81cda3..2a0d43fbcc3f 100644
--- a/dev-python/sphinx/sphinx-3.2.1.ebuild
+++ b/dev-python/sphinx/sphinx-3.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,19 +16,19 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc latex test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.12[${PYTHON_USEDEP}]
 	dev-python/imagesize[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/snowballstemmer[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/sphinx-3.3.1.ebuild b/dev-python/sphinx/sphinx-3.4.2-r1.ebuild
index e4701f467cbb..f0e68d45683f 100644
--- a/dev-python/sphinx/sphinx-3.3.1.ebuild
+++ b/dev-python/sphinx/sphinx-3.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,19 +16,19 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc latex test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.12[${PYTHON_USEDEP}]
 	dev-python/imagesize[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/snowballstemmer[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
@@ -67,43 +67,6 @@ PATCHES=(
 )
 
 python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-	sed -i -e 's:test_latex_images:_&:' tests/test_build_latex.py || die
-
-	# fail under pypy3 (some because of missing typed-ast)
-	# revisit when pypy3 becomes pypy3.8
-	sed -i -e '/def test_partialfunction/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		-e '/def test_autodoc_typed_instance_variables/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		-e '/def test_autodoc_inherited_members_None/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		-e '/def test_cython/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		-e '/def test_automethod_for_builtin/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		tests/test_ext_autodoc.py || die
-	sed -i -e '/import pytest/aimport sys' \
-		-e '/def test_builtin_function/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		-e '/def test_methoddescriptor/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		-e '/def test_wrapped_function/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		tests/test_ext_autodoc_autofunction.py || die
-	sed -i -e '/import pytest/aimport sys' \
-		-e '/def test_autodoc_typehints_signature/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		tests/test_ext_autodoc_configs.py || die
-	sed -i -e '/import pytest/aimport sys' \
-		-e '/def test_autosummary_generate_content_for_module/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		tests/test_ext_autosummary.py || die
-	sed -i -e '/def test_annotated_assignment_py36/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		tests/test_pycode_parser.py || die
-
 	# disable internet access
 	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
 		doc/conf.py || die
@@ -133,5 +96,33 @@ python_compile_all() {
 python_test() {
 	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
 	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	pytest -vv || die "Tests fail with ${EPYTHON}"
+
+	local deselect=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_build_latex.py::test_latex_images
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment_py36
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/sphinx/sphinx-3.4.3.ebuild b/dev-python/sphinx/sphinx-3.4.3.ebuild
new file mode 100644
index 000000000000..f0e68d45683f
--- /dev/null
+++ b/dev-python/sphinx/sphinx-3.4.3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2021 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,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.12[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typed-ast[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		${RDEPEND}
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local deselect=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_build_latex.py::test_latex_images
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment_py36
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index c4bbe38c730a..a93f1092c5f9 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,2 +1,3 @@
 DIST sphinx_rtd_theme-0.2.4.tar.gz 1392456 BLAKE2B daf2365d74823465a73ea37352f0a8e85f196ac9c89006e79610a2981b1a266e523865c3b6f7866fa9e77a856c5a6fe001a2eb114dcb252920b19231eade9709 SHA512 865b09febc1c289d47a8be3f3d7caa9d2a4715b350e2e2d058855831321a6f870e8339b2ef22eafc2b9fe72ad48f96b8d2fda4bc032c5f8dcdf23f314869cfbb
 DIST sphinx_rtd_theme-0.4.3.tar.gz 5391190 BLAKE2B 6e08e079378c023f160fc3b858544bec6a295b256564d91c49b9ed8b5d2ee87bb2f21a30239f99fd2463840d194fde820c84ccd8e0b908f96fb7e5ca0fd9e6da SHA512 44b9309ddd041181542747c70b6e180c07aaf8cd7ee9e4c7eb9e3948685b8bd578e815c022bd991cc7f4bc7d02bb3c7a6d213e5d0c2e8214aa85d50b73e53853
+DIST sphinx_rtd_theme-0.5.1.tar.gz 2774928 BLAKE2B 1ff9c2e1b7ef7740de4969b6b4862d9ac499d515163a32ca2b5438c84910d610c80f5e8c3d03e3016ffa8c58003abecb67bd036ded065dfb65318e2f1d7e69d9 SHA512 20a04408fdf3f5698fecb2a0a430eba6f484770c8e01026c0d444d25ffcbd798edb82aa4b489df10b63d9fcc5eac204e9e3ccdaaf7eac7eb0baee2a5d7960c30
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.1.ebuild
new file mode 100644
index 000000000000..98079fe58db6
--- /dev/null
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ReadTheDocs.org theme for Sphinx"
+HOMEPAGE="https://github.com/readthedocs/sphinx_rtd_theme"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE=""
+
+PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${PDEPEND}
+		dev-python/readthedocs-sphinx-ext[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	# CI=1 disables rebuilding webpack that requires npm use
+	# yes, that surely makes sense
+	export CI=1
+}
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
index 913282e86714..9261e6a94d11 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-bibtex/Manifest b/dev-python/sphinxcontrib-bibtex/Manifest
new file mode 100644
index 000000000000..8a428f1c4b05
--- /dev/null
+++ b/dev-python/sphinxcontrib-bibtex/Manifest
@@ -0,0 +1 @@
+DIST sphinxcontrib-bibtex-2.0.0.tar.gz 135555 BLAKE2B 8a542ff7895a89a8dbf6b8ed1df3ab4e928b68ce86881819c1fbfafdda626c2e1106f5513832ee09248381c89f54f06d4d1b42f005b1f775b0fbe8962a0a0ff1 SHA512 bffd4cb1ea8d88b947b89f5bd1c55bbb8bbab8679f205216f87f932cc0170d2bbabfbe4ea8d32fb7c980826d3f7c4a20cd49c2fb36f288b5cdc4500ad9ff75cd
diff --git a/dev-python/sphinxcontrib-bibtex/metadata.xml b/dev-python/sphinxcontrib-bibtex/metadata.xml
new file mode 100644
index 000000000000..682290b0c48a
--- /dev/null
+++ b/dev-python/sphinxcontrib-bibtex/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-bibtex</remote-id>
+		<remote-id type="github">mcmtroffaes/sphinxcontrib-bibtex</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.0.0.ebuild b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.0.0.ebuild
new file mode 100644
index 000000000000..526b49c35751
--- /dev/null
+++ b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extensions for BibTeX style citations"
+HOMEPAGE="https://github.com/mcmtroffaes/sphinxcontrib-bibtex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/oset[${PYTHON_USEDEP}]
+	dev-python/pybtex[${PYTHON_USEDEP}]
+	dev-python/pybtex-docutils[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
index f2fae590e342..613f96fb4e75 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
index dc4577fb9345..84c58a8d9102 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
index b10170035473..794beb62ecb5 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # ImportError: cannot import name 'SphinxStandaloneReader'
 RESTRICT="test"
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
index 311485f531fa..99b356e2feb3 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index 81faae9d99eb..ed6e305f9838 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-pretty-searchresults/Manifest b/dev-python/sphinxcontrib-pretty-searchresults/Manifest
deleted file mode 100644
index e487c5a4317e..000000000000
--- a/dev-python/sphinxcontrib-pretty-searchresults/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sphinxcontrib-pretty-searchresults-0.3.5.tar.gz 9996 BLAKE2B 64324f306aec1d6eac9c791acc0f3f4a0a434f734abcf9bb0d34151137e20407d59e95ea3a3a981e425ded6b6fd82bd36627323a3ed493a47b92979ac5fe2f77 SHA512 30c9a0af183ffada3300c03495afb9f52fbba5522dd386c5a05a28fa1e6dd0fb66725499db7a537534496843e6707c7dcceea45511ee3953d02c3e2275e68630
diff --git a/dev-python/sphinxcontrib-pretty-searchresults/metadata.xml b/dev-python/sphinxcontrib-pretty-searchresults/metadata.xml
deleted file mode 100644
index 7e6b9c423927..000000000000
--- a/dev-python/sphinxcontrib-pretty-searchresults/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Sphinx: pretty search results is an extension for the Sphinx
-		documentation tool.
-
-		To display search results, Sphinx is fetching the
-		source files of search hits and rendering excerpts in raw markup
-		(Example). This extension removes the markup from these source files
-		(during build time), so the search results look decent.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">sphinxprettysearchresults</remote-id>
-		<remote-id type="github">sphinx-contrib/sphinx-pretty-searchresults</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5.ebuild b/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5.ebuild
deleted file mode 100644
index 16397907309b..000000000000
--- a/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5.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=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-MY_PN="${PN/sphinxcontrib/sphinx}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Decently styled search results for sphinx-doc projects"
-HOMEPAGE="https://github.com/sphinx-contrib/sphinx-pretty-searchresults"
-SRC_URI="https://github.com/sphinx-contrib/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx-testing[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	cd tests || die
-	"${EPYTHON}" run.py || die
-}
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
index 912baf1bc4f2..a89013f00230 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
index 527afa7271b2..6e742aecfb3f 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index 727d0defdbcb..50833ccd7e57 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,5 +1 @@
-DIST sphinxcontrib-spelling-5.3.0.tar.gz 45665 BLAKE2B c44c8c2621aecd74734c6137e1344a763e99fb61b3ce882c8ea70364df17a7e2fac49acc8878753cab1b70df2cf084de5087bed77f8b1bffe311410ecec3504d SHA512 8f3c4718877e55b0ebcd3d8c0f078a6c06c27c2cdd3cc557fd2e0e990f0c8956179fd9a8b3135b280973e45c0c8657f71372746ef4b55319078db8f16c7e00e9
-DIST sphinxcontrib-spelling-5.4.0.tar.gz 46823 BLAKE2B 8303a97b87d953a37db4548d895559baf93969c11f8417aafeb67804ec537f9ea028bcbf6a56eb3290f13871a782dcde142b1927865a6f9eefd5a20dc53061b1 SHA512 7e0fe6289f9482982825a1204c926490a1e31dc85e25e6418ba47f5575430875e3df5f77202ad458044b810bc2a29f989e6bc6f0c9b4934af938716a4ab887f0
-DIST sphinxcontrib-spelling-7.0.0.tar.gz 46859 BLAKE2B 08b8fb68f485ce9a091ad889999887c1683c39a99d8b138b1215228a01696181c0c1876004506f54a89812aa96dcb4936145f105829d82017576329bba416f4f SHA512 b5c9585e171747addc2c9d00ede4e4c290286a6f35921fc54bb8a88bb9574b01494e5e7dbf492d59e74afd3c815a2814a4b7d27b3c3aa98a7b6b8934626d2bde
-DIST sphinxcontrib-spelling-7.0.1.tar.gz 47435 BLAKE2B c61d6c91f1765cbe793474f22df571fe0dff59caaef68caf48a5e43c211c589cfcdeb4a9cf397568d48071258ad945637db586c5b3c46b0002fb01248b8d4abd SHA512 54e48361554c54c75aa02512cd70759fbbd439947c9a0258e80d377598d4ed63abd7adcff51c898dcfc93c8b2176395d51830cfebd55a81a4fee13740733dea8
 DIST sphinxcontrib-spelling-7.1.0.tar.gz 49353 BLAKE2B 59e1f5e3fadeb175fb3d1b7a77acdb23e532456de053f886507c76189bf5f657a948d6288625110ccacfb5b673f23d209e6164f3535da30559f0ac4e792f34e9 SHA512 b8ae9ad79afacd362a986dc63d3be87b91d3560333bbcb026ab7d64fa8139e05e048d5e868df0fc40a159a3c44aeac01191df5ef8208bbcd7e35242f9a0b97be
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
deleted file mode 100644
index df664567a5e4..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="https://github.com/sphinx-contrib/spelling"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	dev-python/pbr[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		app-dicts/myspell-en
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-# The doc can only be built from a git repository
-distutils_enable_tests pytest
-
-RDEPEND+="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.ebuild
deleted file mode 100644
index 6a19fab56b30..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.ebuild
+++ /dev/null
@@ -1,52 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="https://github.com/sphinx-contrib/spelling"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		app-dicts/myspell-en
-	)
-"
-
-# The doc can only be built from a git repository
-distutils_enable_tests pytest
-
-# We don't want distutils_enable_tests to add the namespace
-# package to BDEPEND under "test?". Therefore we add it to RDEPEND
-# after running distutils_enable_tests.
-RDEPEND+="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# Needs to be run from a git repository
-	sed -i 's/test_contributors/_&/' \
-		sphinxcontrib/spelling/tests/test_filter.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.0.ebuild
deleted file mode 100644
index d06657cba70c..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.0.ebuild
+++ /dev/null
@@ -1,52 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="https://github.com/sphinx-contrib/spelling"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		app-dicts/myspell-en
-	)
-"
-
-# The doc can only be built from a git repository
-distutils_enable_tests pytest
-
-# We don't want distutils_enable_tests to add the namespace
-# package to BDEPEND under "test?". Therefore we add it to RDEPEND
-# after running distutils_enable_tests.
-RDEPEND+="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# Needs to be run from a git repository
-	sed -i 's/test_contributors/_&/' \
-		tests/test_filter.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.1.ebuild
deleted file mode 100644
index d9296a09dd73..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.1.ebuild
+++ /dev/null
@@ -1,52 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="https://github.com/sphinx-contrib/spelling"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		app-dicts/myspell-en
-	)
-"
-
-# The doc can only be built from a git repository
-distutils_enable_tests pytest
-
-# We don't want distutils_enable_tests to add the namespace
-# package to BDEPEND under "test?". Therefore we add it to RDEPEND
-# after running distutils_enable_tests.
-RDEPEND+="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# Needs to be run from a git repository
-	sed -i 's/test_contributors/_&/' \
-		tests/test_filter.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0.ebuild
index d9296a09dd73..b8e4cf6fde02 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index fb2025ef6db9..61589a5eb2fc 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1 +1,2 @@
 DIST spyder-kernels-1.10.0-gh.tar.gz 77416 BLAKE2B 0d3e3f8228d2a76174e8d7c64a55c9fda384961065673b1b6b64591f476e8932c5dc3fe253b67d94135688b8d346828f88800bdc3bb0b83450d51669218f98b3 SHA512 59a66d9f6c9b53a2cb058e1c493535ee18c3965a62d6ff728cc0f9544c35fbdf56f18024c778c242802f961259231e153cdcd98c867bec84a80ca3541dbcf455
+DIST spyder-kernels-1.10.1-gh.tar.gz 78055 BLAKE2B 51b087d44ef91bc79b10edb12054a2dd6d950b43f39f783f91be4a7681d40c1aa777514517d3b8e9de6fa8c03dbd23ec7a0c46dd9901102bcd06107af51f960d SHA512 f7504691143aff043e39bcab479d1aa76e5814670e081472dde719936f840b3f5e7812575fd829b34301ccdf7f1cd32afb705d37ee452f3e3a691e12bb57965a
diff --git a/dev-python/spyder-kernels/metadata.xml b/dev-python/spyder-kernels/metadata.xml
index 08900078c038..bd2fd3e59372 100644
--- a/dev-python/spyder-kernels/metadata.xml
+++ b/dev-python/spyder-kernels/metadata.xml
@@ -13,5 +13,9 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild
new file mode 100644
index 000000000000..9894ffa10087
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild
@@ -0,0 +1,47 @@
+# 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,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# requires dask[distributed] while we last-rited distributed
+	sed -i -e 's:test_dask_multiprocessing:_&:' \
+				spyder_kernels/console/tests/test_console_kernel.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 9932a8792c86..36a21c34b903 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,2 +1,4 @@
 DIST spyder-4.2.0.tar.gz 11840358 BLAKE2B 26e4cd9865196fb39fa5b49a17f172b3000fe27c5ab6fb1b31ed56d41f118e4016b6ed97ce8cb1b39c65031fc11413f8e426876d3dc8d5af25f12428d0e0c481 SHA512 c1460e2fe9a37c0e6107657de71205682018d87737b3eac16ec92c32d979bf727a6c8955bd2700872b6e91159d1a1efc57cdea52ffc44604fe34b78094de6e7f
+DIST spyder-4.2.1.tar.gz 12156626 BLAKE2B 4a009c8b2ebe1b71bb60c568d5e6a3d7616fba7f9988669e97a2454b6369421a8603495271ad4c275cae9ad7207f2666b28ecccb121b4cc5554a3d1a863a1579 SHA512 56975e851a05dd023d851adaff8e9a747f9b1aa626db8ce65f805e41c5c47dba017332e81bf9efaae65671e06bc7632a519def286568a8ed2f48b41aa285de62
+DIST spyder-docs-5c9c8a3317045c2d301e05b751943be9b521d129.tar.gz 66692311 BLAKE2B ec741a9cd830bc8a5776be1d52dcac9649c8abf33faec0ac8741d95625d8aeda2b8c0d2bdbef02c068a22ec62a4d5281a48e996530e1bd2e6de43b86e0a14ffe SHA512 73bd05ef31f69ebd80bb488017998536c4ed0e63a331efe743d9d858b936df287253f333d09beac6d2b249a96e8f82538d321850a64b0941db3d0141122995eb
 DIST spyder-docs-7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c.tar.gz 58822544 BLAKE2B 9ddd662eb0e3b2845a15bc38a0ab994fcf43824a560cf635a29e16b5eb66407706a412ea50a2f8e5c0212675df3422ece649bd1e50e3ecd1c34ee5727f8a2df9 SHA512 ab30f287733681da0b1d15656a44cd320401330309efbff8f0a89f59a15d5c57532a2eab3e8353d8c3856eac0a393385a852663d6698d0a0d309def21d13933d
diff --git a/dev-python/spyder/files/spyder-4.2.1-build.patch b/dev-python/spyder/files/spyder-4.2.1-build.patch
new file mode 100644
index 000000000000..38d3356b0b3d
--- /dev/null
+++ b/dev-python/spyder/files/spyder-4.2.1-build.patch
@@ -0,0 +1,36 @@
+diff --git a/setup.py b/setup.py
+index 0c47210..20b95c0 100644
+--- a/setup.py
++++ b/setup.py
+@@ -97,21 +97,6 @@ def get_packages():
+     return packages
+ 
+ 
+-#==============================================================================
+-# Make Linux detect Spyder desktop file
+-#==============================================================================
+-class MyInstallData(install_data):
+-    def run(self):
+-        install_data.run(self)
+-        if sys.platform.startswith('linux'):
+-            try:
+-                subprocess.call(['update-desktop-database'])
+-            except:
+-                print("ERROR: unable to update desktop database",
+-                      file=sys.stderr)
+-CMDCLASS = {'install_data': MyInstallData}
+-
+-
+ #==============================================================================
+ # Main scripts
+ #==============================================================================
+@@ -177,8 +162,7 @@ def run(self):
+         'Intended Audience :: Developers',
+         'Topic :: Scientific/Engineering',
+         'Topic :: Software Development :: Widget Sets'
+-    ],
+-    cmdclass=CMDCLASS)
++    ])
+ 
+ 
+ #==============================================================================
diff --git a/dev-python/spyder/spyder-4.2.1.ebuild b/dev-python/spyder/spyder-4.2.1.ebuild
new file mode 100644
index 000000000000..180246ee9663
--- /dev/null
+++ b/dev-python/spyder/spyder-4.2.1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit optfeature xdg distutils-r1
+
+# Commit of documentation to fetch
+DOCS_PV="5c9c8a3317045c2d301e05b751943be9b521d129"
+
+DESCRIPTION="The Scientific Python Development Environment"
+HOMEPAGE="
+	https://www.spyder-ide.org/
+	https://github.com/spyder-ide/spyder/
+	https://pypi.org/project/spyder/
+"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# The test suite often hangs or does not work.
+# Technically spyder requires pyqt5<13, which
+# we do not have in ::gentoo any more. Likely
+# this is the reason many of the tests fail
+# or hang. RESTRICTing because IMO it is
+# not worth the several hours I spend every
+# single version bump checking which tests
+# do and do not work. Spyder itself works
+# fine with pyqt5>13.
+RESTRICT="test"
+
+# White space separated deps are expansion of python-language-server[all] dep
+# As the pyls ebuild does not add flags for optional runtime dependencies
+# we have to manually specify these desp instead of just depending on the [all]
+# flag. The indentation allows us to distinguish them from spyders direct deps.
+RDEPEND="
+	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
+	dev-util/cookiecutter[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
+	~dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
+	~dev-python/parso-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]
+
+	dev-python/autopep8[${PYTHON_USEDEP}]
+	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+	dev-python/yapf[${PYTHON_USEDEP}]
+
+	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyls-black-0.4.6[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/qdarkstyle-2.8[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.0.1[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-1.10.1[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/matplotlib[tk,${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	<dev-python/pytest-6.0[${PYTHON_USEDEP}]
+	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-ordering[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+	dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+)"
+
+# Based on the courtesy of Arfrever
+# This patch removes a call to update-desktop-database during build
+# This fails because access is denied to this command during build
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.1-build.patch"
+	"${FILESDIR}/${PN}-4.1.5-doc-theme-renamed.patch"
+)
+
+DOCS=(
+	"AUTHORS.txt"
+	"Announcements.md"
+	"CHANGELOG.md"
+	"CODE_OF_CONDUCT.md"
+	"CONTRIBUTING.md"
+	"NOTICE.txt"
+	"README.md"
+	"RELEASE.md"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/doc dev-python/sphinx-panels dev-python/pydata-sphinx-theme dev-python/sphinx-multiversion
+
+python_prepare_all() {
+	# move docs into workdir
+	mv ../spyder-docs-${DOCS_PV}* docs || die
+
+	# these deps are packaged separately: dev-python/spyder-kernels, dev-python/python-language-server
+	rm external-deps/* -r || die
+	# runs against things packaged in external-deps dir
+	rm conftest.py || die
+
+	# do not depend on pyqt5<13
+	sed -i -e '/pyqt5/d' \
+		-e '/pyqtwebengine/d' \
+			setup.py || die
+
+	# do not check deps, fails because we removed pyqt5 dependency above
+	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
+		spyder/tests/test_dependencies_in_sync.py || die
+
+	# can't check for update, need network
+	rm spyder/workers/tests/test_update.py || die
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.py || die
+
+	# KeyError: 'conda: base', need conda??
+	sed -i -e 's:test_status_bar_conda_interpreter_status:_&:' \
+		spyder/widgets/tests/test_status.py || die
+
+	# assert 2 == 1
+	sed -i -e 's:test_pylint_max_history_conf:_&:' \
+		spyder/plugins/pylint/tests/test_pylint.py || die
+
+	# https://bugs.gentoo.org/747211
+	sed -i -e 's:test_loaded_and_closed_signals:_&:' \
+		spyder/plugins/projects/tests/test_plugin.py || die
+
+	# AssertionError: assert '' == 'This is some test text!'
+	sed -i -e 's:test_tab_copies_find_to_replace:_&:' \
+		spyder/plugins/editor/widgets/tests/test_editor.py || die
+
+	# hangs till forever
+	sed -i -e 's:test_help_opens_when_show_tutorial_full:_&:' \
+		spyder/app/tests/test_mainwindow.py || die
+
+	# Assertion error, can't connect/remember inside ebuild environment
+	rm spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
+
+	# AssertionError: waitUntil timed out in 20000 miliseconds
+	sed -i -e 's:test_pdb_multiline:_&:' \
+		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
+
+	# AssertionError: assert 'if True:\n    0\n    ' == 'if True:\n    0'
+	sed -i -e 's:test_undo_return:_&:' \
+		spyder/plugins/editor/widgets/tests/test_codeeditor.py || die
+
+	# assert False is True
+	sed -i -e 's:test_range_indicator_visible_on_hover_only:_&:' \
+		spyder/plugins/editor/panels/tests/test_scrollflag.py || die
+
+	# AssertionError: waitUntil timed out in 10000 miliseconds
+	sed -i -e 's:test_get_hints:_&:' \
+		spyder/plugins/editor/widgets/tests/test_hints_and_calltips.py || die
+
+	# Fatal Python error: Aborted
+	sed -i -e 's:test_module_completion:_&:' \
+		spyder/utils/introspection/tests/test_modulecompletion.py || die
+
+	# assert 0 > 0
+	sed -i -e 's:test_maininterpreter_page:_&:' \
+		spyder/preferences/tests/test_config_dialog.py || die
+
+	# This hangs forever
+	sed -i -e 's:test_load_kernel_file:_&:' \
+		-e 's:test_load_kernel_file_from_location:_&:' \
+		-e 's:test_load_kernel_file_from_id:_&:' \
+		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+# Calling pytest directly makes the tests freeze after completing even if successful
+# Exit code is nonzero even upon success, so can't add || die here
+# test results should be checked for success manually
+python_test() {
+	${EPYTHON} runtests.py
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "To get additional features, optional runtime dependencies may be installed:"
+		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+		optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+		optfeature "Run Cython files in the IPython console" dev-python/cython
+		optfeature "The hdf5/h5py plugin" dev-python/h5py
+		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+		optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+		# spyder-autopep8 does not have a release (yet)
+		# and are not compatible with >=spyder-4.0.0 at the moment
+		# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+		optfeature "Vim key bindings" dev-python/spyder-vim
+		optfeature "Unittest support" dev-python/spyder-unittest
+		optfeature "Jupyter notebook support" dev-python/spyder-notebook
+		optfeature "System terminal inside spyder" dev-python/spyder-terminal
+		# spyder-reports not yet updated to >=spyder-4.0.0
+		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+}
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
index ee9f36382acd..432b7e8b5e7e 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 051c2b70a88b..82ab03588f54 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,2 +1,4 @@
 DIST SQLAlchemy-1.3.17.tar.gz 5979141 BLAKE2B f0fa46493461f532ebca9420fc9f49a2c04af888aa99653946a5bb563d40b8bb714a03301300ebb80cca76a99f8226ddfcde4216e8fc2593d3a161b5072276ab SHA512 6f6d54b9018ece6c289f28a3a41ffb1b2216206edee08c49f387e9f30740969dfe0f8272654ce4efca159a2a6619e76c41b2ad2b10c391cdd64681ac17d0bc79
 DIST SQLAlchemy-1.3.20.tar.gz 6264898 BLAKE2B 4c386eff56c2f9ec7ef467e3bc0032629582a970707dc11e3744fe3903d9cb18457f5e0be4dc9c20727b5733f158e031bf8b40f586dadb8f4ab8d0cae3cf7398 SHA512 29c52ada1a66f906ed2563df2ab093eceb7c09de45749c96031f30a1512d20b1d698e00640c777169ef3db99ab012151770a3daea45a51df934269b554ff4b28
+DIST SQLAlchemy-1.3.21.tar.gz 6297278 BLAKE2B 39bd440eec25adc3ec81eaf55d2b97ecb328da4fd6e78dca17a94548a34336a8ef01a1dd0b4565794f4647d3bb4a98803873990c2e0df865216ed57fbe67ba1c SHA512 50ea60b849e6f043507728482dc1a90faea853c3fb16affe1d68197903578cb31f26b3543f4671be6aec2a705343193bfa7579e8d417e74c92ee104af4fba753
+DIST SQLAlchemy-1.3.22.tar.gz 6300186 BLAKE2B 5b788ddadef0b68f440c5c7584320dd0a71d43e288febf0cb35c4683052be0f46174ac17b7c8b22ad0461f1e5f55ef5e6dbb149c49d727c3b42b49f48eb7589d SHA512 5e43af97dd93af8174f14575c8238a72153afa4dbe56503cf934de9f783ea15ad27b25523c147191bd2ec89e25baafab5f5d9c34a29f71eaf4e2de49af5bb887
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
index 4caa81f27cb3..1e696f7ca4dd 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
index 0f4fd2aa72b0..d324f54e7ab3 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.21.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.21.ebuild
new file mode 100644
index 000000000000..53e75f5c5e5b
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.21.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+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 ~x64-solaris"
+IUSE="examples +sqlite test"
+
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# Ported part of those commits to fix failing tests:
+	# https://github.com/sqlalchemy/sqlalchemy/commit/c68f9fb87868c45fcadcc942ce4a35f10ff2f7ea
+	# https://github.com/sqlalchemy/sqlalchemy/commit/a9b068ae564e5e775e312373088545b75aeaa1b0
+	# https://github.com/sqlalchemy/sqlalchemy/commit/9e31fc74089cf565df5f275d22eb8ae5414d6e45
+	"${FILESDIR}/sqlalchemy-1.3.20-pypy3.patch"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Use all CPUs with pytest-xdist
+	pytest -n auto -vv || die "Tests failed with ${EPYTHON}"
+}
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
new file mode 100644
index 000000000000..53e75f5c5e5b
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+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 ~x64-solaris"
+IUSE="examples +sqlite test"
+
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# Ported part of those commits to fix failing tests:
+	# https://github.com/sqlalchemy/sqlalchemy/commit/c68f9fb87868c45fcadcc942ce4a35f10ff2f7ea
+	# https://github.com/sqlalchemy/sqlalchemy/commit/a9b068ae564e5e775e312373088545b75aeaa1b0
+	# https://github.com/sqlalchemy/sqlalchemy/commit/9e31fc74089cf565df5f275d22eb8ae5414d6e45
+	"${FILESDIR}/sqlalchemy-1.3.20-pypy3.patch"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Use all CPUs with pytest-xdist
+	pytest -n auto -vv || die "Tests failed with ${EPYTHON}"
+}
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlparse/sqlparse-0.3.1.ebuild b/dev-python/sqlparse/sqlparse-0.3.1.ebuild
index 9ed630fe02b4..0f560affd48a 100644
--- a/dev-python/sqlparse/sqlparse-0.3.1.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}"/${P#python-}
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 
 BDEPEND="
diff --git a/dev-python/sqlparse/sqlparse-0.4.1.ebuild b/dev-python/sqlparse/sqlparse-0.4.1.ebuild
index eb52588d9ae2..84d355bda807 100644
--- a/dev-python/sqlparse/sqlparse-0.4.1.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}"/${P#python-}
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 
 distutils_enable_sphinx docs/source
diff --git a/dev-python/sshtunnel/Manifest b/dev-python/sshtunnel/Manifest
index 9e0f87790788..90adee069cac 100644
--- a/dev-python/sshtunnel/Manifest
+++ b/dev-python/sshtunnel/Manifest
@@ -1,2 +1 @@
-DIST sshtunnel-0.1.5.tar.gz 49345 BLAKE2B dde497296ebf84cd34a485ac82de3ca138671b4b8ad2d2307a5e40dc0bb9c6a6daa8c8f3888db942133a9a0fb5321c240c5f2db7c93baf824c9cefaf361ef7c9 SHA512 ae804865a83bae8443cff1a73b168ffb8aac0c5c4fa6c7a5e142f4f95b4eef34bc7674588fa8797fa35b2685016828bcb137f4102e84ea15089671cf64503d17
 DIST sshtunnel-0.3.1.tar.gz 51392 BLAKE2B 9cf5c0e1f12489e482abf73e74d1a59bdc619b5248265add15744357ef49bf502e013b9d4494efff27e45817e0728f2cee3629f5cf21ba9849f564e84ac9c4a9 SHA512 5c24243cae959cf38f2cdcad4351950ca3abd1c6d289829b6603cd8e93b8d61480c4c7b3607bb38615854825c0bf08890c2362f79104c8bae7f9bf8e0931aa85
diff --git a/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild b/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
deleted file mode 100644
index b074ed16351e..000000000000
--- a/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
+++ /dev/null
@@ -1,28 +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,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Pure Python SSH tunnels"
-HOMEPAGE="https://pypi.python.org/pypi/sshtunnel"
-SRC_URI="mirror://pypi/s/sshtunnel/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86"
-LICENSE="MIT"
-SLOT="0"
-
-IUSE="test"
-
-RDEPEND="dev-python/paramiko[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/tox[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/sshtunnel/sshtunnel-0.3.1.ebuild b/dev-python/sshtunnel/sshtunnel-0.3.1.ebuild
index 88af24a89bba..4876649fa63c 100644
--- a/dev-python/sshtunnel/sshtunnel-0.3.1.ebuild
+++ b/dev-python/sshtunnel/sshtunnel-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,13 +11,12 @@ DESCRIPTION="Pure Python SSH tunnels"
 HOMEPAGE="https://pypi.org/project/sshtunnel/"
 SRC_URI="mirror://pypi/s/sshtunnel/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~x86"
 LICENSE="MIT"
 SLOT="0"
-
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
+RESTRICT="test"
+
 RDEPEND="dev-python/paramiko[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
-
-RESTRICT="test"
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index 7691a3c84018..b5d60831a589 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND=""
 
diff --git a/dev-python/statsmodels/metadata.xml b/dev-python/statsmodels/metadata.xml
index ce9fffb67345..ed734da25420 100644
--- a/dev-python/statsmodels/metadata.xml
+++ b/dev-python/statsmodels/metadata.xml
@@ -10,7 +10,7 @@
     <name>Gentoo Mathematics Project</name>
   </maintainer>
   <maintainer type="person">
-    <email>chr@chymera.eu</email>
+    <email>gentoo@chymera.eu</email>
     <name>Horea Christian</name>
   </maintainer>
   <maintainer type="project">
diff --git a/dev-python/statsmodels/statsmodels-0.12.1.ebuild b/dev-python/statsmodels/statsmodels-0.12.1.ebuild
index a69c5f35affb..6c9bf7240b22 100644
--- a/dev-python/statsmodels/statsmodels-0.12.1.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.12.1.ebuild
@@ -13,7 +13,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="examples"
 
 RDEPEND="
diff --git a/dev-python/stestr/stestr-2.1.0-r1.ebuild b/dev-python/stestr/stestr-2.1.0-r1.ebuild
index fb3838975721..2f78cfa3a833 100644
--- a/dev-python/stestr/stestr-2.1.0-r1.ebuild
+++ b/dev-python/stestr/stestr-2.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index a2608d158f88..d7a20d68c03b 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,2 +1 @@
-DIST stevedore-3.2.2.tar.gz 512174 BLAKE2B 60061f04cee8b4ab1c95ab7c02083abd15a623970168df379c82860bb2ea9b27171f5862851eb194c88001b02878eacab4428a76cbfbe528e7246b3e492abfe1 SHA512 1c3f81157b16af800c1caa971f063c50638a70eced582dbcffafaf7d9bbd4e402f75003fcd73b3cb85940bbe9027bac24e37754ffcacffb06d133e938e07ebcf
 DIST stevedore-3.3.0.tar.gz 513293 BLAKE2B c1eee40a451fd6cad033a618a15cb62e65dc4ead8d2dd9eced4278cd11b1daf0f6fefdba2f2fa8dc1a63b6c525b1a3cbb87c8db12945e7412ed76318ee42592b SHA512 4fdd13c08517aef69700566fc04fb26a29b5a72f73a476d656d134b0d99229a8cf0012d9f1ae4565ffab6fa30e745a013d96da8eff00f8316ae1b5010e4cfbb3
diff --git a/dev-python/stevedore/stevedore-3.2.2.ebuild b/dev-python/stevedore/stevedore-3.2.2.ebuild
deleted file mode 100644
index e256c3b46801..000000000000
--- a/dev-python/stevedore/stevedore-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
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc64 sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-3.3.0.ebuild b/dev-python/stevedore/stevedore-3.3.0.ebuild
index 4e28b199d7d1..648c6a555f02 100644
--- a/dev-python/stevedore/stevedore-3.3.0.ebuild
+++ b/dev-python/stevedore/stevedore-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,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 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
index b985bc183d86..6cda8bfedfca 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/danielrichman/${PN}/archive/version-${PV}.tar.gz ->
 
 SLOT="0"
 LICENSE="GPL-3+"
-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"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
index b7c37768b937..29eb89e64331 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/subvertpy/Manifest b/dev-python/subvertpy/Manifest
deleted file mode 100644
index 7e2ba2499484..000000000000
--- a/dev-python/subvertpy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST subvertpy-0.10.1.tar.gz 116661 BLAKE2B 81fdc21352f168c1a8d31398be21ad83ed72adc824dbbca7764fb1836cba4a7d7f03e4a96636ab29f4804682658ce834eea3fd433b5f161e61a702dfc6790e22 SHA512 083174ca6516541c48474673e6d601ff3098f19d204f311101f4de81bcd70d73bdb1e73dffe43fc584f35d286020cab1381dc1c44b514442735a139d2a9cd356
diff --git a/dev-python/subvertpy/metadata.xml b/dev-python/subvertpy/metadata.xml
deleted file mode 100644
index 9d2ae1cb41f8..000000000000
--- a/dev-python/subvertpy/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">subvertpy</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/subvertpy/subvertpy-0.10.1.ebuild b/dev-python/subvertpy/subvertpy-0.10.1.ebuild
deleted file mode 100644
index 27c021019e6d..000000000000
--- a/dev-python/subvertpy/subvertpy-0.10.1.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Alternative Python bindings for Subversion"
-HOMEPAGE="
-	https://jelmer.uk/code/subvertpy/
-	https://pypi.org/project/subvertpy/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=dev-vcs/subversion-1.4"
-DEPEND="${RDEPEND}
-	dev-libs/apr-util"
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test --args=-v
-}
diff --git a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild b/dev-python/sudsds/sudsds-1.0.1-r2.ebuild
index ac0d6b9c7860..3f8cc35cdc97 100644
--- a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
+++ b/dev-python/sudsds/sudsds-1.0.1-r2.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 DESCRIPTION="Lightweight SOAP client - Czech NIC labs fork"
@@ -16,5 +17,5 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools-python2[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/svg-path/metadata.xml b/dev-python/svg-path/metadata.xml
index 95589339c41c..cc6a38d518a1 100644
--- a/dev-python/svg-path/metadata.xml
+++ b/dev-python/svg-path/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chr@chymera.eu</email>
+		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/svgwrite/Manifest b/dev-python/svgwrite/Manifest
index 3197da5251f5..d5d2e8def4ca 100644
--- a/dev-python/svgwrite/Manifest
+++ b/dev-python/svgwrite/Manifest
@@ -1 +1,2 @@
+DIST svgwrite-1.4.1.tar.gz 251446 BLAKE2B 21ca55911f6ac1be949c1a714bb61ac58b4b1c04397b1e9076a626080a8420c18a63afb5989c48c7ba6cb843f73bccebd9bd00ae0b032894096135c0ad366cd8 SHA512 74015ed4a72cd781a577ab8c2f38a30a1f6561ca0379e62ecaac8136f40998c926597d97a0c1006fdab69ac4a23ce1841bda296881ede511f3f1b4a2e8dea06f
 DIST svgwrite-1.4.tar.gz 251138 BLAKE2B b105fa60ed75628c59b3ad4d0ea32dddf83f618e213ce6974b5db0e93d519e563eb5a9ff5e37012f71c7ce79579ca927acfb8709d2f8e8ad316b04bae8abafcb SHA512 b722fc51c6b3755064942bb6c7ea199ba5902ee37e426962ed24e0b67659e72e8da36cd2516193e2348a939ab2ccd2c5114349ac72d7b9ea52a7b7d68ad1ce74
diff --git a/dev-python/svgwrite/svgwrite-1.4.1.ebuild b/dev-python/svgwrite/svgwrite-1.4.1.ebuild
new file mode 100644
index 000000000000..b1ee693eac4b
--- /dev/null
+++ b/dev-python/svgwrite/svgwrite-1.4.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python Package to write SVG files"
+HOMEPAGE="https://github.com/mozman/svgwrite"
+SRC_URI="https://github.com/mozman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# fetches from the Internet
+	sed -i -e 's:test_embed_google_web_font:_&:' \
+		tests/test_style.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index 893ff32d81fe..c7aaeb7e1830 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,3 +1 @@
-DIST sybil-1.4.0.tar.gz 30062 BLAKE2B 86a01b4c8c10512f3e2b067f4d1007e60ba46f23f22ad80ff7a30a4503db06fd91d841b33bc54f0f7acbd2539e595f8b0201f9a8e8ccb7577f8e9f422562e02d SHA512 f385b4e67cc5a4b32c7563d98f36dab6e5320966563eb341395e9327c16f92a63863558bfa795b6531819fa6038234492d4d19c1d9286e6306039e8d4abec0b8
-DIST sybil-2.0.0.tar.gz 29217 BLAKE2B 90c60ef39a21f3d8a16d4bd29b158e8fa9f687b0f40c520105bb02c8f4ee131b4a131a5612a7edcd55936d415ab76994013a2098670bdd502988616fd81b8f16 SHA512 e260d55da9d502a38f527f4b460dd76bfe22029a73eb02006e16d61f3b2b445a82b154d6067cb1d2a2dc9785dae5af1c187534a37d890201cb04902c6e8fdf63
 DIST sybil-2.0.1.tar.gz 29316 BLAKE2B cf03bc1595efab535d1248b9d267dcd01547f02539977c12b8753e70d13ea0744a6ab76dc1e44fd1c46d192577aa4c1a9b5d5d52678928acfd63937358fa3e33 SHA512 4f3be7686c1acf6812623a756fa79b41e3fbe5d4c3b4c7cf5dfe39fbe56806b4ef3acd24e25968ab9119b2c65ad5c30eabe32f1a93fb62ba8d3893ef123e69f0
diff --git a/dev-python/sybil/sybil-1.4.0.ebuild b/dev-python/sybil/sybil-1.4.0.ebuild
deleted file mode 100644
index dcc12f86f085..000000000000
--- a/dev-python/sybil/sybil-1.4.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2019-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,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Automated testing for the examples in your documentation"
-HOMEPAGE="https://github.com/cjw296/sybil"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# nose is used to test nosetests integration
-BDEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sybil/sybil-2.0.1.ebuild b/dev-python/sybil/sybil-2.0.1.ebuild
index 265c8c70fbef..aa474ea62b5b 100644
--- a/dev-python/sybil/sybil-2.0.1.ebuild
+++ b/dev-python/sybil/sybil-2.0.1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index 3beb69c6899d..7a8476d16bf4 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,3 +1,2 @@
 DIST sympy-1.6.2.tar.gz 6811705 BLAKE2B 4cd894d28bedc986acc8ef67aa60f82e0899c2ed028658a8f340d7538b890e0ed380b3614a464eb58d71873b29b0795508b4556bb8115bf0c108336ef1e4cca3 SHA512 e16a1d85aba438e4248bac48a163ea1827e2cee57c28f7670ed19cc69d4c08d6796d62f79d245e269d75765b8f7ff4f4ca2841f98534e136ceeb5d3f7a5d252a
 DIST sympy-1.7.1.tar.gz 6974183 BLAKE2B 4bd8c9d60c46b05a7fc6c622667858fe17d25798756dbe967ce19abc8047263fe540f332e39418e877852c0565270377bd01fea7e65aa35ed4e03079bc130805 SHA512 eb9387bb9c632203af650279f896427556725b7496c00d8dfe97b7476beedbbee5714659f7fb44b4fa986c9567cdcaefcc19401d63e1ca0e9a6c7317855440ea
-DIST sympy-1.7.tar.gz 6969594 BLAKE2B c4ebd395e50f589dba2d01bf50a1a9cd7fb34e95e2b8632a64df5fe1a6625889c4e161b8a22aa815857cc3eb0d502f03ec8d9de694f369aaca7e573a2fab03ee SHA512 f7bdaff7432436dc888e56d4b56d023c8da5cfb54dfa6955cf7999acceedfd5175f910fb9b3c5776145f3dc3036f78e66813cdba4201be854dfa2c5c9f4e9f4d
diff --git a/dev-python/sympy/sympy-1.6.2.ebuild b/dev-python/sympy/sympy-1.6.2.ebuild
index 06bc68d37a4b..565fe30460b2 100644
--- a/dev-python/sympy/sympy-1.6.2.ebuild
+++ b/dev-python/sympy/sympy-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/sympy/sympy-1.7.1.ebuild b/dev-python/sympy/sympy-1.7.1-r1.ebuild
index f1fccb5232a0..ce0b831022c0 100644
--- a/dev-python/sympy/sympy-1.7.1.ebuild
+++ b/dev-python/sympy/sympy-1.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
@@ -36,7 +36,7 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
 	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
 	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
 	texmacs? ( app-office/texmacs )
-	theano? ( dev-python/theano[${PYTHON_USEDEP}] )
+	theano? ( || ( dev-python/theano-pymc[${PYTHON_USEDEP}] dev-python/theano[${PYTHON_USEDEP}] ) )
 "
 
 src_test() {
diff --git a/dev-python/sympy/sympy-1.7.ebuild b/dev-python/sympy/sympy-1.7.ebuild
deleted file mode 100644
index a2ab71ae9473..000000000000
--- a/dev-python/sympy/sympy-1.7.ebuild
+++ /dev/null
@@ -1,66 +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,9,10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="https://sympy.org"
-SRC_URI="https://github.com/sympy/sympy/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-		png? ( app-text/dvipng )
-		pdf? ( app-text/ghostscript-gpl )
-	)
-	mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] )
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
-	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
-	texmacs? ( app-office/texmacs )
-	theano? ( dev-python/theano[${PYTHON_USEDEP}] )
-"
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" setup.py test || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.md )
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-
-	if use texmacs; then
-		exeinto /usr/libexec/TeXmacs/bin/
-		doexe data/TeXmacs/bin/tm_sympy
-		insinto /usr/share/TeXmacs/plugins/sympy/
-		doins -r data/TeXmacs/progs
-	fi
-}
diff --git a/dev-python/tblib/tblib-1.7.0.ebuild b/dev-python/tblib/tblib-1.7.0.ebuild
index bc27ec55bc67..83ebc41517c3 100644
--- a/dev-python/tblib/tblib-1.7.0.ebuild
+++ b/dev-python/tblib/tblib-1.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
diff --git a/dev-python/tempita/tempita-0.5.3-r3.ebuild b/dev-python/tempita/tempita-0.5.3-r3.ebuild
index 664a07f1a72b..19d38b582be1 100644
--- a/dev-python/tempita/tempita-0.5.3-r3.ebuild
+++ b/dev-python/tempita/tempita-0.5.3-r3.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/ianb-${PN}-${MY_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 45faf134a62e..b18d5a91b958 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,3 +1 @@
-DIST tempora-3.0.0.tar.gz 21500 BLAKE2B 7bf241d5ab60c78c0ea56df6b28e33504200eb5427cdffaf9d5f34da202c3ba4550fa4dcc48874ee870345fa5a10f2b874687fe7de2bbe049b1c14d05161b0e0 SHA512 2d397c1d17bb4c502817ad0278090137fb8ca00273c63a7336200ed7e621a99cd5c954cdc2da00d06eba34ed4f079429f5ddc68b928cc83feacb2335f995e1b7
-DIST tempora-4.0.0.tar.gz 47217 BLAKE2B 3f8489c584768c074874fd299d11ca71b51c646f07792ac910dbd3fa76c309a866e599204364bbc06e6589a6fa046d3150bff05c9d3beb9b427ff409e2c27fe6 SHA512 59792bf03b4ccbdd5b849f0f6b9a0b5f2672e1cc3076b85449b8f183524d23de05588c3a8185550cdb9e52cc610e29db18ed151b8c5f5f25438de41015cc595e
 DIST tempora-4.0.1.tar.gz 20978 BLAKE2B 1216472a3e03fe0856f598478267647a2a9f8f6b6e28a0e48fc9f66877303da053d1a7e793b812fa8b0909b219a669cd8d82759dfd2c0793d43cc2d086993a8c SHA512 1ee954a7053db2dc0a94637453613851806cc4582f04019e303e13566a842c2710f3c364fd54d8832d4ce2a5eaac29121db9c474b407d5b92e4f8b8ff43b03df
diff --git a/dev-python/tempora/tempora-3.0.0.ebuild b/dev-python/tempora/tempora-3.0.0.ebuild
deleted file mode 100644
index 30592a9dec18..000000000000
--- a/dev-python/tempora/tempora-3.0.0.ebuild
+++ /dev/null
@@ -1,55 +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,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-python_prepare_all() {
-	# avoid a setuptools_scm dependency
-	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
-	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
-		setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	# Skip a test that requires pytest-freezegun
-	# because it seems to be poorly maintained
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		--deselect tempora/__init__.py::tempora.get_nearest_year_for_day \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/tempora/tempora-4.0.0.ebuild b/dev-python/tempora/tempora-4.0.0.ebuild
deleted file mode 100644
index b4ff4815f718..000000000000
--- a/dev-python/tempora/tempora-4.0.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=( python3_{6,7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-src_prepare() {
-	sed -i -e 's:--flake8 --black --cov --mypy::' pytest.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/tempora/tempora-4.0.1.ebuild b/dev-python/tempora/tempora-4.0.1.ebuild
index 7a0497372393..4d5073084928 100644
--- a/dev-python/tempora/tempora-4.0.1.ebuild
+++ b/dev-python/tempora/tempora-4.0.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 1cb836039d61..3ce1e314f2cc 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,2 +1,3 @@
-DIST testfixtures-6.15.0.tar.gz 116119 BLAKE2B cc0e351bd6778393cf061b741d7d593f56bc1b6a3d53d2e34baa006f7edd718c86f1b16c094e42cf116805a5c6652ac6827f71c1ebbb160d48c071317603c151 SHA512 34b9f1b9a5e76c5e20acf9abae2961694817de3822361cd5afc4a405ccdbcf26c617a01fbd8d2d977c2a0bc696232c2363df4a9fb7ba9187e0743cf2a6fe98e1
 DIST testfixtures-6.16.0.tar.gz 120986 BLAKE2B bb17c44091370edca55f1e273f70e454c2e74a152a228f97efba08d605e3a024c64bfc163b3aa50805f038556c76fb754825b16fdf4451760403682c06251c80 SHA512 0c519fa2d2619ad71f6b487456ea1480365aa421c14a9beaeee916e7841bd266be2c95d48c61b64e91554b37d2621358a45b124be6a6d25b3e381f966653c9b8
+DIST testfixtures-6.17.0.tar.gz 121419 BLAKE2B 62dc8808cf9fbc37386fcf9e44c56edbdc2c51ee0698518142dcbc52b73ab538445d49d5d4a779cd68bf51b6aa267222f877bdc703d3dc87230f6a6db81e258a SHA512 2ace802d3bf8b261727037a5ac26a0beca852ca8c2e57ec33344707f300edae7cf317f1bb79c05aa809b1f68d38ffabcc6c5383ce9ecfd4f66a80b02ff4c7315
+DIST testfixtures-6.17.1.tar.gz 121440 BLAKE2B 6fcdf4f99af7941044f5f3cdc3e1204b5730d514a009e95f14451537f62af6c6ebaa97356b7ca0dae6313bd81b2a83d981567346e20c477c2d17c6bca73ecdcf SHA512 fbf7c8cd39b83516a257c5a3bce724a8416af88cf1bac8d69457b2030873185c685feb12aea065df2af729a9b733b3e0afe76207bd78e9b5a0c2d464b727d99e
diff --git a/dev-python/testfixtures/testfixtures-6.16.0.ebuild b/dev-python/testfixtures/testfixtures-6.16.0.ebuild
index c963b2a56fd4..fbb828208b6d 100644
--- a/dev-python/testfixtures/testfixtures-6.16.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/testfixtures/testfixtures-6.15.0.ebuild b/dev-python/testfixtures/testfixtures-6.17.0.ebuild
index b8d8833f0e03..c963b2a56fd4 100644
--- a/dev-python/testfixtures/testfixtures-6.15.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.17.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
@@ -38,5 +38,5 @@ python_prepare_all() {
 python_test() {
 	PYTHONPATH="." \
 	DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings \
-	pytest -vv || die
+	pytest -vv || die "Tests failed with "${EPYTHON}
 }
diff --git a/dev-python/testfixtures/testfixtures-6.17.1.ebuild b/dev-python/testfixtures/testfixtures-6.17.1.ebuild
new file mode 100644
index 000000000000..8c367eb9005c
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-6.17.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/sybil[${PYTHON_USEDEP}]
+		>=dev-python/twisted-18[${PYTHON_USEDEP}]
+		dev-python/zope-component[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# kill weird way of declaring build deps
+	sed -e '/build=/d' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH="." \
+	DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings \
+	pytest -vv || die "Tests failed with "${EPYTHON}
+}
diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild
index 594d8760f631..8c7e4a941379 100644
--- a/dev-python/testrepository/testrepository-0.0.20.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.20.ebuild
@@ -14,7 +14,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 ~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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testresources/testresources-2.0.1.ebuild b/dev-python/testresources/testresources-2.0.1.ebuild
index 1be25e9f2d7d..c49dd819c2cf 100644
--- a/dev-python/testresources/testresources-2.0.1.ebuild
+++ b/dev-python/testresources/testresources-2.0.1.ebuild
@@ -13,7 +13,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 ~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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
index 25389fc89276..9ecaa7c4522c 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
@@ -13,7 +13,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 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testtools/testtools-2.4.0-r1.ebuild b/dev-python/testtools/testtools-2.4.0-r1.ebuild
index 2ca1c8eeec35..733eac8ecbde 100644
--- a/dev-python/testtools/testtools-2.4.0-r1.ebuild
+++ b/dev-python/testtools/testtools-2.4.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/textdistance/Manifest b/dev-python/textdistance/Manifest
new file mode 100644
index 000000000000..ee6361a1a911
--- /dev/null
+++ b/dev-python/textdistance/Manifest
@@ -0,0 +1 @@
+DIST textdistance-4.2.0.tar.gz 34519 BLAKE2B 0432705c57cecd66fe8c9cd4c12293220f1aa72e26c17f7a99d0a312d6ac7c2bb769a01dce9fc950a578f50a490616cb76dbafec541cbe1d61dd8f645dd51281 SHA512 8b58d02824d0c94ece9d0322180dd25af7dd0cef708e3f981efa16e262373532de3d68aed7dffd2008cfb04f30495a1792f2f22e9f1d8a802426d464c20d7b07
diff --git a/dev-python/textdistance/metadata.xml b/dev-python/textdistance/metadata.xml
new file mode 100644
index 000000000000..1abf2b02a7c3
--- /dev/null
+++ b/dev-python/textdistance/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">textdistance</remote-id>
+		<remote-id type="github">life4/textdistance</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/textdistance/textdistance-4.2.0.ebuild b/dev-python/textdistance/textdistance-4.2.0.ebuild
new file mode 100644
index 000000000000..a3b35e6301c4
--- /dev/null
+++ b/dev-python/textdistance/textdistance-4.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Compute distance between the two texts"
+HOMEPAGE="https://github.com/life4/textdistance"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Too many strange failures
+RESTRICT="test"
+
+BDEPEND="test? (
+	dev-python/abydos[${PYTHON_USEDEP}]
+	dev-python/hypothesis[${PYTHON_USEDEP}]
+	dev-python/isort[${PYTHON_USEDEP}]
+	dev-python/jellyfish[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/pyxDamerauLevenshtein[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/theano-pymc/Manifest b/dev-python/theano-pymc/Manifest
new file mode 100644
index 000000000000..b85d83179619
--- /dev/null
+++ b/dev-python/theano-pymc/Manifest
@@ -0,0 +1,4 @@
+DIST Theano-PyMC-rel-1.0.15.tar.gz 12978600 BLAKE2B 9038baa6d7c275a20a2e4f4f9e382f651deee958b2f044ad4360ea7d5a0408ab237af03857d5a598464c770ab1935d051d0f84657efd2915f5c80b393b972e04 SHA512 ad544b2749320ac2c3cd27e84e7700ce469e7d840491675378aabc3a75b03b26065c1022760fd1dae06f6cd694b4ec6de95e78280c478884ffdb224e4f0760ad
+DIST Theano-PyMC-rel-1.1.0.tar.gz 12482951 BLAKE2B 3c3cf6bcd396ce01d68575d8272a9b110077ef8c2b4a6c8f0e795dafcf75f862e145d4e9d83289950e8d463098fe0ebbcee8f4d5f0867d9e6c673c77d6fe8b90 SHA512 667c0b3662ee41254d1776060d64d46b58980ac4ae4e7b271d29d7e09321089946e4aa864626b6e8ea1bd2eae330688b675d507e18dce2d92a4a8df5a0116bb6
+DIST theano-pymc-1.0.13.tar.gz 12975871 BLAKE2B 71528868885084d7c37f1f5cc5156aca5e764d09f0dc57aa46e21240ee2959aafb5882aef8977d9f215b051265d0d9bc3a7097ac0bb6d427cfc076ea6f591905 SHA512 da25e386965695a5630c54a671a7a573d0f0fae2eeeacf4f65130e4e4caf416373852ac14b1eb07ae39c194febe854d71fffe2adc24c348f64a4b73b43564229
+DIST theano-pymc-1.0.14.tar.gz 12979426 BLAKE2B e6db87a348d6e7003f8b1ff4e0634335d53d734ea922951edeaab06ec54d51f1d7930a03f6dca14979930abb6212f873d606a9adada46d5b606854c5d8a6c6a5 SHA512 4ddfe5978f33cea96b20763cb01eecf1ec6c0c6b97ac892d647e28b607e61b11862739e5836356ab87e2002e992febe35ce9e1e72d37732074be2dbed64b50b9
diff --git a/dev-python/dugong/metadata.xml b/dev-python/theano-pymc/metadata.xml
index 7bbeebb75b74..ae53260eb42b 100644
--- a/dev-python/dugong/metadata.xml
+++ b/dev-python/theano-pymc/metadata.xml
@@ -2,12 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="pypi">dugong</remote-id>
-    <remote-id type="github">python-dugong/python-dugong</remote-id>
+    <remote-id type="pypi">Theano-PyMC</remote-id>
+    <remote-id type="github">pymc-devs/Theano-PyMC</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/theano-pymc/theano-pymc-1.0.13-r1.ebuild b/dev-python/theano-pymc/theano-pymc-1.0.13-r1.ebuild
new file mode 100644
index 000000000000..627cad9f55ed
--- /dev/null
+++ b/dev-python/theano-pymc/theano-pymc-1.0.13-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 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,9,10} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/pymc-devs/Theano-PyMC"
+SRC_URI="https://github.com/pymc-devs/Theano-PyMC/archive/rel-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/Theano-PyMC-rel-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/, 'flake8'//" setup.py || die
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/theano-pymc/theano-pymc-1.0.14.ebuild b/dev-python/theano-pymc/theano-pymc-1.0.14.ebuild
new file mode 100644
index 000000000000..627cad9f55ed
--- /dev/null
+++ b/dev-python/theano-pymc/theano-pymc-1.0.14.ebuild
@@ -0,0 +1,42 @@
+# Copyright 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,9,10} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/pymc-devs/Theano-PyMC"
+SRC_URI="https://github.com/pymc-devs/Theano-PyMC/archive/rel-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/Theano-PyMC-rel-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/, 'flake8'//" setup.py || die
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/theano-pymc/theano-pymc-1.0.15.ebuild b/dev-python/theano-pymc/theano-pymc-1.0.15.ebuild
new file mode 100644
index 000000000000..b5addc2bb1d5
--- /dev/null
+++ b/dev-python/theano-pymc/theano-pymc-1.0.15.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2020-2021 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,9,10} )
+inherit distutils-r1 optfeature
+
+MY_P=Theano-PyMC-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/pymc-devs/Theano-PyMC"
+SRC_URI="
+	https://github.com/pymc-devs/Theano-PyMC/archive/rel-${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+	)
+
+	distutils_install_for_testing --via-root
+	pytest -vv ${exclude[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/theano-pymc/theano-pymc-1.1.0.ebuild b/dev-python/theano-pymc/theano-pymc-1.1.0.ebuild
new file mode 100644
index 000000000000..820118d4f297
--- /dev/null
+++ b/dev-python/theano-pymc/theano-pymc-1.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2020-2021 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,9,10} )
+inherit distutils-r1 optfeature
+
+MY_P=Theano-PyMC-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/pymc-devs/Theano-PyMC"
+SRC_URI="
+	https://github.com/pymc-devs/Theano-PyMC/archive/rel-${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+	)
+
+	distutils_install_for_testing --via-root
+	pytest -vv ${exclude[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/theano/theano-1.0.5.ebuild b/dev-python/theano/theano-1.0.5.ebuild
index 1abd07c22257..99f60cb10bbc 100644
--- a/dev-python/theano/theano-1.0.5.ebuild
+++ b/dev-python/theano/theano-1.0.5.ebuild
@@ -18,6 +18,9 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+# Tests sometimes hang. dev-python/theano-pymc is better. #738416
+# This package is on the way out anyway for that fork.
+RESTRICT="test"
 
 BDEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )"
 RDEPEND="
diff --git a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
index 30a66818a38b..fe4dda8e9cc6 100644
--- a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
+++ b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
index 500b1208a390..c7c91b2ab352 100644
--- a/dev-python/three-merge/three-merge-0.1.1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/diff-match-patch[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/thrift/Manifest b/dev-python/thrift/Manifest
index 1294d7e40874..37af6138fd50 100644
--- a/dev-python/thrift/Manifest
+++ b/dev-python/thrift/Manifest
@@ -1 +1 @@
-DIST thrift-0.11.0.tar.gz 52467 BLAKE2B 72dca118476dc5d618f6434614e5d72c6f496088731de9b62fcf47e76dcf707a171721df2aa4c87fdcf90670b8fd11c3a1cdb2b090b78683a3f4a204ef8121cb SHA512 cba59eef2841fa008a19cd36b322491b67d711698205d6671c76e38a3de2b330db8aa54516de8cdd4020dc795e67ed55913df53466f5dbf07d38fed2d10f9349
+DIST thrift-0.13.0.tar.gz 59911 BLAKE2B b45363c2e8bbc5c7fae25533c7df9be49e6ea88b5ce077e9a580c28decf06de608d50100ba77cdb1ce8c7e56b87608d193b8579a4f89cc4fb74d672da0ba7e93 SHA512 063440db324efdae1fc4466133deaedeb1edd2f953f6924191ad819476f7b62a434d52960837e94516a673063ceab8b446b4f7dc8c94bb2d1fb84e95d2fa3d78
diff --git a/dev-python/thrift/thrift-0.11.0.ebuild b/dev-python/thrift/thrift-0.13.0.ebuild
index ac6cb321d4cb..8c1771c6fad3 100644
--- a/dev-python/thrift/thrift-0.11.0.ebuild
+++ b/dev-python/thrift/thrift-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,3 +18,8 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index 9f399a9f3e4b..5a84f468a4e0 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1 +1 @@
-DIST tikzplotlib-0.9.4.tar.gz 588518 BLAKE2B 3f6ec8b9149ef86e8a0dd551d4aeca4f676df3ca86de8bb9bfbf2abed81afab50adef99752970a40f174258f4d14c245366c5159f241d2cd10f7cebdfd6bbbfb SHA512 0d654dbecc473f5bc20dc128ad55852c3787ddd50cf730ed57b25a25e6a55e79bfd451eb28188d75ac6b61a53a6a6e244bef2ca366dcb636e0d325c74b32d1cd
+DIST tikzplotlib-0.9.6.tar.gz 589081 BLAKE2B aacd1374caed3dc86e6a93479b7ed0d0a79a2f96acc3817e630860794dc2f77c0d908d5765ebd500160d8c459b51131645f3633a084627b55aa2f26f5de87add SHA512 447dcd9da8d5cebf68b9f1a1f06d82370d5adf731524ea17c4f570bfd76dfce06e65f92df0ead732a02b42d9bdf6d0fde9e004bff50204cc5e33cca6c014a257
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.4.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.6.ebuild
index f99c56463f50..f99c56463f50 100644
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.4.ebuild
+++ b/dev-python/tikzplotlib/tikzplotlib-0.9.6.ebuild
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index 826ff500a1f2..ccd31e79f3e7 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,3 +1,2 @@
 DIST css-parsing-tests-c5749e51dda3868b3e8062e65a36584c2fec8059.gh.tar.gz 35758 BLAKE2B d834011c3ac774eb79b35e2e74f3854ddc2bb871531a32194041d6f98bde3dc68db67baea25d5463a03e057197144237be69fee4eacfb8edb73167e6e4faf7be SHA512 ef44eb1144a6484f308fabe4187310b2ef0067f328bf5213969d87c475fccae3d716dc66640a0a554ab2a3d7da0efb3a168a288ac6eef7722f3ae46959943b49
-DIST tinycss2-1.0.2.tar.gz 57728 BLAKE2B 966af74a499b9eb696beb3aca2c832d4e07641ed61415aa85a1798e30c568932875ff69f1ccf71cde8823194ea8dfbd54226fa93e718291f09645ea60620b43d SHA512 69bdf52898f9e704c01fe5fd11170e0efc9a6aca14646f5331fc06ebbdf941f9b6c798ded7d93636c7b810b35c659750c3ece3917c5c9cef4092e3e17b382dd1
 DIST tinycss2-1.1.0.gh.tar.gz 28205 BLAKE2B 46ba3f705522067e5b7aa5fdbc89f8980598e7e81b39114052b428e8c21b1a90fb3a9082bd51bbc0c6719adf6f0be285683b125886afe1a957013164f3b89428 SHA512 e1ed2679c09a0814d6deca069c68521e6ceef80f4a9cc16ab359dc5ee7ef97d0c7335680702548b023b1a48c5aeb838e29bf1b55f64698913dd16ae33a478a2b
diff --git a/dev-python/tinycss2/tinycss2-1.0.2.ebuild b/dev-python/tinycss2/tinycss2-1.0.2.ebuild
deleted file mode 100644
index 1151bd050b75..000000000000
--- a/dev-python/tinycss2/tinycss2-1.0.2.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,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A complete yet simple CSS parser for Python"
-HOMEPAGE="https://github.com/Kozea/tinycss2/ https://pypi.python.org/pypi/tinycss2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=dev-python/webencodings-0.4[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# junk deps
-	sed -i -e '/pytest-runner/d' -e '/^addopts/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/tinycss2/tinycss2-1.1.0.ebuild b/dev-python/tinycss2/tinycss2-1.1.0.ebuild
index cff52cb6c575..d215b53f807c 100644
--- a/dev-python/tinycss2/tinycss2-1.1.0.ebuild
+++ b/dev-python/tinycss2/tinycss2-1.1.0.ebuild
@@ -12,7 +12,7 @@ CSS_TEST_COMMIT_ID=c5749e51dda3868b3e8062e65a36584c2fec8059
 
 DESCRIPTION="A complete yet simple CSS parser for Python"
 HOMEPAGE="https://github.com/Kozea/tinycss2/
-	https://pypi.python.org/pypi/tinycss2/"
+	https://pypi.org/project/tinycss2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="
 	https://github.com/Kozea/tinycss2/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=">=dev-python/webencodings-0.4[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest
index 6c2bfc01892d..f220f98005e6 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -1,2 +1,3 @@
 DIST tld-0.12.2.tar.gz 1347015 BLAKE2B d284581917a9ddee026d316961f2cdc6efc8a3c8dee8112c7266d55a9493f1aca831db0635db02b737bb3e02b3910a8822e121a5317ab02f5078075839e02c91 SHA512 b997bd3cdf22f65862c9b3e7d446014325d9538dd06eeed86f4b9b6c6ba440829b5d611cc19fed9bf8bf039ef01c4258c71b5c765bbecdfc345dd00e73c7fca1
 DIST tld-0.12.3.tar.gz 1498596 BLAKE2B 7a1d33c3527bc1dfeb18bfcc5af4d153f9cc39b52e858f4ac5907d0edece67da6bb6f900d028937bafb468b31534ed284a54effae6d97397dd33e27261af3730 SHA512 fe33bb18bceea6e1eb4ba3ca46dc54c81a8d3a1f4187078488676b951e6734a885a44525f6f5c4dc8c2fea1b0f4ffd8060244fbf33f9b1bd9dfafbec12876711
+DIST tld-0.12.5.tar.gz 1500013 BLAKE2B d6b51e144f9c1305212ccb537b3488b7643190598674103e8fc7772c34f1e5a6eefb09d957a6ecd1ffa3e9ab0cc41b07dd97ef70f031259393c7410cd05e0b29 SHA512 90fa3911f64368e3c75d034b5854d4460ac41b603b431ef94bb0b49bbd37f5fadb0a084f24849aa8fa2a74608ea9555eec2d4372641bc4d135e1cb4fd3ad23ed
diff --git a/dev-python/tld/files/tld-0.12.5-names_cli_test.patch b/dev-python/tld/files/tld-0.12.5-names_cli_test.patch
new file mode 100644
index 000000000000..05af5236b1e2
--- /dev/null
+++ b/dev-python/tld/files/tld-0.12.5-names_cli_test.patch
@@ -0,0 +1,18 @@
+diff -Naur tld-0.12.5.orig/src/tld/tests/test_core.py tld-0.12.5/src/tld/tests/test_core.py
+--- tld-0.12.5.orig/src/tld/tests/test_core.py	2021-01-11 22:28:08.000000000 +0100
++++ tld-0.12.5/src/tld/tests/test_core.py	2021-01-12 22:27:47.286114741 +0100
+@@ -710,14 +710,6 @@
+                 )
+             )
+ 
+-    @internet_available_only
+-    @log_info
+-    def test_19_update_tld_names_cli(self):
+-        """Test the return code of the CLI version of `update_tld_names`."""
+-        reset_tld_names()
+-        res = update_tld_names_cli()
+-        self.assertEqual(res, 0)
+-
+     @log_info
+     def test_20_parse_tld_custom_tld_names_good_patterns(self):
+         """Test `parse_tld` good URL patterns for custom tld names."""
diff --git a/dev-python/tld/tld-0.12.5.ebuild b/dev-python/tld/tld-0.12.5.ebuild
new file mode 100644
index 000000000000..5d81a8aabd6e
--- /dev/null
+++ b/dev-python/tld/tld-0.12.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Extract the top level domain (TLD) from the URL given"
+HOMEPAGE="https://github.com/barseghyanartur/tld"
+SRC_URI="https://github.com/barseghyanartur/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? (
+	dev-python/Faker[${PYTHON_USEDEP}]
+	dev-python/tox[${PYTHON_USEDEP}]
+	)"
+
+# Calls system binary directly
+PATCHES=( "${FILESDIR}"/${PN}-0.12.5-names_cli_test.patch )
+
+distutils_enable_tests setup.py
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index 1a21f124aefd..cb2d13b7ae5e 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -1,3 +1,2 @@
-DIST toml-0.10.1-1.tar.gz 22559 BLAKE2B 17d9d9c78f2b78a6fc5bc0efd8530af5514d2f965eb1896a0eaca9a6d8ce1dda3a5dc825a8b6cd2a2096a582bd35952e6f0a3372021c739c69186d5a2c5642be SHA512 0a2348bffc889e63f4c6f8ae4faf022cceff069b178d086a37ff03e97e0f24b4b5a72810a345692f21810f3f41908b6981da902862adb06286bdb2941e9e0d60
 DIST toml-0.10.2-1.tar.gz 23325 BLAKE2B dedab7d08dadca963e62d64e9108e254dd73b78761985faa892792823027befc6473ae02c35c275a216b4544d1af8776afa78e39c63c95eb856e2bccf1de49c4 SHA512 5c706a3ae336e6b29bdce9752b91c677f7610cbcc1af4169cc24779e248031406cd19ac367725b2aa7903e4b1db71fa59255238c0270b2c146fd5d7e12d9a5da
 DIST toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz 19593 BLAKE2B e9deba7c5d1eea7bd87fcf5e5c74bda4c2b9e9686e597e3ad51516f60eb8d192fb01d052ac57729c6f0851e2715cc6409a904affd637c9b099cabc1b12ad5d52 SHA512 7bd69b8c14f09bf431094b52d988eb233922527719ba5047ff769d2e709c2039fb6fb1c8144e630ad2a58835d19e0e4cc51433a427596d37f8eccb6d73d7e5c0
diff --git a/dev-python/toml/files/toml-0.10.1-skip-numpy.patch b/dev-python/toml/files/toml-0.10.1-skip-numpy.patch
deleted file mode 100644
index 5c6808d2daf4..000000000000
--- a/dev-python/toml/files/toml-0.10.1-skip-numpy.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 93901215b45db2ab9d50987ac109c29acbe34600 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 25 May 2020 16:38:17 +0200
-Subject: [PATCH] Skip numpy tests when numpy is not available
-
-Make it possible to successfully run tests without numpy installed.
-This package is becoming quite hard profile, and being able to test it
-without building numpy first would be a nice feature.
----
- tests/test_api.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_api.py b/tests/test_api.py
-index dd12eb3..67bcd88 100644
---- a/tests/test_api.py
-+++ b/tests/test_api.py
-@@ -103,7 +103,7 @@ def test_array_sep():
- 
- 
- def test_numpy_floats():
--    import numpy as np
-+    np = pytest.importorskip('numpy')
- 
-     encoder = toml.TomlNumpyEncoder()
-     d = {'a': np.array([1, .3], dtype=np.float64)}
-@@ -120,7 +120,7 @@ def test_numpy_floats():
- 
- 
- def test_numpy_ints():
--    import numpy as np
-+    np = pytest.importorskip('numpy')
- 
-     encoder = toml.TomlNumpyEncoder()
-     d = {'a': np.array([1, 3], dtype=np.int64)}
--- 
-2.26.2
-
diff --git a/dev-python/toml/toml-0.10.1-r1.ebuild b/dev-python/toml/toml-0.10.1-r1.ebuild
deleted file mode 100644
index d64cd5ab5c9c..000000000000
--- a/dev-python/toml/toml-0.10.1-r1.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=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-TOML_TEST_VER="280497fa5f12e43d7233aed0d74e07ca61ef176b"
-
-DESCRIPTION="Python library for handling TOML files"
-HOMEPAGE="https://github.com/uiri/toml"
-SRC_URI="https://github.com/uiri/${PN}/archive/${PV}.tar.gz -> ${P}-1.tar.gz
-	test? ( https://github.com/BurntSushi/toml-test/archive/${TOML_TEST_VER}.tar.gz -> toml-test-${TOML_TEST_VER}.tar.gz )"
-IUSE="test"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		' python3_{6,7,8})
-	)"
-
-DOCS=( README.rst )
-PATCHES=(
-	"${FILESDIR}"/toml-0.10.1-skip-numpy.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use test; then
-		mv "${WORKDIR}/toml-test-${TOML_TEST_VER#v}" "${S}/toml-test" || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/toml/toml-0.10.2.ebuild b/dev-python/toml/toml-0.10.2.ebuild
index a3d6556e6d97..49b7772a5c0e 100644
--- a/dev-python/toml/toml-0.10.2.ebuild
+++ b/dev-python/toml/toml-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="test"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 227bee587f62..72f28f52cbb5 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1 +1,3 @@
 DIST tox-3.20.1.tar.gz 297516 BLAKE2B 2a13059bce229f30670e247b17ffd03d4b0d907b2fa7eb7d2f6848ada8d81e1a0aad983748c4346dfa61877f88edd22e4616ed20efcbd15da34fdc1c87b4439a SHA512 0989cc3dfd25eb3d1236d973d490f12c81273c93e84140b54342217eb73dd944f446c7ce9fe228b644d764b94300f1c6ccaf94e442d0e34835d05de84cccabd6
+DIST tox-3.21.0.tar.gz 300962 BLAKE2B 360aedb86ef1f918e73f726af238d8fdb20c3217b45ef068ec833b14e17af018c1115a2df43b441b9a4af802c4aee2fcaa9bac8f519028dd05b112902c47b2ce SHA512 50041660839cc081d491f867db74c6e95c93b81b2264785b3ccf7b80fbf3a1250028755ddc4243a285ebd005e12f897001d6ea7efd45d0278ce3cb14f7021572
+DIST tox-3.21.1.tar.gz 301387 BLAKE2B 3b15a17cfa8f2df1c8c3558cacde81d818cbc72b3dd0c4e4868d2fedace61c85ed484ad08e8abec10c0bef4062e623c75e4bf1122b4d15151b741057ea90fba3 SHA512 c3feaf1832db2b16df444d52ea774602c9a68eabd379c86483d33716f414df901b5e95ea9d63dd7c2f4338227cb5d9ee521a56f2dbb0d9c7d21221f49d1fc335
diff --git a/dev-python/tox/tox-3.20.1-r1.ebuild b/dev-python/tox/tox-3.20.1-r1.ebuild
index 2853d4da7c1b..c42936e38830 100644
--- a/dev-python/tox/tox-3.20.1-r1.ebuild
+++ b/dev-python/tox/tox-3.20.1-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tox/tox-3.20.1.ebuild b/dev-python/tox/tox-3.21.0.ebuild
index 0864dbf75286..ca83e71b5b3a 100644
--- a/dev-python/tox/tox-3.20.1.ebuild
+++ b/dev-python/tox/tox-3.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
@@ -39,32 +39,30 @@ BDEPEND="
 		${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
-
+src_configure() {
 	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 }
 
 python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+	local deselect=(
+		# broken without Internet
+		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
+		tests/integration/test_provision_int.py::test_provision_interrupt_child
+
+		# expects python2 to exist
+		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
+	)
+
+	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
+		# TODO?
+		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
+	)
+
+	distutils_install_for_testing --via-root
+	pytest -vv --no-network ${deselect[@]/#/--deselect } || die "Testsuite failed under ${EPYTHON}"
 }
diff --git a/dev-python/tox/tox-3.21.1.ebuild b/dev-python/tox/tox-3.21.1.ebuild
new file mode 100644
index 000000000000..1ed45c6fdaaf
--- /dev/null
+++ b/dev-python/tox/tox-3.21.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 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,9,10} 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/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		# broken without Internet
+		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
+		tests/integration/test_provision_int.py::test_provision_interrupt_child
+
+		# expects python2 to exist
+		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
+
+		# broken without tox installed first
+		# TODO: figure out how to make importlib_metadata work
+		tests/unit/test_z_cmdline.py::test_tox_console_script
+		tests/unit/test_z_cmdline.py::test_tox_quickstart_script
+	)
+
+	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
+		# TODO?
+		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
+
+		# broken without tox installed first
+		# TODO: why it can't import itself?
+		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
+	)
+
+	distutils_install_for_testing --via-root
+	pytest -vv --no-network ${deselect[@]/#/--deselect } || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 2e3ba35ad43c..279d67660139 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,4 +1,5 @@
-DIST tqdm-4.51.0.tar.gz 152976 BLAKE2B f9cef9de6a77c21e40394edd006fbd8fa913af4d3a9a8ac68bd9fde81b1eebc404f6fab90d9aadc57ce2ccfbc3a2f8d8879b151f6283dc34edc25d70f69ae6e1 SHA512 04bb2a173b9b79b76844fedbc14572fa955232d1dcb6ac55b7265c4cc7a4f712f2c2965ac3bcb9e10ea1bd041593230b047365816bf508d457d873a2d4830d3f
-DIST tqdm-4.53.0.tar.gz 179940 BLAKE2B 022fd8eae70a38306d201981bd6c2e469791abc86e3e10bf2bcbe4936e4e6791dc24b3e064c6adb830fd908a1544389fdba8f7017bee17632925c1bcc3d42349 SHA512 ffb06058a71e31497ced0b6b5ce8671a7e958968e0a08e1b68dc9f3a9acac415c1708f6669d369ab484bbc07a8fc06716ed32fde70f22c0dbd8242417f95a713
 DIST tqdm-4.54.0.tar.gz 178664 BLAKE2B 68d0f054b2c95079e13ad9df3e9467f48925311151e5eed94795d3fab232301da99c2704daafd80f748037a467d25416913f0921d6b7c44d725c5ed6861fe347 SHA512 dbb2a61df848ebd84ab805134b7e7297e1cf7626abaa830a08159ce7b1852eba40a6a7f2cc7c8445294a184bbfbd69bf08430371f3e2d71f6a622a271ba49e95
-DIST tqdm-4.54.1.tar.gz 178633 BLAKE2B 10a9314405f1565a130baaef3b4d23fb8606b954fb6e70ec1fffd21a531957432254d3081085f8cb2e55ab103ac17ad23683a5a945917e278fcc61760ee69b90 SHA512 ba9dde2bd2f39d10bfdb0f624f1e60db12fef79732aee1fa21049e37ab60ffafbe097ab124bb3fbd34d9f4efa10e317ab7d594551ae612c0f6c37c2ce9395997
+DIST tqdm-4.55.0.tar.gz 161594 BLAKE2B 890bbb47db356678be2c3edd893d70b085f5bc8fefbf87f12ba8c69fe14ac523a1eed6e335fb84f2ff43b2b0fea901411f8a72b24212cb2ad5ef4955ec8f2df5 SHA512 84062f7d2a109e4067e0868990b6e53578c7c2ec2b81a0cbdc980c91d2d82a8bda37e0c9688777fcf14cc80b7ddf7b28b7a5acfe37608e37903fe45908103913
+DIST tqdm-4.55.1.tar.gz 161638 BLAKE2B 0149269f1ea854589647deb4ddd7415748924942ecc03d5fd6231470e5df959c1b8034d4d8416d83aa0a43ad1fafed15789f7ebaac12e5d525a7fe0bee88752a SHA512 82a6d3d8e10d4c46e40e03e557febe9f7cac3cc01c01c9e29b20cf8f2adcc7370829fe5d4497ff0edb506bf38b9ec14de86377d1bbd9b8b9e57687d951ae683f
+DIST tqdm-4.55.2.tar.gz 162632 BLAKE2B 02e49f442c8d5ad3799de143dd8a188796293253e836c24d04e75aa45f7cbeecb967f1503467ca7486dfd412538da6f7a3aa4c674e16f0da3954f44347c5a498 SHA512 f61f28f2b8f7c4d848e31a3d791822a0433573b36aa900d055e1919b555b84ee36d988c6f51d6951355e70821f4d24bee72bdd4472262ea55ea012ff0556b0df
+DIST tqdm-4.56.0.tar.gz 166848 BLAKE2B d2239ff7efd9c91b7101357b6c7d352c42c49c41c34209092fdfe420e090458581aed61f2ddff09d1c64539eed0d83eb240e6b467b82193016cf13bac94f3313 SHA512 c65eb167063c4b6a0931a6f19fb2e4d88eb92fe3f3118c0247cd0e148220523097c4419289428d2a4c22cc187011d78cba32fc080eb2cbe352f873e29646094e
diff --git a/dev-python/tqdm/metadata.xml b/dev-python/tqdm/metadata.xml
index c4a72503439d..6bbba1936886 100644
--- a/dev-python/tqdm/metadata.xml
+++ b/dev-python/tqdm/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chr@chymera.eu</email>
+		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/tqdm/tqdm-4.54.0.ebuild b/dev-python/tqdm/tqdm-4.54.0.ebuild
index 1b970ec274b5..e781dbfa5b66 100644
--- a/dev-python/tqdm/tqdm-4.54.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.54.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/tqdm/tqdm-4.54.1.ebuild b/dev-python/tqdm/tqdm-4.55.0.ebuild
index 1b970ec274b5..1b970ec274b5 100644
--- a/dev-python/tqdm/tqdm-4.54.1.ebuild
+++ b/dev-python/tqdm/tqdm-4.55.0.ebuild
diff --git a/dev-python/tqdm/tqdm-4.53.0.ebuild b/dev-python/tqdm/tqdm-4.55.1.ebuild
index 0005f7ac9707..a3e4feb1ba0f 100644
--- a/dev-python/tqdm/tqdm-4.53.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.55.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
@@ -25,7 +25,10 @@ IUSE="examples"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/tqdm/tqdm-4.51.0.ebuild b/dev-python/tqdm/tqdm-4.55.2.ebuild
index bf79e1f81574..a3e4feb1ba0f 100644
--- a/dev-python/tqdm/tqdm-4.51.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.55.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
@@ -23,6 +23,13 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
 
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)"
+
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/tqdm/tqdm-9999.ebuild b/dev-python/tqdm/tqdm-4.56.0.ebuild
index 304a5fec96f9..a3e4feb1ba0f 100644
--- a/dev-python/tqdm/tqdm-9999.ebuild
+++ b/dev-python/tqdm/tqdm-4.56.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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,9,10} pypy3 )
 
 inherit distutils-r1
@@ -12,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
@@ -22,33 +23,25 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)"
 
-distutils_enable_tests nose
-
-python_prepare_all() {
-	sed -r \
-		-e "s:'nose'(,[[:space:]]*|)::" \
-		-e "s:'flake8'(,[[:space:]]*|)::" \
-		-e "s:'coverage'(,[[:space:]]*|)::" \
-		-i setup.py
-
-	distutils-r1_python_prepare_all
-}
+distutils_enable_tests pytest
 
 python_test() {
-	# tests_main.py requires the package to be installed
-	distutils_install_for_testing
 	# Skip unpredictable performance tests
-	nosetests tqdm -v --ignore 'tests_perf.py' \
-		|| die "tests failed with ${EPYTHON}"
+	pytest -vv --ignore 'tests/tests_perf.py' ||
+		die "Tests failed with ${EPYTHON}"
 }
 
 python_install() {
 	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
 	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
-	distutils-r1_python_install --skip-build
+	distutils-r1_python_install
 }
 
 python_install_all() {
diff --git a/dev-python/traceback2/traceback2-1.4.0-r1.ebuild b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
index 5a0a650240f0..489923d8b9bb 100644
--- a/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-python/linecache2[${PYTHON_USEDEP}]"
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index b7533d5d980c..1ede0c796f0d 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1 +1,2 @@
 DIST transitions-0.8.2.tar.gz 1084797 BLAKE2B 9ff6284e7c42365c5a169388057acffd53dd31c3ca6d9dee240b253ca34118a67d3f070fd8b6a86cb6a01a2e15023e0bad02ccc07813ee0855a54008ac3d7597 SHA512 d10e513806801d0c874be3eb59e92ad61584b5f7992ba26db8828848df1225fb806621abc118a8d43f2efaa353d988b5becbe4296bc054754e551c86495a540f
+DIST transitions-0.8.6.tar.gz 1092437 BLAKE2B 14a8f50bb3ab34e5a6589c1ccc14482373fcbe670d64cd822ef483da10d5e19771bea28ce26690907862422a7687cacccb8c82f5f623ba34888e88dbf2601945 SHA512 9ada9075074a1201c0858786ea446e5dd36576e154238dccbebc2523da0bd46cb676e7eb4abf1102207b2e674d3214dd4869b3c51a6b9e9799c38bd6be8aedac
diff --git a/dev-python/transitions/metadata.xml b/dev-python/transitions/metadata.xml
index 63e1afe263d4..8bd794c783ee 100644
--- a/dev-python/transitions/metadata.xml
+++ b/dev-python/transitions/metadata.xml
@@ -5,6 +5,10 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		A lightweight, object-oriented state machine implementation in Python.
 		A state machine is a mathematical model of computation.
diff --git a/dev-python/transitions/transitions-0.8.6.ebuild b/dev-python/transitions/transitions-0.8.6.ebuild
new file mode 100644
index 000000000000..bacb1ae2d0b5
--- /dev/null
+++ b/dev-python/transitions/transitions-0.8.6.ebuild
@@ -0,0 +1,40 @@
+# 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,10} )
+inherit distutils-r1
+
+DESCRIPTION="A lightweight, object-oriented state machine implementation in Python"
+HOMEPAGE="https://github.com/pytransitions/transitions"
+SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	|| (
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
+		dev-python/graphviz[${PYTHON_USEDEP}]
+	)
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	test? (
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	use examples && dodoc examples/*.ipynb
+}
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index f14204949a4c..cc98eccc667f 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1 +1,2 @@
 DIST translate-toolkit-3.2.0.tar.gz 6029254 BLAKE2B fe4c30e09fcba6755a928775f931f1027bb5678606e74aa435fd5803642ab39b8b55d763bb96dba6b1a957d6656cfca4ec6400b735afd8df7f2c1273ac173c89 SHA512 1045762a5c63cc2bc8459b61a85ef56e4f1d1f705d74646b8235169f22d8d5aa4ab5e3599af52a860d9e434df0fad3e98836b0c021bb0a9697b36a59edbfb6ec
+DIST translate-toolkit-3.3.0.tar.gz 6122607 BLAKE2B 77e4d4e37fa5fdd0a735b04ccef40769863134411476abe2852855970594f7a11cf06114831c196a744a5e76d50b1707b630a738213d0ded5f588ad98dcfd613 SHA512 3529e5301e8e1f0d89bbadff92cebd5d55ada29fe5eb8d611f604139239645dd6d110bf93180b18faf2ececafb675f2fc6dfbe30d7631ba606a7dfcd5d8f27ca
diff --git a/dev-python/translate-toolkit/files/translate-toolkit-3.3.0-no-install-docs.patch b/dev-python/translate-toolkit/files/translate-toolkit-3.3.0-no-install-docs.patch
new file mode 100644
index 000000000000..9d812c4f98f7
--- /dev/null
+++ b/dev-python/translate-toolkit/files/translate-toolkit-3.3.0-no-install-docs.patch
@@ -0,0 +1,25 @@
+From 6271bfede35f22e8099261863d990eba3d26f989 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 4 Jan 2021 10:33:29 +0100
+Subject: [PATCH] Do not install docs tree into site-packages
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 5fc3abf..80ce25d 100755
+--- a/setup.py
++++ b/setup.py
+@@ -513,7 +513,7 @@ def getdatafiles():
+         )
+ 
+     docfiles = []
+-    for subdir in ["docs", "share"]:
++    for subdir in ["share"]:
+         docwalk = os.walk(subdir)
+         for docs in docwalk:
+             files = listfiles(docs[0])
+-- 
+2.30.0
+
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.0.ebuild
new file mode 100644
index 000000000000..22e1f4c97219
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-3.3.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Toolkit to convert between many translation formats"
+HOMEPAGE="https://github.com/translate/translate"
+SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+html +ical +ini +subtitles +yaml"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/pydiff
+	app-text/iso-codes
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	dev-python/cheroot[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
+	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
+	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
+	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
+	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
+	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-bootstrap-theme
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
+)
+
+python_test() {
+	local deselect=(
+		# Not packaging optional phply for now.
+		# Seems inactive upstream.
+		--ignore translate/convert/test_php2po.py
+		--ignore translate/convert/test_po2php.py
+		--ignore translate/storage/test_php.py
+		--deselect 'translate/storage/test_cpo.py::TestCPOUnit::test_buildfromunit'
+		--deselect 'translate/storage/test_po.py::TestPOUnit::test_buildfromunit'
+		--deselect 'translate/storage/test_pypo.py::TestPYPOUnit::test_buildfromunit'
+
+		# Fails with network-sandbox (and even with it off but w/ softer fail)
+		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
+		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
+	)
+
+	if ! use ini; then
+		deselect+=(
+			--ignore translate/convert/test_ini2po.py
+			--ignore translate/convert/test_po2ini.py
+		)
+	fi
+
+	if ! use subtitles; then
+		deselect+=(
+			--ignore translate/storage/test_subtitles.py
+		)
+	fi
+
+	# translate/storage/test_mo.py needs 'pocompile'
+	distutils_install_for_testing --via-root
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if ! use html; then
+		rm "${ED}"/usr/bin/{html2po,po2html} || die
+	fi
+	if ! use ical; then
+		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
+	fi
+	if ! use ini; then
+		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
+	fi
+	if ! use subtitles; then
+		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
+	fi
+
+	python_optimize
+}
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index 25671236c3cf..d0fae368df6d 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1 +1,2 @@
 DIST tree_sitter-0.2.0.tar.gz 110387 BLAKE2B 62bd0cac84626738c051a16a6e1d8bf18985850e9c0174794d060e09f289edcf5e6183da28ab3805713b7d55d63c2210cc0e53d022689b46a3770243acf08937 SHA512 1b5c1dd8855de00357b5e8fc9dc3cb826c1cd10bec499b2db26f50fe2249a9848e1641765ee9717c8eae88b8d091f0de79cdfabafdecbe8e666a05f63fefe4ba
+DIST tree_sitter-0.2.1.tar.gz 110417 BLAKE2B 263f47b9c8beab4b99fbfeb40521467f7f507ead77b20eb1bea7d6f076398d4f0db02299290a552aaa35959dff4a87866d010d628269e64cebeb06d86856fdc6 SHA512 72fd602689a78f51184820fb15891863873f8b290811152ea568cfa6fbd2d3f182ae8627f028c8d485d0e9bbe7b81a9d6ed57e7a8b551ba38f8dd738fb7c858a
diff --git a/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild b/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
new file mode 100644
index 000000000000..54a747c6f6e1
--- /dev/null
+++ b/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python bindings to the Tree-sitter parsing library"
+HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/trustme/trustme-0.6.0-r1.ebuild b/dev-python/trustme/trustme-0.6.0-r1.ebuild
index ea94b26e24ff..68892fb62198 100644
--- a/dev-python/trustme/trustme-0.6.0-r1.ebuild
+++ b/dev-python/trustme/trustme-0.6.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 5879478ddd52..03a73d81249c 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1 +1,2 @@
 DIST twine-3.2.0.tar.gz 145280 BLAKE2B b25fa984486a375e09705703a47994b529f6e5b48c6733c0a07b57bec6c0dfcdf4096d6ac6b0f9b7a7bfebfb32ea1cfb49c5de79f29495eb2a8fc59a5f8de4e5 SHA512 9959430913ea570d22f2d8b94e929af36b409b71691b3f66de8ddb77cfbfbe36590e21a6062db2a4a4f56ce2eb96984b0a474a93ea96b7734f53ada7a6411c28
+DIST twine-3.3.0.tar.gz 148996 BLAKE2B 60668acd0481534631ca0ecf3c755df7e9e46c6d183d0f1c73ed7467cfecc144878d6ccf7ef2ee62efa17eb5629f5ed74c77c8ae4d57ef16530fad31afe40d97 SHA512 94fc7a9b3f2b5fc7c06baf55debf4fd55f6a2b4c4321c9bff46b844166769ce8bdcab10355c4967998149b62e13b26e11a30ff66042bfdd5af24d448321fd291
diff --git a/dev-python/twine/twine-3.3.0.ebuild b/dev-python/twine/twine-3.3.0.ebuild
new file mode 100644
index 000000000000..19b87e711031
--- /dev/null
+++ b/dev-python/twine/twine-3.3.0.ebuild
@@ -0,0 +1,66 @@
+# 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,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
+SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/munch[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{6,7} pypy{,3})
+	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
+	sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
+		setup.cfg || die
+
+	# requires internet
+	sed -e 's:test_check_status_code_for_wrong_repo_url:_&:' \
+		-i tests/test_upload.py || die
+	rm -f tests/test_integration.py || die
+	# pytest-socket dep relevant only to test_integration, and upstream
+	# disables it anyway
+	sed -i -e '/--disable-socket/d' pytest.ini || die
+
+	sed -i -e '/--cov/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index da8811ccb0d9..5f0e66cd9f5f 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -1 +1,2 @@
+DIST txaio-20.12.1.tar.gz 53200 BLAKE2B 0bbcf8a64fec668c2cf128a390779ca81033d0f43f02a341c46fc392254ff011df13a1456757e86dc5c4c15f18468698f4da85cc830fb2e52e4e620f7a8767ee SHA512 efde6115b8eccba94dce736fffe49f280ff49e9738f3299578cf41641c3b6f1deb5b1c0f0c8c6fbf85c8d8adbdc2d3f67aa256335d63a5977ac0bfacc98f909c
 DIST txaio-20.4.1.tar.gz 52580 BLAKE2B 28d745eb9e8a0df1ca8748ce455eb122e240505f31464fcc0e66bafcefa8a01a356e44a46d9a5a1b1c670df46ca0c2ea9e66d29436bf2668e5614c5aa8726cee SHA512 da0269d13d72f4ea14f2e67585cdb74ec5105884c31d81157fb85e92d4eb935b1c13eb1222bd5ecd57a8caa36008cf49de85321e7b67e94159330e1d592d42c4
diff --git a/dev-python/txaio/metadata.xml b/dev-python/txaio/metadata.xml
index 12a998131bc8..29b5a05fecab 100644
--- a/dev-python/txaio/metadata.xml
+++ b/dev-python/txaio/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>autobahnws@googlegroups.com</email>
diff --git a/dev-python/txaio/txaio-20.12.1.ebuild b/dev-python/txaio/txaio-20.12.1.ebuild
new file mode 100644
index 000000000000..f15fb714b298
--- /dev/null
+++ b/dev-python/txaio/txaio-20.12.1.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,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
+HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+	)
+"
+distutils_enable_sphinx docs \
+	'>=dev-python/sphinxcontrib-spelling-2.1.2' \
+	'>=dev-python/sphinx_rtd_theme-0.1.9'
+distutils_enable_tests pytest
+
+src_prepare() {
+	default_src_prepare
+	# Take out failing tests known to pass when run manually
+	# we certainly don't need to test "python setup.py sdist" here
+	rm "${S}/test/test_packaging.py" || die
+}
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index a77958857835..903624a6b663 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1 +1,2 @@
 DIST typed_ast-1.4.1.tar.gz 208587 BLAKE2B db874caf459cb73345305051a7c4e97244e92b28e94e82f59b38bb91b7c6c69a2531a81c84d483eca8d641bc947f6aa1b98ba59cd880f7560fbdec55bce41787 SHA512 a3154fe723aeadf998694aba0faf516e5b9abb876e4c7d91843b3694474ff6911b3e77a6cb7366cfa8e5a573b331906b6a0b134b25627aaba0dcbe92c4e25590
+DIST typed_ast-1.4.2.tar.gz 208583 BLAKE2B fb94967409c073b3390a133232259605aab0ee893fe53deb0e97a07c814b1c2021815beab4fa680653f75a44b53eb3f02d7c9e330cf51195c2dd668762c9e0be SHA512 9a46f2a4c48bd267445a773463771824be958dfdd1a2df21356d0a763ee2029b51d5b0fddeb16df202f89ba86019640ab45ba520fdad5c550250fe2a135605fe
diff --git a/dev-python/typed-ast/typed-ast-1.4.2.ebuild b/dev-python/typed-ast/typed-ast-1.4.2.ebuild
new file mode 100644
index 000000000000..c0404a93c440
--- /dev/null
+++ b/dev-python/typed-ast/typed-ast-1.4.2.ebuild
@@ -0,0 +1,21 @@
+# 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,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python typed-ast backported"
+HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${P/-/_}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/typing-python2/typing-python2-3.7.4.3.ebuild b/dev-python/typing-python2/typing-python2-3.7.4.3-r1.ebuild
index a353118e6e53..dfd26b19e07c 100644
--- a/dev-python/typing-python2/typing-python2-3.7.4.3.ebuild
+++ b/dev-python/typing-python2/typing-python2-3.7.4.3-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 MY_PN=typing
@@ -19,7 +20,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd6
 IUSE=""
 RESTRICT="test"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools-python2[${PYTHON_USEDEP}]"
 RDEPEND="!dev-python/${MY_PN}[python_targets_python2_7]"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index b909b356d43f..55ceac0bb136 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1 +1,2 @@
 DIST ubelt-0.9.1.tar.gz 174866 BLAKE2B d9825cc266945e76560be0afaeaf28ce2c7ca99a9313f519c9e83fc987599a4d8c2d262af4f13040f522b91e3c73170f8af7fc7dbe9e40128b707d9a571f4b1a SHA512 92edac331602ef292842d48cd03c3ae12aaaec7e5860fd47c83dbe0449dee584e95ce5dd157a0b84b557dc4f4b6a0ee66ccabb669c5923e9b9083daaa2eb92df
+DIST ubelt-0.9.4.tar.gz 185601 BLAKE2B 09c236b6ecd0d434f8bec104afc89082fbdff9954d64b5063ba29f1ca456a6ab68937fd6e0db4cc672589135b99ea1a6448720dbea00acdbc2a3b441b1357682 SHA512 e562949fe27a19f6708dbc1f9e92a1d5a14857159f03840b525c1b77e660ce64f1ea2e2198c7068f9835343230ddee7fa66672c2e81126f9e4afddf729f19cb7
diff --git a/dev-python/ubelt/ubelt-0.9.4.ebuild b/dev-python/ubelt/ubelt-0.9.4.ebuild
new file mode 100644
index 000000000000..0458566cddd1
--- /dev/null
+++ b/dev-python/ubelt/ubelt-0.9.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="https://github.com/Erotemic/ubelt"
+SRC_URI="https://github.com/Erotemic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/ordered-set[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# relies on passwd being equal to ${HOME}
+		ubelt/util_path.py::userhome:0
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } tests ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
index f8446b7c4bc6..ac5126009bbb 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index 1dfb9910dfe4..f1080e6dfa7e 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,2 +1,2 @@
-DIST Unidecode-0.04.21.tar.gz 205931 BLAKE2B 701afb86b89fc17a8eb9c769b4be1d08a30f0b44881597735478108d8121f57e2539a8209b9aef9c90f5aa8cc9f9dc76bea837d9b2ebad502a840c37628ed5ff SHA512 33fc546b3eefc4ba5feee90d584e49ccd81dd0ae00671f7e44f43cc3dc8a458b86ed6dbfacba6dac7539112408137fc1db6329cc42f31ee250755d841c7c29c2
 DIST Unidecode-1.1.1.tar.gz 212151 BLAKE2B 9884f89bb45c7c99569d42e0b287731638b8b1b697afab2c812b56340c6bd12dc3214b42177554f1b0aa214ce1b73fe1f05208ac6fc33d1949ed1200e42914ab SHA512 5474f04be843ed94ddceb1a7e5f1ca986ee5f2e88ee35bd9347784c7a11b51e1d94d61e1a2a10dd2e71b3587c5b7b76717756f6cf4e2446d83222178c2360696
+DIST Unidecode-1.1.2.tar.gz 213644 BLAKE2B c4a9ecb441eb05800d931ccd43843d19ae07f74829d43bc3c24462955e8872f4edf4bb9b3909fc5155b13676b8d255848cdd90772a88cd453152ca13af0d3fab SHA512 8ee45ae05064612638ecbaa4eb74759580e5ea5cba9f3116b8e63db4af13affc266c7a07aaefbbd70b50ead7e483a72d7676c64e20b5bee2a6ba831aaccd6748
diff --git a/dev-python/unidecode/unidecode-1.1.1.ebuild b/dev-python/unidecode/unidecode-1.1.1.ebuild
index 879e934ade2b..d56386a08341 100644
--- a/dev-python/unidecode/unidecode-1.1.1.ebuild
+++ b/dev-python/unidecode/unidecode-1.1.1.ebuild
@@ -17,6 +17,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/unidecode/unidecode-0.04.21.ebuild b/dev-python/unidecode/unidecode-1.1.2.ebuild
index 4a7685bc367a..1f2571b14e40 100644
--- a/dev-python/unidecode/unidecode-0.04.21.ebuild
+++ b/dev-python/unidecode/unidecode-1.1.2.ebuild
@@ -1,27 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-MY_PN=Unidecode
-MY_P=${MY_PN}-${PV}
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="wide-unicode(+)"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
+MY_P=Unidecode-${PV}
 DESCRIPTION="Module providing ASCII transliterations of Unicode text"
 HOMEPAGE="https://pypi.org/project/Unidecode/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
index bdeab89ead4b..14d1db5a7279 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nedbat/unittest-mixins/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
index 2b8417ca35a0..4044eae15775 100644
--- a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/linecache2[${PYTHON_USEDEP}]
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index a02f16c957c0..2875f144904d 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,5 +1,2 @@
-DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40189561fa0ea393a8a2515b24da9a2a383aeec35b55bdd2a9954d3d585450d759548358ed91ecfdb9ec03d391b6 SHA512 9939e9e7c4da30b5effb334969cd835c9d0404a136761098203c699570aab02e63fb3f1b4ab680def0bc0906fabe5f0782ab94cf3095ff10ccf9b3c371653cf2
 DIST urllib3-1.25.11.tar.gz 260300 BLAKE2B 06bd2107bad479e36c6474f95567c3ecb119d18b193b358df9e345e4d09392366255b21597b26fbf2374220b921cc2117a1972f88021c3a6ebac3844a319acbe SHA512 58f77edb9ced62cbac7b0baf2651c07f9f413267f103730ee25f08c5d4d0bf52a2ace02f58841bcd55652db677c7a1dc9a756681e7e32d590bc69d8b93e8f173
-DIST urllib3-1.26.0.tar.gz 291709 BLAKE2B e750bcd28c6205cb8e7f12c2a1c6123d48979877b206914fc122f67ff6cdf3e16e5d7ee0ffae1f4af40f028075f9592cdebf8856ca7e29b541283a8023afbf0d SHA512 5e5a78486cded9a378532a094818cfcaf6ec621d3aefbffac4c78f130798ee06f08e47d14f3d154274a502c8c1e3963a12d65030ba6109108ed786202637bd42
-DIST urllib3-1.26.1.tar.gz 286708 BLAKE2B 19f210a56850e9754faa7a7a309292ba69450ba3ca232bc42f10e1f163eb72e7430eb233d8a0ee1cf97acbdfa132b2e515561e67fade3806347e04e6c7869db2 SHA512 5fbb28e190ecf58aae0932994bc1adb1542041bf96f176a9ece22bd6ee8d4ae8dc8f40dea77359601b704025e65c65ca27137f65d3d47fac3fc796b7bbd112f3
 DIST urllib3-1.26.2.tar.gz 286877 BLAKE2B dc5884e2561fae476ba8695cf9e50abb63d8dfc45ad6219d07ba30ecae48e5f27fbdd9a324c0e71f739555c90a3653f18eda513f2ea45b76abcd8c6c714ec0f7 SHA512 4de7cf844ed0deb83c4129e1b1742eafefe95035dd7ffbeaeaaccabca8bd361de9fa240882ea4dec16a7f0b5c5684416656f0d58bea15e7aefd4132024a25c9e
diff --git a/dev-python/urllib3/files/urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch b/dev-python/urllib3/files/urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch
new file mode 100644
index 000000000000..2af65e84f016
--- /dev/null
+++ b/dev-python/urllib3/files/urllib3-1.26.2-fix-test_proxy_rejection-test-hang.patch
@@ -0,0 +1,87 @@
+Fixes a hang on test_proxy_rejection.
+https://github.com/urllib3/urllib3/commit/087d4de8487379033970898866625c00e0d51c85.patch
+
+From 087d4de8487379033970898866625c00e0d51c85 Mon Sep 17 00:00:00 2001
+From: Quentin Pradet <quentin.pradet@gmail.com>
+Date: Tue, 3 Nov 2020 17:15:50 +0400
+Subject: [PATCH] Fix test_proxy_rejection even with two localhost entries
+
+---
+ test/contrib/test_socks.py | 34 +++++++++++++++++++++++++++++++---
+ 1 file changed, 31 insertions(+), 3 deletions(-)
+
+diff --git a/test/contrib/test_socks.py b/test/contrib/test_socks.py
+index 1966513c1..ed716f188 100644
+--- a/test/contrib/test_socks.py
++++ b/test/contrib/test_socks.py
+@@ -1,8 +1,12 @@
++from __future__ import absolute_import
++
+ import socket
+ import threading
++from socket import getaddrinfo as real_getaddrinfo
+ from test import SHORT_TIMEOUT
+ 
+ import pytest
++import socks as py_socks
+ 
+ from dummyserver.server import DEFAULT_CA, DEFAULT_CERTS
+ from dummyserver.testcase import IPV4SocketDummyServerTestCase
+@@ -87,6 +91,26 @@ def _address_from_socket(sock):
+         raise RuntimeError("Unexpected addr type: %r" % addr_type)
+ 
+ 
++def _set_up_fake_getaddrinfo(monkeypatch):
++    # Work around https://github.com/urllib3/urllib3/pull/2034
++    # Nothing prevents localhost to point to two different IPs. For example, in the
++    # Ubuntu set up by GitHub Actions, localhost points both to 127.0.0.1 and ::1.
++    #
++    # In case of failure, PySocks will try the same request on both IPs, but our
++    # handle_socks[45]_negotiation functions don't handle retries, which leads either to
++    # a deadlock or a timeout in case of a failure on the first address.
++    #
++    # However, some tests need to exercise failure. We don't want retries there, but
++    # can't affect PySocks retries via its API. Instead, we monkeypatch PySocks so that
++    # it only sees a single address, which effectively disables retries.
++    def fake_getaddrinfo(addr, port, family, socket_type):
++        gai_list = real_getaddrinfo(addr, port, family, socket_type)
++        gai_list = [gai for gai in gai_list if gai[0] == socket.AF_INET]
++        return gai_list[:1]
++
++    monkeypatch.setattr(py_socks.socket, "getaddrinfo", fake_getaddrinfo)
++
++
+ def handle_socks5_negotiation(sock, negotiate, username=None, password=None):
+     """
+     Handle the SOCKS5 handshake.
+@@ -334,7 +358,8 @@ def request_handler(listener):
+             with pytest.raises(NewConnectionError):
+                 pm.request("GET", "http://example.com", retries=False)
+ 
+-    def test_proxy_rejection(self):
++    def test_proxy_rejection(self, monkeypatch):
++        _set_up_fake_getaddrinfo(monkeypatch)
+         evt = threading.Event()
+ 
+         def request_handler(listener):
+@@ -429,7 +454,9 @@ def request_handler(listener):
+             assert response.data == b""
+             assert response.headers["Server"] == "SocksTestServer"
+ 
+-    def test_socks_with_invalid_password(self):
++    def test_socks_with_invalid_password(self, monkeypatch):
++        _set_up_fake_getaddrinfo(monkeypatch)
++
+         def request_handler(listener):
+             sock = listener.accept()[0]
+ 
+@@ -592,7 +619,8 @@ def request_handler(listener):
+             response = pm.request("GET", "http://example.com")
+             assert response.status == 200
+ 
+-    def test_proxy_rejection(self):
++    def test_proxy_rejection(self, monkeypatch):
++        _set_up_fake_getaddrinfo(monkeypatch)
+         evt = threading.Event()
+ 
+         def request_handler(listener):
diff --git a/dev-python/urllib3/urllib3-1.24.2-r1.ebuild b/dev-python/urllib3/urllib3-1.24.2-r1.ebuild
deleted file mode 100644
index 77804c7832db..000000000000
--- a/dev-python/urllib3/urllib3-1.24.2-r1.ebuild
+++ /dev/null
@@ -1,64 +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,8,9,10} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/shazow/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" 'python3*')
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/alabaster \
-	dev-python/mock
-
-python_prepare_all() {
-	# skip appengine tests
-	rm -r test/appengine || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# FIXME: get tornado ported
-	case ${EPYTHON} in
-		python2*)
-			ewarn "Tests are being skipped for Python 2 in order to reduce the number"
-			ewarn "of circular dependencies for Python 2 removal.  Please test"
-			ewarn "manually in a virtualenv."
-			;;
-		python3*)
-			pytest -vv || die "Tests fail with ${EPYTHON}"
-			;;
-	esac
-}
diff --git a/dev-python/urllib3/urllib3-1.26.0.ebuild b/dev-python/urllib3/urllib3-1.26.0.ebuild
deleted file mode 100644
index acfa441040ae..000000000000
--- a/dev-python/urllib3/urllib3-1.26.0.ebuild
+++ /dev/null
@@ -1,69 +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,9,10} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-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 ~riscv ~s390 ~sparc ~x86"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlipy[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{6,7,8,9})
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/alabaster \
-	dev-python/mock
-
-python_prepare_all() {
-	# https://github.com/urllib3/urllib3/issues/1756
-	sed -e 's:10.255.255.1:240.0.0.0:' \
-		-i test/__init__.py || die
-	# tests failing if 'localhost.' cannot be resolved
-	sed -e 's:test_dotted_fqdn:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	case ${EPYTHON} in
-		python3*)
-			pytest -vv || die "Tests fail with ${EPYTHON}"
-			;;
-	esac
-}
diff --git a/dev-python/urllib3/urllib3-1.26.1.ebuild b/dev-python/urllib3/urllib3-1.26.1.ebuild
deleted file mode 100644
index acfa441040ae..000000000000
--- a/dev-python/urllib3/urllib3-1.26.1.ebuild
+++ /dev/null
@@ -1,69 +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,9,10} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-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 ~riscv ~s390 ~sparc ~x86"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlipy[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{6,7,8,9})
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/alabaster \
-	dev-python/mock
-
-python_prepare_all() {
-	# https://github.com/urllib3/urllib3/issues/1756
-	sed -e 's:10.255.255.1:240.0.0.0:' \
-		-i test/__init__.py || die
-	# tests failing if 'localhost.' cannot be resolved
-	sed -e 's:test_dotted_fqdn:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	case ${EPYTHON} in
-		python3*)
-			pytest -vv || die "Tests fail with ${EPYTHON}"
-			;;
-	esac
-}
diff --git a/dev-python/urllib3/urllib3-1.26.2-r1.ebuild b/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
index 3e35d3af8d0a..5c6f31bf986d 100644
--- a/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 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-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
@@ -41,6 +41,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-test_proxy_rejection-test-hang.patch"
+)
+
 python_prepare_all() {
 	# https://github.com/urllib3/urllib3/issues/1756
 	sed -e 's:10.255.255.1:240.0.0.0:' \
diff --git a/dev-python/urllib3/urllib3-1.26.2.ebuild b/dev-python/urllib3/urllib3-1.26.2.ebuild
index 3c897f46e8d9..6c1d6369e39c 100644
--- a/dev-python/urllib3/urllib3-1.26.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.2.ebuild
@@ -14,7 +14,7 @@ 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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
@@ -41,6 +41,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-test_proxy_rejection-test-hang.patch"
+)
+
 python_prepare_all() {
 	# https://github.com/urllib3/urllib3/issues/1756
 	sed -e 's:10.255.255.1:240.0.0.0:' \
diff --git a/dev-python/validators/Manifest b/dev-python/validators/Manifest
new file mode 100644
index 000000000000..f9d7f1287c36
--- /dev/null
+++ b/dev-python/validators/Manifest
@@ -0,0 +1 @@
+DIST validators-0.18.2.tar.gz 30299 BLAKE2B 96be7c0bed74e32143d2ea9de7b595599d567b6a8c81b85d92ba7be035e7fe26361240896ada08b2b5f30ce5519a6828dc4350b6ce7ecdb27525e40934a10d31 SHA512 8213736508e56b5d4ddaa9c8e707a7ceb398c8b2c41b938d626459d8bf134aa113116f49cef0cd317033a683d18493448ac4107a5f50151899946bbd48197411
diff --git a/dev-python/billiard/metadata.xml b/dev-python/validators/metadata.xml
index 02f5cbe337fe..4815e9a1d5f9 100644
--- a/dev-python/billiard/metadata.xml
+++ b/dev-python/validators/metadata.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">billiard</remote-id>
-		<remote-id type="github">celery/billiard</remote-id>
+		<remote-id type="pypi">validators</remote-id>
+		<remote-id type="github">kvesteri/validators</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/validators/validators-0.18.2.ebuild b/dev-python/validators/validators-0.18.2.ebuild
new file mode 100644
index 000000000000..c49e00b48575
--- /dev/null
+++ b/dev-python/validators/validators-0.18.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python Data Validation for Humans"
+HOMEPAGE="https://github.com/kvesteri/validators"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
+DEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-python/vcversioner/Manifest b/dev-python/vcversioner/Manifest
deleted file mode 100644
index 745196e12cc8..000000000000
--- a/dev-python/vcversioner/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vcversioner-2.16.0.0.tar.gz 9024 BLAKE2B 70d61a0d65129c28c9febfae54454a50ce99fa3478b4948fb677b90f52d7abff4c14b69ad8e71b26c45cb40a7535be8f916cdf3951a1ca932e1b7d0f07ceae0c SHA512 e4e34693aa813e57991eca01d20102bd2e939b536461e2e9e063ac0e3558580e57d7e8d5e08d010690b3c901c97e53f187f20b48520b333eb492ec33e85757d8
diff --git a/dev-python/vcversioner/metadata.xml b/dev-python/vcversioner/metadata.xml
deleted file mode 100644
index deb4a09d540c..000000000000
--- a/dev-python/vcversioner/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">vcversioner</remote-id>
-    <remote-id type="github">habnabit/vcversioner</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
deleted file mode 100644
index 4158ffac8e36..000000000000
--- a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Use version control tags to discover version numbers"
-HOMEPAGE="https://github.com/habnabit/vcversioner https://pypi.org/project/vcversioner/"
-SRC_URI="mirror://pypi/v/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	"
-
-# not included
-RESTRICT=test
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index 9399e48bd261..0f994745b04e 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,2 +1 @@
-DIST versioneer-0.18.tar.gz 40552 BLAKE2B 640c010958a0178ec5ec5f06c986d83e3bc2f49df95583c4c90d3058449dcca5c7b5421ee5f2f56905b1d949bfe3bfbd87fb23ebc868ede591d078d811ccc2b3 SHA512 8d4522932b1f6aa1c13211008a57a572d54ea677cbdecd7d563ef8f77c76ed5d59f58f2e3be38a01e8cd102c264baf5c8949e9c17ea98d686ac497f8ad8b0011
 DIST versioneer-0.19.tar.gz 47005 BLAKE2B cd4ce82bdb17cd10b628cf6013d1be171cc21115d9a065b845227fd6e5d1e988f8ab6fb001e2eeb6c1bfeda8a4afc8420937b0ec7437554d87e207713ccef381 SHA512 919c2e52e32b2fa1661ab2e10e3a698eb3f7c5102e66175d465d1a29237b86efa1520435ca581e321802cffeaa0ccd21fb66ba66946d72a05d13743c87a3e333
diff --git a/dev-python/versioneer/files/versioneer-0.18-fix_test_git.patch b/dev-python/versioneer/files/versioneer-0.18-fix_test_git.patch
deleted file mode 100644
index 35c45979e6f1..000000000000
--- a/dev-python/versioneer/files/versioneer-0.18-fix_test_git.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/test/git/test_git.py 	2020-04-11 23:36:18.858361255 -0700
-+++ b/test/git/test_git.py	2020-04-11 23:47:01.929316371 -0700
-@@ -8,7 +8,8 @@
- import tempfile
- 
- 
--from pkg_resources import parse_version, SetuptoolsLegacyVersion
-+from pkg_resources import parse_version
-+from packaging.version import LegacyVersion
- 
- sys.path.insert(0, "src")
- import common
-@@ -590,7 +591,7 @@
-     def assertPEP440(self, got, state, tree, runtime):
-         where = "/".join([state, tree, runtime])
-         pv = parse_version(got)
--        self.assertFalse(isinstance(pv, SetuptoolsLegacyVersion),
-+        self.assertFalse(isinstance(pv, LegacyVersion),
-                          "%s: '%s' was not pep440-compatible"
-                          % (where, got))
-         self.assertEqual(str(pv), got,
diff --git a/dev-python/versioneer/metadata.xml b/dev-python/versioneer/metadata.xml
index ffd779f25dff..d322f9d96de3 100644
--- a/dev-python/versioneer/metadata.xml
+++ b/dev-python/versioneer/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <stabilize-allarches/>
   <upstream>
-    <remote-id type="github">warner/python-versioneer</remote-id>
+    <remote-id type="github">python-versioneer/python-versioneer</remote-id>
     <remote-id type="pypi">versioneer</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
diff --git a/dev-python/versioneer/versioneer-0.18-r1.ebuild b/dev-python/versioneer/versioneer-0.18-r1.ebuild
deleted file mode 100644
index 56ba51f56f42..000000000000
--- a/dev-python/versioneer/versioneer-0.18-r1.ebuild
+++ /dev/null
@@ -1,39 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy VCS-based management of project version strings"
-HOMEPAGE="https://pypi.org/project/versioneer/ https://github.com/warner/python-versioneer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.18-fix_test_git.patch"
-)
-
-python_test() {
-	esetup.py make_versioneer
-
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-
-	${PYTHON} test/git/test_git.py -v || die
-}
diff --git a/dev-python/versioneer/versioneer-0.19.ebuild b/dev-python/versioneer/versioneer-0.19.ebuild
index 60aa06920782..d74902ce88fa 100644
--- a/dev-python/versioneer/versioneer-0.19.ebuild
+++ b/dev-python/versioneer/versioneer-0.19.ebuild
@@ -9,12 +9,14 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Easy VCS-based management of project version strings"
-HOMEPAGE="https://pypi.org/project/versioneer/ https://github.com/warner/python-versioneer"
+HOMEPAGE="
+	https://pypi.org/project/versioneer/
+	https://github.com/python-versioneer/python-versioneer/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="public-domain"
-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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 82d9a61fd688..34c02a68feaa 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,4 @@
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
-DIST virtualenv-20.1.0.tar.gz 8284462 BLAKE2B 4356c9c49f7bd2dbb6cf8998be5cd3970804bdec5e3c1223439700f4b5597cd843cdb17b722d54f0181094296247d1f2d4c27980679602b94020fdf1e95dd73f SHA512 740bf8ba30d836c240d248dd2fa31a8702cfa8f96a6192dd6430dbeff3ebbf0fe67d4fd2439ed4961869731520b097783a29381eae3f81f6700b6050b75422c8
 DIST virtualenv-20.2.1.tar.gz 8286055 BLAKE2B da77c51b352e979f05515107df49101a70f97da01862ae92aff0e185065edf1d6d517ee68057f1f2efe5ee999dd9dec24c0f2967b1f10130b446e83e478ccbd1 SHA512 e7877a9766bc47f47a07219258201ad8457ca587a04d61119a0516da43016dda4b5cfeaf725dd0b06f1f896ac8af0f3d7a2ceed3d3f35ac7a4b6ecc607c84118
+DIST virtualenv-20.3.0.tar.gz 9074217 BLAKE2B a5a00e39e31beff84e28e66d1cf6693804861ec0a3c0d0ee5c042e39a8edf894e89d6e78093fe1a4fecaf8b43bceff82e47a1ef7b8a92a1d2bc58d61411575b9 SHA512 5703a934d373d88670092febf26782f65303c65de93cffdd1a2ca06d6f2de4868378421f3ad96e3857eb99d0b60e7a77b0a2dbcf10561918efcbadb29a4ebf3b
+DIST virtualenv-20.3.1.tar.gz 9077527 BLAKE2B 9932c75ffd42c2448a3f5dc49aa8b31f7cd169cc671e225a97fa75fabc3339728d0b280abec9616c11fc869dc696bfd17da05bf911c6f8a14947d710ade86897 SHA512 ee95e851e9e3597fd1691086d1d4dc72a41d6a143e9644be208cadbc1dfe7c8e562cd506a657ba1f77161d8d80a9f6f648b345e6533265b0e989c7ad39cc7680
diff --git a/dev-python/virtualenv/virtualenv-20.1.0.ebuild b/dev-python/virtualenv/virtualenv-20.1.0.ebuild
deleted file mode 100644
index dd2689cfed90..000000000000
--- a/dev-python/virtualenv/virtualenv-20.1.0.ebuild
+++ /dev/null
@@ -1,93 +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,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
-	' python3_6 pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/coverage[${PYTHON_USEDEP}]
-			dev-python/flaky[${PYTHON_USEDEP}]
-			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
-			>=dev-python/pytest-5[${PYTHON_USEDEP}]
-			>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
-			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-		' 'python3*')
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/towncrier
-
-src_prepare() {
-	# we don't have xonsh
-	rm tests/unit/activation/test_xonsh.py || die
-	# require internet
-	sed -e 's:test_seed_link_via_app_data:_&:' \
-		-i tests/unit/seed/embed/test_boostrap_link_via_app_data.py || die
-	# TODO: investigate
-	sed -e 's:test_cross_major:_&:' \
-		-i tests/unit/create/test_creator.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		# TODO: skip with better granularity
-		ewarn "Skipping broken tests on pypy3"
-		return
-	fi
-
-	distutils_install_for_testing
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.2.1.ebuild b/dev-python/virtualenv/virtualenv-20.2.1.ebuild
index 02bd775c4f20..7c0a0c3dfc13 100644
--- a/dev-python/virtualenv/virtualenv-20.2.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/virtualenv/virtualenv-20.3.0.ebuild b/dev-python/virtualenv/virtualenv-20.3.0.ebuild
new file mode 100644
index 000000000000..7a01fa9ad8dc
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.3.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
+	' python3_6 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
+			dev-python/flaky[${PYTHON_USEDEP}]
+			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+			>=dev-python/pytest-5[${PYTHON_USEDEP}]
+			>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+		' 'python3*')
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	distutils_install_for_testing --via-root
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/virtualenv/virtualenv-20.3.1.ebuild b/dev-python/virtualenv/virtualenv-20.3.1.ebuild
new file mode 100644
index 000000000000..7a01fa9ad8dc
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.3.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
+	' python3_6 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
+			dev-python/flaky[${PYTHON_USEDEP}]
+			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+			>=dev-python/pytest-5[${PYTHON_USEDEP}]
+			>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+		' 'python3*')
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	distutils_install_for_testing --via-root
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index fcd498312d7f..4bcf0fdff88d 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,2 +1 @@
-DIST voluptuous-0.12.0.tar.gz 46958 BLAKE2B ec41ea9d5775bdc443153b913bcef7e73f14e29d47c6997e5597958b59c2b1143c83b65ca08d2a06aba3725f76f9168be4f46f68d91d87ceb4e4e3b6643e6800 SHA512 7c72d965f2a2eeb2ad099a19b41e2249b9921e51985ff975ed62fe5a6d5b3f2d5c2a7d6fc2cbe3c80abbea17cfc46c39f1953db5daecc0faafb348c838f80417
 DIST voluptuous-0.12.1.tar.gz 47476 BLAKE2B aa991ab2131e478eb06909c8b7ca86158980b47431d7fae82f41ab2c09b2d23c21d6da937394732cb479436fc247268947c3b31701c6260132cd6f9c7f7e288f SHA512 14ead6bd99c9238318e7ed39fa543cb3363cbb0716a251061e6f533b8fae3fd5e754bd6b2756b6d76745da0e02236e04bfe0ae4e25dd87d291bb2a716660eebc
diff --git a/dev-python/voluptuous/voluptuous-0.12.0.ebuild b/dev-python/voluptuous/voluptuous-0.12.0.ebuild
deleted file mode 100644
index 4cd10b5a472e..000000000000
--- a/dev-python/voluptuous/voluptuous-0.12.0.ebuild
+++ /dev/null
@@ -1,20 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python data validation library."
-HOMEPAGE="https://github.com/alecthomas/voluptuous"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch )
-
-distutils_enable_tests nose
diff --git a/dev-python/voluptuous/voluptuous-0.12.1.ebuild b/dev-python/voluptuous/voluptuous-0.12.1.ebuild
index d462864db631..fc7ffa94f4fa 100644
--- a/dev-python/voluptuous/voluptuous-0.12.1.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch )
 
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 85ac3c02f1c3..b9143771050a 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,5 +1,2 @@
-DIST watchdog-0.10.3.tar.gz 89215 BLAKE2B bbe8a2ab3f84b7eff60d4ebd38ac928db85998910fc5b107dcd645c9b91388a9e45d317777f08288ce3bc2befcf9310bb7c8aef4f8e3309481919dc87e84b2a1 SHA512 6061b1393cd07038ee22271101bd6d5c847ee9732b14f63bbb5d94fba9f8273ca728cdc58b6f53a95d8213d0ed35bc71e8bb9c54960bf3aea2f64da066a864f5
-DIST watchdog-0.10.4.tar.gz 90303 BLAKE2B 0c057fe35383deaa6b7a66c24c07b2260153e94072b2769dd023210e0e5af90b4556ac18a4e8cab8af794c9dad8709205d9f48022458ee6c93fc0f2926b6f372 SHA512 abaadebd74dd869af545b5a3f10edc9d58f4f0f31f43aaf2244aed2c0ef56828f0b4cf9eda919727c832b20c79e95f50df7193dc8ea9d05d28a52dc322a3a497
-DIST watchdog-0.10.5.tar.gz 91432 BLAKE2B 0f10a94edf4cb79d68b83f0cc6eebc1eae9a00a0fd7b8164977a2511b952b6dda9d0b26404ef316a57524f948eb6676a5da65bb711530f64a4a37ab82576b9a9 SHA512 b107fe23b123360ba8ad049576bdbbb40061c70157bee0663bcf9ee9a9a9f65b95234540a477ba9ae6d617199ca1d77fe30b3b9dc4868bfef08a6b9099d6fe51
-DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
 DIST watchdog-1.0.0.tar.gz 89861 BLAKE2B 79734397fc91e3c733fd28e8c607c07265230f8e7949b07e4236e4fe38af48cd0f758270990b384ccee88bc88311291cc3758f29296edda2dff06dc757d6d492 SHA512 e89f34aba7547022a48ff16e36e6a2eea340e80a4b1e1f8657d4e70d4a451ac43351aafc76978fb4241c583df11c2dd6c53cb1a03c43c2734f4a8a07d5b2604f
+DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
diff --git a/dev-python/watchdog/watchdog-0.10.3.ebuild b/dev-python/watchdog/watchdog-0.10.3.ebuild
deleted file mode 100644
index 939e3a0678ff..000000000000
--- a/dev-python/watchdog/watchdog-0.10.3.ebuild
+++ /dev/null
@@ -1,35 +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,9,10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc x86"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]
-	dev-python/pathtools[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? ( >=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-0.10.4.ebuild b/dev-python/watchdog/watchdog-0.10.4.ebuild
deleted file mode 100644
index 5912b969c304..000000000000
--- a/dev-python/watchdog/watchdog-0.10.4.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_{6,7,8,9,10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]
-	dev-python/pathtools[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	# broken when django is installed
-	sed -i -e 's:test_eventlet_monkey_patching:_&:' \
-		tests/test_skip_repeats_queue.py || die
-	default
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
deleted file mode 100644
index 1559bdf501b2..000000000000
--- a/dev-python/watchdog/watchdog-0.8.3-r2.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,7,8,9,10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="mirror://pypi/w/watchdog/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]
-	dev-python/pathtools[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-		)"
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-1.0.0.ebuild b/dev-python/watchdog/watchdog-1.0.0.ebuild
index 2f8d278e0dd2..5eb55c041cb4 100644
--- a/dev-python/watchdog/watchdog-1.0.0.ebuild
+++ b/dev-python/watchdog/watchdog-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-python/watchdog/watchdog-0.10.5.ebuild b/dev-python/watchdog/watchdog-1.0.2.ebuild
index 5912b969c304..2f8d278e0dd2 100644
--- a/dev-python/watchdog/watchdog-0.10.5.ebuild
+++ b/dev-python/watchdog/watchdog-1.0.2.ebuild
@@ -18,8 +18,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]
-	dev-python/pathtools[${PYTHON_USEDEP}]"
+	dev-python/argh[${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}
 	test? (
 		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index eb561b1f9514..c373472b8938 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1 +1,2 @@
 DIST wcmatch-7.1.tar.gz 105744 BLAKE2B 0add1c68025c92ac57d6ea64d82bddb20bace60de5d319fb16e16802f208d788d876695bfcd186b80630039f544565c631d36e1c7327dee5d8c799eff8c80ce2 SHA512 79d62d85f13d245e38d0fe92a275e24058b86af8aaf9a926bfd950dad4ec47e40e763c18b08d3eb4ddd925832ae9910f13407094070442b41dbe2fe4ad11fb39
+DIST wcmatch-7.2.tar.gz 105087 BLAKE2B a28bd9d02468f3ca83d606ee7f7d5c9b6b8883cf6e0c04b711765aefafce189f7f524a490c6831a739b579be66af5f4b1c7b6373da22e170211e611677c5788f SHA512 6fdc0a3cb6d66b323c509a5ee34c1e8df9a46a93fd1fc0921dfdbc17ac604934fdad3df5e8f253aa6a880bea2e81bb26ec097b9503c920433c5827ea91b327d8
diff --git a/dev-python/wcmatch/metadata.xml b/dev-python/wcmatch/metadata.xml
index 74ac9d9243fb..c02c090a3292 100644
--- a/dev-python/wcmatch/metadata.xml
+++ b/dev-python/wcmatch/metadata.xml
@@ -14,6 +14,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">facelessuser/wcmatch</remote-id>
 		<remote-id type="pypi">wcmatch</remote-id>
diff --git a/dev-python/wcmatch/wcmatch-7.2.ebuild b/dev-python/wcmatch/wcmatch-7.2.ebuild
new file mode 100644
index 000000000000..d1d3030699ea
--- /dev/null
+++ b/dev-python/wcmatch/wcmatch-7.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
+	dev-python/mkdocs-material
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Wildcard/glob file name matcher"
+HOMEPAGE="
+	https://github.com/facelessuser/wcmatch/
+	https://pypi.org/project/wcmatch/"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
+	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-vcs/git
+)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# this test makes a really wrong assumption that basename of $HOME
+	# will be a username
+	sed -i -e 's:test_tilde_user:_&:' \
+		tests/test_glob.py || die
+
+	# tests require some files in homedir
+	> "${HOME}"/test1.txt || die
+	> "${HOME}"/test2.txt || die
+
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/webcolors/webcolors-1.11.1.ebuild b/dev-python/webcolors/webcolors-1.11.1.ebuild
index 2599db5e101d..7492a8702dea 100644
--- a/dev-python/webcolors/webcolors-1.11.1.ebuild
+++ b/dev-python/webcolors/webcolors-1.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-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"
 
 BDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/webob/webob-1.8.6.ebuild b/dev-python/webob/webob-1.8.6.ebuild
index fde8d9317dfa..d9c2d7a6344e 100644
--- a/dev-python/webob/webob-1.8.6.ebuild
+++ b/dev-python/webob/webob-1.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 distutils_enable_sphinx docs 'dev-python/alabaster'
 distutils_enable_tests pytest
diff --git a/dev-python/websockets/websockets-8.1.ebuild b/dev-python/websockets/websockets-8.1.ebuild
index a3daa5f6cefa..08353bfff544 100644
--- a/dev-python/websockets/websockets-8.1.ebuild
+++ b/dev-python/websockets/websockets-8.1.ebuild
@@ -14,4 +14,4 @@ SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
diff --git a/dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild b/dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild
index b1411aa2b54b..6cb63d56a9a5 100644
--- a/dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild
+++ b/dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/dev-python/whatever/Manifest b/dev-python/whatever/Manifest
new file mode 100644
index 000000000000..0a13a32bb428
--- /dev/null
+++ b/dev-python/whatever/Manifest
@@ -0,0 +1 @@
+DIST whatever-0.6.tar.gz 4748 BLAKE2B c0a8b3bff715b61744ca5094c234c24558882d00b0dd8c375b90deef9d68155997cb97fb94435cb6dcfa0ba4674ce61fd6d030dd338409e8aaa5686c3bf9f3b1 SHA512 acdc145b81423908fd2d80bf0e8a0c02bad3a6156ec5a7724cf10b0f447c14354c34ac4ffa4e5a26788a79ce2a6b7bd65bb0ea281a6d8919dacd9a24ee1cde2d
diff --git a/dev-python/parametrized/metadata.xml b/dev-python/whatever/metadata.xml
index 7c607500d241..448ce80f24f5 100644
--- a/dev-python/parametrized/metadata.xml
+++ b/dev-python/whatever/metadata.xml
@@ -2,10 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>amynka@gentoo.org</email>
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">parametrized</remote-id>
+		<remote-id type="pypi">whatever</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/funcy/funcy-1.10.1.ebuild b/dev-python/whatever/whatever-0.6.ebuild
index 1a1071e7e7b0..b903234d391e 100644
--- a/dev-python/funcy/funcy-1.10.1.ebuild
+++ b/dev-python/whatever/whatever-0.6.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="A collection of fancy functional tools focused on practicality"
-HOMEPAGE="https://github.com/Suor/funcy"
+HOMEPAGE="https://github.com/Suor/whatever"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index a7c35f1fb5d7..fa55c58f41f2 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,4 +1 @@
-DIST wheel-0.35.1.gh.tar.gz 63563 BLAKE2B d1432a638b91e821cb9b9fc748567b9ad18bbfd4737cee915ee3e2c585c4758e79bcf163edac56a09f9e356d81a057214c8e84c5c75b45505c67aa761e97fe3f SHA512 34cd6d1a649842abd895418c0183e68f44e228be905041e1dd8562987fbab8aa617da9b78479cb8d56fb6bb8714ec1085b87640c385bfc933e215f6e33ccf55b
-DIST wheel-0.36.0.gh.tar.gz 65186 BLAKE2B 384dea20a6fdc2e9cc581c1e30814ac84285b8ca2ac5588fc837a1e27add493dedd38ead643776d1353a98cafa45a609e9655168fd09944cfe016d99e357fcd2 SHA512 1f851dfc18fa96d67bb96c61eec15999c46ea77c490173b71121810480f3c30f2de770a2e6e0712d04f35c91fcadbb276b05968e2b5db76dea882929f555f983
-DIST wheel-0.36.1.gh.tar.gz 65846 BLAKE2B 906bd8887ab0efc6542547c603d613e6b12e4ea56e8d037c3a4532e064f3d337cd5c161e2c2557cc832262a42eeda2850303f1d92e8de45f44321ebc9d47c955 SHA512 1f9a27604b0fa0d1ae4782bdba57956a70d74a9a736f4c41481b417cd1e8a86938705555c37835ffe1a061ef55f8adad3475bfc20e2c1fd8de8083dd5c72cca0
 DIST wheel-0.36.2.gh.tar.gz 67999 BLAKE2B 0bb6742ddb25a5b94f94fd071dfe63ae5fa555731625b4b8ca2c7abb1a255e24590ae9ea250ada0473fcd74f19bdca7e529f8eda1a79d8e394d8b339bd2a257a SHA512 23f3dd0540ecc8e762f37a4bb69713abe99125a605c03b1a3412cec910fb7a6cea3eee3910d7c98122b276170a17414c9132b57b57a30a4ba1283cea8f9e20fa
diff --git a/dev-python/wheel/wheel-0.35.1-r1.ebuild b/dev-python/wheel/wheel-0.35.1-r1.ebuild
deleted file mode 100644
index c7a24a1d3c44..000000000000
--- a/dev-python/wheel/wheel-0.35.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A built-package format for Python"
-HOMEPAGE="https://pypi.org/project/wheel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed \
-		-e 's:--cov=wheel::g' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	if ! python_is_python3; then
-		# install fails due to unicode in paths
-		ewarn "Testing is broken with py2.7, please test externally"
-		return
-	fi
-
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/wheel/wheel-0.36.0.ebuild b/dev-python/wheel/wheel-0.36.0.ebuild
deleted file mode 100644
index 0475f2c77666..000000000000
--- a/dev-python/wheel/wheel-0.36.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A built-package format for Python"
-HOMEPAGE="https://pypi.org/project/wheel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed \
-		-e 's:--cov=wheel::g' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	if ! python_is_python3; then
-		# install fails due to unicode in paths
-		ewarn "Testing is broken with py2.7, please test externally"
-		return
-	fi
-
-	distutils_install_for_testing --via-root
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/wheel/wheel-0.36.1.ebuild b/dev-python/wheel/wheel-0.36.1.ebuild
deleted file mode 100644
index 0475f2c77666..000000000000
--- a/dev-python/wheel/wheel-0.36.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A built-package format for Python"
-HOMEPAGE="https://pypi.org/project/wheel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed \
-		-e 's:--cov=wheel::g' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	if ! python_is_python3; then
-		# install fails due to unicode in paths
-		ewarn "Testing is broken with py2.7, please test externally"
-		return
-	fi
-
-	distutils_install_for_testing --via-root
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/wheel/wheel-0.36.2.ebuild b/dev-python/wheel/wheel-0.36.2.ebuild
index 0475f2c77666..1c3dd4ace5fb 100644
--- a/dev-python/wheel/wheel-0.36.2.ebuild
+++ b/dev-python/wheel/wheel-0.36.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/whisper/Manifest b/dev-python/whisper/Manifest
index d6c316848ac3..4ecf372e5722 100644
--- a/dev-python/whisper/Manifest
+++ b/dev-python/whisper/Manifest
@@ -1 +1,2 @@
 DIST whisper-1.1.5.tar.gz 38104 BLAKE2B ab36c91c00dd8e8e26b24c0c2967c661f0bd69f3dcb0e52763f6527a233f656a984c738be720c0b5f2d27fff08daa164db87f0ab693d360bd0c087cf6a408340 SHA512 dee42adf1824c876cf15e9e55101d90d08889fd6e267a89c18fdb4a7d4c5a3a0d4f6f24bb0fdeb974fd194046c17e00f71033ddb72c74c4d4ded0a937e82c8a9
+DIST whisper-1.1.7.tar.gz 38289 BLAKE2B 05c5ed972c6dbe8ecc29731d206a44e4db2605aa1270d0eba63c90390062f3cee81a6076a571e6b18cc54f8b1a0ffbc9800c91e9aa7cf3cab862d7e6bb8217c0 SHA512 2dc4f15a91b518495da120af4ad2af4b5f81d04fae6028ca1d7505046b93082a9294452a703c8de87dc89629c35dca0809c4ee7c0df1a7a6bd5ec527f3126df2
diff --git a/dev-python/whisper/metadata.xml b/dev-python/whisper/metadata.xml
index 29c0284ccb49..363b790c9332 100644
--- a/dev-python/whisper/metadata.xml
+++ b/dev-python/whisper/metadata.xml
@@ -9,10 +9,12 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">whisper</remote-id>
 		<remote-id type="github">graphite-project/whisper</remote-id>
 		<bugs-to>https://github.com/graphite-project/whisper/issues</bugs-to>
+		<changelog>https://github.com/graphite-project/graphite-web/blob/master/CHANGELOG.md</changelog>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/whisper/whisper-1.1.7.ebuild b/dev-python/whisper/whisper-1.1.7.ebuild
new file mode 100644
index 000000000000..705545574a6a
--- /dev/null
+++ b/dev-python/whisper/whisper-1.1.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Fixed size round-robin style database"
+HOMEPAGE="https://github.com/graphite-project/whisper"
+# PyPI tarballs don't contain tests
+# https://github.com/graphite-project/whisper/pull/253
+SRC_URI="https://github.com/graphite-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~x64-solaris"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+#python_test() {
+#	py.test || die "tests failed with ${EPYTHON}"
+#}
diff --git a/dev-python/wrapt/wrapt-1.12.1.ebuild b/dev-python/wrapt/wrapt-1.12.1.ebuild
index d4fbd7c9fe25..989dc9b6dcf2 100644
--- a/dev-python/wrapt/wrapt-1.12.1.ebuild
+++ b/dev-python/wrapt/wrapt-1.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/wsaccel/wsaccel-0.6.3.ebuild b/dev-python/wsaccel/wsaccel-0.6.3.ebuild
index 774553bcb166..93e18c76daa5 100644
--- a/dev-python/wsaccel/wsaccel-0.6.3.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/methane/wsaccel/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/wstools/wstools-0.4.8.ebuild b/dev-python/wstools/wstools-0.4.8.ebuild
index be8152838cd1..237d8d68762f 100644
--- a/dev-python/wstools/wstools-0.4.8.ebuild
+++ b/dev-python/wstools/wstools-0.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wxpython2/wxpython2-3.0.2.0.ebuild b/dev-python/wxpython2/wxpython2-3.0.2.0-r1.ebuild
index 13958e9e81c7..1d3987542b30 100644
--- a/dev-python/wxpython2/wxpython2-3.0.2.0.ebuild
+++ b/dev-python/wxpython2/wxpython2-3.0.2.0-r1.ebuild
@@ -6,7 +6,8 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 WX_GTK_VER="3.0"
 
-inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets
+DISTUTILS_USE_SETUPTOOLS=manual
+inherit alternatives distutils-r1 eutils flag-o-matic wxwidgets
 
 ORIG_PN="wxpython"
 MY_PN="wxPython-src"
@@ -27,7 +28,7 @@ RDEPEND="
 	dev-lang/python-exec:2[${PYTHON_USEDEP}]
 	>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}=[libnotify=,opengl?,tiff,X]
 	dev-libs/glib:2
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools-python2[${PYTHON_USEDEP}]
 	media-libs/libpng:0=
 	media-libs/tiff:0
 	virtual/jpeg
@@ -114,6 +115,16 @@ python_install_all() {
 	rm -r ${D}/usr/share
 }
 
+fdo-mime_desktop_database_update() {
+	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
+	has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
+	if [ -x "${EPREFIX}/usr/bin/update-desktop-database" ]
+	then
+		einfo "Updating desktop mime database ..."
+		"${EPREFIX}/usr/bin/update-desktop-database" -q "${EROOT}usr/share/applications"
+	fi
+}
+
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 
@@ -139,3 +150,4 @@ pkg_postrm() {
 	}
 	python_foreach_impl update_symlinks
 }
+
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index 95b27944821c..0afcbc7b87a6 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1 +1,3 @@
-DIST xapp-2.0.1.tar.gz 19839 BLAKE2B 692ef5a560681f415ab211b6f2870339dc80ca3ce90ac860637ce6765309b03f8ac41499ad5bcef51cde194b7cee2e3366abb3ddb5ee7e2212e3dac0da625387 SHA512 a529680ab2adbcd829ec224b7dafeb5f641afaabd51ac6cea154d1adf46772b0f2c58a78c6f136d3c6dde0b5d69a4e53a988f69d282af852ecf9ffa130ec1fe4
+DIST xapp-2.0.2.tar.gz 19946 BLAKE2B fde2f4f30fa1dbb5d4778d82bcfb347a5b8f89635df6c298d0dc509a194c528b653a1cbe4537c878bde4a8b987852ca51e37a70b6c35f96c9882c5b1b277dd36 SHA512 2b5d2a259e55384426940e6284ec9f964f4f0220b8cb364606c938ef6e1717d40ddbc3730732dddc86d460f624ac6161fe5ab55c276aedba9187a79d9d53a60e
+EBUILD xapp-2.0.2.ebuild 559 BLAKE2B 015725f6be4217227fead11a012d4a3a62363546989f6397356f710b1a5b690d2ab3a5c080be00fefe0d4a5b7592bdf062478d51856ec7abd4f61bfda15fddb0 SHA512 92c825c4203d4c183947d40aad2f3f325bbb490c9254600c9acbefd93e51b8894dd038729067d3fb3799aff216831c15a3f3f496504d0a6a863bf88f29435874
+MISC metadata.xml 584 BLAKE2B 7b0110a8ad67b0faa3125ddd088a8d019129d239cc541a08b4443f8bddd3c1efc1891ccbd935309fd13c940b1cf95bf6f1e769c078e895393f7bccf3a366a0ea SHA512 3273919c56af741c5cfde4b69180c20a2defdb16a59f34c0a57147f955c8454eb73cd20f5d02fe827432b7f7310e9a313b324832df96c724300cf3b05cb30141
diff --git a/dev-python/xapp/metadata.xml b/dev-python/xapp/metadata.xml
index a2fa205b61a3..0baf89c0baa4 100644
--- a/dev-python/xapp/metadata.xml
+++ b/dev-python/xapp/metadata.xml
@@ -16,5 +16,5 @@
 	<upstream>
 		<remote-id type="github">linuxmint/python3-xapp</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
+	<origin>cinnamon-overlay</origin>
 </pkgmetadata>
diff --git a/dev-python/xapp/xapp-2.0.1.ebuild b/dev-python/xapp/xapp-2.0.2.ebuild
index 61e2e90aa55a..178671b54df4 100644
--- a/dev-python/xapp/xapp-2.0.1.ebuild
+++ b/dev-python/xapp/xapp-2.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/xapps[introspection]"
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 53282ff96824..a997479fcd72 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,2 +1 @@
-DIST xarray-0.16.1.tar.gz 2007111 BLAKE2B 426485a921669e2a5c92eec143d5470c5fabcbe9c0ec440c39b27b3b95aa2e87d494397c3b3ad69b0856a2c467b025beccd188aee40a5b96a5d411bb2d66ada6 SHA512 b02dc0a0993c1a41b839d693fb1b3639cfe2a449ae53da39adac01a19749e7945217716a8a07bedd9ef4d63f333a0ac4ce3fed6a8da9042468fdce2290656321
 DIST xarray-0.16.2.tar.gz 2018053 BLAKE2B 3b95c688a3979323b93ec46c9f218795fbf9df56a7ba1459a507ac36379b3240c351cbb3f1907a204199c6c0c4c0c1c516552548d1e03fb987ad718561aa9772 SHA512 f6cd3eee2012e3b544874388c4824e911ce5d213cd393bf01b10deb9742a1168f41629e4f1e49220228771cac920980eaa98a599a6d62c383dd3da7b3bfe0dd8
diff --git a/dev-python/xarray/xarray-0.16.1.ebuild b/dev-python/xarray/xarray-0.16.1.ebuild
deleted file mode 100644
index 562a713aec5b..000000000000
--- a/dev-python/xarray/xarray-0.16.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pkg_resources use in code
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="https://xarray.pydata.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25[${PYTHON_USEDEP}]"
-# note: most of test dependencies are optional
-BDEPEND="
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-#	"${FILESDIR}/${PN}-0.10.8-skip-broken-test.patch"
-)
diff --git a/dev-python/xarray/xarray-0.16.2.ebuild b/dev-python/xarray/xarray-0.16.2.ebuild
index 3d2476f0e7c7..926693812348 100644
--- a/dev-python/xarray/xarray-0.16.2.ebuild
+++ b/dev-python/xarray/xarray-0.16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 89938e081fb2..270ed80f043b 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,3 +1 @@
-DIST xcffib-0.10.1.tar.gz 84689 BLAKE2B e36ad4f9c6bf5bc63400ae35d0d58ea1def00f299c0f811807cde430e6a6850132e77584359f77fb2f4ce5fdf5f22ec91ed22e1b7ce5d6d318b7a8dc5f3e0939 SHA512 98412fe36962108902dc0599f05ac9be5d7412d7f12fc6566e020c2ce84ae4a536a20ae2dfddd2dc9a536f37cd82539bf19e1993ee65f0b09c44372008cd7edf
-DIST xcffib-0.11.0.tar.gz 84750 BLAKE2B adc1faebc8f0e83150f50e1b711175f5f4617124e07a4d5744b7d1c116cdb89f6d68617cc0ad0efccf2d9465e6bbd2504ee08c322c61228728aeeccb57fe55fa SHA512 22b82844295b277e2abb363ff818e7163037542ffc1ec2874a948f3b3cc63e9a8fad371fa87099910546a17f2f6f1bfb8f62214869fa30a196fc198adce14384
 DIST xcffib-0.11.1.tar.gz 84713 BLAKE2B 6ab1ad6e582d71214cd719fdfa898e561e29d5750f5befe5c71173cfe34f2dff7dbd52fe93e618aab695646850f7ef5420114e2b1e725150c643904cdaba560a SHA512 09f4e19b88258446af26628c3a8e694c1f938fe3b5456e797b06174602fa0e9ef6e4eab76daccfd169d98fb7e869c910e6216d1f71fa2853e62b82c62c667669
diff --git a/dev-python/xcffib/xcffib-0.10.1.ebuild b/dev-python/xcffib/xcffib-0.10.1.ebuild
deleted file mode 100644
index 69f9bd41b29b..000000000000
--- a/dev-python/xcffib/xcffib-0.10.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_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
-HOMEPAGE="https://github.com/tych0/xcffib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-
-DEPEND="x11-libs/libxcb"
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
-	' 'python*')
-	dev-python/six[${PYTHON_USEDEP}]
-	${DEPEND}"
-BDEPEND="
-	test? (
-		x11-base/xorg-server[xvfb]
-		x11-apps/xeyes
-	)"
-
-distutils_enable_tests nose
diff --git a/dev-python/xcffib/xcffib-0.11.0.ebuild b/dev-python/xcffib/xcffib-0.11.0.ebuild
deleted file mode 100644
index e4e62019068f..000000000000
--- a/dev-python/xcffib/xcffib-0.11.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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
-HOMEPAGE="https://github.com/tych0/xcffib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-DEPEND="x11-libs/libxcb"
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
-	' 'python*')
-	dev-python/six[${PYTHON_USEDEP}]
-	${DEPEND}"
-BDEPEND="
-	test? (
-		x11-base/xorg-server[xvfb]
-		x11-apps/xeyes
-	)"
-
-distutils_enable_tests nose
diff --git a/dev-python/xcffib/xcffib-0.11.1.ebuild b/dev-python/xcffib/xcffib-0.11.1.ebuild
index e4e62019068f..6df591ecf1b7 100644
--- a/dev-python/xcffib/xcffib-0.11.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 DEPEND="x11-libs/libxcb"
 RDEPEND="
diff --git a/dev-python/xlrd/xlrd-1.2.0.ebuild b/dev-python/xlrd/xlrd-1.2.0.ebuild
index 62d97efc8edc..9d4e3f8dd5d1 100644
--- a/dev-python/xlrd/xlrd-1.2.0.ebuild
+++ b/dev-python/xlrd/xlrd-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/xlutils/Manifest b/dev-python/xlutils/Manifest
deleted file mode 100644
index 905cd18e180c..000000000000
--- a/dev-python/xlutils/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xlutils-2.0.0.tar.gz 61614 BLAKE2B 51fde8ef1a0a88ecccfb3cfb332fe8a31101d29865cfa6201001d272db34a5f210e988ccb99ba00344f80dd457a5c91866af12061af9342d556953700cf02916 SHA512 7b6c39912a2b23d718b1aaac2f21770f1e5b156fdc7416f11d4a7e6b52195ffffb982aecb52b5571599eb4928c7e09bbfb20fdf2554f0c49c286b243e2fb3ea9
diff --git a/dev-python/xlutils/files/xlutils-2.0.0-fix-tests.patch b/dev-python/xlutils/files/xlutils-2.0.0-fix-tests.patch
deleted file mode 100644
index b7e74925095e..000000000000
--- a/dev-python/xlutils/files/xlutils-2.0.0-fix-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e9edf279ba2e699be92da7611368cf92b4d87cec Mon Sep 17 00:00:00 2001
-From: Chris Withers <chris@simplistix.co.uk>
-Date: Wed, 4 Apr 2018 08:05:06 +0100
-Subject: [PATCH] fix test expectations
-
----
- xlutils/tests/test_view.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/xlutils/tests/test_view.py b/xlutils/tests/test_view.py
-index 7b32892..5b4aa2b 100644
---- a/xlutils/tests/test_view.py
-+++ b/xlutils/tests/test_view.py
-@@ -219,6 +219,8 @@ def test_does_not_match(self):
- ('XX',)
- 
- actual:
--(u'',)'''
-+(u'',)
-+
-+While comparing [5][1]: 'XX' (expected) != u'' (actual)'''
- 
-         compare(expected, actual=str(s.raised))
diff --git a/dev-python/xlutils/xlutils-2.0.0-r1.ebuild b/dev-python/xlutils/xlutils-2.0.0-r1.ebuild
deleted file mode 100644
index 4077d3f44af7..000000000000
--- a/dev-python/xlutils/xlutils-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,44 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="provides a collection of utilities for working with Excel files"
-HOMEPAGE="https://pypi.org/project/xlutils/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/xlwt-1.3[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-1.2[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/errorhandler-2[${PYTHON_USEDEP}]
-		>=dev-python/manuel-1.9[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-fix-tests.patch"
-)
-
-python_test() {
-	# upstream runs its tests with nose, but the suite actually runs better
-	# when ran through pytest...
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index ed30cc43f4e0..b8f6dcff10b6 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,2 +1,2 @@
-DIST xmlschema-1.2.5.tar.gz 290750 BLAKE2B b6fb6722f1f9468cbae6507522c4398a7d0aff11918479b8e89e24986df2ad1ae4fe8640c5fe532319c6e7dbdb958d81df8cf81f1ceb18db09c406fc6a137219 SHA512 f821f041b7be483039746d7c7771117d4cac6189dd02a0f95235ea6597300dead39813b1ede9b6871fad93e50aa55f01f7da4e485c7074f66d78a76f1b57e7cf
 DIST xmlschema-1.3.1.tar.gz 318853 BLAKE2B 1f2f960c5dad0c82a7ca0345bca052560d39f07b3fff9f443ec5d206a2ec92743462be2209e69a9330f432dbeb7e5908dae4168f7815cf64c141047876844453 SHA512 3bd2ba3004c1a397aff1c81c1105a603dd219f9c2c4afd0742aea3d7263dd0c50adbc05f4ccf96ad0a0f8bd5c116002152eba8194619e6bb636ef46111e6a2a4
+DIST xmlschema-1.4.1.tar.gz 329488 BLAKE2B 80125c6867facb8f94574f4aa210239057f6c8429ff52daac047457eaf6c836b051ccf8e0dec751c1bc57e4de7343781849fe88290117b8546ecd9b8ee99859a SHA512 935e4bffa5361e87fe0656c04b79fe50213098db86e18de38d82d9c04e45557b7ce9468379644c202ab25bdbd6f430bf85a639c3aa7636833d4bbe8533738e82
diff --git a/dev-python/xmlschema/files/xmlschema-1.2.5-skip_network_tests.patch b/dev-python/xmlschema/files/xmlschema-1.2.5-skip_network_tests.patch
deleted file mode 100644
index 4dee9a4ef107..000000000000
--- a/dev-python/xmlschema/files/xmlschema-1.2.5-skip_network_tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xmlschema-1.2.5/tests/validators/test_schema_class.py
-+++ xmlschema-1.2.5/tests/validators/test_schema_class.py
-@@ -261,6 +261,7 @@ class TestXMLSchema10(XsdValidatorTestCa
- 
-         self.assertFalse(os.path.isdir(dirname))
- 
-+    @unittest.skipIf(SKIP_REMOTE_TESTS, "Remote networks are not accessible.")
-     def test_export_remote__issue_187(self):
-         vh_schema_file = self.casepath('issues/issue_187/issue_187_2.xsd')
-         vh_schema = self.schema_class(vh_schema_file)
diff --git a/dev-python/xmlschema/xmlschema-1.3.1.ebuild b/dev-python/xmlschema/xmlschema-1.3.1.ebuild
index c4efac11ffbe..218f5811f138 100644
--- a/dev-python/xmlschema/xmlschema-1.3.1.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xmlschema/xmlschema-1.2.5.ebuild b/dev-python/xmlschema/xmlschema-1.4.1.ebuild
index 5fcc88b88c69..c4efac11ffbe 100644
--- a/dev-python/xmlschema/xmlschema-1.2.5.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -25,11 +25,6 @@ BDEPEND="${RDEPEND}
 		dev-python/lxml[${PYTHON_USEDEP}]
 	)"
 
-# patch from https://github.com/sissaschool/xmlschema/issues/206
-PATCHES=(
-	"${FILESDIR}/${P}-skip_network_tests.patch"
-)
-
 python_test() {
 	"${EPYTHON}" tests/test_all.py -v ||
 		die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/yapf/metadata.xml b/dev-python/yapf/metadata.xml
index 85e5d030058e..6ff4157c563f 100644
--- a/dev-python/yapf/metadata.xml
+++ b/dev-python/yapf/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chr@chymera.eu</email>
+		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
index bd655310b9cc..bf54e86e8269 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -1,2 +1,3 @@
 DIST yappi-1.2.5.tar.gz 928100 BLAKE2B 1d303226821d53fb215ac29f8363d9f564f9f40096b5ba8f67475c4074012316f523afb6d770cff879038cd333ef7f050b29c015e2dd2e517859f66a0e1f36f3 SHA512 ec784e76b56e8bc0c3cfe07c90d0810fa90d5a7da62f36187e8a09a9d6e01f3c2d74320de3dd3f4bf1d4a9425fee319c7a575a9d35ad5412c1501c934f1ba353
-DIST yappi-1.3.0.tar.gz 928100 BLAKE2B 1d303226821d53fb215ac29f8363d9f564f9f40096b5ba8f67475c4074012316f523afb6d770cff879038cd333ef7f050b29c015e2dd2e517859f66a0e1f36f3 SHA512 ec784e76b56e8bc0c3cfe07c90d0810fa90d5a7da62f36187e8a09a9d6e01f3c2d74320de3dd3f4bf1d4a9425fee319c7a575a9d35ad5412c1501c934f1ba353
+DIST yappi-1.3.0.gh.tar.gz 936160 BLAKE2B fcb7651a188e8442f9cac8dc680cc2c944f0f20d322982eaa3f75893f8575db45144f9fac51af58e4c75001603fce08c65d5ffd02b47cceb0d4db0af0ffb1b36 SHA512 ae7c27231721df1a705905c0270feb3e469d156fd8e62fe83a8387920662eb10c5262783b74e97fb01c8ea0dcdb6b78dcce3a87ab5472f1a8f6f03849480a523
+DIST yappi-1.3.2.tar.gz 936566 BLAKE2B 55f114b8ed8689944f8146cb283701b41f34e87f3e5104d7d8df239cd2afc24f1ca1bf86f99bf672735677005df6527c83c5306a7902ea45e335134a925d6e18 SHA512 7a555bf6db8d7b9d8b4e36ceda1a40319a3d0aa478c512fb0fbca678dd3966b1facffa7555dca1ffaf07461ed3ab81284bd643e331eb2e6d1ee9c99eab1acb55
diff --git a/dev-python/yappi/yappi-1.3.0-r1.ebuild b/dev-python/yappi/yappi-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..b089fb1d2ed5
--- /dev/null
+++ b/dev-python/yappi/yappi-1.3.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+# no tags on github, no tests on pypi
+COMMIT_HASH="ade55478807aa957714e0ef3e228d0cf0c68949d"
+
+DESCRIPTION="Yet Another Python Profiler"
+HOMEPAGE="https://pypi.org/project/yappi/ https://github.com/sumerc/yappi"
+SRC_URI="https://github.com/sumerc/yappi/archive/${COMMIT_HASH}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-python/gevent[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
+
+PATCHES=(
+	"${FILESDIR}/yappi-1.2.5-warnings.patch"
+	"${FILESDIR}/yappi-1.3.0-tests.patch"
+)
+
+python_prepare_all() {
+	cp tests/utils.py "${S}" || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/yappi/yappi-1.3.0.ebuild b/dev-python/yappi/yappi-1.3.2.ebuild
index c48bcfa1fd11..7cadfac832cf 100644
--- a/dev-python/yappi/yappi-1.3.0.ebuild
+++ b/dev-python/yappi/yappi-1.3.2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 # no tags on github, no tests on pypi
-COMMIT_HASH="b6c7d9f0bb40b511f61bb82cc395ad9140a4f4b0"
+COMMIT_HASH="c256f28d3ccc2bc1692a5a090dc8f774c4933c16"
 
 DESCRIPTION="Yet Another Python Profiler"
 HOMEPAGE="https://pypi.org/project/yappi/ https://github.com/sumerc/yappi"
@@ -16,11 +17,11 @@ S="${WORKDIR}/${PN}-${COMMIT_HASH}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-#RDEPEND="
-#	$(python_gen_cond_dep 'dev-python/contextvars[${PYTHON_USEDEP}]' 'python3_6')
-#"
+BDEPEND="test? ( dev-python/gevent[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index af19baba946b..3bed866b7df0 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,2 +1 @@
-DIST yarl-1.6.2.tar.gz 177534 BLAKE2B a7a587387c8030737874b445007aac4a7bc7f5552238fb892cbb99325e9a3862c599a11df5738d79e47dd1073e29731f80bd941f351e4a7b1867780fba9986ce SHA512 5e3ab46216d567583558a6945127d0d8d758475636deb0733bae25fc869d842f05e996f06aa4a7dc6fd067f7e38afdc6e328cc8019735819d2a1cebc50ca165d
 DIST yarl-1.6.3.tar.gz 176823 BLAKE2B 58d36c6d18ef661cb08074153081f541fc98968107d71e7b501297f45f38de092804bba2ae89ddcf0da79b5d4fca62292a4c460bc9dff9d723d3958bc64ff84b SHA512 4c76b94198b8e334f4b4e71d92b0fe23f752d35e0c29bc68df99648b3f48fbb6e3dd8d7339138544e5dc8fbf64c15cb61678052670ac47edc5be958df819d42e
diff --git a/dev-python/yarl/yarl-1.6.2.ebuild b/dev-python/yarl/yarl-1.6.2.ebuild
deleted file mode 100644
index 0a85d855499d..000000000000
--- a/dev-python/yarl/yarl-1.6.2.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,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-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"
-
-RDEPEND="
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.2-test-without-coverage.patch
-)
diff --git a/dev-python/yarl/yarl-1.6.3.ebuild b/dev-python/yarl/yarl-1.6.3.ebuild
index 7a16b320d1e6..264065d81694 100644
--- a/dev-python/yarl/yarl-1.6.3.ebuild
+++ b/dev-python/yarl/yarl-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 30e0c3bfd214..e204e2e97f6c 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,3 +1,4 @@
 DIST python-zeroconf-0.28.7.gh.tar.gz 60821 BLAKE2B e8c99505d1b149319552c808ee17bd3cd37a016c094d5f273f5d3545670ecf6f9cff58178293816e9cd671cf9e342b0a99641d6b9b3d32626dac4e72d983380e SHA512 8cc5c9b2e964c170c2aa53a3c07f2cd634cb113737fdf2e7a924b0b1c5ffb7c2d1e97b589cce36a4216f427e0e64dfba373f9f96b6117e835a9aa68a911edea0
+DIST python-zeroconf-0.28.8.gh.tar.gz 62107 BLAKE2B 94b910be9f95f8b50bfcd5fca102663713234d40a0cf90c5b94b2ab4e85ffd7363747a0fee2f7a72a3bfb74faa1cab703dfb8bfe3cef80a0495efe2c81d0c2af SHA512 ba599fdd44ecdf3da71ee2a155a47e6cf91c8f4fe3efac428f6e99feda052019423a8a3e775d6cc4624697fbfcbe207829a41ad76105082fe62e81eead2f7a34
 DIST zeroconf-0.24.4.tar.gz 51866 BLAKE2B dd71bda4b0759c61a3e5895e766dff6516ea81ca0c8c9f5a95a8093de8a3a9b15722b99a6af0092b02c1b292bcdb11c02c9f165003b56ca8a793f4a4ca8fd891 SHA512 71678521b05016a7404005a06c8109f861cc8bfe2b3375ac6f1da8f63771271a3d9a095a8db6ccea2e062c5cc28b750a50fbe69218de72646b13a5f03359ea17
 DIST zeroconf-0.28.6.tar.gz 61487 BLAKE2B 2ded05d0e63d9f4918da925c179ee198dac68cf7a51d8f63beaaa697b04d297c7e892c97b1cedd51f9ab4af23e79e50bd3d85eb1af804c0fc0c67461501a508e SHA512 405786a25531efc42acf967838e74b67960b7ecdbee5db0633a56ba3e1774b9bd71fac58bcf29ab57ef6328560ee0f0f8cfa126ea42637ff53fb18c479a92f62
diff --git a/dev-python/zeroconf/zeroconf-0.28.8.ebuild b/dev-python/zeroconf/zeroconf-0.28.8.ebuild
new file mode 100644
index 000000000000..73f10df096e5
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.28.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# broken in network-sandbox
+	sed -e 's:test_launch_and_close:_&:' \
+		-e 's:test_integration_with_listener_ipv6:_&:' \
+		-i zeroconf/test.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/zict/Manifest b/dev-python/zict/Manifest
deleted file mode 100644
index 0d839674f031..000000000000
--- a/dev-python/zict/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zict-0.1.4.tar.gz 11335 BLAKE2B 30a70f04328762687ea9e6805e540469c26a85898278f2d83e1004d2663cd728a03df68e4900cf22b9d3b3ec6efc44a0fae3e5e0ff631a8bb8cc1d8ac510b8ee SHA512 3381c7fd64a99145f80800772dde381ae16225209aa9300f9d1a2c36b5ac1c4281d4068202e607985666ad44cce7d18317d4d8ca4d3ea4f9a227d4f4180e015c
diff --git a/dev-python/zict/metadata.xml b/dev-python/zict/metadata.xml
deleted file mode 100644
index b3cab6d429a6..000000000000
--- a/dev-python/zict/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">zict</remote-id>
-    <remote-id type="github">dask/zict</remote-id>    
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/zope-event/zope-event-4.5.0-r1.ebuild b/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
index 77a0eb2a54c1..da5583467a20 100644
--- a/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
+++ b/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index fbe8f5ad8b34..53878e77b869 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,2 +1 @@
-DIST zope.interface-5.1.2.tar.gz 228946 BLAKE2B 20740fdf2c0298dc852b7c1ca9acdd125fe355dc2032e4ad990af67bc06e505e744c930420bb0c82b2b9c765f642c15b0a398c40dda637eabba7e237f8e7913e SHA512 c0efd82d1b2f3bb6c71d89a74ccbef60955c74012fe2b87c752198c02374b3e5e113679451f2239474dbed0cbebb82b3fdefc3524d00a6f3896a16505847e519
 DIST zope.interface-5.2.0.tar.gz 227058 BLAKE2B d5afcaf56d77431436bc6f2ccf566e835c0908f7037ecd2a93e2b2681c0588b2baeacb0ec50207e59e67f7c4ac3cc76bca657330b48991f22835637985b85ccd SHA512 64688b8a823d63fc78720ee15d59cc54c07a700dc45e46336cb23cd1a0a3eb998284a4d954d3fa08c7f26b35583c0284fb2fcd18f84f3133ce93f7c3ade0a988
diff --git a/dev-python/zope-interface/zope-interface-5.1.2.ebuild b/dev-python/zope-interface/zope-interface-5.1.2.ebuild
deleted file mode 100644
index 78da75b24343..000000000000
--- a/dev-python/zope-interface/zope-interface-5.1.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pkg_resources namespace
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/5.1.0-drop-coverage.patch
-)
-
-distutils_enable_tests setup.py
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-interface/zope-interface-5.2.0.ebuild b/dev-python/zope-interface/zope-interface-5.2.0.ebuild
index b9b3af8828c2..edd50ff0a747 100644
--- a/dev-python/zope-interface/zope-interface-5.2.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/zope-testing/Manifest b/dev-python/zope-testing/Manifest
index 682692fd1bba..177d213024f4 100644
--- a/dev-python/zope-testing/Manifest
+++ b/dev-python/zope-testing/Manifest
@@ -1 +1,3 @@
 DIST zope.testing-4.7.tar.gz 63474 BLAKE2B dc825849c288b9f8ab9e4edfe670e09aa49f28c64047da8e0fb36cbfa6cf24d70cf6a49ea8a51ca1831b152f3ffa4b0c62cde29750036f13c9f754df2bb80da2 SHA512 cdf87f95196880a0f55c740f6340286bb29e96e9273d0c645bbb50def54a0645cce22d971adba3f15ff57b1021a72749219af83abc4e8fa775fb982d8164791d
+DIST zope.testing-4.8.tar.gz 63626 BLAKE2B 1e6910f3e6d0cbee8ea08f4af2c9ae8708183779749e02d9fe71b5726dfd6c0d94a2fca12a8b150044c29a75edf2cbd0783f83b735eecf061488b2e642ad4db9 SHA512 5f89a8babaa94d46d67c29f1f10b1b8dd4196093f6aea66668d93a5256539cc1bbf6ba689c592031df62e300db9cd1fedf9f38490c73355fb415a02e351bb92f
+DIST zope.testing-4.9.tar.gz 62294 BLAKE2B 34b2fc10e7220d88451b655d0e43f513d004779c496c824fa3e58b17c883a401f4707d5dbe7a547f1f97fe7db73b25cdf16997f2733b832ceabc37f1d5265397 SHA512 04b660aa93e120ae7e57bf637d99302d26912800ea3995a24c6d252ee4bd8e06fd8d4a24d980f591846d9bca93523373a92528ef492ff4d6990887ab6cf527d0
diff --git a/dev-python/zope-testing/zope-testing-4.7-r2.ebuild b/dev-python/zope-testing/zope-testing-4.7-r2.ebuild
index 507c4808b307..0fffd83a4e4d 100644
--- a/dev-python/zope-testing/zope-testing-4.7-r2.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/zope-testing/zope-testing-4.8.ebuild b/dev-python/zope-testing/zope-testing-4.8.ebuild
new file mode 100644
index 000000000000..da716aadb448
--- /dev/null
+++ b/dev-python/zope-testing/zope-testing-4.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 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,9,10} pypy3 )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope testing helpers"
+HOMEPAGE="https://pypi.org/project/zope.testing/ https://github.com/zopefoundation/zope.testing"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-testing/zope-testing-4.9.ebuild b/dev-python/zope-testing/zope-testing-4.9.ebuild
new file mode 100644
index 000000000000..da716aadb448
--- /dev/null
+++ b/dev-python/zope-testing/zope-testing-4.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 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,9,10} pypy3 )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope testing helpers"
+HOMEPAGE="https://pypi.org/project/zope.testing/ https://github.com/zopefoundation/zope.testing"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index 5588bf0ef9b2..7f5fdab8093e 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,3 +1,4 @@
 DIST zstandard-0.14.0.tar.gz 676761 BLAKE2B f90fcee6571f89eb5964ba50c722be8f3b846a0aaa6f79bd41389131ce332a4c6f7ec3d2eabd16268a42d211c7c02c2f7379019ef44272eb23cc74a20e5e9b3d SHA512 57c62eb7dedde2a2178f79a5658b87b5c5f176b282311273953003824272afa03e126a79b57fc8b75e9e15585d44d6b9931318a8ea5e7c75ec0feebbd7eb6cf0
 DIST zstandard-0.14.1.tar.gz 676849 BLAKE2B ad2a89371301e64428de90adf8770ebb7b43b06d720f5e0e9b490dc8771c55a974625105128c3a8052d68230d2670a802adfbf64708729440fdf624ca8d4fccb SHA512 e49f294816f0c7da35914363dbbdfcc4d432f7fa8367192e07a5d0c093ec8af76966fd0a95b4e8316091f056a8027c383ca73cc9ed506b29e2f9a31bc9ad3379
-DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
+DIST zstandard-0.15.0.tar.gz 990208 BLAKE2B d31a4c3cec60b642ec8c3a85b9038d6b0153e2be25696591db1a8e8f45b44018e370eb10bc4a902df3da03048a26ad55b2358d3b9912b1802c61bb63ce920523 SHA512 2de5a2047b1a9a146160bfa1cc50adb0ae1ddf23ae346b22d49b04e38987f90dcbb1f15d75c486fb37bf7084de66ebe19d917a37515dedac462102543533c407
+DIST zstandard-0.15.1.tar.gz 992126 BLAKE2B 7f6e987402bb5ddada70b56660d6e9d4eb5cd17dfa0041323ba2ef75bdb5362e7bc4fc8415132079a929e34fefdb654860088356b38dc0546b7c4f7108f93252 SHA512 7aabe647fa8c9a696084da6544c27287fe7d57e3a0ce2594c061fd20136e147ded4ea3da3648f6ef93c49636edc1d04ca4f29561514fb13f1a5d0340cd51996b
diff --git a/dev-python/zstandard/zstandard-0.14.0-r1.ebuild b/dev-python/zstandard/zstandard-0.14.0-r1.ebuild
index 223705feeef0..c018e86e271b 100644
--- a/dev-python/zstandard/zstandard-0.14.0-r1.ebuild
+++ b/dev-python/zstandard/zstandard-0.14.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86 ~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 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/zstandard/zstandard-0.14.1.ebuild b/dev-python/zstandard/zstandard-0.14.1.ebuild
index 32772f5ec33b..b11d2a4fbfe9 100644
--- a/dev-python/zstandard/zstandard-0.14.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~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 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/zstandard/zstandard-0.15.0.ebuild b/dev-python/zstandard/zstandard-0.15.0.ebuild
new file mode 100644
index 000000000000..8978554ba889
--- /dev/null
+++ b/dev-python/zstandard/zstandard-0.15.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Zstandard Bindings for Python"
+HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+python_compile() {
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile
+}
diff --git a/dev-python/zstandard/zstandard-0.15.1.ebuild b/dev-python/zstandard/zstandard-0.15.1.ebuild
new file mode 100644
index 000000000000..6e20685073c5
--- /dev/null
+++ b/dev-python/zstandard/zstandard-0.15.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Zstandard Bindings for Python"
+HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]' 'python*')
+"
+BDEPEND="
+	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+python_compile() {
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile --system-zstd
+}
+
+python_install() {
+	distutils-r1_python_install --system-zstd
+}
diff --git a/dev-python/zstandard/zstandard-0.8.1-r1.ebuild b/dev-python/zstandard/zstandard-0.8.1-r1.ebuild
deleted file mode 100644
index bf5ab1236c94..000000000000
--- a/dev-python/zstandard/zstandard-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,20 +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,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Zstandard Bindings for Python"
-HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${RDEPEND}"
diff --git a/dev-python/zstd/zstd-1.4.5.1.ebuild b/dev-python/zstd/zstd-1.4.5.1.ebuild
index 0729fe6258f3..0738180b4e75 100644
--- a/dev-python/zstd/zstd-1.4.5.1.ebuild
+++ b/dev-python/zstd/zstd-1.4.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	app-arch/zstd