Merge commit 'origin/stable-rc-0.26-sugar' into stable-0.26

12 files changed, 39 insertions, 4 deletions

diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index a11b82ce6d..4fa02a1f2a 100755
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2008-10-14 Vlad Glagolev <stealth@sourcemage.org>
+	* SUB_DEPENDS: fixed regression bug
+
 2008-10-04 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: PATCHLEVEL=1, fixed a number of bugs caused by parsing order
 	* rules.d/70-cdrom_perms.rules: renamed to 76-*
diff --git a/disk/udev/SUB_DEPENDS b/disk/udev/SUB_DEPENDS
new file mode 100755
index 0000000000..9dcaf3256c
--- /dev/null
+++ b/disk/udev/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case "$THIS_SUB_DEPENDS" in
+  VOLUME_ID) true;;
+          *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
+             return 1;;
+esac
diff --git a/graphics/gimp/DETAILS b/graphics/gimp/DETAILS
index 5e5a5cb28e..b0ccdab27c 100755
--- a/graphics/gimp/DETAILS
+++ b/graphics/gimp/DETAILS
@@ -2,12 +2,12 @@
 if [ "$GIMP_DEVEL" == "y" ]; then
          VERSION=2.6.0
           SOURCE=$SPELL-$VERSION.tar.bz2
-     SOURCE_HASH=sha512:d751cb5aea72784591b74c63f2aea8cf44e9ae6fe7bb25992fabed9a73808ec6756db1ab8c2046901ec9c0386fdc535fc1e706c581440cb543885175053b9a65
+     SOURCE_HASH=sha512:8b5f0f828029591ae0e1b7fd526c4ed2531af74239f773d3f47ca7d1245c6d71f3d97cb528765137938dfc902c457201308afac3d68113a59ad4f14a9a105c60
    SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
 else
          VERSION=2.6.0
           SOURCE=$SPELL-$VERSION.tar.bz2
-     SOURCE_HASH=sha512:d751cb5aea72784591b74c63f2aea8cf44e9ae6fe7bb25992fabed9a73808ec6756db1ab8c2046901ec9c0386fdc535fc1e706c581440cb543885175053b9a65
+     SOURCE_HASH=sha512:8b5f0f828029591ae0e1b7fd526c4ed2531af74239f773d3f47ca7d1245c6d71f3d97cb528765137938dfc902c457201308afac3d68113a59ad4f14a9a105c60
    SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
 #     SOURCE_GPG=gurus.gpg:$SOURCE.sig
 fi
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index a1e60cf855..e8eb503986 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,4 +1,7 @@
 2008-10-01 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: updated SOURCE_HASH, a new tarball has been uploaded
+
+2008-10-01 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 2.6.0
 	* DEPENDS: stable version now also depends on gegl and iso-codes
 
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index 2821ad70c4..e091ce679d 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -15,6 +15,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
       LICENSE[0]=MIT
          ENTERED=20040617
+      PATCHLEVEL=1
         KEYWORDS="x11 libs"
            SHORT="multi-platform 2D graphics library"
 cat << EOF
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index bd45259887..a39f36b60a 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,10 @@
+2008-10-13 Vlad Glagolev <stealth@sourcemage.org>
+	* [PRE_]SUB_DEPENDS: added ps subdep for new gtk+2
+	* REPAIR^all^PRE_SUB_DEPENDS: added, for repairing the previous subdeps
+
+2008-10-06 Arjan Bouter <abouter@sourcemage.org>
+	* SUB_DEPENDS, PRE_SUB_DEPENDS: added XCB
+
 2008-09-26 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 1.8.0
 	* DEPENDS: added ps option; force_depends pixman on old installations
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index c8fd97eb58..4aba94b65c 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -1,5 +1,7 @@
 case $THIS_SUB_DEPENDS in
   PDF) is_depends_enabled $SPELL poppler;;
+  XCB) is_depends_enabled $SPELL xcb-util;;
+   PS) is_depends_enabled $SPELL ghostscript;;
     *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
        return 1;;
 esac
diff --git a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..4aba94b65c
--- /dev/null
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+  PDF) is_depends_enabled $SPELL poppler;;
+  XCB) is_depends_enabled $SPELL xcb-util;;
+   PS) is_depends_enabled $SPELL ghostscript;;
+    *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+       return 1;;
+esac
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 85386189ea..10e6792873 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -1,6 +1,10 @@
 case $THIS_SUB_DEPENDS in
   PDF) message "Cairo with PDF support requested, forcing poppler dependency" &&
        depends poppler "--enable-pdf";;
+  XCB) message "Cairo with XCB support requested, forcing xcb-util dependency" &&
+       depends xcb-util "--enable-xcb";;
+   PS) message "Cairo with PS support requested, forcing ghostscript dependency" &&
+       depends ghostscript "--enable-ps";;
     *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
        return 1;;
 esac
diff --git a/x11-toolkits/gtk+2/CONFLICTS b/x11-toolkits/gtk+2/CONFLICTS
index 6b3a6c8a91..50f6d21157 100755
--- a/x11-toolkits/gtk+2/CONFLICTS
+++ b/x11-toolkits/gtk+2/CONFLICTS
@@ -1 +1 @@
-conflicts gail y
\ No newline at end of file
+conflicts gail y
diff --git a/x11-toolkits/gtk+2/DEPENDS b/x11-toolkits/gtk+2/DEPENDS
index 1f99077461..5965ac2e8e 100755
--- a/x11-toolkits/gtk+2/DEPENDS
+++ b/x11-toolkits/gtk+2/DEPENDS
@@ -1,7 +1,7 @@
 depends glib2 &&
 depends atk &&
 depends pango &&
-depends -sub PDF cairo &&
+depends -sub "PDF PS" cairo &&
 depends xorg-libs &&
 depends libxrender &&
 
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index cd8b3d7901..e3453741cc 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,6 @@
+2008-10-13 Vlad Glagolev <stealth@sourcemage.org>
+	* DEPENDS: added PS subdep for cairo (required)
+
 2008-09-26 Vlad Glagolev <stealth@sourcemage.org>
 	* DEPENDS: fixed deps
 	* DETAILS: fixed descs