Fixed wrapper script (bug 59523), cleaned the ebuild

9 files changed, 45 insertions, 139 deletions

diff --git a/dev-java/jswat/ChangeLog b/dev-java/jswat/ChangeLog
index 51e456551fc7..37d20beab64e 100644
--- a/dev-java/jswat/ChangeLog
+++ b/dev-java/jswat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jswat
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/ChangeLog,v 1.11 2004/06/24 22:36:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/ChangeLog,v 1.12 2004/08/27 09:56:30 axxo Exp $
+
+  27 Aug 2004; Thomas Matthijs <axxo@gentoo.org> files/jswat,
+  -files/jswat-2.21.diff, -files/jswat2, +files/2.21/build.xml.diff,
+  files/2.21/jswat2, -jswat-2.17-r1.ebuild, jswat-2.21.ebuild:
+  Fixed wrapper script (bug 59523), cleaned the ebuild
+  TODO: fix wrapper script's jdk detection
 
   02 Jun 2004; Aron Griffis <agriffis@gentoo.org> jswat-2.17-r1.ebuild:
   Fix use invocation
diff --git a/dev-java/jswat/Manifest b/dev-java/jswat/Manifest
index 9eab9a62ff01..37aec7273b2d 100644
--- a/dev-java/jswat/Manifest
+++ b/dev-java/jswat/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7a3b80e832b32c3cddae26dcc962baf4 ChangeLog 2132
 MD5 855797054bb1d726edccbd478667a49a jswat-1.7.1.ebuild 851
-MD5 0453e87259857478c72bef0f0df26592 jswat-2.17-r1.ebuild 1381
+MD5 d448d0b797e2e30990f4aff2c37354b8 jswat-2.21.ebuild 1298
+MD5 bb49b33031b1be76c7aaa66b59e37513 ChangeLog 2421
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 6cb98270345cd84ca3be482e563af90b jswat-2.21.ebuild 1394
-MD5 b7b3e490432793c593c9694f882a2163 files/digest-jswat-1.7.1 64
-MD5 118ed7a87e5e670070676eaaa139f77a files/digest-jswat-2.17-r1 67
-MD5 6011298ab92d43aa53a798fb77add597 files/jswat 1422
-MD5 32e2ac1f676495d5e6c779c11918f70b files/jswat2 1260
+MD5 5fb69786d5458d626f0c04fd59d7be5b files/jswat 1411
 MD5 52d53eb4cc81c586df4ba5b11dc5a682 files/digest-jswat-2.21 67
-MD5 bfb56f46fc6c46eb188c7153cc81c2b4 files/jswat-2.21.diff 747
-MD5 5e1bd298504bbcf369fcce83c60fdc05 files/2.21/jswat2 1230
+MD5 b7b3e490432793c593c9694f882a2163 files/digest-jswat-1.7.1 64
+MD5 dfdb6d1b85d8fbb055bd57e6bc30aab2 files/2.21/jswat2 1220
+MD5 070f409edc50e7b85e80227e51af7a5f files/2.21/build.xml.diff 730
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.2.5 (GNU/Linux)
 
-iD8DBQFA+efVmdTrptrqvGERAjpOAJwKH8E+HNJMrxA/Os48HOnIDYO6nQCeLpS/
-PmnidrjLy0BvlxpaIYxmnV8=
-=8h7m
+iD8DBQFBLwWJ/rLF9B432nYRAik4AJ0ZOpSHyne14C5k1AgPOqratYEloQCgkjFQ
+znX4ip+/uXqwpo6SHSqV+R0=
+=dfTJ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jswat/files/jswat-2.21.diff b/dev-java/jswat/files/2.21/build.xml.diff
index ece3889b36d7..4851823b8357 100644
--- a/dev-java/jswat/files/jswat-2.21.diff
+++ b/dev-java/jswat/files/2.21/build.xml.diff
@@ -1,17 +1,15 @@
---- build.xml.orig	2004-02-16 05:29:31.000000000 -0500
-+++ build.xml	2004-02-25 01:43:23.271058552 -0500
-@@ -92,11 +92,11 @@
+--- build.xml	2004-08-27 11:29:14.149734160 +0200
++++ build.xml   2004-08-27 11:29:44.246158808 +0200
+@@ -92,9 +92,10 @@
    <!-- Get the release version number from the builder. -->
    <target name="version">
      <!-- Newer Ant releases only ask if 'version' is not set. -->
 -    <input message="Enter JSwat version number (x.y[.z]):"
 -           addproperty="version"/>
-+    <!-- <input message="Enter JSwat version number (x.y[.z]):"
-+           addproperty="version"/> -->
++    <!-- input message="Enter JSwat version number (x.y[.z]):"
++           addproperty="version"/-->
      <!-- Update the version.properties file for this build. -->
++       <property name="version" value="2.21"/>
      <propertyfile file="${classes}/${pkgpath}/util/version.properties">
--      <entry key="version" value="${version}"/>
-+      <entry key="version" value="2.21"/>
+       <entry key="version" value="${version}"/>
      </propertyfile>
-   </target>
- 
diff --git a/dev-java/jswat/files/2.21/jswat2 b/dev-java/jswat/files/2.21/jswat2
index 84fbc7a979bd..2aafdfbed11b 100644
--- a/dev-java/jswat/files/2.21/jswat2
+++ b/dev-java/jswat/files/2.21/jswat2
@@ -1,8 +1,8 @@
 #!/bin/sh
 # jswat Launch Script
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/files/2.21/jswat2,v 1.2 2004/07/18 02:53:05 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/files/2.21/jswat2,v 1.3 2004/08/27 09:56:30 axxo Exp $
 
