Thu Jun 28 00:01:48 UTC 2012

36 files changed, 391 insertions, 92 deletions

diff --git a/community/goocanvas/PKGBUILD b/community/goocanvas/PKGBUILD
index 332b93004..143df9b60 100644
--- a/community/goocanvas/PKGBUILD
+++ b/community/goocanvas/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 56677 2011-10-10 09:46:09Z ibiru $
+# $Id: PKGBUILD 72991 2012-06-26 19:38:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=goocanvas
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A cairo canvas widget for GTK+"
 arch=(i686 x86_64)
 url="http://live.gnome.org/GooCanvas"
 options=('!libtool' 'docs')
 license=("LGPL")
 depends=('gtk3')
-makedepends=('gobject-introspection')
+makedepends=('gobject-introspection' 'python-gobject2')
 source=(http://ftp.gnome.org/pub/GNOME/sources/goocanvas/2.0/goocanvas-$pkgver.tar.xz)
 sha256sums=('0c3a595a6d2a4fe0f1a1a5243637e66aa1bfbaf6492455bfd0b51e0dec9b1553')
+sha256sums=('0c3a595a6d2a4fe0f1a1a5243637e66aa1bfbaf6492455bfd0b51e0dec9b1553')
 
 build() {
   cd $srcdir/goocanvas-$pkgver
diff --git a/community/mairix/PKGBUILD b/community/mairix/PKGBUILD
index b041bd02e..5cd6acd7f 100644
--- a/community/mairix/PKGBUILD
+++ b/community/mairix/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 66226 2012-02-23 05:02:08Z spupykin $
+# $Id: PKGBUILD 72993 2012-06-26 19:39:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: Giorgio Lando <patroclo7@gmail.com>
 # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
 
 pkgname=mairix
-pkgver=0.22
-pkgrel=2
+pkgver=0.23
+pkgrel=1
 pkgdesc="A program for indexing and searching emails"
 arch=('i686' 'x86_64')
 url="http://www.rpcurnow.force9.co.uk/mairix/"
@@ -15,7 +15,7 @@ depends=(bzip2 zlib)
 makedepends=('flex' 'bison')
 install=$pkgname.install
 source=(http://downloads.sf.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('6c6aaca19c2b2de3bf567b856705ce1a')
+md5sums=('732cf94e05c779ff1ce4a9e9eb19ab44')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD
index 586761908..3376d8fc2 100644
--- a/community/mariadb/PKGBUILD
+++ b/community/mariadb/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 71910 2012-06-03 09:52:48Z bpiotrowski $
+# $Id: PKGBUILD 72987 2012-06-26 14:18:03Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
-pkgver=5.5.24
+pkgver=5.5.25
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://mariadb.org/"
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
-source=("http://mirror.de.gsnw.de:56431/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz"
-        'mysqld')
-md5sums=('caf9461227eeadd4e57cf3f2a74b1165'
+source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz
+        mysqld)
+md5sums=('943f67c267d73a4080ab497e11740daf'
          '3bb5a9a96340feb0184bc057ee6e330b')
 
 build() {
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 923d5f82e..66062aad6 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72338 2012-06-12 05:36:21Z bpiotrowski $
+# $Id: PKGBUILD 72985 2012-06-26 13:36:13Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,7 +8,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.6.19
+pkgver=0.8.0
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
 options=('!emptydirs')
 source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
-md5sums=('f5669a9717422b811c6bad1cc961b1e5')
+md5sums=('7efde00ad3292d4c56ad607ab676d935')
 
 build() {
   cd node-v${pkgver}
@@ -27,10 +27,10 @@ build() {
   msg 'fixing for python2 name'
   find -type f -exec sed -e 's_^#!/usr/bin/env python$_&2_' -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' -e 's_^#!/usr/bin/python$_&2_' -e "s_'python'_'python2'_" -i {} \;
   find test -type f -exec sed -e "s|python |python2 |" -i {} \;
-  sed -i "s|cmd_R = 'python |cmd_R = 'python2 |" wscript
+  #sed -i "s|cmd_R = 'python |cmd_R = 'python2 |" wscript
   sed -i "s|python |python2 |" Makefile
-  find test -type f -exec sed -e 's/python/&2/' -i {} \;
-  sed -i "s/python/&2/" configure
+  #find test -type f -exec sed -e 's/python/&2/' -i {} \;
+  #sed -i "s/python/python2/" configure
 
   export PYTHON=python2
 
diff --git a/community/pptpd/PKGBUILD b/community/pptpd/PKGBUILD
index 66203ba7b..8d68250f9 100644
--- a/community/pptpd/PKGBUILD
+++ b/community/pptpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 70497 2012-05-09 17:18:35Z spupykin $
+# $Id: PKGBUILD 72984 2012-06-26 13:10:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=pptpd
 pkgver=1.3.4
-pkgrel=7
+pkgrel=8
 pkgdesc="Poptop server"
 arch=(i686 x86_64)
 url="http://poptop.sourceforge.net/"
@@ -21,7 +21,7 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   patch -p1 <$srcdir/unrecognized-opt.patch
   autoreconf -i
-  ./configure --prefix=/usr --libdir=/usr/lib --exec-prefix=/usr --mandir=/usr/share
+  ./configure --prefix=/usr --libdir=/usr/lib --exec-prefix=/usr --mandir=/usr/share/man
   make
   sed -i 's|install -o root|install|g' plugins/Makefile
   sed -i 's|?=|=|g' plugins/Makefile
diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD
index c2ca50617..587604851 100644
--- a/core/dbus-core/PKGBUILD
+++ b/core/dbus-core/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 162315 2012-06-24 22:30:38Z dreisner $
+# $Id: PKGBUILD 162424 2012-06-27 01:43:40Z dreisner $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus-core
 pkgver=1.6.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow') # shadow for install scriptlet FS#29341
+depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 'systemd-tools') # shadow for install scriptlet FS#29341
 makedepends=('libx11')
 conflicts=('dbus<1.2.3-2')
 options=(!libtool)
diff --git a/core/dbus-core/dbus.install b/core/dbus-core/dbus.install
index 88a568429..f1ffd61a8 100644
--- a/core/dbus-core/dbus.install
+++ b/core/dbus-core/dbus.install
@@ -2,12 +2,6 @@ post_install() {
   getent group dbus >/dev/null || groupadd -g 81 dbus
   getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
   passwd -l dbus &>/dev/null
-
-  if [[ ! -L var/lib/dbus/machine-id ]]; then
-    [[ -e var/lib/dbus/machine-id && ! -e etc/machine-id ]] && mv var/lib/dbus/machine-id etc/
-    ln -sf ../../../etc/machine-id var/lib/dbus/
-  fi
-  dbus-uuidgen --ensure=etc/machine-id
 }
 
 post_upgrade() {
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 367b26834..2d9323250 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat')
 pkgver=185
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -132,6 +132,7 @@ package_systemd() {
   mv "$pkgdir"/etc/udev etc
   mv "$pkgdir"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc
   mv "$pkgdir"/usr/bin/udevadm usr/bin
+  mv "$pkgdir"/usr/bin/systemd-machine-id-setup usr/bin
   mv "$pkgdir"/usr/lib/pkgconfig usr/lib
   mv "$pkgdir"/usr/lib/systemd/systemd-udevd usr/lib/systemd
   mv "$pkgdir"/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system
@@ -147,7 +148,7 @@ package_systemd() {
   mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html
   mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7
   mv "$pkgdir"/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 usr/share/man/man8
-  mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt}.1 usr/share/man/man1
+  mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1
   mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5
   mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf}.5 usr/share/man/man5
   mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin
diff --git a/core/systemd/systemd-tools.install b/core/systemd/systemd-tools.install
index c1c19d15d..7d0bd8790 100644
--- a/core/systemd/systemd-tools.install
+++ b/core/systemd/systemd-tools.install
@@ -1,7 +1,13 @@
 # arg 1:  the new package version
 # arg 2:  the old package version
 
+post_install() {
+  systemd-machine-id-setup
+}
+
 post_upgrade() {
+  systemd-machine-id-setup
+
   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."
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install
index cb82b6c8c..e369f094d 100644
--- a/core/systemd/systemd.install
+++ b/core/systemd/systemd.install
@@ -5,8 +5,6 @@ sd_booted() {
 }
 
 post_install() {
-  systemd-machine-id-setup
-
   # enable getty@tty1 by default, but don't track the file
   systemctl enable getty@.service
 
@@ -15,8 +13,6 @@ post_install() {
 }
 
 post_upgrade() {
-  systemd-machine-id-setup
-
   if sd_booted; then
     # we moved the binary in 44-2 to /usr, so a reexec leads to a
     # coredump. refuse this reexec and warn the user that they should
diff --git a/extra/bluefish/PKGBUILD b/extra/bluefish/PKGBUILD
index 2b9878027..26cbe5081 100644
--- a/extra/bluefish/PKGBUILD
+++ b/extra/bluefish/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 153431 2012-03-13 20:19:08Z eric $
+# $Id: PKGBUILD 162427 2012-06-27 03:30:42Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=bluefish
-pkgver=2.2.2
+pkgver=2.2.3
 pkgrel=1
 pkgdesc="A powerful HTML editor for experienced web designers and programmers"
 arch=('i686' 'x86_64')
@@ -14,14 +14,14 @@ optdepends=('gucharmap: for using the charmap plugin')
 options=('!libtool')
 install=bluefish.install
 source=(http://www.bennewitz.com/bluefish/stable/source/bluefish-${pkgver}.tar.bz2{,.sig})
-sha1sums=('2fca4e4fa67e6f2fda1335e1dc4e19ca318eb002'
-          'a7f2b776d9bacff1e2fd6d70aa0e37c53e85f7a2')
+sha1sums=('181f28b595f6259441eb13f4aaae60def596b980'
+          'e8c4e3ba0623e476adeb8bf8466044894aa034c8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-    src/plugin_zencoding/zencoding/{,filters/,actions/}*.py
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    src/plugin_zencoding/zencoding/{,filters/,actions/}*.py data/lorem-ipsum-generator
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --enable-spell-check --disable-update-databases --disable-xml-catalog-update
   make
 }
diff --git a/extra/dbus-glib/PKGBUILD b/extra/dbus-glib/PKGBUILD
index 5569f6dc5..9ba5e1e92 100644
--- a/extra/dbus-glib/PKGBUILD
+++ b/extra/dbus-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 140079 2011-10-06 07:35:47Z ibiru $
+# $Id: PKGBUILD 162401 2012-06-26 20:15:42Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=dbus-glib
-pkgver=0.98
+pkgver=0.100
 pkgrel=1
 pkgdesc="GLib bindings for DBUS"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2')
 makedepends=('pkgconfig')
 options=('!libtool' '!emptydirs')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3f7f117dc7c8d899d9acfdcbf9253fb8')
+md5sums=('d33959a9c0c6a158f5ac6d640316e89e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD
index 1a7023d5d..029a5d7a1 100644
--- a/extra/dbus-python/PKGBUILD
+++ b/extra/dbus-python/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161472 2012-06-11 18:34:18Z jgc $
+# $Id: PKGBUILD 162393 2012-06-26 18:57:06Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=dbus-python
 pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common')
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
 pkgdesc="Python bindings for DBUS"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
@@ -12,7 +12,7 @@ url="http://www.freedesktop.org/wiki/Software/DBusBindings"
 makedepends=('docutils' 'dbus-glib' 'python' 'python2')
 options=('!libtool')
 source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz)
-md5sums=('41a459bbbb5fd92eeebd632623af0bd7')
+md5sums=('742c7432ad0f7c3f98291d58fa2e35dc')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD
index 181df4616..dd8840842 100644
--- a/extra/kdegraphics-mobipocket/PKGBUILD
+++ b/extra/kdegraphics-mobipocket/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 161211 2012-06-08 06:37:59Z andrea $
+# $Id: PKGBUILD 162383 2012-06-26 17:25:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-mobipocket
 pkgver=4.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection of plugins to handle mobipocket files"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
+groups=('kde' 'kdegraphics')
 makedepends=('cmake' 'automoc4' 'kdegraphics-okular')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD
index df3615600..f8a15ba72 100644
--- a/extra/kexec-tools/PKGBUILD
+++ b/extra/kexec-tools/PKGBUILD
@@ -1,28 +1,23 @@
-# $Id: PKGBUILD 155721 2012-04-05 13:08:48Z dreisner $
+# $Id: PKGBUILD 162395 2012-06-26 19:28:54Z tpowa $
 # Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kexec-tools
-pkgver=2.0.2
-pkgrel=5
+pkgver=2.0.3
+pkgrel=1
 pkgdesc="Load another kernel from the currently executing Linux kernel"
 arch=('i686' 'x86_64')
 url="http://kernel.org/pub/linux/utils/kernel/kexec/"
-source=("http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-${pkgver}.tar.bz2"
-        'kexec-tools-2.0.0-purgatory-makefile.patch'
+source=("ftp://ftp.archlinux.org/other/kexec-tools/kexec-tools-${pkgver}.tar.bz2"
+        #"http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-${pkgver}.tar.bz2"
         'kexec' 
         'kexec.conf.d')
 depends=('gawk' 'zlib' 'xz')
 backup=('etc/conf.d/kexec')
 license=('GPL2')
-md5sums=('35d05fed1c97008ac34c5bfb929295eb'
-         'b96f47c29757fcadfbc50ea6ea22f839'
-         'be059a103e5989519d22fca99f860a64'
-         '9ca7e31d2c5c66c436a9a2baf20ad9b2')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ../kexec-tools-2.0.0-purgatory-makefile.patch
   ./configure --prefix=/usr
   make
 }
@@ -37,3 +32,6 @@ package() {
   install -D -m644 $srcdir/kexec.conf.d $pkgdir/etc/conf.d/kexec
   install -D -m755 $srcdir/kexec $pkgdir/etc/rc.d/kexec
 }
+md5sums=('3d9ff82e8e16165b9e79ded271c08348'
+         'be059a103e5989519d22fca99f860a64'
+         '9ca7e31d2c5c66c436a9a2baf20ad9b2')
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 1eee0763a..d8347d089 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 161314 2012-06-09 06:35:50Z tpowa $
+# $Id: PKGBUILD 162373 2012-06-26 05:39:58Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=3.6.5
+pkgver=3.6.6
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.5
-pkgrel=3
+_realver=3.6.6
+pkgrel=1
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
@@ -157,7 +157,7 @@ install='samba.install'
   install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf
   rm -rf ${pkgdir}/var/run
 }
-md5sums=('2f0c14547333c1b48fd4728b031e7040'
+md5sums=('0bea52842d172231c0c0e23ee570d7af'
          'a45a4283723be2b0ae32439dc4496a09'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index 779b90f5a..73295c498 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162336 2012-06-25 16:30:47Z andyrtr $
+# $Id: PKGBUILD 162381 2012-06-26 16:12:16Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=280
+pkgver=281
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE)
-md5sums=('9ba6bf015b5eca93fe273bd75c1a35ac'
+md5sums=('bca2eb95bdd57653f8e3f2f57952c1c5'
          '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {
diff --git a/kde-unstable/kdebase-workspace/PKGBUILD b/kde-unstable/kdebase-workspace/PKGBUILD
index d64ee4138..b97eb4ce9 100644
--- a/kde-unstable/kdebase-workspace/PKGBUILD
+++ b/kde-unstable/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 161679 2012-06-13 14:12:52Z andrea $
+# $Id: PKGBUILD 162386 2012-06-26 17:50:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.8.90
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -28,13 +28,14 @@ backup=('usr/share/config/kdm/kdmrc'
         'etc/pam.d/kscreensaver')
 options=('emptydirs')
 source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
-        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
+        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service'
         'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
 sha1sums=('1f5034f90cc3b0f1a97555b05b42043414bd3489'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           '712a90999bd429883dcef5dcaf288aace332ced8'
           'b321b5e613b60231330e606fdf1e124646148388'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+          '758203a76b58d62786a1013f6f8682e48844138a'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
           'd509dac592bd8b310df27991b208c95b6d907514')
@@ -65,13 +66,17 @@ package() {
 	cd "${srcdir}"/build
 	make DESTDIR="${pkgdir}" install
 
-	install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
 	install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde
 	install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np
 	install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver
+
 	install -d -m755 "${pkgdir}"/usr/share/xsessions/
-	ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/
+	ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \
+      "${pkgdir}"/usr/share/xsessions/
 	install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown}
 
 	install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm
+    install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
+    install -D -m644 "${srcdir}"/kdm.service \
+      "${pkgdir}"/usr/lib/systemd/system/kdm.service
 }
diff --git a/kde-unstable/kdebase-workspace/kdm.service b/kde-unstable/kdebase-workspace/kdm.service
new file mode 100644
index 000000000..15ff75ff2
--- /dev/null
+++ b/kde-unstable/kdebase-workspace/kdm.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=K Display Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/kdm -nodaemon
+
+[Install]
+WantedBy=graphical.target
diff --git a/kde-unstable/kdegraphics-mobipocket/PKGBUILD b/kde-unstable/kdegraphics-mobipocket/PKGBUILD
index e0b1f2516..0b246f3a7 100644
--- a/kde-unstable/kdegraphics-mobipocket/PKGBUILD
+++ b/kde-unstable/kdegraphics-mobipocket/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 161731 2012-06-13 14:48:45Z andrea $
+# $Id: PKGBUILD 162384 2012-06-26 17:27:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-mobipocket
 pkgver=4.8.90
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection of plugins to handle mobipocket files"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4' 'kdegraphics-okular')
+groups=('kde' 'kdegraphics')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index b6bc8ce2f..d8ce703b2 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -7,7 +7,7 @@
 _pkgname=hplip
 pkgname=hplip-libre
 pkgver=3.12.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -36,16 +36,17 @@ md5sums=('5303938e8630775ea6fb383af85775e5'
 build() {
  cd "$srcdir/$_pkgname-$pkgver"
  export PYTHON=python2
- 
+
  find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py base/magic.py
  sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py
  sed -i 's|python ./print.py|python2 ./print.py|' scan.py
  sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py 
+ sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py
  sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
  sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
 
+
  # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
  # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
  # The hpcups driver does not use foomatic-rip
@@ -56,7 +57,7 @@ build() {
 			gzip > ${i}.temp || return 1
 		mv ${i}.temp ${i}
 	done
-   
+
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install
 
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
index 063a9e899..d806b73fd 100644
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -31,11 +31,9 @@ md5sums=('868dc1824391768e120fdd71ba28e520'
 build() {
    # remove nonfree packages
    # No specific free license.
-   rm {authoraftertitle,clock,fltpage,fnpara}.tar.xz
-   # No explicit modification permission.
-   rm cmdtrack.tar.xz
+   rm {authoraftertitle,clock,fnpara}.tar.xz
    # Remove them from package list.
-   sed -ri '/^(authoraftertitle|clock+fltpage|fnpara|cmdtrack) /d' CONTENTS
+   sed -ri '/^(authoraftertitle|fnpara) /d' CONTENTS
    for p in *.tar.xz; do
 	   bsdtar -xf $p
    done
diff --git a/multilib/lib32-dbus-core/PKGBUILD b/multilib/lib32-dbus-core/PKGBUILD
index 5f83b3959..b99ad482e 100644
--- a/multilib/lib32-dbus-core/PKGBUILD
+++ b/multilib/lib32-dbus-core/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69375 2012-04-14 22:31:10Z bluewind $
+# $Id: PKGBUILD 72982 2012-06-26 12:34:29Z bluewind $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgname=lib32-dbus-core
 _pkgbasename=dbus-core
-pkgver=1.4.20
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system (32-bit)"
 arch=('x86_64')
@@ -13,7 +13,7 @@ depends=('lib32-glibc' 'lib32-expat' 'dbus-core')
 makedepends=('gcc-multilib' lib32-libx11)
 options=(!libtool)
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz)
-md5sums=('79eca2f2c1894ac347acce128314428b')
+md5sums=('16dcae2dd0c76e398381601ac9acdec4')
 
 build() {
     export CC="gcc -m32"
@@ -27,7 +27,7 @@ build() {
         --with-system-pid-file=/var/run/dbus.pid \
         --enable-inotify --disable-dnotify \
         --disable-verbose-mode --disable-static \
-        --disable-tests --disable-asserts
+        --disable-tests --disable-asserts --disable-systemd
     make
 }
 
diff --git a/multilib/lib32-libtiff/PKGBUILD b/multilib/lib32-libtiff/PKGBUILD
index 10f3a0682..1753d9ff3 100644
--- a/multilib/lib32-libtiff/PKGBUILD
+++ b/multilib/lib32-libtiff/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67353 2012-03-09 20:50:06Z bluewind $
+# $Id: PKGBUILD 72978 2012-06-26 11:06:41Z bluewind $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 _pkgbasename=libtiff
 pkgname=lib32-$_pkgbasename
-pkgver=4.0.1
+pkgver=4.0.2
 pkgrel=1
 pkgdesc="Library for manipulation of TIFF images (32-bit)"
 arch=('x86_64')
@@ -14,7 +14,7 @@ depends=('lib32-libjpeg' 'lib32-zlib' $_pkgbasename)
 makedepends=(gcc-multilib)
 options=('!libtool')
 source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz)
-sha1sums=('8baf382231c9051a1b3eb294581289aa21447171')
+sha1sums=('d84b7b33a6cfb3d15ca386c8c16b05047f8b5352')
 
 build() {
   export CC="gcc -m32"
diff --git a/testing/kdebase-workspace/PKGBUILD b/testing/kdebase-workspace/PKGBUILD
new file mode 100644
index 000000000..accdb6fe7
--- /dev/null
+++ b/testing/kdebase-workspace/PKGBUILD
@@ -0,0 +1,82 @@
+# $Id: PKGBUILD 162385 2012-06-26 17:49:20Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=kdebase-workspace
+_pkgname=kde-workspace
+pkgver=4.8.4
+pkgrel=2
+pkgdesc="KDE Base Workspace"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde')
+# note on libxdamage:
+# 	not detected by namcap because libgl depends on it
+#	but nvidia providing libgl does not depend on libxdamage
+depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate'
+         'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage'
+         'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
+         'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst'
+         'xorg-xrandr' 'xorg-xmessage' 'libusb-compat')
+makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
+optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
+install="${pkgname}.install"
+backup=('usr/share/config/kdm/kdmrc'
+        'etc/pam.d/kde'
+        'etc/pam.d/kde-np'
+        'etc/pam.d/kscreensaver')
+options=('emptydirs')
+source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
+        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service'
+        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+sha1sums=('a732ceacf34dfb79c8ab243f17cd5a70b9183212'
+          '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
+          '712a90999bd429883dcef5dcaf288aace332ced8'
+          'b321b5e613b60231330e606fdf1e124646148388'
+          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+          '758203a76b58d62786a1013f6f8682e48844138a'
+          'd7b5883f7e65c6839b1f65f94d58026673dd0226'
+          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
+          'd509dac592bd8b310df27991b208c95b6d907514')
+
+build() {
+	cd "${srcdir}"/${_pkgname}-${pkgver}
+	patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
+	patch -p0 -i "${srcdir}"/fixpath.patch
+	patch -p0 -i "${srcdir}"/terminate-server.patch
+	
+	cd "${srcdir}"
+	mkdir build
+	cd build
+	cmake ../${_pkgname}-${pkgver} \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_SKIP_RPATH=ON \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DWITH_Xmms=OFF \
+        -DWITH_Googlegadgets=OFF \
+        -DWITH_libgps=OFF \
+        -DWITH_OpenGLES=ON \
+        -DKWIN_BUILD_WITH_OPENGLES=ON \
+        -DPYTHON_EXECUTABLE=/usr/bin/python2
+	make
+}
+
+package() {
+	cd "${srcdir}"/build
+	make DESTDIR="${pkgdir}" install
+
+	install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde
+	install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np
+	install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver
+
+	install -d -m755 "${pkgdir}"/usr/share/xsessions/
+	ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \
+      "${pkgdir}"/usr/share/xsessions/
+	install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown}
+
+	install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm
+	install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
+    install -Dm644 "${srcdir}"/kdm.service \
+      "${pkgdir}"/usr/lib/systemd/system/kdm.service
+}
diff --git a/testing/kdebase-workspace/fixpath.patch b/testing/kdebase-workspace/fixpath.patch
new file mode 100644
index 000000000..be2b8383e
--- /dev/null
+++ b/testing/kdebase-workspace/fixpath.patch
@@ -0,0 +1,34 @@
+--- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
++++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
+@@ -34,22 +34,6 @@
+ MALLOC_CHECK_=2 
+ export MALLOC_CHECK_
+ 
+-# in case we have been started with full pathname spec without being in PATH
+-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+-if [ -n "$bindir" ]; then
+-  qbindir=`$bindir/kde4-config --qt-binaries`
+-  if [ -n "$qbindir" ]; then
+-    case $PATH in
+-      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
+-      *) PATH=$qbindir:$PATH; export PATH;;
+-    esac
+-  fi
+-  case $PATH in
+-    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+-    *) PATH=$bindir:$PATH; export PATH;;
+-  esac
+-fi
+-
+ # Boot sequence:
+ #
+ # kdeinit is used to fork off processes which improves memory usage
+@@ -206,7 +190,7 @@
+ # For anything else (that doesn't set env vars, or that needs a window manager),
+ # better use the Autostart folder.
+ 
+-libpath=`kde4-config --path lib | tr : '\n'`
++libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
+ 
+ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+   for file in "$prefix"*.sh; do
diff --git a/testing/kdebase-workspace/kde-np.pam b/testing/kdebase-workspace/kde-np.pam
new file mode 100644
index 000000000..7d60cc35c
--- /dev/null
+++ b/testing/kdebase-workspace/kde-np.pam
@@ -0,0 +1,9 @@
+#%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
+session		required	pam_limits.so
+-session    optional    pam_systemd.so
diff --git a/testing/kdebase-workspace/kde.pam b/testing/kdebase-workspace/kde.pam
new file mode 100644
index 000000000..ec1d8277f
--- /dev/null
+++ b/testing/kdebase-workspace/kde.pam
@@ -0,0 +1,9 @@
+#%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
+session		required	pam_limits.so
+-session    optional    pam_systemd.so
diff --git a/testing/kdebase-workspace/kdebase-workspace.install b/testing/kdebase-workspace/kdebase-workspace.install
new file mode 100644
index 000000000..f7d6d305b
--- /dev/null
+++ b/testing/kdebase-workspace/kdebase-workspace.install
@@ -0,0 +1,25 @@
+post_install() {
+	groupadd -g 135 kdm &>/dev/null
+	useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
+	chown -R 135:135 var/lib/kdm &>/dev/null
+	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
+	getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
+	chown -R 135:135 var/lib/kdm &>/dev/null
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_remove() {
+	if getent passwd kdm >/dev/null 2>&1; then
+	  userdel kdm
+	fi
+	if getent group kdm >/dev/null 2>&1; then
+	  groupdel kdm
+	fi
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
diff --git a/testing/kdebase-workspace/kdm b/testing/kdebase-workspace/kdm
new file mode 100644
index 000000000..799d58f4b
--- /dev/null
+++ b/testing/kdebase-workspace/kdm
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=$(pidof -o %PPID /usr/bin/kdm)
+case "$1" in
+  start)
+    stat_busy "Starting KDE Desktop Manager"
+    [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon kdm
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping KDE Desktop Manager"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon kdm
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/testing/kdebase-workspace/kdm-xinitrd.patch b/testing/kdebase-workspace/kdm-xinitrd.patch
new file mode 100644
index 000000000..f5fc0e571
--- /dev/null
+++ b/testing/kdebase-workspace/kdm-xinitrd.patch
@@ -0,0 +1,18 @@
+--- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~	2011-10-04 22:11:24.787771512 +0000
++++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c	2011-10-04 22:13:58.612702824 +0000
+@@ -742,6 +742,15 @@
+ "[ -f /etc/xprofile ] && . /etc/xprofile\n"
+ "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
+ "\n"
++"# run all system xinitrc shell scripts.\n"
++"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n"
++"  for i in /etc/X11/xinit/xinitrc.d/* ; do\n"
++"  if [ -x \"$i\" ]; then\n"
++"    . \"$i\"\n"
++"  fi\n"
++"  done\n"
++"fi\n"
++"\n"
+ "if [ -d /etc/X11/Xresources ]; then\n"
+ "  for i in /etc/X11/Xresources/*; do\n"
+ "    [ -f $i ] && xrdb -merge $i\n"
diff --git a/testing/kdebase-workspace/kdm.service b/testing/kdebase-workspace/kdm.service
new file mode 100644
index 000000000..15ff75ff2
--- /dev/null
+++ b/testing/kdebase-workspace/kdm.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=K Display Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/kdm -nodaemon
+
+[Install]
+WantedBy=graphical.target
diff --git a/testing/kdebase-workspace/kscreensaver.pam b/testing/kdebase-workspace/kscreensaver.pam
new file mode 100644
index 000000000..b4d80c21f
--- /dev/null
+++ b/testing/kdebase-workspace/kscreensaver.pam
@@ -0,0 +1 @@
+auth		required	pam_unix_auth.so
diff --git a/testing/kdebase-workspace/terminate-server.patch b/testing/kdebase-workspace/terminate-server.patch
new file mode 100644
index 000000000..094591317
--- /dev/null
+++ b/testing/kdebase-workspace/terminate-server.patch
@@ -0,0 +1,11 @@
+--- kdm/config.def	2009-08-27 10:17:39.000000000 +0200
++++ kdm/config.def	2009-10-31 00:40:21.000000000 +0100
+@@ -1448,7 +1448,7 @@
+ 
+ Key: TerminateServer
+ Type: bool
+-Default: false
++Default: true
+ User: core
+ Instance: #:*/!
+ Merge: xdm
diff --git a/testing/links/PKGBUILD b/testing/links/PKGBUILD
new file mode 100644
index 000000000..75b79952a
--- /dev/null
+++ b/testing/links/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 162375 2012-06-26 06:36:44Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=links
+pkgver=2.7
+pkgrel=1
+pkgdesc="A text WWW browser, similar to Lynx"
+arch=('i686' 'x86_64')
+url="http://links.twibright.com/"
+license=('GPL')
+depends=('bzip2' 'xz' 'zlib' 'openssl' 'gpm')
+makedepends=('libtiff' 'libpng' 'libxt')
+optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks')
+provides=('links-g')
+conflicts=('links-g')
+replaces=('links-g')
+source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop)
+sha1sums=('1e362a7e27078d630edf5868145a46247cda8cc3'
+          'f600e27c2a71184444f7dd07a10230aa44463a02')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  (cd intl; ./gen-intl; ./synclang)
+  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
+    --enable-graphics --with-x --with-fb
+  make
+  mv links xlinks
+
+  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
+    --disable-graphics --without-x  --without-fb
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 xlinks "${pkgdir}/usr/bin/xlinks"
+  ln -s links.1.gz "${pkgdir}/usr/share/man/man1/xlinks.1.gz"
+
+  install -D -m644 "${srcdir}/links.desktop" "${pkgdir}/usr/share/applications/links.desktop"
+  install -d "${pkgdir}/usr/share/pixmaps"
+  install -m644 links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm "${pkgdir}/usr/share/pixmaps/"
+
+  install -d "${pkgdir}/usr/share/doc/links/calibration"
+  install -m644 doc/links_cal/* "${pkgdir}/usr/share/doc/links/calibration/"
+}
diff --git a/testing/links/links.desktop b/testing/links/links.desktop
new file mode 100644
index 000000000..9d6338a5b
--- /dev/null
+++ b/testing/links/links.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Links
+Exec=xlinks -g
+Icon=links_32x32.xpm
+Type=Application
+Terminal=false
+Categories=Network;WebBrowser;