mgorny 14/11/05 23:03:01 Modified: ChangeLog python-r1.eclass python-utils-r1.eclass Log: Add support for PyPy3.
Revision Changes Path 1.1403 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1403&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1403&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1402&r2=1.1403 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1402 retrieving revision 1.1403 diff -u -r1.1402 -r1.1403 --- ChangeLog 5 Nov 2014 00:24:33 -0000 1.1402 +++ ChangeLog 5 Nov 2014 23:03:01 -0000 1.1403 @@ -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.1402 2014/11/05 00:24:33 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1403 2014/11/05 23:03:01 mgorny Exp $ + + 05 Nov 2014; Michał Górny <mgo...@gentoo.org> python-r1.eclass, + python-utils-r1.eclass, tests/python-utils-r1.sh: + Add support for PyPy3. 05 Nov 2014; Andreas K. Huettel <dilfri...@gentoo.org> perl-module.eclass: Remove unused function perl_set_eprefix 1.77 eclass/python-r1.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.77&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.77&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.76&r2=1.77 Index: python-r1.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- python-r1.eclass 18 Aug 2014 08:56:06 -0000 1.76 +++ python-r1.eclass 5 Nov 2014 23:03:01 -0000 1.77 @@ -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-r1.eclass,v 1.76 2014/08/18 08:56:06 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.77 2014/11/05 23:03:01 mgorny Exp $ # @ECLASS: python-r1 # @MAINTAINER: @@ -565,7 +565,7 @@ local abi case "${impl}" in - pypy|python3_4) + pypy|pypy3|python3_4) # unsupported in python.eclass continue ;; 1.63 eclass/python-utils-r1.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.63&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.63&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.62&r2=1.63 Index: python-utils-r1.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- python-utils-r1.eclass 18 Oct 2014 22:36:17 -0000 1.62 +++ python-utils-r1.eclass 5 Nov 2014 23:03:01 -0000 1.63 @@ -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.62 2014/10/18 22:36:17 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.63 2014/11/05 23:03:01 mgorny Exp $ # @ECLASS: python-utils-r1 # @MAINTAINER: @@ -41,7 +41,7 @@ # All supported Python implementations, most preferred last. _PYTHON_ALL_IMPLS=( jython2_5 jython2_7 - pypy + pypy pypy3 python3_2 python3_3 python3_4 python2_7 ) @@ -72,7 +72,7 @@ pypy1_[89]|pypy2_0|python2_[56]|python3_1) return 1 ;; - pypy) + pypy|pypy3) if [[ ${EAPI:-0} == [01234] ]]; then die "PyPy is supported in EAPI 5 and newer only." fi @@ -235,7 +235,7 @@ impl=${1/_/.} shift ;; - pypy) + pypy|pypy3) impl=${1} shift ;; @@ -261,7 +261,7 @@ PYTHON_SITEDIR) local dir case "${impl}" in - python*|pypy) + python*|pypy|pypy3) dir=/usr/$(get_libdir)/${impl} ;; jython*) @@ -278,7 +278,7 @@ python*) dir=/usr/include/${impl} ;; - pypy) + pypy|pypy3) dir=/usr/$(get_libdir)/${impl}/include ;; *) @@ -350,6 +350,8 @@ PYTHON_PKG_DEP="dev-lang/python:${impl#python}";; pypy) PYTHON_PKG_DEP='virtual/pypy:0=';; + pypy3) + PYTHON_PKG_DEP='virtual/pypy3:0=';; jython2.5) PYTHON_PKG_DEP='>=dev-java/jython-2.5.3-r2:2.5';; jython2.7) @@ -914,7 +916,7 @@ local impl=${1:-${EPYTHON}} [[ ${impl} ]] || die "python_is_python3: no impl nor EPYTHON" - [[ ${impl} == python3* ]] + [[ ${impl} == python3* || ${impl} == pypy3 ]] } # @FUNCTION: python_fix_shebang @@ -1001,7 +1003,7 @@ fi break ;; - *python[23].[0123456789]|*pypy|*jython[23].[0123456789]) + *python[23].[0123456789]|*pypy|*pypy3|*jython[23].[0123456789]) # Explicit mismatch. if [[ ! ${force} ]]; then error=1 @@ -1011,6 +1013,8 @@ from="python[23].[0123456789]";; *pypy) from="pypy";; + *pypy3) + from="pypy3";; *jython[23].[0123456789]) from="jython[23].[0123456789]";; *)
