[gentoo-commits] repo/gentoo:master commit in: eclass/, eclass/tests/

[Michał Górny]

commit:     8f8b4aff201b3ba77d7cbd26fad8e1797b5e3126
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 12:32:33 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 12:58:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8b4aff

python-utils-r1.eclass: Eliminate virtual/pypy

Depend on dev-python/pypy directly, as that's the common package
with the new layout.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/python-utils-r1.eclass   | 4 ++--
 eclass/tests/python-utils-r1.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 301c9a029b5..91a32434dfa 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -472,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';;
                                        *)

diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index 4910b700308..279324e163b 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