x11-libs/cairo: added scm branch

7 files changed, 35 insertions, 14 deletions

diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index fa0d086e75..c44f1da371 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -1,17 +1,28 @@
+. ${GRIMOIRE}/FUNCTIONS &&
            SPELL=cairo
-if [[ $CAIRO_DEVEL == y ]]; then
+case "$CAIRO_BRANCH" in
+   scm)
+         VERSION=$(get_scm_version)
+          SOURCE=$SPELL-git.tar.bz2
+   SOURCE_URL[0]=git://anongit.freedesktop.org/git/cairo:cairo-git
+   SOURCE_IGNORE=volatile
+  FORCE_DOWNLOAD=1
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" ;;
+
+ devel)
          VERSION=1.12.16
      SOURCE_HASH=sha512:35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f  
           SOURCE=$SPELL-$VERSION.tar.xz
    SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
-#     SOURCE_HASH=sha512:35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f  
-else
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" ;;
+
+  stable)
          VERSION=1.12.16
      SOURCE_HASH=sha512:35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f  
           SOURCE=$SPELL-$VERSION.tar.xz
    SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
-fi
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" ;;
+esac
         WEB_SITE=http://cairographics.org/
       LICENSE[0]=MIT
          ENTERED=20040617
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 05bd7956a9..1f5cbf97d6 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2014-07-04 Pol Vinogradov <vin.public@gmail.com>
+	* DETAILS, PRE_BUILD, PREPARE, PRE_BUILD, PRE_SUB_DEPENDS,
+	  REPAIR^all^PRE_SUB_DEPENDS, SUB_DEPENDS: added scm branch
+
 2013-09-12 Robin Cook <rcook@wyrms.net>
 	* DETAILS: updated VERSION to 1.12.16
 
diff --git a/x11-libs/cairo/PREPARE b/x11-libs/cairo/PREPARE
index 8f9397f2df..40600f7d24 100755
--- a/x11-libs/cairo/PREPARE
+++ b/x11-libs/cairo/PREPARE
@@ -1 +1,2 @@
-config_query CAIRO_DEVEL "Build devel (unstable) version?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable devel scm
diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
index 682b8e2b76..e94bf95c23 100755
--- a/x11-libs/cairo/PRE_BUILD
+++ b/x11-libs/cairo/PRE_BUILD
@@ -1,4 +1,9 @@
-mk_source_dir $SOURCE_DIRECTORY &&
- unpack_file &&
-# http://bugs.gentoo.org/show_bug.cgi?id=336696
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+    
+if [[ "$CAIRO_BRANCH" == "scm" ]]; then
+    NOCONFIGURE=1 ./autogen.sh
+else
+    # http://bugs.gentoo.org/show_bug.cgi?id=336696
+    patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch
+fi
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index 15cc31bd6a..32d996d520 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) [[ "$CAIRO_DEVEL" == "y" ]];;
+  CAIRO_DEVEL) [[ "$CAIRO_BRANCH" == "devel" || "$CAIRO_BRANCH" == "scm" ]];;
   PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
   XCB) is_depends_enabled $SPELL libxcb;;
  GOBJ) is_depends_enabled $SPELL glib2;;
diff --git a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
index 15cc31bd6a..32d996d520 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) [[ "$CAIRO_DEVEL" == "y" ]];;
+  CAIRO_DEVEL) [[ "$CAIRO_BRANCH" == "devel" || "$CAIRO_BRANCH" == "scm" ]];;
   PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
   XCB) is_depends_enabled $SPELL libxcb;;
  GOBJ) is_depends_enabled $SPELL glib2;;
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 1a1e7d7838..8edd371f37 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -1,6 +1,6 @@
 case $THIS_SUB_DEPENDS in
-  CAIRO_DEVEL) echo "Devel release needed, forcing it."  &&
-       CAIRO_DEVEL="y"                          ;;
+    CAIRO_DEVEL) echo "Devel release needed, forcing it."  &&
+		       [[ "$CAIRO_BRANCH" == "scm" ]] || CAIRO_BRANCH="devel";;
   PDF) return 0;;
   XCB) message "Cairo with XCB support requested, forcing libxcb dependency" &&
        depends libxcb "--enable-xcb";;