[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (4fe10856209dd1706e7c95a713831637042bb8d9)

Vlad Glagolev scm at sourcemage.org
Tue Sep 27 07:06:08 EDT 2011


GIT changes to devel-xorg-modular grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 VERSION                                         |    2 
 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                         |    6 ++
 chat-irc/minbif/PREPARE                         |    7 ---
 chat-irc/minbif/REPAIR^ALL^PRE_SUB_DEPENDS      |    4 +
 devel/perl/DETAILS                              |    5 +-
 devel/perl/HISTORY                              |    4 +
 devel/phpmyadmin/DETAILS                        |    4 -
 devel/phpmyadmin/HISTORY                        |    3 +
 e-17/iconbar/DETAILS                            |    6 +-
 e-17/iconbar/HISTORY                            |    3 +
 e-17/iconbar/PREPARE                            |    4 -
 graphics-libs/mesalib/CONFIGURE                 |    4 -
 graphics-libs/mesalib/HISTORY                   |    3 +
 graphics/imagemagick/DETAILS                    |    4 -
 graphics/imagemagick/HISTORY                    |    3 +
 http/luakit/HISTORY                             |    3 +
 http/luakit/PREPARE                             |    3 -
 kde4-bindings/kimono/DEPENDS                    |    1 
 kde4-bindings/kimono/HISTORY                    |    3 +
 kde4-support/soprano/HISTORY                    |    4 +
 kde4-support/soprano/PRE_SUB_DEPENDS            |    1 
 kde4-support/soprano/REPAIR^all^PRE_SUB_DEPENDS |    9 ++++
 kde4-support/soprano/REPAIR^all^SUB_DEPENDS     |   14 ++++++
 kde4-support/soprano/SUB_DEPENDS                |    2 
 kde4/kdelibs4/DEPENDS                           |    2 
 kde4/kdelibs4/HISTORY                           |    3 +
 video/ffmpeg-svn/DOWNLOAD                       |   49 ------------------------
 video/ffmpeg-svn/HISTORY                        |    4 +
 video/ffmpeg-svn/PREPARE                        |    5 +-
 67 files changed, 158 insertions(+), 145 deletions(-)

New commits:
commit 2cdf579fd69c2cf9f7356580ce6b42a21a7eb055
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    perl: => 5.14.2 (security)

commit 6c2a388bbf84cccacdc90188b775eace5a07dfc7
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdelibs4: added one extra space so params are used correctly

commit cc90bee8d64d114bad9516d123795ef5f27ab53c
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    minbif: fixed REPAIR^ALL^PRE_SUB_DEPENDS to be the same as SUB_DEPENDS

commit 317f1463f1afbb29f68335e1c65b18ac342b3d4e
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    soprano: added CLUCENCE as optional sub dependency

commit a9c5ad826b6d82adee04dbcc75cd914a53b2f451
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kimono: added dependency on soprano with CLUCENE

commit 4584785c85692e3efb138a296e64bbcf00f56447
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    mesalib: Fix broken case statement

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

commit f342b2d9f0cb6a10acf2d8ba23a59c48853e22a5
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    imagemagick: Updated to version 6.7.2-9

commit 89666829aa1f95c00802478a035a7bc09a1d2a7e
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    phpmyadmin: Updated to version 3.4.5

commit 2781cc11d14c91ac3becd8ebee002651b5062a3f
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    VERSION: 0.61-test

diff --git a/VERSION b/VERSION
index 1d8f979..8f53e5e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.60-test
+0.61-test
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..98e1dbe 100644
--- a/chat-irc/minbif/HISTORY
+++ b/chat-irc/minbif/HISTORY
@@ -1,3 +1,9 @@
+2011-09-27 Bor Kraljič <pyrobor at ver.si>
+	* REPAIR^ALL^PRE_SUB_DEPENDS: fixed to be the same as SUB_DEPENDS
+
+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/chat-irc/minbif/REPAIR^ALL^PRE_SUB_DEPENDS b/chat-irc/minbif/REPAIR^ALL^PRE_SUB_DEPENDS
index e69de29..b2a9f7d 100755
--- a/chat-irc/minbif/REPAIR^ALL^PRE_SUB_DEPENDS
+++ b/chat-irc/minbif/REPAIR^ALL^PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+  LIBCACA) is_depends_enabled $SPELL libcaca && return 0;;
+esac
+return 1
diff --git a/devel/perl/DETAILS b/devel/perl/DETAILS
index a66bbf7..4d5bdf4 100755
--- a/devel/perl/DETAILS
+++ b/devel/perl/DETAILS
@@ -1,6 +1,7 @@
            SPELL=perl
