Version bump.

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

8 files changed, 43 insertions, 438 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 4222753fb542..0761fd504715 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.192 2012/10/28 21:55:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.193 2012/11/22 23:09:01 eva Exp $
+
+*gvfs-1.14.2 (22 Nov 2012)
+
+  22 Nov 2012; Gilles Dartiguelongue <eva@gentoo.org> -gvfs-1.10.1.ebuild,
+  -files/gvfs-1.10.1-libimobiledevice-1.1.2.patch,
+  -files/gvfs-1.10.1-unneeded-include.patch, -gvfs-1.12.2-r1.ebuild,
+  -files/gvfs-1.12.2-afp-g_clear_object.patch, -gvfs-1.14.0.ebuild,
+  +gvfs-1.14.2.ebuild:
+  Version bump.
 
 *gvfs-1.14.1 (28 Oct 2012)
 
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 53a1893e4141..d7b4ceb06f69 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,32 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gvfs-1.10.1-libimobiledevice-1.1.2.patch 2813 SHA256 db8bc868fb74f470b4a91ee4eed6e4f327a64b5a666a37c915ef504ace1258e8 SHA512 3c2a77b58a40aa835b06e973ebfcb2a5c5fb41263da9b06d3a41b6d8168b5bfbe55a793c7dd5b413c653a43ad66c917a527c926913693c6e1ee7e4d7a685afdb WHIRLPOOL 8669a733fe783dea942970948975f6195056ca0e6100c91fed05069a41fa359f1d651953277135958fb84ebc05d819154a28fea02aded85a629f96a9164dd1fe
-AUX gvfs-1.10.1-unneeded-include.patch 706 SHA256 7271536185ad468c39474b8eea387af7038a974c60964b5d8d4f6bac0cc96969 SHA512 f7337d7c79e514c0113e4fe3d492cd210e74ab98ec8ef423cffc81149f7df39173aa78c761e8f4d788c083ca8c0eb01554e90312111cf10c2ebc0f12bde8da66 WHIRLPOOL 6037d30ebf6b4fcc8ed1633ff3e6fa2db76d8fafd841ff566ab6f0ca0343215a6267bbaf2eead6d1de32a1c64f8d82d21082f5d7f5e1df054d29f8a467e4346c
-AUX gvfs-1.12.2-afp-g_clear_object.patch 1148 SHA256 6a93963644317d9e55aebac723008bd94cf97d42349dbf48ab6996fa5d9eed89 SHA512 263bd5c1c511573ad9fd3c698e03d3769ff40a6cb273bae9c2712d35c40893ecdf184dd448588a0a425be3563eeba3c6192b18ad9f96ab48d203b976cfcd356d WHIRLPOOL b9ebcf496e0c442c3626625442883f5fe4cebf52655373979f21e850822937d88099fefd2216c711a0f06dd8783480ee43ab49a0427a72aa5b8d0cbca79f2f0f
 AUX gvfs-1.12.3-gphoto2-2.5-1.patch 2925 SHA256 fb55f86c2602947b88b53c3ebc8c4c2f1b15e3eefa69dc8a1936f91c3e737020 SHA512 2acc9179ba8f0cbfbe4e96b2535458a38753319fe14c32bb69574254be79a32db8223e0003c67c520d613d78f1c681441798d4e52b1ad2671571c358f655d32a WHIRLPOOL 98e9d0a201a09bdeba79e0c9698d8aab5097a23c7d9100a7dec1feeed643895ce74ec4ac1e6215d34f151a4d0be36c06d3497fe1fe234323bf94372105f51fe3
 AUX gvfs-1.12.3-gphoto2-2.5-2.patch 1251 SHA256 9ac03fb241f16a095812e6cd4440ecca5d20819874c9ed285af353e2bdeca733 SHA512 d41b0848bf4f5d09e5e0479d4722da1c52d6af0e65f9f62631f1dfce2f2fdea7569a2e95057bedf2c1180d4c0c14accb330c15f444d20fcf8346b61b3356d10a WHIRLPOOL 04c91a5f31ba1bcf21c22ca98ce505ebf28344b815bafa8338167f723b7d9b779b979e2f183976b7da570a15bb2dd7ab1f3b66bc7def373ab7759f1e98187987
 AUX gvfs-1.12.3-gphoto2-stricter-checks.patch 1719 SHA256 ba50fa4e9e468e62eccad1ebfc91f6c794f2b0f95da23a463ede260f4c9ca248 SHA512 71275ea9f3ba56577f0890ae087e8ab6704840a9f228bbfba8adbb31f81e101e9e9c0d78daf0ccb788e3e8aa0ebaa1b583f70ad5394858cac4e221ea2ceddcb5 WHIRLPOOL eb8952c3fba5ca5330a99ff7c5ad6789cf14532ce7166d86dfd8cd9b1cfe8599d51316c6daefa6d57d62659b55de4cb8a2a043a464a97bc1faabba39c0de29d6
 AUX gvfs-1.2.2-expose-archive-backend.patch 1607 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519 SHA512 2f1c8fb6d3fe1171991b2d56fceb7f36ed52e17b29b003eaee09a7550981466de4c7da1b85b16ff71cc710fa0bf90dddd25d0cb91ffc095e67764e75fe09b347 WHIRLPOOL 8b44d6106752108b8db2c548508ead6c951a2baba2725c513e66d95bf2f34a257ee1a9764726575fc50e0f24e536548d5425b93559546261edf9ef0d359e75ec
 AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062 SHA512 e3dbcfc257a5ce2ecebc2011317717d853f8069fbdca1c4bb81e90c79acbe3661f64c68321a1d209fdb3584e09efaf3c655d10b8a586f4a9be3d51d62ada9662 WHIRLPOOL 6c417af80339cee72de22c6ddf055057eefabc059c944a848283566ec20ef4785025b72d79537002254bd4a4675d68d892f7aea435b992245d5b22db689ebb97
