Remove old style dbus dep for bug 183696.

Package-Manager: portage-2.1.3_rc6

4 files changed, 22 insertions, 20 deletions

diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest
index 72b5bbf0791f..2e3fe091c13f 100644
--- a/xfce-base/xfce-utils/Manifest
+++ b/xfce-base/xfce-utils/Manifest
@@ -16,14 +16,14 @@ EBUILD xfce-utils-4.4.0-r3.ebuild 1080 RMD160 29f684095bd780e1a8fdf43e6c6c3739a3
 MD5 2f073f2751806baea09dae3f489b8d08 xfce-utils-4.4.0-r3.ebuild 1080
 RMD160 29f684095bd780e1a8fdf43e6c6c3739a3d99400 xfce-utils-4.4.0-r3.ebuild 1080
 SHA256 9498eb189a2e39d5ade6e2769dd8ef7efe6f30b20fb48207a494bc0aa01bd7e2 xfce-utils-4.4.0-r3.ebuild 1080
-EBUILD xfce-utils-4.4.1-r1.ebuild 1218 RMD160 4ea4deb4d80efdb631272c4048cdd3c6b4bc43af SHA1 637a38641c29314ee91151aafad1302801e5d7a8 SHA256 3794c38e2084f68b1c2d86403a4a8280c3966f552f066e273f18da9599a023b3
-MD5 c8d178a1ef862704375ad05f8c0839f3 xfce-utils-4.4.1-r1.ebuild 1218
-RMD160 4ea4deb4d80efdb631272c4048cdd3c6b4bc43af xfce-utils-4.4.1-r1.ebuild 1218
-SHA256 3794c38e2084f68b1c2d86403a4a8280c3966f552f066e273f18da9599a023b3 xfce-utils-4.4.1-r1.ebuild 1218
-MISC ChangeLog 14578 RMD160 a800e721333244a7cf0fac4b9f401ba44e14a764 SHA1 dd52d925439eeaabe86281e371375ff6cd411d3c SHA256 e7a40d786e6d8479cc01d25dc548dad096576d5cf1a361cc7d24ad8cb574f32e
-MD5 329cf1107b396415242b0ea00549c43e ChangeLog 14578
-RMD160 a800e721333244a7cf0fac4b9f401ba44e14a764 ChangeLog 14578
-SHA256 e7a40d786e6d8479cc01d25dc548dad096576d5cf1a361cc7d24ad8cb574f32e ChangeLog 14578
+EBUILD xfce-utils-4.4.1-r1.ebuild 1194 RMD160 9a9db0c9e6d3208ffc76e1cb01e9c7f377e7b8bd SHA1 8f139ccb77396d9b9f373e7a98234537c30345f9 SHA256 08a41b4cb2d80009112c643775b97ca5147443afb40f1c9d63d08721cb1beb8b
+MD5 24e21e8058a3d9688427ee1ab62c21e5 xfce-utils-4.4.1-r1.ebuild 1194
+RMD160 9a9db0c9e6d3208ffc76e1cb01e9c7f377e7b8bd xfce-utils-4.4.1-r1.ebuild 1194
+SHA256 08a41b4cb2d80009112c643775b97ca5147443afb40f1c9d63d08721cb1beb8b xfce-utils-4.4.1-r1.ebuild 1194
+MISC ChangeLog 14690 RMD160 224bad9540b097597e700794c4e7b4a66fcaa73a SHA1 259472b680327361df45e14b960e5fabb21a71a1 SHA256 d0db31189a8516ffc848e4466fe2890d147ad4e2ddef30268293dc5c795bf335
+MD5 627f36c24599d92a950d47b3e152984f ChangeLog 14690
+RMD160 224bad9540b097597e700794c4e7b4a66fcaa73a ChangeLog 14690
+SHA256 d0db31189a8516ffc848e4466fe2890d147ad4e2ddef30268293dc5c795bf335 ChangeLog 14690
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog
index daaa83c2ee89..d4a658fb2ecf 100644
--- a/xfce-base/xfdesktop/ChangeLog
+++ b/xfce-base/xfdesktop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfdesktop
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.108 2007/07/01 09:23:33 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.109 2007/07/01 09:56:15 drac Exp $
+
+  01 Jul 2007; Samuli Suominen <drac@gentoo.org> xfdesktop-4.4.1-r1.ebuild:
+  Clean up old dbus deps wrt bug 183696
 
   01 Jul 2007; Peter Weller <welp@gentoo.org> xfdesktop-4.4.0-r3.ebuild:
   Clean up old dbus deps wrt bug 183696
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index f38bc7a39b52..f732e0f5c088 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -8,14 +8,14 @@ EBUILD xfdesktop-4.4.0-r3.ebuild 2215 RMD160 1df6d9cff077ad59f3c297377b66980208a
 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 13570 RMD160 2b70f4bca9a23982aa10c9090e522a076c64f17f SHA1 8f1596771ab9f2856c4e59ec2560c582f2828eaf SHA256 714a82ef42e04efadeb0ed1b7d51840fee1cab7cb9fe8682bb45f46b24cf5674
