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
@@ -8,8 +8,8 @@ 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
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
@@ -13,15 +13,17 @@ 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
 "
@@ -35,5 +37,5 @@ src_unpack() {
         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