Source Mage code commit list

[Arjan Bouter <scm AT sourcemage.org>]

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

 gnome2-apps/gnumeric/DEPENDS       |    7 +++++++
 gnome2-apps/gnumeric/HISTORY       |    4 ++++
 gnome2-libs/libgsf/HISTORY         |    3 +++
 gnome2-libs/libgsf/PRE_SUB_DEPENDS |    5 +++++
 gnome2-libs/libgsf/SUB_DEPENDS     |    6 ++++++
 5 files changed, 25 insertions(+)

New commits:
commit c2a12c5a09e2dcb68d0e6f0d5eeae5d5d0bc9b26
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    gnumeric: added cairo SVG subdepends

commit 45c350ecc9c4aef00229a7444831748aca66bdf5
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    libgsf: added GNOME subdepends

diff --git a/gnome2-apps/gnumeric/DEPENDS b/gnome2-apps/gnumeric/DEPENDS
index 2bcc377..c9a9178 100755
--- a/gnome2-apps/gnumeric/DEPENDS
+++ b/gnome2-apps/gnumeric/DEPENDS
@@ -8,6 +8,9 @@ else
 fi &&
 depends  libxml2      &&
 
+depends  cairo &&
+depends  -sub SVG cairo &&
+
 optional_depends  gtk+2                                \
                   "--with-gtk"                         \
                   "--without-gtk"                      \
@@ -18,6 +21,10 @@ optional_depends  libgnomeui                           \
                   "--without-gnome"                    \
                   "Build GNOME extensions?"            &&
 
+if ( is_depends_enabled ${SPELL} libgnomeui ); then
+  depends  -sub GNOME libgsf
+fi &&
+
 optional_depends  perl                                 \
                   "--with-perl"                        \
                   "--without-perl"                     \
diff --git a/gnome2-apps/gnumeric/HISTORY b/gnome2-apps/gnumeric/HISTORY
index caa73d8..d01ef80 100644
--- a/gnome2-apps/gnumeric/HISTORY
+++ b/gnome2-apps/gnumeric/HISTORY
@@ -1,3 +1,7 @@
+2009-08-03 Arjan Bouter <abouter AT soucemage.org>
+       * DEPENDS: depends on cairo with SVG and libgsf with
+         GNOME when libgnomeui is enabled
+
 2009-07-15 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: SOURCE has to be defined before it's used
 
diff --git a/gnome2-libs/libgsf/HISTORY b/gnome2-libs/libgsf/HISTORY
index 8e64b6c..da4b5fe 100644
--- a/gnome2-libs/libgsf/HISTORY
+++ b/gnome2-libs/libgsf/HISTORY
@@ -1,3 +1,6 @@
+2009-08-03 Arjan Bouter <abouter AT sourcemage.org>
+       * SUB_DEPENDS, PRE_SUB_DEPENDS: added subdep GNOME for gnumeric
+
 2009-06-20 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.14.15
 
diff --git a/gnome2-libs/libgsf/PRE_SUB_DEPENDS 
b/gnome2-libs/libgsf/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..cb85268
--- /dev/null
+++ b/gnome2-libs/libgsf/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ GNOME) is_depends_enabled $SPELL gnome-vfs2;;
+     *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+        return 1;;
+esac
diff --git a/gnome2-libs/libgsf/SUB_DEPENDS b/gnome2-libs/libgsf/SUB_DEPENDS
new file mode 100755
index 0000000..0d5d0a9
--- /dev/null
+++ b/gnome2-libs/libgsf/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+GNOME) message "Libgsf with GNOME support requested, forcing gnome-vfs2 
dependency" &&
+       depends poppler "--with-gnome-vfs";;
+    *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+       return 1;;
+esac