Wed Jul 13 23:12:30 UTC 2011

author: root <root@rshg047.dnsready.net> 2011-07-13 23:12:30 +0000
committer: root <root@rshg047.dnsready.net> 2011-07-13 23:12:30 +0000
commit: 29657877f6a02dbba1bd58b417b4ccd211939690 (patch)
tree: 0213b621a87e176f90d19cf8e894d1da8fd0d1b6
parent: 079c689ef9b252fd82dbf9b182ec2517c48f8737 (diff)
112 files changed, 1842 insertions, 310 deletions
diff --git a/community/addresses/PKGBUILD b/community/addresses/PKGBUILD
index ef2790765..af9eec5e9 100644
--- a/community/addresses/PKGBUILD
+++ b/community/addresses/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 50653 2011-06-29 11:36:38Z spupykin $
+# $Id: PKGBUILD 51616 2011-07-12 10:59:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=addresses
 pkgver=0.4.6
-pkgrel=7
+pkgrel=8
 pkgdesc="A versatile address book application for GNUstep"
 arch=('i686' 'x86_64')
 url="http://giesler.biz/bjoern/en/sw_addr.html"
@@ -20,19 +20,18 @@ build() {
   . /etc/profile.d/GNUstep.sh
   cd $srcdir/Addresses-$pkgver
   sed -i -e 's|Versions/A|Versions/0|g' {Test,AddressManager}/GNUmakefile
-
-  export PATH=$startdir/gcc-objc/src/gcc-4.2.1/build/qwe/usr/bin:$PATH
-
   make
 }
 
 package() {
   . /etc/profile.d/GNUstep.sh
   cd $srcdir/Addresses-$pkgver
-  make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System INSTALL_ROOT_DIR=$pkgdir install
-
+  make GNUSTEP_INSTALLATION_DIR=$pkgdir/usr/lib/GNUstep INSTALL_ROOT_DIR=$pkgdir install
   # buggy install scripts
-  cd $pkgdir/opt/GNUstep/System/Library/Headers/
+  cd $pkgdir/usr/lib/GNUstep/Library/Headers/
   rm AddressBook
   ln -sf Addresses AddressBook
+  cd $pkgdir/usr/lib/GNUstep/Library/
+  mv * ..
+  cd .. && rmdir Library
 }
diff --git a/community/gnumail/PKGBUILD b/community/gnumail/PKGBUILD
index 79044c6cd..9f64c23b1 100644
--- a/community/gnumail/PKGBUILD
+++ b/community/gnumail/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 46065 2011-05-03 10:03:55Z spupykin $
+# $Id: PKGBUILD 51621 2011-07-12 11:00:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnumail
 pkgver=1.2.0pre3
-pkgrel=5
+pkgrel=6
 pkgdesc="A complete and fast mail application for GNUstep"
 arch=('i686' 'x86_64')
 url="http://www.collaboration-world.com/gnumail"
 license=('GPL')
-depends=('pantomime' 'addresses' 'gcc' 'gnustep-gui')
+depends=('pantomime' 'addresses' 'gnustep-gui')
+makedepends=('gcc-objc')
 options=('!makeflags')
