Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

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

 graphics-libs/poppler/DEPENDS |   11 ++++++++++-
 graphics-libs/poppler/HISTORY |    4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

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

    poppler: fixed dependencies

commit 1b075a515deb2a83e042fd8742cda97c1d37733d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    Revert "poppler: gtk+2 -> gtk+3"
    
    This reverts commit 60d1defbb16c0bbcf9d5ef97d615c8d12b5c57b7.

diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index 0248127..de31f0c 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -36,11 +36,20 @@ optional_depends zlib \
                  "--disable-zlib" \
                  "for compressed file support" &&
 
-optional_depends gtk+3 \
+optional_depends glib2 \
                  "--enable-poppler-glib" \
                  "--disable-poppler-glib" \
                  "for glib wrapper" &&
 
+if is_depends_enabled $SPELL glib2; then
+  optional_depends gtk+3 \
+                   "--enable-gtk-test" \
+                   "--disable-gtk-test" \
+                   "to compile GTK+ test program"
+else
+  list_add "POPPLER_OPTS" "--disable-gtk-test"
+fi &&
+
 optional_depends gobject-introspection \
                  "--enable-introspection" \
                  "--disable-introspection" \
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 1776923..63a5e1c 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,5 +1,5 @@
-2014-10-15 Thomas Orgis <sobukus AT sourcemage.org>
-       * DEPENDS: glib stuff is now for gtk+3
+2015-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+       * DEPENDS: corrected glib2/gtk+3 dependencies
 
 2014-10-03 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.26.5