Mon Apr 2 00:01:14 UTC 2012

author: root <root@rshg054.dnsready.net> 2012-04-02 00:01:14 +0000
committer: root <root@rshg054.dnsready.net> 2012-04-02 00:01:14 +0000
commit: 8ebbe4e4befac1396a153b356fc9793655dde4ff (patch)
tree: b957bcef566f4da47b8d4a406c64837ec6e3b2e7 /staging
parent: 939efb693a8b362edc0c6ccba62c5ce54fb501af (diff)
116 files changed, 1834 insertions, 382 deletions
diff --git a/staging/bluez/PKGBUILD b/staging/bluez/PKGBUILD
new file mode 100644
index 000000000..277b5413d
--- /dev/null
+++ b/staging/bluez/PKGBUILD
@@ -0,0 +1,84 @@
+# $Id: PKGBUILD 154962 2012-03-31 22:36:54Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
+
+pkgname=bluez
+pkgver=4.99
+pkgrel=2
+pkgdesc="Libraries and tools for the Bluetooth protocol stack"
+url="http://www.bluez.org/"
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('dbus-core' 'python2' 'udev')
+makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile')
+optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
+            "alsa-lib: Audio bluetooth devices support"
+            "dbus-python: to run bluez-simple-agent"
+            "pygobject: to run bluez-simple-agent"
+            "libusb-compat: USB adapters support"
+            "cups: CUPS backend")
+conflicts=('bluez-libs' 'bluez-utils')
+provides=('bluez-libs' 'bluez-utils')
+replaces=('bluez-libs' 'bluez-utils')
+options=('!libtool')
+backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
+        'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
+source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
+        'bluetooth.conf.d'
+	'rc.bluetooth')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/lib \
+    --enable-gstreamer \
+    --enable-alsa \
+    --enable-usb \
+    --enable-tools \
+    --enable-bccmd \
+    --enable-dfutool \
+    --enable-hid2hci \
+    --enable-hidd \
+    --enable-pand \
+    --enable-dund \
+    --enable-cups \
+    --enable-wiimote \
+    --disable-test
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth
+  
+  install -d ${pkgdir}/etc/bluetooth
+  install -m644 network/network.conf \
+                input/input.conf \
+                audio/audio.conf \
+                serial/serial.conf \
+    ${pkgdir}/etc/bluetooth/
+  
+  install -Dm644 ${srcdir}/bluetooth.conf.d \
+    ${pkgdir}/etc/conf.d/bluetooth
+
+  # FS#27630
+  install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent
+  install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device
+  install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input
+  sed -i 's#/usr/bin/python#/usr/bin/python2#' \
+    "${pkgdir}"/usr/bin/bluez-simple-agent \
+    "${pkgdir}"/usr/bin/bluez-test-device \
+    "${pkgdir}"/usr/bin/bluez-test-input
+
+  # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html
+  rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules
+}
+md5sums=('2387053eb5a7b02f37df4871df022a02'
+         '7412982b440f29fa7f76a41a87fef985'
+         '8f9498707f809506928b2e480d3b6789')
diff --git a/staging/bluez/bluetooth.conf.d b/staging/bluez/bluetooth.conf.d
new file mode 100644
index 000000000..1c1e02589
--- /dev/null
+++ b/staging/bluez/bluetooth.conf.d
@@ -0,0 +1,30 @@
+# Bluetooth configuraton file
+
+# Bluetooth services (allowed values are "true" and "false")
+
+# Run the bluetoothd daemon (default: true)
+#DAEMON_ENABLE="false"
+
+# Run the sdp daemon (default: false)
+# If this is disabled, hcid's internal sdp daemon will be used
+#SDPD_ENABLE="true"
+
+# Run the bluetooth HID daemon (default: false)
+#HIDD_ENABLE="true"
+
+# Activate rfcomm ports (default: false)
+#RFCOMM_ENABLE="true"
+
+# Run bluetooth dial-up networking daemon (default: false)
+#DUND_ENABLE="true"
+
+# Run bluetooth PAN daemon (default: false)
+#PAND_ENABLE="true"
+
+# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf)
+#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
+
+# Options for hidd, dund and pand (default: none)
+HIDD_OPTIONS="--server"
+#DUND_OPTIONS=""
+#PAND_OPTIONS=""
diff --git a/staging/bluez/rc.bluetooth b/staging/bluez/rc.bluetooth
new file mode 100644
index 000000000..a46ee2abb
--- /dev/null
+++ b/staging/bluez/rc.bluetooth
@@ -0,0 +1,100 @@
+#!/bin/bash
+#
+# Start/stop the Bluetooth daemons
+#
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+DAEMON_NAME="bluetoothd"
+HIDD_NAME="hidd"
+RFCOMM_NAME="rfcomm"
+PAND_NAME="pand"
+DUND_NAME="dund"
+
+DAEMON_EXEC="/usr/sbin/bluetoothd"
+HIDD_EXEC="/usr/bin/hidd"
+RFCOMM_EXEC="/usr/bin/rfcomm"
+PAND_EXEC="/usr/bin/pand"
+DUND_EXEC="/usr/bin/dund"
+
+DAEMON_ENABLE="true"
+HIDD_ENABLE="false"
+RFCOMM_ENABLE="false"
+DUND_ENABLE="false"
+PAND_ENABLE="false"
+
+RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
+
+HIDD_OPTIONS=""
+DUND_OPTIONS=""
+PAND_OPTIONS=""
+
+[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
+
+case "$1" in
+  start)
+    stat_busy "Starting bluetooth subsystem:"
+    if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then
+      stat_append " $DAEMON_NAME"
+      $DAEMON_EXEC
+      sleep 1
+    fi
+    if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then
+      stat_append " $SDPD_NAME"
+      $SDPD_EXEC
+    fi
+    if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then
+      stat_append " $HIDD_NAME"
+      $HIDD_EXEC $HIDD_OPTIONS
+    fi
+    if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then
+      stat_append " $RFCOMM_NAME"
+      $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all
+    fi
+    if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then
+      stat_append " $DUND_NAME"
+      $DUND_EXEC $DUND_OPTIONS
+    fi
+    if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then
+      stat_append " $PAND_NAME"
+      $PAND_EXEC $PAND_OPTIONS
+    fi
+    add_daemon bluetooth
+    stat_done
+    ;;
+  stop)
+    stat_busy "Stopping bluetooth subsystem:"
+
+    stat_append " $PAND_NAME"
+    killall $PAND_NAME >/dev/null 2>&1
+
+    stat_append " $DUND_NAME"
+    killall $DUND_NAME >/dev/null 2>&1
+
+    if [ -x "$RFCOMM_EXEC" ]; then
+      stat_append " $RFCOMM_NAME"
+      $RFCOMM_EXEC release all >/dev/null 2>&1
+    fi
+
+    stat_append " $HIDD_NAME"
+    killall $HIDD_NAME >/dev/null 2>&1
+
+    stat_append " $SDPD_NAME"
+    killall $SDPD_NAME >/dev/null 2>&1
+
+    stat_append " $DAEMON_NAME"
+    killall $DAEMON_NAME >/dev/null 2>&1
+
+    rm_daemon bluetooth
+    stat_done
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/staging/boost/PKGBUILD b/staging/boost/PKGBUILD
index 0f6be7ab1..d54a3da70 100644
--- a/staging/boost/PKGBUILD
+++ b/staging/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151566 2012-02-27 18:05:58Z ibiru $
+# $Id: PKGBUILD 154943 2012-03-31 13:16:40Z andyrtr $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Kritoke <kritoke@gamebox.net>
@@ -8,7 +8,7 @@ pkgbase=boost
 pkgname=('boost-libs' 'boost')
 pkgver=1.49.0
 _boostver=${pkgver//./_}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.boost.org/"
 makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
diff --git a/staging/gpsd/PKGBUILD b/staging/gpsd/PKGBUILD
new file mode 100644
index 000000000..99b468286
--- /dev/null
+++ b/staging/gpsd/PKGBUILD
@@ -0,0 +1,78 @@
+# $Id: PKGBUILD 154959 2012-03-31 22:33:52Z tomegun $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Giacomo Rizzo <alt@free-os.it>
+
+pkgname=gpsd
+pkgver=3.4
+pkgrel=2
+pkgdesc="GPS daemon and library to support USB/serial GPS devices"
+arch=('i686' 'x86_64')
+url="http://catb.org/gpsd/"
+license=('BSD')
+depends=('python2' 'libusb' 'bluez' 'desktop-file-utils')
+optdepends=('php: generate a PHP status page for your GPS'
+            'php-gd: image support for the PHP status page'
+            'pygtk: GUI frontends')
+makedepends=('scons' 'docbook-xsl' 'chrpath')
+backup=('etc/conf.d/gpsd')
+options=('!libtool')
+install="${pkgname}.install"
+source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
+        'gpsd' 'gpsd.conf.d')
+md5sums=('c01353459faa68834309109d4e868460'
+         '8aea27e1b0c23f254f94861f7d898106'
+         '1f3402f8e33a7032b9ae6dfd077234f7'
+         '3e963df3f9f7ef3572ecc648ae829315')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # fix python 2.7 path
+  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+    $(find . -name '*.py')
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps \
+    gpscat gpsfake gpsprof xgps xgpsspeed
+
+  scons prefix=/usr \
+    systemd=yes \
+    libQgpsmm=no \
+    PYTHONPATH=/usr/bin/python2
+  scons build
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix man pages path (FS#21715)
+  sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1
+
+  export DESTDIR="${pkgdir}"
+  scons install
+
+  install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd"
+
+  install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/99-gpsd-usb.rules"
+
+  sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug
+  install -D -m755 gpsd.hotplug "${pkgdir}/usr/lib/udev/gpsd.hotplug"
+
+  # GPSD needs RPATH
+  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0
+  chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps}
+  chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl}
+  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/gps/{clienthelpers,packet}.so
+
+  install -D -m644 packaging/X11/xgps.desktop \
+    "${pkgdir}/usr/share/applications/xgps.desktop"
+  install -D -m644 packaging/X11/xgpsspeed.desktop \
+    "${pkgdir}/usr/share/applications/xgpsspeed.desktop"
+  install -D -m644 packaging/X11/gpsd-logo.png \
+    "${pkgdir}/usr/share/gpsd/gpsd-logo.png"
+
+  install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd"
+
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/staging/gpsd/gpsd b/staging/gpsd/gpsd
new file mode 100755
index 000000000..b510a7542
--- /dev/null
+++ b/staging/gpsd/gpsd
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd
+
+NAME=gpsd
+DAEMON=/usr/sbin/$NAME
+PIDFILE=/var/run/$NAME/$NAME.pid
+PID=$(cat $PIDFILE 2>/dev/null)
+
+case "$1" in
+   start)
+	stat_busy "Starting $NAME"
+	[ ! -d /var/run/$NAME ] && install -d /var/run/$NAME
+	[ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /var/run/$NAME/$NAME.sock ${GPSD_OPTIONS} ${DEVICES}
+	if [ $? -gt 0 ]; then
+		stat_fail
+	else
+		add_daemon $NAME
+		stat_done
+	fi
+   ;;
+   stop)
+	stat_busy "Stopping $NAME"
+	[ ! -z "$PID" ]  && kill $PID &> /dev/null
+	if [ $? -gt 0 ]; then
+		stat_fail
+	else
+	    rm -f $PIDFILE &>/dev/null
+	    rm_daemon $NAME
+	    stat_done
+	fi
+   ;;
+
+   restart)
+	$0 stop
+	sleep 2
+	$0 start
+   ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/staging/gpsd/gpsd.conf.d b/staging/gpsd/gpsd.conf.d
new file mode 100644
index 000000000..9fef72cb9
--- /dev/null
+++ b/staging/gpsd/gpsd.conf.d
@@ -0,0 +1,5 @@
+# Default settings for gpsd.
+START_DAEMON="true"
+GPSD_OPTIONS=""
+DEVICES=""
+USBAUTO="true"
diff --git a/staging/gpsd/gpsd.install b/staging/gpsd/gpsd.install
new file mode 100644
index 000000000..ee661fcb1
--- /dev/null
+++ b/staging/gpsd/gpsd.install
@@ -0,0 +1,16 @@
+post_install() {
+    echo ">>> Note: the supplied gpsd udev rules are device-specific, so"
+    echo ">>> if your device isn't detected correctly, please use lsusb or"
+    echo ">>> another suitable tool to determine the proper device IDs and"
+    echo ">>> use the commented rules to fill in the blanks for your device."
+
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    update-desktop-database -q
+}
+
+post_remove() {
+    update-desktop-database -q
+}
diff --git a/staging/kactivities/PKGBUILD b/staging/kactivities/PKGBUILD
index 53b9c400d..3d10f663b 100644
--- a/staging/kactivities/PKGBUILD
+++ b/staging/kactivities/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152041 2012-03-04 14:22:26Z andrea $
+# $Id: PKGBUILD 154922 2012-03-31 08:10:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kactivities
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='API for using and interacting with Activities'
@@ -10,8 +10,8 @@ url='http://kde.org/'
 license=('GPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('29979514848633da71780b342e7328063bd47d07')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('e97d0b82661fd3d886b87d673d7a1191073af7ff')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeaccessibility-jovie/PKGBUILD b/staging/kdeaccessibility-jovie/PKGBUILD
index aadc80dbc..419ee2dc0 100644
--- a/staging/kdeaccessibility-jovie/PKGBUILD
+++ b/staging/kdeaccessibility-jovie/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152051 2012-03-04 14:29:11Z andrea $
+# $Id: PKGBUILD 154855 2012-03-31 07:28:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-jovie
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A text to speech application'
@@ -13,8 +13,8 @@ depends=('kdebase-runtime' 'speech-dispatcher')
 makedepends=('cmake' 'automoc4')
 replaces=('kdeaccessibility-kttsd')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/jovie-${pkgver}.tar.xz")
-sha1sums=('4ac647ac3823b6a4f01f839f3e11bca09d6353ee')
+source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz")
+sha1sums=('eac0fe5006b54914f17dd529a723da4964f59a0b')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeaccessibility-kaccessible/PKGBUILD b/staging/kdeaccessibility-kaccessible/PKGBUILD
index efd116667..8fe68565a 100644
--- a/staging/kdeaccessibility-kaccessible/PKGBUILD
+++ b/staging/kdeaccessibility-kaccessible/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152052 2012-03-04 14:29:40Z andrea $
+# $Id: PKGBUILD 154856 2012-03-31 07:28:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kaccessible
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Provides accessibility services like focus tracking and a screenreader'
@@ -11,8 +11,8 @@ license=('GPL' 'FDL')
 groups=('kde' 'kdeaccessibility')
 depends=('kdelibs' 'speech-dispatcher')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kaccessible-${pkgver}.tar.xz")
-sha1sums=('da137f22a8de55858a3ae80f4e95d89c18b50257')
+source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz")
+sha1sums=('bc5cd13decd2456c91fd6973be038e6fea0da256')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeaccessibility-kmag/PKGBUILD b/staging/kdeaccessibility-kmag/PKGBUILD
index a6e48bedc..ff542342d 100644
--- a/staging/kdeaccessibility-kmag/PKGBUILD
+++ b/staging/kdeaccessibility-kmag/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152053 2012-03-04 14:30:04Z andrea $
+# $Id: PKGBUILD 154857 2012-03-31 07:29:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmag
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Screen Magnifier'
@@ -12,8 +12,8 @@ groups=('kde' 'kdeaccessibility')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kmag-${pkgver}.tar.xz")
-sha1sums=('35686d11ecf5e2783b7518499300a715ef27108d')
+source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz")
+sha1sums=('5a88645d7af1f407e87fcd91911b1e94e4ffb271')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeaccessibility-kmousetool/PKGBUILD b/staging/kdeaccessibility-kmousetool/PKGBUILD
index 2f4f1da27..3b8172f72 100644
--- a/staging/kdeaccessibility-kmousetool/PKGBUILD
+++ b/staging/kdeaccessibility-kmousetool/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152054 2012-03-04 14:30:28Z andrea $
+# $Id: PKGBUILD 154858 2012-03-31 07:29:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmousetool
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
@@ -12,8 +12,8 @@ groups=('kde' 'kdeaccessibility')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kmousetool-${pkgver}.tar.xz")
-sha1sums=('8b3f0323602ab33a5749c7e5c75d50b62c352786')
+source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz")
+sha1sums=('e0a66c42324d9ac09c3e85fea12a24a5ae2abb9b')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeaccessibility-kmouth/PKGBUILD b/staging/kdeaccessibility-kmouth/PKGBUILD
index a92e288fd..854222f3f 100644
--- a/staging/kdeaccessibility-kmouth/PKGBUILD
+++ b/staging/kdeaccessibility-kmouth/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152055 2012-03-04 14:30:56Z andrea $
+# $Id: PKGBUILD 154859 2012-03-31 07:29:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmouth
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Speech Synthesizer Frontend'
@@ -12,8 +12,8 @@ groups=('kde' 'kdeaccessibility')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kmouth-${pkgver}.tar.xz")
-sha1sums=('b4cecf89eea96892608fd125635ea9f9f7fee8be')
+source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz")
+sha1sums=('f0192e531161544a803f8822b041d8c50ec9bb58')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeadmin/PKGBUILD b/staging/kdeadmin/PKGBUILD
index f6a407826..6665d017d 100644
--- a/staging/kdeadmin/PKGBUILD
+++ b/staging/kdeadmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152056 2012-03-04 14:31:34Z andrea $
+# $Id: PKGBUILD 154860 2012-03-31 07:30:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -7,16 +7,16 @@ pkgname=('kdeadmin-kcron'
          'kdeadmin-ksystemlog'
          'kdeadmin-kuser'
          'kdeadmin-system-config-printer-kde')
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeadmin')
-makedepends=('cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz"
+makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'syslog-path.patch')
-sha1sums=('0ee44575bfb45159ced6d4d046b07323ebab00e7'
+sha1sums=('2952e5111f5e71671384db40d305630bd50c01c0'
           '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
 
 build() {
@@ -56,7 +56,7 @@ package_kdeadmin-ksystemlog() {
 
 package_kdeadmin-kuser() {
 	pkgdesc='User Manager'
-	depends=('kdepim-runtime')
+	depends=('kdebase-runtime' 'kdepimlibs')
 	url="http://kde.org/applications/system/kuser/"
 	install='kdeadmin.install'
 	cd $srcdir/build/kuser
@@ -67,15 +67,14 @@ package_kdeadmin-kuser() {
 
 package_kdeadmin-system-config-printer-kde() {
 	pkgdesc='Configure local and remote Printers'
-	depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt'
-             'cups' 'python2-gobject2')
+	depends=('kdebindings-python2' 'system-config-printer-common' 'cups' 'python2-gobject2')
 	url="http://kde.org/applications/system/printerapplet/"
 	cd $srcdir/build/system-config-printer-kde
 	make DESTDIR=$pkgdir install
 
-        # Use the python2 executable
-        sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-          "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py
-        sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-          "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py
+    # Use the python2 executable
+    sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+        "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py
+    sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+        "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py
 }
diff --git a/staging/kdeartwork/PKGBUILD b/staging/kdeartwork/PKGBUILD
index c7959ee8b..8ed3ade20 100644
--- a/staging/kdeartwork/PKGBUILD
+++ b/staging/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152057 2012-03-04 14:32:05Z andrea $
+# $Id: PKGBUILD 154861 2012-03-31 07:31:08Z 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.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -21,8 +21,8 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeartwork')
 makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace'
              'libkexiv2')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('31215ff41d01c8bf680578abe57b65648441a135')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('828d8f36eb55bc93800a8d799b3cf20c22146021')
 
 build() {
 	cd $srcdir
diff --git a/staging/kdebase-konsole/PKGBUILD b/staging/kdebase-konsole/PKGBUILD
index c6a931305..de0f8c9b4 100644
--- a/staging/kdebase-konsole/PKGBUILD
+++ b/staging/kdebase-konsole/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152058 2012-03-04 14:36:30Z andrea $
+# $Id: PKGBUILD 154862 2012-03-31 07:35:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebase-konsole
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://kde.org/applications/system/konsole/'
@@ -11,8 +11,8 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 depends=('kdebase-runtime' 'kdebase-lib')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/konsole-${pkgver}.tar.xz")
-sha1sums=('23490d929c6c3a56485e4c6585a1d10af9810651')
+source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz")
+sha1sums=('a57ff4844a612ac0ece07435186d55fb95bf012d')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdebase-runtime/PKGBUILD b/staging/kdebase-runtime/PKGBUILD
index ee3e4cf1b..af0067aa1 100644
--- a/staging/kdebase-runtime/PKGBUILD
+++ b/staging/kdebase-runtime/PKGBUILD
@@ -1,24 +1,22 @@
-# $Id: PKGBUILD 152030 2012-03-04 14:16:27Z andrea $
+# $Id: PKGBUILD 154835 2012-03-31 07:14:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-runtime
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="KDE Base Runtime Environment"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
-depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
-        'xorg-xauth')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
-             'xine-lib')
+depends=('kdelibs' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth')
+makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen' 'networkmanager')
 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/stable/${pkgver}/src/xz/kde-runtime-${pkgver}.tar.xz")
-sha1sums=('82b57dc38335716fb382a665b536a9aece4684d6')
+source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz")
+sha1sums=('d2931b8a7c744d6c2fc95d46b2195ed2cd253c00')
 
 build() {
     cd "${srcdir}"
@@ -27,7 +25,9 @@ build() {
 	cmake ../kde-runtime-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_PREFIX=/usr \
+        -DWITH_QNtrack=OFF \
+        -DWITH_Xine=OFF
 	make
 }
 
diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD
index b25ad608a..dbaeb3a02 100644
--- a/staging/kdebase-workspace/PKGBUILD
+++ b/staging/kdebase-workspace/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 152042 2012-03-04 14:23:30Z andrea $
+# $Id: PKGBUILD 154846 2012-03-31 07:22:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate'
          'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
          'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst'
          'xorg-xrandr')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager')
+makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
 optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
 replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde'
           'kdebase-kinfocenter')
@@ -31,13 +31,13 @@ backup=('usr/share/config/kdm/kdmrc'
         'etc/pam.d/kde-np'
         'etc/pam.d/kscreensaver')
 options=('emptydirs')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${_pkgname}-${pkgver}.tar.xz"
+source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
         'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
-sha1sums=('675df4befd736e770e3029af8d38800c9018e888'
+sha1sums=('7f48a4f8bb7e3296155b18464bc7bd5c04f6ae92'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-          'e4198a443703f749b58a4fec88362fced1b45789'
-          '264e395c2c44cdda5a242c6dee649afab44cd6e5'
+          '712a90999bd429883dcef5dcaf288aace332ced8'
+          'b321b5e613b60231330e606fdf1e124646148388'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
diff --git a/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam
index dfedb8edf..7d60cc35c 100644
--- a/staging/kdebase-workspace/kde-np.pam
+++ b/staging/kdebase-workspace/kde-np.pam
@@ -1,6 +1,7 @@
 #%PAM-1.0
 auth		required	pam_nologin.so
 auth		required	pam_permit.so
+auth        required    pam_env.so
 account		required	pam_unix.so
 password	required	pam_unix.so
 session		required	pam_unix.so
diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam
index 9ec074d06..ec1d8277f 100644
--- a/staging/kdebase-workspace/kde.pam
+++ b/staging/kdebase-workspace/kde.pam
@@ -1,6 +1,7 @@
 #%PAM-1.0
 auth		required	pam_unix.so
 auth		required	pam_nologin.so
+auth        required    pam_env.so
 account		required	pam_unix.so
 password	required	pam_unix.so
 session		required	pam_unix.so
diff --git a/staging/kdebase/PKGBUILD b/staging/kdebase/PKGBUILD
index aa0552f73..8cf602273 100644
--- a/staging/kdebase/PKGBUILD
+++ b/staging/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152043 2012-03-04 14:25:01Z andrea $
+# $Id: PKGBUILD 154847 2012-03-31 07:23:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -12,15 +12,15 @@ pkgname=('kdebase-dolphin'
          'kdebase-konqueror'
          'kdebase-lib'
          'kdebase-plasma')
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kde-baseapps-${pkgver}.tar.xz")
-sha1sums=('bfbc51930a81ea272ddbb1fc9a9cefb9cf9a81d6')
+source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz")
+sha1sums=('13dc2e6c8639feadc9a5a334d0720a60b1e3ccb6')
 
 build() {
 	cd ${srcdir}
diff --git a/staging/kdebindings-kimono/PKGBUILD b/staging/kdebindings-kimono/PKGBUILD
index e42e65a18..736e4a918 100644
--- a/staging/kdebindings-kimono/PKGBUILD
+++ b/staging/kdebindings-kimono/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152059 2012-03-04 14:36:59Z andrea $
+# $Id: PKGBUILD 154863 2012-03-31 07:35:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-kimono
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the KDE libraries"
 url="http://kde.org/"
@@ -12,8 +12,8 @@ groups=('kdebindings')
 depends=('kdebindings-qyoto' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
 conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kimono-${pkgver}.tar.xz")
-sha1sums=('cecf979d52091a2baaabb7334750f8376d835b0a')
+source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz")
+sha1sums=('ffe572e5df8f8a5d2a6b94db8e460b603af711e6')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdebindings-korundum/PKGBUILD b/staging/kdebindings-korundum/PKGBUILD
index c6612adcb..aef1e6365 100644
--- a/staging/kdebindings-korundum/PKGBUILD
+++ b/staging/kdebindings-korundum/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152060 2012-03-04 14:37:24Z andrea $
+# $Id: PKGBUILD 154864 2012-03-31 07:36:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-korundum
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="KDE bindings for ruby"
 url="http://kde.org/"
@@ -14,9 +14,9 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
              'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
 conflicts=('kdebindings-ruby')
 options=('!makeflags')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/korundum-${pkgver}.tar.xz"
+source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz"
         'korundum-4.8.0-ruby19.patch')
-sha1sums=('10788c362d209785ce800d70c3b8823af49cf16c'
+sha1sums=('59db0c58a26849aaf4c1839d175239f768257d5b'
           '73299f56a891d8a5475ac07dd485619859312f70')
 
 build() {
diff --git a/staging/kdebindings-kross/PKGBUILD b/staging/kdebindings-kross/PKGBUILD
index 0d356e635..95f6efef5 100644
--- a/staging/kdebindings-kross/PKGBUILD
+++ b/staging/kdebindings-kross/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 152061 2012-03-04 14:37:52Z andrea $
+# $Id: PKGBUILD 154865 2012-03-31 07:36:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-kross
 pkgname=('kdebindings-kross-python'
 #         'kdebindings-kross-ruby'
          'kdebindings-kross-java')
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kross-interpreters-${pkgver}.tar.xz")
-sha1sums=('28a20608fedf726615fc6b97664a30a350e58540')
+source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz")
+sha1sums=('dfee7d8098db258bcd26d447553775434d299113')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdebindings-perlkde/PKGBUILD b/staging/kdebindings-perlkde/PKGBUILD
index fd470a090..24c3ac668 100644
--- a/staging/kdebindings-perlkde/PKGBUILD
+++ b/staging/kdebindings-perlkde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152062 2012-03-04 14:38:19Z andrea $
+# $Id: PKGBUILD 154866 2012-03-31 07:37:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlkde
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Perl bindings for the KDE libraries"
 url="http://kde.org/"
@@ -12,8 +12,8 @@ groups=('kdebindings')
 depends=('kdebindings-perlqt' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
             'kdegraphics-okular' 'kdesdk-kate')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/perlkde-${pkgver}.tar.xz")
-sha1sums=('93e3b009c972a697aebf0450c4c07ff87a5c0461')
+source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz")
+sha1sums=('cfb7d44bd88a899aef56e6200b6a6ff34516a316')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdebindings-perlqt/PKGBUILD b/staging/kdebindings-perlqt/PKGBUILD
index 2ad102007..971dc186f 100644
--- a/staging/kdebindings-perlqt/PKGBUILD
+++ b/staging/kdebindings-perlqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152037 2012-03-04 14:20:22Z andrea $
+# $Id: PKGBUILD 154842 2012-03-31 07:18:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlqt
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Perl bindings for the Qt libraries"
 url="http://kde.org/"
@@ -11,8 +11,8 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'perl-list-moreutils')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/perlqt-${pkgver}.tar.xz")
-sha1sums=('119bbce5e82a47c8f70a8a124b73aa1cacf646ff')
+source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz")
+sha1sums=('e9ccef109d2a2a7d10f43f87691356c44a733b54')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdebindings-python/PKGBUILD b/staging/kdebindings-python/PKGBUILD
index 6a7cc62d3..a354c8f8a 100644
--- a/staging/kdebindings-python/PKGBUILD
+++ b/staging/kdebindings-python/PKGBUILD
@@ -1,33 +1,67 @@
-# $Id: PKGBUILD 152038 2012-03-04 14:20:50Z andrea $
+# $Id: PKGBUILD 154843 2012-03-31 07:19:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
-pkgname=kdebindings-python
-pkgver=4.8.1
+pkgbase=kdebindings-python
+pkgname=('kdebindings-python'
+         'kdebindings-python2')
+pkgver=4.8.2
 pkgrel=1
-pkgdesc="KDE bindings for Python"
-url="http://kde.org/"
+url='http://kde.org/'
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
-depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/pykde4-${pkgver}.tar.xz")
-sha1sums=('b9ef35269d2e08578ba20d01822dbdbed72bffb8')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'qscintilla')
+source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
+sha1sums=('7d1a41e00794dba160ce8e2a3f750c9a4298ef15')
 
 build() {
+  export PYTHONDONTWRITEBYTECODE="TRUE"
+
   cd "${srcdir}"
   mkdir build
   cd build
   cmake ../pykde4-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0
+  make
+  cd ..
+
+  mkdir build-python2
+  cd build-python2
+  cmake ../pykde4-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DPYTHON_EXECUTABLE=/usr/bin/python2
   make
 }
 
-package() {
+package_kdebindings-python() {
+  pkgdesc="A set of Python 3.x bindings for KDE"
+  depends=('kdepim-runtime' 'pyqt' 'qscintilla')
+
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
+}
+
+package_kdebindings-python2() {
+  pkgdesc="A set of Python 2.x bindings for KDE"
+  depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
+  conflicts=('kdebindings-python<4.8.1-2')
+ 
+  cd "${srcdir}"/build-python2
+  make DESTDIR="${pkgdir}" install
+
+  # Fix conflicts
+  rm "${pkgdir}"/usr/bin/pykdeuic4
+  ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
+    "${pkgdir}"/usr/bin/python2-pykdeuic4
+
+  mv "${pkgdir}"/usr/share/apps/pykde4/examples \
+    "${pkgdir}"/usr/share/apps/pykde4/python2-examples
+
+  mv "${pkgdir}"/usr/share/sip/PyKDE4 \
+    "${pkgdir}"/usr/share/sip/python2-PyKDE4
 
   # Use the python2 executable
   find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
diff --git a/staging/kdebindings-qtruby/PKGBUILD b/staging/kdebindings-qtruby/PKGBUILD
index bd113cf47..07add09a5 100644
--- a/staging/kdebindings-qtruby/PKGBUILD
+++ b/staging/kdebindings-qtruby/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152040 2012-03-04 14:21:58Z andrea $
+# $Id: PKGBUILD 154845 2012-03-31 07:20:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qtruby
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Qt bindings for ruby"
 url="http://kde.org/"
@@ -12,8 +12,8 @@ groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'ruby')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-ruby')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/qtruby-${pkgver}.tar.xz")
-sha1sums=('b2532f9e9e04760fce5d9ac87768e6085f0c231b')
+source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz")
+sha1sums=('86643ab8ea52f4a1abcefa3620cea62d2225f949')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdebindings-qyoto/PKGBUILD b/staging/kdebindings-qyoto/PKGBUILD
index 354483001..6074d5711 100644
--- a/staging/kdebindings-qyoto/PKGBUILD
+++ b/staging/kdebindings-qyoto/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152039 2012-03-04 14:21:28Z andrea $
+# $Id: PKGBUILD 154844 2012-03-31 07:20:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qyoto
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the Qt libraries"
 url="http://kde.org/"
@@ -12,8 +12,8 @@ groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'mono')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/qyoto-${pkgver}.tar.xz")
-sha1sums=('32ad56ce6189ce691ed46b8494c4cb446dda6016')
+source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz")
+sha1sums=('6d7b8dcac2a92b143bae0d329793864a7a23aa8f')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdebindings-smokegen/PKGBUILD b/staging/kdebindings-smokegen/PKGBUILD
index 1cc2be2d1..ff56852b0 100644
--- a/staging/kdebindings-smokegen/PKGBUILD
+++ b/staging/kdebindings-smokegen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152032 2012-03-04 14:17:38Z andrea $
+# $Id: PKGBUILD 154837 2012-03-31 07:16:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokegen
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="A general purpose C++ parser with a plugin infrastructure"
 url="http://kde.org/"
@@ -11,8 +11,8 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/smokegen-${pkgver}.tar.xz")
-sha1sums=('6d43ed064730ff81e1844d0634c1b574bd4ffdb2')
+source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz")
+sha1sums=('8ba52937f10fb83470e1fbd724d767ab90921c41')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdebindings-smokekde/PKGBUILD b/staging/kdebindings-smokekde/PKGBUILD
index 769938d00..320590c2f 100644
--- a/staging/kdebindings-smokekde/PKGBUILD
+++ b/staging/kdebindings-smokekde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152036 2012-03-04 14:19:50Z andrea $
+# $Id: PKGBUILD 154841 2012-03-31 07:18:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokekde
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Language independent library for KDE bindings"
 url="http://kde.org/"
@@ -13,8 +13,8 @@ depends=('kdebindings-smokeqt')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
              'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
 conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/smokekde-${pkgver}.tar.xz")
-sha1sums=('680a29725c4b04629befafcd6c74dbc8cc6238f6')
+source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz")
+sha1sums=('5cc24772b72c13555dd716ef7b6d77e81d826d79')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdebindings-smokeqt/PKGBUILD b/staging/kdebindings-smokeqt/PKGBUILD
index 07e3a8c1c..a21bfe31b 100644
--- a/staging/kdebindings-smokeqt/PKGBUILD
+++ b/staging/kdebindings-smokeqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152033 2012-03-04 14:18:07Z andrea $
+# $Id: PKGBUILD 154838 2012-03-31 07:16:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokeqt
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Language independent library for Qt bindings"
 url="http://kde.org/"
@@ -12,8 +12,8 @@ groups=('kdebindings')
 depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/smokeqt-${pkgver}.tar.xz")
-sha1sums=('7af6089df0ffefe7a88600e43641dfd18da8e3e8')
+source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz")
+sha1sums=('0d798ecfc7ec881871723e51ed1e4f32ef009c3a')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-analitza/PKGBUILD b/staging/kdeedu-analitza/PKGBUILD
index 159d57bb3..80ad0e51f 100644
--- a/staging/kdeedu-analitza/PKGBUILD
+++ b/staging/kdeedu-analitza/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152050 2012-03-04 14:28:46Z andrea $
+# $Id: PKGBUILD 154854 2012-03-31 07:27:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-analitza
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="A library to add mathematical features to your program"
 url="http://kde.org/"
@@ -11,8 +11,8 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/analitza-${pkgver}.tar.xz")
-sha1sums=('94c175417126c578c38f29c348a8bb8f54cdfb45')
+source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz")
+sha1sums=('bf76411269246581b09df98ca8ae33be200c4427')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-blinken/PKGBUILD b/staging/kdeedu-blinken/PKGBUILD
index 8f10ba83d..9611bcc54 100644
--- a/staging/kdeedu-blinken/PKGBUILD
+++ b/staging/kdeedu-blinken/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152063 2012-03-04 14:38:42Z andrea $
+# $Id: PKGBUILD 154867 2012-03-31 07:37:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-blinken
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Memory Enhancement Game"
 url="http://kde.org/applications/education/blinken/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/blinken-${pkgver}.tar.xz")
-sha1sums=('ff9f07ee59145a9993604fdef7f301c09c095775')
+source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz")
+sha1sums=('c86a67b2e3506e2c56307871afc77e3e67a967d6')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-cantor/PKGBUILD b/staging/kdeedu-cantor/PKGBUILD
index 3a6a9a25b..91ed54eff 100644
--- a/staging/kdeedu-cantor/PKGBUILD
+++ b/staging/kdeedu-cantor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152064 2012-03-04 14:39:08Z andrea $
+# $Id: PKGBUILD 154868 2012-03-31 07:38:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-cantor
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="KDE Frontend to Mathematical Software"
 url="http://kde.org/applications/education/cantor/"
@@ -15,8 +15,8 @@ optdepends=('maxima: Maxima backend'
             'octave: Octave backend'
             'r: R backend')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/cantor-${pkgver}.tar.xz")
-sha1sums=('bc98d41262454de5aee65b124e7f93041ad639af')
+source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz")
+sha1sums=('53a13c3594ea82b87a421e96b408355eea76fa89')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-kalgebra/PKGBUILD b/staging/kdeedu-kalgebra/PKGBUILD
index 1b1aff5db..b7b193480 100644
--- a/staging/kdeedu-kalgebra/PKGBUILD
+++ b/staging/kdeedu-kalgebra/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152065 2012-03-04 14:39:34Z andrea $
+# $Id: PKGBUILD 154869 2012-03-31 07:38:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalgebra
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Graph Calculator"
 url="http://kde.org/applications/education/kalgebra/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kalgebra-${pkgver}.tar.xz")
-sha1sums=('79f4c85e93a1d270d9d7ba648b86d49fca42d6fb')
+source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz")
+sha1sums=('560efe77d842c0410986b294323eabef6226e6ff')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-kalzium/PKGBUILD b/staging/kdeedu-kalzium/PKGBUILD
index 6afd88d02..0664263ba 100644
--- a/staging/kdeedu-kalzium/PKGBUILD
+++ b/staging/kdeedu-kalzium/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152066 2012-03-04 14:40:00Z andrea $
+# $Id: PKGBUILD 154870 2012-03-31 07:39:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalzium
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Periodic Table of Elements"
 url="http://kde.org/applications/education/kalzium/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdelibs' 'avogadro' 'ocaml' 'facile')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kalzium-${pkgver}.tar.xz")
-sha1sums=('914072b8a324e6966528e0047ea50c2a52736051')
+source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz")
+sha1sums=('e685430d183339dd06e718c0dee3c6aacdd1536a')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-kanagram/PKGBUILD b/staging/kdeedu-kanagram/PKGBUILD
index 212e02e3d..197dfc633 100644
--- a/staging/kdeedu-kanagram/PKGBUILD
+++ b/staging/kdeedu-kanagram/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152067 2012-03-04 14:40:32Z andrea $
+# $Id: PKGBUILD 154871 2012-03-31 07:39:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kanagram
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Letter Order Game"
 url="http://kde.org/applications/education/kanagram/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kanagram-${pkgver}.tar.xz")
-sha1sums=('d41fa85f894fb0ada8757e4282a57102fda32006')
+source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz")
+sha1sums=('25f7733ddc451738575fe1af5a89833ab8295493')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-kbruch/PKGBUILD b/staging/kdeedu-kbruch/PKGBUILD
index c39f780c6..54057ed57 100644
--- a/staging/kdeedu-kbruch/PKGBUILD
+++ b/staging/kdeedu-kbruch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152068 2012-03-04 14:40:57Z andrea $
+# $Id: PKGBUILD 154872 2012-03-31 07:40:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kbruch
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Exercise Fractions"
 url="http://kde.org/applications/education/kbruch/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kbruch-${pkgver}.tar.xz")
