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.

(Portage version: 2.1.2-r5)

5 files changed, 87 insertions, 5 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/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
+}