[Lunar-commits] <moonbase> openoffice-src: fixing some java pathing issues and removing

[Dennis 'stumbles' Veatch]

commit b490bad52f33295b6c463ad75f8a82fad85213ca
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Wed Apr 1 20:58:29 2009 -0400

    openoffice-src: fixing some java pathing issues and removing
    
    a duplicate optional_depends.
---
 x11-apps/openoffice-src/BUILD        |   10 +++++-----
 x11-apps/openoffice-src/BUILD.x86_64 |   10 +++++-----
 x11-apps/openoffice-src/DEPENDS      |    7 +------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/x11-apps/openoffice-src/BUILD b/x11-apps/openoffice-src/BUILD
index 2d6e87c..b2175ee 100644
--- a/x11-apps/openoffice-src/BUILD
+++ b/x11-apps/openoffice-src/BUILD
@@ -48,11 +48,11 @@
   fi &&
 
   if module_installed sun-jdk ; then
-    JAVA_VERSION="`installed_version sun-jdk`";
-    OPTS="$OPTS --with-jdk-home=/usr/lib/jdk${JAVA_VERSION}";
-   elif module_installed j2sdk ; then
-    JAVA_VERSION="`installed_version j2sdk`";
-    OPTS="$OPTS --with-jdk-home=/usr/lib/j2sdk${JAVA_VERSION}";
+    OPTS="$OPTS --with-jdk-home=$JAVA_HOME";
+   else
+    if  module_installed j2sdk ; then
+    OPTS="$OPTS --with-jdk-home=$JAVA_HOME";
+    fi
   fi &&
 
   # Apply mandatory and optional patches
diff --git a/x11-apps/openoffice-src/BUILD.x86_64 b/x11-apps/openoffice-src/BUILD.x86_64
index 08ccd97..b3e8643 100644
--- a/x11-apps/openoffice-src/BUILD.x86_64
+++ b/x11-apps/openoffice-src/BUILD.x86_64
@@ -48,11 +48,11 @@
   fi &&
 
   if module_installed sun-jdk ; then
-    JAVA_VERSION="`installed_version sun-jdk`";
-    OPTS="$OPTS --with-jdk-home=/usr/lib/jdk${JAVA_VERSION}";
-   elif module_installed j2sdk ; then
-    JAVA_VERSION="`installed_version j2sdk`";
-    OPTS="$OPTS --with-jdk-home=/usr/lib/j2sdk${JAVA_VERSION}";
+    OPTS="$OPTS --with-jdk-home=$JAVA_HOME";
+   else
+    if  module_installed j2sdk ; then
+    OPTS="$OPTS --with-jdk-home=$JAVA_HOME";
+    fi
   fi &&
 
   # Apply mandatory and optional patches
diff --git a/x11-apps/openoffice-src/DEPENDS b/x11-apps/openoffice-src/DEPENDS
index 96b48b9..9a7ad3b 100644
--- a/x11-apps/openoffice-src/DEPENDS
+++ b/x11-apps/openoffice-src/DEPENDS
@@ -21,7 +21,7 @@ optional_depends "libxslt"                  \
                  "--without-system-libxslt" \
                  "For xslt support"          
 
-optional_depends "sun-jdk"        \
+optional_depends "%JAVA_SDK"      \
                  "--with-java"    \
                  "--without-java" \
                  "For java components, applets, XML filters support"
@@ -91,11 +91,6 @@ optional_depends "Linux-PAM"            \
                  "--disable-pam"        \
                  "for Linux-PAM support"
 
-optional_depends "boost"                             \
-                 "--with-system-boost"               \
-                 "--without-system-boost"            \
-                 "to use the already installed boost"
-
 optional_depends "vigra"                         \
                  "--with-system-vigra"           \
                  "--without-system-vigra"        \