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

1 files changed, 12 insertions, 16 deletions

diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 352a2e45e..358071391 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,33 +1,29 @@
-# $Id: PKGBUILD 180810 2013-03-26 11:49:41Z foutrelis $
+# $Id: PKGBUILD 183324 2013-04-21 22:06:43Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
-pkgver=0.14.5
+pkgver=0.16.0
 _tver=${pkgver%.*}
-pkgrel=1
+pkgrel=4
 pkgdesc="All-in-one indexer, search tool and metadata database"
 arch=(i686 x86_64 mips64el)
 license=(GPL)
-makedepends=(libgnome-keyring upower libexif exempi rest
+makedepends=(libgee libsecret upower libexif exempi
              poppler-glib libgsf icu enca networkmanager gtk3
              desktop-file-utils hicolor-icon-theme gobject-introspection
-             intltool giflib gstreamer0.10-base totem-plparser
-             taglib nautilus libvorbis flac vala libgxps)
+             intltool giflib gst-plugins-base-libs totem-plparser
+             taglib libvorbis flac vala libgxps libnautilus-extension)
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('cabef75eb18ad35208000dc472bdc20a74269799414527ee6e1c1c1cfb28eec8')
+sha256sums=('299c6a180370522d1d794c184aaef8d8222d3f737d564b8e5ca25b8751470c4f')
 
 build() {
   cd $pkgbase-$pkgver
 
-  # HACK: uninstall libtracker-sparql to ensure a clean build,
-  # as the build system will wrongly link against it
-  #if pacman -Qq libtracker-sparql; then sudo pacman -Rdd --noconfirm libtracker-sparql; fi
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -43,18 +39,18 @@ build() {
 }
 
 package_tracker() {
-  depends=("libtracker-sparql=$pkgver-$pkgrel" libgnome-keyring
-           upower libexif exempi rest poppler-glib libgsf enca
+  depends=("libtracker-sparql=$pkgver-$pkgrel" libgee libsecret
+           upower libexif exempi poppler-glib libgsf enca
            networkmanager gtk3 desktop-file-utils hicolor-icon-theme)
   optdepends=('giflib: extractor for GIF data'
-              'gstreamer0.10-base: video extractor'
+              'gst-plugins-base-libs: video extractor'
               'totem-plparser: playlist support'
-              'nautilus: nautilus-extension'
               'libvorbis: Vorbis metadata extractor'
               'flac: FLAC metadata extractor'
               'taglib: writeback for audio files'
+              "nautilus: edit files' tracker tags"
               'libgxps: XPS extractor')
-  groups=('gnome-extra')
+  groups=('gnome')
   install=tracker.install
 
   cd $pkgbase-$pkgver