Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 x11-libs/cairo/DEPENDS         |    4 +++-
 x11-libs/cairo/HISTORY         |    9 +++++----
 x11-libs/cairo/PRE_SUB_DEPENDS |    5 +++++
 x11-libs/cairo/SUB_DEPENDS     |    6 ++++++
 4 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit b7e9c329582281218cab24ee9f701862bc9d4b01
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    cairo: created pdf subdep for new gtk+2

diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index 44cf624..3cb788b 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -2,7 +2,9 @@ depends libpng &&
 depends fontconfig &&
 depends pixman &&
 
-force_depends pixman &&
+if spell_ok pixman && [[ $(installed_version pixman) < 0.12 ]]; then
+  force_depends pixman
+fi &&
 
 optional_depends libx11 \
                  "--enable-xlib" \
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 594b40e..bd45259 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,9 +1,10 @@
-2008-09-24 Andrew Stitt <astitt AT sourcemage.org>
-       * DEPENDS: add missing dependency
-
 2008-09-26 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.8.0
-       * DEPENDS: added ps option; force_depends pixman
+       * DEPENDS: added ps option; force_depends pixman on old installations
+       * [PRE_]SUB_DEPENDS: added, pdf subdep for new gtk+2
+
+2008-09-24 Andrew Stitt <astitt AT sourcemage.org>
+       * DEPENDS: add missing dependency
 
 2008-09-23 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated devel to 1.7.6; force devel version (until 1.8.0);
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..c8fd97e
--- /dev/null
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+  PDF) is_depends_enabled $SPELL poppler;;
+    *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+       return 1;;
+esac
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
new file mode 100755
index 0000000..8538618
--- /dev/null
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+  PDF) message "Cairo with PDF support requested, forcing poppler 
dependency" &&
+       depends poppler "--enable-pdf";;
+    *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+       return 1;;
+esac