diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-11-09 22:47:27 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-11-09 22:47:27 +0000 |
| commit | 27b175f061dce943b75df52a4bfb6b2d912bc962 (patch) | |
| tree | 7764659b304a3189183c7d0ca92f56b3818abddc /dev-python/pypy | |
| parent | Version bump. (diff) | |
| download | gentoo-2-27b175f061dce943b75df52a4bfb6b2d912bc962.tar.gz gentoo-2-27b175f061dce943b75df52a4bfb6b2d912bc962.tar.bz2 gentoo-2-27b175f061dce943b75df52a4bfb6b2d912bc962.zip | |
Improve/simplify interpreter choice code using new eclass code.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'dev-python/pypy')
| -rw-r--r-- | dev-python/pypy/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/pypy/pypy-2.4.0.ebuild | 23 |
2 files changed, 10 insertions, 18 deletions
diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog index 9d4e23a50d2d..90834314fe15 100644 --- a/dev-python/pypy/ChangeLog +++ b/dev-python/pypy/ChangeLog @@ -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 <mgorny@gentoo.org> pypy-2.4.0.ebuild: + Improve/simplify interpreter choice code using new eclass code. 08 Nov 2014; Michał Górny <mgorny@gentoo.org> -files/2.0.2-distutils-fix_handling_of_executables_and_flags.patch, diff --git a/dev-python/pypy/pypy-2.4.0.ebuild b/dev-python/pypy/pypy-2.4.0.ebuild index 10b9d24969c2..6fb18d90eba3 100644 --- a/dev-python/pypy/pypy-2.4.0.ebuild +++ b/dev-python/pypy/pypy-2.4.0.ebuild @@ -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 @@ S="${WORKDIR}/${P}-src" 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_pretend() { } 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 @@ pkg_setup() { 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() { |