Make USE="udisks" require USE="udev" wrt #482764 by Michael Weber

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 19 insertions, 23 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index bcb80f18c2dd..13a2c6d942c7 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.221 2013/08/03 09:45:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.222 2013/08/29 12:47:55 ssuominen Exp $
+
+  29 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> gvfs-1.16.2.ebuild,
+  gvfs-1.16.3.ebuild:
+  Make USE="udisks" require USE="udev" wrt #482764 by Michael Weber
 
   03 Aug 2013; Michał Górny <mgorny@gentoo.org> gvfs-1.16.2.ebuild,
   gvfs-1.16.3.ebuild:
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 883aec74f286..6381fc3d1a39 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -14,26 +14,18 @@ DIST gvfs-1.16.3.tar.xz 1493048 SHA256 02a4483d0dd2e307f58f8e1d34dd29dbe06d3a345
 DIST libgcrypt.m4.bz2 1526 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128 SHA512 fe7916d01efb1d14c4d84ed37f3b53b04d3b005cb04b603bded8d24e147fe69a4c0823164483dba3bc95cf540eaf93a0c0ad59f29f8e1edbae9566a81be5900d WHIRLPOOL 6baa8ed005a691fb1f31ac420d801d20a1611519a38749718dcf3956557f40a058c24b988d20534a62084fadd4141c44893cfa751ebf8011cf55d83c759868dd
 EBUILD gvfs-1.12.3-r1.ebuild 3361 SHA256 d7dec2b44edda8d1f96026583b737539b328dc6aee9a99e50b3f2d87ffdede9c SHA512 ebdd5ed06ad17c47666d51d993ff7d5b00ba42335756f2ad75ab0962d0e3174d6472439171221f7e5442b98a8ac7a70610c1d54dd09d6eb06d7d4a03f1047116 WHIRLPOOL 4a59239fed3d82ad2940547584e64d4e41229edfb54e7984177529939fa19b4af8ac76b130d2637e5178028e4be8530a635cf19035e9bf4b6b5c970369328c74
 EBUILD gvfs-1.14.2.ebuild 3895 SHA256 97e2c23271679993f190e4ee679f6f7acc29631c8842f50002b61ed20c9f52e7 SHA512 99c3e93b995059842e8d0a968a455078ed410f458de52033ee6dfde389f999b320d36474d6b0769172bcc2551e002d524099dcab72a76da8c141774e738c39f2 WHIRLPOOL 71f10146264911ca4d33a75548bc2f1fd4ff082b17846c2ea8b93b16d8cc3859a50b199b424b03fcb705dc74b4f0229990bb9ccc63a7bd7f97542a074357c1f4
-EBUILD gvfs-1.16.2.ebuild 3642 SHA256 e8daaa593970663a643d97be1c70d3cd7f7f55d829e52179c9f8864540c9edbd SHA512 b404eab196347bd79b067ce582a1dbf1f7067183d3cca69c638cbaf463a078652c081ff411a5b5da392585992e06c0ceeb7273dab66f99d71cc9f608f757dab7 WHIRLPOOL b6769ded6d9165731dccfcd65bc75d34782665654ce9e6410b3eee8a67c0ec8c18487125e6863f697a269043e264ecaa98ece3dbdafb70d65fd16a9cfed6c7f0
-EBUILD gvfs-1.16.3.ebuild 3642 SHA256 8d5dc1a19b10a99097e85f8569cccf39db6b1a0f02fb41a3b774695530b2cb67 SHA512 c0d85cf9bbdb930ef32685350e7ca35a861cb511e069ced68f0c1135c77855865492e93e3de987751e6ebf5b56a0fdfa7f558a14d6be09a08b6b629cd9e7df4a WHIRLPOOL b6619f200baf6e23055d678a09cd5ea64ca7dd5d2981c81ea40b4090cf1fa6693b3b98d08003ce711a85af1f970e52411a8410828105ff4328d144efcf3a7218
-MISC ChangeLog 31684 SHA256 47d5b45284d861d40b896dcca37bece23cad405c67dddf4e6a9a0fb43f27d423 SHA512 7fab45a019a2e46b04cd78c9ca1326f5c09b01540ade31d068b8491aeea43b32379445a14cfd4c6503b23ef17b509444a8d44db9e4a79542caec4e35daff43b9 WHIRLPOOL 71a59ecc1df4d5eb66f4334d881ede71eead5b0ec60f149558e829ec65708adde23118ee1310a2297788548125bb3f1ea567037435d5079e91ea631a64205a0f
+EBUILD gvfs-1.16.2.ebuild 3662 SHA256 9ec832f8180ffbb1ad39eb63496f2345e90ec736fc607a5d954392abbb22dca1 SHA512 e6e78fadc5f471cd2c05c11cf78e3f6bbf0cb6fae68723952ccb60bf9f7ec47bd16dada7a5441dc5160b129c4508c8cd1c07c406427dd2c448c132ee77cc96c5 WHIRLPOOL e4be417d8eafb3bdeba6071349880bfb8792e0c1805f0c09447b4f952673b0759740c265605733049e9abf62dcf26bd428ec1a8f0d5122623262449a944d5778
+EBUILD gvfs-1.16.3.ebuild 3662 SHA256 0cdedaae5d6e6b4903722946efbf01c05fed4a49cb17be23b2419b1bb0765d33 SHA512 d0cf31e5e9f3c48bd1c6d07499dd7eead6e08d339d3ae3f17bd131650859f7d34f7c568f93fb2c327af6785245d7b06705ddb410205eecdff9495724a6d2e00e WHIRLPOOL a2e1d1650775646da056c39334185404eb0293d4bffbc56fd6c6dbde256395272b376455b21bc3fc6e9dc02b95fc2977ae387a27c018f2513d700d23fe7b44b9
+MISC ChangeLog 31852 SHA256 db2bb47682e911ecdb42497c189ac59bf590fd96c2b2f1aecaf68a34d2a61f11 SHA512 1f7ebbe5e73e9159f4643ee8679b244ce6863f0f9438737761e7bc226b0ac10e8cbef6584acb7ede8f3f4e9fe30c2ebb9fe74b1fa19e70a20741ff66a78fdbd8 WHIRLPOOL 67f691abfe8005e928ccdce4c693a6da8d574ae63191806de3192eb4923c5969e1dea9e18436196a577cedacb6dba2f6f173842c561aaecb91f373b86b6921f5
 MISC metadata.xml 1440 SHA256 a02bc760008f281e624b5bb457002578368cbd4a6cd6c0022a8e6e7e7dda9603 SHA512 93e1c99b3108f240d9543a22c9ef67a1ab6baaa25d99bbe721d6fcba7e939b40bacabe727310d2ecda1200e3612c88a7245c55dfb2a3e25ef5afc20b69b59863 WHIRLPOOL 6c3357fadeba19ff338ece726468464973b74a37b40aeba8925ccf6eba41b46d8e2c62bfca58d4b7f83138df248cd4c0ccee418b66ab374d8eef045ba21d0717
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJR/NGkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD4OsQAIFTVxHUal/RSWuboCv6m9wm
-MgzmRJGOjiWBBBcbCfnoPWpkOo7TnRDGaNKN0hZDK75T3qFv9gm5V5gIlQyPx90x
-Me/NswJF6gvZwxV+Z02PVWRLKtgU56ZI1e3EC40TJvDoUaCBdb1ZQe+NuXaE7NsN
-3KFu7BaNpBbWVbNIxoIsqZgD8E/irzIeLd26jYzBrDKxde2DO8m6gg2g1GlBNpKw
-OtNJxp3NC2SX/iM9uW6nx1wQn/h7Lk0756auTMdRcRHRWBp/PbvpORCMwbICxqC5
-a3v77vzrAIjYkWAt8lBbk1JRebTA5Efri7cFT2NNX85w8LJij1zS4OqHppPansWL
-ZNcRDgSbnWaF0KxN5FiXEFkHGT6JxwLMluOAWyHPQjZniFixZC1lv1N0nDlQehRp
-i+YVSLLmwxTrmRGTsUQI7Q9v6opFVOMp9TGvD/nQigVr3bPcg/qGyTGWHEAzbeoX
-v8JwghdyVkyq8CS2z1SGFwZ7hgo3Peeab7aYDmV2XyL6+JWyLnp9luk+MWGHLWVM
-UIkSBfrSvqyjotHgB08zyDj6C95UlwCvdRvLlfQHkFSqz0rlTYqBnpJz/TeM13sx
-dq2exB8cw+aO0IS4Qg1e/Qo770yqhB4nuDVDdLII5+R3YcrSNlNl1iPXw3zAb5wU
-Sj1Mmj7noUKJ9AghVJ2e
-=4OG/
+iQEcBAEBCAAGBQJSH0LdAAoJEEdUh39IaPFN2TUH/j3+EAgoH79nUN4YOWuQVjHR
+fvs9lUlDDoob0+GAHfP4ttHz66vxRuaf1ZnHpgBgbWMm6FADaK6LDuZnAr0fuyRL
+oth/VEYo28qpRWryGdupLA6laVeuACdh6Bgg8UHioDqji2jkn6UjsDPvtMbC8XvW
+SAMo9eJAdHVZze+n7ZNKXRF466zK/ZdNRgm0prkmU9moPbzXWGmwPlaIx+T57TNG
+rLkGboYLWmw0+xC1C8W3jxVU6bLFuFML+42r4IS9Ap0iUrGLERkOHUQ9pxXf3Iq/
+sSCXV2MBUhMTotfxF3Z6LlYI4QNNiYymhr1G2JxiK/ozZ0q9mzCWZzMQerKLxW8=
+=WABY
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.16.2.ebuild b/gnome-base/gvfs/gvfs-1.16.2.ebuild
index 6ec369022820..6564c4c44837 100644
--- a/gnome-base/gvfs/gvfs-1.16.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.16.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.16.2.ebuild,v 1.2 2013/08/03 09:45:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.16.2.ebuild,v 1.3 2013/08/29 12:47:55 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 IUSE="afp archive avahi bluetooth bluray cdda fuse gdu gnome-keyring gnome-online-accounts gphoto2 gtk +http mtp ios samba systemd test +udev udisks"
-REQUIRED_USE="systemd? ( udisks )"
+REQUIRED_USE="udisks? ( udev ) systemd? ( udisks )"
 
 # Can use libgphoto-2.5.0 as well. Automagic detection.
 RDEPEND="
diff --git a/gnome-base/gvfs/gvfs-1.16.3.ebuild b/gnome-base/gvfs/gvfs-1.16.3.ebuild
index 8de6f7c57356..6ce99978d07d 100644
--- a/gnome-base/gvfs/gvfs-1.16.3.ebuild
+++ b/gnome-base/gvfs/gvfs-1.16.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.16.3.ebuild,v 1.2 2013/08/03 09:45:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.16.3.ebuild,v 1.3 2013/08/29 12:47:55 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 IUSE="afp archive avahi bluetooth bluray cdda fuse gdu gnome-keyring gnome-online-accounts gphoto2 gtk +http mtp ios samba systemd test +udev udisks"
-REQUIRED_USE="systemd? ( udisks )"
+REQUIRED_USE="udisks? ( udev ) systemd? ( udisks )"
 
 # Can use libgphoto-2.5.0 as well. Automagic detection.
 RDEPEND="