-MD5 95f0fcc017046d91e81cf6e7f4ad0133 ChangeLog 13570
-RMD160 2b70f4bca9a23982aa10c9090e522a076c64f17f ChangeLog 13570
-SHA256 714a82ef42e04efadeb0ed1b7d51840fee1cab7cb9fe8682bb45f46b24cf5674 ChangeLog 13570
+EBUILD xfdesktop-4.4.1-r1.ebuild 2339 RMD160 fcf4e27a94b90096c9dff487b9382028f6d363c5 SHA1 3e97defe0b9754da395311bc46310815ae3b628c SHA256 f844565d7e01da8918c9c34cce7eb75673aa24c35eb007c2d4b5436ce7d930e4
+MD5 2e47f24923bec388e5a6a26873aa2585 xfdesktop-4.4.1-r1.ebuild 2339
+RMD160 fcf4e27a94b90096c9dff487b9382028f6d363c5 xfdesktop-4.4.1-r1.ebuild 2339
+SHA256 f844565d7e01da8918c9c34cce7eb75673aa24c35eb007c2d4b5436ce7d930e4 xfdesktop-4.4.1-r1.ebuild 2339
+MISC ChangeLog 13687 RMD160 a0bf39db67a15700aa58e4fdc23e145fa69ffb82 SHA1 fbea4ae89424706f0f650885a1f3c46cff2a4f2a SHA256 5e82bf081c8365629d57492ddcf909975b4c2f3911b3b630dd44cbfc6b0b3b91
+MD5 47feeb89dd92df2b0fdb2e1ee64cf9d8 ChangeLog 13687
+RMD160 a0bf39db67a15700aa58e4fdc23e145fa69ffb82 ChangeLog 13687
+SHA256 5e82bf081c8365629d57492ddcf909975b4c2f3911b3b630dd44cbfc6b0b3b91 ChangeLog 13687
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
diff --git a/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild
index 184d5c8902a5..7c02abcc9977 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.4.1-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/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild,v 1.10 2007/06/07 18:34:23 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild,v 1.11 2007/07/01 09:56:15 drac Exp $
 
 inherit eutils xfce44
 
@@ -24,8 +24,7 @@ RDEPEND="x11-libs/libX11
 	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
 	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
 	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
-	dbus? ( || ( dev-libs/dbus-glib <sys-apps/dbus-1 )
-		>=xfce-base/thunar-${THUNAR_MASTER_VERSION} )
+	dbus? ( dev-libs/dbus-glib >=xfce-base/thunar-${THUNAR_MASTER_VERSION} )
 	!minimal? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION}
 		>=xfce-extra/exo-0.3.2 )"
 DEPEND="${RDEPEND}