-DIST gvfs-1.10.1.tar.xz 1295236 SHA256 cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288 SHA512 abb8cf7e1455cda6b434e111a6194c6b91b77c7888f91b6da2e128157bffc81473280812172d68127ddba781a69df86aa26564de8fc88ea6f8d746688f17f0d1 WHIRLPOOL cb6132ebb4881829f0d86527a84c2b6c81ab8b48a3739c60f181839e14b843006afad302b1bef4aca14991567eaf1774908c2a1d0edb44a78a0fae7ec4086716
-DIST gvfs-1.12.2.tar.xz 1359940 SHA256 998b9d0089d21e451e455b6bc5f421eb08bcb3e5ff0aceda98e424cc42ef6616 SHA512 4bf11979eb8b9789d21e187367cce59d87200dbaabf0c89f47cda9b04f1b0c0741961c0bf4b7524cb40f5f9c08a43ca3dab1cd0c6f570c7f20af032fda6337b0 WHIRLPOOL 611c053928663a391c4e6ed9a3b2a186770cf4cf82b84eb136ed66b188ba276c40f4e77b709f2bbfa9c9e833808e1d71efdc6b3452aba98b21f994b162eb6ef4
 DIST gvfs-1.12.3.tar.xz 1361968 SHA256 38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2 SHA512 1b2a2947447fa0917c64a69e02c84a1f870e88fb12c65169a86fd54165e5d4df671e324653ce1d1f123e03187f284e645ef6d4311000b9e88ac2aec055d48a58 WHIRLPOOL 07b21d6ddbb2388944e88af5057d5c027ea9cc4848e6901d74f428498cc4e87db4b80846ca2914802777c32b536bb220a7a8a3c0eae3a8e1f9373a032cd4511f
