sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by George Sherwood (d182859e4402908aee11e37677ab57f0019f2fb1)

From: George Sherwood <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (d182859e4402908aee11e37677ab57f0019f2fb1)
Date: Sun, 2 Jan 2011 14:05:33 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

x11-libs/cairo/HISTORY | 1 +
x11-libs/cairo/PRE_SUB_DEPENDS | 2 +-
x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit d182859e4402908aee11e37677ab57f0019f2fb1
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

cairo: Fix PRE_SUB_DEPENDS to actually evaluate false when devel is not
used.

diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 9259478..a123e66 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,4 +1,5 @@
2011-01-02 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_SUB_DEPENDS: Fix to work correctly
* REPAIR^all^PRE_SUB_DEPENDS: Updated to be current with
PRE_SUB_DEPENDS.

diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index 75946d1..b0ffc2e 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- CAIRO_DEVEL) if [[ "$CAIRO_DEVEL" == "y" ]]; then return 0; fi;;
+ CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
XCB) is_depends_enabled $SPELL xcb-util;;
PNG) is_depends_enabled $SPELL libpng;;
diff --git a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
index 75946d1..b0ffc2e 100755
--- a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- CAIRO_DEVEL) if [[ "$CAIRO_DEVEL" == "y" ]]; then return 0; fi;;
+ CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
XCB) is_depends_enabled $SPELL xcb-util;;
PNG) is_depends_enabled $SPELL libpng;;

[SM-Commit] GIT changes to master grimoire by George Sherwood (d182859e4402908aee11e37677ab57f0019f2fb1), George Sherwood, 01/02/2011