dev-db/schemaspy-svn: adjusted jdbc deps

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

4 files changed, 75 insertions, 11 deletions

diff --git a/dev-db/schemaspy-svn/Manifest b/dev-db/schemaspy-svn/Manifest
index a36cf5e..9cf2d60 100644
--- a/dev-db/schemaspy-svn/Manifest
+++ b/dev-db/schemaspy-svn/Manifest
@@ -1,11 +1,18 @@
 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
-EBUILD schemaspy-svn-304.ebuild 1313 RMD160 2d810c4cb7beba85252580e3fc20f985e849ca9d SHA1 540d9a823aec32a8ade9a60b023837bb403ea9b0 SHA256 e2f7a4d92b8a8c059bc83ed7e08d9198234ef8d3261c0f92fe83715e00b5107a
-MD5 99d5c2edec50d3b25a67b7610867b1e1 schemaspy-svn-304.ebuild 1313
-RMD160 2d810c4cb7beba85252580e3fc20f985e849ca9d schemaspy-svn-304.ebuild 1313
-SHA256 e2f7a4d92b8a8c059bc83ed7e08d9198234ef8d3261c0f92fe83715e00b5107a schemaspy-svn-304.ebuild 1313
+EBUILD schemaspy-svn-304.ebuild 1337 RMD160 821abad1625fe5dfc88198517f2f9003dc7cdcfe SHA1 0f5498542ce31a1ac23c41d3b0eaf40f7a457efc SHA256 0809215999e3ef78b71d78fb5b331a0884f9b1186675fe4f01ff48a36891873d
+MD5 87190029ce2bfa6aad56744b603fd117 schemaspy-svn-304.ebuild 1337
+RMD160 821abad1625fe5dfc88198517f2f9003dc7cdcfe schemaspy-svn-304.ebuild 1337
+SHA256 0809215999e3ef78b71d78fb5b331a0884f9b1186675fe4f01ff48a36891873d schemaspy-svn-304.ebuild 1337
+EBUILD schemaspy-svn-345.ebuild 1337 RMD160 821abad1625fe5dfc88198517f2f9003dc7cdcfe SHA1 0f5498542ce31a1ac23c41d3b0eaf40f7a457efc SHA256 0809215999e3ef78b71d78fb5b331a0884f9b1186675fe4f01ff48a36891873d
+MD5 87190029ce2bfa6aad56744b603fd117 schemaspy-svn-345.ebuild 1337
+RMD160 821abad1625fe5dfc88198517f2f9003dc7cdcfe schemaspy-svn-345.ebuild 1337
+SHA256 0809215999e3ef78b71d78fb5b331a0884f9b1186675fe4f01ff48a36891873d schemaspy-svn-345.ebuild 1337
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-schemaspy-svn-304 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-schemaspy-svn-304 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-schemaspy-svn-304 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-schemaspy-svn-345 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-schemaspy-svn-345 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-schemaspy-svn-345 0
diff --git a/dev-db/schemaspy-svn/files/digest-schemaspy-svn-345 b/dev-db/schemaspy-svn/files/digest-schemaspy-svn-345
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/dev-db/schemaspy-svn/files/digest-schemaspy-svn-345
diff --git a/dev-db/schemaspy-svn/schemaspy-svn-304.ebuild b/dev-db/schemaspy-svn/schemaspy-svn-304.ebuild
index 80ba3a9..b61d184 100644
--- a/dev-db/schemaspy-svn/schemaspy-svn-304.ebuild
+++ b/dev-db/schemaspy-svn/schemaspy-svn-304.ebuild
@@ -8,41 +8,43 @@ OPN="${PN%-svn}"
 
 ESVN_REPO_URI="https://svn.sourceforge.net/svnroot/${OPN}/trunk"
 ESVN_PROJECT="schemaspy"
 ESVN_OPTIONS="-r${PV}"
 
 DESCRIPTION="Graphical database schema metadata browser"
 HOMEPAGE="http://schemaspy.sourceforge.net/"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 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.5
         dev-java/ant-core
         app-arch/unzip
 "
-RDEPEND="
+RDEPEND="$JDEPEND
         >=virtual/jre-1.5
-        postgres? ( dev-java/jdbc3-postgresql )
-        firebird? ( dev-java/jdbc3-firebird )
-        oracle? ( dev-java/jdbc3-oracle )
-        mysql? ( dev-java/jdbc-mysql )
         !dev-db/schemaspy
 "
 
 src_unpack() {
         subversion_src_unpack
-        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 compile"
 }
 
 src_install() {
         java-pkg_dojar dist/schemaSpy.jar
diff --git a/dev-db/schemaspy-svn/schemaspy-svn-345.ebuild b/dev-db/schemaspy-svn/schemaspy-svn-345.ebuild
new file mode 100644
index 0000000..b61d184
--- a/dev/null
+++ b/dev-db/schemaspy-svn/schemaspy-svn-345.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit subversion eutils java-pkg-2 java-ant-2
+
+OPN="${PN%-svn}"
+
+ESVN_REPO_URI="https://svn.sourceforge.net/svnroot/${OPN}/trunk"
+ESVN_PROJECT="schemaspy"
+ESVN_OPTIONS="-r${PV}"
+
+DESCRIPTION="Graphical database schema metadata browser"
+HOMEPAGE="http://schemaspy.sourceforge.net/"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="postgres firebird oracle mysql"
+
+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.5
+        dev-java/ant-core
+        app-arch/unzip
+"
+RDEPEND="$JDEPEND
+        >=virtual/jre-1.5
+        !dev-db/schemaspy
+"
+
+src_unpack() {
+        subversion_src_unpack
+        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 compile"
+}
+
+src_install() {
+        java-pkg_dojar dist/schemaSpy.jar
+        java-pkg_dolauncher ${OPN}
+        insinto /etc/java-config-2/launcher.d/
+        newins ${FILESDIR}/${OPN}.launcherd ${PN}
+        dodoc dist/index.html dist/releaseNotes.html
+}