correct dbus deps (bug #187369)

(Portage version: 2.1.2.9)

6 files changed, 17 insertions, 16 deletions

diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index 13a54d9e7f4f..d7434d037f5b 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.93 2007/07/25 17:20:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.94 2007/08/02 06:02:11 mr_bones_ Exp $
+
+  02 Aug 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  kdebase-kioslaves-3.5.5-r1.ebuild, kdebase-kioslaves-3.5.6.ebuild,
+  kdebase-kioslaves-3.5.6-r1.ebuild, kdebase-kioslaves-3.5.7.ebuild,
+  kdebase-kioslaves-3.5.7-r1.ebuild:
+  correct dbus deps (bug #187369)
 
 *kdebase-kioslaves-3.5.7-r1 (25 Jul 2007)
 
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.5-r1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.5-r1.ebuild
index d1ada00e8f52..8aab61e1ac39 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.5-r1.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.5-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/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.5-r1.ebuild,v 1.12 2007/07/08 04:34:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.5-r1.ebuild,v 1.13 2007/08/02 06:02:11 mr_bones_ Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -17,8 +17,7 @@ IUSE="hal kdehiddenvisibility ldap openexr samba"
 DEPEND="ldap? ( net-nds/openldap )
 	samba? ( >=net-fs/samba-3.0.1 )
 	>=dev-libs/cyrus-sasl-2
-	hal? ( || ( dev-libs/dbus-qt3-old >=sys-apps/dbus-0.34 )
-		   =sys-apps/hal-0.5* )
+	hal? ( dev-libs/dbus-qt3-old =sys-apps/hal-0.5* )
 	openexr? ( >=media-libs/openexr-1.2.2-r2 )"
 RDEPEND="${DEPEND}
 	$(deprange $PV $MAXKDEVER kde-base/kdialog)"	# for the kdeeject script used by the devices/mounthelper ioslave
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6-r1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6-r1.ebuild
index 1450781bec26..bf86e468ce0a 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6-r1.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.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/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6-r1.ebuild,v 1.4 2007/07/08 04:34:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6-r1.ebuild,v 1.5 2007/08/02 06:02:11 mr_bones_ Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -17,8 +17,7 @@ IUSE="hal kdehiddenvisibility ldap openexr samba"
 DEPEND="ldap? ( net-nds/openldap )
 	samba? ( >=net-fs/samba-3.0.1 )
 	>=dev-libs/cyrus-sasl-2
-	hal? ( || ( dev-libs/dbus-qt3-old >=sys-apps/dbus-0.34 )
-		   =sys-apps/hal-0.5* )
+	hal? ( dev-libs/dbus-qt3-old =sys-apps/hal-0.5* )
 	openexr? ( >=media-libs/openexr-1.2.2-r2 )
 	!<kde-base/kdesktop-3.5.6-r1"
 RDEPEND="${DEPEND}
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6.ebuild
index cd640d0bf350..5a331c2ac3d8 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6.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/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6.ebuild,v 1.3 2007/07/08 04:34:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6.ebuild,v 1.4 2007/08/02 06:02:11 mr_bones_ Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -17,8 +17,7 @@ IUSE="hal kdehiddenvisibility ldap openexr samba"
 DEPEND="ldap? ( net-nds/openldap )
 	samba? ( >=net-fs/samba-3.0.1 )
 	>=dev-libs/cyrus-sasl-2
-	hal? ( || ( dev-libs/dbus-qt3-old >=sys-apps/dbus-0.34 )
-		   =sys-apps/hal-0.5* )
+	hal? ( dev-libs/dbus-qt3-old =sys-apps/hal-0.5* )
 	openexr? ( >=media-libs/openexr-1.2.2-r2 )"
 RDEPEND="${DEPEND}
 	$(deprange 3.5.5 $MAXKDEVER kde-base/kdialog)"	# for the kdeeject script used by the devices/mounthelper ioslave
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7-r1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7-r1.ebuild
index 5583c3c5b9ac..c6575776075a 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7-r1.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7-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/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7-r1.ebuild,v 1.1 2007/07/25 17:20:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7-r1.ebuild,v 1.2 2007/08/02 06:02:11 mr_bones_ Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -17,8 +17,7 @@ IUSE="hal kdehiddenvisibility ldap openexr samba"
 DEPEND="ldap? ( net-nds/openldap )
 	samba? ( >=net-fs/samba-3.0.1 )
 	>=dev-libs/cyrus-sasl-2
-	hal? ( || ( dev-libs/dbus-qt3-old >=sys-apps/dbus-0.34 )
-		   =sys-apps/hal-0.5* )
+	hal? ( dev-libs/dbus-qt3-old =sys-apps/hal-0.5* )
 	openexr? ( >=media-libs/openexr-1.2.2-r2 )
 	!<kde-base/kdesktop-3.5.6-r1"
 RDEPEND="${DEPEND}
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7.ebuild
index 4166eab045e8..c7a42eda670d 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.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/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7.ebuild,v 1.3 2007/07/08 04:34:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7.ebuild,v 1.4 2007/08/02 06:02:11 mr_bones_ Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -17,8 +17,7 @@ IUSE="hal kdehiddenvisibility ldap openexr samba"
 DEPEND="ldap? ( net-nds/openldap )
 	samba? ( >=net-fs/samba-3.0.1 )
 	>=dev-libs/cyrus-sasl-2
-	hal? ( || ( dev-libs/dbus-qt3-old >=sys-apps/dbus-0.34 )
-		   =sys-apps/hal-0.5* )
+	hal? ( dev-libs/dbus-qt3-old =sys-apps/hal-0.5* )
 	openexr? ( >=media-libs/openexr-1.2.2-r2 )
 	!<kde-base/kdesktop-3.5.6-r1"
 RDEPEND="${DEPEND}