Added SAVE_ON_STOP option to init script thanks to Kalin KOZHUHAROV <kalin@ThinRope.net> in bug #61130.

8 files changed, 39 insertions, 20 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index bb0c00e53f9f..0169f255ddd3 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,11 @@
 # 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.64 2004/08/23 22:01:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.65 2004/08/29 17:08:53 eradicator Exp $
+
+  29 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound,
+  +files/alsasound.confd:
+  Added SAVE_ON_STOP option to init script thanks to Kalin KOZHUHAROV
+  <kalin@ThinRope.net> in bug #61130.
 
 *alsa-utils-1.0.6 (23 Aug 2004)
 
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index cd2492d7c45a..baed0fbbec4d 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,17 +1,18 @@
-MD5 753d77f2c08a6a1c826450fbc6f4543e ChangeLog 10411
+MD5 d31ef66aeb478ca3e4f160a895207655 ChangeLog 10620
 MD5 f1cae297e40943ab7250caf03f4fb51b alsa-utils-0.5.10-r8.ebuild 935
 MD5 8f4d45d64587cd64abf27a7328f2875f alsa-utils-0.9.0_rc2.ebuild 821
 MD5 6e78cc615da0fc4b10fdea171f211534 alsa-utils-0.9.2.ebuild 788
-MD5 282bcad49a0354a9556e16e7b42e22e7 alsa-utils-0.9.8.ebuild 1640
-MD5 5acaa72cd5478b0a9b3553ebb4a60d2f alsa-utils-1.0.2.ebuild 1687
-MD5 afb1cec1242a691a97b89f61b164ec34 alsa-utils-1.0.6.ebuild 1709
-MD5 2c30d8f51a7295775ff269f3962c7c1e alsa-utils-1.0.5.ebuild 1705
+MD5 4a72ec010a949781d88677b259e42f59 alsa-utils-0.9.8.ebuild 1690
+MD5 1cdd236bf37b587189e17aa61450b978 alsa-utils-1.0.2.ebuild 1737
+MD5 bf38435d3130dbc90f2e6df2925196ef alsa-utils-1.0.6.ebuild 1761
+MD5 214089b1865d961d21c6139bcd8d84f1 alsa-utils-1.0.5.ebuild 1757
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 3d11dd42884e1123fcacf5fb054ac5ff files/alsasound.confd 162
 MD5 dcc66ee6a9db24006a4158e2be0da3f2 files/alsa-0.5.10 392
 MD5 4d2978b89e32f1ae922eca319b87ccc0 files/alsa-modules.conf-rc 1163
 MD5 f20045fc395596290d5a6d807ba311fc files/alsa-utils-0.5.10-aplay-destdir.diff 626
 MD5 d331cfdb897b5cd5b0a3eca37ff47b9b files/alsa-utils-1.0.4-alsaconf.patch 1182
-MD5 8b504b75a499fa16ffd97740fccf983b files/alsasound 5862
+MD5 6b3631b7f1706d65632483c58a83c7dd files/alsasound 5909
 MD5 a82c4c173c1d617bae9967438c659bac files/digest-alsa-utils-0.5.10-r8 70
 MD5 59a93bf64737644e4001cbb6ad5387b4 files/digest-alsa-utils-0.9.0_rc2 71
 MD5 55414f65ffecf5f44fa35295dae8bf19 files/digest-alsa-utils-0.9.2 69
diff --git a/media-sound/alsa-utils/alsa-utils-0.9.8.ebuild b/media-sound/alsa-utils/alsa-utils-0.9.8.ebuild
index 26a7d2ff65c6..9f5cee7c1191 100644
--- a/media-sound/alsa-utils/alsa-utils-0.9.8.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-0.9.8.ebuild,v 1.10 2004/06/24 23:49:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-0.9.8.ebuild,v 1.11 2004/08/29 17:08:53 eradicator Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -24,7 +24,8 @@ src_install() {
 	dodoc ${ALSA_UTILS_DOCS}
 	newdoc alsamixer/README README.alsamixer
 
-	dodir /etc/init.d
+	insinto /etc/conf.d
+	newins ${FILESDIR}/alsasound.confd alsasound
 	insinto /etc/modules.d
 	newins ${FILESDIR}/alsa-modules.conf-rc alsa
 	exeinto /etc/init.d
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.2.ebuild
index 3e42d8ae1118..8db4c9149071 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.2.ebuild,v 1.8 2004/06/24 23:49:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.2.ebuild,v 1.9 2004/08/29 17:08:53 eradicator Exp $
 
 MY_P=${P/_rc/rc}
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
@@ -27,7 +27,8 @@ src_install() {
 	dodoc ${ALSA_UTILS_DOCS}
 	newdoc alsamixer/README README.alsamixer
 
-	dodir /etc/init.d
+	insinto /etc/conf.d
+	newins ${FILESDIR}/alsasound.confd alsasound
 	insinto /etc/modules.d
 	newins ${FILESDIR}/alsa-modules.conf-rc alsa
 	exeinto /etc/init.d
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.5.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.5.ebuild
index 3a57a54b49c8..cc89b292289a 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.5.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.5.ebuild,v 1.7 2004/08/17 23:28:01 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.5.ebuild,v 1.8 2004/08/29 17:08:53 eradicator Exp $
 
 MY_P=${P/_rc/rc}
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
@@ -28,7 +28,8 @@ src_install() {
 	dodoc ${ALSA_UTILS_DOCS}
 	newdoc alsamixer/README README.alsamixer
 
-	dodir /etc/init.d
+	insinto /etc/conf.d
+	newins ${FILESDIR}/alsasound.confd alsasound
 	insinto /etc/modules.d
 	newins ${FILESDIR}/alsa-modules.conf-rc alsa
 	exeinto /etc/init.d
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.6.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.6.ebuild
index 0f5e0f271fc6..b68c98a9c408 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.6.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.6.ebuild,v 1.1 2004/08/23 22:01:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.6.ebuild,v 1.2 2004/08/29 17:08:53 eradicator Exp $
 
 MY_P=${P/_rc/rc}
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
@@ -9,7 +9,7 @@ SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="x86 ppc amd64 ~alpha hppa"
+KEYWORDS="~x86 ~ppc ~amd64 ~alpha ~hppa"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.1
@@ -28,7 +28,8 @@ src_install() {
 	dodoc ${ALSA_UTILS_DOCS}
 	newdoc alsamixer/README README.alsamixer
 
-	dodir /etc/init.d
+	insinto /etc/conf.d
+	newins ${FILESDIR}/alsasound.confd alsasound
 	insinto /etc/modules.d
 	newins ${FILESDIR}/alsa-modules.conf-rc alsa
 	exeinto /etc/init.d
diff --git a/media-sound/alsa-utils/files/alsasound b/media-sound/alsa-utils/files/alsasound
index 449deee8bfa4..82c47279a103 100644
--- 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.14 2004/06/18 08:07:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.15 2004/08/29 17:08:53 eradicator Exp $
 #
 # Gentoo users: add this script to 'boot' run level.
 # ==================================================
@@ -191,9 +191,11 @@ stop() {
 	ebegin "Unloading ALSA"
 	terminate
 
-	einfo "Storing ALSA Mixer Levels"
-	if ! save_mixer; then
-		eend 1
+	if [ "${SAVE_ON_STOP}" = "yes" ]; the
+		einfo "Storing ALSA Mixer Levels"
+		if ! save_mixer; then
+			eend 1
+		fi
 	fi
 
 	einfo "Unloading modules"
diff --git a/media-sound/alsa-utils/files/alsasound.confd b/media-sound/alsa-utils/files/alsasound.confd
new file mode 100644
index 000000000000..7be75537b602
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsasound.confd
@@ -0,0 +1,7 @@
+# SAVE_ON_STOP:
+# Do you want to save changes made to your mixer volumes when alsasound
+# stops? 
+# no - Do not save state
+# yes - Save state
+
+SAVE_ON_STOP="yes"