Source Mage code commit list

[Bor Kraljič <scm AT sourcemage.org>]

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

 editors/openoffice/DEPENDS |    8 +++-----
 editors/openoffice/HISTORY |    2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit dfa969b3ef93e780779142bff8dcad59285926cf
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

    openoffice: the correct way "depends ant"

commit d4f7c8fa9327fb8fe48af9362b621dd73c88f38f
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

    Revert "openoffice: depends ant"
    
    This reverts commit bf4eb7b867d0cd58a2bade00066f9123f07bd031.
    Guess I missed that already exists.

diff --git a/editors/openoffice/DEPENDS b/editors/openoffice/DEPENDS
index b684b0f..753478a 100755
--- a/editors/openoffice/DEPENDS
+++ b/editors/openoffice/DEPENDS
@@ -24,8 +24,6 @@ depends  hyphen '--with-system-altlinuxhyph' &&
 depends  mythes '--with-system-mythes' &&
 # just weird, it needs to be installed but OOo won't build when you specify 
--with-stlport
 depends  stlport  "--without-stlport"  &&
-# needs ant and we install ant in opt so we need to tell where is installed
-depends ant '--with-ant-home=/opt/ant/' &&
 depends  vigra  '--with-system-vigra' &&
 depends  sane-backends '--with-system-sane-header'  &&
 depends  lp_solve '--with-system-lpsolve' &&
@@ -41,9 +39,9 @@ optional_depends JAVA \
                  '--with-java --with-system-jars' \
                  '--without-java' \
                  'enable JAVA support?' &&
-if (is_depends_enabled ${SPELL} JAVA); then
-   depends  ant "--with-ant-home=${INSTALL_ROOT}/usr"  &&
-   depends  lucene '--with-system-lucene' &&
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL JAVA); then
+   depends  ant "--with-ant-home=${INSTALL_ROOT}/opt/ant/"  &&
+#   depends lucene '--with-system-lucene' &&
    optional_depends gcj \
                     '--enable-gcjaot' \
                     '--disable-gcjaot' \
diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index 196a68c..5cc28bc 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,5 +1,5 @@
 2010-04-04 Bor Kraljič <pyrobor AT ver.si>
-       * DEPENDS: added depends ant
+       * DEPENDS: corrected to work properly
        * DETAILS: removed ARCHIVE=off and added TMPFS=off
 
 2010-03-31 Arjan Bouter <abouter AT sourcemage.org>