Use a newer version of jtds. It wouldn't have needed a new slot but what's done is done.

Package-Manager: portage-2.1.2.4

4 files changed, 96 insertions, 8 deletions

diff --git a/dev-db/jxtray/ChangeLog b/dev-db/jxtray/ChangeLog
index d9a6f49bf5fd..dbe9a8f217d1 100644
--- a/dev-db/jxtray/ChangeLog
+++ b/dev-db/jxtray/ChangeLog
@@ -1,6 +1,12 @@
 # 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.23 2007/04/12 22:32:24 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/ChangeLog,v 1.24 2007/04/25 17:33:26 betelgeuse Exp $
+
+*jxtray-0.5-r4 (25 Apr 2007)
+
+  25 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> +jxtray-0.5-r4.ebuild:
+  Use a newer version of jtds. It wouldn't have needed a new slot but what's
+  done is done.
 
   12 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> -jxtray-0.5-r1.ebuild:
   Remove old version so that we can package.mask dev-java/jdbc3-postgresql.
diff --git a/dev-db/jxtray/Manifest b/dev-db/jxtray/Manifest
index b31b4d3b54bf..f7c168b2bb59 100644
--- a/dev-db/jxtray/Manifest
+++ b/dev-db/jxtray/Manifest
@@ -18,10 +18,14 @@ EBUILD jxtray-0.5-r3.ebuild 1949 RMD160 5fe5c9c729603ea71bf66b4daca8bfa1a0decc2e
 MD5 94b6f282f7bc5c56a12e2b828859cc5f jxtray-0.5-r3.ebuild 1949
 RMD160 5fe5c9c729603ea71bf66b4daca8bfa1a0decc2e jxtray-0.5-r3.ebuild 1949
 SHA256 b1b1dc78df448e0f3a4bca97a0b146b1c0884bd6005e3c85a9c7eb8f92a5a1e4 jxtray-0.5-r3.ebuild 1949
-MISC ChangeLog 3529 RMD160 b87ccd03abe91f9555a3f0d90b4edabcf6cde5b4 SHA1 ef590f671df414a85cae51a156b1733f4ef1b911 SHA256 88939815e15d144f53c5b7bc754257e136fc27e29412a8500ae588ca479c9770
-MD5 c298ed734afd120955b7dd305a069e29 ChangeLog 3529
-RMD160 b87ccd03abe91f9555a3f0d90b4edabcf6cde5b4 ChangeLog 3529
-SHA256 88939815e15d144f53c5b7bc754257e136fc27e29412a8500ae588ca479c9770 ChangeLog 3529
+EBUILD jxtray-0.5-r4.ebuild 1937 RMD160 b4d411ddc00c5741179e7347deed036fbdb9b67c SHA1 195cee20755e76656a115c2bb91a9aa1ad11c837 SHA256 662547e12566c4c59c42d4bfd212f8180ce51334743f76428c1b48ee9f4b3bcb
+MD5 d2229692fbd6ca9883718b3a301507b3 jxtray-0.5-r4.ebuild 1937
+RMD160 b4d411ddc00c5741179e7347deed036fbdb9b67c jxtray-0.5-r4.ebuild 1937
+SHA256 662547e12566c4c59c42d4bfd212f8180ce51334743f76428c1b48ee9f4b3bcb jxtray-0.5-r4.ebuild 1937
+MISC ChangeLog 3729 RMD160 28cd8bb7ed0b0a3f9533068a38bff6aa3d191090 SHA1 20ef4a2117148d292ccb0694a870c2a90815ec6a SHA256 b223bf8b04de6fca1f46c46fd8e456ff3f995f8528cd3f9f1888a2ad96ed0557
+MD5 5dcae21ee14b42ccefd7e16a2f9dee7d ChangeLog 3729
+RMD160 28cd8bb7ed0b0a3f9533068a38bff6aa3d191090 ChangeLog 3729
+SHA256 b223bf8b04de6fca1f46c46fd8e456ff3f995f8528cd3f9f1888a2ad96ed0557 ChangeLog 3729
 MISC metadata.xml 586 RMD160 774dae3c502ca2fdb4e906211cdfb5b7ecf3e9a7 SHA1 d4a26605f4ccfbdc0a582cccec0bf6c7dcc5829d SHA256 4be3c32bfe30ef7b3d9c516caf50be3c23508dac87bf643edfcd0835f68a4aaf
 MD5 594c956745248197dd33c47c01686464 metadata.xml 586
 RMD160 774dae3c502ca2fdb4e906211cdfb5b7ecf3e9a7 metadata.xml 586
@@ -32,10 +36,13 @@ SHA256 ce525836d421d7614397a7dc09f5c1f74f6431fb4e650a1e68cc6c98b15e72f4 files/di
 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
+MD5 7af89aae3e508d01ce8dfab9af1d81be files/digest-jxtray-0.5-r4 238
+RMD160 195074f5a992ba75b3228faf6ef28ac00b168a6e files/digest-jxtray-0.5-r4 238
+SHA256 ce525836d421d7614397a7dc09f5c1f74f6431fb4e650a1e68cc6c98b15e72f4 files/digest-jxtray-0.5-r4 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGHrN6cxLzpIGCsLQRAqRsAJ4pgkM5kRNY3sGC92a/t1Ypt9B6lwCdFce/
-Ljjgvn5gn1gLYsiWavumisw=
-=sLUU
+iD8DBQFGL5DocxLzpIGCsLQRApTYAJsHHcBgGDxiP+FhAhGH49c5Tr892ACcDZx2
+R1DlUGQCnXA6AeONo1FpCqw=
+=l48D
 -----END PGP SIGNATURE-----
diff --git a/dev-db/jxtray/files/digest-jxtray-0.5-r4 b/dev-db/jxtray/files/digest-jxtray-0.5-r4
new file mode 100644
index 000000000000..928e2b1f52a2
--- /dev/null
+++ b/dev-db/jxtray/files/digest-jxtray-0.5-r4
@@ -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-r4.ebuild b/dev-db/jxtray/jxtray-0.5-r4.ebuild
new file mode 100644
index 000000000000..ed00c48adc39
--- /dev/null
+++ b/dev-db/jxtray/jxtray-0.5-r4.ebuild
@@ -0,0 +1,72 @@
+# 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-r4.ebuild,v 1.1 2007/04/25 17:33:26 betelgeuse 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 ~x86"
+IUSE="doc firebird mssql mysql postgres"
+
+COMMON_DEP="
+	>=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-1.2 )
+	mysql? ( dev-java/jdbc-mysql )
+	postgres? ( dev-java/jdbc-postgresql )
+	!firebird? ( !mssql? ( !postgres? ( dev-java/jdbc-mysql ) ) )"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
+	${COMMON_DEP}"
+
+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-1.2)"
+	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
+}