Updating liguros repo

51 files changed, 134 insertions, 214 deletions

diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
index a047bbbf82b0..9313ec901ef5 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-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} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Private sip module for PyQt5"
@@ -50,10 +50,6 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.23.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild
index eab2d161878f..c61529a6f32a 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.23.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.23-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} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Private sip module for PyQt5"
@@ -50,10 +50,6 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
diff --git a/dev-python/PyQt5/PyQt5-5.14.2.ebuild b/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild
index 6b80e9f1f794..6f47872f089c 100644
--- a/dev-python/PyQt5/PyQt5-5.14.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.14.2-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} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
@@ -54,11 +54,7 @@ REQUIRED_USE="
 # Minimal supported version of Qt.
 QT_PV="5.12:5"
 
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/enum34[${PYTHON_USEDEP}]
-	' -2)
+RDEPEND="${PYTHON_DEPS}
 	>=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
@@ -156,13 +152,8 @@ src_configure() {
 		"${myconf[@]}" || die
 
 		# Fix parallel install failure
-		if python_is_python3; then
-			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
-				${PN}.pro || die
-		else
-			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \
-				${PN}.pro || die
-		fi
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
+			${PN}.pro || die
 
 		# Run eqmake to respect toolchain and build flags
 		eqmake5 -recursive ${PN}.pro
@@ -187,11 +178,7 @@ src_install() {
 		done
 
 		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
+		rm -r "${uic_dir}"/port_v2 || die
 
 		multibuild_merge_root "${tmp_root}" "${D}"
 		python_optimize
diff --git a/dev-python/PyQt5/PyQt5-5.15.0.ebuild b/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild
index ae0ffbe7b6ad..46c99c6e00aa 100644
--- a/dev-python/PyQt5/PyQt5-5.15.0.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.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 multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
@@ -54,11 +54,7 @@ REQUIRED_USE="
 # Minimal supported version of Qt.
 QT_PV="5.12:5"
 
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/enum34[${PYTHON_USEDEP}]
-	' -2)
+RDEPEND="${PYTHON_DEPS}
 	>=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
@@ -156,13 +152,8 @@ src_configure() {
 		"${myconf[@]}" || die
 
 		# Fix parallel install failure
-		if python_is_python3; then
-			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
-				${PN}.pro || die
-		else
-			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \
-				${PN}.pro || die
-		fi
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
+			${PN}.pro || die
 
 		# Run eqmake to respect toolchain and build flags
 		eqmake5 -recursive ${PN}.pro
@@ -187,11 +178,7 @@ src_install() {
 		done
 
 		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
+		rm -r "${uic_dir}"/port_v2 || die
 
 		multibuild_merge_root "${tmp_root}" "${D}"
 		python_optimize
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
index c75086b36a94..e86e336a469d 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.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 python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QtWebEngine"
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
index 42b5aa1f89ea..745c89b607f8 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.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 python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QtWebEngine"
diff --git a/dev-python/alabaster/alabaster-0.7.12.ebuild b/dev-python/alabaster/alabaster-0.7.12.ebuild
index 3db4ca3feba8..86584133eccb 100644
--- a/dev-python/alabaster/alabaster-0.7.12.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.12.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/argcomplete/argcomplete-1.11.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
index a8805597e32e..61d48bd03a8d 100644
--- a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/backports-os/backports-os-0.1.1.ebuild b/dev-python/backports-os/backports-os-0.1.1.ebuild
index 5a7d9f21659f..15dfb9af414d 100644
--- a/dev-python/backports-os/backports-os-0.1.1.ebuild
+++ b/dev-python/backports-os/backports-os-0.1.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
 
 DESCRIPTION="Backport of new features in Python's os module"
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
index 4f96634c2be6..95a282d1b2d3 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 # It is the developer's intention that backports.unittest_mock will be
 # used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild b/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
index 3792986a38e5..5d72a235db3f 100644
--- a/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
+++ b/dev-python/backports-weakref/backports-weakref-1.0_p1.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/bareos/Manifest b/dev-python/bareos/Manifest
index f8e008f663e3..4f136daa4464 100644
--- a/dev-python/bareos/Manifest
+++ b/dev-python/bareos/Manifest
@@ -1 +1 @@
-DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d SHA512 cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6
+DIST bareos-19.2.8.tar.gz 12604929 BLAKE2B c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302 SHA512 60bbbbd949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5
diff --git a/dev-python/bareos/bareos-19.2.7.ebuild b/dev-python/bareos/bareos-19.2.8.ebuild
index 64d3d91bc00b..74d1f8b24f15 100644
--- a/dev-python/bareos/bareos-19.2.7.ebuild
+++ b/dev-python/bareos/bareos-19.2.8.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
 
 DESCRIPTION="python bindings for bareos network backup suite"
diff --git a/dev-python/bsddb3/bsddb3-6.2.7.ebuild b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
index a834cf962de6..5f683c40cef4 100644
--- a/dev-python/bsddb3/bsddb3-6.2.7.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
index c00b2da88a9b..86a974f7268a 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/constantly/metadata.xml b/dev-python/constantly/metadata.xml
index ae3a420e422a..87c4cf4f1770 100644
--- a/dev-python/constantly/metadata.xml
+++ b/dev-python/constantly/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>twisted-python@twistedmatrix.com</email>
diff --git a/dev-python/ctypesgen/Manifest b/dev-python/ctypesgen/Manifest
index d0814d56c0ec..fe3c67a77500 100644
--- a/dev-python/ctypesgen/Manifest
+++ b/dev-python/ctypesgen/Manifest
@@ -1 +1,2 @@
 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-1.0.2.ebuild b/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
new file mode 100644
index 000000000000..d1eadbf05f0e
--- /dev/null
+++ b/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pkg compiles fine with py3_{8,9} but tests fail
+# https://github.com/davidjamesca/ctypesgen/issues/90
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper generator for ctypes"
+HOMEPAGE="https://github.com/davidjamesca/ctypesgen"
+SRC_URI="https://github.com/davidjamesca/ctypesgen/archive/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}-${PN}-${PV}"
+
+python_test() {
+	"${PYTHON}" "${PN}/test/testsuite.py" || die "Test ${f} fails with ${EPYTHON}"
+}
diff --git a/dev-python/defusedxml/defusedxml-0.6.0.ebuild b/dev-python/defusedxml/defusedxml-0.6.0.ebuild
index e32261652694..42ae362926bc 100644
--- a/dev-python/defusedxml/defusedxml-0.6.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.6.0.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="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild b/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
index 2401008db4aa..528e76422854 100644
--- a/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.7.0_rc1.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="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/docopt/docopt-0.6.2-r3.ebuild b/dev-python/docopt/docopt-0.6.2-r3.ebuild
index 442fe2371b5d..aa47b70fcf02 100644
--- a/dev-python/docopt/docopt-0.6.2-r3.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/empy/empy-3.3.3.ebuild b/dev-python/empy/empy-3.3.3.ebuild
index 614f5b797956..575dc9c28c20 100644
--- a/dev-python/empy/empy-3.3.3.ebuild
+++ b/dev-python/empy/empy-3.3.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fields/fields-5.0.0-r2.ebuild b/dev-python/fields/fields-5.0.0-r2.ebuild
index 766f8c794553..831c3a8e0ede 100644
--- a/dev-python/fields/fields-5.0.0-r2.ebuild
+++ b/dev-python/fields/fields-5.0.0-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/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
index bb77acacca56..4b3250045f4f 100644
--- a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="Flask-Sphinx-Themes"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx Themes for Flask related projects and Flask itself"
diff --git a/dev-python/gst-python/gst-python-1.14.1-r1.ebuild b/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
index a382ff07674e..64cf9aad4372 100644
--- a/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
+++ b/dev-python/gst-python/gst-python-1.14.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 ltprune python-r1 xdg-utils
 
diff --git a/dev-python/gst-python/gst-python-1.16.2.ebuild b/dev-python/gst-python/gst-python-1.16.2.ebuild
index 65d7a79134d6..d404f63fb70e 100644
--- a/dev-python/gst-python/gst-python-1.16.2.ebuild
+++ b/dev-python/gst-python/gst-python-1.16.2.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 meson python-r1 xdg-utils
 
diff --git a/dev-python/jsonschema/jsonschema-3.2.0.ebuild b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
index 5ca988eec5a9..4d3624dbdbb2 100644
--- a/dev-python/jsonschema/jsonschema-3.2.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.2.0.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/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r2.ebuild
index a4f19edf8a84..4d925d88348f 100644
--- a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
+++ b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r2.ebuild
@@ -23,8 +23,8 @@ S=${WORKDIR}/${MY_P}
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="cairo excel gtk3 latex qt5 test tk wxwidgets"
-REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk wxwidgets )"
+IUSE="cairo excel gtk3 latex test tk wxwidgets"
+REQUIRED_USE="test? ( cairo gtk3 latex tk wxwidgets )"
 
 RESTRICT="!test? ( test )"
 
@@ -77,8 +77,7 @@ RDEPEND="${COMMON_DEPEND}
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-xetex
-	)
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )"
+	)"
 
 # A few C++ source files are written to srcdir.
 # Other than that, the ebuild shall be fit for out-of-source build.