-sha1sums=('477e508294b097d8367f80a65b1be7c60b1f3211')
+source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz")
+sha1sums=('92cc810935b3aeebe68a970720f4b418490488d8')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-kgeography/PKGBUILD b/staging/kdeedu-kgeography/PKGBUILD
index 1e0b0f432..6292c8cb4 100644
--- a/staging/kdeedu-kgeography/PKGBUILD
+++ b/staging/kdeedu-kgeography/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152069 2012-03-04 14:41:23Z andrea $
+# $Id: PKGBUILD 154873 2012-03-31 07:40:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kgeography
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Geography Trainer"
 url="http://kde.org/applications/education/kgeography/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kgeography-${pkgver}.tar.xz")
-sha1sums=('58b526d3a597cc2afff49f431a78864d36842ef2')
+source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz")
+sha1sums=('795ddfb81e5f75d81b8eb332a07f58af85321197')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-khangman/PKGBUILD b/staging/kdeedu-khangman/PKGBUILD
index ab6c6ea2a..ff0326d3a 100644
--- a/staging/kdeedu-khangman/PKGBUILD
+++ b/staging/kdeedu-khangman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152070 2012-03-04 14:42:00Z andrea $
+# $Id: PKGBUILD 154874 2012-03-31 07:41:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-khangman
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Hangman Game"
 url="http://kde.org/applications/education/khangman/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/khangman-${pkgver}.tar.xz")
-sha1sums=('102eb6edec5f2c6f6f9086c6fb2136a6550cdef1')
+source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz")
+sha1sums=('3e37d43965c190ccf5bc4c4485751dbe3139bda6')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-kig/PKGBUILD b/staging/kdeedu-kig/PKGBUILD
index 3be26d95f..00bc3ff31 100644
--- a/staging/kdeedu-kig/PKGBUILD
+++ b/staging/kdeedu-kig/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152071 2012-03-04 14:42:26Z andrea $
+# $Id: PKGBUILD 154875 2012-03-31 07:41:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kig
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kig-${pkgver}.tar.xz")
-sha1sums=('05a5ee09be9955bb24e5fcb926eb5bb8f0b24459')
+source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz")
+sha1sums=('7532bb454d6379af2c0ff37819c76c6c1f20deac')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-kiten/PKGBUILD b/staging/kdeedu-kiten/PKGBUILD
index dd698cdff..773061fd2 100644
--- a/staging/kdeedu-kiten/PKGBUILD
+++ b/staging/kdeedu-kiten/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152072 2012-03-04 14:42:53Z andrea $
+# $Id: PKGBUILD 154876 2012-03-31 07:42:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kiten
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Japanese Reference/Study Tool"
 url="http://kde.org/applications/education/kiten/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kiten-${pkgver}.tar.xz")
-sha1sums=('c2c165f4bc89bcbe3a6b49eb06231d4bf85132f0')
+source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz")
+sha1sums=('db608b5550281e8ca0097e3c4ed15abe6018a002')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-klettres/PKGBUILD b/staging/kdeedu-klettres/PKGBUILD
index 720d4fada..208724359 100644
--- a/staging/kdeedu-klettres/PKGBUILD
+++ b/staging/kdeedu-klettres/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152073 2012-03-04 14:43:37Z andrea $
+# $Id: PKGBUILD 154877 2012-03-31 07:42:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-klettres
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Learn The Alphabet"
 url="http://kde.org/applications/education/klettres/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/klettres-${pkgver}.tar.xz")
-sha1sums=('d26ced07799a849d42e0865c143515934bfb9446')
+source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz")
+sha1sums=('2b107d5d4f07ab3a1364a5eb3cc5ba5a35b5ffa4')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-kmplot/PKGBUILD b/staging/kdeedu-kmplot/PKGBUILD
index 995baea61..589ab22f2 100644
--- a/staging/kdeedu-kmplot/PKGBUILD
+++ b/staging/kdeedu-kmplot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152074 2012-03-04 14:44:06Z andrea $
+# $Id: PKGBUILD 154878 2012-03-31 07:43:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kmplot
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Mathematical Function Plotter"
 url="http://kde.org/applications/education/kmplot/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kmplot-${pkgver}.tar.xz")
-sha1sums=('04eadb4a030e594c9ea09b55142640345b1c36c4')
+source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz")
+sha1sums=('17c20bc1916be9be2510040302406f6fe861d878')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-kstars/PKGBUILD b/staging/kdeedu-kstars/PKGBUILD
index 906e10020..112529752 100644
--- a/staging/kdeedu-kstars/PKGBUILD
+++ b/staging/kdeedu-kstars/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152075 2012-03-04 14:44:33Z andrea $
+# $Id: PKGBUILD 154879 2012-03-31 07:43:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kstars
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Desktop Planetarium"
 url="http://kde.org/applications/education/kstars/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kstars-${pkgver}.tar.xz")
-sha1sums=('5453568396529c4767fb5485e1493d86bd0e6177')
+source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz")
+sha1sums=('6447338ebed2f822c4c852bcfe50264ccaba2acb')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-ktouch/PKGBUILD b/staging/kdeedu-ktouch/PKGBUILD
index 9d5942501..eabbe00bb 100644
--- a/staging/kdeedu-ktouch/PKGBUILD
+++ b/staging/kdeedu-ktouch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152076 2012-03-04 14:45:24Z andrea $
+# $Id: PKGBUILD 154880 2012-03-31 07:44:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-ktouch
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Touch Typing Tutor"
 url="http://kde.org/applications/education/ktouch/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/ktouch-${pkgver}.tar.xz")
-sha1sums=('42598cddc04de3d7ec64ea88068b2313333e02fd')
+source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz")
+sha1sums=('5f19f77d3d80058f70b7df2376ce339fda6239e0')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-kturtle/PKGBUILD b/staging/kdeedu-kturtle/PKGBUILD
index cd7ffec7f..1dab15e52 100644
--- a/staging/kdeedu-kturtle/PKGBUILD
+++ b/staging/kdeedu-kturtle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152077 2012-03-04 14:45:53Z andrea $
+# $Id: PKGBUILD 154881 2012-03-31 07:45:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kturtle
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Educational Programming Environment"
 url="http://kde.org/applications/education/kturtle/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kturtle-${pkgver}.tar.xz")
-sha1sums=('3a6a3828c44957644716608234a3813690d0c503')
+source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz")
+sha1sums=('e27f02ae08b8cb3e6be4c0ad971681be5d55db8e')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-kwordquiz/PKGBUILD b/staging/kdeedu-kwordquiz/PKGBUILD
index 8c12fbe42..fcc1f7ed4 100644
--- a/staging/kdeedu-kwordquiz/PKGBUILD
+++ b/staging/kdeedu-kwordquiz/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152078 2012-03-04 14:46:19Z andrea $
+# $Id: PKGBUILD 154882 2012-03-31 07:45:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kwordquiz
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Flash Card Trainer"
 url="http://kde.org/applications/education/kwordquiz/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kwordquiz-${pkgver}.tar.xz")
