Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/fotoxx/PKGBUILD
	community/gtkdialog/PKGBUILD
	community/hubbub/PKGBUILD
	community/libgdamm/PKGBUILD
	community/libparserutils/PKGBUILD
	community/mingw32-binutils/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/mtpaint/PKGBUILD
	community/netsurf/PKGBUILD
	community/patchage/PKGBUILD
	community/qgo/PKGBUILD
	community/tomoyo-tools/PKGBUILD
	community/tre/PKGBUILD
	community/virtualbox/PKGBUILD
	core/net-tools/PKGBUILD
	core/openldap/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/evolution/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/folks/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/koffice/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/swt/PKGBUILD
	extra/tomcat/PKGBUILD
	extra/totem/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vte/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-atk/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/wine/PKGBUILD
	social/miniupnpc/PKGBUILD
	testing/icedtea-web-java7/PKGBUILD
	testing/sqlite3/PKGBUILD
	~xihh/abiword/PKGBUILD

1 files changed, 11 insertions, 34 deletions

diff --git a/gnome-unstable/folks/PKGBUILD b/gnome-unstable/folks/PKGBUILD
index e9a200874..929edf424 100644
--- a/gnome-unstable/folks/PKGBUILD
+++ b/gnome-unstable/folks/PKGBUILD
@@ -1,52 +1,29 @@
-# $Id: PKGBUILD 138408 2011-09-21 16:18:20Z heftig $
+# $Id: PKGBUILD 138556 2011-09-27 10:46:31Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
-pkgbase=folks
-pkgname=(folks folks-tracker)
-pkgver=0.6.3
-pkgrel=3
+pkgname=folks
+pkgver=0.6.3.2
+pkgrel=1
 pkgdesc="Library to aggregates people into metacontacts"
 arch=(i686 x86_64)
 url="http://telepathy.freedesktop.org/wiki/Folks"
 license=('LGPL2.1')
 depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb')
-makedepends=('gobject-introspection' 'vala' 'intltool' 'libtracker-sparql')
+makedepends=('gobject-introspection' 'vala' 'intltool')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/0.6/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('e21810966f300b31e8cd51cca9851606213345eb933584997b49326c43b46e1b')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('e04d80e4bab12d85a254a22a6b5b8fab88d14d1c2f7b732e40299960c7c32414')
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  # Change tracker version
-  grep -lr sparql-0.10 . | xargs sed -i 's/sparql-0.10/sparql-0.12/g'
-
-  # Fix the sed command to work with LANG=C
-  sed -i '/dlname=/s/A-Za-z0-9\.-+/A-Za-z0-9./' folks/Makefile.*
-
-  ./configure --prefix=/usr --enable-tracker-backend
+  ./configure --prefix=/usr
   make
 }
 
-package_folks() {
-  optdepends=('folks-tracker: Tracker backend')
-
-  cd "$srcdir/$pkgbase-$pkgver"
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-
-### Split folks-tracker
-  cd "$pkgdir"
-  find . -name '*tracker*' \! -type d | while IFS= read -r _file; do
-    mkdir -p "$srcdir/folks-tracker/${_file%/*}"
-    mv "$_file" "$srcdir/folks-tracker/$_file"
-  done
-}
-
-package_folks-tracker() {
-  pkgdesc="Tracker backend for folks"
-  depends=('folks' 'tracker')
-
-  mv "$srcdir"/folks-tracker/* "$pkgdir"
 }
 
 # vim:set ts=2 sw=2 et: