Fixes a bug with alsa 0.5.10

7 files changed, 35 insertions, 46 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 30085278ca6c..a004635f4277 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.3 2002/04/27 08:04:55 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.4 2002/04/28 21:03:09 karltk Exp $
+
+*alsa-utils-0.5.10-r8 (28 Apr 2002)
+
+  28 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> alsa-utils-0.5.10-r8.ebuild files/digest-alsa-utils-0.5.10-r8:
+
+  Previous update broke alsa-0.5.10 by messing up the /etc/init.d/alsa script,
+  this has now been reverted to the original scheme for 0.5.10. 0.9.x is not
+  affected.
+
+  Removed alsa-utils-0.5.10-r7.ebuild files/digest-alsa-utils-0.5.10-r7
 
 *alsa-utils-0.9.0_rc1 (27 Apr 2002)
 
diff --git a/media-sound/alsa-utils/alsa-utils-0.5.10-r6.ebuild b/media-sound/alsa-utils/alsa-utils-0.5.10-r6.ebuild
deleted file mode 100644
index fe0da78a88ba..000000000000
--- a/media-sound/alsa-utils/alsa-utils-0.5.10-r6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-0.5.10-r6.ebuild,v 1.1 2001/10/02 20:34:44 woodchip Exp $
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="Advanced Linux Sound Architecture / Utils"
-SRC_URI="ftp://ftp.alsa-project.org/pub/utils/"${A}
-HOMEPAGE="http://www.alsa-project.org/"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	>=media-libs/alsa-lib-0.5.10"
-
-src_compile() {
-	./configure --host=${CHOST} --prefix=/usr || die
-	make || die
-}
-
-src_install() {
-	cd ${S}/aplay
-	cd aplay
-	cp Makefile Makefile.orig
-	sed -e "s:cd \$(bindir):cd \$(DESTDIR)\$(bindir):" \
-	sed -e "s:cd \$(mandir):cd \$(DESTDIR)\$(mandir):" \
-	Makefile.orig > Makefile
-	cd ${S}
-	try make DESTDIR=${D} install
-	dodoc ChangeLog COPYING README
-	newdoc alsamixer/README README.alsamixer
-	dodoc seq/aconnect/README* seq/aseqnet/README*
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/alsa.rc6 alsa
-}
-
-pkg_postinst() {
-	:;
-	#this will configure alsa to restore and save settings correctly
-	#${ROOT}/usr/sbin/rc-update add alsa	
-}
diff --git a/media-sound/alsa-utils/alsa-utils-0.5.10-r7.ebuild b/media-sound/alsa-utils/alsa-utils-0.5.10-r8.ebuild
index e8f100f54fb3..e8cf151eb17d 100644
--- a/media-sound/alsa-utils/alsa-utils-0.5.10-r7.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-0.5.10-r8.ebuild
@@ -33,5 +33,5 @@ src_install() {
 	dodoc seq/aseqnet/README.aseqnet
 	newdoc alsamixer/README README.alsamixer
 
-	exeinto /etc/init.d ; newexe ${FILESDIR}/alsa.rc6 alsa
+	exeinto /etc/init.d ; newexe ${FILESDIR}/alsa-0.5.10 alsa
 }
diff --git a/media-sound/alsa-utils/files/alsa-0.5.10 b/media-sound/alsa-utils/files/alsa-0.5.10
new file mode 100644
index 000000000000..9d73fdad55cc
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-0.5.10
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+
+depend() {
+	need modules
+}
+
+start() {
+	if [ -e /etc/asound.conf ]
+	then
+		ebegin "Restoring ALSA volume settings"
+		/usr/sbin/alsactl restore
+	else
+		ebegin "/etc/asound.conf not found, ALSA muted"
+	fi
+    eend $? 
+}
+
+stop() {
+	ebegin "Saving ALSA volume settings"
+	/usr/sbin/alsactl store
+	eend 
+	#will fail if no modules were loaded, so we don't process the return val
+}
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-0.5.10-r6 b/media-sound/alsa-utils/files/digest-alsa-utils-0.5.10-r6
deleted file mode 100644
index 779df014a529..000000000000
--- a/media-sound/alsa-utils/files/digest-alsa-utils-0.5.10-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 16ef72c810397409f1dc3cc31b6bcb4e alsa-utils-0.5.10.tar.bz2 115414
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-0.5.10-r7 b/media-sound/alsa-utils/files/digest-alsa-utils-0.5.10-r7
deleted file mode 100644
index 779df014a529..000000000000
--- a/media-sound/alsa-utils/files/digest-alsa-utils-0.5.10-r7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 16ef72c810397409f1dc3cc31b6bcb4e alsa-utils-0.5.10.tar.bz2 115414
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-0.5.10 b/media-sound/alsa-utils/files/digest-alsa-utils-0.5.10-r8
index 779df014a529..779df014a529 100644
--- a/media-sound/alsa-utils/files/digest-alsa-utils-0.5.10
+++ b/media-sound/alsa-utils/files/digest-alsa-utils-0.5.10-r8