-if [[ $ALSA_GIT == y ]]; then
+if [[ $ALSA_DRIVER_BRANCH == scm ]]; then
export ALSAKERNELDIR="$SOURCE2_DIRECTORY" &&
OPTS="--prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
diff --git a/audio-drivers/alsa-driver/DEPENDS
b/audio-drivers/alsa-driver/DEPENDS
index 7ed0589..3968427 100755
--- a/audio-drivers/alsa-driver/DEPENDS
+++ b/audio-drivers/alsa-driver/DEPENDS
@@ -1,5 +1,5 @@
depends alsa-lib &&
-if [[ $ALSA_GIT == y ]]; then
+if [[ $ALSA_DRIVER_BRANCH == scm ]]; then
depends git &&
depends libtool &&
depends automake &&
diff --git a/audio-drivers/alsa-driver/DETAILS
b/audio-drivers/alsa-driver/DETAILS
index bd6e8a2..0bc0b7d 100755
--- a/audio-drivers/alsa-driver/DETAILS
+++ b/audio-drivers/alsa-driver/DETAILS
@@ -1,6 +1,6 @@
SPELL=alsa-driver
-if [[ $ALSA_GIT == y ]]; then
- if [[ $ALSA_GIT_AUTOUPDATE == y ]]; then
+if [[ $ALSA_DRIVER_BRANCH == scm ]]; then
+ if [[ $ALSA_DRIVER_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/audio-drivers/alsa-driver/FINAL b/audio-drivers/alsa-driver/FINAL
index 8ee7ee3..2a469ac 100755
--- a/audio-drivers/alsa-driver/FINAL
+++ b/audio-drivers/alsa-driver/FINAL
@@ -1,5 +1,5 @@
[ -e ${INSTALL_ROOT}/etc/sysconfig/alsa ] && sedit "s:\$CARD:$CARD:"
${INSTALL_ROOT}/etc/sysconfig/alsa
depmod -a $(get_kernel_version)
-if [[ $ALSA_GIT == y ]]; then
+if [[ $ALSA_DRIVER_BRANCH == scm ]]; then
rm_source_dir "$SOURCE2_DIRECTORY"
fi
diff --git a/audio-drivers/alsa-driver/HISTORY
b/audio-drivers/alsa-driver/HISTORY
index e6729f2..fa66b99 100644
--- a/audio-drivers/alsa-driver/HISTORY
+++ b/audio-drivers/alsa-driver/HISTORY
@@ -1,3 +1,6 @@
+2011-09-26 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, FINAL, PREPARE: Use prepare_select_branch
+
2011-02-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.24
diff --git a/audio-drivers/alsa-driver/PREPARE
b/audio-drivers/alsa-driver/PREPARE
index d508e82..047cc72 100755
--- a/audio-drivers/alsa-driver/PREPARE
+++ b/audio-drivers/alsa-driver/PREPARE
@@ -10,9 +10,4 @@ then
return 1
fi &&
-config_query ALSA_GIT "Build latest version from development tree?" n &&
-
-if [[ $ALSA_GIT == y ]]; then
- config_query ALSA_GIT_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+prepare_select_branch stable scm
diff --git a/audio-drivers/alsa-firmware/BUILD
b/audio-drivers/alsa-firmware/BUILD
index 24d9d1f..49df2f3 100755
--- a/audio-drivers/alsa-firmware/BUILD
+++ b/audio-drivers/alsa-firmware/BUILD
@@ -1,4 +1,4 @@
-if [[ $ALSA_FIRM_GIT == y ]]; then
+if [[ $ALSA_FIRMWARE_BRANCH == scm ]]; then
OPTS="--prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
--localstatedir=${INSTALL_ROOT}/var \
diff --git a/audio-drivers/alsa-firmware/DEPENDS
b/audio-drivers/alsa-firmware/DEPENDS
index d4be8d7..4844a1b 100755
--- a/audio-drivers/alsa-firmware/DEPENDS
+++ b/audio-drivers/alsa-firmware/DEPENDS
@@ -1,4 +1,4 @@
-if [[ $ALSA_FIRM_GIT == y ]]; then
+if [[ $ALSA_FIRMWARE_BRANCH == scm ]]; then
depends git &&
depends libtool &&
depends automake &&
diff --git a/audio-drivers/alsa-firmware/DETAILS
b/audio-drivers/alsa-firmware/DETAILS
index c803988..2cf11ed 100755
--- a/audio-drivers/alsa-firmware/DETAILS
+++ b/audio-drivers/alsa-firmware/DETAILS
@@ -1,6 +1,6 @@
SPELL=alsa-firmware
-if [[ $ALSA_FIRM_GIT == y ]]; then
- if [[ $ALSA_FIRM_GIT_AUTOUPDATE == y ]]; then
+if [[ $ALSA_FIRMWARE_BRANCH == scm ]]; then
+ if [[ $ALSA_FIRMWARE_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/audio-drivers/alsa-firmware/HISTORY
b/audio-drivers/alsa-firmware/HISTORY
index 22e037f..5e190ba 100644
--- a/audio-drivers/alsa-firmware/HISTORY
+++ b/audio-drivers/alsa-firmware/HISTORY
@@ -1,3 +1,6 @@
+2011-09-26 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-02-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.24.1
diff --git a/audio-drivers/alsa-firmware/PREPARE
b/audio-drivers/alsa-firmware/PREPARE
index 31122f7..98d27e4 100755
--- a/audio-drivers/alsa-firmware/PREPARE
+++ b/audio-drivers/alsa-firmware/PREPARE
@@ -1,6 +1,2 @@
-config_query ALSA_FIRM_GIT "Build latest version from development tree?"
n &&
-
-if [[ $ALSA_FIRM_GIT == y ]]; then
- config_query ALSA_FIRM_GIT_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-drivers/alsa-lib/BUILD b/audio-drivers/alsa-lib/BUILD
index 0a6d991..de20ac6 100755
--- a/audio-drivers/alsa-lib/BUILD
+++ b/audio-drivers/alsa-lib/BUILD
@@ -1,4 +1,4 @@
-if [[ $ALSA_LIB_GIT == y ]]; then
+if [[ $ALSA_LIB_BRANCH == scm ]]; then
OPTS="--prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
--localstatedir=${INSTALL_ROOT}/var \
diff --git a/audio-drivers/alsa-lib/DEPENDS b/audio-drivers/alsa-lib/DEPENDS
index edd02cc..de82b00 100755
--- a/audio-drivers/alsa-lib/DEPENDS
+++ b/audio-drivers/alsa-lib/DEPENDS
@@ -1,4 +1,4 @@
-if [[ $ALSA_LIB_GIT == y ]]; then
+if [[ $ALSA_LIB_BRANCH == scm ]]; then
depends git &&
depends libtool &&
depends automake &&
diff --git a/audio-drivers/alsa-lib/DETAILS b/audio-drivers/alsa-lib/DETAILS
index 4fd0dce..bf573d9 100755
--- a/audio-drivers/alsa-lib/DETAILS
+++ b/audio-drivers/alsa-lib/DETAILS
@@ -1,6 +1,6 @@
SPELL=alsa-lib
-if [[ $ALSA_LIB_GIT == y ]]; then
- if [[ $ALSA_LIB_GIT_AUTOUPDATE == y ]]; then
+if [[ $ALSA_LIB_BRANCH == scm ]]; then
+ if [[ $ALSA_LIB_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/audio-drivers/alsa-lib/HISTORY b/audio-drivers/alsa-lib/HISTORY
index 022421d..a1aa8ed 100644
--- a/audio-drivers/alsa-lib/HISTORY
+++ b/audio-drivers/alsa-lib/HISTORY
@@ -1,3 +1,6 @@
+2011-09-26 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-02-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.0.24.1
diff --git a/audio-drivers/alsa-lib/PREPARE b/audio-drivers/alsa-lib/PREPARE
index 8abb3ba..98d27e4 100755
--- a/audio-drivers/alsa-lib/PREPARE
+++ b/audio-drivers/alsa-lib/PREPARE
@@ -1,6 +1,2 @@
-config_query ALSA_LIB_GIT "Build latest version from development tree?" n &&
-
-if [[ $ALSA_LIB_GIT == y ]]; then
- config_query ALSA_LIB_GIT_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-drivers/alsa-oss/BUILD b/audio-drivers/alsa-oss/BUILD
index e609448..b8f1cf9 100755
--- a/audio-drivers/alsa-oss/BUILD
+++ b/audio-drivers/alsa-oss/BUILD
@@ -1,4 +1,4 @@
-if [[ $ALSA_OSS_GIT == y ]]; then
+if [[ $ALSA_OSS_BRANCH == scm ]]; then
OPTS="--prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
--localstatedir=${INSTALL_ROOT}/var \
diff --git a/audio-drivers/alsa-oss/DEPENDS b/audio-drivers/alsa-oss/DEPENDS
index adbf271..e364d84 100755
--- a/audio-drivers/alsa-oss/DEPENDS
+++ b/audio-drivers/alsa-oss/DEPENDS
@@ -1,5 +1,5 @@
depends alsa-lib &&
-if [[ $ALSA_OSS_GIT == y ]]; then
+if [[ $ALSA_OSS_BRANCH == scm ]]; then
depends git &&
depends libtool &&
depends automake &&
diff --git a/audio-drivers/alsa-oss/DETAILS b/audio-drivers/alsa-oss/DETAILS
index 0526d24..c2e87e4 100755
--- a/audio-drivers/alsa-oss/DETAILS
+++ b/audio-drivers/alsa-oss/DETAILS
@@ -1,6 +1,6 @@
SPELL=alsa-oss
-if [[ $ALSA_OSS_GIT == y ]]; then
- if [[ $ALSA_OSS_GIT_AUTOUPDATE == y ]]; then
+if [[ $ALSA_OSS_BRANCH == scm ]]; then
+ if [[ $ALSA_OSS_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/audio-drivers/alsa-oss/HISTORY b/audio-drivers/alsa-oss/HISTORY
index a8aeddd..0e72daf 100644
--- a/audio-drivers/alsa-oss/HISTORY
+++ b/audio-drivers/alsa-oss/HISTORY
@@ -1,3 +1,6 @@
+2011-09-26 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2009-10-11 Ethan Grammatikidis <eekee57 AT fastmail.fm>
* DETAILS: trimmed SHORT, pruned long
diff --git a/audio-drivers/alsa-oss/PREPARE b/audio-drivers/alsa-oss/PREPARE
index 864842b..98d27e4 100755
--- a/audio-drivers/alsa-oss/PREPARE
+++ b/audio-drivers/alsa-oss/PREPARE
@@ -1,6 +1,2 @@
-config_query ALSA_OSS_GIT "Build latest version from development tree?" n
&&
-
-if [[ $ALSA_OSS_GIT == y ]]; then
- config_query ALSA_OSS_GIT_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-drivers/alsa-plugins/BUILD
b/audio-drivers/alsa-plugins/BUILD
index 4e3c06d..b3975be 100755
--- a/audio-drivers/alsa-plugins/BUILD
+++ b/audio-drivers/alsa-plugins/BUILD
@@ -1,4 +1,4 @@
-if [[ $ALSA_PLUG_GIT == y ]]; then
+if [[ $ALSA_PLUGINS_BRANCH == scm ]]; then
OPTS="--prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
--localstatedir=${INSTALL_ROOT}/var \
diff --git a/audio-drivers/alsa-plugins/DEPENDS
b/audio-drivers/alsa-plugins/DEPENDS
index 7824feb..27f2341 100755
--- a/audio-drivers/alsa-plugins/DEPENDS
+++ b/audio-drivers/alsa-plugins/DEPENDS
@@ -1,5 +1,5 @@
depends alsa-lib &&
-if [[ $ALSA_PLUG_GIT == y ]]; then
+if [[ $ALSA_PLUGINS_BRANCH == scm ]]; then
depends git &&
depends libtool &&
depends automake &&
diff --git a/audio-drivers/alsa-plugins/DETAILS
b/audio-drivers/alsa-plugins/DETAILS
index 51890bd..18d447f 100755
--- a/audio-drivers/alsa-plugins/DETAILS
+++ b/audio-drivers/alsa-plugins/DETAILS
@@ -1,6 +1,6 @@
SPELL=alsa-plugins
-if [[ $ALSA_PLUG_GIT == y ]]; then
- if [[ $ALSA_PLUG_GIT_AUTOUPDATE == y ]]; then
+if [[ $ALSA_PLUGINS_BRANCH == scm ]]; then
+ if [[ $ALSA_PLUGINS_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/audio-drivers/alsa-plugins/HISTORY
b/audio-drivers/alsa-plugins/HISTORY
index 0043f84..71cd27f 100644
--- a/audio-drivers/alsa-plugins/HISTORY
+++ b/audio-drivers/alsa-plugins/HISTORY
@@ -1,3 +1,6 @@
+2011-09-26 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-02-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.24
diff --git a/audio-drivers/alsa-plugins/PREPARE
b/audio-drivers/alsa-plugins/PREPARE
index 468460d..98d27e4 100755
--- a/audio-drivers/alsa-plugins/PREPARE
+++ b/audio-drivers/alsa-plugins/PREPARE
@@ -1,6 +1,2 @@
-config_query ALSA_PLUG_GIT "Build latest version from development tree?"
n &&
-
-if [[ $ALSA_PLUG_GIT == y ]]; then
- config_query ALSA_PLUG_GIT_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-drivers/alsa-tools/BUILD b/audio-drivers/alsa-tools/BUILD
index df8b302..aecfaeb 100755
--- a/audio-drivers/alsa-tools/BUILD
+++ b/audio-drivers/alsa-tools/BUILD
@@ -13,7 +13,7 @@ do
message "${MESSAGE_COLOR}Tool $ALSATOOL is being built ..."
message "${DEFAULT_COLOR}"
-if [[ $ALSA_TOOLS_GIT == y ]]; then
+if [[ $ALSA_TOOLS_BRANCH == scm ]]; then
OPTS="--prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
--localstatedir=${INSTALL_ROOT}/var \
diff --git a/audio-drivers/alsa-tools/DEPENDS
b/audio-drivers/alsa-tools/DEPENDS
index f7a55f2..08fbe8b 100755
--- a/audio-drivers/alsa-tools/DEPENDS
+++ b/audio-drivers/alsa-tools/DEPENDS
@@ -1,4 +1,4 @@
-if [[ $ALSA_TOOLS_GIT == y ]]; then
+if [[ $ALSA_TOOLS_BRANCH == scm ]]; then
depends git &&
depends libtool &&
depends automake &&
diff --git a/audio-drivers/alsa-tools/DETAILS
b/audio-drivers/alsa-tools/DETAILS
index e2a66cd..de63914 100755
--- a/audio-drivers/alsa-tools/DETAILS
+++ b/audio-drivers/alsa-tools/DETAILS
@@ -1,6 +1,6 @@
SPELL=alsa-tools
-if [[ $ALSA_TOOLS_GIT == y ]]; then
- if [[ $ALSA_TOOLS_GIT_AUTOUPDATE == y ]]; then
+if [[ $ALSA_TOOLS_BRANCH == scm ]]; then
+ if [[ $ALSA_TOOLS_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/audio-drivers/alsa-tools/HISTORY
b/audio-drivers/alsa-tools/HISTORY
index db52cbb..0c9f885 100644
--- a/audio-drivers/alsa-tools/HISTORY
+++ b/audio-drivers/alsa-tools/HISTORY
@@ -1,3 +1,6 @@
+2011-09-26 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-02-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.24.1
diff --git a/audio-drivers/alsa-tools/PREPARE
b/audio-drivers/alsa-tools/PREPARE
index 29813dd..98d27e4 100755
--- a/audio-drivers/alsa-tools/PREPARE
+++ b/audio-drivers/alsa-tools/PREPARE
@@ -1,6 +1,2 @@
-config_query ALSA_TOOLS_GIT "Build latest version from development tree?"
n &&
-
-if [[ $ALSA_TOOLS_GIT == y ]]; then
- config_query ALSA_TOOLS_GIT_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-drivers/alsa-utils/BUILD b/audio-drivers/alsa-utils/BUILD
index 1ce3003..9711236 100755
--- a/audio-drivers/alsa-utils/BUILD
+++ b/audio-drivers/alsa-utils/BUILD
@@ -1,4 +1,4 @@
-if [[ $ALSA_UTILS_GIT == y ]]; then
+if [[ $ALSA_UTILS_BRANCH == scm ]]; then
OPTS="--prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
--localstatedir=${INSTALL_ROOT}/var \
diff --git a/audio-drivers/alsa-utils/DEPENDS
b/audio-drivers/alsa-utils/DEPENDS
index 8176157..3b47779 100755
--- a/audio-drivers/alsa-utils/DEPENDS
+++ b/audio-drivers/alsa-utils/DEPENDS
@@ -7,7 +7,7 @@ optional_depends xmlto \
"--disable-xmlto" \
"for generated documentation" &&
-if [[ $ALSA_UTILS_GIT == y ]]; then
+if [[ $ALSA_UTILS_BRANCH == scm ]]; then
depends git &&
depends libtool &&
depends automake &&
diff --git a/audio-drivers/alsa-utils/DETAILS
b/audio-drivers/alsa-utils/DETAILS
index 2737928..4de201f 100755
--- a/audio-drivers/alsa-utils/DETAILS
+++ b/audio-drivers/alsa-utils/DETAILS
@@ -1,6 +1,6 @@
SPELL=alsa-utils
-if [[ $ALSA_UTILS_GIT == y ]]; then
- if [[ $ALSA_UTILS_GIT_AUTOUPDATE == y ]]; then
+if [[ $ALSA_UTILS_BRANCH == scm ]]; then
+ if [[ $ALSA_UTILS_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/audio-drivers/alsa-utils/HISTORY
b/audio-drivers/alsa-utils/HISTORY
index b05505e..983cd11 100644
--- a/audio-drivers/alsa-utils/HISTORY
+++ b/audio-drivers/alsa-utils/HISTORY
@@ -1,3 +1,6 @@
+2011-09-26 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-02-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.0.24.2
diff --git a/audio-drivers/alsa-utils/PREPARE
b/audio-drivers/alsa-utils/PREPARE
index 25a1d02..98d27e4 100755
--- a/audio-drivers/alsa-utils/PREPARE
+++ b/audio-drivers/alsa-utils/PREPARE
@@ -1,6 +1,2 @@
-config_query ALSA_UTILS_GIT "Build latest version from development tree?" n
&&
-
-if [[ $ALSA_UTILS_GIT == y ]]; then
- config_query ALSA_UTILS_GIT_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/chat-irc/minbif/DEPENDS b/chat-irc/minbif/DEPENDS
index 7ed5903..0a089c6 100755
--- a/chat-irc/minbif/DEPENDS
+++ b/chat-irc/minbif/DEPENDS
@@ -1,4 +1,4 @@
-if [[ ${MINBIF_SCM} == "y" ]]
+if [[ ${MINBIF_BRANCH} == "scm" ]]
then
depends git
fi &&
diff --git a/chat-irc/minbif/DETAILS b/chat-irc/minbif/DETAILS
index fb7e52f..2532139 100755
--- a/chat-irc/minbif/DETAILS
+++ b/chat-irc/minbif/DETAILS
@@ -1,5 +1,5 @@
SPELL=minbif
-if [[ "${MINBIF_SCM}" == "y" ]]
+if [[ "${MINBIF_BRANCH}" == "scm" ]]
then
VERSION=scm
SOURCE=${SPELL}-${VERSION}.tar.bz2
diff --git a/chat-irc/minbif/HISTORY b/chat-irc/minbif/HISTORY
index 8e3b6d7..7789304 100644
--- a/chat-irc/minbif/HISTORY
+++ b/chat-irc/minbif/HISTORY
@@ -1,3 +1,6 @@
+2011-09-26 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2010-03-19 Quentin Rameau <quinq AT sourcemage.org>
* PREPARE, DETAILS, DEPENDS, SUB_DEPENDS, PRE_BUILD, BUILD,
HISTORY, PRE_SUB_DEPENDS, REPAIR^ALL^PRE_SUB_DEPENDS,
diff --git a/chat-irc/minbif/PREPARE b/chat-irc/minbif/PREPARE
index 350389e..98d27e4 100755
--- a/chat-irc/minbif/PREPARE
+++ b/chat-irc/minbif/PREPARE
@@ -1,5 +1,2 @@
-config_query MINBIF_SCM "Build SCM (git) version?" n &&
-if [[ "${MINBIF_SCM}" == "y" ]]
-then
- config_query MINBIF_SCM_AUTOUPDATE "Update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/e-17/iconbar/DETAILS b/e-17/iconbar/DETAILS
index 6af4459..8693bd3 100755
--- a/e-17/iconbar/DETAILS
+++ b/e-17/iconbar/DETAILS
@@ -1,5 +1,5 @@
SPELL=iconbar
-if [ "$ICONBAR_CVS_AUTOUPDATE" == "y" ]; then
+if [ "$ICONBAR_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
@@ -16,6 +16,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SHORT="Standalone iconbar based on the e17 iconbar"
cat << EOF
This is a standalone iconbar based on the e17 iconbar by raster and rephorm.
-As of v0.5 the iconbar now uses Edje for both its theme and its icons. This
allows for a
-ll sorts of animation and other effects.
+As of v0.5 the iconbar now uses Edje for both its theme and its icons. This
allows for
+all sorts of animation and other effects.
EOF
diff --git a/e-17/iconbar/HISTORY b/e-17/iconbar/HISTORY
index b7cdf4c..28bd4b7 100644
--- a/e-17/iconbar/HISTORY
+++ b/e-17/iconbar/HISTORY
@@ -1,3 +1,6 @@
+2011-09-26 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE: Use prepare_select_branch
+
2010-10-30 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed SOURCE_URL