Make bad alsa headers non-fatal.

3 files changed, 24 insertions, 8 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 2dd5160ad8cd..854aebad9050 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.74 2004/07/02 10:41:25 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.75 2004/07/03 00:40:06 eradicator Exp $
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-lib-1.0.5-r2.ebuild:
+  Make bad alsa headers non-fatal.
 
   02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   files/fix-asound_h.patch:
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index be7591a5e47d..3f9d0e09c3f2 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -7,8 +7,8 @@ MD5 30c24770677d9b2cd942438b6e46761e alsa-lib-1.0.3b-r2.ebuild 1329
 MD5 2236aa4afa6a060c354d1b7e0d90b1e8 alsa-lib-1.0.4.ebuild 1714
 MD5 60e98bd5e8fe3c26aa3162a591ddb58e alsa-lib-1.0.5.ebuild 1718
 MD5 e1147a642867b3b3ea43518a1376f6d2 metadata.xml 250
-MD5 11be8cd84c4c9c82c171d896e62e56ed ChangeLog 11215
-MD5 c2abd6412c8bc46d842c69c1f77de1e1 alsa-lib-1.0.5-r2.ebuild 3362
+MD5 5241ae0a262c37b58053ec58cddf8e94 ChangeLog 11336
+MD5 59ef099c56483b6ea1afbbc4c8450abe alsa-lib-1.0.5-r2.ebuild 3744
 MD5 7866cccb2308203280e2a4382cbddee4 files/alsa-lib-1.0.3b-rate-capture.patch 565
 MD5 190a6c4ffe2eef20e3095ab70ea34941 files/configure.diff 586
 MD5 e015f7b1e3c316cf8c9dbbd0bf77a5a7 files/digest-alsa-lib-0.5.10b 69
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.5-r2.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.5-r2.ebuild
index bb8a3fd81c4a..1aa691510db5 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.5-r2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.5-r2.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-libs/alsa-lib/alsa-lib-1.0.5-r2.ebuild,v 1.2 2004/07/01 19:08:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.5-r2.ebuild,v 1.3 2004/07/03 00:40:06 eradicator Exp $
 
 inherit libtool
 
@@ -25,7 +25,8 @@ MY_P=${P/_rc/rc}
 SRC_URI="mirror://alsaproject/lib/${MY_P}.tar.bz2"
 S=${WORKDIR}/${MY_P}
 
-pkg_setup() {
+#pkg_setup() {
+pkg_postinst() {
 	# This is kinda hackish, so if someone else has a better idea,
 	# feel free to implement it.  We need to detect if /usr/include/sound
 	# exists.  If it does, then we leave it alone.  If it doesn't, we
@@ -48,8 +49,9 @@ pkg_setup() {
 		echo "yes"
 		eerror "Your version of:"
 		eerror "  /usr/include/sound/asound.h"
-		eerror "is broken (from a user space perspective).  Please apply"
-		eerror "the following patch:"
+		eerror "is broken (from a user space perspective).  Programs which"
+		eerror "rely on the alsa driver headers will fail to compile. Please"
+		eerror "apply the following patch:"
 		echo
 		eerror "*******************************************************"
 		cat ${FILESDIR}/fix-asound_h.patch
@@ -59,7 +61,17 @@ pkg_setup() {
 		eerror "cd /usr/include/sound"
 		eerror "patch -p0 < ${FILESDIR}/fix-asound_h.patch"
 		echo
-		die "Broken sound/asound.h header included in kernel sources!"
+		eerror "If that doesn't work, please apply the patch by hand by"
+		eerror "editing /usr/include/sound/asound.h in a text editor."
+		echo
+#		die "Broken sound/asound.h header included in kernel sources!"
+
+		eerror "Continuting in 10 seconds to let you read this note: "
+		for d in 10 9 8 7 6 5 4 3 2 1; do
+			echo -n "$d "
+			sleep 1
+		done
+		echo
 	else
 		echo "no"
 	fi