Updating liguros repo

author: Liguros - Gitlab CI/CD [feature/flatten] <gitlab@liguros.net> 2020-09-20 18:26:39 +0000
committer: Liguros - Gitlab CI/CD [feature/flatten] <gitlab@liguros.net> 2020-09-20 18:26:39 +0000
commit: 8dfa4160bd746ed1e0f70310531606e4a33484ea (patch)
tree: ceae711c5023203ed35799a8810d68f6b534fadc /dev-python
parent: 2ac6366d92f666627bfef883713e84f652192f4f (diff)
download: baldeagleos-repo-8dfa4160bd746ed1e0f70310531606e4a33484ea.tar.gz
baldeagleos-repo-8dfa4160bd746ed1e0f70310531606e4a33484ea.tar.xz
baldeagleos-repo-8dfa4160bd746ed1e0f70310531606e4a33484ea.zip
121 files changed, 276 insertions, 1785 deletions
diff --git a/dev-python/appdirs/appdirs-1.4.4.ebuild b/dev-python/appdirs/appdirs-1.4.4-r1.ebuild
index f5bba8115f74..900c347db577 100644
--- a/dev-python/appdirs/appdirs-1.4.4.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # note the patch below
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/atomicwrites/atomicwrites-1.4.0.ebuild b/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
index 724af3f94b07..29a978a1448f 100644
--- a/dev-python/atomicwrites/atomicwrites-1.4.0.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,13 +14,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/mock[${PYTHON_USEDEP}]
-		' -2)
-	)"
-
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/attrs/attrs-20.1.0.ebuild b/dev-python/attrs/attrs-20.1.0-r1.ebuild
index beb9d68298c0..44c0020b8be2 100644
--- a/dev-python/attrs/attrs-20.1.0.ebuild
+++ b/dev-python/attrs/attrs-20.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/attrs/attrs-20.2.0.ebuild b/dev-python/attrs/attrs-20.2.0-r1.ebuild
index f5011ba0d705..31b27447d649 100644
--- a/dev-python/attrs/attrs-20.2.0.ebuild
+++ b/dev-python/attrs/attrs-20.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports/backports-1.0.ebuild b/dev-python/backports/backports-1.0-r1.ebuild
index 4cff8f1b5a49..ec50397fa36a 100644
--- a/dev-python/backports/backports-1.0.ebuild
+++ b/dev-python/backports/backports-1.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/black/files/black-19.10_beta0-setuptools_scm.patch b/dev-python/black/files/black-19.10_beta0-setuptools_scm.patch
deleted file mode 100644
index 21f996480386..000000000000
--- a/dev-python/black/files/black-19.10_beta0-setuptools_scm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 614a8d6..66946b2 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,6 +1,7 @@
- # Copyright (C) 2018 Łukasz Langa
- from setuptools import setup
- import sys
-+import os
- 
- assert sys.version_info >= (3, 6, 0), "black requires Python 3.6+"
- from pathlib import Path  # noqa E402
-@@ -17,10 +18,7 @@ def get_long_description() -> str:
- 
- setup(
-     name="black",
--    use_scm_version={
--        "write_to": "_black_version.py",
--        "write_to_template": 'version = "{version}"\n',
--    },
-+    version=os.getenv("MY_PV"),
-     description="The uncompromising code formatter.",
-     long_description=get_long_description(),
-     long_description_content_type="text/markdown",
diff --git a/dev-python/cffi/cffi-1.14.0-r2.ebuild b/dev-python/cffi/cffi-1.14.0-r3.ebuild
index f924801d2a04..4a459635cd1e 100644
--- a/dev-python/cffi/cffi-1.14.0-r2.ebuild
+++ b/dev-python/cffi/cffi-1.14.0-r3.ebuild
@@ -6,7 +6,7 @@ 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_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/cheroot/files/cheroot-8.3.0-test-unixsocket.patch b/dev-python/cheroot/files/cheroot-8.3.0-test-unixsocket.patch
deleted file mode 100644
index 311489565301..000000000000
--- a/dev-python/cheroot/files/cheroot-8.3.0-test-unixsocket.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 6ead1efb37edfade4dda60e48d1af8fe89be3cdc Mon Sep 17 00:00:00 2001
-From: "Jason R. Coombs" <jaraco@jaraco.com>
-Date: Sun, 12 Apr 2020 16:28:00 -0400
-Subject: [PATCH] Remove client from peercreds tests. Fixes #276.
-
----
- cheroot/test/test_server.py | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/cheroot/test/test_server.py b/cheroot/test/test_server.py
-index 80728d66..6c4b53ee 100644
---- a/cheroot/test/test_server.py
-+++ b/cheroot/test/test_server.py
-@@ -23,7 +23,6 @@
-     ANY_INTERFACE_IPV4,
-     ANY_INTERFACE_IPV6,
-     EPHEMERAL_PORT,
--    get_server_client,
- )
- 
- 
-@@ -171,19 +170,19 @@ def send_payload(self, payload):
- 
- 
- @pytest.fixture
--def peercreds_enabled_server_and_client(http_server, unix_sock_file):
-+def peercreds_enabled_server(http_server, unix_sock_file):
-     """Construct a test server with ``peercreds_enabled``."""
-     httpserver = http_server.send(unix_sock_file)
-     httpserver.gateway = _TestGateway
-     httpserver.peercreds_enabled = True
--    return httpserver, get_server_client(httpserver)
-+    return httpserver
- 
- 
- @unix_only_sock_test
- @non_macos_sock_test
--def test_peercreds_unix_sock(peercreds_enabled_server_and_client):
-+def test_peercreds_unix_sock(peercreds_enabled_server):
-     """Check that ``PEERCRED`` lookup works when enabled."""
--    httpserver, testclient = peercreds_enabled_server_and_client
-+    httpserver = peercreds_enabled_server
-     bind_addr = httpserver.bind_addr
- 
-     if isinstance(bind_addr, six.binary_type):
-@@ -212,9 +211,9 @@ def test_peercreds_unix_sock(peercreds_enabled_server_and_client):
- )
- @unix_only_sock_test
- @non_macos_sock_test
--def test_peercreds_unix_sock_with_lookup(peercreds_enabled_server_and_client):
-+def test_peercreds_unix_sock_with_lookup(peercreds_enabled_server):
-     """Check that ``PEERCRED`` resolution works when enabled."""
--    httpserver, testclient = peercreds_enabled_server_and_client
-+    httpserver = peercreds_enabled_server
-     httpserver.peercreds_resolve_enabled = True
- 
-     bind_addr = httpserver.bind_addr
diff --git a/dev-python/clang-python/clang-python-10.0.1.ebuild b/dev-python/clang-python/clang-python-10.0.1.ebuild
index 918e896e3ca1..28433f3d495e 100644
--- a/dev-python/clang-python/clang-python-10.0.1.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.1.ebuild
@@ -13,7 +13,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/configclass/configclass-0.2.0.ebuild b/dev-python/configclass/configclass-0.2.0.ebuild
index 0084a57805fc..fc1f88dafdbb 100644
--- a/dev-python/configclass/configclass-0.2.0.ebuild
+++ b/dev-python/configclass/configclass-0.2.0.ebuild
@@ -2,20 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
 
 DESCRIPTION="A Python to class to hold configuration values"
 HOMEPAGE="https://github.com/schettino72/configclass/"
-SRC_URI="
-	https://github.com/schettino72/configclass/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
+SRC_URI="https://github.com/schettino72/configclass/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND=">=dev-python/mergedict-0.2.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/contextlib2/contextlib2-0.6.0_p1.ebuild b/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
index ea5baeaf78d9..170c469377bb 100644
--- a/dev-python/contextlib2/contextlib2-0.6.0_p1.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cryptography/cryptography-3.0.ebuild b/dev-python/cryptography/cryptography-3.0-r1.ebuild
index 3f300b10c9e2..2616d9f2cdc5 100644
--- a/dev-python/cryptography/cryptography-3.0.ebuild
+++ b/dev-python/cryptography/cryptography-3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/cryptography/cryptography-3.1.ebuild b/dev-python/cryptography/cryptography-3.1-r1.ebuild
index 735c7aaa5129..9545e87deb78 100644
--- a/dev-python/cryptography/cryptography-3.1.ebuild
+++ b/dev-python/cryptography/cryptography-3.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
@@ -31,10 +31,6 @@ RDEPEND="
 	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
 	>=dev-python/six-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-1.8:=[${PYTHON_USEDEP}]
 	' 'python*')
 	"
diff --git a/dev-python/distlib/distlib-0.3.1.ebuild b/dev-python/distlib/distlib-0.3.1-r1.ebuild
index 32a3e1aa9b05..3ee25a006c7c 100644
--- a/dev-python/distlib/distlib-0.3.1.ebuild
+++ b/dev-python/distlib/distlib-0.3.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 401b4853b78c..7f0c4dc3a6df 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,2 +1,3 @@
 DIST dulwich-0.19.15.tar.gz 369491 BLAKE2B ffaabbd68ee228e771b8a56c9a5b70498e49a4547f3f0ff87225ca4ee0a222fca5cd75a36293fb0d111615f4fe9550acd2825732a178f67d9f6b538abf9fc37f SHA512 ae56cf4748ea5f9d275f2d1456bf9fce77859ad2eeba6b7d8f34283e212404ba385f377f4fb86b88dc40982649ec8cfb12ea407dd25ada7cb2b0e862568ac7da
 DIST dulwich-0.20.5.tar.gz 384166 BLAKE2B f11ef1467a7f850666a850c42871b2bb798cdad54b4ad5a7d6fef8171cb5378982537574f9d2c783e2c9e7357624eec4c617c0b014d789d9f40f5bdfd56d8b39 SHA512 88c546fdc6cb4fbde1ebab5160e1f226259d85c934bee456c8a93b14f4c292550e685696fd25c27635f3342f82b0c67572059fb90e3e9b339aa0d11b9e010c25
+DIST dulwich-0.20.6.tar.gz 388660 BLAKE2B 1a193d03e0f21a9fdd125617823742b87e9bea74c73734da10eb79f1ecbec0263cb90224f78413c724db8998f4d06ff6c448e7a6d50ce760ba1545f3321b95d8 SHA512 2f11ce9a1c716fb4242f1f93fce92f756bd93ed8f0951fc2e6b3fb18b0a495b0f372966149fca587efcafc0eaf00e9fbfcfd957442a96cc2004eb66cb7f0773e
diff --git a/dev-python/dulwich/dulwich-0.20.6.ebuild b/dev-python/dulwich/dulwich-0.20.6.ebuild
new file mode 100644
index 000000000000..28c16b903611
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.20.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="https://github.com/jelmer/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 ~x86-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/extras/extras-1.0.0.ebuild b/dev-python/extras/extras-1.0.0-r1.ebuild
index 65253788e142..3e660fe7f105 100644
--- a/dev-python/extras/extras-1.0.0.ebuild
+++ b/dev-python/extras/extras-1.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/filelock/filelock-3.0.12.ebuild b/dev-python/filelock/filelock-3.0.12-r1.ebuild
index 397134fb4b36..ffaedb24e9d2 100644
--- a/dev-python/filelock/filelock-3.0.12.ebuild
+++ b/dev-python/filelock/filelock-3.0.12-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 inherit distutils-r1
 
 MY_P=py-filelock-${PV}
