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

[Michael Weber]

commit:     79f31022d501fa483bbaa362e4736f9ffe37f229
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Wed Aug 26 12:16:22 2015 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 12:16:22 2015 +0000
URL:        https://gitweb.gentoo.org/dev/xmw.git/commit/?id=79f31022

dev-java/grappa: cleanup ebuild

Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 62EEF090

 dev-java/grappa/grappa-1.2.ebuild | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/dev-java/grappa/grappa-1.2.ebuild 
b/dev-java/grappa/grappa-1.2.ebuild
index 750d731..928775c 100644
--- a/dev-java/grappa/grappa-1.2.ebuild
+++ b/dev-java/grappa/grappa-1.2.ebuild
@@ -24,30 +24,26 @@ S=${WORKDIR}/src/jdk1.2/att/grappa
 
 src_prepare() {
        cd "${WORKDIR}" || die
-
-       #unbundle old and system files
        rm -rf archives src/jdk1.0 src/jdk1.1 src/jdk1.2/java_cup || die
-
        epatch "${FILESDIR}"/${P}-Parser.cup.patch
-
        java-pkg_ensure-no-bundled-jars
 }
 
 src_compile() {
        java-pkg_jar-from --build-only javacup javacup.jar
        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_HOME}"/bin/java -jar javacup.jar -package att.grappa \
-               -parser Parser -symbols Symbols -nonterms \
-               < Parser.cup || die
-       sed -e "/^public/i\\
-$(sed -n '/^.[*]/s/$/\\/p' Parser.cup)
-"              -i Parser.java || die
+               -parser Parser -symbols Symbols -nonterms < Parser.cup || die
+       sed -e "/^public/i$(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
+       "${JAVAC}" -source 5 -target 5 -classpath 
javacup.jar:javacup-runtime.jar \
+               -g -nowarn *.java || die
 }
 
 src_install() {