Changed dependency from dev-java/jdbc3-postgresql to dev-java/jdbc-postgresql.

Package-Manager: portage-2.1.2_rc4-r6

4 files changed, 92 insertions, 15 deletions

diff --git a/dev-db/jxtray/ChangeLog b/dev-db/jxtray/ChangeLog
index a6c4effe258b..16f10bc6d5c8 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.11 2007/01/06 21:06:36 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/ChangeLog,v 1.12 2007/01/06 22:22:21 fordfrog Exp $
+
+*jxtray-0.5-r2 (06 Jan 2007)
+
+  06 Jan 2007; Miroslav Šulc <fordfrog@gentoo.org> +jxtray-0.5-r2.ebuild:
+  Changed dependency from jdbc3-postgresql to jdbc-postgresql and changed to
+  java-pkg_dolauncher.
 
   06 Jan 2007; Petteri Räty <betelgeuse@gentoo.org> jxtray-0.5-r1.ebuild:
   Added back ~ppc keyword that was dropped with the last revision bump.
diff --git a/dev-db/jxtray/Manifest b/dev-db/jxtray/Manifest
index 7ac36cbd2517..ce33b6c5cf60 100644
--- a/dev-db/jxtray/Manifest
+++ b/dev-db/jxtray/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX build.xml 1599 RMD160 b63f18fc103695edb7e97a6065121cfa106ea9e2 SHA1 91d54eda8eca0064bbf62da066a65c61449af087 SHA256 4a134433577e5bca6f66851878f2359b01e5d0692d34143b4834d9cec09730cc
 MD5 97bb388f459c454b06a8276c62609259 files/build.xml 1599
 RMD160 b63f18fc103695edb7e97a6065121cfa106ea9e2 files/build.xml 1599
@@ -14,14 +11,18 @@ EBUILD jxtray-0.5-r1.ebuild 2248 RMD160 147a7389a7d37fd397cf39d6a89cd8f4da0c8e5b
 MD5 176760ca5e032b5286f50a1d48a46c5d jxtray-0.5-r1.ebuild 2248
 RMD160 147a7389a7d37fd397cf39d6a89cd8f4da0c8e5b jxtray-0.5-r1.ebuild 2248
 SHA256 c2b1756647f5a1d74fbed839268ba34dd901f87588088eb0214159a6c3961656 jxtray-0.5-r1.ebuild 2248
+EBUILD jxtray-0.5-r2.ebuild 1954 RMD160 ad45b38ca30830a9df88191926bc00ec7298b394 SHA1 575e7d012dfbae4ebb7295a28af981930e188231 SHA256 306864bfac3295599b05e3281818169f0307ccbf49d00ac6ae36a45dde729b7d
+MD5 4aa2ce1db596fed39de1bba3477d4116 jxtray-0.5-r2.ebuild 1954
+RMD160 ad45b38ca30830a9df88191926bc00ec7298b394 jxtray-0.5-r2.ebuild 1954
+SHA256 306864bfac3295599b05e3281818169f0307ccbf49d00ac6ae36a45dde729b7d jxtray-0.5-r2.ebuild 1954
 EBUILD jxtray-0.5.ebuild 2363 RMD160 9c4abdff976219f1ddf56dd8896abc117e066249 SHA1 c9b26681c17593e0f204011c09148eaf1a588cef SHA256 66fa9011251840ad8ff0277228635d2f11140faaf9f1c5e298bdff6ad2618373
 MD5 fa7e6e95cfc6312df8b884f95732e242 jxtray-0.5.ebuild 2363
 RMD160 9c4abdff976219f1ddf56dd8896abc117e066249 jxtray-0.5.ebuild 2363
 SHA256 66fa9011251840ad8ff0277228635d2f11140faaf9f1c5e298bdff6ad2618373 jxtray-0.5.ebuild 2363
-MISC ChangeLog 1715 RMD160 d4e54057ff6307b9c7ce19c12f50713e412ce290 SHA1 effb5095ad8e2293a167319e6b8847c433012fee SHA256 688002ef06c81063f8f16fab8b86f15f6e76d1f8483b92829632313e2dceb145
-MD5 ea223e373e57b68170721fd96cd008ee ChangeLog 1715
-RMD160 d4e54057ff6307b9c7ce19c12f50713e412ce290 ChangeLog 1715
-SHA256 688002ef06c81063f8f16fab8b86f15f6e76d1f8483b92829632313e2dceb145 ChangeLog 1715
+MISC ChangeLog 1919 RMD160 c8024817c6b95f8ef33e275dd670fecd589a97af SHA1 8c81fc1ca029cd9e92d85ac025105eaeb395480c SHA256 ef4e36a813d7ba1f464343d00b4c99bfa2f87d521f3386dbc96b81347fb14e59
+MD5 eab79ba99c725933863938f17c2876bf ChangeLog 1919
+RMD160 c8024817c6b95f8ef33e275dd670fecd589a97af ChangeLog 1919
+SHA256 ef4e36a813d7ba1f464343d00b4c99bfa2f87d521f3386dbc96b81347fb14e59 ChangeLog 1919
 MISC metadata.xml 586 RMD160 774dae3c502ca2fdb4e906211cdfb5b7ecf3e9a7 SHA1 d4a26605f4ccfbdc0a582cccec0bf6c7dcc5829d SHA256 4be3c32bfe30ef7b3d9c516caf50be3c23508dac87bf643edfcd0835f68a4aaf
 MD5 594c956745248197dd33c47c01686464 metadata.xml 586
 RMD160 774dae3c502ca2fdb4e906211cdfb5b7ecf3e9a7 metadata.xml 586
@@ -32,10 +33,6 @@ SHA256 ce525836d421d7614397a7dc09f5c1f74f6431fb4e650a1e68cc6c98b15e72f4 files/di
 MD5 7af89aae3e508d01ce8dfab9af1d81be files/digest-jxtray-0.5-r1 238
 RMD160 195074f5a992ba75b3228faf6ef28ac00b168a6e files/digest-jxtray-0.5-r1 238
 SHA256 ce525836d421d7614397a7dc09f5c1f74f6431fb4e650a1e68cc6c98b15e72f4 files/digest-jxtray-0.5-r1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFoA+VcxLzpIGCsLQRAkkdAJ0SInUULA/C6Yn+/YCT4CQWKr9yywCfb5hA
-fxTn3bntkFvCmUCq+JcUYJI=
-=QQV5
------END PGP SIGNATURE-----
+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
diff --git a/dev-db/jxtray/files/digest-jxtray-0.5-r2 b/dev-db/jxtray/files/digest-jxtray-0.5-r2
new file mode 100644
index 000000000000..928e2b1f52a2
--- /dev/null
+++ b/dev-db/jxtray/files/digest-jxtray-0.5-r2
@@ -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-r2.ebuild b/dev-db/jxtray/jxtray-0.5-r2.ebuild
new file mode 100644
index 000000000000..3dbe2da0e7b3
--- /dev/null
+++ b/dev-db/jxtray/jxtray-0.5-r2.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-r2.ebuild,v 1.1 2007/01/06 22:22:21 fordfrog Exp $
+
+inherit java-pkg-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 ~x86"
+IUSE="doc firebird mssql mysql postgres"
+
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )
+	>=dev-java/jdom-1.0_beta9
+	>=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_beta9)"
+	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 javadocs)
+}
+
+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
+}