cleanup versions and fix dbus deps for bug #155282

Package-Manager: portage-2.1.2_rc1-r7

4 files changed, 19 insertions, 7 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index cbedc1fdfb4f..71943081d6a6 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-news/liferea
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.66 2006/11/13 18:58:42 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.67 2006/11/20 23:07:24 dang Exp $
+
+  20 Nov 2006; Daniel Gryniewicz <dang@gentoo.org> liferea-1.0.16.ebuild,
+  -liferea-1.0.22-r1.ebuild, -liferea-1.0.23.ebuild, liferea-1.0.24.ebuild,
+  -liferea-1.1.9-r1.ebuild, -liferea-1.2_rc1.ebuild,
+  liferea-1.2_rc1-r1.ebuild:
+  cleanup versions and fix dbus deps for bug #155282
 
 *liferea-1.2_rc1-r1 (13 Nov 2006)
 
diff --git a/net-news/liferea/liferea-1.0.16.ebuild b/net-news/liferea/liferea-1.0.16.ebuild
index 26932275ac31..6e4edf1c4a23 100644
--- a/net-news/liferea/liferea-1.0.16.ebuild
+++ b/net-news/liferea/liferea-1.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.0.16.ebuild,v 1.7 2006/11/01 00:10:40 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.0.16.ebuild,v 1.8 2006/11/20 23:07:24 dang Exp $
 
 inherit gnome2 eutils autotools
 
@@ -20,7 +20,9 @@ RDEPEND=">=x11-libs/gtk+-2.4.0
 	gtkhtml? ( =gnome-extra/gtkhtml-2* )
 	!seamonkey? ( !firefox? ( =gnome-extra/gtkhtml-2* ) )
 	>=gnome-base/gconf-2
-	dbus? ( >=sys-apps/dbus-0.30 )"
+	dbus? ( || ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 ) )
+	)"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/net-news/liferea/liferea-1.0.24.ebuild b/net-news/liferea/liferea-1.0.24.ebuild
index 477f835ccb74..051cebda61d5 100644
--- a/net-news/liferea/liferea-1.0.24.ebuild
+++ b/net-news/liferea/liferea-1.0.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.0.24.ebuild,v 1.3 2006/11/04 22:02:37 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.0.24.ebuild,v 1.4 2006/11/20 23:07:24 dang Exp $
 
 inherit gnome2 eutils autotools
 
@@ -22,7 +22,9 @@ RDEPEND=">=x11-libs/gtk+-2.4.0
 	gtkhtml? ( =gnome-extra/gtkhtml-2* )
 	!seamonkey? ( !firefox? ( =gnome-extra/gtkhtml-2* ) )
 	gnome-base/libgnome
-	dbus? ( >=sys-apps/dbus-0.30 )"
+	dbus? ( || ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 ) )
+	)"
 
 # libgnome dep is for gnome-open; it's not in configure.ac
 
diff --git a/net-news/liferea/liferea-1.2_rc1-r1.ebuild b/net-news/liferea/liferea-1.2_rc1-r1.ebuild
index cd942064b14a..1a5eed54a9f6 100644
--- a/net-news/liferea/liferea-1.2_rc1-r1.ebuild
+++ b/net-news/liferea/liferea-1.2_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2_rc1-r1.ebuild,v 1.1 2006/11/13 18:58:42 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2_rc1-r1.ebuild,v 1.2 2006/11/20 23:07:24 dang Exp $
 
 inherit gnome2 flag-o-matic eutils autotools
 
@@ -25,7 +25,9 @@ RDEPEND=">=x11-libs/gtk+-2.8
 	!xulrunner? ( !firefox? ( seamonkey? ( www-client/seamonkey ) ) )
 	!xulrunner? ( !firefox? ( !seamonkey? ( =gnome-extra/gtkhtml-2* ) ) )
 	gtkhtml? ( =gnome-extra/gtkhtml-2* )
-	dbus? ( >=sys-apps/dbus-0.30 )
+	dbus? ( || ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 ) )
+	)
 	libnotify? ( >=x11-libs/libnotify-0.3.2 )
 	gnutls? ( net-libs/gnutls )"