Source Mage code commit list

[Remko van der Vossen <scm AT sourcemage.org>]

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

 gnome2-libs/pango/DEPENDS                         |    2 +-
 gnome2-libs/pango/HISTORY                         |    3 +++
 graphics-libs/harfbuzz/HISTORY                    |    4 ++++
 graphics-libs/harfbuzz/PRE_SUB_DEPENDS            |    5 +++--
 graphics-libs/harfbuzz/REPAIR^all^PRE_SUB_DEPENDS |    8 ++++++++
 graphics-libs/harfbuzz/SUB_DEPENDS                |   12 +++++++-----
 6 files changed, 26 insertions(+), 8 deletions(-)

New commits:
commit 43c41d63de55d89411a5e5d1a7f9e9c6d1e6f6f0
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

    pango: needs harfbuzz with glib2

commit 31dcef130adf8dbdcb36446a6cdcbbd188b8c00b
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

    harfbuzz: added GLIB2 subdependency

diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS
index 602c4d2..3fea2f6 100755
--- a/gnome2-libs/pango/DEPENDS
+++ b/gnome2-libs/pango/DEPENDS
@@ -6,7 +6,7 @@ depends expat       &&
 depends fontconfig  &&
 depends freetype2   &&
 depends glib2       &&
-depends harfbuzz    &&
+depends -sub GLIB2 harfbuzz &&
 depends libpng      &&
 depends mesalib     &&
 depends pcre        &&
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 5d74bba..7400d19 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,6 @@
+2016-02-25 Remko van der Vossen <wich AT sourcemage.org>
+       * DEPENDS: needs harbuzz with glib2
+
 2015-11-14 Eric Sandall <sandalle AT sourcemage.org>
        * CONFIGURE: 1.38.x does not support configuring dynamic modules
        * FINAL: 1.38.x does not have pango-querymodules binary
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index 0690778..3e9db54 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,7 @@
+2016-02-25 Remko van der Vossen <wich AT sourcemage.org>
+       * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS:
+         added GLIB2 subdependency
+
 2016-02-24 Remko van der Vossen <wich AT sourcemage.org>
        * DEPENDS: fontconfig is an optional dependency
 
diff --git a/graphics-libs/harfbuzz/PRE_SUB_DEPENDS 
b/graphics-libs/harfbuzz/PRE_SUB_DEPENDS
index 6fc414a..d2a010c 100755
--- a/graphics-libs/harfbuzz/PRE_SUB_DEPENDS
+++ b/graphics-libs/harfbuzz/PRE_SUB_DEPENDS
@@ -1,7 +1,8 @@
 case $THIS_SUB_DEPENDS in
+          GLIB2) is_depends_enabled $SPELL glib2     && return 0 ;;
       GRAPHITE2) is_depends_enabled $SPELL graphite2 && return 0 ;;
              FT) is_depends_enabled $SPELL freetype2 && return 0 ;;
             ICU) is_depends_enabled $SPELL icu       && return 0 ;;
-        *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
-   return 1;;
+              *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+                 return 1;;
 esac
diff --git a/graphics-libs/harfbuzz/REPAIR^all^PRE_SUB_DEPENDS 
b/graphics-libs/harfbuzz/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..d2a010c
--- /dev/null
+++ b/graphics-libs/harfbuzz/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+          GLIB2) is_depends_enabled $SPELL glib2     && return 0 ;;
+      GRAPHITE2) is_depends_enabled $SPELL graphite2 && return 0 ;;
+             FT) is_depends_enabled $SPELL freetype2 && return 0 ;;
+            ICU) is_depends_enabled $SPELL icu       && return 0 ;;
+              *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+                 return 1;;
+esac
diff --git a/graphics-libs/harfbuzz/SUB_DEPENDS 
b/graphics-libs/harfbuzz/SUB_DEPENDS
index c8f6a96..4ef60f7 100755
--- a/graphics-libs/harfbuzz/SUB_DEPENDS
+++ b/graphics-libs/harfbuzz/SUB_DEPENDS
@@ -1,7 +1,9 @@
 case $THIS_SUB_DEPENDS in
-      GRAPHITE2) depends graphite2 "--with-graphite2"      ;;
-             FT) depends freetype2 '--with-freetype=yes'   ;;
-            ICU) depends icu       "--with-icu"            ;;
-        *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
-   return 1;;
+          GLIB2) depends glib2 "--with-glib=yes --with-gobject=yes" &&
+                 depends pcre ;;
+      GRAPHITE2) depends graphite2 "--with-graphite2" ;;
+             FT) depends freetype2 "--with-freetype=yes" ;;
+            ICU) depends icu "--with-icu" ;;
+              *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+                 return 1;;
 esac