Fix up dbus deps wrt bug 183696

Package-Manager: portage-2.1.3_rc6

5 files changed, 20 insertions, 14 deletions

diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index e33408f7915f..b217081f07b8 100644
--- a/xfce-base/thunar/ChangeLog
+++ b/xfce-base/thunar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/thunar
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.37 2007/06/07 18:31:31 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.38 2007/07/01 09:18:32 welp Exp $
+
+  01 Jul 2007; Peter Weller <welp@gentoo.org> thunar-0.8.0-r3.ebuild:
+  Fix up dbus deps wrt bug 183696
 
   07 Jun 2007; Samuli Suominen <drac@gentoo.org> thunar-0.8.0-r3.ebuild:
   Stable on arm.
diff --git a/xfce-base/thunar/thunar-0.8.0-r3.ebuild b/xfce-base/thunar/thunar-0.8.0-r3.ebuild
index d27bd1e2ae54..c77cb5695f19 100644
--- a/xfce-base/thunar/thunar-0.8.0-r3.ebuild
+++ b/xfce-base/thunar/thunar-0.8.0-r3.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/xfce-base/thunar/thunar-0.8.0-r3.ebuild,v 1.9 2007/06/07 18:31:31 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-0.8.0-r3.ebuild,v 1.10 2007/07/01 09:18:32 welp Exp $
 
 inherit eutils virtualx xfce44
 
@@ -23,7 +23,7 @@ RDEPEND=">=dev-lang/perl-5.6
 	>=dev-util/desktop-file-utils-0.10
 	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
 	virtual/fam
-	dbus? ( || ( dev-libs/dbus-glib <sys-apps/dbus-1 ) )
+	dbus? ( dev-libs/dbus-glib )
 	hal? ( sys-apps/hal )
 	>=media-libs/freetype-2
 	gnome? ( gnome-base/gconf )
diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index c4a87bbbfbb6..6039c195ef47 100644
--- a/xfce-base/xfce-utils/ChangeLog
+++ b/xfce-base/xfce-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfce-utils
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.114 2007/06/07 18:29:47 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.115 2007/07/01 09:19:18 welp Exp $
+
+  01 Jul 2007; Peter Weller <welp@gentoo.org> xfce-utils-4.4.0-r3.ebuild:
+  Fix up dbus deps wrt bug 183696
 
   07 Jun 2007; Samuli Suominen <drac@gentoo.org> xfce-utils-4.4.1-r1.ebuild:
   Stable on arm.
diff --git a/xfce-base/xfce-utils/xfce-utils-4.4.0-r3.ebuild b/xfce-base/xfce-utils/xfce-utils-4.4.0-r3.ebuild
index 0004a74de338..56062c8d7631 100644
--- a/xfce-base/xfce-utils/xfce-utils-4.4.0-r3.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-4.4.0-r3.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/xfce-base/xfce-utils/xfce-utils-4.4.0-r3.ebuild,v 1.10 2007/03/17 21:31:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.4.0-r3.ebuild,v 1.11 2007/07/01 09:19:18 welp Exp $
 
 inherit eutils xfce44
 
@@ -18,7 +18,7 @@ RDEPEND="x11-apps/xrdb
 	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
 	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
 	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
-	dbus? ( || ( dev-libs/dbus-glib <sys-apps/dbus-1 ) )"
+	dbus? ( dev-libs/dbus-glib )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 15221746f010..f38bc7a39b52 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -4,18 +4,18 @@ RMD160 7bbd9d40a212f13ab3e94ad49d1f6e129fc47788 files/xfdesktop-4.4.1-translatio
 SHA256 c5a4895f1db46ba0d5c32095c00d0108a80c326b8b2cfb42956eeafdb0721bd1 files/xfdesktop-4.4.1-translation.patch 16569
 DIST xfdesktop-4.4.0.tar.bz2 3150198 RMD160 edeef28d1a0ac374e6fe11d8da83563a3e1dabb8 SHA1 f59d12cbc4980ce83b3739efc785c47fba09249c SHA256 f6837480d87b61827e25d47ed1ca92565f975a8dff89ab950aefb1fb392fd34b
 DIST xfdesktop-4.4.1.tar.bz2 3067577 RMD160 10e182f2cebd309ed7e2b18d00331861e21f4528 SHA1 46324ad37bb782ec7a5da11c619d9e76a0f54133 SHA256 abf8c93af0df9d6ec730917e02c57783546c40b8be091a74a5160bbf59ee4a80