-         VERSION=5.14.1
-     SOURCE_HASH=sha512:24b8e2f50d7031f255ddbc45e0a608e79f3d0a6c55e2c0243944e23f5ab01679567a92712179e3b2ebd4df89ef3a84ee5ab875bd9cfbda16c0cc14147cdfa705
+         VERSION=5.14.2
+  SECURITY_PATCH=1
+     SOURCE_HASH=sha512:023a0d86302ebf2cbc22457e6799fe75c07498a4974abacdff5b6259982bb4a0388585e57d50b52ea05a1ab186d4bc9d47e80c0981ef9288d502e42f18a21144
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.cpan.org/src/5.0/$SOURCE
diff --git a/devel/perl/HISTORY b/devel/perl/HISTORY
index 9a321b6..a77d3db 100644
--- a/devel/perl/HISTORY
+++ b/devel/perl/HISTORY
@@ -1,3 +1,7 @@
+2011-09-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 5.14.2; SECURITY_PATCH++
+	  (fixes CVE-2011-2728, CVE-2011-2939)
+
 2011-06-17 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 5.14.1
 
diff --git a/devel/phpmyadmin/DETAILS b/devel/phpmyadmin/DETAILS
index 8400569..1e3048a 100755
--- a/devel/phpmyadmin/DETAILS
+++ b/devel/phpmyadmin/DETAILS
@@ -1,7 +1,7 @@
            SPELL=phpmyadmin
-         VERSION=3.4.4
+         VERSION=3.4.5
   SECURITY_PATCH=17
-     SOURCE_HASH=sha512:f4da0f471c4091685356f8eb1da809da520fd417d67ef548b328060206e99524a423675f252878e5206bf29bf5ecb80ea4b8145fb79d1096b869ca8a03d4c210
+     SOURCE_HASH=sha512:6a64792fdef4390d3a08bf73a20635475d1c959c49805ddbd58e6d5f50bb24238985a1c266e6e16e5787cd480aae511d38f3169a4ce9cf46597678aa96ff9910
           SOURCE=phpMyAdmin-$VERSION-all-languages.tar.bz2
 #     SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/phpMyAdmin-$VERSION-all-languages
diff --git a/devel/phpmyadmin/HISTORY b/devel/phpmyadmin/HISTORY
index 99c6b19..e02ba4c 100644
--- a/devel/phpmyadmin/HISTORY
+++ b/devel/phpmyadmin/HISTORY
@@ -1,3 +1,6 @@
+2011-09-26 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 3.4.5
+
 2011-09-05 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 3.4.4
 
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/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 3cff28c..8a59422 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -79,5 +79,5 @@ case "$MESALIB_BRANCH" in
 
      config_query_option MESALIB_OPTS "build separate OpenGL ES only libraries?" n \
                          "--enable-gles-overlay" "--disable-gles-overlay"
-  fi
-fi
+   fi
+esac
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 123b07c..86ab54d 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,6 @@
+2011-09-27 Ismael Luceno <ismael at sourcemage.org>
+	* CONFIGURE: Fix broken case statement
+
 2011-09-26 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: select stable branch by default
 
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 51a7288..d0f0069 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
            SPELL=imagemagick
-         VERSION=6.7.2-1
+         VERSION=6.7.2-9
   SECURITY_PATCH=1
           SOURCE=ImageMagick-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
    SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
    SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
 #     SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-     SOURCE_HASH=sha512:fd8ebda20548b962fbe988531c88865e0925815d506dd09eb80a4316bcfa3a11f52563642820a4d72fa3def4df5379ccc12a2841eb44710a12fa75b621040f82
+     SOURCE_HASH=sha512:fedd8552a70d576480ed79aa304c4a42d99ab7cba1027009f25fcb833acb16192ca5c562673085de59720d62b78d2330a31b3c24b55e0af43d75a571ce93ca51
           CCACHE="off"
         WEB_SITE=http://www.imagemagick.org/
          ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 55ddd26..a2315eb 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2011-09-26 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 6.7.2-9
+
 2011-09-05 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 6.7.2-1
 
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/kde4-bindings/kimono/DEPENDS b/kde4-bindings/kimono/DEPENDS
index 66518f5..46f9dc1 100755
--- a/kde4-bindings/kimono/DEPENDS
+++ b/kde4-bindings/kimono/DEPENDS
@@ -1,4 +1,5 @@
 source  $SECTION_DIRECTORY/KDE_DEPENDS &&
 depends qyoto &&
+depends -sub "CLUCENE" soprano &&
 depends smokeqt &&
 depends mono
diff --git a/kde4-bindings/kimono/HISTORY b/kde4-bindings/kimono/HISTORY
index a13bfea..2373b8a 100644
--- a/kde4-bindings/kimono/HISTORY
+++ b/kde4-bindings/kimono/HISTORY
@@ -1,3 +1,6 @@
+2011-09-27 Bor Kraljič <pyrobor at ver.si>
+	* DEPENDS: added dependency on soprano with CLUCENE
+
 2011-09-07 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.7.1
 
