Merge updates from master

54 files changed, 77 insertions, 154 deletions

diff --git a/dev-db/redis/redis-5.0.7.ebuild b/dev-db/redis/redis-5.0.7.ebuild
index e30178e06fb7..db002fb35ceb 100644
--- a/dev-db/redis/redis-5.0.7.ebuild
+++ b/dev-db/redis/redis-5.0.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://redis.io"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 RESTRICT="!test? ( test )"
 SLOT="0"
diff --git a/dev-python/bcrypt/bcrypt-3.1.6.ebuild b/dev-python/bcrypt/bcrypt-3.1.6.ebuild
index 98355a38ab3c..ec63cd2d6eee 100644
--- a/dev-python/bcrypt/bcrypt-3.1.6.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.6.ebuild
@@ -19,7 +19,6 @@ RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
index 3c4d8047e7c1..9bb24e58c436 100644
--- a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
@@ -17,7 +17,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 
 COMMON_DEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/dev-python/cairocffi/cairocffi-0.8.0.ebuild b/dev-python/cairocffi/cairocffi-0.8.0.ebuild
index 7a53cc6195e8..ecb98aff51f8 100644
--- a/dev-python/cairocffi/cairocffi-0.8.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.8.0.ebuild
@@ -24,8 +24,7 @@ RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
 	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
 	x11-libs/cairo:0=[xcb]
-	x11-libs/gdk-pixbuf[jpeg]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
+	x11-libs/gdk-pixbuf[jpeg]"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -33,8 +32,7 @@ DEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
+	)"
 
 PATCHES=( "${FILESDIR}"/${P}-tests.patch )
 
diff --git a/dev-python/cairocffi/cairocffi-0.9.0.ebuild b/dev-python/cairocffi/cairocffi-0.9.0.ebuild
index ac85506d60c5..c1800f48398f 100644
--- a/dev-python/cairocffi/cairocffi-0.9.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.9.0.ebuild
@@ -24,8 +24,7 @@ RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
 	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
 	x11-libs/cairo:0=[xcb]
-	x11-libs/gdk-pixbuf[jpeg]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
+	x11-libs/gdk-pixbuf[jpeg]"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -33,8 +32,7 @@ DEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
+	)"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/cairocffi/cairocffi-1.0.2.ebuild b/dev-python/cairocffi/cairocffi-1.0.2.ebuild
index 686400bc32f6..7597d48990a9 100644
--- a/dev-python/cairocffi/cairocffi-1.0.2.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.0.2.ebuild
@@ -24,8 +24,7 @@ RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
 	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
 	x11-libs/cairo:0=[xcb]
