diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2009-12-13 18:46:24 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2009-12-13 18:46:24 +0000 |
| commit | 92fa4afe4694921e8649bfbe89e2a3e061f7f713 (patch) | |
| tree | 1d4751e95c9e1db8f87579aca1e81f5ccd79f10c /sys-apps | |
| parent | Stable on alpha, bug #292370 (diff) | |
| download | gentoo-2-92fa4afe4694921e8649bfbe89e2a3e061f7f713.tar.gz gentoo-2-92fa4afe4694921e8649bfbe89e2a3e061f7f713.tar.bz2 gentoo-2-92fa4afe4694921e8649bfbe89e2a3e061f7f713.zip | |
Fix blockers due to a combination of hal[consolekit,-policykit] and polkit pulling in consolekit[policykit] -- bug 296692
(Portage version: 2.1.7.13/cvs/Linux i686)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/hal/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/hal/hal-0.5.14.ebuild | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index 5d5fa580051e..a7cbbb9260ff 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,10 @@ # 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.310 2009/12/11 15:52:37 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.311 2009/12/13 18:46:24 nirbheek Exp $ + + 13 Dec 2009; Nirbheek Chauhan <nirbheek@gentoo.org> hal-0.5.14.ebuild: + Fix blockers due to a combination of hal[consolekit,-policykit] and polkit + pulling in consolekit[policykit] -- bug 296692 11 Dec 2009; Raúl Porcel <armin76@gentoo.org> hal-0.5.13-r2.ebuild: sh stable wrt #287380 diff --git a/sys-apps/hal/hal-0.5.14.ebuild b/sys-apps/hal/hal-0.5.14.ebuild index 0fb92d8ca1cd..f7975adb6923 100644 --- a/sys-apps/hal/hal-0.5.14.ebuild +++ b/sys-apps/hal/hal-0.5.14.ebuild @@ -1,6 +1,6 @@ # 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.14.ebuild,v 1.1 2009/12/02 14:44:49 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.14.ebuild,v 1.2 2009/12/13 18:46:24 nirbheek Exp $ EAPI="2" @@ -44,7 +44,10 @@ RDEPEND=">=dev-libs/dbus-glib-0.61 x86? ( >=sys-apps/dmidecode-2.7 ) selinux? ( sys-libs/libselinux sec-policy/selinux-hal ) consolekit? ( - sys-auth/consolekit[policykit=] + || ( + <sys-auth/consolekit-0.4[policykit=] + >=sys-auth/consolekit-0.4 + ) ) policykit? ( sys-auth/consolekit[policykit] |