Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 audio-creation/audacity/DEPENDS                                 |    4 +-
 audio-creation/audacity/DETAILS                                 |   16 
+++-------
 audio-creation/audacity/HISTORY                                 |    6 +++
 audio-creation/audacity/PREPARE                                 |    2 -
 audio-creation/audacity/audacity-minsrc-1.3.14-beta.tar.bz2.sig |    0 
 dev/null                                                        |binary
 6 files changed, 15 insertions(+), 13 deletions(-)

New commits:
commit 3f6537b813899a1ff5a3b249c4abe3947ef95cc8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-creation/audacity: version 2.0.2

diff --git a/audio-creation/audacity/DEPENDS b/audio-creation/audacity/DEPENDS
index 1548280..895c3f3 100755
--- a/audio-creation/audacity/DEPENDS
+++ b/audio-creation/audacity/DEPENDS
@@ -4,7 +4,9 @@ if [[ "$AUDACITY_BRANCH" == "current" ]]; then
 else
   depends wxgtk
 fi &&
-depends  lame   &&
+optional_depends  lame "--with-lame" \
+                       "--without-lame" \
+                       "for mp3 import/export support" &&
 if [[ "$AUDACITY_BRANCH" != "current" ]]; then
    depends libsndfile
 else
diff --git a/audio-creation/audacity/DETAILS b/audio-creation/audacity/DETAILS
index 5d84e3a..9f48789 100755
--- a/audio-creation/audacity/DETAILS
+++ b/audio-creation/audacity/DETAILS
@@ -11,17 +11,11 @@ in scm)
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
-;; beta)
-         VERSION=1.3.14-beta
-          SOURCE=$SPELL-minsrc-$VERSION.tar.bz2
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-      SOURCE_URL=http://audacity.googlecode.com/files/${SOURCE}
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src-$VERSION
-;; current)
-         VERSION=1.2.6
-          SOURCE=${SPELL}-src-${VERSION}.tar.gz  
-   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     
SOURCE_HASH=sha512:710d030a3b6914a89092d3113c7b7087f018a658c47c2e72aa66518538dfcb4a5ebb99d90b1fedec8e591b9287d3cc62aea24e3a583e439a935f0990788835f1
+;; *)
+         VERSION=2.0.2
+          SOURCE=${SPELL}-minsrc-${VERSION}.tar.bz2
+   SOURCE_URL[0]=http://audacity.googlecode.com/files/${SOURCE}
+     
SOURCE_HASH=sha512:3099c01b099306ee77c3df569a7412c230006ba8e7f85d6e79f0bc0373cc4c95f231aab7e1bde0d297afa3c1db7fe6dc125715d803dc78a47df4b716d7423d2e
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src-$VERSION
 ;; esac
         WEB_SITE=http://audacity.sourceforge.net/
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index 3a778f7..04a2720 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,9 @@
+2012-08-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.0.2
+       * DETAILS, PREPARE: removed option to build beta version since
+         the project doesn't publish betas anymore
+       * DEPENDS: made dependency on lame optional
+
 2011-12-14 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.3.14 (beta)
 
diff --git a/audio-creation/audacity/PREPARE b/audio-creation/audacity/PREPARE
index 9b808a1..eacefe4 100755
--- a/audio-creation/audacity/PREPARE
+++ b/audio-creation/audacity/PREPARE
@@ -1,3 +1,3 @@
 . ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch current beta scm &&
+prepare_select_branch current scm &&
 config_query AUDACITY_UNI "Enable unicode support?" n
diff --git a/audio-creation/audacity/audacity-minsrc-1.3.14-beta.tar.bz2.sig 
b/audio-creation/audacity/audacity-minsrc-1.3.14-beta.tar.bz2.sig
deleted file mode 100644
index 0cf7475..0000000
Binary files 
a/audio-creation/audacity/audacity-minsrc-1.3.14-beta.tar.bz2.sig and 
/dev/null differ