-source=(GNUMail-$pkgver.tar.gz::http://www.collaboration-world.com/cgi-bin/project/download.cgi/GNUMail-$pkgver.tar.gz?rid=103)
+source=("GNUMail-$pkgver.tar.gz::http://www.collaboration-world.com/cgi-bin/project/download.cgi/GNUMail-$pkgver.tar.gz?rid=103")
 md5sums=('0f91fe0c32ef369ea843a2ab3909fb2b')
 
 build() {
   cd $srcdir/GNUMail
   . /etc/profile.d/GNUstep.sh
   make \
-	ADDITIONAL_OBJCFLAGS=-I/opt/GNUstep/System/Library/Headers \
-	ADDITIONAL_GUI_LIBS="-L/opt/GNUstep/System/Library/Libraries -lGNUMail -lPantomime -lAddresses -lAddressView"
+	ADDITIONAL_OBJCFLAGS=-I/usr/lib/GNUstep/Headers \
+	ADDITIONAL_GUI_LIBS="-L/usr/lib/GNUstep/Libraries -lGNUMail -lPantomime -lAddresses -lAddressView"
 }
 
 package() {
   cd $srcdir/GNUMail
-  make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System install
+  make GNUSTEP_INSTALLATION_DIR=$pkgdir/usr/lib/GNUstep install
+  cd $pkgdir/usr/lib/GNUstep/Library/
+  mv * ..
+  cd .. && rmdir Library
 }
diff --git a/community/gnustep-back/PKGBUILD b/community/gnustep-back/PKGBUILD
index 4755f9e02..dcea5faa8 100644
--- a/community/gnustep-back/PKGBUILD
+++ b/community/gnustep-back/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 45208 2011-04-18 12:44:31Z spupykin $
+# $Id: PKGBUILD 51626 2011-07-12 11:01:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-back
 pkgver=0.20.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNUstep GUI Backend"
 arch=('i686' 'x86_64')
 url="http://www.gnustep.org/"
@@ -22,5 +22,15 @@ build() {
   . /etc/profile.d/GNUstep.sh
   ./configure --prefix=/usr --sysconfdir=/etc/GNUstep
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  . /etc/profile.d/GNUstep.sh
   make DESTDIR=$pkgdir install
+  mkdir -p $pkgdir/etc/ld.so.conf.d
+  cat >$pkgdir/etc/ld.so.conf.d/gnustep.conf <<EOF
+/opt/GNUstep/System/Library/Libraries
+/usr/lib/GNUstep/Libraries
+EOF
 }
diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD
index 30705c693..235eb1b0c 100644
--- a/community/myodbc/PKGBUILD
+++ b/community/myodbc/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 42568 2011-03-17 15:04:00Z spupykin $
+# $Id: PKGBUILD 51657 2011-07-12 14:22:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=myodbc
 pkgver=5.1.8
-pkgrel=1
+pkgrel=2
 pkgdesc="ODBC driver/connector for MySQL"
 arch=(i686 x86_64)
 url="http://dev.mysql.com/downloads/connector/odbc/"
 depends=('unixodbc' 'libmysqlclient')
 license=('GPL')
-options=('!libtool')
 source=("http://mysql.cce.usp.br/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-${pkgver}.tar.gz"
 	myodbc-64bit.patch
 	myodbc-add-mysys.patch
@@ -23,16 +22,17 @@ md5sums=('c64d8cec9de453bdf48fcb168643b943'
 
 build() {
   cd $srcdir/mysql-connector-odbc-${pkgver}
-
   [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-64bit.patch
   [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-add-mysys.patch
   [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-my-free.patch
   [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-shutdown.patch
-
-  [ $NOEXTRACT -eq 1 ] || CFLAGS=-DTHREAD LDFLAGS=-lmysqld ./configure --prefix=/usr --sysconfdir=/etc --with-unixODBC=/usr \
-    --with-mysql-path=/usr --without-samples --enable-thread-safe \
-    --without-x --without-qt --disable-gui --enable-shared \
-    --disable-static --disable-test
+  [ -f Makefile ] || CFLAGS="$CFLAGS -DTHREAD" \
+	./configure --prefix=/usr --sysconfdir=/etc --with-unixODBC=/usr --with-odbc-ini=/etc/odbc.ini \
+		--with-mysql-path=/usr --without-x --disable-gui --disable-test
   make
+}
+
+package() {
+  cd $srcdir/mysql-connector-odbc-${pkgver}
   make DESTDIR=$pkgdir install
 }
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 6fd5e2b2b..c8db06edd 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 48812 2011-06-06 11:51:15Z spupykin $
+# $Id: PKGBUILD 51647 2011-07-12 14:13:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
 
@@ -12,7 +12,7 @@ _group=http
 
 pkgname=nginx
 pkgver=1.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
 arch=('i686' 'x86_64')
 depends=('pcre' 'zlib' 'openssl')
@@ -28,7 +28,7 @@ backup=("etc/nginx/conf/nginx.conf"
 source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz
 	nginx)
 md5sums=('d23f6e6b07b57ac061e790b1ed64bb98'
-         '837b010afcbdfe82d8e65ef00c4e14ba')
+         '7e7cafa43a59762b81c4da64e49eca69')
 
 build() {
 	cd $srcdir/nginx-${pkgver}
diff --git a/community/nginx/nginx b/community/nginx/nginx
index 2d5a02a47..811656eed 100644
--- a/community/nginx/nginx
+++ b/community/nginx/nginx
@@ -41,12 +41,16 @@ case "$1" in
     ;;
   stop)
     stat_busy "Stopping Nginx"
-    kill -QUIT `cat /var/run/nginx.pid` &>/dev/null
+    NGINX_PID=`cat /var/run/nginx.pid`
+    kill -QUIT $NGINX_PID &>/dev/null
     if [ $? -ne 0 ]; then
       stat_fail
     else
-      rm_daemon nginx
-      stat_done
+      for i in `seq 1 10`; do
+        [ -d /proc/$NGINX_PID ] || { stat_done; rm_daemon nginx; exit 0; }
+        sleep 1
+      done
+      stat_fail
     fi
     ;;
   restart)
diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD
index 06ba09d60..5f5f3c55b 100644
--- a/community/nut/PKGBUILD
+++ b/community/nut/PKGBUILD
@@ -2,14 +2,14 @@
 # Contributor: Slash <demodevil5 [at] yahoo [dot] com>
 
 pkgname=nut
-pkgver=16.12
+pkgver=16.13
 pkgrel=1
 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.'
 url='http://nut.sourceforge.net/'
 license=('GPL')
 arch=('i686' 'x86_64')
 source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz")
-md5sums=('12b33ddad0e04ce1e3846fdcdd927dde')
+md5sums=('58f29a4510438ce4bd0622cd5971959c')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD
index c32d7c8e8..2225fcaa6 100644
--- a/community/oolite/PKGBUILD
+++ b/community/oolite/PKGBUILD
@@ -2,30 +2,23 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lone_Wolf <lonewolf@xs4all.nl>
 pkgname=oolite
-pkgver=1.75.2
-pkgrel=2
+pkgver=1.75.3
+pkgrel=1
 pkgdesc="A space-sim based on the classic Elite"
 arch=('i686' 'x86_64')
 url="http://oolite-linux.berlios.de"
 license=('GPL2')
 depends=('gnustep-gui' 'sdl_mixer' 'mesa' 'espeak' 'nspr' 'python2' 'icu')
 makedepends=('gcc-objc' 'gnustep-make' 'curl' 'zip')
+options=(!makeflags)
 source=(oolite http://download2.berlios.de/oolite-linux/oolite-dev-source-${pkgver}.tar.bz2)
-md5sums=('d4b3fdc553fbd4aa4418864eebd21ede'
-         '926720981d94fd09c9e2824dbc102d5e')
+md5sums=('b182976fade9b64a3b3702e2a8c72bf0'
+         'e6c3d1e41f60f8cf410f766a3ecadcc7')
 
 build() {
     cd $srcdir
     cp -r ${srcdir}/oolite-dev-source-${pkgver} ${srcdir}/${pkgname}-build
 
-# running 'make -f libjs.make debug=no' and/or 'make -f Makefile release'
-# works from commandline, but gives errors that cause makepkg to abort
-    cd ${srcdir}/${pkgname}-build/deps/Cocoa-deps/scripts
-    ./update-mozilla.sh
-    mkdir -p ${srcdir}/${pkgname}-build/deps/Cross-platform-deps/mozilla/js/src/build-release
-    cd ${srcdir}/${pkgname}-build/deps/Cross-platform-deps/mozilla/js/src/build-release
-    ../configure --disable-shared-js --enable-threadsafe --with-system-nspr --disable-tests --enable-trace-jscalls
-# end of lines needed to avoid makepkg aborting
     cd ${srcdir}/${pkgname}-build
     make -f libjs.make debug=no
     make -f Makefile release
diff --git a/community/oolite/oolite b/community/oolite/oolite
index d20e28545..6c9de2446 100755
--- a/community/oolite/oolite
+++ b/community/oolite/oolite
@@ -3,5 +3,4 @@ source /usr/share/GNUstep/Makefiles/GNUstep.sh
 if [ ! -d ~/.Oolite/AddOns ]; then
       mkdir -p ~/.Oolite/AddOns
 fi
-/usr/share/oolite/oolite
-
+/usr/share/oolite/oolite $@
diff --git a/community/pantomime/PKGBUILD b/community/pantomime/PKGBUILD
index 1d3654d74..88875acfb 100644
--- a/community/pantomime/PKGBUILD
+++ b/community/pantomime/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 46068 2011-05-03 10:04:36Z spupykin $
+# $Id: PKGBUILD 51631 2011-07-12 11:02:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=pantomime
 pkgver=1.2.0pre3
-pkgrel=3
+pkgrel=4
 pkgdesc="A set of Objective-C classes that model a mail system"
 arch=('i686' 'x86_64')
 url="http://www.collaboration-world.com/pantomime"
@@ -27,6 +27,9 @@ build() {
 
 package() {
   cd $srcdir/Pantomime
-  make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System install
+  make GNUSTEP_INSTALLATION_DIR=$pkgdir/usr/lib/GNUstep install
   install -D -m644 Documentation/LICENSE.elm $pkgdir/usr/share/licenses/$pkgname/LICENSE.elm
+  cd $pkgdir/usr/lib/GNUstep/Library/
+  mv * ..
+  cd .. && rmdir Library
 }
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index 93fdbfd05..eedade19e 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scite
-pkgver=2.26
+pkgver=2.27
 pkgrel=1
 pkgdesc='A generally useful editor with facilities for building and running programs.'
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ install=scite.install
 source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver/\./}.tgz"
         'SciTE.desktop'
         'makefile.patch')
-md5sums=('328865585758aca73292083ab4552af4'
+md5sums=('ac5aafa1b47da3792a56d5fd9f383fda'
          '48526532ef677982a4b156ae90f25b6f'
          '87005d4c7262a1a698cde0628dc7e2a2')
 
diff --git a/community/synce-librapi/PKGBUILD b/community/synce-librapi/PKGBUILD
index 0ffbe301f..639321737 100644
--- a/community/synce-librapi/PKGBUILD
+++ b/community/synce-librapi/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 26407 2010-09-15 11:58:40Z schuay $
+# $Id: PKGBUILD 51603 2011-07-12 06:27:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zhukov Pavel <gelios@gmail.com>
 
 pkgname=synce-librapi
-pkgver=0.15
-pkgrel=2
+pkgver=0.15.2
+pkgrel=1
 pkgdesc="provide a means of communication with a Windows CE device - libraries and tools for making remote calls to pocket pc"
 arch=('i686' 'x86_64')
 url="http://synce.sourceforge.net/"
 license=('GPL')
-depends=('synce-libsynce')
+depends=('synce-libsynce' 'hal')
 makedepends=('pyrex')
 source=(http://downloads.sourceforge.net/sourceforge/synce/librapi2-$pkgver.tar.gz)
-md5sums=('7341571d6f6b583bb4837bae42fb5d1c')
+md5sums=('0a15bc22ee02794ca4714799611b4746')
 
 build() {
   cd $srcdir/librapi2-$pkgver
diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD
index 05cd3340e..0eff3b5ae 100644
--- a/community/tracker/PKGBUILD
+++ b/community/tracker/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 51237 2011-07-06 10:22:55Z spupykin $
+# $Id: PKGBUILD 51608 2011-07-12 08:24:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=tracker
 pkgver=0.10.19
-pkgrel=1
+pkgrel=2
 pkgdesc="Powerful object database, tag/metadata database, search tool and indexer"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/tracker/"
 license=('GPL')
 depends=('upower' 'poppler-glib' 'gstreamer0.10-base' 'libgee'  'gnome-desktop' 'libnotify' 'xdg-utils' 'gtkhtml'
 	 'libgsf' 'gnome-panel-bonobo' 'exempi' 'networkmanager')
-makedepends=('intltool' 'gnome-panel' 'nautilus' 'evolution' 'totem-plparser' 'icu')
+makedepends=('intltool' 'gnome-panel' 'evolution' 'totem-plparser' 'icu')
+# 'nautilus'
 optdepends=('nautilus'
 	    'enca'
 	    'gtkhtml'
@@ -39,7 +40,7 @@ build() {
 
   ./configure --prefix=/usr --sysconfdir=/etc  --libexecdir=/usr/lib/$pkgname \
     --enable-video-extractor=gstreamer --disable-hal \
-    --disable-miner-evolution
+    --disable-miner-evolution --disable-nautilus-extension
   make
 }
 
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index 5bfced05d..ab0ee832e 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 42961 2011-03-22 21:16:11Z spupykin $
+# $Id: PKGBUILD 51652 2011-07-12 14:14:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=usb_modeswitch
-pkgver=1.1.7
+pkgver=1.1.8
 pkgrel=1
-_pkgdata=20110227
+_pkgdata=20110705
 pkgdesc="Activating switchable USB devices on Linux."
 arch=('i686' 'x86_64')
 url="http://www.draisberghof.de/usb_modeswitch/"
@@ -13,26 +13,31 @@ depends=('libusb-compat' 'tcl')
 makedepends=('gcc' 'make')
 backup=("etc/$pkgname.conf")
 source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2"
-	"http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2")
-md5sums=('b75e42b7b2d30e9d4cbd5c159f925247'
-         '2f5e5bfa21a97b705a22f95bec367793')
+	"http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2"
+	"http://www.draisberghof.de/usb_modeswitch/device_reference.txt")
+md5sums=('1aaaa45e0465843e4973d7778bfbafbb'
+         '5046e7be8d10d2fe699f9af21a0c3769'
+         'c441eb16a3901052ce882ca844be2a20')
 
 build() {
-  cd $srcdir
+  cd $srcdir/usb-modeswitch-$pkgver/
+  make clean
+  make
+}
 
+package() {
   cd $srcdir/usb-modeswitch-$pkgver/
+
   mkdir -p $pkgdir/lib/udev/usb_modeswitch
   mkdir -p $pkgdir/etc
   mkdir -p $pkgdir/usr/share/man/man1
 
-  make clean
-  make
   make DESTDIR=${pkgdir} install
 
   mv ${pkgdir}/lib/udev/usb_modeswitch/usb_modeswitch.sh ${pkgdir}/lib/udev/usb_modeswitch.sh
   rmdir ${pkgdir}/lib/udev/usb_modeswitch
   mv ${pkgdir}/lib/udev/usb_modeswitch.sh ${pkgdir}/lib/udev/usb_modeswitch
-  cp device_reference.txt $pkgdir/etc/usb_modeswitch.setup
+  cp $srcdir/device_reference.txt $pkgdir/etc/usb_modeswitch.setup
 
   cd $srcdir/usb-modeswitch-data-${_pkgdata}
   make DESTDIR=$pkgdir install
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index 8b758fd16..7f371fe26 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124631 2011-05-23 15:09:42Z ibiru $
+# $Id: PKGBUILD 131265 2011-07-12 13:19:41Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=empathy
 pkgver=3.0.2
@@ -24,7 +24,7 @@ sha256sums=('8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
       --sysconfdir=/etc  \
       --libexecdir=/usr/lib/empathy \
       --disable-static \
diff --git a/extra/kdegraphics/PKGBUILD b/extra/kdegraphics/PKGBUILD
index 37ac0ab2e..4b523eda2 100644
--- a/extra/kdegraphics/PKGBUILD
+++ b/extra/kdegraphics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130500 2011-07-06 23:50:56Z andrea $
+# $Id: PKGBUILD 131255 2011-07-12 11:55:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -13,7 +13,7 @@ pkgname=('kdegraphics-gwenview'
          'kdegraphics-libs'
          'kdegraphics-okular')
 pkgver=4.6.5
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index ab89b60f9..8e4a0224a 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 130249 2011-07-04 19:26:50Z andrea $
+# $Id: PKGBUILD 131295 2011-07-12 17:46:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
 pkgver=4.6.5
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -20,11 +20,15 @@ replaces=('arts' 'kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kde-applications-menu.patch' 'archlinux-menu.patch'
-        'abs-syntax-highlight.patch')
+        'abs-syntax-highlight.patch'
+        'fix-lineedit-clear-button.patch'
+        'fix-lineedit-completion-tab.patch')
 sha1sums=('9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'd994f262356af5b9e4e9619646e471bd98c91efb')
+          'd994f262356af5b9e4e9619646e471bd98c91efb'
+          '3deae3fc6733624759ad8bf5a1560d9a2f792d73'
+          'a5f223b61499fa03043def0b3a45b1712cc72d70')
 
 build() {
        cd ${srcdir}/${pkgname}-${pkgver}
@@ -36,6 +40,10 @@ build() {
        # add syntax highlightning for PKGBUILD and .install files
        patch -p1 -i $srcdir/abs-syntax-highlight.patch
 
+       # Already fixed upstream
+       patch -p1 -i "${srcdir}"/fix-lineedit-clear-button.patch
+       patch -p1 -i "${srcdir}"/fix-lineedit-completion-tab.patch
+
        cd ${srcdir}
        mkdir build
        cd build
diff --git a/extra/kdelibs/fix-lineedit-clear-button.patch b/extra/kdelibs/fix-lineedit-clear-button.patch
new file mode 100644
index 000000000..315892940
--- /dev/null
+++ b/extra/kdelibs/fix-lineedit-clear-button.patch
@@ -0,0 +1,30 @@
+commit 0b7201c1fe4f12dc7b17abbf19047864d1cca302
+Author: Andrea Iacovitti <aiacovitti@libero.it>
+Date:   Sat Jul 9 19:51:40 2011 +0200
+
+    Fix regression about input text clearButton stopping to work on khtml forms
+    BUG: 246513
+    FIXED-IN: 4.7.0
+
+diff --git a/kdeui/widgets/klineedit.cpp b/kdeui/widgets/klineedit.cpp
+index 7382806..8f1c8a4 100644
+--- a/kdeui/widgets/klineedit.cpp
++++ b/kdeui/widgets/klineedit.cpp
+@@ -1116,7 +1116,7 @@ void KLineEdit::mousePressEvent( QMouseEvent* e )
+     if  ( (e->button() == Qt::LeftButton ||
+            e->button() == Qt::MidButton ) &&
+           d->clearButton ) {
+-        d->clickInClear = d->clearButton == childAt( e->pos() );
++        d->clickInClear = ( d->clearButton == childAt(e->pos()) || d->clearButton->underMouse() );
+ 
+         if ( d->clickInClear ) {
+             d->possibleTripleClick = false;
+@@ -1145,7 +1145,7 @@ void KLineEdit::mousePressEvent( QMouseEvent* e )
+ void KLineEdit::mouseReleaseEvent( QMouseEvent* e )
+ {
+     if ( d->clickInClear ) {
+-        if ( d->clearButton == childAt( e->pos() ) ) {
++        if ( d->clearButton == childAt(e->pos()) || d->clearButton->underMouse() ) {
+             QString newText;
+             if ( e->button() == Qt::MidButton ) {
+                 newText = QApplication::clipboard()->text( QClipboard::Selection );
diff --git a/extra/kdelibs/fix-lineedit-completion-tab.patch b/extra/kdelibs/fix-lineedit-completion-tab.patch
new file mode 100644
index 000000000..0c88dffc9
--- /dev/null
+++ b/extra/kdelibs/fix-lineedit-completion-tab.patch
@@ -0,0 +1,56 @@
+--- kdelibs/khtml/rendering/render_form.cpp
++++ kdelibs/khtml/rendering/render_form.cpp
+@@ -1012,11 +1012,11 @@
+ // -----------------------------------------------------------------------------
+ 
+ RenderLineEdit::RenderLineEdit(HTMLInputElementImpl *element)
+-    : RenderFormElement(element)
++    : RenderFormElement(element), m_blockElementUpdates(false)
+ {
+     LineEditWidget *edit = new LineEditWidget(element, view(), view()->widget());
+     connect(edit,SIGNAL(returnPressed()), this, SLOT(slotReturnPressed()));
+-    connect(edit,SIGNAL(textEdited(QString)),this,SLOT(slotTextEdited(QString)));
++    connect(edit,SIGNAL(textChanged(QString)),this,SLOT(slotTextChanged(QString)));
+ 
+     if(element->inputType() == HTMLInputElementImpl::PASSWORD)
+         edit->setEchoMode( QLineEdit::Password );
+@@ -1142,17 +1142,21 @@
+     }
+ 
+     if (element()->value().string() != widget()->text()) {
++        m_blockElementUpdates = true;
+         int pos = widget()->cursorPosition();
+         widget()->setText(element()->value().string());
+         widget()->setCursorPosition(pos);
++        m_blockElementUpdates = false;
+     }
+     widget()->setReadOnly(element()->readOnly());
+ 
+     RenderFormElement::updateFromElement();
+ }
+ 
+-void RenderLineEdit::slotTextEdited(const QString &string)
++void RenderLineEdit::slotTextChanged(const QString &string)
+ {
++    if (m_blockElementUpdates) return;
++
+     // don't use setValue here!
+     element()->m_value = string;
+     element()->m_unsubmittedFormChange = true;
+--- kdelibs/khtml/rendering/render_form.h
++++ kdelibs/khtml/rendering/render_form.h
+@@ -282,12 +282,13 @@
+     void setSelectionRange(long start, long end);
+ public Q_SLOTS:
+     void slotReturnPressed();
+-    void slotTextEdited(const QString &string);
++    void slotTextChanged(const QString &string);
+ protected:
+ 
+ private:
+     virtual bool isEditable() const { return true; }
+     virtual bool canHaveBorder() const { return true; }
++    bool m_blockElementUpdates;
+ };
+ 
+ // -------------------------------------------------------------------------
diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD
index 85973e455..2d943f9b6 100644
--- a/extra/kdemultimedia/PKGBUILD
+++ b/extra/kdemultimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130262 2011-07-04 19:27:51Z andrea $
+# $Id: PKGBUILD 131350 2011-07-12 19:23:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -11,7 +11,7 @@ pkgname=('kdemultimedia-dragonplayer'
          'kdemultimedia-kscd'
          'kdemultimedia-mplayerthumbs')
 pkgver=4.6.5
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -19,11 +19,16 @@ groups=('kde' 'kdemultimedia')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'tunepimp'
         'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'mplayerthumbs.config')
+        'mplayerthumbs.config'
+        'fix-memleak-in-kmix.patch')
 sha1sums=('081bead5ee758d169f3119c138424929b001d04f'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683')
+          'ba016fa2563c14ffcba852c62506b66bfc6ee683'
+          '80370de30898f1ba1a6db057d34324abdcc57384')
 
 build() {
+    cd "${srcdir}"/${pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/fix-memleak-in-kmix.patch
+
     cd ${srcdir}
 	mkdir build
 	cd build
diff --git a/extra/kdemultimedia/fix-memleak-in-kmix.patch b/extra/kdemultimedia/fix-memleak-in-kmix.patch
new file mode 100644
index 000000000..31ea4a606
--- /dev/null
+++ b/extra/kdemultimedia/fix-memleak-in-kmix.patch
@@ -0,0 +1,55 @@
+Index: kdemultimedia/kmix/backends/mixer_pulse.cpp
+===================================================================
+--- kdemultimedia/kmix/backends/mixer_pulse.cpp	(revision 1241345)
++++ kdemultimedia/kmix/backends/mixer_pulse.cpp	(revision 1241346)
+@@ -754,7 +754,12 @@
+         return;
+     }
+     addDevice((*map)[index]);
+-    emit controlsReconfigured(_mixer->id());
++    // Do not emit directly to ensure all connected slots are executed
++    // in their own event loop.
++    QMetaObject::invokeMethod(this,
++                              "controlsReconfigured",
++                              Qt::QueuedConnection,
++                              Q_ARG(QString, _mixer->id()));
+ }
+ 
+ void Mixer_PULSE::removeWidget(int index)
+@@ -778,7 +783,12 @@
+         {
+             delete *iter;
+             m_mixDevices.erase(iter);
+-            emit controlsReconfigured(_mixer->id());
++            // Do not emit directly to ensure all connected slots are executed
++            // in their own event loop.
++            QMetaObject::invokeMethod(this,
++                                      "controlsReconfigured",
++                                      Qt::QueuedConnection,
++                                      Q_ARG(QString, _mixer->id()));
+             return;
+         }
+     }
+@@ -799,7 +809,12 @@
+         delete *iter;
+         m_mixDevices.erase(iter);
+     }
+-    emit controlsReconfigured(_mixer->id());
++    // Do not emit directly to ensure all connected slots are executed
++    // in their own event loop.
++    QMetaObject::invokeMethod(this,
++                              "controlsReconfigured",
++                              Qt::QueuedConnection,
++                              Q_ARG(QString, _mixer->id()));
+ }
+ 
+ void Mixer_PULSE::addDevice(devinfo& dev)
+@@ -990,7 +1005,7 @@
+         kDebug(67100) <<  "Using PulseAudio for mixer: " << m_mixerName;
+         m_isOpen = true;
+     }
+- 
++
+     return 0;
+ }
+ 
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 072898ddc..d79e21519 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 131169 2011-07-11 13:15:58Z giovanni $
+# $Id: PKGBUILD 131260 2011-07-12 12:02:03Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=mkvtoolnix
-pkgver=4.9.0
+pkgver=4.9.1
 pkgrel=1
 pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
 depends=('file' 'boost-libs' 'libmatroska' 'lzo2' 'expat' 'flac' 'libvorbis')
 makedepends=('boost' 'ruby')
 source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('3f92443fe7897abd3d5e7d61bd758432')
+md5sums=('5981f266e6d25da4a49f7464e4a97cdf')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/raptor/Allow-instead-of-in-TRiG.patch b/extra/raptor/Allow-instead-of-in-TRiG.patch
new file mode 100644
index 000000000..21639f600
--- /dev/null
+++ b/extra/raptor/Allow-instead-of-in-TRiG.patch
@@ -0,0 +1,550 @@
+diff -ur ../../raptor2-2.0.3/src/turtle_lexer.c ./src/turtle_lexer.c
+--- ../../raptor2-2.0.3/src/turtle_lexer.c	2011-05-31 21:14:41.000000000 +0200
++++ ./src/turtle_lexer.c	2011-07-12 15:31:39.620638699 +0200
+@@ -62,6 +62,7 @@
+ typedef unsigned char flex_uint8_t; 
+ typedef unsigned short int flex_uint16_t;
+ typedef unsigned int flex_uint32_t;
++#endif /* ! C99 */
+ 
+ /* Limits of integral types. */
+ #ifndef INT8_MIN
+@@ -92,8 +93,6 @@
+ #define UINT32_MAX             (4294967295U)
+ #endif
+ 
+-#endif /* ! C99 */
+-
+ #endif /* ! FLEXINT_H */
+ 
+ #ifdef __cplusplus
+@@ -167,15 +166,7 @@
+ 
+ /* Size of default input buffer. */
+ #ifndef YY_BUF_SIZE
+-#ifdef __ia64__
+-/* On IA-64, the buffer size is 16k, not 8k.
+- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+- * Ditto for the __ia64__ case accordingly.
+- */
+-#define YY_BUF_SIZE 32768
+-#else
+ #define YY_BUF_SIZE 16384
+-#endif /* __ia64__ */
+ #endif
+ 
+ /* The state buf must be large enough to hold one state per character in the main buffer.
+@@ -371,7 +362,7 @@
+ 	flex_int32_t yy_verify;
+ 	flex_int32_t yy_nxt;
+ 	};
+-static yyconst flex_int16_t yy_accept[114] =
++static yyconst flex_int16_t yy_accept[112] =
+     {   0,
+         0,    0,    0,    0,   22,   22,   41,   39,    2,    1,
+         1,   39,   38,   13,   14,   39,    5,    4,   28,   25,
+@@ -384,8 +375,8 @@
+        26,    0,    0,   27,    0,   25,    0,    0,   33,    0,
+         0,   24,   36,   36,   21,    0,   27,    0,   27,    0,
+ 
+-        0,    0,    0,   24,   36,   17,    0,   10,    0,   18,
+-        0,    9,    0
++        0,    0,   24,   36,   17,   10,    0,   18,    0,    9,
++        0
+     } ;
+ 
+ static yyconst flex_int32_t yy_ec[256] =
+@@ -396,154 +387,157 @@
+         1,    2,    1,    5,    6,    1,    1,    1,    1,    7,
+         8,    1,    9,   10,   11,   12,    1,   13,   13,   13,
+        13,   13,   13,   13,   13,   13,   13,   14,   15,   16,
+-        1,   17,    1,   18,   19,   19,   19,   19,   20,   19,
+-       19,   19,   19,   19,   19,   19,   19,   19,   19,   19,
+-       19,   19,   19,   19,   19,   19,   19,   19,   19,   19,
+-       21,   22,   23,   24,   25,    1,   26,   27,   19,   19,
+-
+-       28,   29,   19,   19,   30,   19,   19,   31,   19,   19,
+-       19,   32,   19,   33,   34,   35,   36,   19,   19,   37,
+-       19,   19,   38,    1,   39,    1,    1,   40,   40,   40,
+-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+-
+-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+-       40,   40,   40,   40,   40
++       17,   18,    1,   19,   20,   20,   20,   20,   21,   20,
++       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
++       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
++       22,   23,   24,   25,   26,    1,   27,   28,   20,   20,
++
++       29,   30,   20,   20,   31,   20,   20,   32,   20,   20,
++       20,   33,   20,   34,   35,   36,   37,   20,   20,   38,
++       20,   20,   39,    1,   40,    1,    1,   41,   41,   41,
++       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
++       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
++       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
++       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
++       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
++       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
++       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
++
++       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
++       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
++       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
++       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
++       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
++       41,   41,   41,   41,   41
+     } ;
+ 
+-static yyconst flex_int32_t yy_meta[41] =
++static yyconst flex_int32_t yy_meta[42] =
+     {   0,
+         1,    2,    3,    4,    5,    1,    1,    1,    1,    1,
+-        6,    1,    6,    7,    1,    1,    1,    1,    8,    8,
+-        1,    8,    1,    1,    8,    8,    8,    8,    8,    8,
+-        8,    8,    8,    8,    8,    8,    8,    2,    1,    8
++        6,    1,    6,    7,    1,    1,    2,    1,    1,    8,
++        8,    1,    8,    1,    1,    8,    8,    8,    8,    8,
++        8,    8,    8,    8,    8,    8,    8,    8,    2,    1,
++        8
+     } ;
+ 
+-static yyconst flex_int16_t yy_base[126] =
++static yyconst flex_int16_t yy_base[124] =
+     {   0,
+-        0,    0,   40,    0,   78,   79,  285,  299,  259,  299,
+-      257,   80,   83,  299,  299,   76,  299,  246,   78,   90,
+-      299,  227,   67,   81,  299,  229,  299,  207,  215,   83,
+-       93,   83,  299,  299,  299,  225,  299,  211,  105,  107,
+-      219,  108,  221,  299,  109,  217,    0,  114,  299,  218,
+-      207,  112,  117,  121,  133,  133,  208,  136,  299,  201,
+-      149,  191,  183,  189,  151,  200,  299,    0,  117,   86,
+-      211,  198,  299,  153,  154,  155,  206,  299,  299,  153,
+-      157,  169,  197,  196,  165,  170,  188,  196,  299,  172,
+-      177,    0,  135,  153,  299,  191,  188,  187,  186,  190,
+-
+-      192,  170,  154,    0,  160,  133,  194,  299,  125,  100,
+-       83,  299,  299,  232,  240,  248,  255,  263,  266,  269,
+-      272,  280,  287,   88,  290
++        0,    0,   41,    0,   80,   81,  262,  301,  259,  301,
++      243,   82,   85,  301,  301,   78,  301,  232,   80,   93,
++      301,  215,   66,   83,  301,  217,  301,  205,  215,   84,
++       88,   85,  301,  301,  301,  226,  301,  212,   97,  105,
++      220,  111,  222,  301,  108,  218,    0,  114,  301,  219,
++      208,  109,  113,  114,  128,  142,  144,  146,  301,  202,
++      148,  192,  184,  190,  150,  202,  301,    0,  128,   96,
++      212,  199,  301,  133,  151,  159,  207,  301,  301,  157,
++      148,  162,  198,  197,  155,  176,  188,  193,  301,  174,
++      179,    0,  145,  155,  301,  194,  193,  191,  190,  195,
++
++      173,  171,    0,  159,  173,  301,  168,  165,  138,  301,
++      301,  234,  242,  250,  257,  265,  268,  271,  274,  282,
++      289,  132,  292
+     } ;
+ 
+-static yyconst flex_int16_t yy_def[126] =
++static yyconst flex_int16_t yy_def[124] =
+     {   0,
+-      113,    1,  113,    3,  114,  114,  113,  113,  113,  113,
+-      113,  115,  116,  113,  113,  113,  113,  113,  113,  117,
+-      113,  118,  113,  119,  113,  120,  113,  113,  113,  119,
+-      119,   31,  113,  113,  113,  113,  113,  121,  122,  122,
+-      113,  122,  113,  113,  115,  113,  115,  116,  113,  113,
+-      113,  113,  113,  113,  113,  113,  113,  123,  113,  118,
+-      113,  113,  113,   31,  117,  120,  113,  124,   31,   31,
+-      113,  121,  113,  122,  122,  122,  113,  113,  113,  113,
+-      113,  113,  113,  113,  113,  123,  113,  113,  113,  113,
+-      113,  125,   31,   31,  113,  113,  113,  113,  113,  113,
+-
+-      113,  113,  113,  125,   31,   31,  113,  113,  113,   31,
+-      113,  113,    0,  113,  113,  113,  113,  113,  113,  113,
+-      113,  113,  113,  113,  113
++      111,    1,  111,    3,  112,  112,  111,  111,  111,  111,
++      111,  113,  114,  111,  111,  111,  111,  111,  111,  115,
++      111,  116,  111,  117,  111,  118,  111,  111,  111,  117,
++      117,   31,  111,  111,  111,  111,  111,  119,  120,  120,
++      111,  120,  111,  111,  113,  111,  113,  114,  111,  111,
++      111,  111,  111,  111,  111,  111,  111,  121,  111,  116,
++      111,  111,  111,   31,  115,  118,  111,  122,   31,   31,
++      111,  119,  111,  120,  120,  120,  111,  111,  111,  111,
++      111,  111,  111,  111,  111,  121,  111,  111,  111,  111,
++      111,  123,   31,   31,  111,  111,  111,  111,  111,  111,
++
++      111,  111,  123,   31,   31,  111,  111,   31,  111,  111,
++        0,  111,  111,  111,  111,  111,  111,  111,  111,  111,
++      111,  111,  111
+     } ;
+ 
+-static yyconst flex_int16_t yy_nxt[340] =
++static yyconst flex_int16_t yy_nxt[343] =
+     {   0,
+         8,    9,   10,   11,   12,   13,   14,   15,   16,   17,
+-       16,   18,   19,   20,   21,   22,    8,   23,   24,   24,
+-       25,   26,   27,   28,   29,   30,   24,   24,   31,   24,
+-       24,   24,   24,   24,   32,   24,   24,   33,   34,   26,
+-       35,   36,   35,   35,   35,   35,   35,   35,   35,   35,
+-       35,   35,   35,   37,   35,   35,   35,   35,   38,   38,
+-       35,   38,   35,   35,   35,   38,   38,   38,   38,   38,
+-       38,   38,   38,   38,   38,   38,   38,   35,   35,   38,
+-       40,   40,   41,   41,   46,   49,   50,   51,   52,   54,
+-       52,   56,   56,   62,   65,   92,   65,   55,   63,   42,
+-
+-       42,   47,   66,   57,   66,   55,   65,   75,   64,   75,
+-      113,   64,   74,   78,   66,   70,   49,   50,   69,  112,
+-       66,   94,   66,   54,   52,   64,   76,   59,   76,   53,
+-       47,   55,   66,   81,   56,   56,   80,   56,   56,   55,
+-       82,   83,   64,   83,   80,   84,   57,   93,   82,   57,
+-       87,   87,   56,   56,  111,   75,   75,  113,   64,   74,
+-       64,   96,   88,   96,   57,   97,  100,  100,  105,   81,
+-       59,   56,   56,   59,   76,   76,   82,   98,   64,   98,
+-      106,   99,  109,   57,   82,   64,   89,  110,   59,   87,
+-       87,  100,  100,  107,  107,  107,  107,  108,   99,   99,
+-
+-       97,   88,   59,   97,  103,  102,  101,   59,   84,   84,
+-       95,   73,   71,   65,   64,   91,   90,   61,   85,   53,
+-       49,   79,   43,   77,   73,   89,   71,   59,   68,   89,
+-       67,   89,   39,   39,   39,   39,   39,   39,   39,   39,
+-       45,   45,   65,   61,   45,   45,   45,   45,   48,   48,
+-       48,   48,   48,   48,   48,   48,   58,   58,   53,   44,
+-       43,   58,   58,   60,   60,   60,   60,   60,   60,   60,
+-       60,   64,   64,   64,   66,   66,   66,   72,   72,   72,
+-       74,   74,   74,   74,  113,   74,   74,   74,   86,   86,
+-      113,  113,   86,   86,   86,  104,  113,  104,    7,  113,
+-
+-      113,  113,  113,  113,  113,  113,  113,  113,  113,  113,
+-      113,  113,  113,  113,  113,  113,  113,  113,  113,  113,
+-      113,  113,  113,  113,  113,  113,  113,  113,  113,  113,
+-      113,  113,  113,  113,  113,  113,  113,  113,  113
++       16,   18,   19,   20,   21,   22,    8,    8,   23,   24,
++       24,   25,   26,   27,   28,   29,   30,   24,   24,   31,
++       24,   24,   24,   24,   24,   32,   24,   24,   33,   34,
++       26,   35,   36,   35,   35,   35,   35,   35,   35,   35,
++       35,   35,   35,   35,   37,   35,   35,   35,   35,   35,
++       38,   38,   35,   38,   35,   35,   35,   38,   38,   38,
++       38,   38,   38,   38,   38,   38,   38,   38,   38,   35,
++       35,   38,   40,   40,   41,   41,   46,   49,   50,   51,
++       52,   54,   52,   62,   56,   56,   65,   65,   63,   75,
++
++       55,   65,   42,   42,   47,   66,   66,   75,   55,   57,
++       66,   64,   78,  111,   69,   74,   49,   50,   70,   76,
++       54,   52,   64,   66,   66,   53,   81,   76,   66,   55,
++       47,   59,   94,   80,   82,   75,   83,   55,   83,   92,
++       84,   80,   82,   56,   56,   85,   85,   56,   56,   87,
++       87,   56,   56,   75,   64,   76,   85,   85,   57,   93,
++       81,  111,   57,   74,   88,   96,   57,   96,   82,   97,
++       98,   64,   98,   76,   99,  110,   82,   56,   56,  104,
++       59,   64,   59,  105,   59,   64,   89,  108,   59,   87,
++       87,   64,   57,   59,  100,  100,  100,  100,  109,   64,
++
++      107,  106,   99,   99,   88,   97,   97,  102,  101,   84,
++       84,   95,   73,   71,   59,   65,   64,   91,   90,   61,
++       53,   49,   79,   43,   77,   73,   89,   71,   68,   67,
++       65,   89,   61,   89,   39,   39,   39,   39,   39,   39,
++       39,   39,   45,   45,   53,   44,   45,   45,   45,   45,
++       48,   48,   48,   48,   48,   48,   48,   48,   58,   58,
++       43,  111,  111,  111,   58,   60,   60,   60,   60,   60,
++       60,   60,   60,   64,   64,   64,   66,   66,   66,   72,
++       72,   72,   74,   74,   74,   74,  111,   74,   74,   74,
++       86,   86,  111,  111,   86,  111,   86,  103,  111,  103,
++
++        7,  111,  111,  111,  111,  111,  111,  111,  111,  111,
++      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
++      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
++      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
++      111,  111
+     } ;
+ 
+-static yyconst flex_int16_t yy_chk[340] =
++static yyconst flex_int16_t yy_chk[343] =
+     {   0,
+         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
++        1,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+-        5,    6,    5,    6,   12,   13,   13,   16,   16,   19,
+-       19,   20,   20,   23,   24,  124,   30,   19,   23,    5,
++        3,    3,    5,    6,    5,    6,   12,   13,   13,   16,
++       16,   19,   19,   23,   20,   20,   24,   30,   23,   39,
+ 
+-        6,   12,   24,   20,   30,   19,   31,   39,   32,   40,
+-       42,   70,   42,   45,   31,   32,   48,   48,   31,  111,
+-       24,   70,   30,   52,   52,  110,   39,   20,   40,   53,
+-       45,   52,   31,   54,   56,   56,   53,   58,   58,   52,
+-       54,   55,   69,   55,   53,   55,   56,   69,   54,   58,
+-       61,   61,   65,   65,  109,   74,   75,   76,  106,   76,
+-       93,   80,   61,   80,   65,   80,   85,   85,   93,   81,
+-       56,   86,   86,   58,   74,   75,   81,   82,   94,   82,
+-       94,   82,  103,   86,   81,  105,   61,  105,   65,   87,
+-       87,  100,  100,  101,  101,  107,  107,  102,   99,   98,
+-
+-       97,   87,   85,   96,   91,   90,   88,   86,   84,   83,
+-       77,   72,   71,   66,   64,   63,   62,   60,   57,   51,
+-       50,   46,   43,   41,   38,   87,   36,  100,   29,  101,
+-       28,  107,  114,  114,  114,  114,  114,  114,  114,  114,
+-      115,  115,   26,   22,  115,  115,  115,  115,  116,  116,
+-      116,  116,  116,  116,  116,  116,  117,  117,   18,   11,
+-        9,  117,  117,  118,  118,  118,  118,  118,  118,  118,
+-      118,  119,  119,  119,  120,  120,  120,  121,  121,  121,
+-      122,  122,  122,  122,    7,  122,  122,  122,  123,  123,
+-        0,    0,  123,  123,  123,  125,    0,  125,  113,  113,
+-
+-      113,  113,  113,  113,  113,  113,  113,  113,  113,  113,
+-      113,  113,  113,  113,  113,  113,  113,  113,  113,  113,
+-      113,  113,  113,  113,  113,  113,  113,  113,  113,  113,
+-      113,  113,  113,  113,  113,  113,  113,  113,  113
++       19,   31,    5,    6,   12,   24,   30,   40,   19,   20,
++       31,   32,   45,   42,   31,   42,   48,   48,   32,   39,
++       52,   52,   70,   24,   30,   53,   54,   40,   31,   52,
++       45,   20,   70,   53,   54,   74,   55,   52,   55,  122,
++       55,   53,   54,   56,   56,   57,   57,   58,   58,   61,
++       61,   65,   65,   75,   69,   74,   85,   85,   56,   69,
++       81,   76,   58,   76,   61,   80,   65,   80,   81,   80,
++       82,   93,   82,   75,   82,  109,   81,   86,   86,   93,
++       56,   94,   57,   94,   58,  104,   61,  104,   65,   87,
++       87,  108,   86,   85,   88,   88,  100,  100,  107,  105,
++
++      102,  101,   99,   98,   87,   97,   96,   91,   90,   84,
++       83,   77,   72,   71,   86,   66,   64,   63,   62,   60,
++       51,   50,   46,   43,   41,   38,   87,   36,   29,   28,
++       26,   88,   22,  100,  112,  112,  112,  112,  112,  112,
++      112,  112,  113,  113,   18,   11,  113,  113,  113,  113,
++      114,  114,  114,  114,  114,  114,  114,  114,  115,  115,
++        9,    7,    0,    0,  115,  116,  116,  116,  116,  116,
++      116,  116,  116,  117,  117,  117,  118,  118,  118,  119,
++      119,  119,  120,  120,  120,  120,    0,  120,  120,  120,
++      121,  121,    0,    0,  121,    0,  121,  123,    0,  123,
++
++      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
++      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
++      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
++      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
++      111,  111
+     } ;
+ 
+ /* The intent behind this definition is that it'll catch
+@@ -704,7 +698,7 @@
+ */
+ /* similar to SPARQL but no need for <= check here */
+ 
+-#line 708 "turtle_lexer.c"
++#line 702 "turtle_lexer.c"
+ 
+ #define INITIAL 0
+ #define PREF 1
+@@ -791,6 +785,10 @@
+ 
+ void turtle_lexer_set_lineno (int line_number ,yyscan_t yyscanner );
+ 
++int turtle_lexer_get_column  (yyscan_t yyscanner );
++
++void turtle_lexer_set_column (int column_no ,yyscan_t yyscanner );
++
+ /* Macros after this point can all be overridden by user definitions in
+  * section 1.
+  */
+@@ -823,12 +821,7 @@
+ 
+ /* Amount of stuff to slurp up with each read. */
+ #ifndef YY_READ_BUF_SIZE
+-#ifdef __ia64__
+-/* On IA-64, the buffer size is 16k, not 8k */
+-#define YY_READ_BUF_SIZE 16384
+-#else
+ #define YY_READ_BUF_SIZE 8192
+-#endif /* __ia64__ */
+ #endif
+ 
+ /* Copy whatever the last rule matched to the standard output. */
+@@ -847,7 +840,7 @@
+ 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+ 		{ \
+ 		int c = '*'; \
+-		size_t n; \
++		unsigned n; \
+ 		for ( n = 0; n < max_size && \
+ 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+ 			buf[n] = (char) c; \
+@@ -945,7 +938,7 @@
+ 
+     
+ 
+-#line 949 "turtle_lexer.c"
++#line 942 "turtle_lexer.c"
+ 
+ 	if ( !yyg->yy_init )
+ 		{
+@@ -998,13 +991,13 @@
+ 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ 				{
+ 				yy_current_state = (int) yy_def[yy_current_state];
+-				if ( yy_current_state >= 114 )
++				if ( yy_current_state >= 112 )
+ 					yy_c = yy_meta[(unsigned int) yy_c];
+ 				}
+ 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ 			++yy_cp;
+ 			}
+-		while ( yy_current_state != 113 );
++		while ( yy_current_state != 111 );
+ 		yy_cp = yyg->yy_last_accepting_cpos;
+ 		yy_current_state = yyg->yy_last_accepting_state;
+ 
+@@ -1321,7 +1314,7 @@
+                while(1) {
+                   int c = yytext[yyleng - 1];
+                   if(c == '{' || c == ' ' || c=='\t' || c == '\v' || c == '\n' ||
+-                     c == ':' || c == '-') {
++                     c == '=') {
+                     yyleng--;
+                   } else
+                     break;
+@@ -1398,7 +1391,7 @@
+ #line 439 "./turtle_lexer.l"
+ YY_FATAL_ERROR( "flex scanner jammed" );
+ 	YY_BREAK
+-#line 1402 "turtle_lexer.c"
++#line 1395 "turtle_lexer.c"
+ case YY_STATE_EOF(INITIAL):
+ case YY_STATE_EOF(PREF):
+ 	yyterminate();
+@@ -1694,7 +1687,7 @@
+ 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ 			{
+ 			yy_current_state = (int) yy_def[yy_current_state];
+-			if ( yy_current_state >= 114 )
++			if ( yy_current_state >= 112 )
+ 				yy_c = yy_meta[(unsigned int) yy_c];
+ 			}
+ 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+@@ -1723,11 +1716,11 @@
+ 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ 		{
+ 		yy_current_state = (int) yy_def[yy_current_state];
+-		if ( yy_current_state >= 114 )
++		if ( yy_current_state >= 112 )
+ 			yy_c = yy_meta[(unsigned int) yy_c];
+ 		}
+ 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+-	yy_is_jam = (yy_current_state == 113);
++	yy_is_jam = (yy_current_state == 111);
+ 
+ 	return yy_is_jam ? 0 : yy_current_state;
+ }
+@@ -2130,8 +2123,8 @@
+ 
+ /** Setup the input buffer state to scan the given bytes. The next call to turtle_lexer_lex() will
+  * scan from a @e copy of @a bytes.
+- * @param yybytes the byte buffer to scan
+- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
++ * @param bytes the byte buffer to scan
++ * @param len the number of bytes in the buffer pointed to by @a bytes.
+  * @param yyscanner The scanner object.
+  * @return the newly allocated buffer state object.
+  */
+diff -ur ../../raptor2-2.0.3/src/turtle_lexer.h ./src/turtle_lexer.h
+--- ../../raptor2-2.0.3/src/turtle_lexer.h	2011-05-31 21:14:41.000000000 +0200
++++ ./src/turtle_lexer.h	2011-07-12 15:31:39.600648777 +0200
+@@ -58,6 +58,7 @@
+ typedef unsigned char flex_uint8_t; 
+ typedef unsigned short int flex_uint16_t;
+ typedef unsigned int flex_uint32_t;
++#endif /* ! C99 */
+ 
+ /* Limits of integral types. */
+ #ifndef INT8_MIN
+@@ -88,8 +89,6 @@
+ #define UINT32_MAX             (4294967295U)
+ #endif
+ 
+-#endif /* ! C99 */
+-
+ #endif /* ! FLEXINT_H */
+ 
+ #ifdef __cplusplus
+@@ -132,15 +131,7 @@
+ 
+ /* Size of default input buffer. */
+ #ifndef YY_BUF_SIZE
+-#ifdef __ia64__
+-/* On IA-64, the buffer size is 16k, not 8k.
+- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+- * Ditto for the __ia64__ case accordingly.
+- */
+-#define YY_BUF_SIZE 32768
+-#else
+ #define YY_BUF_SIZE 16384
+-#endif /* __ia64__ */
+ #endif
+ 
+ #ifndef YY_TYPEDEF_YY_BUFFER_STATE
+@@ -274,6 +265,10 @@
+ 
+ void turtle_lexer_set_lineno (int line_number ,yyscan_t yyscanner );
+ 
++int turtle_lexer_get_column  (yyscan_t yyscanner );
++
++void turtle_lexer_set_column (int column_no ,yyscan_t yyscanner );
++
+ /* Macros after this point can all be overridden by user definitions in
+  * section 1.
+  */
+@@ -300,12 +295,7 @@
+ 
+ /* Amount of stuff to slurp up with each read. */
+ #ifndef YY_READ_BUF_SIZE
+-#ifdef __ia64__
+-/* On IA-64, the buffer size is 16k, not 8k */
+-#define YY_READ_BUF_SIZE 16384
+-#else
+ #define YY_READ_BUF_SIZE 8192
+-#endif /* __ia64__ */
+ #endif
+ 
+ /* Number of entries by which start-condition stack grows. */
+@@ -341,6 +331,6 @@
+ #line 439 "./turtle_lexer.l"
+ 
+ 
+-#line 345 "turtle_lexer.h"
++#line 335 "turtle_lexer.h"
+ #undef turtle_lexer_IN_HEADER
+ #endif /* turtle_lexer_HEADER_H */
+diff -ur ../../raptor2-2.0.3/src/turtle_lexer.l ./src/turtle_lexer.l
+--- ../../raptor2-2.0.3/src/turtle_lexer.l	2011-05-31 21:14:36.000000000 +0200
++++ ./src/turtle_lexer.l	2011-07-12 15:28:58.911660781 +0200
+@@ -345,7 +345,7 @@
+                   yyterminate();  }
+ 
+ 
+-{QUOTEDURI}[\ \t\v\n]*(":-")?[\ \t\v\n]*"{"   {
++{QUOTEDURI}[\ \t\v\n]*("=")?[\ \t\v\n]*"{"   {
+                   raptor_stringbuffer* sb;
+                   unsigned char* uri_string;
+ 
+@@ -377,11 +377,11 @@
+                     TURTLE_LEXER_OOM();
+                 return GRAPH_NAME_LEFT_CURLY; }
+ 
+-{QNAME}[\ \t\v\n]*(":-")?[\ \t\v\n]*"{"   {
++{QNAME}[\ \t\v\n]*("=")?[\ \t\v\n]*"{"   {
+                while(1) {
+                   int c = yytext[yyleng - 1];
+                   if(c == '{' || c == ' ' || c=='\t' || c == '\v' || c == '\n' ||
+-                     c == ':' || c == '-') {
++                     c == '=') {
+                     yyleng--;
+                   } else
+                     break;
+\ No newline at end of file
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index 58b3a41d0..70b91af17 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 130397 2011-07-06 11:19:50Z andrea $
+# $Id: PKGBUILD 131270 2011-07-12 17:27:06Z andrea $
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=raptor
 pkgver=2.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
 arch=('i686' 'x86_64')
 url="http://librdf.org/raptor"
@@ -13,20 +13,22 @@ depends=('libxml2>=2.7.8' 'curl>=7.21.7' 'zlib>=1.2.5' 'libxslt>=1.1.26')
 license=('LGPL')
 options=('!libtool')
 source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz"
-        'fix-soprano-bug.patch')
+        'Allow-instead-of-in-TRiG.patch')
 md5sums=('46eff4b20f8752d1146a3e0c8b2168dd'
-         'fd63150d1e9f83bb59af0d86c373c8fa')
+         '73cfb0c1098ded4eff8c7f64bcaa5471')
 
 build() {
   cd ${srcdir}/raptor2-${pkgver}
 
   # see http://bugs.librdf.org/mantis/view.php?id=451
-  patch -p1 -i "${srcdir}"/fix-soprano-bug.patch
+  patch -p1 -i "${srcdir}"/Allow-instead-of-in-TRiG.patch
 
   # fix build with curl >= 7.21.2
   sed -i '/#include <curl\/types.h>/d' src/raptor_internal.h
 
-  ./configure --prefix=/usr --disable-static
+  ./configure --prefix=/usr \
+    --disable-static \
+    --with-yajl=no
   make
 }
 
diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD
index e3611bc0f..0e7b97a7c 100644
--- a/extra/squid/PKGBUILD
+++ b/extra/squid/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122870 2011-05-07 00:40:13Z kevin $
+# $Id: PKGBUILD 131635 2011-07-13 01:26:21Z kevin $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=squid
-pkgver=3.1.12
+pkgver=3.1.14
 pkgrel=1
 pkgdesc="A full-featured Web proxy cache server."
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid)
 install=squid.install
 source=(http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2
         squid squid.conf.d squid.pam squid.cron squid-3.1.11-unused.patch)
-md5sums=('3b4979e4b44f46d4e13f50326c537d89' 'd213b0cc1db72b749bb8c88716fdab39'
+md5sums=('8f82a451b04c3bf3c29202c548d2f2dd' 'd213b0cc1db72b749bb8c88716fdab39'
          '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777'
          '5e17df989e2a74e869790c066f61225b' '8e59089e4a8556fc18df51979f1cfbff')
 
@@ -26,7 +26,7 @@ build() {
   sed '/^    HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure
   # fix compile errors with gcc 4.6
   # http://bugs.squid-cache.org/show_bug.cgi?id=3178
-  patch -Np1 -i ${srcdir}/squid-3.1.11-unused.patch
+  #patch -Np1 -i ${srcdir}/squid-3.1.11-unused.patch
 
   # fix cache_dir, cache_dir size, and effective group.
   sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in
diff --git a/kde-unstable/kdeaccessibility/PKGBUILD b/kde-unstable/kdeaccessibility/PKGBUILD
index df662afc7..b3f23641d 100644
--- a/kde-unstable/kdeaccessibility/PKGBUILD
+++ b/kde-unstable/kdeaccessibility/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128546 2011-06-24 12:53:08Z andrea $
+# $Id: PKGBUILD 131299 2011-07-12 17:47:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -8,7 +8,7 @@ pkgname=('kdeaccessibility-jovie'
          'kdeaccessibility-kmag'
          'kdeaccessibility-kmousetool'
          'kdeaccessibility-kmouth')
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://accessibility.kde.org'
@@ -16,7 +16,7 @@ license=('GPL' 'FDL')
 groups=('kde' 'kdeaccessibility')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('8e6b90d52a7b7b4e8544186f5384683d11c7e224')
+sha1sums=('392abaded3fc2cadf676b6830ce6c385e85a9180')
 
 build() {
 	cd ${srcdir}
diff --git a/kde-unstable/kdeadmin/PKGBUILD b/kde-unstable/kdeadmin/PKGBUILD
index 16066692f..cc0aee315 100644
--- a/kde-unstable/kdeadmin/PKGBUILD
+++ b/kde-unstable/kdeadmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128547 2011-06-24 12:53:11Z andrea $
+# $Id: PKGBUILD 131300 2011-07-12 17:47:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -7,7 +7,7 @@ pkgname=('kdeadmin-kcron'
          'kdeadmin-ksystemlog'
          'kdeadmin-kuser'
          'kdeadmin-system-config-printer-kde')
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -17,7 +17,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python'
 	         'system-config-printer-common')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'syslog-path.patch')
-sha1sums=('48f434cb4cde895d06f03e40b7d77e5f9d3f184f'
+sha1sums=('de406afafed1af4da28648797991bed7c8738fd7'
           '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
 
 build() {
diff --git a/kde-unstable/kdeartwork/PKGBUILD b/kde-unstable/kdeartwork/PKGBUILD
index 0994158d3..b0804b3e7 100644
--- a/kde-unstable/kdeartwork/PKGBUILD
+++ b/kde-unstable/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128548 2011-06-24 12:53:15Z andrea $
+# $Id: PKGBUILD 131301 2011-07-12 17:47:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -13,7 +13,7 @@ pkgname=('kdeartwork-aurorae'
          'kdeartwork-styles'
          'kdeartwork-wallpapers'
          'kdeartwork-weatherwallpapers')
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -22,7 +22,7 @@ groups=('kde' 'kdeartwork')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen'
 	         'kdebase-workspace' 'libkexiv2')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('7eca9710ec09232ef4face13f8135da96f41b888')
+sha1sums=('3f6f7b2321d35e61fe94d2353b9ef89ec056e5d5')
 
 build() {
 	cd $srcdir
diff --git a/kde-unstable/kdebase-konsole/PKGBUILD b/kde-unstable/kdebase-konsole/PKGBUILD
index cad2e935d..13ae3ca8e 100644
--- a/kde-unstable/kdebase-konsole/PKGBUILD
+++ b/kde-unstable/kdebase-konsole/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128549 2011-06-24 12:53:18Z andrea $
+# $Id: PKGBUILD 131302 2011-07-12 17:47:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebase-konsole
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://kde.org/applications/system/konsole/'
@@ -12,7 +12,7 @@ groups=('kde' 'kdebase')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/unstable/${pkgver}/src/konsole-${pkgver}.tar.bz2")
-sha1sums=('314362990e41499c76f7f67bc4c4da0c43cf7780')
+sha1sums=('4869f898cebf72162a1dc06a6697f4fa35075950')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebase-runtime/PKGBUILD b/kde-unstable/kdebase-runtime/PKGBUILD
index c49aa3d99..2ea26c20d 100644
--- a/kde-unstable/kdebase-runtime/PKGBUILD
+++ b/kde-unstable/kdebase-runtime/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 129338 2011-06-26 20:22:13Z andrea $
+# $Id: PKGBUILD 131357 2011-07-12 20:18:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-runtime
-_pkgname=kde-runtime
-pkgver=4.6.90
-pkgrel=2
+pkgver=4.6.95
+pkgrel=1
 pkgdesc="KDE Base Runtime Environment"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -17,14 +16,19 @@ optdepends=('htdig: to build the search index in khelpcenter'
             'rarian: needed by khelpcenter'
             'gdb: drkonq crash handler')
 install="${pkgname}.install"
-source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('9bc01f0e829b355f110246f28daed6496d96f335')
+source=("http://download.kde.org/unstable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2"
+        'fix-nepomuk-cpu-usage.patch')
+sha1sums=('8782bca0ca5afae9c600cc29346968669b940251'
+          'dcddfd7b3191597edaaab93d358e6ff87c53a627')
 
 build() {
+    cd "${srcdir}"/kde-runtime-${pkgver}
+    patch -p1 -i "${srcdir}"/fix-nepomuk-cpu-usage.patch
+
     cd "${srcdir}"
 	mkdir build
 	cd build
-	cmake ../${_pkgname}-${pkgver} \
+	cmake ../kde-runtime-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr
diff --git a/kde-unstable/kdebase-runtime/fix-nepomuk-cpu-usage.patch b/kde-unstable/kdebase-runtime/fix-nepomuk-cpu-usage.patch
new file mode 100644
index 000000000..545072807
--- /dev/null
+++ b/kde-unstable/kdebase-runtime/fix-nepomuk-cpu-usage.patch
@@ -0,0 +1,133 @@
+commit 327ec9a67af653467b670115ebb3e26b00183c1d
+Author: Sebastian Trueg <trueg@kde.org>
+Date:   Thu Jul 7 17:33:23 2011 +0200
+
+    Throttle the IndexCleaner the same way we do with the IndexScheduler.
+    
+    BUG: 276593
+
+diff --git a/nepomuk/services/strigi/indexcleaner.cpp b/nepomuk/services/strigi/indexcleaner.cpp
+index 5c604ab..9198d0b 100644
+--- a/nepomuk/services/strigi/indexcleaner.cpp
++++ b/nepomuk/services/strigi/indexcleaner.cpp
+@@ -47,7 +47,8 @@ using namespace Soprano::Vocabulary;
+ 
+ 
+ Nepomuk::IndexCleaner::IndexCleaner(QObject* parent)
+-    : KJob(parent)
++    : KJob(parent),
++      m_delay(0)
+ {
+     setCapabilities( Suspendable );
+ }
+@@ -268,7 +269,7 @@ void Nepomuk::IndexCleaner::slotRemoveResourcesDone(KJob* job)
+ 
+     QMutexLocker lock(&m_stateMutex);
+     if( !m_suspended ) {
+-        clearNextBatch();
++        QTimer::singleShot(m_delay, this, SLOT(clearNextBatch()));
+     }
+ }
+ 
+@@ -313,4 +314,9 @@ bool Nepomuk::IndexCleaner::doResume()
+     return true;
+ }
+ 
++void Nepomuk::IndexCleaner::setDelay(int msecs)
++{
++    m_delay = msecs;
++}
++
+ #include "indexcleaner.moc"
+diff --git a/nepomuk/services/strigi/indexcleaner.h b/nepomuk/services/strigi/indexcleaner.h
+index e1c38ca..bf0713e 100644
+--- a/nepomuk/services/strigi/indexcleaner.h
++++ b/nepomuk/services/strigi/indexcleaner.h
+@@ -41,6 +41,16 @@ namespace Nepomuk {
+         virtual bool doSuspend();
+         virtual bool doResume();
+ 
++    public slots:
++        /**
++         * Set the delay between the cleanup queries.
++         * Used for throtteling the cleaner to not grab too
++         * many resources. Default is 0.
++         *
++         * \sa IndexScheduler::setIndexingSpeed()
++         */
++        void setDelay(int msecs);
++
+     private slots:
+         void clearNextBatch();
+         void slotRemoveResourcesDone(KJob* job);
+@@ -52,6 +62,7 @@ namespace Nepomuk {
+ 
+         QMutex m_stateMutex;
+         bool m_suspended;
++        int m_delay;
+     };
+ }
+ 
+diff --git a/nepomuk/services/strigi/indexscheduler.cpp b/nepomuk/services/strigi/indexscheduler.cpp
+index 3c92657..f3c6c36 100644
+--- a/nepomuk/services/strigi/indexscheduler.cpp
++++ b/nepomuk/services/strigi/indexscheduler.cpp
+@@ -208,7 +208,7 @@ Nepomuk::IndexScheduler::IndexScheduler( QObject* parent )
+     : QObject( parent ),
+       m_suspended( false ),
+       m_indexing( false ),
+-      m_speed( FullSpeed )
++      m_indexingDelay( 0 )
+ {
+     m_cleaner = new IndexCleaner(this);
+     connect( m_cleaner, SIGNAL(finished(KJob*)), this, SLOT(slotCleaningDone()) );
+@@ -266,7 +266,13 @@ void Nepomuk::IndexScheduler::setSuspended( bool suspended )
+ void Nepomuk::IndexScheduler::setIndexingSpeed( IndexingSpeed speed )
+ {
+     kDebug() << speed;
+-    m_speed = speed;
++    m_indexingDelay = 0;
++    if ( speed != FullSpeed ) {
++        m_indexingDelay = (speed == ReducedSpeed) ? s_reducedSpeedDelay : s_snailPaceDelay;
++    }
++    if( m_cleaner ) {
++        m_cleaner->setDelay(m_indexingDelay);
++    }
+ }
+ 
+ 
+@@ -481,11 +487,7 @@ bool Nepomuk::IndexScheduler::analyzeDir( const QString& dir_, Nepomuk::IndexSch
+ void Nepomuk::IndexScheduler::callDoIndexing()
+ {
+     if( !m_suspended ) {
+-        uint delay = 0;
+-        if ( m_speed != FullSpeed ) {
+-            delay = (m_speed == ReducedSpeed) ? s_reducedSpeedDelay : s_snailPaceDelay;
+-        }
+-        QTimer::singleShot( delay, this, SLOT(doIndexing()) );
++        QTimer::singleShot( m_indexingDelay, this, SLOT(doIndexing()) );
+     }
+ }
+ 
+diff --git a/nepomuk/services/strigi/indexscheduler.h b/nepomuk/services/strigi/indexscheduler.h
+index 9ae1f18..8756206 100644
+--- a/nepomuk/services/strigi/indexscheduler.h
++++ b/nepomuk/services/strigi/indexscheduler.h
+@@ -121,8 +121,6 @@ namespace Nepomuk {
+             SnailPace
+         };
+ 
+-        IndexingSpeed currentSpeed() const { return m_speed; }
+-
+     public Q_SLOTS:
+         void suspend();
+         void resume();
+@@ -226,7 +224,7 @@ namespace Nepomuk {
+         QString m_currentFolder;
+         KUrl m_currentUrl;
+ 
+-        IndexingSpeed m_speed;
++        int m_indexingDelay;
+         IndexCleaner* m_cleaner;
+     };
+ 
diff --git a/kde-unstable/kdebase-workspace/PKGBUILD b/kde-unstable/kdebase-workspace/PKGBUILD
index 941670d9a..831a6cea7 100644
--- a/kde-unstable/kdebase-workspace/PKGBUILD
+++ b/kde-unstable/kdebase-workspace/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 128537 2011-06-24 12:42:31Z andrea $
+# $Id: PKGBUILD 131290 2011-07-12 17:46:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
@@ -29,7 +29,7 @@ options=('emptydirs')
 source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
         'fixpath.patch' 'terminate-server.patch')
-sha1sums=('762a95772b8ba65d5581173739c77fb29505101c'
+sha1sums=('a4ff13d40e16157b98000f8ba1e2ca7b6e18d997'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           'f7b38af38549242a240f1a90ab9964ca8a366129'
diff --git a/kde-unstable/kdebase/PKGBUILD b/kde-unstable/kdebase/PKGBUILD
index 56fc4e475..7357b053f 100644
--- a/kde-unstable/kdebase/PKGBUILD
+++ b/kde-unstable/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128538 2011-06-24 12:42:34Z andrea $
+# $Id: PKGBUILD 131291 2011-07-12 17:46:36Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -12,7 +12,7 @@ pkgname=('kdebase-dolphin'
          'kdebase-konqueror'
          'kdebase-lib'
          'kdebase-plasma')
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml')
 source=("http://download.kde.org/unstable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2")
-sha1sums=('83d1f13ea32381bf70ad4aed5477fe585f806abc')
+sha1sums=('db49bb458cbe329541ccd34aeacf7604e5719e23')
 
 build() {
 	cd ${srcdir}
diff --git a/kde-unstable/kdebindings-kimono/PKGBUILD b/kde-unstable/kdebindings-kimono/PKGBUILD
index 9e609c797..368e0387e 100644
--- a/kde-unstable/kdebindings-kimono/PKGBUILD
+++ b/kde-unstable/kdebindings-kimono/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
+# $Id: PKGBUILD 131303 2011-07-12 17:47:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-kimono
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the KDE libraries"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ depends=('kdebindings-qyoto' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
 conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/unstable/${pkgver}/src/kimono-${pkgver}.tar.bz2")
-sha1sums=('4e18150625d26c1fb6ddc8fa68cc0f97588275c7')
+sha1sums=('814a061da0abc9c4f13c20fc17f1cfe476120363')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-korundum/PKGBUILD b/kde-unstable/kdebindings-korundum/PKGBUILD
index bdd9614ed..3d601df9a 100644
--- a/kde-unstable/kdebindings-korundum/PKGBUILD
+++ b/kde-unstable/kdebindings-korundum/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
+# $Id: PKGBUILD 131304 2011-07-12 17:47:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-korundum
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="KDE bindings for ruby"
 url="http://kde.org/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
              'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
 conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/unstable/${pkgver}/src/korundum-${pkgver}.tar.bz2")
-sha1sums=('458c40543fdd5c340b8738632ae3c867941a4a8c')
+sha1sums=('998b705046e9126ff90081fe2d0fe7a24f393bb5')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-kross/PKGBUILD b/kde-unstable/kdebindings-kross/PKGBUILD
index 8e23d9d30..d399f571c 100644
--- a/kde-unstable/kdebindings-kross/PKGBUILD
+++ b/kde-unstable/kdebindings-kross/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
+# $Id: PKGBUILD 131305 2011-07-12 17:47:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-kross
 pkgname=('kdebindings-kross-python'
 #         'kdebindings-kross-ruby'
          'kdebindings-kross-java')
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 url="http://kde.org/"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'openjdk6')
 source=("http://download.kde.org/unstable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2")
-sha1sums=('db15d0957951a56bdb8c3727dc68cbc207b0e4b4')
+sha1sums=('91e71fc5a37931005f39f65b839740259451bcd7')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-perlkde/PKGBUILD b/kde-unstable/kdebindings-perlkde/PKGBUILD
index e553f1944..15c4d7829 100644
--- a/kde-unstable/kdebindings-perlkde/PKGBUILD
+++ b/kde-unstable/kdebindings-perlkde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
+# $Id: PKGBUILD 131306 2011-07-12 17:47:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlkde
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Perl bindings for the KDE libraries"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
             'kdegraphics-okular' 'kdesdk-kate')
 source=("http://download.kde.org/unstable/${pkgver}/src/perlkde-${pkgver}.tar.bz2")
-sha1sums=('71514987b314cbf1101daccac1b26fe7f76d2184')
+sha1sums=('068817388f1963ef975261054a485f8dc8e3fd09')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-perlqt/PKGBUILD b/kde-unstable/kdebindings-perlqt/PKGBUILD
index 215b442bf..638827b5e 100644
--- a/kde-unstable/kdebindings-perlqt/PKGBUILD
+++ b/kde-unstable/kdebindings-perlqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
+# $Id: PKGBUILD 131285 2011-07-12 17:46:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlqt
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Perl bindings for the Qt libraries"
 url="http://kde.org/"
@@ -12,7 +12,7 @@ groups=('kdebindings')
 depends=('kdebindings-smokeqt')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 source=("http://download.kde.org/unstable/${pkgver}/src/perlqt-${pkgver}.tar.bz2")
-sha1sums=('d55ffeacf16b940e61234294b310933eb133fe0d')
+sha1sums=('6f5f2ab42fa798210f114a2ab2b28f093d041414')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-python/PKGBUILD b/kde-unstable/kdebindings-python/PKGBUILD
index 3561e20b4..66811e195 100644
--- a/kde-unstable/kdebindings-python/PKGBUILD
+++ b/kde-unstable/kdebindings-python/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 129890 2011-06-29 13:33:30Z andrea $
+# $Id: PKGBUILD 131286 2011-07-12 17:46:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-python
-pkgver=4.6.90
-pkgrel=2
+pkgver=4.6.95
+pkgrel=1
 pkgdesc="KDE bindings for python"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ groups=('kdebindings')
 depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs')
 makedepends=('cmake' 'automoc4' 'boost')
 source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.bz2")
-sha1sums=('c90432ec2643b109427a02afbb8d3f7acc19f5e2')
+sha1sums=('adf1e6bfebfb7b35bd4e3947e618b401c8c578f6')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-qtruby/PKGBUILD b/kde-unstable/kdebindings-qtruby/PKGBUILD
index 70d8ef224..b0aa1eb1c 100644
--- a/kde-unstable/kdebindings-qtruby/PKGBUILD
+++ b/kde-unstable/kdebindings-qtruby/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
+# $Id: PKGBUILD 131288 2011-07-12 17:46:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qtruby
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Qt bindings for ruby"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/unstable/${pkgver}/src/qtruby-${pkgver}.tar.bz2")
-sha1sums=('a056ae7485ffc3a2f14ddf7cfd62e14265002234')
+sha1sums=('67b2d9c9280e0b626d63061b94eab0cac8e6838a')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-qyoto/PKGBUILD b/kde-unstable/kdebindings-qyoto/PKGBUILD
index 3bd134647..a401cf14d 100644
--- a/kde-unstable/kdebindings-qyoto/PKGBUILD
+++ b/kde-unstable/kdebindings-qyoto/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
+# $Id: PKGBUILD 131287 2011-07-12 17:46:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qyoto
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the Qt libraries"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/unstable/${pkgver}/src/qyoto-${pkgver}.tar.bz2")
-sha1sums=('05902dd17e0aafa91a71b0f8fb3fdcc0e1ab8770')
+sha1sums=('6c16162e06ef0f587ed76b88d50e97c0a825321f')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-smokegen/PKGBUILD b/kde-unstable/kdebindings-smokegen/PKGBUILD
index 76db20481..ae1326c72 100644
--- a/kde-unstable/kdebindings-smokegen/PKGBUILD
+++ b/kde-unstable/kdebindings-smokegen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128527 2011-06-24 12:41:51Z andrea $
+# $Id: PKGBUILD 131280 2011-07-12 17:45:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokegen
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="A general purpose C++ parser with a plugin infrastructure"
 url="http://kde.org/"
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/unstable/${pkgver}/src/smokegen-${pkgver}.tar.bz2")
-sha1sums=('e3f24c57d79216df8c52eaafb2e4ee7af11e1d5c')
+sha1sums=('c65b10fdcf1e764a53efff55446f764830ab5606')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-smokekde/PKGBUILD b/kde-unstable/kdebindings-smokekde/PKGBUILD
index e28d5abcc..b2acd6919 100644
--- a/kde-unstable/kdebindings-smokekde/PKGBUILD
+++ b/kde-unstable/kdebindings-smokekde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
+# $Id: PKGBUILD 131284 2011-07-12 17:46:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokekde
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Language independent library for KDE bindings"
 url="http://kde.org/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
              'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/unstable/${pkgver}/src/smokekde-${pkgver}.tar.bz2")
-sha1sums=('dc140ff5d6fc87ac2116739df62b49f059510de8')
+sha1sums=('e5f8c58f2d1ab6a688ea8b94e220eea10fa6ccd7')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-smokeqt/PKGBUILD b/kde-unstable/kdebindings-smokeqt/PKGBUILD
index 84533ada3..cd5ad356c 100644
--- a/kde-unstable/kdebindings-smokeqt/PKGBUILD
+++ b/kde-unstable/kdebindings-smokeqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
+# $Id: PKGBUILD 131281 2011-07-12 17:45:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokeqt
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Language independent library for Qt bindings"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'qwt')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2")
-sha1sums=('0fc6b293f96806b695c8dd19275d79db16df24b1')
+sha1sums=('304fcb7a38b3656db1d6614b8ff77e6e27274de6')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-blinken/PKGBUILD b/kde-unstable/kdeedu-blinken/PKGBUILD
index a8c1c4013..2ba605426 100644
--- a/kde-unstable/kdeedu-blinken/PKGBUILD
+++ b/kde-unstable/kdeedu-blinken/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128553 2011-06-24 12:53:30Z andrea $
+# $Id: PKGBUILD 131307 2011-07-12 17:47:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-blinken
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Memory Enhancement Game"
 url="http://kde.org/applications/education/blinken/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/blinken-${pkgver}.tar.bz2")
-sha1sums=('3fbf5f9668588197601b6cf8678d04e2f73dd929')
+sha1sums=('a0c0232f1a441b2e305c8d0208d387042dbed3da')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-cantor/PKGBUILD b/kde-unstable/kdeedu-cantor/PKGBUILD
index 27f802bce..f7e6a6b0b 100644
--- a/kde-unstable/kdeedu-cantor/PKGBUILD
+++ b/kde-unstable/kdeedu-cantor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128554 2011-06-24 12:53:33Z andrea $
+# $Id: PKGBUILD 131308 2011-07-12 17:47:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-cantor
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="KDE Frontend to Mathematical Software"
 url="http://kde.org/applications/education/cantor/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'r' 'libspectre')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/cantor-${pkgver}.tar.bz2")
-sha1sums=('aafbed9dd3781eb56042cace8dd2a7ccda8d594e')
+sha1sums=('7d2acb663acc03a096d3d4df84607c2cc9300e80')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kalgebra/PKGBUILD b/kde-unstable/kdeedu-kalgebra/PKGBUILD
index 919813935..d013d107f 100644
--- a/kde-unstable/kdeedu-kalgebra/PKGBUILD
+++ b/kde-unstable/kdeedu-kalgebra/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128555 2011-06-24 12:53:47Z andrea $
+# $Id: PKGBUILD 131309 2011-07-12 17:48:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalgebra
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Graph Calculator"
 url="http://kde.org/applications/education/kalgebra/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2")
-sha1sums=('5ee5d9e2a45cdb8a9660b9d786db68138ceb8661')
+sha1sums=('91814b9f56b1aeeb39ea686c8f5810d902eac760')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kalzium/PKGBUILD b/kde-unstable/kdeedu-kalzium/PKGBUILD
index 156623957..7d61579ea 100644
--- a/kde-unstable/kdeedu-kalzium/PKGBUILD
+++ b/kde-unstable/kdeedu-kalzium/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128556 2011-06-24 12:53:50Z andrea $
+# $Id: PKGBUILD 131310 2011-07-12 17:48:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalzium
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Periodic Table of Elements"
 url="http://kde.org/applications/education/kalzium/"
@@ -13,7 +13,7 @@ depends=('kdelibs' 'avogadro' 'ocaml')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kalzium-${pkgver}.tar.bz2")
-sha1sums=('4c5cf75e8596d0aec2fdc19d6d28b2c1e468afaa')
+sha1sums=('80a32af31e1760970af89695a72a1ffe4a01ffef')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kanagram/PKGBUILD b/kde-unstable/kdeedu-kanagram/PKGBUILD
index ebcad6581..e5f6e9eb8 100644
--- a/kde-unstable/kdeedu-kanagram/PKGBUILD
+++ b/kde-unstable/kdeedu-kanagram/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128557 2011-06-24 12:53:54Z andrea $
+# $Id: PKGBUILD 131311 2011-07-12 17:48:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kanagram
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Letter Order Game"
 url="http://kde.org/applications/education/kanagram/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kanagram-${pkgver}.tar.bz2")
-sha1sums=('f34f5656d977b11dc42631059215f46ce2f35acf')
+sha1sums=('525a456edad8c06de6010271927e228c4702402c')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kbruch/PKGBUILD b/kde-unstable/kdeedu-kbruch/PKGBUILD
index b2dd48dac..8a9acf120 100644
--- a/kde-unstable/kdeedu-kbruch/PKGBUILD
+++ b/kde-unstable/kdeedu-kbruch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128558 2011-06-24 12:53:57Z andrea $
+# $Id: PKGBUILD 131312 2011-07-12 17:48:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kbruch
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Exercise Fractions"
 url="http://kde.org/applications/education/kbruch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kbruch-${pkgver}.tar.bz2")
-sha1sums=('6c2e1be87b8f79341bc5cfef5b75203b5692e2e9')
+sha1sums=('4049477de5a9bc14902091721b4c0029c8b8c696')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kgeography/PKGBUILD b/kde-unstable/kdeedu-kgeography/PKGBUILD
index 26f0c910d..a91b83a24 100644
--- a/kde-unstable/kdeedu-kgeography/PKGBUILD
+++ b/kde-unstable/kdeedu-kgeography/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128559 2011-06-24 12:54:00Z andrea $
+# $Id: PKGBUILD 131313 2011-07-12 17:48:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kgeography
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Geography Trainer"
 url="http://kde.org/applications/education/kgeography/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kgeography-${pkgver}.tar.bz2")
-sha1sums=('a143e4b4f59b339d4b3d8f9aa4700c4f86852980')
+sha1sums=('2c0d06d1d45062bee324f2df42580c04b2cf611b')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-khangman/PKGBUILD b/kde-unstable/kdeedu-khangman/PKGBUILD
index 48353ed42..94da72b8f 100644
--- a/kde-unstable/kdeedu-khangman/PKGBUILD
+++ b/kde-unstable/kdeedu-khangman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128560 2011-06-24 12:54:03Z andrea $
+# $Id: PKGBUILD 131314 2011-07-12 17:48:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-khangman
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Hangman Game"
 url="http://kde.org/applications/education/khangman/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/khangman-${pkgver}.tar.bz2")
-sha1sums=('25de6658d00980e8e785c9181fb55039aaeab2f8')
+sha1sums=('b54b67e7ee3f42fd6314e0477637020f1860f64a')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kig/PKGBUILD b/kde-unstable/kdeedu-kig/PKGBUILD
index 52abb4c20..8cdedbeb5 100644
--- a/kde-unstable/kdeedu-kig/PKGBUILD
+++ b/kde-unstable/kdeedu-kig/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128561 2011-06-24 12:54:06Z andrea $
+# $Id: PKGBUILD 131315 2011-07-12 17:48:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kig
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kig-${pkgver}.tar.bz2")
-sha1sums=('e48e7e21678eb2e06f8730237658d649f436fd08')
+sha1sums=('af7e09ca9ef1eaa341963852eb054644ac5aee6b')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kiten/PKGBUILD b/kde-unstable/kdeedu-kiten/PKGBUILD
index 0aebfabe8..2e046c2fc 100644
--- a/kde-unstable/kdeedu-kiten/PKGBUILD
+++ b/kde-unstable/kdeedu-kiten/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128562 2011-06-24 12:54:09Z andrea $
+# $Id: PKGBUILD 131316 2011-07-12 17:48:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kiten
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Japanese Reference/Study Tool"
 url="http://kde.org/applications/education/kiten/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kiten-${pkgver}.tar.bz2")
