Fix building with libgphoto2-2.5 (bug #427580, thanks to Diego Elio Pettenò).

(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

5 files changed, 171 insertions, 717 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 28615efc21c7..ab2192e5b6eb 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,718 +1,11 @@
 # 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.181 2012/05/29 16:19:05 aballier Exp $
-
-  29 May 2012; Alexis Ballier <aballier@gentoo.org> gvfs-1.12.3.ebuild:
-  keyword ~amd64-fbsd
-
-*gvfs-1.12.3 (17 May 2012)
-
-  17 May 2012; Samuli Suominen <ssuominen@gentoo.org> +gvfs-1.12.3.ebuild:
-  Version bump.
-
-*gvfs-1.12.2-r1 (10 May 2012)
-
-  10 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -gvfs-1.12.1.ebuild,
-  +gvfs-1.12.2-r1.ebuild, +files/gvfs-1.12.2-afp-g_clear_object.patch:
-  Fix failure with USE=afp and glib-2.32.2 (bug #414787, thanks to Randy
-  Tupas). Drop old.
-
-  08 May 2012; Jeremy Olexa <darkside@gentoo.org> gvfs-1.12.2.ebuild:
-  Add prefix keywords and specify dbus-service-dir, no changes for Gentoo Linux
-  users
-
-  05 May 2012; Jeff Horelick <jdhore@gentoo.org> gvfs-1.10.1.ebuild,
-  gvfs-1.12.1.ebuild, gvfs-1.12.2.ebuild:
-  dev-util/pkgconfig -> virtual/pkgconfig
-
-*gvfs-1.12.2 (29 Apr 2012)
-
-  29 Apr 2012; Pacho Ramos <pacho@gentoo.org> +gvfs-1.12.2.ebuild,
-  -files/gvfs-1.12.0-afp-gcc-4.5.patch, -gvfs-1.12.0.ebuild:
-  Version bump, remove old.
-
-  24 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.10.1.ebuild,
-  gvfs-1.12.0.ebuild, gvfs-1.12.1.ebuild:
-  Make udev USE flag control everything udev-related to fix gvfs on bsd (bug
-  #413303, thanks to Alexis Ballier).
-
-*gvfs-1.12.1 (21 Apr 2012)
-
-  21 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> +gvfs-1.12.1.ebuild:
-  Version bump, fixes bugs in udisks and gphoto2 backends.
-
-  13 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.12.0.ebuild,
-  +files/gvfs-1.12.0-afp-gcc-4.5.patch:
-  Fix building with gcc-4.5 and USE="afp", thanks to Travis Glenn Hansen for
-  reporting.
-
-  12 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.10.1.ebuild,
-  gvfs-1.12.0.ebuild:
-  Optionally depend on new split libgdu package if USE=gdu.
-
-  02 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.10.1.ebuild,
-  +files/gvfs-1.10.1-libimobiledevice-1.1.2.patch, gvfs-1.12.0.ebuild:
-  Fix building against >=libimobiledevice-1.1.2 (bug #410411, thanks to Leo
-  Laursen for reporting).
-
-*gvfs-1.12.0 (28 Mar 2012)
-
-  28 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  -gvfs-1.6.7-r1.ebuild, -files/gvfs-1.6.7-fix-renaming.patch,
-  +gvfs-1.12.0.ebuild, metadata.xml:
-  Version bump, supports using udisks instead of gnome-disk-utility for volume
-  monitoring. Drop old.
-
-  25 Mar 2012; Raúl Porcel <armin76@gentoo.org> gvfs-1.10.1.ebuild:
-  alpha/ia64/sh/sparc stable wrt #393007
-
-  05 Mar 2012; Brent Baude <ranger@gentoo.org> gvfs-1.10.1.ebuild:
-  Marking gvfs-1.10.1 ppc stable for bug 393007
-
-  05 Mar 2012; Brent Baude <ranger@gentoo.org> gvfs-1.10.1.ebuild:
-  Marking gvfs-1.10.1 ppc64 stable for bug 393007
-
-  30 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.10.1.ebuild,
-  +files/gvfs-1.10.1-unneeded-include.patch:
-  Add patch from 1.11.x to fix building against >=glib-2.31 (bug #401539,
-  thanks to Rolf S. Arvidson for reporting).
-
-  18 Jan 2012; Markus Meier <maekke@gentoo.org> gvfs-1.10.1.ebuild:
-  arm stable, bug #393007
-
-  18 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.10.1.ebuild:
-  Ship libgcrypt.m4 to allow eautoreconf without libgcrypt installed (bug
-  #399043, thanks to Christopher Head for reporting). Also, move
-  gnome2_src_prepare after the eautoreconf.
-
-  14 Jan 2012; Markus Meier <maekke@gentoo.org> gvfs-1.10.1.ebuild:
-  x86 stable, bug #393007
-
-  29 Dec 2011; Pacho Ramos <pacho@gentoo.org> gvfs-1.10.1.ebuild:
-  amd64 stable, bug 393007
-
-  19 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> metadata.xml:
-  Document USE=gnome; thanks to Fabian Köster <f.koester@tarent.de> for the
-  suggestion (bug #390907).
-
-  30 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -gvfs-1.6.7.ebuild:
-  old
-
-  30 Oct 2011; Raúl Porcel <armin76@gentoo.org> gvfs-1.6.7-r1.ebuild:
-  alpha/ia64/sh/sparc stable wrt #385699
-
-  28 Oct 2011; Markus Meier <maekke@gentoo.org> gvfs-1.6.7-r1.ebuild:
-  arm stable, bug #385699
-
-  26 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> gvfs-1.10.1.ebuild:
-  Remove "prefix" from IUSE since according to Jeremy Olexa it isn't required.
-
-  21 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> gvfs-1.6.7-r1.ebuild:
-  x86 stable wrt bug #385699
-
-  19 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.10.1.ebuild,
-  metadata.xml:
-  Rename "crypt" USE flag to a more descriptive "afp", and document what the
-  flag does. Acked by ssuominen.
-
-  17 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> gvfs-1.6.7-r1.ebuild,
-  gvfs-1.10.1.ebuild:
-  Remove old net-fs/samba from depend.
-
-  17 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -gvfs-1.8.2-r1.ebuild,
-  -gvfs-1.10.0.ebuild:
-  old
-
-*gvfs-1.10.1 (17 Oct 2011)
-
-  17 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> +gvfs-1.10.1.ebuild:
-  Version bump.
-
-  16 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> gvfs-1.6.7-r1.ebuild:
-  ppc/ppc64 stable wrt #385699
-
-*gvfs-1.10.0 (16 Oct 2011)
-
-  16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> +gvfs-1.10.0.ebuild:
-  Version bump (also incorporating changeset from gnome-overlay)
-
-  14 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> gvfs-1.6.7-r1.ebuild:
-  amd64 stable wrt #385699
-
-  10 Oct 2011; Pacho Ramos <pacho@gentoo.org> gvfs-1.6.7-r1.ebuild,
-  gvfs-1.8.2-r1.ebuild:
-  Drop .la files, bug #386665 by Ago. Bump to eapi4.
-
-*gvfs-1.8.2-r1 (14 Aug 2011)
-
-  14 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +gvfs-1.8.2-r1.ebuild:
-  Bump to 1.8.2, from gnome overlay for GNOME 3
-
-  11 Jul 2011; Matt Turner <mattst88@gentoo.org> gvfs-1.6.7-r1.ebuild:
-  Added ~mips, bug 269287
-
-*gvfs-1.6.7-r1 (27 Jun 2011)
-
-  27 Jun 2011; Pacho Ramos <pacho@gentoo.org> +gvfs-1.6.7-r1.ebuild,
-  +files/gvfs-1.6.7-fix-renaming.patch:
-  Apply patch fixing renaming issues with afc backend, allow to build without
-  udev on prefix (bug #293480 by Rabbe Fogelholm).
-
-  09 Jun 2011; Sebastian Pipping <sping@gentoo.org> gvfs-1.6.7.ebuild:
-  Add >=sys-fs/udev-171[gudev] as an alternative dependency to
-  >=sys-fs/udev-145[extras] (bug #370353)
-
-  30 Apr 2011; Raúl Porcel <armin76@gentoo.org> gvfs-1.6.7.ebuild:
-  alpha/arm/ia64/sh/sparc stable wrt #364973
-
-  28 Apr 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> gvfs-1.6.7.ebuild:
-  x86 stable wrt security bug #364973
-
-  26 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> gvfs-1.6.7.ebuild:
-  ppc/ppc64 stable wrt #363789
-
-  16 Apr 2011; Christoph Mende <angelos@gentoo.org> gvfs-1.6.7.ebuild:
-  Stable on amd64 wrt bug #363789
-
-  29 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
-  "ios" is now global USE flag.
-
-  29 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> gvfs-1.6.7.ebuild:
-  Remove sys-apps/hal support wrt #313389.
-
-  28 Mar 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
-  Make ios USE description understandable without using google
-
-  27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
-  Move USE="hal" description here from use.desc.
-
-  27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> gvfs-1.6.6-r1.ebuild,
-  gvfs-1.6.7.ebuild, metadata.xml:
-  Rename USE="iphone" to USE="ios" wrt #344763.
-
-  22 Mar 2011; Brent Baude <ranger@gentoo.org> gvfs-1.6.6-r1.ebuild:
-  Marking gvfs-1.6.6-r1 ppc stable for bug 353436
-
-*gvfs-1.6.7 (22 Mar 2011)
-
-  22 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +gvfs-1.6.7.ebuild:
-  Bump to 1.6.7
-
-  21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> gvfs-1.6.6-r1.ebuild:
-  ppc64 stable wrt #353436
-
-  25 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org> gvfs-1.6.6-r1.ebuild:
-  Fix build with >=glib-2.27, bug #346055.
-
-  30 Jan 2011; Raúl Porcel <armin76@gentoo.org> gvfs-1.6.6-r1.ebuild:
-  alpha/arm/ia64/sh/sparc stable wrt #348987
-
-  19 Jan 2011; Markos Chandras <hwoarang@gentoo.org> gvfs-1.6.6-r1.ebuild:
-  Stable on amd64 wrt bug #348987
-
-  18 Jan 2011; Christian Faulhammer <fauli@gentoo.org> gvfs-1.6.6-r1.ebuild:
-  x86 stable, bug 348987
-
-  17 Jan 2011; <xarth@gentoo.org> gvfs-1.6.4-r2.ebuild:
-  ppc stable wrt #346687
-
-*gvfs-1.6.6-r1 (04 Jan 2011)
-
-  04 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> +gvfs-1.6.6-r1.ebuild:
-  Enable hal support only if udev support is disabled.
-
-  27 Dec 2010; Brent Baude <ranger@gentoo.org> gvfs-1.6.4-r2.ebuild:
-  Marking gvfs-1.6.4-r2 ppc64 for bug 346687
-
-  04 Dec 2010; Raúl Porcel <armin76@gentoo.org> gvfs-1.6.4-r2.ebuild:
-  alpha/ia64/sh/sparc stable wrt #346687
-
-  28 Nov 2010; Markus Meier <maekke@gentoo.org> gvfs-1.6.4-r2.ebuild:
-  x86 stable, bug #346687
-
-  28 Nov 2010; Markos Chandras <hwoarang@gentoo.org> gvfs-1.6.4-r2.ebuild:
-  Stable on amd64 wrt bug #346687
-
-  27 Nov 2010; Markus Meier <maekke@gentoo.org> gvfs-1.6.4-r2.ebuild:
-  arm stable, bug #346687
-
-*gvfs-1.6.6 (18 Nov 2010)
-
-  18 Nov 2010; Pacho Ramos <pacho@gentoo.org> +gvfs-1.6.6.ebuild:
-  Version bump with upstream fixes.
-
-*gvfs-1.6.4-r2 (08 Nov 2010)
-
-  08 Nov 2010; Daniel Gryniewicz <dang@gentoo.org> +gvfs-1.6.4-r2.ebuild,
-  +files/gvfs-1.6.4-O_TRUNC-fix.patch:
-  Fix file truncation on open; bug #344079
-
-  24 Oct 2010; Pacho Ramos <pacho@gentoo.org> -gvfs-1.2.3.ebuild,
-  -gvfs-1.4.3-r1.ebuild:
-  Remove old.
-
-  17 Oct 2010; Raúl Porcel <armin76@gentoo.org> gvfs-1.6.3.ebuild:
-  alpha/ia64/sh/sparc stable wrt #324077
-
-  14 Oct 2010; Markus Meier <maekke@gentoo.org> gvfs-1.6.3.ebuild:
-  arm stable, bug #324077
-
-  07 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> gvfs-1.6.3.ebuild:
-  ppc64 stable wrt #324077
-
-*gvfs-1.6.4-r1 (05 Oct 2010)
-
-  05 Oct 2010; Pacho Ramos <pacho@gentoo.org> -gvfs-1.6.4.ebuild,
-  +gvfs-1.6.4-r1.ebuild, +files/gvfs-1.6.4-sftp-timeout.patch:
-  Revision bump to fix timeouts with sftp due bug #339695 (reported by onip)
-  using upstream patch. Remove broken version.
-
-*gvfs-1.6.4 (27 Sep 2010)
-
-  27 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> +gvfs-1.6.4.ebuild:
-  Version bump. sftp: fix for openssh 5.6, bug #335316. iphone: support for
-  iOS4. smb: move around gconf code. Lots of translation updates.
-
-  11 Sep 2010; Joseph Jezak <josejx@gentoo.org> gvfs-1.6.3.ebuild:
-  Marked ppc for bug #324077.
-
-  29 Aug 2010; Raúl Porcel <armin76@gentoo.org> gvfs-1.4.3-r1.ebuild:
-  arm stable
-
-  19 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org> gvfs-1.6.3.ebuild:
-  Raise gnome-disk-utility dependency per configure.
-
-  14 Aug 2010; Raúl Porcel <armin76@gentoo.org> gvfs-1.4.3-r1.ebuild:
-  alpha/ia64/sh/sparc stable wrt #314899
-
-  01 Aug 2010; Christian Faulhammer <fauli@gentoo.org> gvfs-1.6.3.ebuild:
-  x86 stable, bug 324077
-
-  31 Jul 2010; Pacho Ramos <pacho@gentoo.org> gvfs-1.6.3.ebuild:
-  amd64 stable, bug 324077
-
-  19 Jul 2010; Jeroen Roovers <jer@gentoo.org> gvfs-1.2.3.ebuild:
-  Drop HPPA keywording (bug #324511).
-
-*gvfs-1.6.3 (13 Jul 2010)
-
-  13 Jul 2010; Pacho Ramos <pacho@gentoo.org> -gvfs-1.6.2-r1.ebuild,
-  -files/gvfs-1.6.2-afc-depend.patch, -files/gvfs-1.6.2-afc-semicolon.patch,
-  +gvfs-1.6.3.ebuild:
-  Version bump with bugfixes and translation updates, remove old.
-
-*gvfs-1.6.2-r1 (08 Jul 2010)
-
-  08 Jul 2010; Pacho Ramos <pacho@gentoo.org> -gvfs-1.6.2.ebuild,
-  +gvfs-1.6.2-r1.ebuild, metadata.xml:
-  Stop automagic afc support (bug #314161 by Marc-Antoine Perenno). Remove
-  old to make all people run proper ebuild.
-
-  06 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> gvfs-1.4.3-r1.ebuild:
-  Keyword ~ppc64 wrt #313563
-
-*gvfs-1.6.2 (13 Jun 2010)
-
-  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> +gvfs-1.6.2.ebuild,
-  +files/gvfs-1.6.2-afc-depend.patch, +files/gvfs-1.6.2-afc-semicolon.patch:
-  Add new version for Gnome 2.30.
-
-  04 Jun 2010; Markus Meier <maekke@gentoo.org> gvfs-1.4.3-r1.ebuild:
-  x86 stable, bug #314899
-
-  22 May 2010; Raúl Porcel <armin76@gentoo.org> gvfs-1.4.3-r1.ebuild:
-  Add ~alpha/~ia64/~sparc wrt #313563
-
-  05 May 2010; Pacho Ramos <pacho@gentoo.org> gvfs-1.4.3-r1.ebuild:
-  amd64 stable, bug #314899
-
-*gvfs-1.4.3-r1 (05 May 2010)
-
-  05 May 2010; Pacho Ramos <pacho@gentoo.org> -gvfs-1.4.3.ebuild,
-  +gvfs-1.4.3-r1.ebuild:
-  Revision bump to fix translation due broken intltoolize file (bug #318561,
-  thanks a lot to Jeremy Guitton for reporting the problem). Remove broken
-  version.
-
-  03 May 2010; Olivier Crête <tester@gentoo.org> gvfs-1.4.3.ebuild:
-  amd64 stable, bug #314899
-
-  07 Apr 2010; Patrick Lauer <patrick@gentoo.org> gvfs-1.4.3.ebuild:
-  Fixing samba deps
-
-  03 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org> gvfs-1.4.3.ebuild,
-  metadata.xml:
-  Make http backend optional so people can avoid pulling in gnome deps,
-  fixes bug 271511
-
-  24 Feb 2010; Gilles Dartiguelongue <eva@gentoo.org> -gvfs-1.0.3-r2.ebuild,
-  -gvfs-1.0.3-r13.ebuild, -files/gvfs-1.0.3-bluez4-debug.patch,
-  -files/gvfs-1.0.3-bluez4.patch,
-  -files/gvfs-1.0.3-gmountspec-SIGSEGV.patch,
-  -files/gvfs-1.0.3-http-leak.patch, -files/gvfs-1.0.3-obexftp-icon.patch,
-  -files/gvfs-1.0.3-posixtest.patch, -gvfs-1.4.2.ebuild:
-  Clean up old revisions.
-
-  19 Feb 2010; Pacho Ramos <pacho@gentoo.org> gvfs-1.4.2.ebuild,
-  gvfs-1.4.3.ebuild:
-  app-mobilephone/obex-data-server is required by obexftp backend
-
-  16 Jan 2010; Raúl Porcel <armin76@gentoo.org> gvfs-1.2.3.ebuild:
-  sh stable
-
-  14 Jan 2010; Jeroen Roovers <jer@gentoo.org> gvfs-1.2.3.ebuild:
-  Stable for HPPA (bug #281427).
-
-  12 Jan 2010; Patrick Lauer <patrick@gentoo.org> gvfs-1.4.2.ebuild,
-  gvfs-1.4.3.ebuild:
-  Fixing samba deps for new split samba, fixes #300130
-
-  27 Dec 2009; Nirbheek Chauhan <nirbheek@gentoo.org> gvfs-1.4.3.ebuild:
-  Add note about having to restart the session; causes crashing sometimes;
-  bug 296822
-
-*gvfs-1.4.3 (21 Dec 2009)
-
-  21 Dec 2009; Gilles Dartiguelongue <eva@gentoo.org> -gvfs-1.4.1.ebuild,
-  +gvfs-1.4.3.ebuild:
-  Version bump. smb, ftp and gdu fixes. Plug in a leak in metadata handling.
-
-*gvfs-1.4.2 (13 Dec 2009)
-
-  13 Dec 2009; Nirbheek Chauhan <nirbheek@gentoo.org> +gvfs-1.4.2.ebuild:
-  Bump to 1.4.2 -- 4 bugfixes; 2 minor features
-
-  03 Dec 2009; Brent Baude <ranger@gentoo.org> gvfs-1.2.3.ebuild:
-  Marking gvfs-1.2.3 ppc64 stable for bug 281427
-
-  28 Nov 2009; Raúl Porcel <armin76@gentoo.org> gvfs-1.2.3.ebuild:
-  alpha/ia64/sparc stable wrt #281427
-
-  05 Nov 2009; Markus Meier <maekke@gentoo.org> gvfs-1.2.3.ebuild:
-  arm stable, bug #281427
-
-  30 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org> gvfs-1.4.1.ebuild:
-  Rename all references to gudev to udev, bug #291086.
-
-*gvfs-1.4.1 (29 Oct 2009)
-
-  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org> -gvfs-1.2.2.ebuild,
-  +gvfs-1.4.1.ebuild, metadata.xml:
-  New version for GNOME 2.28. Clean up old revision.
-
-  24 Oct 2009; nixnut <nixnut@gentoo.org> gvfs-1.2.3.ebuild:
-  ppc stable #281427
-
-  24 Oct 2009; nixnut <nixnut@gentoo.org> gvfs-1.0.3-r13.ebuild:
-  ppc stable #284661
-
-  16 Oct 2009; Markus Meier <maekke@gentoo.org> gvfs-1.2.3.ebuild:
-  x86 stable, bug #281427
-
-  11 Oct 2009; Markus Meier <maekke@gentoo.org> gvfs-1.0.3-r13.ebuild:
-  x86 stable, bug #284661
-
-  11 Oct 2009; Markus Meier <maekke@gentoo.org> gvfs-1.0.3-r13.ebuild:
-  arm stable, bug #284661
-
-  08 Oct 2009; Olivier Crête <tester@gentoo.org> gvfs-1.2.3.ebuild:
-  Stable on amd64, bug #281427
-
-  27 Sep 2009; Olivier Crête <tester@gentoo.org> gvfs-1.0.3-r13.ebuild:
-  Stable on amd64, bug #284661
-
-  22 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
-  USE cdda is now global.
-
-  31 May 2009; Gilles Dartiguelongue <eva@gentoo.org> gvfs-1.2.3.ebuild:
-  Fix tests with USE='archive', bug #270105.
-
-  30 May 2009; Brent Baude <ranger@gentoo.org> gvfs-1.2.2.ebuild:
-  Marking gvfs-1.2.2 ~ppc64 for bug 269287
-
-  23 May 2009; Brent Baude <ranger@gentoo.org> gvfs-1.2.2.ebuild:
-  Marking gvfs-1.2.2 ~ppc for bug 269287
-
-  20 May 2009; Raúl Porcel <armin76@gentoo.org> gvfs-1.2.2.ebuild,
-  gvfs-1.2.3.ebuild:
-  Re-add ~arm/~ia64/~sh/~sparc wrt #269287
-
-  18 May 2009; Gilles Dartiguelongue <eva@gentoo.org> gvfs-1.2.3.ebuild:
-  Fix incorrect epatch lines.
-
-*gvfs-1.2.3 (18 May 2009)
-
-  18 May 2009; Gilles Dartiguelongue <eva@gentoo.org> +gvfs-1.2.3.ebuild:
-  Bump to 1.2.3. Use SSH_AUTH_SOCK from gnome-keyring, sftp and ftp fixes.
-
-  15 May 2009; Alexis Ballier <aballier@gentoo.org> gvfs-1.2.2.ebuild:
-  keyword ~x86-fbsd, bug #269287
-
-  14 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org> gvfs-1.2.2.ebuild,
-  +files/gvfs-1.2.2-gphoto2-stricter-checks.patch:
-  Add patch to make gphoto2 tests more strict, fixes bug 264941
-
-  10 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org> -gvfs-0.2.5-r3.ebuild,
-  -files/gvfs-0.2.5-bash-completion.patch,
-  -files/gvfs-0.2.5-dbus-crash.patch, -gvfs-1.0.3-r1.ebuild,
-  -gvfs-1.0.3-r12.ebuild:
-  Clean up old versions
-
-*gvfs-1.2.2 (10 May 2009)
-
-  10 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org> +gvfs-1.2.2.ebuild,
-  +files/gvfs-1.2.2-expose-archive-backend.patch:
-  Bump to 1.2.2, several new features
-
-  08 May 2009; Peter Alfredsen <loki_val@gentoo.org> gvfs-1.0.3-r1.ebuild,
-  gvfs-1.0.3-r2.ebuild, gvfs-1.0.3-r12.ebuild, gvfs-1.0.3-r13.ebuild:
-  Fix bug 268788, Function 'g_volume_monitor_adopt_orphan_mount' implicitly
-  converted to pointer at gdaemonvolumemonitor.c:155, caused by newer
-  gtk/glib combos deprecating more functions.
-
-  28 Apr 2009; Raúl Porcel <armin76@gentoo.org> gvfs-1.0.3-r2.ebuild:
-  alpha/arm/ia64/sh/sparc stable
-
-  27 Apr 2009; Jeroen Roovers <jer@gentoo.org> gvfs-1.0.3-r2:
-  Stable for HPPA (bug #266945).
-
-  27 Apr 2009; Jeroen Roovers <jer@gentoo.org> gvfs-1.0.3-r1:
-  Stable for HPPA (bug #260063).
-
-  24 Apr 2009; Brent Baude <ranger@gentoo.org> gvfs-1.0.3-r2.ebuild:
-  stable ppc, bug 266945
-
-  24 Apr 2009; Brent Baude <ranger@gentoo.org> gvfs-1.0.3-r2.ebuild:
-  stable ppc64, bug 266945
-
-  23 Apr 2009; Markus Meier <maekke@gentoo.org> gvfs-1.0.3-r2:
-  amd64/x86 stable, bug #266945
-
-  12 Apr 2009; Friedrich Oslage <bluebird@gentoo.org> gvfs-1.0.3-r1.ebuild:
-  Stable on sparc, bug #260063
-
-*gvfs-1.0.3-r13 (21 Mar 2009)
-
-  21 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
-  +files/gvfs-1.0.3-bluez4-debug.patch, -gvfs-1.0.3.ebuild,
-  -gvfs-1.0.3-r10.ebuild, -gvfs-1.0.3-r11.ebuild, +gvfs-1.0.3-r13.ebuild:
-  Bump to 1.0.3-r13. Remove debug code that turns warnings into crashes, bug
-  #262502.
-
-  18 Mar 2009; Raúl Porcel <armin76@gentoo.org> gvfs-1.0.3-r1.ebuild:
-  alpha/ia64 stable wrt #260063
-
-  15 Mar 2009; Markus Meier <maekke@gentoo.org> gvfs-1.0.3-r1.ebuild:
-  x86 stable, bug #260063
-
-  11 Mar 2009; Daniel Gryniewicz <dang@gentoo.org> gvfs-1.0.3-r1.ebuild:
-  Marked stable on amd64
-
-*gvfs-1.0.3-r12 (07 Mar 2009)
-*gvfs-1.0.3-r2 (07 Mar 2009)
-
-  07 Mar 2009; Daniel Gryniewicz <dang@gentoo.org>
-  +files/gvfs-1.0.3-gmountspec-SIGSEGV.patch, +gvfs-1.0.3-r2.ebuild,
-  +gvfs-1.0.3-r12.ebuild:
-  Bump to gvfs-1.0.3-r2 and gvfs-1.0.3-r12
-
-  - Fix URL parsing crash; bug #245204
-
-  06 Mar 2009; Brent Baude <ranger@gentoo.org> gvfs-1.0.3-r1.ebuild:
-  Marking gvfs-1.0.3-r1 ppc stable for bug 260063
-
-  05 Mar 2009; Brent Baude <ranger@gentoo.org> gvfs-1.0.3-r1.ebuild:
-  Marking gvfs-1.0.3-r1 ppc64 stable for bug 260063
-
-  03 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org> gvfs-1.0.3-r1.ebuild:
-  obexftp-icon patch was not intented for bluez-3 compatible ebuild, bug
-  #257451.
-
-*gvfs-1.0.3-r11 (02 Feb 2009)
-*gvfs-1.0.3-r1 (02 Feb 2009)
-
-  02 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
-  +files/gvfs-1.0.3-http-leak.patch, +files/gvfs-1.0.3-obexftp-icon.patch,
-  +gvfs-1.0.3-r1.ebuild, +gvfs-1.0.3-r11.ebuild:
-  Fix http leak, bug #256892. Fix obexftp icon, bug #256890.
-
-  30 Jan 2009; Alexis Ballier <aballier@gentoo.org> gvfs-1.0.3.ebuild,
-  gvfs-1.0.3-r10.ebuild:
-  keyword ~x86-fbsd
-
-  29 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
-  +files/gvfs-1.0.3-posixtest.patch, -gvfs-0.2.5.ebuild,
-  -gvfs-0.2.5-r1.ebuild, -gvfs-1.0.1.ebuild, -gvfs-1.0.2.ebuild,
-  gvfs-1.0.3.ebuild, gvfs-1.0.3-r10.ebuild:
-  Use posix tests in configure.ac, bug #256305. Clean up old revisions.
-
-  27 Jan 2009; Raúl Porcel <armin76@gentoo.org> gvfs-1.0.3-r10.ebuild:
-  Re-add ~arm/~sh
-
-*gvfs-1.0.3-r10 (26 Jan 2009)
-
-  26 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
-  +files/gvfs-1.0.3-bluez4.patch, +gvfs-1.0.3-r10.ebuild:
-  Add patch for bluez-4, bug #250615.
-
-  20 Jan 2009; Raúl Porcel <armin76@gentoo.org> gvfs-0.2.5-r3.ebuild,
-  gvfs-1.0.3.ebuild:
-  Add ~arm/~sh
-
-  04 Dec 2008; <solar@gentoo.org> gvfs-0.2.5-r3.ebuild:
-  - keyword for arm
-
-*gvfs-1.0.3 (29 Nov 2008)
-
-  29 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org> +gvfs-1.0.3.ebuild:
-  Bump to 1.0.3. Bug fixes.
-
-  13 Nov 2008; Brent Baude <ranger@gentoo.org> gvfs-0.2.5.ebuild:
-  Marking gvfs-0.2.5 ppc64 stable for bug 236971
-
-  28 Oct 2008; Brent Baude <ranger@gentoo.org> gvfs-0.2.5-r3.ebuild:
-  Marking gvfs-0.2.5-r3 ppc64 for bug 241340
-
-  27 Oct 2008; Jeroen Roovers <jer@gentoo.org> gvfs-0.2.5-r3.ebuild:
-  Stable for HPPA (bug #241340).
-
-*gvfs-1.0.2 (23 Oct 2008)
-
-  23 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org> +gvfs-1.0.2.ebuild:
-  Bump to 1.0.2. Crash fixes, emit mount-added signal when needed and some
-  FUSE fixes.
-
-  19 Oct 2008; Brent Baude <ranger@gentoo.org> gvfs-0.2.5-r3.ebuild:
-  Marking gvfs-0.2.5-r3 ppc stable for bug 241340
-
-  18 Oct 2008; Raúl Porcel <armin76@gentoo.org> gvfs-0.2.5-r3.ebuild:
-  ia64 stable wrt #241340
-
-  18 Oct 2008; Jose Luis Rivero <yoswink@gentoo.org> gvfs-0.2.5-r3.ebuild:
-  alpha stable wrt bug #241340
-
-  16 Oct 2008; Markus Meier <maekke@gentoo.org> gvfs-0.2.5-r3.ebuild:
-  amd64/x86 stable, bug #241340
-
-  14 Oct 2008; Ferris McCormick <fmccor@gentoo.org> gvfs-0.2.5-r3.ebuild:
-  Sparc stable, Bug #241340.
-
-  14 Oct 2008; Rémi Cardona <remi@gentoo.org> -gvfs-0.2.5-r2.ebuild,
-  gvfs-0.2.5-r3.ebuild:
-  remove bluetooth for stabilization purposes (see bug #241340) and remove
-  cruft
-
-*gvfs-1.0.1 (12 Oct 2008)
-
-  12 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org> +gvfs-1.0.1.ebuild:
-  New version for GNOME 2.24. Now counts in power of 10. Various fixes to
-  backends, gphoto2 and hal are out of process, better cross backend
-  copy/move logic (uses system move if possible). Fix opening of dm-crypt
-  volumes.
-
-  25 Sep 2008; Jeroen Roovers <jer@gentoo.org> gvfs-0.2.5.ebuild:
-  Stable for HPPA (bug #236971).
-
-  13 Sep 2008; Rémi Cardona <remi@gentoo.org> gvfs-0.2.5-r3.ebuild:
-  fix keyring useflag support, see bug #237133
-
-*gvfs-0.2.5-r3 (08 Sep 2008)
-
-  08 Sep 2008; Rémi Cardona <remi@gentoo.org>
-  +files/gvfs-0.2.5-dbus-crash.patch, +gvfs-0.2.5-r3.ebuild:
-  add patch to fix dbus crash when fuse is enabled (see bug #236862)
-
-  07 Sep 2008; Gilles Dartiguelongue <eva@gentoo.org> -gvfs-0.2.3.ebuild,
-  gvfs-0.2.5.ebuild, gvfs-0.2.5-r1.ebuild, gvfs-0.2.5-r2.ebuild:
-  disable libarchive support, fix bug #234366.
-
-  01 Sep 2008; Rémi Cardona <remi@gentoo.org> gvfs-0.2.5-r2.ebuild:
-  better bash completion code (same as in the gnome overlay)
-
-*gvfs-0.2.5-r2 (20 Aug 2008)
-
-  20 Aug 2008; Rémi Cardona <remi@gentoo.org>
-  +files/gvfs-0.2.5-bash-completion.patch, +gvfs-0.2.5-r2.ebuild:
-  fix location of bash-completion script (see bug #219442)
-
-  12 Aug 2008; Raúl Porcel <armin76@gentoo.org> gvfs-0.2.5.ebuild:
-  alpha/ia64/sparc stable wrt #229709
-
-  10 Aug 2008; Markus Meier <maekke@gentoo.org> gvfs-0.2.5.ebuild:
-  x86 stable, bug #229709
-
-  30 Jul 2008; Brent Baude <ranger@gentoo.org> gvfs-0.2.5-r1.ebuild:
-  Marking gvfs-0.2.5-r1 ppc stable for bug 229709
-
-  29 Jul 2008; nixnut <nixnut@gentoo.org> gvfs-0.2.5-r1.ebuild:
-  Added ~ppc
-
-  28 Jul 2008; Arun Raghavan <ford_prefect@gentoo.org> metadata.xml:
-  Add local USE flags to metadata.xml
-
-  26 Jul 2008; Olivier Crête <tester@gentoo.org> gvfs-0.2.5.ebuild:
-  Stable on amd64, bug #229709
-
-  26 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org> -gvfs-0.2.1.ebuild,
-  -gvfs-0.2.2.ebuild, gvfs-0.2.3.ebuild, -gvfs-0.2.4.ebuild,
-  gvfs-0.2.5.ebuild, +gvfs-0.2.5.ebuild:
-  remove old revisions, drop bluetooth use flag on version to stabilize but
-  keep the feature in r1.
-
-*gvfs-0.2.5 (30 Jun 2008)
-
-  30 Jun 2008; Gilles Dartiguelongue <eva@gentoo.org> +gvfs-0.2.5.ebuild:
-  bump to 0.2.5,
-   * Fix unremovable files in trash (#523139).
-   * Fix recursive copy of directories (#522933).
-
-  01 Jun 2008; nixnut <nixnut@gentoo.org> gvfs-0.2.3.ebuild:
-  Added ~ppc wrt bug 218794
-
-*gvfs-0.2.4 (27 May 2008)
-
-  27 May 2008; Rémi Cardona <remi@gentoo.org> +gvfs-0.2.4.ebuild:
-  bump to 0.2.4, bugfix release
-
-  12 May 2008; Jeroen Roovers <jer@gentoo.org> gvfs-0.2.3.ebuild:
-  Marked ~hppa (bug #218794).
-
-  24 Apr 2008; Markus Rothe <corsair@gentoo.org> gvfs-0.2.3.ebuild:
-  Added ~ppc64; bug #218794
-
-  21 Apr 2008; <welp@gentoo.org> gvfs-0.2.1.ebuild, gvfs-0.2.2.ebuild,
-  gvfs-0.2.3.ebuild:
-  keyring to gnome-keyring
-
-  15 Apr 2008; Daniel Gryniewicz <dang@gentoo.org> gvfs-0.2.3.ebuild:
-  Check for minimal use flag in libcdio; bug #217385
-
-*gvfs-0.2.3 (09 Apr 2008)
-
-  09 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org> +gvfs-0.2.3.ebuild:
-  bump to 0.2.3. Fixes in webdav/sftp/ftp backends. Minor bugs and leaks
-  fixes.
-
-  09 Apr 2008; Raúl Porcel <armin76@gentoo.org> gvfs-0.2.2.ebuild:
-  Add ~alpha/~ia64/sparc
-
-  04 Apr 2008; Daniel Gryniewicz <dang@gentoo.org> gvfs-0.2.1.ebuild:
-  Bump dep on libgphoto2; bug #215322
-
-*gvfs-0.2.2 (31 Mar 2008)
-
-  31 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org> +gvfs-0.2.2.ebuild:
-  bump to 0.2.2, fix crashes and leaks and silent overwrites (sftp). Fix bug
-  #215322 by raising media-libs/gphoto2 dependency to 2.4.
-
-  24 Mar 2008; Saleem Abdulrasool <compnerd@gentoo.org> gvfs-0.2.1.ebuild:
-  add hal dep for cdda
-
-*gvfs-0.2.1 (23 Mar 2008)
-
-  23 Mar 2008; Mart Raudsepp <leio@gentoo.org> +metadata.xml,
-  +gvfs-0.2.1.ebuild:
-  Initial import of GVFS - the new Virtual Filesystem layer used by GNOME-2.22
-  and any other glib-2.16 GIO API using application for seamless remote
-  filesystem access and more
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.182 2012/09/08 07:51:14 tetromino Exp $
+
+  08 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.12.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:
+  Fix building with libgphoto2-2.5 (bug #427580, thanks to Diego Elio
+  Pettenò).
 
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
new file mode 100644
index 000000000000..f162c98a79a4
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.12.3-gphoto2-2.5-1.patch
@@ -0,0 +1,77 @@
+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
new file mode 100644
index 000000000000..1708b845c8fa
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.12.3-gphoto2-2.5-2.patch
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 000000000000..329844bc27a2
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.12.3-gphoto2-stricter-checks.patch
@@ -0,0 +1,48 @@
+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/gvfs-1.12.3.ebuild b/gnome-base/gvfs/gvfs-1.12.3.ebuild
index 043aef9aadfa..1df3b0bf7f46 100644
--- a/gnome-base/gvfs/gvfs-1.12.3.ebuild
+++ b/gnome-base/gvfs/gvfs-1.12.3.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.12.3.ebuild,v 1.2 2012/05/29 16:19:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.3.ebuild,v 1.3 2012/09/08 07:51:14 tetromino Exp $
 
 EAPI=4
 GCONF_DEBUG=no
@@ -92,7 +92,10 @@ pkg_setup() {
 
 src_prepare() {
 	# Conditional patching purely to avoid eautoreconf
-	use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks.patch
+	if use gphoto2; then
+		epatch "${FILESDIR}"/${PN}-1.12.3-gphoto2-stricter-checks.patch
+		epatch "${FILESDIR}"/${PN}-1.12.3-gphoto2-2.5-{1,2}.patch
+	fi
 
 	if use archive; then
 		epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch