Adding 0.5.9 init script which uses consolekit. Removing 0.4.x series init script...

Package-Manager: portage-2.1.2.3

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 45af0c661f54d7b73c1ba462edc0782c443cec0a..e2bb17d157c05d13baafa2f287de7db16367a48c 100644 (file)
--- 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/Manifest b/sys-apps/hal/Manifest
index e2695d61303fba90e5cf683854bbe0d1a7a8bae2..a457a8ad01d46e599ecd84f583c3718b46b35e91 100644 (file)
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -5,10 +5,18 @@ AUX 0.5-hald.rc 681 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 SHA1 fe413a8
 MD5 facf81eeca7ebddff5d030acb36de31d files/0.5-hald.rc 681
 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 files/0.5-hald.rc 681
 SHA256 802f83998c50a3e030d1db2f5a8364e4bb10eebecd464683445d63cf56702161 files/0.5-hald.rc 681
+AUX 0.5.9-hald.rc 694 RMD160 5676f5b1456eee6cacdf2e8483b0327b5a355c00 SHA1 e13e6c4caa950edf011d66414d16d62c1e4cc63e SHA256 1d09144864382a2048450287c6c0325aa4cd2e8f34c5ed7b13ec7e89d2b45b4f
+MD5 15715aebbf516c16ef7a97c5edfee2ba files/0.5.9-hald.rc 694
+RMD160 5676f5b1456eee6cacdf2e8483b0327b5a355c00 files/0.5.9-hald.rc 694
+SHA256 1d09144864382a2048450287c6c0325aa4cd2e8f34c5ed7b13ec7e89d2b45b4f files/0.5.9-hald.rc 694
 AUX 0.5.9/01_luks_mount_fix.patch 2605 RMD160 00d6b01a0c96123ce6ee66d1762a00988c363139 SHA1 d5b0ce4140b0db59942ef384df640a4749b0c24c SHA256 f1dfdd118055efbc97163273e0f3930f8badf2be3e4f1ca327654c221faa951e
 MD5 526e8c9b50700bca6340f6a0d73f1aa4 files/0.5.9/01_luks_mount_fix.patch 2605
 RMD160 00d6b01a0c96123ce6ee66d1762a00988c363139 files/0.5.9/01_luks_mount_fix.patch 2605
 SHA256 f1dfdd118055efbc97163273e0f3930f8badf2be3e4f1ca327654c221faa951e files/0.5.9/01_luks_mount_fix.patch 2605
+AUX 0.5.9/series 24 RMD160 12dfd75a9ba2f9c5bbaf5fad0b90e052f0464f17 SHA1 b6d6c3b3a3a1684ff3e12022257c550595171c6a SHA256 9a579045b0c76a53dce6842b5189b8d5399e17db370fa06a1e596f1a0906b3f5
+MD5 9723afa558e74a4f64a7b68f864b3336 files/0.5.9/series 24
+RMD160 12dfd75a9ba2f9c5bbaf5fad0b90e052f0464f17 files/0.5.9/series 24
+SHA256 9a579045b0c76a53dce6842b5189b8d5399e17db370fa06a1e596f1a0906b3f5 files/0.5.9/series 24
 AUX fix-scsi-fake-host-event.patch 3108 RMD160 2bda406fcb2dd92c348781a6c0958d40c79d78ea SHA1 af1d5c9a2cde091bd7abe04ed5e91a4bb815b675 SHA256 199749c188e5fb4858e4c1dac8800525377daf6a680dcd13e7096e71266ed05d
 MD5 3b6df9a24978d931781dc029c85288a9 files/fix-scsi-fake-host-event.patch 3108
 RMD160 2bda406fcb2dd92c348781a6c0958d40c79d78ea files/fix-scsi-fake-host-event.patch 3108
@@ -113,10 +121,6 @@ AUX hal-unmount.dev 397 RMD160 78286dd9527bbb421082e73b0d08e06cd514d275 SHA1 311
 MD5 7ee3fd5b5ee117f14633350e5b335c2f files/hal-unmount.dev 397
 RMD160 78286dd9527bbb421082e73b0d08e06cd514d275 files/hal-unmount.dev 397
 SHA256 747a4c483f8a558f2c75666e9547e539475f112363f1dbfc6ea19ca393c8e89b files/hal-unmount.dev 397