-sha1sums=('6faec1ab525a3b7b71a48a6c5f73950d1f139bc0')
+sha1sums=('c83f9078141fe2868be1b0040cbe204228aacb1c')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-klettres/PKGBUILD b/kde-unstable/kdeedu-klettres/PKGBUILD
index 92a41331e..7929c7e60 100644
--- a/kde-unstable/kdeedu-klettres/PKGBUILD
+++ b/kde-unstable/kdeedu-klettres/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128563 2011-06-24 12:54:12Z andrea $
+# $Id: PKGBUILD 131317 2011-07-12 17:48:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-klettres
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Learn The Alphabet"
 url="http://kde.org/applications/education/klettres/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/klettres-${pkgver}.tar.bz2")
-sha1sums=('8e55891618e02b7bd8d647e014e4d090fc46537a')
+sha1sums=('deb7895877b18a6dbfce6901508c18c2c53c24ba')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kmplot/PKGBUILD b/kde-unstable/kdeedu-kmplot/PKGBUILD
index 4680a3c5f..52b9b5693 100644
--- a/kde-unstable/kdeedu-kmplot/PKGBUILD
+++ b/kde-unstable/kdeedu-kmplot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128564 2011-06-24 12:54:15Z andrea $
+# $Id: PKGBUILD 131318 2011-07-12 17:48:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kmplot
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Mathematical Function Plotter"
 url="http://kde.org/applications/education/kmplot/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kmplot-${pkgver}.tar.bz2")
