Version bump.

4 files changed, 106 insertions, 9 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 89b1d87c66d9..61a488d782e9 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.60 2004/11/12 11:12:15 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.61 2004/11/12 11:14:21 eradicator Exp $
+
+*alsa-tools-1.0.7 (12 Nov 2004)
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-1.0.6.ebuild, +alsa-tools-1.0.7.ebuild:
+  Version bump.
 
   12 Nov 2004; <SeJo@gentoo.org> alsa-tools-1.0.6.ebuild:
   stable on ppc asked by eradicator
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.6.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.6.ebuild
index e619f4a5f62e..82e6c1255276 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.6.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.6.ebuild
@@ -1,21 +1,21 @@
 # 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.4 2004/11/12 11:12:15 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.6.ebuild,v 1.5 2004/11/12 11:14:21 eradicator Exp $
 
 IUSE="X"
 
 inherit gnuconfig eutils
 
+MY_P=${P/_rc/rc}
+S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="Advanced Linux Sound Architecture tools"
 HOMEPAGE="http://www.alsa-project.org"
-
-MY_P=${P/_rc/rc}
 SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 SLOT="0.9"
-KEYWORDS="x86 ppc amd64"
+KEYWORDS="amd64 ppc x86"
 LICENSE="GPL-2"
-S=${WORKDIR}/${MY_P}
 
 DEPEND=">=media-libs/alsa-lib-1.0.0
 	virtual/alsa
@@ -49,11 +49,10 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gcc34.patch
+	gnuconfig_update
 }
 
 src_compile() {
-	gnuconfig_update
-
 	# hdspmixer requires fltk
 	export LDFLAGS="-L/usr/$(get_libdir)/fltk-1.1"
 	export CPPFLAGS="-I/usr/include/fltk-1.1"
@@ -80,7 +79,7 @@ src_install() {
 
 		# Install the text documentation
 		local doc
-		for doc in README TODO ChangeLog COPYING AUTHORS
+		for doc in README TODO ChangeLog AUTHORS
 		do
 			if [ -f "${doc}" ]
 			then
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.7.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.7.ebuild
new file mode 100644
index 000000000000..dce2d98f7f1f
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.7.ebuild
@@ -0,0 +1,91 @@
+# 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.7.ebuild,v 1.1 2004/11/12 11:14:21 eradicator Exp $
+
+IUSE="X"
+
+inherit gnuconfig eutils
+
+MY_P=${P/_rc/rc}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Advanced Linux Sound Architecture tools"
+HOMEPAGE="http://www.alsa-project.org"
+SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
+
+SLOT="0.9"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+
+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}/${PN}-1.0.6-gcc34.patch
+	gnuconfig_update
+}
+
+src_compile() {
+	# hdspmixer requires fltk
+	export LDFLAGS="-L/usr/$(get_libdir)/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 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.7 b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.7
new file mode 100644
index 000000000000..f7c931187288
--- /dev/null
+++ b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.7
@@ -0,0 +1 @@
+MD5 efd8660f818f2bbd7fd4761e0068fde1 alsa-tools-1.0.7.tar.bz2 773542