Wed Mar 27 00:05:42 PDT 2013

25 files changed, 302 insertions, 297 deletions

diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index c153916c9..e1719ecc2 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,66 +1,45 @@
-# $Id: PKGBUILD 176990 2013-02-03 14:59:10Z schiv $
+# $Id: PKGBUILD 180842 2013-03-26 21:39:25Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-# ardour, liblrdf and raptor are heavily dependent on each other. Updating of
-# one package mostly will require an update of all the other packages. I vote
-# for fixed dependencies speaking in terms of versions -- tobias
-
-# SYSLIBS enabled, support still valid; see ardour 2.8.13 rel notes
-# http://ardour.org/node/5263
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+# Contributor: see .contrib
 
 pkgname=ardour
-pkgver=2.8.16
+pkgver=3.0
 pkgrel=1
-pkgdesc="A multichannel hard disk recorder and digital audio workstation"
+pkgdesc="Professional-grade digital audio workstation"
 arch=('i686' 'x86_64')
 url="http://ardour.org/"
 license=('GPL')
-depends=('liblrdf' 'libusb-compat' 'liblo' 'soundtouch'
-         'aubio' 'lilv' 'suil' 'libgnomecanvasmm')
-         # -libgnomecanvas(+libgnomecanvasmm)
-         # +soundtouch (these +/- changes are for SYSLIBS=1)
-         # cwiid removed for https://bugs.archlinux.org/task/28344
-makedepends=('scons' 'boost')
-changelog=$pkgname.changelog
-source=("ftp://ftp.archlinux.org/other/ardour/$pkgname-$pkgver.tar.bz2"
+depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0'
+         'aubio' 'libgnomecanvasmm' 'suil>=0.6.12')
+makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz')
+install=$pkgname.install
+source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2"
         "$pkgname.desktop")
-md5sums=('5bafe41df00d25e7a357baaa1038f16d'
-         '8aeaf433ebf781733db48e5a16b0c4da')
+md5sums=('2759df2ac29e6075e006cc5b262bfee0'
+         '316bd21ece5e2208a104fd09cac521af')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  # ardour defaults to -O3; use this in CFLAGS below
-  sed -i '/-O3/d' SConstruct
+  # python2 fix
+  sed -i 's/python ${SRC}/python2 ${SRC}/' libs/pbd/wscript
 
-  # work around boost linking error (see ardour3 svn r13081)
-  # thanks to Harry Harren for the heads-up
-  CFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED"
-  CXXFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED"
-  export CFLAGS CXXFLAGS
+  python2 waf configure --prefix=/usr \
+                        --configdir=/etc \
+                        --docs
 
-  scons $MAKEFLAGS ARCH="${CFLAGS/-O[0-9]/-O3}" \
-                   PREFIX="/usr" \
-                   DIST_LIBDIR="lib" \
-                   FREEDESKTOP=0 \
-                   FREESOUND=1 \
-                   SYSLIBS=1
+  python2 waf build $MAKEFLAGS
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  scons DESTDIR="$pkgdir" install
+  python2 waf install --destdir="$pkgdir"
 
   # install some freedesktop.org compatibility
   install -Dm644 "$srcdir/$pkgname.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
-
-  # upstream will not do this
-  # install templates
-  cp -r templates "$pkgdir/usr/share/ardour2/"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/ardour/ardour.changelog b/extra/ardour/ardour.changelog
deleted file mode 100644
index 242d5a78a..000000000
--- a/extra/ardour/ardour.changelog
+++ /dev/null
@@ -1,55 +0,0 @@
-11 Aug 2012 (GMT+8) Ray Rashif <schiv@archlinux.org>
-	* 2.8.14:
-	Upstream release
-	Dep on new (s)lv2 stack (lilv, suil et al replaces slv2)
-	SYSLIBS turned on by upstream decree; see 2.8.13 release notes
-
-15 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 2.8.11-5:
-	Resolve previous issues with slv2 & redland/rasqal/raptor
-		- just needed rebuild of slv2 against latest redland suite [1]
-		- also needed ardour buildsystem patch for raptor2 [1][2]
-		- bring back support for slv2
-
-	[1] https://bugs.archlinux.org/task/25060
-	[2] http://tracker.ardour.org/view.php?id=4179
-
-9 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 2.8.11-4:
-	Fix build failures and runtime segfaults
-		- gcc 4.6 patch
-		- enable SYSLIBS due to ardour sigc++ issues
-		- remove slv2 dep due to ardour rasqal incompatibility [1][2]
-
-	[1] https://bugs.archlinux.org/task/25060
-	[2] https://ardour.org/node/4301
-
-22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 2.8.11-2 :
-	raptor rebuild
-
-9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 2.8.11-1 :
-	Testing build.
-	Removed libgnomecanvasmm depend (ardour internal).
-	Removed soundtouch makedepend (ardour internal, unneded).
-	Added new depends
-		- slv2 ("LV2" plug-ins support)
-		- rubberband (can "do more" than soundtouch)
-		- libgnomecanvas
-	Not using SYSLIBS because upstream does not support it.
-	Namcap warnings can be ignored; they're ardour internals.
-
-	* PKGBUILD :
-	Minor cosmetic ammendments.
-
-	* ardour.changelog :
-	Added this changelog.
-	Only important changes will be logged.
-
-	* ardour.install :
-	Removed install scriptlet; old and deprecated information.
diff --git a/extra/ardour/ardour.desktop b/extra/ardour/ardour.desktop
index b50f6c952..de68483e1 100644
--- a/extra/ardour/ardour.desktop
+++ b/extra/ardour/ardour.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Ardour
+Name=Ardour 3
 Comment=Multitrack hard disk recorder
-Exec=ardour2
-Icon=/usr/share/ardour2/icons/ardour_icon_48px.png
+Exec=ardour3
+Icon=/usr/share/ardour3/icons/ardour_icon_48px.png
 Terminal=false
 Type=Application
 X-MultipleArgs=false
diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install
new file mode 100644
index 000000000..555d7377d
--- /dev/null
+++ b/extra/ardour/ardour.install
@@ -0,0 +1,21 @@
+post_install() {
+  cat << MSG
+  > Ardour 3 has support for native "Linux" VSTs. You may want to export
+  > LXVST_PATH to include any custom directories of *.so VST plug-ins.
+
+  > Please consider supporting Paul Davis, lead developer of Ardour, by
+  > either subscribing or at least donating to the project's cause:
+
+      https://community.ardour.org/s/subscribe
+      https://community.ardour.org/donate
+
+  > With your continued support, Ardour will continue to improve and will
+  > one day no longer be dependent on unstable funding.
+MSG
+}
+
+post_upgrade() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 15d67acac..cd61d1341 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176283 2013-01-28 16:48:15Z stephane $
+# $Id: PKGBUILD 180800 2013-03-26 11:49:27Z foutrelis $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
@@ -10,106 +10,97 @@ pkgbase=boost
 pkgname=('boost-libs' 'boost')
 pkgver=1.52.0
 _boostver=${pkgver//./_}
-pkgrel=1
-arch=('i686' 'x86_64')
+pkgrel=2
 url="http://www.boost.org/"
-makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz)
+arch=('i686' 'x86_64')
 license=('custom')
-sha1sums=('1120430030315b0a94b6d63fc04662960db2444c')
+makedepends=('icu>=51.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
+source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
+       boost-1.52.0-python3.patch)
+sha1sums=('1120430030315b0a94b6d63fc04662960db2444c'
+          '34026072a7cb2534164f20e77bb71a5c75093307')
 
 _stagedir="${srcdir}/stagedir"
 
 build() {
-  # set python path for bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools"
-  echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
-  echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> build/v2/user-config.jam
-  echo "using mpi ;" >> build/v2/user-config.jam
-
-  cd "${srcdir}"/${pkgbase}_${_boostver}
-
-  # build bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
-  ./build.sh cc
-
-  _bindir="bin.linuxx86"
-  [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
-
-  install -d "${_stagedir}"/usr/bin
-  install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
-
-  # build tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/"
-  "${_stagedir}"/usr/bin/bjam --toolset=gcc
-
-  # copy the tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin"
-  for i in *;do
-      install -m755 "${i}" "${_stagedir}/usr/bin/${i}"
-  done
-
-  #boostbook needed by quickbook
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/"
-  cp -r share "${_stagedir}"
-
-  # build libs
-  cd "${srcdir}/${pkgbase}_${_boostver}"
-
-  # default "minimal" install: "release link=shared,static
-  # runtime-link=shared threading=single,multi"
-  # --layout=tagged will add the "-mt" suffix for multithreaded libraries
-  # and installs includes in /usr/include/boost.
-  # --layout=system no longer adds the -mt suffix for multi-threaded libs.
-  # install to ${_stagedir} in preparation for split packaging
-
-  "${_stagedir}"/usr/bin/bjam \
-      release debug-symbols=off threading=multi \
-      runtime-link=shared link=shared,static \
-      cflags=-fno-strict-aliasing \
+   local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
+    
+   cd "${srcdir}/${pkgbase}_${_boostver}"
+
+   # Fix build errors with python 3
+   sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh
+   patch -Np1 -i ../boost-1.52.0-python3.patch
+
+   # Shut up strict aliasing warnings
+   echo "using gcc : : : <compileflags>-fno-strict-aliasing ;" >> ./tools/build/v2/user-config.jam
+   # Add an extra python version. This does not replace anything and python 2.x need to be the default.
+   echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> ./tools/build/v2/user-config.jam
+   # Support for OpenMPI
+   echo "using mpi ;" >> ./tools/build/v2/user-config.jam
+
+   ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2
+
+   _bindir="bin.linuxx86"
+   [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
+
+   install -d -m 755 "${_stagedir}"/bin
+   install "${srcdir}"/${pkgbase}_${_boostver}/tools/build/v2/engine/${_bindir}/bjam "${_stagedir}"/bin/bjam
+
+   pushd tools
+   for _tool in bcp inspect quickbook compiler_status process_jam_log wave; do
+      "${_stagedir}"/bin/bjam --toolset=gcc $_tool
+   done
+   "${_stagedir}"/bin/bjam --toolset=gcc cflags="-std=gnu++11" library_status
+   popd
+   cp -a dist/bin/* "${_stagedir}"/bin
+   
+   #boostbook is needed by quickbook
+   install -d -m 755 "${_stagedir}"/share/boostbook
+   cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/
+
+   # default "minimal" install: "release link=shared,static
+   # runtime-link=shared threading=single,multi"
+   # --layout=tagged will add the "-mt" suffix for multithreaded libraries
+   # and installs includes in /usr/include/boost.
+   # --layout=system no longer adds the -mt suffix for multi-threaded libs.
+   # install to ${_stagedir} in preparation for split packaging
+   "${_stagedir}"/bin/bjam \
+      release \
+      debug-symbols=off \
+      threading=multi \
+      runtime-link=shared \
+      link=shared \
       toolset=gcc \
-      --prefix="${_stagedir}" \
-      -sTOOLS=gcc \
       --layout=system \
-      ${MAKEFLAGS} \
+      --prefix="${_stagedir}" \
+      ${JOBS} \
       install
+
+   find ${_stagedir} -name \*.a -exec rm -f {} \;
 }
 
 package_boost() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
-    depends=("boost-libs=${pkgver}")
-    optdepends=('python: for python3 bindings'
-                'python2: for python2 bindings'
-		'boost-build: to use boost jam for building your project.')
-
-    install -d "${pkgdir}"/usr/{include,lib,share}
-    # headers/source files
-    cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
-
-    # static libs
-    cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/
-
-    # utilities (bjam, bcp, pyste)
-    cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
+   pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
+   depends=("boost-libs=${pkgver}")
+   optdepends=('python: for python bindings'
+               'python2: for python2 bindings'
+               'boost-build: to use boost jam for building your project.')
 
-    #boostbook
-    cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share
+   install -d -m 755 "${pkgdir}"/usr
+   cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr
 
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
+   install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \
+      "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
 }
 
 package_boost-libs() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
-    depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
-    optdepends=('openmpi: for mpi support')
+   pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
+   depends=('bzip2' 'zlib' 'icu')
+   optdepends=('openmpi: for mpi support')
 
-    install -d "${pkgdir}/usr/lib"
-    #shared libs
-    cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
+   install -d -m 755 "${pkgdir}"/usr
+   cp -a "${_stagedir}"/lib "${pkgdir}"/usr
 
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
+   install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \
+      "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
 }
diff --git a/extra/boost/boost-1.52.0-python3.patch b/extra/boost/boost-1.52.0-python3.patch
new file mode 100644
index 000000000..8d2f59269
--- /dev/null
+++ b/extra/boost/boost-1.52.0-python3.patch
@@ -0,0 +1,96 @@
+diff -Naur boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp boost_1_53_0/libs/mpi/src/python/datatypes.cpp
+--- boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp	2007-11-25 13:38:02.000000000 -0500
++++ boost_1_53_0/libs/mpi/src/python/datatypes.cpp	2013-03-11 20:59:57.171732691 -0400
+@@ -13,6 +13,10 @@
+ #include <boost/mpi/python/serialize.hpp>
+ #include <boost/mpi.hpp>
+ 
++#if PY_MAJOR_VERSION >= 3
++#define PyInt_Type PyLong_Type
++#endif
++
+ namespace boost { namespace mpi { namespace python {
+ 
+ void export_datatypes()
+diff -Naur boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp boost_1_53_0/libs/mpi/src/python/py_environment.cpp
+--- boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp	2007-11-25 13:38:02.000000000 -0500
++++ boost_1_53_0/libs/mpi/src/python/py_environment.cpp	2013-03-11 21:02:12.961737401 -0400
+@@ -11,6 +11,9 @@
+  *  This file reflects the Boost.MPI "environment" class into Python
+  *  methods at module level.
+  */
++
++#include <locale>
++#include <string>
+ #include <boost/python.hpp>
+ #include <boost/mpi.hpp>
+ 
+@@ -50,11 +53,65 @@
+ 
+   // If anything changed, convert C-style argc/argv into Python argv
+   if (mpi_argv != my_argv)
++  {
++#if PY_MAJOR_VERSION >= 3
++    // Code stolen from py3k/Modules/python.c.
++
++    wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
++    /* We need a second copies, as Python might modify the first one. */
++    wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
++
++    if (!argv_copy || !argv_copy2) {
++      fprintf(stderr, "out of memory\n");
++      return false;
++    }
++
++    std::locale mylocale;
++    mbstate_t mystate;
++
++    const std::codecvt<char, wchar_t, mbstate_t>& myfacet =
++      std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale);
++
++    for (int i = 0; i < mpi_argc; i++) 
++    {
++      size_t length = strlen(mpi_argv[i]);
++
++      wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1));
++
++      const char *from_next;
++      wchar_t *to_next;
++
++      std::codecvt<wchar_t,char,mbstate_t>::result myresult = 
++        myfacet.out(mystate,
++            mpi_argv[i], mpi_argv[i] + length + 1, from_next,
++            dest, dest+length+1, to_next);
++
++      if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok )
++      {
++        fprintf(stderr, "failure translating argv\n");
++        return 1;
++      }
++
++      argv_copy2[i] = argv_copy[i] = dest;
++      if (!argv_copy[i])
++          return false;
++    }
++
++    PySys_SetArgv(mpi_argc, argv_copy);
++
++    for (int i = 0; i < mpi_argc; i++) {
++        PyMem_Free(argv_copy2[i]);
++    }
++    PyMem_Free(argv_copy);
++    PyMem_Free(argv_copy2);
++#else
+     PySys_SetArgv(mpi_argc, mpi_argv);
++#endif
++  }
+ 
+-  for (int arg = 0; arg < my_argc; ++arg)
+-    free(my_argv[arg]);
+-  delete [] my_argv;
++  for (int arg = 0; arg < mpi_argc; ++arg)
++    free(mpi_argv[arg]);
++  delete [] mpi_argv;
+ 
+   return true;
+ }
diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index 45b854d34..1405c33f0 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 175866 2013-01-23 00:12:57Z eric $
+# $Id: PKGBUILD 180801 2013-03-26 11:49:28Z foutrelis $
 # Maintainer:
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=brltty
 pkgver=4.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Braille display driver for Linux/Unix"
 arch=('i686' 'x86_64')
 url="http://mielke.cc/brltty"
 license=('GPL' 'LGPL')
-depends=('libxaw' 'at-spi2-core' 'gpm' 'icu>=50.1.2' 'tcl' 'atk' 'pyrex')
+depends=('libxaw' 'at-spi2-core' 'gpm' 'icu>=51.1' 'tcl' 'atk' 'pyrex')
 makedepends=('bluez')
 optdepends=('bluez: bluetooth support')
 backup=(etc/brltty.conf etc/conf.d/brltty.conf)
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index b01af8eee..1a3759c0b 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180550 2013-03-23 07:23:55Z bpiotrowski $
+# $Id: PKGBUILD 180802 2013-03-26 11:49:30Z foutrelis $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -18,7 +18,7 @@ pkgname=('calligra-filters'
          'calligra-braindump'
          'calligra-flow')
 pkgver=2.6.2
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
@@ -215,6 +215,7 @@ package_calligra-flow() {
   conflicts=('calligra-flow-doc')
   replaces=('calligra-flow-doc')
   install=calligra-flow.install
+  optdepends=('calligra-karbon: to export the charts in various formats')
 
   cd "${srcdir}"/build/flow
   make DESTDIR="${pkgdir}" install
diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD
index 00c55118f..f0bf3edf9 100644
--- a/extra/gptfdisk/PKGBUILD
+++ b/extra/gptfdisk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 177797 2013-02-09 01:45:32Z foutrelis $
+# $Id: PKGBUILD 180803 2013-03-26 11:49:32Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Hokum <hokum_at_mail_dot_ru>
 
 pkgname=gptfdisk
 pkgver=0.8.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
 arch=('i686' 'x86_64')
 url="http://www.rodsbooks.com/gdisk/"
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index 69ec71c15..5bb0db2e0 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175869 2013-01-23 00:13:03Z eric $
+# $Id: PKGBUILD 180804 2013-03-26 11:49:33Z foutrelis $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=harfbuzz
-pkgver=0.9.9
-pkgrel=3
+pkgver=0.9.14
+pkgrel=1
 pkgdesc="OpenType text shaping engine."
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -13,7 +13,7 @@ makedepends=('icu' 'cairo' 'glib2' 'freetype2')
 optdepends=('cairo: hb-view program')
 options=(!libtool)
 source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3d8dd4ebbc38da011485ef181f8ff072b4b0d7e305bbda19b355f217d25169cf')
+sha256sums=('d07c0ffdbbbfdfbb6c65e73fe9c76466e87dbf04b094cbd0abf5fd7d571a4004')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index b2bafa9c5..690d4ec3b 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175783 2013-01-21 17:03:37Z stephane $
+# $Id: PKGBUILD 180744 2013-03-26 01:47:54Z stephane $
 # Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
 # Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
 
 pkgname=hwloc
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=1
 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('sh' 'pciutils' 'cairo' 'libxml2')
 makedepends=('pkg-config')
 options=('!libtool' '!docs')
 source=(http://www.open-mpi.org/software/hwloc/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('9d02234d6abd5332675957506e4d8144c515e986')
+sha1sums=('f9d9938d427e65257d1745ffc1d10634251cdc09')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index 8122fc58c..d2b74f769 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175870 2013-01-23 00:13:04Z eric $
+# $Id: PKGBUILD 180805 2013-03-26 11:49:34Z foutrelis $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Art Gramlich <art@gramlich-net.com>
 
 pkgname=icu
-pkgver=50.1.2
+pkgver=51.1
 pkgrel=1
 pkgdesc="International Components for Unicode library"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ depends=('gcc-libs>=4.7.1-5' 'sh')
 source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
 	    http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
 	    icu.8198.revert.icu5431.patch)
-md5sums=('beb98aa972219c9fcd9c8a71314943c9'
+md5sums=('6eef33b229d0239d654983028c9c7053'
          'ebd5470fc969c75e52baf4af94a9ee82')
 
 build() {
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index b7654765c..e3b811c32 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180320 2013-03-20 04:16:52Z eric $
+# $Id: PKGBUILD 180839 2013-03-26 18:36:41Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.3.10
+pkgver=6.8.4.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
@@ -13,7 +13,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
 #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
 source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-sha1sums=('2a80effb525ea87e6eef96d30def680175ff3222'
+sha1sums=('e79b197cc17f1053ed5ff22f2eea73e01f94aeb5'
           'e143cf9d530fabf3b58023899b5cc544ba93daec')
 
 build() {
@@ -63,7 +63,7 @@ package_imagemagick() {
   options=('!docs' 'libtool' '!emptydirs')
 
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make DESTDIR="${pkgdir}" install
+  make -j1 DESTDIR="${pkgdir}" install
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
   install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
 
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index ac49b5778..95cc63dfe 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180591 2013-03-24 07:51:29Z andyrtr $
+# $Id: PKGBUILD 180806 2013-03-26 11:49:36Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -21,7 +21,7 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
 _LOver=4.0.1.2
 pkgver=4.0.1
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -32,7 +32,7 @@ makedepends=( # makedepends
              'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez'
              # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1-2" 
+             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" 
              'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.2' 
              'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
 	         'ttf-dejavu') # to satisfy regression tests
@@ -282,7 +282,7 @@ package_libreoffice-common() {
  pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
  install=libreoffice-common.install
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib'
-          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' "poppler>=0.22.2"
+          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.2"
           'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') # 'orbit2')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
diff --git a/extra/libwacom/PKGBUILD b/extra/libwacom/PKGBUILD
index ee919f122..aaf22f835 100644
--- a/extra/libwacom/PKGBUILD
+++ b/extra/libwacom/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 164253 2012-07-28 20:26:26Z eric $
+# $Id: PKGBUILD 180845 2013-03-26 22:37:55Z eric $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libwacom
-pkgver=0.6
+pkgver=0.7
 pkgrel=1
 pkgdesc="Library to identify Wacom tablets and their features"
 arch=('x86_64' 'i686')
 url="http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Libwacom"
 license=('MIT')
-depends=('glib2' 'systemd-tools')
+depends=('glib2' 'systemd')
 options=('!libtool')
 source=(http://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7115690698edc87deec482f0b2526567b858475d2135b5f8ccc946e5e76ec01d')
+sha256sums=('210c48b595461ebee63b1a846a6eb1d8f029b49d02ccbde34eadf551a5a68a78')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 224dc4210..a9e616335 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179613 2013-03-08 14:04:07Z giovanni $
+# $Id: PKGBUILD 180835 2013-03-26 16:00:15Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2013.03.07
+pkgver=2013.03.23
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('1cdef2dbc7d790f48051194125faf64b')
+md5sums=('e9a75e0cfbf4f25aedd4ee4a10a7c26f')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index 399be0add..573ac890a 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180012 2013-03-14 18:21:32Z bpiotrowski $
+# $Id: PKGBUILD 180833 2013-03-26 15:59:12Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
 pkgver=5.5.30
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'
diff --git a/extra/mariadb/mariadb.install b/extra/mariadb/mariadb.install
index c99114c07..7d3c2ce5c 100644
--- a/extra/mariadb/mariadb.install
+++ b/extra/mariadb/mariadb.install
@@ -13,7 +13,7 @@ post_install(){
     chown -R mysql:mysql var/lib/mysql &>/dev/null
   fi
 
-  usr/bin/systemd-tmpfiles --create mysqld.conf
+  usr/bin/systemd-tmpfiles --create mysql.conf
 
   echo ">> If you are migrating from MySQL, don't forget to run 'mysql_upgrade'"
   echo "     after mysqld.service restart." 
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 850dbaef6..1a18b2162 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180290 2013-03-19 19:00:59Z pierre $
+# $Id: PKGBUILD 180807 2013-03-26 11:49:38Z foutrelis $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -22,7 +22,7 @@ pkgname=('php'
          'php-tidy'
          'php-xsl')
 pkgver=5.4.13
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index 693f2904a..ce4ba16aa 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 177618 2013-02-08 07:48:31Z ronald $
+# $Id: PKGBUILD 180808 2013-03-26 11:49:39Z foutrelis $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: K. Piche <kpiche@rogers.com>
 
 pkgname=r
-pkgver=2.15.2
-pkgrel=3
+pkgver=2.15.3
+pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,21 +13,19 @@ url=('http://www.r-project.org/')
 depends=('blas' 'lapack' 'bzip2'  'libpng' 'libjpeg' 'libtiff'
          'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs'
          'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils')
-makedepends=('openjdk6' 'gcc-fortran' 'tk>=8.6.0')
+makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk')
 optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files')
 backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories')
 options=('!makeflags' '!emptydirs')
+install=r.install
 source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
 	'r.desktop'
 	'r.png'
-	'R.conf'
-	'x11.patch')
-install=r.install
-sha1sums=('c80da687d66ee88d1e34fc1ae5c1bd525f9513dd'
+	'R.conf')
+sha1sums=('a05b68f31b00d8038d9f0a8562cfc0c8e32d9621'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
           'a69a07ec363440efc18ce0a7f2af103375dea978'
-          '43668da6cfd1b4455a99f23e79e2059294dddac9'
-          'a11b91d53645bd545fddc382c991096502e8ac67')
+          '43668da6cfd1b4455a99f23e79e2059294dddac9')
 
 build() {
    cd "${srcdir}/R-${pkgver}"
@@ -36,8 +34,8 @@ build() {
   # set texmf dir correctly in makefile
   sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
 
-  # upstream patch fixing empty plots FS#32597
-  patch -Np0 -i ${srcdir}/x11.patch
+# fix for texinfo 5.X
+  sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure
 
    ./configure  --prefix=/usr \
 		--libdir=/usr/lib \
@@ -53,11 +51,19 @@ build() {
                 F77=gfortran \
 		LIBnn=lib
    make
+
+# make libRmath.so
+   cd src/nmath/standalone
+   make shared
 }
 
 package() {
    cd "${srcdir}/R-${pkgver}"
-   make -j1 DESTDIR="${pkgdir}" install
+   make DESTDIR="${pkgdir}" install
+
+# install libRmath.so
+   cd src/nmath/standalone
+   make DESTDIR="${pkgdir}" install
 
    #  Fixup R wrapper scripts.
    sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
@@ -80,5 +86,5 @@ package() {
   done
 
   # Install ld.so.conf.d file to ensure other applications access the shared lib
-  install -Dm644 ${srcdir}/R.conf ${pkgdir}/etc/ld.so.conf.d/R.conf
+  install -Dm644 "${srcdir}/R.conf" "${pkgdir}/etc/ld.so.conf.d/R.conf"
 }
diff --git a/extra/r/x11.patch b/extra/r/x11.patch
deleted file mode 100644
index 3a02b28ea..000000000
--- a/extra/r/x11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/modules/X11/devX11.c	(révision 61681)
-+++ src/modules/X11/devX11.c	(révision 61682)
-@@ -244,6 +244,7 @@ 
- {
-     if(inclose || !xd || !xd->buffered || xd->holdlevel > 0) return;
-     cairo_paint(xd->xcc);
-+    cairo_surface_flush(xd->xcs);
-     if (xd->type == WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
-     XSync(display, 0);
-     xd->last = currentTime();
-@@ -753,8 +754,10 @@ 
- #ifdef HAVE_WORKING_CAIRO
- 	    pX11Desc xd = (pX11Desc) dd->deviceSpecific;
- 	    /* We can use the buffered copy where we have it */ 
--	    if(xd->buffered == 1) cairo_paint(xd->xcc);
--	    else if (xd->buffered > 1)
-+	    if(xd->buffered == 1) {
-+		cairo_paint(xd->xcc);
-+		cairo_surface_flush(xd->xcs);
-+	    } else if (xd->buffered > 1)
- 		/* rely on timer to repaint eventually */
- 		xd->last_activity = currentTime();
- 	    else
-@@ -2691,7 +2694,11 @@ 
- 		Cairo_update(xd);
- 	    return;
- 	}
--	if(xd->buffered) cairo_paint(xd->xcc);
-+	if(xd->buffered) {
-+	    cairo_paint(xd->xcc);
-+	    cairo_surface_flush(xd->xcs);
-+	}
-+	
- #endif
- 	if(xd->type==WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
- 	XSync(display, 0);
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index 47f2f3ed3..86bda04b5 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179134 2013-03-04 08:06:34Z tomegun $
+# $Id: PKGBUILD 180809 2013-03-26 11:49:40Z foutrelis $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: eric <eric@archlinux.org>
@@ -6,11 +6,11 @@
 
 pkgname=raptor
 pkgver=2.0.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
 arch=('i686' 'x86_64')
 url="http://librdf.org/raptor"
-depends=('curl' 'libxslt' 'icu>=50.1.2')
+depends=('curl' 'libxslt' 'icu')
 license=('LGPL')
 options=('!libtool')
 source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz")
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 44d98296c..ffc68955e 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,30 +1,33 @@
-# $Id: PKGBUILD 175872 2013-01-23 00:13:08Z eric $
+# $Id: PKGBUILD 180810 2013-03-26 11:49:41Z foutrelis $
 # 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.4
+pkgver=0.14.5
 _tver=${pkgver%.*}
-pkgrel=3
+pkgrel=1
 pkgdesc="All-in-one indexer, search tool and metadata database"
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('libgee' 'libgnome-keyring' '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' 'gnome-panel' 'libvorbis' 'flac' 'vala'
-             'libgxps')
+arch=(i686 x86_64)
+license=(GPL)
+makedepends=(libgnome-keyring upower libexif exempi rest
+             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)
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('b818ee42b9007a94b2f8046edc4706bb2036187d5fd304e7ae23e5d2fcf85918')
+sha256sums=('cabef75eb18ad35208000dc472bdc20a74269799414527ee6e1c1c1cfb28eec8')
 
 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 \
@@ -40,9 +43,9 @@ build() {
 }
 
 package_tracker() {
-  depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring'
-           'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca'
-           'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
+  depends=("libtracker-sparql=$pkgver-$pkgrel" libgnome-keyring
+           upower libexif exempi rest poppler-glib libgsf enca
+           networkmanager gtk3 desktop-file-utils hicolor-icon-theme)
   optdepends=('giflib: extractor for GIF data'
               'gstreamer0.10-base: video extractor'
               'totem-plparser: playlist support'
@@ -50,7 +53,6 @@ package_tracker() {
               'libvorbis: Vorbis metadata extractor'
               'flac: FLAC metadata extractor'
               'taglib: writeback for audio files'
-              'gnome-panel: tracker-search-bar'
               'libgxps: XPS extractor')
   groups=('gnome-extra')
   install=tracker.install
@@ -80,7 +82,7 @@ package_tracker() {
 
 package_libtracker-sparql() {
   pkgdesc="$pkgdesc (SPARQL library)"
-  depends=('sqlite' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
+  depends=(sqlite icu glib2 libffi pcre util-linux)
 
   mv "$srcdir"/sparql/* "$pkgdir"
 }
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index 8a2d586a6..9065ed194 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175876 2013-01-23 00:13:13Z eric $
+# $Id: PKGBUILD 180811 2013-03-26 11:49:42Z foutrelis $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=webkitgtk
 pkgname=('webkitgtk2' 'webkitgtk3')
 pkgver=1.10.2
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://webkitgtk.org/"
 license=('custom')
diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD
index e9ee0cb50..8b0a684da 100644
--- a/extra/xf86-input-evdev/PKGBUILD
+++ b/extra/xf86-input-evdev/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180182 2013-03-18 16:08:53Z andyrtr $
+# $Id: PKGBUILD 180837 2013-03-26 16:14:16Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <Alexander@archlinux.org
 
 pkgname=xf86-input-evdev
-pkgver=2.7.3
-pkgrel=3
+pkgver=2.8.0
+pkgrel=1
 pkgdesc="X.org evdev input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -15,7 +15,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>
 options=('!libtool' '!makeflags')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504')
+sha256sums=('2f5b4403955f8e82603acff7f8f21a67e89a7c0230e1506c6924c4b9dd8f0e57')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"