Fixes #46135

7 files changed, 66 insertions, 42 deletions

diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog
index c398a2b7d740..6ef0a4301a19 100644
--- a/dev-java/javacc/ChangeLog
+++ b/dev-java/javacc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.1 2004/02/27 15:24:24 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.2 2004/03/29 19:10:27 karltk Exp $
+
+*javacc-3.2-r1 (29 Mar 2004)
+
+  29 Mar 2004; Karl Trygve Kalleberg <karltk@gentoo.org> 
+  Rewrote to use the src tarball instead. Fixes #46135.
 
 *javacc-3.2 (29 Feb 2004)
 
diff --git a/dev-java/javacc/files/digest-javacc-3.2-r1 b/dev-java/javacc/files/digest-javacc-3.2-r1
new file mode 100644
index 000000000000..5a33b72706cc
--- /dev/null
+++ b/dev-java/javacc/files/digest-javacc-3.2-r1
@@ -0,0 +1 @@
+MD5 bc0fe5d325e24f2e7c95e5c962813354 javacc-3.2.tar.gz 620640
diff --git a/dev-java/javacc/files/javacc b/dev-java/javacc/files/javacc
new file mode 100644
index 000000000000..032ad977d18a
--- /dev/null
+++ b/dev-java/javacc/files/javacc
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+java=$(java-config --java)
+classpath=$(java-config --classpath=javacc)
+
+${java} -classpath ${classpath} javacc "$@"
diff --git a/dev-java/javacc/files/jjdoc b/dev-java/javacc/files/jjdoc
new file mode 100644
index 000000000000..95ae526058cf
--- /dev/null
+++ b/dev-java/javacc/files/jjdoc
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+java=$(java-config --java)
+classpath=$(java-config --classpath=javacc)
+
+${java} -classpath ${classpath} jjdoc "$@"
diff --git a/dev-java/javacc/files/jjtree b/dev-java/javacc/files/jjtree
new file mode 100644
index 000000000000..5a9b479f7dd5
--- /dev/null
+++ b/dev-java/javacc/files/jjtree
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+java=$(java-config --java)
+classpath=$(java-config --classpath=javacc)
+
+${java} -classpath ${classpath} jjtree "$@"
diff --git a/dev-java/javacc/javacc-3.2-r1.ebuild b/dev-java/javacc/javacc-3.2-r1.ebuild
new file mode 100644
index 000000000000..8cbbfc596bb0
--- /dev/null
+++ b/dev-java/javacc/javacc-3.2-r1.ebuild
@@ -0,0 +1,28 @@
+# 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-r1.ebuild,v 1.1 2004/03/29 19:10:27 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"
+IUSE="doc"
+
+RDEPEND="virtual/jre"
+
+src_compile() {
+	ant || die
+}
+
+ src_install() {
+ 	use doc && dohtml -r www/*
+ 	java-pkg_dojar bin/lib/javacc.jar
+ 	dobin ${FILESDIR}/javacc
+ 	dobin ${FILESDIR}/jjdoc
+ 	dobin ${FILESDIR}/jjtree
+}
+
diff --git a/dev-java/javacc/javacc-3.2.ebuild b/dev-java/javacc/javacc-3.2.ebuild
index 99e86fd42ac9..7266e6af4011 100644
--- a/dev-java/javacc/javacc-3.2.ebuild
+++ b/dev-java/javacc/javacc-3.2.ebuild
@@ -1,56 +1,28 @@
 # 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.ebuild,v 1.1 2004/02/27 15:24:24 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-3.2.ebuild,v 1.2 2004/03/29 19:10:27 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="${P}.tar.gz"
+SRC_URI="https://javacc.dev.java.net/files/documents/17/3616/javacc-3.2.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86"
-RESTRICT="fetch"
-IUSE=""
+IUSE="doc"
 
 RDEPEND="virtual/jre"
 
-pkg_nofetch() {
-	einfo "Please goto ${HOMEPAGE} and download ${SRC_URI}"
-	einfo "Place it into: "
-	einfo "     ${DISTDIR}"
-}
-
-src_install() {
-	dohtml doc/*
-	dodir /opt/${P}/bin/lib
-
-	into /opt/${P}
-	dodir /usr/bin
-	for i in javacc jjdoc jjtree ; do
-		echo "#!/bin/sh" > bin/$i
-		echo "java -classpath /opt/${P}/bin/lib/javacc.jar $i \$*" >> bin/$i
-		dobin bin/$i
-		dosym /opt/${P}/bin/$i /usr/bin
-	done
-	insinto /opt/${P}/bin/lib
-	doins bin/lib/*
-
-	# no recursive doins available:
-	for i in `find examples -type d` ; do
-		dodir /opt/${P}/$i
-		insinto /opt/${P}/$i
-		FILES=`find $i -type f -maxdepth 1`
-		if [ ! "${FILES}" == "" ] ; then
-			doins ${FILES}
-		fi
-	done
-
-	dodir /etc/env.d
-	echo "JAVACC_HOME=\"/opt/${P}\"" > ${D}/etc/env.d/70javacc
+src_compile() {
+	ant || die
 }
 
-pkg_postinst () {
-	einfo
-	einfo "An environment variable JAVACC_HOME has been set up."
-	einfo
+ src_install() {
+ 	use doc && dohtml -r www/*
+ 	java-pkg_dojar bin/lib/javacc.jar
+ 	dobin ${FILESDIR}/javacc
+ 	dobin ${FILESDIR}/jjdoc
+ 	dobin ${FILESDIR}/jjtree
 }