From 23824c28f0e29791d7eb0418f857b98f24fc08a0 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Wed, 5 Aug 2009 18:34:56 +0000 Subject: Use PYTHON() instead of get_python(). --- eclass/distutils.eclass | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'eclass') diff --git a/eclass/distutils.eclass b/eclass/distutils.eclass index 96572d8baefe..c06b007d769d 100644 --- a/eclass/distutils.eclass +++ b/eclass/distutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.57 2009/08/02 00:30:29 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.58 2009/08/05 18:34:56 arfrever Exp $ # @ECLASS: distutils.eclass # @MAINTAINER: @@ -71,8 +71,8 @@ distutils_src_prepare() { distutils_src_compile() { if ! has "${EAPI:-0}" 0 1 2 || [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then build_modules() { - echo "$(get_python)" setup.py build -b "build-${PYTHON_ABI}" "$@" - "$(get_python)" setup.py build -b "build-${PYTHON_ABI}" "$@" + echo "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" "$@" + "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" "$@" } python_execute_function build_modules "$@" else @@ -86,6 +86,7 @@ distutils_src_compile() { # It also installs the "standard docs" (CHANGELOG, Change*, KNOWN_BUGS, MAINTAINERS, # PKG-INFO, CONTRIBUTORS, TODO, NEWS, MANIFEST*, README*, and AUTHORS) distutils_src_install() { + local pylibdir # Mark the package to be rebuilt after a python upgrade. python_need_rebuild @@ -96,11 +97,11 @@ distutils_src_install() { # a package uses distutils but does not install anything # in site-packages. (eg. dev-java/java-config-2.x) # - liquidx (14/08/2006) - pylibdir="$("$(get_python)" -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')" + pylibdir="$("$(PYTHON)" -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')" [[ -n "${pylibdir}" ]] && dodir "${pylibdir}" - echo "$(get_python)" setup.py build -b "build-${PYTHON_ABI}" install --root="${D}" --no-compile "$@" - "$(get_python)" setup.py build -b "build-${PYTHON_ABI}" install --root="${D}" --no-compile "$@" + echo "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install --root="${D}" --no-compile "$@" + "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install --root="${D}" --no-compile "$@" } python_execute_function install_modules "$@" else -- cgit v1.2.3-65-gdbad