Sat Jul 12 03:30:38 UTC 2014

34 files changed, 309 insertions, 443 deletions

diff --git a/community/gmrun/PKGBUILD b/community/gmrun/PKGBUILD
index ea5fd9c70..197008332 100644
--- a/community/gmrun/PKGBUILD
+++ b/community/gmrun/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=gmrun
 pkgver=0.9.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A simple program which provides a run program window"
 arch=('i686' 'x86_64')
 url="http://sf.net/projects/gmrun"
@@ -27,4 +27,4 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	make DESTDIR="${pkgdir}" install
-} 
+}
diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD
deleted file mode 100644
index fed85e6e9..000000000
--- a/community/haskell-haskeline/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 110623 2014-05-04 13:55:02Z td123 $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=haskeline
-pkgname=haskell-haskeline
-pkgver=0.7.1.2
-pkgrel=3
-pkgdesc="A command-line interface for user input, written in Haskell."
-url="http://hackage.haskell.org/package/haskeline"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.8.2-2' 'sh' 'haskell-utf8-string=0.3.7-7' 'haskell-mtl=2.1.3.1' 'haskell-terminfo=0.4.0.0-2')
-install=${pkgname}.install
-options=('staticlibs')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-md5sums=('5a34c091ffff2564a1ea4bec0a3aaf71')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure \
-      -O -p --enable-split-objs --enable-shared -fterminfo --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community/haskell-haskeline/haskell-haskeline.install b/community/haskell-haskeline/haskell-haskeline.install
deleted file mode 100644
index 27cb4a093..000000000
--- a/community/haskell-haskeline/haskell-haskeline.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-haskeline
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-html/PKGBUILD b/community/haskell-html/PKGBUILD
deleted file mode 100644
index 4b7b6ac27..000000000
--- a/community/haskell-html/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=html
-pkgname=haskell-html
-pkgver=1.0.1.2
-pkgrel=17
-pkgdesc="HTML combinator library"
-url="http://hackage.haskell.org/package/html"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.8.2-2' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('2a7de5a2af9a2f80d39825d6a95ee445')
-options=('staticlibs')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community/haskell-html/haskell-html.install b/community/haskell-html/haskell-html.install
deleted file mode 100644
index 768297e0a..000000000
--- a/community/haskell-html/haskell-html.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-html
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-http/0001-relax-upper-bound-on-network.patch b/community/haskell-http/0001-relax-upper-bound-on-network.patch
deleted file mode 100644
index 0c750ee02..000000000
--- a/community/haskell-http/0001-relax-upper-bound-on-network.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 48063198a77c0274ae7d9ba2f50dc4c25ddba99f Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Fri, 18 Apr 2014 09:40:01 -0700
-Subject: [PATCH] relax upper bound on network
-
----
- HTTP.cabal | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/HTTP.cabal b/HTTP.cabal
-index 594e22d..a1b5578 100644
---- a/HTTP.cabal
-+++ b/HTTP.cabal
-@@ -85,7 +85,7 @@ Library
-                  Network.HTTP.Utils
-                  Paths_HTTP
-   GHC-options: -fwarn-missing-signatures -Wall
--  Build-depends: base >= 2 && < 4.8, network < 2.5, parsec
-+  Build-depends: base >= 2 && < 4.8, network < 2.6, parsec
-   Extensions: FlexibleInstances
-   if flag(old-base)
-     Build-depends: base < 3
--- 
-1.9.2
-
diff --git a/community/haskell-http/PKGBUILD b/community/haskell-http/PKGBUILD
deleted file mode 100644
index 4eed8349a..000000000
--- a/community/haskell-http/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=HTTP
-pkgname=haskell-http
-pkgver=4000.2.12
-pkgrel=2
-pkgdesc="A library for client-side HTTP"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-options=('staticlibs')
-depends=('ghc=7.8.2-2' 'sh' 'haskell-network=2.5.0.0-1' 'haskell-parsec=3.1.5-2' 'haskell-mtl=2.1.3.1-2')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
-        '0001-relax-upper-bound-on-network.patch')
-install=${pkgname}.install
-md5sums=('cd69429866439890353ec98100e3ba32'
-         '490004d105b18535bb6c77ec2566053e')
-
-build() {
-  cd ${_hkgname}-${pkgver}
-
-  # fixes https://github.com/haskell/HTTP/issues/55
-  patch -Np1 -i ${srcdir}/0001-relax-upper-bound-on-network.patch
-
-  runhaskell Setup configure -O -p \
-    --enable-split-objs \
-    --enable-shared \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/${pkgname} \
-    --libsubdir=\$compiler/site-local/\$pkgid
-
-  runhaskell Setup build
-
-  runhaskell Setup haddock
-
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${_hkgname}-${pkgver}
-
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-
-  runhaskell Setup copy --destdir=${pkgdir}
-
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community/haskell-http/haskell-http.install b/community/haskell-http/haskell-http.install
deleted file mode 100644
index 0593ec4e2..000000000
--- a/community/haskell-http/haskell-http.install
+++ /dev/null
@@ -1,35 +0,0 @@
-pkgname=haskell-http
-
-_register() {
-  usr/share/haskell/${pkgname}/register.sh
-}
-
-_unregister() {
-  usr/share/haskell/${pkgname}/unregister.sh
-}
-
-_gen_contents() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_install() {
-  _register
-  _gen_contents
-}
-
-pre_upgrade() {
-  _unregister
-}
-
-post_upgrade() {
-  _register
-  _gen_contents
-}
-
-pre_remove() {
-  _unregister
-}
-
-post_remove() {
-  _gen_contents
-}
diff --git a/community/haskell-zlib/PKGBUILD b/community/haskell-zlib/PKGBUILD
deleted file mode 100644
index 7ddd4519a..000000000
--- a/community/haskell-zlib/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=zlib
-pkgname=haskell-zlib
-pkgver=0.5.4.1
-pkgrel=3
-pkgdesc="Compression and decompression in the gzip and zlib formats"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-options=('staticlibs')
-depends=('ghc=7.8.2-2' 'sh' 'zlib')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-md5sums=('d0d10786d2bbd1d401a8b28a83e88475')
-
-build() {
-  cd ${_hkgname}-${pkgver}
-
-  runhaskell Setup configure -O -p \
-    --enable-split-objs \
-    --enable-shared \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/${pkgname} \
-    --libsubdir=\$compiler/site-local/\$pkgid
-
-  runhaskell Setup build
-
-  runhaskell Setup haddock
-
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${_hkgname}-${pkgver}
-
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-
-  runhaskell Setup copy --destdir=${pkgdir}
-
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/community/haskell-zlib/haskell-zlib.install b/community/haskell-zlib/haskell-zlib.install
deleted file mode 100644
index a2bb66224..000000000
--- a/community/haskell-zlib/haskell-zlib.install
+++ /dev/null
@@ -1,35 +0,0 @@
-pkgname=haskell-zlib
-
-_register() {
-  usr/share/haskell/${pkgname}/register.sh
-}
-
-_unregister() {
-  usr/share/haskell/${pkgname}/unregister.sh
-}
-
-_gen_contents() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_install() {
-  _register
-  _gen_contents
-}
-
-pre_upgrade() {
-  _unregister
-}
-
-post_upgrade() {
-  _register
-  _gen_contents
-}
-
-pre_remove() {
-  _unregister
-}
-
-post_remove() {
-  _gen_contents
-}
diff --git a/community/kdeconnect/PKGBUILD b/community/kdeconnect/PKGBUILD
index abf8114bc..8bc681308 100644
--- a/community/kdeconnect/PKGBUILD
+++ b/community/kdeconnect/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113762 2014-06-29 17:54:21Z andrea $
+# $Id: PKGBUILD 115427 2014-07-11 09:34:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
 
 pkgname=kdeconnect
-pkgver=0.7.1
+pkgver=0.7.2
 pkgrel=1
 pkgdesc='Adds communication between KDE and your smartphone'
 url='https://projects.kde.org/projects/playground/base/kdeconnect-kde'
@@ -14,7 +14,7 @@ makedepends=('automoc4' 'cmake')
 optdepends=('sshfs: remote filesystem browser')
 install="${pkgname}.install"
 source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-kde-${pkgver}.tar.xz")
-md5sums=('bcf4525e8967a10771534e8b7a5b22d8')
+md5sums=('1cd10d54bb3dc6e5b854ec110f63cecb')
 
 prepare() {
   mkdir build
diff --git a/community/python2-caja/PKGBUILD b/community/python2-caja/PKGBUILD
index 46530e36f..79cbc63da 100644
--- a/community/python2-caja/PKGBUILD
+++ b/community/python2-caja/PKGBUILD
@@ -3,22 +3,26 @@
 pkgname=python2-caja
 _pkgname=python-caja
 pkgver=1.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Python binding for Caja, to allow Caja property page and menu item extensions to be written in Python."
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('caja' 'python2' 'python2-gobject')
 makedepends=('mate-common')
-options=('!emptydirs')
 replaces=('python-caja')
 provides=('python-caja')
-source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz")
-sha1sums=('63cf08e3f711be8eb44c423322962a18f822031e')
+source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz"
+        "use-pkg-config.diff")
+sha1sums=('63cf08e3f711be8eb44c423322962a18f822031e'
+          '32c348669868414d98c3a4be0a083b419256200d')
 
 prepare() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
-    sed -i 's/python-config/python2-config/' configure
+    # Use pkg-config for python detection and variables
+    #  - https://github.com/mate-desktop/python-caja/issues/17
+    patch -Np1 -i "${srcdir}/use-pkg-config.diff"
+    autoreconf -fi
 }
 
 build() {
diff --git a/community/python2-caja/use-pkg-config.diff b/community/python2-caja/use-pkg-config.diff
new file mode 100644
index 000000000..0d32df316
--- /dev/null
+++ b/community/python2-caja/use-pkg-config.diff
@@ -0,0 +1,39 @@
+diff --git a/configure.ac b/configure.ac
+index f4059e3..a8345ae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,8 +30,12 @@ GTK_DOC_CHECK(1.9)
+ dnl **************************************************
+ dnl * Check for Python
+ dnl **************************************************
+-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR([could not find Python headers])])
+-AM_CHECK_PYTHON_LIBS(,[AC_MSG_ERROR([could not find Python lib])])
++AM_PATH_PYTHON([2.6])
++PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}])
++PYTHON_LIB_LOC="`pkg-config python-${PYTHON_VERSION} --variable=libdir`"
++AC_SUBST(PYTHON_LIBS)
++AC_SUBST(PYTHON_CFLAGS)
++AC_SUBST(PYTHON_LIB_LOC)
+ 
+ if test "`pkg-config --variable=datadir pygobject-3.0`" != "" ; then
+     PYGOBJECT_VERSION=pygobject-3.0
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e3d7c3f..dd37d15 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -16,12 +16,13 @@ libcaja_python_la_CPPFLAGS = \
+ 	-DLIBDIR=\"$(libdir)\" \
+ 	-DPYTHON_VERSION=\"$(PYTHON_VERSION)\" \
+ 	-DPY_LIB_LOC="\"$(PYTHON_LIB_LOC)\"" \
+-	$(PYTHON_INCLUDES) \
++	$(CAJA_PYTHON_CFLAGS) \
+ 	$(AM_CPPFLAGS)
+ 
+ libcaja_python_la_CFLAGS = \
++	$(PYTHON_CFLAGS)
+ 	$(CAJA_PYTHON_CFLAGS) \
+ 	$(AM_CFLAGS)
+ 
+ libcaja_python_la_LDFLAGS = -module -avoid-version
+-libcaja_python_la_LIBADD  = $(CAJA_PYTHON_LIBS) $(PYTHON_LIBS)
++libcaja_python_la_LIBADD  = $(PYTHON_LIBS) $(CAJA_PYTHON_LIBS)
diff --git a/community/rlwrap/ChangeLog b/community/rlwrap/ChangeLog
index 995078cfe..dd0412af3 100644
--- a/community/rlwrap/ChangeLog
+++ b/community/rlwrap/ChangeLog
@@ -1,3 +1,5 @@
+2014-07-11 Kyle Keen <keenerd@gmail.com>
+* Updated to 0.41
 2014-05-10 Kyle Keen <keenerd@gmail.com>
 * Updated to 0.40
 2008-03-21 partition <heniekk@gmail.com>
