Add a check for ISA drivers, improve check for PNP/FW_LOADER drivers, properly check for SND being disabled in kernel.

Package-Manager: portage-2.1.2_rc2-r5

3 files changed, 40 insertions, 34 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 21a8625c1f49..5c07004e8951 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.241 2006/12/06 17:03:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.242 2006/12/06 20:04:13 flameeyes Exp $
+
+  06 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-driver-1.0.14_pre20061130.ebuild:
+  Add a check for ISA drivers, improve check for PNP/FW_LOADER drivers,
+  properly check for SND being disabled in kernel.
 
   06 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
   alsa-driver-1.0.14_pre20061130.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index ed57132722d1..ff49e9de929e 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -46,18 +46,18 @@ EBUILD alsa-driver-1.0.13.ebuild 5160 RMD160 abad5a48b406673f2a8fa62a41415fe4342
 MD5 50ff8f799846587b055c416226461783 alsa-driver-1.0.13.ebuild 5160
 RMD160 abad5a48b406673f2a8fa62a41415fe434299338 alsa-driver-1.0.13.ebuild 5160
 SHA256 497b820de807f9c3812b2e33dc117a9be8f3bbe00db67e31f2800775cdd9e95a alsa-driver-1.0.13.ebuild 5160
-EBUILD alsa-driver-1.0.14_pre20061130.ebuild 6442 RMD160 110ec7d9241d8555b1a8bd2e0f83918614a1f3f0 SHA1 734f09593358488147a37ab16a2e2e48de381125 SHA256 bf3d50db96c19a4c0d75f6272d3fea80eb34fd5af341e0330ab81feffeebda20
-MD5 65acb4f8a70d72df9f9779e6719ee33f alsa-driver-1.0.14_pre20061130.ebuild 6442
-RMD160 110ec7d9241d8555b1a8bd2e0f83918614a1f3f0 alsa-driver-1.0.14_pre20061130.ebuild 6442
-SHA256 bf3d50db96c19a4c0d75f6272d3fea80eb34fd5af341e0330ab81feffeebda20 alsa-driver-1.0.14_pre20061130.ebuild 6442
+EBUILD alsa-driver-1.0.14_pre20061130.ebuild 6915 RMD160 ecbcc9cebb0c423d14370e87bde0574dc02ad0ff SHA1 12ffcd7e86048e758cda7668390b507a5ac41c1f SHA256 a44c39cf5b065f3f8f6f00134b4fb0432a810db3055e7232093ab96f92592c35
+MD5 1829be89294f9356d0322b2aa2cb233c alsa-driver-1.0.14_pre20061130.ebuild 6915
+RMD160 ecbcc9cebb0c423d14370e87bde0574dc02ad0ff alsa-driver-1.0.14_pre20061130.ebuild 6915
+SHA256 a44c39cf5b065f3f8f6f00134b4fb0432a810db3055e7232093ab96f92592c35 alsa-driver-1.0.14_pre20061130.ebuild 6915
 EBUILD alsa-driver-9999.ebuild 4939 RMD160 ffc8cdac211e2136904639fe54c9aca242c3d7a9 SHA1 7fcb2126ef4c538a3128c954172652283310bf99 SHA256 92c3eea9df5cc7a53049d601098f0f296a01dd7f69e76ad1b874c2e9896ad22c
 MD5 c34a52c4d50bc207111ac34f68f82cdb alsa-driver-9999.ebuild 4939
 RMD160 ffc8cdac211e2136904639fe54c9aca242c3d7a9 alsa-driver-9999.ebuild 4939
 SHA256 92c3eea9df5cc7a53049d601098f0f296a01dd7f69e76ad1b874c2e9896ad22c alsa-driver-9999.ebuild 4939