-DIST gvfs-1.14.0.tar.xz 1463400 SHA256 71ab8cf60070025d1aff9bee1f514fdb45682ffad01b6856cabab1bc3791bfb4 SHA512 e12fab5b1ba56cf3c52f41da032b238f80168ca644d122171b87f74a7a96f226539efde36e41a381201afb2e0b5849a2f47e39583dd880fdc69971dbb4d6a7ee WHIRLPOOL fdd7bcb842a38914830651faf9127f20ac343feae96ebda69d250b436e7c3d2f74574d1f85d0ec1667ca1a7e643f996c912fcfcd118e5ab0479d9d569cb2dd4e
 DIST gvfs-1.14.1.tar.xz 1465416 SHA256 0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a SHA512 cffe1c3316f60e1d09ddc6481567a316de07f8eebe7ae604f365b7dcca9818ecd59c7c92fd49ba34d64fbd0075c189c89cf830343d0a935f9a245940818fa4e6 WHIRLPOOL fafa2dee3e553b74cb703c76ce5619f5dd2d388dc74aade025edb6e00e5edc35ee7c400b3c7eee9458c2c86e72e7ec6a92b0df4122d1533a99de27514dd1792c
+DIST gvfs-1.14.2.tar.xz 1466384 SHA256 c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc SHA512 f7f4fa2b69d51f087d0f5094c4a170363cad2cd86c6de94241bb4fd9adfcde48ee34c21f5e3e761ff13ba39d842f886dbabba5cecb466dcbae9a40c9b7976a58 WHIRLPOOL dff3f4fc334cb5f3ccd82260fd0feb7c57da8d588e5e9fd5ec5c8563dc52922fe58ff6ac3de85af94d7c7ff6d32acc85edb9def6db90130ef75681566222cde4
 DIST libgcrypt.m4.bz2 1526 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128 SHA512 fe7916d01efb1d14c4d84ed37f3b53b04d3b005cb04b603bded8d24e147fe69a4c0823164483dba3bc95cf540eaf93a0c0ad59f29f8e1edbae9566a81be5900d WHIRLPOOL 6baa8ed005a691fb1f31ac420d801d20a1611519a38749718dcf3956557f40a058c24b988d20534a62084fadd4141c44893cfa751ebf8011cf55d83c759868dd
-EBUILD gvfs-1.10.1.ebuild 3526 SHA256 1cfa5b275f772ef5734f7ce41329cc2236fd77847886e101db873d0866432060 SHA512 43e370b126736603382bf32616c6d267d2979973ef481cdf36f6387243298564b3acf502647d34777d5f81f8e68c0d07c42d78d2e1114e0776a0c12c1fc24809 WHIRLPOOL 9e66ce9f1b7ef9a4884a29b1bd4010219ea4848f7c690c7b8f976f07bb4697f13876afdc04d8f6c9d4432350623301975d33c7bb3c42f7d8a2c93cd6ba0917d7
-EBUILD gvfs-1.12.2-r1.ebuild 3507 SHA256 4b83beded1f186a39d7fd687c1c661d6874c62ef58327ec8e0a2841ad3999770 SHA512 17efc197b724a670a6266c79b6fd79159b4574857b8c1c28659f79c0af1af7f3e3f0b7367854118fbd6e669c508ada1d2ed42d5f682a144e6a7e60cc0d336acb WHIRLPOOL 2a91f633e03689c89766f4edb6c9d6326886b938b6fff18938bc22b25d5f7399995cb67f19a7463b9125ebe9130f248d01fa81883034e3452cb50b89bc2b7c5e
 EBUILD gvfs-1.12.3-r1.ebuild 3507 SHA256 919f81711917620b5b26b436d96d9ff23166e032d696010d4955c9726ac3946e SHA512 9583fd0c4f4e2e802de4a1cb13dc1ba218f7516eaea1850545a7b6211dd55762ae138e8fdadd4a3fdb4a25f189c8f2dbee49eac58d743c37f1dcf222c37f1159 WHIRLPOOL 586362d23926ae9e8dd38a7356f843c612e63dce109757d6a6d9042c1f8296d0a00cc81eba1ef73c07c72bfe16c667bb66776c1a1323d87cc0b15d535397df14
 EBUILD gvfs-1.12.3.ebuild 3494 SHA256 883a8ead3528dd6d65a584d232c63f4079804b69c2fd8161ce3c2a246eafbdbe SHA512 c5c2d2bf4683f77606663e666a74a394a479cb056600628a7bcc8b5ea35cf8e7ad882f035d77cfb28371e47c66db47b74e3acb609e367329b6b8c83f027bb2b2 WHIRLPOOL 30196618b862de657f079e601aee8685efbe1d983049b8e21b4905615078885c3fc732a8b90ce4421ad7210eb468791c9f23e3607fab1bdb447a514320a8e8c3
