Can we get the dbus stuff right?

Package-Manager: portage-2.1.2_rc1-r1

5 files changed, 37 insertions, 33 deletions

diff --git a/x11-misc/notification-daemon/ChangeLog b/x11-misc/notification-daemon/ChangeLog
index fcc5ff7bb018..71d39128ece4 100644
--- a/x11-misc/notification-daemon/ChangeLog
+++ b/x11-misc/notification-daemon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/notification-daemon
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.20 2006/10/29 17:22:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.21 2006/10/30 18:16:06 compnerd Exp $
+
+  30 Oct 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  notification-daemon-0.3.5.ebuild, notification-daemon-0.3.5-r2.ebuild,
+  notification-daemon-0.3.6.ebuild:
+  Fix dbus deps round II
 
   29 Oct 2006; Doug Goldstein <cardoe@gentoo.org>
   -notification-daemon-0.3.4.ebuild, -notification-daemon-0.3.4-r1.ebuild,
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index ad51319a0032..c963a21b635c 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX notification-daemon-0.3.5-icon-data.patch 1968 RMD160 c782a6dc51e407b15192d80d6a2ce7badd84e76f SHA1 7eac5ffe153f9a68daffb91f9e4a32f8b0ee6f30 SHA256 089ffbc7032a8c747ca9b0044bb2359fe3d114eca0fab43f01815ba114e6c9b3
 MD5 fad34100a2397e2115ed59b29237d93c files/notification-daemon-0.3.5-icon-data.patch 1968
 RMD160 c782a6dc51e407b15192d80d6a2ce7badd84e76f files/notification-daemon-0.3.5-icon-data.patch 1968
@@ -11,22 +8,22 @@ RMD160 2721edbc148944188b42ac437a0b60482582ddc1 files/notification-daemon-0.3.5-
 SHA256 17090a40d6a4e8dbc5d426c982701e218e1a629e5e3fcc82b28b5d745eab55b3 files/notification-daemon-0.3.5-unrealize-in-destroy.patch 398
 DIST notification-daemon-0.3.5.tar.gz 383582 RMD160 5251ce4dcc2ae3cc637077ea71eb65a17c9102b4 SHA1 c8aa3b601db6d8b00cd9f4227fff146b8259eb71 SHA256 83a15eb99bb7a895d52e31be1c1548789a8bc29e83d30e758cf034a6627a1184
 DIST notification-daemon-0.3.6.tar.gz 402426 RMD160 f673127a3724cebbf9c91a1e457b15288cd86cce SHA1 fe222006e246036250d8a3d29ad3ea4ea6e8b1c4 SHA256 a187976c1957a7a0e17014ed97cbb4341f6898d5f60301f1b0c37e52188ebd13
