Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 devel/binutils/HISTORY                     |    3 +++
 devel/binutils/PRE_SUB_DEPENDS             |    2 +-
 devel/binutils/REPAIR^none^PRE_SUB_DEPENDS |    2 +-
 devel/binutils/SUB_DEPENDS                 |    1 -
 x11-libs/cairo/DEPENDS                     |    5 +----
 x11-libs/cairo/HISTORY                     |    3 +++
 6 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 17c5a2aebaa504f5309afd6df70a5f0accf9d7cd
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    devel/binutils: fixed LIBERTY sub_dependency checks

commit 9474fe743df4a064a3735e1998c20d39a9eddd78
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    x11-libs/cairo: simplified binutils dependency

diff --git a/devel/binutils/HISTORY b/devel/binutils/HISTORY
index 5da1b72..49250cd 100644
--- a/devel/binutils/HISTORY
+++ b/devel/binutils/HISTORY
@@ -1,3 +1,6 @@
+2016-07-19 Pavel Vinogradov <public AT sourcemage.org>
+       * *SUB_DEPENDS: fixed LIBERTY checks
+
 2016-07-09 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.26.1
 
diff --git a/devel/binutils/PRE_SUB_DEPENDS b/devel/binutils/PRE_SUB_DEPENDS
index 9e1d25d..a892d5f 100755
--- a/devel/binutils/PRE_SUB_DEPENDS
+++ b/devel/binutils/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
 case $THIS_SUB_DEPENDS in
-LIBERTY) [[ BINUTILS_LIBIBERTY = y ]] ;;
+LIBERTY) [[ "${BINUTILS_LIBIBERTY}" == "y" ]] ;;
       *)
   message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
   return 1
diff --git a/devel/binutils/REPAIR^none^PRE_SUB_DEPENDS 
b/devel/binutils/REPAIR^none^PRE_SUB_DEPENDS
index 9e1d25d..a892d5f 100755
--- a/devel/binutils/REPAIR^none^PRE_SUB_DEPENDS
+++ b/devel/binutils/REPAIR^none^PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
 case $THIS_SUB_DEPENDS in
-LIBERTY) [[ BINUTILS_LIBIBERTY = y ]] ;;
+LIBERTY) [[ "${BINUTILS_LIBIBERTY}" == "y" ]] ;;
       *)
   message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
   return 1
diff --git a/devel/binutils/SUB_DEPENDS b/devel/binutils/SUB_DEPENDS
index 72577bc..0ab2cb4 100755
--- a/devel/binutils/SUB_DEPENDS
+++ b/devel/binutils/SUB_DEPENDS
@@ -1,4 +1,3 @@
-persistent_add BINUTILS_LIBIBERTY &&
 case $THIS_SUB_DEPENDS in
 LIBERTY)
   message "${MESSAGE_COLOR}Install of libiberty enforced by 
sub-dependency.$DEFAULT_COLOR"
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index 62600ec..d8bb117 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -15,13 +15,10 @@ optional_depends zlib \
                  "for XML surface backend" &&
 
 # uses libbfd-*.so
-optional_depends binutils \
+optional_depends -sub LIBERTY binutils \
                  "--enable-symbol-lookup" \
                  "--disable-symbol-lookup" \
                  "for symbol-lookup feature" &&
-if is_depends_enabled $SPELL binutils; then
-  depends -sub LIBERTY binutils
-fi &&
 
 optional_depends libxcb \
                  "--enable-xcb" \
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 6527a10..ffc9892 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,6 @@
+2016-07-19 Pavel Vinogradov <public AT sourcemage.org>
+       * DEPENDS: simplified binutils dependency
+qgn
 2016-03-17 Thomas Orgis <sobukus AT sourcemage.org>
        * DEPENDS: depends -sub LIBERTY binutils