Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/apvlv/PKGBUILD
	community/audit/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/dia/PKGBUILD
	community/gedit-plugins/PKGBUILD
	community/giggle/PKGBUILD
	community/gitg/PKGBUILD
	community/gmic/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnome-screensaver/PKGBUILD
	community/gtranslator/PKGBUILD
	community/metacity/PKGBUILD
	community/zeitgeist-datahub/PKGBUILD
	core/glib2/PKGBUILD
	core/perl/PKGBUILD
	extra/anjuta-extras/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/atkmm/PKGBUILD
	extra/brltty/PKGBUILD
	extra/cheese/PKGBUILD
	extra/clutter/PKGBUILD
	extra/cogl/PKGBUILD
	extra/devhelp/PKGBUILD
	extra/empathy/PKGBUILD
	extra/eog/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution/PKGBUILD
	extra/fontconfig/PKGBUILD
	extra/gcr/PKGBUILD
	extra/gdl/PKGBUILD
	extra/gedit/PKGBUILD
	extra/gjs/PKGBUILD
	extra/glade/PKGBUILD
	extra/glib-networking/PKGBUILD
	extra/gnome-calculator/PKGBUILD
	extra/gnome-contacts/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnome-disk-utility/PKGBUILD
	extra/gnome-documents/PKGBUILD
	extra/gnome-font-viewer/PKGBUILD
	extra/gnome-games/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-screenshot/PKGBUILD
	extra/gnome-session/PKGBUILD
	extra/gnome-terminal/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/grilo-plugins/PKGBUILD
	extra/gssdp/PKGBUILD
	extra/gthumb/PKGBUILD
	extra/gtkmm3/PKGBUILD
	extra/gtksourceview3/PKGBUILD
	extra/gucharmap/PKGBUILD
	extra/gupnp-av/PKGBUILD
	extra/gupnp-dlna/PKGBUILD
	extra/gupnp-igd/PKGBUILD
	extra/gupnp/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/js/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libgee/PKGBUILD
	extra/libgweather/PKGBUILD
	extra/liboauth/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/librsvg/PKGBUILD
	extra/libsocialweb/PKGBUILD
	extra/libsoup/PKGBUILD
	extra/mash/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/mutter/PKGBUILD
	extra/mysql/PKGBUILD
	extra/nautilus-sendto/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/network-manager-applet/PKGBUILD
	extra/notification-daemon/PKGBUILD
	extra/p11-kit/PKGBUILD
	extra/pango/PKGBUILD
	extra/pangomm/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/rest/PKGBUILD
	extra/rhythmbox/PKGBUILD
	extra/rygel/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vala/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vte3/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/yelp/PKGBUILD
	extra/zeitgeist/PKGBUILD
	libre/rp-pppoe-libre/PKGBUILD
	pcr/python-sfml2/PKGBUILD
	pcr/python2-sfml2/PKGBUILD

2 files changed, 36 insertions, 24 deletions

diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 455464d7c..8c2f5b737 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,23 +1,20 @@
-# $Id: PKGBUILD 179106 2013-03-03 17:28:34Z dreisner $
+# $Id: PKGBUILD 183318 2013-04-21 22:06:37Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.14.2
-pkgrel=4
+pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp')
+pkgver=1.16.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3')
+makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray')
 url="http://www.gnome.org"
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
-        fix-paranoia-include.patch)
-sha256sums=('c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc'
-            '4385f9c5100bc0e01c59d07bef07737bb8155e60b56d3ee948e0b48ff207ff76')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('e7ec47547ff8029a2e8d81533bdfa870fe4a547c9d7c4e1e946d42d38970b0ac')
 
 build() {
   cd "$pkgbase-$pkgver"
-  patch -Np0 -i ../fix-paranoia-include.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gvfs \
@@ -27,24 +24,28 @@ build() {
 
 package_gvfs() {
   pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup-gnome' 'udisks2' 'libsecret')
+  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup>=2.24.0' 'udisks2' 'libsecret' 'libbluray')
   optdepends=('gvfs-afc: AFC (mobile devices) support'
               'gvfs-smb: SMB/CIFS (Windows client) support'
               'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
               'gvfs-obexftp: ObexFTP (bluetooth) support'
               'gvfs-afp: Apple Filing Protocol (AFP) support'
+              'gvfs-mtp: MTP device support'
+              'gvfs-goa: gnome-online-accounts support'
               'gtk3: Recent files support')
   install=gvfs.install
 
   cd "$pkgbase-$pkgver"
   sed -e 's/^am__append_4/#am__append_4/' \
       -e 's/^am__append_5/#am__append_5/' \
+      -e 's/^am__append_6/#am__append_6/' \
+      -e 's/^am__append_7/#am__append_7/' \
       -i monitor/Makefile
   make DESTDIR="$pkgdir" install
 
   cd "$pkgdir"
-  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
-  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
+  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}
+  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}.mount
   rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
   rm usr/share/GConf/gsettings/gvfs-smb.convert
 }
@@ -114,3 +115,25 @@ package_gvfs-afp() {
   install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
   install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
 }
+
+package_gvfs-mtp() {
+  pkgdesc="MTP backend for gvfs"
+  depends=("gvfs=$pkgver" 'libmtp')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-mtp "$pkgdir/usr/lib/gvfs/gvfsd-mtp"
+  install -Dm644 mtp.mount "$pkgdir/usr/share/gvfs/mounts/mtp.mount"
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/mtp"
+  make DESTDIR="$pkgdir" install
+}
+
+package_gvfs-goa() {
+  pkgdesc="Gnome Online Accounts (webservices) backend for gvfs"
+  depends=("gvfs=$pkgver" 'gnome-online-accounts')
+  install=gvfs-module.install
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/goa"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gvfs/fix-paranoia-include.patch b/extra/gvfs/fix-paranoia-include.patch
deleted file mode 100644
index 02856a06f..000000000
--- a/extra/gvfs/fix-paranoia-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- daemon/gvfsbackendcdda.c.orig	2013-01-08 11:19:52.311593338 +0000
-+++ daemon/gvfsbackendcdda.c	2013-01-08 11:20:05.778169190 +0000
-@@ -55,7 +55,7 @@
- #include "gvfsjobenumerate.h"
- 
- #define DO_NOT_WANT_PARANOIA_COMPATIBILITY
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/paranoia.h>
- #include <cdio/cdio.h>
- 
- /* TODO: