Fixes #53829.

7 files changed, 103 insertions, 5 deletions

diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog
index 50c285796cfa..a4f1d7fd5334 100644
--- a/dev-java/javacc/ChangeLog
+++ b/dev-java/javacc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/javacc
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.6 2004/04/26 03:39:28 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.7 2004/06/19 22:54:38 karltk Exp $
+
+*javacc-3.2-r2 (19 Jun 2004)
+
+  19 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org> javacc-3.2-r2.ebuild:
+  Fixed JAVACC_HOME and VERSION bug, #53829, thanks to Andy Daniels
+  <danielsa@uwstout.edu> for initial suggestions.
 
   30 Apr 2004; Chris Aniszczyk <zx@gentoo.org> javacc-3.2.ebuild:
   Clean up.
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 1f1593582214..0b53f92ae23e 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,8 +1,13 @@
-MD5 5cd4bcd68eb284e8e325f1e0ca1c9369 files/javacc-3.2 293
+MD5 dea21eca5dbf01e78206867e10d6f653 ChangeLog 1197
+MD5 4588f115bd9435fa337d0d88a0a264b8 javacc-3.2-r2.ebuild 1269
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 f8c60c4ed2bfd61850c921e18264c27c javacc-3.2-r1.ebuild 920
+MD5 0254d70a0b74b6bdaf13ed190e83ce88 files/javacc.sh-3.2 400
+MD5 27f05e9ef0c9b90262c6f9f43dae9633 files/jjdoc-3.2 380
 MD5 c1977d510ff18a454666499bed5aa797 files/digest-javacc-3.2-r1 62
+MD5 169889bcf3545fed8164d19166f6216d files/jjtree-3.2 388
+MD5 c1977d510ff18a454666499bed5aa797 files/digest-javacc-3.2-r2 62
+MD5 80b2c57ca20498f6cc1ff30d6c984383 files/javacc-3.2 292
 MD5 6f5d6501b4f873ffbd9cbca5a847b897 files/javacc 128
 MD5 34ffde7ed24a1315dbcba6b16557f644 files/jjdoc 127
 MD5 f4614a490a4f23987e131ce4f47a0ddf files/jjtree 128
-MD5 834dda3a588b8383b9cf094f2b78098b ChangeLog 966
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 bf50f037342b91538c752c81580105c6 javacc-3.2-r1.ebuild 921
diff --git a/dev-java/javacc/files/digest-javacc-3.2-r2 b/dev-java/javacc/files/digest-javacc-3.2-r2
new file mode 100644
index 000000000000..5a33b72706cc
--- /dev/null
+++ b/dev-java/javacc/files/digest-javacc-3.2-r2
@@ -0,0 +1 @@
+MD5 bc0fe5d325e24f2e7c95e5c962813354 javacc-3.2.tar.gz 620640
diff --git a/dev-java/javacc/files/javacc.sh-3.2 b/dev-java/javacc/files/javacc.sh-3.2
new file mode 100644
index 000000000000..b5509e339980
--- /dev/null
+++ b/dev-java/javacc/files/javacc.sh-3.2
@@ -0,0 +1,14 @@
+#! /bin/sh
+#
+# Copyright (c) 2004, Gentoo Technologies, Inc.
+# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
+#
+# Licensed under the GNU General Public License, v2
+
+. /etc/env.d/java/22javacc
+[ -f "${HOME}/.gentoo/env.d/22javacc" ] && . ${HOME}/.gentoo/env.d/22javacc
+
+java=$(java-config --java)
+classpath=$(java-config --classpath=javacc)
+
+${java} -classpath ${classpath} javacc "$@"
diff --git a/dev-java/javacc/files/jjdoc-3.2 b/dev-java/javacc/files/jjdoc-3.2
new file mode 100644
index 000000000000..f886ee838682
--- /dev/null
+++ b/dev-java/javacc/files/jjdoc-3.2
@@ -0,0 +1,14 @@
+#! /bin/sh
+#
+# Copyright (c) Gentoo Technologies, Inc.
+# Copyright (c) Karl Trygve Kalleberg <karltk@gentoo.org>
+#
+# Licensed under the GNU General License, v2
+
+. /etc/env.d/java/22javacc
+[ -f "${HOME}/.gentoo/env.d/22javacc" ] && . ${HOME}/.gentoo/env.d/22javacc
+
+java=$(java-config --java)
+classpath=$(java-config --classpath=javacc)
+
+${java} -classpath ${classpath} jjdoc "$@"
diff --git a/dev-java/javacc/files/jjtree-3.2 b/dev-java/javacc/files/jjtree-3.2
new file mode 100644
index 000000000000..3385f5c3ebb9
--- /dev/null
+++ b/dev-java/javacc/files/jjtree-3.2
@@ -0,0 +1,14 @@
+#! /bin/sh
+#
+# Copyright (c) Gentoo Technologies, Inc.
+# Copyright (c) Karl Trygve Kalleberg <karltk@gentoo.org>
+#
+# Licensed under the GNU General Public License, v2
+
+. /etc/env.d/java/22javacc
+[ -f "${HOME}/.gentoo/env.d/22javacc" ] && . ${HOME}/.gentoo/env.d/22javacc
+
+java=$(java-config --java)
+classpath=$(java-config --classpath=javacc)
+
+${java} -classpath ${classpath} jjtree "$@"
diff --git a/dev-java/javacc/javacc-3.2-r2.ebuild b/dev-java/javacc/javacc-3.2-r2.ebuild
new file mode 100644
index 000000000000..436aab424df8
--- /dev/null
+++ b/dev-java/javacc/javacc-3.2-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-3.2-r2.ebuild,v 1.1 2004/06/19 22:54:38 karltk Exp $
+
+inherit java-pkg
+
+DESCRIPTION="Java Compiler Compiler [tm] (JavaCC [tm]) - The Java Parser Generator"
+HOMEPAGE="https://javacc.dev.java.net/servlets/ProjectHome"
+SRC_URI="https://javacc.dev.java.net/files/documents/17/3616/javacc-3.2.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="doc"
+DEPEND="virtual/jdk
+		sys-apps/sed
+		dev-java/ant"
+RDEPEND="virtual/jre"
+
+src_compile() {
+	ant || die "compilation failed"
+
+	cp ${FILESDIR}/${PN}-${PV} ${S}/ || die "Missing env file ${P}"
+	sed -i \
+		-e "s:@PV@:${PV}:" \
+		-e "s:@PN@:${PN}:" \
+		${PN}-${PV} || die "Failed to sed"
+}
+
+src_install() {
+	if use doc ; then
+		dohtml -r www/* || die "Failed to install HTML files"
+		dodir /usr/share/${PN}/examples
+		cp -R examples ${D}/usr/share/${PN} || die "Failed to copy examples"
+	fi
+	java-pkg_dojar bin/lib/javacc.jar
+
+	newbin ${FILESDIR}/javacc.sh-${PV} javacc
+	newbin ${FILESDIR}/jjdoc-${PV} jjdoc
+	newbin ${FILESDIR}/jjtree-${PV} jjtree
+
+	dodir /etc/env.d/java
+	insinto /etc/env.d/java
+	newins ${PN}-${PV} 22javacc || die "Missing ${PF}"
+}