diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2009-05-02 18:27:34 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2009-05-02 18:27:34 +0000 |
| commit | fab9a27bef92eeead253cf7ba1afc390e36ad555 (patch) | |
| tree | dc15098173a907902e92affe3b2d0040e8dc5421 /sys-apps | |
| parent | Don't install hal's policy file; bug #268243 (diff) | |
| download | gentoo-2-fab9a27bef92eeead253cf7ba1afc390e36ad555.tar.gz gentoo-2-fab9a27bef92eeead253cf7ba1afc390e36ad555.tar.bz2 gentoo-2-fab9a27bef92eeead253cf7ba1afc390e36ad555.zip | |
Block g-p-m-2.24-4-r1 and less, due to policy file conflict
(Portage version: 2.2_rc31/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/hal/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/hal/hal-0.5.12_rc1-r2.ebuild | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index 28e3c36b5d01..ed37e9b51369 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,9 @@ # 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.281 2009/05/02 00:16:38 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.282 2009/05/02 18:27:34 dang Exp $ + + 02 May 2009; Daniel Gryniewicz <dang@gentoo.org> hal-0.5.12_rc1-r2.ebuild: + Block g-p-m-2.24-4-r1 and less, due to policy file conflict *hal-0.5.12_rc1-r2 (01 May 2009) diff --git a/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild b/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild index f014f69ada53..e00362f02aee 100644 --- a/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild +++ b/sys-apps/hal/hal-0.5.12_rc1-r2.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.12_rc1-r2.ebuild,v 1.1 2009/05/02 00:16:38 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild,v 1.2 2009/05/02 18:27:34 dang Exp $ EAPI="2" @@ -58,7 +58,8 @@ DEPEND="${RDEPEND} dev-libs/libxml2 dev-util/gtk-doc app-text/docbook-sgml-utils - )" + ) + !<gnome-extra/gnome-power-manager-2.24.4-r2" PDEPEND=">=app-misc/hal-info-20081219 !gnome-extra/hal-device-manager laptop? ( >=sys-power/pm-utils-0.99.3 )" |