From 7bf347e3f1cacf0778ea14677ae8543c5ff6c54d Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sat, 6 Mar 2010 21:18:28 +0000 Subject: Fix circular dependency with gvfs/gnome-disk-utility (nautilus -> gvfs[gdu] -> gnome-disk-utility[nautilus] -> nautilus) (Portage version: 2.1.7.17/cvs/Linux i686) --- gnome-base/nautilus/ChangeLog | 7 ++++++- gnome-base/nautilus/nautilus-2.28.4.ebuild | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'gnome-base') diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog index 5b15e89e0618..3dcdcc8a3a02 100644 --- a/gnome-base/nautilus/ChangeLog +++ b/gnome-base/nautilus/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/nautilus # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.333 2010/01/16 17:19:11 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.334 2010/03/06 21:18:28 nirbheek Exp $ + + 06 Mar 2010; Nirbheek Chauhan + nautilus-2.28.4.ebuild: + Fix circular dependency with gvfs/gnome-disk-utility (nautilus -> + gvfs[gdu] -> gnome-disk-utility[nautilus] -> nautilus) 16 Jan 2010; Raúl Porcel nautilus-2.26.4.ebuild: sh stable diff --git a/gnome-base/nautilus/nautilus-2.28.4.ebuild b/gnome-base/nautilus/nautilus-2.28.4.ebuild index 1c30aa26e336..2356cea42597 100644 --- a/gnome-base/nautilus/nautilus-2.28.4.ebuild +++ b/gnome-base/nautilus/nautilus-2.28.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.28.4.ebuild,v 1.2 2010/01/16 00:36:28 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.28.4.ebuild,v 1.3 2010/03/06 21:18:28 nirbheek Exp $ EAPI="2" GCONF_DEBUG="no" @@ -23,7 +23,6 @@ RDEPEND=">=dev-libs/glib-2.21.3 >=dev-libs/libxml2-2.4.7 >=media-libs/libexif-0.5.12 >=gnome-base/gconf-2.0 - >=gnome-base/gvfs-0.1.2 dev-libs/libunique dev-libs/dbus-glib x11-libs/libXft @@ -44,7 +43,8 @@ DEPEND="${RDEPEND} # gnome-base/gnome-common # dev-util/gtk-doc-am" -PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )" +PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 ) + >=gnome-base/gvfs-0.1.2" DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO" -- cgit v1.2.3-65-gdbad