-EBUILD notification-daemon-0.3.5-r2.ebuild 971 RMD160 89de1af3636d79bc84a350f76d0ffe1d61776282 SHA1 50048662b9dce462ea2d7d44eb295081330d3131 SHA256 db95a9d1fd4f3c989553a2b228570decc62e7d22805ce0f44c19edde75b42cea
-MD5 148889f2f7cfb437b0f5f4bd6bb3d313 notification-daemon-0.3.5-r2.ebuild 971
-RMD160 89de1af3636d79bc84a350f76d0ffe1d61776282 notification-daemon-0.3.5-r2.ebuild 971
-SHA256 db95a9d1fd4f3c989553a2b228570decc62e7d22805ce0f44c19edde75b42cea notification-daemon-0.3.5-r2.ebuild 971
-EBUILD notification-daemon-0.3.5.ebuild 805 RMD160 eee0a2d3c82517ee82b4f0d2dfcca06115a154b6 SHA1 0a2c72db165132b9efb1ada070762ff307affd80 SHA256 7aff0456b348cf14fa4478124fd3ee750e2dda27fea1f14e66e53406b561c05e
-MD5 2b4e7126ef7b725b8c59c1f1751c107e notification-daemon-0.3.5.ebuild 805
-RMD160 eee0a2d3c82517ee82b4f0d2dfcca06115a154b6 notification-daemon-0.3.5.ebuild 805
-SHA256 7aff0456b348cf14fa4478124fd3ee750e2dda27fea1f14e66e53406b561c05e notification-daemon-0.3.5.ebuild 805
-EBUILD notification-daemon-0.3.6.ebuild 823 RMD160 3f0d56c191340f18d987d22ea8adac9b16435ca9 SHA1 ed1d8cd99eae05219a4c622622dbb1465dde3ade SHA256 1c9f71d5ae82745a669076cc84c40ad24544a8fd9f7bdb5a32cd9e9bcf3d1c59
-MD5 c463e34b6f039c681603f42c4c9ffef9 notification-daemon-0.3.6.ebuild 823
-RMD160 3f0d56c191340f18d987d22ea8adac9b16435ca9 notification-daemon-0.3.6.ebuild 823
-SHA256 1c9f71d5ae82745a669076cc84c40ad24544a8fd9f7bdb5a32cd9e9bcf3d1c59 notification-daemon-0.3.6.ebuild 823
-MISC ChangeLog 3124 RMD160 d396d9dc22f6ba23fd3448b3b79da31c31f5e173 SHA1 1485fdfe586eb7ec1f3df6f8449e023845ba7718 SHA256 47d403536e2b9a2bf0627642e02d7f1b95b52b0bd535e7ea3a9003dc889eea12
-MD5 fec3b7033b3f4bf44907c73699914736 ChangeLog 3124
-RMD160 d396d9dc22f6ba23fd3448b3b79da31c31f5e173 ChangeLog 3124
-SHA256 47d403536e2b9a2bf0627642e02d7f1b95b52b0bd535e7ea3a9003dc889eea12 ChangeLog 3124
+EBUILD notification-daemon-0.3.5-r2.ebuild 978 RMD160 69ab79bbb2d30668304b3bec43ca77cae04ad789 SHA1 c995aa454ca42f596fe91287155cefdd5bca35af SHA256 c3949b038a0c23e14ddcb1a8c60e92f89215b0efb1fea1828fc056aa3d065748
+MD5 4dafbf354c41a055a5cf5a1f66eb9439 notification-daemon-0.3.5-r2.ebuild 978
+RMD160 69ab79bbb2d30668304b3bec43ca77cae04ad789 notification-daemon-0.3.5-r2.ebuild 978
+SHA256 c3949b038a0c23e14ddcb1a8c60e92f89215b0efb1fea1828fc056aa3d065748 notification-daemon-0.3.5-r2.ebuild 978
+EBUILD notification-daemon-0.3.5.ebuild 813 RMD160 6277d707b7db63dfc8d4d1d40b6bfbe34b8407ae SHA1 a5663d716b8c27c888c2a6979d73e16655ebb370 SHA256 c5222abe6935066ff5ce4bc5da033a5f2d354521eb75213babdb5e737ea1f769
+MD5 48ad4dd40a48a8898149fb9c7cf5221a notification-daemon-0.3.5.ebuild 813
+RMD160 6277d707b7db63dfc8d4d1d40b6bfbe34b8407ae notification-daemon-0.3.5.ebuild 813
+SHA256 c5222abe6935066ff5ce4bc5da033a5f2d354521eb75213babdb5e737ea1f769 notification-daemon-0.3.5.ebuild 813
+EBUILD notification-daemon-0.3.6.ebuild 830 RMD160 4421bf0bc62157f091bdddcc1323d1cdc7329cd8 SHA1 9a07f1ef8ec23649ba5477f08cc89371480c3d4e SHA256 4e914a62987ab2fcf2f86091adc6c94c7c9ef0993235030b4e94a3f06184130f
+MD5 361de4f18cb55d6e3660055497da8892 notification-daemon-0.3.6.ebuild 830
+RMD160 4421bf0bc62157f091bdddcc1323d1cdc7329cd8 notification-daemon-0.3.6.ebuild 830
+SHA256 4e914a62987ab2fcf2f86091adc6c94c7c9ef0993235030b4e94a3f06184130f notification-daemon-0.3.6.ebuild 830
+MISC ChangeLog 3317 RMD160 aacfff155781a34daf42647f492106a3cf502d4c SHA1 87e1f3abdf007a70b8ab7f67b56576a61f5b7071 SHA256 5ef776ee240a92ee6ace5351787841929de6cfd7ca58d006f4c1a960cb8420ef
+MD5 738198fc9460bd85bdd8e580fd57410a ChangeLog 3317
+RMD160 aacfff155781a34daf42647f492106a3cf502d4c ChangeLog 3317
+SHA256 5ef776ee240a92ee6ace5351787841929de6cfd7ca58d006f4c1a960cb8420ef ChangeLog 3317
 MISC metadata.xml 309 RMD160 41a011e8c4aa3b21a2dd17d07d4169816141fb8a SHA1 49d26a613994ed1e423d9200bf3b66592c0760c5 SHA256 37dfe8555749481a6f02759a7ad6c2961e71283013c9c9be94f57aa6e1358bfb
 MD5 d16211c4cb4eb6ad762a7b3481d04417 metadata.xml 309
 RMD160 41a011e8c4aa3b21a2dd17d07d4169816141fb8a metadata.xml 309
