diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-03-12 09:29:39 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-03-12 09:29:39 +0000 |
| commit | 034e50ed7d7fc286879077ef7d2527c5fecf2051 (patch) | |
| tree | 06cdb1ea9d3f14679c2a9c837dbdadf65e713d0c /eclass | |
| parent | Removed old stable version using deprecated distutils eclass. (diff) | |
| download | gentoo-2-034e50ed7d7fc286879077ef7d2527c5fecf2051.tar.gz gentoo-2-034e50ed7d7fc286879077ef7d2527c5fecf2051.tar.bz2 gentoo-2-034e50ed7d7fc286879077ef7d2527c5fecf2051.zip | |
Use subslot operator deps on non-slotted PyPy.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index c9eb038bbcb5..2d27df3474c0 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.1173 2014/03/12 09:23:39 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1174 2014/03/12 09:29:39 mgorny Exp $ + + 12 Mar 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass: + Use subslot operator deps on non-slotted PyPy. 12 Mar 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass, tests/python-utils-r1.sh: diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 6f1bc475cca5..c1bb626a4388 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.50 2014/03/12 09:23:39 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.51 2014/03/12 09:29:39 mgorny Exp $ # @ECLASS: python-utils-r1 # @MAINTAINER: @@ -72,6 +72,11 @@ _python_impl_supported() { pypy1_[89]|python2_5|python3_1) return 1 ;; + pypy) + if [[ ${EAPI:-0} == [01234] ]]; then + die "PyPy is supported in EAPI 5 and newer only." + fi + ;; *) die "Invalid implementation in PYTHON_COMPAT: ${impl}" esac @@ -366,7 +371,7 @@ python_export() { pypy-c2.0) PYTHON_PKG_DEP='>=virtual/pypy-2.0.2:2.0';; pypy) - PYTHON_PKG_DEP='virtual/pypy:0';; + PYTHON_PKG_DEP='virtual/pypy:0=';; jython2.5) PYTHON_PKG_DEP='>=dev-java/jython-2.5.3-r2:2.5';; jython2.7) |