-AUX hald 522 RMD160 3d15723862416de29b6e2d18c53aec05b05216c3 SHA1 81d0023ef240790cf9e49d2e62e64760851038e1 SHA256 92f584b631026307485faa9ba386353b6d833349999e052fae0e8e9f82f83b6e
-MD5 35750516d24e67c9f24f5f1e0da22ca0 files/hald 522
-RMD160 3d15723862416de29b6e2d18c53aec05b05216c3 files/hald 522
-SHA256 92f584b631026307485faa9ba386353b6d833349999e052fae0e8e9f82f83b6e files/hald 522
 DIST hal-0.5.7.1.tar.gz 1503156 RMD160 2861818b29546bd3628b1bda3d41238cf644c644 SHA1 233b67e724e68f41ec3f53adcfb7d139328c5813 SHA256 f15320c1ec3e5c89307fc0a6fbf75b6619de12c15ce8cc1a689e7bc3f2c0831b
 DIST hal-0.5.9.tar.gz 1587364 RMD160 bc97bf63e35d36bdb5731c3447036425dc7adeb9 SHA1 5832d97bcaf3dabb9aeb919226e3c38d366057ac SHA256 65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
 EBUILD hal-0.5.7.1-r3.ebuild 6222 RMD160 5b7c01c492988a99e04b1e5516982bbe62fa8182 SHA1 6028da543a35928eb8ba9681f9c188c203842b11 SHA256 0ecad9d4f734c2deeaa1b1d14642ee148a0a9808584e7fde02a2633113f67ad0
@@ -127,14 +131,14 @@ EBUILD hal-0.5.7.1-r5.ebuild 6426 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498
 MD5 709ca20b11819f2e13e381be47e19535 hal-0.5.7.1-r5.ebuild 6426
 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498e hal-0.5.7.1-r5.ebuild 6426
 SHA256 6e020d3a29d82b993984f58ab8ef3659d837c11bce25f3ad25df6f4748e11207 hal-0.5.7.1-r5.ebuild 6426
-EBUILD hal-0.5.9.ebuild 5194 RMD160 2bf77ecee7c30686cefe0e8150bc8899eb253c0e SHA1 c40c25b85710c9b8551c3f8ad023bab8f3fc19ea SHA256 696df3fe5d94129ced9ab09ac92b445f879bd1d81014ea38a5a47db67faba884
-MD5 8b60961b54e79a88eea88a771866726b hal-0.5.9.ebuild 5194
-RMD160 2bf77ecee7c30686cefe0e8150bc8899eb253c0e hal-0.5.9.ebuild 5194
-SHA256 696df3fe5d94129ced9ab09ac92b445f879bd1d81014ea38a5a47db67faba884 hal-0.5.9.ebuild 5194
-MISC ChangeLog 22318 RMD160 b50d80584150f20a923ca1f644d804ee0dc8e26c SHA1 8c25827253b4bc62a94778de6ddedfa0bad26f7c SHA256 65e4a2a05c309821df994d04be34f3431f082802008dab409f4747bcd1e144ff
-MD5 167d779e5ed099b27504a584723974e8 ChangeLog 22318
-RMD160 b50d80584150f20a923ca1f644d804ee0dc8e26c ChangeLog 22318
-SHA256 65e4a2a05c309821df994d04be34f3431f082802008dab409f4747bcd1e144ff ChangeLog 22318
+EBUILD hal-0.5.9.ebuild 5215 RMD160 4a4a35016052cf78ccfff56ac05878c117335669 SHA1 601759fcc3f4c5a05e61db46b6430e7aa7c58a28 SHA256 14eee6f575e35b1133648981e292da1c1c7976c474b3fdb71619f8cee34ab0d9
+MD5 17834cfcca0c1c34ea2177c0a22ee0bf hal-0.5.9.ebuild 5215
+RMD160 4a4a35016052cf78ccfff56ac05878c117335669 hal-0.5.9.ebuild 5215
+SHA256 14eee6f575e35b1133648981e292da1c1c7976c474b3fdb71619f8cee34ab0d9 hal-0.5.9.ebuild 5215
+MISC ChangeLog 22702 RMD160 f394e484635d5d62db13728218a64ffe0582646e SHA1 401901fde44b316b212f09035875ffb8dc5233fc SHA256 42721118c9f615531406ea007ea2e6e927cc39f162bbc9a49be4c0b3e2353b23
+MD5 a894505dd246ea5977b0c2baf47cf997 ChangeLog 22702
+RMD160 f394e484635d5d62db13728218a64ffe0582646e ChangeLog 22702
+SHA256 42721118c9f615531406ea007ea2e6e927cc39f162bbc9a49be4c0b3e2353b23 ChangeLog 22702
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -151,7 +155,7 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGEsbvoeSe8B0zEfwRAie4AJ9l1yRatzHhEnuEs2gR0VdeSOlacACfVeKE
-89LEKeQMFfSkfbrLfISiR7c=
-=+uXN
+iD8DBQFGFFx9oeSe8B0zEfwRAogGAKCIM/OIwj6eCFAj3mGEYZZ97XyX3gCfb3ur
+b6oga7nVWRJALYE0ylQts8Y=
+=NDjf
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..b8232d2
--- /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 (file)
index 0000000..c1fdfb9
--- /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 (file)
index 23d5341..0000000
--- 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 19c469b0822c02c8d4cc24cd6417ec721715a344..413e9e833ad7d86ed198d45bccf973018ed0c6e0 100644 (file)
--- 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() {