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, 9 deletions

diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index 81a62da5af79..044964712bfa 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.435 2012/04/29 15:46:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.436 2012/05/15 15:32:23 ssuominen Exp $
+
+  15 May 2012; Samuli Suominen <ssuominen@gentoo.org> gnome-2.32.1-r1.ebuild,
+  gnome-2.32.1-r2.ebuild, gnome-3.2.1.ebuild:
+  Relax PDEPEND for gnome-base/gvfs for USE="udisks" vs. USE="gdu"
 
   29 Apr 2012; Markus Meier <maekke@gentoo.org> gnome-2.32.1-r2.ebuild:
   x86 stable, bug #410611
diff --git a/gnome-base/gnome/gnome-2.32.1-r1.ebuild b/gnome-base/gnome/gnome-2.32.1-r1.ebuild
index 56a086a6a95b..95ee95ff7ded 100644
--- a/gnome-base/gnome/gnome-2.32.1-r1.ebuild
+++ b/gnome-base/gnome/gnome-2.32.1-r1.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/gnome-2.32.1-r1.ebuild,v 1.7 2011/12/07 07:36:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.32.1-r1.ebuild,v 1.8 2012/05/15 15:32:23 ssuominen Exp $
 
 EAPI="4"
 
@@ -159,7 +159,7 @@ RDEPEND="
 		>=app-misc/tomboy-1.4.2 )
 	policykit? ( gnome-extra/polkit-gnome )"
 DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.6.6[gdu]"
+PDEPEND="|| ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] )"
 # Broken from assumptions of gnome-vfs headers being included in nautilus headers,
 # which isn't the case with nautilus-2.22, bug #216019
 #	>=app-admin/gnome-system-tools-2.32.0
diff --git a/gnome-base/gnome/gnome-2.32.1-r2.ebuild b/gnome-base/gnome/gnome-2.32.1-r2.ebuild
index 67fd581edadd..802520e9c5ff 100644
--- a/gnome-base/gnome/gnome-2.32.1-r2.ebuild
+++ b/gnome-base/gnome/gnome-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/gnome-2.32.1-r2.ebuild,v 1.5 2012/04/29 15:46:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.32.1-r2.ebuild,v 1.6 2012/05/15 15:32:23 ssuominen Exp $
 
 EAPI="4"
 
@@ -159,7 +159,7 @@ RDEPEND="!<x11-libs/gtk+-3.2.4-r1:3
 		>=app-misc/tomboy-1.4.2 )
 	policykit? ( gnome-extra/polkit-gnome )"
 DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.6.6[gdu]"
+PDEPEND="|| ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] )"
 # Broken from assumptions of gnome-vfs headers being included in nautilus headers,
 # which isn't the case with nautilus-2.22, bug #216019
 #	>=app-admin/gnome-system-tools-2.32.0
diff --git a/gnome-base/gnome/gnome-3.2.1.ebuild b/gnome-base/gnome/gnome-3.2.1.ebuild
index 12f7e52e1fff..2c8dc0b4c2bd 100644
--- a/gnome-base/gnome/gnome-3.2.1.ebuild
+++ b/gnome-base/gnome/gnome-3.2.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/gnome-3.2.1.ebuild,v 1.1 2011/11/07 07:50:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-3.2.1.ebuild,v 1.2 2012/05/15 15:32:23 ssuominen Exp $
 
 EAPI="4"
 
@@ -44,7 +44,7 @@ RDEPEND="
 		>=gnome-base/gnome-applets-${PV}
 		>=gnome-base/gnome-fallback-${PV} )"
 DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.10.1[gdu]"
+PDEPEND="|| ( >=gnome-base/gvfs-1.10.1[udisks] >=gnome-base/gvfs-1.10.1[gdu] )"
 # Broken from assumptions of gnome-vfs headers being included in nautilus headers,
 # which isn't the case with nautilus-2.22, bug #216019
 #	>=app-admin/gnome-system-tools-2.32.0