Disabled some ppc drivers due to compile problems as per bug #53529

Package-Manager: portage-2.0.51-r13

3 files changed, 74 insertions, 30 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index bf0240fafb68..0d8d422e238d 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.127 2005/01/14 13:52:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.128 2005/01/16 20:53:06 dragonheart Exp $
+
+  17 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  alsa-driver-1.0.7-r4.ebuild:
+  Disabled some ppc drivers due to compile problems as per bug #53529. Added
+  ~ppc keyword
 
 *alsa-driver-1.0.8 (14 Jan 2005)
 
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 3c282e56688d..259091e4accc 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,40 +1,40 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 088425a0f2d8bf9480208483cfc5155a ChangeLog 21905
-MD5 133dcf5fd2cb2802e703806517e8c2d5 alsa-driver-1.0.7-r4.ebuild 3862
-MD5 29f93511201747e9c6a7262f04f5a2cd alsa-driver-0.9.8.ebuild 2341
+MD5 bb7d2c641bcbccd7340a5ce510f3979b ChangeLog 22083
 MD5 f91e7f3510d5b33588bb15b545f7a56d alsa-driver-1.0.7-r3.ebuild 3803
-MD5 3c0f4daec01807f3cce65c8fff87ff3f alsa-driver-1.0.3.ebuild 3366
-MD5 cbc06c410e94282f92dde8b31de93195 alsa-driver-1.0.8_rc1.ebuild 3519
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 9b2cf1594fd2216b4c6ce2e0f26616fb alsa-driver-1.0.5a.ebuild 3609
+MD5 29f93511201747e9c6a7262f04f5a2cd alsa-driver-0.9.8.ebuild 2341
 MD5 0bf804c34fffec8a8eced3d6f6672a71 alsa-driver-1.0.6a.ebuild 3501
+MD5 6ce6671c10bc20cf578c8fc707c4a46b alsa-driver-1.0.7-r4.ebuild 4663
+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 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
+MD5 e1b13905eac70fe728dcb85fcaac27a9 files/digest-alsa-driver-1.0.6a 72
 MD5 14b6c8d954e36bb9d40c97cf051220f0 files/digest-alsa-driver-1.0.8 71
 MD5 bc0105e64f35a41aa0602c43e7f09733 files/alsa-driver-1.0.7-configure.patch 21924
-MD5 8c120f7730b91118d0a8148d2deb3a43 files/alsa-driver-0.9.8-au-fix.patch 1267
-MD5 1d70561326ef89e94179634d92782610 files/alsa-driver-1.0.4-devfix.patch 2756
-MD5 08af7cfec9cd33819c62880d6219f3a5 files/alsa-driver-1.0.5-devfix.patch 763
-MD5 8cfc2afad77baecf06694bee8bd67d4a files/alsa-driver-1.0.7-xbox.patch 645
-MD5 479ee887025f4ce7944adee1e4a6fdf3 files/digest-alsa-driver-1.0.7-r4 71
-MD5 178c3d0a289f3998f750d292905084a9 files/digest-alsa-driver-1.0.8_rc1 74
-MD5 831a1a1097613c2444cc3e512ff09a01 files/alsa-driver-1.0.7-audigy71.patch 643
+MD5 4d7c4de4eaa3007e13360d7434ecb284 files/alsa-driver-1.0.7-ioctl32.patch-r2 44165
+MD5 479ee887025f4ce7944adee1e4a6fdf3 files/digest-alsa-driver-1.0.7-r3 71
 MD5 439dab13c036317c9b308b234ecf7290 files/digest-alsa-driver-0.9.8 71
-MD5 e1b13905eac70fe728dcb85fcaac27a9 files/digest-alsa-driver-1.0.6a 72
-MD5 938a2ee36c54416322d1acd47b249c99 files/digest-alsa-driver-1.0.3 71
 MD5 27684bd356b1a43809d3f8c847a6abce files/alsa-driver-1.0.6a-kbuild.patch 575
-MD5 f9d35aa6adca1137e05b1cb8852ff672 files/alsa-driver-1.0.6a-emu10k1-passthrough.patch 658
+MD5 938a2ee36c54416322d1acd47b249c99 files/digest-alsa-driver-1.0.3 71
 MD5 27ccbe36406f145c1d63725a53517233 files/makefile.patch 1122