-EBUILD gvfs-1.14.0.ebuild 3623 SHA256 9a041724ff8ffe5230a699be8ec2bab1f3cb66cbce0fbe9073a2452af9536cd6 SHA512 c6c5746b8e1c2a9a2aea90ffb59d1c5793f3d1cd9a892552418c64301a611e07a68ff07afa2e5069fde4bdb6cfbc163eae3c8fa1b93fbf6feab1c7533a9294c1 WHIRLPOOL 82d1ea095d4beb715c274a2b075e8249fa9ebf015b3a5612617456bcd6b27904f11461cc683d5c865a4cbf206c60d60f016ed49eff4bf9fdb879685056da87cb
 EBUILD gvfs-1.14.1.ebuild 3617 SHA256 1b89c526b1112d50ed8eb9ea17db48785c12ce02028277d23e8ee2d7a6da35cf SHA512 b37d5b8d06b17c707c4f97306e7a7bf1c2bb99fc69ee7b0fe1abd43499fd8323924f890a4ba45e3bdfbdc75e0adc179724dda81b49409bef876bd938f08f9958 WHIRLPOOL 01a7cda819b81da6c873d01e295b6b4b1bfc8de5376ddeb26009e79c157932085d87db57ccb1208b7dc0218c16de3421ad8318f920fbced5db771c8c065fabc2