-sha1sums=('954e49b9dea8e486f8316b9215e12d736e9b1448')
+source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz")
+sha1sums=('4507a07bdf62e5af1ce14ba18523a44b065d090e')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-marble/PKGBUILD b/staging/kdeedu-marble/PKGBUILD
index 693eb6fe6..ecf695948 100644
--- a/staging/kdeedu-marble/PKGBUILD
+++ b/staging/kdeedu-marble/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152045 2012-03-04 14:26:05Z andrea $
+# $Id: PKGBUILD 154849 2012-03-31 07:24:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-marble
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Desktop Globe"
 url="http://kde.org/applications/education/marble/"
@@ -13,8 +13,8 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'gpsd')
 optdepends=('gpsd: gps support')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/marble-${pkgver}.tar.xz")
-sha1sums=('542da37f6ea2df21b331aea28cab810eb6802b78')
+source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz")
+sha1sums=('f57f134976b27fd0622ba2a24e32128ab23f5494')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-parley/PKGBUILD b/staging/kdeedu-parley/PKGBUILD
index a640b5fe1..b0876884e 100644
--- a/staging/kdeedu-parley/PKGBUILD
+++ b/staging/kdeedu-parley/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152079 2012-03-04 14:46:45Z andrea $
+# $Id: PKGBUILD 154883 2012-03-31 07:45:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-parley
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Vocabulary Trainer"
 url="http://kde.org/applications/education/parley/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/parley-${pkgver}.tar.xz")
-sha1sums=('65cb2a02e5da3d9f1f9bb5a2017743b116bce1cb')
+source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz")
+sha1sums=('3b656361108b5c48e0c582c3ce724f6a439c7fe2')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-rocs/PKGBUILD b/staging/kdeedu-rocs/PKGBUILD
index 604009744..2a7c0e908 100644
--- a/staging/kdeedu-rocs/PKGBUILD
+++ b/staging/kdeedu-rocs/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 152080 2012-03-04 14:47:21Z andrea $
+# $Id: PKGBUILD 154884 2012-03-31 07:46:29Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-rocs
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Rocs Graph Theory"
 url="http://kde.org/applications/education/rocs/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'boost-libs')
+depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/rocs-${pkgver}.tar.xz")
-sha1sums=('b485fe77d48bb82d3b2e6d79337ba4898c06ae5d')
+source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz")
+sha1sums=('3e22d284ec0ba40bc82dfc5f3b58b4a5721a8c64')
 options=('!makeflags')
 
 build() {
diff --git a/staging/kdeedu-step/PKGBUILD b/staging/kdeedu-step/PKGBUILD
index 3fca6f9e2..7a5702548 100644
--- a/staging/kdeedu-step/PKGBUILD
+++ b/staging/kdeedu-step/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152081 2012-03-04 14:47:48Z andrea $
+# $Id: PKGBUILD 154885 2012-03-31 07:46:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-step
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Interactive Physical Simulator"
 url="http://kde.org/applications/education/step/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/step-${pkgver}.tar.xz")
-sha1sums=('5b8da2e1efe783e46042603d9ba87f1f464ba105')
+source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz")
+sha1sums=('0620924f7683c29e855482af8822067722ced080')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdegames/PKGBUILD b/staging/kdegames/PKGBUILD
index f9fbf2227..5d15769ef 100644
--- a/staging/kdegames/PKGBUILD
+++ b/staging/kdegames/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152082 2012-03-04 14:49:19Z andrea $
+# $Id: PKGBUILD 154886 2012-03-31 07:48:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -43,16 +43,16 @@ pkgname=('kdegames-bomber'
          'kdegames-libkmahjongg'
          'kdegames-lskat'
          'kdegames-palapeli')
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
-makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python'
+makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python2'
              'openal')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('bcf764fd1f2f8083c388c17f26b83eeac568b1d5')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('9aeeccbc5f79f7f6b1e91bac41857ac3818cd989')
 
 build() {
 	cd $srcdir
@@ -101,7 +101,7 @@ package_kdegames-granatier() {
 
 package_kdegames-kajongg() {
 	pkgdesc='The ancient Chinese board game for 4 players'
-	depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted')
+	depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python2' 'twisted')
         url="http://www.kde.org/applications/games/kajongg/"
 	install='kdegames.install'
 	cd $srcdir/build/kajongg
diff --git a/staging/kdegraphics-gwenview/PKGBUILD b/staging/kdegraphics-gwenview/PKGBUILD
index a06f9527b..a4b2c4be7 100644
--- a/staging/kdegraphics-gwenview/PKGBUILD
+++ b/staging/kdegraphics-gwenview/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152083 2012-03-04 14:51:23Z andrea $
+# $Id: PKGBUILD 154887 2012-03-31 07:50:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-gwenview
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="A fast and easy to use image viewer for KDE"
 url="http://kde.org/applications/graphics/gwenview/"
@@ -13,8 +13,8 @@ depends=('kdebase-lib' 'libkipi')
 makedepends=('cmake' 'automoc4')
 optdepends=('kipi-plugins: extra plugins to share photos')
 install=$pkgname.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/gwenview-${pkgver}.tar.xz")
-sha1sums=('c549b0256140c6c466e3279cf12bdc6e6ee82960')
+source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz")
+sha1sums=('1c5293c258b5afeba5551bdd2029d83eb2ae7df3')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdegraphics-kamera/PKGBUILD b/staging/kdegraphics-kamera/PKGBUILD
index 69819b970..453703fab 100644
--- a/staging/kdegraphics-kamera/PKGBUILD
+++ b/staging/kdegraphics-kamera/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152084 2012-03-04 14:51:55Z andrea $
+# $Id: PKGBUILD 154889 2012-03-31 07:51:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kamera
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Configure Kamera"
 url="http://kde.org/applications/graphics/kamera/"
@@ -11,8 +11,8 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'gphoto2')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kamera-${pkgver}.tar.xz")
-sha1sums=('98a54976430aa3061d14f5b71c6d5d896abc9baf')
+source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz")
+sha1sums=('45beaa52b384e80a3c66f15587abc2938b64c4f1')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdegraphics-kcolorchooser/PKGBUILD b/staging/kdegraphics-kcolorchooser/PKGBUILD
index 004941744..a51da1457 100644
--- a/staging/kdegraphics-kcolorchooser/PKGBUILD
+++ b/staging/kdegraphics-kcolorchooser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152085 2012-03-04 14:52:19Z andrea $
+# $Id: PKGBUILD 154890 2012-03-31 07:51:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kcolorchooser
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Color Chooser"
 url="http://kde.org/applications/graphics/kcolorchooser/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kcolorchooser-${pkgver}.tar.xz")
-sha1sums=('b82a86ac95ca9b4c1dbd66b8164ce855232fec69')
+source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz")
+sha1sums=('0d1b46b7c90fc2910b3c7422469422efcebc39aa')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdegraphics-kgamma/PKGBUILD b/staging/kdegraphics-kgamma/PKGBUILD
index 9af0cf761..74e71e81d 100644
--- a/staging/kdegraphics-kgamma/PKGBUILD
+++ b/staging/kdegraphics-kgamma/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152086 2012-03-04 14:52:45Z andrea $
+# $Id: PKGBUILD 154891 2012-03-31 07:52:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kgamma
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="A monitor calibration tool"
 url="http://kde.org/applications/graphics/kgamma/"
@@ -14,8 +14,8 @@ groups=('kde' 'kdegraphics')
 #       but nvidia providing libgl does not depend on libxxf86vm
 depends=('kdebase-runtime' 'libxxf86vm')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kgamma-${pkgver}.tar.xz")
-sha1sums=('9829ed03f9faac64afafe83bb84eae0048929dfe')
+source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz")
+sha1sums=('222c2f7f16bae3dd450b04225b88596f4817e3a6')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdegraphics-kolourpaint/PKGBUILD b/staging/kdegraphics-kolourpaint/PKGBUILD
index e5dcd9683..8874f241c 100644
--- a/staging/kdegraphics-kolourpaint/PKGBUILD
+++ b/staging/kdegraphics-kolourpaint/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152087 2012-03-04 14:53:09Z andrea $
+# $Id: PKGBUILD 154892 2012-03-31 07:52:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kolourpaint
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Paint Program"
 url="http://kde.org/applications/graphics/kolourpaint/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'qimageblitz')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kolourpaint-${pkgver}.tar.xz")
-sha1sums=('7a6404f573671b8407a2cf4ec3543ab0883a7af2')
+source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz")
+sha1sums=('1a51dce10d29f5694216d99cb7c9b0964181fe50')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdegraphics-kruler/PKGBUILD b/staging/kdegraphics-kruler/PKGBUILD
index 88df04160..922cfded5 100644
--- a/staging/kdegraphics-kruler/PKGBUILD
+++ b/staging/kdegraphics-kruler/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152088 2012-03-04 14:53:35Z andrea $
+# $Id: PKGBUILD 154893 2012-03-31 07:53:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kruler
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Screen Ruler"
 url="http://kde.org/applications/graphics/kruler/"
@@ -12,8 +12,8 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kruler-${pkgver}.tar.xz")
-sha1sums=('e551744f2e3f772450eb6fe21358067e9448799e')
+source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz")
+sha1sums=('3db2efcc53a0ef1ba46d5f908f732da708b2b14c')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdegraphics-ksaneplugin/PKGBUILD b/staging/kdegraphics-ksaneplugin/PKGBUILD
index f6ef47c2d..e3125d466 100644
--- a/staging/kdegraphics-ksaneplugin/PKGBUILD
+++ b/staging/kdegraphics-ksaneplugin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152089 2012-03-04 14:54:04Z andrea $
+# $Id: PKGBUILD 154894 2012-03-31 07:53:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksaneplugin
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="A scan plugin that implements the scanning"
 url="http://kde.org/"
@@ -12,8 +12,8 @@ depends=('libksane')
 makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/ksaneplugin-${pkgver}.tar.xz")
-sha1sums=('6f59ab3630850d9ceee15e9d01cb1b6b6dedc9e9')
+source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz")
+sha1sums=('04a75bc260f0780a9c9dcbdd6b75418168ad5631')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdegraphics-ksnapshot/PKGBUILD b/staging/kdegraphics-ksnapshot/PKGBUILD
index 9b4318b6f..24208183c 100644
--- a/staging/kdegraphics-ksnapshot/PKGBUILD
+++ b/staging/kdegraphics-ksnapshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152090 2012-03-04 14:54:28Z andrea $
+# $Id: PKGBUILD 154895 2012-03-31 07:53:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksnapshot
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Screen Capture Program"
 url="http://kde.org/applications/graphics/ksnapshot/"
@@ -13,8 +13,8 @@ depends=('kdelibs' 'libkipi')
 makedepends=('cmake' 'automoc4')
 optdepends=('kipi-plugins')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/ksnapshot-${pkgver}.tar.xz")
-sha1sums=('3e8f0842d06d0fbb98dcebeba684847552fc02a9')
+source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz")
+sha1sums=('373362717f42b5996883eb405a756c8a570ce128')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdegraphics-mobipocket/PKGBUILD b/staging/kdegraphics-mobipocket/PKGBUILD
index 959c97385..bec4dfb8d 100644
--- a/staging/kdegraphics-mobipocket/PKGBUILD
+++ b/staging/kdegraphics-mobipocket/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152091 2012-03-04 14:54:53Z andrea $
+# $Id: PKGBUILD 154896 2012-03-31 07:54:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-mobipocket
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="A collection of plugins to handle mobipocket files"
 url="http://kde.org/"
@@ -13,8 +13,8 @@ makedepends=('cmake' 'automoc4' 'kdegraphics-okular')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('6ffef4612619ac433addee9fae7f49c05455863b')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('60ea4e3e0e7030ed61c35761c5542d967cd161fc')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdegraphics-okular/PKGBUILD b/staging/kdegraphics-okular/PKGBUILD
index a7c6bfc15..53834817a 100644
--- a/staging/kdegraphics-okular/PKGBUILD
+++ b/staging/kdegraphics-okular/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152034 2012-03-04 14:18:36Z andrea $
+# $Id: PKGBUILD 154839 2012-03-31 07:17:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-okular
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc='Document Viewer'
 arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
 makedepends=('cmake' 'automoc4')
 optdepends=('kdegraphics-mobipocket: mobipocket support')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/okular-${pkgver}.tar.xz")
-sha1sums=('ddf676820acf3615d1996bf40e82ebd5c9aa41d8')
+source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz")
+sha1sums=('174ff248e3a90246ee84d8aed4014d9864f9f807')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdegraphics-strigi-analyzer/PKGBUILD b/staging/kdegraphics-strigi-analyzer/PKGBUILD
index 8fe4a5370..3d292e2ce 100644
--- a/staging/kdegraphics-strigi-analyzer/PKGBUILD
+++ b/staging/kdegraphics-strigi-analyzer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152092 2012-03-04 14:55:22Z andrea $
+# $Id: PKGBUILD 154897 2012-03-31 07:54:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-strigi-analyzer
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Strigi analyzers for various graphics file formats"
 url="http://kde.org/"
@@ -12,8 +12,8 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('2e951029c3874cd5f10a75dc4d88b653b76a3121')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('6b61e1a949d0de92d5f4f1a822fe6dcaaa52b03c')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdegraphics-svgpart/PKGBUILD b/staging/kdegraphics-svgpart/PKGBUILD
index 0826a5f9a..797caa2b7 100644
--- a/staging/kdegraphics-svgpart/PKGBUILD
+++ b/staging/kdegraphics-svgpart/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152093 2012-03-04 14:55:50Z andrea $
+# $Id: PKGBUILD 154898 2012-03-31 07:55:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-svgpart
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="A KPart for viewving SVGs"
 url="http://kde.org/"
@@ -12,8 +12,8 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/svgpart-${pkgver}.tar.xz")
-sha1sums=('2332156b52c9f1a33cc0f0cb9d64f01aaf38f9bc')
+source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz")
+sha1sums=('f29c38a0d82d96140770a4a354d8087aaca9ddb8')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdegraphics-thumbnailers/PKGBUILD b/staging/kdegraphics-thumbnailers/PKGBUILD
index db08b6c54..08683383a 100644
--- a/staging/kdegraphics-thumbnailers/PKGBUILD
+++ b/staging/kdegraphics-thumbnailers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152094 2012-03-04 14:56:17Z andrea $
+# $Id: PKGBUILD 154899 2012-03-31 07:55:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-thumbnailers
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Thumbnailers for various graphics file formats"
 url="http://kde.org/"
@@ -12,8 +12,8 @@ depends=('libkexiv2' 'libkdcraw')
 makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('a714f485f68202c8b6e2716cf426abd6d82c0dc7')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('cd6e99a6c0db6bda765c765356ba9bbd601fba0d')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdemultimedia/PKGBUILD b/staging/kdemultimedia/PKGBUILD
