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 | 96cf2470efcbed6cb59353fecf447d4b0d404027 (patch) | |
| tree | 59603af39107bcf0858517ed6e43996112b8d06b /sys-apps | |
| parent | Stable on alpha, bug #292370 (diff) | |
| download | historical-96cf2470efcbed6cb59353fecf447d4b0d404027.tar.gz historical-96cf2470efcbed6cb59353fecf447d4b0d404027.tar.bz2 historical-96cf2470efcbed6cb59353fecf447d4b0d404027.zip | |
Fix blockers due to a combination of hal[consolekit,-policykit] and polkit pulling in consolekit[policykit] -- bug 296692
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/hal/hal-0.5.14.ebuild | 7 |
3 files changed, 12 insertions, 5 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/Manifest b/sys-apps/hal/Manifest index 5fa048472693..816822b68679 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -15,6 +15,6 @@ EBUILD hal-0.5.12_rc1-r6.ebuild 9821 RMD160 3861e904a70e10534fbde7af2c2c88f46f15 EBUILD hal-0.5.12_rc1-r7.ebuild 9769 RMD160 95a92aa81f15944ef2f10b425933f2dfb5418dbb SHA1 bc45ad8afdadf32cf745cb417d3dd14cac55edf7 SHA256 818095452fa1458bc069a3fbb56f853ee91bfa4208d04706e5b471e242f0af3d EBUILD hal-0.5.12_rc1-r8.ebuild 9668 RMD160 54494d2f817d932db9350595e81a9870870d6809 SHA1 1bf9009c77de925fed98f2817ebe0b5a85260abb SHA256 83a08f6d6827ca290cfaca916119f8be8f7842db965e614114f97aff492b4b6f EBUILD hal-0.5.13-r2.ebuild 9793 RMD160 dcd8f938dccd0decc0134a06be9a628ea5c0954e SHA1 c3f8d1beb9ed79d885da59bd97294d4795e42775 SHA256 a35466fa8b1cfee9963fe72aef729a28c3528ee10dd59bf87d3175e033c09757 -EBUILD hal-0.5.14.ebuild 9796 RMD160 c227f5b8ff9652166d9da8f33edf2087eed0d7b7 SHA1 5bea7dd43bf4c03cc7ead20144db93615fdedf1d SHA256 eb01affa897916dd8d2129e13cc56fdb24909236c7ce0fb4af62fb810d337950 -MISC ChangeLog 55033 RMD160 0f6ef0724527cd8c29da56f68913add9a8f2ba58 SHA1 a46817ce0877363f6de64a8a62c9455387ac5f68 SHA256 5fbf87dd79000e00a4c13b11d91f6bce316c84e6634b0f52ef41238c04f98024 +EBUILD hal-0.5.14.ebuild 9865 RMD160 5f2c448e12431680ef3691fc0df49889f45fef1b SHA1 64dcc78ddda9c8a455fa5910203ce8bbfd5a5554 SHA256 9af3aa58cbad6ae47ee67b3da8e205c13c0a0c1113f85c7d0db181f5a587c5a4 +MISC ChangeLog 55234 RMD160 08a3aa8f5524fbef2c29687b5a5b69a96f2fbdcc SHA1 7ef030808123edfa6ef96ca123314fa339268415 SHA256 54e0ceb360ede4efbf78c3a4a35e464112782502be6cac9d123806ec88c79b4b MISC metadata.xml 2017 RMD160 90b6fed11f5582fce64fe36354e94b811478d21e SHA1 2b2693c7d677adf363e41e16cc71787fbe01d383 SHA256 910ab10f73ca0bccdea716f39dd3d3cc3d594bd25f6bbb7e25b70082be194048 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] |