Updating liguros repo

100 files changed, 235 insertions, 1661 deletions

diff --git a/dev-python/Babel/Babel-2.8.0-r1.ebuild b/dev-python/Babel/Babel-2.8.0-r2.ebuild
index 8c1f9c07e370..7ca46c128ea7 100644
--- a/dev-python/Babel/Babel-2.8.0-r1.ebuild
+++ b/dev-python/Babel/Babel-2.8.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 )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/dev-python/PyContracts/PyContracts-1.8.14.ebuild b/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
index 0cf7e7f46901..a5c1d5f14229 100644
--- a/dev-python/PyContracts/PyContracts-1.8.14.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.14-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
 
@@ -24,9 +24,3 @@ RDEPEND="
 "
 
 distutils_enable_tests nose
-
-python_test() {
-	nosetests -v \
-		$(python_is_python3 || echo "--ignore-files=test_py3k_annotations.py") \
-		|| die
-}
diff --git a/dev-python/PySocks/PySocks-1.7.1.ebuild b/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
index fb1e63241286..29b239badd95 100644
--- a/dev-python/PySocks/PySocks-1.7.1.ebuild
+++ b/dev-python/PySocks/PySocks-1.7.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/apipkg/apipkg-1.5.ebuild b/dev-python/apipkg/apipkg-1.5-r1.ebuild
index 66c9927cefba..13478e2def6f 100644
--- a/dev-python/apipkg/apipkg-1.5.ebuild
+++ b/dev-python/apipkg/apipkg-1.5-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/argcomplete/argcomplete-1.12.0.ebuild b/dev-python/argcomplete/argcomplete-1.12.0-r1.ebuild
index bab3d4f3aaef..3fcb860c9f7b 100644
--- a/dev-python/argcomplete/argcomplete-1.12.0.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.12.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/blinker/blinker-1.4-r1.ebuild b/dev-python/blinker/blinker-1.4-r2.ebuild
index 6e606194da7d..cece90a62bd8 100644
--- a/dev-python/blinker/blinker-1.4-r1.ebuild
+++ b/dev-python/blinker/blinker-1.4-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
 
diff --git a/dev-python/bottle/bottle-0.12.18.ebuild b/dev-python/bottle/bottle-0.12.18-r1.ebuild
index 147c6ef50425..e1c1ca03614b 100644
--- a/dev-python/bottle/bottle-0.12.18.ebuild
+++ b/dev-python/bottle/bottle-0.12.18-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 optfeature
 
diff --git a/dev-python/brotlipy/brotlipy-0.7.0-r2.ebuild b/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
index 8d854adbd9b2..5508e20efb7e 100644
--- a/dev-python/brotlipy/brotlipy-0.7.0-r2.ebuild
+++ b/dev-python/brotlipy/brotlipy-0.7.0-r3.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
 