diff --git a/dev-python/fixtures/fixtures-3.0.0.ebuild b/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
index 9136f3851add..2d01c09322f3 100644
--- a/dev-python/fixtures/fixtures-3.0.0.ebuild
+++ b/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flaky/flaky-3.7.0.ebuild b/dev-python/flaky/flaky-3.7.0-r1.ebuild
index 3f9b7395c05b..212fd9ad1899 100644
--- a/dev-python/flaky/flaky-3.7.0.ebuild
+++ b/dev-python/flaky/flaky-3.7.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild b/dev-python/funcsigs/funcsigs-1.0.2-r2.ebuild
index feeda9f188df..c8faaddd5c57 100644
--- a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
+++ b/dev-python/funcsigs/funcsigs-1.0.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/future/future-0.18.2.ebuild b/dev-python/future/future-0.18.2-r1.ebuild
index bb4b07ca1f71..5194316e7edb 100644
--- a/dev-python/future/future-0.18.2.ebuild
+++ b/dev-python/future/future-0.18.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/genty/genty-1.3.2.ebuild b/dev-python/genty/genty-1.3.2-r1.ebuild
index b090cbcef1ff..05387efa6906 100644
--- a/dev-python/genty/genty-1.3.2.ebuild
+++ b/dev-python/genty/genty-1.3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 11855509c0ae..e715741c083f 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,4 +1,3 @@
-DIST hypothesis-python-4.57.1.tar.gz 9005030 BLAKE2B 3d318896cbe2d24fa6847e764a109791d3acf3821852f8e170991b0be5b069f166e16bdacf7a82fbe49bd9db5188315cdec7cdb4592647571233949ec5732991 SHA512 28622ce8a1d89d09df65f3fbf7e92a1ad98dac140ab646fe11fcb15e6aa9a9672eb51d459f984384d92b819f902de911b06cec2542582d529dd556d2f99ed952
 DIST hypothesis-python-5.24.4.tar.gz 9054743 BLAKE2B 5c64c86ed58d8f0e4a07390b1b1b5e405878b9632bf14233e0515ad9d98ec6ddcc57bf39be6b61f53739d34e393b3af64c0d362880019d29a649a9523a0204e3 SHA512 147f4fa47b54bf3ec4dfcebf2a6c98cee26ea6780244ef99e181bada65978375ca7731ed05cb98f1b92f7a44a357faae374d97d489ec6e2318ff94e526cd9a40
 DIST hypothesis-python-5.29.4.tar.gz 9071060 BLAKE2B 0668f3c7859fae7024c15f693b1f56ce8d02d6f3b8187d24b2d84e38e7bdb73c0824d2b02cfecc6b40bdfbbb1c91c0aa83d40848c499a97ab7e9223aaa6c78d4 SHA512 9da4b487fd3c56540a20e2fbff635704f0720f422d8a398d0accd24a1fb9517476b0d29135b9113a96e8dc98fcfc31cc53215ad82cb727be54e4e77b44d4c8e4
 DIST hypothesis-python-5.35.3.tar.gz 9084707 BLAKE2B ff0638194067a1c52a0297254be572ba66d67afa49c1f2fbcc42bff694ab4fe545d408d9144118314a6decfdffdbe950e2b72e89b689ae99b82ad3d3321e72fd SHA512 d862cba17444b36fa05877419495b5e49e8686980e0203da388e2dc4e528ace928f0bcb244afc8512f97bf466f2e5a2a421a2c873053849af61de71421d5c61a