-sha1sums=('f0a947cf818c4f5a3aff2dc8a9c442d0eb324515')
+sha1sums=('7e6ec705ed886b69fb5eb93ccf9f0962c4524989')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kstars/PKGBUILD b/kde-unstable/kdeedu-kstars/PKGBUILD
index bfaf8ae14..fb28a4fe9 100644
--- a/kde-unstable/kdeedu-kstars/PKGBUILD
+++ b/kde-unstable/kdeedu-kstars/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128565 2011-06-24 12:54:31Z andrea $
+# $Id: PKGBUILD 131319 2011-07-12 17:48:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kstars
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Desktop Planetarium"
 url="http://kde.org/applications/education/kstars/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kstars-${pkgver}.tar.bz2")
-sha1sums=('4d82d0bed20c66c820b2dde664f6fb6978c618a1')
+sha1sums=('11d870bacf8ef814998f874e2fc8c3cf82059dcf')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-ktouch/PKGBUILD b/kde-unstable/kdeedu-ktouch/PKGBUILD
index e544a7f79..3eef6955b 100644
--- a/kde-unstable/kdeedu-ktouch/PKGBUILD
+++ b/kde-unstable/kdeedu-ktouch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128566 2011-06-24 12:54:35Z andrea $
+# $Id: PKGBUILD 131320 2011-07-12 17:49:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-ktouch
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Touch Typing Tutor"
 url="http://kde.org/applications/education/ktouch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/ktouch-${pkgver}.tar.bz2")
-sha1sums=('2a7a22e194b023e2cd36b2aecf7d7eedc28518be')
+sha1sums=('f8ad455ce1104e8fb542ff3191cb7c041cfa2d8e')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kturtle/PKGBUILD b/kde-unstable/kdeedu-kturtle/PKGBUILD
index 108259e32..9d1f433ba 100644
--- a/kde-unstable/kdeedu-kturtle/PKGBUILD
+++ b/kde-unstable/kdeedu-kturtle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128567 2011-06-24 12:54:38Z andrea $
+# $Id: PKGBUILD 131321 2011-07-12 17:49:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kturtle
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Educational Programming Environment"
 url="http://kde.org/applications/education/kturtle/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kturtle-${pkgver}.tar.bz2")
-sha1sums=('936799165299e62241ef4fe4914446470d089501')
+sha1sums=('4fda890d4cd89ea2d257788354c9cc4158fc993b')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kwordquiz/PKGBUILD b/kde-unstable/kdeedu-kwordquiz/PKGBUILD
index 3763ef433..5181d71fe 100644
--- a/kde-unstable/kdeedu-kwordquiz/PKGBUILD
+++ b/kde-unstable/kdeedu-kwordquiz/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128568 2011-06-24 12:54:41Z andrea $
+# $Id: PKGBUILD 131322 2011-07-12 17:49:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kwordquiz
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Flash Card Trainer"
 url="http://kde.org/applications/education/kwordquiz/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2")
