util-linux is only for Linux. init script depends on acpid now if the person uses...

Package-Manager: portage-2.1.2.3

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 723c8ed6313ee87e33702e7669fa0ad62a3fa309..e0e5632b0a94b87e9604616221a9946f688c7773 100644 (file)
--- 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/Manifest b/sys-apps/hal/Manifest
index 13d1e9fc0c8b3dbb881e775741c527eaccfa5723..af27a82657aa83a344b98b04a4306a78429d10ef 100644 (file)
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,11 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.5-hald.rc 681 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 SHA1 fe413a84ee58cefa923cbc922a1c961fbdb17aa6 SHA256 802f83998c50a3e030d1db2f5a8364e4bb10eebecd464683445d63cf56702161
 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-hald.rc 700 RMD160 3fa0a991056eb872f9dd044998315fcbf0052745 SHA1 f640c31dd3974f0348e8ecaccff3bdac4426b693 SHA256 ca1995a88a7540ffbdc67ec9098cf946f3a284880e467aaa0220c618e4a117b3
+MD5 3b00116a452b7b02f790e49249211a0e files/0.5.9-hald.rc 700
+RMD160 3fa0a991056eb872f9dd044998315fcbf0052745 files/0.5.9-hald.rc 700
+SHA256 ca1995a88a7540ffbdc67ec9098cf946f3a284880e467aaa0220c618e4a117b3 files/0.5.9-hald.rc 700
 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
@@ -136,14 +139,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 5693 RMD160 961b3013e4abe1b551d9f128207aef4926de6f48 SHA1 6a95eee2b7b821f245eb7f8e9d459320fb081e23 SHA256 f6e18e84918a645767c119470aef310092de6745715e0668a8b213a68b8bc83a
-MD5 3a2a83ff6125fa5d35d91365c2f5bc82 hal-0.5.9.ebuild 5693
-RMD160 961b3013e4abe1b551d9f128207aef4926de6f48 hal-0.5.9.ebuild 5693
-SHA256 f6e18e84918a645767c119470aef310092de6745715e0668a8b213a68b8bc83a hal-0.5.9.ebuild 5693
-MISC ChangeLog 23490 RMD160 b243535433752300594f40bde0c39e90b9278f0c SHA1 20ba2004e8efe56ea0170500153047f4e278b2ea SHA256 8d1ff080d4d7865d8399330c4cb535140aa7eb065939fb8bd2eb8af1dd17a633
-MD5 946866bb6dfc5c50c018e039ada52865 ChangeLog 23490
-RMD160 b243535433752300594f40bde0c39e90b9278f0c ChangeLog 23490
-SHA256 8d1ff080d4d7865d8399330c4cb535140aa7eb065939fb8bd2eb8af1dd17a633 ChangeLog 23490
+EBUILD hal-0.5.9.ebuild 5711 RMD160 9134345e239208cd114282aa3a0e7bd32b0430f9 SHA1 8bc332d2e8cb5a43df26b6b49f88826e5fcb1c66 SHA256 9dcd88897c5372f58d2312e7ab6efda46c4656743bd7981bd37fe44d79ef7617
+MD5 c024f20c50a98639db540e0362e58c28 hal-0.5.9.ebuild 5711
+RMD160 9134345e239208cd114282aa3a0e7bd32b0430f9 hal-0.5.9.ebuild 5711
+SHA256 9dcd88897c5372f58d2312e7ab6efda46c4656743bd7981bd37fe44d79ef7617 hal-0.5.9.ebuild 5711
+MISC ChangeLog 23727 RMD160 61d1ad8fa0e0ae6b78837557f3f42b0fcc2783f4 SHA1 40e923313c93a45270d55aecdc722c05d442c656 SHA256 a1bba75b210deff599904b4c15cc132fbb10614f65728383c0ed98239e446730
+MD5 667de1333cdeb9901f794ce0560cb2dc ChangeLog 23727
+RMD160 61d1ad8fa0e0ae6b78837557f3f42b0fcc2783f4 ChangeLog 23727
+SHA256 a1bba75b210deff599904b4c15cc132fbb10614f65728383c0ed98239e446730 ChangeLog 23727
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -157,3 +160,10 @@ SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/di
 MD5 75c89219e1c767bdbfa9942258c86827 files/digest-hal-0.5.9 232
 RMD160 6244ab5be8bbc652f1130c2715f32bf881710f31 files/digest-hal-0.5.9 232
 SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/digest-hal-0.5.9 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGFnjuoeSe8B0zEfwRAk3TAJ99t6Ap5yjW7oxAtsxyd8cFds5BJQCfe4LM
+l0OZWOhSsKR29sfYLANF1Bk=
+=0mBt
+-----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
index b8232d29f0825327f3a48a98343bc349d9bf2ceb..68502b68cbc6b23a096489346cf45343d03ccc3c 100644 (file)
--- 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 b70530db38a31da0d41d55cbcdb7bebc6aa888df..38de7e0e2daa1bb1d74613ec40820581f9338845 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.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