diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2010-07-19 06:00:51 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2010-07-19 06:00:51 +0000 |
| commit | f09e4f4d894fdfa98706cb477609170269cd6cff (patch) | |
| tree | 1354b7361247edb641e474514b0355bbeb4bc1f3 /dev-db/sqldeveloper | |
| parent | whitespace (diff) | |
| download | gentoo-2-f09e4f4d894fdfa98706cb477609170269cd6cff.tar.gz gentoo-2-f09e4f4d894fdfa98706cb477609170269cd6cff.tar.bz2 gentoo-2-f09e4f4d894fdfa98706cb477609170269cd6cff.zip | |
Use java eclasses to find jars. Fixes bug #300852.
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'dev-db/sqldeveloper')
| -rw-r--r-- | dev-db/sqldeveloper/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/sqldeveloper/sqldeveloper-1.5.4.59.40.ebuild | 32 |
2 files changed, 14 insertions, 24 deletions
diff --git a/dev-db/sqldeveloper/ChangeLog b/dev-db/sqldeveloper/ChangeLog index 06319dcdf528..e780ea8c12e9 100644 --- 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/sqldeveloper-1.5.4.59.40.ebuild b/dev-db/sqldeveloper/sqldeveloper-1.5.4.59.40.ebuild index a5914301806f..96c4e6a955b5 100644 --- 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 } |