-sha1sums=('cf585ca654ab26e05b8107973253119363c0a152')
+sha1sums=('584ce1db0f777b1fab3f45cecb89d59cb2f9d1ad')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-marble/PKGBUILD b/kde-unstable/kdeedu-marble/PKGBUILD
index 30651f815..85aa4c346 100644
--- a/kde-unstable/kdeedu-marble/PKGBUILD
+++ b/kde-unstable/kdeedu-marble/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128540 2011-06-24 12:42:41Z andrea $
+# $Id: PKGBUILD 131293 2011-07-12 17:46:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-marble
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Desktop Globe"
 url="http://kde.org/applications/education/marble/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/marble-${pkgver}.tar.bz2"
         'gpsd-2.96.patch')
-sha1sums=('cff7862fef00e7848c8c9bb55f1ee1ba847c1ac3'
+sha1sums=('f70645d42f246e38e912d84d4009ec0795be4c31'
           'f44dfd3bb384e631d59b93d7dda3413795da8183')
 
 build() {
diff --git a/kde-unstable/kdeedu-parley/PKGBUILD b/kde-unstable/kdeedu-parley/PKGBUILD
index eb1b6c5af..bd54478ef 100644
--- a/kde-unstable/kdeedu-parley/PKGBUILD
+++ b/kde-unstable/kdeedu-parley/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128569 2011-06-24 12:54:44Z andrea $
+# $Id: PKGBUILD 131323 2011-07-12 17:49:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-parley
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Vocabulary Trainer"
 url="http://kde.org/applications/education/parley/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/parley-${pkgver}.tar.bz2")
-sha1sums=('483078998a0677974e39580f827a4bffe5c16cd4')
+sha1sums=('438c6cbb8cd6645e2467d3ffaef8afbcca90b17a')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-rocs/PKGBUILD b/kde-unstable/kdeedu-rocs/PKGBUILD
index 8f40e9971..151030138 100644
--- a/kde-unstable/kdeedu-rocs/PKGBUILD
+++ b/kde-unstable/kdeedu-rocs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128570 2011-06-24 12:54:47Z andrea $
+# $Id: PKGBUILD 131324 2011-07-12 17:49:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-rocs
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Rocs Graph Theory"
 url="http://kde.org/applications/education/rocs/"
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'boost-libs')
 makedepends=('cmake' 'automoc4' 'boost')
 source=("http://download.kde.org/unstable/${pkgver}/src/rocs-${pkgver}.tar.bz2")
-sha1sums=('6de23231f0d43ecac33a456b8b46a6ff6158a1fb')
+sha1sums=('4f59682cf124ad7ac2b7832e7b470b00f7c4de10')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-step/PKGBUILD b/kde-unstable/kdeedu-step/PKGBUILD
index 10710b68a..5ea0fa608 100644
--- a/kde-unstable/kdeedu-step/PKGBUILD
+++ b/kde-unstable/kdeedu-step/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128571 2011-06-24 12:54:50Z andrea $
+# $Id: PKGBUILD 131325 2011-07-12 17:49:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-step
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Interactive Physical Simulator"
 url="http://kde.org/applications/education/step/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/step-${pkgver}.tar.bz2")
-sha1sums=('2f005305cd53d396b88cf35bca8bd3d7e7cadb7c')
+sha1sums=('379212172a3605695a3652c4c9e5f32fac261780')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegames/PKGBUILD b/kde-unstable/kdegames/PKGBUILD
index 1ae9c4c2f..cf5485e3e 100644
--- a/kde-unstable/kdegames/PKGBUILD
+++ b/kde-unstable/kdegames/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128572 2011-06-24 12:54:54Z andrea $
+# $Id: PKGBUILD 131326 2011-07-12 17:49:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -43,7 +43,7 @@ pkgname=('kdegames-bomber'
          'kdegames-libkmahjongg'
          'kdegames-lskat'
          'kdegames-palapeli')
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -52,7 +52,7 @@ groups=('kde' 'kdegames')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted'
              'kdebindings-python' 'openal')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('b20c005287ec09b70096146507f49b0a34c48a90')
+sha1sums=('a3d2e30a94e6200ce7ae7454310eee90105d8f66')
 
 build() {
 	cd $srcdir
diff --git a/kde-unstable/kdegraphics-gwenview/PKGBUILD b/kde-unstable/kdegraphics-gwenview/PKGBUILD
index 6a944a619..6d8a34880 100644
--- a/kde-unstable/kdegraphics-gwenview/PKGBUILD
+++ b/kde-unstable/kdegraphics-gwenview/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128573 2011-06-24 12:54:57Z andrea $
+# $Id: PKGBUILD 131327 2011-07-12 17:49:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-gwenview
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="A fast and easy to use image viewer for KDE"
 url="http://kde.org/applications/graphics/gwenview/"
@@ -11,9 +11,10 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegraphics')
 depends=('kdebase-lib' 'libkipi')
 makedepends=('cmake' 'automoc4')
-optdepends=('kipi-plugins')
+optdepends=('kipi-plugins: extra plugins to share photos')
+install=$pkgname.install
 source=("http://download.kde.org/unstable/${pkgver}/src/gwenview-${pkgver}.tar.bz2")
-sha1sums=('c6d38823ed1a041dd43b3e20674106bf62404a11')
+sha1sums=('defd3b737d12d8359ed6479c0bd81a4074fa7504')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-kamera/PKGBUILD b/kde-unstable/kdegraphics-kamera/PKGBUILD
index 901c18fe8..353611a03 100644
--- a/kde-unstable/kdegraphics-kamera/PKGBUILD
+++ b/kde-unstable/kdegraphics-kamera/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128575 2011-06-24 12:55:05Z andrea $
+# $Id: PKGBUILD 131328 2011-07-12 17:49:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kamera
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Configure Kamera"
 url="http://kde.org/applications/graphics/kamera/"
@@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'gphoto2')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/unstable/${pkgver}/src/kamera-${pkgver}.tar.bz2")
-sha1sums=('34bbd9a2cbda925a55369e3bf2b839ffc49b36b6')
+sha1sums=('ffc6c953470a3406f85ed4fdd2cfd8b6fdd60a21')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD b/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
index 8e4999149..79015b13c 100644
--- a/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
+++ b/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128576 2011-06-24 12:55:19Z andrea $
+# $Id: PKGBUILD 131329 2011-07-12 17:49:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kcolorchooser
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Color Chooser"
 url="http://kde.org/applications/graphics/kcolorchooser/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2")
-sha1sums=('598742387491f91038fa4a0914fc79df4fdbea51')
+sha1sums=('da9eac36af9b2a263df1e44d978a89a537f2c377')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-kgamma/PKGBUILD b/kde-unstable/kdegraphics-kgamma/PKGBUILD
index 00c09d255..a2e746195 100644
--- a/kde-unstable/kdegraphics-kgamma/PKGBUILD
+++ b/kde-unstable/kdegraphics-kgamma/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128577 2011-06-24 12:55:22Z andrea $
+# $Id: PKGBUILD 131330 2011-07-12 17:49:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kgamma
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="A monitor calibration tool"
 url="http://kde.org/applications/graphics/kgamma/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'libxxf86vm')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/unstable/${pkgver}/src/kgamma-${pkgver}.tar.bz2")
-sha1sums=('4a57feb62a75cae0a0efeef86873ec6a745d6bb6')
+sha1sums=('b01c9aa5c2802e602bd9954fb47c2f17a012fa50')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-kolourpaint/PKGBUILD b/kde-unstable/kdegraphics-kolourpaint/PKGBUILD
index d0c8f0a31..f388a4377 100644
--- a/kde-unstable/kdegraphics-kolourpaint/PKGBUILD
+++ b/kde-unstable/kdegraphics-kolourpaint/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128578 2011-06-24 12:55:25Z andrea $
+# $Id: PKGBUILD 131331 2011-07-12 17:50:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kolourpaint
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Paint Program"
 url="http://kde.org/applications/graphics/kolourpaint/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2")
-sha1sums=('437f3a4396c7fb959c8fd32fb6fd28fca734f680')
+sha1sums=('de8cd43375f3aee836219a19a4a84b8741ffb588')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-kruler/PKGBUILD b/kde-unstable/kdegraphics-kruler/PKGBUILD
index bc43e9edf..f1d68c8db 100644
--- a/kde-unstable/kdegraphics-kruler/PKGBUILD
+++ b/kde-unstable/kdegraphics-kruler/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128579 2011-06-24 12:55:28Z andrea $
+# $Id: PKGBUILD 131332 2011-07-12 17:50:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kruler
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Screen Ruler"
 url="http://kde.org/applications/graphics/kruler/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kruler-${pkgver}.tar.bz2")
-sha1sums=('448f6f98646b69be47f64a554bb006d7cc643a93')
+sha1sums=('6fc8c56ea5bd677cd1b65dd6d35b348cbfc6733f')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD b/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
index 76a4731bc..b94b2123b 100644
--- a/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
+++ b/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128580 2011-06-24 12:55:31Z andrea $
+# $Id: PKGBUILD 131333 2011-07-12 17:50:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksaneplugin
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="A scan plugin that implements the scanning"
 url="http://kde.org/"
@@ -12,7 +12,7 @@ depends=('libksane')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/unstable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2")
-sha1sums=('e0e77853ebbfe9895301a7e335c65c2db4d7c01d')
+sha1sums=('fd466fa77783f843b1c6dd9fc591a7d5375186d4')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-ksnapshot/PKGBUILD b/kde-unstable/kdegraphics-ksnapshot/PKGBUILD
index 72db35c06..d8f1b2989 100644
--- a/kde-unstable/kdegraphics-ksnapshot/PKGBUILD
+++ b/kde-unstable/kdegraphics-ksnapshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128581 2011-06-24 12:55:34Z andrea $
+# $Id: PKGBUILD 131334 2011-07-12 17:50:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksnapshot
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Screen Capture Program"
 url="http://kde.org/applications/graphics/ksnapshot/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kipi-plugins')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2")
-sha1sums=('f2b92a791e986c1b4e92611646fc327aa096e25d')
+sha1sums=('60f7cd950b84ffa3eebe486a1b5b8b1e44e82bce')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-okular/PKGBUILD b/kde-unstable/kdegraphics-okular/PKGBUILD
index 6763efad0..a941629df 100644
--- a/kde-unstable/kdegraphics-okular/PKGBUILD
+++ b/kde-unstable/kdegraphics-okular/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128529 2011-06-24 12:42:01Z andrea $
+# $Id: PKGBUILD 131282 2011-07-12 17:46:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-okular
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc='Document Viewer'
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
 makedepends=('pkgconfig' 'cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/okular-${pkgver}.tar.bz2")
-sha1sums=('9de2423f525a82c28158ffd3add82196afce710f')
+sha1sums=('e192a3634da00012a977d74cfe3bb6601d48bde4')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD b/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
index 032281af9..778eba971 100644
--- a/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
+++ b/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128582 2011-06-24 12:55:37Z andrea $
+# $Id: PKGBUILD 131335 2011-07-12 17:50:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-strigi-analyzer
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Strigi analyzers for various graphics file formats"
 url="http://kde.org/"
@@ -12,7 +12,7 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('6f5da6ecb917304ed8356bf286753c378d393239')
+sha1sums=('d2ab09db3fad3a7f1c1435455fddbbc43ace8a3e')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-svgpart/PKGBUILD b/kde-unstable/kdegraphics-svgpart/PKGBUILD
index 3403293de..991673801 100644
--- a/kde-unstable/kdegraphics-svgpart/PKGBUILD
+++ b/kde-unstable/kdegraphics-svgpart/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128583 2011-06-24 12:55:40Z andrea $
+# $Id: PKGBUILD 131336 2011-07-12 17:50:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-svgpart
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="A KPart for viewving SVGs"
 url="http://kde.org/"
@@ -12,7 +12,7 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/unstable/${pkgver}/src/svgpart-${pkgver}.tar.bz2")
-sha1sums=('85e86bd65d67dce99415f03e189236f7e20ad052')
+sha1sums=('e375f3a83b343b3b3a94c90c227e424f97c9b58b')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-thumbnailers/PKGBUILD b/kde-unstable/kdegraphics-thumbnailers/PKGBUILD
index edc803749..70e0ba8c3 100644
--- a/kde-unstable/kdegraphics-thumbnailers/PKGBUILD
+++ b/kde-unstable/kdegraphics-thumbnailers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128584 2011-06-24 12:55:43Z andrea $
+# $Id: PKGBUILD 131337 2011-07-12 17:50:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-thumbnailers
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Thumbnailers for various graphics file formats"
 url="http://kde.org/"
@@ -12,7 +12,7 @@ depends=('libkexiv2' 'libkdcraw')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('31fc2f01f0a4946ca2b542ea112d6e683dc0e183')
+sha1sums=('2b626fc0bbc266c64b98fc801bd29447077d4e29')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdelibs/PKGBUILD b/kde-unstable/kdelibs/PKGBUILD
index 452c32835..2e504cd1e 100644
--- a/kde-unstable/kdelibs/PKGBUILD
+++ b/kde-unstable/kdelibs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 128522 2011-06-24 12:41:31Z andrea $
+# $Id: PKGBUILD 131358 2011-07-12 20:19:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ replaces=('kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kde-applications-menu.patch' 'archlinux-menu.patch')
-sha1sums=('e04a0ecdb83a2cb086e13c9a2541b264dce00993'
+sha1sums=('9c46d7653a19f5897d4408180de239d7004c470e'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
 
diff --git a/kde-unstable/kdemultimedia/PKGBUILD b/kde-unstable/kdemultimedia/PKGBUILD
index a2dec2b03..901c4fe13 100644
--- a/kde-unstable/kdemultimedia/PKGBUILD
+++ b/kde-unstable/kdemultimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128585 2011-06-24 12:55:46Z andrea $
+# $Id: PKGBUILD 131351 2011-07-12 19:24:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -10,7 +10,7 @@ pkgname=('kdemultimedia-dragonplayer'
          'kdemultimedia-kmix'
          'kdemultimedia-kscd'
          'kdemultimedia-mplayerthumbs')
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -19,11 +19,16 @@ groups=('kde' 'kdemultimedia')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp'
             'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'mplayerthumbs.config')
-sha1sums=('ebc01da3a67e04fa1c281ff3aab04079caa61325'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683')
+        'mplayerthumbs.config'
+        'fix-memleak-in-kmix.patch')
+sha1sums=('81c9755c5f1bf41b4af0452ba9522f23096f47a9'
+          'ba016fa2563c14ffcba852c62506b66bfc6ee683'
+          '80370de30898f1ba1a6db057d34324abdcc57384')
 
 build() {
+    cd "${srcdir}"/${pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/fix-memleak-in-kmix.patch
+
     cd ${srcdir}
 	mkdir build
 	cd build
diff --git a/kde-unstable/kdemultimedia/fix-memleak-in-kmix.patch b/kde-unstable/kdemultimedia/fix-memleak-in-kmix.patch
new file mode 100644
index 000000000..31ea4a606
--- /dev/null
+++ b/kde-unstable/kdemultimedia/fix-memleak-in-kmix.patch
@@ -0,0 +1,55 @@
+Index: kdemultimedia/kmix/backends/mixer_pulse.cpp
+===================================================================
+--- kdemultimedia/kmix/backends/mixer_pulse.cpp	(revision 1241345)
++++ kdemultimedia/kmix/backends/mixer_pulse.cpp	(revision 1241346)
+@@ -754,7 +754,12 @@
+         return;
+     }
+     addDevice((*map)[index]);
+-    emit controlsReconfigured(_mixer->id());
++    // Do not emit directly to ensure all connected slots are executed
++    // in their own event loop.
++    QMetaObject::invokeMethod(this,
++                              "controlsReconfigured",
++                              Qt::QueuedConnection,
++                              Q_ARG(QString, _mixer->id()));
+ }
+ 
+ void Mixer_PULSE::removeWidget(int index)
+@@ -778,7 +783,12 @@
+         {
+             delete *iter;
+             m_mixDevices.erase(iter);
+-            emit controlsReconfigured(_mixer->id());
++            // Do not emit directly to ensure all connected slots are executed
++            // in their own event loop.
++            QMetaObject::invokeMethod(this,
++                                      "controlsReconfigured",
++                                      Qt::QueuedConnection,
++                                      Q_ARG(QString, _mixer->id()));
+             return;
+         }
+     }
+@@ -799,7 +809,12 @@
+         delete *iter;
+         m_mixDevices.erase(iter);
+     }
+-    emit controlsReconfigured(_mixer->id());
++    // Do not emit directly to ensure all connected slots are executed
++    // in their own event loop.
++    QMetaObject::invokeMethod(this,
++                              "controlsReconfigured",
++                              Qt::QueuedConnection,
++                              Q_ARG(QString, _mixer->id()));
+ }
+ 
+ void Mixer_PULSE::addDevice(devinfo& dev)
+@@ -990,7 +1005,7 @@
+         kDebug(67100) <<  "Using PulseAudio for mixer: " << m_mixerName;
+         m_isOpen = true;
+     }
+- 
++
+     return 0;
+ }
+ 
diff --git a/kde-unstable/kdenetwork/PKGBUILD b/kde-unstable/kdenetwork/PKGBUILD
index 51dc86269..d6ad724a7 100644
--- a/kde-unstable/kdenetwork/PKGBUILD
+++ b/kde-unstable/kdenetwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 129373 2011-06-27 05:53:20Z andrea $
+# $Id: PKGBUILD 131339 2011-07-12 17:50:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -10,8 +10,8 @@ pkgname=('kdenetwork-filesharing'
          'kdenetwork-kppp'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
-pkgver=4.6.90
-pkgrel=2
+pkgver=4.6.95
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -21,7 +21,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
     'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
     'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('0aa2f1ae9d13f9bd9dd4f57b6707f2edbfce1f40')
+sha1sums=('1425187e64f539af28e458279815ac43d1dad5c8')
 
 build() {
     cd "${srcdir}"
diff --git a/kde-unstable/kdepim-runtime/PKGBUILD b/kde-unstable/kdepim-runtime/PKGBUILD
index eb69d50dd..1b9f41a0f 100644
--- a/kde-unstable/kdepim-runtime/PKGBUILD
+++ b/kde-unstable/kdepim-runtime/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepim-runtime
-pkgver=4.6.90
-pkgrel=2
+pkgver=4.6.95
+pkgrel=1
 pkgdesc='KDE PIM Runtime Environment'
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -13,7 +13,7 @@ depends=('kdepimlibs' 'kdebase-runtime')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('ac13fffd49e9b29de7da65d6713aa8b9fa9106b4')
+sha1sums=('5fbcc464ba82a48faf63e6b4dfb1552c30969fbc')
 
 build() {
     cd "${srcdir}"
diff --git a/kde-unstable/kdepim/PKGBUILD b/kde-unstable/kdepim/PKGBUILD
index cd3e3939a..6faff06be 100644
--- a/kde-unstable/kdepim/PKGBUILD
+++ b/kde-unstable/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128587 2011-06-24 12:56:13Z andrea $
+# $Id: PKGBUILD 131340 2011-07-12 17:50:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-ktimetracker'
          'kdepim-libkdepim'
          'kdepim-wizards')
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://pim.kde.org'
@@ -29,7 +29,7 @@ groups=('kde' 'kdepim')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
              'pilot-link' 'kde-agent')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('40d8b4718281554096dc1cee3928e5ed38f1c52d')
+sha1sums=('5052e2171bd6aec792b5f2deedda143e8379eb5c')
 
 build() {
     cd "${srcdir}"
diff --git a/kde-unstable/kdepimlibs/PKGBUILD b/kde-unstable/kdepimlibs/PKGBUILD
index bab597e53..b8499a78e 100644
--- a/kde-unstable/kdepimlibs/PKGBUILD
+++ b/kde-unstable/kdepimlibs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 128644 2011-06-25 10:17:07Z andrea $
+# $Id: PKGBUILD 131276 2011-07-12 17:45:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepimlibs
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="KDE PIM Libraries"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' )
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
 install='kdepimlibs.install'
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('8dfdc170ed506d3c7d3dc0d46195cee8804bc431')
+sha1sums=('531dfe646723ae821836b739ed8be930c2f64337')
 
 build() {
 	cd ${srcdir}
diff --git a/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD
index 86719c634..26211b0e8 100644
--- a/kde-unstable/kdeplasma-addons/PKGBUILD
+++ b/kde-unstable/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128588 2011-06-24 12:56:20Z andrea $
+# $Id: PKGBUILD 131341 2011-07-12 17:50:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -72,7 +72,7 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-pattern'
          'kdeplasma-addons-wallpapers-virus'
          'kdeplasma-addons-wallpapers-weather')
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -81,7 +81,7 @@ groups=('kde' 'kdeplasma-addons')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble'
              'eigen' 'scim' 'qwt' 'boost' 'libkexiv2')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('d0db05c9881c3151a128b0feb0f4505f271a520c')
+sha1sums=('9cb24aa6c7dc2388c78167fd936dfd0034a73638')
 
 build() {
     cd ${srcdir}
diff --git a/kde-unstable/kdesdk-kate/PKGBUILD b/kde-unstable/kdesdk-kate/PKGBUILD
index 5a4917efa..bdf99aa05 100644
--- a/kde-unstable/kdesdk-kate/PKGBUILD
+++ b/kde-unstable/kdesdk-kate/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 128530 2011-06-24 12:42:04Z andrea $
+# $Id: PKGBUILD 131283 2011-07-12 17:46:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdesdk-kate
 pkgname=('kdebase-kwrite'
          'kdesdk-kate')
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('kdelibs ''cmake' 'automoc4')
 source=("http://download.kde.org/unstable/${pkgver}/src/kate-${pkgver}.tar.bz2"
         'pkgbuild-syntax-highlight.patch')
-sha1sums=('a1afeeae3de94e964b48bc84ef5c920862571dcb'
+sha1sums=('03f83d92726fda79e6bac9aad63bb00d861611a5'
           'ab0c5d2a796b0f283154799add161c99f48ffcd5')
 
 build() {
diff --git a/kde-unstable/kdesdk/PKGBUILD b/kde-unstable/kdesdk/PKGBUILD
index 975e5f4a1..080b11d42 100644
--- a/kde-unstable/kdesdk/PKGBUILD
+++ b/kde-unstable/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128589 2011-06-24 12:56:27Z andrea $
+# $Id: PKGBUILD 131342 2011-07-12 17:50:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -24,7 +24,7 @@ pkgname=('kdesdk-cervisia'
          'kdesdk-scripts'
          'kdesdk-strigi-analyzer'
          'kdesdk-umbrello')
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -34,7 +34,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2'
              'kdepimlibs' 'kdebase-lib')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'fix-python2-path.patch')
