[gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/

[Fabian Groffen]

commit:     907ea4521c9b1c382eaeec1b2c4be1d1922b18f5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 17:28:28 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 17:28:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=907ea452

dev-lang/python: fix 3.3 install, by Jacob Godserv in bug #574926

Package-Manager: portage-2.2.20-prefix

 dev-lang/python/python-3.3.3.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-lang/python/python-3.3.3.ebuild 
b/dev-lang/python/python-3.3.3.ebuild
index 16122b7..8f989d8 100644
--- a/dev-lang/python/python-3.3.3.ebuild
+++ b/dev-lang/python/python-3.3.3.ebuild
@@ -360,14 +360,17 @@ src_install() {
                -i "${ED}etc/conf.d/pydoc-${SLOT}" 
"${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
        # for python-exec
-       python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+       local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
 
        # if not using a cross-compiler, use the fresh binary
        if ! tc-is-cross-compiler; then
-               local PYTHON=./python
+               local -x PYTHON=./python
                local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+       else
+               vars=( PYTHON "${vars[@]}" )
        fi
 
+       python_export "python${SLOT}" "${vars[@]}"
        echo "EPYTHON='${EPYTHON}'" > epython.py
        python_domodule epython.py
 }