-EBUILD xfdesktop-4.4.0-r3.ebuild 2243 RMD160 59c41fb5b3832d61f5ccad47a74075167d2e48c9 SHA1 419d1cb2554d67a4b838c967ee71906352462185 SHA256 adc9bb2e6e4fd38ed29a85b997f44daa7bd00506bef3685d3b75d94924526fdc
-MD5 02e77ef509eb98201900bdc69fe1a0a7 xfdesktop-4.4.0-r3.ebuild 2243
-RMD160 59c41fb5b3832d61f5ccad47a74075167d2e48c9 xfdesktop-4.4.0-r3.ebuild 2243
-SHA256 adc9bb2e6e4fd38ed29a85b997f44daa7bd00506bef3685d3b75d94924526fdc xfdesktop-4.4.0-r3.ebuild 2243
+EBUILD xfdesktop-4.4.0-r3.ebuild 2215 RMD160 1df6d9cff077ad59f3c297377b66980208a443a7 SHA1 472b5042963d150cebc71e4956077971e1fb8a3b SHA256 8d8c5feea80b95ec8db21b38e54841d8ec4ea2cfbcbc7d5c2b4f792cc4939c3c
+MD5 6f8a94adf72821d66e2b6a8cf78d8fd4 xfdesktop-4.4.0-r3.ebuild 2215
+RMD160 1df6d9cff077ad59f3c297377b66980208a443a7 xfdesktop-4.4.0-r3.ebuild 2215
+SHA256 8d8c5feea80b95ec8db21b38e54841d8ec4ea2cfbcbc7d5c2b4f792cc4939c3c xfdesktop-4.4.0-r3.ebuild 2215
 EBUILD xfdesktop-4.4.1-r1.ebuild 2365 RMD160 d54c84e91454b5634b3c76abb8728a3aebedbb4c SHA1 94f7e2a262f051148788396d23e21c4089ba3243 SHA256 1d7e12a588093211482c7754c7e40f5c4a5849935893383eb6d1b1350de64bea
 MD5 0200210052d4a5d28ff549c4b9bc48ff xfdesktop-4.4.1-r1.ebuild 2365
 RMD160 d54c84e91454b5634b3c76abb8728a3aebedbb4c xfdesktop-4.4.1-r1.ebuild 2365
 SHA256 1d7e12a588093211482c7754c7e40f5c4a5849935893383eb6d1b1350de64bea xfdesktop-4.4.1-r1.ebuild 2365
-MISC ChangeLog 13456 RMD160 2bf56498c6f308a29cf8b78b87848b47421c143d SHA1 6963c46a163e85b5cbe4757976617061fab4a5a9 SHA256 decba5be7cccc67fa922f6d4e1df6aa5ac25a08fd896ce801da84c8166ce0b0c
-MD5 216d6a4d0fd210a8e3aad091333388af ChangeLog 13456
-RMD160 2bf56498c6f308a29cf8b78b87848b47421c143d ChangeLog 13456
-SHA256 decba5be7cccc67fa922f6d4e1df6aa5ac25a08fd896ce801da84c8166ce0b0c ChangeLog 13456
+MISC ChangeLog 13570 RMD160 2b70f4bca9a23982aa10c9090e522a076c64f17f SHA1 8f1596771ab9f2856c4e59ec2560c582f2828eaf SHA256 714a82ef42e04efadeb0ed1b7d51840fee1cab7cb9fe8682bb45f46b24cf5674
+MD5 95f0fcc017046d91e81cf6e7f4ad0133 ChangeLog 13570
+RMD160 2b70f4bca9a23982aa10c9090e522a076c64f17f ChangeLog 13570
+SHA256 714a82ef42e04efadeb0ed1b7d51840fee1cab7cb9fe8682bb45f46b24cf5674 ChangeLog 13570
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157