From cea23b4d7d03a6066a01569c87ccc8506524e5df Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Wed, 17 Jun 2009 22:33:42 +0000 Subject: Move gnome-base/gvfs dependency to PDEPEND to break circular dependency, bug #269747. (Portage version: 2.2_rc33/cvs/Linux x86_64) --- gnome-base/libgnome/ChangeLog | 7 ++++++- gnome-base/libgnome/libgnome-2.24.1.ebuild | 5 +++-- gnome-base/libgnome/libgnome-2.26.0.ebuild | 5 +++-- 3 files changed, 12 insertions(+), 5 deletions(-) (limited to 'gnome-base') diff --git a/gnome-base/libgnome/ChangeLog b/gnome-base/libgnome/ChangeLog index a2ced199252d..c8eedcc6c1ec 100644 --- a/gnome-base/libgnome/ChangeLog +++ b/gnome-base/libgnome/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/libgnome # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.175 2009/05/10 18:34:54 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.176 2009/06/17 22:33:42 eva Exp $ + + 18 Jun 2009; Gilles Dartiguelongue + libgnome-2.24.1.ebuild, libgnome-2.26.0.ebuild: + Move gnome-base/gvfs dependency to PDEPEND to break circular dependency, + bug #269747. *libgnome-2.26.0 (10 May 2009) diff --git a/gnome-base/libgnome/libgnome-2.24.1.ebuild b/gnome-base/libgnome/libgnome-2.24.1.ebuild index 10acbc115232..4ae5d7983350 100644 --- a/gnome-base/libgnome/libgnome-2.24.1.ebuild +++ b/gnome-base/libgnome/libgnome-2.24.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.24.1.ebuild,v 1.11 2009/04/28 14:35:37 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.24.1.ebuild,v 1.12 2009/06/17 22:33:42 eva Exp $ inherit gnome2 @@ -14,7 +14,6 @@ IUSE="doc esd" RDEPEND=">=gnome-base/gconf-2 >=dev-libs/glib-2.16 - gnome-base/gvfs >=gnome-base/gnome-vfs-2.5.3 >=gnome-base/libbonobo-2.13 >=dev-libs/popt-1.7 @@ -27,6 +26,8 @@ DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.17 doc? ( >=dev-util/gtk-doc-1 )" +PDEPEND="gnome-base/gvfs" + DOCS="AUTHORS ChangeLog NEWS README" pkg_setup() { diff --git a/gnome-base/libgnome/libgnome-2.26.0.ebuild b/gnome-base/libgnome/libgnome-2.26.0.ebuild index 26d7ca041160..5cc03b85a226 100644 --- a/gnome-base/libgnome/libgnome-2.26.0.ebuild +++ b/gnome-base/libgnome/libgnome-2.26.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.26.0.ebuild,v 1.1 2009/05/10 18:34:54 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.26.0.ebuild,v 1.2 2009/06/17 22:33:42 eva Exp $ EAPI="2" @@ -19,7 +19,6 @@ SRC_URI="${SRC_URI} RDEPEND=">=gnome-base/gconf-2 >=dev-libs/glib-2.16 - gnome-base/gvfs >=gnome-base/gnome-vfs-2.5.3 >=gnome-base/libbonobo-2.13 >=dev-libs/popt-1.7 @@ -32,6 +31,8 @@ DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.17 doc? ( >=dev-util/gtk-doc-1 )" +PDEPEND="gnome-base/gvfs" + DOCS="AUTHORS ChangeLog NEWS README" pkg_setup() { -- cgit v1.2.3-65-gdbad