Use java eclasses to find jars. Fixes bug #300852.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/dev-db/sqldeveloper/ChangeLog b/dev-db/sqldeveloper/ChangeLog
index 06319dcdf5284249625e761f5a10617b205daf11..e780ea8c12e992652fad2e5d2fb815a25047c596 100644 (file)
--- a/dev-db/sqldeveloper/ChangeLog
+++ b/dev-db/sqldeveloper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/sqldeveloper
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqldeveloper/ChangeLog,v 1.7 2010/06/02 06:46:27 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqldeveloper/ChangeLog,v 1.8 2010/07/19 06:00:51 betelgeuse Exp $
+
+  19 Jul 2010; Petteri Räty <betelgeuse@gentoo.org>
+  sqldeveloper-1.5.4.59.40.ebuild:
+  Use java eclasses to find jars. Fixes bug #300852.
 
   02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove bluebird from metadata.xml (#223101)

diff --git a/dev-db/sqldeveloper/Manifest b/dev-db/sqldeveloper/Manifest
index 19e053e2d1a887781ca03661bf6888babbf37696..ae7d4d83955327e22807a05b7936fe5338f26bd2 100644 (file)
--- a/dev-db/sqldeveloper/Manifest
+++ b/dev-db/sqldeveloper/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 AUX sqldeveloper 290 RMD160 c8636f571f0dc48118bb80edd8d8ee8dfc5b60dc SHA1 4a6907dec0bcae73971959fb725c65d9edef0eb9 SHA256 3f9563a05c1c059b92365eb3b3940b118fb70494854f12addf0b4ef90eb49236
 DIST sqldeveloper-1.5.4.59.40-no-jre.zip 76430283 RMD160 5e4c76ca9bd173e99fb2bfb64d3694b65847f1a4 SHA1 635b34b87b058242694a797bc83ca655a56a924a SHA256 3849ea6560bc31a17f6c457ffdefde018041e8acb601426a027efd5fea62debc
-EBUILD sqldeveloper-1.5.4.59.40.ebuild 2709 RMD160 ea249fb1efc7e3728fdf3170baaae7144e85165d SHA1 fc90cfe97e0b45dee083751c11ce280b8acd8839 SHA256 d1d79162ca97dff618b9a75ca65a5da6dfa09583e1fda55f7a2f8ef43d86bd2f
-MISC ChangeLog 1192 RMD160 94441082f42915cfecd0142846bd90425d16878b SHA1 0a8ae7d995a31a56d53939a0269c4b6857251ad9 SHA256 f20c9ec2652bf1ea0b203db8eeeebabe1af9d44016762942338342fc635a42ac
+EBUILD sqldeveloper-1.5.4.59.40.ebuild 2204 RMD160 c42fb69b5d67ce7a500fb33fe1a07793c451813d SHA1 039fa82566a4543b4acea14625ffa934cac478bc SHA256 509fc54d93a425d6073fdac8079c5505a9cc5252573c813412f02ef8006c26d7
+MISC ChangeLog 1340 RMD160 2e6ed632b26a44fdf6dd887f3250654e01ad8b8b SHA1 948890c859b0ea2272c15dceab6d41e73a38350e SHA256 c40412ff9eba0e0a0cd5cd2c17c6b0ab35c12ff8e853f4e4a513bc1ad8477864
 MISC metadata.xml 666 RMD160 02a09d2a2e725e1b8b233425ff03598a7b4ef535 SHA1 6b9c75e52e2f32a95d7200ff615dd434bb7168cc SHA256 fe7805af93a97665b3661ba04caf1c946e2eb4d5a5414127f54de888acbd5db7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwF/kgACgkQV3J2n04EauzugACfd0Mmi/8XxjTzpe3YFsLpMme1
-puYAoMumF2sHo+X6QMbrTOqrvv37vPKX
-=U7bm
+iEYEARECAAYFAkxD6mwACgkQcxLzpIGCsLTEyACfeu4UcSRte4PpDnjgoAcgyKZr
+Q7EAoJLgCnlEUqsCikYDNOXU3D5UBd0P
+=G6Ev
 -----END PGP SIGNATURE-----

diff --git a/dev-db/sqldeveloper/sqldeveloper-1.5.4.59.40.ebuild b/dev-db/sqldeveloper/sqldeveloper-1.5.4.59.40.ebuild
index a5914301806f3bc5379f743d76d9c7ba8c32158b..96c4e6a955b5f98c776fa8c7b2685e7fb8a9181d 100644 (file)
--- a/dev-db/sqldeveloper/sqldeveloper-1.5.4.59.40.ebuild
+++ b/dev-db/sqldeveloper/sqldeveloper-1.5.4.59.40.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqldeveloper/sqldeveloper-1.5.4.59.40.ebuild,v 1.2 2009/07/05 08:48:54 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqldeveloper/sqldeveloper-1.5.4.59.40.ebuild,v 1.3 2010/07/19 06:00:51 betelgeuse Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit eutils java-pkg-2
 
 DESCRIPTION="Oracle SQL Developer is a graphical tool for database development"
 HOMEPAGE="http://www.oracle.com/technology/products/database/sql_developer/"
@@ -16,10 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE="mssql mysql sybase"
 
-DEPEND="mssql? ( dev-java/jtds )
-       mysql? ( dev-java/jdbc-mysql )
-       sybase? ( dev-java/jtds )"
-RDEPEND=">=virtual/jdk-1.5.0
+DEPEND="mssql? ( dev-java/jtds:1.2 )
+       mysql? ( dev-java/jdbc-mysql:0 )
+       sybase? ( dev-java/jtds:1.2 )"
+RDEPEND=">=virtual/jre-1.5.0
        ${DEPEND}"
 
 S="${WORKDIR}/${PN}"
@@ -48,26 +48,12 @@ src_configure() {
        fi
 
        if use mssql || use sybase; then
-               jtds_version="$(best_version dev-java/jtds)"
-               jtds_version="${jtds_version/dev-java\/jtds-/}"
-               jtds_version="${jtds_version/-*/}"
-
-               if [ ! -e "${ROOT}/usr/share/jtds-${jtds_version}/lib/jtds.jar" ]; then
-                       eerror "$(best_version dev-java/jtds) does not provide jtds.jar!"
-                       die "Cannot find jtds.jar"
-               fi
-
-               echo "AddJavaLibFile /usr/share/jtds-${jtds_version}/lib/jtds.jar" \
+               echo "AddJavaLibFile $(java-pkg_getjars jtds-1.2)"
                        >> sqldeveloper/bin/sqldeveloper.conf
        fi
 
        if use mysql; then
-               if [ ! -e "${ROOT}"/usr/share/jdbc-mysql/lib/jdbc-mysql.jar ]; then
-                       eerror "$(best_version jdbc-mysql) does not provide jdbc-mysql.jar!"
-                       die "Cannot find jdbc-mysql.jar"
-               fi
-
-               echo "AddJavaLibFile /usr/share/jdbc-mysql/lib/jdbc-mysql.jar" \
+               echo "AddJavaLibFile $(java-pkg_getjars jdbc-mysql)"
                        >> sqldeveloper/bin/sqldeveloper.conf
        fi
 }