Mon Oct 28 01:14:27 PDT 2013

49 files changed, 607 insertions, 198 deletions

diff --git a/extra/allegro4/PKGBUILD b/extra/allegro4/PKGBUILD
index 203d0b3a5..e15282e73 100644
--- a/extra/allegro4/PKGBUILD
+++ b/extra/allegro4/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161080 2012-06-08 01:31:13Z ibiru $
+# $Id: PKGBUILD 197590 2013-10-27 03:29:02Z eric $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: arjan <arjan@archlinux.org>
@@ -12,6 +12,7 @@ url="http://alleg.sourceforge.net/"
 license=('custom')
 depends=('sh' 'jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor')
 makedepends=('cmake' 'libpng' 'mesa')
+options=('staticlibs')
 source=(http://downloads.sourceforge.net/alleg/allegro-${pkgver}.tar.gz
         LICENSE)
 md5sums=('4db71b0460fc99926ae91d223199c2e6'
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 44657193e..91b08dca4 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,19 +1,25 @@
-# $Id: PKGBUILD 193960 2013-09-08 17:48:29Z giovanni $
+# $Id: PKGBUILD 197597 2013-10-27 14:10:21Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
+# Contributor: Anatol Pomozov <anatol.pomozov@gmail.com>
 
 pkgname=amule
 pkgver=10808
-pkgrel=1
+pkgrel=2
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
 url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++')
-source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('68099241871f4e47eee06bebc7ce20a1')
+install=amule.install
+source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2"
+        'amuled.systemd'
+        'amuleweb.systemd')
+md5sums=('68099241871f4e47eee06bebc7ce20a1'
+         '59772c41860e238f1c822feb8ca8d47f'
+         '05975c5d94bfc41fddb894d98b1115d5')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
@@ -40,5 +46,8 @@ build() {
 package() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
 
-  make DESTDIR=${pkgdir}/ install
+  make DESTDIR=${pkgdir} install
+
+  install -D -m644 "${srcdir}/amuled.systemd" "${pkgdir}/usr/lib/systemd/system/amuled.service"
+  install -D -m644 "${srcdir}/amuleweb.systemd" "${pkgdir}/usr/lib/systemd/system/amuleweb.service"
 }
diff --git a/extra/amule/amule.install b/extra/amule/amule.install
new file mode 100644
index 000000000..62dab1173
--- /dev/null
+++ b/extra/amule/amule.install
@@ -0,0 +1,29 @@
+post_install() {
+  post_upgrade
+  passwd -l amule &>/dev/null
+}
+
+_config_instructions() {
+  echo "If you plan to use external client (e.g. amuleGUI or amuleweb) then you need to"
+  echo "provide [ExternalConnect] configuration."
+  echo "You also need to specify amuleweb password."
+  echo "Please follow https://wiki.archlinux.org/index.php/AMule for more information."
+  echo "amuleweb can be started as 'systemctl start amuleweb'."
+}
+
+post_upgrade() {
+  # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files
+  getent group amule >/dev/null || groupadd amule
+  getent passwd amule >/dev/null || useradd -c 'aMule Client' -g amule -d '/var/lib/amule' -m -s /bin/false amule
+
+  if [ ! -e /var/lib/amule/.aMule/amule.conf ]; then
+    _config_instructions
+  fi
+}
+
+post_remove() {
+  # TOTHINK: delete homedir and user account/group?
+  #getent passwd amule >/dev/null && userdel amule
+  #getent group amule >/dev/null && groupdel amule
+  true
+}
diff --git a/extra/amule/amuled.systemd b/extra/amule/amuled.systemd
new file mode 100644
index 000000000..e1878dfd9
--- /dev/null
+++ b/extra/amule/amuled.systemd
@@ -0,0 +1,11 @@
+[Unit]
+Description=aMule Daemon
+After=network.target
+
+# This assumes that a user 'amule' exists, with a writeable home directory
+[Service]
+User=amule
+ExecStart=/usr/bin/amuled
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/amule/amuleweb.systemd b/extra/amule/amuleweb.systemd
new file mode 100644
index 000000000..1799f4ae8
--- /dev/null
+++ b/extra/amule/amuleweb.systemd
@@ -0,0 +1,13 @@
+[Unit]
+Description=aMule Webserver
+Requires=amuled.service
+
+[Service]
+User=amule
+ExecStart=/usr/bin/amuleweb --quiet
+# If amuled still starting then amuleweb exits, restart until amuleweb is up 
+Restart=on-success
+RestartSec=3s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/ccrtp/PKGBUILD b/extra/ccrtp/PKGBUILD
index 099da0f85..c17444702 100644
--- a/extra/ccrtp/PKGBUILD
+++ b/extra/ccrtp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184148 2013-05-02 19:39:49Z eric $
+# $Id: PKGBUILD 197587 2013-10-27 03:20:07Z eric $
 # Maintainer:
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
@@ -6,17 +6,16 @@
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ccrtp
-pkgver=2.0.5
+pkgver=2.0.6
 pkgrel=1
 pkgdesc="An implementation of RTP, the real-time transport protocol from the IETF"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/ccrtp/"
 license=('GPL' 'custom')
 depends=('ucommon' 'libgcrypt')
-options=('!libtool')
 install=$pkgname.install
 source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
-md5sums=('7f462f6b31c68180a93f36b06944fef4'
+md5sums=('ca0a7a184b242d660d81caf6101a2c0c'
          'SKIP')
 
 build() {
diff --git a/extra/dotconf/PKGBUILD b/extra/dotconf/PKGBUILD
index c00c1582e..81cb17413 100644
--- a/extra/dotconf/PKGBUILD
+++ b/extra/dotconf/PKGBUILD
@@ -1,29 +1,27 @@
-# $Id: PKGBUILD 149587 2012-02-08 15:12:44Z andrea $
+# $Id: PKGBUILD 197652 2013-10-27 18:25:32Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Chris Brannon <cmbrannon@cox.net>
 
 pkgname=dotconf
 pkgver=1.3
-pkgrel=3
+pkgrel=4
 pkgdesc='A C library for parsing configuration files'
-url="https://github.com/williamh/dotconf"
 arch=('i686' 'x86_64')
-depends=('glibc')
-makedepends=('pkgconfig' 'findutils')
+url="https://github.com/williamh/dotconf"
 license=('LGPL2.1')
+depends=('glibc')
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/williamh/${pkgname}/tarball/v${pkgver}")
 md5sums=('36bfdde245072fc2f4f5766b7db97c45')
-options=('!libtool')
 
 build() {
-  cd "${srcdir}"/williamh-${pkgname}-4cd7b3a
+  cd williamh-${pkgname}-4cd7b3a
   autoreconf -i
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}"/williamh-${pkgname}-4cd7b3a
+  cd williamh-${pkgname}-4cd7b3a
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD
index 5fd6d3901..138bbad57 100644
--- a/extra/fltk/PKGBUILD
+++ b/extra/fltk/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 194347 2013-09-14 08:19:54Z bpiotrowski $
+# $Id: PKGBUILD 197654 2013-10-27 19:10:51Z eric $
 # Maintainer:
 
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.2
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url="http://www.fltk.org/"
-makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
+makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libxft' 'libxinerama' \
              'alsa-lib' 'desktop-file-utils' 'libxcursor')
 source=(http://fltk.org/pub/fltk/$pkgver/fltk-$pkgver-source.tar.gz
         tigervnc.patch)
@@ -16,44 +16,41 @@ md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d'
          '9efdf03a449d7639b6da493cb0972bba')
 
 prepare() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd $pkgbase-$pkgver
   patch -Np1 -i ../tigervnc.patch
 }
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd $pkgbase-$pkgver
   sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
          -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile
   ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
   make
-  cd documentation
-  make html
+  make -C documentation html
 }
 
 package_fltk() {
   pkgdesc="Graphical user interface toolkit for X"
-  depends=('libjpeg' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme' \
+  depends=('libjpeg' 'libxft' 'libxinerama' 'hicolor-icon-theme' \
            'desktop-file-utils' 'xdg-utils' 'libxcursor')
   options=('!docs')
   install=fltk.install
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
-  (cd fluid; make DESTDIR="$pkgdir" install install-linux)
-  chmod 644 "$pkgdir"/usr/lib/*.a
+  make DESTDIR="$pkgdir" -C fluid install install-linux
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_fltk-docs() {
   pkgdesc="Graphical user interface toolkit for X (documentation)"
 
-  cd "$srcdir/$pkgbase-$pkgver/documentation"
+  cd $pkgbase-$pkgver/documentation
   install -d "$pkgdir"/usr/share/doc/fltk/
   for _file in html/* ; do
     install -m644 $_file "$pkgdir"/usr/share/doc/fltk/
   done
-  cd ../test
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C ../test install
   install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
@@ -62,8 +59,8 @@ package_fltk-games() {
   depends=('alsa-lib' 'fltk')
   install=fltk-games.install
 
-  cd "$srcdir/$pkgbase-$pkgver/test"
+  cd $pkgbase-$pkgver/test
   make DESTDIR="$pkgdir" install-linux
-  (cd ../documentation;  make DESTDIR="$pkgdir" install-linux)
+  make DESTDIR="$pkgdir" -C ../documentation install-linux
   install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/freetds/PKGBUILD b/extra/freetds/PKGBUILD
index 10ddb2d89..368c3ff74 100644
--- a/extra/freetds/PKGBUILD
+++ b/extra/freetds/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 11362 2010-02-09 23:57:26Z dgriffiths $
+# $Id: PKGBUILD 197581 2013-10-27 02:46:26Z eric $
+# Maintainer:
 # Contributor: Aaron Malone <aaron@munge.net>
 
 pkgname=freetds
 pkgver=0.91
-pkgrel=2
+pkgrel=3
 pkgdesc='Library for accessing Sybase and MS SQL Server databases'
 url='http://www.freetds.org'
 arch=('i686' 'x86_64')
diff --git a/extra/gamin/0001-Poll-files-on-nfs4.patch b/extra/gamin/0001-Poll-files-on-nfs4.patch
new file mode 100644
index 000000000..f776732c8
--- /dev/null
+++ b/extra/gamin/0001-Poll-files-on-nfs4.patch
@@ -0,0 +1,27 @@
+From b92b17ecced6df463da73d6de566740cf5cd00d4 Mon Sep 17 00:00:00 2001
+From: Marek Kasik <mkasik@redhat.com>
+Date: Fri, 1 Feb 2013 15:19:58 +0100
+Subject: [PATCH 1/2] Poll files on nfs4
+
+Add nfs4 among polled filesystems.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=693006
+---
+ server/gam_fs.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/server/gam_fs.c b/server/gam_fs.c
+index c8ca704..143a603 100644
+--- a/server/gam_fs.c
++++ b/server/gam_fs.c
+@@ -178,6 +178,7 @@ gam_fs_init (void)
+ 		gam_fs_set ("reiserfs", GFS_MT_DEFAULT, 0);
+ 		gam_fs_set ("novfs", GFS_MT_POLL, 30);
+ 		gam_fs_set ("nfs", GFS_MT_POLL, 5);
++		gam_fs_set ("nfs4", GFS_MT_POLL, 5);
+ 		if (stat("/etc/mtab", &mtab_sbuf) != 0)
+ 		{
+ 			GAM_DEBUG(DEBUG_INFO, "Could not stat /etc/mtab\n");
+-- 
+1.8.1.2
+
diff --git a/extra/gamin/PKGBUILD b/extra/gamin/PKGBUILD
index a039cbfef..d0d1706fb 100644
--- a/extra/gamin/PKGBUILD
+++ b/extra/gamin/PKGBUILD
@@ -1,46 +1,54 @@
-# $Id: PKGBUILD 30749 2010-10-20 11:18:33Z schuay $
+# $Id: PKGBUILD 197583 2013-10-27 02:51:46Z heftig $
 # Maintainer:
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: Pulphix <crimea.v@libero.it>
 
 pkgname=gamin
 pkgver=0.1.10
-pkgrel=7
+pkgrel=8
 pkgdesc='File and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor)'
 url='http://www.gnome.org/~veillard/gamin'
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('glib2')
 makedepends=('python2')
-options=('libtool')
-optdepends=('python2: for the python module.')
+optdepends=('python2: for the python module')
 provides=('fam')
 conflicts=('fam')
-source=("http://www.gnome.org/~veillard/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"
+options=('!libtool')
+source=("$url/sources/${pkgname}-${pkgver}.tar.gz"
         'fix-deprecated-const.patch'
-        '18_gam_server_deadlocks.patch')
+        '18_gam_server_deadlocks.patch'
+        '0001-Poll-files-on-nfs4.patch')
 md5sums=('b4ec549e57da470c04edd5ec2876a028'
          'f679aeb48fe9dd376c8828cc9b6941ab'
-         '4784359a3206bfa3c0dce1c23468f87f')
+         '4784359a3206bfa3c0dce1c23468f87f'
+         '6711cd0b1e8d2ad038c5761715d084a5')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+  cd $pkgname-$pkgver
 
   # https://bugs.archlinux.org/task/33642
-  patch -p1 -i "${srcdir}"/18_gam_server_deadlocks.patch
+  patch -Np1 -i ../18_gam_server_deadlocks.patch
 
-  patch -p1 -i "${srcdir}"/fix-deprecated-const.patch
+  patch -Np1 -i ../fix-deprecated-const.patch
+  patch -Np1 -i ../0001-Poll-files-on-nfs4.patch
 
   # python 2
   sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' python/gamin.py
+}
 
+build() {
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-static --with-threads \
     --disable-debug-api --disable-debug --libexecdir=/usr/lib/gamin \
     --with-python=/usr/bin/python2
   make
 }
+
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
+
 # vim:set ts=2 sw=2 et:
diff --git a/extra/kte-collaborative/PKGBUILD b/extra/kte-collaborative/PKGBUILD
new file mode 100644
index 000000000..9213a4b64
--- /dev/null
+++ b/extra/kte-collaborative/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 197600 2013-10-27 14:17:27Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Antonio Rojas <nqn1976 @ gmail.com>
+
+pkgname=kte-collaborative
+pkgver=0.1.80
+pkgrel=1
+pkgdesc="A plugin for KTextEditor which allows to edit text documents collaboratively"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/playground/network/kte-collaborative'
+license=('GPL')
+depends=('libqinfinity' 'telepathy-kde-common-internals')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-v${pkgver}.tar.xz")
+md5sums=('4e5c8e81d02ab1ccb5f0f6b1f739707a')
+
+prepare() {
+  mkdir build
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-v${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/lesstif/PKGBUILD b/extra/lesstif/PKGBUILD
index fc55d369b..2ec414b6b 100644
--- a/extra/lesstif/PKGBUILD
+++ b/extra/lesstif/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 195188 2013-09-27 04:29:31Z eric $
-# Maintainer:
+# $Id: PKGBUILD 197577 2013-10-27 02:25:22Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=lesstif
 pkgver=0.95.2
-pkgrel=5
+pkgrel=6
 pkgdesc="LGPL'd re-implementation of Motif"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/lesstif/"
 license=('LGPL' 'MIT')
 depends=('freetype2' 'libxt' 'libxp')
-options=('!libtool' '!buildflags')
+options=('!makeflags' '!buildflags')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'LICENSE'
         '040_fedora_XxxxProperty-64bit.diff')
@@ -18,14 +18,14 @@ md5sums=('754187dbac09fcf5d18296437e72a32f'
          '30e2c0babc84696af089d55cb9cb2908')
 
 prepare() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   # https://bugs.archlinux.org/task/17712
   patch -p1 -i "${srcdir}"/040_fedora_XxxxProperty-64bit.diff
 }
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   ./configure --prefix=/usr \
     --enable-production \
@@ -33,8 +33,7 @@ build() {
     --enable-editres \
     --with-xdnd \
     --enable-build-21 \
-    --disable-debug \
-    --enable-static
+    --disable-debug
 
   # fix linkage against already installed version
   perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool
@@ -50,7 +49,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   make -C lib/Mrm-2.1 DESTDIR="${pkgdir}" install
   make DESTDIR="${pkgdir}" appdir=/usr/share/X11/app-defaults rootdir=/usr/share/doc/LessTif install
diff --git a/extra/libaccounts-glib/PKGBUILD b/extra/libaccounts-glib/PKGBUILD
new file mode 100644
index 000000000..9f802865d
--- /dev/null
+++ b/extra/libaccounts-glib/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 197625 2013-10-27 14:37:53Z andrea $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=libaccounts-glib
+pkgver=1.12
+pkgrel=1
+pkgdesc="Glib-based client library for accessing the online accounts database"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/accounts-sso/"
+license=('LGPL')
+depends=('dbus-glib' 'libxml2' 'sqlite3')
+makedepends=('python2-gobject')
+options=('!libtool')
+source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz)
+sha1sums=('165e0b89a0bc47459711b1e7e077fb9e14848503')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static \
+              PYTHON=python2
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # Install GI overrides for python 3 as well
+  install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides"
+  ln -s ../../../../python2.7/site-packages/gi/overrides/Accounts.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Accounts.py"
+
+  # We don't have Backup Framework on Arch Linux
+  rm -r "$pkgdir/usr/share/backup-framework"
+}
diff --git a/extra/libaccounts-qt/PKGBUILD b/extra/libaccounts-qt/PKGBUILD
new file mode 100644
index 000000000..4c87f2de0
--- /dev/null
+++ b/extra/libaccounts-qt/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 197627 2013-10-27 14:38:36Z andrea $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgbase=libaccounts-qt
+_pkgbase=accounts-qt
+pkgname=('libaccounts-qt' 'libaccounts-qt-doc')
+pkgver=1.9
+pkgrel=1
+pkgdesc="Qt-based client library for accessing the online accounts database"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/accounts-sso/"
+license=('LGPL')
+depends=('qt4' 'libaccounts-glib')
+makedepends=('doxygen' 'graphviz' 'ttf-dejavu')
+options=('!emptydirs')
+source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2)
+sha1sums=('86d7bbaa7bdd18f80a28c2617653707d763d1984')
+
+build() {
+  cd "$srcdir/$_pkgbase-$pkgver"
+
+  # Do not install tests
+  echo 'INSTALLS =' >>tests/accountstest.pro
+
+  qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
+  make
+}
+
+package_libaccounts-qt() {
+  cd "$srcdir/$_pkgbase-$pkgver"
+
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Split out documentation
+  mv "$pkgdir/usr/share/doc" "$srcdir"
+}
+
+package_libaccounts-qt-doc() {
+  pkgdesc="Developer documention of signon"
+  depends=()
+
+  mkdir -p "$pkgdir/usr/share"
+  mv "$srcdir/doc" "$pkgdir/usr/share"
+}
diff --git a/extra/libkpeople/PKGBUILD b/extra/libkpeople/PKGBUILD
new file mode 100644
index 000000000..544b62054
--- /dev/null
+++ b/extra/libkpeople/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 197593 2013-10-27 13:36:10Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Antonio Rojas <nqn1976 @ gmail.com>
+
+pkgname=libkpeople
+pkgver=0.1.0
+pkgrel=2
+pkgdesc="A contact aggregation library for KDE"
+arch=('i686' 'x86_64')
+url='http://community.kde.org/KTp/libkpeople'
+license=('LGPL')
+depends=('nepomuk-core')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('6ab54b3ba203ff06d17f101060ed277696dfbaad')
+
+prepare() {
+  mkdir build
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}/" install
+}
diff --git a/extra/libmatroska/PKGBUILD b/extra/libmatroska/PKGBUILD
index 331e7f088..ccb8f2352 100644
--- a/extra/libmatroska/PKGBUILD
+++ b/extra/libmatroska/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 197329 2013-10-25 02:33:41Z bisson $
+# $Id: PKGBUILD 197633 2013-10-27 14:48:10Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor 03/08/04 <lefungus@altern.org>
 
 pkgname=libmatroska
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.4.1
+pkgrel=1
 pkgdesc="Matroska library"
 arch=('i686' 'x86_64')
 url="http://dl.matroska.org/downloads/libmatroska/"
 license=('LGPL')
 depends=('libebml')
 source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('5b83155019589b04a49f9db923b5bf74')
+md5sums=('f61b2e5086f4bb9d24a43cc8af43a719')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
diff --git a/extra/libqinfinity/PKGBUILD b/extra/libqinfinity/PKGBUILD
new file mode 100644
index 000000000..d7f16d1c6
--- /dev/null
+++ b/extra/libqinfinity/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Antonio Rojas <nqn1976 @ gmail.com>
+
+pkgname=libqinfinity
+pkgver=0.5.1
+pkgrel=2
+pkgdesc="Qt wrapper around libinfinity, a library for collaborative editing"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/playground/libs/libqinfinity'
+license=('LGPL')
+depends=('libinfinity' 'qt4')
+makedepends=('cmake')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-v${pkgver}.tar.xz")
+md5sums=('ca40902e7a9a699d3d83138cb76d569a')
+
+prepare() {
+	mkdir build
+}
+
+build() {
+	cd build
+	cmake ../${pkgname}-v${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+	make
+}
+
+package() {
+	cd build
+	make DESTDIR="${pkgdir}/" install
+}
diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD
index 84a3f01e3..920c0ebbd 100644
--- a/extra/link-grammar/PKGBUILD
+++ b/extra/link-grammar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189484 2013-07-03 16:37:06Z giovanni $
+# $Id: PKGBUILD 197635 2013-10-27 14:56:36Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=link-grammar
-pkgver=4.7.14
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="A Grammar Checking library"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('aspell')
 options=('!libtool' '!makeflags')
 source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('2d7771d8063aec6efb27a35663d67e9f')
+md5sums=('218a2ee5ffed258bc52a0718811ca66e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 86605b99a..e6233cf81 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 194693 2013-09-22 12:59:18Z giovanni $
+# $Id: PKGBUILD 197637 2013-10-27 15:07:22Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2013.09.18
+pkgver=2013.10.25
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
+options=('staticlibs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('082ebd8f4cab6194db268b77780056d9')
+md5sums=('43a8d3a622db8a4582174fa2ddc7461b')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mhash/PKGBUILD b/extra/mhash/PKGBUILD
index 3c2f7b732..8227d8250 100644
--- a/extra/mhash/PKGBUILD
+++ b/extra/mhash/PKGBUILD
@@ -1,27 +1,26 @@
-# $Id: PKGBUILD 122885 2011-05-07 03:21:34Z eric $
+# $Id: PKGBUILD 197559 2013-10-26 22:44:00Z eric $
 # Contributor: gregor <gregor@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=mhash
 pkgver=0.9.9.9
-pkgrel=2
+pkgrel=3
 pkgdesc="A thread-safe hash library which provides a uniform interface to hash algorithms (MD5, SHA1, HAVAL, etc)"
 arch=('i686' 'x86_64')
 url="http://mhash.sourceforge.net/"
 license=('LGPL')
 depends=('glibc')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/mhash/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('f91c74f9ccab2b574a98be5bc31eb280')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-static
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 132678976..a718bf19e 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194528 2013-09-17 13:02:47Z giovanni $
+# $Id: PKGBUILD 197567 2013-10-27 00:07:32Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=6.4.1
+pkgver=6.5.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,7 +12,7 @@ url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
 makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
              'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
 source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('1e878646b34eb2c32772d05b91f84f4c')
+md5sums=('e2d8d539b8cb9249b6c398690bc61c78')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -52,6 +52,7 @@ package_mkvtoolnix-cli() {
   install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
 
   rm -rf "${pkgdir}"/usr/bin/mmg
+  rm -rf "${pkgdir}"/usr/share/man/de/man1/mmg.1
   rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1
   rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
   rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
@@ -76,6 +77,7 @@ package_mkvtoolnix-gtk() {
 
   rm -rf "${pkgdir}"/usr/share/doc
   rm -rf "${pkgdir}"/usr/share/locale
+  rm -rf "${pkgdir}"/usr/share/man/de/man1/mkv*
   rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv*
   rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
   rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD
index d58895531..32fb6249a 100644
--- a/extra/monodevelop-debugger-gdb/PKGBUILD
+++ b/extra/monodevelop-debugger-gdb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 194339 2013-09-13 21:42:34Z daniel $
+# $Id: PKGBUILD 197648 2013-10-27 17:35:08Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=monodevelop-debugger-gdb
-pkgver=4.0.12
+pkgver=4.0.13
 pkgrel=1
 pkgdesc="Mono Debugger support"
 arch=('i686' 'x86_64') # also "any" pkg?
@@ -11,8 +11,8 @@ license=('GPL')
 depends=('monodevelop>=4.0.12' 'gdb')
 makedepends=('mono')
 options=('!makeflags')
-source=(http://origin-download.mono-project.com/sources/$pkgname/$pkgname-$pkgver-3.tar.bz2)
-md5sums=('b9c9d12cc73352a208bcdb5ad5949418')
+source=(http://origin-download.mono-project.com/sources/$pkgname/$pkgname-$pkgver-38.tar.bz2)
+md5sums=('d47c712b47cfcbcdc1224825395cdcee')
 
 build() {
   export MONO_SHARED_DIR="${srcdir}/.wabi"
diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD
index 886f09470..02da29f3e 100644
--- a/extra/monodevelop/PKGBUILD
+++ b/extra/monodevelop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194341 2013-09-13 21:42:47Z daniel $
+# $Id: PKGBUILD 197646 2013-10-27 17:34:49Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=monodevelop
-pkgver=4.0.12
+pkgver=4.0.13
 pkgrel=1
 pkgdesc="An IDE primarily designed for C# and other .NET languages"
 
@@ -17,9 +17,9 @@ depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils'
 makedepends=('rsync' 'git')
 options=(!makeflags)
 install=monodevelop.install
-source=(http://origin-download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}-3.tar.bz2
+source=(http://origin-download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}-38.tar.bz2
         monodevelop-core-addins.pc.in.patch)
-md5sums=('5f9cd24d2791054d88b0dcce1259afdb'
+md5sums=('63ea0b389976f72d6f8b131a74c54b93'
          '8466d032735130e37d4091a793a7966c')
 
 build() {
diff --git a/extra/opensp/PKGBUILD b/extra/opensp/PKGBUILD
index ff23a6dff..473455242 100644
--- a/extra/opensp/PKGBUILD
+++ b/extra/opensp/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 150566 2012-02-18 14:51:32Z pierre $
+# $Id: PKGBUILD 197585 2013-10-27 03:05:15Z eric $
 # Maintainer:
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=opensp
 pkgver=1.5.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A library and a set of tools for validating, parsing and manipulating SGML and XML documents"
 arch=('i686' 'x86_64')
 url="http://openjade.sourceforge.net/"
 license=('BSD')
 depends=('gcc-libs')
 makedepends=('xmlto' 'docbook-xsl')
-options=('!libtool')
 source=("http://download.sourceforge.net/openjade/OpenSP-$pkgver.tar.gz")
 md5sums=('670b223c5d12cee40c9137be86b6c39b')
 
 build() {
-  cd "${srcdir}"/OpenSP-$pkgver
+  cd OpenSP-$pkgver
   ./configure --prefix=/usr \
     --mandir=/usr/share/man \
     --disable-nls \
@@ -29,7 +28,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/OpenSP-$pkgver
+  cd OpenSP-$pkgver
   make DESTDIR="${pkgdir}" install
   install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/extra/pywebkitgtk/PKGBUILD b/extra/pywebkitgtk/PKGBUILD
index 9fec0ff5d..daebf9ec7 100644
--- a/extra/pywebkitgtk/PKGBUILD
+++ b/extra/pywebkitgtk/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 148894 2012-02-05 11:54:35Z ibiru $
+# $Id: PKGBUILD 197579 2013-10-27 02:33:41Z eric $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>  
 # Contributor: kasa <biuta.jr@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=pywebkitgtk
 pkgver=1.1.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Python bindings to the WebKit GTK+ port"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/pywebkitgtk/"
 license=('LGPL')
-depends=('libwebkit' 'pygtk')
-options=('!libtool' '!makeflags')
+depends=('webkitgtk2' 'pygtk')
+options=('!makeflags')
 source=(http://pywebkitgtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 md5sums=('158335385354ba38090c9324b37bf225')
 
 build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
+    cd ${pkgname}-${pkgver}
     ./configure --prefix=/usr
     make
 }
 
 package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install
+    cd ${pkgname}-${pkgver}
+    make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/qhull/PKGBUILD b/extra/qhull/PKGBUILD
index 8ce544a21..f4bc77890 100644
--- a/extra/qhull/PKGBUILD
+++ b/extra/qhull/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171913 2012-11-23 13:37:18Z ronald $
+# $Id: PKGBUILD 197574 2013-10-27 02:10:42Z eric $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
@@ -13,12 +13,12 @@ url="http://www.qhull.org/"
 license=('custom')
 depends=('gcc-libs')
 makedepends=('cmake')
-options=('!libtool')
+options=('staticlibs')
 source=("http://www.qhull.org/download/$pkgname-$pkgver-src.tgz")
 md5sums=('d0f978c0d8dfb2e919caefa56ea2953c')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   if [ "${CARCH}" = "x86_64" ]; then
     EXTRAOPTS="-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC"
@@ -31,7 +31,7 @@ build() {
 }
 
 package() { 
-  cd "$srcdir/$pkgname-$pkgver/srcbuild"
+  cd $pkgname-$pkgver/srcbuild
 
   make DESTDIR="$pkgdir" install
 
diff --git a/extra/recode/PKGBUILD b/extra/recode/PKGBUILD
index ffa636c60..87d149f89 100644
--- a/extra/recode/PKGBUILD
+++ b/extra/recode/PKGBUILD
@@ -1,31 +1,36 @@
-# $Id: PKGBUILD 151219 2012-02-25 08:35:55Z pierre $
+# $Id: PKGBUILD 197569 2013-10-27 00:17:34Z eric $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=recode
 pkgver=3.6
-pkgrel=7
+pkgrel=8
 pkgdesc="Converts files between various character sets and usages"
 arch=('i686' 'x86_64')
 url="http://recode.progiciels-bpi.ca/index.html"
 license=('GPL' 'LGPL')
-depends=('glibc' 'texinfo')
-options=('!libtool')
+depends=('glibc')
 install=recode.install
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/pinard/${pkgname}/tarball/v${pkgver}"
-        'http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-15.diff.gz'
+        'http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-17.diff.gz'
         'recode-3.6-as-if.patch' 'recode-3.6-gettextfix.diff')
 md5sums=('f82e9a6ede9119268c13493c9add2809'
-         '95ca772e367a7ef56d3f46d724b6f86e'
+         '3716ae269074e31add3d29387ff09438'
          'fca7484ba332c8ad59eb02334883cd92'
          'eb602e80a24b5448604bfebeacc55304')
 
-build() {
-  cd ${srcdir}/pinard-Recode-2127b34
-  patch -Np1 -i ${srcdir}/recode-3.6-as-if.patch
-  patch -Np1 -i ${srcdir}/recode-3.6-gettextfix.diff
-  patch -Np1 -i ${srcdir}/recode_3.6-15.diff
+prepare() {
+  cd pinard-Recode-2127b34
+  patch -Np1 -i "${srcdir}/recode-3.6-as-if.patch"
+  patch -Np1 -i "${srcdir}/recode-3.6-gettextfix.diff"
+  patch -Np1 -i "${srcdir}/recode_3.6-17.diff"
   sed -i '1i#include <stdlib.h>' src/argmatch.c
+  sed -i -e '/^AM_C_PROTOTYPES/d' -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \
+    configure.in src/Makefile.am
+}
+
+build() {
+  cd pinard-Recode-2127b34
   rm -f acinclude.m4
   autoreconf -fi
   libtoolize
@@ -35,9 +40,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/pinard-Recode-2127b34
-  make DESTDIR=${pkgdir} install
-
-  rm ${pkgdir}/usr/share/info/dir
-  gzip ${pkgdir}/usr/share/info/*
+  cd pinard-Recode-2127b34
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/recode/recode.install b/extra/recode/recode.install
index 6304d5906..b66d99b11 100644
--- a/extra/recode/recode.install
+++ b/extra/recode/recode.install
@@ -1,5 +1,5 @@
 infodir=/usr/share/info
-filelist=(recode.info-5.gz recode.info-3.gz recode.info-7.gz recode.info-6.gz recode.info-2.gz recode.info-4.gz recode.info.gz recode.info-1.gz)
+filelist=(recode.info.gz)
 
 post_install() {
   [ -x usr/bin/install-info ] || return 0
diff --git a/extra/signon/PKGBUILD b/extra/signon/PKGBUILD
new file mode 100644
index 000000000..ef4dbf001
--- /dev/null
+++ b/extra/signon/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 197629 2013-10-27 14:39:15Z andrea $
+#Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgbase=signon
+pkgname=('signon' 'signon-doc')
+pkgver=8.54
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/accounts-sso/"
+license=('LGPL')
+makedepends=('qt4' 'libproxy' 'doxygen' 'graphviz' 'ttf-font')
+options=('!emptydirs')
+source=("http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2"
+        'use_keyring.patch')
+sha1sums=('a29a12d6fe3747930e94932f6e1b1339b471d108'
+          'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1')
+
+prepare() {
+  cd $pkgbase-$pkgver
+  
+  # Use gnome-keyring secrets storage if signon-keyring-extension is available
+  patch -Np1 -i "$srcdir/use_keyring.patch"
+  
+  # qt4 fix
+  sed -i 's/qdbusxml2cpp/qdbusxml2cpp-qt4/' src/signond/signond.pro
+}
+
+build() {
+  cd $pkgbase-$pkgver
+  qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
+  make
+}
+
+package_signon() {
+  pkgdesc="Framework to provide credential storage and authentication service"
+  depends=('qt4' 'libproxy')
+  backup=('etc/signond.conf')
+  install=$pkgname.install
+
+  cd $pkgbase-$pkgver
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Split out documentation
+  mv "$pkgdir/usr/share/doc" "$srcdir"
+}
+
+package_signon-doc() {
+  pkgdesc="Developer documention of signon"
+
+  mkdir -p "$pkgdir/usr/share"
+  mv "$srcdir/doc" "$pkgdir/usr/share"
+}
diff --git a/extra/signon/signon.install b/extra/signon/signon.install
new file mode 100644
index 000000000..4ccb62fcb
--- /dev/null
+++ b/extra/signon/signon.install
@@ -0,0 +1,6 @@
+post_upgrade() {
+  if [ "$(vercmp 8.44 "$2")" -eq 1 ]; then
+    printf '==> Default config location changed\n'
+    printf '    Move the file signon.db from ~/.signon/ to ~/.config/signond/\n'
+  fi
+}
diff --git a/extra/signon/use_keyring.patch b/extra/signon/use_keyring.patch
new file mode 100644
index 000000000..55b593a26
--- /dev/null
+++ b/extra/signon/use_keyring.patch
@@ -0,0 +1,12 @@
+=== modified file 'src/signond/signond.conf'
+--- old/src/signond/signond.conf	2012-07-25 14:57:50 +0000
++++ new/src/signond/signond.conf	2012-07-25 19:27:16 +0000
+@@ -17,6 +17,7 @@
+ FileSystemName=signonfs
+ Size=8
+ FileSystemType=ext2
++SecretsStorage=gnome-keyring
+ 
+ [ObjectTimeouts]
+ IdentityTimeout=300
+
diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD
index abd254912..7def29f76 100644
--- a/extra/smb4k/PKGBUILD
+++ b/extra/smb4k/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186369 2013-05-26 07:53:25Z giovanni $
+# $Id: PKGBUILD 197642 2013-10-27 16:28:17Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com>
 
 pkgname=smb4k
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="A KDE program that browses samba shares"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=smb4k.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('1b15d7f0f4ad89b0fe730629ec53c2ae')
+md5sums=('8dac25845830cee18b72776d0f90d62c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index f8185ed5b..2a23dc657 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 193060 2013-08-15 10:40:13Z schiv $
+# $Id: PKGBUILD 197656 2013-10-27 21:04:41Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: see .contrib
 
 pkgname=snd
-pkgver=13.9
+pkgver=14.1
 pkgrel=1
 pkgdesc="An advanced sound editor"
 arch=('i686' 'x86_64')
@@ -16,8 +16,17 @@ makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'gmp'
 optdepends=('wavpack' 'flac' 'speex' 'mpg123'
             'timidity++' 'vorbis-tools')
 install=$pkgname.install
-source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz")
-md5sums=('acceab2d1e30720640aca54d4b68d45b')
+source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz"
+        'type_error.patch')
+md5sums=('955ca19ca70ac0e4d03cd710516c0174'
+         '6e96d59346b53a1c73060857f688dbd0')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # work around incomplete type error
+  patch -Np1 -i "$srcdir/type_error.patch"
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/snd/type_error.patch b/extra/snd/type_error.patch
new file mode 100644
index 000000000..e7bf9ab91
--- /dev/null
+++ b/extra/snd/type_error.patch
@@ -0,0 +1,20 @@
+diff -ur snd-14.1.orig/vct.h snd-14.1/vct.h
+--- snd-14.1.orig/vct.h	2013-10-28 02:22:35.073798054 +0800
++++ snd-14.1/vct.h	2013-10-28 02:45:27.166364791 +0800
+@@ -1,11 +1,11 @@
+ #ifndef VCT_H
+ #define VCT_H
+ 
+-#if HAVE_SCHEME
+-  typedef struct s7_cell vct;
+-#else
+-typedef struct vct vct;
+-#endif
++typedef struct {
++  mus_long_t length;
++  mus_float_t *data;
++  bool dont_free;
++} vct;
+ 
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/extra/spandsp/PKGBUILD b/extra/spandsp/PKGBUILD
index 359dffd72..f8f6501a8 100644
--- a/extra/spandsp/PKGBUILD
+++ b/extra/spandsp/PKGBUILD
@@ -1,30 +1,29 @@
-# $Id: PKGBUILD 165523 2012-08-22 19:37:34Z tpowa $
+# $Id: PKGBUILD 197565 2013-10-26 23:18:17Z eric $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=spandsp
 pkgver=0.0.6pre21
-pkgrel=1
+pkgrel=2
 pkgdesc="A DSP library for telephony"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.soft-switch.org/"
 depends=('libtiff')
 source=(http://www.soft-switch.org/downloads/$pkgname/$pkgname-$pkgver.tgz)
-options=(!libtool)
+md5sums=('492f3790439891c07d8c06e97ccbfcf1')
 
 build() {
-  cd $srcdir/$pkgname-0.0.6
+  cd $pkgname-0.0.6
   ./configure --prefix=/usr
   make
 }
 
 check() {
-   cd $srcdir/$pkgname-0.0.6
+   cd $pkgname-0.0.6
    make check
 }  
 
 package() {
-  cd $srcdir/$pkgname-0.0.6
-  make DESTDIR=$pkgdir install
+  cd $pkgname-0.0.6
+  make DESTDIR="$pkgdir" install
 }
-md5sums=('492f3790439891c07d8c06e97ccbfcf1')
diff --git a/extra/speech-dispatcher/PKGBUILD b/extra/speech-dispatcher/PKGBUILD
index d798fb0e5..36eb479a4 100644
--- a/extra/speech-dispatcher/PKGBUILD
+++ b/extra/speech-dispatcher/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179645 2013-03-09 01:49:56Z eric $
+# $Id: PKGBUILD 197563 2013-10-26 23:08:53Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Steve Holmes <steve.holmes88@gmail.com>
@@ -8,7 +8,7 @@
 
 pkgname=speech-dispatcher
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="High-level device independent layer for speech synthesis interface"
 url="http://www.freebsoft.org/speechd"
@@ -19,7 +19,6 @@ optdepends=('festival: Speech output using Festival'
         'espeak: Speech output using ESpeak'
         'pulseaudio: PulseAudio support')
 provides=("speechd=${pkgver}")
-options=('!libtool') 
 backup=(etc/speech-dispatcher/clients/gnome-speech.conf
 	etc/speech-dispatcher/clients/emacs.conf
 	etc/speech-dispatcher/modules/ibmtts.conf
@@ -42,7 +41,7 @@ md5sums=('d88691a64c676122f996230c107c392f'
          'd26f52e2e95a30eaa83560f0e63faca5')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
@@ -51,7 +50,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/speech-dispatcherd.service"
diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD
index 39f6d95f8..83799c3ec 100644
--- a/extra/telepathy-kde-accounts-kcm/PKGBUILD
+++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192364 2013-08-10 10:59:23Z andrea $
+# $Id: PKGBUILD 197604 2013-10-27 14:19:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-accounts-kcm
 _pkgname=ktp-accounts-kcm
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts"
 arch=('i686' 'x86_64')
@@ -17,11 +17,14 @@ optdepends=('telepathy-gabble: XMPP/Jabber/GTalk support'
 groups=('kde-telepathy')
 conflicts=('telepathy-kde-accounts-kcm-plugins')
 replaces=('telepathy-kde-accounts-kcm-plugins')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('9646cfe13c4cf155acd97d6ea66ea9bf3c8a73d7')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('8791acef43bb125259d218f2385ddf50a1ec857c')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD
index 0d8fc26a1..a2ca351fe 100644
--- a/extra/telepathy-kde-approver/PKGBUILD
+++ b/extra/telepathy-kde-approver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192366 2013-08-10 10:59:48Z andrea $
+# $Id: PKGBUILD 197606 2013-10-27 14:19:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-approver
 _pkgname=ktp-approver
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="KDE Channel Approver for Telepathy"
 arch=('i686' 'x86_64')
@@ -13,11 +13,14 @@ license=('GPL')
 depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a29415946b45160aa0469e8aa7e4b6c20209569c')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('f250514208481a328732d73e1d3807e72f375d27')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD
index eb0810d88..520a9cf75 100644
--- a/extra/telepathy-kde-auth-handler/PKGBUILD
+++ b/extra/telepathy-kde-auth-handler/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 193542 2013-08-22 21:22:10Z andrea $
+# $Id: PKGBUILD 197623 2013-10-27 14:21:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-auth-handler
 _pkgname=ktp-auth-handler
-pkgver=0.6.3
-pkgrel=2
+pkgver=0.7.0
+pkgrel=1
 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect"
 arch=('i686' 'x86_64')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
-depends=('telepathy-kde-common-internals' 'qjson' 'qca-ossl')
+depends=('telepathy-kde-common-internals' 'qjson' 'qca-ossl' 'libaccounts-qt' 'signon')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('027697f01a41e70d10cebb78b15e7bc783617be3')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('0abeef4bc6905f0b975505f9a215bfbafa4b02a3')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD
index f478b26ee..17d1154cd 100644
--- a/extra/telepathy-kde-common-internals/PKGBUILD
+++ b/extra/telepathy-kde-common-internals/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 192370 2013-08-10 11:00:20Z andrea $
+# $Id: PKGBUILD 197602 2013-10-27 14:18:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-common-internals
 _pkgname=ktp-common-internals
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="Common components for KDE-Telepathy"
 arch=('i686' 'x86_64')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
-depends=('kdelibs' 'telepathy-logger-qt' 'telepathy-mission-control')
+depends=('libkpeople' 'telepathy-logger-qt' 'telepathy-mission-control')
 makedepends=('cmake' 'automoc4' 'boost' 'doxygen')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('d4934f760b62da5859d81fc1d264315f4d5473e8')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('9610eb4b606166200aacbb8d311b63c30724403e')
 
 prepare() {
   mkdir build
diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD
index 90a733c5c..03d4ab079 100644
--- a/extra/telepathy-kde-contact-list/PKGBUILD
+++ b/extra/telepathy-kde-contact-list/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192372 2013-08-10 11:00:34Z andrea $
+# $Id: PKGBUILD 197610 2013-10-27 14:19:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-contact-list
 _pkgname=ktp-contact-list
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="Telepathy contact list application"
 arch=('i686' 'x86_64')
@@ -14,11 +14,14 @@ depends=('telepathy-kde-common-internals' 'kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f26eb5d1cf546b87921447d455b4b47ac8772673')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('493a7c0f5d3e46c1c2011130670f907a295fc4a4')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD
index c1caca42d..3bd877ccc 100644
--- a/extra/telepathy-kde-contact-runner/PKGBUILD
+++ b/extra/telepathy-kde-contact-runner/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192374 2013-08-10 11:00:51Z andrea $
+# $Id: PKGBUILD 197612 2013-10-27 14:20:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-contact-runner
 _pkgname=ktp-contact-runner
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="KRunner plugin for KDE Telepathy"
 arch=('i686' 'x86_64')
@@ -12,11 +12,14 @@ license=('GPL')
 depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('1fa8321597c54ad75db23e57ded46818c1f923cd')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('cbba565c8fbb56857824ff8c18a14bf8094fc4e9')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-desktop-applets/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD
index a68eecb18..998dcaa2f 100644
--- a/extra/telepathy-kde-desktop-applets/PKGBUILD
+++ b/extra/telepathy-kde-desktop-applets/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192376 2013-08-10 11:01:07Z andrea $
+# $Id: PKGBUILD 197614 2013-10-27 14:20:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-desktop-applets
 _pkgname=ktp-desktop-applets
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="The KDE-Telepathy Plasma desktop applets"
 arch=('i686' 'x86_64')
@@ -14,11 +14,14 @@ makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 conflicts=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet')
 replaces=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('c6482ecd6fc009b6c0da3d428506e21a65561eb8')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('0e968a850bd579ce0557773daf5b4fb33e9ff711')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
index f828f6065..23718aa01 100644
--- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD
+++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192378 2013-08-10 11:01:25Z andrea $
+# $Id: PKGBUILD 197616 2013-10-27 14:20:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-filetransfer-handler
 _pkgname=ktp-filetransfer-handler
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="Telepathy file transfer handler"
 arch=('i686' 'x86_64')
@@ -12,11 +12,14 @@ license=('GPL')
 depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f9acb53cadc4d63acedcb5017f6c4a5f95a1c2b5')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('5586256d77b2675aa3c1bb036fb3832a7993e415')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD
index e2abf2c9f..1f3ece5e5 100644
--- a/extra/telepathy-kde-integration-module/PKGBUILD
+++ b/extra/telepathy-kde-integration-module/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192380 2013-08-10 11:01:40Z andrea $
+# $Id: PKGBUILD 197618 2013-10-27 14:20:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-integration-module
 _pkgname=ktp-kded-integration-module
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors"
 arch=('i686' 'x86_64')
@@ -12,11 +12,14 @@ license=('GPL')
 depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e8faf0e651053718077865f388fe209f2c06f537')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('0ce145e4a9354e40d19806febf5d8ad8097b13de')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD
index 4be4f1201..15564ff47 100644
--- a/extra/telepathy-kde-send-file/PKGBUILD
+++ b/extra/telepathy-kde-send-file/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192382 2013-08-10 11:01:57Z andrea $
+# $Id: PKGBUILD 197620 2013-10-27 14:20:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-send-file
 _pkgname=ktp-send-file
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact"
 arch=('i686' 'x86_64')
@@ -13,11 +13,14 @@ depends=('telepathy-kde-filetransfer-handler' 'telepathy-kde-contact-list')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a1fb83c768967483896541f81a78820fb67dff78')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('16c5fa9437b4952c045957c2344eafec665b7bcb')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
index bc3326d20..ab5148fed 100644
--- a/extra/telepathy-kde-text-ui/PKGBUILD
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192384 2013-08-10 11:02:14Z andrea $
+# $Id: PKGBUILD 197622 2013-10-27 14:20:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-text-ui
 _pkgname=ktp-text-ui
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="Telepathy handler for Text Chats"
 arch=('i686' 'x86_64')
@@ -13,11 +13,14 @@ license=('GPL')
 depends=('telepathy-kde-contact-list' 'telepathy-logger-qt')
 makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('480a634f95e75306efa7694526b8a137b18f9e49')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('f940e7ae031d5ad897906efad3b8f37e3197bd95')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD
index 513071a5c..15d645dee 100644
--- a/extra/xorg-xinit/PKGBUILD
+++ b/extra/xorg-xinit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194377 2013-09-15 08:07:59Z andyrtr $
+# $Id: PKGBUILD 197640 2013-10-27 15:15:12Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xorg-xinit
 pkgver=1.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
@@ -30,11 +30,15 @@ sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af'
             '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
             '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
 
-build() {
+prepare() {
   cd xinit-${pkgver}
   patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
   patch -Np1 -i "${srcdir}/fs25361.patch"
   sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
+}
+
+build() {
+  cd xinit-${pkgver}
   ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
   make
 }
@@ -49,4 +53,9 @@ package() {
   install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  
+  # a workaround for https://bugs.archlinux.org/task/36959
+  sed -i '/^\s*$/d' $pkgdir/usr/bin/startx
+  sed -i '/^\s*$/d' $pkgdir/etc/X11/xinit/xinitrc
+
 }