Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (16dec525553be8a663697c8dba583815d177b6c1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (16dec525553be8a663697c8dba583815d177b6c1)
  • Date: Mon, 26 Sep 2011 21:42:24 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

audio-drivers/alsa-driver/BUILD | 2 -
audio-drivers/alsa-driver/DEPENDS | 2 -
audio-drivers/alsa-driver/DETAILS | 4 +-
audio-drivers/alsa-driver/FINAL | 2 -
audio-drivers/alsa-driver/HISTORY | 3 ++
audio-drivers/alsa-driver/PREPARE | 7 -----
audio-drivers/alsa-firmware/BUILD | 2 -
audio-drivers/alsa-firmware/DEPENDS | 2 -
audio-drivers/alsa-firmware/DETAILS | 4 +-
audio-drivers/alsa-firmware/HISTORY | 3 ++
audio-drivers/alsa-firmware/PREPARE | 8 +----
audio-drivers/alsa-lib/BUILD | 2 -
audio-drivers/alsa-lib/DEPENDS | 2 -
audio-drivers/alsa-lib/DETAILS | 4 +-
audio-drivers/alsa-lib/HISTORY | 3 ++
audio-drivers/alsa-lib/PREPARE | 8 +----
audio-drivers/alsa-oss/BUILD | 2 -
audio-drivers/alsa-oss/DEPENDS | 2 -
audio-drivers/alsa-oss/DETAILS | 4 +-
audio-drivers/alsa-oss/HISTORY | 3 ++
audio-drivers/alsa-oss/PREPARE | 8 +----
audio-drivers/alsa-plugins/BUILD | 2 -
audio-drivers/alsa-plugins/DEPENDS | 2 -
audio-drivers/alsa-plugins/DETAILS | 4 +-
audio-drivers/alsa-plugins/HISTORY | 3 ++
audio-drivers/alsa-plugins/PREPARE | 8 +----
audio-drivers/alsa-tools/BUILD | 2 -
audio-drivers/alsa-tools/DEPENDS | 2 -
audio-drivers/alsa-tools/DETAILS | 4 +-
audio-drivers/alsa-tools/HISTORY | 3 ++
audio-drivers/alsa-tools/PREPARE | 8 +----
audio-drivers/alsa-utils/BUILD | 2 -
audio-drivers/alsa-utils/DEPENDS | 2 -
audio-drivers/alsa-utils/DETAILS | 4 +-
audio-drivers/alsa-utils/HISTORY | 3 ++
audio-drivers/alsa-utils/PREPARE | 8 +----
chat-irc/minbif/DEPENDS | 2 -
chat-irc/minbif/DETAILS | 2 -
chat-irc/minbif/HISTORY | 3 ++
chat-irc/minbif/PREPARE | 7 +----
e-17/iconbar/DETAILS | 6 ++--
e-17/iconbar/HISTORY | 3 ++
e-17/iconbar/PREPARE | 4 +-
http/luakit/HISTORY | 3 ++
http/luakit/PREPARE | 3 +-
video/ffmpeg-svn/DOWNLOAD | 49
------------------------------------
video/ffmpeg-svn/HISTORY | 4 ++
video/ffmpeg-svn/PREPARE | 5 ++-
48 files changed, 90 insertions(+), 135 deletions(-)

New commits:
commit 16dec525553be8a663697c8dba583815d177b6c1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

alsa-utils: Use prepare_select_branch

commit 89626967669bc350a66e9e18a7bafaf3b35d79d6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

alsa-tools: Use prepare_select_branch

commit 6625ef19201c4f622f95a65c1962cdaed512848e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

alsa-plugins: Use prepare_select_branch

commit 8929f6c6b73fc34fe01f495b4fa742fc2b467527
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

alsa-oss: Use prepare_select_branch

commit f58248316a229285c4ed989a5a52730dcbd7fbbb
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

alsa-lib: Use prepare_select_branch

commit 0cad16f720603d50f3e314bd18e21853f19582c7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

alsa-firmware: Use prepare_select_branch

commit bdead105fcdb305d82a1263dca29f255cf57cbb7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

alsa-driver: Use prepare_select_branch

commit cde925dca22e04b8d323708b03ecaebb0568d2c8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

iconbar: Use prepare_select_branch

commit afb14af6273fe0bd131cd71650e7e1c1688e6016
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

luakit: Use prepare_select_branch

commit 86599f919bdc57f1df5a694c285d816730d7a795
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

minbif: Use prepare_select_branch

commit 3438eb287701d47b348d0652abddc503753b394e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ffmpeg-svn: Remove DOWNLOAD, sorcery supports Subversion URLs now

commit 4a4d67011b6846dcc22d8b95aea5e337e7f2195f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ffmpeg-svn: Use prepare_select_branch

diff --git a/audio-drivers/alsa-driver/BUILD b/audio-drivers/alsa-driver/BUILD
index 4e06a19..5b6d9f0 100755
--- a/audio-drivers/alsa-driver/BUILD
+++ b/audio-drivers/alsa-driver/BUILD
@@ -15,7 +15,7 @@ OPTS="--with-isapnp=yes --with-sequencer=yes --with-oss=yes
--with-debug=none \
--with-kernel=${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/source
\
--with-cards=${CARDS} ${OPTS}"
&&

-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

diff --git a/e-17/iconbar/PREPARE b/e-17/iconbar/PREPARE
index 15918de..f8b7d7e 100755
--- a/e-17/iconbar/PREPARE
+++ b/e-17/iconbar/PREPARE
@@ -1,2 +1,2 @@
-config_query ICONBAR_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/http/luakit/HISTORY b/http/luakit/HISTORY
index e2680cc..6c986bc 100644
--- a/http/luakit/HISTORY
+++ b/http/luakit/HISTORY
@@ -1,3 +1,6 @@
+2011-09-26 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE: Use prepare_select_branch
+
2011-05-12 Justin Boffemmyer <flux AT sourcemage.org>
* DEPENDS: add missing dependencies, remove wget (no longer a
dependency)
diff --git a/http/luakit/PREPARE b/http/luakit/PREPARE
index f441410..f8b7d7e 100755
--- a/http/luakit/PREPARE
+++ b/http/luakit/PREPARE
@@ -1 +1,2 @@
-config_query LUAKIT_AUTOUPDATE "Queue for update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/video/ffmpeg-svn/DOWNLOAD b/video/ffmpeg-svn/DOWNLOAD
deleted file mode 100755
index 873b9fa..0000000
--- a/video/ffmpeg-svn/DOWNLOAD
+++ /dev/null
@@ -1,49 +0,0 @@
-function url_r_svn_crack() {
-
- URL=`url_strip_prefix "$1" svn`
- R_SVN_ROOT=`echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#"`
- local R_SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#"`
- R_SVN_MODULE=`echo $R_SVN_MODULE_TAG | cut -d : -f2`
- local R_SVN_TAGNAME=`echo $R_SVN_MODULE_TAG | cut -d : -f3`
- R_SVN_TAG=${R_SVN_TAGNAME:-HEAD}
-
-}
-
-url_r_svn_crack ${SOURCE_URL}
&&
-message "${MESSAGE_COLOR}Starting SVN checkout of"
\
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"
&&
-if [[ -f $SOURCE_CACHE/${SOURCE} ]]
-then
- message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/${SOURCE}
&&
- cd $R_SVN_MODULE
&&
- message "${MESSAGE_COLOR}Running SVN update...${DEFAULT_COLOR}"
&&
- svn
\
- --non-interactive
\
- update
\
- -r${R_SVN_TAG}
&&
- cd ..
&&
- message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
-else
- message "${MESSAGE_COLOR}Running initial SVN checkout...${DEFAULT_COLOR}"
&&
- svn
\
- --non-interactive
\
- checkout
\
- -r${R_SVN_TAG}
\
- svn://${R_SVN_ROOT}
\
- ${R_SVN_MODULE}
&&
- message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
-fi
&&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}"
&&
-tar -jcf
\
- ${SOURCE}
\
- ${R_SVN_MODULE}
&&
-cp ${SOURCE} ${SOURCE_CACHE}/${SOURCE}
&&
-rm ${SOURCE}
&&
-message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
&&
-
-if [[ $SOURCE2 ]]; then
- acquire_src 2 &&
- acquire_src 3 &&
- acquire_src 4
-fi
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index 0f551c0..23c228d 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,7 @@
+2011-09-25 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE: Use prepare_select_branch
+ * DOWNLOAD: Remove, sorcery supports Subversion URLs now
+
2010-06-29 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: libfaad2 wrapper was removed upstream

diff --git a/video/ffmpeg-svn/PREPARE b/video/ffmpeg-svn/PREPARE
index 91728c5..66b4fd5 100755
--- a/video/ffmpeg-svn/PREPARE
+++ b/video/ffmpeg-svn/PREPARE
@@ -1,5 +1,6 @@
-persistent_read ffmpeg-cvs FFMPEG_CVS_AUTOUPDATE DEFAULT
-config_query FFMPEG_SVN_AUTOUPDATE "Update to the latest SVN on every cast?"
${DEFAULT:-n}
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
+
#if [[ $FFAMR == amr-nb-fixed ]]; then
# FFAMR=amr-nb
#fi &&



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (16dec525553be8a663697c8dba583815d177b6c1), Ismael Luceno, 09/26/2011

Archive powered by MHonArc 2.6.24.

Top of Page