diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-11-03 07:58:16 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-11-03 07:58:16 +0000 |
| commit | 88bcbd80c8c5b7679ea39bbc26d186aae88de917 (patch) | |
| tree | 4aed922d2c2e01ae5345b03f0d26a3fd3172d3aa /eclass | |
| parent | Version bump (diff) | |
| download | historical-88bcbd80c8c5b7679ea39bbc26d186aae88de917.tar.gz historical-88bcbd80c8c5b7679ea39bbc26d186aae88de917.tar.bz2 historical-88bcbd80c8c5b7679ea39bbc26d186aae88de917.zip | |
Fix python-utils-r1 tests to accomodate versions in PYTHON_PKG_DEP.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rwxr-xr-x | eclass/tests/python-utils-r1.sh | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 61739320a15e..5902a3d3bd26 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1044 2013/11/02 12:58:50 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1045 2013/11/03 07:58:16 mgorny Exp $ + + 03 Nov 2013; Michał Górny <mgorny@gentoo.org> tests/python-utils-r1.sh: + Fix python-utils-r1 tests to accomodate versions in PYTHON_PKG_DEP. 02 Nov 2013; Tom Wijsman <TomWij@gentoo.org> kernel-2.eclass: Trivial change to support patches with pre-defined patch levels. diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index 1e8fe1a0a67c..e3e9c6328ce7 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -37,7 +37,7 @@ test_var PYTHON python2_7 /usr/bin/python2.7 test_var PYTHON_SITEDIR python2_7 /usr/lib/python2.7/site-packages test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7 test_var PYTHON_LIBPATH python2_7 /usr/lib/libpython2.7$(get_libname) -test_var PYTHON_PKG_DEP python2_7 dev-lang/python:2.7 +test_var PYTHON_PKG_DEP python2_7 '*dev-lang/python*:2.7' test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7 test_var EPYTHON python3_3 python3.3 @@ -45,20 +45,20 @@ test_var PYTHON python3_3 /usr/bin/python3.3 test_var PYTHON_SITEDIR python3_3 /usr/lib/python3.3/site-packages test_var PYTHON_INCLUDEDIR python3_3 /usr/include/python3.3 test_var PYTHON_LIBPATH python3_3 /usr/lib/libpython3.3$(get_libname) -test_var PYTHON_PKG_DEP python3_3 dev-lang/python:3.3 +test_var PYTHON_PKG_DEP python3_3 '*dev-lang/python*:3.3' test_var PYTHON_SCRIPTDIR python3_3 /usr/lib/python-exec/python3.3 test_var EPYTHON jython2_7 jython2.7 test_var PYTHON jython2_7 /usr/bin/jython2.7 test_var PYTHON_SITEDIR jython2_7 /usr/share/jython-2.7/Lib/site-packages -test_var PYTHON_PKG_DEP jython2_7 dev-java/jython:2.7 +test_var PYTHON_PKG_DEP jython2_7 '*dev-java/jython*:2.7' test_var PYTHON_SCRIPTDIR jython2_7 /usr/lib/python-exec/jython2.7 test_var EPYTHON pypy2_0 pypy-c2.0 test_var PYTHON pypy2_0 /usr/bin/pypy-c2.0 test_var PYTHON_SITEDIR pypy2_0 /usr/lib/pypy2.0/site-packages test_var PYTHON_INCLUDEDIR pypy2_0 /usr/lib/pypy2.0/include -test_var PYTHON_PKG_DEP pypy2_0 virtual/pypy:2.0 +test_var PYTHON_PKG_DEP pypy2_0 '*virtual/pypy*:2.0' test_var PYTHON_SCRIPTDIR pypy2_0 /usr/lib/python-exec/pypy-c2.0 test_is python_is_python3 python2.7 1 |