summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gryniewicz <dang@gentoo.org>2009-05-02 00:16:39 +0000
committerDaniel Gryniewicz <dang@gentoo.org>2009-05-02 00:16:39 +0000
commit5f52a1f53d3af9e798a6dcdd8dd4bf72e865cabc (patch)
treedcb4d929e56ff207dac3dca4ca6e61a09767f834 /sys-apps
parentKeeping the pkg_preinst is causing more problems than removing it, such as bu... (diff)
downloadgentoo-2-5f52a1f53d3af9e798a6dcdd8dd4bf72e865cabc.tar.gz
gentoo-2-5f52a1f53d3af9e798a6dcdd8dd4bf72e865cabc.tar.bz2
gentoo-2-5f52a1f53d3af9e798a6dcdd8dd4bf72e865cabc.zip
Fix #267706 and #267621
(Portage version: 2.2_rc31/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/hal/ChangeLog9
-rw-r--r--sys-apps/hal/files/0.5.10-hald.rc4
-rw-r--r--sys-apps/hal/hal-0.5.12_rc1-r2.ebuild (renamed from sys-apps/hal/hal-0.5.12_rc1-r1.ebuild)4
3 files changed, 12 insertions, 5 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 937fcfc7c036..28e3c36b5d01 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-apps/hal
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.280 2009/04/30 19:20:44 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.281 2009/05/02 00:16:38 dang Exp $
+
+*hal-0.5.12_rc1-r2 (01 May 2009)
+
+ 01 May 2009; Daniel Gryniewicz <dang@gentoo.org> files/0.5.10-hald.rc,
+ -hal-0.5.12_rc1-r1.ebuild, +hal-0.5.12_rc1-r2.ebuild:
+ - Indicate hal should start after consolekit (bug #267706)
+ - Add KillSwitch to the dbus policy (bug #267621)
*hal-0.5.12_rc1-r1 (30 Apr 2009)
diff --git a/sys-apps/hal/files/0.5.10-hald.rc b/sys-apps/hal/files/0.5.10-hald.rc
index f14e12ab7421..af26ee6faf9b 100644
--- a/sys-apps/hal/files/0.5.10-hald.rc
+++ b/sys-apps/hal/files/0.5.10-hald.rc
@@ -1,10 +1,10 @@
#!/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.10-hald.rc,v 1.2 2008/01/05 19:23:08 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5.10-hald.rc,v 1.3 2009/05/02 00:16:39 dang Exp $
depend() {
- use logger acpid
+ use logger acpid consolekit
need dbus
after coldplug dns nscd
}
diff --git a/sys-apps/hal/hal-0.5.12_rc1-r1.ebuild b/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild
index deb79a0e6171..f014f69ada53 100644
--- a/sys-apps/hal/hal-0.5.12_rc1-r1.ebuild
+++ b/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.12_rc1-r1.ebuild,v 1.1 2009/04/30 19:20:44 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild,v 1.1 2009/05/02 00:16:38 dang Exp $
EAPI="2"
inherit eutils linux-info autotools flag-o-matic
-PATCH_VERSION="2"
+PATCH_VERSION="3"
MY_P=${P/_/}
S=${WORKDIR}/${MY_P}