tweak dbus deps for upcoming release

(Portage version: 2.1.2_rc1-r1)

4 files changed, 20 insertions, 7 deletions

diff --git a/x11-libs/libnotify/ChangeLog b/x11-libs/libnotify/ChangeLog
index 8bfb298b04e0..497bb05f050d 100644
--- a/x11-libs/libnotify/ChangeLog
+++ b/x11-libs/libnotify/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libnotify
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/ChangeLog,v 1.21 2006/10/29 17:31:05 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/ChangeLog,v 1.22 2006/10/29 17:37:02 compnerd Exp $
+
+  29 Oct 2006; Saleem Abdulrasool <compnerd@gentoo.org> libnotify-0.4.0.ebuild,
+  libnotify-0.4.2.ebuild, libnotify-0.4.3.ebuild:
+  Tweak dbus deps for the upcoming dbus release
 
   29 Oct 2006; Saleem Abdulrasool <compnerd@gentoo.org> -libnotify-0.3.2.ebuild:
   prune older version
diff --git a/x11-libs/libnotify/libnotify-0.4.0.ebuild b/x11-libs/libnotify/libnotify-0.4.0.ebuild
index 7ff29a9b2d14..d778eb548afa 100644
--- a/x11-libs/libnotify/libnotify-0.4.0.ebuild
+++ b/x11-libs/libnotify/libnotify-0.4.0.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/x11-libs/libnotify/libnotify-0.4.0.ebuild,v 1.2 2006/10/03 21:32:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.4.0.ebuild,v 1.3 2006/10/29 17:37:02 compnerd Exp $
 
 DESCRIPTION="Notifications library"
 HOMEPAGE="http://www.galago-project.org/"
@@ -13,7 +13,10 @@ IUSE=""
 
 DEPEND=">=x11-libs/gtk+-2.2.2
 		>=dev-libs/glib-2.2.2
-		>=sys-apps/dbus-0.36
+		||	(
+				( >=sys-apps/dbus-core-0.91 >=dev-libs/dbus-glib-0.71 )
+				>=sys-apps/dbus-0.36
+			)
 		  dev-libs/popt"
 RDEPEND="${DEPEND}
 		 x11-misc/notification-daemon"
diff --git a/x11-libs/libnotify/libnotify-0.4.2.ebuild b/x11-libs/libnotify/libnotify-0.4.2.ebuild
index 5ad59b88c989..55721e132975 100644
--- a/x11-libs/libnotify/libnotify-0.4.2.ebuild
+++ b/x11-libs/libnotify/libnotify-0.4.2.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/x11-libs/libnotify/libnotify-0.4.2.ebuild,v 1.11 2006/10/11 09:54:06 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.4.2.ebuild,v 1.12 2006/10/29 17:37:02 compnerd Exp $
 
 inherit eutils
 
@@ -15,7 +15,10 @@ IUSE="doc"
 
 RDEPEND=">=x11-libs/gtk+-2.2.2
 		 >=dev-libs/glib-2.6
-		 >=sys-apps/dbus-0.60
+		 || (
+				( >=sys-apps/dbus-core-0.91 >=dev-libs/dbus-glib-0.71 )
+				>=sys-apps/dbus-0.60
+			)
 		 x11-misc/notification-daemon"
 DEPEND="${RDEPEND}
 		doc? ( >=dev-util/gtk-doc-1.4 )"
diff --git a/x11-libs/libnotify/libnotify-0.4.3.ebuild b/x11-libs/libnotify/libnotify-0.4.3.ebuild
index 64e8a95bfb57..1ae32b64bad7 100644
--- a/x11-libs/libnotify/libnotify-0.4.3.ebuild
+++ b/x11-libs/libnotify/libnotify-0.4.3.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/x11-libs/libnotify/libnotify-0.4.3.ebuild,v 1.1 2006/10/15 21:52:14 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.4.3.ebuild,v 1.2 2006/10/29 17:37:02 compnerd Exp $
 
 inherit eutils
 
@@ -15,7 +15,10 @@ IUSE="doc"
 
 RDEPEND=">=x11-libs/gtk+-2.6
 		 >=dev-libs/glib-2.6
-		 >=sys-apps/dbus-0.60
+		 || (
+				( >=sys-apps/dbus-core-0.91 >=dev-libs/dbus-glib-0.71  )
+				>=sys-apps/dbus-0.60
+			)
 		 x11-misc/notification-daemon"
 DEPEND="${RDEPEND}
 		doc? ( >=dev-util/gtk-doc-1.4 )"