[dev-db/virtuoso] a bit of cleanup

8 files changed, 14 insertions, 33 deletions

diff --git a/dev-db/virtuoso-jdbc/Manifest b/dev-db/virtuoso-jdbc/Manifest
index 1088694c52..6173cc3ef0 100644
--- a/dev-db/virtuoso-jdbc/Manifest
+++ b/dev-db/virtuoso-jdbc/Manifest
@@ -1,4 +1,4 @@
 AUX 5.0.11/5.0.11-common.patch 10445 RMD160 b9734db5881e502d3ae093651e083679f8730cce SHA1 5c0a46033c7acfc1a6ffa1da8ac8503fb738c02c SHA256 69c0cc53f1b43728a1d6bffb713197bfc20c57d9bacb5b11458e18448232e60d
 DIST virtuoso-opensource-5.0.11.tar.gz 60131544 RMD160 cbc4e98c5c1b399db4de3acc9ad3fc3e4c8f3faf SHA1 e16e5e5e9a0279a8b7e46868e06bd79ed9088291 SHA256 b6d518b96bfb2aaadd194b9added5b2454533411a4b723014f0f1b5d5fe4825f
-EBUILD virtuoso-jdbc-5.0.11.ebuild 533 RMD160 efc96b4c27cc74837e9a6f96d063ee973eae9439 SHA1 676309cddcae90bd20ae9a57dc4e135e5c7907bd SHA256 ead6c9c11f205f161079d22d18792117d10cde29885182160366d067b98328f1
+EBUILD virtuoso-jdbc-5.0.11.ebuild 529 RMD160 f1de1cf28d57cfb303ac7c57b90717c63184ca46 SHA1 f46237d94c114e78afc0801ce63a148c74aedba8 SHA256 ff6f32239bbef501cd330720432b31e6b20681365e1536c887d547dd48ac9335
 MISC metadata.xml 254 RMD160 53ade98a0f3bc3e0865a83ad0337f7aef78e176d SHA1 671cd5784aa889f2dc95c412748e2b9ea15945ea SHA256 801b3c18ec13a5e6bfa0e0d940c190a73c7e0ae031a4c6eb621b64fe8f8ab886
diff --git a/dev-db/virtuoso-jdbc/virtuoso-jdbc-5.0.11.ebuild b/dev-db/virtuoso-jdbc/virtuoso-jdbc-5.0.11.ebuild
index 7906cd198a..1365d1daf7 100644
--- a/dev-db/virtuoso-jdbc/virtuoso-jdbc-5.0.11.ebuild
+++ b/dev-db/virtuoso-jdbc/virtuoso-jdbc-5.0.11.ebuild
@@ -6,16 +6,16 @@ EAPI="2"
 
 inherit virtuoso java-pkg-2
 
-DESCRIPTION="ODBC driver for OpenLink Virtuoso"
+DESCRIPTION="JDBC driver for OpenLink Virtuoso Open-Source Edition"
 
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	java? ( >=virtual/jdk-1.6.0 )
+	>=virtual/jdk-1.6.0
 "
 RDEPEND="
-	java? ( >=virtual/jre-1.6.0 )
+	>=virtual/jre-1.6.0
 "
 
 VOS_EXTRACT="
@@ -23,7 +23,7 @@ VOS_EXTRACT="
 "
 
 src_prepare() {
-	java-pkg-opt-2_src_prepare
+	java-pkg-2_src_prepare
 	virtuoso_src_prepare
 }
 
diff --git a/dev-db/virtuoso-odbc/Manifest b/dev-db/virtuoso-odbc/Manifest
index b157f616aa..272dcdede5 100644
--- a/dev-db/virtuoso-odbc/Manifest
+++ b/dev-db/virtuoso-odbc/Manifest
@@ -1,4 +1,4 @@
 AUX 5.0.11/5.0.11-common.patch 10445 RMD160 b9734db5881e502d3ae093651e083679f8730cce SHA1 5c0a46033c7acfc1a6ffa1da8ac8503fb738c02c SHA256 69c0cc53f1b43728a1d6bffb713197bfc20c57d9bacb5b11458e18448232e60d
 DIST virtuoso-opensource-5.0.11.tar.gz 60131544 RMD160 cbc4e98c5c1b399db4de3acc9ad3fc3e4c8f3faf SHA1 e16e5e5e9a0279a8b7e46868e06bd79ed9088291 SHA256 b6d518b96bfb2aaadd194b9added5b2454533411a4b723014f0f1b5d5fe4825f
