Version bump.

5 files changed, 117 insertions, 3 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 46cfc6379141..b036bbde3446 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.53 2004/08/04 20:06:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.54 2004/08/23 22:07:49 eradicator Exp $
+
+*alsa-tools-1.0.6 (23 Aug 2004)
+
+  23 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/alsa-tools-1.0.6-gcc34.patch, +alsa-tools-1.0.6.ebuild:
+  Version bump.
 
   04 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
   -alsa-tools-1.0.2.ebuild, -alsa-tools-1.0.3.ebuild,
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 468d33798581..87e1d95d9ebd 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,11 +1,14 @@
-MD5 43124d2238849088e6367ffb29b03a80 ChangeLog 7741
+MD5 9ddde54f8f025b33eb6f54afad91d6ce ChangeLog 8021
 MD5 6c351447a24c939ea3ac0082c75e51d0 alsa-tools-0.9.0_rc1-r1.ebuild 1599
 MD5 e9f6a6616eaa930f653a195bca2d0836 alsa-tools-0.9.8.ebuild 2088
+MD5 c255fdc822f3be614058898cdf0bd8c0 alsa-tools-1.0.6.ebuild 2377
 MD5 b83800a29b987eba75ff4701b6886f2a alsa-tools-1.0.4.ebuild 2327
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 ea166289784d2bee22c4ca713aed6345 alsa-tools-1.0.5-r1.ebuild 2295
+MD5 ab1e1ce31935c85609057ba0263e80e6 alsa-tools-1.0.5-r1.ebuild 2294
 MD5 898810373b49d9d25e9e19006bf9903f files/alsa-tools-1.0.3-kernel-2.6.patch 443
 MD5 2094cef02e54ae2c227bf442fa461f08 files/digest-alsa-tools-0.9.0_rc1-r1 72
 MD5 1671d48040628fff2ae90826203f01ec files/digest-alsa-tools-0.9.8 70
+MD5 d44a324f85dac09748cb2abb0246d541 files/digest-alsa-tools-1.0.6 69
 MD5 1bdcd1721550eb1146185f185e4048c3 files/digest-alsa-tools-1.0.4 69
 MD5 6936bcab5224ab9b201832698db86d84 files/digest-alsa-tools-1.0.5-r1 69
+MD5 e2a96585b296f3f975f2cc8146eb3b74 files/alsa-tools-1.0.6-gcc34.patch 280
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.6.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.6.ebuild
new file mode 100644
index 000000000000..daa53ff1b7f8
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.6.ebuild,v 1.1 2004/08/23 22:07:49 eradicator Exp $
+
+IUSE="X"
+
+inherit gnuconfig eutils
+
+DESCRIPTION="Advanced Linux Sound Architecture tools"
+HOMEPAGE="http://www.alsa-project.org"
+
+MY_P=${P/_rc/rc}
+#SRC_URI="ftp://ftp.alsa-project.org/pub/tools/${MY_P}.tar.bz2"
+SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
+
+SLOT="0.9"
+KEYWORDS="~x86 ~ppc ~amd64"
+LICENSE="GPL-2"
+S=${WORKDIR}/${MY_P}
+
+DEPEND=">=media-libs/alsa-lib-1.0.0
+	virtual/alsa
+	X? ( =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.
+#
+# By default, all the supported tools will be compiled.
+# If you want to only compile for specific tool(s), set ALSA_TOOLS
+# environment to a space-separated list of tools that you want to build.
+# For example:
+#
+#   env ALSA_TOOLS='as10k1 ac3dec' emerge alsa-tools
+#
+if [ -z "${ALSA_TOOLS}" ]; then
+	if use X; then
+		ALSA_TOOLS="ac3dec as10k1 envy24control hdspconf hdsploader hdspmixer \
+		            mixartloader rmedigicontrol sb16_csp seq/sbiload sscape_ctl \
+		            us428control usx2yloader vxloader"
+	else
+		ALSA_TOOLS="ac3dec as10k1 hdsploader \
+		            mixartloader sb16_csp seq/sbiload sscape_ctl \
+		            us428control usx2yloader vxloader"
+	fi
+fi
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
+src_compile() {
+	gnuconfig_update
+
+	# 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 --with-kernel="${KV}" || 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/alsa-tools-1.0.6-gcc34.patch b/media-sound/alsa-tools/files/alsa-tools-1.0.6-gcc34.patch
new file mode 100644
index 000000000000..f01687e7cf90
--- /dev/null
+++ b/media-sound/alsa-tools/files/alsa-tools-1.0.6-gcc34.patch
@@ -0,0 +1,11 @@
+diff -urN alsa-tools-1.0.6~/as10k1/as10k1.c alsa-tools-1.0.6/as10k1/as10k1.c
+--- alsa-tools-1.0.6~/as10k1/as10k1.c	2003-07-15 20:33:59.000000000 +0200
++++ alsa-tools-1.0.6/as10k1/as10k1.c	2004-08-23 23:01:02.489972288 +0200
+@@ -159,6 +159,7 @@
+ 
+ 		}
+ next_cli_arg:
++		;
+ 
+ 	}
+ }
diff --git a/media-sound/alsa-tools/files/digest-alsa-tools-1.0.6 b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.6
new file mode 100644
index 000000000000..d7647788fa1f
--- /dev/null
+++ b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.6
@@ -0,0 +1 @@
+MD5 d8047c270d7033c00f1f64cde0f67d99 alsa-tools-1.0.6.tar.bz2 771922