Clean up dbus deps wrt bug #183696.

Package-Manager: portage-2.1.3_rc5

9 files changed, 26 insertions, 23 deletions

diff --git a/net-libs/libtelepathy/ChangeLog b/net-libs/libtelepathy/ChangeLog
index 496e579e4fe7..19fd32e4f68e 100644
--- a/net-libs/libtelepathy/ChangeLog
+++ b/net-libs/libtelepathy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libtelepathy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtelepathy/ChangeLog,v 1.11 2007/05/31 14:48:23 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtelepathy/ChangeLog,v 1.12 2007/06/30 17:33:58 peper Exp $
+
+  30 Jun 2007; Piotr Jaroszyński <peper@gentoo.org>
+  libtelepathy-0.0.42.ebuild, libtelepathy-0.0.53.ebuild,
+  libtelepathy-0.0.54.ebuild, libtelepathy-0.0.55.ebuild:
+  Clean up dbus deps wrt bug #183696.
 
 *libtelepathy-0.0.55 (31 May 2007)
 
diff --git a/net-libs/libtelepathy/libtelepathy-0.0.42.ebuild b/net-libs/libtelepathy/libtelepathy-0.0.42.ebuild
index c3866de11beb..d849fbe7decf 100644
--- a/net-libs/libtelepathy/libtelepathy-0.0.42.ebuild
+++ b/net-libs/libtelepathy/libtelepathy-0.0.42.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/net-libs/libtelepathy/libtelepathy-0.0.42.ebuild,v 1.1 2007/02/20 18:40:18 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtelepathy/libtelepathy-0.0.42.ebuild,v 1.2 2007/06/30 17:33:58 peper Exp $
 
 DESCRIPTION="A glib based library for Telepathy client development"
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -11,8 +11,7 @@ KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE=""
 
 DEPEND=">=dev-libs/glib-2.4
-	|| ( >=dev-libs/dbus-glib-0.71
-		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.61 ) )"
+	>=dev-libs/dbus-glib-0.71"
 
 RDEPEND="${DEPEND}"
 
diff --git a/net-libs/libtelepathy/libtelepathy-0.0.53.ebuild b/net-libs/libtelepathy/libtelepathy-0.0.53.ebuild
index ea78eb73e9da..eca3c2990e32 100644
--- a/net-libs/libtelepathy/libtelepathy-0.0.53.ebuild
+++ b/net-libs/libtelepathy/libtelepathy-0.0.53.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/net-libs/libtelepathy/libtelepathy-0.0.53.ebuild,v 1.2 2007/05/03 15:19:02 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtelepathy/libtelepathy-0.0.53.ebuild,v 1.3 2007/06/30 17:33:58 peper Exp $
 
 DESCRIPTION="A glib based library for Telepathy client development"
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -11,8 +11,7 @@ KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.4
-	|| ( >=dev-libs/dbus-glib-0.71
-		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.61 ) )"
+	>=dev-libs/dbus-glib-0.71"
 
 DEPEND="${RDEPEND}
 	dev-libs/libxslt"
diff --git a/net-libs/libtelepathy/libtelepathy-0.0.54.ebuild b/net-libs/libtelepathy/libtelepathy-0.0.54.ebuild
index ed780221c42c..74a020577c32 100644
--- a/net-libs/libtelepathy/libtelepathy-0.0.54.ebuild
+++ b/net-libs/libtelepathy/libtelepathy-0.0.54.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/net-libs/libtelepathy/libtelepathy-0.0.54.ebuild,v 1.1 2007/05/03 15:19:02 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtelepathy/libtelepathy-0.0.54.ebuild,v 1.2 2007/06/30 17:33:58 peper Exp $
 
 DESCRIPTION="A glib based library for Telepathy client development"
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -11,8 +11,7 @@ KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.4
-	|| ( >=dev-libs/dbus-glib-0.71
-		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.61 ) )"
+	>=dev-libs/dbus-glib-0.71"
 
 DEPEND="${RDEPEND}
 	dev-libs/libxslt"
