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-libs/libnotify/ChangeLog b/x11-libs/libnotify/ChangeLog
index fd0cdf45540f..21aa67ed48c1 100644
--- a/x11-libs/libnotify/ChangeLog
+++ b/x11-libs/libnotify/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libnotify
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/ChangeLog,v 1.38 2007/07/15 16:29:02 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/ChangeLog,v 1.39 2007/08/01 17:56:14 drac Exp $
+
+  01 Aug 2007; Samuli Suominen <drac@gentoo.org> libnotify-0.4.3.ebuild,
+  libnotify-0.4.4.ebuild:
+  Fix fscked up dbus deps for bug 187369.
 
   15 Jul 2007; nixnut <nixnut@gentoo.org> libnotify-0.4.4.ebuild:
   Stable on ppc wrt bug 184615
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index d1b0a0c6ff27..bfda42f89dac 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,17 +1,17 @@
 DIST libnotify-0.4.3.tar.gz 389402 RMD160 c4e42c9407b57633b87ad088a8cb7795b253e5e6 SHA1 7d175003b91227b1101e867a67147852af20c9d6 SHA256 15b0492ac252f6e8ce57c106bda0722413196d16d198c97f20a05908d1b977af
 DIST libnotify-0.4.4.tar.gz 395528 RMD160 d5f1a2b63b98dc4abcd521b625ff5e7c206741c8 SHA1 51375cb75ea933962bb3bf594f8f1856968aa2e7 SHA256 2389a9b8220f776033f728a8d46352cfee5c8705066e34887bfb188f9f0d3856
-EBUILD libnotify-0.4.3.ebuild 862 RMD160 9d471cf8a6560e2dc04dfbcc8321fa219be08adb SHA1 14dfafa1d3c02eaf048acf3efaf22782d6d798bd SHA256 bf665a93a53b470778c632131e759347343b044a10d7b875dac4888aa8ad17fb
-MD5 3a7e03c7ddca9559499b003463d0a10f libnotify-0.4.3.ebuild 862
-RMD160 9d471cf8a6560e2dc04dfbcc8321fa219be08adb libnotify-0.4.3.ebuild 862
-SHA256 bf665a93a53b470778c632131e759347343b044a10d7b875dac4888aa8ad17fb libnotify-0.4.3.ebuild 862
-EBUILD libnotify-0.4.4.ebuild 870 RMD160 fdf10f0cd1878a451dda695856788df774690c86 SHA1 e99c205f19da17ec7904a3b36c4af80da1050fe0 SHA256 1e67a291edec914936771aa9f3cd47771f1c2531f09b4868b7b0e0cb34188514
-MD5 f2b24c4fb5ac21fef516c30b33ed9945 libnotify-0.4.4.ebuild 870
-RMD160 fdf10f0cd1878a451dda695856788df774690c86 libnotify-0.4.4.ebuild 870
-SHA256 1e67a291edec914936771aa9f3cd47771f1c2531f09b4868b7b0e0cb34188514 libnotify-0.4.4.ebuild 870
-MISC ChangeLog 4824 RMD160 56683753e02017f79d85fe156e6ac678883367a7 SHA1 b739a178b0f31e36a4037a009fb39a5fae56227f SHA256 8fd5659eb0e21c220d7994b934740f31bd0d236a8f47808d7fda3ccb75e09683
-MD5 0ffcca4d4a6b8681bdfff86483c71eb2 ChangeLog 4824
-RMD160 56683753e02017f79d85fe156e6ac678883367a7 ChangeLog 4824
-SHA256 8fd5659eb0e21c220d7994b934740f31bd0d236a8f47808d7fda3ccb75e09683 ChangeLog 4824
+EBUILD libnotify-0.4.3.ebuild 820 RMD160 02de0843454b35f4b6bfa94a5ab605ab6da78ada SHA1 90c78309b78baeb3f7fcc5bbf4bd8adc38b23881 SHA256 8cedffdc0771a1d9a2f0b5bb025986ae923c3bc919dcf106387aea22c0c6b1e7
+MD5 60b0f38fed0d8a4815a6829e07f63374 libnotify-0.4.3.ebuild 820
+RMD160 02de0843454b35f4b6bfa94a5ab605ab6da78ada libnotify-0.4.3.ebuild 820
+SHA256 8cedffdc0771a1d9a2f0b5bb025986ae923c3bc919dcf106387aea22c0c6b1e7 libnotify-0.4.3.ebuild 820
+EBUILD libnotify-0.4.4.ebuild 826 RMD160 b1feb8c936f41ca47e57c807d95c41dffc2e474c SHA1 63ca6578332ad707dbed860b9bc405bad8905382 SHA256 c46be4325689fa5202b3b6ccb72ce4451da5688612c89f9f74053bdd295b8d6c
+MD5 3af0b9c55329e118a627afc8ae537e69 libnotify-0.4.4.ebuild 826
+RMD160 b1feb8c936f41ca47e57c807d95c41dffc2e474c libnotify-0.4.4.ebuild 826
+SHA256 c46be4325689fa5202b3b6ccb72ce4451da5688612c89f9f74053bdd295b8d6c libnotify-0.4.4.ebuild 826
+MISC ChangeLog 4964 RMD160 8aa997004b24791aedd0e7ee9049a2a48808651b SHA1 75d76ea370837d85d83cc859faad5cd56e06eee0 SHA256 4f6da8af4cf0a5d892dc762a2d65897211aebddf819fcdf83e76c78829488e7f
+MD5 175b2f0dedd549f17c57260a5f2602ab ChangeLog 4964
+RMD160 8aa997004b24791aedd0e7ee9049a2a48808651b ChangeLog 4964
+SHA256 4f6da8af4cf0a5d892dc762a2d65897211aebddf819fcdf83e76c78829488e7f ChangeLog 4964
 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.3.ebuild b/x11-libs/libnotify/libnotify-0.4.3.ebuild
