Fix circular dependency with gvfs/gnome-disk-utility (nautilus -> gvfs[gdu] -> gnome...

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 5b15e89e0618993551cc3520439ded29070dd672..3dcdcc8a3a02a49980539b7774208f6970e9df29 100644 (file)
--- 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 <nirbheek@gentoo.org>
+  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 <armin76@gentoo.org> nautilus-2.26.4.ebuild:
   sh stable

diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 2805c7422ce2c89a2a93a242839f0fcf264d9c76..5148acd7c1a3e7821fe0f34305e9cd46bec69efc 100644 (file)
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -16,6 +16,6 @@ EBUILD nautilus-2.26.4-r1.ebuild 2851 RMD160 5aa183ccc4ee3bcb0d89bb317a9ed90069f
 EBUILD nautilus-2.26.4.ebuild 2704 RMD160 d46a2c6118d834a4865309e93d6008b0000a181a SHA1 1dd8a89af73235849dc1febf4cb25be859dc73cb SHA256 9ba0cd088519c0cc99bfb90b059ce523a758034e3d606c831585fc2dd02b0476
 EBUILD nautilus-2.28.1.ebuild 2693 RMD160 be87cc6ad315e776951b2f430ebebad50a76f781 SHA1 73797f00dc3da48ddd2fcfde7d5ffe8b0921d265 SHA256 36613b6cab032b8c5b1be3901243b6905294a8ae1c953f1b97130d7e555efe74
 EBUILD nautilus-2.28.2.ebuild 2685 RMD160 dd2e2ee8f57d347bcc08c56f993abd35a20282b3 SHA1 2d52a0517e8e120f6cced02a65bf3dd602efd915 SHA256 b3355ede9f5cff4763693be1695104fb64490457b555e574109e997187f39abc
-EBUILD nautilus-2.28.4.ebuild 2748 RMD160 7607463c232f5d0f7cd22b3b73d0236a646bedf3 SHA1 d83677960504a120427af7dcd02bb616741eab56 SHA256 2373855c6c5a7ed96f7af2408887e866804d00fe98712318b59a548cd7652a09
-MISC ChangeLog 48245 RMD160 015a98f68a42c32f0fcf89e9d5ff0b3e37a106f1 SHA1 a10da873eda039742ad06262eec1e69369161c0a SHA256 a82c6fdf981ab71d25b3f7ac52616bb5edbe1f1b13283a83dd358d0d935153cc
+EBUILD nautilus-2.28.4.ebuild 2752 RMD160 5087945b40be9046e733966cca96b992670ea208 SHA1 18fcac32eaf42ff89005dd995ee73d7307c7882d SHA256 7e64f4d844e059f0d0124641f0149319a0163fb6fab622564368ae1825bb6efc
+MISC ChangeLog 48452 RMD160 dbfcb61759d00fe57ec3d7672996d11635fa73f9 SHA1 476b46f65411c6c0b28e454becad6ac025e87109 SHA256 38162d67b4575e0cf16e9b51febd52f6a31b6b4b64ae04d30504f3cbd79c5125
 MISC metadata.xml 418 RMD160 950ac903bccee9717bb2aa3ab8b1269ad96d7fb2 SHA1 b8c46a622a2725f2860557b2a1c2ffee0ff000ff SHA256 eecdd5e524b283e5cf158c17c89828a17f67cdd64e2c552a7c5ae9a4dd977ebc

diff --git a/gnome-base/nautilus/nautilus-2.28.4.ebuild b/gnome-base/nautilus/nautilus-2.28.4.ebuild
index 1c30aa26e336eb62d6bad8439b46580cbff641f3..2356cea42597f437fed744bd118891a1a2fff736 100644 (file)
--- 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"