Add patch to fix include order.

Package-Manager: portage-2529-svn

4 files changed, 52 insertions, 5 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 717c94c91e01..65ff1df6d5f6 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.134 2006/01/11 18:40:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.135 2006/01/23 19:10:25 flameeyes Exp $
+
+  23 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/alsa-utils-1.0.11_rc2-nls.patch, alsa-utils-1.0.11_rc2.ebuild:
+  Add patch to fix include order.
 
   11 Jan 2006; Jeroen Roovers <jer@gentoo.org> alsa-utils-1.0.11_rc2.ebuild:
   Marked stable for hppa (bug #111968).
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 11e85f22f867..8bef9f7895b5 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,8 +1,12 @@
-MD5 c221053a3924889eb15575892a9cda8e ChangeLog 20612
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 97efa8dff42d9963abcc3a744d302fe6 ChangeLog 20778
 MD5 ea6e42934c950f573d27291ff73cf09d alsa-utils-1.0.10.ebuild 2414
-MD5 125bbd58a9f110243ec8c98e62ceb722 alsa-utils-1.0.11_rc2.ebuild 2421
+MD5 5bffb94550cef495b54404883b2ddd03 alsa-utils-1.0.11_rc2.ebuild 2492
 MD5 8bf806386c8a966605549b7a91fd9131 alsa-utils-1.0.9a.ebuild 2343
 MD5 954b0951b5fed9bf591abf9e7cc1963e files/alsa-modules.conf-rc 1162
+MD5 5d34abc973abfd894d764986b8408cd6 files/alsa-utils-1.0.11_rc2-nls.patch 587
 MD5 2a50971b115f63d74d0054c7e3ee9144 files/alsasound 7106
 MD5 6e3b02ef9e95e47eb339f6a3d0d91daa files/alsasound-1.0.10_rc2 7183
 MD5 f4f492c382b243ebf558809a372fd6b7 files/alsasound.confd 515
@@ -10,3 +14,10 @@ MD5 a86ec4a87712d028c83f9066f4505551 files/digest-alsa-utils-1.0.10 70
 MD5 d97909af462b2d708b5c64c15d4983d6 files/digest-alsa-utils-1.0.11_rc2 73
 MD5 2bfc6eaf49d769272a46ed2046b73944 files/digest-alsa-utils-1.0.9a 70
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD1So6AiZjviIA2XgRApvaAJ4u0FlXsDV7J0dGB83Iiwj4N7L9BwCdGEFP
+BF6zPN4B5UP8ZaAN3E+fnyw=
+=DIxQ
+-----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.11_rc2.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.11_rc2.ebuild
index be9829e62088..46df26e2f630 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.11_rc2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.11_rc2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.11_rc2.ebuild,v 1.3 2006/01/11 18:40:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.11_rc2.ebuild,v 1.4 2006/01/23 19:10:25 flameeyes Exp $
 
-inherit eutils flag-o-matic autotools
+inherit eutils autotools
 
 MY_P="${P/_rc/rc}"
 
@@ -23,6 +23,13 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-nls.patch"
+}
+
 src_compile() {
 	econf \
 		$(use_enable nls) \
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
new file mode 100644
index 000000000000..864df3811e55
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc2-nls.patch
@@ -0,0 +1,25 @@
+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
+@@ -44,9 +44,6 @@
+ #include <getopt.h>
+ #include <inttypes.h>
+ #include <ctype.h>
+-#ifdef ENABLE_NLS
+-#include <locale.h>
+-#endif
+ #include <byteswap.h>
+ 
+ #define ALSA_PCM_NEW_HW_PARAMS_API
+@@ -59,6 +56,10 @@
+ #include "gettext.h"
+ #include "version.h"
+ 
++#ifdef ENABLE_NLS
++#include <locale.h>
++#endif
++
+ enum {
+   TEST_PINK_NOISE = 1,
+   TEST_SINE,