summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2005-07-11 15:15:30 +0000
committerStefan Schweizer <genstef@gentoo.org>2005-07-11 15:15:30 +0000
commit550ac74ca066753a5b2ae21e5b153b3b6c2b61d7 (patch)
treea27a80a7336748f10e03a52fd3aeb1131ea591e9 /net-dialup/slmodem
parentVersion bump thanks to Alon Bar-Lev <alon.barlev@gmail.com> in bug 98389 (diff)
downloadgentoo-2-550ac74ca066753a5b2ae21e5b153b3b6c2b61d7.tar.gz
gentoo-2-550ac74ca066753a5b2ae21e5b153b3b6c2b61d7.tar.bz2
gentoo-2-550ac74ca066753a5b2ae21e5b153b3b6c2b61d7.zip
Fix init script problem on livecd and move useage of KV_DIR after linux-mod_pkg_setup.
(Portage version: 1.589-cvs)
Diffstat (limited to 'net-dialup/slmodem')
-rw-r--r--net-dialup/slmodem/ChangeLog7
-rw-r--r--net-dialup/slmodem/files/slmodem-2.9.init12
-rw-r--r--net-dialup/slmodem/slmodem-2.9.9d.ebuild4
3 files changed, 14 insertions, 9 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/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() {