Fix fscked up dbus deps for bug 187369.

Package-Manager: portage-2.1.3

4 files changed, 21 insertions, 23 deletions

diff --git a/x11-misc/notification-daemon/ChangeLog b/x11-misc/notification-daemon/ChangeLog
index 4f577fa37a62..282115fcf584 100644
--- a/x11-misc/notification-daemon/ChangeLog
+++ b/x11-misc/notification-daemon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/notification-daemon
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.45 2007/07/15 16:33:44 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.46 2007/08/01 17:53:58 drac Exp $
+
+  01 Aug 2007; Samuli Suominen <drac@gentoo.org>
+  notification-daemon-0.3.6-r1.ebuild, notification-daemon-0.3.7.ebuild:
+  Fix fscked up dbus deps for bug 187369.
 
   15 Jul 2007; nixnut <nixnut@gentoo.org> notification-daemon-0.3.7.ebuild:
   Stable on ppc wrt bug 184615
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index c949f77a48bd..7fecbc6cdb93 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -4,18 +4,18 @@ RMD160 40d290931cd7027784f9f1cb64e987c9ee2b0542 files/notification-daemon-0.3.6-
 SHA256 c1334df4dc7ec53f806f030a4edc15ca608fb703cb0931cdb2050a0b9e9fac59 files/notification-daemon-0.3.6-binding-tool.patch 1562
 DIST notification-daemon-0.3.6.tar.gz 402426 RMD160 f673127a3724cebbf9c91a1e457b15288cd86cce SHA1 fe222006e246036250d8a3d29ad3ea4ea6e8b1c4 SHA256 a187976c1957a7a0e17014ed97cbb4341f6898d5f60301f1b0c37e52188ebd13
 DIST notification-daemon-0.3.7.tar.gz 412184 RMD160 04a226d939f6985ee73e4d603a95598cc8eff221 SHA1 14abf2431b1feb8c752926ff9cb84dc1b66823a6 SHA256 53d2f92c3d14423b49c2ff077855cf3987d38def963c82fd26fba5de379ca540
-EBUILD notification-daemon-0.3.6-r1.ebuild 1117 RMD160 a01d508009a20c1e5b243c96417a493c42020e61 SHA1 1b914fb93264dd86b920bc44f6f7c4915f185519 SHA256 5d5804284b4bde4984448cfcc46ef61ac0806576f5325af0ca29caf19f01d389
-MD5 7edef7a365eb8757381034417ef1553f notification-daemon-0.3.6-r1.ebuild 1117
-RMD160 a01d508009a20c1e5b243c96417a493c42020e61 notification-daemon-0.3.6-r1.ebuild 1117
-SHA256 5d5804284b4bde4984448cfcc46ef61ac0806576f5325af0ca29caf19f01d389 notification-daemon-0.3.6-r1.ebuild 1117
-EBUILD notification-daemon-0.3.7.ebuild 876 RMD160 24c0776551b8dc531cd5d2e5206b9bade39ed6cd SHA1 7fde00183d180f633a0a66c580cfce825a8af14a SHA256 baac424760a8ce065756b830fbee4036df97b9517ee21b94d946f4e854fcb8cb
-MD5 54cede169b39413ed19e3f1e097552d5 notification-daemon-0.3.7.ebuild 876
-RMD160 24c0776551b8dc531cd5d2e5206b9bade39ed6cd notification-daemon-0.3.7.ebuild 876
-SHA256 baac424760a8ce065756b830fbee4036df97b9517ee21b94d946f4e854fcb8cb notification-daemon-0.3.7.ebuild 876
-MISC ChangeLog 6820 RMD160 84b856c7447a897bbb354b7602541896e104ad3c SHA1 df31e6936c90f696e36996ef4ffe8f723fa407bd SHA256 4c143bf8b7e1ea446af693471cd863f9885fa40215bec316844848122b7c995e
-MD5 1b03a9a9561b60c1f876e98c386b58c1 ChangeLog 6820
-RMD160 84b856c7447a897bbb354b7602541896e104ad3c ChangeLog 6820
-SHA256 4c143bf8b7e1ea446af693471cd863f9885fa40215bec316844848122b7c995e ChangeLog 6820
+EBUILD notification-daemon-0.3.6-r1.ebuild 1079 RMD160 c86c293c3df0ce15642f8dda1593c7a4dfed7057 SHA1 cf9d898c0422b0fe50531d30484448a819459ef7 SHA256 4c3a9becd642eb6a9aeb9f75baffede7e80149df1b610da7c9d24b8c9f2ac8f3
+MD5 d48e727b09202eaf7621b21c3935c318 notification-daemon-0.3.6-r1.ebuild 1079
+RMD160 c86c293c3df0ce15642f8dda1593c7a4dfed7057 notification-daemon-0.3.6-r1.ebuild 1079
+SHA256 4c3a9becd642eb6a9aeb9f75baffede7e80149df1b610da7c9d24b8c9f2ac8f3 notification-daemon-0.3.6-r1.ebuild 1079
+EBUILD notification-daemon-0.3.7.ebuild 836 RMD160 b9f987bc99c1bc4d5d164cec1883b4219b47eb8e SHA1 eb3d523d3ff98152fbbf12a255f74d87cf31c06d SHA256 40d7ddd43b0b304262789ba8433303e515c24461eb67d7225743471755c782ed
+MD5 0ac6e5a323feeacf82557af8e772d21f notification-daemon-0.3.7.ebuild 836
+RMD160 b9f987bc99c1bc4d5d164cec1883b4219b47eb8e notification-daemon-0.3.7.ebuild 836
+SHA256 40d7ddd43b0b304262789ba8433303e515c24461eb67d7225743471755c782ed notification-daemon-0.3.7.ebuild 836
+MISC ChangeLog 6983 RMD160 d62457559f304a6c41cb231fdd1ffa20f0441652 SHA1 3c06914332bd9043e04314903eb69f7fec7c39c0 SHA256 8b9f09d21a953ff25ed4236c8867f6ac3aa0ce68571913d736e599ebf26737e9
+MD5 5d668c1a04dbe59c85c4f1f15e4f131c ChangeLog 6983
+RMD160 d62457559f304a6c41cb231fdd1ffa20f0441652 ChangeLog 6983
+SHA256 8b9f09d21a953ff25ed4236c8867f6ac3aa0ce68571913d736e599ebf26737e9 ChangeLog 6983
 MISC metadata.xml 309 RMD160 41a011e8c4aa3b21a2dd17d07d4169816141fb8a SHA1 49d26a613994ed1e423d9200bf3b66592c0760c5 SHA256 37dfe8555749481a6f02759a7ad6c2961e71283013c9c9be94f57aa6e1358bfb
 MD5 d16211c4cb4eb6ad762a7b3481d04417 metadata.xml 309
 RMD160 41a011e8c4aa3b21a2dd17d07d4169816141fb8a metadata.xml 309
