tweak dbus deps for upcoming release

Package-Manager: portage-2.1.2_rc1-r1

5 files changed, 36 insertions, 23 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/Manifest b/x11-libs/libnotify/Manifest
index d6e8eb774826..a7348ba370ee 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -5,22 +5,22 @@ SHA256 33a8eb9cbf70f70b12fd7cfc7b659b92f2f421719c628a82e929d53bf4af6518 files/li
 DIST libnotify-0.4.0.tar.gz 341717 RMD160 7eb24422cc77bbb4f2c07e73152bbb9364d1ce8d SHA1 bf2fccf2f34040ccd762b881971898b80c3068b2 SHA256 3a15a820557f9eba24a08212c9748ec4ef912d18567e0fd026f6d6a2f742d55c
 DIST libnotify-0.4.2.tar.gz 388355 RMD160 6a2bc403a927571480683b5ffa3d40ecb482e24f SHA1 ff67522426f2908c41de9ded210c8e3e28e0de84 SHA256 9e95499badd1b0da67b1422caa4198dbe61c961300b7001173eace18b8b2c38e
 DIST libnotify-0.4.3.tar.gz 389402 RMD160 c4e42c9407b57633b87ad088a8cb7795b253e5e6 SHA1 7d175003b91227b1101e867a67147852af20c9d6 SHA256 15b0492ac252f6e8ce57c106bda0722413196d16d198c97f20a05908d1b977af