diff --git a/net-libs/libtelepathy/libtelepathy-0.0.55.ebuild b/net-libs/libtelepathy/libtelepathy-0.0.55.ebuild
index 6cb8abd5183f..9c442efe2b9f 100644
--- a/net-libs/libtelepathy/libtelepathy-0.0.55.ebuild
+++ b/net-libs/libtelepathy/libtelepathy-0.0.55.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/net-libs/libtelepathy/libtelepathy-0.0.55.ebuild,v 1.1 2007/05/31 14:48:23 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtelepathy/libtelepathy-0.0.55.ebuild,v 1.2 2007/06/30 17:33:58 peper Exp $
 
 DESCRIPTION="A glib based library for Telepathy client development"
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -11,8 +11,7 @@ KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.4
-	|| ( >=dev-libs/dbus-glib-0.71
-		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.61 ) )"
+	>=dev-libs/dbus-glib-0.71"
 
 DEPEND="${RDEPEND}
 	dev-libs/libxslt"
diff --git a/net-libs/telepathy-glib/ChangeLog b/net-libs/telepathy-glib/ChangeLog
index 8dabc4606b08..8b9d3fbb3b99 100644
--- a/net-libs/telepathy-glib/ChangeLog
+++ b/net-libs/telepathy-glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/telepathy-glib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/ChangeLog,v 1.4 2007/06/01 17:11:18 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/ChangeLog,v 1.5 2007/06/30 17:38:03 peper Exp $
+
+  30 Jun 2007; Piotr Jaroszyński <peper@gentoo.org>
+  telepathy-glib-0.5.10.ebuild, telepathy-glib-0.5.11.ebuild,
+  telepathy-glib-0.5.13.ebuild:
+  Clean up dbus deps wrt bug #183696.
 
 *telepathy-glib-0.5.13 (01 Jun 2007)
 
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.5.10.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.5.10.ebuild
index c54bad5c0251..33df4094a570 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.5.10.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.5.10.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/net-libs/telepathy-glib/telepathy-glib-0.5.10.ebuild,v 1.2 2007/04/22 10:30:11 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.5.10.ebuild,v 1.3 2007/06/30 17:38:03 peper Exp $
 
 DESCRIPTION="GLib binding for the Telepathy D-Bus protocol."
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -12,8 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.4
-	|| ( >=dev-libs/dbus-glib-0.72
-		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.61 ) )
+	>=dev-libs/dbus-glib-0.72
 	>=dev-lang/python-2.3
 	!<net-voip/telepathy-gabble-0.5.10"
 
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.5.11.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.5.11.ebuild
index 2272325ad33d..e14dd7655e15 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.5.11.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.5.11.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/net-libs/telepathy-glib/telepathy-glib-0.5.11.ebuild,v 1.1 2007/04/30 21:46:46 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.5.11.ebuild,v 1.2 2007/06/30 17:38:03 peper Exp $
 
 DESCRIPTION="GLib binding for the Telepathy D-Bus protocol."
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -12,8 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.4
-	|| ( >=dev-libs/dbus-glib-0.72
-		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.61 ) )
+	>=dev-libs/dbus-glib-0.72
 	>=dev-lang/python-2.3
 	!<net-voip/telepathy-gabble-0.5.10"
 
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.5.13.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.5.13.ebuild
index e78c8cba259f..fc5bec6053d2 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.5.13.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.5.13.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/net-libs/telepathy-glib/telepathy-glib-0.5.13.ebuild,v 1.1 2007/06/01 17:11:18 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.5.13.ebuild,v 1.2 2007/06/30 17:38:03 peper Exp $
 
 DESCRIPTION="GLib binding for the Telepathy D-Bus protocol."
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -12,8 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.4
-	|| ( >=dev-libs/dbus-glib-0.72
-		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.61 ) )
+	>=dev-libs/dbus-glib-0.72
 	>=dev-lang/python-2.3
 	!<net-voip/telepathy-gabble-0.5.10"