-sha1sums=('cfdcb81459e105dc843fcfd56a1093b557754b79'
+sha1sums=('114c3ad6e5cabeca20de65280235891942a0179c'
           'd05ca0231869c484fd3861955d960a60aff7dcfb')
 
 build() {
diff --git a/kde-unstable/kdetoys/PKGBUILD b/kde-unstable/kdetoys/PKGBUILD
index 7ddc8710b..c92223df7 100644
--- a/kde-unstable/kdetoys/PKGBUILD
+++ b/kde-unstable/kdetoys/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128590 2011-06-24 12:56:36Z andrea $
+# $Id: PKGBUILD 131343 2011-07-12 17:51:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -6,7 +6,7 @@ pkgbase=kdetoys
 pkgname=('kdetoys-amor'
          'kdetoys-kteatime'
          'kdetoys-ktux')
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdetoys')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('faa490fc8d58976e37961780145f0c85971c030b')
+sha1sums=('533d8f6e67c4ee73479c81ae0dad0ddc5c4941fd')
 
 build() {
 	cd $srcdir
diff --git a/kde-unstable/kdeutils/PKGBUILD b/kde-unstable/kdeutils/PKGBUILD
index 449b47a96..fccbd510e 100644
--- a/kde-unstable/kdeutils/PKGBUILD
+++ b/kde-unstable/kdeutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128591 2011-06-24 12:56:50Z andrea $
+# $Id: PKGBUILD 130961 2011-07-09 08:56:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -16,7 +16,7 @@ pkgname=('kdeutils-ark'
          'kdeutils-printer-applet'
          'kdeutils-superkaramba'
          'kdeutils-sweeper')
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -26,7 +26,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
 	'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
 	'qjson')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('d2782e6b24ea433017c31412d1b2610d87549c7d')
+sha1sums=('d7824e7878f4e46dc203553fc7566c2f137369d0')
 
 build() {
 	cd ${srcdir}
diff --git a/kde-unstable/kdewebdev/PKGBUILD b/kde-unstable/kdewebdev/PKGBUILD
index 3473a71b4..5ce7adc93 100644
--- a/kde-unstable/kdewebdev/PKGBUILD
+++ b/kde-unstable/kdewebdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128592 2011-06-24 12:56:53Z andrea $
+# $Id: PKGBUILD 131344 2011-07-12 17:51:19Z andrea $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=kdewebdev
@@ -6,7 +6,7 @@ pkgname=('kdewebdev-kfilereplace'
          'kdewebdev-kimagemapeditor'
          'kdewebdev-klinkstatus'
          'kdewebdev-kommander')
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -15,7 +15,7 @@ groups=('kde' 'kdewebdev')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime'
 	'boost')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('959a3f020f8b79a539162df74cf9898628c900ff')
+sha1sums=('77dc8d2e455b2529410b9358704e7e124c58ace0')
 
 build() {
 	cd $srcdir
diff --git a/kde-unstable/libkdcraw/PKGBUILD b/kde-unstable/libkdcraw/PKGBUILD
index 6fdf59762..18d88af33 100644
--- a/kde-unstable/libkdcraw/PKGBUILD
+++ b/kde-unstable/libkdcraw/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128541 2011-06-24 12:43:00Z andrea $
+# $Id: PKGBUILD 131294 2011-07-12 17:46:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdcraw
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="A C++ interface used to decode RAW picture"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('4ea47528716db93c0b3a0fa5abcd9dde0148eb78')
+sha1sums=('b3a2b9df68b46db9728d0d0b009f9f5a28a02020')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/libkdeedu/PKGBUILD b/kde-unstable/libkdeedu/PKGBUILD
index 8cc822b1f..04985b1a2 100644
--- a/kde-unstable/libkdeedu/PKGBUILD
+++ b/kde-unstable/libkdeedu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128539 2011-06-24 12:42:38Z andrea $
+# $Id: PKGBUILD 131292 2011-07-12 17:46:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdeedu
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="Libraries used by KDE Education applications"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 replaces=('kdeedu-libkdeedu' 'kdeedu-data')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('1c4f1fbe5301c0b82e53cd6b009f7fc04209965c')
+sha1sums=('9f9599bcf40c8684f42e38c4dcba9adb920c1754')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/libkexiv2/PKGBUILD b/kde-unstable/libkexiv2/PKGBUILD
index 82811eff9..23d0ac4a2 100644
--- a/kde-unstable/libkexiv2/PKGBUILD
+++ b/kde-unstable/libkexiv2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128542 2011-06-24 12:50:40Z andrea $
+# $Id: PKGBUILD 131296 2011-07-12 17:46:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkexiv2
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="A library to manipulate pictures metadata"
 url="http://kde.org/"
@@ -12,7 +12,7 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('da3d8a14200171371be48e31290cb3a22015829b')
+sha1sums=('fdf43f76bcfa44596cbc179140a8667da5f92ad2')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/libkipi/PKGBUILD b/kde-unstable/libkipi/PKGBUILD
index 72f3d2297..ec28095c6 100644
--- a/kde-unstable/libkipi/PKGBUILD
+++ b/kde-unstable/libkipi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128543 2011-06-24 12:51:01Z andrea $
+# $Id: PKGBUILD 131297 2011-07-12 17:46:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkipi
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="An interface to use kipi-plugins from a KDE application"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('c85d4c4572f8d9c91fd7e40ed3f7a6e0bee72320')
+sha1sums=('d68b2a2564ad1b2384bb825ce3981bba3e89c8ae')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/libksane/PKGBUILD b/kde-unstable/libksane/PKGBUILD
index 2a857d528..debcd33c3 100644
--- a/kde-unstable/libksane/PKGBUILD
+++ b/kde-unstable/libksane/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 128544 2011-06-24 12:51:18Z andrea $
+# $Id: PKGBUILD 131298 2011-07-12 17:47:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libksane
-pkgver=4.6.90
+pkgver=4.6.95
 pkgrel=1
 pkgdesc="An image scanning library"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('26b27920f02a6e6999c7bfd08fe6632a39fe2d53')
+sha1sums=('9092666fb625872e8028b4cf9fe4e1476bf47b97')
 
 build() {
   cd "${srcdir}"
diff --git a/testing/dirmngr/PKGBUILD b/testing/dirmngr/PKGBUILD
new file mode 100644
index 000000000..49f81d6f4
--- /dev/null
+++ b/testing/dirmngr/PKGBUILD
@@ -0,0 +1,21 @@
+# $Id: PKGBUILD 131241 2011-07-12 07:38:53Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=dirmngr
+pkgver=1.1.0
+pkgrel=2
+pkgdesc="A daemon to handle CRL and certificate requests"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="ftp://ftp.gnupg.org/gcrypt/dirmngr"
+depends=('libgcrypt' 'libldap' 'libksba' 'libgpg-error' 'libassuan' 'pth')
+source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
+install=dirmngr.install
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr  --libexecdir=/usr/lib
+  make 
+  make DESTDIR=$pkgdir install
+}
+md5sums=('f2570f0248f5947daac200e85291b328')
diff --git a/testing/dirmngr/dirmngr.install b/testing/dirmngr/dirmngr.install
new file mode 100644
index 000000000..e26e0e7fd
--- /dev/null
+++ b/testing/dirmngr/dirmngr.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(dirmngr.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/gpgme/PKGBUILD b/testing/gpgme/PKGBUILD
new file mode 100644
index 000000000..3593bb5e7
--- /dev/null
+++ b/testing/gpgme/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 131247 2011-07-12 07:42:52Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Roman Kyrylych <roman@archlinux.org>
+# Contributor: Sarah Hay <sarah@archlinux.org>
+
+pkgname=gpgme
+pkgver=1.3.1
+pkgrel=1
+pkgdesc="A C wrapper library for GnuPG"
+arch=('i686' 'x86_64')
+url="http://www.gnupg.org/related_software/gpgme/"
+license=('GPL')
+depends=('libgpg-error' 'pth' 'gnupg' 'gnupg2')
+install=${pkgname}.install
+options=('!libtool' '!emptydirs')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make || return 1
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install || return 1
+  rm ${pkgdir}/usr/share/info/dir
+  gzip ${pkgdir}/usr/share/info/*
+}
+md5sums=('90afa8436ce2b2683c001c824bd22601')
diff --git a/testing/gpgme/gpgme.install b/testing/gpgme/gpgme.install
new file mode 100644
index 000000000..b54620d9a
--- /dev/null
+++ b/testing/gpgme/gpgme.install
@@ -0,0 +1,18 @@
+infodir=/usr/share/info
+filelist=(gpgme.info gpgme.info-1 gpgme.info-2)
+
+post_install() {
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/libassuan/PKGBUILD b/testing/libassuan/PKGBUILD
new file mode 100644
index 000000000..29aa66536
--- /dev/null
+++ b/testing/libassuan/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 131235 2011-07-12 07:35:37Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=libassuan
+pkgver=2.0.2
+pkgrel=1
+pkgdesc="A IPC library used by some GnuPG related software"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnupg.org/related_software/libassuan"
+depends=('libgpg-error')
+options=('!libtool')
+source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
+install=libassuan.install
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
+md5sums=('3e7d00fd2ee8a0b9c51ac7616ef3f1ec')
diff --git a/testing/libassuan/libassuan.install b/testing/libassuan/libassuan.install
new file mode 100644
index 000000000..07e2672db
--- /dev/null
+++ b/testing/libassuan/libassuan.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(assuan.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/libksba/PKGBUILD b/testing/libksba/PKGBUILD
new file mode 100644
index 000000000..b70d1b1fd
--- /dev/null
+++ b/testing/libksba/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 131238 2011-07-12 07:37:20Z tpowa $
+# Maintainer: damir <damir@archlinux.org>
+# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+
+pkgname=libksba
+pkgver=1.0.8
+pkgrel=2
+pkgdesc="Libksba is a CMS and X.509 access library"
+arch=(i686 x86_64)
+license=('GPL')
+url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba"
+depends=('bash' 'libgpg-error' 'glibc')
+source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
+options=(!libtool)
+install=libksba.install
+
+build() {
+  cd $startdir/src/$pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=$startdir/pkg install
+}
+md5sums=('8acac0b3cbd0030dfc6d0f6a58c9b5b2')
diff --git a/testing/libksba/libksba.install b/testing/libksba/libksba.install
new file mode 100644
index 000000000..3715b8960
--- /dev/null
+++ b/testing/libksba/libksba.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(ksba.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/pinentry/PKGBUILD b/testing/pinentry/PKGBUILD
new file mode 100644
index 000000000..71baf5bdc
--- /dev/null
+++ b/testing/pinentry/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 131244 2011-07-12 07:40:08Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=pinentry
+pkgver=0.8.1
+pkgrel=2
+pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnupg.org/aegypten2"
+depends=('ncurses' 'libcap>=2.16')
+makedepends=('gtk' 'qt3' 'gtk2' 'qt')
+optdepends=('gtk: for gtk backend'
+            'gtk2: for gtk2 backend'
+            'qt3: for qt3 backend'
+            'qt: for qt4 backend')  
+source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz
+        gtk2-pinentry-segfault.patch)
+install=pinentry.install
+
+build() {
+  cd $startdir/src/$pkgname-$pkgver
+  [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh
+  for file in qt4/*.moc; do
+       /usr/bin/moc ${file/.moc/.h} > ${file}
+   done
+  ./configure --prefix=/usr \
+	--enable-pinentry-curses \
+	--enable-pinentry-gtk \
+	--enable-pinentry-gtk2 \
+        --enable-pinentry-qt \
+        --enable-pinentry-qt4 \
+	--enable-fallback-curses
+  make 
+  make DESTDIR=${pkgdir} install 
+  rm ${pkgdir}/usr/share/info/dir 
+  rm ${pkgdir}/usr/bin/pinentry 
+  ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry 
+}
+md5sums=('81f99904daee5331eb6738408bb024b6'
+         'bd9888fafc56464b2c4deaad5b8edb07')
diff --git a/testing/pinentry/gtk2-pinentry-segfault.patch b/testing/pinentry/gtk2-pinentry-segfault.patch
new file mode 100644
index 000000000..c0b9fb4ca
--- /dev/null
+++ b/testing/pinentry/gtk2-pinentry-segfault.patch
@@ -0,0 +1,11 @@
+--- gtk+-2/pinentry-gtk-2.c.orig	2010-03-03 05:19:55.000000000 -0600
++++ gtk+-2/pinentry-gtk-2.c	2010-07-07 00:11:30.413572124 -0500
+@@ -145,7 +145,7 @@
+ {
+   gdk_keyboard_ungrab (gdk_event_get_time (event));
+   /* Unmake window transient for the root window.  */
+-  gdk_window_set_transient_for (win->window, NULL);
++  gdk_property_delete (win->window, gdk_atom_intern_static_string ("WM_TRANSIENT_FOR"));
+ }
+ 
+ 
diff --git a/testing/pinentry/pinentry.install b/testing/pinentry/pinentry.install
new file mode 100644
index 000000000..eed2c7124
--- /dev/null
+++ b/testing/pinentry/pinentry.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(pinentry.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/syslog-ng/PKGBUILD b/testing/syslog-ng/PKGBUILD
new file mode 100644
index 000000000..3c4bc0767
--- /dev/null
+++ b/testing/syslog-ng/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id: PKGBUILD 131638 2011-07-13 03:09:27Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer: Aaron Griffin <aaron@archlinux.org>
+
+pkgname=syslog-ng
+pkgver=3.2.4
+pkgrel=3
+pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+groups=('base')
+url="http://www.balabit.com/network-security/syslog-ng/"
+depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk')
+makedepends=('flex' 'pkg-config')
+optdepends=('logrotate: for rotating log files')
+provides=('logger')
+options=('!libtool')
+backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \
+        'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
+source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${pkgver}/source/${pkgname}_${pkgver}.tar.gz
+        non-blocking-systemd-fds.patch
+        syslog-ng.conf syslog-ng.logrotate syslog-ng.rc cap_syslog.patch)
+md5sums=('5995f7dad0053a478b60a63f6f754203'
+         '25e43afe51eb2223c25168e3c3e7aaf6'
+         '344dddfff946300f5576b13a7e8ea19f'
+         '735636090be4582885974542d2a75855'
+         '8b4441343d859c2f01c2cf799a7e6f98'
+         '46e5dcff71f820d497898331a3f608fe')
+sha1sums=('ff732f7223bd2bd0424d4b9028b523cf62133af1'
+          '73b83deae9a8b945dfb13adf331e6bf6f119b83e'
+          'b9eb8c61f7cccda543fc5c97fe1d40a8d15e713f'
+          'ac997b25d7d8e69e66782d3771a0e12aff55ae7f'
+          '4481819762fd1b6f25903016a8878e63c0058fcb'
+          'f093a09626a528d23f0f2aeece018cab15a735a9')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # fix #22555 for kernels >=2.6.38
+  patch -p1 -i ../cap_syslog.patch
+
+  # fix systemd blocking FD bug
+  # https://bugzilla.balabit.com/show_bug.cgi?id=125
+  patch -Np1 < "$srcdir/non-blocking-systemd-fds.patch"
+
+  ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng \
+    --libexecdir=/usr/lib --localstatedir=/var/lib/syslog-ng \
+    --enable-tcp-wrapper \
+    --with-pidfile-dir=/var/run \
+    --disable-spoof-source \
+    --disable-tcp-wrapper \
+    --enable-systemd
+
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -dm755 "${pkgdir}/var/lib/syslog-ng" "${pkgdir}/etc/syslog-ng/patterndb.d"
+  install -Dm644 "${srcdir}/syslog-ng.conf" "${pkgdir}/etc/syslog-ng/syslog-ng.conf"
+  install -Dm644 "${srcdir}/syslog-ng.logrotate" "${pkgdir}/etc/logrotate.d/syslog-ng"
+  install -Dm755 "${srcdir}/syslog-ng.rc" "${pkgdir}/etc/rc.d/syslog-ng"
+  install -Dm644 "doc/examples/syslog-ng.service" "$pkgdir/lib/systemd/system/syslog-ng.service"
+}
diff --git a/testing/syslog-ng/cap_syslog.patch b/testing/syslog-ng/cap_syslog.patch
new file mode 100644
index 000000000..b6e6db6e4
--- /dev/null
+++ b/testing/syslog-ng/cap_syslog.patch
@@ -0,0 +1,101 @@
+diff --git a/lib/gprocess.h b/lib/gprocess.h
+index cda35b0..5c449f7 100644
+--- a/lib/gprocess.h
++++ b/lib/gprocess.h
+@@ -28,9 +28,14 @@
+ #include "syslog-ng.h"
+ 
+ #include <sys/types.h>
++#include <sys/utsname.h>
+ 
+ #if ENABLE_LINUX_CAPS
+ #  include <sys/capability.h>
++#
++#  ifndef CAP_SYSLOG
++#    define CAP_SYSLOG 34
++#  endif
+ #endif
+ 
+ typedef enum
+@@ -78,5 +83,8 @@ void g_process_finish(void);
+ 
+ void g_process_add_option_group(GOptionContext *ctx);
+ 
++extern int kernel_version;
++extern void get_kernel_version(void);
++#define LINUX_VERSION(x,y,z)    (0x10000*(x) + 0x100*(y) + z)
+ 
+ #endif
+diff --git a/modules/affile/affile.c b/modules/affile/affile.c
+index e145324..886fa72 100644
+--- a/modules/affile/affile.c
++++ b/modules/affile/affile.c
+@@ -59,7 +59,12 @@ affile_open_file(gchar *name, gint flags,
+   if (privileged)
+     {
+       g_process_cap_modify(CAP_DAC_READ_SEARCH, TRUE);
+-      g_process_cap_modify(CAP_SYS_ADMIN, TRUE);
++      if (!kernel_version)
++        get_kernel_version();
++      if (kernel_version < LINUX_VERSION(2, 6, 38))
++        g_process_cap_modify(CAP_SYS_ADMIN, TRUE);
++      else
++        g_process_cap_modify(CAP_SYSLOG, TRUE);
+     }
+   else
+     {
+diff --git a/syslog-ng/main.c b/syslog-ng/main.c
+index 9880c1f..ee5031b 100644
+--- a/syslog-ng/main.c
++++ b/syslog-ng/main.c
+@@ -67,6 +67,7 @@ static gboolean syntax_only = FALSE;
+ static gboolean display_version = FALSE;
+ static gchar *ctlfilename = PATH_CONTROL_SOCKET;
+ static gchar *preprocess_into = NULL;
++int kernel_version;
+ 
+ static volatile sig_atomic_t sig_hup_received = FALSE;
+ static volatile sig_atomic_t sig_term_received = FALSE;
+@@ -363,6 +364,20 @@ version(void)
+          ON_OFF_STR(ENABLE_PACCT_MODULE));
+ }
+ 
++void
++get_kernel_version(void) {
++	static struct utsname uts;
++	int x = 0, y = 0, z = 0;
++
++	if (uname(&uts) == -1) {
++		fprintf(stderr, "Unable to retrieve kernel version.\n");
++		exit(1);
++	}
++
++	sscanf(uts.release, "%d.%d.%d", &x, &y, &z);
++	kernel_version = LINUX_VERSION(x, y, z);
++}
++
+ int 
+ main(int argc, char *argv[])
+ {
+@@ -379,9 +394,20 @@ main(int argc, char *argv[])
+    * indicate readability. Enabling/disabling cap_sys_admin on every poll
+    * invocation seems to be too expensive. So I enable it for now. */
+   
+-  g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw,"
++  if (!kernel_version)
++    get_kernel_version();
++  if (kernel_version < LINUX_VERSION(2, 6, 34))
++    g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw,"
+                      "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner=p "
+                      "cap_sys_admin=ep");
++  else if (kernel_version < LINUX_VERSION(2, 6, 38))
++    g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw,"
++                     "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner,"
++                     "cap_sys_admin=p");
++  else
++    g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw,"
++                     "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner,"
++                     "cap_syslog=p");
+   ctx = g_option_context_new("syslog-ng");
+   g_process_add_option_group(ctx);
+   msg_add_option_group(ctx);
diff --git a/testing/syslog-ng/non-blocking-systemd-fds.patch b/testing/syslog-ng/non-blocking-systemd-fds.patch
new file mode 100644
index 000000000..bd056088b
--- /dev/null
+++ b/testing/syslog-ng/non-blocking-systemd-fds.patch
@@ -0,0 +1,32 @@
+From 2f214c4f87d944aa28d53e331a67b1fd88d9840f Mon Sep 17 00:00:00 2001
+From: Balazs Scheidler <bazsi@balabit.hu>
+Date: Wed, 22 Jun 2011 12:50:53 +0200
+Subject: [PATCH] systemd: make sure the acquired fd is in non-blocking mode
+
+The fd acquired from systemd is in blocking mode, and syslog-ng
+didn't explicitly set it to non-blocking, causing syslog-ng
+to stall. This patch changes that, explicitly enables
+O_NONBLOCK and O_CLOEXEC on systemd acquired fds.
+
+Reported-By: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+Signed-off-by: Balazs Scheidler <bazsi@balabit.hu>
+---
+ modules/afsocket/afunix.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/modules/afsocket/afunix.c b/modules/afsocket/afunix.c
+index cd9c205..9a4e37b 100644
+--- a/modules/afsocket/afunix.c
++++ b/modules/afsocket/afunix.c
+@@ -108,6 +108,8 @@ afunix_sd_acquire_socket(AFSocketSourceDriver *s, gint *result_fd)
+ 
+   if (*result_fd != -1)
+     {
++      g_fd_set_nonblock(*result_fd, TRUE);
++      g_fd_set_cloexec(*result_fd, TRUE);
+       msg_verbose("Acquired systemd socket",
+ 		  evt_tag_str("filename", self->filename),
+ 		  evt_tag_int("systemd-sock-fd", *result_fd),
+-- 
+1.7.5.4
+
diff --git a/testing/syslog-ng/syslog-ng.conf b/testing/syslog-ng/syslog-ng.conf
new file mode 100644
index 000000000..6e3362681
--- /dev/null
+++ b/testing/syslog-ng/syslog-ng.conf
@@ -0,0 +1,92 @@
+@version: 3.2
+#
+# /etc/syslog-ng/syslog-ng.conf
+#
+
+options {
+  stats_freq (0);
+  flush_lines (0);
+  time_reopen (10);
+  log_fifo_size (1000);
+  long_hostnames(off); 
+  use_dns (no);
+  use_fqdn (no);
+  create_dirs (no);
+  keep_hostname (yes);
+  perm(0640);
+  group("log");
+};
+
+source src {
+  unix-dgram("/dev/log");
+  internal();
+  file("/proc/kmsg");
+};
+
+destination d_authlog { file("/var/log/auth.log"); };
+destination d_syslog { file("/var/log/syslog.log"); };
+destination d_cron { file("/var/log/crond.log"); };
+destination d_daemon { file("/var/log/daemon.log"); };
+destination d_kernel { file("/var/log/kernel.log"); };
+destination d_lpr { file("/var/log/lpr.log"); };
+destination d_user { file("/var/log/user.log"); };
+destination d_uucp { file("/var/log/uucp.log"); };
+destination d_mail { file("/var/log/mail.log"); };
+destination d_news { file("/var/log/news.log"); };
+destination d_ppp { file("/var/log/ppp.log"); };
+destination d_debug { file("/var/log/debug.log"); };
+destination d_messages { file("/var/log/messages.log"); };
+destination d_errors { file("/var/log/errors.log"); };
+destination d_everything { file("/var/log/everything.log"); };
+destination d_iptables { file("/var/log/iptables.log"); };
+destination d_acpid { file("/var/log/acpid.log"); };
+destination d_console { usertty("root"); };
+
+# Log everything to tty12
+destination console_all { file("/dev/tty12"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { program(syslog-ng); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kernel { facility(kern) and not filter(f_iptables); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_news { facility(news); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+filter f_ppp { facility(local2); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); };
+filter f_everything { level(debug..emerg) and not facility(auth, authpriv); };
+filter f_emergency { level(emerg); };
+filter f_info { level(info); };
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); };
+filter f_acpid { program("acpid"); };
+
+log { source(src); filter(f_acpid); destination(d_acpid); };
+log { source(src); filter(f_authpriv); destination(d_authlog); };
+log { source(src); filter(f_syslog); destination(d_syslog); };
+log { source(src); filter(f_cron); destination(d_cron); };
+log { source(src); filter(f_daemon); destination(d_daemon); };
+log { source(src); filter(f_kernel); destination(d_kernel); };
+log { source(src); filter(f_lpr); destination(d_lpr); };
+log { source(src); filter(f_mail); destination(d_mail); };
+log { source(src); filter(f_news); destination(d_news); };
+log { source(src); filter(f_ppp); destination(d_ppp); };
+log { source(src); filter(f_user); destination(d_user); };
+log { source(src); filter(f_uucp); destination(d_uucp); };
+#log { source(src); filter(f_debug); destination(d_debug); };
+log { source(src); filter(f_messages); destination(d_messages); };
+log { source(src); filter(f_err); destination(d_errors); };
+log { source(src); filter(f_emergency); destination(d_console); };
+log { source(src); filter(f_everything); destination(d_everything); };
+log { source(src); filter(f_iptables); destination(d_iptables); };
+
+# Log everything to tty12
+#log { source(src); destination(console_all); };
diff --git a/testing/syslog-ng/syslog-ng.logrotate b/testing/syslog-ng/syslog-ng.logrotate
new file mode 100644
index 000000000..e0e6929f2
--- /dev/null
+++ b/testing/syslog-ng/syslog-ng.logrotate
@@ -0,0 +1,7 @@
+/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log {
+	missingok
+	sharedscripts
+	postrotate
+		/bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null`  2> /dev/null || true
+	endscript
+}
diff --git a/testing/syslog-ng/syslog-ng.rc b/testing/syslog-ng/syslog-ng.rc
new file mode 100755
index 000000000..bb5320b2c
--- /dev/null
+++ b/testing/syslog-ng/syslog-ng.rc
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+checkconfig() {
+    syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf
+    if [ $? -gt 0 ]; then
+	stat_busy "Configuration error. Please fix your config file (/etc/syslog-ng/syslog-ng.conf)."
+	stat_fail
+        exit 0
+    fi
+}
+
+PID=`pidof -o %PPID /usr/sbin/syslog-ng`
+case "$1" in
+  start)
+    stat_busy "Starting Syslog-NG"
+    checkconfig
+    [ -z "$PID" ] && /usr/sbin/syslog-ng
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon syslog-ng
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Syslog-NG"
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm -f /var/run/syslog-ng.pid
+#     Removing stale syslog-ng.persist file. Its new location, as of 2.0.6-1, is /var/lib/syslog-ng/
+      rm -f /var/syslog-ng.persist
+      rm_daemon syslog-ng
+      stat_done
+    fi
+    ;;
+  reload)
+    stat_busy "Reloading Syslog-NG configuration and re-opening log files"
+    if [ -z "$PID" ]; then
+      stat_fail
+    else
+      checkconfig
+      kill -HUP $PID &> /dev/null
+      if [ $? -gt 0 ]; then
+        stat_fail
+      else
+        stat_done
+      fi
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart|reload}"  
+esac
+exit 0
author	root <root@rshg047.dnsready.net>	2011-07-13 23:12:30 +0000
committer	root <root@rshg047.dnsready.net>	2011-07-13 23:12:30 +0000
commit	29657877f6a02dbba1bd58b417b4ccd211939690 (patch)
tree	0213b621a87e176f90d19cf8e894d1da8fd0d1b6
parent	079c689ef9b252fd82dbf9b182ec2517c48f8737 (diff)