Version bump, use upstream rules to install bach-completion file, 'mtp' needs 'udev' support (#521472 by Christopher Head), drop old.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

11 files changed, 20 insertions, 539 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index fa29ff604d21..67d936d79de5 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.267 2014/08/25 10:58:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.268 2014/09/05 09:57:24 pacho Exp $
+
+*gvfs-1.20.3 (05 Sep 2014)
+
+  05 Sep 2014; Pacho Ramos <pacho@gentoo.org> +gvfs-1.20.3.ebuild,
+  -files/gvfs-1.12.3-gphoto2-2.5-1.patch,
+  -files/gvfs-1.12.3-gphoto2-2.5-2.patch,
+  -files/gvfs-1.12.3-gphoto2-stricter-checks.patch,
+  -files/gvfs-1.12.3-libcdio-0.84.patch, -files/gvfs-1.16.3-emit-signal.patch,
+  -files/gvfs-1.2.2-expose-archive-backend.patch,
+  -files/gvfs-1.2.2-gphoto2-stricter-checks.patch, -gvfs-1.18.3.ebuild,
+  -gvfs-1.20.1.ebuild, metadata.xml:
+  Version bump, use upstream rules to install bach-completion file, 'mtp' needs
+  'udev' support (#521472 by Christopher Head), drop old.
 
   25 Aug 2014; Agostino Sarubbo <ago@gentoo.org> gvfs-1.20.2.ebuild:
   Stable for alpha, wrt bug #512012
diff --git a/gnome-base/gvfs/files/gvfs-1.12.3-gphoto2-2.5-1.patch b/gnome-base/gvfs/files/gvfs-1.12.3-gphoto2-2.5-1.patch
deleted file mode 100644
index f162c98a79a4..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.12.3-gphoto2-2.5-1.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 259a09183f7c96b5fb0f6453bb4b0bcf92e3eaa2 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Wed, 8 Aug 2012 13:14:19 +0200
-Subject: [PATCH] gphoto: build with libgphoto 2.5 API
-
-Patch taken from the Fedora package
-Author: Jindrich Novy <jnovy@redhat.com>
-
-http://pkgs.fedoraproject.org/cgit/gvfs.git/commit/?id=cd0c6218df85bf3de101402c1aa9d79aae7c3019
----
- configure.ac                |  3 +++
- daemon/gvfsbackendgphoto2.c | 12 +++++++++++-
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3215694..3280666 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -436,6 +436,9 @@ if test "x$enable_gphoto2" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev"
-   if test "x$msg_gphoto2" = "xyes"; then
-     if test "x$use_gphoto2" = "xyes"; then
-       AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
-+      PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.5.0,
-+         AC_DEFINE(HAVE_GPHOTO25, 1, [Define to 1 if libgphoto2 2.5 is available])
-+      )
-     else
-       if test "x$enable_gphoto2" = "xyes"; then
-         AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in hal volume monitor.])
-diff --git a/daemon/gvfsbackendgphoto2.c b/daemon/gvfsbackendgphoto2.c
-index 0d2c594..75b4b02 100644
---- a/daemon/gvfsbackendgphoto2.c
-+++ b/daemon/gvfsbackendgphoto2.c
-@@ -1647,7 +1647,9 @@ do_mount (GVfsBackend *backend,
-       return;
-     }
- 
-+#ifndef HAVE_GPHOTO25
-   DEBUG ("  '%s' '%s' '%s'",  info.name, info.path, info.library_filename);
-+#endif
-   
-   /* set port */
-   rc = gp_camera_set_port_info (gphoto2_backend->camera, info);
-@@ -2590,7 +2592,11 @@ do_slow_file_rename_in_same_dir (GVfsBackendGphoto2 *gphoto2_backend,
-         }
-     }
- 
-+#ifdef HAVE_GPHOTO25
-+  rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, new_name, GP_FILE_TYPE_NORMAL, file_dest, gphoto2_backend->context);
-+#else
-   rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, file_dest, gphoto2_backend->context);
-+#endif
-   if (rc != 0)
-     goto out;
- 
-@@ -3222,14 +3228,18 @@ commit_write_handle (GVfsBackendGphoto2 *gphoto2_backend, WriteHandle *write_han
-   if (rc != 0)
-     goto out;
- 
--  gp_file_set_type (file, GP_FILE_TYPE_NORMAL);
-   gp_file_set_name (file, write_handle->name);
-   gp_file_set_mtime (file, time (NULL));
-   gp_file_set_data_and_size (file, 
-                              dup_for_gphoto2 (write_handle->data, write_handle->size), 
-                              write_handle->size);
-   
-+#ifdef HAVE_GPHOTO25
-+  rc = gp_camera_folder_put_file (gphoto2_backend->camera, write_handle->dir, write_handle->name, GP_FILE_TYPE_NORMAL, file, gphoto2_backend->context);
-+#else
-+  gp_file_set_type (file, GP_FILE_TYPE_NORMAL);
-   rc = gp_camera_folder_put_file (gphoto2_backend->camera, write_handle->dir, file, gphoto2_backend->context);
-+#endif
-   if (rc != 0)
-     {
-       gp_file_unref (file);
--- 
-1.7.12
-
diff --git a/gnome-base/gvfs/files/gvfs-1.12.3-gphoto2-2.5-2.patch b/gnome-base/gvfs/files/gvfs-1.12.3-gphoto2-2.5-2.patch
deleted file mode 100644
index 1708b845c8fa..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.12.3-gphoto2-2.5-2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ef1578c9fef421a22c030d728fb5ef77bb7b86f6 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Wed, 8 Aug 2012 15:11:24 +0200
-Subject: [PATCH] gphoto: support 2.5, but do not require it.
-
-Using GPHOTO2 for a 2nd PKG_CHECK_MODULE does not give the expected
-result, as the flag 'FOUND' is already set and the higher version
-requirement will not be honored.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=681448
----
- configure.ac | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c32d425..6ffe06d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -436,8 +436,9 @@ if test "x$enable_gphoto2" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev"
-   if test "x$msg_gphoto2" = "xyes"; then
-     if test "x$use_gphoto2" = "xyes"; then
-       AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
--      PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.5.0,
--         AC_DEFINE(HAVE_GPHOTO25, 1, [Define to 1 if libgphoto2 2.5 is available])
-+      PKG_CHECK_MODULES(GPHOTO25, libgphoto2 >= 2.5.0,
-+         AC_DEFINE(HAVE_GPHOTO25, 1, [Define to 1 if libgphoto2 2.5 is available]),
-+	 []
-       )
-     else
-       if test "x$enable_gphoto2" = "xyes"; then
--- 
-1.7.12
-
diff --git a/gnome-base/gvfs/files/gvfs-1.12.3-gphoto2-stricter-checks.patch b/gnome-base/gvfs/files/gvfs-1.12.3-gphoto2-stricter-checks.patch
deleted file mode 100644
index 329844bc27a2..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.12.3-gphoto2-stricter-checks.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7d0127ee181c0b282b8f99f461d26fce1c3a27b0 Mon Sep 17 00:00:00 2001
-From: Arun Raghavan <arun@accosted.net>
-Date: Mon, 30 Apr 2012 11:15:49 +0100
-Subject: [PATCH] build: Bail if gphoto support is requested but not available
-
-https://bugzilla.gnome.org/show_bug.cgi?id=578027
----
- configure.ac | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e55ab58..91621a9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -402,7 +402,7 @@ GPHOTO2_LIBS=
- GPHOTO2_CFLAGS=
- 
- if test "x$enable_gphoto2" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev" = "xyes" \); then
--  PKG_CHECK_EXISTS(libgphoto2, msg_gphoto2=yes)
-+  PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0, [msg_gphoto2=yes])
- 
-   # Need OS tweaks in hal volume monitor backend
-   case "$host" in
-@@ -414,12 +414,19 @@ if test "x$enable_gphoto2" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev"
-       ;;
-   esac
- 
-+  if test "x$enable_gphoto2" = "xyes" -a "x$msg_gphoto2" != "xyes"; then
-+    AC_MSG_ERROR([gphoto2 support requested but not available])
-+  fi
-+
-   if test "x$msg_gphoto2" = "xyes"; then
-     if test "x$use_gphoto2" = "xyes"; then
--      PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0)
-       AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
-     else
--      AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])
-+      if test "x$enable_gphoto2" = "xyes"; then
-+        AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in hal volume monitor.])
-+      else
-+        AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])
-+      fi
-       msg_gphoto2=no
-     fi
-   fi
--- 
-1.7.12
-
diff --git a/gnome-base/gvfs/files/gvfs-1.12.3-libcdio-0.84.patch b/gnome-base/gvfs/files/gvfs-1.12.3-libcdio-0.84.patch
deleted file mode 100644
index ed0f2a9a85dd..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.12.3-libcdio-0.84.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From e5423da4d7ca010fa3c33736445752ff9e549585 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Tue, 7 Aug 2012 18:10:24 +0200
-Subject: [PATCH] cdda: Support libcdio 0.84 with changed API
-
-following CDIO changeset
-http://git.savannah.gnu.org/gitweb/?p=libcdio.git;a=commitdiff;h=abe5b8429573c9ac796c274c7abe7f76ef52dc76
-
-https://bugzilla.gnome.org/show_bug.cgi?id=678257
-
-[Alexandre Rostovtsev <tetromino@gentoo.org> : cherry-pick for 1.12]
----
- daemon/gvfsbackendcdda.c | 32 +++++++++++++++++++++++++-------
- 1 file changed, 25 insertions(+), 7 deletions(-)
-
-diff --git a/daemon/gvfsbackendcdda.c b/daemon/gvfsbackendcdda.c
-index 6f009c7..1ad4251 100644
---- a/daemon/gvfsbackendcdda.c
-+++ b/daemon/gvfsbackendcdda.c
-@@ -169,11 +169,22 @@ fetch_metadata (GVfsBackendCdda *cdda_backend)
-   if (!cdio)
-     return;
- 
--  cdtext = cdio_get_cdtext(cdio, 0);
-+#if LIBCDIO_VERSION_NUM >= 84
-+  cdtext = cdio_get_cdtext (cdio);
-+#else
-+  cdtext = cdio_get_cdtext (cdio, 0);
-+#endif /* LIBCDIO_VERSION_NUM >= 84 */
-+
-   if (cdtext) {
--    cdda_backend->album_title = g_strdup (cdtext_get (CDTEXT_TITLE, cdtext));
--    cdda_backend->album_artist = g_strdup (cdtext_get (CDTEXT_PERFORMER, cdtext));
--    cdda_backend->genre = g_strdup (cdtext_get (CDTEXT_GENRE, cdtext));
-+#if LIBCDIO_VERSION_NUM >= 84
-+    cdda_backend->album_title = g_strdup (cdtext_get_const (cdtext, CDTEXT_FIELD_TITLE, 0));
-+    cdda_backend->album_artist = g_strdup (cdtext_get_const (cdtext, CDTEXT_FIELD_PERFORMER, 0));
-+    cdda_backend->genre = g_strdup (cdtext_get_const (cdtext, CDTEXT_FIELD_GENRE, 0));
-+#else
-+    cdda_backend->album_title = g_strdup (cdtext_get_const (CDTEXT_TITLE, cdtext));
-+    cdda_backend->album_artist = g_strdup (cdtext_get_const (CDTEXT_PERFORMER, cdtext));
-+    cdda_backend->genre = g_strdup (cdtext_get_const (CDTEXT_GENRE, cdtext));
-+#endif /* LIBCDIO_VERSION_NUM >= 84 */
-   }
- 
-   cdtrack = cdio_get_first_track_num(cdio);
-@@ -182,10 +193,17 @@ fetch_metadata (GVfsBackendCdda *cdda_backend)
-   for ( ; cdtrack < last_cdtrack; cdtrack++ ) {
-     GVfsBackendCddaTrack *track;
-     track = g_new0 (GVfsBackendCddaTrack, 1);
--    cdtext = cdio_get_cdtext(cdio, cdtrack);
-+#if LIBCDIO_VERSION_NUM < 84
-+    cdtext = cdio_get_cdtext (cdio, cdtrack);
-+#endif /* LIBCDIO_VERSION_NUM < 84 */
-     if (cdtext) {
--      track->title = g_strdup (cdtext_get (CDTEXT_TITLE, cdtext));
--      track->artist = g_strdup (cdtext_get (CDTEXT_PERFORMER, cdtext));
-+#if LIBCDIO_VERSION_NUM >= 84
-+      track->title = g_strdup (cdtext_get_const (cdtext, CDTEXT_FIELD_TITLE, cdtrack));
-+      track->artist = g_strdup (cdtext_get_const (cdtext, CDTEXT_FIELD_PERFORMER, cdtrack));
-+#else
-+      track->title = g_strdup (cdtext_get_const (CDTEXT_TITLE, cdtext));
-+      track->artist = g_strdup (cdtext_get_const (CDTEXT_PERFORMER, cdtext);
-+#endif /* LIBCDIO_VERSION_NUM >= 84 */
-     }
-     track->duration = cdio_get_track_sec_count (cdio, cdtrack) / CDIO_CD_FRAMES_PER_SEC;
- 
--- 
-1.9.1
-
diff --git a/gnome-base/gvfs/files/gvfs-1.16.3-emit-signal.patch b/gnome-base/gvfs/files/gvfs-1.16.3-emit-signal.patch
deleted file mode 100644
index 6f8deb321456..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.16.3-emit-signal.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From bdc3babbe21e5fed06876db4d56d1b13915fe1cb Mon Sep 17 00:00:00 2001
-From: Ross Lagerwall <rosslagerwall@gmail.com>
-Date: Sat, 21 Sep 2013 20:22:27 +0000
-Subject: daemon: Emit signal before returning dbus value
-
-In gvfsjobopenforread.c, the dbus method returns a value in create_reply
-which eventually results in a GVfsJobRead job to be sent to the backend.
-This could happen before the "new-source" signal is emitted.  If this
-happens, the job is not queued because the "new_job" signal would not
-have been connected to a job source yet.  The read then hangs because
-the GVfsJobRead is lost.
-
-This is hit often when performing large smb transfers (see
-https://bugzilla.gnome.org/show_bug.cgi?id=697782 and
-https://bugs.launchpad.net/ubuntu/+source/gvfs/+bug/1075923).
-It can be reproduced by putting a small sleep before the
-g_signal_emit_by_name call.
-
-Fix this by emitting the "new-source" signal *before* the dbus method
-value is returned.  This ensures that the "new_job" signal is set up
-before any further jobs are sent.
-
-Note that the same problem and solution applies for
-gvfsjobopenforwrite.c.
----
-diff --git a/daemon/gvfsjobopenforread.c b/daemon/gvfsjobopenforread.c
-index d978136..41b5f34 100644
---- a/daemon/gvfsjobopenforread.c
-+++ b/daemon/gvfsjobopenforread.c
-@@ -194,6 +194,12 @@ create_reply (GVfsJob *job,
-       g_error_free (error);
-     }
- 
-+  g_vfs_channel_set_backend_handle (G_VFS_CHANNEL (channel), open_job->backend_handle);
-+  open_job->backend_handle = NULL;
-+  open_job->read_channel = channel;
-+
-+  g_signal_emit_by_name (job, "new-source", channel);
-+
-   if (open_job->read_icon)
-     gvfs_dbus_mount_complete_open_icon_for_read (object, invocation,
-                                                  fd_list, g_variant_new_handle (fd_id),
-@@ -206,12 +212,6 @@ create_reply (GVfsJob *job,
-   /* FIXME: this could cause issues as long as fd_list closes all its fd's when it's finalized */
-   close (remote_fd);
-   g_object_unref (fd_list);
--  
--  g_vfs_channel_set_backend_handle (G_VFS_CHANNEL (channel), open_job->backend_handle);
--  open_job->backend_handle = NULL;
--  open_job->read_channel = channel;
--
--  g_signal_emit_by_name (job, "new-source", open_job->read_channel);
- }
- 
- static void
-diff --git a/daemon/gvfsjobopenforwrite.c b/daemon/gvfsjobopenforwrite.c
-index a63e9cd..429e267 100644
---- a/daemon/gvfsjobopenforwrite.c
-+++ b/daemon/gvfsjobopenforwrite.c
-@@ -278,6 +278,12 @@ create_reply (GVfsJob *job,
-       g_error_free (error);
-     }
- 
-+  g_vfs_channel_set_backend_handle (G_VFS_CHANNEL (channel), open_job->backend_handle);
-+  open_job->backend_handle = NULL;
-+  open_job->write_channel = channel;
-+
-+  g_signal_emit_by_name (job, "new-source", open_job->write_channel);
-+
-   gvfs_dbus_mount_complete_open_for_write (object, invocation,
-                                            fd_list, g_variant_new_handle (fd_id),
-                                            open_job->can_seek,
-@@ -285,12 +291,6 @@ create_reply (GVfsJob *job,
-   
-   close (remote_fd);
-   g_object_unref (fd_list);
--
--  g_vfs_channel_set_backend_handle (G_VFS_CHANNEL (channel), open_job->backend_handle);
--  open_job->backend_handle = NULL;
--  open_job->write_channel = channel;
--
--  g_signal_emit_by_name (job, "new-source", open_job->write_channel);
- }
- 
- static void
---
-cgit v0.9.2
diff --git a/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch b/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch
deleted file mode 100644
index 86222e5451f0..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Upstream bug: http://bugzilla.gnome.org/show_bug.cgi?id=567235 (Fedora)
-Our bug: http://bugs.gentoo.org/show_bug.cgi?id=249829
-----
-Index: mount-archive.desktop.in.in
-===================================================================
---- mount-archive.desktop.in.in	(revision 0)
-+++ mount-archive.desktop.in.in	(revision 0)
-@@ -0,0 +1,14 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+_Name=Archive Mounter
-+Exec=@libexecdir@/gvfsd-archive file=%u
-+X-Gnome-Vfs-System=gio
-+MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;application/zip;application/x-lzma-compressed-tar;
-+Terminal=false
-+StartupNotify=false
-+Type=Application
-+NoDisplay=true
-+X-GNOME-Bugzilla-Bugzilla=GNOME
-+X-GNOME-Bugzilla-Product=gvfs
-+X-GNOME-Bugzilla-Component=archive-backend
-+X-GNOME-Bugzilla-Version=@VERSION@
-Index: Makefile.am
-===================================================================
---- Makefile.am.orig	2008-07-22 15:35:49.000000000 +0200
-+++ Makefile.am	2008-07-22 17:56:59.417180064 +0200
-@@ -1,5 +1,20 @@
- NULL =
- 
-+@INTLTOOL_DESKTOP_RULE@
-+
-+desktop_in_files = mount-archive.desktop.in
-+
-+mount-archive.desktop.in: mount-archive.desktop.in.in
-+	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-+
-+desktopdir       = $(datadir)/applications
-+if HAVE_ARCHIVE
-+desktop_DATA     = mount-archive.desktop
-+else
-+desktop_DATA     = 
-+endif	
-+
-+
- SUBDIRS = \
- 	common \
- 	client \
-@@ -15,6 +30,8 @@
- 
- EXTRA_DIST = \
- 	MAINTAINERS		\
-+	mount-archive.desktop.in.in \
-+	$(desktop_in_files)     \
- 	$(NULL)
- 
- DISTCLEANFILES = \
diff --git a/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch b/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch
deleted file mode 100644
index 78fecb7cd618..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Gentoo bug 264941
-Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=578027
----
-diff -urNp gvfs-1.2.2/configure.ac gvfs-1.2.2-new/configure.ac
---- gvfs-1.2.2/configure.ac	2009-04-03 13:00:54.000000000 +0530
-+++ gvfs-1.2.2-new/configure.ac	2009-05-04 22:53:24.000000000 +0530
-@@ -307,12 +307,20 @@ if test "x$enable_gphoto2" != "xno" -a "
-       ;;
-   esac
- 
-+  if test "x$enable_gphoto2" = "xyes" -a "x$msg_gphoto2" != "xyes"; then
-+    AC_MSG_ERROR([gphoto2 support requested but not available])
-+  fi
-+
-   if test "x$msg_gphoto2" = "xyes"; then
-     if test "x$use_gphoto2" = "xyes"; then
-       PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0)
-       AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
-     else
--      AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])
-+      if test "x$enable_gphoto2" = "xyes"; then
-+        AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in hal volume monitor.])
-+      else
-+        AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])
-+      fi
-       msg_gphoto2=no
-     fi
-   fi
diff --git a/gnome-base/gvfs/gvfs-1.18.3.ebuild b/gnome-base/gvfs/gvfs-1.18.3.ebuild
deleted file mode 100644
index c563dbf5420f..000000000000
--- a/gnome-base/gvfs/gvfs-1.18.3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.18.3.ebuild,v 1.13 2014/07/24 18:14:19 ssuominen Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://git.gnome.org/browse/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive avahi bluetooth bluray cdda fuse gdu gnome-online-accounts gphoto2 gtk +http ios libsecret mtp samba systemd test +udev udisks"
-REQUIRED_USE="
-	cdda? ( udev )
-	udisks? ( udev )
-	systemd? ( udisks )
-"
-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"
-
-# Can use libgphoto-2.5.0 as well. Automagic detection.
-RDEPEND="
-	>=dev-libs/glib-2.37:2
-	sys-apps/dbus
-	dev-libs/libxml2:2
-	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	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-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
-	gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	http? ( >=net-libs/libsoup-gnome-2.34:2.4 )
-	ios? (
-		>=app-pda/libimobiledevice-1.1.5:=
-		>=app-pda/libplist-1:= )
-	libsecret? ( app-crypt/libsecret )
-	mtp? ( >=media-libs/libmtp-1.1.6 )
-	samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
-	systemd? ( sys-apps/systemd:0= )
-	udev? (
-		cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
-		virtual/libgudev:=
-		virtual/libudev:= )
-	udisks? ( >=sys-fs/udisks-1.97:2 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	test? (
-		>=dev-python/twisted-core-12.3.0
-		|| (
-			net-analyzer/netcat
-			net-analyzer/netcat6 ) )
-	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
-"
-# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
-# test dependencies needed per https://bugzilla.gnome.org/700162
-
-# Tests with multiple failures, this is being handled upstream at:
-# https://bugzilla.gnome.org/700162
-RESTRICT="test"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
-
-	if ! use udev; then
-		sed -e 's/gvfsd-burn/ /' \
-			-e 's/burn.mount.in/ /' \
-			-e 's/burn.mount/ /' \
-			-i daemon/Makefile.am || die
-
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-documentation installs man pages
-	gnome2_src_configure \
-		--disable-bash-completion \
-		--disable-hal \
-		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
-		--enable-documentation \
-		$(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 gnome-online-accounts goa) \
-		$(use_enable gphoto2) \
-		$(use_enable gtk) \
-		$(use_enable ios afc) \
-		$(use_enable mtp libmtp) \
-		$(use_enable udev) \
-		$(use_enable udev gudev) \
-		$(use_enable http) \
-		$(use_enable libsecret keyring) \
-		$(use_enable samba) \
-		$(use_enable systemd libsystemd-login) \
-		$(use_enable udisks udisks2)
-}
-
-src_install() {
-	gnome2_src_install
-	dobashcomp programs/completion/gvfs
-}
diff --git a/gnome-base/gvfs/gvfs-1.20.1.ebuild b/gnome-base/gvfs/gvfs-1.20.3.ebuild
index 8f5102683d09..f3171a325393 100644
--- a/gnome-base/gvfs/gvfs-1.20.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.20.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.20.1.ebuild,v 1.3 2014/07/24 18:14:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.20.3.ebuild,v 1.1 2014/09/05 09:57:24 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -17,6 +17,7 @@ SLOT="0"
 IUSE="afp archive avahi bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios libsecret mtp samba systemd test +udev udisks"
 REQUIRED_USE="
 	cdda? ( udev )
