Robustified the build. See bug #25775 for the basic jist.

4 files changed, 72 insertions, 3 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index b3709e432f39..c6cf05d39918 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-tools
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.26 2003/07/29 19:57:49 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.27 2003/08/18 11:29:53 g2boojum Exp $
+
+*alsa-tools-0.9.6-r1 (18 Aug 2003)
+
+  18 Aug 2003; Nick Hadaway <raker@gentoo.org> alsa-tools-0.9.6-r1.ebuild:
+  See bug #25775.  Brought the ALSA_TOOLS list up to date and added
+  a small fix0r for a non compiling hdspmixer.
 
   04 Jul 2003; jje <jje@gentoo.org> alsa-tools-0.9.4.ebuild:
   Added alsa-driver to DEPEND. See #23613. Most people follow the instructions
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 60871120fd82..0ef7fcbacfbc 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,9 +1,10 @@
 MD5 3549f3e434bec636ea7f5824f870694f alsa-tools-0.9.0_rc1-r1.ebuild 1320
+MD5 5bcceb61a4ddec540b989b8b089323fe alsa-tools-0.9.6.ebuild 1304
 MD5 86fc807b53b47d3d0d2fda967a1c2418 alsa-tools-0.9.1.ebuild 1297
 MD5 235d10a1de9c1536889541d74324b77d alsa-tools-0.9.3.ebuild 1298
-MD5 632dc4d1054325f4b73a8c43ed1a99af alsa-tools-0.9.6-r1.ebuild 1628
+MD5 c697ae874770889ce6831604f2a9f3b9 alsa-tools-0.9.6-r1.ebuild 1602
 MD5 3f4ddfc5fc2a6b1b97326892e3c9b459 alsa-tools-0.9.5-r1.ebuild 1396
-MD5 646ecae6aea5dbef0854b3245fc6ca99 ChangeLog 3708
+MD5 c19248447e9e41fd2304397c17964cee ChangeLog 3936
 MD5 3422c9155140d82e399df2f0ad07a053 alsa-tools-0.9.4.ebuild 1408
 MD5 39600c0be0d77ae2146d432ac5fd9ac5 files/digest-alsa-tools-0.9.5-r1 69
 MD5 283e31534ffc30ab423217d89fd5a37a files/digest-alsa-tools-0.9.6-r1 70
diff --git a/media-sound/alsa-tools/alsa-tools-0.9.6-r1.ebuild b/media-sound/alsa-tools/alsa-tools-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..9aa7c5577268
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-0.9.6-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-0.9.6-r1.ebuild,v 1.1 2003/08/18 11:29:53 g2boojum Exp $
+
+IUSE=""
+
+DESCRIPTION="Advanced Linux Sound Architecture tools"
+HOMEPAGE="http://www.alsa-project.org"
+SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
+
+SLOT="0.9"
+KEYWORDS="~x86 ~ppc"
+LICENSE="GPL-2"
+
+DEPEND=">=media-libs/alsa-lib-0.9.6
+	virtual/alsa
+	=x11-libs/fltk-1.1*
+	=x11-libs/gtk+-1.2*"
+
+# This is a list of the tools in the package.
+# Some of the tools don't make proper use of CFLAGS, even though
+# all of them seem to use autoconf.  This needs to be fixed.
+ALSA_TOOLS="ac3dec as10k1 envy24control hdsploader hdspmixer mixartloader rmedigicontrol sb16_csp seq/sbiload sscape_ctl vxloader"
+
+src_compile() {
+    # hdspmixer requires fltk
+    export LDFLAGS="-L/usr/lib/fltk-1.1"
+    export CPPFLAGS="-I/usr/include/fltk-1.1"
+
+    # hdspmixer is missing depconf - copy from the hdsploader directory
+    cp ${S}/hdsploader/depcomp ${S}/hdspmixer/
+
+    local f
+    for f in ${ALSA_TOOLS}
+    do
+	cd "${S}/${f}"
+	econf || die "configure failed"
+	make || die "make failed"
+    done
+}
+
+src_install() {
+    local f
+    for f in ${ALSA_TOOLS}
+    do
+	# Install the main stuff
+	cd "${S}/${f}"
+	make DESTDIR="${D}" install || die
+
+	# Install the text documentation
+	local doc
+	for doc in README TODO ChangeLog COPYING AUTHORS
+	do
+	    if [ -f "${doc}" ]
+	    then
+		mv "${doc}" "${doc}.`basename ${f}`"
+		dodoc "${doc}.`basename ${f}`"
+	    fi
+	done
+    done
+}
diff --git a/media-sound/alsa-tools/files/digest-alsa-tools-0.9.6-r1 b/media-sound/alsa-tools/files/digest-alsa-tools-0.9.6-r1
new file mode 100644
index 000000000000..50949459e78a
--- /dev/null
+++ b/media-sound/alsa-tools/files/digest-alsa-tools-0.9.6-r1
@@ -0,0 +1 @@
+MD5 bd0cd5e8cdcde72d06d92b4b4cc8b8b8 alsa-tools-0.9.6.tar.bz2 1414065