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

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

5 files changed, 25 insertions, 17 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/Manifest b/gnome-base/gnome/Manifest
index 850de3a4a9c4..ac525ab5bb1d 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD gnome-2.32.1-r1.ebuild 6047 RMD160 e781963724ec85758aa977fd25c6a5540f4ce2c7 SHA1 bf086b7fa34b1cde9b5d22a3d74c120229e3b165 SHA256 a4efeab2fbbfaf8ac311e7f4c2f59844db31c1877fe0d53b03dc1239dd0ea29c
-EBUILD gnome-2.32.1-r2.ebuild 5595 RMD160 d11cb7dd77d0070b16566392530194c0fb56fc4b SHA1 584de3737c22e2c29678f579cb77591336ed30c1 SHA256 fbd5cc40ebc68647669193011d2f5f8c403fb347ace84b43a3b48db1b1a9e936
-EBUILD gnome-3.2.1.ebuild 3224 RMD160 44f5e804923f346fe5240a66fed56080c5695173 SHA1 e2e84743dcf442c00190faea82f5ba3a387f6669 SHA256 1f8f27081a3e515e95853c33f21521e130538b14466b30dabaf325a7fdc2c52a
-MISC ChangeLog 59090 RMD160 e0421a913063f8e9e08f44aec94a67db640f9eba SHA1 fbe4f03d5b61a6b949b55c91ccd7fa27bdecf6fa SHA256 59a5591646b906c8e146f10743c7aefe0761e1c3863265fb4226139b977566fd
+EBUILD gnome-2.32.1-r1.ebuild 6086 RMD160 cf8e7b3303ac0a980de9df92cc992718e55232cf SHA1 1a5dab09ea68f80474c02b0741988bf7046cf629 SHA256 26efbd5c15e09b4755e4e41f8d4c00fea3c6f31a803d19596b9265acac2da45f
+EBUILD gnome-2.32.1-r2.ebuild 5637 RMD160 e87bfbd6b59513d954f844921485c096e02f6de5 SHA1 b84a28f3f97fb8137ef802264be724dabdffbbf1 SHA256 c2c6dcfea2fef3d19ec7516a8e8f6a15e9e255d127380d1a1d5aff39d4bcb6a0
+EBUILD gnome-3.2.1.ebuild 3264 RMD160 ad5b522d2e53d7b5dfc92f14182757bb2515c0c2 SHA1 5c15fe8f8dccc5a6b131faacf6848782326679f2 SHA256 de7799e8732d6d887ad946a36be27427409914e02e2f2d07a27cc1dee38642d1
+MISC ChangeLog 59285 RMD160 0ff5698414ed069ff9e7323cef5e7c6fb0697c27 SHA1 96180c4868de46874925eec69a186fb7db10c350 SHA256 1bd867db7b2559837b926aee2e17f49a1cac514439cd9f3b9dc66feac84b628e
 MISC metadata.xml 376 RMD160 f7312176ff564c73436f37a44a5f3d5896837b00 SHA1 4ab2f29ef6a32763abc61aa5afbe307e0502537e SHA256 207bb8410f0620f37bc86f90175a0c4144e36a3eb9c3d79e41212c9cc32f24df
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+dYxcACgkQkKaRLQcq0GKO8QCfbI8ikhqLFtq+kU2cPaGqwTnV
-olEAn2+Iae01gXjO6kBg4t2dFnHUG0wJ
-=Ot2V
+iQEcBAEBAgAGBQJPsnZmAAoJEEdUh39IaPFNtJQH/R9gOCOIyqCQ+PFaej3BNu3X
+FuybV4quqNK4pNrruc47JYJ2OTC9d+ujOb8EBb/FWDldjAg1AZiyeyl81twPmL2o
+3DEgZEuvdrIoGg+x6y7C3J5lUAYwM/hMl76ad+DDqXOlIcwQwlxyIppX1wpNiPy8
+H3FZ8bjpeT1ZhLbS08RBwspGqx8SyNAxV2QUGInR0O5F1dfIVslXKsJCJYEpwbFm
+r5cZ+7f3Oe1fTYgzMyXtNfVilbVzXD0KfhOlHTlItu3Xz/MWVUK55DjQsDDJ/TBU
+Gi3Nn/k2Fvk6W7+lH+UAvd9v/Jgh5pEA9TuzNJDh1ThNen2ni3bZ60R/thsZE8U=
+=ujb2
 -----END PGP SIGNATURE-----
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