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>:

 graphics-libs/harfbuzz/DEPENDS |   21 +++++++++++++--------
 graphics-libs/harfbuzz/HISTORY |    1 +
 2 files changed, 14 insertions(+), 8 deletions(-)

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

    harfbuzz: avoid circular dependency through fontconfig

diff --git a/graphics-libs/harfbuzz/DEPENDS b/graphics-libs/harfbuzz/DEPENDS
index cc89cc3..a642daa 100755
--- a/graphics-libs/harfbuzz/DEPENDS
+++ b/graphics-libs/harfbuzz/DEPENDS
@@ -30,17 +30,22 @@ else
   message "${PROBLEM_COLOR}cyclic ${SPELL_COLOR}cairo${PROBLEM_COLOR} 
optional dependency disabled until ${SPELL_COLOR}cairo${PROBLEM_COLOR} is 
cast${DEFAULT_COLOR}"
 fi &&
 
-optional_depends fontconfig "--with-fontconfig=yes" "--with-fontconfig=no" \
-                 "use fontconfig for command-line utilities" &&
+if spell_ok fontconfig; then
+  optional_depends fontconfig "--with-fontconfig=yes" "--with-fontconfig=no" 
\
+                   "use fontconfig for command-line utilities"
+else
+  list_add HARFBUZZ_OPTS "--with-fontconfig=no" &&
+  message "${PROBLEM_COLOR}cyclic ${SPELL_COLOR}fontconfig${PROBLEM_COLOR} 
optional dependency disabled until ${SPELL_COLOR}fontconfig${PROBLEM_COLOR} 
is cast${DEFAULT_COLOR}"
+fi &&
 
-optional_depends icu "--with-icu=yes" "--with-icu=no"                \
-                 "Enable icu use?"        &&
+optional_depends icu "--with-icu=yes" "--with-icu=no" \
+                 "Enable icu use?" &&
 
-optional_depends freetype2 "--with-freetype=yes" "--with-freetype=no"        
  \
-                 "Enable freetype2 use?"  &&
+optional_depends freetype2 "--with-freetype=yes" "--with-freetype=no" \
+                 "Enable freetype2 use?" &&
 
-optional_depends graphite2 "--with-graphite2=yes" "--with-graphite2=no"      
    \
-                 "Enable graphite2 use?"  &&
+optional_depends graphite2 "--with-graphite2=yes" "--with-graphite2=no" \
+                 "Enable graphite2 use?" &&
 
 optional_depends gtk-doc "--enable-gtk-doc" "--disable-gtk-doc" \
                  "Enable gtk-doc to build documentation?"
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index 3e9db54..2422dde 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,6 +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
+       * DEPENDS: fontconfig creates a circular dependency
 
 2016-02-24 Remko van der Vossen <wich AT sourcemage.org>
        * DEPENDS: fontconfig is an optional dependency