Revbump to use jdom-1.0 final instead of beta9 (the API changes there don't seem to affect this package). Add java-ant-2 to inherit in all gen-2 revisions.

Package-Manager: portage-2.1.2-r5

6 files changed, 106 insertions, 17 deletions

diff --git a/dev-db/jxtray/ChangeLog b/dev-db/jxtray/ChangeLog
index c51702e52882..887a8bc95314 100644
--- a/dev-db/jxtray/ChangeLog
+++ b/dev-db/jxtray/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/jxtray
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/ChangeLog,v 1.15 2007/01/25 23:15:08 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/ChangeLog,v 1.16 2007/01/30 10:52:41 caster Exp $
+
+*jxtray-0.5-r3 (30 Jan 2007)
+
+  30 Jan 2007; Vlastimil Babka <caster@gentoo.org> jxtray-0.5-r1.ebuild,
+  jxtray-0.5-r2.ebuild, +jxtray-0.5-r3.ebuild:
+  Revbump to use jdom-1.0 final instead of beta9 (the API changes there don't
+  seem to affect this package). Add java-ant-2 to inherit in all gen-2
+  revisions.
 
   25 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   jxtray-0.5-r1.ebuild, jxtray-0.5-r2.ebuild:
diff --git a/dev-db/jxtray/Manifest b/dev-db/jxtray/Manifest
index aaae3998a251..36573d5ffbb7 100644
--- a/dev-db/jxtray/Manifest
+++ b/dev-db/jxtray/Manifest
@@ -7,22 +7,26 @@ MD5 63dce73e99d8ec22a695238f0928b003 files/default.properties 109
 RMD160 3ab7abd2a5102ce2b8cb4fb93c63afeba91c046c files/default.properties 109
 SHA256 bd4f5887a65b1db47d2546b32ada76f9df2311bf5f9e383cacf576c57a88c4fd files/default.properties 109
 DIST jxtray-src-0.5.tgz 2476739 RMD160 f35e7def1558cfcee48bfb42e1706e3ba8866e45 SHA1 3c01c781a8c9670a6e12c1a03bfc809756e2577e SHA256 ddb5d2b2399d1440d84b144fce4ef4f7ff865081745057e101deff3a38f0a849
-EBUILD jxtray-0.5-r1.ebuild 2249 RMD160 a111b65108420845057f2f4835b7eb71b6341263 SHA1 142da15759a2679ed57b7aba809fac217a780864 SHA256 913a5375620ba744c84656970071a264a191b765266a0dc02691050086f153fb
-MD5 2560e4f6d9ab6d3603e7ca64614461b4 jxtray-0.5-r1.ebuild 2249
-RMD160 a111b65108420845057f2f4835b7eb71b6341263 jxtray-0.5-r1.ebuild 2249
-SHA256 913a5375620ba744c84656970071a264a191b765266a0dc02691050086f153fb jxtray-0.5-r1.ebuild 2249
-EBUILD jxtray-0.5-r2.ebuild 1957 RMD160 c8e3803774cbcf99b9525748404e3786a376ae65 SHA1 0466daac59bad3969796275fb2b4f0e04d2663c5 SHA256 1825b925760956583aa087d38bda1543db1f645869f3c6ae494e3bf72b6058f6
-MD5 4e659915c90d5d13957a7420a5a143d9 jxtray-0.5-r2.ebuild 1957
-RMD160 c8e3803774cbcf99b9525748404e3786a376ae65 jxtray-0.5-r2.ebuild 1957
-SHA256 1825b925760956583aa087d38bda1543db1f645869f3c6ae494e3bf72b6058f6 jxtray-0.5-r2.ebuild 1957
+EBUILD jxtray-0.5-r1.ebuild 2261 RMD160 db7940d8840efa764b722c42934940b1c76caa02 SHA1 d14cc62f1d5461ec7886d3a885c02d293a8444b1 SHA256 7b31967b8eaea452a3690a6bf804f4fecbb30268dc22223fef5ee22b3bb86bce
+MD5 cfd7ecd32e4573caaa1b331986a3f9b8 jxtray-0.5-r1.ebuild 2261
+RMD160 db7940d8840efa764b722c42934940b1c76caa02 jxtray-0.5-r1.ebuild 2261
+SHA256 7b31967b8eaea452a3690a6bf804f4fecbb30268dc22223fef5ee22b3bb86bce jxtray-0.5-r1.ebuild 2261
+EBUILD jxtray-0.5-r2.ebuild 1969 RMD160 5c7d02364f5889d03ec68032ee709e41d8dfdbcd SHA1 aef7101b2395cdc9d4b54f280bf22cd24ba953a8 SHA256 af4946677469ff4f5fb5fb71c8495eb50bc6a163263815e8458096f473613354
+MD5 50b45db48f56d15aa4fb6048cf8abd13 jxtray-0.5-r2.ebuild 1969
+RMD160 5c7d02364f5889d03ec68032ee709e41d8dfdbcd jxtray-0.5-r2.ebuild 1969
+SHA256 af4946677469ff4f5fb5fb71c8495eb50bc6a163263815e8458096f473613354 jxtray-0.5-r2.ebuild 1969
+EBUILD jxtray-0.5-r3.ebuild 1957 RMD160 402e0edd15129381600cc0fb9dd1135a4ab09be1 SHA1 b574298c7d127fbd1a7d817c53a4c8f4836fee81 SHA256 e2ead544e373d0966b2f89e0871b41fd6e34575ef314cb3371906c5a781eac96
+MD5 68327318124727a06969817664e86ab1 jxtray-0.5-r3.ebuild 1957
+RMD160 402e0edd15129381600cc0fb9dd1135a4ab09be1 jxtray-0.5-r3.ebuild 1957
+SHA256 e2ead544e373d0966b2f89e0871b41fd6e34575ef314cb3371906c5a781eac96 jxtray-0.5-r3.ebuild 1957
 EBUILD jxtray-0.5.ebuild 2371 RMD160 1dcd0e197d148874d39fbef5692f59863bcf0c4a SHA1 ef88652eefd145a141dc7dedfa82da8eab8ef8df SHA256 51750be517b3ff2df5060df78895aa33e37043ec3214204129d26dd882595308
 MD5 f41d241bb6ac584e2a6e5ceb547b7e61 jxtray-0.5.ebuild 2371
 RMD160 1dcd0e197d148874d39fbef5692f59863bcf0c4a jxtray-0.5.ebuild 2371
 SHA256 51750be517b3ff2df5060df78895aa33e37043ec3214204129d26dd882595308 jxtray-0.5.ebuild 2371
-MISC ChangeLog 2382 RMD160 ed4733b69a73b41f22d66cd327c7518c292a0bfe SHA1 05eeff43be6fe0deb7950f0ba7bfb4ad1b9906cc SHA256 bc2b50af17c77dd3f19393b4387751f62ff6f542f938fb40195641dbeb97ccd1
-MD5 9b8294424dd9134167eb8b040b4f2b2c ChangeLog 2382
-RMD160 ed4733b69a73b41f22d66cd327c7518c292a0bfe ChangeLog 2382
-SHA256 bc2b50af17c77dd3f19393b4387751f62ff6f542f938fb40195641dbeb97ccd1 ChangeLog 2382
+MISC ChangeLog 2696 RMD160 6659d477b5fa3ad46908e71c38f4b74be7d66452 SHA1 82df1ce4bde3c36cebbb5af68941e3bfe9b9cfb5 SHA256 502b7fd453f84929e3118aa59bfccc3a65ca09dc570d2e8b5bd337626bc8ad5f
+MD5 f8384c52036555a584d8d42f4a31981e ChangeLog 2696
+RMD160 6659d477b5fa3ad46908e71c38f4b74be7d66452 ChangeLog 2696
+SHA256 502b7fd453f84929e3118aa59bfccc3a65ca09dc570d2e8b5bd337626bc8ad5f ChangeLog 2696
 MISC metadata.xml 586 RMD160 774dae3c502ca2fdb4e906211cdfb5b7ecf3e9a7 SHA1 d4a26605f4ccfbdc0a582cccec0bf6c7dcc5829d SHA256 4be3c32bfe30ef7b3d9c516caf50be3c23508dac87bf643edfcd0835f68a4aaf
 MD5 594c956745248197dd33c47c01686464 metadata.xml 586
 RMD160 774dae3c502ca2fdb4e906211cdfb5b7ecf3e9a7 metadata.xml 586
@@ -36,3 +40,6 @@ SHA256 ce525836d421d7614397a7dc09f5c1f74f6431fb4e650a1e68cc6c98b15e72f4 files/di
 MD5 7af89aae3e508d01ce8dfab9af1d81be files/digest-jxtray-0.5-r2 238
 RMD160 195074f5a992ba75b3228faf6ef28ac00b168a6e files/digest-jxtray-0.5-r2 238
 SHA256 ce525836d421d7614397a7dc09f5c1f74f6431fb4e650a1e68cc6c98b15e72f4 files/digest-jxtray-0.5-r2 238
+MD5 7af89aae3e508d01ce8dfab9af1d81be files/digest-jxtray-0.5-r3 238
+RMD160 195074f5a992ba75b3228faf6ef28ac00b168a6e files/digest-jxtray-0.5-r3 238
+SHA256 ce525836d421d7614397a7dc09f5c1f74f6431fb4e650a1e68cc6c98b15e72f4 files/digest-jxtray-0.5-r3 238
diff --git a/dev-db/jxtray/files/digest-jxtray-0.5-r3 b/dev-db/jxtray/files/digest-jxtray-0.5-r3
new file mode 100644
index 000000000000..928e2b1f52a2
--- /dev/null
+++ b/dev-db/jxtray/files/digest-jxtray-0.5-r3
@@ -0,0 +1,3 @@
+MD5 2d8f90c6c597e2a50b2217c4ec4abb03 jxtray-src-0.5.tgz 2476739
+RMD160 f35e7def1558cfcee48bfb42e1706e3ba8866e45 jxtray-src-0.5.tgz 2476739
+SHA256 ddb5d2b2399d1440d84b144fce4ef4f7ff865081745057e101deff3a38f0a849 jxtray-src-0.5.tgz 2476739
diff --git a/dev-db/jxtray/jxtray-0.5-r1.ebuild b/dev-db/jxtray/jxtray-0.5-r1.ebuild
index 495f52849913..d65c7356e6bf 100644
--- a/dev-db/jxtray/jxtray-0.5-r1.ebuild
+++ b/dev-db/jxtray/jxtray-0.5-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/jxtray-0.5-r1.ebuild,v 1.5 2007/01/25 23:15:08 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/jxtray-0.5-r1.ebuild,v 1.6 2007/01/30 10:52:41 caster Exp $
 
-inherit java-pkg-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Java based Database Explorer"
 HOMEPAGE="http://jxtray.sourceforge.net"
diff --git a/dev-db/jxtray/jxtray-0.5-r2.ebuild b/dev-db/jxtray/jxtray-0.5-r2.ebuild
index 261489620635..2afe3d49b549 100644
--- a/dev-db/jxtray/jxtray-0.5-r2.ebuild
+++ b/dev-db/jxtray/jxtray-0.5-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/jxtray-0.5-r2.ebuild,v 1.4 2007/01/25 23:15:08 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/jxtray-0.5-r2.ebuild,v 1.5 2007/01/30 10:52:41 caster Exp $
 
-inherit java-pkg-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Java based Database Explorer"
 HOMEPAGE="http://jxtray.sourceforge.net"
diff --git a/dev-db/jxtray/jxtray-0.5-r3.ebuild b/dev-db/jxtray/jxtray-0.5-r3.ebuild
new file mode 100644
index 000000000000..a6c814434d02
--- /dev/null
+++ b/dev-db/jxtray/jxtray-0.5-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/jxtray-0.5-r3.ebuild,v 1.1 2007/01/30 10:52:41 caster Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java based Database Explorer"
+HOMEPAGE="http://jxtray.sourceforge.net"
+SRC_URI="mirror://sourceforge/jxtray/${PN}-src-${PV}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc firebird mssql mysql postgres"
+
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )
+	>=dev-java/jdom-1.0
+	>=dev-java/kunststoff-2.0.2
+	dev-java/poi
+	dev-java/sax
+	>=dev-java/xerces-2.7
+	dev-java/xml-commons
+	firebird? ( dev-java/jdbc-jaybird )
+	mssql? ( =dev-java/jtds-0.9* )
+	mysql? ( dev-java/jdbc-mysql )
+	postgres? ( dev-java/jdbc-postgresql )
+	!firebird? ( !mssql? ( !postgres? ( dev-java/jdbc-mysql ) ) )"
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+	${RDEPEND}
+	dev-java/ant-core"
+
+S="${WORKDIR}/${PN}-src-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cp ${FILESDIR}/build.xml ${FILESDIR}/default.properties ${S}
+	local cp=""
+
+	cd ${S}/lib
+	rm *.jar
+	cp="${cp}:$(java-pkg_getjars jdom-1.0)"
+	cp="${cp}:$(java-pkg_getjars xerces-2)"
+	cp="${cp}:$(java-pkg_getjars xml-commons)"
+	cp="${cp}:$(java-pkg_getjars sax)"
+	cp="${cp}:$(java-pkg_getjars poi)"
+
+	cd ${S}/lib/lookandfeel
+	rm *.jar
+	cp="${cp}:$(java-pkg_getjars kunststoff-2.0)"
+
+	cd ${S}/lib/drivers
+	rm *.jar
+	use firebird && cp="${cp}:$(java-pkg_getjars jdbc-jaybird)"
+	use mssql && cp="${cp}:$(java-pkg_getjars jtds-0.9)"
+	use mysql && cp="${cp}:$(java-pkg_getjars jdbc-mysql)"
+	use postgres && cp="${cp}:$(java-pkg_getjars jdbc-postgresql)"
+
+	echo "classpath=${cp}" > ${S}/build.properties
+}
+
+src_compile() {
+	eant jar $(use_doc javadoc)
+}
+
+src_install() {
+	java-pkg_newjar ${S}/dist/${P}.jar ${PN}.jar
+
+	java-pkg_dolauncher jxtray --main jxtray.Jxtray
+
+	dodoc CHANGELOG.txt README.txt
+	use doc && java-pkg_dojavadoc -r ${S}/javadoc
+}