diff --git a/community/rlwrap/PKGBUILD b/community/rlwrap/PKGBUILD
index c3e099365..0366e7fe7 100644
--- a/community/rlwrap/PKGBUILD
+++ b/community/rlwrap/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 110957 2014-05-10 16:52:31Z kkeen $
+# $Id: PKGBUILD 115530 2014-07-11 21:36:16Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: wizzomafizzo <wizzomafizzo@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
@@ -6,7 +6,7 @@
 # Contributor: Douglas Thrift <douglas@douglasthrift.net>
 
 pkgname=rlwrap
-pkgver=0.40
+pkgver=0.41
 pkgrel=1
 pkgdesc="Adds readline-style editing and history to programs."
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ url="http://utopia.knoware.nl/~hlub/uck/rlwrap/"
 license=('GPL')
 depends=('perl')
 source=(http://utopia.knoware.nl/~hlub/uck/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('2488052579d05aeef68e746ad35c7a55')
+md5sums=('8d1f3f8e634d55725645e6750c54e5f2')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD
index ed2f6f08d..a02067b58 100644
--- a/community/springlobby/PKGBUILD
+++ b/community/springlobby/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 112973 2014-06-10 17:40:28Z svenstaro $
+# $Id: PKGBUILD 115417 2014-07-11 01:30:32Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: DuGi <dugi@irc.pl>
 
 pkgname=springlobby
-pkgver=0.195
+pkgver=0.196
 pkgrel=1
 pkgdesc="A free cross-platform lobby client for the Spring RTS project."
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ optdepends=('sdl' 'sdl_sound' 'sdl_mixer')
 makedepends=('boost' 'asio' 'cmake')
 install=springlobby.install
 source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9a13e2207c80382561f02c74f571b339')
+md5sums=('3b39b1ee5597001ff101bb7469027c79')
 
 build() {
   cd $srcdir/${pkgname}-$pkgver
diff --git a/community/syncthing/PKGBUILD b/community/syncthing/PKGBUILD
index 162149f1d..fbfc2ad65 100644
--- a/community/syncthing/PKGBUILD
+++ b/community/syncthing/PKGBUILD
@@ -6,7 +6,7 @@
 
 _pkgstamp=$(date +%s)
 pkgname=syncthing
-pkgver=0.8.18
+pkgver=0.8.19
 pkgrel=1
 pkgdesc="Open Source Continuous Replication / Cluster Synchronization Thing"
 url="http://syncthing.net/"
@@ -17,7 +17,7 @@ makedepends=('go' 'godep' 'inetutils' 'sed')
 source=("https://github.com/calmh/${pkgname}/archive/v${pkgver}.tar.gz"
         "syncthing@.service"
         "syncthing.1")
-sha1sums=('e643d6b0f3610ca74496c7020aaa19906b75a51a'
+sha1sums=('88c1bd818061a127b5263e9220ec54fd7544d217'
           '204cad3823306c793a14a17a23220e26199160d4'
           '17be8b3f99c577e325765abc251f597e204d7711')
 install=${pkgname}.install
diff --git a/community/tap-plugins/PKGBUILD b/community/tap-plugins/PKGBUILD
index 8ab3c5150..05fa57e32 100644
--- a/community/tap-plugins/PKGBUILD
+++ b/community/tap-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 95495 2013-08-13 03:24:48Z speps $
+# $Id: PKGBUILD 115470 2014-07-11 19:11:33Z speps $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 # Contributor: Ng Oon-Ee <ngoonee.talk@gmail.com>
 
 pkgname=tap-plugins
-pkgver=0.7.2
+pkgver=0.7.3
 pkgrel=1
 pkgdesc="Tom's LADSPA Plugins"
 arch=('i686' 'x86_64')
@@ -12,20 +12,20 @@ license=('GPL')
 groups=('ladspa-plugins')
 depends=('ladspa')
 source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('354b171e580cfad6bad87c26a79ef273')
+md5sums=('113fa021b2a05e2fd3cf35f65e6ca137')
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   # correct install path
   sed 's|/usr/local/|$(DESTDIR)/usr/|' -i Makefile
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make 
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir/" install
 }
diff --git a/community/xautolock/PKGBUILD b/community/xautolock/PKGBUILD
index 9ab05243c..6a57dfe85 100644
--- a/community/xautolock/PKGBUILD
+++ b/community/xautolock/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 64681 2012-02-17 18:30:55Z bluewind $
+# $Id: PKGBUILD 115435 2014-07-11 10:18:32Z bluewind $
 # Maintainer: Florian Pritz <f-p@gmx.at>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=xautolock
 pkgver=2.2
-pkgrel=3
+pkgrel=4
 pkgdesc="An automatic X screen-locker/screen-saver"
 arch=(i686 x86_64)
 url="ftp://ibiblio.org/pub/Linux/X11/screensavers/"
diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD
index 88c3712e4..72f19879a 100644
--- a/core/dbus/PKGBUILD
+++ b/core/dbus/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 215082 2014-06-13 11:12:13Z jgc $
+# $Id: PKGBUILD 216821 2014-07-11 19:28:08Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgbase=dbus
 pkgname=('dbus' 'libdbus')
-pkgver=1.8.4
+pkgver=1.8.6
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
@@ -14,7 +14,7 @@ license=('GPL' 'custom')
 makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl')
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc}
         30-dbus)
