Fix init script problem on livecd and move useage of KV_DIR after linux-mod_pkg_setup.

Package-Manager: portage-1.589-cvs

4 files changed, 17 insertions, 22 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 701f7b3bd343..836dbf2b378e 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.47 2005/07/10 21:29:54 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.48 2005/07/11 15:15:30 genstef Exp $
+
+  11 Jul 2005; Stefan Schweizer <genstef@gentoo.org> files/slmodem-2.9.init,
+  slmodem-2.9.9d.ebuild:
+  Fix init script problem on livecd and move useage of KV_DIR after
+  linux-mod_pkg_setup.
 
   10 Jul 2005; Daniel Drake <dsd@gentoo.org> slmodem-2.9.9d.ebuild:
   Do linux-mod_pkg_setup after setting variables, fixes config check.
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 12202f6a6d4c..9d64fdd287c5 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0864be087773a03c996fb587ae584e78 slmodem-2.9.9d.ebuild 3557
-MD5 0a2b8067e70960d8d2c1c54173913131 ChangeLog 11152
+MD5 769179635975c3fba67ade244cc014d2 slmodem-2.9.9d.ebuild 3561
+MD5 464a87658e8bcd584b008c36c3bc4794 ChangeLog 11350
 MD5 e487a8ab7ec754f06a85f64f4aaa7540 metadata.xml 409
 MD5 a5c2c40e3a6c4665033c97bb9088f03d files/slusb.hotplug 262
 MD5 8834a62c67909059cef10887bfbcc853 files/slmodem-2.9.modules 494
 MD5 1a0b854bbe34e01e918b855b7c81ffba files/slmodem-2.9.conf 649
-MD5 6b1353dad0548404d5a468d4e6f5a18c files/slmodem-2.9.init 2679
+MD5 3d00e935ef9592cf6538298cacd92a02 files/slmodem-2.9.init 2702
 MD5 fd55ef399408a109742263cd5b4a5219 files/digest-slmodem-2.9.9d 66
 MD5 fd0f0a405fb7f059cc2f5078d54fd884 files/slmodem-2.9.9b-gcc4.patch 463
 MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0ZSHTOXg++0VvJQRAvw4AKCc+0NJC6hTCtByBTtFcv6HJC4yWQCeNL2R
-cUT8Bf/0MZmSQrb8gu2MdME=
-=jEq0
------END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/slmodem-2.9.init b/net-dialup/slmodem/files/slmodem-2.9.init
index b54d9b11c1c6..ad03bb2a377b 100644
--- a/net-dialup/slmodem/files/slmodem-2.9.init
+++ b/net-dialup/slmodem/files/slmodem-2.9.init
@@ -1,14 +1,14 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.init,v 1.12 2005/03/14 15:42:32 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.init,v 1.13 2005/07/11 15:15:30 genstef Exp $
 
+if [ "${MODULE}" = "alsa" ];
+then
+	needalsasound="alsasound1"
+fi
 depend() {
-	need logger
-	if [ "${MODULE}" = "alsa" ];
-	then
-		need alsasound
-	fi
+	need logger $needalsasound
 }
 
 
diff --git a/net-dialup/slmodem/slmodem-2.9.9d.ebuild b/net-dialup/slmodem/slmodem-2.9.9d.ebuild
index f5dce3237a08..75de6767cd5e 100644
--- a/net-dialup/slmodem/slmodem-2.9.9d.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.9d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.9d.ebuild,v 1.4 2005/07/10 21:29:54 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.9d.ebuild,v 1.5 2005/07/11 15:15:30 genstef Exp $
 
 inherit eutils linux-mod
 
@@ -24,9 +24,9 @@ pkg_setup() {
 		MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)"
 		CONFIG_CHECK="USB"
 	fi
-	BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
 	BUILD_TARGETS="all"
 	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
 }
 
 src_unpack() {