index 35cb93be4..d8e186079 100644
--- a/staging/kdemultimedia/PKGBUILD
+++ b/staging/kdemultimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152095 2012-03-04 14:56:57Z andrea $
+# $Id: PKGBUILD 154900 2012-03-31 07:56:14Z 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.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -18,9 +18,9 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdemultimedia')
 makedepends=('cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer'
              'pulseaudio' 'libmusicbrainz3')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz"
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'mplayerthumbs.config')
-sha1sums=('9de14f08c7f1649201be029b8e683a296cc75f52'
+sha1sums=('8f54038cc68f91acef07fed711f83407c113b88b'
           'ba016fa2563c14ffcba852c62506b66bfc6ee683')
 
 build() {
diff --git a/staging/kdenetwork/PKGBUILD b/staging/kdenetwork/PKGBUILD
index 5bd26e0ec..3fe235f7d 100644
--- a/staging/kdenetwork/PKGBUILD
+++ b/staging/kdenetwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152431 2012-03-06 21:03:24Z andrea $
+# $Id: PKGBUILD 154901 2012-03-31 07:57:02Z 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.8.1
-pkgrel=2
+pkgver=4.8.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -21,7 +21,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
     'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
     'libktorrent' 'libmms' 'mediastreamer')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('e914a1d990ff42ec88cf37ffc897ae9df9b1fa45')
+sha1sums=('a899a9ef1637612a5ec14bb3ff950f3ed565d60e')
 
 build() {
     cd "${srcdir}"
diff --git a/staging/kdepim-runtime/PKGBUILD b/staging/kdepim-runtime/PKGBUILD
index d085dc553..9e73c83e4 100644
--- a/staging/kdepim-runtime/PKGBUILD
+++ b/staging/kdepim-runtime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 152031 2012-03-04 14:17:05Z andrea $
+# $Id: PKGBUILD 154836 2012-03-31 07:15:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepim-runtime
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc='KDE PIM Runtime Environment'
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdepimlibs' 'kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('2e2e5f1dbfd1b54f0e2b71f9f23be2cfa94348f2')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('afb6ad8f9f2fa4193c8fa13cac816e693f447db9')
 
 build() {
     cd "${srcdir}"
diff --git a/staging/kdepim/PKGBUILD b/staging/kdepim/PKGBUILD
index 2e5a27241..fce7249d7 100644
--- a/staging/kdepim/PKGBUILD
+++ b/staging/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152421 2012-03-06 19:04:36Z andrea $
+# $Id: PKGBUILD 154902 2012-03-31 07:58:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -19,8 +19,8 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-kresources'
          'kdepim-ktimetracker'
          'kdepim-libkdepim')
-pkgver=4.8.1
-pkgrel=2
+pkgver=4.8.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -28,7 +28,7 @@ groups=('kde' 'kdepim')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
              'kde-agent')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('93222d56f9adde015cb202a1ad3b194ac52e6bda')
+sha1sums=('1c3a459ef4d76e1247ac47816bf2b7ea6e37908a')
 
 build() {
     cd "${srcdir}"
diff --git a/staging/kdepimlibs/PKGBUILD b/staging/kdepimlibs/PKGBUILD
index 285fee625..96c0918a6 100644
--- a/staging/kdepimlibs/PKGBUILD
+++ b/staging/kdepimlibs/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 152028 2012-03-04 14:11:34Z andrea $
+# $Id: PKGBUILD 154833 2012-03-31 07:09:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepimlibs
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="KDE PIM Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison')
-makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
+makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl')
 install='kdepimlibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('ccc653df34fd8f5f8eddac9a9e14f0fa1ea82839')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('038474d1c8a3d5c430f25823e25330fa464cfe40')
 
 build() {
 	cd ${srcdir}
diff --git a/staging/kdeplasma-addons/PKGBUILD b/staging/kdeplasma-addons/PKGBUILD
index a7270d62a..f6cc95c72 100644
--- a/staging/kdeplasma-addons/PKGBUILD
+++ b/staging/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152098 2012-03-04 14:59:51Z andrea $
+# $Id: PKGBUILD 154903 2012-03-31 07:59:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -74,7 +74,7 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-potd'
          'kdeplasma-addons-wallpapers-virus'
          'kdeplasma-addons-wallpapers-weather')
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -82,8 +82,8 @@ license=('GPL' 'LGPL')
 groups=('kde' 'kdeplasma-addons')
 makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen'
              'scim' 'qwt' 'boost' 'libkexiv2' 'ibus')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('dad77ee1f6ab341a327d694f670e15f160d77d7c')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('1f9db32c724ce9aee6f46bc11a8d2fc073975657')
 
 build() {
     cd "${srcdir}"
diff --git a/staging/kdesdk-kate/PKGBUILD b/staging/kdesdk-kate/PKGBUILD
index 631090335..074b070d3 100644
--- a/staging/kdesdk-kate/PKGBUILD
+++ b/staging/kdesdk-kate/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 152035 2012-03-04 14:19:16Z andrea $
+# $Id: PKGBUILD 154840 2012-03-31 07:17:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdesdk-kate
-pkgname=('kdebase-kwrite'
+pkgname=('kdebase-katepart'
+         'kdebase-kwrite'
          'kdesdk-kate')
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('kdelibs ''cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kate-${pkgver}.tar.xz"
+source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
         'pkgbuild-syntax-highlight.patch')
-sha1sums=('d5bd513cd2bfefc2d345547115d0cb0a9d3e6143'
+sha1sums=('6bf4796574a003a4edadfb2029725805235bd086'
           '0a928253bd2077f0264d96a6c8823c69c47b6a8d')
 
 build() {
@@ -23,14 +24,23 @@ build() {
   cd build
   cmake ../kate-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_KTEXTEDITOR=OFF
+    -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
+package_kdebase-katepart() {
+  pkgdesc="A fast and feature-rich text editor component"
+  depends=('kdelibs')
+  url="http://kate-editor.org/about-katepart/"
+  install='kdebase-katepart.install'
+
+  cd "${srcdir}"/build/part
+  make DESTDIR="${pkgdir}" install
+}
+
 package_kdebase-kwrite() {
   pkgdesc="Text Editor"
-  depends=('kdebase-runtime')
+  depends=('kdebase-runtime' 'kdebase-katepart')
   groups=('kde' 'kdebase')
   url="http://www.kde.org/applications/utilities/kwrite/"
   install='kdebase-kwrite.install'
@@ -38,16 +48,13 @@ package_kdebase-kwrite() {
   cd "${srcdir}"/build/kwrite
   make DESTDIR="${pkgdir}" install
 
-  cd "${srcdir}"/build/part
-  make DESTDIR="${pkgdir}" install
-
   cd "${srcdir}"/build/doc/kwrite
   make DESTDIR="${pkgdir}" install
 }
 
 package_kdesdk-kate() {
   pkgdesc="Advanced Text Editor"
-  depends=('kdebase-kwrite')
+  depends=('kdebase-runtime' 'kdebase-katepart')
   groups=('kde' 'kdesdk')
   url="http://www.kde.org/applications/utilities/kate/"
   install='kdesdk-kate.install'
diff --git a/staging/kdesdk-kate/kdebase-katepart.install b/staging/kdesdk-kate/kdebase-katepart.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/staging/kdesdk-kate/kdebase-katepart.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/staging/kdesdk/PKGBUILD b/staging/kdesdk/PKGBUILD
index 30c9faa5e..e4c4fb7c7 100644
--- a/staging/kdesdk/PKGBUILD
+++ b/staging/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152099 2012-03-04 15:01:25Z andrea $
+# $Id: PKGBUILD 154904 2012-03-31 08:00:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -22,7 +22,7 @@ pkgname=('kdesdk-cervisia'
          'kdesdk-scripts'
          'kdesdk-strigi-analyzer'
          'kdesdk-umbrello')
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -30,9 +30,9 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs'
              'kdebase-lib')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz"
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'fix-python2-path.patch')
-sha1sums=('5104445024047ae01099e7baa8e5b47a63b76198'
+sha1sums=('d080aee7222b8cf3cede8eccf193f0694338056c'
           '923cabd7a877cf9a68efeb24fbf3d5827e1d949e')
 
 build() {
@@ -104,7 +104,7 @@ package_kdesdk-kcachegrind() {
 
 package_kdesdk-kdeaccounts-plugin() {
         pkgdesc='KDE Repository Accounts'
-        depends=('kdepim-runtime')
+        depends=('kdebase-runtime' 'kdepimlibs')
         cd $srcdir/build/kdeaccounts-plugin
         make DESTDIR=$pkgdir install
 }
@@ -183,7 +183,7 @@ package_kdesdk-kuiviewer() {
 
 package_kdesdk-lokalize() {
 	pkgdesc='Computer-Aided Translation System'
-	depends=('kdebase-runtime' 'kdebindings-python')
+	depends=('kdebase-runtime' 'kdebindings-python2')
 	url="http://kde.org/applications/development/lokalize/"
 	optdepends=('translate-toolkit: enable extra python script')
 	install='kdesdk-lokalize.install'
diff --git a/staging/kdetoys/PKGBUILD b/staging/kdetoys/PKGBUILD
index 3d73b5909..b9c608d14 100644
--- a/staging/kdetoys/PKGBUILD
+++ b/staging/kdetoys/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152100 2012-03-04 15:02:04Z andrea $
+# $Id: PKGBUILD 154905 2012-03-31 08:01:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -6,15 +6,15 @@ pkgbase=kdetoys
 pkgname=('kdetoys-amor'
          'kdetoys-kteatime'
          'kdetoys-ktux')
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdetoys')
 makedepends=('cmake' 'automoc4' 'kdebase-workspace')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('b0a1c26fa00795767c0d73ff3d25cc339cb005b8')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('d6414aadd77a4c84fdd1d72c32bc066251b30bde')
 
 build() {
 	cd $srcdir
diff --git a/staging/kdeutils-filelight/PKGBUILD b/staging/kdeutils-filelight/PKGBUILD
index c659bd746..2a5c1ab06 100644
--- a/staging/kdeutils-filelight/PKGBUILD
+++ b/staging/kdeutils-filelight/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152102 2012-03-04 15:02:53Z andrea $
+# $Id: PKGBUILD 154907 2012-03-31 08:02:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-filelight
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc='View disk usage information'
 url='http://kde.org/applications/utilities/filelight'
@@ -14,8 +14,8 @@ groups=('kde' 'kdeutils')
 replaces=('filelight')
 conflicts=('filelight')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/filelight-${pkgver}.tar.xz")
-sha1sums=('24cd19b927221de2dafd2a1c3d5e8a72a41ec4b5')
+source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz")
+sha1sums=('76d8c729e259e2395258f6114e737b07b6671846')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeutils-kcalc/PKGBUILD b/staging/kdeutils-kcalc/PKGBUILD
index e9dd112ec..85078427a 100644
--- a/staging/kdeutils-kcalc/PKGBUILD
+++ b/staging/kdeutils-kcalc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152103 2012-03-04 15:03:17Z andrea $
+# $Id: PKGBUILD 154908 2012-03-31 08:02:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcalc
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc='Scientific Calculator'
 url='http://kde.org/applications/utilities/kcalc/'
@@ -12,8 +12,8 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kcalc-${pkgver}.tar.xz")
-sha1sums=('f119707ece800a2102eb881402a5bc289b2a55ea')
+source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz")
+sha1sums=('f2bbed3d7f991a4cd0484cc4fafe8c04bd29d986')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeutils-kcharselect/PKGBUILD b/staging/kdeutils-kcharselect/PKGBUILD
index 8cbae2f1e..18a45ced4 100644
--- a/staging/kdeutils-kcharselect/PKGBUILD
+++ b/staging/kdeutils-kcharselect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152104 2012-03-04 15:03:44Z andrea $
+# $Id: PKGBUILD 154909 2012-03-31 08:02:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcharselect
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc='Character Selector'
 url="http://kde.org/applications/utilities/kcharselect/"
@@ -11,8 +11,8 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kcharselect-${pkgver}.tar.xz")
-sha1sums=('06888b54f8c139966f327dd1955c25c967d437fb')
+source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz")
+sha1sums=('527d28bf3bb22d38665a006ab835ff6d75f592a4')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeutils-kdf/PKGBUILD b/staging/kdeutils-kdf/PKGBUILD
index 414e69448..3e14d48d6 100644
--- a/staging/kdeutils-kdf/PKGBUILD
+++ b/staging/kdeutils-kdf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152105 2012-03-04 15:04:08Z andrea $
+# $Id: PKGBUILD 154910 2012-03-31 08:03:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kdf
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 url="http://kde.org/applications/system/kdiskfree/"
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kdf-${pkgver}.tar.xz")
-sha1sums=('fb28f99b23819f3618a8857affdaad1957f8bd68')
+source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz")
+sha1sums=('50754775bacf562ff53862b2005901501f8eb1c4')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeutils-kfloppy/PKGBUILD b/staging/kdeutils-kfloppy/PKGBUILD
index 1e276665a..a5429b342 100644
--- a/staging/kdeutils-kfloppy/PKGBUILD
+++ b/staging/kdeutils-kfloppy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152107 2012-03-04 15:04:33Z andrea $
+# $Id: PKGBUILD 154911 2012-03-31 08:03:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kfloppy
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc='Floppy Formatter'
 url='http://kde.org/applications/utilities/kfloppy/'
@@ -12,8 +12,8 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kfloppy-${pkgver}.tar.xz")
-sha1sums=('78c5dfa1198d9c215ff2a22b82c4e3db2b7c0485')
+source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz")
+sha1sums=('abbbd2908caeade32912cff7db13a50199fae453')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeutils-kgpg/PKGBUILD b/staging/kdeutils-kgpg/PKGBUILD
index 5e4be5008..246ed861d 100644
--- a/staging/kdeutils-kgpg/PKGBUILD
+++ b/staging/kdeutils-kgpg/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 152108 2012-03-04 15:04:57Z andrea $
+# $Id: PKGBUILD 154912 2012-03-31 08:04:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kgpg
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc='A GnuPG frontend'
 url='http://kde.org/applications/utilities/kgpg/'
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-depends=('kdepim-runtime' 'kde-agent')
+depends=('kdebase-runtime' 'kdepimlibs' 'kde-agent')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kgpg-${pkgver}.tar.xz")
-sha1sums=('40f5bd3f2d4bfeed56e519194c41049e14899e36')
+source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz")
+sha1sums=('ef4833daa82e277f2336e68c0d586cf180a1510f')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeutils-kremotecontrol/PKGBUILD b/staging/kdeutils-kremotecontrol/PKGBUILD
index 2360606b4..e2bcdf689 100644
--- a/staging/kdeutils-kremotecontrol/PKGBUILD
+++ b/staging/kdeutils-kremotecontrol/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kremotecontrol
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc='Configure your remote controls for use with applications'
 url='http://kde.org/applications/utilities/kremotecontrol/'
@@ -14,8 +14,8 @@ groups=('kde' 'kdeutils')
 replaces=('kdeutils-kdelirc')
 conflicts=('kdeutils-kdelirc')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kremotecontrol-${pkgver}.tar.xz")
-sha1sums=('684ad9b0393081a39b2c6badb2f411846e582bb2')
+source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz")
+sha1sums=('2269320a9a33a29511c14c7e6c46bff22474076a')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeutils-ksecrets/PKGBUILD b/staging/kdeutils-ksecrets/PKGBUILD
index 2b84caf32..853b64671 100644
--- a/staging/kdeutils-ksecrets/PKGBUILD
+++ b/staging/kdeutils-ksecrets/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152110 2012-03-04 15:05:49Z andrea $
+# $Id: PKGBUILD 154914 2012-03-31 08:04:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-ksecrets
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc='Secrets Management Infrastructure for KDE'
 url='http://techbase.kde.org/Projects/Utils/ksecretsservice'
@@ -12,8 +12,8 @@ depends=('kdebase-workspace' 'qca-ossl')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/ksecrets-${pkgver}.tar.xz")
-sha1sums=('7ff7889da899dbac86ae63b0e25c2a8cde59fc32')
+source=("http://download.kde.org/stable/${pkgver}/src/ksecrets-${pkgver}.tar.xz")
+sha1sums=('53a13dfd7b6f97195a9519497cd48d3304e6e39d')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeutils-ktimer/PKGBUILD b/staging/kdeutils-ktimer/PKGBUILD
index d7936f5ad..56b1c11d3 100644
--- a/staging/kdeutils-ktimer/PKGBUILD
+++ b/staging/kdeutils-ktimer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152111 2012-03-04 15:06:13Z andrea $
+# $Id: PKGBUILD 154915 2012-03-31 08:05:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-ktimer
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc='Countdown Launcher'
 url='http://kde.org/applications/utilities/ktimer/'
@@ -12,8 +12,8 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/ktimer-${pkgver}.tar.xz")
-sha1sums=('c16ace45eefe9d495086a08fb1c0144baec9572f')
+source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz")
+sha1sums=('4e92e995041043a8dcd62caf21ff91d602aaefdf')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeutils-kwallet/PKGBUILD b/staging/kdeutils-kwallet/PKGBUILD
index 29c973791..c8b72a6ed 100644
--- a/staging/kdeutils-kwallet/PKGBUILD
+++ b/staging/kdeutils-kwallet/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152112 2012-03-04 15:06:37Z andrea $
+# $Id: PKGBUILD 154916 2012-03-31 08:05:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kwallet
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc='Wallet Management Tool'
 url='http://kde.org/applications/system/kwalletmanager/'
@@ -12,8 +12,8 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kwallet-${pkgver}.tar.xz")
-sha1sums=('39c1d6720cd486e86179468b5606923bab73cb9e')
+source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz")
+sha1sums=('3a9b13fff2c156fb642b2fff1f93180b4b564c20')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeutils-superkaramba/PKGBUILD b/staging/kdeutils-superkaramba/PKGBUILD
index 831308948..20171ca0d 100644
--- a/staging/kdeutils-superkaramba/PKGBUILD
+++ b/staging/kdeutils-superkaramba/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152114 2012-03-04 15:07:27Z andrea $
+# $Id: PKGBUILD 154918 2012-03-31 08:06:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-superkaramba
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc='An engine for cool desktop eyecandy'
 url='http://kde.org/applications/utilities/superkaramba/'
@@ -12,8 +12,8 @@ depends=('kdebase-runtime' 'qimageblitz')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/superkaramba-${pkgver}.tar.xz")
-sha1sums=('934a62e3d82e92a99b9d070a2dd39634b7351cea')
+source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz")
+sha1sums=('5cddf45820903fe3f44873ceda907e100dbdc66b')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeutils-sweeper/PKGBUILD b/staging/kdeutils-sweeper/PKGBUILD
index a3592c49c..6941af118 100644
--- a/staging/kdeutils-sweeper/PKGBUILD
+++ b/staging/kdeutils-sweeper/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152115 2012-03-04 15:07:56Z andrea $
+# $Id: PKGBUILD 154919 2012-03-31 08:07:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-sweeper
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc='System Cleaner'
 url='http://kde.org/applications/utilities/sweeper'
@@ -12,8 +12,8 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/sweeper-${pkgver}.tar.xz")
-sha1sums=('7a11a22397bbe5106118ed94942f27f546fad80b')
+source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz")
+sha1sums=('ddb2eeb947e43e52e166cad962b5b4bddd5efd37')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdewebdev/PKGBUILD b/staging/kdewebdev/PKGBUILD
index eda5c303d..c7511686b 100644
--- a/staging/kdewebdev/PKGBUILD
+++ b/staging/kdewebdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152116 2012-03-04 15:08:26Z andrea $
+# $Id: PKGBUILD 154920 2012-03-31 08:07:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -7,15 +7,15 @@ pkgname=('kdewebdev-kfilereplace'
          'kdewebdev-kimagemapeditor'
          'kdewebdev-klinkstatus'
          'kdewebdev-kommander')
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdewebdev')
-makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('c707886d79d9ba150c408326efccf24847d5dc38')
+makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('34b229bf778109e0cbd10765c0bd7341f95cd46d')
 
 build() {
 	cd $srcdir
@@ -42,7 +42,7 @@ package_kdewebdev-kfilereplace() {
 package_kdewebdev-kimagemapeditor() {
 	pkgdesc='HTML Image Map Editor'
 	depends=('kdebase-runtime')
-        url="http://www.kde.org/applications/development/kimagemapeditor/"
+    url="http://www.kde.org/applications/development/kimagemapeditor/"
 	install='kdewebdev-kimagemapeditor.install'
 	cd $srcdir/build/kimagemapeditor
 	make DESTDIR=$pkgdir install
@@ -52,8 +52,8 @@ package_kdewebdev-kimagemapeditor() {
 
 package_kdewebdev-klinkstatus() {
 	pkgdesc='Link Checker'
-	depends=('kdepim-runtime' 'tidyhtml')
-        url="http://www.kde.org/applications/development/klinkstatus/"
+	depends=('kdebase-runtime' 'kdepimlibs' 'tidyhtml')
+    url="http://www.kde.org/applications/development/klinkstatus/"
 	install='kdewebdev.install'
 	cd $srcdir/build/klinkstatus
 	make DESTDIR=$pkgdir install
diff --git a/staging/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch b/staging/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
new file mode 100644
index 000000000..bf2c3501f
--- /dev/null
+++ b/staging/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
@@ -0,0 +1,50 @@
+From 666ba68a0635048aea0db70cd9ec61aea9b61ed2 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Sat, 3 Mar 2012 12:37:06 +0100
+Subject: [PATCH 1/2] split usr: read configs from /lib/{depmod.d,modprobe.d}
+
+This allows rootprefix to be set to /usr, even if not all other packages
+have been fixed to read from this dir.
+---
+ libkmod/libkmod.c   |    5 +++--
+ tools/kmod-depmod.c |    1 +
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
+index 36ca629..12c1112 100644
+--- a/libkmod/libkmod.c
++++ b/libkmod/libkmod.c
+@@ -62,6 +62,7 @@ static const char *default_config_paths[] = {
+ 	SYSCONFDIR "/modprobe.d",
+ 	"/run/modprobe.d",
+ 	ROOTPREFIX "/lib/modprobe.d",
++	"/lib/modprobe.d",
+ 	NULL
+ };
+ 
+@@ -223,8 +224,8 @@ static char *get_kernel_release(const char *dirname)
+  * @config_paths: ordered array of paths (directories or files) where
+  *                to load from user-defined configuration parameters such as
+  *                alias, blacklists, commands (install, remove). If
+- *                NULL defaults to /run/modprobe.d, /etc/modprobe.d and
+- *                $rootprefix/lib/modprobe.d. Give an empty vector if
++ *                NULL defaults to /run/modprobe.d, /etc/modprobe.d,
++ *                $rootprefix/lib/modprobe.d and /lib/modprobe.d. Give an empty vector if
+  *                configuration should not be read. This array must be null
+  *                terminated.
+  *
+diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
+index 1871e18..7bb1c5d 100644
+--- a/tools/kmod-depmod.c
++++ b/tools/kmod-depmod.c
+@@ -58,6 +58,7 @@ static const char *default_cfg_paths[] = {
+ 	"/run/depmod.d",
+ 	SYSCONFDIR "/depmod.d",
+ 	ROOTPREFIX "/lib/depmod.d",
++	"/lib/depmod.d",
+ 	NULL
+ };
+ 
+-- 
+1.7.9.5
+
diff --git a/staging/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch b/staging/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
new file mode 100644
index 000000000..f39f36ace
--- /dev/null
+++ b/staging/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
@@ -0,0 +1,93 @@
+From 53e7e0e42428770578ca0d54d0a9540f498f917f Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Sat, 31 Mar 2012 12:17:39 +0200
+Subject: [PATCH 2/2] config: hardcode the path to modules to be /lib/modules
+
+This means that we can move the configuration paths from /lib
+to /usr/lib without having to touch the kernel and related
+packages.
+
+That can be dealt with separately at a later location, in which case
+all we have to do is revert this patch.
+
+Signed-off-by: Tom Gundersen <teg@jklm.no>
+---
+ libkmod/libkmod.c     |    2 +-
+ tools/kmod-depmod.c   |    2 +-
+ tools/kmod-modinfo.c  |    4 ++--
+ tools/kmod-modprobe.c |    4 ++--
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
+index 12c1112..11edfa0 100644
+--- a/libkmod/libkmod.c
++++ b/libkmod/libkmod.c
+@@ -196,7 +196,7 @@ static int log_priority(const char *priority)
+ 	return 0;
+ }
+ 
+-static const char *dirname_default_prefix = ROOTPREFIX "/lib/modules";
++static const char *dirname_default_prefix = "/lib/modules";
+ 
+ static char *get_kernel_release(const char *dirname)
+ {
+diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
+index 7bb1c5d..454d538 100644
+--- a/tools/kmod-depmod.c
++++ b/tools/kmod-depmod.c
+@@ -2634,7 +2634,7 @@ static int do_depmod(int argc, char *argv[])
+ 	}
+ 
+ 	cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX,
+-				  "%s" ROOTPREFIX "/lib/modules/%s",
++				  "%s/lib/modules/%s",
+ 				  root == NULL ? "" : root, cfg.kversion);
+ 
+ 	if (optind == argc)
+diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
+index aa5223f..b13cd4b 100644
+--- a/tools/kmod-modinfo.c
++++ b/tools/kmod-modinfo.c
+@@ -339,7 +339,7 @@ static void help(const char *progname)
+ 		"\t-0, --null                  Use \\0 instead of \\n\n"
+ 		"\t-F, --field=FIELD           Print only provided FIELD\n"
+ 		"\t-k, --set-version=VERSION   Use VERSION instead of `uname -r`\n"
+-		"\t-b, --basedir=DIR           Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n"
++		"\t-b, --basedir=DIR           Use DIR as filesystem root for /lib/modules\n"
+ 		"\t-V, --version               Show version\n"
+ 		"\t-h, --help                  Show this help\n",
+ 		progname);
+@@ -439,7 +439,7 @@ static int do_modinfo(int argc, char *argv[])
+ 			}
+ 			kversion = u.release;
+ 		}
+-		snprintf(dirname_buf, sizeof(dirname_buf), "%s" ROOTPREFIX "/lib/modules/%s",
++		snprintf(dirname_buf, sizeof(dirname_buf), "%s/lib/modules/%s",
+ 			 root, kversion);
+ 		dirname = dirname_buf;
+ 	}
+diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
+index 4760682..ccb41d8 100644
+--- a/tools/kmod-modprobe.c
++++ b/tools/kmod-modprobe.c
+@@ -128,7 +128,7 @@ static void help(const char *progname)
+ 		"\t-n, --show                  Same as --dry-run\n"
+ 
+ 		"\t-C, --config=FILE           Use FILE instead of default search paths\n"
+-		"\t-d, --dirname=DIR           Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n"
++		"\t-d, --dirname=DIR           Use DIR as filesystem root for /lib/modules\n"
+ 		"\t-S, --set-version=VERSION   Use VERSION instead of `uname -r`\n"
+ 
+ 		"\t-s, --syslog                print to syslog, not stderr\n"
+@@ -973,7 +973,7 @@ static int do_modprobe(int argc, char **orig_argv)
+ 			kversion = u.release;
+ 		}
+ 		snprintf(dirname_buf, sizeof(dirname_buf),
+-				"%s" ROOTPREFIX "/lib/modules/%s", root,
++				"%s/lib/modules/%s", root,
+ 				kversion);
+ 		dirname = dirname_buf;
+ 	}
+-- 
+1.7.9.5
+
diff --git a/staging/kmod/PKGBUILD b/staging/kmod/PKGBUILD
new file mode 100644
index 000000000..d06c84008
--- /dev/null
+++ b/staging/kmod/PKGBUILD
@@ -0,0 +1,61 @@
+# $Id: PKGBUILD 154955 2012-03-31 21:06:52Z tomegun $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+
+pkgname=kmod
+pkgver=7
+pkgrel=2
+pkgdesc="Linux kernel module handling"
+arch=('i686' 'x86_64')
+url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
+license=('GPL2')
+depends=('glibc' 'zlib')
+options=('!libtool')
+provides=('module-init-tools=3.16')
+conflicts=('module-init-tools')
+replaces=('module-init-tools')
+source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
+        "depmod-search.conf"
+        "0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch"
+        "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch")
+md5sums=('7bd916ae1c8a38e7697fdd8118bc98eb'
+         'dd62cbf62bd8f212f51ef8c43bec9a77'
+         'ba73b9e98db1abbf41274f922fcfbd55'
+         'c9af56636c5667cf4ce3a31ea56e03d9')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  patch -p1 -i ../0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
+  patch -p1 -i ../0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
+
+  ./configure \
+    --sysconfdir=/etc \
+    --with-zlib \
+    --with-rootprefix=/usr
+
+  make
+}
+
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
+package() {
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+  # extra directories
+  install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin"
+
+  # add symlinks to kmod
+  ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe"
+  ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod"
+
+  for tool in {ins,ls,rm}mod modinfo; do
+    ln -s kmod "$pkgdir/usr/bin/$tool"
+  done
+
+  # install depmod.d file for search/ dir
+  install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/usr/lib/depmod.d/search.conf"
+}
+
+# vim: ft=sh syn=sh et
diff --git a/staging/kmod/depmod-search.conf b/staging/kmod/depmod-search.conf
new file mode 100644
index 000000000..36f2cf7db
--- /dev/null
+++ b/staging/kmod/depmod-search.conf
@@ -0,0 +1,5 @@
+#
+# /usr/lib/depmod.d/search.conf
+#
+
+search updates extramodules built-in
diff --git a/staging/libgpod/PKGBUILD b/staging/libgpod/PKGBUILD
new file mode 100644
index 000000000..fbd367677
--- /dev/null
+++ b/staging/libgpod/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 154964 2012-03-31 22:50:08Z tomegun $
+# Maintainer: Daniel Isenmann <daniel@archlinux.org>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=libgpod
+pkgver=0.8.2
+pkgrel=4
+pkgdesc="A shared library to access the contents of an iPod"
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice')
+makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2')
+optdepends=('gtk-sharp-2: Mono bindings')
+url="http://www.gtkpod.org/libgpod/"
+source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
+options=('!libtool' '!emptydirs')
+md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --with-udev-dir=/usr/lib/udev \
+      --enable-udev --with-python=/usr/bin/python2
+  make PREFIX=/usr
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make PREFIX=/usr DESTDIR="${pkgdir}" install
+}
+
diff --git a/staging/libkdcraw/PKGBUILD b/staging/libkdcraw/PKGBUILD
index 96f7530b6..d2e5d7c34 100644
--- a/staging/libkdcraw/PKGBUILD
+++ b/staging/libkdcraw/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152046 2012-03-04 14:27:03Z andrea $
+# $Id: PKGBUILD 154850 2012-03-31 07:25:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdcraw
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="A C++ interface used to decode RAW picture"
 url="http://kde.org/"
@@ -13,8 +13,8 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('80dd47457b9803240a3002ef42d96e201d9face8')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('38708f1b223740ae105295cdaa6ee372e31c43bc')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/libkdeedu/PKGBUILD b/staging/libkdeedu/PKGBUILD
index bd760b2a4..58c296c3b 100644
--- a/staging/libkdeedu/PKGBUILD
+++ b/staging/libkdeedu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152044 2012-03-04 14:25:39Z andrea $
+# $Id: PKGBUILD 154848 2012-03-31 07:24:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdeedu
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Libraries used by KDE Education applications"
 url="http://kde.org/"
@@ -12,8 +12,8 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 replaces=('kdeedu-libkdeedu' 'kdeedu-data')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('ab9ed54dcb99f7cfe98623aa47434841f372a5a7')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('7c2bebb2d29793a1cab949382c19d2420398bf08')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/libkexiv2/PKGBUILD b/staging/libkexiv2/PKGBUILD
index f0fed8e0f..ca9537d72 100644
--- a/staging/libkexiv2/PKGBUILD
+++ b/staging/libkexiv2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152047 2012-03-04 14:27:30Z andrea $
+# $Id: PKGBUILD 154851 2012-03-31 07:26:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkexiv2
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="A library to manipulate pictures metadata"
 url="http://kde.org/"
@@ -12,8 +12,8 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('273d76f2414c2dc442ab8f9dc72578977aba0f0c')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('fe32631401be655d4692fec724743d5f623b880d')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/libkipi/PKGBUILD b/staging/libkipi/PKGBUILD
index d4332a378..69bdadf6f 100644
--- a/staging/libkipi/PKGBUILD
+++ b/staging/libkipi/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkipi
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="An interface to use kipi-plugins from a KDE application"
 url="http://kde.org/"
@@ -13,8 +13,8 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('bc290e3354c206d7852433aac704fc96b3a55700')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('c2f788e05f5e6d52e10578ebd58a2b1dd8f65c89')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/libksane/PKGBUILD b/staging/libksane/PKGBUILD
index 42fc7cf99..e3af438aa 100644
--- a/staging/libksane/PKGBUILD
+++ b/staging/libksane/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152049 2012-03-04 14:28:20Z andrea $
+# $Id: PKGBUILD 154853 2012-03-31 07:27:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libksane
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="An image scanning library"
 url="http://kde.org/"
@@ -13,8 +13,8 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('20631624185f8bf26d7a8c2e7222731513e8a2ec')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('fe9376710687c2e9354bd5f8245755c53e2ad91c')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/libmtp/PKGBUILD b/staging/libmtp/PKGBUILD
new file mode 100644
index 000000000..3e394fd79
--- /dev/null
+++ b/staging/libmtp/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 154966 2012-03-31 23:02:48Z tomegun $
+# Contributor: damir <damir@archlinux.org>
+# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
+
+pkgname=libmtp
+pkgver=1.1.2
+pkgrel=2
+pkgdesc="Library implementation of the Media Transfer Protocol"
+arch=("i686" "x86_64")
+url="http://libmtp.sourceforge.net"
+license=('LGPL')
+depends=('libusb')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('6dc708757e3fd3ccce7445b4f2171263')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --with-udev=/usr/lib/udev
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/pcmciautils/PKGBUILD b/staging/pcmciautils/PKGBUILD
new file mode 100644
index 000000000..e76e08b34
--- /dev/null
+++ b/staging/pcmciautils/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 154968 2012-03-31 23:04:36Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=pcmciautils
+pkgver=018
+pkgrel=3
+pkgdesc="Utilities for inserting and removing PCMCIA cards"
+arch=(i686 x86_64)
+url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
+license=('GPL')
+groups=('base')
+# sysfsutils will not be required in the next release
+depends=('udev' 'sysfsutils')
+conflicts=('pcmcia-cs')
+# source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2) broken due to breakin
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+options=(!makeflags)
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i -e 's,/usr/bin/install,install,g;
+             s,/lib/udev,/usr/lib/udev,g' Makefile
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+md5sums=('964c802994677a71b38ec56554aa229f')
diff --git a/staging/system-config-printer/PKGBUILD b/staging/system-config-printer/PKGBUILD
new file mode 100644
index 000000000..3875bb476
--- /dev/null
+++ b/staging/system-config-printer/PKGBUILD
@@ -0,0 +1,104 @@
+# $Id: PKGBUILD 154970 2012-03-31 23:15:18Z tomegun $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgbase=system-config-printer
+pkgname=('system-config-printer-common'
+         'system-config-printer-gnome')
+pkgver=1.3.9
+pkgrel=2
+pkgdesc="A CUPS printer configuration tool and status applet"
+url="http://cyberelk.net/tim/software/system-config-printer/"
+arch=('i686' 'x86_64')
+license=('GPL')
+makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils')
+source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig})
+md5sums=('df424f127eede63965608e5ec5e27519'
+         'd105b7f7725c1ec538b6e6adb10667f3')
+
+build() {
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+
+  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+    $(find . -name '*.py')
+  sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer 
+
+  ./configure --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --with-udev-rules
+
+  make
+}
+
+package_system-config-printer-common() {
+  pkgdesc='Pygtk CUPS Configuration'
+  depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python-pycurl' 'libusb-compat')
+  optdepends=('system-config-printer-gnome: for the GTK frontend'
+	'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings')
+  replaces=('system-config-printer')
+  provides=("system-config-printer=${pkgver}")
+  conflicts=('system-config-printer')
+
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  install -d "${pkgdir}"/usr/share/${pkgbase}
+  install -m644 config.py \
+    debug.py \
+    installpackage.py \
+    monitor.py \
+    PhysicalDevice.py \
+    ppdippstr.py \
+    probe_printer.py \
+    SearchCriterion.py \
+    smburi.py \
+    statereason.py \
+    "${pkgdir}"/usr/share/${pkgbase}/
+
+  install -m755 pysmb.py \
+    "${pkgdir}"/usr/share/${pkgbase}/
+
+  install -d "${pkgdir}"/etc/dbus-1/system.d/
+  install -m644 dbus/com.redhat.NewPrinterNotification.conf \
+    dbus/com.redhat.PrinterDriversInstaller.conf \
+    "${pkgdir}"/etc/dbus-1/system.d/
+  install -d "${pkgdir}"/etc/cupshelpers/
+  install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/
+
+  install -d "${pkgdir}"/usr/lib/udev/rules.d
+  install -m755 udev/{udev-add-printer,udev-configure-printer} \
+    "${pkgdir}"/usr/lib/udev/
+  install -m644 udev/70-printers.rules \
+    "${pkgdir}"/usr/lib/udev/rules.d
+
+  for file in build/lib/cupshelpers/*.py; do
+    install -Dm644 $file \
+      "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file)
+  done
+}
+
+package_system-config-printer-gnome() {
+  pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend'
+  depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify')
+  optdependence=('gnome-keyring: password management')
+
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  # files provided by system-config-printer-common
+  cd "${pkgdir}"/usr/share/${pkgbase}
+  rm config.py \
+    debug.py \
+    installpackage.py \
+    monitor.py \
+    PhysicalDevice.py \
+    ppdippstr.py \
+    probe_printer.py \
+    SearchCriterion.py \
+    smburi.py \
+    statereason.py \
+    pysmb.py
+  rm -r "${pkgdir}"/etc/dbus-1/
+  rm -r "${pkgdir}"/etc/cupshelpers/
+  rm -r "${pkgdir}"/etc/udev/
+  rm -r "${pkgdir}"/usr/lib/
+}
diff --git a/staging/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch b/staging/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch
new file mode 100644
index 000000000..7ac9251b3
--- /dev/null
+++ b/staging/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch
@@ -0,0 +1,32 @@
+From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt@redhat.com>
+Date: Fri, 2 Mar 2012 10:39:10 +0100
+Subject: [PATCH] util: never follow symlinks in rm_rf_children()
+
+The function checks if the entry is a directory before recursing, but
+there is a window between the check and the open, during which the
+directory could be replaced with a symlink.
+
+CVE-2012-1174
+https://bugzilla.redhat.com/show_bug.cgi?id=803358
+---
+ src/util.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/util.c b/src/util.c
+index 20cbc2b..dfc1dc6 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) {
+                 if (is_dir) {
+                         int subdir_fd;
+ 
+-                        if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) {
++                        subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
++                        if (subdir_fd < 0) {
+                                 if (ret == 0 && errno != ENOENT)
+                                         ret = -errno;
+                                 continue;
+-- 
+1.7.9.4
+
diff --git a/staging/systemd/PKGBUILD b/staging/systemd/PKGBUILD
new file mode 100644
index 000000000..38df148a2
--- /dev/null
+++ b/staging/systemd/PKGBUILD
@@ -0,0 +1,108 @@
+# $Id: PKGBUILD 154953 2012-03-31 21:05:37Z tomegun $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+
+pkgbase=systemd
+pkgname=('systemd' 'libsystemd')
+pkgver=44
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/systemd"
+license=('GPL2')
+makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
+             'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
+options=('!libtool')
+source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+        "os-release"
+        0001-util-never-follow-symlinks-in-rm_rf_children.patch)
+md5sums=('11f44ff74c87850064e4351518bcff17'
+         '752636def0db3c03f121f8b4f44a63cd'
+         'b5863d6d4b47e2b5bda8eb57bde0d327')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # https://bugzilla.redhat.com/show_bug.cgi?id=803358
+  patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch"
+
+  ./configure --sysconfdir=/etc \
+              --libexecdir=/usr/lib \
+              --with-pamlibdir=/lib/security \
+              --localstatedir=/var \
+              --with-distro=arch \
+              --enable-split-usr
+
+  make
+}
+
+package_systemd() {
+  pkgdesc="system and service manager"
+  depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz')
+  optdepends=('cryptsetup: required for encrypted block devices'
+              'dbus-python: systemd-analyze'
+              'initscripts: legacy support for hostname and vconsole setup'
+              'initscripts-systemd: native boot and initialization scripts'
+              'python2-cairo: systemd-analyze'
+              'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
+              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
+  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
+          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
+          etc/dbus-1/system.d/org.freedesktop.login1.conf
+          etc/dbus-1/system.d/org.freedesktop.locale1.conf
+          etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+          etc/systemd/system.conf
+          etc/systemd/user.conf
+          etc/systemd/systemd-logind.conf
+          etc/systemd/systemd-journald.conf)
+  install="$pkgname.install"
+
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
+
+  printf "d /run/console 755 root root\n" >"$pkgdir/usr/lib/tmpfiles.d/console.conf"
+  chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
+
+  # symlink to /bin/systemd for compat and sanity
+  mkdir -p "$pkgdir/bin"
+  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
+  mkdir -p "$pkgdir/lib/systemd"
+  ln -s ../../usr/lib/systemd/systemd "$pkgdir/lib/systemd/systemd"
+
+  # use python2 for systemd-analyze
+  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
+  # didn't build this...
+  rm -f "$pkgdir/usr/share/man/man1/systemadm.1"
+
+  # fix .so links in manpage stubs
+  find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
+      -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} +
+
+  # rename man pages to avoid conflicts with sysvinit and initscripts
+  manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+            man5/{hostname,{vconsole,locale}.conf}.5)
+  cd "$pkgdir/usr/share/man"
+  for manpage in "${manpages[@]}"; do
+    IFS='/' read section page <<< "$manpage"
+    mv "$manpage" "$section/systemd.$page"
+  done
+
+  ### split off libsystemd (libs, includes, pkgconfig, man3)
+  install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig}
+
+  cd "$srcdir"/libsystemd
+  mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
+  mv "$pkgdir/usr/include/systemd" usr/include
+  mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
+}
+
+package_libsystemd() {
+  pkgdesc="systemd client libraries"
+  depends=('libcap' 'xz')
+
+  mv "$srcdir/libsystemd"/* "$pkgdir"
+}
+
+# vim: ft=sh syn=sh et
diff --git a/staging/systemd/cpp-compat.patch b/staging/systemd/cpp-compat.patch
new file mode 100644
index 000000000..346c353bc
--- /dev/null
+++ b/staging/systemd/cpp-compat.patch
@@ -0,0 +1,19 @@
+commit e09a9a35a1fdb4e849e63bdaf47d936c272b5e82
+Author: Lennart Poettering <lennart@poettering.net>
+Date:   2012-03-05 15:16:10 +0100
+
+    sd-login: c++ compatibility
+
+diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
+index 2f3c90c..6e99cfc 100644
+--- a/src/systemd/sd-login.h
++++ b/src/systemd/sd-login.h
+@@ -94,7 +94,7 @@ int sd_session_get_service(const char *session, char **service);
+ int sd_session_get_type(const char *session, char **type);
+ 
+ /* Determine the class of this session, i.e. one of "user", "greeter" or "lock-screen". */
+-int sd_session_get_class(const char *session, char **class);
++int sd_session_get_class(const char *session, char **clazz);
+ 
+ /* Determine the X11 display of this session. */
+ int sd_session_get_display(const char *session, char **display);
diff --git a/staging/systemd/os-release b/staging/systemd/os-release
new file mode 100644
index 000000000..5e24a6031
--- /dev/null
+++ b/staging/systemd/os-release
@@ -0,0 +1,5 @@
+NAME="Arch Linux"
+ID=arch
+PRETTY_NAME="Arch Linux"
+ANSI_COLOR="1;36"
+
diff --git a/staging/systemd/systemd.install b/staging/systemd/systemd.install
new file mode 100644
index 000000000..11004222a
--- /dev/null
+++ b/staging/systemd/systemd.install
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+checkgroups() {
+  if ! getent group lock >/dev/null; then
+    groupadd -g 54 lock
+  fi
+}
+
+sd_booted() {
+  [ -e sys/fs/cgroups/systemd ]
+}
+
+post_install() {
+  checkgroups
+
+  if [ ! -f etc/machine-id ]; then
+    systemd-machine-id-setup
+  fi
+
+  echo "systemd has been installed to /bin/systemd. Please ensure you append"
+  echo "init=/bin/systemd to your kernel command line in your bootloader."
+}
+
+post_upgrade() {
+  checkgroups
+
+  if [ ! -f etc/machine-id ]; then
+    systemd-machine-id-setup
+  fi
+
+  if sd_booted; then
+    systemctl daemon-reexec >/dev/null
+    systemctl daemon-reload >/dev/null
+  fi
+
+  newpkgver=${1%-*}
+  oldpkgver=${2%-*}
+
+  # catch v31 need for restarting systemd-logind.service
+  if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
+    # but only if systemd is running
+    if sd_booted; then
+      systemctl try-restart systemd-logind.service
+    fi
+  fi
+}
+
+post_remove() {
+  if getent group lock >/dev/null; then
+    groupdel lock
+  fi
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/staging/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch b/staging/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch
new file mode 100644
index 000000000..d4d162167
--- /dev/null
+++ b/staging/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch
@@ -0,0 +1,80 @@
+From f2bdace5bb68d4f3162f886b27210762d8b115b8 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Sat, 3 Mar 2012 12:28:15 +0100
+Subject: [PATCH 1/2] split /usr: always read config files from /lib/udev
+
+This means we don't need a flagday in order to move udev to use
+/usr/lib/udev/rules.d
+---
+ src/libudev.c |   25 ++++++++++++++++---------
+ 1 file changed, 16 insertions(+), 9 deletions(-)
+
+diff --git a/src/libudev.c b/src/libudev.c
+index be24329..754d713 100644
+--- a/src/libudev.c
++++ b/src/libudev.c
+@@ -43,8 +43,8 @@ struct udev {
+         void *userdata;
+         char *sys_path;
+         char *dev_path;
+-        char *rules_path[4];
+-        unsigned long long rules_path_ts[4];
++        char *rules_path[5];
++        unsigned long long rules_path_ts[5];
+         int rules_path_count;
+         char *run_path;
+         struct udev_list properties_list;
+@@ -255,21 +255,26 @@ UDEV_EXPORT struct udev *udev_new(void)
+                         goto err;
+ 
+         if (udev->rules_path[0] == NULL) {
+-                /* /usr/lib/udev -- system rules */
+-                udev->rules_path[0] = strdup(PKGLIBEXECDIR "/rules.d");
++                /* /lib/udev -- compat for system rules */
++                udev->rules_path[0] = strdup("/lib/udev/rules.d");
+                 if (!udev->rules_path[0])
++                       goto err;
++
++                /* /usr/lib/udev -- system rules */
++                udev->rules_path[1] = strdup(PKGLIBEXECDIR "/rules.d");
++                if (!udev->rules_path[1])
+                         goto err;
+ 
+                 /* /etc/udev -- local administration rules */
+-                udev->rules_path[1] = strdup(SYSCONFDIR "/udev/rules.d");
+-                if (!udev->rules_path[1])
++                udev->rules_path[2] = strdup(SYSCONFDIR "/udev/rules.d");
++                if (!udev->rules_path[2])
+                         goto err;
+ 
+                 /* /run/udev -- runtime rules */
+-                if (asprintf(&udev->rules_path[2], "%s/rules.d", udev->run_path) < 0)
++                if (asprintf(&udev->rules_path[3], "%s/rules.d", udev->run_path) < 0)
+                         goto err;
+ 
+-                udev->rules_path_count = 3;
++                udev->rules_path_count = 4;
+         }
+ 
+         dbg(udev, "context %p created\n", udev);
+@@ -278,7 +283,8 @@ UDEV_EXPORT struct udev *udev_new(void)
+         dbg(udev, "dev_path='%s'\n", udev->dev_path);
+         dbg(udev, "sys_path='%s'\n", udev->sys_path);
+         dbg(udev, "run_path='%s'\n", udev->run_path);
+-        dbg(udev, "rules_path='%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1], udev->rules_path[2]);
++        dbg(udev, "rules_path='%s':'%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1],
++              udev->rules_path[2], udev->rules_path[3]);
+         free(config_file);
+         return udev;
+ err:
+@@ -325,6 +331,7 @@ UDEV_EXPORT void udev_unref(struct udev *udev)
+         free(udev->rules_path[0]);
+         free(udev->rules_path[1]);
+         free(udev->rules_path[2]);
++        free(udev->rules_path[3]);
+         free(udev->run_path);
+         dbg(udev, "context %p released\n", udev);
+         free(udev);
+-- 
+1.7.9.5
+
diff --git a/staging/udev/0002-reinstate-TIMEOUT-handling.patch b/staging/udev/0002-reinstate-TIMEOUT-handling.patch
new file mode 100644
index 000000000..9d1d36fb6
--- /dev/null
+++ b/staging/udev/0002-reinstate-TIMEOUT-handling.patch
@@ -0,0 +1,146 @@
+From 0a581062ee3e31e0c2aedc5eb64c60f52868b17f Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Thu, 15 Mar 2012 02:12:43 +0100
+Subject: [PATCH 2/2] reinstate TIMEOUT= handling
+
+Without treating events with timeouts specially some drivers would cause a
+30 seconds stall on boot: .
+
+I also received reports of some drivers not working at all, even after the
+timeout.
+
+We will remove this patch when more drivers have been fixed in the kernel (3.4?).
+
+This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and
+57c6f8ae5f52a6e8ffc66a54966346f733dded39.
+---
+ TODO                  |    2 ++
+ src/libudev-device.c  |   19 +++++++++++++++++++
+ src/libudev-private.h |    1 +
+ src/udevd.c           |   13 ++++++++++---
+ 4 files changed, 32 insertions(+), 3 deletions(-)
+
+diff --git a/TODO b/TODO
+index 36e8440..c2e59b6 100644
+--- a/TODO
++++ b/TODO
+@@ -1,6 +1,8 @@
+  - find a way to tell udev to not cancel firmware
+    requests in initramfs
+ 
++ - remove TIMEOUT= handling
++
+  - move /lib/udev/devices/ to tmpfiles
+ 
+  - trigger --subsystem-match=usb/usb_device
+diff --git a/src/libudev-device.c b/src/libudev-device.c
+index 10f28b8..639c367 100644
+--- a/src/libudev-device.c
++++ b/src/libudev-device.c
+@@ -68,6 +68,7 @@ struct udev_device {
+         struct udev_list tags_list;
+         unsigned long long int seqnum;
+         unsigned long long int usec_initialized;
++        int timeout;
+         int devlink_priority;
+         int refcount;
+         dev_t devnum;
+@@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)
+         return 0;
+ }
+ 
++int udev_device_get_timeout(struct udev_device *udev_device)
++{
++        return udev_device->timeout;
++}
++
++static int udev_device_set_timeout(struct udev_device *udev_device, int timeout)
++{
++        char num[32];
++
++        udev_device->timeout = timeout;
++        snprintf(num, sizeof(num), "%u", timeout);
++        udev_device_add_property(udev_device, "TIMEOUT", num);
++        return 0;
++}
++
+ const char *udev_device_get_devpath_old(struct udev_device *udev_device)
+ {
+         return udev_device->devpath_old;
+@@ -414,6 +430,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
+                 udev_device_set_devpath_old(udev_device, &property[12]);
+         } else if (strncmp(property, "SEQNUM=", 7) == 0) {
+                 udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10));
++        } else if (strncmp(property, "TIMEOUT=", 8) == 0) {
++                udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
+         } else if (strncmp(property, "IFINDEX=", 8) == 0) {
+                 udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10));
+         } else if (strncmp(property, "DEVMODE=", 8) == 0) {
+@@ -599,6 +617,7 @@ struct udev_device *udev_device_new(struct udev *udev)
+         udev_list_init(udev, &udev_device->sysattr_value_list, true);
+         udev_list_init(udev, &udev_device->sysattr_list, false);
+         udev_list_init(udev, &udev_device->tags_list, true);
++        udev_device->timeout = -1;
+         udev_device->watch_handle = -1;
+         /* copy global properties */
+         udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
+diff --git a/src/libudev-private.h b/src/libudev-private.h
+index 5f5c64a..ec63b67 100644
+--- a/src/libudev-private.h
++++ b/src/libudev-private.h
+@@ -87,6 +87,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device);
+ void udev_device_set_is_initialized(struct udev_device *udev_device);
+ int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
+ void udev_device_cleanup_tags_list(struct udev_device *udev_device);
++int udev_device_get_timeout(struct udev_device *udev_device);
+ unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device);
+ void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized);
+ int udev_device_get_devlink_priority(struct udev_device *udev_device);
+diff --git a/src/udevd.c b/src/udevd.c
+index 1702217..88e9272 100644
+--- a/src/udevd.c
++++ b/src/udevd.c
+@@ -401,7 +401,7 @@ out:
+         }
+ }
+ 
+-static void event_run(struct event *event)
++static void event_run(struct event *event, bool force)
+ {
+         struct udev_list_node *loop;
+ 
+@@ -427,7 +427,7 @@ static void event_run(struct event *event)
+                 return;
+         }
+ 
+-        if (children >= children_max) {
++        if (!force && children >= children_max) {
+                 if (children_max > 1)
+                         info(event->udev, "maximum number (%i) of children reached\n", children);
+                 return;
+@@ -461,6 +461,13 @@ static int event_queue_insert(struct udev_device *dev)
+ 
+         event->state = EVENT_QUEUED;
+         udev_list_node_append(&event->node, &event_list);
++
++        /* run all events with a timeout set immediately */
++        if (udev_device_get_timeout(dev) > 0) {
++                event_run(event, true);
++                return 0;
++        }
++
+         return 0;
+ }
+ 
+@@ -577,7 +584,7 @@ static void event_queue_start(struct udev *udev)
+                         continue;
+                 }
+ 
+-                event_run(event);
++                event_run(event, false);
+         }
+ }
+ 
+-- 
+1.7.9.5
+
diff --git a/staging/udev/PKGBUILD b/staging/udev/PKGBUILD
new file mode 100644
index 000000000..5b2ad49ce
--- /dev/null
+++ b/staging/udev/PKGBUILD
@@ -0,0 +1,72 @@
+# $Id: PKGBUILD 154974 2012-03-31 23:23:46Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Thomas Bächler <thomas@archlinux.org>
+
+pkgname=udev
+pkgver=181
+pkgrel=7
+pkgdesc="The userspace dev tools (udev)"
+depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl')
+install=udev.install
+arch=(i686 x86_64)
+license=('GPL')
+makedepends=('gobject-introspection' 'gperf' 'libxslt')
+source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz
+	0001-split-usr-always-read-config-files-from-lib-udev.patch
+	0002-reinstate-TIMEOUT-handling.patch
+	initcpio-hooks-udev
+	initcpio-install-udev)
+url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
+backup=(etc/udev/udev.conf)
+groups=('base')
+options=(!makeflags !libtool)
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  patch -p1 -i ../0001-split-usr-always-read-config-files-from-lib-udev.patch
+  patch -p1 -i ../0002-reinstate-TIMEOUT-handling.patch
+
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --libexecdir=/usr/lib \
+              --with-systemdsystemunitdir=/usr/lib/systemd/system \
+              --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \
+              --enable-udev_acl
+
+  make
+}
+
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+ 
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=${pkgdir} install
+
+  # install the mkinitpcio hook
+  install -D -m644 ../initcpio-hooks-udev ${pkgdir}/usr/lib/initcpio/hooks/udev
+  install -D -m644 ../initcpio-install-udev ${pkgdir}/usr/lib/initcpio/install/udev
+
+  # udevd moved, symlink to make life easy for restarting udevd manually
+  ln -s ../lib/udev/udevd ${pkgdir}/usr/bin/udevd
+
+  # the path to udevadm is hardcoded in some places
+  install -d ${pkgdir}/sbin
+  ln -s ../usr/bin/udevadm ${pkgdir}/sbin/udevadm
+
+  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
+  for i in $pkgdir/usr/lib/udev/rules.d/*.rules; do
+    sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
+               s#GROUP="tape"#GROUP="storage"#g;
+               s#GROUP="cdrom"#GROUP="optical"#g' $i
+  done
+}
+md5sums=('0d7af750702620a871b9f9b98d8ad859'
+         '02a0dbbdcba6c1eae3ef65b6b06bde1f'
+         'a9fae85491a08d7759388c605389a8c5'
+         'a4dd853050bf2e0ae6b2e3d2c75499c2'
+         'ee0bfe91a20fff12cc25ab1d1e024853')
diff --git a/staging/udev/initcpio-hooks-udev b/staging/udev/initcpio-hooks-udev
new file mode 100644
index 000000000..87aa7960f
--- /dev/null
+++ b/staging/udev/initcpio-hooks-udev
@@ -0,0 +1,9 @@
+# vim: set ft=sh:
+run_hook ()
+{
+    msg -n ":: Triggering uevents..."
+    udevadm trigger --action=add --type=subsystems
+    udevadm trigger --action=add --type=devices
+    udevadm settle
+    msg "done."
+}
diff --git a/staging/udev/initcpio-install-udev b/staging/udev/initcpio-install-udev
new file mode 100644
index 000000000..e7e2c0f60
--- /dev/null
+++ b/staging/udev/initcpio-install-udev
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+build() {
+    FILES="/etc/udev/udev.conf"
+    SCRIPT="udev"
+
+    add_binary /lib/udev/udevd
+    add_binary /usr/bin/udevadm
+
+    for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do
+        add_file "/lib/udev/rules.d/$rules"
+    done
+    for tool in ata_id scsi_id; do
+        add_file "/lib/udev/$tool"
+    done
+}
+
+help() {
+    cat <<HELPEOF
+This hook will use udev to create your root device node and detect the needed
+modules for your root device. It is also required for firmware loading in
+initramfs. It is recommended to use this hook.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/staging/udev/udev.install b/staging/udev/udev.install
new file mode 100644
index 000000000..557efe9e1
--- /dev/null
+++ b/staging/udev/udev.install
@@ -0,0 +1,59 @@
+# arg 1:  the new package version
+# arg 2:  the old package version
+
+post_upgrade() {
+  if [ "$(vercmp $2 181-3)" -lt 0 ]; then
+    echo "udev changes:"
+    if [ "$(vercmp $2 168)" -lt 0 ]; then
+      echo " * Kernel 2.6.32 or newer is now required."
+      echo " * OSS emulation modules are not loaded by default, add to rc.conf if needed."
+      echo " * Arch specific cd symlinks are now no longer created."
+      echo " * cd and net persistent rules will no longer be autogenerated,"
+      echo "   see <https://wiki.archlinux.org/index.php/Udev> for details."
+      echo " * Errors are now logged (possibly to the console) by default."
+    fi
+    if [ "$(vercmp $2 171)" -lt 0 ]; then
+      echo " * Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and"
+      echo "   blacklisting in MODULES no longer works."
+      echo "   See 'man modprobe.conf' for a replacement to blacklisting."
+      echo "   To disable a module mod1 on the kernel command line, use"
+      echo "     mod1.disable=1"
+      echo "   or"
+      echo "     modprobe.blacklist=mod1"
+      echo " * The following modules are no longer unconditionally loaded:"
+      echo "     pcspkr irtty-sir analog lp ppdev ide-generic"
+      echo "   Add them to MODULES in rc.conf if you need them."
+    fi
+    if [ "$(vercmp $2 172)" -lt 0 ]; then
+      echo " * Blacklisting of framebuffer devices has moved from /etc/modprobe.d to"
+      echo "   /lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it"
+      echo "   takes precedence."
+      echo " * kbd and rtc devices are no longer world readable."
+      echo " * rtc is no longer in the audio group and fb devices are no longer in"
+      echo "   the video group, as permissions and ownership of fb devices are controlled"
+      echo "   by X."
+    fi
+    if [ "$(vercmp $2 174)" -lt 0 ]; then
+      echo " * We now use upstream rules for assigning devices to the 'disk', 'optical',"
+      echo "   'scanner' and 'video' groups. Beware of any changes."
+      echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
+      echo " * For security reasons, we no longer add devices to the 'storage' group. Use"
+      echo "   udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
+      echo "   this functionality back."
+      echo " * We no longer create the static nodes on install needed for an initrd-less"
+      echo "   boot where devtmpfs is not mounted by the kernel, this only affects fresh"
+      echo "   installs."
+    fi
+    if [ "$(vercmp $2 175)" -lt 0 ]; then
+      echo " * devtmpfs support is now a hard requirement. Users of the official Arch"
+      echo "   kernels have this enabled."
+    fi
+    if [ "$(vercmp $2 181)" -lt 0 ]; then
+      echo " * udev-compat has been removed, and should be uninstalled."
+      echo " * Framebuffers are no longer blacklisted by default."
+      echo " * binaries moved from /sbin to /usr/bin"
+    fi
+    echo " * if your kernel does not provide /dev/loop-control, you need to manually"
+    echo "   load the 'loop' module before using losetup"
+  fi
+}
diff --git a/staging/udisks/PKGBUILD b/staging/udisks/PKGBUILD
new file mode 100644
index 000000000..fcded4b5c
--- /dev/null
+++ b/staging/udisks/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 154972 2012-03-31 23:19:08Z tomegun $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=udisks
+pkgver=1.0.4
+pkgrel=3
+pkgdesc="Disk Management Service"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/udisks"
+license=('GPL')
+depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject')
+makedepends=('intltool' 'docbook-xsl')
+options=(!libtool)
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/udisks --disable-static
+  #fix location for bash_completion helper
+  sed -i -e 's|profile.d|bash_completion.d|' tools/Makefile
+
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  # move udev helpers and rules to /usr/lib
+  mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/
+  rm -r "${pkgdir}"/lib
+}
author	root <root@rshg054.dnsready.net>	2012-04-02 00:01:14 +0000
committer	root <root@rshg054.dnsready.net>	2012-04-02 00:01:14 +0000
commit	8ebbe4e4befac1396a153b356fc9793655dde4ff (patch)
tree	b957bcef566f4da47b8d4a406c64837ec6e3b2e7 /staging
parent	939efb693a8b362edc0c6ccba62c5ce54fb501af (diff)