diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-03-12 09:06:06 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-03-12 09:06:06 +0000 |
| commit | f6417f79ed2ca3c36c8bb349a2861246926d59c4 (patch) | |
| tree | 7ba17502df0534f9c6fd126b7726354be5a816d1 /eclass | |
| parent | Stable for amd64 wrt bug #503108 (diff) | |
| download | gentoo-2-f6417f79ed2ca3c36c8bb349a2861246926d59c4.tar.gz gentoo-2-f6417f79ed2ca3c36c8bb349a2861246926d59c4.tar.bz2 gentoo-2-f6417f79ed2ca3c36c8bb349a2861246926d59c4.zip | |
Revert ignorant pypy2_2 commit.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 98a2dac29e73..c588a4b1712e 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1171 2014/03/12 08:18:38 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1172 2014/03/12 09:06:06 mgorny Exp $ + + 12 Mar 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass: + Revert ignorant pypy2_2 commit. 12 Mar 2014; Patrick Lauer <patrick@gentoo.org> python-utils-r1.eclass: Modify python-utils-r1 for pypy2.2 diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 94c714db38f1..51d0dc6190d8 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.48 2014/03/12 08:18:38 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.49 2014/03/12 09:06:06 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_2 + pypy2_0 python3_2 python3_3 python3_4 python2_6 python2_7 ) @@ -66,7 +66,7 @@ _python_impl_supported() { # keep in sync with _PYTHON_ALL_IMPLS! # (not using that list because inline patterns shall be faster) case "${impl}" in - python2_[67]|python3_[234]|pypy2_[02]|jython2_[57]) + python2_[67]|python3_[234]|pypy2_0|jython2_[57]) return 0 ;; pypy1_[89]|python2_5|python3_1) @@ -361,8 +361,6 @@ python_export() { PYTHON_PKG_DEP="dev-lang/python:${impl#python}";; pypy-c2.0) PYTHON_PKG_DEP='>=virtual/pypy-2.0.2:2.0';; - pypy-c2.2) - PYTHON_PKG_DEP='>=virtual/pypy-2.2.1:2.2';; jython2.5) PYTHON_PKG_DEP='>=dev-java/jython-2.5.3-r2:2.5';; jython2.7) |