-MD5 deb0bfd8e2cfe0ba434fb5a820294502 files/digest-alsa-driver-1.0.5a 72
+MD5 8c120f7730b91118d0a8148d2deb3a43 files/alsa-driver-0.9.8-au-fix.patch 1267
+MD5 8cfc2afad77baecf06694bee8bd67d4a files/alsa-driver-1.0.7-xbox.patch 645
+MD5 08af7cfec9cd33819c62880d6219f3a5 files/alsa-driver-1.0.5-devfix.patch 763
 MD5 a2ee6fa920bbac70835b4a58e5759e8c files/alsa-driver-1.0.5a-cs46xx-passthrough.patch 446
+MD5 deb0bfd8e2cfe0ba434fb5a820294502 files/digest-alsa-driver-1.0.5a 72
 MD5 8bb31a005a1db2e306c51d017fd44e70 files/alsa-driver-1.0.5a-xbox-ac97.patch 721
-MD5 4d7c4de4eaa3007e13360d7434ecb284 files/alsa-driver-1.0.7-ioctl32.patch-r2 44165
-MD5 479ee887025f4ce7944adee1e4a6fdf3 files/digest-alsa-driver-1.0.7-r3 71
+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)
 
-iD8DBQFB5871ArHZZzCEUG0RApvTAJ4x1LAiwtAZ2R55lYnQpZZX7BsPCQCfS7X0
-zZugWSUYe8WH7fHl2qK4Sq4=
-=Nbkc
+iD8DBQFB6tQ4mdTrptrqvGERAhjxAJwPRhBjf12vL6hgLjnjBP4ALLRz2QCfS9dq
+MOEtAWUwNIDERVsDpHjNCSM=
+=CNhz
 -----END PGP SIGNATURE-----
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 b7106f27db7a..f183adfbff47 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.6 2005/01/11 12:47:47 eradicator Exp $
+# $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 $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -16,7 +16,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
 # This just has updates for xbox over -r3
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
 
 RDEPEND="virtual/modutils
 	 ~media-sound/alsa-headers-${PV}"
@@ -29,6 +29,9 @@ DEPEND="${RDEPEND}
 
 PROVIDE="virtual/alsa"
 
+
+
+
 pkg_setup() {
 	CONFIG_CHECK="SOUND !SND !SOUND_PRIME"
 	SND_ERROR="ALSA is already compiled into the kernel."
@@ -44,7 +47,24 @@ pkg_setup() {
 	#
 	#   env ALSA_CARDS='emu10k1 intel8x0 ens1370' emerge alsa-driver
 	#
-	[ -z "${ALSA_CARDS}" ] && ALSA_CARDS=all
+	use ppc && export BAD_DRIVERS="interwave interwave-stb hdspm"
+
+	if [ -z "${ALSA_CARDS}" ]
+	then
+		ALSA_CARDS=all
+		if [ -n "${BAD_DRIVERS}" ]
+		then
+			ewarn "Drivers have been disabled"
+			ewarn "due to compile problems: ${BAD_DRIVERS}"
+		fi
+	else
+		for baddriver in ${BAD_DRIVERS}
+		do
+			# check for bad drivers in ALSA_CARDS
+			[ `expr match ${baddriver} "${ALSA_CARDS}"` -gt 0 ] && \
+				die "Driver ${baddriver} failes to compile."
+		done
+	fi
 }
 
 src_unpack() {
@@ -83,9 +103,16 @@ 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 "${BAD_DRIVERS}" ]
+	then
+		myconf=$(echo ${BAD_DRIVERS//-/_} | sed -e 's/[a-z_]*/CONFIG_SND_\U&\E=n/g')
+	fi
+
+	unset ARCH	
 	# -j1 : see bug #71028
-	emake -j1 || die "Parallel Make Failed"
+	emake -j1  ${myconf} || die "Make Failed"
 
 	if use doc;
 	then
@@ -102,7 +129,14 @@ src_compile() {
 
 src_install() {
 	dodir /usr/include/sound
-	make DESTDIR=${D} install || die
+
+	local myconf
+	if [ -n "${BAD_DRIVERS}" ]
+	then
+		myconf=$(echo ${BAD_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
@@ -138,6 +172,11 @@ pkg_postinst() {
 	einfo "If you experience problems, please report bugs to http://bugs.gentoo.org."
 	einfo
 
+	if use ppc
+	then
+		einfo "some drivers haven't been built due to compile problems: ${BAD_DRIVERS}"
+	fi
+
 	linux-mod_pkg_postinst
 
 	einfo "Check out the ALSA installation guide availible at the following URL:"