summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Klimaszewski <steev@gentoo.org>2006-09-17 12:35:48 +0000
committerStephen Klimaszewski <steev@gentoo.org>2006-09-17 12:35:48 +0000
commit3ba979b41765495a9212b8845a6261eb0c1c37d0 (patch)
tree2ae5234c60633194fe62a98dcccb387c2333eda3 /sys-apps/hal
parentfix bug 147912 (diff)
downloadgentoo-2-3ba979b41765495a9212b8845a6261eb0c1c37d0.tar.gz
gentoo-2-3ba979b41765495a9212b8845a6261eb0c1c37d0.tar.bz2
gentoo-2-3ba979b41765495a9212b8845a6261eb0c1c37d0.zip
Add split dbus dependencies
(Portage version: 2.1.1)
Diffstat (limited to 'sys-apps/hal')
-rw-r--r--sys-apps/hal/ChangeLog7
-rw-r--r--sys-apps/hal/hal-0.5.7.1-r1.ebuild4
2 files changed, 8 insertions, 3 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index a8dace1e983e..6907180ef277 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
# 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.103 2006/09/16 17:40:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.104 2006/09/17 12:35:48 steev Exp $
+
+ 17 Sep 2006; Steev Klimaszewski <steev@gentoo.org> hal-0.5.7.1-r1.ebuild:
+ Added split dependency on either dbus-glib *or* dbus, that way, those people
+ who have unmasked dbus-glib it will depend on that first, and if not, fall
+ back on dbus monolithic.
*hal-0.5.7.1-r1 (16 Sep 2006)
diff --git a/sys-apps/hal/hal-0.5.7.1-r1.ebuild b/sys-apps/hal/hal-0.5.7.1-r1.ebuild
index 052752105b66..be97eac87ec4 100644
--- a/sys-apps/hal/hal-0.5.7.1-r1.ebuild
+++ b/sys-apps/hal/hal-0.5.7.1-r1.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.1-r1.ebuild,v 1.1 2006/09/16 17:40:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r1.ebuild,v 1.2 2006/09/17 12:35:48 steev Exp $
inherit eutils linux-info debug
@@ -14,7 +14,7 @@ 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
+ || ( dev-libs/dbus-glibs sys-apps/dbus )
>=sys-fs/udev-078
>=sys-apps/util-linux-2.12r
|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )