dev-java/jython: Fix epython.py module first install

diff --git a/dev-java/jython/jython-2.5.3-r3.ebuild b/dev-java/jython/jython-2.5.3-r3.ebuild
index f35e893b7ead0879ed4a451ccc57e07a12d616de..e455cffd64e28b8f8487ed0ce358a2439b3c968e 100644 (file)
--- a/dev-java/jython/jython-2.5.3-r3.ebuild
+++ b/dev-java/jython/jython-2.5.3-r3.ebuild
@@ -135,8 +135,8 @@ exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLAS
 _EOF_
        chmod +x "${T}"/jython || die
 
+       local -x PYTHON="${T}"/jython
        python_export jython${SLOT} EPYTHON PYTHON_SITEDIR
-       local PYTHON="${T}"/jython
 
        # compile tests (everything else is compiled already)
        # we're keeping it quiet since jython reports errors verbosely
@@ -144,6 +144,6 @@ _EOF_
        python_optimize "${ED}"/usr/share/jython-${SLOT}/Lib/test &>/dev/null
 
        # for python-exec
-       echo "EPYTHON='${EPYTHON}'" > epython.py
+       echo "EPYTHON='${EPYTHON}'" > epython.py || die
        python_domodule epython.py
 }

diff --git a/dev-java/jython/jython-2.7.0.ebuild b/dev-java/jython/jython-2.7.0.ebuild
index f46891f5c2a45c51ebdafd2477307fa8be953b55..4d60a40192e58c0be4a3e6288a784b8857e4f7a8 100644 (file)
--- a/dev-java/jython/jython-2.7.0.ebuild
+++ b/dev-java/jython/jython-2.7.0.ebuild
@@ -156,8 +156,11 @@ src_install() {
        EOF
        chmod +x "${T}"/jython || die
 
-       python_export jython${SLOT} EPYTHON PYTHON_SITEDIR
-       local PYTHON="${T}"/jython
+       local -x PYTHON="${T}"/jython
+       # we can't get the path from the interpreter since it does some
+       # magic that fails on non-installed copy...
+       local PYTHON_SITEDIR=${EPREFIX}/usr/share/jython-${SLOT}/Lib/site-packages
+       python_export jython${SLOT} EPYTHON
 
        # compile tests (everything else is compiled already)
        # we're keeping it quiet since jython reports errors verbosely
@@ -165,7 +168,7 @@ src_install() {
        python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
 
        # for python-exec
-       echo "EPYTHON='${EPYTHON}'" > epython.py
+       echo "EPYTHON='${EPYTHON}'" > epython.py || die
        python_domodule epython.py
 
        # some of the class files end up with newer timestamps than the files they