index 2375c529277a..6cc90b08418a 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-2007 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.11 2007/07/08 05:33:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.4.3.ebuild,v 1.12 2007/08/01 17:56:14 drac Exp $
 
 inherit eutils
 
@@ -15,10 +15,7 @@ IUSE="doc"
 
 RDEPEND=">=x11-libs/gtk+-2.6
 	>=dev-libs/glib-2.6
-	|| (
-		( >=dev-libs/dbus-glib-0.71 )
-		>=sys-apps/dbus-0.60
-	)
+	>=dev-libs/dbus-glib-0.71
 	|| ( x11-misc/notification-daemon xfce-extra/notification-daemon-xfce )"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1.4 )"
diff --git a/x11-libs/libnotify/libnotify-0.4.4.ebuild b/x11-libs/libnotify/libnotify-0.4.4.ebuild
index b1d643971315..a3f8d7416ef5 100644
--- a/x11-libs/libnotify/libnotify-0.4.4.ebuild
+++ b/x11-libs/libnotify/libnotify-0.4.4.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-libs/libnotify/libnotify-0.4.4.ebuild,v 1.9 2007/07/15 16:29:02 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.4.4.ebuild,v 1.10 2007/08/01 17:56:14 drac Exp $
 
 inherit eutils
 
@@ -15,10 +15,7 @@ IUSE="doc"
 
 RDEPEND=">=x11-libs/gtk+-2.6
 		>=dev-libs/glib-2.6
-		||	(
-				( >=dev-libs/dbus-glib-0.71 )
-				>=sys-apps/dbus-0.60
-			)
+		>=dev-libs/dbus-glib-0.71
 		|| ( x11-misc/notification-daemon xfce-extra/notification-daemon-xfce )"
 DEPEND="${RDEPEND}
 		doc? ( >=dev-util/gtk-doc-1.4 )"