Use asfxload instead of sfxload by default in init files wrt #290458 by Lukasz Pawelczyk.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-sound/awesfx/ChangeLog b/media-sound/awesfx/ChangeLog
index ae862cffda2ff126dd9b9eb932c8fe5e1dcc7f1f..dd7566b300a6772d46d472c5cc7360b8e953181f 100644 (file)
--- a/media-sound/awesfx/ChangeLog
+++ b/media-sound/awesfx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/awesfx
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/ChangeLog,v 1.30 2009/06/10 14:48:32 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/ChangeLog,v 1.31 2010/04/28 19:01:05 ssuominen Exp $
+
+  28 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> files/sfxload.confd,
+  files/sfxload.initd:
+  Use asfxload instead of sfxload by default in init files wrt #290458 by
+  Lukasz Pawelczyk.
 
   10 Jun 2009; Raúl Porcel <armin76@gentoo.org> awesfx-0.5.1c.ebuild:
   sparc stable wrt #270569

diff --git a/media-sound/awesfx/Manifest b/media-sound/awesfx/Manifest
index f2cd0ea2bd4ae5f4543ac30d10b203ae710dea20..7201fac6f56391320bbef58c5243bba2091134f1 100644 (file)
--- a/media-sound/awesfx/Manifest
+++ b/media-sound/awesfx/Manifest
@@ -1,8 +1,8 @@
 AUX awesfx-0.5.1c-getline.patch 1266 RMD160 acc230af79b23208f2e9b0e3a0e99f07a06b5da2 SHA1 a6dedff432e98223b5ea6a95a42e0aa3d911c2c3 SHA256 8ea20036dfe738ad4c84e79d4b97f7615dc3500591303d91e9a3c59fb8fec464
-AUX sfxload.confd 123 RMD160 9431d281c0624148dda458794c5699939af1ee07 SHA1 7e61315660f691bff78b5939683900ac1aeed63e SHA256 3ade0846df851e0cde82d9e4ba6c1c62c1a7463194fa75e6e3c6a984cbc59629
-AUX sfxload.initd 523 RMD160 ed15205fa3d94bb4f13776ae38baa3aa8fa51668 SHA1 24c3e40ab25ef569a1cc3eb9bd4aab2fd9504a1b SHA256 afaf2ead4894e0dde4b5ca67f176697a185f3bead79ca38cdfa5512a39e00538
+AUX sfxload.confd 165 RMD160 036b1d2edd583addfcfd4da090f51159ceea2f3a SHA1 b4f60f1ce7c17da49325026da728295f1d27043b SHA256 b0344444973ee0fee09353148aed2d7c87632c44f3116793eaa7e64244c9dfce
+AUX sfxload.initd 513 RMD160 1112eaeb6f44d873860fc176fbf87a55e0836ab3 SHA1 ec6d1f03e8d17c606eecfebcba09c3969a73bb0f SHA256 a39725b8c14f83c3165f47f8ac221d01364796a03188eb6155452bdc727247e9
 DIST awesfx-0.5.1c.tar.bz2 289565 RMD160 af1c876c957c71cda48dbb9c38a6186e6bdc34c9 SHA1 6d44ce7b0a7981645de3bc4f7ec44c6eae4e310f SHA256 04d47e07a01a82ee59ca0c37db4b77f97d1734cacfb08e02e5a4277671d5a54b
 EBUILD awesfx-0.5.1c-r1.ebuild 1107 RMD160 5baafc60ce2d2cbfd529456818b2ea191096122c SHA1 b8f443743fbf87acffa32ac0f1aa71b838a508b8 SHA256 3b2ecdb730c8e7115cbce782ed9990b69ad4211e0b639be9f60e585ce2c6846d
 EBUILD awesfx-0.5.1c.ebuild 1007 RMD160 a89611d711ae5751e9d4901cc957c81ae0698c41 SHA1 2ddccb9840021dc89a8c91f5c819101efe3b02b9 SHA256 224c019b8160964984051626f6da8d7ca2506aef00f68c43172ecfc880487685
-MISC ChangeLog 4209 RMD160 39ebfbf80b37619212daa0a0dbebeaed74e1626a SHA1 3aa22302051e8d4b4cf40bcd74ad676c28c9de56 SHA256 ef190d3a4c8787ffd554e09afd9971ca636d1600f065bca5ac138d5f4a8e7052
+MISC ChangeLog 4404 RMD160 68d7f72d42e91978883216d82cd9c446ed9912c2 SHA1 c3dc1048ce1a92c6def9d5d5c49e3424b40312af SHA256 440f70445e16a02eab2723c2af1d1b387f5404a20e50120fe9dc7eb7691b6eec
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b

diff --git a/media-sound/awesfx/files/sfxload.confd b/media-sound/awesfx/files/sfxload.confd
index 2ab604f80ac7fda25fcbb33971a8a3f577397e10..e44815a7c71b3a2d2752d9507642d93b15b8c3bb 100644 (file)
--- a/media-sound/awesfx/files/sfxload.confd
+++ b/media-sound/awesfx/files/sfxload.confd
@@ -1,4 +1,7 @@
 # /etc/conf.d/sfxload
 
+# sfxload or asfxload
+sfxload="asfxload"
+
 # Example location of sound bank for sfxload init script
 sfxbank="/usr/share/sounds/sf2/foobar.bin"

diff --git a/media-sound/awesfx/files/sfxload.initd b/media-sound/awesfx/files/sfxload.initd
index 6c71ce40807a388d9b0e28c1bf69e044c6c871db..39f6b8facf3678a1d936ea087603a8fb3beb5702 100644 (file)
--- a/media-sound/awesfx/files/sfxload.initd
+++ b/media-sound/awesfx/files/sfxload.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/files/sfxload.initd,v 1.1 2009/05/30 19:22:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/files/sfxload.initd,v 1.2 2010/04/28 19:01:05 ssuominen Exp $
 
 depend() {
        need alsasound
@@ -9,12 +9,12 @@ depend() {
 
 start() {
        ebegin "Loading sound font bank"
-       /usr/bin/sfxload -q ${sfxbank}
+       ${sfxload} -q "${sfxbank}"
        eend $? "Error at loading sound font bank ${sfxbank}"
 }
 
 stop() {
        ebegin "Unloading sound font bank"
-       /usr/bin/sfxload -i -q
+       ${sfxload} -i -q
        eend $? "Error at unloading sound font bank"
 }