Tue Jul 1 03:46:37 UTC 2014

115 files changed, 570 insertions, 1419 deletions

diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
index aa75bc061..02e9b2c74 100644
--- a/community/bitcoin/PKGBUILD
+++ b/community/bitcoin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 113294 2014-06-17 09:48:19Z tredaelli $
+# $Id: PKGBUILD 113790 2014-06-30 13:57:31Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: shahid <helllamer@gmail.com>
 
 pkgbase=bitcoin
-pkgname=('bitcoin-daemon' 'bitcoin-qt')
-pkgver=0.9.2
+pkgname=('bitcoin-daemon' 'bitcoin-cli' 'bitcoin-qt')
+pkgver=0.9.2.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.bitcoin.org/"
@@ -16,20 +16,30 @@ source=(http://bitcoin.org/bin/$pkgver/bitcoin-$pkgver-linux.tar.gz
 	https://raw.github.com/bitcoin/bitcoin/v$pkgver/contrib/debian/examples/bitcoin.conf
 	https://raw.github.com/bitcoin/bitcoin/v$pkgver/contrib/debian/manpages/bitcoind.1
 	https://raw.github.com/bitcoin/bitcoin/v$pkgver/contrib/debian/manpages/bitcoin.conf.5)
-sha256sums=('58a77aeb4c81b54d3903d85abce4f0fb580694a3611a415c5fe69a27dea5935b'
+sha256sums=('0060f7d38b98113ab912d4c184000291d7f026eaf77ca5830deec15059678f54'
             'b65b377c0d9ecae9eea722843bca0add6bdb7e50929a7e1f751b79b6621c6073'
             'ad880c8459ecfdb96abe6a4689af06bdd27906e0edcd39d0915482f2da91e722'
             'e141088b07641e4e58cc750f93bbdda1ca0e8f07262fce66b73524c1ed97480e'
             '881dcc53ebe2d2a4f8647eb206fd355c69e4186f225e2dcfce19d276381e613a'
             'b7b232079027c41061dcfd21bca2054e349e4bed4f233733406bb3d90bd533ec')
 
+# Upstream should be more coherent!
+case "$pkgver" in
+*.*.*.*)
+  _pkgver=${pkgver%.*}
+  ;;
+*)
+  _pkgver=$pkgver
+  ;;
+esac
+
 prepare() {
   cd "$srcdir/$pkgbase-$pkgver-linux/src"
-  tar xf $pkgbase-$pkgver.tar.gz
+  tar xf $pkgbase-$_pkgver.tar.gz
 }
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver-linux/src/$pkgbase-$pkgver"
+  cd "$srcdir/$pkgbase-$pkgver-linux/src/$pkgbase-$_pkgver"
   ./configure --prefix=/usr --with-incompatible-bdb --with-gui=qt4
   make
 }
