Adding 0.5.9 init script which uses consolekit. Removing 0.4.x series init script. Remove uneeded dodir calls. Add keepdir /var/lib/cache/hald since HAL bombs without that directory. Adding quilt series file so we can use quilt to maintain patches.

(Portage version: 2.1.2.3)

5 files changed, 43 insertions, 25 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 45af0c661f54..e2bb17d157c0 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,13 @@
 # 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.144 2007/04/03 21:29:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.145 2007/04/05 02:18:28 cardoe Exp $
+
+  05 Apr 2007; Doug Goldstein <cardoe@gentoo.org> +files/0.5.9-hald.rc,
+  +files/0.5.9/series, -files/hald, hal-0.5.9.ebuild:
+  Adding 0.5.9 init script which uses consolekit. Removing 0.4.x series init
+  script. Remove uneeded dodir calls. Add keepdir /var/lib/cache/hald since
+  HAL bombs without that directory. Adding quilt series file so we can use
+  quilt to maintain patches.
 
   03 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
   +files/0.5.9/01_luks_mount_fix.patch, hal-0.5.9.ebuild:
diff --git a/sys-apps/hal/files/0.5.9-hald.rc b/sys-apps/hal/files/0.5.9-hald.rc
new file mode 100644
index 000000000000..b8232d29f082
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9-hald.rc
@@ -0,0 +1,28 @@
+#!/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 $
+
+depend() {
+	need dbus
+	use logger consolekit
+	after coldplug dns nscd
+}
+
+start() {
+	ebegin "Starting Hardware Abstraction Layer daemon"
+
+	if [ -f /proc/acpi/event ]; then
+		chgrp haldaemon /proc/acpi/event
+		chmod 440 /proc/acpi/event
+	fi
+
+	start-stop-daemon --start -q --exec /usr/sbin/hald -- --use-syslog
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Hardware Abstraction Layer daemon"
+	start-stop-daemon --stop -q --pidfile /var/run/hald.pid 
+	eend $?
+}
diff --git a/sys-apps/hal/files/0.5.9/series b/sys-apps/hal/files/0.5.9/series
new file mode 100644
index 000000000000..c1fdfb94d58c
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/series
@@ -0,0 +1 @@
+01_luks_mount_fix.patch
diff --git a/sys-apps/hal/files/hald b/sys-apps/hal/files/hald
deleted file mode 100644
index 23d534195501..000000000000
--- a/sys-apps/hal/files/hald
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/hald,v 1.4 2005/12/27 19:41:44 cardoe Exp $
-
-depend() {
-	need dbus
-}
-
-start() {
-	ebegin "Starting Hardware Abstraction Layer daemon"
-	start-stop-daemon --start -q --exec /usr/sbin/hald
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Hardware Abstraction Layer daemon"
-	start-stop-daemon --stop -q --pidfile /var/run/hald/hald.pid 
-	eend $?
-}
diff --git a/sys-apps/hal/hal-0.5.9.ebuild b/sys-apps/hal/hal-0.5.9.ebuild
index 19c469b0822c..413e9e833ad7 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.2 2007/04/03 21:29:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.3 2007/04/05 02:18:28 cardoe Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -126,16 +126,18 @@ src_install() {
 	newexe "${FILESDIR}"/hal-unmount.dev hal_unmount
 
 	# initscript
-	newinitd "${FILESDIR}"/0.5-hald.rc hald
+	newinitd "${FILESDIR}"/0.5.9-hald.rc hald
 
 	# We now create and keep /media here as both gnome-mount and pmount
 	# use these directories, to avoid collision.
-	dodir /media
 	keepdir /media
+
 	# We also need to create and keep /etc/fdi/{information,policy,preprobe}
 	# or else hal bombs.
-	dodir /etc/hal/fdi/{information,policy,preprobe}
 	keepdir /etc/hal/fdi/{information,policy,preprobe}
+
+	# HAL stores it's fdi cache in /var/lib/cache/hald
+	keepdir /var/lib/cache/hald
 }
 
 pkg_postinst() {