QA - 0.9.8 - fixed bad depend on portage. 1.0.7-r4 and 1.0.8 - added check in for CONFIG_PNP that 2 drivers depend on. Bug #53529 refers

(Portage version: 2.0.51-r13)

5 files changed, 73 insertions, 40 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 0d8d422e238d..b26f49e5f472 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.128 2005/01/16 20:53:06 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.129 2005/01/18 08:42:48 dragonheart Exp $
+
+  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:
+  QA - 0.9.8 - fixed bad depend on portage. 1.0.7-r4 and 1.0.8 - added check in
+  for CONFIG_PNP that 2 drivers depend on. Bug #53529 refers
 
   17 Jan 2005; Daniel Black <dragonheart@gentoo.org>
   alsa-driver-1.0.7-r4.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 259091e4accc..fe866d90c6f6 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,15 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 bb7d2c641bcbccd7340a5ce510f3979b ChangeLog 22083
+MD5 41e96583f87df098a24a1e431336477e ChangeLog 22361
 MD5 f91e7f3510d5b33588bb15b545f7a56d alsa-driver-1.0.7-r3.ebuild 3803
-MD5 29f93511201747e9c6a7262f04f5a2cd alsa-driver-0.9.8.ebuild 2341
+MD5 24b50d5d416c83edd88a4322a09a5b89 alsa-driver-0.9.8.ebuild 2314
 MD5 0bf804c34fffec8a8eced3d6f6672a71 alsa-driver-1.0.6a.ebuild 3501
-MD5 6ce6671c10bc20cf578c8fc707c4a46b alsa-driver-1.0.7-r4.ebuild 4663
+MD5 cd7897a541ab03b3d7dfd2f4a3a1f24e alsa-driver-1.0.7-r4.ebuild 4729
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 cbc06c410e94282f92dde8b31de93195 alsa-driver-1.0.8_rc1.ebuild 3519
 MD5 3c0f4daec01807f3cce65c8fff87ff3f alsa-driver-1.0.3.ebuild 3366
-MD5 58490e5ee6cad8920db143bfc2369a7f alsa-driver-1.0.8.ebuild 3516
+MD5 3787ee1a6551e52160d8a13280be9c15 alsa-driver-1.0.8.ebuild 4375
 MD5 9b2cf1594fd2216b4c6ce2e0f26616fb alsa-driver-1.0.5a.ebuild 3609
 MD5 f9d35aa6adca1137e05b1cb8852ff672 files/alsa-driver-1.0.6a-emu10k1-passthrough.patch 658
 MD5 1d70561326ef89e94179634d92782610 files/alsa-driver-1.0.4-devfix.patch 2756
@@ -31,10 +28,3 @@ MD5 8bb31a005a1db2e306c51d017fd44e70 files/alsa-driver-1.0.5a-xbox-ac97.patch 72
 MD5 831a1a1097613c2444cc3e512ff09a01 files/alsa-driver-1.0.7-audigy71.patch 643
 MD5 479ee887025f4ce7944adee1e4a6fdf3 files/digest-alsa-driver-1.0.7-r4 71
 MD5 178c3d0a289f3998f750d292905084a9 files/digest-alsa-driver-1.0.8_rc1 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB6tQ4mdTrptrqvGERAhjxAJwPRhBjf12vL6hgLjnjBP4ALLRz2QCfS9dq
-MOEtAWUwNIDERVsDpHjNCSM=
-=CNhz
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild b/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild
index 950c8fadfdad..2523b2e6400a 100644
--- a/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-0.9.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-0.9.8.ebuild,v 1.15 2005/01/01 11:43:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild,v 1.16 2005/01/18 08:42:48 dragonheart Exp $
 
 inherit eutils
 
@@ -21,8 +21,7 @@ IUSE="oss"
 
 # Need the baselayout 1.7.9 or newer for the init script to work correctly.
 DEPEND="sys-devel/autoconf
-	virtual/linux-sources
-	>=sys-apps/portage-1.9.10"
+	virtual/linux-sources"
 RDEPEND=">=sys-apps/baselayout-1.7.9"
 PROVIDE="virtual/alsa"
 
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 f183adfbff47..7848f61c9a46 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.7 2005/01/16 20:53:06 dragonheart Exp $
+# $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 $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -47,22 +47,22 @@ pkg_setup() {
 	#
 	#   env ALSA_CARDS='emu10k1 intel8x0 ens1370' emerge alsa-driver
 	#
-	use ppc && export BAD_DRIVERS="interwave interwave-stb hdspm"
+	linux_chkconfig_present PNP || export PNP_DRIVERS="interwave interwave-stb"
 
 	if [ -z "${ALSA_CARDS}" ]
 	then
 		ALSA_CARDS=all
-		if [ -n "${BAD_DRIVERS}" ]
+		if [ -n "${PNP_DRIVERS}" ]
 		then
-			ewarn "Drivers have been disabled"
-			ewarn "due to compile problems: ${BAD_DRIVERS}"
+			ewarn "Drivers have been disabled."
+			ewarn "They require CONFIG_PNP in the kernel: ${PNP_DRIVERS}"
 		fi
 	else
-		for baddriver in ${BAD_DRIVERS}
+		for pnpdriver in ${PNP_DRIVERS}
 		do