-JSWAT_VER="2.21"
+JSWAT_VER="2"
 
 JAVA_HOME=`/usr/bin/java-config --jdk-home`
 if [ -z "${JAVA_HOME}" ] ; then
diff --git a/dev-java/jswat/files/digest-jswat-2.17-r1 b/dev-java/jswat/files/digest-jswat-2.17-r1
deleted file mode 100644
index aa5ca6c524bf..000000000000
--- a/dev-java/jswat/files/digest-jswat-2.17-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49d9959b7d70113afb6d43b92d137615 jswat-src-2.17.tar.gz 1579760
diff --git a/dev-java/jswat/files/jswat b/dev-java/jswat/files/jswat
index b95673066209..55915ce4b05b 100644
--- a/dev-java/jswat/files/jswat
+++ b/dev-java/jswat/files/jswat
@@ -2,9 +2,9 @@
 # jswat Launch Script
 # Author: Dylan Carlson
 # May 2003
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/files/jswat,v 1.2 2004/07/18 02:53:05 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/files/jswat,v 1.3 2004/08/27 09:56:30 axxo Exp $
 
-JSWAT_VER="1.7.1"
+JSWAT_VER="1"
 
 JAVA_HOME=`/usr/bin/java-config --jdk-home`
 if [ -z "${JAVA_HOME}" ] ; then
@@ -34,7 +34,7 @@ fi
 
 if [ -z `echo ${JAVA_HOME} | grep "1.3"` ] ; then
 	echo "!!!  JDK 1.2 or 1.3 is required for this     "
-	echo "!!!  version of jswat (${JSWAT_VER}).        "
+	echo "!!!  version of jswat.                       "
 	echo "!!!                                          "
 	echo "!!!  Please run java-config(1) and configure "
 	echo "!!!  your system to use a 1.2 or 1.3 JDK.    "
diff --git a/dev-java/jswat/files/jswat2 b/dev-java/jswat/files/jswat2
deleted file mode 100644
index 872c0cc5ecd7..000000000000
--- a/dev-java/jswat/files/jswat2
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# jswat Launch Script
-# Author: Dylan Carlson
-# May 2003
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/files/jswat2,v 1.2 2004/07/18 02:53:05 dragonheart 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-r1.ebuild b/dev-java/jswat/jswat-2.17-r1.ebuild
deleted file mode 100644
index d1e20b4a9988..000000000000
--- a/dev-java/jswat/jswat-2.17-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.17-r1.ebuild,v 1.8 2004/06/24 22:36:35 agriffis Exp $
-
-inherit java-pkg
-
-S="${WORKDIR}/${PN}-${PV}"
-DESCRIPTION="Extensible graphical Java debugger"
-HOMEPAGE="http://www.bluemarsh.com/java/jswat"
-SRC_URI="mirror://sourceforge/jswat/${PN}-src-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86 sparc -ppc"
-DEPEND=">=dev-java/ant-1.4.1"
-RDEPEND=">=virtual/jdk-1.4"
-IUSE="doc jikes junit"
-
-src_compile() {
-	antopts="-Dversion=${PV}"
-	use jikes && antopts="${antopts} -Dbuild.compiler=jikes"
-	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
-		export CLASSPATH="/usr/share/junit/lib/junit.jar"
-		export DEP_APPEND="junit"
-		if use junit
-			then
-				einfo "Running JUnit tests, this may take awhile ..."
-				ant ${antopts} test || die "Junit test failed"
-		fi
-	fi
-
-}
-
-src_install () {
-	# 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
-	use doc && dohtml -r docs
-}
diff --git a/dev-java/jswat/jswat-2.21.ebuild b/dev-java/jswat/jswat-2.21.ebuild
index 415bfab6de15..d610ccad31ba 100644
--- a/dev-java/jswat/jswat-2.21.ebuild
+++ b/dev-java/jswat/jswat-2.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.21.ebuild,v 1.4 2004/06/24 22:36:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.21.ebuild,v 1.5 2004/08/27 09:56:30 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -13,38 +13,39 @@ SLOT="2"
 KEYWORDS="x86 sparc -ppc amd64"
 IUSE="doc jikes junit"
 
-DEPEND=">=dev-java/ant-1.5"
+DEPEND=">=dev-java/ant-1.5
+	junit? ( dev-java/junit )"
 RDEPEND=">=virtual/jdk-1.4"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/build.xml.diff
+}
+
 src_compile() {
-	epatch ${FILESDIR}/${P}.diff
 	# antopts="-Dversion=${PV}"
+	local antopts=""
 	use jikes && antopts="${antopts} -Dbuild.compiler=jikes"
 	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
-		export CLASSPATH="/usr/share/junit/lib/junit.jar"
-		export DEP_APPEND="junit"
-		if use junit ; then
-			einfo "Running JUnit tests, this may take awhile ..."
-			ant ${antopts} test || die "Junit test failed"
-		fi
+	if use junit ; then
+		addwrite /root/.java/
+		einfo "Running JUnit tests, this may take awhile ..."
+		ant ${antopts} test || die "Junit test failed"
 	fi
 }
 
 src_install() {
 	# install jswat classes
-	java-pkg_dojar \
-		build/dist/*/*.jar \
-		classes/ext/parser.jar \
-		classes/ext/jclasslib.jar
+	java-pkg_dojar build/dist/*/*.jar
 
 	# prepare and install jswat script
 	dobin ${FILESDIR}/${PV}/jswat2
 
 	# install documents
-	dodoc AUTHORS.txt BUGS.txt HISTORY.txt LICENSE.txt OLD_HISTORY.txt TODO.txt
+	dodoc BUGS.txt HISTORY.txt LICENSE.txt OLD_HISTORY.txt TODO.txt
 	dohtml README.html
 	use doc && dohtml -r docs
 }