6 files changed, 23 insertions, 13 deletions
diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index b26f49e5f472..430ee9e5b2a3 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.129 2005/01/18 08:42:48 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.130 2005/01/18 10:07:19 dragonheart Exp $
+
+  18 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  alsa-driver-1.0.6a.ebuild, alsa-driver-1.0.7-r3.ebuild,
+  alsa-driver-1.0.7-r4.ebuild, alsa-driver-1.0.8.ebuild,
+  alsa-driver-1.0.8_rc1.ebuild:
+  Changed unset ARCH to set_arch_to_kernel/set_arch_to_portage pair as per brix
 
   18 Jan 2005; Daniel Black <dragonheart@gentoo.org> alsa-driver-0.9.8.ebuild,
   alsa-driver-1.0.7-r4.ebuild, alsa-driver-1.0.8.ebuild:
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild
index c4b329813c27..91231dffa50d 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild,v 1.6 2005/01/01 11:43:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild,v 1.7 2005/01/18 10:07:19 dragonheart Exp $
 
 IUSE="oss"
 
@@ -85,8 +85,9 @@ src_compile() {
 	# Should fix bug #46901
 	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
 
-	unset ARCH
+	set_arch_to_kernel
 	emake || die "Parallel Make Failed"
+	set_arch_to_portage
 }
 
 
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild
index 8e0b7fffee4e..e24f0b879490 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild,v 1.8 2005/01/11 12:47:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild,v 1.9 2005/01/18 10:07:19 dragonheart Exp $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -81,9 +81,10 @@ src_compile() {
 		--with-cards="${ALSA_CARDS}" || die "econf failed"
 
 	# linux-mod_src_compile doesn't work well with alsa
-	unset ARCH
+	set_arch_to_kernel
 	# -j1 : see bug #71028
-	emake -j1 || die "Parallel Make Failed"
+	emake -j1 || die "Make Failed"
+	set_arch_to_portage
 
 	if use doc;
 	then
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild
index 7848f61c9a46..7f54238d80b2 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild,v 1.8 2005/01/18 08:42:48 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild,v 1.9 2005/01/18 10:07:19 dragonheart Exp $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -110,9 +110,10 @@ src_compile() {
 		myconf=$(echo ${PNP_DRIVERS//-/_} | sed -e 's/[a-z_]*/CONFIG_SND_\U&\E=n/g')
 	fi
 
-	unset ARCH
+	set_arch_to_kernel
 	# -j1 : see bug #71028
 	emake -j1  ${myconf} || die "Make Failed"
+	set_arch_to_portage
 
 	if use doc;
 	then
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild
index 29adf1a0a4d2..f9009b27732a 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild,v 1.2 2005/01/18 08:42:48 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild,v 1.3 2005/01/18 10:07:19 dragonheart Exp $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -89,7 +89,6 @@ src_compile() {
 		--with-cards="${ALSA_CARDS}" || die "econf failed"
 
 	# linux-mod_src_compile doesn't work well with alsa
-	unset ARCH
 
 	local myconf
 	if [ -n "${PNP_DRIVERS}" ]
@@ -98,8 +97,9 @@ src_compile() {
 	fi
 
 	# -j1 : see bug #71028
+	set_arch_to_kernel
 	emake -j1  ${myconf} || die "Make Failed"
-
+	set_arch_to_portage
 
 	if use doc;
 	then
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.8_rc1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.8_rc1.ebuild
index 7073b7a96b1d..fba5088b1143 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.8_rc1.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.8_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.8_rc1.ebuild,v 1.3 2005/01/11 13:24:25 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.8_rc1.ebuild,v 1.4 2005/01/18 10:07:19 dragonheart Exp $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -71,9 +71,10 @@ src_compile() {
 		--with-cards="${ALSA_CARDS}" || die "econf failed"
 
 	# linux-mod_src_compile doesn't work well with alsa
-	unset ARCH
+	set_arch_to_kernel
 	# -j1 : see bug #71028
 	emake -j1 || die "Parallel Make Failed"
+	set_arch_to_portage
 
 	if use doc;
 	then