From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Sat, 27 Nov 2004 09:56:01 +0000 (+0000)
Subject: Fixing kernel configuration check.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=343174d7e9d167acdbf4ff8bc97ad11c560d8d8a;p=gentoo.git

Fixing kernel configuration check.
---

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 93661348930c..7acd3f76688d 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.111 2004/11/26 22:38:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.112 2004/11/27 09:56:01 eradicator Exp $
+
+  27 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.7-r1.ebuild:
+  Fixing kernel configuration check.
 
   26 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-driver-1.0.7-r1.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 197de032e429..1430d0d6d897 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b38f7d7acfc51af9921312107cc0d7ae ChangeLog 18939
+MD5 7d2cf121119f38748dba51e4f59fca4e ChangeLog 19065
 MD5 46f88ce4ab65513f63f868e186942482 alsa-driver-1.0.7.ebuild 4128
-MD5 d543a9870da0d8a52737040b37f7e18d alsa-driver-1.0.7-r1.ebuild 3625
+MD5 b866d54c043eed16be27989e62ae0b8e alsa-driver-1.0.7-r1.ebuild 3742
 MD5 d388a1b0706024ddccccc99045b976f9 alsa-driver-0.9.8.ebuild 2341
 MD5 e5de43659b629d1e9f0ee8d3f1864840 alsa-driver-1.0.3.ebuild 3363
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
@@ -30,7 +30,7 @@ MD5 8bb31a005a1db2e306c51d017fd44e70 files/alsa-driver-1.0.5a-xbox-ac97.patch 72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBp7CQArHZZzCEUG0RAq+GAJsEVXO9ltyIgGIdBTzs9oh3JEVjmwCfSSsb
-iUNJF+PBQRK9scDdsghVi6Y=
-=Woc0
+iD8DBQFBqE9LArHZZzCEUG0RAh4qAJ4sRDTgE62jjgsu+PQS9PBnLRApIgCffHoT
+nNeM43W7M9eyRxSmQvLzMfA=
+=n3LJ
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.7-r1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.7-r1.ebuild
index 87aae30618af..b8a495f075a9 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.7-r1.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r1.ebuild,v 1.5 2004/11/26 22:39:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.7-r1.ebuild,v 1.6 2004/11/27 09:56:01 eradicator Exp $
 
 IUSE="oss doc"
 
@@ -111,11 +111,11 @@ src_install() {
 
 pkg_setup() {
 	linux-mod_pkg_setup
-	if [ ! getfilevar_isset ] ;
-	then
-		eerror "Sound support is currently built into the kernel."
-		eerror "unable to continue."
-		die Sound support built into kernel already
+	if getfilevar_isset CONFIG_SND ${KV_DIR}/.config || 
+	   ! getfilevar_isset CONFIG_SOUND ${KV_DIR}/.config; then
+		eerror "Your kernel is improperly configured.  Unable to continue."
+		eerror "You must enable sound support, but not ALSA in the kernel."
+		die Kernel improperly configured.
 	fi
 
 	# By default, drivers for all supported cards will be compiled.