Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master z-rejected grimoire by Eric Sandall 
<sandalle AT sourcemage.org>:

 z-java/jdk6-bin/DEPENDS |   16 +++++-----------
 z-java/jdk6-bin/HISTORY |    2 ++
 2 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 6acca6a4a209df034d16130b9e64ab8ef041ce41
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    jdk6-bin: Remove xorg-modular check and add as dependencies
    Make X libraries non-optional to avoid `cleanse` failure

diff --git a/z-java/jdk6-bin/DEPENDS b/z-java/jdk6-bin/DEPENDS
index 18c9391..7d51724 100755
--- a/z-java/jdk6-bin/DEPENDS
+++ b/z-java/jdk6-bin/DEPENDS
@@ -1,13 +1,7 @@
-depends  unixodbc  &&
 depends  alsa-lib  &&
 depends  gcc       &&
-
-optional_depends  X11-LIBS "" "" "To run gui applications" &&
-
-source  $GRIMOIRE/FUNCTIONS  &&
-
-if  check_if_xorg_modular_libs
-then
-  depends  libxi  &&
-  depends  libxtst
-fi
+depends  libx11    &&
+depends  libxext   &&
+depends  libxt     &&
+depends  libxtst   &&
+depends  unixodbc
diff --git a/z-java/jdk6-bin/HISTORY b/z-java/jdk6-bin/HISTORY
index 5722fdb..7229d71 100644
--- a/z-java/jdk6-bin/HISTORY
+++ b/z-java/jdk6-bin/HISTORY
@@ -1,6 +1,8 @@
 2009-04-19 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Removed gcc33, libstdc++.so.5 is no longer needed
          Bug #15164
+         Remove xorg-modular check and add as dependencies
+         Make X libraries non-optional to avoid `cleanse` failure
 
 2009-02-17 Eric Sandall <sandalle AT sourcemage.org>
        * INSTALL: Install plugins to xulrunner instead of firefox