Version bump.

6 files changed, 21 insertions, 48 deletions

diff --git a/dev-java/jswat/Manifest b/dev-java/jswat/Manifest
index 0af85270ea3e..c6df33c6c582 100644
--- a/dev-java/jswat/Manifest
+++ b/dev-java/jswat/Manifest
@@ -1,3 +1,3 @@
-MD5 b1120daf4f9a063a62314505f4b58d0b jswat-2.17.ebuild 1383
-MD5 f74d30469dc6c23d292c74804e1dd48a ChangeLog 1202
+MD5 a989589f0a88e10238bbba40d7eabb66 jswat-2.17.ebuild 1383
+MD5 feb81c726532eb872cd99f3dd4da012c ChangeLog 1202
 MD5 118ed7a87e5e670070676eaaa139f77a files/digest-jswat-2.17 67
diff --git a/dev-java/jswat/files/digest-jswat-2.16 b/dev-java/jswat/files/digest-jswat-2.16
deleted file mode 100644
index 6176ad4be5af..000000000000
--- a/dev-java/jswat/files/digest-jswat-2.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3b94b36eb130e48c59129abf1ab66fe5 jswat-src-2.16.tar.gz 1515266
diff --git a/dev-java/jswat/files/digest-jswat-2.17 b/dev-java/jswat/files/digest-jswat-2.17
new file mode 100644
index 000000000000..aa5ca6c524bf
--- /dev/null
+++ b/dev-java/jswat/files/digest-jswat-2.17
@@ -0,0 +1 @@
+MD5 49d9959b7d70113afb6d43b92d137615 jswat-src-2.17.tar.gz 1579760
diff --git a/dev-java/jswat/files/digest-jswat-2.6 b/dev-java/jswat/files/digest-jswat-2.6
deleted file mode 100644
index e074bb253dd0..000000000000
--- a/dev-java/jswat/files/digest-jswat-2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc718cc6f6d7a654cdde484814ff1d26 jswat2-src-20020617.tar.gz 1193935
diff --git a/dev-java/jswat/jswat-2.16.ebuild b/dev-java/jswat/jswat-2.17.ebuild
index ef7e3bef600f..d6a5ce7e73fd 100644
--- a/dev-java/jswat/jswat-2.16.ebuild
+++ b/dev-java/jswat/jswat-2.17.ebuild
@@ -1,22 +1,36 @@
 # 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.16.ebuild,v 1.2 2003/04/30 16:44:01 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.17.ebuild,v 1.1 2003/05/23 07:09:24 absinthe Exp $
 
 inherit java-pkg
 
 S="${WORKDIR}/${PN}-${PV}"
 DESCRIPTION="Extensible graphical Java debugger"
 HOMEPAGE="http://www.bluemarsh.com/java/jswat"
-SRC_URI="http://switch.dl.sourceforge.net/sourceforge/jswat/${PN}-src-${PV}.tar.gz"
+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() {
-	echo ${S}
-	echo "${PV}" | ant || die "compile problem"
+	antopts="-Dversion=${PV}"
+	use jikes && antopts="${antopts} -Dbuild.compiler=jikes"
+	ant ${antopts} binjar || 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 () {
diff --git a/dev-java/jswat/jswat-2.6.ebuild b/dev-java/jswat/jswat-2.6.ebuild
deleted file mode 100644
index 32d0996327a3..000000000000
--- a/dev-java/jswat/jswat-2.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.6.ebuild,v 1.5 2003/03/27 02:04:26 seemant Exp $
-
-S="${WORKDIR}/jswat"
-DESCRIPTION="Extensible graphical Java debugger"
-HOMEPAGE="http://www.bluemarsh.com/java/jswat"
-SRC_URI="http://www.bluemarsh.com/binaries/java/jswat/jswat2-src-20020617.tar.gz"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
-
-DEPEND=">=dev-java/ant-1.4.1"
-#this next line should be changed to >=virtual/jdk once we have a bunch of 1.4 JDK's
-RDEPEND=">=dev-java/sun-jdk-1.4"
-
-src_compile() {
-	cd build
-	# we cannot use jikes here because we would get
-	# a java.lang.VerifyError from the ClassLoader (why?)
-	ant || die "compile problem"
-}
-
-src_install () {
-	# install it as new CLASSPATH package because other programs
-	# (like app-editors/jedit) can make use of it
-	cd dist/jswat
-	dojar jswat2.jar parser.jar
-
-	cd ../..
-
-	echo -e >jswat '#!/bin/sh\njava -classpath /usr/share/jswat/lib/jswat2.jar:/opt/sun-jdk-1.4.0/lib/tools.jar com.bluemarsh.jswat.Main $@'
-	chmod 755 jswat
-	dobin jswat
-
-	dodoc AUTHORS.txt BUGS.txt HISTORY.txt LICENSE.txt OLD_HISTORY.txt TODO.txt
-	dohtml README.html
-	dohtml -r docs
-}