mgorny 14/11/09 22:47:27 Modified: pypy-2.4.0.ebuild ChangeLog Log: Improve/simplify interpreter choice code using new eclass code. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.10 dev-python/pypy/pypy-2.4.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild?r1=1.9&r2=1.10 Index: pypy-2.4.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pypy-2.4.0.ebuild 8 Nov 2014 23:04:12 -0000 1.9 +++ pypy-2.4.0.ebuild 9 Nov 2014 22:47:27 -0000 1.10 @@ -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/dev-python/pypy/pypy-2.4.0.ebuild,v 1.9 2014/11/08 23:04:12 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild,v 1.10 2014/11/09 22:47:27 mgorny Exp $ EAPI=5 @@ -40,8 +40,7 @@ pkg_pretend() { if use low-memory; then - if ! has_version dev-python/pypy && ! has_version dev-python/pypy-bin - then + if ! python_is_installed pypy; then eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy" eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:" eerror @@ -62,15 +61,12 @@ } pkg_setup() { - local force_pypy - pkg_pretend - if has_version dev-python/pypy || has_version dev-python/pypy-bin - then - if [[ ! ${EPYTHON} ]] || use low-memory; then + if python_is_installed pypy; then + if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then einfo "Using already-installed PyPy to perform the translation." - force_pypy=1 + local EPYTHON=pypy else einfo "Using ${EPYTHON} to perform the translation. Please note that upstream" einfo "recommends using PyPy for that. If you wish to do so, please unset" @@ -78,14 +74,7 @@ fi fi - if [[ ${force_pypy} ]]; then - # set manually since python_setup needs virtual/pypy - # and we don't force the dep - python_export pypy EPYTHON PYTHON - python_wrapper_setup - else - python-any-r1_pkg_setup - fi + python-any-r1_pkg_setup } src_prepare() { 1.81 dev-python/pypy/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.81&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.81&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?r1=1.80&r2=1.81 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- ChangeLog 8 Nov 2014 23:10:10 -0000 1.80 +++ ChangeLog 9 Nov 2014 22:47:27 -0000 1.81 @@ -1,6 +1,9 @@ # ChangeLog for dev-python/pypy # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.80 2014/11/08 23:10:10 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.81 2014/11/09 22:47:27 mgorny Exp $ + + 09 Nov 2014; Michał Górny <[email protected]> pypy-2.4.0.ebuild: + Improve/simplify interpreter choice code using new eclass code. 08 Nov 2014; Michał Górny <[email protected]> -files/2.0.2-distutils-fix_handling_of_executables_and_flags.patch,
