summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@gentoo.org>2006-11-20 22:16:30 +0000
committerSaleem Abdulrasool <compnerd@gentoo.org>2006-11-20 22:16:30 +0000
commit31d4f7d293fd664fedc498f274e2494a9b3166a7 (patch)
tree987a275fc6caed24392be605d551e0320c5afd87 /sys-apps/hal
parentVersion bump, bug #138483 (diff)
downloadgentoo-2-31d4f7d293fd664fedc498f274e2494a9b3166a7.tar.gz
gentoo-2-31d4f7d293fd664fedc498f274e2494a9b3166a7.tar.bz2
gentoo-2-31d4f7d293fd664fedc498f274e2494a9b3166a7.zip
fix dependencies for dbus-1.0
(Portage version: 2.1.2_rc2-r1)
Diffstat (limited to 'sys-apps/hal')
-rw-r--r--sys-apps/hal/ChangeLog5
-rw-r--r--sys-apps/hal/hal-0.5.7-r3.ebuild7
2 files changed, 9 insertions, 3 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 0b640ad5d1e7..3f7915f35edd 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/hal
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.109 2006/11/19 23:59:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.110 2006/11/20 22:16:30 compnerd Exp $
+
+ 20 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org> hal-0.5.7-r3.ebuild:
+ Fix dbus dependencies for dbus-1.0 release
19 Nov 2006; Doug Goldstein <cardoe@gentoo.org>
files/hal-0.5.7.1-hibernate-fix.patch:
diff --git a/sys-apps/hal/hal-0.5.7-r3.ebuild b/sys-apps/hal/hal-0.5.7-r3.ebuild
index 8d152949ebbf..abda6b858ad0 100644
--- a/sys-apps/hal/hal-0.5.7-r3.ebuild
+++ b/sys-apps/hal/hal-0.5.7-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7-r3.ebuild,v 1.12 2006/10/31 03:05:21 christel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7-r3.ebuild,v 1.13 2006/11/20 22:16:30 compnerd Exp $
inherit eutils linux-info debug
@@ -14,7 +14,6 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
IUSE="acpi crypt debug doc dmi pcmcia selinux"
RDEPEND=">=dev-libs/glib-2.6
- >=sys-apps/dbus-0.60
>=sys-fs/udev-078
>=sys-apps/util-linux-2.12r
|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
@@ -23,6 +22,10 @@ RDEPEND=">=dev-libs/glib-2.6
sys-apps/pciutils
dev-libs/libusb
sys-apps/hotplug
+ || (
+ >=dev-libs/dbus-glib-0.71
+ ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
+ )
dmi? ( >=sys-apps/dmidecode-2.7 )
crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 )
selinux? ( sys-libs/libselinux )"