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

5 files changed, 93 insertions, 17 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 3dfec3480de8..3f9326a6f7aa 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.246 2008/11/11 18:07:50 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.247 2008/11/14 02:23:54 flameeyes Exp $
+
+  14 Nov 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/alsa-utils-1.0.11_rc2-nls.patch,
+  files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch,
+  files/alsa-utils-1.0.14-alsaconf-modules-update.patch:
+  Replace the patches that has been submitted upstream with the actual patch
+  from the git repository.
 
 *alsa-utils-1.0.18 (11 Nov 2008)
 
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index bbf58019cee0..6fa6a29f5b7c 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,7 +1,7 @@
 AUX alsa-modules.conf-rc 1028 RMD160 8e115310eb0e13e08b21304c98a78e721be0029a SHA1 7a2b5fed91fa640894efaf2f557eb2b04aff1a40 SHA256 6060c101ca0793ea80e2b6b5bb8d6b118325092788ff26f07c280dd1ff546570
-AUX alsa-utils-1.0.11_rc2-nls.patch 587 RMD160 9dff7b5f75295834457ff93a13d485d66685cdf3 SHA1 79009e9a09e8f3518cbab2d7f00eb4fb3cb410aa SHA256 c68819938d0241dd38293b0e411921b3ad580390183880fd364361fe71cb6d51
-AUX alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 649 RMD160 cfb4dac18bfacf45bbb78e0c3278b431d5015d30 SHA1 02a306c5e555fe6423fb5e10b9c7fc40514b09c2 SHA256 e4da9da92bb88fbf66897da35b588bb81b6d4899a129d59237fd4d65cdd59a55
-AUX alsa-utils-1.0.14-alsaconf-modules-update.patch 502 RMD160 01d37569b6c54c5825dd5a351a83cdf874d30a00 SHA1 57a25ec1591211655440137787302bd98559fd48 SHA256 7dcf7813c0c33fe1f59b5d97bcabf6cf92f62e1bab906c88543615c502d2c1b6
+AUX alsa-utils-1.0.11_rc2-nls.patch 1212 RMD160 a83b1c634b5dd589cc0b119329453576f5995691 SHA1 4074ab6478a890052ff627f296a9310be9c839bb SHA256 ce3630efbed0cd3b3fea3a4e012e9d24f8a1f01a44d759fb5ad7bc9f6a96b7b2
+AUX alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 1283 RMD160 9bd58de0ab10c6ea8a7b310759b5b99c80681bf4 SHA1 cf3cd67c492e5c69e78e34c6a8fdfebdd84639df SHA256 8a28d91e9b6092c5f71a45bf40a9dc710fa1f305ee0738d16070eedfcb480511
+AUX alsa-utils-1.0.14-alsaconf-modules-update.patch 1337 RMD160 9910bf0845f279609c7249fd344da1a2278c071e SHA1 fe06f65b32a84f48d6589aa3c1a691a081c7a48c SHA256 5c91313683a66b4b023a1fce15bb2c00228f945bcaeaa3d668892a59098475b3
 AUX alsa-utils-1.0.14-remove-debug-printing.patch 728 RMD160 466ed5e32c8254d31104374726df42605563d2ae SHA1 921689fb952d38a09de613b9b122af1312a2f610 SHA256 92677275afd32170d8043bb1e06d194f2e9ee1d11cf89f3339d1c05a3ad59082
 AUX alsa-utils-1.0.14-seq.patch 1583 RMD160 4067b69562110bb82e54b7ef77a56bdd2ac48aaf SHA1 aa88f43ffc3b4ef697d2b81b4836cf493b4ce22a SHA256 8150feba5a28cdb5ec095817747f9c130d3f7f1b5929e0943cecd945af5d2e53
 AUX alsa-utils-1.0.14_rc2-seq.patch 1581 RMD160 66b1abc9b0cf810a5d51ae4878754d7fd767c3ce SHA1 bab8bcaacf5f339a0cfe38918db70405abf6ed43 SHA256 4ee63baf37506098b50d15c21aabadd7d80f7561a824bab541e89b4320da86c7
@@ -22,5 +22,5 @@ EBUILD alsa-utils-1.0.16-r2.ebuild 2773 RMD160 9dc2aee3e0a6538e194dfffcf775d5ca4
 EBUILD alsa-utils-1.0.16.ebuild 2318 RMD160 1eef70f21dfddd89a0e6eb923d4a26ea4c4e975d SHA1 8240b21979a6003142d7bac366679838642b9a48 SHA256 f523fadd038c96147b7511131218ddf3c315ad8ed2248e22170a07b379745f0e
 EBUILD alsa-utils-1.0.17.ebuild 2714 RMD160 73fc80dda20d3f5a8d11b5c659b441f21ca88775 SHA1 d6be05f62e8e79c9dff78762134a74ddcbb9e818 SHA256 1b75638debdd3eb89a0536cc70a43065e440c2c76f5f92ae8606b78877da255f
 EBUILD alsa-utils-1.0.18.ebuild 2682 RMD160 811d975a1b26b62ccb1f7a2d5557e4696b1c895d SHA1 b177cc35b99e09710753fbc434ccb51a48967b1a SHA256 b838d3c081aaa2412f540cec55d839ecb3b8c267aae5830745798a475a64dba0
-MISC ChangeLog 36780 RMD160 cd7aaea533a91a91b150e0335ceea94421d56c62 SHA1 b47cf9c9187831bc09fe33ab99a2608b90c70fa0 SHA256 eb0778c4ab275a9a277990ab59417cd7b3d03777e7537b8381511874af48ed5f
+MISC ChangeLog 37091 RMD160 9513b49502b1618559427e35138d42367cb8c068 SHA1 98dad4d28d0e27cca536fd9cd66ada1c711cad56 SHA256 398f2e40aac66762affa4002baffdc55cc2e8565bd7e3a12e1436959389d2adf
 MISC metadata.xml 313 RMD160 268cddbeb91eb55d326ff5736fe51e704b22db82 SHA1 2a144ccf9aa1c3789e7b25cd0e9083c5ce345b67 SHA256 4777a7e011441b62b0e6db0b35035fa99d36a0657aac31f406c7cbeaef906801
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
+