summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2007-04-06 16:44:41 +0000
committerDoug Goldstein <cardoe@gentoo.org>2007-04-06 16:44:41 +0000
commit51fc0a893894591ad208be3408d292c78484e072 (patch)
tree193727e173527cfc0faf8a9131cfcaf1a05de95d
parentStable on amd64 wrt bug 173070 (diff)
downloadgentoo-2-51fc0a893894591ad208be3408d292c78484e072.tar.gz
gentoo-2-51fc0a893894591ad208be3408d292c78484e072.tar.bz2
gentoo-2-51fc0a893894591ad208be3408d292c78484e072.zip
util-linux is only for Linux. init script depends on acpid now if the person uses acpid. So we don't grab the /proc/acpi/event before acpid.
(Portage version: 2.1.2.3)
-rw-r--r--sys-apps/hal/ChangeLog7
-rw-r--r--sys-apps/hal/files/0.5.9-hald.rc4
-rw-r--r--sys-apps/hal/hal-0.5.9.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 723c8ed6313e..e0e5632b0a94 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/hal
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.147 2007/04/06 01:24:09 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.148 2007/04/06 16:44:41 cardoe Exp $
+
+ 06 Apr 2007; Doug Goldstein <cardoe@gentoo.org> files/0.5.9-hald.rc,
+ hal-0.5.9.ebuild:
+ util-linux is only for Linux. init script depends on acpid now if the person
+ uses acpid. So we don't grab the /proc/acpi/event before acpid.
06 Apr 2007; Doug Goldstein <cardoe@gentoo.org> hal-0.5.9.ebuild:
Adding kernel_linux and kernel_FreeBSD to IUSE
diff --git a/sys-apps/hal/files/0.5.9-hald.rc b/sys-apps/hal/files/0.5.9-hald.rc
index b8232d29f082..68502b68cbc6 100644
--- a/sys-apps/hal/files/0.5.9-hald.rc
+++ b/sys-apps/hal/files/0.5.9-hald.rc
@@ -1,11 +1,11 @@
#!/sbin/runscript
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5.9-hald.rc,v 1.1 2007/04/05 02:18:28 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5.9-hald.rc,v 1.2 2007/04/06 16:44:41 cardoe Exp $
depend() {
need dbus
- use logger consolekit
+ use logger consolekit acpid
after coldplug dns nscd
}
diff --git a/sys-apps/hal/hal-0.5.9.ebuild b/sys-apps/hal/hal-0.5.9.ebuild
index b70530db38a3..38de7e0e2daa 100644
--- a/sys-apps/hal/hal-0.5.9.ebuild
+++ b/sys-apps/hal/hal-0.5.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.6 2007/04/06 01:24:09 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.7 2007/04/06 16:44:41 cardoe Exp $
inherit eutils linux-info autotools flag-o-matic
@@ -18,7 +18,7 @@ IUSE="acpi crypt debug dell disk-partition doc pam pcmcia selinux ${KERNEL_IUSE}
RDEPEND=">=dev-libs/glib-2.6
>=dev-libs/dbus-glib-0.61
>=sys-fs/udev-104
- >=sys-apps/util-linux-2.12r-r1
+ kernel_linux? ( >=sys-apps/util-linux-2.12r-r1 )
kernel_linux? ( >=sys-kernel/linux-headers-2.6.17 )
>=dev-libs/expat-1.95.8
>=sys-apps/pciutils-2.2.3