From 08b4157416e56b81438e0b4f5e2e9e12f187d68b Mon Sep 17 00:00:00 2001 From: Joshua Nichols Date: Wed, 6 Dec 2006 05:51:45 +0000 Subject: [PATCH] Updated dependencies for modular dbus, see bug #154521. Package-Manager: portage-2.1.2_rc2-r5 --- xfce-extra/exo/ChangeLog | 6 +++++- xfce-extra/exo/exo-0.2.0-r1.ebuild | 9 ++++++--- xfce-extra/exo/exo-0.3.0_pre1.ebuild | 9 ++++++--- xfce-extra/terminal/ChangeLog | 7 ++++++- xfce-extra/terminal/terminal-0.2.4-r1.ebuild | 10 ++++++---- xfce-extra/terminal/terminal-0.2.4.ebuild | 8 +++++--- xfce-extra/terminal/terminal-0.2.5.1_beta1.ebuild | 6 ++++-- xfce-extra/terminal/terminal-0.2.5.4_beta2.ebuild | 6 ++++-- xfce-extra/terminal/terminal-0.2.5.8_rc2.ebuild | 6 ++++-- xfce-extra/xfmedia/ChangeLog | 6 +++++- xfce-extra/xfmedia/xfmedia-0.9.1-r1.ebuild | 6 +++++- xfce-extra/xfmedia/xfmedia-0.9.1-r2.ebuild | 7 +++++-- 12 files changed, 61 insertions(+), 25 deletions(-) diff --git a/xfce-extra/exo/ChangeLog b/xfce-extra/exo/ChangeLog index a1ccb1106f59..f0e1ca7585fd 100644 --- a/xfce-extra/exo/ChangeLog +++ b/xfce-extra/exo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for xfce-extra/exo # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/ChangeLog,v 1.18 2006/12/06 00:51:40 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/ChangeLog,v 1.19 2006/12/06 05:50:12 nichoj Exp $ + + 11 Dec 2006; Joshua Nichols exo-0.2.0-r1.ebuild, + exo-0.3.0_pre1.ebuild: + Updated dependencies for modular dbus, see bug #154521. 10 Dec 2006; Joshua Nichols exo-0.3.1.12_rc2.ebuild: Fixed SRC_URI. Reported by drac. diff --git a/xfce-extra/exo/exo-0.2.0-r1.ebuild b/xfce-extra/exo/exo-0.2.0-r1.ebuild index b3d501c65723..d6c581123a0e 100644 --- a/xfce-extra/exo/exo-0.2.0-r1.ebuild +++ b/xfce-extra/exo/exo-0.2.0-r1.ebuild @@ -1,13 +1,16 @@ -# 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/exo/exo-0.2.0-r1.ebuild,v 1.8 2005/08/23 22:33:41 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.2.0-r1.ebuild,v 1.9 2006/12/06 05:50:12 nichoj Exp $ DESCRIPTION="Extension library for Xfce" HOMEPAGE="http://www.os-cillation.com/" KEYWORDS="~amd64 ia64 ppc ~ppc64 ~sparc x86" RDEPEND=">=x11-libs/gtk+-2.4 - >=sys-apps/dbus-0.22 + || ( + >=dev-libs/dbus-glib-0.71 + ( =sys-apps/dbus-0.34 ) + ) >=xfce-base/libxfce4mcs-4.2.0" MY_P="${PN/t/T}-${PV}" BZIPPED=1 diff --git a/xfce-extra/exo/exo-0.3.0_pre1.ebuild b/xfce-extra/exo/exo-0.3.0_pre1.ebuild index 7371ac46ce09..29cae4db999d 100644 --- a/xfce-extra/exo/exo-0.3.0_pre1.ebuild +++ b/xfce-extra/exo/exo-0.3.0_pre1.ebuild @@ -1,13 +1,16 @@ -# 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/exo/exo-0.3.0_pre1.ebuild,v 1.2 2005/06/12 14:29:30 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.0_pre1.ebuild,v 1.3 2006/12/06 05:50:12 nichoj Exp $ DESCRIPTION="Extension library for Xfce" HOMEPAGE="http://www.os-cillation.com/" KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" RDEPEND=">=x11-libs/gtk+-2.4 - >=sys-apps/dbus-0.22 + || ( + >=dev-libs/dbus-glib-0.71 + ( =sys-apps/dbus-0.34 ) + ) >=xfce-base/libxfce4mcs-4.2.0" MY_P="${PN/t/T}-${PV/_/}" BZIPPED=1 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 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.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.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.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.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.34 ) ) + ) || ( ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 diff --git a/xfce-extra/xfmedia/ChangeLog b/xfce-extra/xfmedia/ChangeLog index 068dd1e5daa4..b23910b3c945 100644 --- a/xfce-extra/xfmedia/ChangeLog +++ b/xfce-extra/xfmedia/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for xfce-extra/xfmedia # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/ChangeLog,v 1.11 2006/04/08 21:28:04 dostrow Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/ChangeLog,v 1.12 2006/12/06 05:46:25 nichoj Exp $ + + 11 Dec 2006; Joshua Nichols xfmedia-0.9.1-r1.ebuild, + xfmedia-0.9.1-r2.ebuild: + Updated dependencies for modular dbus, see bug #154521. 08 Apr 2006; Daniel Ostrow xfmedia-0.9.1-r1.ebuild, xfmedia-0.9.1-r2.ebuild: diff --git a/xfce-extra/xfmedia/xfmedia-0.9.1-r1.ebuild b/xfce-extra/xfmedia/xfmedia-0.9.1-r1.ebuild index 5d62adabc308..a7d7b9f04790 100644 --- a/xfce-extra/xfmedia/xfmedia-0.9.1-r1.ebuild +++ b/xfce-extra/xfmedia/xfmedia-0.9.1-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/xfce-extra/xfmedia/xfmedia-0.9.1-r1.ebuild,v 1.4 2006/04/08 21:28:04 dostrow Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/xfmedia-0.9.1-r1.ebuild,v 1.5 2006/12/06 05:46:25 nichoj Exp $ inherit xfce42 @@ -16,6 +16,10 @@ RDEPEND="|| ( ( x11-libs/libX11 virtual/x11 ) >=xfce-base/libxfce4mcs-4.2.2-r1 xfce-extra/exo + || ( + >=dev-libs/dbus-glib-0.71 + ( =sys-apps/dbus-0.34 ) + ) sys-apps/dbus media-libs/xine-lib media-libs/taglib" diff --git a/xfce-extra/xfmedia/xfmedia-0.9.1-r2.ebuild b/xfce-extra/xfmedia/xfmedia-0.9.1-r2.ebuild index 63d4f928a209..2d7c05335236 100644 --- a/xfce-extra/xfmedia/xfmedia-0.9.1-r2.ebuild +++ b/xfce-extra/xfmedia/xfmedia-0.9.1-r2.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/xfmedia/xfmedia-0.9.1-r2.ebuild,v 1.2 2006/04/08 21:28:04 dostrow Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/xfmedia-0.9.1-r2.ebuild,v 1.3 2006/12/06 05:46:25 nichoj Exp $ inherit eutils xfce42 @@ -16,7 +16,10 @@ RDEPEND="|| ( ( x11-libs/libX11 virtual/x11 ) >=xfce-base/libxfce4mcs-4.2.2-r1 xfce-extra/exo - sys-apps/dbus + || ( + >=dev-libs/dbus-glib-0.71 + ( =sys-apps/dbus-0.34 ) + ) media-libs/xine-lib media-libs/taglib" DEPEND="${RDEPEND} -- 2.26.2