-md5sums=('4717cb8ab5b80978fcadf2b4f2f72e1b'
+md5sums=('6a08ba555d340e9dfe2d623b83c0eea8'
          'SKIP'
          '3314d727fa57fc443fce25b5cbeebbcc')
 
diff --git a/core/systemd/0001-networkd-properly-track-addresses-when-first-added.patch b/core/systemd/0001-networkd-properly-track-addresses-when-first-added.patch
new file mode 100644
index 000000000..4f1af0741
--- /dev/null
+++ b/core/systemd/0001-networkd-properly-track-addresses-when-first-added.patch
@@ -0,0 +1,104 @@
+From 4958aee4977f325be19f0e1e4b424922c3cada5f Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Thu, 3 Jul 2014 22:47:51 +0200
+Subject: [PATCH] networkd: properly track addresses when first added
+
+When doing a NEWADDR, the reply we get back is the NEWADDR itself, rather
+than just an empty ack (unlike how NEWLINK works). For this reason, the
+process that did the NEWADDR does not get the broadcast message.
+
+We were only listening for broadcast messages, and hence not tracking the
+addresses we added ourselves. This went unnoticed as the kernel will usually
+send NEWADDR messages from time to time anyway, so things would mostly work,
+but in the worst case we would not notice that a routable address was available
+and consider ourselves offline.
+---
+ src/network/networkd-link.c | 54 +++++++++++++++++++++++++--------------------
+ 1 file changed, 30 insertions(+), 24 deletions(-)
+
+diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
+index 961c1ab..6257372 100644
+--- a/src/network/networkd-link.c
++++ b/src/network/networkd-link.c
+@@ -599,10 +599,35 @@ static int route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata)
+         return 0;
+ }
+ 
++static int link_get_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
++        _cleanup_link_unref_ Link *link = userdata;
++        int r;
++
++        assert(rtnl);
++        assert(m);
++        assert(link);
++        assert(link->manager);
++
++        for (; m; m = sd_rtnl_message_next(m)) {
++                r = sd_rtnl_message_get_errno(m);
++                if (r < 0) {
++                        log_debug_link(link, "getting address failed: %s", strerror(-r));
++                        continue;
++                }
++
++                r = link_rtnl_process_address(rtnl, m, link->manager);
++                if (r < 0)
++                        log_warning_link(link, "could not process address: %s", strerror(-r));
++        }
++
++        return 1;
++}
++
+ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+         _cleanup_link_unref_ Link *link = userdata;
+         int r;
+ 
++        assert(rtnl);
+         assert(m);
+         assert(link);
+         assert(link->ifname);
+@@ -623,6 +648,11 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+                                 link->ifname, strerror(-r),
+                                 "ERRNO=%d", -r,
+                                 NULL);
++        if (r >= 0) {
++                /* calling handler directly so take a ref */
++                link_ref(link);
++                link_get_address_handler(rtnl, m, link);
++        }
+ 
+         if (link->addr_messages == 0) {
+                 log_debug_link(link, "addresses set");
+@@ -2233,30 +2263,6 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use
+         return 1;
+ }
+ 
+-static int link_get_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+-        _cleanup_link_unref_ Link *link = userdata;
+-        int r;
+-
+-        assert(rtnl);
+-        assert(m);
+-        assert(link);
+-        assert(link->manager);
+-
+-        for (; m; m = sd_rtnl_message_next(m)) {
+-                r = sd_rtnl_message_get_errno(m);
+-                if (r < 0) {
+-                        log_debug_link(link, "getting address failed: %s", strerror(-r));
+-                        continue;
+-                }
+-
+-                r = link_rtnl_process_address(rtnl, m, link->manager);
+-                if (r < 0)
+-                        log_warning_link(link, "could not process address: %s", strerror(-r));
+-        }
+-
+-        return 1;
+-}
+-
+ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) {
+         Link *link;
+         _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+-- 
+2.0.1
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 24021348b..b8642c5a4 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
-pkgver=214
-pkgrel=2
+pkgver=215
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -15,11 +15,19 @@ options=('strip' 'debug')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
-        'initcpio-install-udev')
-md5sums=('eac4f9fc5bd18a0efc3fc20858baacf3'
+        'initcpio-install-udev'
+        '0001-networkd-properly-track-addresses-when-first-added.patch')
+md5sums=('d2603e9fffd8b18d242543e36f2e7d31'
          '29245f7a240bfba66e2b1783b63b6b40'
          '66cca7318e13eaf37c5b7db2efa69846'
-         'bde43090d4ac0ef048e3eaee8202a407')
+         'bde43090d4ac0ef048e3eaee8202a407'
+         '2d237a277a12b3801c88d159d64a7413')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 <"$srcdir"/0001-networkd-properly-track-addresses-when-first-added.patch
+}
 
 build() {
   cd "$pkgname-$pkgver"
@@ -78,6 +86,7 @@ package_systemd() {
   rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" \
       "$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-networkd.service" \
       "$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-resolved.service" \
+      "$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service" \
       "$pkgdir/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service"
   rmdir "$pkgdir/etc/systemd/system/getty.target.wants" \
       "$pkgdir/etc/systemd/system/network-online.target.wants"
@@ -95,6 +104,9 @@ package_systemd() {
   sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
           s#GROUP="tape"#GROUP="storage"#g;
           s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
+  sed -i 's/dialout/uucp/g;
+          s/tape/storage/g;
+          s/cdrom/optical/g' "$pkgdir"/usr/lib/sysusers.d/basic.conf
 
   # add mkinitcpio hooks
   install -Dm644 "$srcdir/initcpio-install-systemd" "$pkgdir/usr/lib/initcpio/install/systemd"
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install
index 062e9a97d..a075a28ee 100644
--- a/core/systemd/systemd.install
+++ b/core/systemd/systemd.install
@@ -137,6 +137,11 @@ _214_2_changes() {
   echo '       "kernel.core_pattern=|/usr/lib/systemd/systemd-coredump %p %u %g %s %t %e"'
 }
 
+_215_2_changes() {
+  # create at least the symlink from /etc/os-release to /usr/lib/os-release
+  systemd-tmpfiles --create etc.conf
+}
+
 post_install() {
   post_common "$@"
 
@@ -162,7 +167,8 @@ post_upgrade() {
                     209-1
                     210-1
                     213-4
-                    214-2)
+                    214-2
+                    215-2)
 
   for v in "${upgrades[@]}"; do
     if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index b2343ec57..c7795e04e 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 213478 2014-05-23 23:41:13Z heftig $
+# $Id: PKGBUILD 216814 2014-07-11 18:24:37Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
-pkgver=3.12.2
+pkgver=3.12.3
 pkgrel=1
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ install=gnome-color-manager.install
 options=('!emptydirs')
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7f406233c03499c786dac69d54a3b9312f7fd36a6c75e8b9c899cad1588731d0')
+sha256sums=('ce62f9d2d8702547b5083f800a2747cb6c8fd5a04a71e2dc6928166951d1d039')
 
 build(){
   cd $pkgname-$pkgver
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index 18342a9bf..1333ba6bf 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 215423 2014-06-24 19:18:03Z heftig $
+# $Id: PKGBUILD 216817 2014-07-11 18:35:27Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=(harfbuzz)
 pkgname=(harfbuzz harfbuzz-icu)
-pkgver=0.9.29
+pkgver=0.9.30
 pkgrel=1
 pkgdesc="OpenType text shaping engine"
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 license=(MIT)
 makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection)
 source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('601cea38c6fa0cf362dd9042c66cf4db711c5f9390de4ca46d6d2fc3f64de390')
+sha256sums=('fa873f9fe4a5ad4f7beb524475e13a5a8729d7414d2bc64a557c0d5651d58586')
 
 build() {
   cd $pkgbase-$pkgver
@@ -21,6 +21,11 @@ build() {
   make
 }
 
+check() {
+  cd $pkgbase-$pkgver
+  make -k check || :
+}
+
 package_harfbuzz() {
   depends=(glib2 freetype2 graphite)
   optdepends=('cairo: hb-view program')
diff --git a/extra/kdelibs4support/PKGBUILD b/extra/kdelibs4support/PKGBUILD
index 0cff1484c..f0de2f7ed 100644
--- a/extra/kdelibs4support/PKGBUILD
+++ b/extra/kdelibs4support/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 216708 2014-07-08 18:37:28Z andrea $
+# $Id: PKGBUILD 216790 2014-07-11 11:50:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdelibs4support
 pkgver=5.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='KDE 4 Support'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/frameworks/kdelibs4support'
@@ -13,11 +13,16 @@ makedepends=('extra-cmake-modules' 'kdoctools' 'qt5-tools') # 'networkmanager'
 groups=('kf5-aids')
 replaces=('kde4support')
 conflicts=('kde4support')
-source=("http://download.kde.org/stable/frameworks/${pkgver}/portingAids/${pkgname}-${pkgver}.tar.xz")
-md5sums=('1fe3fc10a31a2c123338c3a8ae82455a')
+source=("http://download.kde.org/stable/frameworks/${pkgver}/portingAids/${pkgname}-${pkgver}.tar.xz"
+        'update-FindGettext.patch')
+md5sums=('1fe3fc10a31a2c123338c3a8ae82455a'
+         'cfde4360628836b039cb614f6641112d')
 
 prepare() {
   mkdir -p build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/update-FindGettext.patch
 }
 
 build() {
diff --git a/extra/kdelibs4support/update-FindGettext.patch b/extra/kdelibs4support/update-FindGettext.patch
new file mode 100644
index 000000000..5647feac2
--- /dev/null
+++ b/extra/kdelibs4support/update-FindGettext.patch
@@ -0,0 +1,37 @@
+From: Alex Merry <alex.merry@kde.org>
+Date: Fri, 04 Jul 2014 10:10:27 +0000
+Subject: Make FindGettext compatible with the one provided by CMake
+X-Git-Url: http://quickgit.kde.org/?p=kdelibs4support.git&a=commitdiff&h=581ee6b370d8b5627196c8d6d8760d3655f6daea
+---
+Make FindGettext compatible with the one provided by CMake
+
+This version will accept the old GETTEXT_PROCESS_PO_FILES() syntax (no
+PO_FILES argument), but will also accept the new syntax required by
+CMake's version of this file. It will also warn when PO_FILES is not
+given.
+
+REVIEW: 119111
+---
+
+
+--- a/cmake/modules/FindGettext.cmake
++++ b/cmake/modules/FindGettext.cmake
+@@ -212,7 +212,16 @@
+       LIST(REMOVE_AT _args 0 1)
+    ENDIF("${_tmp}" STREQUAL "INSTALL_DESTINATION")
+    
+-#    message(STATUS "2 all ${_addToAll} dest ${_installDest} args: ${_args}")
++   LIST(GET _args 0 _tmp)
++   IF("${_tmp}" STREQUAL "PO_FILES")
++      LIST(REMOVE_AT _args 0)
++   ELSE()
++      SET(_deprecation_arg DEPRECATION)
++      IF(CMAKE_VERSION VERSION_LESS 3.0.0)
++         SET(_deprecation_arg AUTHOR_WARNING)
++      ENDIF()
++      MESSAGE(${_deprecation_arg} "GETTEXT_PROCESS_PO_FILES without a PO_FILES argument is deprecated")
++   ENDIF()
+    
+    FOREACH(_current_PO_FILE ${_args})
+       GET_FILENAME_COMPONENT(_name ${_current_PO_FILE} NAME)
+
diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD
index 37ea037b6..1b44b5c0d 100644
--- a/extra/libxi/PKGBUILD
+++ b/extra/libxi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198284 2013-10-30 13:55:49Z allan $
+# $Id: PKGBUILD 216802 2014-07-11 15:20:34Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxi
-pkgver=1.7.2
+pkgver=1.7.3
 pkgrel=1
 pkgdesc="X11 Input extension library"
 arch=('i686' 'x86_64')
@@ -12,18 +12,16 @@ depends=('libxext' 'inputproto')
 makedepends=('pkgconfig' 'xorg-util-macros' 'libxfixes' 'automake')
 license=('custom')
 source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2)
-sha256sums=('df24781dc63645e2b561cd0b20bd8a0e7aff02e426a8d2a7641159004d4cb20e')
+sha256sums=('763db879f57b44c6e2cc96ae4bb756cf276170c979ef8a51b4db6e04c969953c')
 
 build() {
-  cd "${srcdir}/libXi-${pkgver}"
-
+  cd libXi-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/libXi-${pkgver}"
-
+  cd libXi-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/polkit-qt/PKGBUILD b/extra/polkit-qt/PKGBUILD
index c8f52877c..f6449603e 100644
--- a/extra/polkit-qt/PKGBUILD
+++ b/extra/polkit-qt/PKGBUILD
@@ -2,31 +2,52 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
-pkgname=polkit-qt
-pkgver=0.103.0
-pkgrel=3
+pkgbase=polkit-qt
+pkgname=('polkit-qt4' 'polkit-qt5')
+pkgver=0.112
+pkgrel=1
 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'
 license=('LGPL')
-depends=('polkit' 'qt4')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2")
-md5sums=('a105e233e6733fb072c9080cd7ae1af2')
+makedepends=('cmake' 'automoc4' 'polkit' 'qt4' 'qt5-base')
+source=(${pkgbase}-${pkgver}.tar.bz2::"http://quickgit.kde.org/?p=${pkgbase}-1.git&a=snapshot&h=40afa675bfa4cacd95487ce8b0544654c5f34e21&fmt=tbz2")
+md5sums=('c46401dbb55e2276616849e22b096768')
 
 prepare() {
-  mkdir build
+  mkdir build{,-qt5}
 }
 
 build() {
   cd build
-  cmake ../${pkgname}-1-${pkgver} \
+  cmake ../${pkgbase}-1 \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_DESTINATION=/usr/lib \
+    -DUSE_QT4=ON
+  make
+
+  cd ../build-qt5
+  cmake ../${pkgbase}-1 \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_DESTINATION=/usr/lib
   make
 }
 
-package() {
+package_polkit-qt4() {
+  depends=('polkit' 'qt4')
+  replaces=('polkit-qt')
+  provides=('polkit-qt')
+  conflicts=('polkit-qt')
+
   cd build
   make DESTDIR="${pkgdir}" install
 }
+
+package_polkit-qt5() {
+  depends=('polkit' 'qt5-base')
+
+  cd build-qt5
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/polkit-qt5/PKGBUILD b/extra/polkit-qt5/PKGBUILD
deleted file mode 100644
index 49340c37e..000000000
--- a/extra/polkit-qt5/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 212982 2014-05-16 23:15:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Antonio Rojas <nqn1976 @ gmail.com>
-
-pkgname=polkit-qt5
-pkgver=0.103.0.bac771e
-pkgrel=1
-pkgdesc='Qt wrapper around polkit-1 client libraries'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kdesupport/polkit-qt-1'
-license=('LGPL')
-depends=('polkit' 'qt5-base')
-makedepends=('extra-cmake-modules' 'git')
-source=('git://anongit.kde.org/polkit-qt-1#commit=bac771e69887c9253f2b0973f6310810db0061f8')
-md5sums=('SKIP')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../polkit-qt-1 \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=lib
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 7584569ac..f83e3179e 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 215169 2014-06-14 19:17:22Z andyrtr $
+# $Id: PKGBUILD 216819 2014-07-11 18:38:43Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
-pkgver=1.0.1
-pkgrel=2
+pkgver=1.0.2
+pkgrel=1
 pkgdesc="All-in-one indexer, search tool and metadata database"
 arch=(i686 x86_64)
 license=(GPL)
@@ -19,7 +19,7 @@ url="http://www.gnome.org"
 options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz
         tracker-1.0.1-giflib-5.1.0.patch)
-sha256sums=('76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889'
+sha256sums=('73491517006a58802630ff28243fc6fe07a24fe8bea563670da0ad28595468c4'
             'b5440e8129256a315f932229e9a25a3586b9dfdc3505bd2c018351573345b0bc')
 
 prepare() {
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index 748cc7c50..b44d4e9b9 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 216508 2014-07-04 19:12:59Z heftig $
+# $Id: PKGBUILD 216826 2014-07-11 21:54:26Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=webkitgtk
 pkgname=(webkitgtk webkitgtk2)
-pkgver=2.4.3
-pkgrel=2
+pkgver=2.4.4
+pkgrel=1
 pkgdesc="GTK+ Web content engine library"
 arch=(i686 x86_64)
 url="http://webkitgtk.org/"
@@ -17,11 +17,9 @@ optdepends=('gst-plugins-base: free media decoding'
             'gst-libav: nonfree media decoding')
 options=(!emptydirs)
 source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
-        fix-pretty-quotes.patch
-        webkitgtk-2.4.3-angle_symbol_table.patch)
-sha256sums=('9862c3eac1d12cc6e52cc39060a1284163950b304d534529a0dbcc5958a8ceac'
-            '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6'
-            'a2c0b96a1671d43c18baf3cbe53c84738181aa08c3ac448c423b50722953a50b')
+        fix-pretty-quotes.patch)
+sha256sums=('58cbfc7e352ae1e1f5e383f9f766795794d88483e9a52377a295f56eedf53ab9'
+            '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6')
 
 prepare() {
   mkdir build-gtk{,2} path
@@ -30,7 +28,6 @@ prepare() {
 
   cd $pkgbase-$pkgver
   patch -Np0 -i ../fix-pretty-quotes.patch
-  patch -Np1 -i ../webkitgtk-2.4.3-angle_symbol_table.patch
 }
 
 _build() (
diff --git a/extra/webkitgtk/webkitgtk-2.4.3-angle_symbol_table.patch b/extra/webkitgtk/webkitgtk-2.4.3-angle_symbol_table.patch
deleted file mode 100644
index 8d3096670..000000000
--- a/extra/webkitgtk/webkitgtk-2.4.3-angle_symbol_table.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp
-+++ b/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp
-@@ -171,7 +171,8 @@ TFunction::~TFunction()
- TSymbolTableLevel::~TSymbolTableLevel()
- {
-     for (tLevel::iterator it = level.begin(); it != level.end(); ++it)
--        delete (*it).second;
-+        if ((*it).first == (*it).second->getMangledName())
-+            delete (*it).second;
- }
-
- //
-
diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD
index 8db9e19d8..12a1e5fe8 100644
--- a/extra/x2goclient/PKGBUILD
+++ b/extra/x2goclient/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 210182 2014-04-10 18:18:43Z andyrtr $
+# $Id: PKGBUILD 216796 2014-07-11 14:49:07Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
 # Contributor: Richard Murri <admin@richardmurri.com>
 
 pkgname=x2goclient
-pkgver=4.0.2.0
+pkgver=4.0.2.1
 pkgrel=1
 pkgdesc="x2go qt4 client"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-the
 makedepends=('man2html')
 install=x2goclient.install
 source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
-sha1sums=('bbe8efb2df88bfa18b056c52ee0b1cca7a52b71b'
+sha1sums=('fb9e787afc610f69a56ddf61ecc255d62d111189'
           'SKIP')
 
 build() {