[gentoo-python] [PATCH jython2.5 ebuild 3/4] use python-utils-r1 to compile not-compiled-already files

[Michał Górny]

---
 gx86/dev-java/jython/jython-2.5.3-r2.ebuild | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/gx86/dev-java/jython/jython-2.5.3-r2.ebuild b/gx86/dev-java/jython/jython-2.5.3-r2.ebuild
index 2dbdb9c..751d143 100644
--- a/gx86/dev-java/jython/jython-2.5.3-r2.ebuild
+++ b/gx86/dev-java/jython/jython-2.5.3-r2.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 
 JAVA_PKG_IUSE="doc examples source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit eutils java-pkg-2 java-ant-2 python-utils-r1
 
 DESCRIPTION="An implementation of Python written in Java"
 HOMEPAGE="http://www.jython.org"
@@ -121,9 +121,20 @@ src_install() {
 	dodir /etc/sandbox.d
 	echo "SANDBOX_PREDICT=/usr/share/${PN}-${SLOT}" > "${ED}/etc/sandbox.d/20${P}-${SLOT}"
 
-	# compile aot
-	java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
-		-Dpython.home="${ED}"/usr/share/${PN}-${SLOT} \
-		-Dpython.cachedir="${T}/.jythoncachedir" \
-		org.python.util.jython -m compileall -f -q -x "/test/" "${ED}" || die
+	# we need a wrapper to help python_optimize
+	cat > "${T}"/jython <<_EOF_ || die
+exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
+	-Dpython.home="${ED}"/usr/share/${PN}-${SLOT} \
+	-Dpython.cachedir="${T}/.jythoncachedir" \
+	org.python.util.jython "\${@}"
+_EOF_
+	chmod +x "${T}"/jython || die
+
+	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
+	# and some of the tests are supposed to trigger compile errors
+	python_optimize "${ED}"/usr/share/jython-${SLOT}/Lib/test &>/dev/null
 }
-- 
1.8.0