-MISC ChangeLog 41669 RMD160 9888333a1f40f824730b6a2087c9312af98d9277 SHA1 f6db7a77abaf675a023f37aa1162aa8d93583919 SHA256 0134fa9384c46f4460693dbe0bb7fa7875d7df51a96f4961db7350f0ae9cc295
-MD5 2000d3e8b949d732cf2363174bca6cbe ChangeLog 41669
-RMD160 9888333a1f40f824730b6a2087c9312af98d9277 ChangeLog 41669
-SHA256 0134fa9384c46f4460693dbe0bb7fa7875d7df51a96f4961db7350f0ae9cc295 ChangeLog 41669
+MISC ChangeLog 41887 RMD160 c362ade7195293f66ae55e9d8e8d0037ce4aa116 SHA1 2505d4648d6bc4776b3efce3009ddd5a49146aeb SHA256 3cf6674a8ff89c0d81fd971f0202595ac6bbb9b18912c6a3578fd0e16986c052
+MD5 c036860cafc7627c923dda8a0d28fc85 ChangeLog 41887
+RMD160 c362ade7195293f66ae55e9d8e8d0037ce4aa116 ChangeLog 41887
+SHA256 3cf6674a8ff89c0d81fd971f0202595ac6bbb9b18912c6a3578fd0e16986c052 ChangeLog 41887
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -83,7 +83,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFdvfdAiZjviIA2XgRAuUrAKC5BXKh2avEfwzw/uRdQ+ARxqv0iwCgwdCP
-7XLTxxK/7Ct+24tzA4xWUWM=
-=fOiW
+iD8DBQFFdyJjAiZjviIA2XgRAhR1AJ9bWYOghl04v23cm8+3QWkjZvzHMwCfYdtv
+PgeEyTJWehQwcR9Xw66g47Y=
+=JhCv
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.14_pre20061130.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.14_pre20061130.ebuild
index a397d1b5365b..7205ad01a276 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.14_pre20061130.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.14_pre20061130.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.14_pre20061130.ebuild,v 1.3 2006/12/06 17:03:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.14_pre20061130.ebuild,v 1.4 2006/12/06 20:04:13 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -60,35 +60,36 @@ pkg_setup() {
 	#
 	ALSA_CARDS=${ALSA_CARDS:-${IUSE_ALSA_CARDS}}
 
+	local PNP_DRIVERS="interwave interwave-stb"
+	local PNP_ERROR="Some of the drivers you selected require PnP support in your kernel (${PNP_DRIVERS}). Either enable PnP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
+
+	local ISA_DRIVERS="cs4232 msnd-pinnacle cs4231-lib adlib ad1816a ad1848 als100 azt2320
+		cmi8330 cs4231 cs4236 dt019x  es968 es1688 es18xx gusclassic gusextreme gusmax
+		interwave interwave-stb opl3sa2 opti92x-ad1848 opti92x-cs4231 opti93x miro sb8
+		sb16 sbawe sb16_csp sgalaxy sscape wavefront"
+	local ISA_ERROR="Some of the drivers you selected require ISA support in your kernel ($(echo $ISA_DRIVERS)). Either enable ISA in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
+
+	local FW_DRIVERS="emu10k1"
+	local FW_LOADER_ERROR="Some of the drivers you selected require 'Userspace firmware loading support' in your kernel (${FW_DRIVERS}). Either enable that feature or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
+
 	local TMP_ALSA_CARDS
+	local CHECK_PNP
+	local CHECK_ISA
+	local CHECK_FW
 	for card in ${ALSA_CARDS}; do
-		has alsa_cards_${card} ${IUSE} && use alsa_cards_${card} && TMP_ALSA_CARDS="${TMP_ALSA_CARDS} ${card}"
+		if has alsa_cards_${card} ${IUSE} && use alsa_cards_${card}; then
+			TMP_ALSA_CARDS="${TMP_ALSA_CARDS} ${card}"
+			has ${card} ${PNP_DRIVERS} && CHECK_PNP="PNP"
+			has ${card} ${ISA_DRIVERS} && CHECK_ISA="ISA"
+			has ${card} ${FW_DRIVERS} && CHECK_FW="FW_LOADER"
+		fi
 	done
 	ALSA_CARDS="${TMP_ALSA_CARDS}"
 
-	# Which drivers need PNP
-	local PNP_DRIVERS="interwave interwave-stb"
-	local FW_DRIVERS="emu10k1"
-
-	local CONFIG_CHECK="SOUND"
+	local CONFIG_CHECK="!SND SOUND ${CHECK_PNP} ${CHECK_ISA} ${CHECK_FW}"
 	local SND_ERROR="ALSA is already compiled into the kernel."
 	local SOUND_ERROR="Your kernel doesn't have sound support enabled."
 	local SOUND_PRIME_ERROR="Your kernel is configured to use the deprecated OSS drivers.	 Please disable them and re-emerge alsa-driver."
-	local PNP_ERROR="Some of the drivers you selected require PnP support in your kernel (${PNP_DRIVERS}). Either enable PnP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
-	local FW_LOADER_ERROR="Some of the drivers you selected require 'Userspace firmware loading support' in your kernel (${FW_DRIVERS}). Either enable that feature or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
-
-	for pnpdriver in ${PNP_DRIVERS}; do
-		if use alsa_cards_${pnpdriver}; then
-			CONFIG_CHECK="${CONFIG_CHECK} PNP"
-			break;
-		fi
-	done
-	for fwdriver in ${FW_DRIVERS}; do
-		if use alsa_cards_${fwdriver}; then
-			CONFIG_CHECK="${CONFIG_CHECK} FW_LOADER"
-			break;
-		fi
-	done
 
 	linux-mod_pkg_setup