diff options
| author |   Marien Zwart <marienz@gentoo.org> | 2012-03-29 12:47:35 +0000 |
|---|---|---|
| committer | Marien Zwart <marienz@gentoo.org> | 2012-03-29 12:47:35 +0000 |
| commit | b85074f425aede076ecb54c3266ecde444292c28 (patch) | |
| tree | d5bab5babc3db3ca35d7a9fabe5599db94c14974 /eclass | |
| parent | Version bump. (diff) | |
| download | gentoo-2-b85074f425aede076ecb54c3266ecde444292c28.tar.gz gentoo-2-b85074f425aede076ecb54c3266ecde444292c28.tar.bz2 gentoo-2-b85074f425aede076ecb54c3266ecde444292c28.zip | |
Add more versions of pypy to the hardcoded mapping in python.eclass.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/python.eclass | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 28bd20495e10..22a52857791e 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.192 2012/03/28 14:21:55 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.193 2012/03/29 12:47:35 marienz Exp $ + + 29 Mar 2012; Marien Zwart <marienz@gentoo.org> python.eclass: + Add more versions of pypy to the hardcoded mapping in python.eclass. 28 Mar 2012; Marien Zwart <marienz@gentoo.org> python-distutils-ng.eclass: Try to unbreak dependency generation. diff --git a/eclass/python.eclass b/eclass/python.eclass index d88cd35d8d1e..d11050a82997 100644 --- a/eclass/python.eclass +++ b/eclass/python.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.153 2012/03/20 20:37:21 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.154 2012/03/29 12:47:35 marienz Exp $ # @ECLASS: python.eclass # @MAINTAINER: @@ -1307,7 +1307,10 @@ python_shebang_options_re = re.compile(r"^#![ \t]*${EPREFIX}/usr/bin/(?:jython|p python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$") pypy_versions_mapping = { - "1.5": "2.7" + "1.5": "2.7", + "1.6": "2.7", + "1.7": "2.7", + "1.8": "2.7", } def get_PYTHON_ABI(python_interpreter): |