-MISC ChangeLog 27458 SHA256 a202ca1a4a089b1072571f5c73d9ec9c9d6ad1836c831c6c18273f646d72e773 SHA512 7ca7302d8ebc3c65a5ad0ba81836726ab111e027d4cbaa8088cc3a5f9a4d8412fa972c144324c6f204392d0288e6552131051769bf3d22f96909e67dfa7c57d8 WHIRLPOOL 777447e2fc30c858929ff375aa9e2f5d47538a6aebab703d9a7979f7eaa40ea5bc357de005314fd3ff567559ff0b4904a41d15156e16e6b0de6538afd25434eb
+EBUILD gvfs-1.14.2.ebuild 3560 SHA256 f4d970ad84908ed99425282a20eada4d942dd42102390d507ba4323e7636534f SHA512 d38ae7a8aabe9f7ade050777e537014e6a5d2ab84eba769787370852903397b52b793cabcc65b039ca4b7e254b616ba9aeba6d2aeefa6ce642df0d56126ebb21 WHIRLPOOL c261e8f5ecdb1a569b6cd7a8ac4f95708493f5b625973af12c4bb93674d7d43925debcfe01ea3d92ee3047a2684e1c055293845b375e39cbd8fa4269dc07fa91
+MISC ChangeLog 27789 SHA256 5c1c09188f04e9e4d4c620494c542fc4bd21b0472947a89ce496db26e862ebcb SHA512 2b1f2fa9657219cbe756a304c9f138dddd1374f9be8ae2bd4ac991a89a351847174e94a0510b7141f2f29e3a257644c9f3c32b77e935ea253cae86c017c7b7c4 WHIRLPOOL 583a5b4e1a8aca0fa9b4521890499b1d8ab742faddca06d8b07ebd0a3b4bb3815c2686778ead7ecce54b2274e3ddfda80e23130588e9e6d6a51c1097e859ff49
 MISC metadata.xml 1436 SHA256 8abc5f14d4c38e07815876aba0a376bd4c73e308477dd0cb584ec2e0fd3a58f1 SHA512 5c8481499c086482c54d5ccd18ad31f60941298e6329b32a88e909d571df46cadb80ee6c6d890a83b68288806901504287793f68c47970122092a17b8aa59a3b WHIRLPOOL 52c575106ca10f2e10406d669fc7802af23ff6dd055e03751cc9a33ced386291cf6d1865c968536cf50da9e3ccbf9511d6a7fda82ba2ef5888a7d06e0a086096
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNqboACgkQ1fmVwcYIWAYThgCeM/pp6SUFFFyy39HbhD/hi+A6
-5tcAoNTFzj1LQmHhFsJYCyAWte7rlXLh
-=YXwv
+iEYEAREIAAYFAlCusI4ACgkQ1fmVwcYIWAa1pgCfagQAFIyd8zJaYB71BwwnYkRi
+FHgAn2nVDpYTZC8tIaDPkHYvD5lGc5c3
+=ef/S
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/files/gvfs-1.10.1-libimobiledevice-1.1.2.patch b/gnome-base/gvfs/files/gvfs-1.10.1-libimobiledevice-1.1.2.patch
deleted file mode 100644
index ab6b82228b49..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.10.1-libimobiledevice-1.1.2.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 9668b2601e43a7a32471383c63cd3839aa721c51 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 2 Apr 2012 03:15:30 -0400
-Subject: [PATCH] afc: Fix building against libimobiledevice-1.1.2
-
-In 1.1.2, the struct idevice_event_t uuid field was renamed to udid.
-Since libimobiledevice lacks a library version macro, we are forced
-to check for the pkgconfig version in configure.
----
- configure.ac                   |    3 +++
- daemon/gvfsbackendafc.c        |   10 +++++++++-
- monitor/afc/afcvolumemonitor.c |   11 +++++++++--
- 3 files changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e31fb50..081cc09 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -327,6 +327,9 @@ if test "x$enable_afc" != "xno" ; then
-   if test "x$msg_afc" = "xyes"; then
-     PKG_CHECK_MODULES(AFC, libimobiledevice-1.0 libplist)
-     AC_DEFINE(HAVE_AFC, 1, [Define to 1 if AFC is going to be built])
-+    PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.2,
-+                     [AC_DEFINE(HAVE_LIBIMOBILEDEVICE_1_1_2, 1,
-+                                [Define to 1 if libimobiledevice-1.1.2 found])])
-   fi
- fi
- 
-diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
-index ab7094f..a62a197 100644
---- a/daemon/gvfsbackendafc.c
-+++ b/daemon/gvfsbackendafc.c
-@@ -339,11 +339,19 @@ static void
- _idevice_event_cb (const idevice_event_t *event, void *user_data)
- {
-   GVfsBackendAfc *afc_backend = G_VFS_BACKEND_AFC (user_data);
-+  gchar *event_udid;
- 
-   g_return_if_fail (afc_backend->uuid != NULL);
-   if (event->event != IDEVICE_DEVICE_REMOVE)
-     return;
--  if (g_str_equal (event->uuid, afc_backend->uuid) == FALSE)
-+
-+#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
-+  event_udid = event->udid;
-+#else
-+  event_udid = event->uuid;
-+#endif
-+
-+  if (g_str_equal (event_udid, afc_backend->uuid) == FALSE)
-     return;
- 
-   g_print ("Shutting down AFC backend for device uuid %s\n", afc_backend->uuid);
-diff --git a/monitor/afc/afcvolumemonitor.c b/monitor/afc/afcvolumemonitor.c
-index dfc3fa5..9f24753 100644
---- a/monitor/afc/afcvolumemonitor.c
-+++ b/monitor/afc/afcvolumemonitor.c
-@@ -83,15 +83,22 @@ static void
- g_vfs_afc_monitor_idevice_event (const idevice_event_t *event, void *user_data)
- {
-   GVfsAfcVolumeMonitor *self;
-+  gchar *event_udid;
- 
-   g_return_if_fail (event != NULL);
- 
-   self = G_VFS_AFC_VOLUME_MONITOR(user_data);
- 
-+#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
-+  event_udid = event->udid;
-+#else
-+  event_udid = event->uuid;
-+#endif
-+
-   if (event->event == IDEVICE_DEVICE_ADD)
--    g_vfs_afc_monitor_create_volume (self, event->uuid);
-+    g_vfs_afc_monitor_create_volume (self, event_udid);
-   else
--    g_vfs_afc_monitor_remove_volume (self, event->uuid);
-+    g_vfs_afc_monitor_remove_volume (self, event_udid);
- }
- 
- static GObject *
--- 
-1.7.8.5
-
diff --git a/gnome-base/gvfs/files/gvfs-1.10.1-unneeded-include.patch b/gnome-base/gvfs/files/gvfs-1.10.1-unneeded-include.patch
deleted file mode 100644
index 96663e6b04f8..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.10.1-unneeded-include.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 42d800f377dfa4e7338c516d286aef0b76bb1f72 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 13 Oct 2011 18:58:57 -0400
-Subject: [PATCH] Drop an unneeded include
-
-GLib recently became less forgiving about single includes
-like this.
----
- client/gvfsfusedaemon.c |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
-index b41e83b..a4ba32c 100644
---- a/client/gvfsfusedaemon.c
-+++ b/client/gvfsfusedaemon.c
-@@ -41,8 +41,6 @@
- #include <glib/gprintf.h>
- #include <gio/gio.h>
- 
--#include <glib/gurifuncs.h>
--
- /* stuff from common/ */
- #include <gdaemonmount.h>
- #include <gvfsdaemonprotocol.h>
--- 
-1.7.8.4
-
diff --git a/gnome-base/gvfs/files/gvfs-1.12.2-afp-g_clear_object.patch b/gnome-base/gvfs/files/gvfs-1.12.2-afp-g_clear_object.patch
deleted file mode 100644
index 09e11d888545..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.12.2-afp-g_clear_object.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 01161473ed33ee682f340e6f12edcba5334475e0 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 30 Apr 2012 06:09:30 -0400
-Subject: [PATCH] afp: Use g_clear_object properly
-
-g_clear_object expects the address of a pointer. A recent
-change in its definition makes gcc complain about this.
-(cherry picked from commit 7fe5deeae25f2396027f667d8960d2ec84c64716)
----
- daemon/gvfsafpvolume.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/daemon/gvfsafpvolume.c b/daemon/gvfsafpvolume.c
-index 3fd33f2..5207459 100644
---- a/daemon/gvfsafpvolume.c
-+++ b/daemon/gvfsafpvolume.c
-@@ -1082,7 +1082,7 @@ create_directory_get_filedir_parms_cb (GObject *source_object, GAsyncResult *res
-   return;
- 
- error:
--  g_clear_object (info);
-+  g_clear_object (&info);
-   g_simple_async_result_take_error (simple, err);
-   g_simple_async_result_complete (simple);
-   g_object_unref (simple);
-@@ -3033,4 +3033,4 @@ g_vfs_afp_volume_read_from_fork_finish (GVfsAfpVolume  *volume,
-     *bytes_read = g_simple_async_result_get_op_res_gssize (simple);
-   
-   return TRUE;
--}
-\ No newline at end of file
-+}
--- 
-1.7.8.6
-
diff --git a/gnome-base/gvfs/gvfs-1.10.1.ebuild b/gnome-base/gvfs/gvfs-1.10.1.ebuild
deleted file mode 100644
index 02b58562a5c6..000000000000
--- a/gnome-base/gvfs/gvfs-1.10.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild,v 1.17 2012/09/25 11:46:48 tetromino Exp $
-
-EAPI=4
-GCONF_DEBUG=no
-GNOME2_LA_PUNT=yes
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-[[ ${PV} = 9999 ]] && inherit gnome2-live
-
-DESCRIPTION="GNOME Virtual Filesystem Layer"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-	DOCS=""
-else
-	KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
-fi
-
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
-
-IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev"
-
-RDEPEND=">=dev-libs/glib-2.29.14
-	sys-apps/dbus
-	dev-libs/libxml2
-	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2 )
-	archive? ( app-arch/libarchive )
-	avahi? ( >=net-dns/avahi-0.6 )
-	bluetooth? (
-		>=app-mobilephone/obex-data-server-0.4.5
-		dev-libs/dbus-glib
-		net-wireless/bluez
-		dev-libs/expat )
-	bluray? ( media-libs/libbluray )
-	fuse? ( >=sys-fs/fuse-2.8.0 )
-	gdu? ( || (
-		>=gnome-base/libgdu-3.0.2
-		=sys-apps/gnome-disk-utility-3.0.2-r300
-		=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
-	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
-	ios? (
-		>=app-pda/libimobiledevice-1.1.0
-		>=app-pda/libplist-1 )
-	udev? (
-		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
-		|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-164-r2[extras] ) )
-	http? ( >=net-libs/libsoup-gnome-2.26.0 )
-	samba? ( >=net-fs/samba-3.4.6[smbclient] )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-REQUIRED_USE="cdda? ( udev )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-bash-completion
-		--disable-hal
-		--disable-schemas-compile
-		--with-dbus-service-dir=/usr/share/dbus-1/services
-		$(use_enable afp)
-		$(use_enable archive)
-		$(use_enable avahi)
-		$(use_enable bluetooth obexftp)
-		$(use_enable bluray)
-		$(use_enable cdda)
-		$(use_enable fuse)
-		$(use_enable gdu)
-		$(use_enable gphoto2)
-		$(use_enable ios afc)
-		$(use_enable udev)
-		$(use_enable udev gudev)
-		$(use_enable http)
-		$(use_enable gnome-keyring keyring)
-		$(use_enable samba)"
-}
-
-src_prepare() {
-	# Patch from 1.11 for building against glib-2.31, bug #401539
-	epatch "${FILESDIR}/${P}-unneeded-include.patch"
-
-	# Conditional patching purely to avoid eautoreconf
-	use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks.patch
-
-	if use archive; then
-		epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
-		echo mount-archive.desktop.in >> po/POTFILES.in
-		echo mount-archive.desktop.in.in >> po/POTFILES.in
-	fi
-
-	if ! use udev; then
-		sed -i -e 's/gvfsd-burn/ /' daemon/Makefile.am || die
-		sed -i -e 's/burn.mount.in/ /' daemon/Makefile.am || die
-		sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
-	fi
-
-	# bug #410411, https://bugzilla.gnome.org/show_bug.cgi?id=672693
-	use ios && epatch "${FILESDIR}/${PN}-1.10.1-libimobiledevice-1.1.2.patch"
-
-	if use gphoto2 || use archive || ! use udev || use ios; then
-		# libgcrypt.m4 needed for eautoreconf, bug #399043
-		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
-
-		AT_M4DIR=. eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	newbashcomp programs/gvfs-bash-completion.sh ${PN}
-}
diff --git a/gnome-base/gvfs/gvfs-1.12.2-r1.ebuild b/gnome-base/gvfs/gvfs-1.12.2-r1.ebuild
deleted file mode 100644
index e8a457335238..000000000000
--- a/gnome-base/gvfs/gvfs-1.12.2-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.2-r1.ebuild,v 1.2 2012/09/25 11:46:48 tetromino Exp $
-
-EAPI=4
-GCONF_DEBUG=no
-GNOME2_LA_PUNT=yes
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-[[ ${PV} = 9999 ]] && inherit gnome2-live
-
-DESCRIPTION="GNOME Virtual Filesystem Layer"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-	DOCS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
-fi
-
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
-
-IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev udisks"
-
-RDEPEND=">=dev-libs/glib-2.31.0:2
-	sys-apps/dbus
-	dev-libs/libxml2
-	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2 )
-	archive? ( app-arch/libarchive )
-	avahi? ( >=net-dns/avahi-0.6 )
-	bluetooth? (
-		>=app-mobilephone/obex-data-server-0.4.5
-		dev-libs/dbus-glib
-		net-wireless/bluez
-		dev-libs/expat )
-	bluray? ( media-libs/libbluray )
-	fuse? ( >=sys-fs/fuse-2.8.0 )
-	gdu? ( || (
-		>=gnome-base/libgdu-3.0.2
-		=sys-apps/gnome-disk-utility-3.0.2-r300
-		=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
-	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
-	ios? (
-		>=app-pda/libimobiledevice-1.1.0
-		>=app-pda/libplist-1 )
-	udev? (
-		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
-		|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-164-r2[extras] ) )
-	udisks? ( >=sys-fs/udisks-1.90:2 )
-	http? ( >=net-libs/libsoup-gnome-2.26.0 )
-	samba? ( >=net-fs/samba-3.4.6[smbclient] )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-REQUIRED_USE="cdda? ( udev )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-bash-completion
-		--disable-hal
-		--disable-schemas-compile
-		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services
-		$(use_enable afp)
-		$(use_enable archive)
-		$(use_enable avahi)
-		$(use_enable bluetooth obexftp)
-		$(use_enable bluray)
-		$(use_enable cdda)
-		$(use_enable fuse)
-		$(use_enable gdu)
-		$(use_enable gphoto2)
-		$(use_enable ios afc)
-		$(use_enable udev)
-		$(use_enable udev gudev)
-		$(use_enable http)
-		$(use_enable gnome-keyring keyring)
-		$(use_enable samba)
-		$(use_enable udisks udisks2)"
-}
-
-src_prepare() {
-	# bug #414787; in next release
-	epatch "${FILESDIR}/${P}-afp-g_clear_object.patch"
-
-	# Conditional patching purely to avoid eautoreconf
-	use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks.patch
-
-	if use archive; then
-		epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
-		echo mount-archive.desktop.in >> po/POTFILES.in
-		echo mount-archive.desktop.in.in >> po/POTFILES.in
-	fi
-
-	if ! use udev; then
-		sed -i -e 's/gvfsd-burn/ /' daemon/Makefile.am || die
-		sed -i -e 's/burn.mount.in/ /' daemon/Makefile.am || die
-		sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
-	fi
-
-	if use gphoto2 || use archive || ! use udev; then
-		# libgcrypt.m4 needed for eautoreconf, bug #399043
-		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
-
-		AT_M4DIR=. eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	newbashcomp programs/gvfs-bash-completion.sh ${PN}
-}
diff --git a/gnome-base/gvfs/gvfs-1.14.0.ebuild b/gnome-base/gvfs/gvfs-1.14.2.ebuild
index 23577c2d3266..f440181638dd 100644
--- a/gnome-base/gvfs/gvfs-1.14.0.ebuild
+++ b/gnome-base/gvfs/gvfs-1.14.2.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/gvfs/gvfs-1.14.0.ebuild,v 1.1 2012/09/25 11:46:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.14.2.ebuild,v 1.1 2012/11/22 23:09:01 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -72,12 +72,35 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="cdda? ( udev )"
 