@@ -40,10 +37,3 @@ SHA256 1d2ae8dc681259b79fef9389f33814a4711f8b4645b6500827a724fdb98352a6 files/di
 MD5 1170966f2057c18f09abfc08ae657b93 files/digest-notification-daemon-0.3.6 277
 RMD160 bec7dd41bcad36894ba9ebb7f30d5be68f66b9a7 files/digest-notification-daemon-0.3.6 277
 SHA256 58241ee9626d375cd855a74b73765d666319ecbfe5adad9228f5b3ba05c1eaa5 files/digest-notification-daemon-0.3.6 277
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFRONUoeSe8B0zEfwRAhfRAJ9xRCMBpIwZVt1OsQFUkh6AVq4cbACcDkEq
-nBagnxXTifVhIWQsHEEHfCY=
-=288O
------END PGP SIGNATURE-----
diff --git a/x11-misc/notification-daemon/notification-daemon-0.3.5-r2.ebuild b/x11-misc/notification-daemon/notification-daemon-0.3.5-r2.ebuild
index bd32006268ad..669b3eea529c 100644
--- a/x11-misc/notification-daemon/notification-daemon-0.3.5-r2.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-0.3.5-r2.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-misc/notification-daemon/notification-daemon-0.3.5-r2.ebuild,v 1.3 2006/10/29 17:22:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.3.5-r2.ebuild,v 1.4 2006/10/30 18:16:06 compnerd Exp $
 
 inherit gnome2 eutils
 
@@ -17,7 +17,10 @@ DEPEND=">=dev-libs/glib-2.4.0
 		>=x11-libs/gtk+-2.4.0
 		>=gnome-base/gconf-2.4.0
 		>=x11-libs/libsexy-0.1.3
-		|| ( ( >=sys-apps/dbus-core-0.91 >=dev-libs/dbus-glib-0.71 ) >=sys-apps/dbus-0.36 )
+		||	(
+				>=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 )
+			)
 		x11-libs/libwnck
 		dev-libs/popt"
 RDEPEND="${DEPEND}
diff --git a/x11-misc/notification-daemon/notification-daemon-0.3.5.ebuild b/x11-misc/notification-daemon/notification-daemon-0.3.5.ebuild
index f0fd1879af92..29f05a540bde 100644
--- a/x11-misc/notification-daemon/notification-daemon-0.3.5.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-0.3.5.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-misc/notification-daemon/notification-daemon-0.3.5.ebuild,v 1.9 2006/10/29 17:22:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.3.5.ebuild,v 1.10 2006/10/30 18:16:06 compnerd Exp $
 
 inherit gnome2
 
@@ -17,7 +17,10 @@ DEPEND=">=dev-libs/glib-2.4.0
 		>=x11-libs/gtk+-2.4.0
 		>=gnome-base/gconf-2.4.0
 		>=x11-libs/libsexy-0.1.3
-		|| ( ( >=sys-apps/dbus-core-0.91 >=dev-libs/dbus-glib-0.71 ) >=sys-apps/dbus-0.36 )
+		||	(
+				>=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 )
+			)
 		x11-libs/libwnck
 		dev-libs/popt"
 RDEPEND="${DEPEND}
diff --git a/x11-misc/notification-daemon/notification-daemon-0.3.6.ebuild b/x11-misc/notification-daemon/notification-daemon-0.3.6.ebuild
index 1df02eeba12f..625d9d454895 100644
--- a/x11-misc/notification-daemon/notification-daemon-0.3.6.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-0.3.6.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-misc/notification-daemon/notification-daemon-0.3.6.ebuild,v 1.2 2006/10/29 17:22:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.3.6.ebuild,v 1.3 2006/10/30 18:16:06 compnerd Exp $
 
 inherit gnome2 eutils
 
@@ -17,7 +17,10 @@ DEPEND=">=dev-libs/glib-2.4.0
 		>=x11-libs/gtk+-2.4.0
 		>=gnome-base/gconf-2.4.0
 		>=x11-libs/libsexy-0.1.3
-		|| ( ( >=sys-apps/dbus-core-0.91 >=dev-libs/dbus-glib-0.71 ) >=sys-apps/dbus-0.60 )
+		||	(
+				>=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
+			)
 		x11-libs/libwnck
 		dev-libs/popt"
 RDEPEND="${DEPEND}