6 files changed, 29 insertions, 14 deletions
diff --git a/xfce-extra/terminal/ChangeLog b/xfce-extra/terminal/ChangeLog
index f029023aad94..db96d6168aca 100644
--- a/xfce-extra/terminal/ChangeLog
+++ b/xfce-extra/terminal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-extra/terminal
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/ChangeLog,v 1.16 2006/12/05 16:28:38 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/ChangeLog,v 1.17 2006/12/06 05:51:45 nichoj Exp $
+
+  11 Dec 2006; Joshua Nichols <nichoj@gentoo.org> terminal-0.2.4.ebuild,
+  terminal-0.2.4-r1.ebuild, terminal-0.2.5.1_beta1.ebuild,
+  terminal-0.2.5.4_beta2.ebuild, terminal-0.2.5.8_rc2.ebuild:
+  Updated dependencies for modular dbus, see bug #154521.
 
 *terminal-0.2.5.8_rc2 (07 Dec 2006)
 
diff --git a/xfce-extra/terminal/terminal-0.2.4-r1.ebuild b/xfce-extra/terminal/terminal-0.2.4-r1.ebuild
index 9602441fda89..6277177c4ec3 100644
--- a/xfce-extra/terminal/terminal-0.2.4-r1.ebuild
+++ b/xfce-extra/terminal/terminal-0.2.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.4-r1.ebuild,v 1.3 2005/10/10 15:51:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.4-r1.ebuild,v 1.4 2006/12/06 05:51:45 nichoj Exp $
 
 inherit xfce42
 
@@ -18,7 +18,9 @@ RDEPEND="|| ( ( x11-libs/libX11
 	virtual/x11 )
 	>=x11-libs/gtk+-2.4
 	>=xfce-extra/exo-0.3.0-r1
-	dbus? ( sys-apps/dbus )
+	dbus? ( || 	( >=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
+	)
 	>=x11-libs/vte-0.11.11
 	x11-libs/startup-notification
 	>=xfce-base/libxfce4mcs-4.2.2-r1"
@@ -31,4 +33,4 @@ S=${WORKDIR}/${MY_P}
 
 if ! use dbus; then
 	XFCE_CONFIG="--disable-dbus"
-fi
-\ No newline at end of file
+fi
diff --git a/xfce-extra/terminal/terminal-0.2.4.ebuild b/xfce-extra/terminal/terminal-0.2.4.ebuild
index 18ccf9feff91..db9595a82cd3 100644
--- a/xfce-extra/terminal/terminal-0.2.4.ebuild
+++ b/xfce-extra/terminal/terminal-0.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.4.ebuild,v 1.8 2005/12/10 03:24:03 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.4.ebuild,v 1.9 2006/12/06 05:51:45 nichoj Exp $
 
 DESCRIPTION="Terminal with close ties to xfce"
 HOMEPAGE="http://www.os-cillation.com/"
@@ -10,7 +10,9 @@ IUSE="dbus"
 
 RDEPEND=">=x11-libs/gtk+-2.4
 	>=xfce-extra/exo-0.3.0_pre1
-	dbus? ( sys-apps/dbus )
+	dbus? ( || 	( >=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
+	)
 	>=x11-libs/vte-0.11.11
 	>=xfce-base/libxfce4mcs-4.2.0"
 
diff --git a/xfce-extra/terminal/terminal-0.2.5.1_beta1.ebuild b/xfce-extra/terminal/terminal-0.2.5.1_beta1.ebuild
index fd553d81fbd7..9b989c92ff3f 100644
--- a/xfce-extra/terminal/terminal-0.2.5.1_beta1.ebuild
+++ b/xfce-extra/terminal/terminal-0.2.5.1_beta1.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/xfce-extra/terminal/terminal-0.2.5.1_beta1.ebuild,v 1.1 2006/04/20 05:56:37 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.5.1_beta1.ebuild,v 1.2 2006/12/06 05:51:45 nichoj Exp $
 
 inherit gnome2 xfce44 versionator
 
@@ -24,7 +24,9 @@ RDEPEND=">=dev-libs/glib-2
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/libpng
-	dbus? ( >=sys-apps/dbus-0.34 )
+	dbus? ( || 	( >=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
+	)
 	|| ( ( x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
diff --git a/xfce-extra/terminal/terminal-0.2.5.4_beta2.ebuild b/xfce-extra/terminal/terminal-0.2.5.4_beta2.ebuild
index 72ef70d73038..c4903d4a7033 100644
--- a/xfce-extra/terminal/terminal-0.2.5.4_beta2.ebuild
+++ b/xfce-extra/terminal/terminal-0.2.5.4_beta2.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/xfce-extra/terminal/terminal-0.2.5.4_beta2.ebuild,v 1.1 2006/07/10 18:49:50 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.5.4_beta2.ebuild,v 1.2 2006/12/06 05:51:45 nichoj Exp $
 
 inherit gnome2 xfce44 versionator
 
@@ -24,7 +24,9 @@ RDEPEND=">=dev-libs/glib-2
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/libpng
-	dbus? ( >=sys-apps/dbus-0.34 )
+	dbus? ( || 	( >=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
+	)
 	|| ( ( x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
diff --git a/xfce-extra/terminal/terminal-0.2.5.8_rc2.ebuild b/xfce-extra/terminal/terminal-0.2.5.8_rc2.ebuild
index 4a83f88c1c88..a230de7baba9 100644
--- a/xfce-extra/terminal/terminal-0.2.5.8_rc2.ebuild
+++ b/xfce-extra/terminal/terminal-0.2.5.8_rc2.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/xfce-extra/terminal/terminal-0.2.5.8_rc2.ebuild,v 1.1 2006/12/05 16:28:38 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.5.8_rc2.ebuild,v 1.2 2006/12/06 05:51:45 nichoj Exp $
 
 inherit gnome2 xfce44 versionator
 
@@ -24,7 +24,9 @@ RDEPEND=">=dev-libs/glib-2
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/libpng
-	dbus? ( >=sys-apps/dbus-0.34 )
+	dbus? ( || 	( >=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
+	)
 	|| ( ( x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11