-			# check for bad drivers in ALSA_CARDS
-			[ `expr match ${baddriver} "${ALSA_CARDS}"` -gt 0 ] && \
-				die "Driver ${baddriver} failes to compile."
+			# check for pnp drivers in ALSA_CARDS
+			[ `expr match ${pnpdriver} "${ALSA_CARDS}"` -gt 0 ] && \
+				die "Driver ${pnpdriver} needs CONFIG_PNP."
 		done
 	fi
 }
@@ -105,12 +105,12 @@ src_compile() {
 	# linux-mod_src_compile doesn't work well with alsa
 
 	local myconf
-	if [ -n "${BAD_DRIVERS}" ]
+	if [ -n "${PNP_DRIVERS}" ]
 	then
-		myconf=$(echo ${BAD_DRIVERS//-/_} | sed -e 's/[a-z_]*/CONFIG_SND_\U&\E=n/g')
+		myconf=$(echo ${PNP_DRIVERS//-/_} | sed -e 's/[a-z_]*/CONFIG_SND_\U&\E=n/g')
 	fi
 
-	unset ARCH	
+	unset ARCH
 	# -j1 : see bug #71028
 	emake -j1  ${myconf} || die "Make Failed"
 
@@ -131,9 +131,9 @@ src_install() {
 	dodir /usr/include/sound
 
 	local myconf
-	if [ -n "${BAD_DRIVERS}" ]
+	if [ -n "${PNP_DRIVERS}" ]
 	then
-		myconf=$(echo ${BAD_DRIVERS//-/_} | sed -e 's/[a-z_]*/CONFIG_SND_\U&\E=n/g')
+		myconf=$(echo ${PNP_DRIVERS//-/_} | sed -e 's/[a-z_]*/CONFIG_SND_\U&\E=n/g')
 	fi
 
 	make DESTDIR=${D} ${myconf} install || die
@@ -172,9 +172,9 @@ pkg_postinst() {
 	einfo "If you experience problems, please report bugs to http://bugs.gentoo.org."
 	einfo
 
-	if use ppc
+	if [ -n "${PNP_DRIVERS}" ]
 	then
-		einfo "some drivers haven't been built due to compile problems: ${BAD_DRIVERS}"
+		einfo "some drivers haven't been built due to them requiring CONFIG_PNP in the kernel: ${PNP_DRIVERS}"
 	fi
 
 	linux-mod_pkg_postinst
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 f2edb3f78fb5..29adf1a0a4d2 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.1 2005/01/14 13:52:55 eradicator Exp $
+# $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 $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -42,10 +42,28 @@ pkg_setup() {
 	#
 	#   env ALSA_CARDS='emu10k1 intel8x0 ens1370' emerge alsa-driver
 	#
-	if [ -z "${ALSA_CARDS}" ]; then
-		ewarn "\${ALSA_CARDS} isn't set, so we are compiling all alsa drivers."
-		ALSA_CARDS="all"
+
+	linux_chkconfig_present PNP || export PNP_DRIVERS="interwave interwave-stb"
+
+	if [ -z "${ALSA_CARDS}" ]
+	then
+		ALSA_CARDS=all
+		if [ -n "${PNP_DRIVERS}" ]
+		then
+			ewarn "Some drivers have been disabled."
+			ewarn "They require CONFIG_PNP in the kernel: ${PNP_DRIVERS}"
+		else
+			ewarn "\${ALSA_CARDS} isn't set, so we are compiling all alsa drivers."
+		fi
+	else
+		for pnpdriver in ${PNP_DRIVERS}
+		do
+			# check for pnp drivers in ALSA_CARDS
+			[ `expr match ${pnpdriver} "${ALSA_CARDS}"` -gt 0 ] && \
+				die "Driver ${pnpdriver} needs CONFIG_PNP."
+		done
 	fi
+
 }
 
 src_unpack() {
@@ -72,8 +90,16 @@ src_compile() {
 
 	# linux-mod_src_compile doesn't work well with alsa
 	unset ARCH
+
+	local myconf
+	if [ -n "${PNP_DRIVERS}" ]
+	then
+		myconf=$(echo ${PNP_DRIVERS//-/_} | sed -e 's/[a-z_]*/CONFIG_SND_\U&\E=n/g')
+	fi
+
 	# -j1 : see bug #71028
-	emake -j1 || die "Parallel Make Failed"
+	emake -j1  ${myconf} || die "Make Failed"
+
 
 	if use doc;
 	then
@@ -90,7 +116,14 @@ src_compile() {
 
 src_install() {
 	dodir /usr/include/sound
-	make DESTDIR="${D}" install || die
+
+	local myconf
+	if [ -n "${PNP_DRIVERS}" ]
+	then
+		myconf=$(echo ${PNP_DRIVERS//-/_} | sed -e 's/[a-z_]*/CONFIG_SND_\U&\E=n/g')
+	fi
+
+	make DESTDIR=${D} ${myconf} install || die
 
 	# Provided by alsa-headers now
 	rm -rf ${D}/usr/include/sound
@@ -126,8 +159,14 @@ pkg_postinst() {
 	einfo "If you experience problems, please report bugs to http://bugs.gentoo.org."
 	einfo
 
+
+	if [ -n "${PNP_DRIVERS}" ]
+	then
+		einfo "some drivers haven't been built due to them requiring CONFIG_PNP in the kernel: ${PNP_DRIVERS}"
+	fi
 	linux-mod_pkg_postinst
 
 	einfo "Check out the ALSA installation guide availible at the following URL:"
 	einfo "http://www.gentoo.org/doc/en/alsa-guide.xml"
 }
+