+	mtp? ( udev )
 	udisks? ( udev )
 	systemd? ( udisks )
 "
@@ -72,6 +73,8 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 src_prepare() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
+
 	if ! use udev; then
 		sed -e 's/gvfsd-burn/ /' \
 			-e 's/burn.mount.in/ /' \
@@ -88,7 +91,8 @@ src_configure() {
 	# --enable-documentation installs man pages
 	# --disable-obexftp, upstream bug #729945
 	gnome2_src_configure \
-		--disable-bash-completion \
+		--enable-bash-completion \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
 		--disable-gdu \
 		--disable-hal \
 		--disable-obexftp \
@@ -113,9 +117,3 @@ src_configure() {
 		$(use_enable systemd libsystemd-login) \
 		$(use_enable udisks udisks2)
 }
-
-src_install() {
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
-	gnome2_src_install
-	dobashcomp programs/completion/gvfs
-}
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index 00b7676269d8..0e94e8959b13 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -14,7 +14,6 @@ applications not using gio to access the gvfs filesystems.
 	<flag name='archive'>Enables support for accessing files in archives transparently via <pkg>app-arch/libarchive</pkg></flag>
 	<flag name='bluray'>Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg></flag>
 	<flag name='fuse'>Enables fuse mount points in $HOME/.gvfs for legacy application access</flag>
-	<flag name='gdu'>Enable <pkg>sys-apps/gnome-disk-utility</pkg> integration (DEPRECATED, use USE flag "udisks" instead)</flag>
 	<flag name='gnome-online-accounts'>Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
 	<flag name='http'>Enable the HTTP/DAV backend using <pkg>net-libs/libsoup-gnome</pkg></flag>
 	<flag name='libsecret'>Enable <pkg>app-crypt/libsecret</pkg> support to store login credentials.</flag>