Added save option thanks to Ben Anderson <roothorick@new.rr.com> in bug #72771.

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index a8a9c10c4f2c7420ad8dd72c420ac079617e0b08..d591eb80fb51a645cedaa0c835ab710de253e4f4 100644 (file)
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.79 2004/11/23 12:58:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.80 2004/11/29 12:28:15 eradicator Exp $
+
+  29 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  Added save option thanks to Ben Anderson <roothorick@new.rr.com> in bug #72771.
 
   23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-utils-1.0.7.ebuild:

diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index b22f69682272ce84d455d72e1c4446e6e99f269e..b416a52b0f4cb7783d724f52cbaa2eaab28c532a 100644 (file)
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f8980eeef1591feca839585b5828dc0e ChangeLog 12679
+MD5 28ceaea8ab23661ff42fd8221981ed43 ChangeLog 12836
 MD5 eaedf66281406d0a541c07417cb11d11 alsa-utils-1.0.7.ebuild 2269
 MD5 f708f7156af58c40d9e8c3c8619894f2 alsa-utils-0.9.8.ebuild 1729
 MD5 2b19b71fe7ffde4f783fc5617cb430dd alsa-utils-1.0.6.ebuild 1807
@@ -9,13 +9,13 @@ MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 3d11dd42884e1123fcacf5fb054ac5ff files/alsasound.confd 162
 MD5 ddaf1d5cc1a19dff65e19e6470bc711d files/digest-alsa-utils-1.0.7 69
 MD5 954b0951b5fed9bf591abf9e7cc1963e files/alsa-modules.conf-rc 1162
-MD5 4f219b3a7b2a2e5427d908d270279ccb files/alsasound 6430
+MD5 6e594c7a2760ecfafb8cde7662a79975 files/alsasound 6509
 MD5 c393c831cb8bcda375cd4690e85b3495 files/digest-alsa-utils-0.9.8 69
 MD5 fb7f68ad1c0d4ad52a9de4477b47c5c8 files/digest-alsa-utils-1.0.6 69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBozP6ArHZZzCEUG0RAnk2AJ9KDXGHCJLyZ+tnh7JZ5p3Hy9xRbgCghji9
-Aq99cVCZOxofIfwGiP4N/ho=
-=KiBF
+iD8DBQFBqxX7ArHZZzCEUG0RAn+cAJwPFBoM33GLovIHA6m1n7Pwle6BgQCffbz+
+hYIjCAHMAkPOG84hjkzNKDA=
+=T4tl
 -----END PGP SIGNATURE-----

diff --git a/media-sound/alsa-utils/files/alsasound b/media-sound/alsa-utils/files/alsasound
index 23d07bf3699f8a20a9510d245f01a33802a89389..fc63f4ba1e0b63482028e982137258b8115dc005 100644 (file)
--- a/media-sound/alsa-utils/files/alsasound
+++ b/media-sound/alsa-utils/files/alsasound
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.19 2004/11/20 10:47:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.20 2004/11/29 12:28:15 eradicator Exp $
 #
 # Gentoo users: add this script to 'boot' run level.
 # ==================================================
@@ -37,12 +37,17 @@
 #
 # 2004.10.29 - Jeremy Huddleston <eradicator@gentoo.org>
 # Cleaned up to work better for mixed builtin/module systems
+#
+# 2004.11.29 - Jeremy Huddleston <eradicator@gentoo.org>
+# Added save option thanks to Ben Anderson <roothorick@new.rr.com>
 
 alsactl=/usr/sbin/alsactl
 asoundcfg=/etc/asound.state
 aconnect=/usr/bin/aconnect
 alsascrdir=/etc/alsa.d
 
+opts="${opts} save"
+
 depend() {
        need bootmisc localmount
        after modules isapnp coldplug hotplug
@@ -171,15 +176,19 @@ restore_mixer() {
        return 0
 }
 
-save_mixer() {
+save() {
+       ebegin "Storing ALSA Mixer Levels"
+       
        if [ -x $alsactl ]; then
                $alsactl -f $asoundcfg store
+               val=$?
+               eend $val
+               return $val
        else
-               eerror -e "ERROR: Cannot find alsactl, did you forget to install media-sound/alsa-utils?"
+               eerror -e "ERROR: Cannot find alsactl."
+               eend 1
                return 1
        fi
-
-       return 0
 }
 
 start() {
@@ -207,12 +216,7 @@ stop() {
        eend 0
 
        if [ "${SAVE_ON_STOP}" = "yes" ]; then
-               einfo "Storing ALSA Mixer Levels"
-               if save_mixer; then
-                       eend 0
-               else
-                       eend 1
-               fi
+               save
        fi
 
        einfo "Unloading modules"