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

Conflicts:
	community/dwdiff/PKGBUILD
	community/ejabberd/PKGBUILD
	community/gnome-settings-daemon-updates/PKGBUILD
	community/gpicview/PKGBUILD
	community/libgexiv2/PKGBUILD
	community/mapnik/PKGBUILD
	community/mplayer2/PKGBUILD
	community/open-vm-tools/PKGBUILD
	community/vdrift/PKGBUILD
	community/xboard/PKGBUILD
	core/openssh/PKGBUILD
	extra/boost/PKGBUILD
	extra/dconf/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/gconf/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-disk-utility/PKGBUILD
	extra/gnome-menus/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-themes-standard/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/gtk3/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/icu/PKGBUILD
	extra/libgsf/PKGBUILD
	extra/libimobiledevice/PKGBUILD
	extra/libplist/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/pango/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/telepathy-kde-accounts-kcm/PKGBUILD
	extra/telepathy-kde-approver/PKGBUILD
	extra/telepathy-kde-auth-handler/PKGBUILD
	extra/telepathy-kde-contact-list/PKGBUILD
	extra/telepathy-kde-filetransfer-handler/PKGBUILD
	extra/telepathy-kde-integration-module/PKGBUILD
	extra/telepathy-kde-send-file/PKGBUILD
	extra/telepathy-kde-text-ui/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/yelp/PKGBUILD
	libre/unarchiver/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	testing/binutils/PKGBUILD

2 files changed, 14 insertions, 19 deletions

diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index e44a59713..5b732426c 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,41 +1,38 @@
-# $Id: PKGBUILD 142866 2011-11-17 18:34:20Z ibiru $
+# $Id: PKGBUILD 156740 2012-04-23 09:04:26Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.2.2
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Empathy"
 license=('GPL2')
-depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring'
-'libcanberra' 'iso-codes' 'networkmanager')
-makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto')
+depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'libwebkit3' 'networkmanager' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control')
+makedepends=('intltool' 'itstool')
 optdepends=('telepathy-gabble: XMPP/Jabber support'
-            'telepathy-butterfly: MSN support'
             'telepathy-idle: IRC support'
             'telepathy-salut: Link-local XMPP support'
-            'telepathy-sofiasip: SIP support'
+            'telepathy-rakia: SIP support'
             'telepathy-haze: libpurple support')
 options=('!libtool')
 groups=('gnome-extra')
 install=empathy.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('d6a391b801f58024ed6f97d9bf4e774b9ab9e1262d79aefb5c1dd95233fd5aa1')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('b12493f47b932dcd3d8b5101d414a00447a6eea60a575db7211ee24cfe8c4565')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
       --sysconfdir=/etc  \
       --libexecdir=/usr/lib/empathy \
       --disable-static \
-      --disable-scrollkeeper \
       --disable-schemas-compile
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/empathy/empathy.install b/extra/empathy/empathy.install
index c3f7abf13..f8d2dfb1f 100644
--- a/extra/empathy/empathy.install
+++ b/extra/empathy/empathy.install
@@ -1,18 +1,16 @@
 post_install() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+    glib-compile-schemas /usr/share/glib-2.0/schemas
     update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
     echo "To use Empathy you need to install at least one Telepathy connection manager."
 }
 
 post_upgrade() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+    glib-compile-schemas /usr/share/glib-2.0/schemas
     update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_remove() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    post_upgrade
 }