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, 16 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/Manifest b/gnome-base/gnome-light/Manifest
index 4e41c429ade9..539319cba080 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD gnome-light-2.32.1-r1.ebuild 3060 RMD160 5cf8d5fec71da36c4e2f207c9c871f43629f785e SHA1 51a62f8da0ef0ec7e663417f69f08e68e775af75 SHA256 a91b7029694346fb97bc6bdfdcc15da3e06c001d266859a29388647d85e17dd7
-EBUILD gnome-light-2.32.1-r2.ebuild 2612 RMD160 2ba2ed963a1b14ee1746996e85263b555234a8f6 SHA1 ae8d270580d90f1bbcb2695ff733a3a1b1ff318f SHA256 8ab763d4b75ac54248d74d93d4e26b1fd4e823e23acf06909568bced5f1c99ed
-EBUILD gnome-light-2.32.1.ebuild 2497 RMD160 fb0bf3bbbf42364fdea3189cf23d9f9778baa49e SHA1 df3e54b80baa3c3a16a27f835411f9643a35d629 SHA256 4eddafffb28f398c7350f0378be815e5dcf41b2f395e4d553e26570c359063b4
+EBUILD gnome-light-2.32.1-r1.ebuild 3101 RMD160 03cfea8f62f5c33b2791b4b878ad3d0cfd9e97cb SHA1 75c914a1e74d7a92fa56474a3e631bbddfa6cc39 SHA256 ea119d3b189567182069525c8fd3c45fb9ba4ecfb891d6029a74db19c7356aae
+EBUILD gnome-light-2.32.1-r2.ebuild 2654 RMD160 166b4ec4a6eac2b5eeedd03311213760ed69eb05 SHA1 1971054a662133cd399396b4332f7f52d406434a SHA256 8dc857dc6b53853458eb8141a2fbf1b879911b88c9ae5adb428e43a9dfc62f82
+EBUILD gnome-light-2.32.1.ebuild 2539 RMD160 35b572baf518fcdefab0b5eb00e0be18a706bfa5 SHA1 9556a16a4032b7b7e904bc2c70e489507f2ab5e3 SHA256 6bd2cd70b2366fe2d5bbed6b34d21de4592956ab9c64ab46edf2b9e084ef2c34
 EBUILD gnome-light-3.2.1.ebuild 1785 RMD160 222e0f5ca771820ce760574d8dc19b286051d3ee SHA1 df53fa7c2526a9c541ad0ac976218dd258b9394b SHA256 2b3755dcdf1bdb22a92d4c8dfd4a6a7c40ed8f77f4e25285ca32feeea347bffd
-MISC ChangeLog 21110 RMD160 52207002019f89cb0208bb8070e69ff53077c367 SHA1 9bb6ec588981a62793ef25c353b087085e9cf377 SHA256 8a7ca62c30654645f8b9e78f5e78660c01e771109a5dc327d4fdb7dea9816cd4
+MISC ChangeLog 21326 RMD160 5dc76062e8adfe2fa734fab0e9ca04c0a3e5e732 SHA1 c55a1d40ff1b325daf65696cbc5ad93a3a5b2960 SHA256 35d70120b946529abfb7ea47bbf5dc7c90c0eb40fd4f3e7e20b7ae436efd275a
 MISC metadata.xml 558 RMD160 e6e9b6b33de73535a677016c3ad4e57f65dc4cb5 SHA1 cb2dda85acede762253dd793ca14f265f2892a95 SHA256 dc53207a4222c119fc1226b860b47cbe4dca5824b6cceefc9278bd37b34395fe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+dYssACgkQkKaRLQcq0GIiFgCfcuL8d1SELoSPOEtyvDd1SF+7
-CHMAn0te3B93KJoaZRiemNtWkwxmZRvs
-=gQpr
+iQEcBAEBAgAGBQJPsnfDAAoJEEdUh39IaPFNvnUH/2fHzhrc+Mnt9mytXnP4XWli
+6ljuDYvmDkvgeOUx3hO9VG9MSFWmlqQkIVuqdoD59LtT8OAtt2zRRJswsPt8hY0P
+NgL6uCHQEMrM/vsrC3vdC68B0liOxf+SfZjJCzL5jlf+wyE2328+o7V0VQlm1JBe
+QSJEAZuDfUFp+rBujSY57yL7GyquDOJD6dQUsNQKx7zHsGhbn/S9tzZy5CoNyZcm
+aMnsblhK1cXoQDrjR/mu816Mp+5UC1v6XNolRfimRSHjzPjKGWLo7n3HVYSLcZ/G
+XLfdY2woKDp2KOGm/tiiunddsUHhMtlDB3oAnkui27HgIEtfwdIGl0APCUlSkUg=
+=4lRe
 -----END PGP SIGNATURE-----
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