version bump, cleanup

Package-Manager: portage-2.0.51.22-r1

8 files changed, 100 insertions, 42 deletions

diff --git a/dev-java/jswat/ChangeLog b/dev-java/jswat/ChangeLog
index 4de923ea2d8f..81cd468428ae 100644
--- a/dev-java/jswat/ChangeLog
+++ b/dev-java/jswat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jswat
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/ChangeLog,v 1.22 2005/04/03 18:25:41 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/ChangeLog,v 1.23 2005/07/15 22:10:03 axxo Exp $
+
+*jswat-2.37 (15 Jul 2005)
+
+  15 Jul 2005; Thomas Matthijs <axxo@gentoo.org> jswat-1.7.1-r1.ebuild,
+  jswat-2.21-r1.ebuild, jswat-2.25.ebuild, jswat-2.34.ebuild,
+  +jswat-2.37.ebuild:
+  version bump, cleanup
 
 *jswat-2.25 (03 Apr 2005)
 
diff --git a/dev-java/jswat/Manifest b/dev-java/jswat/Manifest
index c04d713728b5..bb9d966ad948 100644
--- a/dev-java/jswat/Manifest
+++ b/dev-java/jswat/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 415c640d72f062c928339cae9ce86d13 ChangeLog 4361
-MD5 070f409edc50e7b85e80227e51af7a5f files/2.21/build.xml.diff 730
-MD5 dfdb6d1b85d8fbb055bd57e6bc30aab2 files/2.21/jswat2 1220
-MD5 5cbb19f7d395ac847f9ab66bfc86262c files/build.xml.patch 677
+MD5 804a21d0d4c90f8a108ffee365ac8fc4 jswat-2.25.ebuild 1270
+MD5 445ef244667532f1a9ca8dc095a5224e jswat-1.7.1-r1.ebuild 712
+MD5 8a3baafe2884e32f9d6599443165ab5c jswat-2.21-r1.ebuild 1258
+MD5 9d4507ad3c5b3c4015c8d7b7fb44c33c jswat-2.37.ebuild 1488
+MD5 f04cd75618b0abdd7206e1eb489693dc ChangeLog 4568
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 449b14e606295fc22509f4f3e0506ded jswat-2.34.ebuild 1488
 MD5 b7b3e490432793c593c9694f882a2163 files/digest-jswat-1.7.1-r1 64
-MD5 52d53eb4cc81c586df4ba5b11dc5a682 files/digest-jswat-2.21-r1 67
+MD5 5fb69786d5458d626f0c04fd59d7be5b files/jswat 1411
 MD5 bb970d9369dc57864ae0ae76592073fe files/digest-jswat-2.25 67
 MD5 ff292abee441bd03a5a31733da598235 files/digest-jswat-2.34 64
-MD5 5fb69786d5458d626f0c04fd59d7be5b files/jswat 1411
+MD5 060e1f6861bc767a0eb85ed54db92385 files/digest-jswat-2.37 64
+MD5 5cbb19f7d395ac847f9ab66bfc86262c files/build.xml.patch 677
 MD5 56036ddb69a86ea3ef40cb26fd444257 files/jswat2 1225
-MD5 d0a5096b2676b7358934e699512b7698 jswat-1.7.1-r1.ebuild 869
-MD5 471d23b247628d552c9279f2397780bb jswat-2.21-r1.ebuild 1357
-MD5 b0603de8736ff95b60f76708b465387a jswat-2.25.ebuild 1353
-MD5 610f1b3edaa13d060f75e4b39af09e35 jswat-2.34.ebuild 1570
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 52d53eb4cc81c586df4ba5b11dc5a682 files/digest-jswat-2.21-r1 67
+MD5 dfdb6d1b85d8fbb055bd57e6bc30aab2 files/2.21/jswat2 1220
+MD5 070f409edc50e7b85e80227e51af7a5f files/2.21/build.xml.diff 730
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD4DBQFC1TF5I1lqEGTUzyQRAofsAJ4iEPAJyBaqM+4fmpWh/gZjaRDV2gCWINup
-TKBwh0Q/GTp9T1mUnGfZAA==
-=4cUz
+iD8DBQFC2DRI/rLF9B432nYRAv+AAJ98xqQd4QXK/yZwlEube+V7ZhDDgwCfYF9U
+IcIFSD48BXW2kNynr+W0hu4=
+=6sVO
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jswat/files/digest-jswat-2.37 b/dev-java/jswat/files/digest-jswat-2.37
new file mode 100644
index 000000000000..ba00ff5189eb
--- /dev/null
+++ b/dev-java/jswat/files/digest-jswat-2.37
@@ -0,0 +1 @@
+MD5 bc0a5dd220ccbcf99e251c4b8a2bd433 jswat-src-2.37.zip 2443463
diff --git a/dev-java/jswat/jswat-1.7.1-r1.ebuild b/dev-java/jswat/jswat-1.7.1-r1.ebuild
index 231a22ffe96d..8c7f42ac80f7 100644
--- a/dev-java/jswat/jswat-1.7.1-r1.ebuild
+++ b/dev-java/jswat/jswat-1.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-1.7.1-r1.ebuild,v 1.5 2005/07/13 15:21:04 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-1.7.1-r1.ebuild,v 1.6 2005/07/15 22:10:03 axxo Exp $
 
 inherit java-pkg
 