-EBUILD virtuoso-odbc-5.0.11.ebuild 1186 RMD160 7d74c0eb758e92fe16c45c04b2155eb534022942 SHA1 1d6895450b3b0ae2a965e02e2560f2dffc5cdf0f SHA256 7aa319e6650e4e0ae0dbb52c81efc2a2f4e2b803ee973ba5d7f7444a8a22c5a8
+EBUILD virtuoso-odbc-5.0.11.ebuild 835 RMD160 0bef8e86c12e47967b4bfa515e6e8aee267f2739 SHA1 f26b3c9aaa0667e9dbc5c5f52adbfce40c9c4d2b SHA256 dd82e2535eb7e55556a8e4d0a46258e2f86e3d048eeb8eaea397e3b4cb8a4b6a
 MISC metadata.xml 254 RMD160 53ade98a0f3bc3e0865a83ad0337f7aef78e176d SHA1 671cd5784aa889f2dc95c412748e2b9ea15945ea SHA256 801b3c18ec13a5e6bfa0e0d940c190a73c7e0ae031a4c6eb621b64fe8f8ab886
diff --git a/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.11.ebuild b/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.11.ebuild
index 28117d45d7..ff6ecab191 100644
--- a/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.11.ebuild
+++ b/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.11.ebuild
@@ -4,10 +4,9 @@
 
 EAPI="2"
 
-#inherit virtuoso java-pkg-opt-2
 inherit virtuoso
 
-DESCRIPTION="ODBC driver for OpenLink Virtuoso"
+DESCRIPTION="ODBC driver for OpenLink Virtuoso Open-Source Edition"
 
 KEYWORDS="~amd64 ~x86"
 IUSE="+iodbc static-libs"
@@ -49,23 +48,3 @@ src_install() {
 		done
 	fi
 }
-
-#DEPEND="
-#	java? ( >=virtual/jdk-1.6.0 )
-#"
-#RDEPEND="
-	#java? ( >=virtual/jre-1.6.0 )
-#"
-
-#pkg_setup() {
-#	use java && VOS_EXTRACT="libsrc/JDBCDriverType4 ${VOS_EXTRACT}"
-#}
-
-#src_prepare() {
-#	java-pkg-opt-2_src_prepare
-#	virtuoso_src_prepare
-#}
-
-#src_configure() {
-#	use java && myconf="${myconf} --with-jdk4=$(java-config-2 -O)"
-#}
diff --git a/dev-db/virtuoso-server/Manifest b/dev-db/virtuoso-server/Manifest
index b24ddcaff4..e6413ff9f8 100644
--- a/dev-db/virtuoso-server/Manifest
+++ b/dev-db/virtuoso-server/Manifest
@@ -1,4 +1,4 @@
 AUX 5.0.11/5.0.11-common.patch 10445 RMD160 b9734db5881e502d3ae093651e083679f8730cce SHA1 5c0a46033c7acfc1a6ffa1da8ac8503fb738c02c SHA256 69c0cc53f1b43728a1d6bffb713197bfc20c57d9bacb5b11458e18448232e60d
 DIST virtuoso-opensource-5.0.11.tar.gz 60131544 RMD160 cbc4e98c5c1b399db4de3acc9ad3fc3e4c8f3faf SHA1 e16e5e5e9a0279a8b7e46868e06bd79ed9088291 SHA256 b6d518b96bfb2aaadd194b9added5b2454533411a4b723014f0f1b5d5fe4825f
-EBUILD virtuoso-server-5.0.11.ebuild 2552 RMD160 60410076fb9f7814f5c3a73264b2362e01e94acc SHA1 9350d3d7750528565cf816666edb8e59ea920f91 SHA256 6a0a3056e05883321aa059f2a07852e8953a16f65cff9322a290d8ca00f4c379
+EBUILD virtuoso-server-5.0.11.ebuild 2630 RMD160 172ac958b869091cc4b9ab06c4e207a2938b5a68 SHA1 df168537cda1c8464b1b289b418b56a64c062340 SHA256 a8432dc80f7d7c2d659c88b234177252c6319eda250781be3f1f016c41dfe6ad
 MISC metadata.xml 1012 RMD160 953d0558ff30447c9b71fbdaf3aa9372ec9304b2 SHA1 765ba622f23e317a6f23efbbfbe4129e018eb58e SHA256 f5ab1180022f75b8ec46b9fbc6dc2597bff5a9b6c2e06edfee0a6925b40e8402
