Replace the patches that has been submitted upstream with the actual patch from the git repository.

3 files changed, 81 insertions, 12 deletions

diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc2-nls.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc2-nls.patch
index 864df3811e55..c81889cf811c 100644
--- a/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc2-nls.patch
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc2-nls.patch
@@ -1,7 +1,24 @@
-Index: alsa-utils-1.0.11rc2/speaker-test/speaker-test.c
-===================================================================
---- alsa-utils-1.0.11rc2.orig/speaker-test/speaker-test.c
-+++ alsa-utils-1.0.11rc2/speaker-test/speaker-test.c
+From 01285f20d9f1c51d251bc143dd1c9f2ad026f87b Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Diego=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Thu, 13 Nov 2008 13:22:13 +0100
+Subject: [PATCH] Move conditional inclusion of locale.h further down.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+Without this patch, ENABLE_NLS is checked before ever being defined
+(aconfig.h is not yet included), and thus locale.h would never be
+included even when NLS is enabled.
+
+Signed-off-by: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
+---
+ speaker-test/speaker-test.c |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c
+index 57a7cbc..b8cd5c8 100644
+--- a/speaker-test/speaker-test.c
++++ b/speaker-test/speaker-test.c
 @@ -44,9 +44,6 @@
  #include <getopt.h>
  #include <inttypes.h>
@@ -23,3 +40,6 @@ Index: alsa-utils-1.0.11rc2/speaker-test/speaker-test.c
  enum {
    TEST_PINK_NOISE = 1,
    TEST_SINE,
+-- 
+1.6.0.3
+
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch
index 89f74b74466a..9f1f0efb3564 100644
--- a/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch
@@ -1,8 +1,27 @@
-Index: alsa-utils-1.0.11rc5/alsaconf/alsaconf.in
-===================================================================
---- alsa-utils-1.0.11rc5.orig/alsaconf/alsaconf.in
-+++ alsa-utils-1.0.11rc5/alsaconf/alsaconf.in
-@@ -1394,7 +1394,7 @@ if [ x$devs_found != x ]; then
+From 6596a405f6b9f00dcbab9548a1e0afce04b99421 Mon Sep 17 00:00:00 2001
+From: grdscarabe@grdscarabe.net <grdscarabe@grdscarabe.net>
+Date: Thu, 13 Nov 2008 13:22:55 +0100
+Subject: [PATCH] Create a special fd redirection for menu choice.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+Without this patch, dialog errors gets interpreted as the choice,
+causing errors related to loading "snd-***" module.
+
+The problem was reported as Gentoo bug #96467 (
+https://bugs.gentoo.org/show_bug.cgi?id=96467 ).
+
+Signed-off-by: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
+---
+ alsaconf/alsaconf.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in
+index 47d6da5..806ddb6 100644
+--- a/alsaconf/alsaconf.in
++++ b/alsaconf/alsaconf.in
+@@ -1411,7 +1411,7 @@ if [ x$devs_found != x ]; then
           Following card(s) are found on your system.
           Choose a soundcard to configure:
  ")
@@ -11,3 +30,6 @@ Index: alsa-utils-1.0.11rc5/alsaconf/alsaconf.in
      card=`head -n 1 $FOUND`
      if [ "$card" = "legacy" ]; then
  	ac_config_legacy
+-- 
+1.6.0.3
+
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.14-alsaconf-modules-update.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.14-alsaconf-modules-update.patch
index a20f8918c6e7..72699cde4b0e 100644
--- a/media-sound/alsa-utils/files/alsa-utils-1.0.14-alsaconf-modules-update.patch
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.14-alsaconf-modules-update.patch
@@ -1,6 +1,26 @@
+From 2c79b79b4780cae2192ecfc4ba5615d6b0d13f5b Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Diego=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Thu, 13 Nov 2008 13:23:04 +0100
+Subject: [PATCH] Nowadays Gentoo also uses update-modules, so update alsaconf.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+This was originally reported as Gentoo bug #193303 (
+https://bugs.gentoo.org/show_bug.cgi?id=193303 ).
+
+Original patch by Jack Kelly <endgame.dos@gmail.com>
+
+Signed-off-by: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
+---
+ alsaconf/alsaconf.in |   13 ++++++-------
+ 1 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in
+index 806ddb6..6e9ff75 100644
 --- a/alsaconf/alsaconf.in
 +++ b/alsaconf/alsaconf.in
-@@ -904,13 +904,8 @@ BEGIN { in_sound=0; }
+@@ -908,13 +908,12 @@ BEGIN { in_sound=0; }
  
      farewell
      clear
@@ -11,8 +31,15 @@
 -      xecho "Running update-modules..."
 -      update-modules
 -    fi
-+    xecho "Running update-modules..."
-+    update-modules
++    case "$distribution" in
++    gentoo | debian)
++	xecho "Running update-modules..."
++	update-modules
++	;;
++    esac
      if [ -x $rcalsasound ] ; then
        echo Loading driver...
        $rcalsasound restart
+-- 
+1.6.0.3
+