Thu Aug 4 23:14:34 UTC 2011

25 files changed, 310 insertions, 129 deletions

diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD
index 9ef6c7ff5..ecdc98517 100644
--- a/community/apcupsd/PKGBUILD
+++ b/community/apcupsd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 52280 2011-07-23 09:29:14Z spupykin $
+# $Id: PKGBUILD 53371 2011-08-03 09:47:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Todd Musall <tmusall@comcast.net>
 
 pkgname=apcupsd
 pkgver=3.14.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Apcupsd can be used for power mangement and controlling most of APC's UPS models on Unix and Windows machines."
 arch=(i686 x86_64)
 url="http://www.apcupsd.org"
@@ -19,7 +19,7 @@ backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf
 source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz
 	apcupsd)
 md5sums=('aa5e2c2954a81c2f07e0a356e38fe853'
-         '5eae3c4d921eeb81798a0250fe3dd111')
+         '8bc674da24188c69b0ad5d7fe7510f73')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/apcupsd/apcupsd b/community/apcupsd/apcupsd
index 3cd5c9dc8..73ca2b4bf 100755
--- a/community/apcupsd/apcupsd
+++ b/community/apcupsd/apcupsd
@@ -13,8 +13,6 @@ case "$1" in
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      PID=`pidof -o %PPID /sbin/apcupsd`
-      echo $PID > /var/run/apcupsd.pid
       add_daemon apcupsd
       stat_done
     fi
@@ -25,7 +23,6 @@ case "$1" in
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      rm /var/run/apcupsd.pid
       rm_daemon apcupsd
       stat_done
     fi
@@ -39,6 +36,6 @@ case "$1" in
     /sbin/apcaccess status
     ;;
   *)
-    echo "usage: $0 {start|stop|restart|status}"  
+    echo "usage: $0 {start|stop|restart|status}"
 esac
 exit 0
diff --git a/community/calcurse/PKGBUILD b/community/calcurse/PKGBUILD
index 537483258..a3e9c8b43 100644
--- a/community/calcurse/PKGBUILD
+++ b/community/calcurse/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 53331 2011-08-02 22:40:00Z lfleischer $
+# $Id: PKGBUILD 53403 2011-08-03 11:06:10Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: wain <wain.at.gmx.net>
 
 pkgname=calcurse
 pkgver=2.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc='A text-based personal organizer.'
 arch=('i686' 'x86_64')
 url='http://calcurse.org/'
 license=('BSD')
 depends=('ncurses')
+makedepends=('asciidoc')
 source=("http://calcurse.org/files/${pkgname}-${pkgver}.tar.gz")
 md5sums=('3a1af304a55a87169c425099b4886dc2')
 
diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD
index 6c28aaf4b..eb4a0c1fb 100644
--- a/community/compiz/PKGBUILD
+++ b/community/compiz/PKGBUILD
@@ -9,14 +9,14 @@ pkgname=('compiz-core'
 	'compiz-decorator-kde'
 	'compiz-decorator-gtk')
 pkgver=0.8.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Composite manager for Aiglx and Xgl"
 url="http://www.compiz.org/"
 license=('GPL' 'LGPL' 'MIT')
 arch=('i686' 'x86_64')
 groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion')
 makedepends=('intltool' 'gnome-control-center' 'libwnck' 'kdebase-workspace'
- 'startup-notification' 'librsvg' 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse')
+ 'startup-notification' 'librsvg' 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse' 'metacity')
 options=(!libtool !emptydirs)
 conflicts=('compiz' 'compiz-core-git' 'compiz-git')
 replaces=('compiz')
@@ -65,7 +65,7 @@ package_compiz-core()
 package_compiz-decorator-gtk()
 {
   pkgdesc="Compiz decorator for GNOME"
-  depends=('gnome-control-center' 'libwnck' 'compiz-core')
+  depends=('gnome-control-center' 'libwnck' 'compiz-core' 'metacity')
   install=compiz-decorator-gtk.install
 
   cd $srcdir/compiz-$pkgver
diff --git a/community/directfb/PKGBUILD b/community/directfb/PKGBUILD
index 7a366507a..322155d9f 100644
--- a/community/directfb/PKGBUILD
+++ b/community/directfb/PKGBUILD
@@ -1,24 +1,22 @@
-# $Id: PKGBUILD 33711 2010-11-27 20:33:08Z jlichtblau $
+# $Id: PKGBUILD 53472 2011-08-03 20:58:54Z ebelanger $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=directfb
-pkgver=1.4.11
+pkgver=1.4.14
 pkgrel=1
 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device"
 arch=('i686' 'x86_64')
 url="http://www.directfb.org"
 license=('LGPL')
-depends=('libjpeg' 'libxext' 'sdl' 'sysfsutils' 'libpng' 'freetype2')
+depends=('gcc-libs' 'libjpeg' 'sdl' 'sysfsutils' 'libpng' 'freetype2')
 options=('!libtool')
 changelog=$pkgname.changelog
 source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz)
-md5sums=('94735ccec21120794adcce93a61445d2')
+md5sums=('de0745d25a6ac9e337d4d5572df85471')
 
 build() {
-  cd ${srcdir}/DirectFB-${pkgver}
-
+  cd "${srcdir}/DirectFB-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-zlib \
               --enable-x11 --enable-sdl --disable-vnc --disable-osx \
               --enable-video4linux2 --enable-voodoo
@@ -26,7 +24,6 @@ build() {
 } 
 
 package() {
-  cd ${srcdir}/DirectFB-${pkgver}
-
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/DirectFB-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/ibus-hangul/PKGBUILD b/community/ibus-hangul/PKGBUILD
index efeed5115..6191465bf 100644
--- a/community/ibus-hangul/PKGBUILD
+++ b/community/ibus-hangul/PKGBUILD
@@ -1,9 +1,10 @@
+# $Id: PKGBUILD 53477 2011-08-03 21:36:31Z ebelanger $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Radim Hvizdák <hvizdakr at gmail dot com>
 
 pkgname=ibus-hangul
-pkgver=1.3.0.20100329
-pkgrel=2
+pkgver=1.3.1
+pkgrel=1
 pkgdesc='Korean input engine for IBus'
 arch=('i686' 'x86_64')
 url='http://ibus.googlecode.com'
@@ -11,10 +12,10 @@ license=('GPL')
 depends=('ibus' 'libhangul')
 makedepends=('intltool')
 source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('3464c98626685c8e23f6b0b580de2d08')
+md5sums=('b71565bba3a1439a47212611b774ecf7')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure \
     --prefix=/usr \
@@ -24,7 +25,7 @@ build() {
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make NO_INDEX=true DESTDIR=${pkgdir} install
+  make NO_INDEX=true DESTDIR="${pkgdir}" install
 }
diff --git a/community/ibus-m17n/PKGBUILD b/community/ibus-m17n/PKGBUILD
index 3e08b4c03..1849c40dd 100644
--- a/community/ibus-m17n/PKGBUILD
+++ b/community/ibus-m17n/PKGBUILD
@@ -1,20 +1,21 @@
+# $Id: PKGBUILD 53482 2011-08-03 22:10:35Z ebelanger $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Lonfucius <Lonfucius@gmail.com>
 # Contributor: Jesse Jaara <jesse.jaara@gmail.com>
 
 pkgname=ibus-m17n
-pkgver=1.3.1
-pkgrel=2
+pkgver=1.3.2
+pkgrel=1
 pkgdesc='M17N engine for IBus'
 arch=('i686' 'x86_64')
 url='http://code.google.com/p/ibus/'
 license=('LGPL')
 depends=('python-pyenchant' 'ibus' 'm17n-db' 'm17n-lib')
 source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('38ff41207518812945c60084deba0080')
+md5sums=('4c406147318f94e5e805c408c4be075e')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure  \
     --prefix=/usr \
@@ -24,7 +25,7 @@ build() {
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD
index b9d7c736c..653274e4d 100644
--- a/community/jshon/PKGBUILD
+++ b/community/jshon/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 pkgname=jshon
-pkgver=20110723
+pkgver=20110803
 pkgrel=1
 pkgdesc="A json parser for the shell."
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ depends=('jansson')
 makedepends=()
 optdepends=()
 source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('604ae154cb29cee8369df465794872ec')
+md5sums=('d14f012d6e9acf2c0ccc355fcd53c6fd')
 
 build() {
   cd "$srcdir/$pkgname"
diff --git a/community/kiwi/PKGBUILD b/community/kiwi/PKGBUILD
index bd02fe205..3b30c8fcc 100644
--- a/community/kiwi/PKGBUILD
+++ b/community/kiwi/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 26968 2010-09-16 03:55:06Z bfanella $
+# $Id: PKGBUILD 53351 2011-08-03 06:50:46Z bfanella $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=kiwi
-pkgver=1.9.26
-pkgrel=3
+pkgver=1.9.29
+pkgrel=1
 pkgdesc="A set of classes and wrappers for PyGTK"
 arch=('i686' 'x86_64')
 url="http://www.async.com.br/projects/kiwi"
@@ -13,7 +13,7 @@ license=("LGPL")
 depends=('pygtk')
 makedepends=('gettext')
 source=(http://download.gnome.org/sources/$pkgname/1.9/$pkgname-$pkgver.tar.bz2)
-md5sums=('43c2aab9acf8d95321ee1ccec2c5e4e4')
+sha256sums=('0ffa912cd180b3092b3ff636c582ab2c40f0f8eb541ada07b1432631a2d49e90')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
@@ -27,5 +27,6 @@ build() {
 }
 package() {
 	cd $srcdir/$pkgname-$pkgver
+
         python2 setup.py install --root=$pkgdir
 }
diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD
index 21497ff60..49f850d9a 100644
--- a/community/libinfinity/PKGBUILD
+++ b/community/libinfinity/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 45226 2011-04-18 13:01:37Z spupykin $
+# $Id: PKGBUILD 53361 2011-08-03 09:42:41Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Gregory Haynes <greg@greghaynes.net>
 
 pkgname=libinfinity
-pkgver=0.5.0
+pkgver=0.5.1
 pkgrel=1
 pkgdesc="An implementation of the Infininote protocol written in GObject-based C"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ optdepends=('avahi: zeroconf support'
             'gtk2: gtk support')
 options=('!libtool')
 source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('2b25de033c3a4c9975340300b09b84b0')
+md5sums=('85e6d75e101fe25503653d2202054eff')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index c2354f5e5..f15f7c2ad 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 53281 2011-08-02 17:21:12Z spupykin $
+# $Id: PKGBUILD 53366 2011-08-03 09:43:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=0.9.3
-pkgrel=4
+pkgver=0.9.4
+pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -38,10 +38,10 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	openbsd-netcat-default.patch
 	unixperms.patch
 	yajl-2.x.patch)
-md5sums=('04f47fad7d0c614af9dcc5d1351c2148'
+md5sums=('86b411b11bd23d4af20611699f372af7'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
-         'ebb78cda893ca7991e0c22588a63132b'
+         'ee7052f3929d5d918236c646a59edebf'
          'db95aecdf2ccf3693fef5821cdcb7eba'
          '5745bb8d0b254abb7a3528c66e03b0f9')
 
diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch
index 29f05b34f..c7543c5a4 100644
--- a/community/libvirt/openbsd-netcat-default.patch
+++ b/community/libvirt/openbsd-netcat-default.patch
@@ -1,7 +1,7 @@
-diff -wbBur libvirt-0.9.3/src/qemu/qemu_migration.c libvirt-0.9.3.my/src/qemu/qemu_migration.c
---- libvirt-0.9.3/src/qemu/qemu_migration.c	2011-07-04 06:45:14.000000000 +0400
-+++ libvirt-0.9.3.my/src/qemu/qemu_migration.c	2011-07-04 15:03:15.000000000 +0400
-@@ -1763,7 +1763,7 @@
+diff -wbBur libvirt-0.9.4.org/src/qemu/qemu_migration.c libvirt-0.9.4/src/qemu/qemu_migration.c
+--- libvirt-0.9.4.org/src/qemu/qemu_migration.c	2011-08-03 05:36:34.000000000 +0400
++++ libvirt-0.9.4/src/qemu/qemu_migration.c	2011-08-03 13:29:56.000000000 +0400
+@@ -1612,7 +1612,7 @@
          ret = qemuMonitorMigrateToUnix(priv->mon, background_flags,
                                                 unixfile);
      } else if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) {
@@ -10,24 +10,24 @@ diff -wbBur libvirt-0.9.3/src/qemu/qemu_migration.c libvirt-0.9.3.my/src/qemu/qe
          ret = qemuMonitorMigrateToCommand(priv->mon, QEMU_MONITOR_MIGRATE_BACKGROUND, args);
      } else {
          ret = -1;
-diff -wbBur libvirt-0.9.3/src/remote/remote_driver.c libvirt-0.9.3.my/src/remote/remote_driver.c
---- libvirt-0.9.3/src/remote/remote_driver.c	2011-07-01 10:59:10.000000000 +0400
-+++ libvirt-0.9.3.my/src/remote/remote_driver.c	2011-07-04 15:03:32.000000000 +0400
-@@ -571,7 +571,7 @@
-                                                 command,
+diff -wbBur libvirt-0.9.4.org/src/remote/remote_driver.c libvirt-0.9.4/src/remote/remote_driver.c
+--- libvirt-0.9.4.org/src/remote/remote_driver.c	2011-07-29 09:14:03.000000000 +0400
++++ libvirt-0.9.4/src/remote/remote_driver.c	2011-08-03 13:30:05.000000000 +0400
+@@ -588,7 +588,7 @@
                                                  username,
-                                                 no_tty,
+                                                 !tty,
+                                                 !verify,
 -                                                netcat ? netcat : "nc",
 +                                                netcat ? netcat : "nc.openbsd",
+                                                 keyfile,
                                                  sockname)))
              goto failed;
- 
-diff -wbBur libvirt-0.9.3/src/rpc/virnetsocket.c libvirt-0.9.3.my/src/rpc/virnetsocket.c
---- libvirt-0.9.3/src/rpc/virnetsocket.c	2011-07-01 10:59:10.000000000 +0400
-+++ libvirt-0.9.3.my/src/rpc/virnetsocket.c	2011-07-04 15:03:00.000000000 +0400
-@@ -597,7 +597,7 @@
-         virCommandAddArgList(cmd, "-T", "-o", "BatchMode=yes",
-                              "-e", "none", NULL);
+diff -wbBur libvirt-0.9.4.org/src/rpc/virnetsocket.c libvirt-0.9.4/src/rpc/virnetsocket.c
+--- libvirt-0.9.4.org/src/rpc/virnetsocket.c	2011-08-01 05:32:35.000000000 +0400
++++ libvirt-0.9.4/src/rpc/virnetsocket.c	2011-08-03 13:29:46.000000000 +0400
+@@ -629,7 +629,7 @@
+     if (noVerify)
+         virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
      virCommandAddArgList(cmd, nodename,
 -                         netcat ? netcat : "nc",
 +                         netcat ? netcat : "nc.openbsd",
diff --git a/community/listen/PKGBUILD b/community/listen/PKGBUILD
index ca594fa72..87f1289b8 100644
--- a/community/listen/PKGBUILD
+++ b/community/listen/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=listen
 pkgver=0.6.5
-pkgrel=6
+pkgrel=7
 pkgdesc="Music player and management for GNOME"
 arch=('i686' 'x86_64')
 url="http://www.listen-project.org/"
@@ -15,7 +15,6 @@ depends=('python2-egg' 'python2-libgnome'   'mutagen'
 makedepends=('gettext' 'pkgconfig' 'intltool' 'docbook2x' 'docbook-xml')
 optdepends=('python-musicbrainz2: musicbrainz & cd support'
             'libgpod: iPod support'
-            'hal: hal support'
             'python-daap: DAAP support'
             'tunepimp: tagging support')
 source=("http://download.listen-project.org/0.6/${pkgname}-${pkgver}.tar.gz")
diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD
index ba101365a..18136b30e 100644
--- a/community/lxappearance/PKGBUILD
+++ b/community/lxappearance/PKGBUILD
@@ -1,21 +1,21 @@
-#$Id: PKGBUILD 52925 2011-07-29 21:34:54Z angvp $
+#$Id: PKGBUILD 53436 2011-08-03 17:25:08Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>  
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 pkgname=lxappearance
 pkgver=0.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK+ theme switcher of the LXDE Desktop (manages icons and fonts)"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
-depends=('gtk3' 'intltool')
+depends=('gtk2' 'intltool')
 makedepends=('pkgconfig')
 source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
-    ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3 
+    ./configure --sysconfdir=/etc --prefix=/usr 
     make 
 }
 
diff --git a/community/lxde-common/PKGBUILD b/community/lxde-common/PKGBUILD
index b2516b833..808afbf1f 100644
--- a/community/lxde-common/PKGBUILD
+++ b/community/lxde-common/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $
+# $Id: PKGBUILD 53456 2011-08-03 20:00:26Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=lxde-common
-pkgver=0.5.0
-pkgrel=3
+pkgver=0.5.5
+pkgrel=1
 pkgdesc="Common files of the LXDE Desktop"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -15,16 +15,12 @@ url="http://lxde.org/"
 makedepends=(automake)
 optdepends=(lxsession-lite)
 backup=(etc/xdg/lxsession/LXDE/{desktop.conf,autostart})
-source=("http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz"
-        "${pkgname}-arch.patch" "${pkgname}-invalid-distfile.patch")
-md5sums=('23606ab3d6e1039386d62a4b68b4ffc6'
-         '21657157d9ab377de55deb19a42d68e8'
-         '24938631783683fd98dfd533023e6d4e')
+source=("http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz")
+md5sums=('e51a6b2a815a89fda1f497b509465a97')
 
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
-    patch -p1 -i ${srcdir}/${pkgname}-arch.patch
     autoreconf
     ./configure --sysconfdir=/etc --prefix=/usr
 }
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index f40329120..5e7a7ee29 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 52900 2011-07-29 19:07:23Z angvp $
+# $Id: PKGBUILD 53431 2011-08-03 17:17:03Z angvp $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: kiefer <jorgelmadrid@gmail.com>
 
 pkgname=lxdm
 pkgver=0.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight Display Manager (part of LXDE)"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/lxdm/"
@@ -13,7 +13,7 @@ groups=('lxde')
 depends=('gtk2' 'xorg-server' 'consolekit')
 makedepends=('intltool')
 install=${pkgname}.install
-backup=('etc/lxdm/lxdm.conf') # 'etc/lxdm/xinitrc')
+backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm') # 'etc/lxdm/xinitrc')
 source=("http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz"
         Xsession.patch lxdm.patch lxdm-pam.patch lxdm-daemon)
 md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
diff --git a/community/lxsession/PKGBUILD b/community/lxsession/PKGBUILD
new file mode 100644
index 000000000..db8719774
--- /dev/null
+++ b/community/lxsession/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 53453 2011-08-03 19:42:00Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+
+pkgname=lxsession
+pkgver=0.4.6.1
+pkgrel=1
+pkgdesc="Session manager of the LXDE Desktop (light version)"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://lxde.org/"
+groups=('lxde')
+depends=('gtk2' 'dbus')
+makedepends=('pkgconfig' 'intltool')
+replaces=('lxde-settings-daemon' 'lxsession-lite')
+conflicts=('lxsession-lite' 'lxde-settings-daemon')
+source=(http://downloads.sourceforge.net/lxde/lxsession-${pkgver}.tar.gz)
+md5sums=('e456b64c5ab3652a4dec661ec706dc6e')
+
+build() {
+	cd "$srcdir/lxsession-$pkgver"
+	./configure --sysconfdir=/etc --prefix=/usr
+	make
+}
+
+package() {
+	cd "$srcdir/lxsession-$pkgver"
+	make DESTDIR="$pkgdir" install 
+}
diff --git a/community/lxtask/PKGBUILD b/community/lxtask/PKGBUILD
index 38c46743e..8d2e9a7e9 100644
--- a/community/lxtask/PKGBUILD
+++ b/community/lxtask/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 52423 2011-07-24 22:29:09Z angvp $
+# $Id: PKGBUILD 53426 2011-08-03 17:15:52Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 pkgname=lxtask
 pkgver=0.1.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Task manager of the LXDE Desktop"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
-depends=('gtk3')
+depends=('gtk2')
 makedepends=('pkgconfig' 'intltool')
 source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
 md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f')
@@ -17,7 +17,7 @@ md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f')
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	autoreconf
-	./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3
+	./configure --sysconfdir=/etc --prefix=/usr
 	make
 }
 package() {
diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD
index 36876fe3d..b12c49445 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 51085 2011-07-05 07:17:46Z jconder $
+# $Id: PKGBUILD 53398 2011-08-03 10:39:01Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 pkgbase='packagekit'
 pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python')
-pkgver=0.6.16
+pkgver=0.6.17
 pkgrel=1
 pkgdesc="A system designed to make installation and updates of packages easier."
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool'
 	     'shared-mime-info' 'sqlite3' 'udev')
 options=('!libtool')
 source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz")
-sha256sums=('28fc2149e2dac4bed5b6b0479488dacc8af7e8a18556851711502b26de567e67')
+sha256sums=('7d6e0d0c63d0a0ef9b393a80ae3711e073cd4b884ff4996d5622f688e28d63c3')
 
 build() {
   cd "$srcdir/PackageKit-$pkgver"
diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD
index ef9d59015..fc56d7629 100644
--- a/community/qbittorrent/PKGBUILD
+++ b/community/qbittorrent/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=qbittorrent
-pkgver=2.8.2
-pkgrel=2
+pkgver=2.8.3
+pkgrel=1
 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
 arch=('i686' 'x86_64')
 url="http://www.qbittorrent.org/"
@@ -16,7 +16,7 @@ optdepends=('python2: needed for search'
 install='qbittorrent.install'
 source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz"
         'python2.patch')
-md5sums=('58008b6b0233c7997067a61cf07af50d'
+md5sums=('2e977ece476a83116beee5bf9df7a6c1'
          'db0d79fee8ce3470ad3741d36b02a94c')
 
 build() {
diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD
index 643c7b379..05d858e2c 100644
--- a/community/root/PKGBUILD
+++ b/community/root/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=root
 pkgver=5.30.00
-pkgrel=2
+pkgrel=3
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
 arch=('i686' 'x86_64')
 url='http://root.cern.ch'
@@ -40,7 +40,12 @@ build() {
 
   # python2 switch
   find . -type f -exec sed -i -e 's/python -O/python2 -O/g' -e 's/python -c/python2 -c/g' {} \;
-  sed -i 's/python 2/python2 2/g' configure
+  sed \
+    -e 's/python 2/python2 2/g' \
+    -i configure
+  sed \
+    -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \
+    -i cint/reflex/python/genreflex/Makefile.am
 
   ./configure \
     ${TARGET} \
diff --git a/community/synce-vdccm/PKGBUILD b/community/synce-vdccm/PKGBUILD
index ef43928d7..384394e78 100644
--- a/community/synce-vdccm/PKGBUILD
+++ b/community/synce-vdccm/PKGBUILD
@@ -1,26 +1,24 @@
-# $Id: PKGBUILD 17750 2010-05-24 21:46:24Z spupykin $
+# $Id: PKGBUILD 53376 2011-08-03 10:12:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zhukov Pavel <gelios@gmail.com>
 
 pkgname=synce-vdccm
 pkgver=0.10.1
-pkgrel=2
+pkgrel=3
 pkgdesc="provide a means of communication with a Windows CE device - daemon to communicate with a handheld device"
 arch=('i686' 'x86_64')
 url="http://synce.sourceforge.net/"
 license=('GPL')
 depends=('synce-libsynce')
-source=(http://downloads.sourceforge.net/synce/vdccm-$pkgver.tar.gz)
-md5sums=('43bca4c2fdb658f99b07549fa03832e0')
+source=(http://downloads.sourceforge.net/synce/vdccm-$pkgver.tar.gz
+	build-fix.patch)
+md5sums=('43bca4c2fdb658f99b07549fa03832e0'
+         'b90e1f8b46e70cd7f8f66f7ef041f3ac')
 
 build() {
   cd $srcdir/vdccm-$pkgver
+  patch -p1 <$srcdir/build-fix.patch
   ./configure --prefix=/usr
-  sed -i 's#-pedantic-errors##' Makefile.in src/Makefile.in Makefile src/Makefile
-  sed -i '1,1i#include <string.h>' lib/tcpsocket.cpp lib/tcpconnectedsocket.cpp lib/tcpclientsocket.cpp lib/udpsocket.cpp src/rapiclient.cpp
-  sed -i '1,1i#include <stdint.h>' lib/udpsocket.h src/rapiclient.h
-  sed -i '1,1i#include <limits.h>' src/rapiclient.h
-  sed -i '1,1i#include <stdio.h>' src/rapiconnection.cpp
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  make
+  make DESTDIR=$pkgdir install
 }
diff --git a/community/synce-vdccm/build-fix.patch b/community/synce-vdccm/build-fix.patch
new file mode 100644
index 000000000..f3bd32cff
--- /dev/null
+++ b/community/synce-vdccm/build-fix.patch
@@ -0,0 +1,123 @@
+diff -wbBur vdccm-0.10.1/lib/continousnode.cpp vdccm-0.10.1.my/lib/continousnode.cpp
+--- vdccm-0.10.1/lib/continousnode.cpp	2006-03-28 02:40:15.000000000 +0400
++++ vdccm-0.10.1.my/lib/continousnode.cpp	2011-08-03 14:05:21.000000000 +0400
+@@ -1,3 +1,4 @@
++#include <stdio.h>
+ /***************************************************************************
+  * Copyright (c) 2003 Volker Christian <voc@users.sourceforge.net>         *
+  *                                                                         *
+diff -wbBur vdccm-0.10.1/lib/localclientsocket.cpp vdccm-0.10.1.my/lib/localclientsocket.cpp
+--- vdccm-0.10.1/lib/localclientsocket.cpp	2006-03-22 22:59:14.000000000 +0300
++++ vdccm-0.10.1.my/lib/localclientsocket.cpp	2011-08-03 14:09:42.000000000 +0400
+@@ -68,6 +68,7 @@
+     raddr.sun_family = AF_LOCAL;
+     strncpy(raddr.sun_path, path.c_str(), sizeof(raddr.sun_path));
+ 
++#define offsetof(type, member)  __builtin_offsetof (type, member)
+     size_t size = (offsetof (struct sockaddr_un, sun_path) + strlen(raddr.sun_path) + 1);
+ 
+     if (::connect(fd, (struct sockaddr *) &raddr, size) < 0) {
+diff -wbBur vdccm-0.10.1/lib/localsocket.cpp vdccm-0.10.1.my/lib/localsocket.cpp
+--- vdccm-0.10.1/lib/localsocket.cpp	2006-03-28 02:40:15.000000000 +0400
++++ vdccm-0.10.1.my/lib/localsocket.cpp	2011-08-03 14:09:16.000000000 +0400
+@@ -78,6 +78,7 @@
+     localAddress.sun_family = AF_LOCAL;
+     strncpy(localAddress.sun_path, path.c_str(), sizeof(localAddress.sun_path));
+ 
++#define offsetof(type, member)  __builtin_offsetof (type, member)
+     size_t size = (offsetof (struct sockaddr_un, sun_path) + strlen(localAddress.sun_path) + 1);
+ 
+     if (::bind(getDescriptor(), (struct sockaddr *) &localAddress, size) < 0) {
+diff -wbBur vdccm-0.10.1/lib/tcpclientsocket.cpp vdccm-0.10.1.my/lib/tcpclientsocket.cpp
+--- vdccm-0.10.1/lib/tcpclientsocket.cpp	2006-03-22 22:59:14.000000000 +0300
++++ vdccm-0.10.1.my/lib/tcpclientsocket.cpp	2011-08-03 14:05:21.000000000 +0400
+@@ -1,3 +1,4 @@
++#include <string.h>
+ /***************************************************************************
+  * Copyright (c) 2003 Volker Christian <voc@users.sourceforge.net>         *
+  *                                                                         *
+diff -wbBur vdccm-0.10.1/lib/tcpconnectedsocket.cpp vdccm-0.10.1.my/lib/tcpconnectedsocket.cpp
+--- vdccm-0.10.1/lib/tcpconnectedsocket.cpp	2006-06-29 23:01:48.000000000 +0400
++++ vdccm-0.10.1.my/lib/tcpconnectedsocket.cpp	2011-08-03 14:05:21.000000000 +0400
+@@ -1,3 +1,4 @@
++#include <string.h>
+ /***************************************************************************
+  * Copyright (c) 2003 Volker Christian <voc@users.sourceforge.net>         *
+  *                                                                         *
+diff -wbBur vdccm-0.10.1/lib/tcpsocket.cpp vdccm-0.10.1.my/lib/tcpsocket.cpp
+--- vdccm-0.10.1/lib/tcpsocket.cpp	2006-06-29 23:01:48.000000000 +0400
++++ vdccm-0.10.1.my/lib/tcpsocket.cpp	2011-08-03 14:05:21.000000000 +0400
+@@ -1,3 +1,4 @@
++#include <string.h>
+ /***************************************************************************
+  * Copyright (c) 2003 Volker Christian <voc@users.sourceforge.net>         *
+  *                                                                         *
+diff -wbBur vdccm-0.10.1/lib/udpsocket.cpp vdccm-0.10.1.my/lib/udpsocket.cpp
+--- vdccm-0.10.1/lib/udpsocket.cpp	2006-05-07 19:49:36.000000000 +0400
++++ vdccm-0.10.1.my/lib/udpsocket.cpp	2011-08-03 14:05:21.000000000 +0400
+@@ -1,3 +1,4 @@
++#include <string.h>
+ //
+ // C++ Implementation: udpsocket
+ //
+diff -wbBur vdccm-0.10.1/lib/udpsocket.h vdccm-0.10.1.my/lib/udpsocket.h
+--- vdccm-0.10.1/lib/udpsocket.h	2006-05-06 17:07:32.000000000 +0400
++++ vdccm-0.10.1.my/lib/udpsocket.h	2011-08-03 14:05:21.000000000 +0400
+@@ -1,3 +1,4 @@
++#include <stdint.h>
+ //
+ // C++ Interface: udpsocket
+ //
+diff -wbBur vdccm-0.10.1/Makefile.in vdccm-0.10.1.my/Makefile.in
+--- vdccm-0.10.1/Makefile.in	2007-12-19 22:59:02.000000000 +0300
++++ vdccm-0.10.1.my/Makefile.in	2011-08-03 14:05:21.000000000 +0400
+@@ -186,9 +186,9 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = lib src tools
+-AM_CFLAGS = -O2 -Werror -pedantic-errors -Wall
+-AM_CXXFLAGS = -O2 -Werror -pedantic-errors -Wall
+-AM_FFLAGS = -O2 -Werror -pedantic-errors -Wall
++AM_CFLAGS = -O2 -Werror  -Wall
++AM_CXXFLAGS = -O2 -Werror  -Wall
++AM_FFLAGS = -O2 -Werror  -Wall
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+diff -wbBur vdccm-0.10.1/src/Makefile.in vdccm-0.10.1.my/src/Makefile.in
+--- vdccm-0.10.1/src/Makefile.in	2007-12-19 22:59:01.000000000 +0300
++++ vdccm-0.10.1.my/src/Makefile.in	2011-08-03 14:05:21.000000000 +0400
+@@ -250,7 +250,7 @@
+ 	rapiproxy.cpp rapiproxyfactory.cpp rapiproxyconnection.cpp \
+ 	$(am__append_3)
+ AM_CFLAGS = -Wall
+-AM_CXXFLAGS = -pedantic-errors -Wall
++AM_CXXFLAGS =  -Wall
+ man_MANS = vdccm.1
+ EXTRA_DIST = $(man_MANS)
+ all: $(BUILT_SOURCES)
+diff -wbBur vdccm-0.10.1/src/rapiclient.cpp vdccm-0.10.1.my/src/rapiclient.cpp
+--- vdccm-0.10.1/src/rapiclient.cpp	2006-05-06 17:07:32.000000000 +0400
++++ vdccm-0.10.1.my/src/rapiclient.cpp	2011-08-03 14:05:21.000000000 +0400
+@@ -1,3 +1,4 @@
++#include <string.h>
+ //
+ // C++ Implementation: rapiclient
+ //
+diff -wbBur vdccm-0.10.1/src/rapiclient.h vdccm-0.10.1.my/src/rapiclient.h
+--- vdccm-0.10.1/src/rapiclient.h	2006-05-06 17:07:32.000000000 +0400
++++ vdccm-0.10.1.my/src/rapiclient.h	2011-08-03 14:05:21.000000000 +0400
+@@ -1,3 +1,5 @@
++#include <limits.h>
++#include <stdint.h>
+ //
+ // C++ Interface: rapiclient
+ //
+diff -wbBur vdccm-0.10.1/src/rapiconnection.cpp vdccm-0.10.1.my/src/rapiconnection.cpp
+--- vdccm-0.10.1/src/rapiconnection.cpp	2007-05-10 22:27:03.000000000 +0400
++++ vdccm-0.10.1.my/src/rapiconnection.cpp	2011-08-03 14:05:21.000000000 +0400
+@@ -1,3 +1,4 @@
++#include <stdio.h>
+ //
+ // C++ Implementation: rapiconnection
+ //
diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD
index 0efa9c6d0..03f85a55d 100644
--- a/community/systemd/PKGBUILD
+++ b/community/systemd/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 49447 2011-06-16 13:09:25Z dreisner $
-# Maintainer: Dave Reisner <d@falconindy.com>
+# $Id: PKGBUILD 53341 2011-08-03 04:06:06Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=systemd
-pkgver=29
+pkgver=33
 pkgrel=1
 pkgdesc="Session and Startup manager"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2')
-depends=('dbus-core' 'sysvinit' 'util-linux>=2.19')
-makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'libnotify')
+depends=('dbus-core' 'libcap' 'util-linux>=2.19' 'udev>=172')
+makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify' 'gperf')
 optdepends=('cryptsetup: required for encrypted block devices'
             'dbus-python: systemd-analyze'
             'gtk2: systemadm'
@@ -20,29 +20,42 @@ optdepends=('cryptsetup: required for encrypted block devices'
             'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
 groups=('systemd')
 options=('!libtool')
-backup=(etc/systemd/system.conf
-        etc/tmpfiles.d/console.conf
-        usr/lib/tmpfiles.d/legacy.conf
-        usr/lib/tmpfiles.d/systemd.conf
-        usr/lib/tmpfiles.d/x11.conf)
+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)
 install=systemd.install
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2"
         "os-release")
-md5sums=('e91ffd208c5f03e5c11966eee7b684b0'
+md5sums=('361cad7c3debbdd81c211527509ba181'
          '752636def0db3c03f121f8b4f44a63cd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Don't unset locale in getty
+  # https://bugzilla.redhat.com/show_bug.cgi?id=663900
+  sed -i -e '/^Environ.*LANG/s/^/#/' \
+         -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4
+
   ./configure --prefix=/usr \
-              --with-rootdir= \
               --sysconfdir=/etc \
               --libexecdir=/usr/lib \
+              --libdir=/usr/lib \
               --localstatedir=/var \
+              --with-rootdir= \
+              --with-rootlibdir=/lib \
               --disable-audit \
               --disable-tcpwrap
 
   make
+
+  # fix .so links in manpages
+  sed -i 's|\.so halt\.8|.so systemd.halt.8|' man/{halt,poweroff}.8
 }
 
 package() {
@@ -51,7 +64,7 @@ package() {
   make DESTDIR="$pkgdir" install
 
   install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-  printf "d /run/console 755 root root\n" > "$pkgdir/etc/tmpfiles.d/console.conf"
+  printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
 
   # fix systemd-analyze for python2
   sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
@@ -61,5 +74,5 @@ package() {
   for manpage in telinit halt reboot poweroff runlevel shutdown; do
     mv {,systemd.}"$manpage.8"
   done
-}
 
+}
diff --git a/community/systemd/systemd.install b/community/systemd/systemd.install
index 7ec58682a..34f902276 100644
--- a/community/systemd/systemd.install
+++ b/community/systemd/systemd.install
@@ -1,13 +1,21 @@
 #!/bin/sh
 
 checkgroups() {
-  getent group lock >/dev/null || groupadd -g 54 lock
+  if usr/bin/getent group lock >/dev/null; then
+    usr/sbin/groupadd -g 54 lock
+  fi
+}
+
+sd_booted() {
+  [ -e sys/fs/cgroups/systemd ]
 }
 
 post_install() {
   checkgroups
 
-  [ -f /etc/machine-id ] || systemd-machine-id-setup
+  if [ -f etc/machine-id ]; then
+    bin/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."
@@ -16,16 +24,28 @@ post_install() {
 post_upgrade() {
   checkgroups
 
-  [ -f /etc/machine-id ] || systemd-machine-id-setup
-  systemctl daemon-reexec >/dev/null || :
-}
+  if [ -f etc/machine-id ]; then
+    bin/systemd-machine-id-setup
+  fi
+
+  if sd_booted; then
+    bin/systemctl daemon-reexec >/dev/null
+  fi
+
+  newpkgver=${1%-*}
+  oldpkgver=${2%-*}
 
-pre_remove() {
-  rm -f /etc/systemd/system/default.target
+  # 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
+      bin/systemctl try-restart systemd-logind.service
+    fi
+  fi
 }
 
 post_remove() {
-  getent group lock >/dev/null && groupdel lock
+  usr/bin/getent group lock >/dev/null && usr/sbin/groupdel lock
 }
 
 # vim:set ts=2 sw=2 et: