diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2019-12-30 13:32:33 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2019-12-30 13:58:58 +0100 |
| commit | 8f8b4aff201b3ba77d7cbd26fad8e1797b5e3126 (patch) | |
| tree | 0058b40de74cdb4a668c7fb299bf04d51b648ef8 /eclass | |
| parent | www-servers/uwsgi: Remove dep on virtual/pypy (diff) | |
| download | gentoo-8f8b4aff201b3ba77d7cbd26fad8e1797b5e3126.tar.gz gentoo-8f8b4aff201b3ba77d7cbd26fad8e1797b5e3126.tar.bz2 gentoo-8f8b4aff201b3ba77d7cbd26fad8e1797b5e3126.zip | |
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@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/python-utils-r1.eclass | 4 | ||||
| -rwxr-xr-x | 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 301c9a029b5f..91a32434dfaa 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 4910b700308d..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 |