@@ -24,7 +24,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 # module name collision with app-arch/brotli
 RDEPEND="
 	virtual/python-cffi[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' -2)
 	!app-arch/brotli[python]"
 DEPEND="
 	test? (
diff --git a/dev-python/chardet/chardet-3.0.4.ebuild b/dev-python/chardet/chardet-3.0.4-r1.ebuild
index d738ed49eace..bf0dc0b2a12e 100644
--- a/dev-python/chardet/chardet-3.0.4.ebuild
+++ b/dev-python/chardet/chardet-3.0.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 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
 
@@ -19,8 +19,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="
 	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
 "
 
diff --git a/dev-python/cliapp/cliapp-1.20180812.1.ebuild b/dev-python/cliapp/cliapp-1.20180812.1.ebuild
index 4367b2a3bc75..deac89f8095b 100644
--- a/dev-python/cliapp/cliapp-1.20180812.1.ebuild
+++ b/dev-python/cliapp/cliapp-1.20180812.1.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/click/click-6.7-r1.ebuild b/dev-python/click/click-6.7-r2.ebuild
index 53a02fc994ea..e1fb02292d0f 100644
--- a/dev-python/click/click-6.7-r1.ebuild
+++ b/dev-python/click/click-6.7-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
 
@@ -14,15 +14,12 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="doc examples test"
+IUSE="examples test"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 PATCHES=(
 	# From upstream, can be removed in next release.
@@ -31,26 +28,11 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.7-support-sphinx-1.7.patch"
 )
 
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
 python_test() {
 	emake test
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
 	use examples && dodoc -r examples
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/click/click-7.1.2.ebuild b/dev-python/click/click-7.1.2-r1.ebuild
index 5f8ebf81ce29..ff42cdf87361 100644
--- a/dev-python/click/click-7.1.2.ebuild
+++ b/dev-python/click/click-7.1.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/colorama/colorama-0.4.3.ebuild b/dev-python/colorama/colorama-0.4.3-r1.ebuild
index af7de5834de6..0fc11671c3e4 100644
--- a/dev-python/colorama/colorama-0.4.3.ebuild
+++ b/dev-python/colorama/colorama-0.4.3-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/cov-core/cov-core-1.15.0-r1.ebuild b/dev-python/cov-core/cov-core-1.15.0-r2.ebuild
index 672595bc7547..06dd8e2f68aa 100644
--- a/dev-python/cov-core/cov-core-1.15.0-r1.ebuild
+++ b/dev-python/cov-core/cov-core-1.15.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
 
 DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
diff --git a/dev-python/coverage/coverage-4.5.4.ebuild b/dev-python/coverage/coverage-4.5.4.ebuild
index a03a5a7c052e..630a98c68e32 100644
--- a/dev-python/coverage/coverage-4.5.4.ebuild
+++ b/dev-python/coverage/coverage-4.5.4.ebuild
@@ -14,33 +14,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-BDEPEND="
-	>=dev-python/setuptools-18.4[${PYTHON_USEDEP}]
-	test? (
-		dev-python/PyContracts[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-	)
-"
+RESTRICT="test"
 
 DISTUTILS_IN_SOURCE_BUILD=1
 
-PATCHES=(
-	"${FILESDIR}/coverage-4.5.4-tests.patch"
-)
-
-src_prepare() {
-	# avoid the dep on xdist, run tests verbosely
-	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
 python_compile() {
 	if [[ ${EPYTHON} == python2.7 ]]; then
 		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
@@ -49,24 +26,3 @@ python_compile() {
 
 	distutils-r1_python_compile
 }
-
-python_test() {
-	distutils_install_for_testing
-	local bindir=${TEST_DIR}/scripts
-
-	pushd tests/eggsrc >/dev/null || die
-	distutils_install_for_testing
-	popd >/dev/null || die
-
-	"${EPYTHON}" igor.py zip_mods || die
-	PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer py || die
-
-	# No C extensions under pypy
-	if [[ ${EPYTHON} != pypy* ]]; then
-		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
-		PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer c || die
-	fi
-
-	# clean up leftover "egg1" directory
-	rm -rf build/lib/egg1 || die
-}
diff --git a/dev-python/coverage/files/coverage-4.5.4-tests.patch b/dev-python/coverage/files/coverage-4.5.4-tests.patch
deleted file mode 100644
index 779102c8f658..000000000000
--- a/dev-python/coverage/files/coverage-4.5.4-tests.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/tests/farm/run/run_timid.py b/tests/farm/run/run_timid.py
-index 0370cf84..4e3cf1ca 100644
---- a/tests/farm/run/run_timid.py
-+++ b/tests/farm/run/run_timid.py
-@@ -38,6 +38,10 @@ if os.environ.get('COVERAGE_TEST_TRACER', 'c') == 'c':
- else:
-     # If the Python trace function is being tested, then regular running will
-     # also show the Python function.
--    contains("out_timid/showtraceout.txt", "regular PyTracer")
-+    #
-+    # tox.ini deletes compiled c modules to make this test work, not feasible
-+    # to do this from the ebuild environment
-+    #contains("out_timid/showtraceout.txt", "regular PyTracer")
-+    pass
- 
- clean("out_timid")
-diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py
-index 578cc679..c875be86 100644
---- a/tests/test_concurrency.py
-+++ b/tests/test_concurrency.py
-@@ -11,6 +11,7 @@ import time
- 
- from flaky import flaky
- 
-+import unittest
- import coverage
- from coverage import env
- from coverage.backward import import_local_file
-@@ -255,22 +256,27 @@ class ConcurrencyTest(CoverageTest):
-         code = SIMPLE.format(QLIMIT=self.QLIMIT)
-         self.try_some_code(code, "thread", threading)
- 
-+    @unittest.skipIf(env.PY2, "eventlet tests don't work with python tracer on python2")
-     def test_eventlet(self):
-         code = (EVENTLET + SUM_RANGE_Q + PRINT_SUM_RANGE).format(QLIMIT=self.QLIMIT)
-         self.try_some_code(code, "eventlet", eventlet)
- 
-+    @unittest.skipIf(env.PY2, "eventlet tests don't work with python tracer on python2")
-     def test_eventlet_simple_code(self):
-         code = SIMPLE.format(QLIMIT=self.QLIMIT)
-         self.try_some_code(code, "eventlet", eventlet)
- 
-+    @unittest.skipIf(env.PY2, "gevent tests don't work with python tracer on python2")
-     def test_gevent(self):
-         code = (GEVENT + SUM_RANGE_Q + PRINT_SUM_RANGE).format(QLIMIT=self.QLIMIT)
-         self.try_some_code(code, "gevent", gevent)
- 
-+    @unittest.skipIf(env.PY2, "gevent tests don't work with python tracer on python2")
-     def test_gevent_simple_code(self):
-         code = SIMPLE.format(QLIMIT=self.QLIMIT)
-         self.try_some_code(code, "gevent", gevent)
- 
-+    @unittest.skip("greenlet tests don't work with python tracer")
-     def test_greenlet(self):
-         GREENLET = """\
-             from greenlet import greenlet
-@@ -289,6 +295,7 @@ class ConcurrencyTest(CoverageTest):
-             """
-         self.try_some_code(GREENLET, "greenlet", greenlet, "hello world\n42\n")
- 
-+    @unittest.skip("greenlet tests don't work with python tracer")
-     def test_greenlet_simple_code(self):
-         code = SIMPLE.format(QLIMIT=self.QLIMIT)
-         self.try_some_code(code, "greenlet", greenlet)
-diff --git a/tests/test_filereporter.py b/tests/test_filereporter.py
-index 91e47762..121c3260 100644
---- a/tests/test_filereporter.py
-+++ b/tests/test_filereporter.py
-@@ -4,6 +4,7 @@
- """Tests for FileReporters"""
- 
- import os
-+import unittest
- 
- from coverage.plugin import FileReporter
- from coverage.python import PythonFileReporter
-@@ -87,6 +88,7 @@ class FileReporterTest(UsingModulesMixin, CoverageTest):
-         assert acu < bcu and acu <= bcu and acu != bcu
-         assert bcu > acu and bcu >= acu and bcu != acu
- 
-+    @unittest.skip("we don't install zip eggs on gentoo")
-     def test_egg(self):
-         # Test that we can get files out of eggs, and read their source files.
-         # The egg1 module is installed by an action in igor.py.
-diff --git a/tests/test_oddball.py b/tests/test_oddball.py
-index aa2f333c..bc63395a 100644
---- a/tests/test_oddball.py
-+++ b/tests/test_oddball.py
-@@ -405,7 +405,9 @@ class DoctestTest(CoverageTest):
-         # well with coverage. Nose fixes the problem by monkeypatching doctest.
-         # I want to be sure there's no monkeypatch and that I'm getting the
-         # doctest module that users of coverage will get.
--        assert 'doctest' not in sys.modules
-+
-+        # gentoo is not running these tests via nose, so there is no monkeypatching
-+        #assert 'doctest' not in sys.modules
- 
-     def test_doctest(self):
-         self.check_coverage('''\
-diff --git a/tests/test_process.py b/tests/test_process.py
-index 62dc80a5..7fa9b2ba 100644
---- a/tests/test_process.py
-+++ b/tests/test_process.py
-@@ -620,11 +620,16 @@ class ProcessTest(CoverageTest):
-             print("FOOEY == %s" % os.getenv("FOOEY"))
-             """)
- 
--        fullcov = os.path.join(
--            os.path.dirname(coverage.__file__), "fullcoverage"
--            )
-+        # we want to use the coverage module we are testing, not the system installation
-+        paths = [
-+            os.path.join(
-+                os.path.dirname(coverage.__file__), "fullcoverage"
-+            ),
-+            os.path.dirname(os.path.dirname(coverage.__file__))
-+        ]
-         self.set_environ("FOOEY", "BOO")
--        self.set_environ("PYTHONPATH", fullcov)
-+        self.set_environ("PYTHONPATH", ':'.join(paths))
-+        print(paths)
-         out = self.run_command("python -m coverage run -L getenv.py")
-         self.assertEqual(out, "FOOEY == BOO\n")
-         data = coverage.CoverageData()
diff --git a/dev-python/crcmod/crcmod-1.7-r3.ebuild b/dev-python/crcmod/crcmod-1.7-r4.ebuild
index 468a296adeb8..828b7c107901 100644
--- a/dev-python/crcmod/crcmod-1.7-r3.ebuild
+++ b/dev-python/crcmod/crcmod-1.7-r4.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/csv23/csv23-0.3.2.ebuild b/dev-python/csv23/csv23-0.3.2-r1.ebuild
index 5012d50db665..f3e38ed14c02 100644
--- a/dev-python/csv23/csv23-0.3.2.ebuild
+++ b/dev-python/csv23/csv23-0.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
 
 DESCRIPTION="Python 2/3 unicode CSV compatibility layer"
@@ -16,9 +16,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
-# note: upstream really uses mock at runtime
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)"
 BDEPEND="
 	test? (
 		>=dev-python/pytest-4.6[${PYTHON_USEDEP}]
diff --git a/dev-python/ctypesgen/Manifest b/dev-python/ctypesgen/Manifest
index fe3c67a77500..dea8d15714bb 100644
--- a/dev-python/ctypesgen/Manifest
+++ b/dev-python/ctypesgen/Manifest
@@ -1,2 +1 @@
-DIST ctypesgen-0_p72.tar.bz2 85694 BLAKE2B eab6f01c7fc541f069d131abe255a51dd876e0629639cb46a8fac215da55af80746771cd15a5de4b300c58f56e4b975985953d4efe5327c8d2b29c37c166c393 SHA512 eab85c71a2f98fd03ae582899de680bd861e7e6e20841ac087520f8b844dc686ea519b0510382cedec09ff3fa1d87fcc1c79878a2eb9219d7cc092423813e2e5
 DIST ctypesgen-1.0.2.tar.gz 119413 BLAKE2B 27bc387ccbcd62cd164aef544129ead58248272251d2e2737f7fd65f22b92def3b62845a92dab4e1ba3faf030a002b4f2a67bfb0492ffb6298ddba9d7a2ba0f3 SHA512 d5168f72a04878d64b43c096f84f2a32663d481d7ac37f78d706f11aa09b68fe267af476885232a8c64be0f33dec20937e11bbfdef6231ecef1b19eae592d638
diff --git a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
deleted file mode 100644
index fc7875610aa0..000000000000
--- a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper generator for ctypes"
-HOMEPAGE="https://github.com/davidjamesca/ctypesgen"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-python_prepare_all() {
-	# r73 upstream
-	sed -i -e 's:libc:libm.so.6:' test/math_functions.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp -r -l test "${BUILD_DIR}"/ || die
-
-	cd "${BUILD_DIR}"/test || die
-	local f
-	for f in {math_functions,simple_macros,structures}.py; do
-		"${PYTHON}" "${f}" || die "Test ${f} fails with ${EPYTHON}"
-	done
-}
diff --git a/dev-python/dbus-python/dbus-python-1.2.16.ebuild b/dev-python/dbus-python/dbus-python-1.2.16-r1.ebuild
index 640972cc4659..3e8404ab9e9d 100644
--- a/dev-python/dbus-python/dbus-python-1.2.16.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.16-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit autotools python-r1
diff --git a/dev-python/decorator/decorator-4.4.2.ebuild b/dev-python/decorator/decorator-4.4.2-r1.ebuild
index 85690ec75330..10ecee953d38 100644
--- a/dev-python/decorator/decorator-4.4.2.ebuild
+++ b/dev-python/decorator/decorator-4.4.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/distro/distro-1.5.0.ebuild b/dev-python/distro/distro-1.5.0-r1.ebuild
index f50ec591abbb..1b31bd309086 100644
--- a/dev-python/distro/distro-1.5.0.ebuild
+++ b/dev-python/distro/distro-1.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} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild b/dev-python/ecdsa/ecdsa-0.14.1-r2.ebuild
index 555709d9c238..4e6f405fb832 100644
--- a/dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.14.1-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
 
diff --git a/dev-python/ecdsa/ecdsa-0.15.ebuild b/dev-python/ecdsa/ecdsa-0.15-r1.ebuild
index b09bdb9e20da..7f5fbcbfaefe 100644
--- a/dev-python/ecdsa/ecdsa-0.15.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.15-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/ecdsa/ecdsa-0.16.0.ebuild b/dev-python/ecdsa/ecdsa-0.16.0-r1.ebuild
index ed406381b631..99ffc734c22f 100644
--- a/dev-python/ecdsa/ecdsa-0.16.0.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.16.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
 
@@ -25,8 +25,6 @@ BDEPEND="
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pluggy[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/idna[${PYTHON_USEDEP}]' -2)
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
 	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild b/dev-python/entrypoints/entrypoints-0.3-r2.ebuild
index d1c7b092f757..21a7bddc2a42 100644
--- a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
+++ b/dev-python/entrypoints/entrypoints-0.3-r2.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
 
@@ -18,16 +18,10 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/configparser-3.5.0[${PYTHON_USEDEP}]' -2)
-"
 BDEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/pathlib[${PYTHON_USEDEP}]
-		' -2)
 	)
 "
 
diff --git a/dev-python/execnet/execnet-1.7.1.ebuild b/dev-python/execnet/execnet-1.7.1-r1.ebuild
index 74b842cbbed8..195de81f4e69 100644
--- a/dev-python/execnet/execnet-1.7.1.ebuild
+++ b/dev-python/execnet/execnet-1.7.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/flask/flask-1.1.2.ebuild b/dev-python/flask/flask-1.1.2-r1.ebuild
index 345c6f1d2e57..617f24d34cd3 100644
--- a/dev-python/flask/flask-1.1.2.ebuild
+++ b/dev-python/flask/flask-1.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/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild
index 38525bad59fd..da2ee0ae37a0 100644
--- a/dev-python/flask/flask-9999.ebuild
+++ b/dev-python/flask/flask-9999.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/freezegun/freezegun-0.3.15.ebuild b/dev-python/freezegun/freezegun-0.3.15-r1.ebuild
index e625859f952f..d590b717ceb0 100644
--- a/dev-python/freezegun/freezegun-0.3.15.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.15-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/freezegun/freezegun-1.0.0.ebuild b/dev-python/freezegun/freezegun-1.0.0-r1.ebuild
index 2766d12e66ef..2766d12e66ef 100644
--- a/dev-python/freezegun/freezegun-1.0.0.ebuild
+++ b/dev-python/freezegun/freezegun-1.0.0-r1.ebuild
diff --git a/dev-python/gmpy/gmpy-2.0.8-r1.ebuild b/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
index d9730e9c398b..2d7a3c1b25c8 100644
--- a/dev-python/gmpy/gmpy-2.0.8-r1.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/greenlet/greenlet-0.4.16.ebuild b/dev-python/greenlet/greenlet-0.4.16-r1.ebuild
index 0b73a2ebbed6..5356c0a7b6ef 100644
--- a/dev-python/greenlet/greenlet-0.4.16.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.16-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/httpbin/httpbin-0.7.0.ebuild b/dev-python/httpbin/httpbin-0.7.0-r1.ebuild
index 8b234c218bdb..31320ad231c1 100644
--- a/dev-python/httpbin/httpbin-0.7.0.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.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/httplib2/httplib2-0.18.1.ebuild b/dev-python/httplib2/httplib2-0.18.1-r1.ebuild
index 5c7db0fcad5c..4cfde90a8fda 100644
--- a/dev-python/httplib2/httplib2-0.18.1.ebuild
+++ b/dev-python/httplib2/httplib2-0.18.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/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index c014e1f50e6b..468acd50d048 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1 +1,2 @@
 DIST hyper-h2-3.2.0.tar.gz 2203333 BLAKE2B 245bab162852070e850613c41162c75efe5e43535945dacf448afdc948cade83402f77259aa46f375d0772a5287e42d8842b1259cb36392cc8fc222dec7cef75 SHA512 103a4ea2cd29037ce03ae676864125b4111c7d31a82bbbe7028557da886d88fb5363d885f08d5d3f68dfa29013b7b03350cc0cb4d9dddf32735e98dae5d7fc7c
+DIST hyper-h2-4.0.0.tar.gz 2142185 BLAKE2B e5ae692c1f21b6e3ea8695ec269a4d02f72b8d385b6f9c523775f3db2200379f9af5accb70fa06a357575728a6a5b2644dd1225cfdf458fffa80e84c7b1c7b2f SHA512 84578174a13782897f9286c62d450eaf11aa71c01c96b8660179cd2df77618dc1a6c4b354b2bc5731cd21c4709c8c0a8282a859a98c4a62a7295b6dfd1b5cfb2
diff --git a/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild b/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
new file mode 100644
index 000000000000..284161100632
--- /dev/null
+++ b/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
+HOMEPAGE="https://python-hyper.org/h2/en/stable/ https://pypi.org/project/h2/"
+SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/hyperframe-6.0[${PYTHON_USEDEP}]
+	<dev-python/hyperframe-7[${PYTHON_USEDEP}]
+	>=dev-python/hpack-4.0[${PYTHON_USEDEP}]
+	<dev-python/hpack-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild b/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
index 1fd8cfb033bf..06b50c39f19a 100644
--- a/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-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/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 31fdd2191757..57b68f1925c4 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,2 +1 @@
-DIST kiwisolver-1.0.1.tar.gz 34783 BLAKE2B 104fb7789e004841921bc43fe98a98b247c7f0506a94b07d10ff1e758287a272c9d2f119b7a086847653cdf1bfc9d5c94823d1eb0b4a30ea93cf2b8b05027013 SHA512 01002ae1dbf6482ed68c49ad3da80b772db84ec221c4b111c42f1b493f19299e0ddb187e43e64b380eb2ddc292d5848d6e09a5a1dbfaf68950a65423a913ec18
 DIST kiwisolver-1.2.0.tar.gz 54244 BLAKE2B 42590c2cbb78b3c2ed568373616e772326bf5a0e133396d9e9cf6468132ec88b45d40f68f51baff7bc22ca261567ebab81cf2585009657bd2a59df4e97c33f1f SHA512 05541ff46cc64b9958d714452138dc7bb343e6cc9308408a3f8cf25242e9640af37f8bfd22a7038e8ca70a895f57bdb983346259bce22b1630ac10b974d00a0e
diff --git a/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
deleted file mode 100644
index 87df0e5abfef..000000000000
--- a/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
-HOMEPAGE="https://github.com/nucleic/kiwi"
-SRC_URI="https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Clear-BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-S="${WORKDIR}"/kiwi-${PV}
diff --git a/dev-python/mako/mako-1.1.3.ebuild b/dev-python/mako/mako-1.1.3-r1.ebuild
index 73019a54a254..69dccce3d684 100644
--- a/dev-python/mako/mako-1.1.3.ebuild
+++ b/dev-python/mako/mako-1.1.3-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 optfeature
 
@@ -20,11 +20,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 IUSE="doc"
 
 RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-	)
-"
 
 PATCHES=(
 	"${FILESDIR}"/mako-1.1.1-pypy3-test.patch
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
index 6f45cdc48011..af47cf489a7c 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.6-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
 
diff --git a/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild
index e4899b146f5c..23826a711942 100644
--- a/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit gnome2 python-single-r1
 
diff --git a/dev-python/parso/parso-0.7.0.ebuild b/dev-python/parso/parso-0.7.0-r1.ebuild
index 9e84f728cbed..01e304acc8a9 100644
--- a/dev-python/parso/parso-0.7.0.ebuild
+++ b/dev-python/parso/parso-0.7.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/parso/parso-0.7.1.ebuild b/dev-python/parso/parso-0.7.1-r1.ebuild
index d9eda66a79da..8e9d18fe6205 100644
--- a/dev-python/parso/parso-0.7.1.ebuild
+++ b/dev-python/parso/parso-0.7.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/pip/pip-20.1.1.ebuild b/dev-python/pip/pip-20.1.1-r1.ebuild
index 27093a34ed1b..19fe0bc2bf86 100644
--- a/dev-python/pip/pip-20.1.1.ebuild
+++ b/dev-python/pip/pip-20.1.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 )
 PYTHON_REQ_USE="ssl(+),threads(+)"
 
 inherit bash-completion-r1 distutils-r1 multiprocessing
@@ -49,7 +49,6 @@ DEPEND="
 		<dev-python/virtualenv-20[${PYTHON_USEDEP}]
 		dev-python/werkzeug[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' -2)
 	)
 "
 
diff --git a/dev-python/pip/pip-20.2.2.ebuild b/dev-python/pip/pip-20.2.2-r1.ebuild
index 3f09f9c458a1..abd219f8b047 100644
--- a/dev-python/pip/pip-20.2.2.ebuild
+++ b/dev-python/pip/pip-20.2.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="ssl(+),threads(+)"
 
 inherit bash-completion-r1 distutils-r1 multiprocessing
@@ -49,7 +49,6 @@ DEPEND="
 		<dev-python/virtualenv-20[${PYTHON_USEDEP}]
 		dev-python/werkzeug[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' -2)
 	)
 "
 
diff --git a/dev-python/pip/pip-20.2.3.ebuild b/dev-python/pip/pip-20.2.3-r1.ebuild
index 9b28a9159786..8837647f713d 100644
--- a/dev-python/pip/pip-20.2.3.ebuild
+++ b/dev-python/pip/pip-20.2.3-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="ssl(+),threads(+)"
 
 inherit bash-completion-r1 distutils-r1 multiprocessing
@@ -49,7 +49,6 @@ DEPEND="
 		<dev-python/virtualenv-20[${PYTHON_USEDEP}]
 		dev-python/werkzeug[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' -2)
 	)
 "
 
diff --git a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild b/dev-python/pkginfo/pkginfo-1.5.0.1-r1.ebuild
index eca58ec32918..12de804f7f9a 100644
--- a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.5.0.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
 
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
index 4b2d3c1527db..8fa95934c259 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/psutil/psutil-5.7.0.ebuild b/dev-python/psutil/psutil-5.7.0-r1.ebuild
index cd6be75dd90d..e629af037384 100644
--- a/dev-python/psutil/psutil-5.7.0.ebuild
+++ b/dev-python/psutil/psutil-5.7.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
 
@@ -16,15 +16,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linu
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/ipaddress[${PYTHON_USEDEP}]
-		' -2)
-	)
-"
-
 PATCHES=(
 	"${FILESDIR}/psutil-5.7.0-tests.patch"
 )
diff --git a/dev-python/psutil/psutil-5.7.2.ebuild b/dev-python/psutil/psutil-5.7.2-r1.ebuild
index 256fb651c315..752f647c16b9 100644
--- a/dev-python/psutil/psutil-5.7.2.ebuild
+++ b/dev-python/psutil/psutil-5.7.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
 
@@ -16,16 +16,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/ipaddress[${PYTHON_USEDEP}]
-			dev-python/unittest2[${PYTHON_USEDEP}]
-		' -2)
-	)
-"
-
 PATCHES=(
 	"${FILESDIR}/psutil-5.7.2-tests.patch"
 )
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.8-r1.ebuild
index 28338ac3d8b0..b1d2cf779a44 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.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 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 743563948f6f..b3bb3b6bc03c 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,2 +1 @@
-DIST pyflakes-2.1.1.tar.gz 58072 BLAKE2B 68dccddae2a9dc77f2d1f1251c80e2552935281b6b79e55fd2a0805cb30bf5e1c227b60a7e1f55f5f92ac42dfd18a69eb0b76ce06f43ac1c48dde3921817a271 SHA512 7ebf5843b38146305c1063e070480fea8ec3b47fa1be546b1fafaeb242a688a5a001f978e7257fd71d5905b9a338b466ef17c7330725191587e9c40ba632c3f8
 DIST pyflakes-2.2.0.tar.gz 65307 BLAKE2B e48e0cb0497f90b6482c0fd08c182d766ab50755fe348352df510841f4ad43f7c1d6486753ce774603a3624f49c9b0165ad930bb1451ef30cf2e828d732e0652 SHA512 6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35
diff --git a/dev-python/pyflakes/files/pyflakes-2.1.1-py38.patch b/dev-python/pyflakes/files/pyflakes-2.1.1-py38.patch
deleted file mode 100644
index f9f00b895f5a..000000000000
--- a/dev-python/pyflakes/files/pyflakes-2.1.1-py38.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit 1911c203a13826d2eb03d582d60874b91e36f4fc
-Author: Batuhan Taşkaya <47358913+isidentical@users.noreply.github.com>
-Date:   Sun Nov 3 22:51:27 2019 +0300
-
-    Allow continue inside finally in 3.8+ (#476)
-
-diff --git a/pyflakes/checker.py b/pyflakes/checker.py
-index eca2002..c8ccf56 100644
---- a/pyflakes/checker.py
-+++ b/pyflakes/checker.py
-@@ -1738,7 +1738,7 @@ class Checker(object):
-                 break
-             # Handle Try/TryFinally difference in Python < and >= 3.3
-             if hasattr(n, 'finalbody') and isinstance(node, ast.Continue):
--                if n_child in n.finalbody:
-+                if n_child in n.finalbody and not PY38_PLUS:
-                     self.report(messages.ContinueInFinally, node)
-                     return
-         if isinstance(node, ast.Continue):
-diff --git a/pyflakes/test/test_other.py b/pyflakes/test/test_other.py
-index df2f790..282accb 100644
---- a/pyflakes/test/test_other.py
-+++ b/pyflakes/test/test_other.py
-@@ -493,8 +493,10 @@ class Test(TestCase):
-                     continue
-         ''')
- 
-+    @skipIf(version_info > (3, 8), "Python <= 3.8 only")
-     def test_continueInFinally(self):
-         # 'continue' inside 'finally' is a special syntax error
-+        # that is removed in 3.8
-         self.flakes('''
-         while True:
-             try:
-@@ -2003,6 +2005,7 @@ class TestAsyncStatements(TestCase):
-         ''', m.BreakOutsideLoop)
- 
-     @skipIf(version_info < (3, 5), 'new in Python 3.5')
-+    @skipIf(version_info > (3, 8), "Python <= 3.8 only")
-     def test_continueInAsyncForFinally(self):
-         self.flakes('''
-         async def read_data(db):
diff --git a/dev-python/pyflakes/files/pyflakes-2.1.1-tests.patch b/dev-python/pyflakes/files/pyflakes-2.1.1-tests.patch
deleted file mode 100644
index 5e1a445e161e..000000000000
--- a/dev-python/pyflakes/files/pyflakes-2.1.1-tests.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
-index ee205f9..e295bd9 100644
---- a/pyflakes/test/test_api.py
-+++ b/pyflakes/test/test_api.py
-@@ -9,7 +9,6 @@ import shutil
- import subprocess
- import tempfile
- 
--from pyflakes.checker import PY2
- from pyflakes.messages import UnusedImport
- from pyflakes.reporter import Reporter
- from pyflakes.api import (
-@@ -423,7 +422,7 @@ def baz():
- 
-         with self.makeTempFile(source) as sourcePath:
-             if PYPY:
--                message = 'EOF while scanning triple-quoted string literal'
-+                message = 'end of file (EOF) while scanning triple-quoted string literal'
-             else:
-                 message = 'invalid syntax'
- 
-@@ -465,8 +464,8 @@ def foo(
-         syntax error reflects the cause for the syntax error.
-         """
-         with self.makeTempFile("if True:\n\tfoo =") as sourcePath:
--            column = 5 if PYPY else 7
--            last_line = '\t   ^' if PYPY else '\t     ^'
-+            column = 6 if PYPY else 7
-+            last_line = '\t    ^' if PYPY else '\t     ^'
- 
-             self.assertHasErrors(
-                 sourcePath,
-@@ -476,6 +475,7 @@ def foo(
- %s
- """ % (sourcePath, column, last_line)])
- 
-+    @skipIf(PYPY, "Broken on pypy")
-     def test_nonDefaultFollowsDefaultSyntaxError(self):
-         """
-         Source which has a non-default argument following a default argument
-@@ -488,7 +488,12 @@ def foo(bar=baz, bax):
- """
-         with self.makeTempFile(source) as sourcePath:
-             if ERROR_HAS_LAST_LINE:
--                column = 9 if sys.version_info >= (3, 8) else 8
-+                if PYPY and sys.version_info >= (3,):
-+                    column = 7
-+                elif sys.version_info >= (3, 8):
-+                    column = 9
-+                else:
-+                    column = 8
-                 last_line = ' ' * (column - 1) + '^\n'
-                 columnstr = '%d:' % column
-             else:
-@@ -500,6 +505,7 @@ def foo(bar=baz, bax):
- def foo(bar=baz, bax):
- %s""" % (sourcePath, columnstr, last_line)])
- 
-+    @skipIf(PYPY, "Broken on pypy")
-     def test_nonKeywordAfterKeywordSyntaxError(self):
-         """
-         Source which has a non-keyword argument after a keyword argument should
-@@ -511,7 +517,12 @@ foo(bar=baz, bax)
- """
-         with self.makeTempFile(source) as sourcePath:
-             if ERROR_HAS_LAST_LINE:
--                column = 14 if sys.version_info >= (3, 8) else 13
-+                if PYPY and sys.version_info >= (3,):
-+                    column = 12
-+                elif sys.version_info >= (3, 8):
-+                    column = 14
-+                else:
-+                    column = 13
-                 last_line = ' ' * (column - 1) + '^\n'
-                 columnstr = '%d:' % column
-             else:
-@@ -529,6 +540,7 @@ foo(bar=baz, bax)
- foo(bar=baz, bax)
- %s""" % (sourcePath, columnstr, message, last_line)])
- 
-+    @skipIf(PYPY and sys.hexversion < 0x3080000, "broken on pypy3")
-     def test_invalidEscape(self):
-         """
-         The invalid escape syntax raises ValueError in Python 2
-@@ -681,6 +693,12 @@ class IntegrationTests(TestCase):
-     Tests of the pyflakes script that actually spawn the script.
-     """
- 
-+    # https://bitbucket.org/pypy/pypy/issues/3069/pypy36-on-windows-incorrect-line-separator
-+    if PYPY and sys.version_info >= (3,) and WIN:
-+        LINESEP = '\n'
-+    else:
-+        LINESEP = os.linesep
-+
-     def setUp(self):
-         self.tempdir = tempfile.mkdtemp()
-         self.tempfilepath = os.path.join(self.tempdir, 'temp')
-@@ -721,9 +739,6 @@ class IntegrationTests(TestCase):
-         if sys.version_info >= (3,):
-             stdout = stdout.decode('utf-8')
-             stderr = stderr.decode('utf-8')
--        # Workaround https://bitbucket.org/pypy/pypy/issues/2350
--        if PYPY and PY2 and WIN:
--            stderr = stderr.replace('\r\r\n', '\r\n')
-         return (stdout, stderr, rv)
- 
-     def test_goodFile(self):
-@@ -744,7 +759,7 @@ class IntegrationTests(TestCase):
-             fd.write("import contraband\n".encode('ascii'))
-         d = self.runPyflakes([self.tempfilepath])
-         expected = UnusedImport(self.tempfilepath, Node(1), 'contraband')
--        self.assertEqual(d, ("%s%s" % (expected, os.linesep), '', 1))
-+        self.assertEqual(d, ("%s%s" % (expected, self.LINESEP), '', 1))
- 
-     def test_errors_io(self):
-         """
-@@ -754,7 +769,7 @@ class IntegrationTests(TestCase):
-         """
-         d = self.runPyflakes([self.tempfilepath])
-         error_msg = '%s: No such file or directory%s' % (self.tempfilepath,
--                                                         os.linesep)
-+                                                         self.LINESEP)
-         self.assertEqual(d, ('', error_msg, 1))
- 
-     def test_errors_syntax(self):
-@@ -766,8 +781,8 @@ class IntegrationTests(TestCase):
-         with open(self.tempfilepath, 'wb') as fd:
-             fd.write("import".encode('ascii'))
-         d = self.runPyflakes([self.tempfilepath])
--        error_msg = '{0}:1:{2}: invalid syntax{1}import{1}    {3}^{1}'.format(
--            self.tempfilepath, os.linesep, 5 if PYPY else 7, '' if PYPY else '  ')
-+        error_msg = '{0}:1:{2}: invalid syntax{1}import{1}     {3}^{1}'.format(
-+            self.tempfilepath, self.LINESEP, 6 if PYPY else 7, '' if PYPY else ' ')
-         self.assertEqual(d, ('', error_msg, 1))
- 
-     def test_readFromStdin(self):
-@@ -776,13 +791,14 @@ class IntegrationTests(TestCase):
-         """
-         d = self.runPyflakes([], stdin='import contraband')
-         expected = UnusedImport('<stdin>', Node(1), 'contraband')
--        self.assertEqual(d, ("%s%s" % (expected, os.linesep), '', 1))
-+        self.assertEqual(d, ("%s%s" % (expected, self.LINESEP), '', 1))
- 
- 
- class TestMain(IntegrationTests):
-     """
-     Tests of the pyflakes main function.
-     """
-+    LINESEP = os.linesep
- 
-     def runPyflakes(self, paths, stdin=None):
-         try:
-diff --git a/pyflakes/test/test_doctests.py b/pyflakes/test/test_doctests.py
-index 0825ffe..a474bb1 100644
---- a/pyflakes/test/test_doctests.py
-+++ b/pyflakes/test/test_doctests.py
-@@ -328,7 +328,9 @@ class Test(TestCase):
-             m.DoctestSyntaxError).messages
-         exc = exceptions[0]
-         self.assertEqual(exc.lineno, 4)
--        if sys.version_info >= (3, 8):
-+        if PYPY:
-+            self.assertEqual(exc.col, 27)
-+        elif sys.version_info >= (3, 8):
-             self.assertEqual(exc.col, 18)
-         else:
-             self.assertEqual(exc.col, 26)
-@@ -339,12 +341,14 @@ class Test(TestCase):
-         exc = exceptions[1]
-         self.assertEqual(exc.lineno, 5)
-         if PYPY:
--            self.assertEqual(exc.col, 13)
-+            self.assertEqual(exc.col, 14)
-         else:
-             self.assertEqual(exc.col, 16)
-         exc = exceptions[2]
-         self.assertEqual(exc.lineno, 6)
--        if PYPY or sys.version_info >= (3, 8):
-+        if PYPY:
-+            self.assertEqual(exc.col, 14)
-+        elif sys.version_info >= (3, 8):
-             self.assertEqual(exc.col, 13)
-         else:
-             self.assertEqual(exc.col, 18)
-@@ -358,7 +362,9 @@ class Test(TestCase):
-             """
-         ''', m.DoctestSyntaxError).messages[0]
-         self.assertEqual(exc.lineno, 5)
--        if PYPY or sys.version_info >= (3, 8):
-+        if PYPY:
-+            self.assertEqual(exc.col, 14)
-+        elif sys.version_info >= (3, 8):
-             self.assertEqual(exc.col, 13)
-         else:
-             self.assertEqual(exc.col, 16)
-@@ -377,7 +383,10 @@ class Test(TestCase):
-             m.DoctestSyntaxError,
-             m.UndefinedName).messages
-         self.assertEqual(exc1.lineno, 6)
--        self.assertEqual(exc1.col, 19)
-+        if PYPY:
-+            self.assertEqual(exc1.col, 20)
-+        else:
-+            self.assertEqual(exc1.col, 19)
-         self.assertEqual(exc2.lineno, 7)
-         self.assertEqual(exc2.col, 12)
- 
diff --git a/dev-python/pyflakes/pyflakes-2.1.1.ebuild b/dev-python/pyflakes/pyflakes-2.1.1.ebuild
deleted file mode 100644
index 17e3afb1b8e7..000000000000
--- a/dev-python/pyflakes/pyflakes-2.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/pyflakes-2.1.1-tests.patch"
-	"${FILESDIR}/pyflakes-2.1.1-py38.patch"
-)
-
-distutils_enable_tests unittest
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index c108ab0a10d4..30e13a75e670 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,2 +1,3 @@
 DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f361e9e0296b5c7d57c5949d3434a040d028249c5b8f3c865ac3dcdbb32e6f0b223186678595a8625213ba2a17 SHA512 d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0
 DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890d2f772e3ef302f243cca67724c6012355644ba60d4cae6de72db6dd61d320177deff6ee83dd355ec4cc33e841b565f7 SHA512 4cee7599fd8a6d31ddd66bfaad3bbb67cb167c1ae339f37e83322d810fea8746e81a191c224a0eeb6cc43a64bf1730ff0886c82f1a4f642e2e656ca9a837bf9e
+DIST pygame-2.0.0.dev12.tar.gz 5598471 BLAKE2B 339e96ed7f01070c3aa4b31b587a793b43b99ac476d72a431dff09d98b95ef48c6b0d4faa20301e6db43cb2b35b13245253d86859c16d2befbd3795f8ed48b7f SHA512 f732056b3c8377326caf1d6ded6c59e8665de2ab2f6233d6d95dcc26137d67d180f8c5dc92fc22578ec5ce0ecf5a1de5080c62355d15035ab248d518cd75180f
diff --git a/dev-python/pygame/pygame-2.0.0_pre12.ebuild b/dev-python/pygame/pygame-2.0.0_pre12.ebuild
new file mode 100644
index 000000000000..893ea49f26a9
--- /dev/null
+++ b/dev-python/pygame/pygame-2.0.0_pre12.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+
+inherit distutils-r1
+
+MY_PV=${PV/_pre/.dev}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="https://www.pygame.org/"
+SRC_URI="
+	https://github.com/pygame/pygame/releases/download/${MY_PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples midi opengl test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freetype
+	>=media-libs/sdl2-image-1.2.2
+	>=media-libs/sdl2-mixer-1.2.4
+	>=media-libs/sdl2-ttf-2.0.6
+	>=media-libs/smpeg2-0.4.4-r1
+	midi? ( media-libs/portmidi )
+	X? ( >=media-libs/libsdl2-1.2.5[opengl?,video,X] )
+	!X? ( >=media-libs/libsdl2-1.2.5 )"
+DEPEND="${RDEPEND}
+	test? (
+		media-libs/sdl2-image[gif,jpeg,png]
+		media-libs/sdl2-mixer[mp3,vorbis,wav]
+	)"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig"
+# util-linux provides script
+BDEPEND="
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)"
+
+src_prepare() {
+	if ! use midi; then
+		rm test/midi_test.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py -auto || die
+
+	# Disable automagic dependency on PortMidi.
+	if ! use midi; then
+		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
+	fi
+}
+
+python_test() {
+	local -x PYTHONPATH=
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=disk
+	distutils_install_for_testing
+	script -eqc "${EPYTHON} -m pygame.tests" || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 254a957c983a..c36dda5234e9 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,3 +1,2 @@
-DIST pygobject-2.28.6.tar.xz 747248 BLAKE2B 5f92794034b2d0559a623db4a7d273a7dc3f099cae87ede91b17e81acac085a9298c6b81b45b4b8540b6a75ced97e474a993437dbfcfc2133d3321d6a979b541 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c
 DIST pygobject-3.34.0.tar.xz 552268 BLAKE2B a9cbeb644e0aa1b23067b591fe5c6299741395656631d39782a8c183a5d3a8e5e7f1a81acdefee186b7cc2bc34dda9271468b1828d5b9613ddc1256e24f1ecb8 SHA512 782195d22e564b88dea8d43469f0111f398b44b51a63df2fe7d07650af94d5cd037f322a5d7e405338823be3419fcdbf0113fe50b220ab1cfd07d4d01dbc4766
 DIST pygobject-3.36.1.tar.xz 556568 BLAKE2B cd38aec8e71ff230926327e77867d07ae0fd5549b71619301bb3be01821ea93e557ecf335ea238292176981a864b269eaa2a86da47e8fb320f187f54caf24dc4 SHA512 5e00dcd03dfe4f92acbf827c13c164b6b9740b2a8cef3b2dce70f96a2156fee2411c84dc669f12b910f4a93daa03ba845282832e2b09d8c887102d43764a345f
diff --git a/dev-python/pygobject/files/pygobject-2.28.3-fix-codegen-location.patch b/dev-python/pygobject/files/pygobject-2.28.3-fix-codegen-location.patch
deleted file mode 100644
index 44440a526b81..000000000000
--- a/dev-python/pygobject/files/pygobject-2.28.3-fix-codegen-location.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From b3e852d29bfd1e90f7e0da409fd0ae36cc01675a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 8 Apr 2011 15:36:35 +0200
-Subject: [PATCH 1/3] Move codegen to a non-private directory
-
----
- codegen/Makefile.am              |    2 +-
- codegen/pygobject-codegen-2.0.in |    3 ++-
- pygobject-2.0.pc.in              |    3 ++-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/codegen/Makefile.am b/codegen/Makefile.am
-index f9886eb..d714ff2 100644
---- a/codegen/Makefile.am
-+++ b/codegen/Makefile.am
-@@ -2,7 +2,7 @@ PLATFORM_VERSION = 2.0
- 
- bin_SCRIPTS = pygobject-codegen-$(PLATFORM_VERSION)
- 
--codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen
-+codegendir = $(pyexecdir)/gtk-2.0/codegen
- 
- codegen_SCRIPTS = \
- 	code-coverage.py \
-diff --git a/codegen/pygobject-codegen-2.0.in b/codegen/pygobject-codegen-2.0.in
-index c5c912e..c04451b 100644
---- a/codegen/pygobject-codegen-2.0.in
-+++ b/codegen/pygobject-codegen-2.0.in
-@@ -1,9 +1,10 @@
- #!/bin/sh
- 
- prefix=@prefix@
-+exec_prefix=@exec_prefix@
- datarootdir=@datarootdir@
- datadir=@datadir@
--codegendir=${datadir}/pygobject/2.0/codegen
-+codegendir=@pyexecdir@/gtk-2.0/codegen
- 
- PYTHONPATH=$codegendir
- export PYTHONPATH
-diff --git a/pygobject-2.0.pc.in b/pygobject-2.0.pc.in
-index a47b685..0d1a811 100644
---- a/pygobject-2.0.pc.in
-+++ b/pygobject-2.0.pc.in
-@@ -4,6 +4,7 @@ includedir=@includedir@
- datarootdir=@datarootdir@
- datadir=@datadir@
- libdir=@libdir@
-+pyexecdir=@pyexecdir@
- 
- # you can use the --variable=pygtkincludedir argument to
- # pkg-config to get this value.  You might want to use this to
-@@ -12,7 +13,7 @@ pygtkincludedir=${includedir}/pygtk-2.0
- fixxref=${datadir}/pygobject/xsl/fixxref.py
- pygdocs=${datadir}/gtk-doc/html/pygobject
- defsdir=${datadir}/pygobject/2.0/defs
--codegendir=${datadir}/pygobject/2.0/codegen
-+codegendir=${pyexecdir}/gtk-2.0/codegen
- overridesdir=@pyexecdir@/gi/overrides
- 
- Name: PyGObject
--- 
-1.7.4.1
-
diff --git a/dev-python/pygobject/files/pygobject-2.28.3-make_check.patch b/dev-python/pygobject/files/pygobject-2.28.3-make_check.patch
deleted file mode 100644
index 45c04b96780e..000000000000
--- a/dev-python/pygobject/files/pygobject-2.28.3-make_check.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From b5c4b8b97a1ccb9a4c63ab726ea9c84d81ef51ca Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 5 Nov 2010 23:39:08 +0100
-Subject: [PATCH 2/3] Do not build tests unless needed
-
----
- tests/Makefile.am |   12 +++++-------
- tests/runtests.py |    2 ++
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index bad15f0..5b0859a 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -1,7 +1,7 @@
- CLEANFILES =
--noinst_LTLIBRARIES = 
-+check_LTLIBRARIES = 
- if ENABLE_INTROSPECTION
--noinst_LTLIBRARIES += libregress.la libgimarshallingtests.la
-+check_LTLIBRARIES += libregress.la libgimarshallingtests.la
- 
- nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
- libregress_la_CFLAGS = $(GIO_CFLAGS) $(PYCAIRO_CFLAGS)
-@@ -46,7 +46,7 @@ gschemas.compiled: org.gnome.test.gschema.xml
- CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIMarshallingTests-1.0.typelib gschemas.compiled
- endif
- 
--noinst_LTLIBRARIES += testhelper.la
-+check_LTLIBRARIES += testhelper.la
- 
- testhelper_la_CFLAGS = -I$(top_srcdir)/gobject -I$(top_srcdir)/glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
- testhelper_la_LDFLAGS = -module -avoid-version
-@@ -66,8 +66,6 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
- 	test -L $@ || $(LN_S) .libs/$@ $@
- 
- 
--all: $(LTLIBRARIES:.la=.so)
--
- TEST_FILES_STATIC = \
- 	test_gobject.py \
- 	test_interface.py \
-@@ -109,7 +107,7 @@ EXTRA_DIST = \
- EXTRA_DIST += $(TEST_FILES_STATIC) $(TEST_FILES_GI) $(TEST_FILES_GIO)
- 
- clean-local:
--	rm -f $(LTLIBRARIES:.la=.so) file.txt~
-+	rm -f $(check_LTLIBRARIES:.la=.so) file.txt~
- 
- DBUS_LAUNCH=$(shell which dbus-launch)
- RUN_TESTS_ENV_VARS= \
-@@ -121,7 +119,7 @@ RUN_TESTS_ENV_VARS= \
- RUN_TESTS_LAUNCH=$(RUN_TESTS_ENV_VARS) $(DBUS_LAUNCH) $(EXEC_NAME) $(PYTHON) $(srcdir)/runtests.py
- 
- # run tests in separately to avoid loading static and introspection bindings in the same process
--check-local: $(LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
-+check-local: $(check_LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
- 	TEST_FILES="$(TEST_FILES_STATIC)" $(RUN_TESTS_LAUNCH)
- 	TEST_FILES="$(TEST_FILES_GI)" $(RUN_TESTS_LAUNCH)
- if BUILD_GIO
-diff --git a/tests/runtests.py b/tests/runtests.py
-index 2bb8637..4107bcf 100644
---- a/tests/runtests.py
-+++ b/tests/runtests.py
-@@ -6,6 +6,8 @@ import sys
- 
- import unittest
- 
-+# Some tests fail with translated messages.
-+os.environ["LC_ALL"] = "C"
- 
- # force untranslated messages, as we check for them in some tests
- os.environ['LC_MESSAGES'] = 'C'
--- 
-1.7.4.1
-
diff --git a/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch
deleted file mode 100644
index 65d881a43d2a..000000000000
--- a/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 2f75378f3c56f245cabdcd2c52b561dbb878db2d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 8 Apr 2011 15:43:39 +0200
-Subject: [PATCH 3/3] Enable support to build against multiple version of python
-
----
- codegen/pygobject-codegen-2.0.in |    2 +-
- gi/Makefile.am                   |    2 +-
- gio/Makefile.am                  |    2 +-
- glib/Makefile.am                 |   10 +++++-----
- gobject/Makefile.am              |    2 +-
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/codegen/pygobject-codegen-2.0.in b/codegen/pygobject-codegen-2.0.in
-index c04451b..194e5ba 100644
---- a/codegen/pygobject-codegen-2.0.in
-+++ b/codegen/pygobject-codegen-2.0.in
-@@ -4,7 +4,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- datarootdir=@datarootdir@
- datadir=@datadir@
--codegendir=@pyexecdir@/gtk-2.0/codegen
-+codegendir=$(@PYTHON@ -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, prefix='@exec_prefix@')")/gtk-2.0/codegen
- 
- PYTHONPATH=$codegendir
- export PYTHONPATH
-diff --git a/gi/Makefile.am b/gi/Makefile.am
-index 31f6c79..8690522 100644
---- a/gi/Makefile.am
-+++ b/gi/Makefile.am
-@@ -25,7 +25,7 @@ _gi_la_LDFLAGS = \
- 	-export-symbols-regex "init_gi|PyInit__gi"
- _gi_la_LIBADD = \
- 	$(GI_LIBS) \
--	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
-+	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _gi_la_SOURCES = \
- 	pygi-repository.c \
- 	pygi-repository.h \
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 6b3eb57..00e1c54 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -67,7 +67,7 @@ EXTRA_DIST += $(GIO_DEFS) $(GIO_OVERRIDES)
- gio.c: $(GIO_DEFS) $(GIO_OVERRIDES)
- _gio_la_CFLAGS = $(GIO_CFLAGS)
- _gio_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gio
--_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
-+_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _gio_la_SOURCES = \
- 	giomodule.c \
- 	pygio-utils.c \
-diff --git a/glib/Makefile.am b/glib/Makefile.am
-index e210318..df39687 100644
---- a/glib/Makefile.am
-+++ b/glib/Makefile.am
-@@ -4,7 +4,7 @@ INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -DPY_SSIZE_T_CLEAN
- pkgincludedir = $(includedir)/pygtk-2.0
- pkginclude_HEADERS = pyglib.h
- 
--lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@.la
-+lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- 
- pkgpyexecdir = $(pyexecdir)
- 
-@@ -19,9 +19,9 @@ if PLATFORM_WIN32
- common_ldflags += -no-undefined
- endif
- 
--libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS)
--libpyglib_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
--libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES = 	\
-+libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS = $(GLIB_CFLAGS)
-+libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
-+libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES = 	\
- 	pyglib.c		\
- 	pyglib.h		\
- 	pyglib-private.h 	\
-@@ -29,7 +29,7 @@ libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES = 	\
- 
- _glib_la_CFLAGS = $(GLIB_CFLAGS)
- _glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib"
--_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@.la
-+_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _glib_la_SOURCES = 	 	\
- 	glibmodule.c	 	\
- 	pygiochannel.c 	 	\
-diff --git a/gobject/Makefile.am b/gobject/Makefile.am
-index 7208329..3f9ad8e 100644
---- a/gobject/Makefile.am
-+++ b/gobject/Makefile.am
-@@ -35,7 +35,7 @@ _gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_gobject|PyInit__
- _gobject_la_LIBADD = \
- 	$(GLIB_LIBS) \
- 	$(FFI_LIBS) \
--	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
-+	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _gobject_la_SOURCES =           \
-         gobjectmodule.c         \
-         pygboxed.c              \
--- 
-1.7.4.1
-
diff --git a/dev-python/pygobject/files/pygobject-2.28.6-disable-failing-tests.patch b/dev-python/pygobject/files/pygobject-2.28.6-disable-failing-tests.patch
deleted file mode 100644
index f9d396dc4b56..000000000000
--- a/dev-python/pygobject/files/pygobject-2.28.6-disable-failing-tests.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 9d8867a7c67a14d055a0dd8db5f6a9aae5762a04 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 13 Jan 2013 19:50:14 -0500
-Subject: [PATCH] Disable failing tests
-
----
- tests/test_gio.py       | 13 ++++++++-----
- tests/test_overrides.py |  4 ++--
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/tests/test_gio.py b/tests/test_gio.py
-index e14eddf..a4d1bc7 100644
---- a/tests/test_gio.py
-+++ b/tests/test_gio.py
-@@ -650,10 +650,11 @@ class TestInputStream(unittest.TestCase):
-             else:
-                 return read_data
- 
-+    """
-     def testReadAsync(self):
-         def callback(stream, result):
--            self.assertEquals(result.get_op_res_gssize(), 7)
-             try:
-+                self.assertEquals(result.get_op_res_gssize(), 7)
-                 data = stream.read_finish(result)
-                 self.assertEquals(data, "testing")
-                 stream.close()
-@@ -694,7 +695,7 @@ class TestInputStream(unittest.TestCase):
-         self.assertRaises(TypeError, self.stream.read_async, 1024,
-                           priority=1, cancellable="bar")
-         self.assertRaises(TypeError, self.stream.read_async, 1024, 1, "bar")
--
-+    """
- 
-     # FIXME: this makes 'make check' freeze
-     def _testCloseAsync(self):
-@@ -822,10 +823,11 @@ class TestOutputStream(unittest.TestCase):
- 
-         self.assertEquals(stream.get_contents(), some_data)
- 
-+    """
-     def testWriteAsync(self):
-         def callback(stream, result):
--            self.assertEquals(result.get_op_res_gssize(), 7)
-             try:
-+                self.assertEquals(result.get_op_res_gssize(), 7)
-                 self.assertEquals(stream.write_finish(result), 7)
-                 self.failUnless(os.path.exists("outputstream.txt"))
-                 self.assertEquals(open("outputstream.txt").read(), "testing")
-@@ -861,6 +863,7 @@ class TestOutputStream(unittest.TestCase):
-         self.assertRaises(TypeError, self.stream.write_async, "foo",
-                           priority=1, cancellable="bar")
-         self.assertRaises(TypeError, self.stream.write_async, "foo", 1, "bar")
-+    """
- 
-     # FIXME: this makes 'make check' freeze
-     def _testCloseAsync(self):
-@@ -1007,7 +1010,7 @@ class TestVfs(unittest.TestCase):
- class TestVolume(unittest.TestCase):
-     def setUp(self):
-         self.monitor = gio.volume_monitor_get()
--    
-+"""    
-     def testVolumeEnumerate(self):
-         volumes = self.monitor.get_volumes()
-         self.failUnless(isinstance(volumes, list))
-@@ -1018,7 +1021,7 @@ class TestVolume(unittest.TestCase):
-                 for id in ids:
-                     if id is not None:
-                         self.failUnless(isinstance(id, str))
--
-+"""
- class TestFileInputStream(unittest.TestCase):
-     def setUp(self):
-         self._f = open("file.txt", "w+")
-diff --git a/tests/test_overrides.py b/tests/test_overrides.py
-index 47f38a3..063792d 100644
---- a/tests/test_overrides.py
-+++ b/tests/test_overrides.py
-@@ -337,13 +337,13 @@ class TestPango(unittest.TestCase):
-         desc = Pango.FontDescription('monospace')
-         self.assertEquals(desc.get_family(), 'monospace')
-         self.assertEquals(desc.get_variant(), Pango.Variant.NORMAL)
--
-+"""
-     def test_layout(self):
-         self.assertRaises(TypeError, Pango.Layout)
-         context = Pango.Context()
-         layout = Pango.Layout(context)
-         self.assertEquals(layout.get_context(), context)
--
-+"""
- class TestGdk(unittest.TestCase):
- 
-     def test_constructor(self):
--- 
-1.8.1
-
diff --git a/dev-python/pygobject/files/pygobject-2.28.6-gio-types-2.32.patch b/dev-python/pygobject/files/pygobject-2.28.6-gio-types-2.32.patch
deleted file mode 100644
index fa0adf54ad04..000000000000
--- a/dev-python/pygobject/files/pygobject-2.28.6-gio-types-2.32.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Mon, 12 Mar 2012 16:44:14 -0400
-Subject: [PATCH] gio-types.defs: change some enums to flags
-
-These flags types were originally incorrectly handled in glib as being
-enums.  That bug was fixed, but they're still enums here, leading to
-warnings about the mismatch.
-
-Change them to flags.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=668522
----
- gio/gio-types.defs |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gio/gio-types.defs b/gio/gio-types.defs
-index 331e0bc..7eee5c8 100644
---- a/gio/gio-types.defs
-+++ b/gio/gio-types.defs
-@@ -526,7 +526,7 @@
-   )
- )
- 
--(define-enum MountMountFlags
-+(define-flags MountMountFlags
-   (in-module "gio")
-   (c-name "GMountMountFlags")
-   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
-@@ -545,7 +545,7 @@
-   )
- )
- 
--(define-enum DriveStartFlags
-+(define-flags DriveStartFlags
-   (in-module "gio")
-   (c-name "GDriveStartFlags")
-   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
-@@ -770,7 +770,7 @@
-   )
- )
- 
--(define-enum SocketMsgFlags
-+(define-flags SocketMsgFlags
-   (in-module "gio")
-   (c-name "GSocketMsgFlags")
-   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
--- 
-1.7.8.5
-
diff --git a/dev-python/pygobject/files/pygobject-2.28.6-glib-2.36-class_init.patch b/dev-python/pygobject/files/pygobject-2.28.6-glib-2.36-class_init.patch
deleted file mode 100644
index b2f9b147f847..000000000000
--- a/dev-python/pygobject/files/pygobject-2.28.6-glib-2.36-class_init.patch
+++ /dev/null
@@ -1,315 +0,0 @@
-From 9456ba70fdb98b3a4eb7ee2f630182387a54ca00 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martinpitt@gnome.org>
-Date: Tue, 19 Feb 2013 15:39:56 +0100
-Subject: [PATCH] Move property and signal creation into _class_init()
-
-We must not add class interfaces after g_type_class_ref() has been called the
-first time. Move signal and property creation from pyg_type_register() into
-pyg_object_class_init(), and drop the hack of registering interfaces twice.
-
-This is a backport of commit efcb0f9fd for 2.28.x. This allows old pygtk
-applications to work with pygobject 2.28.x and glib 2.35.x.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=694108
----
- gobject/gobjectmodule.c | 177 +++++++++++++++++++-----------------------------
- 1 file changed, 70 insertions(+), 107 deletions(-)
-
-diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c
-index 2a84606..91f7315 100644
---- a/gobject/gobjectmodule.c
-+++ b/gobject/gobjectmodule.c
-@@ -312,13 +312,6 @@ pyg_object_get_property (GObject *object, guint property_id,
-     pyglib_gil_state_release(state);
- }
- 
--static void
--pyg_object_class_init(GObjectClass *class, PyObject *py_class)
--{
--    class->set_property = pyg_object_set_property;
--    class->get_property = pyg_object_get_property;
--}
--
- typedef struct _PyGSignalAccumulatorData {
-     PyObject *callable;
-     PyObject *user_data;
-@@ -484,15 +477,14 @@ override_signal(GType instance_type, const gchar *signal_name)
- }
- 
- static PyObject *
--add_signals (GType instance_type, PyObject *signals)
-+add_signals (GObjectClass *klass, PyObject *signals)
- {
-     gboolean ret = TRUE;
--    GObjectClass *oclass;
-     Py_ssize_t pos = 0;
-     PyObject *key, *value, *overridden_signals = NULL;
-+    GType instance_type = G_OBJECT_CLASS_TYPE (klass);
- 
-     overridden_signals = PyDict_New();
--    oclass = g_type_class_ref(instance_type);
-     while (PyDict_Next(signals, &pos, &key, &value)) {
- 	const gchar *signal_name;
-         gchar *signal_name_canon, *c;
-@@ -530,7 +522,6 @@ add_signals (GType instance_type, PyObject *signals)
- 	if (!ret)
- 	    break;
-     }
--    g_type_class_unref(oclass);
-     if (ret)
-         return overridden_signals;
-     else {
-@@ -800,14 +791,12 @@ pyg_param_spec_from_object (PyObject *tuple)
- }
- 
- static gboolean
--add_properties (GType instance_type, PyObject *properties)
-+add_properties (GObjectClass *klass, PyObject *properties)
- {
-     gboolean ret = TRUE;
--    GObjectClass *oclass;
-     Py_ssize_t pos = 0;
-     PyObject *key, *value;
- 
--    oclass = g_type_class_ref(instance_type);
-     while (PyDict_Next(properties, &pos, &key, &value)) {
- 	const gchar *prop_name;
- 	GType prop_type;
-@@ -873,7 +862,7 @@ add_properties (GType instance_type, PyObject *properties)
- 	Py_DECREF(slice);
- 
- 	if (pspec) {
--	    g_object_class_install_property(oclass, 1, pspec);
-+	    g_object_class_install_property(klass, 1, pspec);
- 	} else {
-             PyObject *type, *value, *traceback;
- 	    ret = FALSE;
-@@ -883,7 +872,7 @@ add_properties (GType instance_type, PyObject *properties)
-                 g_snprintf(msg, 256,
- 			   "%s (while registering property '%s' for GType '%s')",
-                PYGLIB_PyUnicode_AsString(value),
--			   prop_name, g_type_name(instance_type));
-+			   prop_name, G_OBJECT_CLASS_NAME(klass));
-                 Py_DECREF(value);
-                 value = PYGLIB_PyUnicode_FromString(msg);
-             }
-@@ -892,11 +881,63 @@ add_properties (GType instance_type, PyObject *properties)
- 	}
-     }
- 
--    g_type_class_unref(oclass);
-     return ret;
- }
- 
- static void
-+pyg_object_class_init(GObjectClass *class, PyObject *py_class)
-+{
-+    PyObject *gproperties, *gsignals, *overridden_signals;
-+    PyObject *class_dict = ((PyTypeObject*) py_class)->tp_dict;
-+
-+    class->set_property = pyg_object_set_property;
-+    class->get_property = pyg_object_get_property;
-+
-+    /* install signals */
-+    /* we look this up in the instance dictionary, so we don't
-+     * accidentally get a parent type's __gsignals__ attribute. */
-+    gsignals = PyDict_GetItemString(class_dict, "__gsignals__");
-+    if (gsignals) {
-+	if (!PyDict_Check(gsignals)) {
-+	    PyErr_SetString(PyExc_TypeError,
-+			    "__gsignals__ attribute not a dict!");
-+	    return;
-+	}
-+	if (!(overridden_signals = add_signals(class, gsignals))) {
-+	    return;
-+	}
-+        if (PyDict_SetItemString(class_dict, "__gsignals__",
-+				 overridden_signals)) {
-+            return;
-+        }
-+        Py_DECREF(overridden_signals);
-+
-+        PyDict_DelItemString(class_dict, "__gsignals__");
-+    } else {
-+	PyErr_Clear();
-+    }
-+
-+    /* install properties */
-+    /* we look this up in the instance dictionary, so we don't
-+     * accidentally get a parent type's __gproperties__ attribute. */
-+    gproperties = PyDict_GetItemString(class_dict, "__gproperties__");
-+    if (gproperties) {
-+	if (!PyDict_Check(gproperties)) {
-+	    PyErr_SetString(PyExc_TypeError,
-+			    "__gproperties__ attribute not a dict!");
-+	    return;
-+	}
-+	if (!add_properties(class, gproperties)) {
-+	    return;
-+	}
-+	PyDict_DelItemString(class_dict, "__gproperties__");
-+	/* Borrowed reference. Py_DECREF(gproperties); */
-+    } else {
-+	PyErr_Clear();
-+    }
-+}
-+
-+static void
- pyg_register_class_init(GType gtype, PyGClassInitFunc class_init)
- {
-     GSList *list;
-@@ -1068,7 +1109,7 @@ pygobject__g_instance_init(GTypeInstance   *instance,
-  */
- static void
- pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
--                        PyObject *bases, gboolean new_interfaces,
-+                        PyObject *bases,
-                         GType *parent_interfaces, guint n_parent_interfaces)
- {
-     int i;
-@@ -1082,7 +1123,6 @@ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
-         guint k;
-         PyObject *base = PyTuple_GET_ITEM(bases, i);
-         GType itype;
--        gboolean is_new = TRUE;
-         const GInterfaceInfo *iinfo;
-         GInterfaceInfo iinfo_copy;
- 
-@@ -1099,16 +1139,6 @@ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
-         if (!G_TYPE_IS_INTERFACE(itype))
-             continue;
- 
--        for (k = 0; k < n_parent_interfaces; ++k) {
--            if (parent_interfaces[k] == itype) {
--                is_new = FALSE;
--                break;
--            }
--        }
--
--        if ((new_interfaces && !is_new) || (!new_interfaces && is_new))
--            continue;
--
-         iinfo = pyg_lookup_interface_info(itype);
-         if (!iinfo) {
-             gchar *error;
-@@ -1129,7 +1159,7 @@ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
- int
- pyg_type_register(PyTypeObject *class, const char *type_name)
- {
--    PyObject *gtype, *gsignals, *gproperties, *overridden_signals;
-+    PyObject *gtype;
-     GType parent_type, instance_type;
-     GType *parent_interfaces;
-     guint n_parent_interfaces;
-@@ -1216,88 +1246,22 @@ pyg_type_register(PyTypeObject *class, const char *type_name)
-     }
- 
-     /*
--     * Note: Interfaces to be implemented are searched twice.  First
--     * we register interfaces that are already implemented by a parent
--     * type.  The second time, the remaining interfaces are
--     * registered, i.e. the ones that are not implemented by a parent
--     * type.  In between these two loops, properties and signals are
--     * registered.  It has to be done this way, in two steps,
--     * otherwise glib will complain.  If registering all interfaces
--     * always before properties, you get an error like:
--     *
--     *    ../gobject:121: Warning: Object class
--     *    test_interface+MyObject doesn't implement property
--     *    'some-property' from interface 'TestInterface'
--     *
--     * If, on the other hand, you register interfaces after
--     * registering the properties, you get something like:
--     *
--     *     ../gobject:121: Warning: cannot add interface type
--     *    `TestInterface' to type `test_interface+MyUnknown', since
--     *    type `test_interface+MyUnknown' already conforms to
--     *    interface
--     *
--     * This looks like a GLib quirk, but no bug has been filed
--     * upstream.  However we have a unit test for this particular
--     * problem, which can be found in test_interfaces.py, class
--     * TestInterfaceImpl.
-+     * Note, all interfaces need to be registered before the first
-+     * g_type_class_ref(), see bug #686149.
-      *
-      * See also comment above pyg_type_add_interfaces().
-      */
--    pyg_type_add_interfaces(class, instance_type, class->tp_bases, FALSE,
-+    pyg_type_add_interfaces(class, instance_type, class->tp_bases,
-                             parent_interfaces, n_parent_interfaces);
- 
--    /* we look this up in the instance dictionary, so we don't
--     * accidentally get a parent type's __gsignals__ attribute. */
--    gsignals = PyDict_GetItemString(class->tp_dict, "__gsignals__");
--    if (gsignals) {
--	if (!PyDict_Check(gsignals)) {
--	    PyErr_SetString(PyExc_TypeError,
--			    "__gsignals__ attribute not a dict!");
--            g_free(parent_interfaces);
--	    return -1;
--	}
--	if (!(overridden_signals = add_signals(instance_type, gsignals))) {
--            g_free(parent_interfaces);
--	    return -1;
--	}
--        if (PyDict_SetItemString(class->tp_dict, "__gsignals__",
--				 overridden_signals)) {
--            g_free(parent_interfaces);
--            return -1;
--        }
--        Py_DECREF(overridden_signals);
--    } else {
--	PyErr_Clear();
--    }
- 
--    /* we look this up in the instance dictionary, so we don't
--     * accidentally get a parent type's __gsignals__ attribute. */
--    gproperties = PyDict_GetItemString(class->tp_dict, "__gproperties__");
--    if (gproperties) {
--	if (!PyDict_Check(gproperties)) {
--	    PyErr_SetString(PyExc_TypeError,
--			    "__gproperties__ attribute not a dict!");
--            g_free(parent_interfaces);
--	    return -1;
--	}
--	if (!add_properties(instance_type, gproperties)) {
--            g_free(parent_interfaces);
--	    return -1;
--	}
--	PyDict_DelItemString(class->tp_dict, "__gproperties__");
--	/* Borrowed reference. Py_DECREF(gproperties); */
--    } else {
--	PyErr_Clear();
-+    gclass = g_type_class_ref(instance_type);
-+    if (PyErr_Occurred() != NULL) {
-+        g_type_class_unref(gclass);
-+        g_free(parent_interfaces);
-+        return -1;
-     }
- 
--    /* Register new interfaces, that are _not_ already defined by
--     * the parent type.  FIXME: See above.
--     */
--    pyg_type_add_interfaces(class, instance_type, class->tp_bases, TRUE,
--                            parent_interfaces, n_parent_interfaces);
--
--    gclass = g_type_class_ref(instance_type);
-     if (pyg_run_class_init(instance_type, gclass, class)) {
-         g_type_class_unref(gclass);
-         g_free(parent_interfaces);
-@@ -1306,9 +1270,8 @@ pyg_type_register(PyTypeObject *class, const char *type_name)
-     g_type_class_unref(gclass);
-     g_free(parent_interfaces);
- 
--    if (gsignals)
--        PyDict_DelItemString(class->tp_dict, "__gsignals__");
--
-+    if (PyErr_Occurred() != NULL)
-+        return -1;
-     return 0;
- }
- 
--- 
-1.8.3.2
-
diff --git a/dev-python/pygobject/files/pygobject-2.28.6-set_qdata.patch b/dev-python/pygobject/files/pygobject-2.28.6-set_qdata.patch
deleted file mode 100644
index 55376b59d829..000000000000
--- a/dev-python/pygobject/files/pygobject-2.28.6-set_qdata.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 42d871eb0b08ee6d55e95cc7e4b90844919555b9 Mon Sep 17 00:00:00 2001
-From: Ivan Stankovic <ivan.stankovic@avl.com>
-Date: Tue, 21 Feb 2012 12:24:58 +0100
-Subject: [PATCH] Fix set_qdata warning on accessing NULL gobject property
-
-https://bugzilla.gnome.org/show_bug.cgi?id=661155
----
- gobject/pygobject.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/gobject/pygobject.c b/gobject/pygobject.c
-index 6c2f06c..70dc89a 100644
---- a/gobject/pygobject.c
-+++ b/gobject/pygobject.c
-@@ -991,7 +991,9 @@ pygobject_new(GObject *obj)
- PyObject *
- pygobject_new_sunk(GObject *obj)
- {
--    g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1));
-+    if (obj)
-+       g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1));
-+       
-     return pygobject_new_full(obj, TRUE, NULL);
- }
- 
--- 
-1.7.8.5
-
diff --git a/dev-python/pygobject/files/pygobject-2.28.6-tests-no-introspection.patch b/dev-python/pygobject/files/pygobject-2.28.6-tests-no-introspection.patch
deleted file mode 100644
index d7e0c68e0dca..000000000000
--- a/dev-python/pygobject/files/pygobject-2.28.6-tests-no-introspection.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9c8ec7495e9e73855dc284be293828572f408c92 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 25 Dec 2012 00:26:05 -0500
-Subject: [PATCH] Do not run introspection tests when building with
- introspection disabled
-
----
- tests/Makefile.am | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index e60bad5..3a0d1b7 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -120,9 +120,14 @@ RUN_TESTS_ENV_VARS= \
- RUN_TESTS_LAUNCH=$(RUN_TESTS_ENV_VARS) $(DBUS_LAUNCH) $(EXEC_NAME) $(PYTHON) $(srcdir)/runtests.py
- 
- # run tests in separately to avoid loading static and introspection bindings in the same process
--check-local: $(check_LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
-+if ENABLE_INTROSPECTION
-+CHECK_LOCAL_INTROSPECTION_REQ = Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
-+endif
-+check-local: $(check_LTLIBRARIES:.la=.so) $(CHECK_LOCAL_INTROSPECTION_REQ)
- 	TEST_FILES="$(TEST_FILES_STATIC)" $(RUN_TESTS_LAUNCH)
-+if ENABLE_INTROSPECTION
- 	TEST_FILES="$(TEST_FILES_GI)" $(RUN_TESTS_LAUNCH)
-+endif
- if BUILD_GIO
- 	TEST_FILES="$(TEST_FILES_GIO)" $(RUN_TESTS_LAUNCH)
- endif 
--- 
-1.8.0.2
-
diff --git a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
deleted file mode 100644
index 82089da77515..000000000000
--- a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-r1 virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="https://www.pygtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-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="examples libffi test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
-	dev-lang/python-exec:2
-	libffi? ( dev-libs/libffi:= )
-	${PYTHON_DEPS}
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? (
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/pygtk-2.23"
-
-src_prepare() {
-	# Fix FHS compliance, see upstream bug #535524
-	epatch "${FILESDIR}/${PN}-2.28.3-fix-codegen-location.patch"
-
-	# Do not build tests if unneeded, bug #226345
-	epatch "${FILESDIR}/${PN}-2.28.3-make_check.patch"
-
-	# Support installation for multiple Python versions, upstream bug #648292
-	epatch "${FILESDIR}/${PN}-2.28.3-support_multiple_python_versions.patch"
-
-	# Disable tests that fail
-	epatch "${FILESDIR}/${P}-disable-failing-tests.patch"
-
-	# Disable introspection tests when we build with --disable-introspection
-	epatch "${FILESDIR}/${P}-tests-no-introspection.patch"
-
-	# Fix warning spam
-	epatch "${FILESDIR}/${P}-set_qdata.patch"
-	epatch "${FILESDIR}/${P}-gio-types-2.32.patch"
-
-	# Fix glib-2.36 compatibility, bug #486602
-	epatch "${FILESDIR}/${P}-glib-2.36-class_init.patch"
-
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
-		configure.ac || die
-
-	eautoreconf
-	gnome2_src_prepare
-
-	python_copy_sources
-
-	prepare_shebangs() {
-		# Make a backup with unconverted shebangs to keep python_doscript happy
-		cp codegen/codegen.py pygobject-codegen-2.0
-		sed -e "s%#! \?/usr/bin/env python%#!${PYTHON}%" \
-			-i codegen/*.py || die "shebang convertion failed"
-	}
-	python_foreach_impl run_in_build_dir prepare_shebangs
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-	# --disable-introspection and --disable-cairo because we use pygobject:3
-	# for introspection support
-	G2CONF="${G2CONF}
-		--disable-introspection
-		--disable-cairo
-		$(use_with libffi ffi)"
-
-	python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-# FIXME: With python multiple ABI support, tests return 1 even when they pass
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-
-	testing() {
-		export XDG_CACHE_HOME="${T}/${EPYTHON}"
-		run_in_build_dir Xemake -j1 check
-		unset XDG_CACHE_HOME
-	}
-	python_foreach_impl testing
-	unset GIO_USE_VFS
-}
-
-src_install() {
-	installing() {
-		local f prefixed_sitedir
-
-		gnome2_src_install
-
-		python_doscript pygobject-codegen-2.0
-
-		# Don't keep multiple copies of pygobject-codegen-2.0 script
-		prefixed_sitedir=$(python_get_sitedir)
-		dosym "${prefixed_sitedir#${EPREFIX}}/gtk-2.0/codegen/codegen.py" "/usr/lib/python-exec/${EPYTHON}/pygobject-codegen-2.0"
-	}
-	python_foreach_impl run_in_build_dir installing
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null
-}
diff --git a/dev-python/pypam/pypam-0.5.0-r5.ebuild b/dev-python/pypam/pypam-0.5.0-r6.ebuild
index 2ab45d1b266a..861a83352897 100644
--- a/dev-python/pypam/pypam-0.5.0-r5.ebuild
+++ b/dev-python/pypam/pypam-0.5.0-r6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-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/pytest-forked/pytest-forked-1.3.0.ebuild b/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild
index 414c180f23d1..e3f0f5e83841 100644
--- a/dev-python/pytest-forked/pytest-forked-1.3.0.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.3.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/pytest-httpbin/pytest-httpbin-1.0.0.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.ebuild
index 52709c214b95..82ee6c552b76 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-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 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild
index 1a1be5bf1793..5f036cb928e4 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.34.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/pytest-xprocess/pytest-xprocess-0.13.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.13.1-r1.ebuild
index d65489b26d2d..8d6659608981 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.13.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
 
diff --git a/dev-python/pytest/pytest-4.6.11.ebuild b/dev-python/pytest/pytest-4.6.11.ebuild
index b128cc712f8b..ea2e25bebd2a 100644
--- a/dev-python/pytest/pytest-4.6.11.ebuild
+++ b/dev-python/pytest/pytest-4.6.11.ebuild
@@ -15,8 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+RESTRICT="test"
 
 # When bumping, please check setup.py for the proper py version
 PY_VER="1.5.0"
@@ -41,23 +40,6 @@ 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"
@@ -66,19 +48,5 @@ 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-dateutil/python-dateutil-2.8.1-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.1-r2.ebuild
index 38df458dc932..adbf47e12bb8 100644
--- a/dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.8.1-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
 
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index ae6769da08aa..33e981c603bf 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1 +1,2 @@
 DIST python-xlib-0.27.tar.bz2 207119 BLAKE2B f34f5df34a64557d66f216bd03fb79b22364faab86e82761f43bf7c7cc0af744f6fa9a10b7a39fa42072c8ee0f25cebe3a8324471ecbb41dc3f33ed339875942 SHA512 6a25e796a2c522185e4df027bce8f423432dcbb5c4f74b96eb56e3d0e6e3a5be7570a872e479bbd556ef07b437043f7d97cdb2c21a0bb408e1cded44d2d9fa8f
+DIST python-xlib-0.28.tar.bz2 203306 BLAKE2B f8916fd0c62c8b4546f1c381fc9f13b1e86c4ae6da06434b666f4952ae6a28f06389b006d48dc3139f9018cc3c126ab8316b968e64da7b2f4d22bcc2a2c83bb9 SHA512 69c17486ffc465c2f5ca740761f52191b4ba86b1e11b047f146f949d8431a0ad7fb1007b7fe29fd659dc2e7be6facc9ea1d7b1e87cd534ae425555f0d512c4c2
diff --git a/dev-python/python-xlib/python-xlib-0.28.ebuild b/dev-python/python-xlib/python-xlib-0.28.ebuild
new file mode 100644
index 000000000000..ee6169d9ffd3
--- /dev/null
+++ b/dev-python/python-xlib/python-xlib-0.28.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="A fully functional X client library for Python, written in Python"
+HOMEPAGE="https://github.com/python-xlib/python-xlib"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( sys-apps/texinfo )"
+
+# DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_tests unittest
+
+python_compile_all() {
+	use doc && emake -C doc/info
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_install_all() {
+	use doc && doinfo doc/info/*.info
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyusb/pyusb-1.0.2.ebuild b/dev-python/pyusb/pyusb-1.0.2-r1.ebuild
index 9a515ecba9f6..83ad2f70ee05 100644
--- a/dev-python/pyusb/pyusb-1.0.2.ebuild
+++ b/dev-python/pyusb/pyusb-1.0.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} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyxdg/pyxdg-0.26-r1.ebuild b/dev-python/pyxdg/pyxdg-0.26-r2.ebuild
index 8d1d7f7a2ae3..94de62c59600 100644
--- a/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.26-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/regex/regex-2020.4.4.ebuild b/dev-python/regex/regex-2020.4.4-r1.ebuild
index 25037adbf0a9..1f8618bf93e9 100644
--- a/dev-python/regex/regex-2020.4.4.ebuild
+++ b/dev-python/regex/regex-2020.4.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 flag-o-matic
 
diff --git a/dev-python/requests/requests-2.24.0.ebuild b/dev-python/requests/requests-2.24.0-r1.ebuild
index 7c773d9ab491..866700bbeef5 100644
--- a/dev-python/requests/requests-2.24.0.ebuild
+++ b/dev-python/requests/requests-2.24.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/scripttest/scripttest-1.3.0.ebuild b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
index 3976073b9c40..9b47ccbe6c8b 100644
--- a/dev-python/scripttest/scripttest-1.3.0.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.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/service_identity/service_identity-18.1.0.ebuild b/dev-python/service_identity/service_identity-18.1.0-r1.ebuild
index 34de4c06616a..d6f5dd8e842e 100644
--- a/dev-python/service_identity/service_identity-18.1.0.ebuild
+++ b/dev-python/service_identity/service_identity-18.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
 
@@ -22,8 +22,6 @@ RDEPEND="
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
 	dev-python/attrs[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/setuptools-git/setuptools-git-1.2-r1.ebuild b/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
index 9d9c2edf3e22..9829c49189fa 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2-r1.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2-r2.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/snappy/snappy-0.5.1.ebuild b/dev-python/snappy/snappy-0.5.1-r1.ebuild
index 56dbc6a27b35..41f7dc4da097 100644
--- a/dev-python/snappy/snappy-0.5.1.ebuild
+++ b/dev-python/snappy/snappy-0.5.1-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
 
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index 7bfa319b971e..74f6caad1353 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -1,2 +1 @@
-DIST tap.py-2.6.2.tar.gz 148974 BLAKE2B 5e33c7af37c2533b4fd5b45684cc93793027b50c09fde34a4a8ff80c58510a50f5f21295852c14bef506c783cae6293bae521c5fdd696752c221cc49c7d2713e SHA512 2cd0b1b69f155970cf2367766cca96bc8391e074edc754531f0511c3dd027a0a8e95bb8481b627b2610ec9b5f685ebff95f07f5f97eb31c321d96590286be803
 DIST tap.py-3.0.tar.gz 141764 BLAKE2B 0d65d9c0691deef31475cf6db172e41340e112cacda240d32a55338665632613f09c98d0c7dcfbf28be997079f789054d71f1059fb74228507041163df9710a1 SHA512 58b0928dd28ba525d9bb5edfab5606cb67af15e75a5f03d2648280d30377e2aa23b314ed41dba3b09b7dfa1aefead53674df43b6087e552b9aa937472838e7db
diff --git a/dev-python/tappy/files/tappy-2.6.2-yaml.patch b/dev-python/tappy/files/tappy-2.6.2-yaml.patch
deleted file mode 100644
index 791ac3bc7b92..000000000000
--- a/dev-python/tappy/files/tappy-2.6.2-yaml.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 116aa55f5d1ae1f82604ae377e07a751f61bb651 Mon Sep 17 00:00:00 2001
-From: Matt Layman <matthewlayman@gmail.com>
-Date: Sat, 14 Dec 2019 21:20:22 -0500
-Subject: [PATCH] Use PyYAML safe loader and remove deprecation warning. (#103)
-
-Fixes #102
----
- setup.py    | 2 +-
- tap/line.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 2d001da..4c59879 100644
---- a/setup.py
-+++ b/setup.py
-@@ -63,7 +63,7 @@ def run(self):
-         zip_safe=False,
-         platforms="any",
-         install_requires=[],
--        extras_require={"yaml": ["more-itertools", "PyYAML"]},
-+        extras_require={"yaml": ["more-itertools", "PyYAML>=5.1"]},
-         classifiers=[
-             "Development Status :: 5 - Production/Stable",
-             "Environment :: Console",
-diff --git a/tap/line.py b/tap/line.py
-index 0d44ff8..fc8f8e2 100644
---- a/tap/line.py
-+++ b/tap/line.py
-@@ -96,7 +96,7 @@ def yaml_block(self):
-         """
-         if LOAD_YAML and self._yaml_block is not None:
-             try:
--                yaml_dict = yaml.load(self._yaml_block)
-+                yaml_dict = yaml.load(self._yaml_block, Loader=yaml.SafeLoader)
-                 return yaml_dict
-             except yaml.error.YAMLError:
-                 print("Error parsing yaml block. Check formatting.")
diff --git a/dev-python/tappy/tappy-2.6.2.ebuild b/dev-python/tappy/tappy-2.6.2.ebuild
deleted file mode 100644
index ed1844c449d3..000000000000
--- a/dev-python/tappy/tappy-2.6.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
-inherit distutils-r1
-
-MY_PN=tap.py
-DESCRIPTION="Test Anything Protocol (TAP) tools"
-HOMEPAGE="https://github.com/python-tap/tappy https://pypi.org/project/tap.py/"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S=${WORKDIR}/${MY_PN}-${PV}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="yaml"
-
-RDEPEND="
-	yaml? (
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/mock[${PYTHON_USEDEP}]
-		' -2)
-	)"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-yaml.patch
-)
diff --git a/dev-python/trustme/trustme-0.6.0.ebuild b/dev-python/trustme/trustme-0.6.0-r1.ebuild
index 76d1ac680fe2..603a2f23946c 100644
--- a/dev-python/trustme/trustme-0.6.0.ebuild
+++ b/dev-python/trustme/trustme-0.6.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
 
 DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
@@ -15,14 +15,12 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' -2 )"
+	dev-python/idna[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' -2 )
 	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/ttystatus/ttystatus-0.36.ebuild b/dev-python/ttystatus/ttystatus-0.36.ebuild
index 822135dcc2da..dd20b044eb98 100644
--- a/dev-python/ttystatus/ttystatus-0.36.ebuild
+++ b/dev-python/ttystatus/ttystatus-0.36.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="ncurses"
 
 inherit distutils-r1
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
index d5f1d28b1c71..2abe758adf11 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.6-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/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2-r1.ebuild
index 766b7b1c143e..cda42d1b9828 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2-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 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -25,9 +25,6 @@ RDEPEND="
 	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/ipaddress[${PYTHON_USEDEP}]
-	' -2)
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/urllib3/urllib3-1.25.10.ebuild b/dev-python/urllib3/urllib3-1.25.10-r1.ebuild
index d1bb758c6978..e4b88f828bf4 100644
--- a/dev-python/urllib3/urllib3-1.25.10.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.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 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -25,9 +25,6 @@ RDEPEND="
 	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/ipaddress[${PYTHON_USEDEP}]
-	' -2)
 	brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
 "
 BDEPEND="
@@ -64,11 +61,6 @@ python_test() {
 	local -x CI=1
 	# FIXME: get tornado ported
 	case ${EPYTHON} in
-		python2*)
-			ewarn "Tests are being skipped for Python 2 in order to reduce the number"
-			ewarn "of circular dependencies for Python 2 removal.  Please test"
-			ewarn "manually in a virtualenv."
-			;;
 		python3*)
 			pytest -vv || die "Tests fail with ${EPYTHON}"
 			;;
diff --git a/dev-python/utidylib/utidylib-0.6.ebuild b/dev-python/utidylib/utidylib-0.6-r1.ebuild
index 3944d30af39a..d8efccd598d8 100644
--- a/dev-python/utidylib/utidylib-0.6.ebuild
+++ b/dev-python/utidylib/utidylib-0.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} )
 
 MY_P="uTidylib-${PV}"
 inherit distutils-r1
diff --git a/dev-python/werkzeug/werkzeug-1.0.1.ebuild b/dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild
index cd546bf1b73b..139c6a761004 100644
--- a/dev-python/werkzeug/werkzeug-1.0.1.ebuild
+++ b/dev-python/werkzeug/werkzeug-1.0.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/zstandard/zstandard-0.12.0.ebuild b/dev-python/zstandard/zstandard-0.12.0-r1.ebuild
index 8bc9fc09b3d8..b33a8a1c0014 100644
--- a/dev-python/zstandard/zstandard-0.12.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.12.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} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zstandard/zstandard-0.14.0.ebuild b/dev-python/zstandard/zstandard-0.14.0-r1.ebuild
index 6fbc44885d0b..204c296ff864 100644
--- a/dev-python/zstandard/zstandard-0.14.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.14.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} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zstandard/zstandard-0.8.1.ebuild b/dev-python/zstandard/zstandard-0.8.1-r1.ebuild
index ad9b0f6ff71a..e0e1e55c2b07 100644
--- a/dev-python/zstandard/zstandard-0.8.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.8.1-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