From: Daniel Drake <dsd@gentoo.org>
Date: Fri, 27 Apr 2007 00:28:57 +0000 (+0000)
Subject: Fix rmedigicontrol build, patch from Andreas Sundebo in bug #172392
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=393102e407fe0d1705563b44dd05068aa446aa28;p=gentoo.git

Fix rmedigicontrol build, patch from Andreas Sundebo in bug #172392
Package-Manager: portage-2.1.2.4
---

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index b0821cf65b01..4c950e86b6e0 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/alsa-tools
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.143 2007/04/27 00:23:06 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.144 2007/04/27 00:28:57 dsd Exp $
+
+  27 Apr 2007; Daniel Drake <dsd@gentoo.org>
+  alsa-tools-1.0.14_rc3-r1.ebuild:
+  Fix rmedigicontrol build, patch from Andreas Sundebo in bug #172392
 
 *alsa-tools-1.0.14_rc3-r1 (27 Apr 2007)
 
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index d452a3807ce5..9e0bdb4089a1 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -17,18 +17,18 @@ EBUILD alsa-tools-1.0.14_rc1.ebuild 2555 RMD160 d56a39c292603a35f99deb9e05e45d9e
 MD5 a5bd1febf7a6b2f3e73d139d773edb30 alsa-tools-1.0.14_rc1.ebuild 2555
 RMD160 d56a39c292603a35f99deb9e05e45d9e4268c10c alsa-tools-1.0.14_rc1.ebuild 2555
 SHA256 49fb940036f707963ff6b60718f7489e6f170c2eb28ac3a0aafe211abff9eb01 alsa-tools-1.0.14_rc1.ebuild 2555
-EBUILD alsa-tools-1.0.14_rc3-r1.ebuild 3679 RMD160 7f73a0ca5e568d45f1c6b2ed1d46654670f5b0b6 SHA1 025e7b9c0e9c49f2ff0f7007d0af66ab38b2ba0c SHA256 541d999d037952bc3c07407e6670bed1934fc67700fbaa5927e8b3dd9981c05e
-MD5 b52141d61ec9f9df0780f86a3bc5fc0e alsa-tools-1.0.14_rc3-r1.ebuild 3679
-RMD160 7f73a0ca5e568d45f1c6b2ed1d46654670f5b0b6 alsa-tools-1.0.14_rc3-r1.ebuild 3679
-SHA256 541d999d037952bc3c07407e6670bed1934fc67700fbaa5927e8b3dd9981c05e alsa-tools-1.0.14_rc3-r1.ebuild 3679
+EBUILD alsa-tools-1.0.14_rc3-r1.ebuild 3688 RMD160 1f122eed7a4fdabb5efae6b972684ae01275e81a SHA1 65c3f1b185d598f42adac70b1941405df601f9d6 SHA256 c5a776953c72a4824aa3dddfb6f15c75f79da6ca94711ce966b6ffda5ad0a58c
+MD5 18aef9e9ff106f61acf22d490dccfb08 alsa-tools-1.0.14_rc3-r1.ebuild 3688
+RMD160 1f122eed7a4fdabb5efae6b972684ae01275e81a alsa-tools-1.0.14_rc3-r1.ebuild 3688
+SHA256 c5a776953c72a4824aa3dddfb6f15c75f79da6ca94711ce966b6ffda5ad0a58c alsa-tools-1.0.14_rc3-r1.ebuild 3688
 EBUILD alsa-tools-1.0.14_rc3.ebuild 3662 RMD160 dbd3ece58d692c12d85cc03df51e91ffb7ca88a6 SHA1 adedb79508c8735df77bbd23db6bef95fa5744dc SHA256 aab92bab42a7c5de3751532dd294af96fbcbb906c4e2a82220041ba01e6414ec
 MD5 1a15e0568898ec54c4263eb773fe72b7 alsa-tools-1.0.14_rc3.ebuild 3662
 RMD160 dbd3ece58d692c12d85cc03df51e91ffb7ca88a6 alsa-tools-1.0.14_rc3.ebuild 3662
 SHA256 aab92bab42a7c5de3751532dd294af96fbcbb906c4e2a82220041ba01e6414ec alsa-tools-1.0.14_rc3.ebuild 3662
-MISC ChangeLog 20325 RMD160 ea4c3e0ae07de92c5c8584b20b09392ee969fd59 SHA1 a7bbb0775e70100729fcad220c5e52c8fac0dc2a SHA256 de66bc69a5f236e6701257be3a908ec38243f0df56194fe9adb69d91c2de7ed7
-MD5 30aa686553ba3b82dbfea6e6ecb8eebe ChangeLog 20325
-RMD160 ea4c3e0ae07de92c5c8584b20b09392ee969fd59 ChangeLog 20325
-SHA256 de66bc69a5f236e6701257be3a908ec38243f0df56194fe9adb69d91c2de7ed7 ChangeLog 20325
+MISC ChangeLog 20476 RMD160 b0879b3cbf0bd787e63a7c52d1e2eccf28f17a64 SHA1 83732a0f991262d39bdd2c7da4b136dc86a38b73 SHA256 c6aba32b018b4802b63fb8c0d118bc4b4fb04ccd1a195ef7a27610b93daf90a9
+MD5 ee24f5f648254a1fbc38ca88819581ec ChangeLog 20476
+RMD160 b0879b3cbf0bd787e63a7c52d1e2eccf28f17a64 ChangeLog 20476
+SHA256 c6aba32b018b4802b63fb8c0d118bc4b4fb04ccd1a195ef7a27610b93daf90a9 ChangeLog 20476
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.14_rc3-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.14_rc3-r1.ebuild
index 39c62f0d2607..7656e5c23ae5 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.14_rc3-r1.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.14_rc3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14_rc3-r1.ebuild,v 1.1 2007/04/27 00:23:06 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14_rc3-r1.ebuild,v 1.2 2007/04/27 00:28:57 dsd Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
@@ -50,8 +50,9 @@ pkg_setup() {
 	if use gtk; then
 		use midi && use alsa_cards_ice1712 && \
 			ALSA_TOOLS="${ALSA_TOOLS} envy24control"
-		use alsa_cards_rme32 && use alsa_cards_rme96 && \
+		if use alsa_cards_rme32 || use alsa_cards_rme96; then
 			ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol"
+		fi
 	fi
 
 	if use alsa_cards_hdsp || use alsa_cards_hdspm; then