diff --git a/kde4-support/soprano/HISTORY b/kde4-support/soprano/HISTORY
index 143e1e7..c0d656c 100644
--- a/kde4-support/soprano/HISTORY
+++ b/kde4-support/soprano/HISTORY
@@ -1,3 +1,7 @@
+2011-09-27 Bor Kraljič <pyrobor at ver.si>
+	* {,PRE_}SUB_DEPENDS: added CLUCENCE as optional sub dependency
+	* REPAIR^all^{,PRE_}SUB_DEPENDS: added repair files
+
 2011-09-14 Bor Kraljič <pyrobor at ver.si>
 	* DEPENDS: only optional dependencies will do since we have SUB_DEPENDS now
 	* {,PRE_}SUB_DEPENDS: added option to request REDLAND RAPTOR DBUS VIRTUOSO support
diff --git a/kde4-support/soprano/PRE_SUB_DEPENDS b/kde4-support/soprano/PRE_SUB_DEPENDS
index f2116b2..af99e59 100755
--- a/kde4-support/soprano/PRE_SUB_DEPENDS
+++ b/kde4-support/soprano/PRE_SUB_DEPENDS
@@ -3,6 +3,7 @@ case $THIS_SUB_DEPENDS in
     RAPTOR)  is_depends_enabled $SPELL raptor ;;
       DBUS)  is_depends_enabled $SPELL dbus ;;
   VIRTUOSO)  is_depends_enabled $SPELL virtuoso ;;
+   CLUCENE)  is_depends_enabled $SPELL clucene ;;
          *)  message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
           return 1;;
 esac
diff --git a/kde4-support/soprano/REPAIR^all^PRE_SUB_DEPENDS b/kde4-support/soprano/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..af99e59
--- /dev/null
+++ b/kde4-support/soprano/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,9 @@
+case $THIS_SUB_DEPENDS in
+   REDLAND)  is_depends_enabled $SPELL redland ;;
+    RAPTOR)  is_depends_enabled $SPELL raptor ;;
+      DBUS)  is_depends_enabled $SPELL dbus ;;
+  VIRTUOSO)  is_depends_enabled $SPELL virtuoso ;;
+   CLUCENE)  is_depends_enabled $SPELL clucene ;;
+         *)  message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+          return 1;;
+esac
diff --git a/kde4-support/soprano/REPAIR^all^SUB_DEPENDS b/kde4-support/soprano/REPAIR^all^SUB_DEPENDS
new file mode 100755
index 0000000..4b2665f
--- /dev/null
+++ b/kde4-support/soprano/REPAIR^all^SUB_DEPENDS
@@ -0,0 +1,14 @@
+case $THIS_SUB_DEPENDS in
+   REDLAND)  message "Redland support requested forcing dependency" &&
+             depends redland ;;
+    RAPTOR)  message "Raptor support requested forcing dependency" &&
+             depends raptor ;;
+      DBUS)  message "Dbus support requested forcing dependency" &&
+             depends dbus ;;
+  VIRTUOSO)  message "Redland support requested forcing dependency" &&
+             runtime_depends virtuoso ;;
+   CLUCENE)  message "Clucene support requested forcing dependency" &&
+             depends clucene ;;
+      *)  message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+          return 1;;
+esac
diff --git a/kde4-support/soprano/SUB_DEPENDS b/kde4-support/soprano/SUB_DEPENDS
index 64aa2bb..4b2665f 100755
--- a/kde4-support/soprano/SUB_DEPENDS
+++ b/kde4-support/soprano/SUB_DEPENDS
@@ -7,6 +7,8 @@ case $THIS_SUB_DEPENDS in
              depends dbus ;;
   VIRTUOSO)  message "Redland support requested forcing dependency" &&
              runtime_depends virtuoso ;;
+   CLUCENE)  message "Clucene support requested forcing dependency" &&
+             depends clucene ;;
       *)  message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
           return 1;;
 esac
diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index 8acb1d5..2670a6f 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -37,7 +37,7 @@ optional_depends  aspell      '' '' 'for spell checking support'&&
 optional_depends  hspell      '' '' 'for Hebrew spell checking' &&
 optional_depends  avahi       '' '' 'for domain browsing'       &&
 optional_depends  gss         '' '' 'GSSAPI HTTP authentication support'  &&
-optional_depends  mdnsresponder'' '' 'Zerconf/DNS-SD service support'&&
+optional_depends  mdnsresponder '' '' 'Zerconf/DNS-SD service support' &&
 optional_depends  polkit-qt-1  '' '' 'Policykit support'         &&
 optional_depends  python      '' '' 'kross scripting support'   &&
 optional_depends  libmng      '' '' 'for animated PNG'          &&
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index c541705..fde98df 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,6 @@
+2011-09-27 Bor Kraljič <pyrobor at ver.si>
+	* DEPENDS: added one extra space so params are used correctly
+
 2011-09-15 Ismael Luceno <ismael at sourcemage.org>
 	* BUILD: Remove --ffast-math from CXXFLAGS
 
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  &&


More information about the SM-Commit mailing list