-	x11-libs/gdk-pixbuf[jpeg]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
+	x11-libs/gdk-pixbuf[jpeg]"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -33,8 +32,7 @@ DEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
+	)"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8.0-tests.patch
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
index 42f8b1978c51..cc4207c6f893 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
@@ -30,7 +30,6 @@ DEPEND="${RDEPEND}
 	!low-memory? (
 		|| (
 			dev-python/pypy
-			dev-python/pypy-bin
 			(
 				dev-lang/python:2.7
 				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
@@ -42,7 +41,7 @@ check_env() {
 	if use low-memory; then
 		if ! python_is_installed pypy; then
 			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+			eerror "being installed. Please install it using e.g.:"
 			eerror
 			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
 			eerror
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
index d5c7abffda28..09209ec71253 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
@@ -26,10 +26,10 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	ncurses? ( sys-libs/ncurses:0= )
 	!dev-python/pypy3-exe-bin:${PV}"
 DEPEND="${RDEPEND}
-	low-memory? ( virtual/pypy )
+	low-memory? ( dev-python/pypy )
 	!low-memory? (
 		|| (
-			virtual/pypy
+			dev-python/pypy
 			(
 				dev-lang/python:2.7
 				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
@@ -65,7 +65,7 @@ pkg_setup() {
 		else
 			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
 			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
+			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
 		fi
 
 		python-any-r1_pkg_setup
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
index 7ae62ae1e4d8..ba1f483cb088 100644
--- a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
@@ -15,13 +15,9 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
-	python_targets_python2_7? (
-		>=dev-python/mock-2[python_targets_python2_7]
-	)
-	python_targets_pypy? (
-		>=dev-python/mock-2[python_targets_pypy]
-	)"
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/mock-2[${PYTHON_USEDEP}]' -2)"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/xcffib/xcffib-0.5.1.ebuild b/dev-python/xcffib/xcffib-0.5.1.ebuild
index 93726e016cc5..fc7379b7c693 100644
--- a/dev-python/xcffib/xcffib-0.5.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.5.1.ebuild
@@ -20,7 +20,6 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="x11-libs/libxcb"
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
 	dev-python/six[${PYTHON_USEDEP}]
 	${COMMON_DEPEND}"
 DEPEND="
diff --git a/dev-python/xcffib/xcffib-0.6.0.ebuild b/dev-python/xcffib/xcffib-0.6.0.ebuild
index 60fabee1d1fc..354ff0f8d107 100644
--- a/dev-python/xcffib/xcffib-0.6.0.ebuild
+++ b/dev-python/xcffib/xcffib-0.6.0.ebuild
@@ -20,7 +20,6 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="x11-libs/libxcb"
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
 	dev-python/six[${PYTHON_USEDEP}]
 	${COMMON_DEPEND}"
 DEPEND="
diff --git a/dev-python/xcffib/xcffib-0.7.0.ebuild b/dev-python/xcffib/xcffib-0.7.0.ebuild
index 077a6308d0c8..e633cb9015ae 100644
--- a/dev-python/xcffib/xcffib-0.7.0.ebuild
+++ b/dev-python/xcffib/xcffib-0.7.0.ebuild
@@ -20,7 +20,6 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="x11-libs/libxcb"
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
 	dev-python/six[${PYTHON_USEDEP}]
 	${COMMON_DEPEND}"
 DEPEND="
diff --git a/dev-python/xcffib/xcffib-0.8.1.ebuild b/dev-python/xcffib/xcffib-0.8.1.ebuild
index 48f82dd70d2d..25448710cbf9 100644
--- a/dev-python/xcffib/xcffib-0.8.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.8.1.ebuild
@@ -20,7 +20,6 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="x11-libs/libxcb"
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
 	dev-python/six[${PYTHON_USEDEP}]
 	${COMMON_DEPEND}"
 DEPEND="
diff --git a/dev-util/itstool/itstool-2.0.6.ebuild b/dev-util/itstool/itstool-2.0.6.ebuild
index 60f557a2a803..26fe2f10e987 100644
--- a/dev-util/itstool/itstool-2.0.6.ebuild
+++ b/dev-util/itstool/itstool-2.0.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
 # files in /usr/share/itstool/its are under a special exception || GPL-3+
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-linux"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index 3863ef6fa849..878e337ff3c2 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author: Michał Górny <mgorny@gentoo.org>
 # Based on work of: Krzysztof Pawlik <nelchael@gentoo.org>
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: An eclass for packages having build-time dependency on Python.
 # @DESCRIPTION:
 # A minimal eclass for packages which need any Python interpreter
@@ -37,11 +37,9 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-any-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5|6|7)
-		;;
-	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-		;;
+	[0-4]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
+	[5-7]) ;;
+	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
 esac
 
 if [[ ! ${_PYTHON_ANY_R1} ]]; then
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index e87b59967cde..dd350a436fa5 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -126,7 +126,7 @@ fi
 # @CODE
 # dev-lang/python-exec:=
 # python_targets_python2_7? ( dev-lang/python:2.7[gdbm] )
-# python_targets_pypy? ( virtual/pypy[gdbm] )
+# python_targets_pypy? ( dev-python/pypy[gdbm] )
 # @CODE
 
 # @ECLASS-VARIABLE: PYTHON_USEDEP
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index f042bf4e1167..b82c3a29f5c4 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -136,7 +136,7 @@ EXPORT_FUNCTIONS pkg_setup
 # @CODE
 # dev-lang/python-exec:=
 # python_single_target_python2_7? ( dev-lang/python:2.7[gdbm] )
-# python_single_target_pypy? ( virtual/pypy[gdbm] )
+# python_single_target_pypy? ( dev-python/pypy[gdbm] )
 # @CODE
 
 # @ECLASS-VARIABLE: PYTHON_USEDEP
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 3eadc50f93e6..91a32434dfaa 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: python-utils-r1.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author: Michał Górny <mgorny@gentoo.org>
 # Based on work of: Krzysztof Pawlik <nelchael@gentoo.org>
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: Utility functions for packages with Python parts.
 # @DESCRIPTION:
 # A utility eclass providing functions to query Python implementations,
@@ -20,11 +20,9 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-utils-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5|6|7)
-		;;
-	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-		;;
+	[0-4]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
+	[5-7]) ;;
+	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
 esac
 
 if [[ ${_PYTHON_ECLASS_INHERITED} ]]; then
@@ -33,7 +31,7 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib
+[[ ${EAPI} == 5 ]] && inherit eutils multilib
 inherit toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
@@ -41,10 +39,9 @@ inherit toolchain-funcs
 # @DESCRIPTION:
 # All supported Python implementations, most preferred last.
 _PYTHON_ALL_IMPLS=(
-	jython2_7
-	pypy pypy3
+	pypy3
 	python2_7
-	python3_5 python3_6 python3_7 python3_8
+	python3_6 python3_7 python3_8
 )
 readonly _PYTHON_ALL_IMPLS
 
@@ -80,17 +77,12 @@ _python_impl_supported() {
 	# keep in sync with _PYTHON_ALL_IMPLS!
 	# (not using that list because inline patterns shall be faster)
 	case "${impl}" in
-		python2_7|python3_[5678]|jython2_7)
+		python2_7|python3_[678]|pypy3)
 			return 0
 			;;
-		pypy1_[89]|pypy2_0|python2_[56]|python3_[1234])
+		jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[56]|python3_[12345])
 			return 1
 			;;
-		pypy|pypy3)
-			if [[ ${EAPI:-0} == [01234] ]]; then
-				die "PyPy is supported in EAPI 5 and newer only."
-			fi
-			;;
 		*)
 			[[ ${PYTHON_COMPAT_NO_STRICT} ]] && return 1
 			die "Invalid implementation in PYTHON_COMPAT: ${impl}"
@@ -480,9 +472,9 @@ python_export() {
 					python*)
 						PYTHON_PKG_DEP="dev-lang/python:${impl#python}";;
 					pypy)
-						PYTHON_PKG_DEP='>=virtual/pypy-5:0=';;
+						PYTHON_PKG_DEP='>=dev-python/pypy-5:0=';;
 					pypy3)
-						PYTHON_PKG_DEP='>=virtual/pypy3-5:0=';;
+						PYTHON_PKG_DEP='>=dev-python/pypy3-5:0=';;
 					jython2.7)
 						PYTHON_PKG_DEP='dev-java/jython:2.7';;
 					*)
@@ -776,9 +768,6 @@ python_newexe() {
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
 	[[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>"
-	if [[ ${EAPI:-0} == [0123] ]]; then
-		die "python_do* and python_new* helpers are banned in EAPIs older than 4."
-	fi
 
 	local wrapd=${python_scriptroot:-/usr/bin}
 
@@ -906,9 +895,6 @@ python_domodule() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
-	if [[ ${EAPI:-0} == [0123] ]]; then
-		die "python_do* and python_new* helpers are banned in EAPIs older than 4."
-	fi
 
 	local d
 	if [[ ${python_moduleroot} == /* ]]; then
@@ -948,9 +934,6 @@ python_doheader() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
-	if [[ ${EAPI:-0} == [0123] ]]; then
-		die "python_do* and python_new* helpers are banned in EAPIs older than 4."
-	fi
 
 	local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
 	[[ ${PYTHON_INCLUDEDIR} ]] || python_export PYTHON_INCLUDEDIR
@@ -1093,10 +1076,7 @@ python_is_installed() {
 	[[ ${impl} ]] || die "${FUNCNAME}: no impl nor EPYTHON"
 	local hasv_args=()
 
-	case ${EAPI:-0} in
-		0|1|2|3|4)
-			local -x ROOT=/
-			;;
+	case ${EAPI} in
 		5|6)
 			hasv_args+=( --host-root )
 			;;
@@ -1265,7 +1245,7 @@ python_fix_shebang() {
 
 		if [[ ! ${any_fixed} ]]; then
 			local cmd=eerror
-			[[ ${EAPI:-0} == [012345] ]] && cmd=eqawarn
+			[[ ${EAPI} == 5 ]] && cmd=eqawarn
 
 			"${cmd}" "QA warning: ${FUNCNAME}, ${path#${D%/}} did not match any fixable files."
 			if [[ ${any_correct} ]]; then
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index e883da38cead..279324e163ba 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -109,7 +109,7 @@ if [[ -x /usr/bin/pypy ]]; then
 	test_var PYTHON_SITEDIR pypy "/usr/lib*/pypy2.7/site-packages"
 	test_var PYTHON_INCLUDEDIR pypy "/usr/lib*/pypy2.7/include"
 fi
-test_var PYTHON_PKG_DEP pypy '*virtual/pypy*:0='
+test_var PYTHON_PKG_DEP pypy '*dev-python/pypy*:0='
 test_var PYTHON_SCRIPTDIR pypy /usr/lib/python-exec/pypy
 
 test_var EPYTHON pypy3 pypy3
@@ -118,7 +118,7 @@ if [[ -x /usr/bin/pypy3 ]]; then
 	test_var PYTHON_SITEDIR pypy3 "/usr/lib*/pypy3.?/site-packages"
 	test_var PYTHON_INCLUDEDIR pypy3 "/usr/lib*/pypy3.?/include"
 fi
-test_var PYTHON_PKG_DEP pypy3 '*virtual/pypy3*:0='
+test_var PYTHON_PKG_DEP pypy3 '*dev-python/pypy3*:0='
 test_var PYTHON_SCRIPTDIR pypy3 /usr/lib/python-exec/pypy3
 
 test_is "python_is_python3 python2.7" 1
@@ -181,16 +181,16 @@ test_is "_python_impl_supported python3_1" 1
 test_is "_python_impl_supported python3_2" 1
 test_is "_python_impl_supported python3_3" 1
 test_is "_python_impl_supported python3_4" 1
-test_is "_python_impl_supported python3_5" 0
+test_is "_python_impl_supported python3_5" 1
 test_is "_python_impl_supported python3_6" 0
 test_is "_python_impl_supported python3_7" 0
 test_is "_python_impl_supported python3_8" 0
 test_is "_python_impl_supported pypy1_8" 1
 test_is "_python_impl_supported pypy1_9" 1
 test_is "_python_impl_supported pypy2_0" 1
-test_is "_python_impl_supported pypy" 0
+test_is "_python_impl_supported pypy" 1
 test_is "_python_impl_supported pypy3" 0
-test_is "_python_impl_supported jython2_7" 0
+test_is "_python_impl_supported jython2_7" 1
 
 # check _python_impl_matches behavior
 test_is "_python_impl_matches python2_7 -2" 0
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
index ac3d06186227..d5d7baa066be 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
 	)' 'python*' ) )
 "
-REQUIRED_USE="systemd? ( !python_single_target_pypy )"
+
 RESTRICT="test"
 DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
 
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
index 613c33272c07..3845f402b886 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
 	)' 'python*' ) )
 "
-REQUIRED_USE="systemd? ( !python_single_target_pypy )"
+
 RESTRICT="test"
 DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
 
diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
index d4e1f1886dc8..a562cf3e6d05 100644
--- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
 	)' 'python*' ) )
 "
-REQUIRED_USE="systemd? ( !python_single_target_pypy )"
+
 RESTRICT="test"
 DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
 
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 09a9e9d17648..902e02eb945b 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -245,10 +245,8 @@ sys-apps/hwloc -gl
 
 # Michał Górny <mgorny@gentoo.org> (2013-07-22)
 # Meaningless on amd64 (it controls the 32-bit x86 JIT).
-dev-python/pypy cpu_flags_x86_sse2
-dev-python/pypy-bin cpu_flags_x86_sse2
-dev-python/pypy3 cpu_flags_x86_sse2
-dev-python/pypy3-bin cpu_flags_x86_sse2
+dev-python/pypy-exe cpu_flags_x86_sse2
+dev-python/pypy3-exe cpu_flags_x86_sse2
 
 # Christoph Junghans <junghans@gentoo.org> (2012-12-26)
 # cuda works on x86/amd64 (masked in base)
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index c3814e0fc7ed..c92316952397 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -100,5 +100,4 @@ gnustep-base/gnustep-make libobjc2
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # Don't apply stable masks to python-exec since we're forcing every
 # impl there anyway. Please keep this in sync with use.stable.mask.
-dev-lang/python-exec -python_targets_pypy
 dev-lang/python-exec -python_targets_pypy3
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 273afa3f77fb..773b4862f2ed 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -42,8 +42,6 @@
 
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is keyworded on this arch.
--python_targets_pypy
--python_single_target_pypy
 -python_targets_pypy3
 -python_single_target_pypy3
 
@@ -72,11 +70,6 @@
 # IPMI is only implemented for x86, amd64 and ia64
 -ipmi
 
-# Ralph Sennhauser <sera@gentoo.org> (2012-07-31)
-# Keyworded on amd64
--python_targets_jython2_7
--python_single_target_jython2_7
-
 # Joerg Bornkessel <hd_brummy@gentoo.org> (2012-03-05)
 # Unmask, works with v4l2, #350211
 -dxr3
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index 632b974f29fb..5d32143f73f4 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -25,7 +25,5 @@ clozurecl
 
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is unstable on this arch.
-python_targets_pypy
-python_single_target_pypy
 python_targets_pypy3
 python_single_target_pypy3
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 607cd6757fb7..4198132cf1a2 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -64,7 +64,7 @@ sys-apps/fwupd dell thunderbolt
 www-apps/nextcloud imagemagick
 
 # Corentin Pazdera <nado@troglodyte.be> (2018-12-28)
-# Requires virtual/pypy which isn't keyworded for ARM.
+# Requires dev-python/pypy which isn't keyworded for ARM.
 www-servers/uwsgi pypy
 
 # Davide Pesavento <pesa@gentoo.org> (2018-12-27)
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 4a46bc011556..10bf338ad853 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -191,8 +191,6 @@ orc
 # Mike Gilbert <floppym@gentoo.org> (2013-01-02)
 # PyPy is unkeyworded on most arches. If you are running amd64 or x86,
 # please switch to one of the testing 13.0 profiles to get it.
-python_targets_pypy
-python_single_target_pypy
 python_targets_pypy3
 python_single_target_pypy3
 
diff --git a/profiles/arch/riscv/rv64gc/use.mask b/profiles/arch/riscv/rv64gc/use.mask
index 529c1d546345..6e01a574cebb 100644
--- a/profiles/arch/riscv/rv64gc/use.mask
+++ b/profiles/arch/riscv/rv64gc/use.mask
@@ -7,8 +7,6 @@
 
 # Our Python has a lot of trouble with the two-level libdir.
 python_targets_python2_7
-python_targets_python3_5
 python_targets_python3_6
 python_single_target_python2_7
-python_single_target_python3_5
 python_single_target_python3_6
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 72e4dea554ab..613458e8f88e 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -94,5 +94,4 @@ dev-cpp/eigen test
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # Don't apply stable masks to python-exec since we're forcing every
 # impl there anyway. Please keep this in sync with use.stable.mask.
-dev-lang/python-exec -python_targets_pypy
 dev-lang/python-exec -python_targets_pypy3
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index d7fb537d7955..bfe15cba31f1 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -38,8 +38,6 @@ python_single_target_python3_7
 
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is keyworded on this arch.
--python_targets_pypy
--python_single_target_pypy
 -python_targets_pypy3
 -python_single_target_pypy3
 
@@ -69,11 +67,6 @@ python_single_target_python3_7
 # IPMI is only implemented for x86, amd64 and ia64
 -ipmi
 
-# Ralph Sennhauser <sera@gentoo.org> (2012-07-31)
-# Keyworded on x86
--python_targets_jython2_7
--python_single_target_jython2_7
-
 # Joerg Bornkessel <hd_brummy@gentoo.org> (2012-03-05)
 # Unmask, works with v4l2, #350211
 -dxr3
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index eae8d7442ac9..580c08661a6b 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -25,7 +25,5 @@ clozurecl
 
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is unstable on this arch.
-python_targets_pypy
-python_single_target_pypy
 python_targets_pypy3
 python_single_target_pypy3
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index bd35fdae7247..5423bfcf2ba0 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -106,12 +106,9 @@ app-shells/bash:0 readline
 # Force-enable all PYTHON_TARGETS for python-exec to avoid using private
 # API. Please remember to keep it in sync with python_targets.desc.
 dev-lang/python-exec python_targets_python2_7
-dev-lang/python-exec python_targets_python3_5
 dev-lang/python-exec python_targets_python3_6
 dev-lang/python-exec python_targets_python3_7
 dev-lang/python-exec python_targets_python3_8
-dev-lang/python-exec python_targets_jython2_7
-dev-lang/python-exec python_targets_pypy
 dev-lang/python-exec python_targets_pypy3
 
 # Zac Medico <zmedico@gentoo.org> (2010-10-20)
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index aeae877243cf..ad09289730d6 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -88,11 +88,6 @@ prefix-stack
 # masking flags that only apply to FreeBSD
 kqueue
 
-# Ralph Sennhauser <sera@gentoo.org> (2012-07-31)
-# Unmask in arch specific profiles when jython implementaton is available.
-python_targets_jython2_7
-python_single_target_jython2_7
-
 # Diego Elio Pettenò <flameeyes@gentoo.org> (2012-08-18)
 # Prelude is being masked for removal
 prelude
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 9c76a0e79acf..759c9247e3a4 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -17,9 +17,7 @@ php_targets_php7-4
 postgres_targets_postgres12
 
 # Zac Medico <zmedico@gentoo.org> (2016-09-01)
-# Needs virtual/pypy* stable
-python_targets_pypy
-python_single_target_pypy
+# Needs dev-python/pypy* stable
 python_targets_pypy3
 python_single_target_pypy3
 
diff --git a/profiles/desc/python_single_target.desc b/profiles/desc/python_single_target.desc
index 574d99eb6a5b..6f8f16d8d04f 100644
--- a/profiles/desc/python_single_target.desc
+++ b/profiles/desc/python_single_target.desc
@@ -4,10 +4,7 @@
 # This file contains descriptions of PYTHON_SINGLE_TARGET USE_EXPAND flags.
 
 python2_7 - Build for Python 2.7 only
-python3_5 - Build for Python 3.5 only
 python3_6 - Build for Python 3.6 only
 python3_7 - Build for Python 3.7 only
 python3_8 - Build for Python 3.8 only
-jython2_7 - Build for Jython 2.7 only
-pypy - Build for PyPy only
 pypy3 - Build for PyPy3 only
diff --git a/profiles/desc/python_targets.desc b/profiles/desc/python_targets.desc
index 4827da4af78f..7823e2baa42f 100644
--- a/profiles/desc/python_targets.desc
+++ b/profiles/desc/python_targets.desc
@@ -4,10 +4,7 @@
 # This file contains descriptions of PYTHON_TARGETS USE_EXPAND flags.
 
 python2_7 - Build with Python 2.7
-python3_5 - Build with Python 3.5
 python3_6 - Build with Python 3.6
 python3_7 - Build with Python 3.7
 python3_8 - Build with Python 3.8
-jython2_7 - Build with Jython 2.7
-pypy - Build with PyPy
 pypy3 - Build with PyPy3
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
index b7f146f8d4a1..83862097866b 100644
--- a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
@@ -1,3 +1 @@
 # >=python-3 is masked
-python_single_target_python3_5
-python_targets_python3_5
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index 287c2abb966b..ed28e6e8aad5 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -7,14 +7,14 @@ net-analyzer/wireshark sdjournal
 
 # Brian Dolbec <dolsen@gentoo.org> (2014-09-17)
 # mask pypy for several utilities due to incompatibility with libselinux
-sys-apps/portage python_targets_pypy python_targets_pypy3
-app-portage/gentoolkit python_targets_pypy python_targets_pypy3
-app-portage/layman python_targets_pypy python_targets_pypy3
-app-admin/webapp-config python_targets_pypy python_targets_pypy3
-app-portage/diffmask python_targets_pypy python_targets_pypy3
-app-portage/flaggie python_targets_pypy python_targets_pypy3
-app-portage/gentoopm python_targets_pypy python_targets_pypy3
-app-portage/gpyutils python_targets_pypy python_targets_pypy3
+sys-apps/portage python_targets_pypy3
+app-portage/gentoolkit python_targets_pypy3
+app-portage/layman python_targets_pypy3
+app-admin/webapp-config python_targets_pypy3
+app-portage/diffmask python_targets_pypy3
+app-portage/flaggie python_targets_pypy3
+app-portage/gentoopm python_targets_pypy3
+app-portage/gpyutils python_targets_pypy3
 
 # Jason Zaman <perfinion@gentoo.org> (2015-06-27)
 # SystemD has no support in the SELinux policy at the moment.
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index d28979a5fd86..55f871b9b664 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -17,6 +17,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2019-12-30)
+# PyPy packages have been restructured, and the virtual is no longer
+# necessary.  Depend on dev-python/pypy{,3} instead.
+virtual/pypy
+virtual/pypy3
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-12-29)
 # consumers should depend on virtual/rust,
 # bug https://bugs.gentoo.org/695698
diff --git a/profiles/package.mask b/profiles/package.mask
index 6445c49ae570..9f568f60147c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2019-12-30)
+# The PyPy packages have been restructured and dev-python/pypy is now
+# used unconditionally as the main package.  If you wish to continue
+# using prebuilt executables, install dev-python/pypy{,3}-exe-bin
+# along with it.
+# Removal in 30 days.
+dev-python/pypy-bin
+dev-python/pypy3-bin
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-12-29)
 # Currently breaks app-text/texlive-core-2019-r5, bug #704166
 ~app-text/poppler-0.84.0
diff --git a/profiles/prefix/use.mask b/profiles/prefix/use.mask
index 6346ec770537..68ccdc24bdc8 100644
--- a/profiles/prefix/use.mask
+++ b/profiles/prefix/use.mask
@@ -21,9 +21,5 @@ kernel_linux
 # coreutils on darwin.
 acl
 
-# Prefix removed python3_5 from PYTHON_TARGETS and PYTHON_SINGLE_TARGET
-python_targets_python3_5
-python_single_target_python3_5
-
 # Similar for Ruby 2.3
 ruby_targets_ruby23
diff --git a/profiles/prefix/windows/cygwin/use.mask b/profiles/prefix/windows/cygwin/use.mask
index 392ef405f2e6..051c6484f403 100644
--- a/profiles/prefix/windows/cygwin/use.mask
+++ b/profiles/prefix/windows/cygwin/use.mask
@@ -5,5 +5,4 @@
 -elibc_Cygwin
 
 # we do have only python-3.6 ready on cygwin
