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

Conflicts:
	community/chmsee/PKGBUILD
	community/darkstat/PKGBUILD
	community/dbmail/PKGBUILD
	community/dvdisaster/PKGBUILD
	community/epic4/PKGBUILD
	community/fb-client/PKGBUILD
	community/fcrackzip/PKGBUILD
	community/fdupes/PKGBUILD
	community/flobopuyo/PKGBUILD
	community/intel-tbb/PKGBUILD
	community/openbsd-netcat/PKGBUILD
	community/sunpinyin/PKGBUILD
	community/tinc/PKGBUILD
	community/uudeview/PKGBUILD
	community/zathura/PKGBUILD
	core/libedit/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	core/openssl/PKGBUILD
	core/util-linux/PKGBUILD
	extra/lua/PKGBUILD
	gnome-unstable/pidgin/PKGBUILD
	testing/openssl/PKGBUILD
	testing/sudo/PKGBUILD
	testing/udev/PKGBUILD
	testing/util-linux/PKGBUILD

11 files changed, 538 insertions, 74 deletions

diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
index d340646e6..0a8006182 100644
--- a/extra/audacity/PKGBUILD
+++ b/extra/audacity/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146761 2012-01-17 05:11:17Z eric $
+# $Id: PKGBUILD 153456 2012-03-14 17:16:21Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=audacity
-pkgver=1.3.14
-pkgrel=2
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="A program that lets you manipulate digital audio waveforms"
 arch=(mips64el)
 url="http://audacity.sourceforge.net/"
@@ -12,14 +12,11 @@ depends=('libmad' 'libid3tag' 'wxgtk' 'lame' 'hicolor-icon-theme'
 	 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg')
 options=('!makeflags')
 install=audacity.install
-source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}-beta.tar.bz2 \
-        audacity-1.3.13-ffmpeg.patch)
-sha1sums=('a0fb22a0cfbb8a72abac8bbc01b3ad8b0bb7e11e'
-          '67f209d362ece6961b154a7c62e23ac856c2fa94')
+source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}.tar.bz2)
+sha1sums=('0175474e63c51aaa97df9b45574f7f307f1d3bc8')
 
 build() {
-  cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
-  patch -p0 -i "${srcdir}/audacity-1.3.13-ffmpeg.patch"
+  cd "${srcdir}/${pkgname}-src-${pkgver}"
   WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
     --with-portaudio --with-libsamplerate \
     --without-libresample --with-libmad \
@@ -31,6 +28,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
+  cd "${srcdir}/${pkgname}-src-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/bluefish/PKGBUILD b/extra/bluefish/PKGBUILD
index 08276d872..b4143a5a2 100644
--- a/extra/bluefish/PKGBUILD
+++ b/extra/bluefish/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 145843 2012-01-02 20:31:09Z eric $
+# $Id: PKGBUILD 153431 2012-03-13 20:19:08Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=bluefish
-pkgver=2.2.1
+pkgver=2.2.2
 pkgrel=1
 pkgdesc="A powerful HTML editor for experienced web designers and programmers"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ optdepends=('gucharmap: for using the charmap plugin')
 options=('!libtool')
 install=bluefish.install
 source=(http://www.bennewitz.com/bluefish/stable/source/bluefish-${pkgver}.tar.bz2{,.sig})
-sha1sums=('f7b2e9915e196c971c6bcca04d8d6b87efab1ae6'
-          '89d5130d91999ff0319b709f0ed2cbcf7aa028d6')
+sha1sums=('2fca4e4fa67e6f2fda1335e1dc4e19ca318eb002'
+          'a7f2b776d9bacff1e2fd6d70aa0e37c53e85f7a2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gimp-devel/PKGBUILD b/extra/gimp-devel/PKGBUILD
index 094827e08..67933771d 100644
--- a/extra/gimp-devel/PKGBUILD
+++ b/extra/gimp-devel/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 148738 2012-02-05 11:48:46Z ibiru $
+# $Id: PKGBUILD 153442 2012-03-14 06:47:26Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gimp-devel
-pkgver=2.7.4
-pkgrel=2
+pkgver=2.7.5
+pkgrel=1
 pkgdesc="GNU Image Manipulation Program (Development Version)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gimp.org/"
 license=('GPL3' 'LGPL3')
 depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'librsvg' 'libmng' 'dbus-glib' \
          'jasper' 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl')
+makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript')
 optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
             'libwebkit: for the help browser or web-page plug-ins'
             'poppler-glib: for pdf support'
             'alsa-lib: for MIDI event controller module'
-            'curl: for URI support')
+            'curl: for URI support'
+            'ghostscript: for postscript support')
 options=('!libtool' '!makeflags')
 conflicts=('gimp')
 provides=("gimp=${pkgver}")
 install=gimp-devel.install
 source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl)
