Relax PDEPEND for gnome-base/gvfs for USE="udisks" vs. USE="gdu"

(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)

4 files changed, 13 insertions, 8 deletions

diff --git a/gnome-base/gnome-light/ChangeLog b/gnome-base/gnome-light/ChangeLog
index f50c547300f9..6d80ea212ea2 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.157 2012/04/29 15:45:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.158 2012/05/15 15:38:12 ssuominen Exp $
+
+  15 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-light-2.32.1.ebuild, gnome-light-2.32.1-r1.ebuild,
+  gnome-light-2.32.1-r2.ebuild:
+  Relax PDEPEND for gnome-base/gvfs for USE="udisks" vs. USE="gdu"
 
   29 Apr 2012; Markus Meier <maekke@gentoo.org> gnome-light-2.32.1-r2.ebuild:
   x86 stable, bug #410611
diff --git a/gnome-base/gnome-light/gnome-light-2.32.1-r1.ebuild b/gnome-base/gnome-light/gnome-light-2.32.1-r1.ebuild
index 20b5ac1b68b9..12e9d4392b5f 100644
--- a/gnome-base/gnome-light/gnome-light-2.32.1-r1.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.32.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.32.1-r1.ebuild,v 1.7 2012/03/25 16:17:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.32.1-r1.ebuild,v 1.8 2012/05/15 15:38:12 ssuominen Exp $
 
 EAPI="4"
 
@@ -68,7 +68,7 @@ RDEPEND="!gnome-base/gnome
 	>=gnome-extra/yelp-2.30.2"
 DEPEND=""
 PDEPEND=">=gnome-base/gvfs-1.6.6
-	automount? ( >=gnome-base/gvfs-1.6.6[gdu] )"
+	automount? ( || ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] ) )"
 
 pkg_postinst () {
 # FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway
diff --git a/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild b/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild
index da4ddb6c5a5b..77501ffac140 100644
--- a/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.32.1-r2.ebuild,v 1.6 2012/04/29 15:45:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild,v 1.7 2012/05/15 15:38:12 ssuominen Exp $
 
 EAPI="4"
 
@@ -69,7 +69,7 @@ RDEPEND="!<x11-libs/gtk+-3.2.4-r1:3
 	>=gnome-extra/yelp-2.30.2"
 DEPEND=""
 PDEPEND=">=gnome-base/gvfs-1.6.6
-	automount? ( >=gnome-base/gvfs-1.6.6[gdu] )"
+	automount? ( || ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] ) )"
 
 pkg_postinst () {
 # FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway
diff --git a/gnome-base/gnome-light/gnome-light-2.32.1.ebuild b/gnome-base/gnome-light/gnome-light-2.32.1.ebuild
index 92570d89b61d..19ed4b2367c7 100644
--- a/gnome-base/gnome-light/gnome-light-2.32.1.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.32.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.32.1.ebuild,v 1.8 2011/03/22 20:13:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.32.1.ebuild,v 1.9 2012/05/15 15:38:12 ssuominen Exp $
 
 EAPI="3"
 
@@ -66,7 +66,7 @@ RDEPEND="!gnome-base/gnome
 	>=gnome-extra/yelp-2.30.2"
 DEPEND=""
 PDEPEND=">=gnome-base/gvfs-1.6.6
-	automount? ( >=gnome-base/gvfs-1.6.6[gdu] )"
+	automount? ( || ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] ) )"
 
 pkg_postinst () {
 # FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway