Version bumped.

8 files changed, 124 insertions, 9 deletions

diff --git a/media-sound/alsa-firmware/ChangeLog b/media-sound/alsa-firmware/ChangeLog
index 4c80a7f4d622..537b79e8db51 100644
--- a/media-sound/alsa-firmware/ChangeLog
+++ b/media-sound/alsa-firmware/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-firmware
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/ChangeLog,v 1.1 2003/12/02 18:31:55 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/ChangeLog,v 1.2 2003/12/07 19:39:11 mholzer Exp $
+
+*alsa-firmware-1.0.0_rc2 (07 Dec 2003)
+
+  07 Dec 2003; Martin Holzer <mholzer@gentoo.org>
+  alsa-firmware-1.0.0_rc2.ebuild:
+  Version bumped.
 
 *alsa-firmware-1.0.0_rc1 (02 Dec 2003)
 
diff --git a/media-sound/alsa-firmware/Manifest b/media-sound/alsa-firmware/Manifest
index c98ebe9d8437..1ee78a178b13 100644
--- a/media-sound/alsa-firmware/Manifest
+++ b/media-sound/alsa-firmware/Manifest
@@ -1,6 +1,6 @@
-MD5 0f12c0819a6274ef0a8b806ca54a1d17 ChangeLog 375
+MD5 e372944d2ba6ed4862dc7821e1211a98 ChangeLog 518
 MD5 ab89c99d4a4dfcf2171a6199857b584b alsa-firmware-1.0.0_rc1.ebuild 622
 MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
-MD5 ab89c99d4a4dfcf2171a6199857b584b alsa-firmware-1.0.0_rc2.ebuild 622
+MD5 9b9bf720d596671fb4bbfcbcb9f66d6d alsa-firmware-1.0.0_rc2.ebuild 622
 MD5 9c8373dda0046b211956970126ccf2e2 files/digest-alsa-firmware-1.0.0_rc1 76
 MD5 2e36a104a13a36bdb2defb8c8fa30587 files/digest-alsa-firmware-1.0.0_rc2 76
diff --git a/media-sound/alsa-firmware/alsa-firmware-1.0.0_rc2.ebuild b/media-sound/alsa-firmware/alsa-firmware-1.0.0_rc2.ebuild
new file mode 100644
index 000000000000..9524d0988729
--- /dev/null
+++ b/media-sound/alsa-firmware/alsa-firmware-1.0.0_rc2.ebuild
@@ -0,0 +1,27 @@
+# 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-firmware/alsa-firmware-1.0.0_rc2.ebuild,v 1.1 2003/12/07 19:39:11 mholzer Exp $
+
+MY_P=${P/_rc/rc}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Advanced Linux Sound Architecture firmware"
+HOMEPAGE="http://www.alsa-project.org/"
+
+SRC_URI="ftp://ftp.alsa-project.org/pub/firmware/${MY_P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~x86"
+LICENSE="GPL-2"
+
+DEPEND=""
+
+src_compile() {
+	econf || die
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc README
+}
diff --git a/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.0_rc2 b/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.0_rc2
new file mode 100644
index 000000000000..e57a1b2441f3
--- /dev/null
+++ b/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.0_rc2
@@ -0,0 +1 @@
+MD5 d323526014eb1d538fc58c4be4688ba8 alsa-firmware-1.0.0rc2.tar.bz2 1024859
diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index e760aec78116..2eebbda496f3 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,11 @@
 # 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.32 2003/12/02 18:25:36 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.33 2003/12/07 19:41:57 mholzer Exp $
+
+*alsa-tools-1.0.0_rc2 (07 Dec 2003)
+
+  07 Dec 2003; Martin Holzer <mholzer@gentoo.org> alsa-tools-1.0.0_rc2.ebuild:
+  Version bumped.
 
 *alsa-tools-1.0.0_rc1 (02 Dec 2003)
 
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 6748caba1027..36d3cb3835ab 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,12 +1,14 @@
+MD5 aa3d9b04029e3be7c83e78627a73dfb8 ChangeLog 4875
 MD5 64c9009618163c95b3f051ad3c99136c alsa-tools-0.9.0_rc1-r1.ebuild 1299
 MD5 b2733e2f3b4d24bd1cd9f64d538820f0 alsa-tools-0.9.1.ebuild 1276
 MD5 e1147a642867b3b3ea43518a1376f6d2 metadata.xml 250
-MD5 60792d103d94088947b714e55c795e86 ChangeLog 4740
-MD5 1da97c227b32337979483cfa92d6f4e0 alsa-tools-1.0.0_rc1.ebuild 1930
 MD5 d57698f25648e67174453aa2447b44b4 alsa-tools-0.9.8.ebuild 1818
+MD5 1da97c227b32337979483cfa92d6f4e0 alsa-tools-1.0.0_rc1.ebuild 1930
+MD5 61e034e2038cf13327ed677f7b70cf06 alsa-tools-1.0.0_rc2.ebuild 1930
 MD5 d345d371cc296e16aa163adfcaa75e19 files/alsa-tools-0.9.4-gcc3.3.patch 2049
+MD5 2094cef02e54ae2c227bf442fa461f08 files/digest-alsa-tools-0.9.0_rc1-r1 72
+MD5 0c34b1352e030b5ef4d8ae5e102a8c3d files/digest-alsa-tools-0.9.1 69
+MD5 1671d48040628fff2ae90826203f01ec files/digest-alsa-tools-0.9.8 70
 MD5 d345d371cc296e16aa163adfcaa75e19 files/alsa-tools-0.9.5-gcc3.3.patch 2049
 MD5 0ae576feba3fe803b932d79a8733b13e files/digest-alsa-tools-1.0.0_rc1 72
-MD5 1671d48040628fff2ae90826203f01ec files/digest-alsa-tools-0.9.8 70
-MD5 0c34b1352e030b5ef4d8ae5e102a8c3d files/digest-alsa-tools-0.9.1 69
-MD5 2094cef02e54ae2c227bf442fa461f08 files/digest-alsa-tools-0.9.0_rc1-r1 72
+MD5 a5ef60aa30a10ede88f0da93c6fead4a files/digest-alsa-tools-1.0.0_rc2 72
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.0_rc2.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.0_rc2.ebuild
new file mode 100644
index 000000000000..61aafa0954ca
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.0_rc2.ebuild
@@ -0,0 +1,73 @@
+# 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-1.0.0_rc2.ebuild,v 1.1 2003/12/07 19:41:57 mholzer 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_rc2
+	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 hdspmixer mixartloader rmedigicontrol \
+	sb16_csp seq/sbiload 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_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.0_rc2 b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.0_rc2
new file mode 100644
index 000000000000..6b3ba76dff98
--- /dev/null
+++ b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.0_rc2
@@ -0,0 +1 @@
+MD5 4f19dd405cc8faccd29c98605c0fc890 alsa-tools-1.0.0rc2.tar.bz2 734653