diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-03-12 09:23:39 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-03-12 09:23:39 +0000 |
| commit | c228ab042aeab1afdb2ac40057c43acc9e812cb5 (patch) | |
| tree | 945b483149b948a9eb4039bcf06ce966491b9ac9 /eclass | |
| parent | Update the mask for fixed ebuild and virtual. (diff) | |
| download | gentoo-2-c228ab042aeab1afdb2ac40057c43acc9e812cb5.tar.gz gentoo-2-c228ab042aeab1afdb2ac40057c43acc9e812cb5.tar.bz2 gentoo-2-c228ab042aeab1afdb2ac40057c43acc9e812cb5.zip | |
Add non-slotted pypy to the eclass.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 10 | ||||
| -rwxr-xr-x | eclass/tests/python-utils-r1.sh | 8 |
3 files changed, 21 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index c588a4b1712e..c9eb038bbcb5 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1172 2014/03/12 09:06:06 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1173 2014/03/12 09:23:39 mgorny Exp $ + + 12 Mar 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass, + tests/python-utils-r1.sh: + Add non-slotted pypy to the eclass. 12 Mar 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass: Revert ignorant pypy2_2 commit. diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 51d0dc6190d8..6f1bc475cca5 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.49 2014/03/12 09:06:06 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.50 2014/03/12 09:23:39 mgorny Exp $ # @ECLASS: python-utils-r1 # @MAINTAINER: @@ -41,7 +41,7 @@ inherit eutils multilib toolchain-funcs # All supported Python implementations, most preferred last. _PYTHON_ALL_IMPLS=( jython2_5 jython2_7 - pypy2_0 + pypy2_0 pypy python3_2 python3_3 python3_4 python2_6 python2_7 ) @@ -230,6 +230,10 @@ python_export() { impl=${1/_/.} shift ;; + pypy) + impl=${1} + shift + ;; pypy-c*) impl=${1} shift @@ -361,6 +365,8 @@ python_export() { PYTHON_PKG_DEP="dev-lang/python:${impl#python}";; pypy-c2.0) PYTHON_PKG_DEP='>=virtual/pypy-2.0.2:2.0';; + pypy) + PYTHON_PKG_DEP='virtual/pypy:0';; jython2.5) PYTHON_PKG_DEP='>=dev-java/jython-2.5.3-r2:2.5';; jython2.7) diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index e3e9c6328ce7..9b246ace5447 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -61,9 +61,17 @@ 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_SCRIPTDIR pypy2_0 /usr/lib/python-exec/pypy-c2.0 +test_var EPYTHON pypy pypy +test_var PYTHON pypy /usr/bin/pypy +test_var PYTHON_SITEDIR pypy /usr/lib/pypy/site-packages +test_var PYTHON_INCLUDEDIR pypy /usr/lib/pypy/include +test_var PYTHON_PKG_DEP pypy '*virtual/pypy*:0' +test_var PYTHON_SCRIPTDIR pypy /usr/lib/python-exec/pypy + test_is python_is_python3 python2.7 1 test_is python_is_python3 python3.2 0 test_is python_is_python3 jython2.7 1 test_is python_is_python3 pypy2.0 1 +test_is python_is_python3 pypy 1 texit |