@@ -39,7 +49,7 @@ package_bitcoin-qt() {
   depends=(boost-libs qt4 miniupnpc qrencode protobuf)
   install=bitcoin-qt.install
 
-  cd "$srcdir/$pkgbase-$pkgver-linux/src/$pkgbase-$pkgver"
+  cd "$srcdir/$pkgbase-$pkgver-linux/src/$pkgbase-$_pkgver"
   install -Dm755 src/qt/bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt
   install -Dm644 "$srcdir"/bitcoin-qt.desktop \
     "$pkgdir"/usr/share/applications/bitcoin.desktop
@@ -53,7 +63,7 @@ package_bitcoin-daemon() {
   pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon"
   depends=(boost-libs miniupnpc openssl)
 
-  cd "$srcdir/$pkgbase-$pkgver-linux/src/$pkgbase-$pkgver"
+  cd "$srcdir/$pkgbase-$pkgver-linux/src/$pkgbase-$_pkgver"
   install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind
   install -Dm644 "$srcdir"/bitcoin.conf \
     "$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf"
@@ -64,3 +74,11 @@ package_bitcoin-daemon() {
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
+package_bitcoin-cli() {
+  pkgdesc="Bitcoin is a peer-to-peer network based digital currency - RPC client"
+  depends=(boost-libs openssl)
+
+  cd "$srcdir/$pkgbase-$pkgver-linux/src/$pkgbase-$_pkgver"
+  install -Dm755 src/bitcoin-cli "$pkgdir"/usr/bin/bitcoin-cli
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD
index 9f0b824bf..4171ccace 100644
--- a/community/cgit/PKGBUILD
+++ b/community/cgit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 106333 2014-02-28 07:30:32Z spupykin $
+# $Id: PKGBUILD 113802 2014-06-30 16:18:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Patrick Palka <patrick@parcs.ath.cx>
@@ -6,7 +6,7 @@
 # Contributor: Andreas Baumann <abaumann at yahoo dot com>
 
 pkgname=cgit
-pkgver=0.10.1
+pkgver=0.10.2
 pkgrel=1
 pkgdesc="A web interface for git written in plain C"
 arch=('i686' 'x86_64')
@@ -14,10 +14,12 @@ url="http://git.zx2c4.com/cgit/"
 license=('GPL2')
 depends=('openssl' 'luajit')
 makedepends=('zlib' 'curl' 'asciidoc')
+optdepends=('python2-pygments: syntax highlighting support'
+	    'mime-types: serve file with correct content-type header')
 install=cgit.install
 source=("http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz"
 	"apache.example.conf")
-md5sums=('060ef0aa95ebda6ea7daf823214bc4d0'
+md5sums=('6682d597f6e3e76645a254c7be537bd3'
          'bd5696bea0654bfcf98f249b1a36737d')
 
 prepare() {
diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD
index 4c7caea95..347241995 100644
--- a/community/chrony/PKGBUILD
+++ b/community/chrony/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108210 2014-03-24 21:36:00Z thestinger $
+# $Id: PKGBUILD 113776 2014-06-30 09:17:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
@@ -9,7 +9,7 @@
 
 pkgname=chrony
 pkgver=1.29.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight NTP client and server'
 arch=('i686' 'x86_64')
 url="http://chrony.tuxfamily.org/"
@@ -45,7 +45,7 @@ package() {
   install -Dm644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/chrony.service"
 
   install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d"
-  echo "$pkgname.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list"
+  echo "$pkgname.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/10-$pkgname.list"
 
   chown 183:183 "$pkgdir/var/lib/chrony"
 }
diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD
index 101b5e977..923751c07 100644
--- a/community/glusterfs/PKGBUILD
+++ b/community/glusterfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 113498 2014-06-24 11:02:08Z spupykin $
+# $Id: PKGBUILD 113780 2014-06-30 11:59:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributors:
 #   Andrei Antoukh - niwi@niwi.be - http://www.niwi.be
@@ -6,14 +6,16 @@
 
 pkgname=glusterfs
 pkgver=3.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.'
 arch=(i686 x86_64)
 url='http://www.gluster.org/'
 license=(GPL2 LGPL3)
 install=glusterfs.install
-depends=(fuse python2 libxml2)
+depends=(fuse python2 libxml2 libaio)
 makedepends=(flex bison)
+optdepends=('rpcbind: NFS'
+	    'glib2: qemu-block')
 source=($pkgname-$pkgver.tar.gz::https://github.com/gluster/glusterfs/archive/v$pkgver.tar.gz)
 md5sums=('8ca66470225704339b94317616977301')
 
diff --git a/community/gtk-sharp-3/PKGBUILD b/community/gtk-sharp-3/PKGBUILD
index 1f0d5604a..1f4e6c374 100644
--- a/community/gtk-sharp-3/PKGBUILD
+++ b/community/gtk-sharp-3/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 110981 2014-05-11 18:52:35Z bgyorgy $
+# $Id: PKGBUILD 113786 2014-06-30 13:43:08Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=gtk-sharp-3
 _pkgname=gtk-sharp
-pkgver=2.99.2
-pkgrel=2
+pkgver=2.99.3
+pkgrel=1
 pkgdesc="C# bindings for GTK+ 3"
 arch=('i686' 'x86_64')
 url="http://mono-project.com/GtkSharp"
 license=('LGPL')
 depends=('mono' 'gtk3')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('0dbb205e827586520a803ec1907d94e51b8c6d4e2bb42bc71c1ac1b769fa9198')
+sha256sums=('6440f571416267ae0cb5698071d087b31e3084693fa2c829b1db37ca7ea2c3a2')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
diff --git a/community/hitori/PKGBUILD b/community/hitori/PKGBUILD
index 58fde03bf..d807e5e6d 100644
--- a/community/hitori/PKGBUILD
+++ b/community/hitori/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 110895 2014-05-09 11:17:30Z bgyorgy $
+# $Id: PKGBUILD 113796 2014-06-30 14:03:05Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=hitori
-pkgver=0.4.3
+pkgver=0.4.4
 pkgrel=1
 pkgdesc="GTK+ application to generate and let you play games of Hitori"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('gtk3')
 makedepends=('intltool' 'itstool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('870657747e7afb6796dae66fccc4fa36a562750bec8f093191c5895ce0f010c2')
+sha256sums=('a842f784f7910a7ece9f8a684fbc29ebc469bc4cb4cb27ec4e6191c4649ff9eb')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD
index 8a2284cbf..d6b463c57 100644
--- a/community/notmuch/PKGBUILD
+++ b/community/notmuch/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 110999 2014-05-11 19:50:10Z dwallace $
+# $Id: PKGBUILD 113820 2014-06-30 20:26:05Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: fauno <fauno at kiwwwi.com.ar>
 # Contributor: Olivier Ramonat <olivier at ramonat dot fr>
@@ -6,15 +6,15 @@
 
 pkgbase=notmuch
 pkgname=('notmuch' 'notmuch-vim' 'notmuch-mutt' 'notmuch-runtime')
-pkgver=0.18
+pkgver=0.18.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://notmuchmail.org/"
 license=('GPL3')
-makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime' 'talloc')
+makedepends=('python2' 'python' 'python-sphinx' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime' 'talloc')
 options=(!distcc !makeflags)
 source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('f28f11af1acfb6d9adde2eec600bc27a')
+md5sums=('12150aefea58ed0922b48c9494f17ddd')
 
 prepare(){
     #cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver"
@@ -55,16 +55,17 @@ package_notmuch-runtime(){
     pkgdesc="Runtime for notmuch and notmuch-mutt"
     depends=('xapian-core' 'gmime' 'talloc')
     cd "$srcdir/${pkgbase}-$pkgver"
-    make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 install
+    make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 WITH_EMACS=0 install
 	install -Dm755 notmuch $pkgdir/usr/bin/notmuch
+    rm -rf $pkgdir/usr/share
 }
 
 
 package_notmuch-vim(){
 	pkgdesc="Vim plugins for notmuch"
 	depends=('notmuch-runtime')
-    mkdir -p "$pkgdir"/usr/share/vim/vimfiles/{plugin,syntax}
-    make -C "$srcdir/$pkgbase-$pkgver/vim" prefix="$pkgdir/usr/share/vim/vimfiles" install
+    install=notmuch.install
+    make -C "$srcdir/$pkgbase-$pkgver/vim" DESTDIR="$pkgdir" prefix="/usr/share/vim/vimfiles" install
 }
 
 
@@ -78,8 +79,15 @@ package_notmuch(){
                 'gnupg: for email encryption')
 
     cd "$srcdir/${pkgname}-$pkgver"
+
+    # Install emacs parts
+    make DESTDIR="$pkgdir/" install-emacs
+
+    # Install manpages
+    make DESTDIR="$pkgdir" prefix="/usr" install-man
+
     # Install ruby bindings
-    sed -i -e 's,/site_ruby,,g' bindings/ruby/Makefile
+    sed -i 's:INSTALL = .*[^D]$:& -D:' bindings/ruby/Makefile
     make -C bindings/ruby exec_prefix=$pkgdir/usr prefix=/usr install
 
     # Install notmuch-deliver
@@ -91,6 +99,7 @@ package_notmuch(){
 
     cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
 	python setup.py install --prefix=/usr --root="$pkgdir"
+
 }
 
 package_notmuch-mutt(){
@@ -102,4 +111,4 @@ package_notmuch-mutt(){
     install -Dm644 "contrib/$pkgname/${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1"
 }
 
-#vim: set filetype=PKGBUILD sw=4 ts=4 et
+#vim: filetype=PKGBUILD sw=4 ts=4 et
diff --git a/community/notmuch/notmuch.install b/community/notmuch/notmuch.install
new file mode 100644
index 000000000..498d9ad2a
--- /dev/null
+++ b/community/notmuch/notmuch.install
@@ -0,0 +1,21 @@
+update_tags() {
+    echo -n "Updating vim help tags... "
+    /usr/bin/vim --noplugins -u NONE -U NONE \
+        --cmd ":helptags /usr/share/vim/vimfiles/doc" \
+        --cmd ":q" > /dev/null 2>&1
+    echo "done."
+}
+
+post_install() {
+    update_tags
+    echo
+    echo '-> To run type "vim -c NotMuch"'
+}
+
+post_upgrade() {
+    update_tags
+}
+
+post_remove() {
+    update_tags
+}
diff --git a/community/pianobar/PKGBUILD b/community/pianobar/PKGBUILD
index bc1108a58..a8ec8cfd7 100644
--- a/community/pianobar/PKGBUILD
+++ b/community/pianobar/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 103923 2014-01-13 17:16:56Z andyrtr $
+# $Id: PKGBUILD 113808 2014-06-30 18:03:21Z dwallace $
 # Maintainer: Daniel Wallace < danielwallace at gtmanfred dot com>
 # Contributor: Mitch Bigelow <ipha00@gmail.com>
 # Contributor: Patrick Palka <patrick@parcs.ath.cx>
 
 pkgname=pianobar
-pkgver=2013.09.15
-pkgrel=2
+pkgver=2014.06.08
+pkgrel=1
 pkgdesc="console-based frontend for Pandora"
 url="http://6xq.net/0017"
 arch=('i686' 'x86_64')
 license=('MIT')
-depends=('libao' 'faad2' 'libmad' 'gnutls' 'json-c' 'libgcrypt')
+depends=('libao' 'ffmpeg')
 source=(http://6xq.net/projects/pianobar/$pkgname-$pkgver.tar.bz2)
-sha256sums=('3f8cf25ef054acf46e519d02453a6e214cfa09661b3adc03da99ace1c6f10066')
+sha256sums=('3348b4bdfa9959bc7aeb03ff6ff66e334f8efc78a84261558f18f5fbd543ed2b')
 
 build() {
     make -C "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/python2-systemd/PKGBUILD b/community/python2-systemd/PKGBUILD
index 7fb11e5ef..36176441f 100644
--- a/community/python2-systemd/PKGBUILD
+++ b/community/python2-systemd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 111765 2014-05-23 14:47:58Z dwallace $
+# $Id: PKGBUILD 113810 2014-06-30 18:17:40Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com
 pkgname=python2-systemd
 _pkgname=systemd
-pkgver=212
-pkgrel=2
+pkgver=214
+pkgrel=1
 pkgdesc="Python2 bindings for systemd"
 arch=('x86_64' 'i686')
 url="http://www.freedesktop.org/wiki/Software/systemd/"
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('python2' "systemd>=$pkgver" 'python2-lxml')
 makedepends=('intltool' 'gperf')
 source=("http://www.freedesktop.org/software/$_pkgname/$_pkgname-$pkgver.tar.xz")
-md5sums=('257a75fff826ff91cb1ce567091cf270')
+md5sums=('eac4f9fc5bd18a0efc3fc20858baacf3')
 
 
 build() {
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index 0b6ab2bdf..24c9cf634 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 111314 2014-05-16 11:43:34Z spupykin $
+# $Id: PKGBUILD 113782 2014-06-30 12:00:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Giovanni Scafora <linuxmania@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=qcad
-pkgver=3.5.1.0
+pkgver=3.6.0.0
 pkgrel=1
 pkgdesc="A 2D CAD package based upon Qt"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ makedepends=('glu')
 options=('libtool')
 source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
         QCad.desktop)
-md5sums=('8515ba13cc8fa5b644864258afed219c'
+md5sums=('bee49bc3fe6fa00c2d80cc308edd2841'
          '84f189dd152e7614a1265659dac6222d')
 
 prepare() {
diff --git a/community/rubinius/PKGBUILD b/community/rubinius/PKGBUILD
index fccc61828..edfa6625c 100644
--- a/community/rubinius/PKGBUILD
+++ b/community/rubinius/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 113258 2014-06-16 18:49:59Z foutrelis $
+# $Id: PKGBUILD 113818 2014-06-30 19:54:25Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=rubinius
 pkgname=(rubinius rubinius-ruby)
-pkgver=2.2.9
-pkgrel=2
+pkgver=2.2.10
+pkgrel=1
 pkgdesc="Ruby runtime written in Ruby, designed for concurrency"
 arch=(i686 x86_64)
 url="http://rubini.us"
@@ -14,7 +14,7 @@ makedepends=(llvm rubinius-ruby)
 options=(!emptydirs)
 source=(http://releases.rubini.us/${pkgbase}-${pkgver}.tar.bz2
         gemrc dirs.patch)
-sha256sums=('7b01a7f2508167e73b5273b4e55e6616fc7fd975e79c84c4d2e3ef83d849d2ce'
+sha256sums=('2a3e6b71f27073b8d83b9592b05523af70bc147ddcd0673bffae55b4167c9d81'
             '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614'
             'a9922b199730c059c26781af45adc46401811ff2e6840c4aeb49da4fa41acdd9')
 
diff --git a/community/sqlitebrowser/PKGBUILD b/community/sqlitebrowser/PKGBUILD
index a5e60dd48..6d3325e47 100644
--- a/community/sqlitebrowser/PKGBUILD
+++ b/community/sqlitebrowser/PKGBUILD
@@ -1,37 +1,26 @@
-# $Id: PKGBUILD 91008 2013-05-17 10:22:46Z spupykin $
+# $Id: PKGBUILD 113784 2014-06-30 12:01:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
 
 pkgname=sqlitebrowser
-pkgver=2.0b1
-_pkgrealver=200_b1
-pkgrel=4
-pkgdesc="SQLite Database browser is a light GUI editor for SQLite databases, built on top of QT"
+pkgver=3.1.0
+pkgrel=1
+pkgdesc="SQLite Database browser is a light GUI editor for SQLite databases, built on top of Qt"
 arch=('i686' 'x86_64')
 url="http://sqlitebrowser.sf.net"
 license=('GPL')
 depends=('qt4' 'sqlite')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}_${_pkgrealver}_src.tar.gz)
-md5sums=('5ca3d41cca454235b93ce72cd585dfe3')
-
-prepare() {
-  cd $srcdir/trunk/$pkgname
-  sed -i 's|getline|xgetline|' sqlitebrowser/sqlbrowser_util.c
-  sed -i 's|: name( 0 ) { }|: name( ) { }|' sqlitebrowser/sqlitedb.h
-  sed -i '/sqlite_source\/sqlite3.h/d' sqlitebrowser/sqlbrowser_util.c # Remove two useless #include
-  sed -i 's/"sqlite_source\/sqlite3.h"/<sqlite3.h>/' sqlitebrowser/sqlbrowser_util.h
-  sed -i -e '1i LIBS += -lsqlite3' -e '/sqlite_source/d' sqlitebrowser/sqlitebrowser.pro
-}
+source=(https://github.com/sqlitebrowser/sqlitebrowser/archive/sqlb-$pkgver.tar.gz)
+md5sums=('17be1cdebcf79a906e6e206fc7cd6cde')
 
 build() {
-  cd $srcdir/trunk/$pkgname
+  cd $srcdir/$pkgname-sqlb-$pkgver
   qmake-qt4
   make
 }
 
 package() {
-  cd $srcdir/trunk/$pkgname
-  mkdir -p $pkgdir/usr/bin
-  cp $pkgname/$pkgname $pkgdir/usr/bin/
+  cd $srcdir/$pkgname-sqlb-$pkgver
+  install -Dm0755 src/$pkgname $pkgdir/usr/bin/$pkgname
 }
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index b984b2477..dcd9dff2d 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 113599 2014-06-26 09:27:28Z spupykin $
+# $Id: PKGBUILD 113804 2014-06-30 16:30:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Coolen <mark.coolen@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,7 +6,7 @@
 
 pkgname=squid
 pkgver=3.4.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686')
 url='http://www.squid-cache.org'
@@ -24,16 +24,18 @@ source=("http://www.squid-cache.org/Versions/v3/3.4/$pkgname-$pkgver.tar.bz2"
         'squid.pam'
         'squid.cron'
         'squid.service'
-        'squid.tmpfiles')
+        'squid.tmpfiles'
+        'squid-r13407.patch')
 md5sums=('d3ca4ce0a039bbba8258d6b67d6afaa1'
          '270977cdd9b47ef44c0c427ab9034777'
          'a71425c4951f2e5b640d19e6a5048531'
          'ceeb57c69ebb165676219222f109a24e'
-         'd243da117c1aee03c0cc6052f023a380')
+         'd243da117c1aee03c0cc6052f023a380'
+         '06e107bc303aca86550a9041fb0ab7a8')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
-#  patch -p0 <$srcdir/ssl.patch
+  patch -p0 <$srcdir/squid-r13407.patch
 }
 
 build() {
diff --git a/community/squid/squid-r13407.patch b/community/squid/squid-r13407.patch
new file mode 100644
index 000000000..6ec937cf5
--- /dev/null
+++ b/community/squid/squid-r13407.patch
@@ -0,0 +1,57 @@
+@@ -, +, @@ 
+  author: Alex Rousskov <rousskov@measurement-factory.com>
+  Avoid on-exit crashes when adaptation is enabled.
+  
+  After trunk r13269 (Vector refactor) destroyed vector objects still have
+  positive item counts. This exposes use-after-delete bugs. In this particular
+  case, global adaptation rule/group/service arrays are destructed by global
+  destruction sequence first and then again by Adaptation::*::TheConfig objects
+  destructors.
+  
+  This change avoiding static destruction order dependencies by storing those
+  global adaptation arrays on heap.
+--- src/adaptation/AccessRule.cc	2014-06-03 07:05:07 +0000
++++ src/adaptation/AccessRule.cc	2014-06-29 15:22:19 +0000
+@@ -51,10 +51,10 @@ Adaptation::AccessRule::group()
+ 
+ Adaptation::AccessRules &
+ Adaptation::AllRules()
+ {
+-    static AccessRules TheRules;
+-    return TheRules;
++    static AccessRules *TheRules = new AccessRules;
++    return *TheRules;
+ }
+ 
+ // TODO: make AccessRules::find work
+ Adaptation::AccessRule *
+--- src/adaptation/Service.cc	2012-08-28 13:00:30 +0000
++++ src/adaptation/Service.cc	2014-06-29 15:22:19 +0000
+@@ -53,10 +53,10 @@ Adaptation::Service::wants(const Service
+ 
+ Adaptation::Services &
+ Adaptation::AllServices()
+ {
+-    static Services TheServices;
+-    return TheServices;
++    static Services *TheServices = new Services;
++    return *TheServices;
+ }
+ 
+ Adaptation::ServicePointer
+ Adaptation::FindService(const Service::Id& key)
+--- src/adaptation/ServiceGroups.cc	2013-09-28 13:03:58 +0000
++++ src/adaptation/ServiceGroups.cc	2014-06-29 15:22:19 +0000
+@@ -314,10 +314,10 @@ Adaptation::ServicePlan::print(std::ostr
+ 
+ Adaptation::Groups &
+ Adaptation::AllGroups()
+ {
+-    static Groups TheGroups;
+-    return TheGroups;
++    static Groups *TheGroups = new Groups;
++    return *TheGroups;
+ }
+ 
+ Adaptation::ServiceGroupPointer
+ Adaptation::FindGroup(const ServiceGroup::Id &id)
diff --git a/community/vapoursynth/PKGBUILD b/community/vapoursynth/PKGBUILD
index da3bd4b31..3cf41741d 100644
--- a/community/vapoursynth/PKGBUILD
+++ b/community/vapoursynth/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 110469 2014-04-30 14:22:15Z alucryd $
+# $Id: PKGBUILD 113778 2014-06-30 09:24:56Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: sl1pkn07 <sl1pkn07@gmail.com>
 # Contributor: jackoneill <cantabile.desu@gmail.com>
 
 pkgname=vapoursynth
 pkgver=R23
-pkgrel=3
+pkgrel=4
 pkgdesc='A video processing framework with the future in mind'
 arch=('i686' 'x86_64')
 url='http://www.vapoursynth.com/'
diff --git a/community/webkitgtk-sharp/PKGBUILD b/community/webkitgtk-sharp/PKGBUILD
index db4a28154..ef61d7660 100644
--- a/community/webkitgtk-sharp/PKGBUILD
+++ b/community/webkitgtk-sharp/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 110988 2014-05-11 19:08:20Z bgyorgy $
+# $Id: PKGBUILD 113788 2014-06-30 13:48:09Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=webkitgtk-sharp
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="C# bindings for WebKitGTK+"
 arch=('i686' 'x86_64')
 url="https://github.com/xDarkice/webkitgtk-sharp"
 license=('LGPL')
 depends=('gtk-sharp-3' 'webkitgtk')
-makedepends=('git' 'soup-sharp')
-source=($pkgname-$pkgver::git://github.com/xDarkice/webkitgtk-sharp.git#commit=f0c32b5fce3043582f4666327f23fdf8914bee66)
-sha256sums=('SKIP')
+makedepends=('soup-sharp')
+source=(https://github.com/xDarkice/webkitgtk-sharp/releases/download/$pkgver/$pkgname-$pkgver.tar.gz)
+sha256sums=('63a73586000a5528812e00c9bf5a6123848996aa8c9e494945216b50f0ffa3d9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./autogen.sh --prefix=/usr
+  ./configure --prefix=/usr
   make -j1
 }
 
diff --git a/core/lzo2/PKGBUILD b/core/lzo2/PKGBUILD
index 69da4de16..e163f4321 100644
--- a/core/lzo2/PKGBUILD
+++ b/core/lzo2/PKGBUILD
@@ -1,20 +1,26 @@
-# $Id: PKGBUILD 197831 2013-10-30 11:05:49Z allan $
+# $Id: PKGBUILD 215660 2014-06-30 06:39:24Z tpowa $
 # Contributor: Low Kian Seong <fastmail_low@speedymail.org>
 # Maintainer: dorphell <dorphell@archlinux.org>
 pkgname=lzo2
-pkgver=2.06
-pkgrel=3
+pkgver=2.07
+pkgrel=2
 pkgdesc="Portable lossless data compression library"
 arch=('i686' 'x86_64')
 url="http://www.oberhumer.com/opensource/lzo"
 license=('GPL')
 depends=('glibc')
-source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz)
-md5sums=('95380bd4081f85ef08c5209f4107e9f8')
+source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz
+        configure-2.07.patch)
+md5sums=('4011935e95171e78ad4894f7335c982a'
+         'db3ead3fb5590275838d3080ea7342d1')
 
-build() {
+prepare() {
   cd "${srcdir}/lzo-${pkgver}"
+  patch -Np0 -i ${srcdir}/configure-2.07.patch
+}
 
+build() {
+  cd "${srcdir}/lzo-${pkgver}"
   ./configure --prefix=/usr --enable-shared
   make
 
diff --git a/core/lzo2/configure-2.07.patch b/core/lzo2/configure-2.07.patch
new file mode 100644
index 000000000..be61278df
--- /dev/null
+++ b/core/lzo2/configure-2.07.patch
@@ -0,0 +1,12 @@
+--- configure.ORIG      2014-06-25 15:47:13.000000000 +0200
++++ configure   2014-06-26 00:05:33.000000000 +0200
+@@ -13953,7 +13953,7 @@
+ /* end confdefs.h.  */
+ #define LZO_CFG_NO_CONFIG_HEADER 1
+ #define LZO_WANT_ACC_INCD_H 1
+-#include "include/lzo/lzodefs.h"
++#include "include/lzo/lzoconf.h"
+ #include "src/lzo_supp.h"
+
+ #undef  LZOCHK_ASSERT
+
diff --git a/extra/anthy/PKGBUILD b/extra/anthy/PKGBUILD
index 5f41b74e2..d60421b5c 100644
--- a/extra/anthy/PKGBUILD
+++ b/extra/anthy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197859 2013-10-30 11:18:33Z allan $
+# $Id: PKGBUILD 215706 2014-06-30 10:18:10Z bisson $
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=anthy
 pkgver=9100h
 _filecode=37536
-pkgrel=3
+pkgrel=4
 pkgdesc='Hiragana text to Kana Kanji mixed text Japanese input method'
 arch=('i686' 'x86_64')
 url='http://sourceforge.jp/projects/anthy/'
@@ -16,7 +16,7 @@ sha1sums=('bfea9e74e208c4b976b6bd7ac6784cd290c636fd')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --sysconfdir=/etc --disable-static
+	./configure --prefix=/usr --sysconfdir=/etc
 	make
 }
 
diff --git a/extra/appmenu-qt/PKGBUILD b/extra/appmenu-qt/PKGBUILD
index cb9cba804..fae907c4b 100644
--- a/extra/appmenu-qt/PKGBUILD
+++ b/extra/appmenu-qt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 206527 2014-03-01 08:09:39Z andrea $
+# $Id: PKGBUILD 215820 2014-06-30 16:38:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=appmenu-qt
 pkgver=0.2.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Allows Qt applications to export menus over DBus to a menu applet"
 arch=('i686' 'x86_64')
 url='https://launchpad.net/appmenu-qt'
diff --git a/extra/apricots/PKGBUILD b/extra/apricots/PKGBUILD
index 3fbe423f6..f25a57d80 100644
--- a/extra/apricots/PKGBUILD
+++ b/extra/apricots/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143883 2011-11-30 13:08:53Z heftig $
+# $Id: PKGBUILD 215866 2014-06-30 18:52:48Z heftig $
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=apricots
 pkgver=0.2.6
-pkgrel=5
+pkgrel=6
 pkgdesc="A simple 2D flying/bombing game similar to basic side scrollers"
 arch=("i686" "x86_64")
 license=('GPL')
diff --git a/extra/aspell-en/PKGBUILD b/extra/aspell-en/PKGBUILD
index aceb777bc..78cb9fd8e 100644
--- a/extra/aspell-en/PKGBUILD
+++ b/extra/aspell-en/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 150483 2012-02-18 03:18:23Z allan $
+# $Id: PKGBUILD 215708 2014-06-30 10:25:37Z bisson $
 
 pkgname=aspell-en
 pkgver=7.1
-pkgrel=2
+pkgrel=3
 pkgdesc="English dictionary for aspell"
 arch=('i686' 'x86_64')
 url="http://aspell.net/"
diff --git a/extra/aspell-es/PKGBUILD b/extra/aspell-es/PKGBUILD
index 3b9df0a33..b7ea705a0 100644
--- a/extra/aspell-es/PKGBUILD
+++ b/extra/aspell-es/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150485 2012-02-18 03:22:08Z allan $
+# $Id: PKGBUILD 215784 2014-06-30 14:35:37Z fyan $
 # Maintainer:
 # Contributor: Simo Leone <simo@archlinux.org>
 # Contributor: Juan Pablo León <jp_leon@gmx.net>
 
 pkgname=aspell-es
 pkgver=1.11
-pkgrel=5
+pkgrel=6
 pkgdesc="Spanish dictionary for aspell"
 arch=('i686' 'x86_64')
 url="http://aspell.net/"
diff --git a/extra/aspell/PKGBUILD b/extra/aspell/PKGBUILD
index e62de7316..f9fe3f854 100644
--- a/extra/aspell/PKGBUILD
+++ b/extra/aspell/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 197863 2013-10-30 11:20:05Z allan $
+# $Id: PKGBUILD 215604 2014-06-30 04:21:29Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=aspell
 pkgver=0.60.6.1
 _pkgmajorver=0.60
-pkgrel=1
+pkgrel=2
 pkgdesc="A spell checker designed to eventually replace Ispell"
 arch=('i686' 'x86_64')
 url="http://aspell.net/"
diff --git a/extra/automoc4/PKGBUILD b/extra/automoc4/PKGBUILD
index b4e153571..ae7906e69 100644
--- a/extra/automoc4/PKGBUILD
+++ b/extra/automoc4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 206531 2014-03-01 08:11:54Z andrea $
+# $Id: PKGBUILD 215826 2014-06-30 16:41:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=automoc4
 pkgver=0.9.88
-pkgrel=4
+pkgrel=5
 pkgdesc="Automatic moc for Qt4"
 arch=('i686' 'x86_64')
 url='http://www.kde.org/'
@@ -17,20 +17,20 @@ md5sums=('91bf517cb940109180ecd07bc90c69ec'
          '9014edbb7e2f02fe90b2db8707487bce')
 
 prepare() {
-	mkdir build
+  mkdir build
 }
 
 build() {
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-	  -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_INSTALL_PREFIX=/usr
-	make
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
 }
 
 package() {
   cd build
-	make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}/license.txt" \
     "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/extra/capseo/PKGBUILD b/extra/capseo/PKGBUILD
index b1eb3f76b..ad24786e4 100644
--- a/extra/capseo/PKGBUILD
+++ b/extra/capseo/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 197882 2013-10-30 11:27:01Z allan $
+# $Id: PKGBUILD 215814 2014-06-30 16:24:00Z fyan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=capseo
 pkgver=0.3
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="Capseo video codec"
 arch=('i686' 'x86_64')
-url="http://dev.gentoo.org/~trapni/capseo/"
+url="https://gitorious.org/capseo"
 license=('GPL2')
 depends=('libgl' 'gcc-libs')
 makedepends=('pkgconfig' 'mesa' 'libogg')
diff --git a/extra/cdrdao/PKGBUILD b/extra/cdrdao/PKGBUILD
index 3ef570fbe..b4f832467 100644
--- a/extra/cdrdao/PKGBUILD
+++ b/extra/cdrdao/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137917 2011-09-12 12:45:56Z pierre $
+# $Id: PKGBUILD 215804 2014-06-30 15:39:05Z fyan $
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
@@ -6,7 +6,7 @@
 pkgbase=('cdrdao')
 pkgname=('cdrdao' 'gcdmaster')
 pkgver=1.2.3
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://cdrdao.sourceforge.net/"
diff --git a/extra/cdrdao/gcdmaster.install b/extra/cdrdao/gcdmaster.install
index ed2efc6aa..0c1bae6b3 100644
--- a/extra/cdrdao/gcdmaster.install
+++ b/extra/cdrdao/gcdmaster.install
@@ -2,7 +2,7 @@ pkgname=gcdmaster
 
 post_install() {
   usr/sbin/gconfpkg --install ${pkgname}
-  update-mime-database usr/share/mime
+  update-mime-database usr/share/mime &> /dev/null
 }
 
 pre_upgrade() {
@@ -18,5 +18,5 @@ pre_remove() {
 }
 
 post_remove() {
-  update-mime-database usr/share/mime
+  update-mime-database usr/share/mime &> /dev/null
 }
diff --git a/extra/datefudge/PKGBUILD b/extra/datefudge/PKGBUILD
index 1cf348382..862afa611 100644
--- a/extra/datefudge/PKGBUILD
+++ b/extra/datefudge/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170796 2012-11-11 16:17:27Z andyrtr $
+# $Id: PKGBUILD 215893 2014-06-30 19:24:42Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Dan Serban (dserban01 => gmail)
 
 pkgname=datefudge
-pkgver=1.17
+pkgver=1.20
 pkgrel=1
 pkgdesc="A program (and preload library) to fake system date"
 arch=('i686' 'x86_64')
@@ -11,20 +11,20 @@ url="http://packages.qa.debian.org/d/datefudge.html"
 license=('GPL2')
 depends=('sh')
 source=(http://ftp.de.debian.org/debian/pool/main/d/$pkgname/${pkgname}_${pkgver}.tar.gz)
-md5sums=('d306e183ea3fdbde088ebd523f6387c5')
+md5sums=('033990e39ab7b29321fc3a0e3bbb165a')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   #./configure --prefix=/usr
   make
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make test
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir/" install
 }
diff --git a/extra/dbus-c++/PKGBUILD b/extra/dbus-c++/PKGBUILD
index 40ee64d05..73d5e0cde 100644
--- a/extra/dbus-c++/PKGBUILD
+++ b/extra/dbus-c++/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=dbus-c++
 _pkgname=lib$pkgname
 pkgver=0.9.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A C++ API for D-BUS"
 url="http://sourceforge.net/projects/dbus-cplusplus/"
 arch=('i686' 'x86_64')
diff --git a/extra/djvulibre/PKGBUILD b/extra/djvulibre/PKGBUILD
index eb44cb111..60a936279 100644
--- a/extra/djvulibre/PKGBUILD
+++ b/extra/djvulibre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197909 2013-10-30 11:37:09Z allan $
+# $Id: PKGBUILD 215710 2014-06-30 10:28:02Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: mgushee
@@ -6,7 +6,7 @@
 pkgname=djvulibre
 pkgver=3.5.25.3
 _major=3.5.25
-pkgrel=1
+pkgrel=2
 pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents"
 url='http://djvu.sourceforge.net/'
 arch=('i686' 'x86_64')
diff --git a/extra/enchant/PKGBUILD b/extra/enchant/PKGBUILD
index b27d1ab89..b5e34c79b 100644
--- a/extra/enchant/PKGBUILD
+++ b/extra/enchant/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 197928 2013-10-30 11:43:45Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 215608 2014-06-30 04:26:00Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=enchant
 pkgver=1.6.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A wrapper library for generic spell checking"
 arch=('i686' 'x86_64')
 url="http://www.abisource.com/enchant/"
diff --git a/extra/ethstatus/PKGBUILD b/extra/ethstatus/PKGBUILD
index 9333a6adf..4489cea8d 100644
--- a/extra/ethstatus/PKGBUILD
+++ b/extra/ethstatus/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 128471 2011-06-24 03:12:05Z eric $
+# $Id: PKGBUILD 215806 2014-06-30 16:10:05Z fyan $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ethstatus
 pkgver=0.4.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple program for displaying commonly needed/wanted statistics in real time of incoming and outgoing traffic"
 arch=('i686' 'x86_64')
 url="http://packages.qa.debian.org/e/ethstatus.html"
diff --git a/extra/expect/PKGBUILD b/extra/expect/PKGBUILD
index 5af97256a..04dd67af4 100644
--- a/extra/expect/PKGBUILD
+++ b/extra/expect/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173839 2012-12-25 00:34:18Z foutrelis $
+# $Id: PKGBUILD 215626 2014-06-30 04:47:30Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=expect
 pkgver=5.45
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool for automating interactive applications"
 arch=('i686' 'x86_64')
 url="http://www.nist.gov/el/msid/expect.cfm"
diff --git a/extra/ftjam/PKGBUILD b/extra/ftjam/PKGBUILD
index 42726f3cb..9ca150e90 100644
--- a/extra/ftjam/PKGBUILD
+++ b/extra/ftjam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 136989 2011-09-04 19:07:07Z eric $
+# $Id: PKGBUILD 215802 2014-06-30 15:35:54Z fyan $
 # Maintainer: Roman Kyrylych <roman@gmail.com>
 # Contributor: Roman Kyrylych <roman@gmail.com>
 
 pkgname=ftjam
 pkgver=2.5.3rc2
-pkgrel=3
+pkgrel=4
 pkgdesc='FT Jam - an enhanced version of the Jam build tool'
 arch=('i686' 'x86_64')
 url="http://freetype.org/jam/"
diff --git a/extra/geoclue/PKGBUILD b/extra/geoclue/PKGBUILD
index 8fc6a8386..eca30f7a0 100644
--- a/extra/geoclue/PKGBUILD
+++ b/extra/geoclue/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197982 2013-10-30 12:04:23Z allan $
+# $Id: PKGBUILD 215864 2014-06-30 18:48:10Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=geoclue
 pkgver=0.12.99
-pkgrel=1
+pkgrel=2
 pkgdesc="Modular geoinformation service built on the D-Bus messaging system."
 arch=(i686 x86_64)
 url="http://geoclue.freedesktop.org/"
diff --git a/extra/glu/PKGBUILD b/extra/glu/PKGBUILD
index 1e0702bea..9bd5a8e5a 100644
--- a/extra/glu/PKGBUILD
+++ b/extra/glu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197997 2013-10-30 12:10:07Z allan $
+# $Id: PKGBUILD 215638 2014-06-30 04:59:29Z lcarlier $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=glu
 pkgver=9.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Mesa OpenGL Utility library"
 arch=('i686' 'x86_64')
 url="http://cgit.freedesktop.org/mesa/glu/"
diff --git a/extra/gnome-desktop2/PKGBUILD b/extra/gnome-desktop2/PKGBUILD
index dcf69381f..1c75f70e7 100644
--- a/extra/gnome-desktop2/PKGBUILD
+++ b/extra/gnome-desktop2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198006 2013-10-30 12:13:26Z allan $
+# $Id: PKGBUILD 215868 2014-06-30 18:56:03Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor:  Jan de Groot <jan@archlinux.org>
 
 _pkgname=gnome-desktop
 pkgname=${_pkgname}2
 pkgver=2.32.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Library with common API for various GNOME modules (legacy version)"
 arch=(i686 x86_64)
 license=(GPL LGPL)
diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD
index 5ebe26808..4a701db3a 100644
--- a/extra/gnome-user-share/PKGBUILD
+++ b/extra/gnome-user-share/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 211287 2014-04-18 15:10:19Z heftig $
+# $Id: PKGBUILD 215858 2014-06-30 18:40:47Z heftig $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-user-share
 pkgver=3.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Easy to use user-level file sharing for GNOME."
 arch=('i686' 'x86_64')
 url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
@@ -13,8 +13,15 @@ makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl')
 options=('!emptydirs')
 groups=('gnome')
 install=gnome-user-share.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+        fix-no-password-mode.patch)
+sha256sums=('1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f'
+            'c35ba44284d5797fee3dfafd879333e5ec26f5b3fa18703e6235aa487c0e25bd')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../fix-no-password-mode.patch
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-user-share/fix-no-password-mode.patch b/extra/gnome-user-share/fix-no-password-mode.patch
new file mode 100644
index 000000000..d57e72b8d
--- /dev/null
+++ b/extra/gnome-user-share/fix-no-password-mode.patch
@@ -0,0 +1,59 @@
+From a1afc2e9aa3b86f408739e78bd23382c53df5b5c Mon Sep 17 00:00:00 2001
+From: Josselin Mouette <joss@debian.org>
+Date: Tue, 24 Jun 2014 15:00:36 +0200
+Subject: data: Fix httpd configuration with require_password=never
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The AuthType, AuthName, AuthDigestDomain, AuthDigestProvider,
+AuthUserFile and AuthGroupFile directives should be in an
+<IfDefine> section, executed only when password authentication
+is configured, otherwise we get this error:
+"AuthType configured with no corresponding authorization directives"
+
+Thanks to scorpy_sk@yahoo.com and Arno Töll.
+
+diff --git a/data/dav_user_2.4.conf b/data/dav_user_2.4.conf
+index de2e885..9604637 100644
+--- a/data/dav_user_2.4.conf
++++ b/data/dav_user_2.4.conf
+@@ -30,20 +30,28 @@ DNSSDAutoRegisterUserDir Off
+   <Location />
+     DAV On
+ 
+-    AuthType Digest
+-    AuthName "${GUS_LOGIN_LABEL}"
+-    AuthDigestDomain /
++    <IfDefine RequirePasswordAlways>
++      AuthType Digest
++      AuthName "${GUS_LOGIN_LABEL}"
++      AuthDigestDomain /
+ 
+-    AuthDigestProvider file
+-    AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
+-    AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
++      AuthDigestProvider file
++      AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
++      AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
+ 
+-    <IfDefine RequirePasswordAlways>
+       Require user guest
+       Require group guest
+     </IfDefine>
+ 
+     <IfDefine RequirePasswordOnWrite>
++      AuthType Digest
++      AuthName "${GUS_LOGIN_LABEL}"
++      AuthDigestDomain /
++
++      AuthDigestProvider file
++      AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
++      AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
++
+       <LimitExcept GET OPTIONS PROPFIND>
+         Require user guest
+         Require group guest
+-- 
+cgit v0.10.1
+
diff --git a/extra/gnu-netcat/PKGBUILD b/extra/gnu-netcat/PKGBUILD
index a436a9d72..c620011d1 100644
--- a/extra/gnu-netcat/PKGBUILD
+++ b/extra/gnu-netcat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137726 2011-09-10 14:19:00Z pierre $
+# $Id: PKGBUILD 215666 2014-06-30 06:45:08Z tpowa $
 # Maintainer: Tom K <tomk@runbox.com>
 
 pkgname=gnu-netcat
 pkgver=0.7.1
-pkgrel=4
+pkgrel=5
 pkgdesc="GNU rewrite of netcat, the network piping application"
 depends=('glibc' 'texinfo')
 arch=('i686' 'x86_64')
diff --git a/extra/gnugo/PKGBUILD b/extra/gnugo/PKGBUILD
index db803a1b9..49dfde200 100644
--- a/extra/gnugo/PKGBUILD
+++ b/extra/gnugo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149077 2012-02-05 16:47:56Z bisson $
+# $Id: PKGBUILD 215714 2014-06-30 10:35:23Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,7 +6,7 @@
 
 pkgname=gnugo
 pkgver=3.8
-pkgrel=3
+pkgrel=4
 pkgdesc='Program that plays the game of Go'
 url='http://www.gnu.org/software/gnugo/'
 license=('GPL3' 'custom')
diff --git a/extra/id3v2/PKGBUILD b/extra/id3v2/PKGBUILD
index 42ab5b3f7..ac4c450c8 100644
--- a/extra/id3v2/PKGBUILD
+++ b/extra/id3v2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150519 2012-02-18 12:00:46Z pierre $
+# $Id: PKGBUILD 215800 2014-06-30 15:31:05Z fyan $
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 # Maintainer: Hugo Doria <hugo@archlinux.org>
 
 pkgname=id3v2
 pkgver=0.1.12
-pkgrel=2
+pkgrel=3
 pkgdesc="Utility to edit id3v2 tags"
 arch=('i686' 'x86_64')
 url="http://id3v2.sourceforge.net/"
diff --git a/extra/ispell/PKGBUILD b/extra/ispell/PKGBUILD
index 490878ee5..d12edf433 100644
--- a/extra/ispell/PKGBUILD
+++ b/extra/ispell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150467 2012-02-18 00:40:03Z allan $
+# $Id: PKGBUILD 215797 2014-06-30 15:24:53Z fyan $
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Maintainer:
 
 pkgname=ispell
 pkgver=3.3.02
-pkgrel=5
+pkgrel=6
 pkgdesc="An interactive spell-checking program for Unix"
 arch=('i686' 'x86_64')
 url="http://ficus-www.cs.ucla.edu/geoff/ispell.html"
diff --git a/extra/libcap-ng/PKGBUILD b/extra/libcap-ng/PKGBUILD
index 8ed9da266..bda080ade 100644
--- a/extra/libcap-ng/PKGBUILD
+++ b/extra/libcap-ng/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198133 2013-10-30 12:59:19Z allan $
+# $Id: PKGBUILD 215908 2014-06-30 20:13:42Z anatolik $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=libcap-ng
-pkgver=0.7.3
+pkgver=0.7.4
 pkgrel=1
 pkgdesc="A library making programming with POSIX capabilities easier than traditional libcap"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://people.redhat.com/sgrubb/libcap-ng/"
 license=('GPL2' 'LGPL2.1')
 depends=('glibc')
 source=(http://people.redhat.com/sgrubb/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('610afb774f80a8032b711281df126283')
+md5sums=('55c57c0673b944ea1a755bcb2636dabd')
 
 build() {
   cd $pkgname-$pkgver
@@ -20,6 +20,12 @@ build() {
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
 
diff --git a/extra/libcue/PKGBUILD b/extra/libcue/PKGBUILD
index 9a1049ba0..da3080da5 100644
--- a/extra/libcue/PKGBUILD
+++ b/extra/libcue/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 198142 2013-10-30 13:02:40Z allan $
-# Contributor: said <atvordhosbn[at]gmail[dot]com>
+# $Id: PKGBUILD 215716 2014-06-30 10:36:40Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org> 
+# Contributor: said <atvordhosbn[at]gmail[dot]com>
 
 pkgname=libcue
 pkgver=1.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Parses so-called cue sheets and handles the parsed data'
 url='http://sourceforge.net/projects/libcue/'
 arch=('i686' 'x86_64')
 license=('GPL2')
-depends=('glibc')
 source=("http://downloads.sourceforge.net/libcue/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('3fd31f2da7c0e3967d5f56363f3051a85a8fd50d')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./autogen.sh --prefix=/usr --disable-static
+	./autogen.sh --prefix=/usr
 	make
 }
 
diff --git a/extra/libdaemon/PKGBUILD b/extra/libdaemon/PKGBUILD
index 12e15fe02..982a2b521 100644
--- a/extra/libdaemon/PKGBUILD
+++ b/extra/libdaemon/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198143 2013-10-30 13:03:04Z allan $
+# $Id: PKGBUILD 215718 2014-06-30 10:38:46Z bisson $
 # Contributor: Manolis Tzanidakis
 # Contributor: Mark Rosenstand <mark@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=libdaemon
 pkgver=0.14
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight C library that eases the writing of UNIX daemons'
 url='http://0pointer.de/lennart/projects/libdaemon/'
 license=('LGPL')
@@ -16,7 +16,7 @@ sha1sums=('78a4db58cf3a7a8906c35592434e37680ca83b8f')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --localstatedir=/var --disable-lynx --disable-static
+	./configure --prefix=/usr --localstatedir=/var --disable-lynx
 	make
 }
 
diff --git a/extra/libdbusmenu-qt/PKGBUILD b/extra/libdbusmenu-qt/PKGBUILD
index 2397638c8..9e6f2e0ae 100644
--- a/extra/libdbusmenu-qt/PKGBUILD
+++ b/extra/libdbusmenu-qt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 206555 2014-03-01 08:25:23Z andrea $
+# $Id: PKGBUILD 215836 2014-06-30 16:52:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libdbusmenu-qt
 pkgver=0.9.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A library that provides a Qt implementation of the DBusMenu spec"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/libdbusmenu-qt"
diff --git a/extra/libgme/PKGBUILD b/extra/libgme/PKGBUILD
index f7604c3f8..a0b31e0a5 100644
--- a/extra/libgme/PKGBUILD
+++ b/extra/libgme/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: $
+# $Id: PKGBUILD 215795 2014-06-30 15:03:13Z fyan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributer: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
 
 pkgname=libgme
 pkgver=0.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Video game music file emulation/playback library"
 url="http://game-music-emu.googlecode.com/"
 license=('LGPL')
diff --git a/extra/libguess/PKGBUILD b/extra/libguess/PKGBUILD
index 8f128dece..f67516182 100644
--- a/extra/libguess/PKGBUILD
+++ b/extra/libguess/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 165081 2012-08-10 03:55:30Z bisson $
+# $Id: PKGBUILD 215720 2014-06-30 10:39:24Z bisson $
 
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Kemka Andrey <dr.andru@gmail.com>
 
 pkgname=libguess
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc='High-speed character set detection library'
-url='http://atheme.org/project/libguess'
+url='http://atheme.org/projects/libguess.html'
 license=('custom')
 depends=('libmowgli')
 arch=('i686' 'x86_64')
 source=("http://distfiles.atheme.org/libguess-${pkgver}.tar.gz")
 sha1sums=('2760e63b71497506208f9d6269ec52f83bfc6f0b')
 
-build() {
+prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	sed 's/libmowgli >= 0.9.50/libmowgli-2/g' -i configure
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr
 	make
 }
diff --git a/extra/libirman/PKGBUILD b/extra/libirman/PKGBUILD
index e1975b433..3b90b2856 100644
--- a/extra/libirman/PKGBUILD
+++ b/extra/libirman/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: $
+# $Id: PKGBUILD 215793 2014-06-30 15:01:24Z fyan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libirman
 pkgver=0.4.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Irman driver lcd library"
 arch=('i686' 'x86_64')
 url="http://www.lirc.org"
diff --git a/extra/libmusicbrainz5/PKGBUILD b/extra/libmusicbrainz5/PKGBUILD
index 9cccbd2b3..ce4687386 100644
--- a/extra/libmusicbrainz5/PKGBUILD
+++ b/extra/libmusicbrainz5/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 161787 2012-06-14 09:28:16Z andrea $
+# $Id: PKGBUILD 215791 2014-06-30 14:58:02Z fyan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libmusicbrainz5
 pkgver=5.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Library That Provides Access to the MusicBrainz Server"
 arch=('i686' 'x86_64')
-url="http://musicbrainz.org/"
+url='http://musicbrainz.org/doc/libmusicbrainz'
 license=('LGPL2.1')
 depends=('neon')
 makedepends=('cmake')
diff --git a/extra/libotf/PKGBUILD b/extra/libotf/PKGBUILD
index aa03243cb..030a38bab 100644
--- a/extra/libotf/PKGBUILD
+++ b/extra/libotf/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198215 2013-10-30 13:30:39Z allan $
+# $Id: PKGBUILD 215722 2014-06-30 10:40:13Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Ashish Shukla <wahjava.ml@gmail.com>
 
 pkgname=libotf
 pkgver=0.9.13
-pkgrel=1
+pkgrel=2
 pkgdesc='OpenType Font library'
 url='http://www.nongnu.org/m17n/'
 license=('LGPL')
@@ -15,7 +15,7 @@ sha1sums=('66bb81958f5f07ee1f8917d3cb7e359ae559d873')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --disable-static
+	./configure --prefix=/usr
 	make
 }
 
diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD
index 5be92aa2c..7bd849803 100644
--- a/extra/libqzeitgeist/PKGBUILD
+++ b/extra/libqzeitgeist/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 206623 2014-03-03 17:50:39Z andrea $
+# $Id: PKGBUILD 215838 2014-06-30 16:55:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libqzeitgeist
 pkgver=0.8.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A Qt interface to the Zeitgeist event tracking system"
 url='https://projects.kde.org/projects/kdesupport/libqzeitgeist'
 arch=('i686' 'x86_64')
@@ -30,8 +30,8 @@ build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_INSTALL_PREFIX=/usr \
-    -DDECLARATIVE_IMPORT_PREFIX=/usr/lib/qt4/imports/
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DDECLARATIVE_IMPORT_PREFIX=/usr/lib/qt4/imports
   make
 }
 
diff --git a/extra/libtextcat/PKGBUILD b/extra/libtextcat/PKGBUILD
deleted file mode 100644
index 5298d0a0a..000000000
--- a/extra/libtextcat/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 198244 2013-10-30 13:41:30Z allan $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=libtextcat
-pkgver=2.2
-pkgrel=9
-pkgdesc="Library that implements N-gram-based text categorization"
-arch=('i686' 'x86_64')
-url="http://software.wise-guys.nl/libtextcat/"
-license=('BSD')
-depends=('glibc')
-source=(http://software.wise-guys.nl/download/${pkgname}-${pkgver}.tar.gz
-	# from http://hg.services.openoffice.org/hg/DEV300/raw-file/tip/libtextcat/data/new_fingerprints/fpdb.conf
-	fpdb.conf
-	libtextcat-2.2-exportapi.patch
-	libtextcat-2.2-OOo.patch)
-md5sums=('128cfc86ed5953e57fe0f5ae98b62c2e'
-         'f4fafe97d3aa184f5476e4918dba045d'
-         '4c46fcb825ec13e9f7ae3728f5f4c834'
-         '1d5f1026392365c58f7a7406e923f886')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/libtextcat-2.2-exportapi.patch
-  patch -Np1 -i ${srcdir}/libtextcat-2.2-OOo.patch
-  autoreconf -fi
-  ./configure --prefix=/usr \
-    --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-#  install -D -m644 src/textcat.h ${pkgdir}/usr/include/textcat.h
-  
-  install -dm755 ${pkgdir}/usr/share/libtextcat/{LM,ShortTexts}
-  install -m644 ${srcdir}/fpdb.conf ${pkgdir}/usr/share/libtextcat
-  install -m644 langclass/conf.txt ${pkgdir}/usr/share/libtextcat
-  install -m644 langclass/LM/*.lm ${pkgdir}/usr/share/libtextcat/LM
-  install -m644 langclass/ShortTexts/*.txt ${pkgdir}/usr/share/libtextcat/ShortTexts
-
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  sed -i 's|LM|/usr/share/libtextcat/LM|' ${pkgdir}/usr/share/libtextcat/conf.txt
-}
-
diff --git a/extra/libtextcat/fpdb.conf b/extra/libtextcat/fpdb.conf
deleted file mode 100644
index 329184d51..000000000
--- a/extra/libtextcat/fpdb.conf
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# A sample config file for the language models
-# provided with Gertjan van Noords language guesser
-# (http://odur.let.rug.nl/~vannoord/TextCat/)
-#
-# Notes:
-# - You may consider eliminating a couple of small languages from this
-# list because they cause false positives with big languages and are
-# bad for performance. (Do you really want to recognize Drents?)
-# - Putting the most probable languages at the top of the list
-# improves performance, because this will raise the threshold for
-# likely candidates more quickly.
-#
-
-# this file have been modified (to OOo by Jocelyn MERAND joc.mer@gmail.com) to include country and encoding
-# guess strings are made as following : language-country-encoding
-
-afrikaans.lm                         af--utf8
-albanian.lm                          sq--utf8
-amharic_utf.lm                       am--utf8
-arabic.lm                            ar--utf8
-basque.lm                            eu--utf8
-belarus.lm                           be--utf8
-bosnian.lm                           bs--utf8
-breton.lm                            br--utf8
-catalan.lm                           ca--utf8
-chinese_simplified.lm                zh-CN-utf8
-chinese_traditional.lm               zh-TW-utf8
-croatian.lm                          hr--utf8
-czech.lm                             cs--utf8
-danish.lm                            da--utf8
-dutch.lm                             nl--utf8
-english.lm                           en--utf8
-esperanto.lm                         eo--utf8
-estonian.lm                          et--utf8
-finnish.lm                           fi--utf8
-french.lm                            fr--utf8
-frisian.lm                           fy--utf8
-georgian.lm                          ka--utf8
-german.lm                            de--utf8
-greek.lm                             el--utf8
-hebrew.lm                            he--utf8
-hindi.lm                             hi--utf8
-hungarian.lm                         hu--utf8
-icelandic.lm                         is--utf8
-indonesian.lm                        id--utf8
-irish_gaelic.lm                      ga--utf8
-italian.lm                           it--utf8
-japanese.lm                          ja--utf8
-korean.lm                            ko--utf8
-latin.lm                             la--utf8
-latvian.lm                           lv--utf8
-lithuanian.lm                        lt--utf8
-luxembourgish.lm                     lb--utf8
-malay.lm                             ms--utf8
-manx_gaelic.lm                       gv--utf8
-marathi.lm                           mr--utf8
-mongolian_cyrillic.lm                mn--utf8
-nepali.lm                            ne--utf8
-norwegian.lm                         nb--utf8       # Norwegian (Bokmal)
-persian.lm                           fa--utf8       # Farsi
-polish.lm                            pl--utf8
-portuguese.lm                        pt-PT-utf8
-quechua.lm                           qu--utf8
-romanian.lm                          ro--utf8
-romansh.lm                           rm--utf8
-russian.lm                           ru--utf8
-sanskrit.lm                          sa--utf8
-scots.lm                             sco--utf8
-scots_gaelic.lm                      gd--utf8
-serbian.lm                           sr--utf-8
-serbian-latin.lm                     sh--utf-8
-slovak_ascii.lm                      sk-SK-utf8
-slovenian.lm                         sl--utf8
-spanish.lm                           es--utf8
-swahili.lm                           sw--utf8
-swedish.lm                           sv--utf8
-tagalog.lm                           tl--utf8
-tamil.lm                             ta--utf8
-thai.lm                              th--utf8
-turkish.lm                           tr--utf8
-ukrainian.lm                         uk--utf8
-vietnamese.lm                        vi--utf8
-welsh.lm                             cy--utf8
-yiddish_utf.lm                       yi--utf8
-zulu.lm                              zu--utf8
diff --git a/extra/libtextcat/libtextcat-2.2-OOo.patch b/extra/libtextcat/libtextcat-2.2-OOo.patch
deleted file mode 100644
index 70f9d8d23..000000000
--- a/extra/libtextcat/libtextcat-2.2-OOo.patch
+++ /dev/null
@@ -1,634 +0,0 @@
-diff -ruN libtextcat-2.2.part1/src/constants.h libtextcat-2.2/src/constants.h
---- libtextcat-2.2.part1/src/constants.h	2007-07-25 10:46:49.000000000 +0100
-+++ libtextcat-2.2/src/constants.h	2007-07-25 10:47:25.000000000 +0100
-@@ -39,6 +39,8 @@
-  */
- #include <limits.h>
- 
-+#define _UTF8_
-+
- #define DESCRIPTION "out of place"
- 
- /* Reported matches are those fingerprints with a score less than best
-@@ -59,14 +61,21 @@
- /* Maximum number of n-grams in a fingerprint */
- #define MAXNGRAMS  400
- 
--/* Maximum size of an n-gram? */
--#define MAXNGRAMSIZE 5
-+/* Maximum number of character of an n-gram? */
-+#define MAXNGRAMSYMBOL 5
-+
-+/* Maximum size of the string representing an n-gram (must be greater than number of symbol) */
-+#ifdef _UTF8_
-+#define MAXNGRAMSIZE 20
-+#else
-+#define MAXNGRAMSIZE MAXNGRAMSYMBOL
-+#endif
- 
- /* Which characters are not acceptable in n-grams? */
- #define INVALID(c) (isspace((int)c) || isdigit((int)c)) 
- 
- /* Minimum size (in characters) for accepting a document */
--#define MINDOCSIZE  25
-+#define MINDOCSIZE  6
- 
- /* Maximum penalty for missing an n-gram in fingerprint */
- #define MAXOUTOFPLACE 400
-@@ -76,4 +85,7 @@
- 
- #define MAXSCORE  INT_MAX
- 
-+/* where the fingerprints files are stored */
-+#define DEFAULT_FINGERPRINTS_PATH ""
-+
- #endif
-diff -ruN libtextcat-2.2.part1/src/fingerprint.c libtextcat-2.2/src/fingerprint.c
---- libtextcat-2.2.part1/src/fingerprint.c	2007-07-25 10:46:49.000000000 +0100
-+++ libtextcat-2.2/src/fingerprint.c	2007-07-25 10:47:25.000000000 +0100
-@@ -63,6 +63,10 @@
-  * - put table/heap datastructure in a separate file.
-  */
- 
-+#ifndef _UTF8_
-+#define _UTF8_
-+#endif
-+
- #include "config.h"
- #include <stdio.h>
- #ifdef HAVE_STDLIB_H
-@@ -80,10 +84,12 @@
- #include "wg_mempool.h"
- #include "constants.h"
- 
-+#include "utf8misc.h"
- 
- #define TABLESIZE  (1<<TABLEPOW)
- #define TABLEMASK  ((TABLESIZE)-1)
- 
-+
- typedef struct {
- 
- 	sint2 rank;
-@@ -134,29 +140,14 @@
- }
- 
- 
--/* checks if n-gram lex is a prefix of key and of length len */
--inline int issame( char *lex, char *key, int len )
--{
--	int i;
--	for (i=0; i<len; i++) {
--		if ( key[i] != lex[i] ) {
--			return 0;
--		}
--	}
--	if ( lex[i] != 0 ) {
--		return 0;
--	}
--	return 1;
--}
--
- 
- /* increases frequency of ngram(p,len) */
--static inline int increasefreq( table_t *t, char *p, int len ) 
--{	
--	uint4 hash = simplehash( p, len ) & TABLEMASK;				
-+static int increasefreq( table_t *t, char *p, int len )
-+{
-+	uint4 hash = simplehash( p, len ) & TABLEMASK;
- 	entry_t *entry = t->table[ hash ];
--	
--	while ( entry ) {				
-+
-+	while ( entry ) {
- 		if ( issame( entry->str, p, len ) ) {
- 			/*** Found it! ***/
- 			entry->cnt++;
-@@ -168,7 +159,7 @@
- 	}
- 
- 	/*** Not found, so create ***/
--	entry = wgmempool_alloc( t->pool, sizeof(entry_t) );
-+        entry = (entry_t*)(wgmempool_alloc( t->pool, sizeof(entry_t) ));
- 	strcpy( entry->str, p );
- 	entry->cnt = 1;
- 
-@@ -181,12 +172,12 @@
- #if 0
- 
- /* looks up ngram(p,len) */
--static entry_t *findfreq( table_t *t, char *p, int len ) 
--{	
--	uint4 hash = simplehash( p, len ) & TABLEMASK;				
-+static entry_t *findfreq( table_t *t, char *p, int len )
-+{
-+	uint4 hash = simplehash( p, len ) & TABLEMASK;
- 	entry_t *entry = t->table[ hash ];
--	
--	while ( entry ) {				
-+
-+	while ( entry ) {
- 		if ( issame( entry->str, p, len ) ) {
- 			return entry;
- 		}
-@@ -219,7 +210,7 @@
- #define GREATER(x,y) ((x).cnt > (y).cnt)
- #define LESS(x,y)    ((x).cnt < (y).cnt)
- 
--inline static void siftup( table_t *t, unsigned int child )
-+static void siftup( table_t *t, unsigned int child )
- {
- 	entry_t *heap = t->heap;
- 	unsigned int parent = (child-1) >> 1;
-@@ -241,7 +232,7 @@
- }
- 
- 
--inline static void siftdown( table_t *t, unsigned int heapsize, uint4 parent )
-+static void siftdown( table_t *t, unsigned int heapsize, uint4 parent )
- {
- 	entry_t *heap = t->heap;
- 	unsigned int child = parent*2 + 1;
-@@ -458,21 +449,27 @@
- 	return dest;
- }
- 
--
-+/**
-+* this function extract all n-gram from past buffer and put them into the table "t"
-+* [modified] by Jocelyn Merand to accept utf-8 multi-character symbols to be used in OpenOffice
-+*/
- static void createngramtable( table_t *t, const char *buf )
- {
- 	char n[MAXNGRAMSIZE+1];
- 	const char *p = buf;
- 	int i;
-+        int pointer = 0;
- 
- 	/*** Get all n-grams where 1<=n<=MAXNGRAMSIZE. Allow underscores only at borders. ***/
--	for (;;p++) {
-+	while(1) {
- 
--		const char *q = p;
-+     const char *q = &p[pointer];   /*[modified] previously p++ above (for(;;p++)) now, it's pointer wich is increased so we have to get the new pointer on the buffer*/
- 		char *m = n;
- 
- 		/*** First char may be an underscore ***/
--		*m++ = *q++;
-+                int decay = charcopy(q, m); /*[modified] previously *q++ = *m++*/
-+                q = &(p[pointer+decay]);    /*[modified] the old copying method do not manage multi-character symbols*/
-+                m += decay; /*[modified]*/
- 		*m = '\0';
- 
- 		increasefreq( t, n, 1 );
-@@ -482,19 +479,22 @@
- 		}
- 
- 		/*** Let the compiler unroll this ***/
--		for ( i=2; i<=MAXNGRAMSIZE; i++) {
-+		for ( i=2; i<=MAXNGRAMSYMBOL; i++) {
- 
--			*m++ = *q;
-+                        decay = charcopy(q, m); /*[modified] like above*/
-+                        m += decay;
- 			*m = '\0';
- 
- 			increasefreq( t, n, i );
- 
- 			if ( *q == '_' ) break;
--			q++;
-+                        q += decay;
- 			if ( *q == '\0' ) {
- 				return;
- 			}
- 		}
-+
-+  pointer = nextcharstart(p,pointer);   /*[modified] p[pointer] must point on the next start of symbol, but whith utf next start is not surely next char*/
- 	}
- 	return;
- }
-diff -ruN libtextcat-2.2.part1/src/fingerprint.h.orig libtextcat-2.2/src/fingerprint.h.orig
---- libtextcat-2.2.part1/src/fingerprint.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ libtextcat-2.2/src/fingerprint.h.orig	2007-07-25 10:47:22.000000000 +0100
-@@ -0,0 +1,55 @@
-+#ifndef _FINGERPRINT_H_
-+#define _FINGERPRINT_H_
-+/*
-+ * Copyright (C) 2003 WiseGuys Internet B.V.
-+ *
-+ * THE BSD LICENSE
-+ * 
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 
-+ * - Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 
-+ * - Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the
-+ * distribution.
-+ * 
-+ * - Neither the name of the WiseGuys Internet B.V. nor the names of
-+ * its contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ * 
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#include "common.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+extern void *fp_Init(const char *name);
-+extern void fp_Done( void *handle );
-+extern int fp_Create( void *handle, const char *buffer, uint4 bufsize, uint4 maxngrams );
-+extern int fp_Read( void *handle, const char *fname, int maxngrams );
-+extern sint4 fp_Compare( void *cat, void *unknown, int cutoff );
-+extern void fp_Show( void *handle );
-+extern const char *fp_Name( void *handle );
-+extern void fp_Print( void *handle, FILE *fp );
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-diff -ruN libtextcat-2.2.part1/src/textcat.c libtextcat-2.2/src/textcat.c
---- libtextcat-2.2.part1/src/textcat.c	2007-07-25 10:46:49.000000000 +0100
-+++ libtextcat-2.2/src/textcat.c	2007-07-25 10:47:25.000000000 +0100
-@@ -74,6 +74,7 @@
- typedef struct {
- 
- 	void **fprint;
-+        char *fprint_disable;
- 	uint4 size;
- 	uint4 maxsize;
- 
-@@ -112,11 +113,21 @@
- 		fp_Done( h->fprint[i] );
- 	}
- 	wg_free( h->fprint );
-+        wg_free( h->fprint_disable );
- 	wg_free( h );
- 
- }
- 
--extern void *textcat_Init( const char *conffile )
-+/** Replaces older function */
-+extern void *textcat_Init( const char *conffile ){
-+    return special_textcat_Init( conffile, DEFAULT_FINGERPRINTS_PATH );
-+}
-+
-+/**
-+ * Originaly this function had only one parameter (conffile) it has been modified since OOo use
-+ * Basicaly prefix is the directory path where fingerprints are stored
-+ */
-+extern void *special_textcat_Init( const char *conffile, const char *prefix )
- {
- 	textcat_t *h;
- 	char line[1024];
-@@ -134,11 +145,13 @@
- 	h->size = 0;
- 	h->maxsize = 16;
- 	h->fprint = (void **)wg_malloc( sizeof(void*) * h->maxsize );
-+ h->fprint_disable = (char *)wg_malloc( sizeof(char*) * h->maxsize );   /*added to store the state of languages*/
- 
- 	while ( wg_getline( line, 1024, fp ) ) {
- 		char *p;
- 		char *segment[4];
--		int res;
-+                char finger_print_file_name[512];
-+                int res;
- 
- 		/*** Skip comments ***/
- #ifdef HAVE_STRCHR
-@@ -156,17 +169,23 @@
- 		/*** Ensure enough space ***/
- 		if ( h->size == h->maxsize ) {
- 			h->maxsize *= 2;
--			h->fprint = (void *)wg_realloc( h->fprint, sizeof(void*) * h->maxsize );
-+			h->fprint = (void **)wg_realloc( h->fprint, sizeof(void*) * h->maxsize );
-+                        h->fprint_disable = (char *)wg_realloc( h->fprint_disable, sizeof(char*) * h->maxsize );
- 		}
- 
- 		/*** Load data ***/
- 		if ((h->fprint[ h->size ] = fp_Init( segment[1] ))==NULL) {
- 			goto ERROR;
- 		}
--		if ( fp_Read( h->fprint[h->size], segment[0], 400 ) == 0 ) {
-+                finger_print_file_name[0] = '\0';
-+                strcat(finger_print_file_name, prefix);
-+                strcat(finger_print_file_name, segment[0]);
-+
-+                if ( fp_Read( h->fprint[h->size], finger_print_file_name, 400 ) == 0 ) {
- 			textcat_Done(h);
- 			goto ERROR;
--		}		
-+		}
-+                h->fprint_disable[h->size] = 0xF0;  /*0xF0 is the code for enabled languages, 0x0F is for disabled*/
- 		h->size++;
- 	}
- 
-@@ -203,11 +222,18 @@
- 		result = _TEXTCAT_RESULT_SHORT;
- 		goto READY;
- 	}
--	
-+
- 	/*** Calculate the score for each category. ***/
- 	for (i=0; i<h->size; i++) {
--		int score = fp_Compare( h->fprint[i], unknown, threshold );
--		candidates[i].score = score;
-+                int score;
-+                if(h->fprint_disable[i] & 0x0F){    /*if this language is disabled*/
-+                    score = MAXSCORE;
-+                }
-+                else{
-+                    score = fp_Compare( h->fprint[i], unknown, threshold );
-+                    /*printf("Score for %s : %i\n", fp_Name(h->fprint[i]), score);*/
-+                }
-+                candidates[i].score = score;
- 		candidates[i].name = fp_Name( h->fprint[i] );
- 		if ( score < minscore ) {
- 			minscore = score;
-diff -ruN libtextcat-2.2.part1/src/textcat.h libtextcat-2.2/src/textcat.h
---- libtextcat-2.2.part1/src/textcat.h	2007-07-25 10:46:49.000000000 +0100
-+++ libtextcat-2.2/src/textcat.h	2007-07-25 10:48:18.000000000 +0100
-@@ -55,10 +54,19 @@
-  * Returns: handle on success, NULL on error. (At the moment, the
-  * only way errors can occur, is when the library cannot read the
-  * conffile, or one of the fingerprint files listed in it.)
-+ *
-+ * Replace older function (and has exacly the same behaviour)
-+ * see below
-  */
- extern void *textcat_Init( const char *conffile );
- 
- /**
-+ * Originaly this function had only one parameter (conffile) it has been modified since OOo must be able to load alternativ DB
-+ * Basicaly prefix is the directory path where fingerprints are stored
-+ */
-+extern void *special_textcat_Init( const char *conffile, const char *prefix );
-+
-+/**
-  * textcat_Done() - Free up resources for handle
-  */
- extern void textcat_Done( void *handle );
-diff -ruN libtextcat-2.2.part1/src/utf8misc.c libtextcat-2.2/src/utf8misc.c
---- libtextcat-2.2.part1/src/utf8misc.c	1970-01-01 01:00:00.000000000 +0100
-+++ libtextcat-2.2/src/utf8misc.c	2007-07-25 10:48:57.000000000 +0100
-@@ -0,0 +1,132 @@
-+/***************************************************************************
-+ *   Copyright (C) 2006 by Jocelyn Merand                                  *
-+ *   joc.mer@gmail.com                                                     *
-+ *                                                                         *
-+ * THE BSD LICENSE
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * - Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ *
-+ * - Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the
-+ * distribution.
-+ *
-+ * - Neither the name of the WiseGuys Internet B.V. nor the names of
-+ * its contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ ***************************************************************************/
-+
-+#ifndef _UTF8_MISC_H_
-+#include "utf8misc.h"
-+#endif
-+
-+
-+int nextcharstart(const char *str, int position){
-+    int pointer = position;
-+
-+    if(str[pointer] & ESCAPE_MASK){ /*if the first bit of the current char is 1*/
-+
-+        /*then str[pointer] is an escape character*/
-+
-+    char escape_char = ((str[pointer] & WEIGHT_MASK) << 1); /*and we use it to count (by bit translation) following characters (only the weightest part)*/
-+
-+    while(escape_char & ESCAPE_MASK && str[pointer]){/*every step, we move the byte of 1 bit left, when first bit is 0, it's finished*/
-+        escape_char = escape_char <<1;
-+        ++pointer;
-+    }
-+    }
-+    if(str[pointer]){   /*finaly, if we are not on the \0 character, we jump to the next character*/
-+        ++pointer;
-+    }
-+    return pointer;
-+}
-+
-+
-+int charcopy(const char *str, char *dest){
-+
-+    int pointer = 0;
-+    if(str[pointer] & ESCAPE_MASK){ /*if the first bit of the current char is 1*/
-+
-+        /*then str[pointer] is an escape character*/
-+
-+        char escape_char = ((str[pointer] & WEIGHT_MASK) << 1); /*and we use it to count following characters (only the weightest part)*/
-+
-+        while(escape_char & ESCAPE_MASK && str[pointer]){   /*every step, we move the byte of 1 bit left, when first bit is 0, it's finished*/
-+            dest[pointer] = str[pointer];
-+            escape_char = escape_char <<1;
-+            ++pointer;
-+        }
-+    }
-+    if(str[pointer]){
-+        dest[pointer] = str[pointer];
-+        ++pointer;
-+    }
-+
-+    return pointer;
-+}
-+
-+
-+int issame( char *lex, char *key, int len )
-+{
-+    /*printf("[%s] prefix of [%s] with length %i", lex, key, len);*/
-+    int char_counter = 0;
-+    int pointer = 0;
-+    while(char_counter < len) {
-+
-+        if(key[pointer] & ESCAPE_MASK){ /*if the first bit of the current char is 1*/
-+
-+            /*then key[pointer] is an escap character*/
-+
-+            char escape_char = ((key[pointer] & WEIGHT_MASK) << 1);     /*and we use it to count (only the weightest part)*/
-+
-+            while(escape_char & ESCAPE_MASK && key[pointer] == lex[pointer] ){
-+                escape_char = escape_char <<1;
-+                ++pointer;
-+            }
-+        }
-+        ++char_counter; /*and we are on a new utf8 character*/
-+        if ( key[pointer] != lex[pointer] ) {
-+            return 0;
-+            /*printf(" NO\n", lex, key, len);*/
-+        }
-+        ++pointer;
-+    }
-+    if ( lex[pointer] != '\0' ) {
-+        return 0;
-+        /*printf(" NO\n");*/
-+    }
-+
-+    /*printf(" YES\n");*/
-+
-+    return 1;
-+}
-+
-+
-+extern int utfstrlen(const char* str){
-+    int char_counter = 0;
-+    int pointer = 0;
-+    while(str[pointer]) {
-+        pointer = nextcharstart(str, pointer);
-+
-+        ++char_counter; /*and we are on a new utf8 character*/
-+    }
-+    return char_counter;
-+}
-+
-diff -ruN libtextcat-2.2.part1/src/utf8misc.h libtextcat-2.2/src/utf8misc.h
---- libtextcat-2.2.part1/src/utf8misc.h	1970-01-01 01:00:00.000000000 +0100
-+++ libtextcat-2.2/src/utf8misc.h	2007-07-25 10:48:57.000000000 +0100
-@@ -0,0 +1,88 @@
-+/***************************************************************************
-+ *   Copyright (C) 2006 by Jocelyn Merand                                  *
-+ *   joc.mer@gmail.com                                                     *
-+ *                                                                         *
-+ * THE BSD LICENSE
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * - Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ *
-+ * - Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the
-+ * distribution.
-+ *
-+ * - Neither the name of the WiseGuys Internet B.V. nor the names of
-+ * its contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ ***************************************************************************/
-+
-+#ifndef _UTF8_MISC_H_
-+#define _UTF8_MISC_H_
-+
-+/**
-+ * These variables are used in character processing functions
-+ * These have been added to manage utf-8 symbols, particularly escape chars
-+ */
-+#ifdef _UTF8_
-+#define ESCAPE_MASK 0x80
-+#define WEIGHT_MASK 0xF0
-+#else
-+#define ESCAPE_MASK 0xFF
-+#define WEIGHT_MASK 0x00
-+#endif
-+
-+
-+/*
-+ * Is used to jump to the next start of char
-+ * of course it's only usefull when encoding is utf-8
-+ * This function have been added by Jocelyn Merand to use libtextcat in OOo
-+ */
-+int nextcharstart(const char *str, int position);
-+
-+
-+/*Copy the char in str to dest
-+ * of course it's only usefull when encoding is utf8 and the symbol is encoded with more than 1 char
-+ * return the number of char jumped
-+ * This function have been added by Jocelyn Merand to use libtextcat in OOo
-+ */
-+int charcopy(const char *str, char *dest);
-+
-+
-+/* checks if n-gram lex is a prefix of key and of length len
-+* if _UTF8_ is defined, it uses escap characters and len is not realy the length of lex
-+* in this case, len is the number of utf-8 char strlen("€") == 3 but len == 1
-+*/
-+int issame( char *lex, char *key, int len );
-+
-+
-+/* Counts the number of characters
-+* if _UTF8_ is defined, it uses escap characters and the result is not realy the length of str
-+* in this case, the result is the number of utf-8 char strlen("€") == 3 but utfstrlen("€") == 1
-+*/
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+extern int utfstrlen(const char* str);
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-+
---- libtextcat-2.2.part2/src/Makefile.am	2007-07-25 10:55:02.000000000 +0100
-+++ libtextcat-2.2/src/Makefile.am	2007-07-25 10:55:52.000000000 +0100
-@@ -12,11 +12,11 @@
- 
- libtextcat_includedir = $(includedir)/libtextcat
- libtextcat_include_HEADERS = \
--	common.h constants.h fingerprint.h textcat.h
-+	common.h constants.h fingerprint.h textcat.h utf8misc.h
- 
- lib_LTLIBRARIES =	libtextcat.la
- libtextcat_la_SOURCES = \
--	common.c fingerprint.c textcat.c wg_mempool.c
-+	common.c fingerprint.c textcat.c wg_mempool.c utf8misc.c
- 
- bin_PROGRAMS =		createfp
- createfp_SOURCES =	createfp.c
diff --git a/extra/libtextcat/libtextcat-2.2-exportapi.patch b/extra/libtextcat/libtextcat-2.2-exportapi.patch
deleted file mode 100644
index acf84e099..000000000
--- a/extra/libtextcat/libtextcat-2.2-exportapi.patch
+++ /dev/null
@@ -1,305 +0,0 @@
-diff -ruN libtextcat-2.2.orig/src/common.c libtextcat-2.2/src/common.c
---- libtextcat-2.2.orig/src/common.c	2007-06-27 17:02:34.000000000 +0100
-+++ libtextcat-2.2/src/common.c	2007-06-27 17:45:16.000000000 +0100
-@@ -45,7 +45,7 @@
- #endif
- #include <stdarg.h>
- #include <ctype.h>
--#include "common.h"
-+#include "common_impl.h"
- 
- extern void wgmem_error( const char *fmt, ... )
- {
-@@ -55,8 +55,6 @@
-         va_start(ap, fmt);
-         vfprintf(stderr, fmt, ap);
-         va_end(ap);
--
--	exit(-1);
- }
- 
- 
-diff -ruN libtextcat-2.2.orig/src/common_impl.h libtextcat-2.2/src/common_impl.h
---- libtextcat-2.2.orig/src/common_impl.h	1970-01-01 01:00:00.000000000 +0100
-+++ libtextcat-2.2/src/common_impl.h	2007-06-27 17:45:16.000000000 +0100
-@@ -0,0 +1,66 @@
-+#ifndef _COMMON_IMPL_H_
-+#define _COMMON_IMPL_H_
-+/**
-+ * common_impl.h -- a mixed bag of helper functions 
-+ *
-+ * Copyright (C) 2003 WiseGuys Internet B.V.
-+ *
-+ * THE BSD LICENSE
-+ * 
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 
-+ * - Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 
-+ * - Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the
-+ * distribution.
-+ * 
-+ * - Neither the name of the WiseGuys Internet B.V. nor the names of
-+ * its contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ * 
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "config.h"
-+#ifndef HAVE_MALLOC
-+#error "This library needs a GNU like malloc to compile. 'configure' says there isn't one."
-+#endif
-+#ifndef HAVE_REALLOC
-+#error "This library needs a GNU like realloc to compile. 'configure' says there isn't one."
-+#endif
-+#ifndef HAVE_STRDUP
-+#error "This library needs a GNU like strdup to compile. 'configure' says there isn't one."
-+#endif
-+#ifdef HAVE_INTTYPES_H
-+#include <inttypes.h>
-+#else
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
-+#endif
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
-+#include "common.h"
-+
-+#define WGMIN(x,y)         ((x)<=(y)?(x):(y))
-+#define WGMAX(x,y)         ((x)<=(y)?(y):(x))
-+#define __STR__(x)         #x
-+#define WGSTR(x)           __STR__(x)
-+
-+#endif
-diff -ruN libtextcat-2.2.orig/src/createfp.c libtextcat-2.2/src/createfp.c
---- libtextcat-2.2.orig/src/createfp.c	2007-06-27 17:02:34.000000000 +0100
-+++ libtextcat-2.2/src/createfp.c	2007-06-27 17:45:16.000000000 +0100
-@@ -44,7 +44,7 @@
- #endif
- 
- #include "fingerprint.h"
--#include "common.h"
-+#include "common_impl.h"
- 
- #define BLOCKSIZE 4096
- 
-diff -ruN libtextcat-2.2.orig/src/fingerprint.c libtextcat-2.2/src/fingerprint.c
---- libtextcat-2.2.orig/src/fingerprint.c	2007-06-27 17:02:34.000000000 +0100
-+++ libtextcat-2.2/src/fingerprint.c	2007-06-27 17:45:16.000000000 +0100
-@@ -76,7 +76,7 @@
- #endif
- #include <ctype.h>
- 
--#include "common.h"
-+#include "common_impl.h"
- #include "wg_mempool.h"
- #include "constants.h"
- 
-diff -ruN libtextcat-2.2.orig/src/Makefile.am libtextcat-2.2/src/Makefile.am
---- libtextcat-2.2.orig/src/Makefile.am	2007-06-27 17:02:34.000000000 +0100
-+++ libtextcat-2.2/src/Makefile.am	2007-06-27 17:47:40.000000000 +0100
-@@ -8,7 +8,11 @@
- AM_LDFLAGS =	-g
- 
- noinst_HEADERS = \
--	common.h constants.h fingerprint.h textcat.h wg_mempool.h
-+	common_impl.h wg_mempool.h
-+
-+libtextcat_includedir = $(includedir)/libtextcat
-+libtextcat_include_HEADERS = \
-+	common.h constants.h fingerprint.h textcat.h
- 
- lib_LTLIBRARIES =	libtextcat.la
- libtextcat_la_SOURCES = \
-diff -ruN libtextcat-2.2.orig/src/testtextcat.c libtextcat-2.2/src/testtextcat.c
---- libtextcat-2.2.orig/src/testtextcat.c	2007-06-27 17:02:34.000000000 +0100
-+++ libtextcat-2.2/src/testtextcat.c	2007-06-27 17:45:16.000000000 +0100
-@@ -47,7 +47,7 @@
- #endif
- 
- #include "textcat.h"
--#include "common.h"
-+#include "common_impl.h"
- 
- #define BLOCKSIZE 4096
- 
-diff -ruN libtextcat-2.2.orig/src/textcat.c libtextcat-2.2/src/textcat.c
---- libtextcat-2.2.orig/src/textcat.c	2007-06-27 17:02:34.000000000 +0100
-+++ libtextcat-2.2/src/textcat.c	2007-06-27 17:45:16.000000000 +0100
-@@ -65,7 +65,7 @@
- #include <alloca.h>
- #endif
- 
--#include "common.h"
-+#include "common_impl.h"
- #include "fingerprint.h"
- #include "textcat.h"
- #include "constants.h"
-diff -ruN libtextcat-2.2.orig/src/wg_mempool.c libtextcat-2.2/src/wg_mempool.c
---- libtextcat-2.2.orig/src/wg_mempool.c	2007-06-27 17:02:34.000000000 +0100
-+++ libtextcat-2.2/src/wg_mempool.c	2007-06-27 17:45:16.000000000 +0100
-@@ -41,7 +41,7 @@
- #ifdef HAVE_STRING_H
- #include <string.h>
- #endif
--#include "common.h"
-+#include "common_impl.h"
- 
- typedef struct memblock_s {
- 	char *pool;             
-diff -ru libtextcat-2.2.orig/src/common.h libtextcat-2.2/src/common.h
---- libtextcat-2.2.orig/src/common.h	2003-05-22 14:02:29.000000000 +0100
-+++ libtextcat-2.2/src/common.h	2007-06-28 09:10:42.000000000 +0100
-@@ -1,7 +1,7 @@
- #ifndef _COMMON_H_
- #define _COMMON_H_
- /**
-- * common.h -- a mixed bag of helper functions 
-+ * common.h
-  *
-  * Copyright (C) 2003 WiseGuys Internet B.V.
-  *
-@@ -36,56 +36,25 @@
-  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--#include "config.h"
--#ifndef HAVE_MALLOC
--#error "This library needs a GNU like malloc to compile. 'configure' says there isn't one."
--#endif
--#ifndef HAVE_REALLOC
--#error "This library needs a GNU like realloc to compile. 'configure' says there isn't one."
--#endif
--#ifndef HAVE_STRDUP
--#error "This library needs a GNU like strdup to compile. 'configure' says there isn't one."
--#endif
- #include <stdio.h>
--#ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
--#else
--#ifdef HAVE_STDINT_H
--#include <stdint.h>
--#endif
--#endif
--#ifdef HAVE_SYS_TIME_H
--#include <sys/time.h>
--#endif
- #include <time.h>
- 
--#define WGMIN(x,y)         ((x)<=(y)?(x):(y))
--#define WGMAX(x,y)         ((x)<=(y)?(y):(x))
--#define __STR__(x)         #x
--#define WGSTR(x)           __STR__(x)
--
--#ifdef HAVE_INTTYPES_H
--typedef uint32_t	uint4;
--typedef uint16_t	uint2;
--typedef uint8_t		uchar;
--
--typedef int32_t		sint4;
--typedef int16_t		sint2;
--typedef int8_t		schar;
--
--typedef int8_t		boole;
--#else
--typedef unsigned long	uint4;
--typedef unsigned int	uint2;
--typedef unsigned char	uchar;
--
--typedef long		sint4;
--typedef int		sint2;
--typedef char		schar;
--
--typedef char		boole;
-+#include <sys/time.h>
-+#ifdef __cplusplus
-+extern "C" {
- #endif
- 
-+typedef uint32_t        uint4;
-+typedef uint16_t        uint2;
-+typedef uint8_t         uchar;
-+
-+typedef int32_t         sint4;
-+typedef int16_t         sint2;
-+typedef int8_t          schar;
-+
-+typedef int8_t          boole;
-+
- typedef struct wgtimer_s {
-         struct timeval start;
-         struct timeval stop;
-@@ -108,6 +76,8 @@
- extern char *wg_strgmov( char *dest, const char *src, const char *destlimit );
- extern char *wg_trim( char *dest, const char *src );
- 
-+#ifdef __cplusplus
-+}
-+#endif
-       
- #endif
--
-diff -ru libtextcat-2.2.orig/src/fingerprint.h libtextcat-2.2/src/fingerprint.h
---- libtextcat-2.2.orig/src/fingerprint.h	2003-05-19 13:16:31.000000000 +0100
-+++ libtextcat-2.2/src/fingerprint.h	2007-06-28 09:11:17.000000000 +0100
-@@ -35,6 +35,10 @@
-  */
- #include "common.h"
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- extern void *fp_Init(const char *name);
- extern void fp_Done( void *handle );
- extern int fp_Create( void *handle, const char *buffer, uint4 bufsize, uint4 maxngrams );
-@@ -44,4 +48,8 @@
- extern const char *fp_Name( void *handle );
- extern void fp_Print( void *handle, FILE *fp );
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif
---- libtextcat-2.2.orig/src/textcat.h	2007-06-28 09:19:26.000000000 +0100
-+++ libtextcat-2.2/src/textcat.h	2007-06-28 09:20:19.000000000 +0100
-@@ -37,6 +37,10 @@
-  */
- #include <stdio.h>
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- #define _TEXTCAT_RESULT_UNKOWN        "UNKNOWN"
- #define _TEXTCAT_RESULT_SHORT         "SHORT"
- 
-@@ -77,4 +81,9 @@
-  * textcat_Version() - Returns a string describing the version of this classifier.
-  */
- extern char *textcat_Version();
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif
diff --git a/extra/libunique3/PKGBUILD b/extra/libunique3/PKGBUILD
index cff7cbfb7..3ba64dd51 100644
--- a/extra/libunique3/PKGBUILD
+++ b/extra/libunique3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198252 2013-10-30 13:44:24Z allan $
+# $Id: PKGBUILD 215789 2014-06-30 14:51:56Z fyan $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=libunique3
 pkgver=3.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Library for writing single instance applications for GTK3"
 arch=('i686' 'x86_64')
 license=('LGPL')
diff --git a/extra/libxcomposite/PKGBUILD b/extra/libxcomposite/PKGBUILD
index 606215f39..9800060d1 100644
--- a/extra/libxcomposite/PKGBUILD
+++ b/extra/libxcomposite/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198272 2013-10-30 13:51:36Z allan $
+# $Id: PKGBUILD 215907 2014-06-30 19:51:39Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxcomposite
 pkgver=0.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Composite extension library"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
@@ -14,13 +14,13 @@ source=("${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2")
 sha256sums=('ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178')
 
 build() {
-  cd "${srcdir}/libXcomposite-${pkgver}"
+  cd libXcomposite-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/libXcomposite-${pkgver}"
+  cd libXcomposite-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libzapojit/PKGBUILD b/extra/libzapojit/PKGBUILD
index cddbdfd84..ff818a21a 100644
--- a/extra/libzapojit/PKGBUILD
+++ b/extra/libzapojit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198304 2013-10-30 14:03:06Z allan $
+# $Id: PKGBUILD 215870 2014-06-30 18:57:35Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libzapojit
 pkgver=0.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/lzop/PKGBUILD b/extra/lzop/PKGBUILD
index b507594a4..361d7c606 100644
--- a/extra/lzop/PKGBUILD
+++ b/extra/lzop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151444 2012-02-26 10:58:51Z pierre $
+# $Id: PKGBUILD 215750 2014-06-30 11:32:13Z fyan $
 # Maintainer:
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=lzop
 pkgver=1.03
-pkgrel=2
+pkgrel=3
 pkgdesc="File compressor using lzo lib"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/mp3wrap/PKGBUILD b/extra/mp3wrap/PKGBUILD
index bb42cbb1c..023bda503 100644
--- a/extra/mp3wrap/PKGBUILD
+++ b/extra/mp3wrap/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137634 2011-09-10 09:03:14Z pierre $
+# $Id: PKGBUILD 215668 2014-06-30 06:46:17Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=mp3wrap
 pkgver=0.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Tool for wrapping mp3 files. A free independent alternative to AlbumWrap"
 arch=('i686' 'x86_64')
 url="http://mp3wrap.sourceforge.net"
diff --git a/extra/naim/PKGBUILD b/extra/naim/PKGBUILD
index d09e33ed7..2adae6e82 100644
--- a/extra/naim/PKGBUILD
+++ b/extra/naim/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137675 2011-09-10 11:46:52Z pierre $
+# $Id: PKGBUILD 215670 2014-06-30 06:47:30Z tpowa $
 # Maintainer: dorphell <dorphell@archlinux.org>
 
 pkgname=naim
 pkgver=0.11.8.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="An ncurses AOL Instant Messenger and IRC client."
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/nawk/PKGBUILD b/extra/nawk/PKGBUILD
index cafb30750..a60eeeab4 100644
--- a/extra/nawk/PKGBUILD
+++ b/extra/nawk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173726 2012-12-22 02:28:46Z dreisner $
+# $Id: PKGBUILD 215856 2014-06-30 17:59:11Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=nawk
 pkgver=20121220
-pkgrel=1
+pkgrel=2
 pkgdesc="The one, true implementation of AWK"
 url="http://cm.bell-labs.com/who/bwk/"
 license=('MIT')
@@ -15,17 +15,21 @@ source=("$pkgname-$pkgver.tar.gz::http://www.cs.princeton.edu/~bwk/btl.mirror/aw
 md5sums=('b74ca7f8f4284fc82ccee6b4e34531d8'
          '8486d387a51fe3b3c9875c4151ad92b4')
 
-build() {
+prepare() {
   # awk -> nawk
-  patch -Np1 < manpage-naming.patch
+  patch -Np1 <"$srcdir"/manpage-naming.patch
 
   # create license
   sed -n '/Copyright/,/THIS SOFTWARE\./p' README > LICENSE
 
   # fix build
   sed -i '/YACC = yacc -d -S/ s|^|#|' makefile
+}
 
-  make "CPPFLAGS=-DHAS_ISBLANK" "LDFLAGS=$LDFLAGS" "CFLAGS=$CFLAGS"
+build() {
+  make "CPPFLAGS=-DHAS_ISBLANK $CPPFLAGS" \
+    "LDFLAGS=$LDFLAGS" \
+    "CFLAGS=$CFLAGS"
 }
 
 package() {
diff --git a/extra/openal/PKGBUILD b/extra/openal/PKGBUILD
index 5df7b91f9..c9dc89c7c 100644
--- a/extra/openal/PKGBUILD
+++ b/extra/openal/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198350 2013-10-30 14:20:00Z allan $
+# $Id: PKGBUILD 215872 2014-06-30 19:00:16Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jchu@xentac.net>
 
 pkgname=openal
 pkgver=1.15.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform 3D audio library"
 arch=(i686 x86_64)
 url="http://www.openal.org/"
diff --git a/extra/paprefs/PKGBUILD b/extra/paprefs/PKGBUILD
index 6be68601b..8c8167e3f 100644
--- a/extra/paprefs/PKGBUILD
+++ b/extra/paprefs/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 142425 2011-11-09 11:00:22Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 215877 2014-06-30 19:06:16Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=paprefs
 pkgver=0.9.10
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple GTK-based configuration dialog for PulseAudio"
 arch=(i686 x86_64)
 url="http://0pointer.de/lennart/projects/paprefs"
@@ -19,17 +19,19 @@ sha256sums=('261c5a67543f2d0c019894fb933949f6ee7c5e181808e1e9565f0784961eabb0'
             '5cdd6cffb08d611451f01b34b08b316fb14cbd14b283bf5d180b8dcde11fa46b'
             '00fd4b14e81d90ac6d74e6eb689fa4e20e1a2fbc2eefbb440a11b1373e115a9d')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i "../do-not-require-recompile.patch"
+}
+
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/do-not-require-recompile.patch"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-lynx
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/paprefs.desktop" \
-    "$pkgdir/usr/share/applications/paprefs.desktop"
+  install -Dm644 ../paprefs.desktop "$pkgdir/usr/share/applications/paprefs.desktop"
 }
diff --git a/extra/pgbouncer/PKGBUILD b/extra/pgbouncer/PKGBUILD
index e03c9c9c1..e36fb3564 100644
--- a/extra/pgbouncer/PKGBUILD
+++ b/extra/pgbouncer/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=pgbouncer
 pkgver=1.5.4
-pkgrel=5
+pkgrel=6
 pkgdesc="A lightweight connection pooler for PostgreSQL"
 arch=('i686' 'x86_64')
 url="http://pgfoundry.org/projects/pgbouncer"
diff --git a/extra/polkit-qt/PKGBUILD b/extra/polkit-qt/PKGBUILD
index fecd886c4..c8f52877c 100644
--- a/extra/polkit-qt/PKGBUILD
+++ b/extra/polkit-qt/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=polkit-qt
 pkgver=0.103.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A library that allows developers to access PolicyKit API with a nice Qt-style API'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kdesupport/polkit-qt-1'
diff --git a/extra/potrace/PKGBUILD b/extra/potrace/PKGBUILD
index 5269bbb7a..ce73e0a81 100644
--- a/extra/potrace/PKGBUILD
+++ b/extra/potrace/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198375 2013-10-30 14:29:13Z allan $
+# $Id: PKGBUILD 215724 2014-06-30 10:43:34Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=potrace
 pkgver=1.11
-pkgrel=1
+pkgrel=2
 pkgdesc='Utility for tracing a bitmap (input: PBM,PGM,PPM,BMP; output: EPS,PS,PDF,SVG,DXF,PGM,Gimppath,XFig)'
 url='http://potrace.sourceforge.net/'
 arch=('i686' 'x86_64')
@@ -19,7 +19,6 @@ build() {
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--with-libpotrace \
-		--disable-static \
 
 	make
 }
diff --git a/extra/qhull/PKGBUILD b/extra/qhull/PKGBUILD
index f4bc77890..3f34c0972 100644
--- a/extra/qhull/PKGBUILD
+++ b/extra/qhull/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197574 2013-10-27 02:10:42Z eric $
+# $Id: PKGBUILD 215740 2014-06-30 11:13:02Z fyan $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=qhull
 pkgver=2012.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A general dimension code for computing convex hulls and related structures"
 arch=('i686' 'x86_64')
 url="http://www.qhull.org/"
diff --git a/extra/qimageblitz/PKGBUILD b/extra/qimageblitz/PKGBUILD
index 0e33fafda..7a568f85e 100644
--- a/extra/qimageblitz/PKGBUILD
+++ b/extra/qimageblitz/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 206544 2014-03-01 08:20:12Z andrea $
+# $Id: PKGBUILD 215848 2014-06-30 17:12:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=qimageblitz
 pkgver=0.0.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A graphical effect and filter library for KDE"
 arch=('i686' 'x86_64')
 url="http://www.kde.org/"
 license=('GPL2')
 depends=('qt4')
 makedepends=('cmake')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('0ae2f7d4e0876764a97ca73799f61df4')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'no-executable-stack.patch')
+md5sums=('0ae2f7d4e0876764a97ca73799f61df4'
+         '67a56f4418bb2bda5f8a7444931ca7ac')
 
 prepare() {
   mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -p3 -i "${srcdir}"/no-executable-stack.patch
 }
 
 build() {
diff --git a/extra/qimageblitz/no-executable-stack.patch b/extra/qimageblitz/no-executable-stack.patch
new file mode 100644
index 000000000..b12a95507
--- /dev/null
+++ b/extra/qimageblitz/no-executable-stack.patch
@@ -0,0 +1,7 @@
+--- trunk/kdesupport/qimageblitz/blitz/asm_scale.S	2010/12/06 14:02:47	1204247
++++ trunk/kdesupport/qimageblitz/blitz/asm_scale.S	2010/12/06 14:05:09	1204248
+@@ -1,3 +1,4 @@
++.section .note.GNU-stack,"",%progbits
+ 
+ #if defined(__EMX__)
+ /* Due to strange behaviour of as.exe we use this macros */
diff --git a/extra/qjson/PKGBUILD b/extra/qjson/PKGBUILD
index be1af2187..2dc8f8bc5 100644
--- a/extra/qjson/PKGBUILD
+++ b/extra/qjson/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 206538 2014-03-01 08:16:33Z andrea $
+# $Id: PKGBUILD 215844 2014-06-30 17:03:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qjson
 pkgver=0.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A qt-based library that maps JSON data to QVariant objects"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/qoauth/PKGBUILD b/extra/qoauth/PKGBUILD
index de947b29e..594d23d8f 100644
--- a/extra/qoauth/PKGBUILD
+++ b/extra/qoauth/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 179067 2013-03-02 22:33:09Z andrea $
+# $Id: PKGBUILD 215846 2014-06-30 17:05:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Peter Richard Lewis <plewis@aur.archlinux.org>
 
 pkgname=qoauth
 pkgver=1.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Support with OAuth-powered network services"
 url='http://github.com/ayoy/qoauth'
 license=('GPL')
@@ -14,12 +14,15 @@ makedepends=('cmake' 'automoc4')
 source=("http://files.ayoy.net/qoauth/release/current/src/${pkgname}-${pkgver}-src.tar.bz2")
 md5sums=('bcb6d01e6c9a6fb22099c9e0f5889578')
 
-build() {
+prepare() {
   cd ${pkgname}-${pkgver}-src
 
   # Install libraries in /usr/lib/
   sed -i 's|lib64|lib|' src/src.pro
+}
 
+build() {
+  cd ${pkgname}-${pkgver}-src
   qmake-qt4
   make
 }
diff --git a/extra/qtscriptgenerator/PKGBUILD b/extra/qtscriptgenerator/PKGBUILD
index e7c66350a..a78095d21 100644
--- a/extra/qtscriptgenerator/PKGBUILD
+++ b/extra/qtscriptgenerator/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179036 2013-03-01 19:03:29Z andrea $
+# $Id: PKGBUILD 215746 2014-06-30 11:24:04Z fyan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=qtscriptgenerator
 pkgver=0.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool that generates Qt bindings for Qt Script"
 arch=("i686" "x86_64")
 url="https://code.google.com/p/qtscriptgenerator/"
diff --git a/extra/sane-frontends/PKGBUILD b/extra/sane-frontends/PKGBUILD
index fffa95d0a..96ed53583 100644
--- a/extra/sane-frontends/PKGBUILD
+++ b/extra/sane-frontends/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149557 2012-02-08 14:05:36Z tpowa $
+# $Id: PKGBUILD 215674 2014-06-30 06:50:16Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=sane-frontends
 pkgver=1.0.14
-pkgrel=6
+pkgrel=7
 pkgdesc="A set of frontends for SANE."
 arch=(i686 x86_64)
 url="http://www.sane-project.org"
diff --git a/extra/sdl_mixer/PKGBUILD b/extra/sdl_mixer/PKGBUILD
index 83e603ecd..b7eca6dc5 100644
--- a/extra/sdl_mixer/PKGBUILD
+++ b/extra/sdl_mixer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198420 2013-10-30 14:46:03Z allan $
+# $Id: PKGBUILD 215884 2014-06-30 19:12:57Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,7 +6,7 @@
 
 pkgname=sdl_mixer
 pkgver=1.2.12
-pkgrel=3
+pkgrel=4
 pkgdesc="A simple multi-channel audio mixer"
 arch=('i686' 'x86_64')
 url="http://www.libsdl.org/projects/SDL_mixer/"
diff --git a/extra/sdl_net/PKGBUILD b/extra/sdl_net/PKGBUILD
index 939347155..6611597b5 100644
--- a/extra/sdl_net/PKGBUILD
+++ b/extra/sdl_net/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198421 2013-10-30 14:46:25Z allan $
+# $Id: PKGBUILD 215888 2014-06-30 19:15:42Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sdl_net
 pkgver=1.2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A small sample cross-platform networking library"
 arch=('i686' 'x86_64')
 license=('custom')
diff --git a/extra/sdl_sound/PKGBUILD b/extra/sdl_sound/PKGBUILD
index 5986efaf6..a3a10a836 100644
--- a/extra/sdl_sound/PKGBUILD
+++ b/extra/sdl_sound/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198423 2013-10-30 14:47:11Z allan $
+# $Id: PKGBUILD 215889 2014-06-30 19:16:38Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sdl_sound
 pkgver=1.0.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A library to decode several popular sound file formats, such as .WAV and .MP3"
 arch=('i686' 'x86_64')
 url="http://icculus.org/SDL_sound/"
diff --git a/extra/sdl_ttf/PKGBUILD b/extra/sdl_ttf/PKGBUILD
index bb945bb8e..3878c5fd5 100644
--- a/extra/sdl_ttf/PKGBUILD
+++ b/extra/sdl_ttf/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198424 2013-10-30 14:47:31Z allan $
+# $Id: PKGBUILD 215886 2014-06-30 19:14:11Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sdl_ttf
 pkgver=2.0.11
-pkgrel=2
+pkgrel=3
 pkgdesc="A library that allows you to use TrueType fonts in your SDL applications"
 arch=('i686' 'x86_64')
 license=('custom')
diff --git a/extra/telepathy-farstream/PKGBUILD b/extra/telepathy-farstream/PKGBUILD
index 5b5777368..bc76d0038 100644
--- a/extra/telepathy-farstream/PKGBUILD
+++ b/extra/telepathy-farstream/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198448 2013-10-30 14:56:09Z allan $
+# $Id: PKGBUILD 215891 2014-06-30 19:18:37Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=telepathy-farstream
-pkgver=0.6.0
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="A telepathy-backend to use stream engine."
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('dbus-glib' 'gobject-introspection')
 conflicts=('telepathy-farsight')
 replaces=('telepathy-farsight')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('d154350f9f1e3bdba87617c0668481a5')
+md5sums=('53e3a69bdee7b301e2fdd2f2d254e385')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD
index 72e886443..8e438b15c 100644
--- a/extra/telepathy-qt/PKGBUILD
+++ b/extra/telepathy-qt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 206925 2014-03-06 10:36:16Z andrea $
+# $Id: PKGBUILD 215850 2014-06-30 17:14:55Z andrea $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-qt
 pkgver=0.9.3
-pkgrel=7
+pkgrel=8
 pkgdesc="A library for Qt-based Telepathy clients"
 arch=('i686' 'x86_64')
 url="http://telepathy.freedesktop.org/wiki/"
@@ -23,25 +23,25 @@ md5sums=('94ac93aedf5f6fff49837bc8368e5a37'
          '50e9db71c0e23b59dba1f20a592e4b8d')
 
 prepare() {
-    mkdir build
+  mkdir build
 
-    cd ${pkgname}-${pkgver}
-    patch -p1 -i "${srcdir}"/farstream-0.2.patch
-    patch -p1 -i "${srcdir}"/cmake.patch
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/farstream-0.2.patch
+  patch -p1 -i "${srcdir}"/cmake.patch
 
 }
 
 build() {
-    cd build
-    cmake ../${pkgname}-${pkgver} \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-        -DENABLE_TESTS=OFF
-    make
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+    -DENABLE_TESTS=OFF
+  make
 }
 
 package() {
-    cd build
-    make DESTDIR="$pkgdir" install
+  cd build
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/tinycdb/PKGBUILD b/extra/tinycdb/PKGBUILD
index 2e803febd..0c6d3d569 100644
--- a/extra/tinycdb/PKGBUILD
+++ b/extra/tinycdb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163135 2012-07-08 02:03:57Z bisson $
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# $Id: PKGBUILD 215728 2014-06-30 10:45:25Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=tinycdb
 pkgver=0.78
-pkgrel=1
+pkgrel=2
 pkgdesc='Very fast and simple package for creating and reading constant data bases'
 url='http://www.corpit.ru/mjt/tinycdb.html'
 license=('custom')
@@ -12,9 +12,13 @@ arch=('i686' 'x86_64')
 source=("http://www.corpit.ru/mjt/tinycdb/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('ade42ee1e7c56f66a63cb933206c089b9983adba')
 
-build() {
+prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	sed -e 's/all: static/all: shared/' -e '/libcdb.a/d' -i Makefile
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
diff --git a/extra/tsocks/PKGBUILD b/extra/tsocks/PKGBUILD
index 6b5aec3f2..ca112e60e 100644
--- a/extra/tsocks/PKGBUILD
+++ b/extra/tsocks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180127 2013-03-17 23:33:27Z bisson $
+# $Id: PKGBUILD 215730 2014-06-30 10:50:45Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=tsocks
 pkgver=1.8beta5
-pkgrel=6
+pkgrel=7
 pkgdesc='Transparent SOCKS proxying library'
 url='http://tsocks.sourceforge.net/'
 license=('GPL')
@@ -13,6 +13,7 @@ sha1sums=('489f88c5df999ba21b27cdaa7836d9426d062aec')
 
 build() {
 	cd "${srcdir}/${pkgname}-1.8"
+	export CPPFLAGS=
 	./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --libdir=/usr/lib
 	make
 }
diff --git a/extra/unison/PKGBUILD b/extra/unison/PKGBUILD
index c92284689..b8b3eaa20 100644
--- a/extra/unison/PKGBUILD
+++ b/extra/unison/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172029 2012-11-26 16:23:15Z tpowa $
+# $Id: PKGBUILD 215678 2014-06-30 06:54:10Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=unison
 pkgver=2.40.102
-pkgrel=1
+pkgrel=2
 pkgdesc="Unison is a file-synchronization tool"
 arch=(i686 x86_64)
 license=('GPL2')
diff --git a/extra/webrtc-audio-processing/PKGBUILD b/extra/webrtc-audio-processing/PKGBUILD
index 299adac16..eb4cd0732 100644
--- a/extra/webrtc-audio-processing/PKGBUILD
+++ b/extra/webrtc-audio-processing/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198484 2013-10-30 15:08:43Z allan $
+# $Id: PKGBUILD 215861 2014-06-30 18:42:52Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=webrtc-audio-processing
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 _gitrev=9413986
 pkgdesc="AudioProcessing library based on Google's implementation of WebRTC"
 arch=(i686 x86_64)
diff --git a/extra/wipe/PKGBUILD b/extra/wipe/PKGBUILD
index b876b0dca..b14462cbb 100644
--- a/extra/wipe/PKGBUILD
+++ b/extra/wipe/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146765 2012-01-17 07:13:10Z bisson $
+# $Id: PKGBUILD 215776 2014-06-30 12:02:45Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=wipe
 pkgver=2.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Secure file wiping utility'
 url='http://wipe.sourceforge.net/'
 license=('GPL')
@@ -16,6 +16,7 @@ sha1sums=('72aa8bcbeb54deb676ae08af78401132860703de')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	export CPPFLAGS=
 	./configure --prefix=/usr --mandir=/usr/share/man
 	make
 }
diff --git a/extra/xclip/PKGBUILD b/extra/xclip/PKGBUILD
index 0e5d405e5..ef8cdef08 100644
--- a/extra/xclip/PKGBUILD
+++ b/extra/xclip/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149046 2012-02-05 15:20:59Z bisson $
-# Contributor: damir <damir@archlinux.org>
-# Committer: Manolis Tzanidakis <manolis@archlinux.org>
+# $Id: PKGBUILD 215768 2014-06-30 11:46:16Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Committer: Manolis Tzanidakis <manolis@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
 
 pkgname=xclip
 pkgver=0.12
-pkgrel=3
+pkgrel=4
 pkgdesc='Command line interface to the X11 clipboard'
 url='http://sourceforge.net/projects/xclip'
 license=('GPL')
diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD
index 3064db092..0458a3c4d 100644
--- a/extra/xf86-video-ati/PKGBUILD
+++ b/extra/xf86-video-ati/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 204721 2014-01-25 21:21:43Z lcarlier $
+# $Id: PKGBUILD 215782 2014-06-30 12:15:42Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-ati
-pkgver=7.3.0
+pkgver=7.4.0
 epoch=1
 pkgrel=1
 pkgdesc="X.org ati video driver"
@@ -15,7 +15,7 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
 conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('107c072c4919a996e04f47afdb53d5946a3ad574f270b8c560ef8b3a032046fe')
+sha256sums=('96230ca9859a2a3e347b7f37597b7b344e80b83f378d3a8463ab1ceb69df76d9')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/xfce4-battery-plugin/PKGBUILD b/extra/xfce4-battery-plugin/PKGBUILD
index b9e3c3e01..2a2551f74 100644
--- a/extra/xfce4-battery-plugin/PKGBUILD
+++ b/extra/xfce4-battery-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198546 2013-10-30 15:31:35Z allan $
+# $Id: PKGBUILD 215644 2014-06-30 05:34:13Z fyan $
 # Maintainer: aurelien <aurelien@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-battery-plugin
 pkgver=1.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A battery monitor plugin for the Xfce panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/xfce4-cpugraph-plugin/PKGBUILD b/extra/xfce4-cpugraph-plugin/PKGBUILD
index 3166f6dfb..9273a64f5 100644
--- a/extra/xfce4-cpugraph-plugin/PKGBUILD
+++ b/extra/xfce4-cpugraph-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198549 2013-10-30 15:32:39Z allan $
+# $Id: PKGBUILD 215649 2014-06-30 05:40:34Z fyan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-cpugraph-plugin
 pkgver=1.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="CPU graph plugin for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('GPL' 'custom')
diff --git a/extra/xfce4-datetime-plugin/PKGBUILD b/extra/xfce4-datetime-plugin/PKGBUILD
index c19b2ad37..7122e7ea3 100644
--- a/extra/xfce4-datetime-plugin/PKGBUILD
+++ b/extra/xfce4-datetime-plugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198550 2013-10-30 15:32:59Z allan $
+# $Id: PKGBUILD 215647 2014-06-30 05:38:23Z fyan $
 # Maintainer:
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-datetime-plugin
 pkgver=0.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A date and time display plugin for the Xfce panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/xfce4-diskperf-plugin/PKGBUILD b/extra/xfce4-diskperf-plugin/PKGBUILD
index 78ae0c0ba..ddcd44591 100644
--- a/extra/xfce4-diskperf-plugin/PKGBUILD
+++ b/extra/xfce4-diskperf-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198552 2013-10-30 15:33:40Z allan $
+# $Id: PKGBUILD 215651 2014-06-30 05:42:00Z fyan $
 # Maintainer:
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-diskperf-plugin
 pkgver=2.5.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugin for the Xfce4 panel displaying instant disk/partition performance"
 arch=('i686' 'x86_64')
 license=('BSD')
diff --git a/extra/xfce4-eyes-plugin/PKGBUILD b/extra/xfce4-eyes-plugin/PKGBUILD
index 1f60e474f..c758cfe8b 100644
--- a/extra/xfce4-eyes-plugin/PKGBUILD
+++ b/extra/xfce4-eyes-plugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198553 2013-10-30 15:34:02Z allan $
+# $Id: PKGBUILD 215653 2014-06-30 05:45:00Z fyan $
 # Maintainer:
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-eyes-plugin
 pkgver=4.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A rolling eyes (following mouse pointer) plugin for the Xfce panel"
 arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin"
diff --git a/extra/xfce4-fsguard-plugin/PKGBUILD b/extra/xfce4-fsguard-plugin/PKGBUILD
index cb060f9a3..f273842ee 100644
--- a/extra/xfce4-fsguard-plugin/PKGBUILD
+++ b/extra/xfce4-fsguard-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198554 2013-10-30 15:34:22Z allan $
+# $Id: PKGBUILD 215655 2014-06-30 05:46:16Z fyan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=xfce4-fsguard-plugin
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="File system usage monitor plugin for the Xfce4 panel"
 arch=(i686 x86_64)
 license=('GPL2')
diff --git a/extra/xfce4-genmon-plugin/PKGBUILD b/extra/xfce4-genmon-plugin/PKGBUILD
index 6686eb5f3..10725677c 100644
--- a/extra/xfce4-genmon-plugin/PKGBUILD
+++ b/extra/xfce4-genmon-plugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198555 2013-10-30 15:34:47Z allan $
+# $Id: PKGBUILD 215659 2014-06-30 05:51:56Z fyan $
 # Maintainer:
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-genmon-plugin
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="plugin that monitors customizable programs stdout for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('LGPL2.1')
diff --git a/extra/xfce4-mpc-plugin/PKGBUILD b/extra/xfce4-mpc-plugin/PKGBUILD
index d4ea1caef..3dc5abc11 100644
--- a/extra/xfce4-mpc-plugin/PKGBUILD
+++ b/extra/xfce4-mpc-plugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198558 2013-10-30 15:35:52Z allan $
+# $Id: PKGBUILD 215657 2014-06-30 05:50:49Z fyan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: aurelien <aurelien@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-mpc-plugin
 pkgver=0.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A plugin to control the music player daemon from the xfce4-panel"
 arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
diff --git a/extra/xfce4-netload-plugin/PKGBUILD b/extra/xfce4-netload-plugin/PKGBUILD
index e660ad85b..b6ebb6d50 100644
--- a/extra/xfce4-netload-plugin/PKGBUILD
+++ b/extra/xfce4-netload-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198559 2013-10-30 15:36:13Z allan $
+# $Id: PKGBUILD 215680 2014-06-30 08:52:57Z fyan $
 # Maintainer:
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-netload-plugin
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A netload plugin for the Xfce panel"
 arch=('i686' 'x86_64')
 url="http://xfce-goodies.berlios.de/"
diff --git a/extra/xfce4-notes-plugin/PKGBUILD b/extra/xfce4-notes-plugin/PKGBUILD
index 6ce2f413b..431d7adcf 100644
--- a/extra/xfce4-notes-plugin/PKGBUILD
+++ b/extra/xfce4-notes-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198560 2013-10-30 15:36:41Z allan $
+# $Id: PKGBUILD 215682 2014-06-30 08:57:25Z fyan $
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: Ben Mazer <contrasutra@myrealbox.com>
 
 pkgname=xfce4-notes-plugin
 pkgver=1.7.7
-pkgrel=4
+pkgrel=5
 pkgdesc="A notes plugin for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/xfce4-quicklauncher-plugin/PKGBUILD b/extra/xfce4-quicklauncher-plugin/PKGBUILD
index e43e9d64e..1173d3476 100644
--- a/extra/xfce4-quicklauncher-plugin/PKGBUILD
+++ b/extra/xfce4-quicklauncher-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198564 2013-10-30 15:38:04Z allan $
+# $Id: PKGBUILD 215684 2014-06-30 08:59:31Z fyan $
 # Maintainer: 
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-quicklauncher-plugin
 pkgver=1.9.4
-pkgrel=7
+pkgrel=8
 pkgdesc="plugin that creates 4 little application launcher in the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/xfce4-sensors-plugin/PKGBUILD b/extra/xfce4-sensors-plugin/PKGBUILD
index 0ecb2dec6..167edf4b3 100644
--- a/extra/xfce4-sensors-plugin/PKGBUILD
+++ b/extra/xfce4-sensors-plugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198566 2013-10-30 15:38:50Z allan $
+# $Id: PKGBUILD 215688 2014-06-30 09:06:33Z fyan $
 # Maintainer:
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Merk Matthias <macem@chello.at>
 
 pkgname=xfce4-sensors-plugin
 pkgver=1.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A lm_sensors plugin for the Xfce panel"
 arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
diff --git a/extra/xfce4-smartbookmark-plugin/PKGBUILD b/extra/xfce4-smartbookmark-plugin/PKGBUILD
index 29beab70f..613458b0a 100644
--- a/extra/xfce4-smartbookmark-plugin/PKGBUILD
+++ b/extra/xfce4-smartbookmark-plugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198568 2013-10-30 15:39:44Z allan $
+# $Id: PKGBUILD 215686 2014-06-30 09:05:15Z fyan $
 # Maintainer:
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-smartbookmark-plugin
 pkgver=0.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugin for the Xfce4 panel that lets you quicksearch from selected websites"
 arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
diff --git a/extra/xfce4-systemload-plugin/PKGBUILD b/extra/xfce4-systemload-plugin/PKGBUILD
index 53c3d0dde..f73601f2a 100644
--- a/extra/xfce4-systemload-plugin/PKGBUILD
+++ b/extra/xfce4-systemload-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198569 2013-10-30 15:40:10Z allan $
+# $Id: PKGBUILD 215690 2014-06-30 09:11:26Z fyan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-systemload-plugin
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A system load plugin for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('custom')
diff --git a/extra/xfce4-time-out-plugin/PKGBUILD b/extra/xfce4-time-out-plugin/PKGBUILD
index b6374ee81..03de6991c 100755
--- a/extra/xfce4-time-out-plugin/PKGBUILD
+++ b/extra/xfce4-time-out-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198572 2013-10-30 15:41:22Z allan $
+# $Id: PKGBUILD 215692 2014-06-30 09:12:41Z fyan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 
 pkgname=xfce4-time-out-plugin
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Take a break from your computer with this plugin for XFCE4."
 arch=('i686' 'x86_64')
 url="http://xfce-goodies.berlios.de/"
diff --git a/extra/xfce4-verve-plugin/PKGBUILD b/extra/xfce4-verve-plugin/PKGBUILD
index 1087fa358..3fea6e9c2 100644
--- a/extra/xfce4-verve-plugin/PKGBUILD
+++ b/extra/xfce4-verve-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157897 2012-04-30 04:21:33Z foutrelis $
+# $Id: PKGBUILD 215694 2014-06-30 09:17:27Z fyan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-verve-plugin
 pkgver=1.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="command line plugin Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/xfce4-wavelan-plugin/PKGBUILD b/extra/xfce4-wavelan-plugin/PKGBUILD
index 06efded79..d4664c5cc 100644
--- a/extra/xfce4-wavelan-plugin/PKGBUILD
+++ b/extra/xfce4-wavelan-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198574 2013-10-30 15:42:05Z allan $
+# $Id: PKGBUILD 215696 2014-06-30 09:20:01Z fyan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-wavelan-plugin
 pkgver=0.5.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugin to monitor wifi connectivity for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('custom')
diff --git a/extra/xorg-font-util/PKGBUILD b/extra/xorg-font-util/PKGBUILD
index 2589f10e6..1d183262f 100644
--- a/extra/xorg-font-util/PKGBUILD
+++ b/extra/xorg-font-util/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151743 2012-03-01 23:01:51Z bisson $
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 215764 2014-06-30 11:44:21Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-font-util
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc='X.Org font utilities'
 url='http://xorg.freedesktop.org/'
 arch=('i686' 'x86_64')
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 1577d3c05..de5a53fb0 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 210322 2014-04-14 09:00:59Z jgc $
+# $Id: PKGBUILD 215781 2014-06-30 12:14:09Z lcarlier $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.15.1
+pkgver=1.15.2
 pkgrel=1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
 arch=('i686' 'x86_64')
 license=('custom')
@@ -22,7 +22,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xvfb-run.1
         10-quirks.conf
         CVE-2013-6424.diff)
-sha256sums=('626db6882602ebe1ff81f7a4231c7ccc6ceb5032f2b5b3954bf749e1567221e2'
+sha256sums=('3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
diff --git a/extra/xorg-setxkbmap/PKGBUILD b/extra/xorg-setxkbmap/PKGBUILD
index f48a852d9..70f4b10c3 100644
--- a/extra/xorg-setxkbmap/PKGBUILD
+++ b/extra/xorg-setxkbmap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 154148 2012-03-23 17:34:14Z andyrtr $
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 215762 2014-06-30 11:44:10Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-setxkbmap
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Set the keyboard using the X Keyboard Extension'
 url='http://xorg.freedesktop.org/'
 license=('custom')
diff --git a/extra/xorg-xev/PKGBUILD b/extra/xorg-xev/PKGBUILD
index 3d0eebc3b..d6bf3dabf 100644
--- a/extra/xorg-xev/PKGBUILD
+++ b/extra/xorg-xev/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176326 2013-01-30 00:25:00Z bisson $
+# $Id: PKGBUILD 215760 2014-06-30 11:43:49Z bisson $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=xorg-xev
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Print contents of X events'
 url='http://xorg.freedesktop.org/'
 arch=('i686' 'x86_64')
diff --git a/extra/xorg-xlsfonts/PKGBUILD b/extra/xorg-xlsfonts/PKGBUILD
index a2a623685..e4489dc24 100644
--- a/extra/xorg-xlsfonts/PKGBUILD
+++ b/extra/xorg-xlsfonts/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156352 2012-04-17 16:02:26Z andyrtr $
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 215758 2014-06-30 11:43:28Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xlsfonts
 pkgver=1.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc='List available X fonts'
 url='http://xorg.freedesktop.org/'
 license=('custom')
diff --git a/extra/xournal/PKGBUILD b/extra/xournal/PKGBUILD
index 240f15da7..d4cfddaee 100644
--- a/extra/xournal/PKGBUILD
+++ b/extra/xournal/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163006 2012-07-05 13:19:55Z bisson $
+# $Id: PKGBUILD 215756 2014-06-30 11:43:03Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=xournal
 pkgver=0.4.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Notetaking and sketching application'
 url='http://xournal.sourceforge.net/'
 license=('GPL')
diff --git a/extra/zip/PKGBUILD b/extra/zip/PKGBUILD
index dca110344..60a44b696 100644
--- a/extra/zip/PKGBUILD
+++ b/extra/zip/PKGBUILD
@@ -1,28 +1,32 @@
-# $Id: PKGBUILD 149604 2012-02-08 19:38:19Z pierre $
-# Maintainer:
+# $Id: PKGBUILD 215754 2014-06-30 11:42:39Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=zip
 pkgver=3.0
-_pkgver=30
-pkgrel=3
-pkgdesc="Creates PKZIP-compatible .zip files"
+_pkgver=${pkgver/./}
+pkgrel=4
+pkgdesc='Compressor/archiver for creating and modifying zipfiles'
+url='http://www.info-zip.org/Zip.html'
 arch=('i686' 'x86_64')
-url="http://www.info-zip.org/Zip.html"
-license=('BSD')
+license=('custom')
 depends=('bzip2')
+source=("http://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz")
+sha1sums=('c9f4099ecf2772b53c2dd4a8e508064ce015d182')
+
 options=('!makeflags')
-source=("ftp://ftp.info-zip.org/pub/infozip/src/${pkgname}${_pkgver}.zip")
-md5sums=('e88492c8abd68fa9cfba72bc08757dba')
 
 build() {
-   cd "${srcdir}/${pkgname}${_pkgver}"
-   make -f unix/Makefile LOCAL_ZIP="$CFLAGS" prefix=/usr generic_gcc
+	cd "${srcdir}/${pkgname}${_pkgver}"
+	make -f unix/Makefile prefix=/usr \
+		LOCAL_ZIP="$CFLAGS $CPPFLAGS $LDFLAGS" \
+		generic_gcc
 }
 
 package() {
-   cd "${srcdir}/${pkgname}${_pkgver}"
-   make -f unix/Makefile INSTALL=/bin/install prefix=${pkgdir}/usr \
-     MANDIR=${pkgdir}/usr/share/man/man1 install
-   install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+	cd "${srcdir}/${pkgname}${_pkgver}"
+	make -f unix/Makefile prefix="${pkgdir}"/usr \
+		MANDIR=${pkgdir}/usr/share/man/man1 \
+		install
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }