[gentoo-commits] dev/xmw:master commit in: dev-java/grappa/

[Michael Weber]

commit:     adf77712edd2fe827b5f22a7e6f7ec5aa0c9115b
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Wed Aug 26 12:06:40 2015 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 12:06:40 2015 +0000
URL:        https://gitweb.gentoo.org/dev/xmw.git/commit/?id=adf77712

dev-java/grappa: fix java

Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 0x927ADD0C62EEF090

 dev-java/grappa/grappa-1.2.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-java/grappa/grappa-1.2.ebuild 
b/dev-java/grappa/grappa-1.2.ebuild
index 7e49518..750d731 100644
--- a/dev-java/grappa/grappa-1.2.ebuild
+++ b/dev-java/grappa/grappa-1.2.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
        dev-java/javacup:0
-       virtual/jdk:1.7"
+       >=virtual/jdk-0"
 
 S=${WORKDIR}/src/jdk1.2/att/grappa
 
@@ -38,7 +38,7 @@ src_compile() {
        java-pkg_jar-from --build-only javacup javacup-runtime.jar
        #JDK=jdk1.2 ./mkParser || die
        einfo "genrating Parser.java and Symbols.java from Parser.cup"
-       java -jar javacup.jar -package att.grappa \
+       "${JAVA_HOME}"/bin/java -jar javacup.jar -package att.grappa \
                -parser Parser -symbols Symbols -nonterms \
                < Parser.cup || die
        sed -e "/^public/i\\
@@ -46,8 +46,8 @@ $(sed -n '/^.[*]/s/$/\\/p' Parser.cup)
 "              -i Parser.java || die
 
        #JDK=jdk1.2 ./mk || die
-       einfo "javac *.java"
-       javac -source 5 -target 5 -classpath javacup.jar:javacup-runtime.jar -g 
-nowarn *.java || die
+       einfo "${JAVAC} *.java"
+       "${JAVAC}" -source 5 -target 5 -classpath 
javacup.jar:javacup-runtime.jar -g -nowarn *.java || die
 }
 
 src_install() {