@@ -12,21 +12,14 @@ SLOT="1"
 KEYWORDS="x86 sparc ppc"
 DEPEND=">=virtual/jdk-1.3
 	app-arch/unzip"
-RDEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
 IUSE="doc"
 
-src_compile() {
-	einfo " This is a binary (bytecode) only ebuild."
-}
-
-src_install () {
-	# install jswat classes
+src_install() {
 	java-pkg_dojar jswat.jar parser.jar
 
-	# prepare and install jswat script
 	dobin ${FILESDIR}/jswat
 
-	# install documents
 	dodoc AUTHORS.txt BUGS.txt HISTORY.txt LICENSE.txt TODO.txt
 	dohtml README.html
 	use doc && java-pkg_dohtml -r docs
diff --git a/dev-java/jswat/jswat-2.21-r1.ebuild b/dev-java/jswat/jswat-2.21-r1.ebuild
index 16cfdb599127..10ac892ef857 100644
--- a/dev-java/jswat/jswat-2.21-r1.ebuild
+++ b/dev-java/jswat/jswat-2.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.21-r1.ebuild,v 1.4 2005/01/20 17:23:09 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.21-r1.ebuild,v 1.5 2005/07/15 22:10:03 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -18,7 +18,7 @@ DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip
 	jikes? ( dev-java/jikes )"
 	#junit? ( dev-java/junit )"
-RDEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
 
 src_unpack() {
 	unpack ${A}
@@ -40,14 +40,11 @@ src_compile() {
 }
 
 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
+	dodoc BUGS.txt HISTORY.txt OLD_HISTORY.txt TODO.txt
 	dohtml README.html
 	use doc && java-pkg_dohtml -r docs
 }
diff --git a/dev-java/jswat/jswat-2.25.ebuild b/dev-java/jswat/jswat-2.25.ebuild
index 64701a958358..48eba007c631 100644
--- a/dev-java/jswat/jswat-2.25.ebuild
+++ b/dev-java/jswat/jswat-2.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.7 2005/04/03 18:25:41 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.25.ebuild,v 1.8 2005/07/15 22:10:03 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -40,13 +40,10 @@ src_compile() {
 }
 
 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 && java-pkg_dohtml -r docs
diff --git a/dev-java/jswat/jswat-2.34.ebuild b/dev-java/jswat/jswat-2.34.ebuild
index f3c911b5b080..dc253598cec8 100644
--- a/dev-java/jswat/jswat-2.34.ebuild
+++ b/dev-java/jswat/jswat-2.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.34.ebuild,v 1.1 2005/04/02 11:07:11 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.34.ebuild,v 1.2 2005/07/15 22:10:03 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -13,15 +13,16 @@ SLOT="2"
 KEYWORDS="~x86 -ppc"
 IUSE="doc jikes" #junit"
 
+RDEPEND=">=virtual/jdk-1.4
+	dev-java/jclasslib"
 DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
 	>=dev-java/ant-1.6
 	app-arch/unzip
 	dev-java/sablecc-anttask
 	dev-java/sablecc
 	jikes? ( dev-java/jikes )"
 	#junit? ( dev-java/junit )"
-RDEPEND=">=virtual/jdk-1.4
-	dev-java/jclasslib"
 
 src_unpack() {
 	unpack ${A}
@@ -52,14 +53,11 @@ src_compile() {
 }
 
 src_install() {
-	# install jswat classes
 	java-pkg_dojar build/dist/jswat.jar
 
-	# prepare and install jswat script
 	dobin ${FILESDIR}/jswat2
 
-	# install documents
-	dodoc BUGS.txt HISTORY.txt LICENSE.txt OLD_HISTORY.txt TODO.txt
+	dodoc BUGS.txt HISTORY.txt OLD_HISTORY.txt TODO.txt
 	dohtml README.html
 	use doc && java-pkg_dohtml -r docs
 }
diff --git a/dev-java/jswat/jswat-2.37.ebuild b/dev-java/jswat/jswat-2.37.ebuild
new file mode 100644
index 000000000000..e518afd98bce
--- /dev/null
+++ b/dev-java/jswat/jswat-2.37.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.37.ebuild,v 1.1 2005/07/15 22:10:03 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}.zip"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~x86 -ppc"
+IUSE="doc jikes" #junit"
+
+RDEPEND=">=virtual/jdk-1.4
+	dev-java/jclasslib"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	>=dev-java/ant-1.6
+	app-arch/unzip
+	dev-java/sablecc-anttask
+	dev-java/sablecc
+	jikes? ( dev-java/jikes )"
+	#junit? ( dev-java/junit )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/build.xml.patch
+	cd ${S}/classes/ext/
+	rm -f *.jar
+	java-pkg_jar-from jclasslib
+}
+
+src_compile() {
+	cd ${S}/parser
+	ant dist -lib $(java-config -p sablecc) || die "failed to create parser.jar"
+
+	cp parser.jar ${S}/classes/ext/
+	cd ${S}
+
+	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/
+	#	addwrite /etc/.java/
+	#	ant ${antopts} test || die "Junit test failed"
+	#fi
+}
+
+src_install() {
+	java-pkg_dojar build/dist/jswat.jar
+
+	dobin ${FILESDIR}/jswat2
+
+	dodoc BUGS.txt HISTORY.txt OLD_HISTORY.txt TODO.txt
+	dohtml README.html
+	use doc && java-pkg_dohtml -r docs
+}