mgorny 14/03/12 09:29:40 Modified: ChangeLog python-utils-r1.eclass Log: Use subslot operator deps on non-slotted PyPy.
Revision Changes Path 1.1174 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1174&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1174&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1173&r2=1.1174 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1173 retrieving revision 1.1174 diff -u -r1.1173 -r1.1174 --- ChangeLog 12 Mar 2014 09:23:39 -0000 1.1173 +++ ChangeLog 12 Mar 2014 09:29:39 -0000 1.1174 @@ -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 <[email protected]> python-utils-r1.eclass: + Use subslot operator deps on non-slotted PyPy. 12 Mar 2014; Michał Górny <[email protected]> python-utils-r1.eclass, tests/python-utils-r1.sh: 1.51 eclass/python-utils-r1.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.51&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.51&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.50&r2=1.51 Index: python-utils-r1.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- python-utils-r1.eclass 12 Mar 2014 09:23:39 -0000 1.50 +++ python-utils-r1.eclass 12 Mar 2014 09:29:39 -0000 1.51 @@ -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 @@ 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 @@ 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)