-EBUILD libnotify-0.4.0.ebuild 718 RMD160 b5ce763021238c87c2660ea79bb4db6727b376a5 SHA1 d090a40487ad8cf01f3264d9f12537f8817bb066 SHA256 75228100eeaa8bd273beb4c2bcf8dbfcf555fb4a3c9f901fa597e366e0757633
-MD5 1f46f473d75cd37db9f84bf730831523 libnotify-0.4.0.ebuild 718
-RMD160 b5ce763021238c87c2660ea79bb4db6727b376a5 libnotify-0.4.0.ebuild 718
-SHA256 75228100eeaa8bd273beb4c2bcf8dbfcf555fb4a3c9f901fa597e366e0757633 libnotify-0.4.0.ebuild 718
-EBUILD libnotify-0.4.2.ebuild 964 RMD160 80561a254eba3b80616980dee221ca481ed084f2 SHA1 3c9c64fe3f117ccf24b5d0f1053af897d8068254 SHA256 eacc567905eb740c8d7517eabe7f52850124e27e34c7ce1e72c720c3eb777c63
-MD5 0cb4424b8e122a23ff2f1a8ceaaeec4d libnotify-0.4.2.ebuild 964
-RMD160 80561a254eba3b80616980dee221ca481ed084f2 libnotify-0.4.2.ebuild 964
-SHA256 eacc567905eb740c8d7517eabe7f52850124e27e34c7ce1e72c720c3eb777c63 libnotify-0.4.2.ebuild 964
-EBUILD libnotify-0.4.3.ebuild 761 RMD160 d34b27f3836e75119a678de83077673009d41ca3 SHA1 0a7c14f531ec47bd6d852555a8ab43b72e84dd0f SHA256 0cde83fb8a4aff182398e5adac204bab7f7c0b9e551512e73589d2e1caf6b9b6
-MD5 e0dcef2cb6b023142c3fd12baff4c12b libnotify-0.4.3.ebuild 761
-RMD160 d34b27f3836e75119a678de83077673009d41ca3 libnotify-0.4.3.ebuild 761
-SHA256 0cde83fb8a4aff182398e5adac204bab7f7c0b9e551512e73589d2e1caf6b9b6 libnotify-0.4.3.ebuild 761
-MISC ChangeLog 2673 RMD160 1baff70e132cf40a5277df803d2d90f5de76d757 SHA1 c92f05626b32bbd27b8291a795b0482fc0b27141 SHA256 daf016771c08b5c31e9f52099232bc72629dbcf08014f496fec26c064e41aa51
-MD5 0766f5a6f96e9b590441e6c7c6681ffe ChangeLog 2673
-RMD160 1baff70e132cf40a5277df803d2d90f5de76d757 ChangeLog 2673
-SHA256 daf016771c08b5c31e9f52099232bc72629dbcf08014f496fec26c064e41aa51 ChangeLog 2673
+EBUILD libnotify-0.4.0.ebuild 792 RMD160 29a2e6624a60bbfe665d4f43fbb2f40a5bcad123 SHA1 698e24abe9b39f262100c82ffc142064eb5a0cdc SHA256 a58172da88c1d434475bad8042d04aff12da54c42c6fb62c2a35ded2a3f49219
+MD5 3b07230e7917f9178fd7539a779e8f55 libnotify-0.4.0.ebuild 792
+RMD160 29a2e6624a60bbfe665d4f43fbb2f40a5bcad123 libnotify-0.4.0.ebuild 792
+SHA256 a58172da88c1d434475bad8042d04aff12da54c42c6fb62c2a35ded2a3f49219 libnotify-0.4.0.ebuild 792
+EBUILD libnotify-0.4.2.ebuild 1040 RMD160 c7201f1d0227d0c54afe1ddc1ef9200e93b36153 SHA1 8337018e93962cc4cc2371b7202fb31b410d1877 SHA256 b5e28ee772327578c1cfeee4deebe93cfad38f940b75eed6dc2bd01577750e33
+MD5 10ad5bfcb1d4817f0a7fd21a2c34251c libnotify-0.4.2.ebuild 1040
+RMD160 c7201f1d0227d0c54afe1ddc1ef9200e93b36153 libnotify-0.4.2.ebuild 1040
+SHA256 b5e28ee772327578c1cfeee4deebe93cfad38f940b75eed6dc2bd01577750e33 libnotify-0.4.2.ebuild 1040
+EBUILD libnotify-0.4.3.ebuild 836 RMD160 ca6ab2a5305b959578c4d8926bf56dd344d82cdd SHA1 b8bfb699de627c15b1d3785ed9a70aca4901a608 SHA256 d0effa30583a5fdfe5dc77781c6b9d9d4eb62a05fb231fa260898462c771f318
+MD5 2b12b217f2ab6d2717ba7cce6ee13b8b libnotify-0.4.3.ebuild 836
+RMD160 ca6ab2a5305b959578c4d8926bf56dd344d82cdd libnotify-0.4.3.ebuild 836
+SHA256 d0effa30583a5fdfe5dc77781c6b9d9d4eb62a05fb231fa260898462c771f318 libnotify-0.4.3.ebuild 836
+MISC ChangeLog 2852 RMD160 c06358e1f976ff346d579325fc546e82eb6d820a SHA1 3760fcc19e48c97aa6d68445cbe09d53a28235ac SHA256 840c738212a6fac326f910c13e2eb50f18b9b1136427c55a068a6cbfd2087c41
+MD5 9fd77106e557a4364443f8971ed68c8b ChangeLog 2852
+RMD160 c06358e1f976ff346d579325fc546e82eb6d820a ChangeLog 2852
+SHA256 840c738212a6fac326f910c13e2eb50f18b9b1136427c55a068a6cbfd2087c41 ChangeLog 2852
 MISC metadata.xml 309 RMD160 41a011e8c4aa3b21a2dd17d07d4169816141fb8a SHA1 49d26a613994ed1e423d9200bf3b66592c0760c5 SHA256 37dfe8555749481a6f02759a7ad6c2961e71283013c9c9be94f57aa6e1358bfb
 MD5 d16211c4cb4eb6ad762a7b3481d04417 metadata.xml 309
 RMD160 41a011e8c4aa3b21a2dd17d07d4169816141fb8a metadata.xml 309
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 )"