| 1 |
mgorny 13/11/03 07:58:16 |
| 2 |
|
| 3 |
Modified: python-utils-r1.sh |
| 4 |
Log: |
| 5 |
Fix python-utils-r1 tests to accomodate versions in PYTHON_PKG_DEP. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.3 eclass/tests/python-utils-r1.sh |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/tests/python-utils-r1.sh?rev=1.3&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/tests/python-utils-r1.sh?rev=1.3&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/tests/python-utils-r1.sh?r1=1.2&r2=1.3 |
| 13 |
|
| 14 |
Index: python-utils-r1.sh |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/tests/python-utils-r1.sh,v |
| 17 |
retrieving revision 1.2 |
| 18 |
retrieving revision 1.3 |
| 19 |
diff -u -r1.2 -r1.3 |
| 20 |
--- python-utils-r1.sh 17 Sep 2013 13:25:58 -0000 1.2 |
| 21 |
+++ python-utils-r1.sh 3 Nov 2013 07:58:16 -0000 1.3 |
| 22 |
@@ -37,7 +37,7 @@ |
| 23 |
test_var PYTHON_SITEDIR python2_7 /usr/lib/python2.7/site-packages |
| 24 |
test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7 |
| 25 |
test_var PYTHON_LIBPATH python2_7 /usr/lib/libpython2.7$(get_libname) |
| 26 |
-test_var PYTHON_PKG_DEP python2_7 dev-lang/python:2.7 |
| 27 |
+test_var PYTHON_PKG_DEP python2_7 '*dev-lang/python*:2.7' |
| 28 |
test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7 |
| 29 |
|
| 30 |
test_var EPYTHON python3_3 python3.3 |
| 31 |
@@ -45,20 +45,20 @@ |
| 32 |
test_var PYTHON_SITEDIR python3_3 /usr/lib/python3.3/site-packages |
| 33 |
test_var PYTHON_INCLUDEDIR python3_3 /usr/include/python3.3 |
| 34 |
test_var PYTHON_LIBPATH python3_3 /usr/lib/libpython3.3$(get_libname) |
| 35 |
-test_var PYTHON_PKG_DEP python3_3 dev-lang/python:3.3 |
| 36 |
+test_var PYTHON_PKG_DEP python3_3 '*dev-lang/python*:3.3' |
| 37 |
test_var PYTHON_SCRIPTDIR python3_3 /usr/lib/python-exec/python3.3 |
| 38 |
|
| 39 |
test_var EPYTHON jython2_7 jython2.7 |
| 40 |
test_var PYTHON jython2_7 /usr/bin/jython2.7 |
| 41 |
test_var PYTHON_SITEDIR jython2_7 /usr/share/jython-2.7/Lib/site-packages |
| 42 |
-test_var PYTHON_PKG_DEP jython2_7 dev-java/jython:2.7 |
| 43 |
+test_var PYTHON_PKG_DEP jython2_7 '*dev-java/jython*:2.7' |
| 44 |
test_var PYTHON_SCRIPTDIR jython2_7 /usr/lib/python-exec/jython2.7 |
| 45 |
|
| 46 |
test_var EPYTHON pypy2_0 pypy-c2.0 |
| 47 |
test_var PYTHON pypy2_0 /usr/bin/pypy-c2.0 |
| 48 |
test_var PYTHON_SITEDIR pypy2_0 /usr/lib/pypy2.0/site-packages |
| 49 |
test_var PYTHON_INCLUDEDIR pypy2_0 /usr/lib/pypy2.0/include |
| 50 |
-test_var PYTHON_PKG_DEP pypy2_0 virtual/pypy:2.0 |
| 51 |
+test_var PYTHON_PKG_DEP pypy2_0 '*virtual/pypy*:2.0' |
| 52 |
test_var PYTHON_SCRIPTDIR pypy2_0 /usr/lib/python-exec/pypy-c2.0 |
| 53 |
|
| 54 |
test_is python_is_python3 python2.7 1 |
Archives