Move gnome-base/gvfs to PDEPEND to prevent circular deps. Add a dependency on +automount? ( gnome-base/gvfs[gdu] )

(Portage version: 2.1.8.1/cvs/Linux i686)

3 files changed, 17 insertions, 4 deletions

diff --git a/gnome-base/gnome-light/ChangeLog b/gnome-base/gnome-light/ChangeLog
index ac700f7bf4aa..49dd3d951fa0 100644
--- a/gnome-base/gnome-light/ChangeLog
+++ b/gnome-base/gnome-light/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-light
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.110 2010/01/14 22:55:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.111 2010/03/18 17:25:40 nirbheek Exp $
+
+  18 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  gnome-light-2.28.1.ebuild, metadata.xml:
+  Move gnome-base/gvfs to PDEPEND to prevent circular deps. Add a dependency
+  on +automount? ( gnome-base/gvfs[gdu] )
 
 *gnome-light-2.28.1 (14 Jan 2010)
 
diff --git a/gnome-base/gnome-light/gnome-light-2.28.1.ebuild b/gnome-base/gnome-light/gnome-light-2.28.1.ebuild
index 2dcc3ee41263..220699855fb4 100644
--- a/gnome-base/gnome-light/gnome-light-2.28.1.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.28.1.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.28.1.ebuild,v 1.1 2010/01/14 22:55:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.28.1.ebuild,v 1.2 2010/03/18 17:25:40 nirbheek Exp $
+
+EAPI="2"
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
 HOMEPAGE="http://www.gnome.org/"
 LICENSE="as-is"
 SLOT="2.0"
-IUSE=""
+IUSE="+automount"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
@@ -51,7 +53,6 @@ RDEPEND="!gnome-base/gnome
 	>=gnome-base/gnome-settings-daemon-2.28.1
 	>=gnome-base/gnome-control-center-2.28.1
 
-	>=gnome-base/gvfs-1.4.3
 	>=gnome-base/nautilus-2.28.4
 
 	>=gnome-base/gnome-desktop-2.28.1
@@ -66,6 +67,9 @@ RDEPEND="!gnome-base/gnome
 	>=gnome-base/librsvg-2.26.0
 
 	>=gnome-extra/yelp-2.28.1"
+DEPEND=""
+PDEPEND=">=gnome-base/gvfs-1.4.3
+	automount? ( >=gnome-base/gvfs-1.4.3[gdu] )"
 
 pkg_postinst () {
 # FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway
diff --git a/gnome-base/gnome-light/metadata.xml b/gnome-base/gnome-light/metadata.xml
index da6fd63d0085..b1870850816a 100644
--- a/gnome-base/gnome-light/metadata.xml
+++ b/gnome-base/gnome-light/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name="automount">Use <pkg>gnome-base/gvfs[gdu]</pkg> for automounting
+		of drives in nautilus</flag>
+</use>
 </pkgmetadata>