diff --git a/x11-misc/notification-daemon/notification-daemon-0.3.6-r1.ebuild b/x11-misc/notification-daemon/notification-daemon-0.3.6-r1.ebuild
index 353598991292..6f4f44809147 100644
--- a/x11-misc/notification-daemon/notification-daemon-0.3.6-r1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-0.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r1.ebuild,v 1.15 2007/07/08 05:34:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.3.6-r1.ebuild,v 1.16 2007/08/01 17:53:58 drac Exp $
 
 inherit gnome2 eutils
 
@@ -17,10 +17,7 @@ RDEPEND=">=dev-libs/glib-2.4.0
 	>=x11-libs/gtk+-2.4.0
 	>=gnome-base/gconf-2.4.0
 	>=x11-libs/libsexy-0.1.3
-	|| (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.60
-	)
+	>=dev-libs/dbus-glib-0.71
 	x11-libs/libwnck
 	dev-libs/popt"
 DEPEND="${RDEPEND}
diff --git a/x11-misc/notification-daemon/notification-daemon-0.3.7.ebuild b/x11-misc/notification-daemon/notification-daemon-0.3.7.ebuild
index 7122b397dd1f..7242cffa6dc1 100644
--- a/x11-misc/notification-daemon/notification-daemon-0.3.7.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-0.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.7.ebuild,v 1.9 2007/07/15 16:33:44 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.3.7.ebuild,v 1.10 2007/08/01 17:53:58 drac Exp $
 
 inherit gnome2 eutils
 
@@ -17,10 +17,7 @@ RDEPEND=">=dev-libs/glib-2.4.0
 		 >=x11-libs/gtk+-2.4.0
 		 >=gnome-base/gconf-2.4.0
 		 >=x11-libs/libsexy-0.1.3
-		 || (
-				>=dev-libs/dbus-glib-0.71
-				>=sys-apps/dbus-0.60
-			)
+		 >=dev-libs/dbus-glib-0.71
 		 x11-libs/libwnck"
 DEPEND="${RDEPEND}
 		=sys-devel/automake-1.9*