diff --git a/dev-python/hypothesis/hypothesis-4.57.1.ebuild b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
deleted file mode 100644
index e331cbc4872e..000000000000
--- a/dev-python/hypothesis/hypothesis-4.57.1.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
-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"
-
-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}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-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
-	# broken on py3.9, the code is too awful to debug
-	rm tests/py3/test_lookup.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local pyver=$(python_is_python3 && echo 3 || echo 2)
-	pytest -vv tests/cover tests/pytest tests/py${pyver} ||
-		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/idna/idna-2.10.ebuild b/dev-python/idna/idna-2.10-r1.ebuild
index c5b4b02b0728..1f43bf07840c 100644
--- a/dev-python/idna/idna-2.10.ebuild
+++ b/dev-python/idna/idna-2.10-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.7.0-r1.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.7.0-r2.ebuild
index c21b85e694a4..7e3567eff09a 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.7.0-r1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.7.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -17,17 +17,12 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
 "
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
-		$(python_gen_cond_dep '
-			>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
-		' pypy3 python{2_7,3_{6,7,8}})
+		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
 		dev-python/packaging[${PYTHON_USEDEP}]
 		dev-python/pyfakefs[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/importlib_resources/importlib_resources-1.5.0-r1.ebuild b/dev-python/importlib_resources/importlib_resources-1.5.0-r2.ebuild
index 7d3c6411de94..5894ec98aaad 100644
--- a/dev-python/importlib_resources/importlib_resources-1.5.0-r1.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-1.5.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/importlib_resources/importlib_resources-3.0.0-r1.ebuild b/dev-python/importlib_resources/importlib_resources-3.0.0-r2.ebuild
index 2d8ee98afe8c..67f727b347eb 100644
--- a/dev-python/importlib_resources/importlib_resources-3.0.0-r1.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-3.0.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index b634e09480fa..36ee7fb3e271 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,2 +1 @@
-DIST inflect-3.0.2.tar.gz 71546 BLAKE2B 951eb818ba1645a9e426468811ad449378aa5a7341575ac2aff5e9d1e06237fe8e96fa64cd678665cd6c05e1dc5e477a65b261b9d8bd170be4fb923d5fb90e9c SHA512 5858548e947f742b91630fc584f568a2221057ada7cd4a55f39de1b52a82c97884d6a78c2f32e5995e354fd1c4eae4d5b3d30491ef57dd5187fd6baca93d2779
 DIST inflect-4.1.0.tar.gz 72200 BLAKE2B c15f6b0d5d93050283dfc4d691e9fdbc26bb2f71573d6b397834e87af62f3afb8f5cdb0448c531de37e84729c0c6ae0cf4ea7a7b081a9dd784f7c06b962d7def SHA512 9a2ba4777f01475390976f3ac28f046d39d1f86cfdafd161cc7c8d33526aca35d44e6598ccf2a0b68d3511a64b67ed0991b51c78bda8f279cd706fd29a3fa514
diff --git a/dev-python/inflect/inflect-3.0.2.ebuild b/dev-python/inflect/inflect-3.0.2.ebuild
deleted file mode 100644
index 8bcc2e1bb8f0..000000000000
--- a/dev-python/inflect/inflect-3.0.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
-
-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="amd64 arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# nose is still required by some test features
-# https://github.com/jazzband/inflect/issues/90
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/alabaster[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-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/iso8601/iso8601-0.1.12.ebuild b/dev-python/iso8601/iso8601-0.1.12-r1.ebuild
index 9ee33abd0a7b..f605c8ec01c9 100644
--- a/dev-python/iso8601/iso8601-0.1.12.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.12-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 83382769cd6d..b9df73dcccb2 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,2 +1 @@
-DIST jaraco.classes-2.0.tar.gz 9911 BLAKE2B aa5e5c90f16c9536239ed61e6dccbc426244c98a33a944de32239bd42a0a4944e5df3529cfd525e05cf276a4a4b028edcec734006b549053ac8817032f52b2ea SHA512 83c9a570f951ef6c3708243dce6397cfbfe963db5920550ac807878a69860b34831af5f277f956fd0b327d85462676fd6386a22d6d97c7616e01ca81d7ace694
 DIST jaraco.classes-3.1.0.tar.gz 11616 BLAKE2B 5b438f7582a9a93ca4fc97a71725c1fe3275e4bfb48f5e06b549f7ac8fb6900262165b1ad0638114d3a8d11c10f449b7930d4c2d66fa928665aaff820af88937 SHA512 697d892a01c4e8ad83f57e69dcd744f976cea67fa3efcd55b10eda02f6bf1916162c0fa952d0d711e62f62fdff62740ee55a93be9fc46ebd4ab22416092f0ff6
diff --git a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
deleted file mode 100644
index 41d4d64b6259..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Tests fail with pypy
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Classes used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.classes"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-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}':" 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() {
-	# Avoid ImportMismatchError, override pytest options to skip flake8
-	pytest -vv "${BUILD_DIR}"/lib --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-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 019029469e8f..aefb78ddb76d 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,2 +1 @@
-DIST jaraco.itertools-4.4.2.tar.gz 19431 BLAKE2B d3493380f9522d436d4d8dbcdf484e7fd4fa223e96fabde0d7f3803c395e56d0bd28f49b9a6bfec0b680fdff7f5d145c85530036157f7976ffa82fc4851e3105 SHA512 74db7a3c7595c7deaf2a0c9ba68e9b02d02ccbc6c65142de34a5339aac679c2d71f05b27e27632d265de4f78997e11d7dc43178bd0d64f3010e1568a5085812c
 DIST jaraco.itertools-5.0.0.tar.gz 19517 BLAKE2B b38bbb75daa53ce9390a51099b3ebad16696924c26c6674a7c5b9ae5e219db6560d1bae24b4c491d6e424b7fecea66dac2eab673d0cfa91fbdb3a4246b852944 SHA512 38ae2cbdd436b277e3d3c252fadeb5239e2d32b2291686b2a3dbaca69328392eb1db4318b2144954b17302e5b15b94ad89f1ea8a1b2e354deec7d4516bd7ec85
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild
deleted file mode 100644
index 7a184215b10d..000000000000
--- a/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.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
-
-# Tests fail with PyPy and PyPy 3
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Tools for working with iterables. Complements itertools and more_itertools"
-HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/inflect[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-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 3d2770628d9d..d0bd6c836512 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,2 +1 @@
-DIST jaraco.packaging-6.2.tar.gz 15408 BLAKE2B 21c63b4e400bdf8b4b79873e6a96c7576b91500624c942246a8f64fc06da22e90203832c3c3084803c6ee23af8f102bb23cb12276cd3bba13446815f4a71f0dc SHA512 f8496a9dccb29dbac24927b40bc29d472b8c6bdb939bfcacf70196130ba9c961747a8b75c63574352a8bfeb2a512eb849dfba3344e942f1338ea1538e0767f33
 DIST jaraco.packaging-8.1.0.tar.gz 15322 BLAKE2B c354bec458a319bd9df0667c155203efa5c3de2d95218d0dd3a5878011d2d8fef694a490a2bac0035bff8daa18d1a3447c2c8dab7c0bd7bb09b62969f91d4709 SHA512 99996765cb047f2f0416d6afc4ff6ee0d84d03da0e07c7a7121518fbaf668f587c044f567c1d66a455372897ec1634ba5ee490552ac92064ca072e20b8f60a3b
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild
deleted file mode 100644
index 6f25f07228bc..000000000000
--- a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Tools to supplement packaging Python releases"
-HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
-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 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	">=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() {
-	# 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" \
-		|| 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/jinja/jinja-2.11.2.ebuild b/dev-python/jinja/jinja-2.11.2-r1.ebuild
index eb45f55daecc..3a8104602252 100644
--- a/dev-python/jinja/jinja-2.11.2.ebuild
+++ b/dev-python/jinja/jinja-2.11.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/linecache2/linecache2-1.0.0.ebuild b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
index f06c2dc6b276..c9c068e5fc0a 100644
--- a/dev-python/linecache2/linecache2-1.0.0.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/lit/lit-10.0.1.ebuild b/dev-python/lit/lit-10.0.1.ebuild
index 2dea7c85f020..bf0edc488ee5 100644
--- a/dev-python/lit/lit-10.0.1.ebuild
+++ b/dev-python/lit/lit-10.0.1.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lxml/files/lxml-4.5.1-py39.patch b/dev-python/lxml/files/lxml-4.5.1-py39.patch
deleted file mode 100644
index 3032e5379272..000000000000
--- a/dev-python/lxml/files/lxml-4.5.1-py39.patch
+++ /dev/null
@@ -1,620 +0,0 @@
-From e5c5cd22d918cd3b196e109a7829dad02d9ef42e Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml@behnel.de>
-Date: Tue, 26 May 2020 11:20:18 +0200
-Subject: [PATCH 1/2] Move some ElementTree compatibility tests over to the
- etree-only tests since the features were removed in Py3.9.
-
----
- src/lxml/tests/test_elementtree.py | 254 +----------------------------
- src/lxml/tests/test_etree.py       | 246 ++++++++++++++++++++++++++++
- 2 files changed, 252 insertions(+), 248 deletions(-)
-
-diff --git a/src/lxml/tests/test_elementtree.py b/src/lxml/tests/test_elementtree.py
-index 78d8964d..ec765ee0 100644
---- a/src/lxml/tests/test_elementtree.py
-+++ b/src/lxml/tests/test_elementtree.py
-@@ -130,7 +130,8 @@ class _ETreeTestCaseBase(HelperTestCase):
-         check_method(element.extend)
-         check_method(element.insert)
-         check_method(element.remove)
--        check_method(element.getchildren)
-+        # Removed in Py3.9
-+        #check_method(element.getchildren)
-         check_method(element.find)
-         check_method(element.iterfind)
-         check_method(element.findall)
-@@ -142,7 +143,8 @@ class _ETreeTestCaseBase(HelperTestCase):
-         check_method(element.items)
-         check_method(element.iter)
-         check_method(element.itertext)
--        check_method(element.getiterator)
-+        # Removed in Py3.9
-+        #check_method(element.getiterator)
- 
-         # These methods return an iterable. See bug 6472.
- 
-@@ -1933,28 +1935,6 @@ class _ETreeTestCaseBase(HelperTestCase):
-             a.remove(el)
-         self.assertLess(len(a), 3)
- 
--    def test_getchildren(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        c = SubElement(a, 'c')
--        d = SubElement(b, 'd')
--        e = SubElement(c, 'e')
--        self.assertXML(
--            _bytes('<a><b><d></d></b><c><e></e></c></a>'),
--            a)
--        self.assertEqual(
--            [b, c],
--            a.getchildren())
--        self.assertEqual(
--            [d],
--            b.getchildren())
--        self.assertEqual(
--            [],
--            d.getchildren())
--
-     def test_makeelement(self):
-         Element = self.etree.Element
- 
-@@ -2010,184 +1990,6 @@ class _ETreeTestCaseBase(HelperTestCase):
-             [None] * 5,
-             [el.tail for el in a.iter()])
- 
--    def test_getiterator(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        c = SubElement(a, 'c')
--        d = SubElement(b, 'd')
--        e = SubElement(c, 'e')
--
--        self.assertEqual(
--            [a, b, d, c, e],
--            list(a.getiterator()))
--        self.assertEqual(
--            [d],
--            list(d.getiterator()))
--
--    def test_getiterator_empty(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        c = SubElement(a, 'c')
--        d = SubElement(b, 'd')
--        e = SubElement(c, 'e')
--
--        self.assertEqual(
--            [],
--            list(a.getiterator('none')))
--        self.assertEqual(
--            [],
--            list(e.getiterator('none')))
--        self.assertEqual(
--            [e],
--            list(e.getiterator()))
--
--    def test_getiterator_filter(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        c = SubElement(a, 'c')
--        d = SubElement(b, 'd')
--        e = SubElement(c, 'e')
--
--        self.assertEqual(
--            [a],
--            list(a.getiterator('a')))
--        a2 = SubElement(e, 'a')
--        self.assertEqual(
--            [a, a2],
--            list(a.getiterator('a')))
--        self.assertEqual(
--            [a2],
--            list(c.getiterator('a')))
--
--    def test_getiterator_filter_all(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        c = SubElement(a, 'c')
--        d = SubElement(b, 'd')
--        e = SubElement(c, 'e')
--
--        self.assertEqual(
--            [a, b, d, c, e],
--            list(a.getiterator('*')))
--
--    def test_getiterator_filter_comment(self):
--        Element = self.etree.Element
--        Comment = self.etree.Comment
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        comment_b = Comment("TEST-b")
--        b.append(comment_b)
--
--        self.assertEqual(
--            [comment_b],
--            list(a.getiterator(Comment)))
--
--        comment_a = Comment("TEST-a")
--        a.append(comment_a)
--
--        self.assertEqual(
--            [comment_b, comment_a],
--            list(a.getiterator(Comment)))
--
--        self.assertEqual(
--            [comment_b],
--            list(b.getiterator(Comment)))
--
--    def test_getiterator_filter_pi(self):
--        Element = self.etree.Element
--        PI = self.etree.ProcessingInstruction
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        pi_b = PI("TEST-b")
--        b.append(pi_b)
--
--        self.assertEqual(
--            [pi_b],
--            list(a.getiterator(PI)))
--
--        pi_a = PI("TEST-a")
--        a.append(pi_a)
--
--        self.assertEqual(
--            [pi_b, pi_a],
--            list(a.getiterator(PI)))
--
--        self.assertEqual(
--            [pi_b],
--            list(b.getiterator(PI)))
--
--    def test_getiterator_with_text(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        a.text = 'a'
--        b = SubElement(a, 'b')
--        b.text = 'b'
--        b.tail = 'b1'
--        c = SubElement(a, 'c')
--        c.text = 'c'
--        c.tail = 'c1'
--        d = SubElement(b, 'd')
--        d.text = 'd'
--        d.tail = 'd1'
--        e = SubElement(c, 'e')
--        e.text = 'e'
--        e.tail = 'e1'
--
--        self.assertEqual(
--            [a, b, d, c, e],
--            list(a.getiterator()))
--        #self.assertEqual(
--        #    [d],
--        #    list(d.getiterator()))
--
--    def test_getiterator_filter_with_text(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        a.text = 'a'
--        b = SubElement(a, 'b')
--        b.text = 'b'
--        b.tail = 'b1'
--        c = SubElement(a, 'c')
--        c.text = 'c'
--        c.tail = 'c1'
--        d = SubElement(b, 'd')
--        d.text = 'd'
--        d.tail = 'd1'
--        e = SubElement(c, 'e')
--        e.text = 'e'
--        e.tail = 'e1'
--
--        self.assertEqual(
--            [a],
--            list(a.getiterator('a')))
--        a2 = SubElement(e, 'a')
--        self.assertEqual(
--            [a, a2],
--            list(a.getiterator('a')))   
--        self.assertEqual(
--            [a2],
--            list(e.getiterator('a')))
--
-     def test_getslice(self):
-         Element = self.etree.Element
-         SubElement = self.etree.SubElement
-@@ -2710,41 +2512,6 @@ class _ETreeTestCaseBase(HelperTestCase):
-         self.assertEqual('A2',
-                           a.tail)
- 
--    def test_elementtree_getiterator(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--        ElementTree = self.etree.ElementTree
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        c = SubElement(a, 'c')
--        d = SubElement(b, 'd')
--        e = SubElement(c, 'e')
--        t = ElementTree(element=a)
--
--        self.assertEqual(
--            [a, b, d, c, e],
--            list(t.getiterator()))
--
--    def test_elementtree_getiterator_filter(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--        ElementTree = self.etree.ElementTree
--        a = Element('a')
--        b = SubElement(a, 'b')
--        c = SubElement(a, 'c')
--        d = SubElement(b, 'd')
--        e = SubElement(c, 'e')
--        t = ElementTree(element=a)
--
--        self.assertEqual(
--            [a],
--            list(t.getiterator('a')))
--        a2 = SubElement(e, 'a')
--        self.assertEqual(
--            [a, a2],
--            list(t.getiterator('a')))
--
-     def test_ns_access(self):
-         ElementTree = self.etree.ElementTree
-         ns = 'http://xml.infrae.com/1'
-@@ -3180,17 +2947,6 @@ class _ETreeTestCaseBase(HelperTestCase):
-             'value',
-             root[0].get(attr_name))
- 
--    def test_iterparse_getiterator(self):
--        iterparse = self.etree.iterparse
--        f = BytesIO('<a><b><d/></b><c/></a>')
--
--        counts = []
--        for event, elem in iterparse(f):
--            counts.append(len(list(elem.getiterator())))
--        self.assertEqual(
--            [1,2,1,4],
--            counts)
--
-     def test_iterparse_move_elements(self):
-         iterparse = self.etree.iterparse
-         f = BytesIO('<a><b><d/></b><c/></a>')
-@@ -5119,6 +4875,8 @@ if ElementTree:
- 
-         @classmethod
-         def setUpClass(cls):
-+            if sys.version_info >= (3, 9):
-+                return
-             import warnings
-             # ElementTree warns about getiterator() in recent Pythons
-             warnings.filterwarnings(
-diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py
-index 3d8dee1c..56d38e75 100644
---- a/src/lxml/tests/test_etree.py
-+++ b/src/lxml/tests/test_etree.py
-@@ -674,6 +674,17 @@ class ETreeOnlyTestCase(HelperTestCase):
-         parse = self.etree.parse
-         self.assertRaises(TypeError, parse, 'notthere.xml', object())
- 
-+    def test_iterparse_getiterator(self):
-+        iterparse = self.etree.iterparse
-+        f = BytesIO('<a><b><d/></b><c/></a>')
-+
-+        counts = []
-+        for event, elem in iterparse(f):
-+            counts.append(len(list(elem.getiterator())))
-+        self.assertEqual(
-+            [1,2,1,4],
-+            counts)
-+
-     def test_iterparse_tree_comments(self):
-         # ET removes comments
-         iterparse = self.etree.iterparse
-@@ -3027,6 +3038,206 @@ class ETreeOnlyTestCase(HelperTestCase):
-         el = etree.HTML('<hha:page-description>aa</hha:page-description>').find('.//page-description')
-         self.assertEqual({'hha': None}, el.nsmap)
- 
-+    def test_getchildren(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        c = SubElement(a, 'c')
-+        d = SubElement(b, 'd')
-+        e = SubElement(c, 'e')
-+        self.assertXML(
-+            _bytes('<a><b><d></d></b><c><e></e></c></a>'),
-+            a)
-+        self.assertEqual(
-+            [b, c],
-+            a.getchildren())
-+        self.assertEqual(
-+            [d],
-+            b.getchildren())
-+        self.assertEqual(
-+            [],
-+            d.getchildren())
-+
-+    def test_getiterator(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        c = SubElement(a, 'c')
-+        d = SubElement(b, 'd')
-+        e = SubElement(c, 'e')
-+
-+        self.assertEqual(
-+            [a, b, d, c, e],
-+            list(a.getiterator()))
-+        self.assertEqual(
-+            [d],
-+            list(d.getiterator()))
-+
-+    def test_getiterator_empty(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        c = SubElement(a, 'c')
-+        d = SubElement(b, 'd')
-+        e = SubElement(c, 'e')
-+
-+        self.assertEqual(
-+            [],
-+            list(a.getiterator('none')))
-+        self.assertEqual(
-+            [],
-+            list(e.getiterator('none')))
-+        self.assertEqual(
-+            [e],
-+            list(e.getiterator()))
-+
-+    def test_getiterator_filter(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        c = SubElement(a, 'c')
-+        d = SubElement(b, 'd')
-+        e = SubElement(c, 'e')
-+
-+        self.assertEqual(
-+            [a],
-+            list(a.getiterator('a')))
-+        a2 = SubElement(e, 'a')
-+        self.assertEqual(
-+            [a, a2],
-+            list(a.getiterator('a')))
-+        self.assertEqual(
-+            [a2],
-+            list(c.getiterator('a')))
-+
-+    def test_getiterator_filter_all(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        c = SubElement(a, 'c')
-+        d = SubElement(b, 'd')
-+        e = SubElement(c, 'e')
-+
-+        self.assertEqual(
-+            [a, b, d, c, e],
-+            list(a.getiterator('*')))
-+
-+    def test_getiterator_filter_comment(self):
-+        Element = self.etree.Element
-+        Comment = self.etree.Comment
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        comment_b = Comment("TEST-b")
-+        b.append(comment_b)
-+
-+        self.assertEqual(
-+            [comment_b],
-+            list(a.getiterator(Comment)))
-+
-+        comment_a = Comment("TEST-a")
-+        a.append(comment_a)
-+
-+        self.assertEqual(
-+            [comment_b, comment_a],
-+            list(a.getiterator(Comment)))
-+
-+        self.assertEqual(
-+            [comment_b],
-+            list(b.getiterator(Comment)))
-+
-+    def test_getiterator_filter_pi(self):
-+        Element = self.etree.Element
-+        PI = self.etree.ProcessingInstruction
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        pi_b = PI("TEST-b")
-+        b.append(pi_b)
-+
-+        self.assertEqual(
-+            [pi_b],
-+            list(a.getiterator(PI)))
-+
-+        pi_a = PI("TEST-a")
-+        a.append(pi_a)
-+
-+        self.assertEqual(
-+            [pi_b, pi_a],
-+            list(a.getiterator(PI)))
-+
-+        self.assertEqual(
-+            [pi_b],
-+            list(b.getiterator(PI)))
-+
-+    def test_getiterator_with_text(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        a.text = 'a'
-+        b = SubElement(a, 'b')
-+        b.text = 'b'
-+        b.tail = 'b1'
-+        c = SubElement(a, 'c')
-+        c.text = 'c'
-+        c.tail = 'c1'
-+        d = SubElement(b, 'd')
-+        d.text = 'd'
-+        d.tail = 'd1'
-+        e = SubElement(c, 'e')
-+        e.text = 'e'
-+        e.tail = 'e1'
-+
-+        self.assertEqual(
-+            [a, b, d, c, e],
-+            list(a.getiterator()))
-+        #self.assertEqual(
-+        #    [d],
-+        #    list(d.getiterator()))
-+
-+    def test_getiterator_filter_with_text(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        a.text = 'a'
-+        b = SubElement(a, 'b')
-+        b.text = 'b'
-+        b.tail = 'b1'
-+        c = SubElement(a, 'c')
-+        c.text = 'c'
-+        c.tail = 'c1'
-+        d = SubElement(b, 'd')
-+        d.text = 'd'
-+        d.tail = 'd1'
-+        e = SubElement(c, 'e')
-+        e.text = 'e'
-+        e.tail = 'e1'
-+
-+        self.assertEqual(
-+            [a],
-+            list(a.getiterator('a')))
-+        a2 = SubElement(e, 'a')
-+        self.assertEqual(
-+            [a, a2],
-+            list(a.getiterator('a')))
-+        self.assertEqual(
-+            [a2],
-+            list(e.getiterator('a')))
-+
-     def test_getiterator_filter_multiple(self):
-         Element = self.etree.Element
-         SubElement = self.etree.SubElement
-@@ -3203,6 +3414,41 @@ class ETreeOnlyTestCase(HelperTestCase):
-             [a, b, c],
-             list(a.getiterator('*')))
- 
-+    def test_elementtree_getiterator(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+        ElementTree = self.etree.ElementTree
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        c = SubElement(a, 'c')
-+        d = SubElement(b, 'd')
-+        e = SubElement(c, 'e')
-+        t = ElementTree(element=a)
-+
-+        self.assertEqual(
-+            [a, b, d, c, e],
-+            list(t.getiterator()))
-+
-+    def test_elementtree_getiterator_filter(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+        ElementTree = self.etree.ElementTree
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        c = SubElement(a, 'c')
-+        d = SubElement(b, 'd')
-+        e = SubElement(c, 'e')
-+        t = ElementTree(element=a)
-+
-+        self.assertEqual(
-+            [a],
-+            list(t.getiterator('a')))
-+        a2 = SubElement(e, 'a')
-+        self.assertEqual(
-+            [a, a2],
-+            list(t.getiterator('a')))
-+
-     def test_elementtree_getelementpath(self):
-         a  = etree.Element("a")
-         b  = etree.SubElement(a, "b")
--- 
-2.26.2
-
-From 56ddb10e50eba7a6352e397f259d9497b44f658d Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml@behnel.de>
-Date: Tue, 26 May 2020 11:30:45 +0200
-Subject: [PATCH 2/2] Fix a test after moving it to a different test module.
-
----
- src/lxml/tests/test_etree.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py
-index 56d38e75..105c59b8 100644
---- a/src/lxml/tests/test_etree.py
-+++ b/src/lxml/tests/test_etree.py
-@@ -3047,9 +3047,9 @@ class ETreeOnlyTestCase(HelperTestCase):
-         c = SubElement(a, 'c')
-         d = SubElement(b, 'd')
-         e = SubElement(c, 'e')
--        self.assertXML(
-+        self.assertEqual(
-             _bytes('<a><b><d></d></b><c><e></e></c></a>'),
--            a)
-+            self.etree.tostring(a, method="c14n"))
-         self.assertEqual(
-             [b, c],
-             a.getchildren())
--- 
-2.26.2
-
diff --git a/dev-python/m2crypto/m2crypto-0.35.2.ebuild b/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
index 69fd7fe46394..43092efbc777 100644
--- a/dev-python/m2crypto/m2crypto-0.35.2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-python/m2crypto/m2crypto-0.36.0.ebuild b/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild
index e8a504b6184d..90e12aa559d8 100644
--- a/dev-python/m2crypto/m2crypto-0.36.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-python/markdown/markdown-2.6.11.ebuild b/dev-python/markdown/markdown-2.6.11.ebuild
index 27a7e09cf45e..05b5689c1066 100644
--- a/dev-python/markdown/markdown-2.6.11.ebuild
+++ b/dev-python/markdown/markdown-2.6.11.ebuild
@@ -18,18 +18,8 @@ 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"
-IUSE="doc test pygments"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-	)"
-# source cites pytidylib however from testruns it appears optional
-RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
+IUSE="doc"
+RESTRICT="test"
 
 S="${WORKDIR}/${P^}"
 
@@ -42,9 +32,3 @@ python_compile_all() {
 		find "${BUILD_DIR}"/docs -name '*.txt' -delete || die
 	fi
 }
-
-python_test() {
-	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}" || die
-	"${EPYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/markdown/markdown-3.1.1-r1.ebuild b/dev-python/markdown/markdown-3.1.1-r1.ebuild
index f2fab7a781dc..d46fd45e91ca 100644
--- a/dev-python/markdown/markdown-3.1.1-r1.ebuild
+++ b/dev-python/markdown/markdown-3.1.1-r1.ebuild
@@ -21,16 +21,10 @@ IUSE="doc"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DEPEND="test? (
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pytidylib[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}] )"
+RESTRICT="test"
 
 S="${WORKDIR}/${P^}"
 
-distutils_enable_tests pytest
-
 python_install_all() {
 	use doc && dodoc -r docs/
 
diff --git a/dev-python/markdown/metadata.xml b/dev-python/markdown/metadata.xml
index 56256d0e4a57..35f3da5cacec 100644
--- a/dev-python/markdown/metadata.xml
+++ b/dev-python/markdown/metadata.xml
@@ -6,9 +6,6 @@
     <name>Python</name>
   </maintainer>
   <stabilize-allarches/>
-  <use>
-    <flag name="pygments">Enable fancy pygments support</flag>
-  </use>
   <upstream>
     <remote-id type="pypi">Markdown</remote-id>
     <remote-id type="github">waylan/Python-Markdown</remote-id>
diff --git a/dev-python/markdown2/markdown2-2.3.9.ebuild b/dev-python/markdown2/markdown2-2.3.9.ebuild
index 9829871cf9fe..f573fa2e4c28 100644
--- a/dev-python/markdown2/markdown2-2.3.9.ebuild
+++ b/dev-python/markdown2/markdown2-2.3.9.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/trentm/python-markdown2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/markupsafe/markupsafe-1.1.1.ebuild b/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
index be305422ee25..c3d9dbb55114 100644
--- a/dev-python/markupsafe/markupsafe-1.1.1.ebuild
+++ b/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mergedict/mergedict-1.0.0.ebuild b/dev-python/mergedict/mergedict-1.0.0.ebuild
index 8266bed39d05..f10df506a170 100644
--- a/dev-python/mergedict/mergedict-1.0.0.ebuild
+++ b/dev-python/mergedict/mergedict-1.0.0.ebuild
@@ -14,9 +14,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
 
 distutils_enable_tests pytest
diff --git a/dev-python/mistune/mistune-0.8.4.ebuild b/dev-python/mistune/mistune-0.8.4-r1.ebuild
index ad6826282348..6d1b5fe9e8c2 100644
--- a/dev-python/mistune/mistune-0.8.4.ebuild
+++ b/dev-python/mistune/mistune-0.8.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mock/mock-3.0.5-r1.ebuild b/dev-python/mock/mock-3.0.5-r2.ebuild
index a701b2ec4862..e84ac5ff516a 100644
--- a/dev-python/mock/mock-3.0.5-r1.ebuild
+++ b/dev-python/mock/mock-3.0.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/more-itertools/more-itertools-5.0.0.ebuild b/dev-python/more-itertools/more-itertools-5.0.0-r1.ebuild
index 6195183ba4ee..9d53eed81eaf 100644
--- a/dev-python/more-itertools/more-itertools-5.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-5.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
index af47cf489a7c..2100c23bb29a 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-jaraco/namespace-jaraco-2.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-2-r1.ebuild
index 83a898fbd12d..83a898fbd12d 100644
--- a/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
+++ b/dev-python/namespace-jaraco/namespace-jaraco-2-r1.ebuild
diff --git a/dev-python/namespace-zope/namespace-zope-1.ebuild b/dev-python/namespace-zope/namespace-zope-1-r1.ebuild
index e43144fc9641..cab4cc294c15 100644
--- a/dev-python/namespace-zope/namespace-zope-1.ebuild
+++ b/dev-python/namespace-zope/namespace-zope-1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for zope"
diff --git a/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild b/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
index 7fb38cf003b9..e103d561cbc2 100644
--- a/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
+++ b/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
@@ -25,8 +25,8 @@ 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"
-IUSE="doc lapack test"
-RESTRICT="!test? ( test )"
+IUSE="doc lapack"
+RESTRICT="test"
 
 RDEPEND="
 	!<dev-python/numpy-1.17
@@ -41,9 +41,6 @@ BDEPEND="
 	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	lapack? ( virtual/pkgconfig )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
 "
 
 S="${WORKDIR}/${MY_PN}-${PV}"
@@ -138,18 +135,6 @@ 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 )
diff --git a/dev-python/packaging/packaging-20.4.ebuild b/dev-python/packaging/packaging-20.4-r1.ebuild
index d721969ac258..c5a80671c11a 100644
--- a/dev-python/packaging/packaging-20.4.ebuild
+++ b/dev-python/packaging/packaging-20.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pathlib2/pathlib2-2.3.5.ebuild b/dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild
index 5e29b6e9d235..3aaf80c7ff8a 100644
--- a/dev-python/pathlib2/pathlib2-2.3.5.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pbr/pbr-5.4.5.ebuild b/dev-python/pbr/pbr-5.4.5-r1.ebuild
index e86d2d520ceb..eaa1a9508717 100644
--- a/dev-python/pbr/pbr-5.4.5.ebuild
+++ b/dev-python/pbr/pbr-5.4.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -25,19 +25,17 @@ RESTRICT="!test? ( test )"
 # stestr is run as external tool
 BDEPEND="
 	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-			<dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			>=dev-python/stestr-2.1.0
-			dev-vcs/git
-		' -3)
+		>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		<dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.1.0
+		dev-vcs/git
 	)"
 PDEPEND=""
 
@@ -57,12 +55,6 @@ python_prepare_all() {
 }
 
 python_test() {
-	if ! python_is_python3; then
-		ewarn "Skipping tests on ${EPYTHON} to unblock circular deps."
-		ewarn "Please run tests manually."
-		return
-	fi
-
 	distutils_install_for_testing
 	local -x PATH=${TEST_DIR}/scripts:${PATH}
 
diff --git a/dev-python/pbr/pbr-5.5.0.ebuild b/dev-python/pbr/pbr-5.5.0-r1.ebuild
index 8657b28cdbdb..2525cef553b5 100644
--- a/dev-python/pbr/pbr-5.5.0.ebuild
+++ b/dev-python/pbr/pbr-5.5.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -24,19 +24,17 @@ RESTRICT="!test? ( test )"
 # stestr is run as external tool
 BDEPEND="
 	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}]
-			>=dev-python/stestr-2.1.0
-			dev-vcs/git
-		' -3)
+		>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.1.0
+		dev-vcs/git
 	)"
 PDEPEND=""
 
@@ -56,12 +54,6 @@ python_prepare_all() {
 }
 
 python_test() {
-	if ! python_is_python3; then
-		ewarn "Skipping tests on ${EPYTHON} to unblock circular deps."
-		ewarn "Please run tests manually."
-		return
-	fi
-
 	distutils_install_for_testing
 	local -x PATH=${TEST_DIR}/scripts:${PATH}
 
diff --git a/dev-python/pexpect/pexpect-4.8.0.ebuild b/dev-python/pexpect/pexpect-4.8.0-r1.ebuild
index c91ea1da59a3..f469de430306 100644
--- a/dev-python/pexpect/pexpect-4.8.0.ebuild
+++ b/dev-python/pexpect/pexpect-4.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pillow/pillow-6.2.2.ebuild b/dev-python/pillow/pillow-6.2.2.ebuild
index 061c4e3b8a33..716b1b5b09ab 100644
--- a/dev-python/pillow/pillow-6.2.2.ebuild
+++ b/dev-python/pillow/pillow-6.2.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
 PYTHON_REQ_USE='tk?,threads(+)'
 
-inherit distutils-r1 toolchain-funcs virtualx
+inherit distutils-r1 toolchain-funcs
 
 MY_PN=Pillow
 MY_P=${MY_PN}-${PV}
@@ -19,9 +19,8 @@ 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 )"
+IUSE="examples imagequant jpeg jpeg2k lcms tiff tk truetype webp zlib"
+RESTRICT="test"
 
 RDEPEND="
 	dev-python/olefile[${PYTHON_USEDEP}]
@@ -35,10 +34,6 @@ RDEPEND="
 	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 \
@@ -73,16 +68,6 @@ python_configure_all() {
 	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
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index 947f88620bd6..a3ce44c13b1b 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,2 +1 @@
-DIST pluggy-0.11.0.tar.gz 56897 BLAKE2B 2d40ca953fa0ead7516dd81007ef6f1f88b0ebe45512b031fda9ed69c953bca08109f157676ba2ed545ffb1f8f7bb18fa1b8532635d6fc929c62bf0b5de45128 SHA512 8808f5015fa6f33fcb07047c644706bf3acceed1e107dd617395e61aa9765a45e3a641e49c610ab817ebaa2c4f3b32a15bf347579206e979fe6b844ba2f684b5
 DIST pluggy-0.13.1.tar.gz 57962 BLAKE2B aa0a3eec06c988a727bc15511313f12a08bde65da55bcc5e7547a654e3ca8a34c12dfa72166b6a37b524972730f08454b6a0446e071d2710396e868ae3a77151 SHA512 eb747ff341cedacbd90eb20e22ad3d1ddf5588056f14d069f56331f4141a15b7eccaee23ea196d2f4906964ddb77a79b156bbf3ef8c8083e9952c55d13d55f3e
diff --git a/dev-python/pluggy/pluggy-0.11.0.ebuild b/dev-python/pluggy/pluggy-0.11.0.ebuild
deleted file mode 100644
index 43cc2f48464e..000000000000
--- a/dev-python/pluggy/pluggy-0.11.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=( python2_7 python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="plugin and hook calling mechanisms for python"
-HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/"
-SRC_URI="mirror://pypi/${P: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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" pytest -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pluggy/pluggy-0.13.1.ebuild b/dev-python/pluggy/pluggy-0.13.1-r1.ebuild
index 36cdd6961dc3..b7ecc607f966 100644
--- a/dev-python/pluggy/pluggy-0.13.1.ebuild
+++ b/dev-python/pluggy/pluggy-0.13.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pretend/pretend-1.0.9.ebuild b/dev-python/pretend/pretend-1.0.9-r1.ebuild
index 9106d22b2cc8..d7760d0005b6 100644
--- a/dev-python/pretend/pretend-1.0.9.ebuild
+++ b/dev-python/pretend/pretend-1.0.9-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/psycopg/psycopg-2.7.7.ebuild b/dev-python/psycopg/psycopg-2.7.7-r1.ebuild
index 074cb03de6ec..964b77d2a1d8 100644
--- a/dev-python/psycopg/psycopg-2.7.7.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/psycopg/psycopg-2.8.5.ebuild b/dev-python/psycopg/psycopg-2.8.5-r1.ebuild
index 7f568796c334..4e307f97042f 100644
--- a/dev-python/psycopg/psycopg-2.8.5.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/psycopg/psycopg-2.8.6.ebuild b/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
index fadc9f03ea1b..52e4c414b7d2 100644
--- a/dev-python/psycopg/psycopg-2.8.6.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/ptyprocess/ptyprocess-0.6.0.ebuild b/dev-python/ptyprocess/ptyprocess-0.6.0-r1.ebuild
index 64eecc5314c4..79ab778d34d1 100644
--- a/dev-python/ptyprocess/ptyprocess-0.6.0.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.6.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py/py-1.9.0.ebuild b/dev-python/py/py-1.9.0-r1.ebuild
index 7d8b11c62d30..f67919440e4f 100644
--- a/dev-python/py/py-1.9.0.ebuild
+++ b/dev-python/py/py-1.9.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
index 3375e004143d..130aa1079afe 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyasn1/pyasn1-0.4.8.ebuild b/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
index c98dd832abdf..b2c1ce94abe2 100644
--- a/dev-python/pyasn1/pyasn1-0.4.8.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycairo/pycairo-1.18.2.ebuild b/dev-python/pycairo/pycairo-1.18.2.ebuild
index 7698579d3626..2344fcf4ec0a 100644
--- a/dev-python/pycairo/pycairo-1.18.2.ebuild
+++ b/dev-python/pycairo/pycairo-1.18.2.ebuild
@@ -19,8 +19,10 @@ IUSE="examples"
 
 BDEPEND="
 	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/hypothesis[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		' -3)
 	)
 "
 RDEPEND="
@@ -34,6 +36,15 @@ distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
 distutils_enable_tests setup.py
 
+python_test() {
+	if ! python_is_python3; then
+		einfo "Skipping tests on Python 2 to unblock deps"
+		return
+	fi
+
+	esetup.py test
+}
+
 python_install() {
 	distutils-r1_python_install \
 		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
diff --git a/dev-python/pycurl/files/pycurl-7.43.0.5-multiple-ssl.patch b/dev-python/pycurl/files/pycurl-7.43.0.5-multiple-ssl.patch
deleted file mode 100644
index 035ad6f9ca36..000000000000
--- a/dev-python/pycurl/files/pycurl-7.43.0.5-multiple-ssl.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 290d762ea13a1d95affa0888c5450b33b00241e8 Mon Sep 17 00:00:00 2001
-From: Bo Anderson <mail@boanderson.me>
-Date: Tue, 21 Jul 2020 18:28:31 +0100
-Subject: [PATCH] Handle MultiSSL
-
-Upstream-Status: Accepted [https://github.com/pycurl/pycurl/pull/639]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/module.c | 41 ++++++++++++++++++++++++++++++++++++++++-
- src/pycurl.h | 11 +++++++++++
- 2 files changed, 51 insertions(+), 1 deletion(-)
-
-diff --git a/src/module.c b/src/module.c
-index 23387ec..dbc5b0c 100644
---- a/src/module.c
-+++ b/src/module.c
-@@ -322,12 +322,21 @@ initpycurl(void)
- {
-     PyObject *m, *d;
-     const curl_version_info_data *vi;
--    const char *libcurl_version, *runtime_ssl_lib;
-+    const char *libcurl_version;
-     size_t libcurl_version_len, pycurl_version_len;
-     PyObject *xio_module = NULL;
-     PyObject *collections_module = NULL;
-     PyObject *named_tuple = NULL;
-     PyObject *arglist = NULL;
-+#ifdef HAVE_CURL_GLOBAL_SSLSET
-+    const curl_ssl_backend **ssllist = NULL;
-+    CURLsslset sslset;
-+    int i, runtime_supported_backend_found = 0;
-+    char backends[200];
-+    size_t backends_len = 0;
-+#else
-+    const char *runtime_ssl_lib;
-+#endif
- 
-     assert(Curl_Type.tp_weaklistoffset > 0);
-     assert(CurlMulti_Type.tp_weaklistoffset > 0);
-@@ -346,6 +355,35 @@ initpycurl(void)
-     }
- 
-     /* Our compiled crypto locks should correspond to runtime ssl library. */
-+#ifdef HAVE_CURL_GLOBAL_SSLSET
-+    sslset = curl_global_sslset(-1, COMPILE_SSL_LIB, &ssllist);
-+    if (sslset != CURLSSLSET_OK) {
-+        if (sslset == CURLSSLSET_NO_BACKENDS) {
-+            strcpy(backends, "none");
-+        } else {
-+            for (i = 0; ssllist[i] != NULL; i++) {
-+                switch (ssllist[i]->id) {
-+                case CURLSSLBACKEND_OPENSSL:
-+                case CURLSSLBACKEND_GNUTLS:
-+                case CURLSSLBACKEND_NSS:
-+                case CURLSSLBACKEND_WOLFSSL:
-+                case CURLSSLBACKEND_MBEDTLS:
-+                    runtime_supported_backend_found = 1;
-+                    break;
-+                default:
-+                    break;
-+                }
-+                if (backends_len < sizeof(backends)) {
-+                    backends_len += snprintf(backends + backends_len, sizeof(backends) - backends_len, "%s%s", (i > 0) ? ", " : "", ssllist[i]->name);
-+                }
-+            }
-+        }
-+        if (runtime_supported_backend_found == COMPILE_SUPPORTED_SSL_BACKEND_FOUND) {
-+            PyErr_Format(PyExc_ImportError, "pycurl: libcurl link-time ssl backends (%s) do not include compile-time ssl backend (%s)", backends, COMPILE_SSL_LIB);
-+            goto error;
-+        }
-+    }
-+#else
-     if (vi->ssl_version == NULL) {
-         runtime_ssl_lib = "none/other";
-     } else if (!strncmp(vi->ssl_version, "OpenSSL/", 8) || !strncmp(vi->ssl_version, "LibreSSL/", 9) ||
-@@ -366,6 +404,7 @@ initpycurl(void)
-         PyErr_Format(PyExc_ImportError, "pycurl: libcurl link-time ssl backend (%s) is different from compile-time ssl backend (%s)", runtime_ssl_lib, COMPILE_SSL_LIB);
-         goto error;
-     }
-+#endif
- 
-     /* Initialize the type of the new type objects here; doing it here
-      * is required for portability to Windows without requiring C++. */
-diff --git a/src/pycurl.h b/src/pycurl.h
-index 02db495..a83c85b 100644
---- a/src/pycurl.h
-+++ b/src/pycurl.h
-@@ -154,6 +154,10 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
- #define HAVE_CURLINFO_HTTP_VERSION
- #endif
- 
-+#if LIBCURL_VERSION_NUM >= 0x073800 /* check for 7.56.0 or greater */
-+#define HAVE_CURL_GLOBAL_SSLSET
-+#endif
-+
- #undef UNUSED
- #define UNUSED(var)     ((void)&var)
- 
-@@ -165,6 +169,7 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
- #   include <openssl/ssl.h>
- #   include <openssl/err.h>
- #   define COMPILE_SSL_LIB "openssl"
-+#   define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
- # elif defined(HAVE_CURL_WOLFSSL)
- #   include <wolfssl/options.h>
- #   if defined(OPENSSL_EXTRA)
-@@ -187,6 +192,7 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
- #    endif
- #   endif
- #   define COMPILE_SSL_LIB "wolfssl"
-+#   define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
- # elif defined(HAVE_CURL_GNUTLS)
- #   include <gnutls/gnutls.h>
- #   if GNUTLS_VERSION_NUMBER <= 0x020b00
-@@ -195,13 +201,16 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
- #     include <gcrypt.h>
- #   endif
- #   define COMPILE_SSL_LIB "gnutls"
-+#   define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
- # elif defined(HAVE_CURL_NSS)
- #   define COMPILE_SSL_LIB "nss"
-+#   define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
- # elif defined(HAVE_CURL_MBEDTLS)
- #   include <mbedtls/ssl.h>
- #   define PYCURL_NEED_SSL_TSL
- #   define PYCURL_NEED_MBEDTLS_TSL
- #   define COMPILE_SSL_LIB "mbedtls"
-+#   define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
- # else
- #  ifdef _MSC_VER
-     /* sigh */
-@@ -218,9 +227,11 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
-    /* since we have no crypto callbacks for other ssl backends,
-     * no reason to require users match those */
- #  define COMPILE_SSL_LIB "none/other"
-+#  define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 0
- # endif /* HAVE_CURL_OPENSSL || HAVE_CURL_WOLFSSL || HAVE_CURL_GNUTLS || HAVE_CURL_NSS || HAVE_CURL_MBEDTLS */
- #else
- # define COMPILE_SSL_LIB "none/other"
-+# define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 0
- #endif /* HAVE_CURL_SSL */
- 
- #if defined(PYCURL_NEED_SSL_TSL)
--- 
-2.28.0
-
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 65199523223d..f150660f36f3 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,2 +1 @@
-DIST pyfakefs-3.7.2.tar.gz 180195 BLAKE2B f1e76b652fc67f630fb45798974dc22455e9e99509829fbcaa479f36887c90207d7b6f087e89c9e113bb44df8c4221dc4676129663740812a9426d84a1d47401 SHA512 33bdbf7e21f1135c0ee048943a4b7dffec96e018285e4ee2e6a1c6a7f9e595e27348c83af3803d80322e7fd12a59985a6bf6342aa6211ba95c74ffa20929fb5a
 DIST pyfakefs-4.1.0.tar.gz 185920 BLAKE2B ee61e5ecda697150374bef035054038aed29e23958c58a3b135aae8dae7b397a194586ef6fd3ae70db1d136572a23a876d7f2dacb7e5814c1bedc9bb4502c3fe SHA512 946e21e34643db2b84e53d14bd9758c8edaa9e5e40b827fd74b245f018e8084995f55256900bf795c23a5aae29f124d9fcb80caf08442f6292adb80ee59d79b4
diff --git a/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
deleted file mode 100644
index 2910c222ba69..000000000000
--- a/dev-python/pyfakefs/pyfakefs-3.7.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=( python2_7 python3_{5,6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 0024397c3a56..44a065c8251e 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,4 +1,3 @@
-DIST Pygments-2.5.2.tar.gz 20263984 BLAKE2B fab5d11458bcb3bd9a825026f119c0bde6f672b00704f3d5db24ce050b959f0c1a34544642fc1b5911f6ae12a9b595a2cbedadc791d6a3e8c83da1a1add60471 SHA512 d6715ca26cdb68d4c771bb530b2395805025c14c78d9099b033d3410ea239c41033fb611e43e39cbaa4ac38078a09324d8cfde42269129be0a096dcc13586859
 DIST Pygments-2.6.1.tar.gz 3303050 BLAKE2B 105f43301d2e7348937345519fe04817fa5baa5de4d0b9b0e9096d34612018bb992721df58a24008b009c0690054ac02c18c57b6b1a8a68039f9b4d20b5900a6 SHA512 0d793bb6eabe43645541347e44932ee50ccd4309f40e7a327422bcbe57d40a7cb8bbf2fb0911744ed6f316c6c08f4216462be88d79192a2ea004d6da51329932
 DIST Pygments-2.7.0.tar.gz 2358072 BLAKE2B a9c4753f62589a676300d366804aecc9349de2367b609919518f11be3ea40c3fb264d68c5da515cf80aaa42fb4e4dd9dd362d58945148a21c81a214c7e6c6b58 SHA512 b70714dd33cac725e0b32678971ab5902895c7d2fd8c9548f69110af32c82ba46a2d366dbbc9c4017e91c39120abe3e5d28e69893e8d92058f0bcbf579909db5
 DIST Pygments-2.7.1.tar.gz 2323072 BLAKE2B ee55bb47369caca78d180659c2f62af18c1b1c6bfd803148ed88254f33c7261bf8acd29d193be2ac9c04d022a1c0c14c0fe9ff3cfcf8a5dc1d4dec90d3f1ee43 SHA512 95d1109cd53092fafa2f1d5c21a135c426700fc92e39bb22a27f47e63d10bdcb9e52593cd282339a3b501430ededbccea4f8d5970ba1171204579b964a6771c8
diff --git a/dev-python/pygments/pygments-2.5.2.ebuild b/dev-python/pygments/pygments-2.5.2.ebuild
deleted file mode 100644
index 4695935999b0..000000000000
--- a/dev-python/pygments/pygments-2.5.2.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
-
-inherit distutils-r1 bash-completion-r1
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="https://pygments.org/ https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		virtual/ttf-fonts
-	)"
-
-distutils_enable_sphinx doc
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-	pytest -vv "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygobject/pygobject-3.34.0.ebuild b/dev-python/pygobject/pygobject-3.34.0.ebuild
index b756e4398359..74e55ee33725 100644
--- a/dev-python/pygobject/pygobject-3.34.0.ebuild
+++ b/dev-python/pygobject/pygobject-3.34.0.ebuild
@@ -27,11 +27,14 @@ RDEPEND="${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-libs/atk[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
+		$(python_gen_cond_dep '
+			dev-libs/atk[introspection]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			x11-libs/gdk-pixbuf:2[introspection,jpeg]
+			x11-libs/gtk+:3[introspection]
+			x11-libs/pango[introspection]
+		' -3)
+	)
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -59,6 +62,11 @@ src_test() {
 	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
 
 	testing() {
+		if ! python_is_python3; then
+			einfo "Skipping tests on Python 2 to unblock deps"
+			return
+		fi
+
 		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
 		meson_src_test || die "test failed for ${EPYTHON}"
 	}
diff --git a/dev-python/pygobject/pygobject-3.36.1.ebuild b/dev-python/pygobject/pygobject-3.36.1.ebuild
index 0ce2c4e42eb4..6d67db65b916 100644
--- a/dev-python/pygobject/pygobject-3.36.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.36.1.ebuild
@@ -27,11 +27,14 @@ RDEPEND="${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-libs/atk[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
+		$(python_gen_cond_dep '
+			dev-libs/atk[introspection]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			x11-libs/gdk-pixbuf:2[introspection,jpeg]
+			x11-libs/gtk+:3[introspection]
+			x11-libs/pango[introspection]
+		' -3)
+	)
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -59,6 +62,11 @@ src_test() {
 	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
 
 	testing() {
+		if ! python_is_python3; then
+			einfo "Skipping tests on Python 2 to unblock deps"
+			return
+		fi
+
 		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
 		meson_src_test || die "test failed for ${EPYTHON}"
 	}
diff --git a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
index 54f3d2909401..913a04a88480 100644
--- a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_PN}-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild
index 5c9a6266fa22..bfd1f2457d96 100644
--- a/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 1c5209be4a90..202adf56034d 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,3 +1,2 @@
-DIST pyrsistent-0.15.6.tar.gz 107424 BLAKE2B 432ce7223fee524cbcd65237171af6f0fa16d23dfcc65b7cb5bc8d19dc8216344bf21660d2acf9b07eb1bc9b883840c0b5de679cfe52a0f977e64cea21cd584f SHA512 42b259c66e118d5b09bcc64e57441729146ed9b40e9fd18cda83c4aa0523d5bc3acde3177113e1f2a1b5c1e3a14d15b369df9701a9218a88a656ba0359b5ff10
 DIST pyrsistent-0.16.0.tar.gz 108012 BLAKE2B 62283b8ef478302964fc6b1869c3646c23b78762c5f4fad68aa239433c54d9c652544d5ce05dee18107c8f9604b689043d07f67b9396f6dce0cce3aab022e2de SHA512 d5764b1a185d4578bf308f338037e0546b06e79a3e7189b904e24e95e0e907bc98d7c1c68becc5549a541a5864df75aba6088cafa3558ecb0a63dafb22f5674a
 DIST pyrsistent-0.17.3.tar.gz 106911 BLAKE2B 90a05617ad1e32801286d3da834bf52b4ea864e7463a0789904e4a3bbfda2f7b987e13ea93e16980f2cf3b5d999e6040b7c5980a81b516999175b4e5f2ed392e SHA512 2d18e1d4cfe9a0a576fd363f466ba920094af0b1cbbb49aec11b32df6c23e59f6552235a496838dab00928cc7f6dad2a4a8aaa0b52cb6a38eba6faedd12846c8
diff --git a/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild b/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild
deleted file mode 100644
index fc4009a049ff..000000000000
--- a/dev-python/pyrsistent/pyrsistent-0.15.6.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=( python2_7 python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Persistent/Functional/Immutable data structures"
-HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/"
-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"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 9a36888b97b4..c44588580b2d 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,2 +1 @@
-DIST pytest-mock-2.0.0.tar.gz 24665 BLAKE2B 31a3464e8bff5a2109716e95492ce1d59f2555769e69cccf4012bc268f88c5eeca99924006bdc78cc5e20cf227860d845bead9656aba1c081da58effb38ea100 SHA512 8bd7f634afebeae628470270c81f0198647bf8cd5b0fac438891d881d9823e40e814d598670bb9c9722b864990958e69d385c7c6a6e2adc81d2adcb303fbe0b0
 DIST pytest-mock-3.3.1.tar.gz 27551 BLAKE2B 9e3602b988c0e27caa295d42d7400cbe7e3e30392511e662fa6ec16ec9fa4ef776d3e64b63b0345d1b520f753c6776103f507f91f0bad022544bfccc510b7e6b SHA512 ffd53974f82f725cf3bdbe750c1deb568ad1a12a67532eca93ff28d80b1cbcd8ebf709985f5473717c9d54345b251c1627c0567821e9e8b9e102db5c16cf7421
diff --git a/dev-python/pytest-mock/pytest-mock-2.0.0.ebuild b/dev-python/pytest-mock/pytest-mock-2.0.0.ebuild
deleted file mode 100644
index c8da7f8f7842..000000000000
--- a/dev-python/pytest-mock/pytest-mock-2.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
-
-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 sparc x86"
-IUSE=""
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/mock-2[${PYTHON_USEDEP}]' -2)"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/pytest-mock-2.0.0-warnings.patch
-)
-
-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-timeout/pytest-timeout-1.3.4.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.3.4-r1.ebuild
index b7b85e95658f..c20e0c7c5b41 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.3.4.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.3.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
index f4f0e872f2bc..e2dc013bda05 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest/pytest-4.6.11.ebuild b/dev-python/pytest/pytest-4.6.11-r1.ebuild
index ea2e25bebd2a..6f70f5cb4b40 100644
--- a/dev-python/pytest/pytest-4.6.11.ebuild
+++ b/dev-python/pytest/pytest-4.6.11-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -15,7 +15,8 @@ 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"
-RESTRICT="test"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 # When bumping, please check setup.py for the proper py version
 PY_VER="1.5.0"
@@ -40,6 +41,23 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/wcwidth[${PYTHON_USEDEP}]"
 
+# flake cause a number of tests to fail
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+		!!dev-python/pytest-aiohttp
+		!!dev-python/pytest-asyncio
+		!!dev-python/pytest-django
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+	)"
+
 PATCHES=(
 	"${FILESDIR}/pytest-4.5.0-strip-setuptools_scm.patch"
 	"${FILESDIR}/pytest-4.6.10-timeout.patch"
@@ -48,5 +66,19 @@ PATCHES=(
 python_prepare_all() {
 	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
 
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
 	distutils-r1_python_prepare_all
 }
+
+python_test() {
+	distutils_install_for_testing
+
+	# In v4.1.1, pytest started being picky about its own verbosity options.
+	# running pytest on itself with -vv made 3 tests fail. This is why we don't
+	# have it below.
+	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
index 78343c585794..669b1362a94b 100644
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytidylib/pytidylib-0.3.2.ebuild b/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
index 9832f2491ee2..30b68fdab49e 100644
--- a/dev-python/pytidylib/pytidylib-0.3.2.ebuild
+++ b/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytz/pytz-2020.1.ebuild b/dev-python/pytz/pytz-2020.1-r1.ebuild
index d11bcc24a83a..4b6445de929d 100644
--- a/dev-python/pytz/pytz-2020.1.ebuild
+++ b/dev-python/pytz/pytz-2020.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/quex/files/quex-0.65.4-gentoo.patch b/dev-python/quex/files/quex-0.65.4-gentoo.patch
deleted file mode 100644
index d870c765f784..000000000000
--- a/dev-python/quex/files/quex-0.65.4-gentoo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/quex-exe.py	2017-12-13 21:42:48.633280478 +0100
-+++ b/quex-exe.py	2017-12-13 21:43:02.066040530 +0100
-@@ -40,11 +40,6 @@
-     print("error: Please, use Python versions 2.x.")
-     sys.exit(-1)
- 
--if os.environ.has_key("QUEX_PATH") == False:
--    print("Environment variable QUEX_PATH has not been defined.")
--else:
--    sys.path.insert(0, os.environ["QUEX_PATH"])
--
- try:
-     exception_checker.do_on_import(sys.argv)
-     import quex.DEFINITIONS
---- a/quex/DEFINITIONS.py	2017-12-13 21:48:52.887765325 +0100
-+++ b/quex/DEFINITIONS.py	2017-12-13 21:52:29.805877359 +0100
-@@ -49,15 +49,14 @@
-     sys.exit(-1) # sys.exit(-1) is acceptable
- 
- QUEX_PATH          = QUEX_INSTALLATION_DIR
--QUEX_CODEC_DB_PATH = QUEX_PATH + "/quex/engine/codec_db/database"
-+QUEX_CODEC_DB_PATH = "/usr/share/quex/database"
- 
--sys.path.insert(0, QUEX_INSTALLATION_DIR)
- 
- def check():
-     global QUEX_INSTALLATION_DIR
- 
-     # -- Try to acces the file 'quex-exe.py' in order to verify
--    if os.access(QUEX_INSTALLATION_DIR + "/quex-exe.py", os.F_OK) == False:
-+    if False:
-         print "error: Environment variable 'QUEX_PATH' does not point to"
-         print "error: a valid installation directory of quex."
-         print "error: current setting of 'QUEX_PATH':"
diff --git a/dev-python/scandir/scandir-1.10.0-r1.ebuild b/dev-python/scandir/scandir-1.10.0-r2.ebuild
index f549dd1cd0ea..b932b7f7e6f8 100644
--- a/dev-python/scandir/scandir-1.10.0-r1.ebuild
+++ b/dev-python/scandir/scandir-1.10.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools/setuptools-46.4.0-r2.ebuild b/dev-python/setuptools/setuptools-46.4.0-r3.ebuild
index 3ce61e1fa7d3..662dc83cf21e 100644
--- a/dev-python/setuptools/setuptools-46.4.0-r2.ebuild
+++ b/dev-python/setuptools/setuptools-46.4.0-r3.ebuild
@@ -35,7 +35,9 @@ BDEPEND="
 # it early
 PDEPEND="
 	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	' -3)"
 
 # Force in-source build because build system modifies sources.
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-4.1.2-r1.ebuild
index 8b63b8408ca7..43b86df827ca 100644
--- a/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-4.1.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/six/six-1.15.0.ebuild b/dev-python/six/six-1.15.0.ebuild
index 4d0b1f980188..79f882555960 100644
--- a/dev-python/six/six-1.15.0.ebuild
+++ b/dev-python/six/six-1.15.0.ebuild
@@ -14,7 +14,20 @@ 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"
-IUSE="doc"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]' -3)
+	)"
 
 distutils_enable_sphinx documentation --no-autodoc
-distutils_enable_tests pytest
+
+python_test() {
+	if ! python_is_python3; then
+		einfo "Tests are skipped on Python 2 to unblock deps"
+		return
+	fi
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.2.2.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.2.2-r1.ebuild
index 854f9ee20197..923320311114 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.2.2.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.2.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/testscenarios/testscenarios-0.5.0.ebuild b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
index 20bad2daf33a..7be970be1e91 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/testtools/testtools-2.4.0.ebuild b/dev-python/testtools/testtools-2.4.0-r1.ebuild
index ca5a8a4f878b..73012157cf4a 100644
--- a/dev-python/testtools/testtools-2.4.0.ebuild
+++ b/dev-python/testtools/testtools-2.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/toml/toml-0.10.1.ebuild b/dev-python/toml/toml-0.10.1-r1.ebuild
index 45b44738df45..b9a7b919702f 100644
--- a/dev-python/toml/toml-0.10.1.ebuild
+++ b/dev-python/toml/toml-0.10.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
index d066d4513979..c4938f7f76b4 100644
--- a/dev-python/traceback2/traceback2-1.4.0.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
index 7cfc2a5b99f3..ab49c7614a24 100644
--- a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 python_test() {
 	cd "${S}"/src_py3 || die
diff --git a/dev-python/ujson/files/ujson-3.0.0-pypy3-test.patch b/dev-python/ujson/files/ujson-3.0.0-pypy3-test.patch
deleted file mode 100644
index 3bee41bc938a..000000000000
--- a/dev-python/ujson/files/ujson-3.0.0-pypy3-test.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From c9a5ee46a1112d5f7e51defebeefb1e0ab43111e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 12 Jun 2020 15:04:57 +0200
-Subject: [PATCH 1/3] Do not depend on specific exception messages in tests
-
-Fix test_encode_raises_allow_nan() not to depend on specific exception
-messages.  This fixes test failures on PyPy which just happens to use
-different error messages.
----
- tests/test_ujson.py | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/tests/test_ujson.py b/tests/test_ujson.py
-index 72018a0..1d41de5 100644
---- a/tests/test_ujson.py
-+++ b/tests/test_ujson.py
-@@ -614,18 +614,17 @@ def test_dumps_raises(test_input, expected_exception, expected_message):
- 
- 
- @pytest.mark.parametrize(
--    "test_input, expected_exception, expected_message",
-+    "test_input, expected_exception",
-     [
--        (float("nan"), OverflowError, "Invalid value when encoding double"),
--        (float("inf"), OverflowError, "Invalid value when encoding double"),
--        (-float("inf"), OverflowError, "Invalid value when encoding double"),
--        (12839128391289382193812939, OverflowError, "int too big to convert"),
-+        (float("nan"), OverflowError),
-+        (float("inf"), OverflowError),
-+        (-float("inf"), OverflowError),
-+        (12839128391289382193812939, OverflowError),
-     ],
- )
--def test_encode_raises_allow_nan(test_input, expected_exception, expected_message):
-+def test_encode_raises_allow_nan(test_input, expected_exception):
-     with pytest.raises(expected_exception) as e:
-         ujson.dumps(test_input, allow_nan=False)
--    assert str(e.value) == expected_message
- 
- 
- @pytest.mark.parametrize(
--- 
-2.27.0
-
-From 66cc0ad8a76d1bef848e36d9bdcaf476047b5605 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 12 Jun 2020 15:08:27 +0200
-Subject: [PATCH 2/3] Skip GC tests on PyPy
-
----
- tests/test_ujson.py | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/tests/test_ujson.py b/tests/test_ujson.py
-index 1d41de5..fe20174 100644
---- a/tests/test_ujson.py
-+++ b/tests/test_ujson.py
-@@ -215,6 +215,9 @@ def test_encode_dict_conversion():
-     assert test_input == ujson.decode(output)
- 
- 
-+@pytest.mark.skipif(
-+    hasattr(sys, "pypy_version_info"), reason="PyPy uses incompatible GC"
-+)
- def test_encode_dict_values_ref_counting():
-     import gc
- 
-@@ -226,6 +229,9 @@ def test_encode_dict_values_ref_counting():
-     assert ref_count == sys.getrefcount(value)
- 
- 
-+@pytest.mark.skipif(
-+    hasattr(sys, "pypy_version_info"), reason="PyPy uses incompatible GC"
-+)
- def test_encode_dict_key_ref_counting():
-     import gc
- 
--- 
-2.27.0
-
diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
index 491a7d193402..eedb49e46b48 100644
--- a/dev-python/unittest2/unittest2-1.1.0.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch b/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch
deleted file mode 100644
index 5777065e9da8..000000000000
--- a/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- Uranium-4.5.0-orig/CMakeLists.txt   2020-03-01 16:26:44.736355687 +0200
-+++ Uranium-4.5.0/CMakeLists.txt        2020-02-24 17:02:05.000000000 +0200
-@@ -12,6 +12,16 @@
- 
- find_package(PythonInterp 3.5.0 REQUIRED)
- 
-+if(NOT PYTHON_SITE_PACKAGES_DIR)
-+   if(APPLE OR WIN32)
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+           CACHE STRING "Directory to install Python bindings to")
-+   else()
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages CACHE
-+           STRING "Directory to install Python bindings to")
-+   endif()
-+endif()
-+
- # # Checks using pylint
- # Note that we use exit 0 here to not mark the build as a failure on check failure
- # In addition, the specified pylint configuration uses the spellchecker plugin. This required python-enchant to be installed.
-@@ -48,10 +58,10 @@
- if(EXISTS /etc/debian_version)
-     install(DIRECTORY UM DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages)
- else()
--    install(DIRECTORY UM DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
-+    install(DIRECTORY UM DESTINATION ${PYTHON_SITE_PACKAGES_DIR})
- endif()
- install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake
--        DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/ )
-+        DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/Modules/ )
- install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
- 
- # Detect plugins to install
diff --git a/dev-python/virtualenv/virtualenv-16.7.10.ebuild b/dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild
index f280347c20f4..fa2298fd9121 100644
--- a/dev-python/virtualenv/virtualenv-16.7.10.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=manual
 
 inherit distutils-r1
@@ -26,16 +26,14 @@ RESTRICT="!test? ( test )"
 RDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
 	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pypiserver[${PYTHON_USEDEP}]
-			dev-python/pytest-localserver[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/six[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' -3)
+		>=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
 	)"
 
 DOCS=( docs/index.rst docs/changes.rst )
@@ -55,13 +53,14 @@ distutils_enable_sphinx docs \
 	dev-python/towncrier
 
 python_test() {
-	if ! python_is_python3; then
-		ewarn "Tests are skipped on py2, please test externally"
-		return
-	fi
-
 	cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \
 		die "Could not copy LICENSE.txt with ${EPYTHON}"
 
 	pytest -vv tests || 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 /usr/bin/python2.7 ..."
+}
diff --git a/dev-python/virtualenv/virtualenv-20.0.31.ebuild b/dev-python/virtualenv/virtualenv-20.0.31-r1.ebuild
index 47cd6d80668f..78530b307e8d 100644
--- a/dev-python/virtualenv/virtualenv-20.0.31.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.0.31-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=manual
 
 inherit distutils-r1
@@ -29,15 +29,11 @@ RDEPEND="
 	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
-	' -2)
-	$(python_gen_cond_dep '
 		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' -2 python3_{6,7} pypy3)
+	' python3_{6,7} pypy3)
 	$(python_gen_cond_dep '
 		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
-	' -2 python3_6 pypy3)"
+	' python3_6 pypy3)"
 # coverage is used somehow magically in virtualenv, maybe it actually
 # tests something useful
 BDEPEND="
@@ -79,10 +75,7 @@ src_configure() {
 }
 
 python_test() {
-	if ! python_is_python3; then
-		ewarn "Tests are skipped on py2, please test externally"
-		return
-	elif [[ ${EPYTHON} == pypy3 ]]; then
+	if [[ ${EPYTHON} == pypy3 ]]; then
 		# TODO: skip with better granularity
 		ewarn "Skipping broken tests on pypy3"
 		return
@@ -92,3 +85,9 @@ python_test() {
 
 	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/wcwidth/wcwidth-0.2.5.ebuild b/dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
index 605d0cc9fe1b..b336c244a8dc 100644
--- a/dev-python/wcwidth/wcwidth-0.2.5.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/wheel/wheel-0.35.1.ebuild b/dev-python/wheel/wheel-0.35.1-r1.ebuild
index 587684eb4130..f6d55d03c55b 100644
--- a/dev-python/wheel/wheel-0.35.1.ebuild
+++ b/dev-python/wheel/wheel-0.35.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/whoosh/whoosh-2.7.4.ebuild b/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
index 45288678c404..cde1d2ba6c71 100644
--- a/dev-python/whoosh/whoosh-2.7.4.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xcffib/files/xcffib-0.4.2-test-imports.patch b/dev-python/xcffib/files/xcffib-0.4.2-test-imports.patch
deleted file mode 100644
index da33bf3934cb..000000000000
--- a/dev-python/xcffib/files/xcffib-0.4.2-test-imports.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Relative imports don't work because the test dir isn't a proper python module.
-
---- xcffib-0.4.2/test/test_connection.py
-+++ xcffib-0.4.2/test/test_connection.py
-@@ -20,7 +20,7 @@
- 
- from xcffib import ffi
- from xcffib.testing import XvfbTest
--from .testing import XcffibTest
-+from testing import XcffibTest
- 
- from nose.tools import raises
- from nose import SkipTest
---- xcffib-0.4.2/test/test_fakeinput.py
-+++ xcffib-0.4.2/test/test_fakeinput.py
-@@ -2,7 +2,7 @@
- import xcffib.xproto
- import xcffib.xtest
- 
--from .testing import XcffibTest
-+from testing import XcffibTest
- 
- class TestConnection(XcffibTest):
-     def test_fakeinput(self):
---- xcffib-0.4.2/test/test_python_code.py
-+++ xcffib-0.4.2/test/test_python_code.py
-@@ -18,7 +18,7 @@
- import struct
- from xcffib.xproto import EventMask
- 
--from .testing import XcffibTest
-+from testing import XcffibTest
- 
- class TestPythonCode(XcffibTest):
- 
diff --git a/dev-python/yarl/yarl-1.5.1.ebuild b/dev-python/yarl/yarl-1.5.1.ebuild
index 66749c4eb890..d30daee69631 100644
--- a/dev-python/yarl/yarl-1.5.1.ebuild
+++ b/dev-python/yarl/yarl-1.5.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"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 910433e8aca5..301e191fabb2 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,2 +1 @@
-DIST zipp-1.0.0.tar.gz 10821 BLAKE2B f5e0476cb0ca01054abc0c56f1a9581a6f537c002791c4a363238555ce9a211fe13114041374c1bfef426544545e3c654e5b0a7e0541c30b775757c43df6d756 SHA512 dbfadfedd30ca4cb31ac4163f367134d96e57405ef00d5f4c19c0af7a141f78487dec29a0ba94975584fcb462d22c8b536bf29c67b7e298368072e897b0e9d82
 DIST zipp-3.1.0.tar.gz 14808 BLAKE2B fb5524c2619e51c5f8c1b85fa819d1001e6296df6c9d5320c6ab3ec88fa5c932c139161e621d51b2827ef40402bb2492b8b08e470b7333e847495ec690024879 SHA512 bb8dea71eccc4f3b18fc816dae700582c3feb72f346e115bb2d1adc336f121304a285e4d5dad48d15b386b9e137c6e1d1793ef50d22b6bd697812a661817684e
diff --git a/dev-python/zipp/zipp-1.0.0.ebuild b/dev-python/zipp/zipp-1.0.0.ebuild
deleted file mode 100644
index 66e28d5263fc..000000000000
--- a/dev-python/zipp/zipp-1.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp"
-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"
-IUSE="test"
-
-RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/contextlib2[${PYTHON_USEDEP}]
-			dev-python/pathlib2[${PYTHON_USEDEP}]
-			dev-python/unittest2[${PYTHON_USEDEP}]
-		' pypy{,3} python{2_7,3_{5,6,7}})
-	)
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	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
-}
diff --git a/dev-python/zope-event/zope-event-4.4.ebuild b/dev-python/zope-event/zope-event-4.4-r1.ebuild
index dc7d5746156f..0ac9a9b61e41 100644
--- a/dev-python/zope-event/zope-event-4.4.ebuild
+++ b/dev-python/zope-event/zope-event-4.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zope-event/zope-event-4.5.0.ebuild b/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
index 6300e7e1f576..650531b82200 100644
--- a/dev-python/zope-event/zope-event-4.5.0.ebuild
+++ b/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zope-interface/zope-interface-5.1.0.ebuild b/dev-python/zope-interface/zope-interface-5.1.0-r1.ebuild
index d10959860f62..2a18f18ffc79 100644
--- a/dev-python/zope-interface/zope-interface-5.1.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/zope-testing/zope-testing-4.7-r1.ebuild b/dev-python/zope-testing/zope-testing-4.7-r2.ebuild
index a37ad4094c50..cfc1855112a0 100644
--- a/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.7-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
author	Liguros - Gitlab CI/CD [feature/flatten] <gitlab@liguros.net>	2020-09-20 18:26:39 +0000
committer	Liguros - Gitlab CI/CD [feature/flatten] <gitlab@liguros.net>	2020-09-20 18:26:39 +0000
commit	8dfa4160bd746ed1e0f70310531606e4a33484ea (patch)
tree	ceae711c5023203ed35799a8810d68f6b534fadc /dev-python
parent	2ac6366d92f666627bfef883713e84f652192f4f (diff)
download	baldeagleos-repo-8dfa4160bd746ed1e0f70310531606e4a33484ea.tar.gz baldeagleos-repo-8dfa4160bd746ed1e0f70310531606e4a33484ea.tar.xz baldeagleos-repo-8dfa4160bd746ed1e0f70310531606e4a33484ea.zip