changed jdbc dependency

Signed-off-by: Michael Krelin <hacker@klever.net>

2 files changed, 13 insertions, 11 deletions

diff --git a/dev-db/schemaspy/Manifest b/dev-db/schemaspy/Manifest
index fb2f9e5..51dc8d8 100644
--- a/dev-db/schemaspy/Manifest
+++ b/dev-db/schemaspy/Manifest
@@ -1,16 +1,16 @@
 AUX build.xml 1233 RMD160 77f3733216ca9a4efbd9446a968978eb809fb640 SHA1 eb0291b182d7d3f48936e2f84a80536e6967648c SHA256 3e353adf66a695173e77c3236bc2fa4134234919f364ae1ea4701bf38a271df7
 MD5 797960ce04628b8f399b02340038fefc files/build.xml 1233
 RMD160 77f3733216ca9a4efbd9446a968978eb809fb640 files/build.xml 1233
 SHA256 3e353adf66a695173e77c3236bc2fa4134234919f364ae1ea4701bf38a271df7 files/build.xml 1233
 AUX schemaspy.launcherd 216 RMD160 967e360342bf3bc6a70752b4157836ba9a9dbb12 SHA1 6a48ec7f3a2e4d8b661e6020245479bd6b38c619 SHA256 408bb7c302a0744f897eec91e1c5d9c9706b74bc97a5fc4afddf240b6854b104
 MD5 f62d9cd841ce9a1d21b62fdb6412f646 files/schemaspy.launcherd 216
 RMD160 967e360342bf3bc6a70752b4157836ba9a9dbb12 files/schemaspy.launcherd 216
 SHA256 408bb7c302a0744f897eec91e1c5d9c9706b74bc97a5fc4afddf240b6854b104 files/schemaspy.launcherd 216
 DIST schemaSpy_3.1.1.source.jar 92103 RMD160 c45252f687da89832b1a19e7bcb7be38c997688c SHA1 1d2fd1591fbe531a883a8d0464b56bcd2020a8e4 SHA256 fe67a047e56357b6c9e7bdd27d5ef680e159ca66e8f4032f7261d3d9de7e783b
-EBUILD schemaspy-3.1.1.ebuild 1292 RMD160 ae41f49c1cb8e12e540e3248330b0658a434cd4c SHA1 9c9128b9b8e5664a97b9dce5e6216f73ed6d32af SHA256 2d53cabfe53360affbd77886d84ae34a22a348113e6f476518cf12b4b880021e
-MD5 a90a1d27fe6b8f988b7bc12af160c1d4 schemaspy-3.1.1.ebuild 1292
-RMD160 ae41f49c1cb8e12e540e3248330b0658a434cd4c schemaspy-3.1.1.ebuild 1292
-SHA256 2d53cabfe53360affbd77886d84ae34a22a348113e6f476518cf12b4b880021e schemaspy-3.1.1.ebuild 1292
+EBUILD schemaspy-3.1.1.ebuild 1316 RMD160 e73b3f4ea89fd81ad8c77f604bcca71499ed14f2 SHA1 0c44b6c7a12b0fdc71197cda6b9c9f1329d82a4c SHA256 d7229b5e5c99395f0a6f80bb8d9b62ff8ff5bad7e7424d47b94ae5a2bb508911
+MD5 581debf4564b82dc2ea97e23cbfc0f44 schemaspy-3.1.1.ebuild 1316
+RMD160 e73b3f4ea89fd81ad8c77f604bcca71499ed14f2 schemaspy-3.1.1.ebuild 1316
+SHA256 d7229b5e5c99395f0a6f80bb8d9b62ff8ff5bad7e7424d47b94ae5a2bb508911 schemaspy-3.1.1.ebuild 1316
 MD5 334efa785fc5c3e16511b06295f4623b files/digest-schemaspy-3.1.1 256
 RMD160 77b91f8d95a0bacfe6c235dccb89026a5d4349c9 files/digest-schemaspy-3.1.1 256
 SHA256 22d266ea1af63952021014e7ccb07a8c253d9e1860cf8bdbd9825286d56dbb9e files/digest-schemaspy-3.1.1 256
diff --git a/dev-db/schemaspy/schemaspy-3.1.1.ebuild b/dev-db/schemaspy/schemaspy-3.1.1.ebuild
index 9945e00..131c84f 100644
--- a/dev-db/schemaspy/schemaspy-3.1.1.ebuild
+++ b/dev-db/schemaspy/schemaspy-3.1.1.ebuild
@@ -1,53 +1,55 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Graphical database schema metadata browser"
 HOMEPAGE="http://schemaspy.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/schemaSpy_${PV}.source.jar"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 amd64"
 IUSE="postgres firebird oracle mysql"
 
-DEPEND="
+JDEPEND="
+        postgres? ( dev-java/jdbc-postgresql )
+        firebird? ( dev-java/jdbc3-firebird )
+        oracle? ( dev-java/jdbc3-oracle )
+        mysql? ( dev-java/jdbc-mysql )
+"
+DEPEND="$JDEPEND
         >=virtual/jdk-1.4
         dev-java/ant-core
         app-arch/unzip
 "
-RDEPEND="
+RDEPEND="$JDEPEND
         >=virtual/jre-1.4
-        postgres? ( dev-java/jdbc3-postgresql )
-        firebird? ( dev-java/jdbc3-firebird )
-        oracle? ( dev-java/jdbc3-oracle )
-        mysql? ( dev-java/jdbc-mysql )
         !dev-db/schemaspy-svn
 "
 
 src_unpack() {
         mkdir "${S}"
         cd "${S}"
         unpack "${A}"
         cp ${FILESDIR}/build.xml ./
         rm -rf META-INF/
         mkdir src
         mv net *.css images src
-        use postgres && java-pkg_jar-from jdbc3-postgresql-1
+        use postgres && java-pkg_jar-from jdbc-postgresql
         use firebird && java-pkg_jar-from jdbc3-firebird
         # XXX: I don't know if it's the right name for oracle package
         use oracle && java-pkg_jar-from jdbc3-oracle
         use mysql && java-pkg_jar-from jdbc-mysql
 }
 
 src_compile() {
         eant || die "Failed complie"
 }
 
 src_install() {
         java-pkg_dojar dist/schemaSpy.jar
         java-pkg_dolauncher ${PN}
         insinto /etc/java-config-2/launcher.d/
         newins ${FILESDIR}/schemaspy.launcherd ${PN}
 }