this actually works now. :/

5 files changed, 69 insertions, 12 deletions

diff --git a/dev-java/jswat/ChangeLog b/dev-java/jswat/ChangeLog
index 013c5cd48d8e..0009bbaf0334 100644
--- a/dev-java/jswat/ChangeLog
+++ b/dev-java/jswat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jswat
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/ChangeLog,v 1.5 2003/05/23 07:09:24 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/ChangeLog,v 1.6 2003/05/24 10:24:45 absinthe Exp $
+
+*jswat-2.17-r1 (24 May 2003)
+
+  24 May 2003; Dylan Carlson <absinthe@gentoo.org> jswat-2.17-r1.ebuild,
+  jswat-2.17.ebuild, files/jswat:
+  This package _should_ work correctly now.  Apologies for the confusion.
 
 *jswat-2.17 (23 May 2003)
 
diff --git a/dev-java/jswat/Manifest b/dev-java/jswat/Manifest
index d93690388e4d..fcd7b2498590 100644
--- a/dev-java/jswat/Manifest
+++ b/dev-java/jswat/Manifest
@@ -1,4 +1,4 @@
-MD5 41c62a4b912b016a70071b3339b7225c jswat-2.17-r1.ebuild 1397
-MD5 35fa762d202da25fafce524723f7de14 ChangeLog 1414
-MD5 87261df0a884f1e99d3463113b1cd4da files/jswat2 1170
+MD5 6df651f92cc0ae0db04a107103b71333 jswat-2.17-r1.ebuild 1400
+MD5 dc3d9ae8b75865e58a6097e289e2121c ChangeLog 1414
+MD5 c52b5e917a5ec237a0b62111506885ca files/jswat2 1258
 MD5 118ed7a87e5e670070676eaaa139f77a files/digest-jswat-2.17-r1 67
diff --git a/dev-java/jswat/files/digest-jswat-2.17 b/dev-java/jswat/files/digest-jswat-2.17-r1
index aa5ca6c524bf..aa5ca6c524bf 100644
--- a/dev-java/jswat/files/digest-jswat-2.17
+++ b/dev-java/jswat/files/digest-jswat-2.17-r1
diff --git a/dev-java/jswat/files/jswat2 b/dev-java/jswat/files/jswat2
new file mode 100644
index 000000000000..9c4ceae42a0b
--- /dev/null
+++ b/dev-java/jswat/files/jswat2
@@ -0,0 +1,45 @@
+#!/bin/sh
+# jswat Launch Script
+# Author: Dylan Carlson
+# May 2003
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/files/jswat2,v 1.1 2003/05/24 10:24:45 absinthe Exp $
+
+JSWAT_VER="2.17"
+
+JAVA_HOME=`/usr/bin/java-config --jdk-home`
+if [ -z "${JAVA_HOME}" ] ; then
+	JAVA_HOME=`/usr/bin/java-config --jre-home`
+fi
+CLASSPATH="${JAVA_HOME}/lib/tools.jar:`/usr/bin/java-config --classpath=jswat-${JSWAT_VER}`:${CLASSPATH}"
+
+if [ ! -f ${JAVA_HOME}/bin/java ] ; then
+	echo " "
+	echo "I tried using the following Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Java Runtime missing.  Please run java-config(1) and ensure"
+	echo "your environment is configured properly."
+	exit 1
+else
+	echo " "
+	echo "Using Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Using CLASSPATH:"
+	echo "${CLASSPATH}"
+	echo " "
+fi
+
+# Make sure we're using 1.4 JDK
+
+if [ -z `echo ${JAVA_HOME} | grep "1.4"` ] ; then
+	echo "!!!  JDK 1.4 is required for this version of "
+	echo "!!!  jswat (${JSWAT_VER}).                   "
+	echo "!!!                                          "
+	echo "!!!  Please run java-config(1) and configure "
+	echo "!!!  your system to use a 1.4 or later JDK.  "
+	echo " "
+	exit 1
+fi
+
+${JAVA_HOME}/bin/java com.bluemarsh.jswat.Main $@
diff --git a/dev-java/jswat/jswat-2.17.ebuild b/dev-java/jswat/jswat-2.17-r1.ebuild
index d6a5ce7e73fd..72cd7fc4c6eb 100644
--- a/dev-java/jswat/jswat-2.17.ebuild
+++ b/dev-java/jswat/jswat-2.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.17.ebuild,v 1.1 2003/05/23 07:09:24 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.17-r1.ebuild,v 1.1 2003/05/24 10:24:45 absinthe Exp $
 
 inherit java-pkg
 
@@ -18,10 +18,10 @@ IUSE="doc jikes junit"
 src_compile() {
 	antopts="-Dversion=${PV}"
 	use jikes && antopts="${antopts} -Dbuild.compiler=jikes"
-	ant ${antopts} binjar || die "Compile failed"
+	ant ${antopts} dist || die "Compile failed"
 	
 	# Make sure junit tasks get built if we have junit
-    if [ -f "/usr/share/junit/lib/junit.jar" ] ; then
+	if [ -f "/usr/share/junit/lib/junit.jar" ] ; then
 		export CLASSPATH="/usr/share/junit/lib/junit.jar"
 		export DEP_APPEND="junit"
 		if [ `use junit` ] 
@@ -34,11 +34,17 @@ src_compile() {
 }
 
 src_install () {
-	java-pkg_dojar build/dist/${PN}-${PV}/*.jar
-	echo -e >jswat '#!/bin/sh\njava -classpath /usr/share/jswat/lib/jswat.jar:$JDK_HOME/lib/tools.jar com.bluemarsh.jswat.Main $@'
-	chmod 755 jswat
-	dobin jswat
+	# install jswat classes
+	java-pkg_dojar \
+		build/dist/${P}/*.jar \
+		classes/ext/parser.jar \
+		classes/ext/jclasslib.jar
+	
+	# prepare and install jswat script
+	dobin ${FILESDIR}/jswat2
+	
+	# install documents
 	dodoc AUTHORS.txt BUGS.txt HISTORY.txt LICENSE.txt OLD_HISTORY.txt TODO.txt
 	dohtml README.html
-	dohtml -r docs
+	use doc && dohtml -r docs
 }