1.0.3 stable on x86. Version bump.

5 files changed, 102 insertions, 3 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 4279419d8d03..5cf0ea0fe495 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 Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.42 2004/03/27 08:03:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.43 2004/04/04 19:11:05 eradicator Exp $
+
+*alsa-tools-1.0.4 (04 Apr 2004)
+
+  04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-1.0.3.ebuild, alsa-tools-1.0.4.ebuild:
+  1.0.3 stable on x86.  Version bump.
 
   27 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-tools-0.9.1.ebuild, alsa-tools-1.0.0_rc2-r1.ebuild,
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 7e0e2cf896f2..9fb7756da8b9 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -2,10 +2,12 @@ MD5 b735f161a72d041d9eea71d3b6ef8c73 alsa-tools-0.9.0_rc1-r1.ebuild 1601
 MD5 972f331ced2b413d671b05d6b95e0e98 alsa-tools-1.0.3.ebuild 2355
 MD5 19f798fb5c496d07007c9922d0db2c6e alsa-tools-0.9.8.ebuild 2119
 MD5 c144ad0f4a4bd920d4e8887dee3388dc alsa-tools-1.0.2.ebuild 2277
+MD5 972f331ced2b413d671b05d6b95e0e98 alsa-tools-1.0.4.ebuild 2355
 MD5 759c72236486fd3aae4a85311c08a21b ChangeLog 6489
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 898810373b49d9d25e9e19006bf9903f files/alsa-tools-1.0.3-kernel-2.6.patch 443
 MD5 1671d48040628fff2ae90826203f01ec files/digest-alsa-tools-0.9.8 70
 MD5 483effb0ad68356ad0b27560efd9e908 files/digest-alsa-tools-1.0.2 69
 MD5 0d9226e726980c37ecbe4ca0ab3fb23e files/digest-alsa-tools-1.0.3 69
+MD5 1bdcd1721550eb1146185f185e4048c3 files/digest-alsa-tools-1.0.4 69
 MD5 2094cef02e54ae2c227bf442fa461f08 files/digest-alsa-tools-0.9.0_rc1-r1 72
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.3.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.3.ebuild
index d7281a98be87..3266f109409a 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.3.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 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-1.0.3.ebuild,v 1.3 2004/03/14 23:38:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.3.ebuild,v 1.4 2004/04/04 19:11:05 eradicator Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -13,7 +15,7 @@ SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 RESTRICT="nomirror"
 
 SLOT="0.9"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 LICENSE="GPL-2"
 S=${WORKDIR}/${MY_P}
 
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.4.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.4.ebuild
new file mode 100644
index 000000000000..9304f945eec6
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2004 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-1.0.4.ebuild,v 1.1 2004/04/04 19:11:05 eradicator Exp $
+
+IUSE=""
+
+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"
+RESTRICT="nomirror"
+
+SLOT="0.9"
+KEYWORDS="~x86 ~ppc"
+LICENSE="GPL-2"
+S=${WORKDIR}/${MY_P}
+
+DEPEND=">=media-libs/alsa-lib-1.0.0
+	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.
+#
+# 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
+#
+[ x"${ALSA_TOOLS}" = x ] &&
+ALSA_TOOLS="ac3dec as10k1 envy24control hdspconf hdsploader hdspmixer \
+	mixartloader rmedigicontrol sb16_csp seq/sbiload sscape_ctl \
+	us428control usx2yloader vxloader"
+
+# The below two tools do not compile with linux-headers from 2.4 kernels
+# as of alsa-tools-0.9.7, so I removed them from the list for now.
+# Bug reports have been sent to the alsa-devel mailing list.
+#
+# hdsploader
+# sscape_ctl
+
+src_unpack() {
+	unpack ${A}
+}
+
+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 --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/digest-alsa-tools-1.0.4 b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.4
new file mode 100644
index 000000000000..155bd8a34c44
--- /dev/null
+++ b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.4
@@ -0,0 +1 @@
+MD5 c901a79e60a42f82f07f7a77cb45691a alsa-tools-1.0.4.tar.bz2 732789