Version bump, and header fixes. Keyword change -ppc on jswat-2* due to dependency problems.

7 files changed, 88 insertions, 11 deletions

diff --git a/dev-java/jswat/ChangeLog b/dev-java/jswat/ChangeLog
index 2fb62c59beca..3be43e308f99 100644
--- a/dev-java/jswat/ChangeLog
+++ b/dev-java/jswat/ChangeLog
@@ -1,6 +1,11 @@
 # 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.7 2003/05/24 10:45:47 absinthe Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/ChangeLog,v 1.8 2004/02/25 08:08:07 absinthe Exp $
+
+  25 Feb 2004; Dylan Carlson <absinthe@gentoo.org> :
+  Version bump.  
+
+  Keywords -ppc for jswat-2* due to dependency problems.
 
 *jswat-1.7.1 (24 May 2003)
 
diff --git a/dev-java/jswat/Manifest b/dev-java/jswat/Manifest
index ae1901b6cd39..726044edc243 100644
--- a/dev-java/jswat/Manifest
+++ b/dev-java/jswat/Manifest
@@ -1,8 +1,11 @@
-MD5 cfee037d09cf83c5a3ee000fefc31f32 ChangeLog 1770
-MD5 fc0e1466afeb1739722e3ba2270bc605 jswat-1.7.1.ebuild 860
-MD5 66c22762a32a8c7ff62790452d749eba jswat-2.17-r1.ebuild 1395
+MD5 f3254174d68116d7b19a765dcbfb9948 ChangeLog 1900
+MD5 2e6fc5083f7e4355086708d660be1172 jswat-1.7.1.ebuild 860
+MD5 316c4fe47b3b9e4b22326c0dccb39a38 jswat-2.17-r1.ebuild 1396
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 767a8c9db8303d34748ff3df71f9b03a jswat-2.21.ebuild 1429
+MD5 b7b3e490432793c593c9694f882a2163 files/digest-jswat-1.7.1 64
 MD5 118ed7a87e5e670070676eaaa139f77a files/digest-jswat-2.17-r1 67
 MD5 cd73b809ca54bfad49d364a277bcf1ae files/jswat 1420
-MD5 b7b3e490432793c593c9694f882a2163 files/digest-jswat-1.7.1 64
 MD5 c52b5e917a5ec237a0b62111506885ca files/jswat2 1258
+MD5 52d53eb4cc81c586df4ba5b11dc5a682 files/digest-jswat-2.21 67
+MD5 bfb56f46fc6c46eb188c7153cc81c2b4 files/jswat-2.21.diff 747
diff --git a/dev-java/jswat/files/digest-jswat-2.21 b/dev-java/jswat/files/digest-jswat-2.21
new file mode 100644
index 000000000000..135d927e6d20
--- /dev/null
+++ b/dev-java/jswat/files/digest-jswat-2.21
@@ -0,0 +1 @@
+MD5 3c2cd6bcde3eeb6f7bb57b7ad9f5117f jswat-src-2.21.tar.gz 1723296
diff --git a/dev-java/jswat/files/jswat-2.21.diff b/dev-java/jswat/files/jswat-2.21.diff
new file mode 100644
index 000000000000..ece3889b36d7
--- /dev/null
+++ b/dev-java/jswat/files/jswat-2.21.diff
@@ -0,0 +1,17 @@
+--- 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 @@
+   <!-- 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"/> -->
+     <!-- Update the version.properties file for this build. -->
+     <propertyfile file="${classes}/${pkgpath}/util/version.properties">
+-      <entry key="version" value="${version}"/>
++      <entry key="version" value="2.21"/>
+     </propertyfile>
+   </target>
+ 
diff --git a/dev-java/jswat/jswat-1.7.1.ebuild b/dev-java/jswat/jswat-1.7.1.ebuild
index e22bd226be4b..e9ff7a0c2d0f 100644
--- a/dev-java/jswat/jswat-1.7.1.ebuild
+++ b/dev-java/jswat/jswat-1.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-1.7.1.ebuild,v 1.4 2003/09/08 07:20:54 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-1.7.1.ebuild,v 1.5 2004/02/25 08:08:08 absinthe Exp $
 
 inherit java-pkg
 
diff --git a/dev-java/jswat/jswat-2.17-r1.ebuild b/dev-java/jswat/jswat-2.17-r1.ebuild
index bf16c092da33..732c942d9d94 100644
--- a/dev-java/jswat/jswat-2.17-r1.ebuild
+++ b/dev-java/jswat/jswat-2.17-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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-r1.ebuild,v 1.5 2003/09/08 07:20:54 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.17-r1.ebuild,v 1.6 2004/02/25 08:08:08 absinthe Exp $
 
 inherit java-pkg
 
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="x86 sparc -ppc"
 DEPEND=">=dev-java/ant-1.4.1"
 RDEPEND=">=virtual/jdk-1.4"
 IUSE="doc jikes junit"
diff --git a/dev-java/jswat/jswat-2.21.ebuild b/dev-java/jswat/jswat-2.21.ebuild
new file mode 100644
index 000000000000..cc2c98f553d9
--- /dev/null
+++ b/dev-java/jswat/jswat-2.21.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/02/25 08:08:08 absinthe 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 amd64"
+DEPEND=">=dev-java/ant-1.5"
+RDEPEND=">=virtual/jdk-1.4"
+IUSE="doc jikes junit"
+
+src_compile() {
+	epatch ${FILESDIR}/${P}.diff
+	# 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
+}