-python_targets_python3_5
 python_targets_python3_7
diff --git a/sci-libs/scipy/scipy-0.18.1.ebuild b/sci-libs/scipy/scipy-0.18.1.ebuild
index 13d5afa657e8..730b436320c5 100644
--- a/sci-libs/scipy/scipy-0.18.1.ebuild
+++ b/sci-libs/scipy/scipy-0.18.1.ebuild
@@ -109,7 +109,7 @@ python_prepare_all() {
 python_compile() {
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
-		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
+		"-j $(makeopts_jobs)" \
 		${SCIPY_FCONFIG}
 }
 
diff --git a/sci-libs/scipy/scipy-0.19.1.ebuild b/sci-libs/scipy/scipy-0.19.1.ebuild
index a17473acc3d5..45225e71258a 100644
--- a/sci-libs/scipy/scipy-0.19.1.ebuild
+++ b/sci-libs/scipy/scipy-0.19.1.ebuild
@@ -104,7 +104,6 @@ python_prepare_all() {
 
 python_compile() {
 	# FIXME: parallel python building fails, bug #614464
-	# $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
 		${SCIPY_FCONFIG}
diff --git a/sci-libs/scipy/scipy-1.0.0.ebuild b/sci-libs/scipy/scipy-1.0.0.ebuild
index 830587f79c37..f9c24c564fd8 100644
--- a/sci-libs/scipy/scipy-1.0.0.ebuild
+++ b/sci-libs/scipy/scipy-1.0.0.ebuild
@@ -107,7 +107,6 @@ python_prepare_all() {
 
 python_compile() {
 	# FIXME: parallel python building fails, bug #614464
-	# $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
 		${SCIPY_FCONFIG}
diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild
index acbf180275f3..26a09951e2a3 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -107,7 +107,6 @@ python_prepare_all() {
 
 python_compile() {
 	# FIXME: parallel python building fails, bug #614464
-	# $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
 		${SCIPY_FCONFIG}
diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild b/sci-libs/scipy/scipy-1.4.1.ebuild
index a655ea5de4ab..763237b3a956 100644
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -108,7 +108,6 @@ python_prepare_all() {
 
 python_compile() {
 	# FIXME: parallel python building fails, bug #614464
-	# $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
 		${SCIPY_FCONFIG}
diff --git a/sci-libs/scipy/scipy-9999.ebuild b/sci-libs/scipy/scipy-9999.ebuild
index 0e528a35be0e..7892ce169010 100644
--- a/sci-libs/scipy/scipy-9999.ebuild
+++ b/sci-libs/scipy/scipy-9999.ebuild
@@ -93,7 +93,7 @@ python_prepare_all() {
 python_compile() {
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
-		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
+		"-j $(makeopts_jobs)" \
 		${SCIPY_FCONFIG}
 }
 
diff --git a/www-servers/uwsgi/metadata.xml b/www-servers/uwsgi/metadata.xml
index 9d3b99eed957..d7c339a2f35c 100644
--- a/www-servers/uwsgi/metadata.xml
+++ b/www-servers/uwsgi/metadata.xml
@@ -8,7 +8,7 @@
 		<flag name="embedded">Embed plugins instead of building them as real plugins. When disabling this USE flag make sure you specify all used plugins in your uWSGI configuration. Note: Language plugins will always be built as real plugins.</flag>
 		<flag name="go">Build the gccgo plugin to run Go applications.</flag>
 		<flag name="json">Support json as a configuration file format.</flag>
-		<flag name="pypy">Build the pypy plugin to run your code using <pkg>virtual/pypy</pkg>.</flag>
+		<flag name="pypy">Build the pypy plugin to run your code using <pkg>dev-python/pypy</pkg>.</flag>
 		<flag name="python_asyncio">Use the EXPERIMENTAL asyncio (tulip) for python3.4 async request dispatching and as LoopEngine (see http://uwsgi-docs.readthedocs.org/en/latest/asyncio.html).</flag>
 		<flag name="python_gevent">Use <pkg>dev-python/gevent</pkg> for async request dispatching and as LoopEngine (see http://projects.unbit.it/uwsgi/wiki/Gevent).</flag>
 		<flag name="routing">Enable routing support</flag>
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
index 46c20be1e22b..775814d2f42b 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
@@ -121,7 +121,7 @@ CDEPEND="
 		php_targets_php7-2? ( dev-lang/php:7.2[embed] )
 		php_targets_php7-3? ( dev-lang/php:7.3[embed] )
 	)
-	pypy? ( virtual/pypy )
+	pypy? ( dev-python/pypy )
 	python? ( ${PYTHON_DEPS} )
 	python_asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )
 	python_gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
index dec917ac9112..25855fe656f1 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
@@ -116,7 +116,7 @@ CDEPEND="sys-libs/zlib
 		php_targets_php7-2? ( dev-lang/php:7.2[embed] )
 		php_targets_php7-3? ( dev-lang/php:7.3[embed] )
 	)
-	pypy? ( virtual/pypy )
+	pypy? ( dev-python/pypy )
 	python? ( ${PYTHON_DEPS} )
 	python_gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )
 	ruby? ( $(ruby_implementations_depend) )"
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.ebuild
index 8f6d69a44d82..80583c558b6a 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.ebuild
@@ -116,7 +116,7 @@ CDEPEND="sys-libs/zlib
 		php_targets_php7-2? ( dev-lang/php:7.2[embed] )
 		php_targets_php7-3? ( dev-lang/php:7.3[embed] )
 	)
-	pypy? ( virtual/pypy )
+	pypy? ( dev-python/pypy )
 	python? ( ${PYTHON_DEPS} )
 	python_gevent? ( >=dev-python/gevent-1.2.1[${PYTHON_USEDEP}] )
 	ruby? ( $(ruby_implementations_depend) )"
diff --git a/www-servers/uwsgi/uwsgi-2.0.18.ebuild b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
index 0f292413d084..b1f88e545f4d 100644
--- a/www-servers/uwsgi/uwsgi-2.0.18.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
@@ -122,7 +122,7 @@ CDEPEND="
 		php_targets_php7-2? ( dev-lang/php:7.2[embed] )
 		php_targets_php7-3? ( dev-lang/php:7.3[embed] )
 	)
-	pypy? ( virtual/pypy )
+	pypy? ( dev-python/pypy )
 	python? ( ${PYTHON_DEPS} )
 	python_asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )
 	python_gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )