Merge remote-tracking branch 'origin/master' into devel-xorg-modular

Conflicts:
	graphics-libs/mesalib/DETAILS
	xorg-driver/xf86-video-ati/HISTORY

10 files changed, 28 insertions, 16 deletions

diff --git a/wm-addons/cairo-dock-plugins/DETAILS b/wm-addons/cairo-dock-plugins/DETAILS
index 67145e2767..732b5a3e8b 100755
--- a/wm-addons/cairo-dock-plugins/DETAILS
+++ b/wm-addons/cairo-dock-plugins/DETAILS
@@ -1,5 +1,5 @@
            SPELL=cairo-dock-plugins
-         VERSION=3.3.0
+         VERSION=3.3.2
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://launchpad.net/cairo-dock-plug-ins/${VERSION:0:3}/${VERSION:0:5}/+download/$SOURCE
          SOURCE2=$SOURCE.asc
diff --git a/wm-addons/cairo-dock-plugins/HISTORY b/wm-addons/cairo-dock-plugins/HISTORY
index 794f92811f..96d13c489f 100644
--- a/wm-addons/cairo-dock-plugins/HISTORY
+++ b/wm-addons/cairo-dock-plugins/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Pol Vinogradov <vin.public@gmail.com>
+	* DETAILS: version 3.3.2
+
 2013-10-16 Pol Vinogradov <vin.public@gmail.com>
 	* DETAILS: version 3.3.0
 
diff --git a/wm-addons/cairo-dock/DETAILS b/wm-addons/cairo-dock/DETAILS
index 4487ac96dc..e77965fe7c 100755
--- a/wm-addons/cairo-dock/DETAILS
+++ b/wm-addons/cairo-dock/DETAILS
@@ -1,5 +1,5 @@
            SPELL=cairo-dock
-         VERSION=3.3.0
+         VERSION=3.3.2
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://launchpad.net/cairo-dock-core/${VERSION:0:3}/${VERSION:0:5}/+download/$SOURCE
          SOURCE2=$SOURCE.asc
diff --git a/wm-addons/cairo-dock/HISTORY b/wm-addons/cairo-dock/HISTORY
index c6c50b038c..1a879b2c1c 100644
--- a/wm-addons/cairo-dock/HISTORY
+++ b/wm-addons/cairo-dock/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Pol Vinogradov <vin.public@gmail.com>
+	* DETAILS: version 3.3.2
+
 2013-10-16 Pol Vinogradov <vin.public@gmail.com>
 	* DETAILS: version 3.3.0
 
diff --git a/wm-addons/obvious/DETAILS b/wm-addons/obvious/DETAILS
index 0ccddf9321..24c0a80965 100755
--- a/wm-addons/obvious/DETAILS
+++ b/wm-addons/obvious/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
            SPELL=obvious
-if  [  "$OBVIOUS_AUTOUPDATE"  ==  "y"  ];  then
-       VERSION=$(date +%Y%m%d)
-else
-         VERSION=git
-fi
+       VERSION=$(get_scm_version)
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=git://git.mercenariesguild.net/${SPELL}.git:${SPELL}-git
    SOURCE_IGNORE=volatile
diff --git a/wm-addons/obvious/HISTORY b/wm-addons/obvious/HISTORY
index 3352758700..03a8421320 100644
--- a/wm-addons/obvious/HISTORY
+++ b/wm-addons/obvious/HISTORY
@@ -1,3 +1,9 @@
+2014-07-04 Ismael Luceno <ismael@sourcemage.org>
+	* PREPARE: Use prepare_select_branch
+
+2014-07-03 Ismael Luceno <ismael@sourcemage.org>
+	* DETAILS: Use get_scm_version
+
 2009-11-02 Arjan Bouter <abouter@sourcemage.org>
 	* DEPENDS: added missing dependency on git
 	* TRIGGERS: added trigger on awesome, to make sure the widgets stay working
diff --git a/wm-addons/obvious/PREPARE b/wm-addons/obvious/PREPARE
index bf979aff26..86a507971e 100755
--- a/wm-addons/obvious/PREPARE
+++ b/wm-addons/obvious/PREPARE
@@ -1,3 +1,2 @@
-config_query OBVIOUS_AUTOUPDATE \
-             "Automatically update on every system update?"  y
-
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch
diff --git a/wm-addons/wicked/DETAILS b/wm-addons/wicked/DETAILS
index 9529de86c8..649ac68759 100755
--- a/wm-addons/wicked/DETAILS
+++ b/wm-addons/wicked/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
            SPELL=wicked
-if [ "$WICKED_AUTOUPDATE" = 'y' ]; then
-         VERSION=$(date +%Y%m%d)
-else
-         VERSION=git
-fi
+         VERSION=$(get_scm_version)
           SOURCE=${SPELL}-${VERSION}.tar.bz2
    SOURCE_URL[0]=git://git.glacicle.com/awesome/wicked.git:$SPELL-$VERSION
      SOURCE_IGNORE=volatile
diff --git a/wm-addons/wicked/HISTORY b/wm-addons/wicked/HISTORY
index 7d661f4e8e..2df5bc23c7 100644
--- a/wm-addons/wicked/HISTORY
+++ b/wm-addons/wicked/HISTORY
@@ -1,3 +1,9 @@
+2014-07-04 Ismael Luceno <ismael@sourcemage.org>
+	* PREPARE: Use prepare_select_branch
+
+2014-07-03 Ismael Luceno <ismael@sourcemage.org>
+	* DETAILS: Use get_scm_version
+
 2008-10-06 Arjan Bouter <abouter@sourcemage.org>
 	* DETAILS,DEPENDS,PREPARE,INSTALL,BUILD: spell created
 
diff --git a/wm-addons/wicked/PREPARE b/wm-addons/wicked/PREPARE
index b08a26f79c..86a507971e 100755
--- a/wm-addons/wicked/PREPARE
+++ b/wm-addons/wicked/PREPARE
@@ -1 +1,2 @@
-config_query WICKED_AUTOUPDATE "Automatically update on every system update?" n
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch