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/freetype2/DEPENDS |   17 +++++++++++++----
 graphics-libs/freetype2/HISTORY |    4 ++++
 graphics-libs/harfbuzz/DEPENDS  |   28 ++++++++++++++++++++++++----
 graphics-libs/harfbuzz/HISTORY  |    5 +++++
 4 files changed, 46 insertions(+), 8 deletions(-)

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

    harfbuzz: fixed dependencies

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

    freetype2: fixed dependencies

diff --git a/graphics-libs/freetype2/DEPENDS b/graphics-libs/freetype2/DEPENDS
index 7a36fa6..cc17202 100755
--- a/graphics-libs/freetype2/DEPENDS
+++ b/graphics-libs/freetype2/DEPENDS
@@ -1,13 +1,22 @@
-depends  glib2   &&
-depends  libpng  &&
-depends  pcre    &&
+optional_depends libpng \
+                 "--with-png=yes" \
+                 "--with-png=no" \
+                 "to support png compressed OpenType embedded bitmaps" &&
 
 # freetype2 with harfbuzz requires harfbuzz built against freetype2 first
 if spell_ok ${SPELL}; then
   optional_depends  -sub 'FT'  'harfbuzz'                        \
                     '--with-harfbuzz=yes'                        \
                     '--with-harfbuzz=no'                         \
-                    'to improve auto-hinting of OpenType fonts'
+                    'to improve auto-hinting of OpenType fonts'  &&
+
+  # LDFLAGS are taken from /usr/lib/libharfbuzz.la
+  if is_depends_enabled $SPELL harfbuzz; then
+    if is_depends_enabled harfbuzz glib2; then
+      depends glib2 &&
+      depends pcre
+    fi
+  fi
 else
   message "${PROBLEM_COLOR}harfbuzz optional dependency disabled until 
${DEFAULT_COLOR}${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}${PROBLEM_COLOR} is 
cast.${DEFAULT_COLOR}"
 fi
diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY
index 788ddd9..6d7d8dd 100644
--- a/graphics-libs/freetype2/HISTORY
+++ b/graphics-libs/freetype2/HISTORY
@@ -1,3 +1,7 @@
+2015-05-31 Vlad Glagolev <stealth AT sourcemage.org>
+       * DEPENDS: made libpng optional; glib2 and pcre are required only if
+         it was built against harfbuzz with glib support
+
 2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: remove SOURCEFORGE_URL usage (automated)
 
diff --git a/graphics-libs/harfbuzz/DEPENDS b/graphics-libs/harfbuzz/DEPENDS
index 219c4e0..733efae 100755
--- a/graphics-libs/harfbuzz/DEPENDS
+++ b/graphics-libs/harfbuzz/DEPENDS
@@ -1,12 +1,32 @@
-depends glib2 &&
-depends libpng &&
-depends pcre &&
 depends ragel &&
 
+optional_depends glib2 \
+                 "--with-glib=yes --with-gobject=yes" \
+                 "--with-glib=no --with-gobject=no" \
+                 "to use glib" &&
+
+persistent_add HARFBUZZ_OPTS &&
+
+if is_depends_enabled $SPELL glib2; then
+  depends pcre &&
+
+  optional_depends gobject-introspection \
+                   "--enable-introspection=yes" \
+                   "--enable-introspection=no" \
+                   "to enable introspection for this build"
+else
+  list_add "HARFBUZZ_OPTS" "--enable-introspection=no"
+fi &&
+
 if spell_ok cairo; then
   optional_depends cairo "--with-cairo=yes" "--with-cairo=no" \
-                 "Enable tools used for command-line utilities?"
+                 "Enable tools used for command-line utilities?" &&
+
+  if is_depends_enabled $SPELL cairo; then
+    depends libpng
+  fi
 else
+  list_add "HARFBUZZ_OPTS" "--with-cairo=no" &&
   message "${PROBLEM_COLOR}cyclic ${SPELL_COLOR}cairo${PROBLEM_COLOR} 
optional dependency disabled until ${SPELL_COLOR}cairo${PROBLEM_COLOR} is 
cast${DEFAULT_COLOR}"
 fi &&
 
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index d27a7ce..1a41a2c 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,8 @@
+2015-05-31 Vlad Glagolev <stealth AT sourcemage.org>
+       * DEPENDS: libpng is required only if it was built with cairo support;
+         glib2 is optional; added missing gobject-introspection dependency;
+         pcre is required only if it was built with glib2 support
+
 2015-04-09 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.9.40