Source Mage code commit list

[Arwed von Merkatz <scm AT sourcemage.org>]

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

 audio-libs/libao-pulse/BUILD                        |    1 +
 audio-libs/libao-pulse/DEPENDS                      |    7 +------
 audio-libs/libao-pulse/DETAILS                      |    9 +++++----
 audio-libs/libao-pulse/HISTORY                      |    3 +++
 audio-libs/libao-pulse/INSTALL                      |    1 +
 audio-libs/libao-pulse/PRE_BUILD                    |    1 +
 audio-libs/libao-pulse/UP_TRIGGERS                  |    1 +
 audio-libs/libao-pulse/libao-pulse-0.9.3.tar.gz.sig |    0 
 audio-libs/libao/CONFLICTS                          |    1 +
 audio-libs/libao/HISTORY                            |    3 +++
 dev/null                                            |binary
 11 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit 7ef6c6ce98f47401e5a2d152584a0a10af7ec6b8
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    libao: conflict to libao-pulse for deprecation

commit 4e8b5ff1b2fee7caaa39e5a7677837292cd86684
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    libao-pulse: deprecated, part of libao now

diff --git a/audio-libs/libao-pulse/BUILD b/audio-libs/libao-pulse/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libao-pulse/BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libao-pulse/DEPENDS b/audio-libs/libao-pulse/DEPENDS
index ee4c847..80d40d1 100755
--- a/audio-libs/libao-pulse/DEPENDS
+++ b/audio-libs/libao-pulse/DEPENDS
@@ -1,6 +1 @@
-depends libao                           &&
-depends pulseaudio                      &&
-optional_depends lynx                   \
-                 "--enable-lynx"        \
-                 "--disable-lynx"       \
-                 "Enable lynx support?"
+depends libao
diff --git a/audio-libs/libao-pulse/DETAILS b/audio-libs/libao-pulse/DETAILS
index 9882212..e370a43 100755
--- a/audio-libs/libao-pulse/DETAILS
+++ b/audio-libs/libao-pulse/DETAILS
@@ -1,9 +1,10 @@
            SPELL=libao-pulse
          VERSION=0.9.3
-          SOURCE=${SPELL}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-      SOURCE_URL=http://0pointer.de/lennart/projects/${SPELL}/${SOURCE}
-      SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+#          SOURCE=${SPELL}-${VERSION}.tar.gz
+#SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+#      SOURCE_URL=http://0pointer.de/lennart/projects/${SPELL}/${SOURCE}
+#      SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+PATCHLEVEL=1
         WEB_SITE=http://0pointer.de/lennart/projects/libao-pulse/
          ENTERED=20070504
       LICENSE[0]=GPL
diff --git a/audio-libs/libao-pulse/HISTORY b/audio-libs/libao-pulse/HISTORY
index fa34aa6..e114b55 100644
--- a/audio-libs/libao-pulse/HISTORY
+++ b/audio-libs/libao-pulse/HISTORY
@@ -1,2 +1,5 @@
+2010-04-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+       * all: deprecated, now part of libao
+
 2007-05-04 Pieter Lenaerts <e-type AT sourcemage.org>
        * DETAILS, DEPENDS, HISTORY: created spell
diff --git a/audio-libs/libao-pulse/INSTALL b/audio-libs/libao-pulse/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libao-pulse/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libao-pulse/PRE_BUILD 
b/audio-libs/libao-pulse/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libao-pulse/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libao-pulse/UP_TRIGGERS 
b/audio-libs/libao-pulse/UP_TRIGGERS
new file mode 100755
index 0000000..48787b7
--- /dev/null
+++ b/audio-libs/libao-pulse/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger libao-pulse dispel_self
diff --git a/audio-libs/libao-pulse/libao-pulse-0.9.3.tar.gz.sig 
b/audio-libs/libao-pulse/libao-pulse-0.9.3.tar.gz.sig
deleted file mode 100644
index 9a873f8..0000000
Binary files a/audio-libs/libao-pulse/libao-pulse-0.9.3.tar.gz.sig and 
/dev/null differ
diff --git a/audio-libs/libao/CONFLICTS b/audio-libs/libao/CONFLICTS
new file mode 100755
index 0000000..f17d8ac
--- /dev/null
+++ b/audio-libs/libao/CONFLICTS
@@ -0,0 +1 @@
+conflicts libao-pulse y
diff --git a/audio-libs/libao/HISTORY b/audio-libs/libao/HISTORY
index dc82a86..b907b5e 100644
--- a/audio-libs/libao/HISTORY
+++ b/audio-libs/libao/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+       * CONFLICTS: added conflict libao-pulse for deprecation
+
 2010-03-26 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.0.0
        * BUILD, alsa-1.0.patch: removed, not needed anymore