bit of files/ cleanup, disabled junit because it runs inside a X program which is unacceptable, version bump

7 files changed, 133 insertions, 28 deletions

diff --git a/dev-java/jswat/ChangeLog b/dev-java/jswat/ChangeLog
index 37d20beab64e..231eb85691c0 100644
--- a/dev-java/jswat/ChangeLog
+++ b/dev-java/jswat/ChangeLog
@@ -1,6 +1,13 @@
 # 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.12 2004/08/27 09:56:30 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/ChangeLog,v 1.13 2004/08/27 10:12:52 axxo Exp $
+
+*jswat-2.25 (27 Aug 2004)
+
+  27 Aug 2004; Thomas Matthijs <axxo@gentoo.org> +files/build.xml.patch,
+  +files/jswat2, jswat-2.21.ebuild, +jswat-2.25.ebuild:
+  bit of files/ cleanup, disabled junit because it runs inside a X program which
+  is unacceptable, version bump
 
   27 Aug 2004; Thomas Matthijs <axxo@gentoo.org> files/jswat,
   -files/jswat-2.21.diff, -files/jswat2, +files/2.21/build.xml.diff,
diff --git a/dev-java/jswat/Manifest b/dev-java/jswat/Manifest
index 37aec7273b2d..a3eba88bb36a 100644
--- a/dev-java/jswat/Manifest
+++ b/dev-java/jswat/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 a258419eeed6e6e26b045867ab81103e jswat-2.25.ebuild 1278
 MD5 855797054bb1d726edccbd478667a49a jswat-1.7.1.ebuild 851
-MD5 d448d0b797e2e30990f4aff2c37354b8 jswat-2.21.ebuild 1298
+MD5 a258419eeed6e6e26b045867ab81103e jswat-2.21.ebuild 1278
 MD5 bb49b33031b1be76c7aaa66b59e37513 ChangeLog 2421
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 5fb69786d5458d626f0c04fd59d7be5b files/jswat 1411
 MD5 52d53eb4cc81c586df4ba5b11dc5a682 files/digest-jswat-2.21 67
+MD5 bb970d9369dc57864ae0ae76592073fe files/digest-jswat-2.25 67
+MD5 5cbb19f7d395ac847f9ab66bfc86262c files/build.xml.patch 677
+MD5 dfdb6d1b85d8fbb055bd57e6bc30aab2 files/jswat2 1220
 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.5 (GNU/Linux)
-
-iD8DBQFBLwWJ/rLF9B432nYRAik4AJ0ZOpSHyne14C5k1AgPOqratYEloQCgkjFQ
-znX4ip+/uXqwpo6SHSqV+R0=
-=dfTJ
------END PGP SIGNATURE-----
diff --git a/dev-java/jswat/files/build.xml.patch b/dev-java/jswat/files/build.xml.patch
new file mode 100644
index 000000000000..2612a69e205d
--- /dev/null
+++ b/dev-java/jswat/files/build.xml.patch
@@ -0,0 +1,13 @@
+--- build.xml	2004-08-27 12:07:39.245306368 +0200
++++ build.xml   2004-08-27 12:07:54.871930760 +0200
+@@ -94,8 +94,8 @@
+   <!-- Get the release version number from the builder. -->
+   <target name="version" depends="compile">
+     <!-- 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"/-->
+     <!-- Update the version.properties file for this build. -->
+     <propertyfile file="${classes}/${pkgpath}/util/version.properties">
+       <entry key="version" value="${version}"/>
diff --git a/dev-java/jswat/files/digest-jswat-2.25 b/dev-java/jswat/files/digest-jswat-2.25
new file mode 100644
index 000000000000..3e953546182b
--- /dev/null
+++ b/dev-java/jswat/files/digest-jswat-2.25
@@ -0,0 +1 @@
+MD5 c0f3055f7d30e79d070c167a407c2898 jswat-src-2.25.tar.gz 1725930
diff --git a/dev-java/jswat/files/jswat2 b/dev-java/jswat/files/jswat2
new file mode 100644
index 000000000000..6d7035ddb490
--- /dev/null
+++ b/dev-java/jswat/files/jswat2
@@ -0,0 +1,43 @@
+#!/bin/sh
+# jswat Launch Script
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/files/jswat2,v 1.4 2004/08/27 10:12:52 axxo Exp $
+
+JSWAT_VER="2"
+
+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.21.ebuild b/dev-java/jswat/jswat-2.21.ebuild
index d610ccad31ba..1346073f645d 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.5 2004/08/27 09:56:30 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.21.ebuild,v 1.6 2004/08/27 10:12:52 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -11,30 +11,29 @@ SRC_URI="mirror://sourceforge/jswat/${PN}-src-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="x86 sparc -ppc amd64"
-IUSE="doc jikes junit"
+IUSE="doc jikes" #junit"
 
-DEPEND=">=dev-java/ant-1.5
-	junit? ( dev-java/junit )"
+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
+	epatch ${FILESDIR}/build.xml.patch
 }
 
 src_compile() {
-	# antopts="-Dversion=${PV}"
-	local antopts=""
+	local 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 use junit ; then
-		addwrite /root/.java/
-		einfo "Running JUnit tests, this may take awhile ..."
-		ant ${antopts} test || die "Junit test failed"
-	fi
+	# Junits tests run inside a X window, disable.
+	#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() {
@@ -42,7 +41,7 @@ src_install() {
 	java-pkg_dojar build/dist/*/*.jar
 
 	# prepare and install jswat script
-	dobin ${FILESDIR}/${PV}/jswat2
+	dobin ${FILESDIR}/jswat2
 
 	# install documents
 	dodoc BUGS.txt HISTORY.txt LICENSE.txt OLD_HISTORY.txt TODO.txt
diff --git a/dev-java/jswat/jswat-2.25.ebuild b/dev-java/jswat/jswat-2.25.ebuild
new file mode 100644
index 000000000000..53e5c170e402
--- /dev/null
+++ b/dev-java/jswat/jswat-2.25.ebuild
@@ -0,0 +1,50 @@
+# 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.25.ebuild,v 1.1 2004/08/27 10:12:52 axxo Exp $
+
+inherit java-pkg eutils
+
+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 amd64"
+IUSE="doc jikes" #junit"
+
+DEPEND=">=dev-java/ant-1.5"
+	#junit? ( dev-java/junit )"
+RDEPEND=">=virtual/jdk-1.4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/build.xml.patch
+}
+
+src_compile() {
+	local antopts="-Dversion=${PV}"
+	use jikes && antopts="${antopts} -Dbuild.compiler=jikes"
+	ant ${antopts} dist || die "Compile failed"
+
+	# Junits tests run inside a X window, disable.
+	#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
+
+	# prepare and install jswat script
+	dobin ${FILESDIR}/jswat2
+
+	# install documents
+	dodoc BUGS.txt HISTORY.txt LICENSE.txt OLD_HISTORY.txt TODO.txt
+	dohtml README.html
+	use doc && dohtml -r docs
+}