-md5sums=('bda95a29c3483b8ff458b06b1543f867'
+md5sums=('55c3ce1402890665464d9aad74ea63b6'
          'bb27bc214261d36484093e857f015f38')
 
 build() {
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index df7da3c71..82da80045 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 149825 2012-02-11 09:11:58Z eric $
+# $Id: PKGBUILD 153440 2012-03-14 01:50:29Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.5.3
+pkgver=6.7.6.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
 license=('custom')
-depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'libjpeg-turbo')
-makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng')
+makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
+             'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-sha1sums=('b6cee59cb380f38572ec40769c438901dcc7500e'
+sha1sums=('878c264d070c70debc514d7da9f4feb7728bfe9f'
           '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
@@ -22,8 +22,7 @@ build() {
   autoreconf
   patch -p0 -i ../perlmagick.rpath.patch
 
-  LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \
-    ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
+  ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
     --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
     --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
     --with-perl --with-perl-options="INSTALLDIRS=vendor" \
@@ -39,6 +38,7 @@ check() {
 
 package_imagemagick() {
   pkgdesc="An image viewing/manipulation program"
+  depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext')
   optdepends=('ghostscript: for Ghostscript support' 
               'openexr: for OpenEXR support' 
               'libwmf: for WMF support' 
@@ -53,13 +53,14 @@ package_imagemagick() {
           'etc/ImageMagick/magic.xml'
           'etc/ImageMagick/mime.xml'
           'etc/ImageMagick/policy.xml'
+          'etc/ImageMagick/quantization-table.xml'
           'etc/ImageMagick/sRGB.icc'
           'etc/ImageMagick/thresholds.xml'
           'etc/ImageMagick/type.xml'
           'etc/ImageMagick/type-dejavu.xml'
           'etc/ImageMagick/type-ghostscript.xml'
           'etc/ImageMagick/type-windows.xml')
-  options=('!makeflags' '!docs' 'libtool')
+  options=('!docs' 'libtool' '!emptydirs')
 
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
   make DESTDIR="${pkgdir}" install
@@ -74,8 +75,6 @@ package_imagemagick() {
 
 package_imagemagick-doc() {
   pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
-  depends=()
-  options=('!makeflags')
 
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
   make DESTDIR="${pkgdir}" install-data-html
diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD
index 179fc63fd..69b6e5b6e 100644
--- a/extra/libtiff/PKGBUILD
+++ b/extra/libtiff/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 148838 2012-02-05 11:52:24Z ibiru $
+# $Id: PKGBUILD 153433 2012-03-13 21:01:28Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libtiff
-pkgver=4.0.0
+pkgver=4.0.1
 pkgrel=1
 pkgdesc="Library for manipulation of TIFF images"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('freeglut')
 optdepends=('freeglut: for using tiffgt')
 options=('!libtool')
 source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz)
-sha1sums=('85d85520fea40fc9291995a60e3d40cf980b5522')
+sha1sums=('8baf382231c9051a1b3eb294581289aa21447171')
 
 build() {
   cd "${srcdir}/tiff-${pkgver}"
diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD
index 67806966e..2b567ab04 100644
--- a/extra/lua/PKGBUILD
+++ b/extra/lua/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 142952 2011-11-19 04:33:22Z eric $
+# $Id: PKGBUILD 153491 2012-03-14 23:43:56Z eric $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=lua 
-pkgver=5.1.4
-pkgrel=9
-_patchver=5.1.4-4
+pkgver=5.1.5
+pkgrel=1
 pkgdesc="A powerful light-weight programming language designed for extending applications" 
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lua.org/"
@@ -13,19 +12,17 @@ depends=('readline')
 license=('MIT')
 options=('!makeflags' '!emptydirs')
 source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz
-        http://www.lua.org/ftp/patch-lua-${_patchver}
         lua-arch.patch lua-5.1-cflags.diff)
-md5sums=('d0870f2de55d59c1c8419f36e8fac150'
-         '329d8695e3e6f1267190e220559f7b6c'
+md5sums=('2e115fe26e435e33b0d5c022e4490567'
          '6c5953f63904bf20a0183cdab05b80de'
          '249582bf1fd861ccf492d2c35a9fe732')
 
 build() { 
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/patch-lua-${_patchver}" -d src
   patch -p1 -i "${srcdir}/lua-arch.patch"
-  [ "$CARCH" != "i686" ] && patch -p1 -i "${srcdir}/lua-5.1-cflags.diff"
-  [ "$CARCH" != "i686" ] && export CFLAGS="$CFLAGS -fPIC"
+  patch -p1 -i "${srcdir}/lua-5.1-cflags.diff"
+  export CFLAGS="$CFLAGS -fPIC"
+
   make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \
     INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
     linux
diff --git a/extra/mtdev/PKGBUILD b/extra/mtdev/PKGBUILD
new file mode 100644
index 000000000..7e49b6371
--- /dev/null
+++ b/extra/mtdev/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 153465 2012-03-14 17:58:06Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+
+pkgname=mtdev
+pkgver=1.1.2
+pkgrel=1
+pkgdesc="A stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol"
+arch=('i686' 'x86_64')
+url="http://bitmath.org/code/mtdev/"
+license=('custom:MIT')
+depends=('glibc')
+options=('!libtool')
+source=("$url$pkgname-$pkgver.tar.bz2")
+md5sums=('d9c7700918fc392e29da7477ae20c5c2')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+
+  # license
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index 47f3f81a7..0d6cbc375 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144934 2011-12-10 23:19:27Z foutrelis $
+# $Id: PKGBUILD 153444 2012-03-14 12:02:02Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 
 pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.1
+pkgver=2.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin.im/"
@@ -17,24 +17,24 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'networkmanager')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-        nm09-more.patch)
-sha256sums=('2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8'
-            '7e173ea37b86b604284da18ea015ee03ccd444f3e980f440c201957d37ee820e')
+        port-to-farstream-v2.patch)
+sha256sums=('e5cdd29056d36677cb81225c3b36b1bcde64605e201492f6e2fdf27ff24d32b8'
+            '03ba48e0da1331a976efc28a66810be4f51599a2b8065ac449965e0aefca4482')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Further fixes for NetworkManager 0.9
-  # http://developer.pidgin.im/ticket/13859
-  patch -Np1 -i "$srcdir/nm09-more.patch"
+  # Apply patch for farsight -> farstream transition
+  # http://developer.pidgin.im/ticket/14936
+  #patch -Np1 -i "$srcdir/port-to-farstream-v2.patch"
+
+  # The farstream patch changes configure.ac
+  #autoreconf -vi
 
   # Use Python 2
   sed -i 's/env python$/&2/' */plugins/*.py \
     libpurple/purple-{remote,notifications-example,url-handler}
 
-  # Pidgin doesn't explicitly link to libm
-  LDFLAGS+=' -Wl,--copy-dt-needed-entries'
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/pidgin/port-to-farstream-v2.patch b/extra/pidgin/port-to-farstream-v2.patch
new file mode 100644
index 000000000..49ae60906
--- /dev/null
+++ b/extra/pidgin/port-to-farstream-v2.patch
@@ -0,0 +1,447 @@
+diff -upr pidgin-2.10.1.orig/configure.ac pidgin-2.10.1/configure.ac
+--- pidgin-2.10.1.orig/configure.ac	2011-12-06 10:44:32.000000000 +0200
++++ pidgin-2.10.1/configure.ac	2012-03-10 18:21:12.000000000 +0200
+@@ -780,18 +780,18 @@ else
+ fi
+ 
+ dnl #######################################################################
+-dnl # Check for Farsight
++dnl # Check for Farstream
+ dnl #######################################################################
+-AC_ARG_ENABLE(farsight,
+-	[AC_HELP_STRING([--disable-farsight], [compile without farsight support])],
+-	enable_farsight="$enableval", enable_farsight="yes")
+-if test "x$enable_farsight" != "xno"; then
+-	PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [
+-		AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video])
+-		AC_SUBST(FARSIGHT_CFLAGS)
+-		AC_SUBST(FARSIGHT_LIBS)
++AC_ARG_ENABLE(farstream,
++	[AC_HELP_STRING([--disable-farstream], [compile without farstream support])],
++	enable_farstream="$enableval", enable_farstream="yes")
++if test "x$enable_farstream" != "xno"; then
++	PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [
++		AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video])
++		AC_SUBST(FARSTREAM_CFLAGS)
++		AC_SUBST(FARSTREAM_LIBS)
+ 	], [
+-		enable_farsight="no"
++		enable_farstream="no"
+ 	])
+ fi
+ 
+@@ -802,20 +802,20 @@ AC_ARG_ENABLE(vv,
+ 	[AC_HELP_STRING([--disable-vv], [compile without voice and video support])],
+ 	enable_vv="$enableval", enable_vv="yes")
+ if test "x$enable_vv" != "xno"; then
+-	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then
++	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then
+ 		AC_DEFINE(USE_VV, 1, [Use voice and video])
+ 	else
+ 		enable_vv="no"
+ 		if test "x$force_deps" = "xyes"; then
+ 			AC_MSG_ERROR([
+ Dependencies for voice/video were not met.
+-Install the necessary gstreamer and farsight packages first.
++Install the necessary gstreamer and farstream packages first.
+ Or use --disable-vv if you do not need voice/video support.
+ 			])
+ 		fi
+ 	fi
+ fi
+-AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno")
++AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno")
+ 
+ dnl #######################################################################
+ dnl # Check for Internationalized Domain Name support
+diff -upr pidgin-2.10.1.orig/libpurple/Makefile.am pidgin-2.10.1/libpurple/Makefile.am
+--- pidgin-2.10.1.orig/libpurple/Makefile.am	2011-12-06 10:44:33.000000000 +0200
++++ pidgin-2.10.1/libpurple/Makefile.am	2012-03-10 18:21:19.000000000 +0200
+@@ -306,7 +306,7 @@ libpurple_la_LIBADD = \
+ 	$(LIBXML_LIBS) \
+ 	$(NETWORKMANAGER_LIBS) \
+ 	$(INTLLIBS) \
+-	$(FARSIGHT_LIBS) \
++	$(FARSTREAM_LIBS) \
+ 	$(GSTREAMER_LIBS) \
+ 	$(GSTINTERFACES_LIBS) \
+ 	$(IDN_LIBS) \
+@@ -322,7 +322,7 @@ AM_CPPFLAGS = \
+ 	$(DEBUG_CFLAGS) \
+ 	$(DBUS_CFLAGS) \
+ 	$(LIBXML_CFLAGS) \
+-	$(FARSIGHT_CFLAGS) \
++	$(FARSTREAM_CFLAGS) \
+ 	$(GSTREAMER_CFLAGS) \
+ 	$(GSTINTERFACES_CFLAGS) \
+ 	$(IDN_CFLAGS) \
+diff -upr pidgin-2.10.1.orig/libpurple/media/backend-fs2.c pidgin-2.10.1/libpurple/media/backend-fs2.c
+--- pidgin-2.10.1.orig/libpurple/media/backend-fs2.c	2011-12-06 10:44:33.000000000 +0200
++++ pidgin-2.10.1/libpurple/media/backend-fs2.c	2012-03-10 18:21:19.000000000 +0200
+@@ -1,5 +1,5 @@
+ /**
+- * @file backend-fs2.c Farsight 2 backend for media API
++ * @file backend-fs2.c Farstream backend for media API
+  * @ingroup core
+  */
+ 
+@@ -34,8 +34,9 @@
+ #include "network.h"
+ #include "media-gst.h"
+ 
+-#include <gst/farsight/fs-conference-iface.h>
+-#include <gst/farsight/fs-element-added-notifier.h>
++#include <farstream/fs-conference.h>
++#include <farstream/fs-element-added-notifier.h>
++#include <farstream/fs-utils.h>
+ 
+ /** @copydoc _PurpleMediaBackendFs2Class */
+ typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class;
+@@ -112,6 +113,8 @@ struct _PurpleMediaBackendFs2Stream
+ 	gchar *participant;
+ 	FsStream *stream;
+ 
++        gboolean supports_add;
++
+ 	GstElement *src;
+ 	GstElement *tee;
+ 	GstElement *volume;
+@@ -147,6 +150,8 @@ struct _PurpleMediaBackendFs2Private
+ 	FsConference *conference;
+ 	gchar *conference_type;
+ 
++        FsElementAddedNotifier *notifier;
++
+ 	GHashTable *sessions;
+ 	GHashTable *participants;
+ 
+@@ -212,6 +217,11 @@ purple_media_backend_fs2_dispose(GObject
+ 
+ 	purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n");
+ 
++	if (priv->notifier) {
++		g_object_unref(priv->notifier);
++		priv->notifier = NULL;
++	}
++
+ 	if (priv->confbin) {
+ 		GstElement *pipeline;
+ 
+@@ -846,7 +856,7 @@ gst_handle_message_element(GstBus *bus,
+ 			priv->conference != FS_CONFERENCE(src))
+ 		return;
+ 
+-	if (gst_structure_has_name(msg->structure, "farsight-error")) {
++	if (gst_structure_has_name(msg->structure, "farstream-error")) {
+ 		FsError error_no;
+ 		gst_structure_get_enum(msg->structure, "error-no",
+ 				FS_TYPE_ERROR, (gint*)&error_no);
+@@ -867,16 +877,9 @@ gst_handle_message_element(GstBus *bus,
+ 						" strict."));
+ 				purple_media_end(priv->media, NULL, NULL);
+ 				break;
+-			case FS_ERROR_UNKNOWN_CNAME:
+-			/*
+-			 * Unknown CName is only a problem for the
+-			 * multicast transmitter which isn't used.
+-			 * It is also deprecated.
+-			 */
+-				break;
+ 			default:
+ 				purple_debug_error("backend-fs2",
+-						"farsight-error: %i: %s\n",
++						"farstream-error: %i: %s\n",
+ 						error_no,
+ 					  	gst_structure_get_string(
+ 						msg->structure, "error-msg"));
+@@ -885,11 +888,11 @@ gst_handle_message_element(GstBus *bus,
+ 
+ 		if (FS_ERROR_IS_FATAL(error_no)) {
+ 			purple_media_error(priv->media, _("A non-recoverable "
+-					"Farsight2 error has occurred."));
++					"Farstream error has occurred."));
+ 			purple_media_end(priv->media, NULL, NULL);
+ 		}
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-new-local-candidate")) {
++			"farstream-new-local-candidate")) {
+ 		const GValue *value;
+ 		FsStream *stream;
+ 		FsCandidate *local_candidate;
+@@ -924,7 +927,7 @@ gst_handle_message_element(GstBus *bus,
+ 				session->id, name, candidate);
+ 		g_object_unref(candidate);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-local-candidates-prepared")) {
++			"farstream-local-candidates-prepared")) {
+ 		const GValue *value;
+ 		FsStream *stream;
+ 		FsParticipant *participant;
+@@ -942,7 +945,7 @@ gst_handle_message_element(GstBus *bus,
+ 		g_signal_emit_by_name(self, "candidates-prepared",
+ 				session->id, name);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-new-active-candidate-pair")) {
++			"farstream-new-active-candidate-pair")) {
+ 		const GValue *value;
+ 		FsStream *stream;
+ 		FsCandidate *local_candidate;
+@@ -976,7 +979,7 @@ gst_handle_message_element(GstBus *bus,
+ 		g_object_unref(lcandidate);
+ 		g_object_unref(rcandidate);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-recv-codecs-changed")) {
++			"farstream-recv-codecs-changed")) {
+ 		const GValue *value;
+ 		GList *codecs;
+ 		FsCodec *codec;
+@@ -986,10 +989,10 @@ gst_handle_message_element(GstBus *bus,
+ 		codec = codecs->data;
+ 
+ 		purple_debug_info("backend-fs2",
+-				"farsight-recv-codecs-changed: %s\n",
++				"farstream-recv-codecs-changed: %s\n",
+ 				codec->encoding_name);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-component-state-changed")) {
++			"farstream-component-state-changed")) {
+ 		const GValue *value;
+ 		FsStreamState fsstate;
+ 		guint component;
+@@ -1025,11 +1028,11 @@ gst_handle_message_element(GstBus *bus,
+ 		}
+ 
+ 		purple_debug_info("backend-fs2",
+-				"farsight-component-state-changed: "
++				"farstream-component-state-changed: "
+ 				"component: %u state: %s\n",
+ 				component, state);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-send-codec-changed")) {
++			"farstream-send-codec-changed")) {
+ 		const GValue *value;
+ 		FsCodec *codec;
+ 		gchar *codec_str;
+@@ -1039,12 +1042,12 @@ gst_handle_message_element(GstBus *bus,
+ 		codec_str = fs_codec_to_string(codec);
+ 
+ 		purple_debug_info("backend-fs2",
+-				"farsight-send-codec-changed: codec: %s\n",
++				"farstream-send-codec-changed: codec: %s\n",
+ 				codec_str);
+ 
+ 		g_free(codec_str);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-codecs-changed")) {
++			"farstream-codecs-changed")) {
+ 		const GValue *value;
+ 		FsSession *fssession;
+ 		GList *sessions;
+@@ -1220,8 +1223,12 @@ stream_info_cb(PurpleMedia *media, Purpl
+ 				purple_media_is_initiator(media, sid, name))
+ 			return;
+ 
+-		fs_stream_set_remote_candidates(stream->stream,
+-				stream->remote_candidates, &err);
++		if (stream->supports_add)
++		  fs_stream_add_remote_candidates(stream->stream,
++			  	stream->remote_candidates, &err);
++		else
++		  fs_stream_force_remote_candidates(stream->stream,
++			  	stream->remote_candidates, &err);
+ 
+ 		if (err == NULL)
+ 			return;
+@@ -1301,6 +1308,7 @@ init_conference(PurpleMediaBackendFs2 *s
+ 	GstElement *pipeline;
+ 	GstBus *bus;
+ 	gchar *name;
++	GKeyFile *default_props;
+ 
+ 	priv->conference = FS_CONFERENCE(
+ 			gst_element_factory_make(priv->conference_type, NULL));
+@@ -1343,6 +1351,14 @@ init_conference(PurpleMediaBackendFs2 *s
+ 		return FALSE;
+ 	}
+ 
++	default_props = fs_utils_get_default_element_properties(GST_ELEMENT(priv->conference));
++	if (default_props != NULL) {
++		priv->notifier = fs_element_added_notifier_new();
++		fs_element_added_notifier_add(priv->notifier,
++					      GST_BIN(priv->confbin));
++		fs_element_added_notifier_set_properties_from_keyfile(priv->notifier, default_props);
++	}
++
+ 	g_signal_connect(G_OBJECT(bus), "message",
+ 			G_CALLBACK(gst_bus_cb), self);
+ 	gst_object_unref(bus);
+@@ -1559,7 +1575,7 @@ create_session(PurpleMediaBackendFs2 *se
+ 	 * receiving the src-pad-added signal.
+ 	 * Only works for non-multicast FsRtpSessions.
+ 	 */
+-	if (is_nice || !strcmp(transmitter, "rawudp"))
++	if (!!strcmp(transmitter, "multicast"))
+ 		g_object_set(G_OBJECT(session->session),
+ 				"no-rtcp-timeout", 0, NULL);
+ 
+@@ -1612,7 +1628,7 @@ create_participant(PurpleMediaBackendFs2
+ 	GError *err = NULL;
+ 
+ 	participant = fs_conference_new_participant(
+-			priv->conference, name, &err);
++			priv->conference, &err);
+ 
+ 	if (err) {
+ 		purple_debug_error("backend-fs2",
+@@ -1622,6 +1638,12 @@ create_participant(PurpleMediaBackendFs2
+ 		return FALSE;
+ 	}
+ 
++	if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant),
++					 "cname")) {
++	  g_object_set(participant, "cname", &name, NULL);
++	}
++
++
+ 	if (!priv->participants) {
+ 		purple_debug_info("backend-fs2",
+ 				"Creating hash table for participants\n");
+@@ -1786,6 +1808,40 @@ create_stream(PurpleMediaBackendFs2 *sel
+ 		}
+ 	}
+ 
++
++	session = get_session(self, sess_id);
++
++	if (session == NULL) {
++		purple_debug_error("backend-fs2",
++				"Couldn't find session to create stream.\n");
++		return FALSE;
++	}
++
++	participant = get_participant(self, who);
++
++	if (participant == NULL) {
++		purple_debug_error("backend-fs2", "Couldn't find "
++				"participant to create stream.\n");
++		return FALSE;
++	}
++
++	fsstream = fs_session_new_stream(session->session, participant,
++			initiator == TRUE ? type_direction :
++			(type_direction & FS_DIRECTION_RECV), &err);
++
++	if (fsstream == NULL) {
++		if (err) {
++			purple_debug_error("backend-fs2",
++					"Error creating stream: %s\n",
++					err && err->message ?
++					err->message : "NULL");
++			g_error_free(err);
++		} else
++			purple_debug_error("backend-fs2",
++					"Error creating stream\n");
++		return FALSE;
++	}
++
+ 	memcpy(_params, params, sizeof(GParameter) * num_params);
+ 
+ 	/* set the controlling mode parameter */
+@@ -1840,45 +1896,22 @@ create_stream(PurpleMediaBackendFs2 *sel
+ 		_num_params++;
+ 	}
+ 
+-	session = get_session(self, sess_id);
+ 
+-	if (session == NULL) {
+-		purple_debug_error("backend-fs2",
+-				"Couldn't find session to create stream.\n");
+-		return FALSE;
+-	}
+-
+-	participant = get_participant(self, who);
+-
+-	if (participant == NULL) {
+-		purple_debug_error("backend-fs2", "Couldn't find "
+-				"participant to create stream.\n");
+-		return FALSE;
++	if(!fs_stream_set_transmitter(fsstream, transmitter,
++				      _params, _num_params, &err)) {
++	     purple_debug_error("backend-fs2", "Could not set transmitter %s: %s.\n", transmitter, err->message);
++	     g_clear_error(&err);
++	     g_free(_params);
++	     return FALSE;
+ 	}
+-
+-	fsstream = fs_session_new_stream(session->session, participant,
+-			initiator == TRUE ? type_direction :
+-			(type_direction & FS_DIRECTION_RECV), transmitter,
+-			_num_params, _params, &err);
+ 	g_free(_params);
+ 
+-	if (fsstream == NULL) {
+-		if (err) {
+-			purple_debug_error("backend-fs2",
+-					"Error creating stream: %s\n",
+-					err && err->message ?
+-					err->message : "NULL");
+-			g_error_free(err);
+-		} else
+-			purple_debug_error("backend-fs2",
+-					"Error creating stream\n");
+-		return FALSE;
+-	}
+ 
+ 	stream = g_new0(PurpleMediaBackendFs2Stream, 1);
+ 	stream->participant = g_strdup(who);
+ 	stream->session = session;
+ 	stream->stream = fsstream;
++	stream->supports_add = !strcmp(transmitter, "nice");
+ 
+ 	priv->streams =	g_list_append(priv->streams, stream);
+ 
+@@ -1991,7 +2024,11 @@ purple_media_backend_fs2_add_remote_cand
+ 	if (purple_media_is_initiator(priv->media, sess_id, participant) ||
+ 			purple_media_accepted(
+ 			priv->media, sess_id, participant)) {
+-		fs_stream_set_remote_candidates(stream->stream,
++  	        if (stream->supports_add)
++		     fs_stream_add_remote_candidates(stream->stream,
++				stream->remote_candidates, &err);
++		else
++		     fs_stream_force_remote_candidates(stream->stream,
+ 				stream->remote_candidates, &err);
+ 
+ 		if (err) {
+diff -upr pidgin-2.10.1.orig/libpurple/media.c pidgin-2.10.1/libpurple/media.c
+--- pidgin-2.10.1.orig/libpurple/media.c	2011-12-06 10:44:33.000000000 +0200
++++ pidgin-2.10.1/libpurple/media.c	2012-03-10 18:21:19.000000000 +0200
+@@ -1067,7 +1067,6 @@ purple_media_add_stream(PurpleMedia *med
+ {
+ #ifdef USE_VV
+ 	PurpleMediaSession *session;
+-	PurpleMediaStream *stream = NULL;
+ 
+ 	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
+ 
+@@ -1103,7 +1102,7 @@ purple_media_add_stream(PurpleMedia *med
+ 	}
+ 
+ 	if (purple_media_get_stream(media, sess_id, who) == NULL) {
+-		stream = purple_media_insert_stream(session, who, initiator);
++		purple_media_insert_stream(session, who, initiator);
+ 
+ 		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
+ 				0, PURPLE_MEDIA_STATE_NEW,
+diff -upr pidgin-2.10.1.orig/libpurple/mediamanager.c pidgin-2.10.1/libpurple/mediamanager.c
+--- pidgin-2.10.1.orig/libpurple/mediamanager.c	2011-12-06 10:44:33.000000000 +0200
++++ pidgin-2.10.1/libpurple/mediamanager.c	2012-03-10 18:27:05.000000000 +0200
+@@ -39,7 +39,7 @@
+ #ifdef USE_VV
+ #include <media/backend-fs2.h>
+ 
+-#include <gst/farsight/fs-element-added-notifier.h>
++#include <farstream/fs-element-added-notifier.h>
+ #include <gst/interfaces/xoverlay.h>
+ 
+ /** @copydoc _PurpleMediaManagerPrivate */
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index c70baf064..b18b302f2 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150933 2012-02-24 01:09:55Z tdziedzic $
+# $Id: PKGBUILD 153438 2012-03-13 23:17:57Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
-pkgver=1.4.5
-pkgrel=6
+pkgver=1.4.7
+pkgrel=1
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rrdtool.org"
@@ -16,13 +16,11 @@ optdepends=('tcl: to use corresponding binding' \
             'lua: to use corresponding binding')
 options=('!libtool' '!emptydirs' '!makeflags')
 source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz)
-sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35')
+sha1sums=('faab7df7696b69f85d6f89dd9708d7cf0c9a273b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl |' bindings/perl-shared/Makefile.PL
-
   # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby
   sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in
 
diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD
index a04c79c99..af90b1df2 100644
--- a/extra/xf86-input-synaptics/PKGBUILD
+++ b/extra/xf86-input-synaptics/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 153311 2012-03-12 20:52:51Z andyrtr $
+# $Id: PKGBUILD 153467 2012-03-14 18:01:52Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski  <tpowa@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-input-synaptics
-pkgver=1.5.99
-pkgrel=0.2
-_gitver=dfc3a8ed713c2878407c6443c4d3092da3125e0c
+pkgver=1.5.99.901
+pkgrel=1
 pkgdesc="Synaptics driver for notebook touchpads"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
-depends=('libxtst')
+depends=('libxtst' 'mtdev')
 makedepends=('xorg-server-devel>=1.11.99.902' 'libxi' 'libx11')
 conflicts=('xorg-server<1.11.99.902')
 replaces=('synaptics')
@@ -21,23 +20,19 @@ conflicts=('synaptics')
 groups=('xorg-drivers' 'xorg')
 options=(!libtool)
 backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
-source=(#http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-		http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/snapshot/xf86-input-synaptics-${_gitver}.tar.gz
+source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         10-synaptics.conf)
-md5sums=('5e21cc5c7f61802ac340968caf9db7de'
-         '3b81a81b958dfe3cac3cdef7ee85f1ce')
+sha1sums=('8836b1c2bf443b2c11f38457e203c5309698d9d0'
+          '68e1f4ef5e1038231d210eb422fa4d18c5922f0f')
 
 build() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
-  autoreconf -fi
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
   install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/"