-pkg_setup() {
+src_prepare() {
+	if use archive; then
+		epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
+		echo mount-archive.desktop.in >> po/POTFILES.in
+		echo mount-archive.desktop.in.in >> po/POTFILES.in
+	fi
+
+	if ! use udev; then
+		sed -e 's/gvfsd-burn/ /' \
+			-e 's/burn.mount.in/ /' \
+			-e 's/burn.mount/ /' \
+			-i daemon/Makefile.am || die
+	fi
+
+	if use archive || ! use udev; then
+		# libgcrypt.m4 needed for eautoreconf, bug #399043
+		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
+
+		[[ ${PV} = 9999 ]] || AT_M4DIR=. eautoreconf
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
 	# --enable-documentation installs man pages
 	G2CONF="${G2CONF}
 		--disable-bash-completion
 		--disable-hal
-		--disable-schemas-compile
 		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services
 		--enable-documentation
 		$(use_enable afp)
@@ -98,29 +121,7 @@ pkg_setup() {
 		$(use_enable samba)
 		$(use_enable systemd libsystemd-login)
 		$(use_enable udisks udisks2)"
-}
-
-src_prepare() {
-	if use archive; then
-		epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
-		echo mount-archive.desktop.in >> po/POTFILES.in
-		echo mount-archive.desktop.in.in >> po/POTFILES.in
-	fi
-
-	if ! use udev; then
-		sed -i -e 's/gvfsd-burn/ /' daemon/Makefile.am || die
-		sed -i -e 's/burn.mount.in/ /' daemon/Makefile.am || die
-		sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
-	fi
-
-	if use archive || ! use udev; then
-		# libgcrypt.m4 needed for eautoreconf, bug #399043
-		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
-
-		[[ ${PV} = 9999 ]] || AT_M4DIR=. eautoreconf
-	fi
-
-	gnome2_src_prepare
+	gnome2_src_configure
 }
 
 src_install() {