Add mtp support (#463794 by plaes) and update archive patch with current fedora one (#463878 by Torsten Stets).

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

3 files changed, 60 insertions, 4 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 96df9de0bf92..cbd6de0f672e 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.208 2013/03/29 13:33:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.209 2013/03/31 12:49:52 pacho Exp $
+
+  31 Mar 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gvfs-1.16.0-expose-archive-backend.patch, gvfs-1.16.0.ebuild:
+  Add mtp support (#463794 by plaes) and update archive patch with current
+  fedora one (#463878 by Torsten Stets).
 
   29 Mar 2013; Agostino Sarubbo <ago@gentoo.org> gvfs-1.12.3-r1.ebuild:
   Stable for ia64, wrt bug #458984
diff --git a/gnome-base/gvfs/files/gvfs-1.16.0-expose-archive-backend.patch b/gnome-base/gvfs/files/gvfs-1.16.0-expose-archive-backend.patch
new file mode 100644
index 000000000000..5f50a4f420ac
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.16.0-expose-archive-backend.patch
@@ -0,0 +1,49 @@
+diff -up gvfs-1.3.2/Makefile.am.archive-integration gvfs-1.3.2/Makefile.am
+--- gvfs-1.3.2/Makefile.am.archive-integration	2009-06-25 19:55:39.000000000 -0400
++++ gvfs-1.3.2/Makefile.am	2009-07-13 22:51:52.480693853 -0400
+@@ -1,5 +1,19 @@
+ 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 \
+ 	metadata \
+@@ -19,6 +33,8 @@ EXTRA_DIST = \
+ 	gvfs.doap		\
+ 	README.commits		\
+ 	MAINTAINERS		\
++	mount-archive.desktop.in.in	\
++	$(desktop_in_files)	\
+ 	m4			\
+ 	$(NULL)
+ 
+diff -up /dev/null gvfs-1.3.2/mount-archive.desktop.in.in
+--- /dev/null	2009-07-13 16:21:55.049012465 -0400
++++ gvfs-1.3.2/mount-archive.desktop.in.in	2009-07-13 22:39:14.844931097 -0400
+@@ -0,0 +1,13 @@
++[Desktop Entry]
++_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;application/x-xz-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@
diff --git a/gnome-base/gvfs/gvfs-1.16.0.ebuild b/gnome-base/gvfs/gvfs-1.16.0.ebuild
index 56acdde75c8b..8b0dea55739f 100644
--- a/gnome-base/gvfs/gvfs-1.16.0.ebuild
+++ b/gnome-base/gvfs/gvfs-1.16.0.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.0.ebuild,v 1.1 2013/03/28 22:51:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.16.0.ebuild,v 1.2 2013/03/31 12:49:52 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -20,7 +20,7 @@ DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README
 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 gnome-online-accounts gphoto2 gtk +http ios samba systemd +udev udisks"
+IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gnome-online-accounts gphoto2 gtk +http mtp ios samba systemd +udev udisks"
 REQUIRED_USE="systemd? ( udisks )"
 
 # Can use libgphoto-2.5.0 as well. Automagic detection.
@@ -49,6 +49,7 @@ RDEPEND=">=dev-libs/glib-2.35:2
 	ios? (
 		>=app-pda/libimobiledevice-1.1.0
 		>=app-pda/libplist-1 )
+	mtp? ( >=media-libs/libmtp-1.1.5 )
 	samba? ( >=net-fs/samba-3.4.6[smbclient] )
 	systemd? ( sys-apps/systemd )
 	udev? (
@@ -68,7 +69,7 @@ REQUIRED_USE="cdda? ( udev )"
 
 src_prepare() {
 	if use archive; then
-		epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
+		epatch "${FILESDIR}"/${PN}-1.16.0-expose-archive-backend.patch
 		echo mount-archive.desktop.in >> po/POTFILES.in
 		echo mount-archive.desktop.in.in >> po/POTFILES.in
 	fi
@@ -108,6 +109,7 @@ src_configure() {
 		$(use_enable gphoto2)
 		$(use_enable gtk)
 		$(use_enable ios afc)
+		$(use_enable mtp libmtp)
 		$(use_enable udev)
 		$(use_enable udev gudev)
 		$(use_enable http)