@@ -157,9 +156,10 @@ python_configure() {
 		pysideagg = False
 		qt4 = False
 		qt4agg = False
+		qt5 = False
+		qt5agg = False
 		$(use_setup cairo)
 		$(use_setup gtk3)
-		$(use_setup qt5)
 		$(use_setup tk)
 	EOF
 
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
index e1586bbb4eb9..4729c742cff0 100644
--- a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets"
+IUSE="cairo doc excel examples gtk3 latex test tk wxwidgets"
 RESTRICT="!test? ( test )"
 
 PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	doc? ( ${PY2_FLAGS} )
 	excel? ( ${PY2_FLAGS} )
 	wxwidgets? ( ${PY2_FLAGS} )
-	test? ( cairo gtk3 latex qt5 tk wxwidgets )"
+	test? ( cairo gtk3 latex tk wxwidgets )"
 
 # #456704 -- a lot of py2-only deps
 PY2_USEDEP=$(python_gen_usedep python2_7)
@@ -94,8 +94,7 @@ RDEPEND="${COMMON_DEPEND}
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-xetex
-	)
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )"
+	)"
 
 # A few C++ source files are written to srcdir.
 # Other than that, the ebuild shall be fit for out-of-source build.
@@ -172,9 +171,10 @@ python_configure() {
 		pysideagg = False
 		qt4 = False
 		qt4agg = False
+		qt5 = False
+		qt5agg = False
 		$(use_setup cairo)
 		$(use_setup gtk3)
-		$(use_setup qt5)
 		$(use_setup tk)
 	EOF
 
diff --git a/dev-python/matplotlib/matplotlib-2.2.4.ebuild b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
index 83d6e6dbda08..9f37f1237e6e 100644
--- a/dev-python/matplotlib/matplotlib-2.2.4.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
@@ -19,13 +19,13 @@ SLOT="0"
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets"
+IUSE="cairo doc excel examples gtk3 latex test tk wxwidgets"
 RESTRICT="!test? ( test )"
 
 PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
 REQUIRED_USE="
 	wxwidgets? ( ${PY2_FLAGS} )
-	test? ( cairo gtk3 latex qt5 tk wxwidgets )"
+	test? ( cairo gtk3 latex tk wxwidgets )"
 
 # #456704 -- a lot of py2-only deps
 PY2_USEDEP=$(python_gen_usedep python2_7)
@@ -93,8 +93,7 @@ RDEPEND="${COMMON_DEPEND}
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-xetex
-	)
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )"
+	)"
 
 # A few C++ source files are written to srcdir.
 # Other than that, the ebuild shall be fit for out-of-source build.
@@ -174,9 +173,10 @@ python_configure() {
 		pysideagg = False
 		qt4 = False
 		qt4agg = False
+		qt5 = False
+		qt5agg = False
 		$(use_setup cairo)
 		$(use_setup gtk3)
-		$(use_setup qt5)
 		$(use_setup tk)
 	EOF
 
diff --git a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
index 999cf6f7b21f..56db56a2cbe0 100644
--- a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
+++ b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for sphinxcontrib"
diff --git a/dev-python/nose/nose-1.3.7-r5.ebuild b/dev-python/nose/nose-1.3.7-r5.ebuild
index b76c36ea03c3..5f429be5273a 100644
--- a/dev-python/nose/nose-1.3.7-r5.ebuild
+++ b/dev-python/nose/nose-1.3.7-r5.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 		${COV_DEP}
 		$(python_gen_cond_dep '
 			dev-python/twisted[${PYTHON_USEDEP}]
-		' python2_7 python3_{6,7,8})
+		' python3_{6,7,8})
 	)"
 
 PATCHES=(
diff --git a/dev-python/owslib/owslib-0.17.1-r1.ebuild b/dev-python/owslib/owslib-0.17.1-r1.ebuild
index dd5c7f7cf299..287b783ff666 100644
--- a/dev-python/owslib/owslib-0.17.1-r1.ebuild
+++ b/dev-python/owslib/owslib-0.17.1-r1.ebuild
@@ -20,10 +20,7 @@ RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	|| (
-		dev-python/elementtree[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
+	dev-python/lxml[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index c59042850469..bac20fb25183 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,2 +1 @@
-DIST pylast-1.9.0.tar.gz 42584 BLAKE2B b479fe5b780f6dbd30f20c0e183205ffe87703f26fe8ff04170c7f906705bfe737e965c2a7ebc562943c96a8f9bf7710e84999656d1ff22820254e4f4573f0e2 SHA512 ff3929583d88466738c9a1e964676652717c9f5bd4631f1a0a7855903e77cd394a612b0e2e8fc2f698ac84a34a135f4e940ff7760c2c88bf388ae56fc9c3da65
 DIST pylast-3.2.1.tar.gz 39763 BLAKE2B 1162efb68b89e381528b73eb5fb1dd45a15fcf8129b59fcae824ee78f100f6ea523207cda5b689b2fe66628b0aa5db313b5fa2f504b61b3b4ef6b64ccf13ea5b SHA512 e79a258e6f7c8490d98b4b737abae29cf763dcc5520f47dfe9fe7827f3163bc43ad7dc5c25edd1099cb4c4cd3483cdc5014331caba6f8c3cb29fb1394a8bfa3a
diff --git a/dev-python/pylast/pylast-1.9.0.ebuild b/dev-python/pylast/pylast-1.9.0.ebuild
deleted file mode 100644
index 942fb4a02b70..000000000000
--- a/dev-python/pylast/pylast-1.9.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to last.fm and other api-compatible websites"
-HOMEPAGE="https://github.com/pylast/pylast"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-# As the testing requires a last.fm account and online access it is restricted
-RESTRICT="test"
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index 539f4b1e1183..1f9477170bce 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,2 +1 @@
-DIST pyperclip-1.5.27.zip 16938 BLAKE2B 653b2e74b6f56839ef1f9d59b864218ffd55866660aa7de4284f0bab4c28b0c1aa7a4a65bce0842003d4744a5d40c87943e05bdea13098e250e534a8cb6c2132 SHA512 cefd79f1d246c9aa9d4d0f3d8cdad291ad31bcc2e000c83e5e05704978bbf7b9b45d49667c2e88305d0a5d6baaeacfb47b26bb69fabf89b6b6e3a1e6f1e23d74
 DIST pyperclip-1.7.0.tar.gz 15977 BLAKE2B da1473f71bcadcc6dcacdfb6d1a1447b055eb1aa7b31fad76bd3a51245ad9b1e512335f9799d7d416a53b8471ab66c28afa5f9d3f3ee2b39e85d9c239a7e2c79 SHA512 7f22227ea894a236703f61ab950e198fab969fac5713ca8eac6df213183a47a244add88a462b9ddf63ed5bec36af5bc2578949f01ed31e0b63316d1761a935bd
diff --git a/dev-python/pyperclip/pyperclip-1.5.27.ebuild b/dev-python/pyperclip/pyperclip-1.5.27.ebuild
deleted file mode 100644
index f3e3b822cddb..000000000000
--- a/dev-python/pyperclip/pyperclip-1.5.27.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A cross-platform clipboard module for Python."
-HOMEPAGE="https://github.com/asweigart/pyperclip"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-RDEPEND="
-	|| (
-		x11-misc/xclip
-		x11-misc/xsel
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_copy_paste.py -vv ||
-		die "Tests fail on ${EPYTHON}"
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
index 1fb599c99c9d..028c7eca5291 100644
--- a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-timeout/files/pytest-timeout-1.4.2-optional-cov.patch b/dev-python/pytest-timeout/files/pytest-timeout-1.4.2-optional-cov.patch
new file mode 100644
index 000000000000..424cfa6c57d4
--- /dev/null
+++ b/dev-python/pytest-timeout/files/pytest-timeout-1.4.2-optional-cov.patch
@@ -0,0 +1,27 @@
+From 65a79fe8ceb52d7ae978f4a2ecc47a1fd34fda2b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 2 Aug 2020 00:11:53 +0200
+Subject: [PATCH] Skip test_cov if pytest-cov is not installed
+
+Skip test_cov gracefully if pytest_cov module can't be imported.
+This would help us since we're removing py2 support from pytest-cov
+but still need it for pytest-timeout.
+---
+ test_pytest_timeout.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test_pytest_timeout.py b/test_pytest_timeout.py
+index 16302d7..69707b4 100644
+--- a/test_pytest_timeout.py
++++ b/test_pytest_timeout.py
+@@ -77,6 +77,7 @@ def test_thread(testdir):
+ )
+ def test_cov(testdir):
+     # This test requires pytest-cov
++    pytest.importorskip("pytest_cov")
+     testdir.makepyfile(
+         """
+         import time
+-- 
+2.28.0
+
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild
index 6c83b228533a..c94d7dac9d78 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild
@@ -21,11 +21,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~a
 BDEPEND="
 	test? (
 		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pytest-cov[${PYTHON_USEDEP}]
+		' -3)
 	)"
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/pytest-timeout-1.4.2-optional-cov.patch
+)
+
 python_test() {
 	distutils_install_for_testing
 
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
index 6c83b228533a..c94d7dac9d78 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
@@ -21,11 +21,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~a
 BDEPEND="
 	test? (
 		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pytest-cov[${PYTHON_USEDEP}]
+		' -3)
 	)"
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/pytest-timeout-1.4.2-optional-cov.patch
+)
+
 python_test() {
 	distutils_install_for_testing
 
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
index 24786d12f43c..e3e8e7c8f73e 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.4.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 python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QScintilla"
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
index 9b17331a0ceb..f783d5cd6d5b 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.5.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 python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QScintilla"
diff --git a/dev-python/sip/sip-4.19.22.ebuild b/dev-python/sip/sip-4.19.22-r1.ebuild
index 53cc7c07829d..0990210585d5 100644
--- a/dev-python/sip/sip-4.19.22.ebuild
+++ b/dev-python/sip/sip-4.19.22-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} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
@@ -50,10 +50,6 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
 		local incdir=$(python_get_includedir)
 		local myconf=(
 			"${PYTHON}"
diff --git a/dev-python/sip/sip-4.19.23.ebuild b/dev-python/sip/sip-4.19.23-r1.ebuild
index 1403de3ddc17..81dde8c08811 100644
--- a/dev-python/sip/sip-4.19.23.ebuild
+++ b/dev-python/sip/sip-4.19.23-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} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
@@ -50,10 +50,6 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
 		local incdir=$(python_get_includedir)
 		local myconf=(
 			"${PYTHON}"
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
index 11a27a5cf383..d12cf8028bec 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.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/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
index 1e6077cb88c1..38420866c3e1 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
@@ -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/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index 0734bfc2e92c..78fe4fe4eb72 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,2 +1 @@
-DIST sphinxcontrib-websupport-1.1.0.tar.gz 587947 BLAKE2B fafaa56071245c8934e27c6d2d7752745b2a8047c8a30d52e513fff7f952086a1b9082aa15e15ef232d69ef0c0d5d117f8a8c97fcdf9cd90c89d53238d7f322e SHA512 adbd7db06150a4424a881a22442c2535ed823c7adcc295ef9c3af5ae38d823349830a114e8a7af2138498d0e68b37189707c1bb5a28b45c76031bcf94210fb89
 DIST sphinxcontrib-websupport-1.2.2.gh.tar.gz 599606 BLAKE2B d7e5754491d0f4e4b508bb5ed58f41d6f57c8785ce2d658cd4beb658b9a01a453bd791e73deab703ebf17d18ddf0a3adc7c72a49e80c33475daca41666da694d SHA512 39d7d688515440fcf7a0df9cff60402499956da4c4d5de4e7b38982ff23ed837e7851a3c747135b9298d0df59f3055a8f588be78f10d98110ab50b8ab434db34
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
deleted file mode 100644
index 75f6ac708544..000000000000
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx websupport extension"
-HOMEPAGE="https://www.sphinx-doc.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-	>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-# avoid circular dependency with sphinx
-PDEPEND="
-	>=dev-python/sphinx-1.5.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		${PDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
-
-src_test() {
-	cd tests || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/tenacity/tenacity-6.1.0.ebuild b/dev-python/tenacity/tenacity-6.1.0-r1.ebuild
index 400d440a3076..495cdf08b53d 100644
--- a/dev-python/tenacity/tenacity-6.1.0.ebuild
+++ b/dev-python/tenacity/tenacity-6.1.0-r1.ebuild
@@ -18,12 +18,10 @@ IUSE=""
 
 DEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 "
 RDEPEND="
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/tinycss/tinycss-0.4.ebuild b/dev-python/tinycss/tinycss-0.4.ebuild
index b77546a182ed..a33a4cdc02bc 100644
--- a/dev-python/tinycss/tinycss-0.4.ebuild
+++ b/dev-python/tinycss/tinycss-0.4.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