diff --git a/dev-db/virtuoso-server/virtuoso-server-5.0.11.ebuild b/dev-db/virtuoso-server/virtuoso-server-5.0.11.ebuild
index b162f5b86d..35886c6325 100644
--- a/dev-db/virtuoso-server/virtuoso-server-5.0.11.ebuild
+++ b/dev-db/virtuoso-server/virtuoso-server-5.0.11.ebuild
@@ -14,7 +14,7 @@ IUSE="+iodbc kerberos ldap readline static-libs"
 # zeroconf support looks like broken - disabling
 # mono support fetches mono source and compiles it manually - disabling for now
 # mono? ( dev-lang/mono )
-RDEPEND="
+COMMON_DEPEND="
 	dev-libs/libxml2:2
 	>=dev-libs/openssl-0.9.7i:0
 	sys-libs/zlib:0
@@ -23,10 +23,13 @@ RDEPEND="
 	ldap? ( net-nds/openldap )
 	readline? ( sys-libs/readline:0 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	>=sys-devel/bison-2.3
 	>=sys-devel/flex-2.5.33
 "
+RDEPEND="${COMMON_DEPEND}
+	>=dev-db/virtuoso-odbc-${PV}:${SLOT}
+"
 
 VOS_EXTRACT="
 	libsrc/Dk
diff --git a/dev-db/virtuoso/Manifest b/dev-db/virtuoso/Manifest
index 877e811e6a..1379850d70 100644
--- a/dev-db/virtuoso/Manifest
+++ b/dev-db/virtuoso/Manifest
@@ -1,5 +1,5 @@
 AUX dist/5.0.11-ruby-support.patch 513 RMD160 b4739d2a9a2e09948e8ef9aa3d6f73e8f467da58 SHA1 efacbecc3bebe3529a6d800fd93d79b46157f8e3 SHA256 276d5664644299c5def20a6c06b42278c694d0030f4f9f34da99512a65e3196e
 AUX dist/5.0.11-use-external-zlib.patch 9285 RMD160 43ec0cd919ae4286679c42f5460c6b8d02752b52 SHA1 d4e07f2496467c75335d787bb2b2bfc39be1693b SHA256 26bebe15d7795e5919c9642cc24eaa66f77cbb57c0e9bf8a9b54691f05f0cbca
 DIST virtuoso-opensource-5.0.11.tar.gz 60131544 RMD160 cbc4e98c5c1b399db4de3acc9ad3fc3e4c8f3faf SHA1 e16e5e5e9a0279a8b7e46868e06bd79ed9088291 SHA256 b6d518b96bfb2aaadd194b9added5b2454533411a4b723014f0f1b5d5fe4825f
-EBUILD virtuoso-5.0.11.ebuild 2735 RMD160 a32c4a674c3653e1679b0131bfe3ae172291986c SHA1 e8582bb6f7f852a6e7f9a108144a8d11e44d0efb SHA256 ea727f0bdf0aade86ee4c03a0c82af4f21b8aeb251c4840d0db59b24a60ad245
+EBUILD virtuoso-5.0.11.ebuild 2713 RMD160 c9b32ec521f21accf791d9a96663188c193f05b4 SHA1 4af1212f8ec6a38bda871cc42b0da9d431a879b9 SHA256 296dd09d1399cff1e04b8c0dd9685ede77180ee7b1f4b82bda36c876c5228077
 MISC metadata.xml 1121 RMD160 dd8d25abb0bf108b92e4a08524daeb2d2c1d70df SHA1 218dc3130a2ace228212454302ea1f6006e18d88 SHA256 7a0e6dbfa485159965fa3827fa24aeb11266310600db6563da37bb1811875ddd
diff --git a/dev-db/virtuoso/virtuoso-5.0.11.ebuild b/dev-db/virtuoso/virtuoso-5.0.11.ebuild
index c19478a46b..63d8e6cf34 100644
--- a/dev-db/virtuoso/virtuoso-5.0.11.ebuild
+++ b/dev-db/virtuoso/virtuoso-5.0.11.ebuild
@@ -71,7 +71,6 @@ src_configure() {
 		--with-layout=gentoo \
 		--localstatedir=/var \
 		--program-transform-name="s/isql/isql-v/" \
-		$(use_with debug) \
 		$(use_enable imagemagick) \
 		$(use_with iodbc) \
 		$(use_enable kerberos krb) \