| 1 |
commit: 8f8b4aff201b3ba77d7cbd26fad8e1797b5e3126 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 30 12:32:33 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 30 12:58:58 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8b4aff |
| 7 |
|
| 8 |
python-utils-r1.eclass: Eliminate virtual/pypy |
| 9 |
|
| 10 |
Depend on dev-python/pypy directly, as that's the common package |
| 11 |
with the new layout. |
| 12 |
|
| 13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 14 |
|
| 15 |
eclass/python-utils-r1.eclass | 4 ++-- |
| 16 |
eclass/tests/python-utils-r1.sh | 4 ++-- |
| 17 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass |
| 20 |
index 301c9a029b5..91a32434dfa 100644 |
| 21 |
--- a/eclass/python-utils-r1.eclass |
| 22 |
+++ b/eclass/python-utils-r1.eclass |
| 23 |
@@ -472,9 +472,9 @@ python_export() { |
| 24 |
python*) |
| 25 |
PYTHON_PKG_DEP="dev-lang/python:${impl#python}";; |
| 26 |
pypy) |
| 27 |
- PYTHON_PKG_DEP='>=virtual/pypy-5:0=';; |
| 28 |
+ PYTHON_PKG_DEP='>=dev-python/pypy-5:0=';; |
| 29 |
pypy3) |
| 30 |
- PYTHON_PKG_DEP='>=virtual/pypy3-5:0=';; |
| 31 |
+ PYTHON_PKG_DEP='>=dev-python/pypy3-5:0=';; |
| 32 |
jython2.7) |
| 33 |
PYTHON_PKG_DEP='dev-java/jython:2.7';; |
| 34 |
*) |
| 35 |
|
| 36 |
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh |
| 37 |
index 4910b700308..279324e163b 100755 |
| 38 |
--- a/eclass/tests/python-utils-r1.sh |
| 39 |
+++ b/eclass/tests/python-utils-r1.sh |
| 40 |
@@ -109,7 +109,7 @@ if [[ -x /usr/bin/pypy ]]; then |
| 41 |
test_var PYTHON_SITEDIR pypy "/usr/lib*/pypy2.7/site-packages" |
| 42 |
test_var PYTHON_INCLUDEDIR pypy "/usr/lib*/pypy2.7/include" |
| 43 |
fi |
| 44 |
-test_var PYTHON_PKG_DEP pypy '*virtual/pypy*:0=' |
| 45 |
+test_var PYTHON_PKG_DEP pypy '*dev-python/pypy*:0=' |
| 46 |
test_var PYTHON_SCRIPTDIR pypy /usr/lib/python-exec/pypy |
| 47 |
|
| 48 |
test_var EPYTHON pypy3 pypy3 |
| 49 |
@@ -118,7 +118,7 @@ if [[ -x /usr/bin/pypy3 ]]; then |
| 50 |
test_var PYTHON_SITEDIR pypy3 "/usr/lib*/pypy3.?/site-packages" |
| 51 |
test_var PYTHON_INCLUDEDIR pypy3 "/usr/lib*/pypy3.?/include" |
| 52 |
fi |
| 53 |
-test_var PYTHON_PKG_DEP pypy3 '*virtual/pypy3*:0=' |
| 54 |
+test_var PYTHON_PKG_DEP pypy3 '*dev-python/pypy3*:0=' |
| 55 |
test_var PYTHON_SCRIPTDIR pypy3 /usr/lib/python-exec/pypy3 |
| 56 |
|
| 57 |
test_is "python_is_python3 python2.7" 1 |
Archives