Sun May 6 00:02:43 UTC 2012

26 files changed, 148 insertions, 115 deletions

diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index 41be55fdd..16d4838bd 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156697 2012-04-23 09:03:20Z ibiru $
+# $Id: PKGBUILD 158550 2012-05-04 21:06:52Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=accountsservice
-pkgver=0.6.18
+pkgver=0.6.20
 pkgrel=1
 pkgdesc="D-Bus interface for user account query and manipulation"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('glib2' 'polkit' 'libsystemd')
 makedepends=('intltool' 'gobject-introspection' 'vala')
 options=('!libtool')
 source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.xz)
-md5sums=('31bc335f7d96b88e0d572a67a9df063d')
+md5sums=('0f26a90677e15c5cb38cf28261a3b434')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/consolekit/PKGBUILD b/extra/consolekit/PKGBUILD
index ed0a878a6..c03db85c1 100644
--- a/extra/consolekit/PKGBUILD
+++ b/extra/consolekit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156074 2012-04-12 21:13:25Z tomegun $
+# $Id: PKGBUILD 158560 2012-05-04 23:57:00Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: onestep_ua <onestep@ukr.net>
 
 pkgname=consolekit
 pkgver=0.4.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A framework for defining and tracking users, login sessions, and seats"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
@@ -25,6 +25,7 @@ build() {
       --libexecdir=/usr/lib/ConsoleKit \
       --with-systemdsystemunitdir=/usr/lib/systemd/system \
       --enable-pam-module \
+      --with-pam-module-dir=/usr/lib/security \
       --enable-docbook-docs \
       --enable-udev-acl
   make
diff --git a/extra/fprintd/PKGBUILD b/extra/fprintd/PKGBUILD
index bb5c2d2b5..292af2d28 100644
--- a/extra/fprintd/PKGBUILD
+++ b/extra/fprintd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142462 2011-11-10 09:32:21Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# $Id: PKGBUILD 158562 2012-05-04 23:57:03Z allan $
+# Maintainer:
 # Contributor: Nikolay Rysev <mad.f3ka@gmail.com>
 
 pkgname=fprintd
 pkgver=0.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="D-Bus service to access fingerprint readers"
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/wiki/Software/fprint/fprintd"
@@ -26,5 +26,5 @@ build() {
 
 package() {
   cd "$srcdir/$_snap"
-  make DESTDIR="$pkgdir" pammoddir="/lib/security" install
+  make DESTDIR="$pkgdir" pammoddir="/usr/lib/security" install
 }
diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD
index 48cafffe6..9519852c3 100644
--- a/extra/gegl/PKGBUILD
+++ b/extra/gegl/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 148728 2012-02-05 11:48:24Z ibiru $
+# $Id: PKGBUILD 158546 2012-05-04 19:12:03Z daniel $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gegl
-pkgver=0.1.8
-pkgrel=2
+pkgver=0.2.0
+pkgrel=1
 pkgdesc="Graph based image processing framework"
 arch=('i686' 'x86_64')
 url="http://www.gegl.org/"
 license=('GPL3' 'LGPL3')
 depends=('babl' 'gtk2')
-makedepends=('ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2')
+makedepends=('intltool' 'ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2')
 optdepends=('openexr: for using the openexr plugin' \
             'ffmpeg: for using the ffmpeg plugin' \
             'librsvg: for using the svg plugin' \
             'jasper: for using the jasper plugin')
 options=('!libtool')
 source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('3d4d902580f5c5122b01b5188b6b5da03089ecac')
+sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -25,10 +25,10 @@ build() {
   make
 }
 
-#check() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-#  make check
-#}
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gimp-devel/PKGBUILD b/extra/gimp-devel/PKGBUILD
index 4d120263d..eb659c9f8 100644
--- a/extra/gimp-devel/PKGBUILD
+++ b/extra/gimp-devel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 153442 2012-03-14 06:47:26Z eric $
+# $Id: PKGBUILD 158548 2012-05-04 19:12:28Z daniel $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gimp-devel
-pkgver=2.7.5
+pkgver=2.8.0
 pkgrel=1
 pkgdesc="GNU Image Manipulation Program (Development Version)"
 arch=('i686' 'x86_64')
@@ -22,7 +22,7 @@ conflicts=('gimp')
 provides=("gimp=${pkgver}")
 install=gimp-devel.install
 source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl)
-md5sums=('55c3ce1402890665464d9aad74ea63b6'
+md5sums=('28997d14055f15db063eb92e1c8a7ebb'
          'bb27bc214261d36484093e857f015f38')
 
 build() {
@@ -44,12 +44,8 @@ package() {
   sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
   install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl"
 
+  rm  "${pkgdir}/usr/share/man/man1/gimp-console.1"
   ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
-  ln -sf gimprc-${pkgver%.*}.5.gz "${pkgdir}/usr/share/man/man5/gimprc.5.gz"
   ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
-  ln -s gimp-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp.1.gz"
-
-  ln -s gimp-${pkgver%.*} "${pkgdir}/usr/bin/gimp"
-  ln -s gimp-console-${pkgver%.*} "${pkgdir}/usr/bin/gimp-console"
   ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
 }
diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD
index 6522c6c5c..7d7a1f464 100644
--- a/extra/gimp/PKGBUILD
+++ b/extra/gimp/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 148734 2012-02-05 11:48:37Z ibiru $
-# Maintainer: tobias <tobias@archlinux.org>
+# $Id: PKGBUILD 158544 2012-05-04 19:10:38Z daniel $
+# Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=gimp
-pkgver=2.6.12
+pkgver=2.8.0
 pkgrel=1
 pkgdesc="GNU Image Manipulation Program"
 arch=('i686' 'x86_64')
 url="http://www.gimp.org/"
 license=('GPL' 'LGPL')
 depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \
-         'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme')
+         'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme' 'babl')
 makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl')
 optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
             'libwebkit: for the help browser'
@@ -21,13 +21,13 @@ conflicts=('gimp-devel')
 install=gimp.install
 source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl 
         uri-backend-libcurl.patch)
-sha1sums=('82964e3d4eb003239f3443a1bccac53f5d780e15'
-          '110ce9798173b19a662d086ed7b882b4729f06cf'
-          'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4')
+md5sums=('28997d14055f15db063eb92e1c8a7ebb'
+         'bb27bc214261d36484093e857f015f38'
+         'e894f4b2ffa92c71448fdd350e9b78c6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../uri-backend-libcurl.patch
+  #patch -p1 < ../uri-backend-libcurl.patch
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
     --enable-mp --enable-gimp-console --enable-gimp-remote \
     --enable-python --with-gif-compression=lzw --with-libcurl \
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index 2d5dd9a3b..71d8e4ebd 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 156825 2012-04-23 09:06:58Z ibiru $
+#$Id: PKGBUILD 158564 2012-05-04 23:57:06Z allan $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
@@ -21,7 +21,7 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-keyring \
-      --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs \
+      --with-pam-dir=/usr/lib/security --with-root-certs=/etc/ssl/certs \
       --disable-schemas-compile
   make
 }
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 4d806833d..d9816ab21 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157397 2012-04-28 09:26:38Z allan $
+# $Id: PKGBUILD 158538 2012-05-04 12:58:08Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
 pkgver=3.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="The next generation GNOME Shell"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeShell"
@@ -15,11 +15,14 @@ optdepends=('network-manager-applet: shell integration for networkmanager')
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6abfd2fca104aae64ce9d027dd233fc218a58b861176a64831b68e3f90ab56a9')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        recorder.patch)
+sha256sums=('6abfd2fca104aae64ce9d027dd233fc218a58b861176a64831b68e3f90ab56a9'
+            'b00589e867c0ae63b47982145cb4ab366afec84a568e66867f51fa8da13027f1')
 
 build() {
   cd "$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/recorder.patch"
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-shell \
       --localstatedir=/var --disable-static \
diff --git a/extra/gnome-shell/recorder.patch b/extra/gnome-shell/recorder.patch
new file mode 100644
index 000000000..41134a31a
--- /dev/null
+++ b/extra/gnome-shell/recorder.patch
@@ -0,0 +1,28 @@
+From 915524e1ab7d2c5efb95985f30ee2f7c5ca69554 Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos@gmail.com>
+Date: Wed, 02 May 2012 14:44:40 +0000
+Subject: main: Close the recorder instead of pausing it
+
+Pausing means that we will continue to use the same output file when
+the keybinding is activated again. While useful to record a single
+video in chunks, it doesn't seem to be how most users understand the
+keybinding. Closing the recorder will close the file and create a new
+one the next time the keybinding is pressed.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=675128
+---
+diff --git a/js/ui/main.js b/js/ui/main.js
+index 3b80297..25ad8d8 100644
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -110,7 +110,7 @@ function _initRecorder() {
+         }
+ 
+         if (recorder.is_recording()) {
+-            recorder.pause();
++            recorder.close();
+             Meta.enable_unredirect_for_screen(global.screen);
+         } else {
+             // read the parameters from GSettings always in case they have changed
+--
+cgit v0.9.0.2
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index d74dd2ca8..1dc364c17 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149986 2012-02-12 02:54:27Z allan $
+# $Id: PKGBUILD 158594 2012-05-05 02:02:44Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
 
 pkgname=libjpeg-turbo
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression"
 arch=('i686' 'x86_64')
 url="http://libjpeg-turbo.virtualgl.org/"
@@ -46,6 +46,7 @@ package() {
   # do not distributre libturbojpeg as it is unversioned
   rm $pkgdir/usr/lib/libturbojpeg.{so,a}
   rm $pkgdir/usr/include/turbojpeg.h
+  rm $pkgdir/usr/bin/tjbench
   
   install -dm755 $pkgdir/usr/share/licenses/libjpeg-turbo/
   ln -s ../../doc/libjpeg-turbo/README \
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index 57fac222e..eea3e9cba 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158285 2012-05-03 15:12:33Z giovanni $
+# $Id: PKGBUILD 158554 2012-05-04 23:23:19Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.2
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('e52ab7ab35105c768a4cd1658de0e1a5'
+md5sums=('0ff7c7f7c50e506d494ff84baa10a77d'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index f2a6773fb..7193c9d8a 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 156228 2012-04-16 12:08:26Z jgc $
+# $Id: PKGBUILD 158536 2012-05-04 10:15:27Z foutrelis $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nss
 pkgver=3.13.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
 _nsprver=4.9
-depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh')
+depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
 makedepends=('perl')
 options=('!strip')
 source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
@@ -47,6 +47,7 @@ build() {
   export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
   export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
   export NSS_USE_SYSTEM_SQLITE=1
+  export NSS_ENABLE_ECC=1
   export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
   export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
   export XCFLAGS="${CFLAGS}"
diff --git a/extra/nss_ldap/PKGBUILD b/extra/nss_ldap/PKGBUILD
index 71c689f86..e702b98e8 100644
--- a/extra/nss_ldap/PKGBUILD
+++ b/extra/nss_ldap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151294 2012-02-25 13:12:18Z pierre $
-# Maintainer: Paul Mattal <paul@archlinux.org>
+# $Id: PKGBUILD 158628 2012-05-05 03:23:20Z dreisner $
+# Maintainer:
 # Contributor: Comete <la_comete@tiscali.fr>
 
 pkgname=nss_ldap
 pkgver=265
-pkgrel=3
+pkgrel=4
 pkgdesc="The nss_ldap module provides the means for Linux and Solaris workstations to resolve the entities defined in RFC 2307 from LDAP directories."
 arch=('i686' 'x86_64')
 url="http://www.padl.com/OSS/nss_ldap.html"
@@ -17,9 +17,10 @@ md5sums=('c1cb02d1a85538cf16bca6f6a562abe4')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure \
+       --prefix=/usr \
        --with-ldap-conf-file=/etc/nss_ldap.conf \
        --with-ldap=openldap \
-       --libdir=/lib \
+       --sysconfdir=/etc \
        --mandir=/usr/share/man \
        --enable-schema-mapping \
        --enable-rfc2307bis \
@@ -30,4 +31,7 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+
+  # buildsystem is trying to be clever and hardcodes symlinks in /usr$(libdir)
+  rm -rf "${pkgdir}/usr/usr"
 }
diff --git a/extra/pam_ldap/PKGBUILD b/extra/pam_ldap/PKGBUILD
index d59b9fc9f..620ed04e8 100644
--- a/extra/pam_ldap/PKGBUILD
+++ b/extra/pam_ldap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151292 2012-02-25 13:09:27Z pierre $
-# Maintainer: Paul Mattal <paul@archlinux.org>
+# $Id: PKGBUILD 158605 2012-05-05 02:41:12Z allan $
+# Maintainer:
 # Contributor: Comete <la_comete@tiscali.fr>
 
 pkgname=pam_ldap
 pkgver=186
-pkgrel=1
+pkgrel=4
 pkgdesc="LDAP authentication module for the PAM framework"
 arch=('i686' 'x86_64')
 url="http://www.padl.com/OSS/pam_ldap.html"
@@ -17,7 +17,7 @@ md5sums=('58c8689921c5c4578363438acd8503c2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --libdir=/lib \
+  ./configure --libdir=/usr/lib \
       --with-ldap-conf-file=/etc/pam_ldap.conf \
       --mandir=/usr/share/man
   PATH="${PATH}:${srcdir}/${pkgname}-${pkgver}" make
diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD
index 2982fae33..43c91f938 100644
--- a/extra/qemu-kvm/PKGBUILD
+++ b/extra/qemu-kvm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 157263 2012-04-26 20:32:45Z tpowa $
+# $Id: PKGBUILD 158632 2012-05-05 03:24:58Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu-kvm
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64)
 license=('GPL2' 'LGPL2.1')
@@ -61,7 +61,7 @@ package()
                      "${pkgdir}/usr/share/man/man1/qemu-kvm.1"
     # install udev rules
     install -D -m644 "${srcdir}/65-kvm.rules" \
-                     "${pkgdir}/lib/udev/rules.d/65-kvm.rules"
+                     "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
     # strip scripts directory
     find "${pkgdir}/usr/bin"  -type f -perm -u+w 2>/dev/null | while read binary ; do
       case "$(file -bi "$binary")" in
diff --git a/extra/qemu-kvm/qemu-kvm.install b/extra/qemu-kvm/qemu-kvm.install
index 84aa773b9..5161df93a 100644
--- a/extra/qemu-kvm/qemu-kvm.install
+++ b/extra/qemu-kvm/qemu-kvm.install
@@ -3,7 +3,6 @@ post_install() {
   echo ">>> PLEASE READ FOR KVM USAGE!"
   echo ">>>  Load the correct KVM module, you will need a KVM capable CPU!"
   echo ">>>  Add yourself to the group 'kvm'."
-  echo ">>>  Use 'qemu-kvm -enable-kvm' to use KVM."
   echo ""
 }
 
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index d787fd561..c96870137 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 152196 2012-03-05 08:20:34Z tpowa $
+# $Id: PKGBUILD 158630 2012-05-05 03:24:55Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
 url="http://wiki.qemu.org/Index.html"
 makedepends=('iasl' 'git' 'texi2html' 'perl' 'python2')
-depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl' 'libpulse')
+depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu.install
 source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz
@@ -42,7 +42,7 @@ package() {
   cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin"
 
   install -D -m644 "${srcdir}/65-kvm.rules" \
-                   "${pkgdir}/lib/udev/rules.d/65-kvm.rules"
+                   "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
   # strip scripts directory
     find "${pkgdir}/usr/src/linux-${_kernver}/scripts"  -type f -perm -u+w 2>/dev/null | while read binary ; do
       case "$(file -bi "$binary")" in
diff --git a/extra/qemu/qemu.install b/extra/qemu/qemu.install
index e16ac027c..fd92c60eb 100644
--- a/extra/qemu/qemu.install
+++ b/extra/qemu/qemu.install
@@ -5,7 +5,6 @@ post_install() {
   echo ">>> PLEASE READ FOR KVM USAGE!"
   echo ">>>  Load the correct KVM module, you will need a KVM capable CPU!"
   echo ">>>  Add yourself to the group 'kvm'."
-  echo ">>>  Use 'qemu -enable-kvm' to use KVM."
   echo ""
   if [ "$(vercmp $2 0.11)" -lt 0 ]; then
     echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index cb0123245..11db4fc3e 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 157239 2012-04-26 13:06:31Z tpowa $
+# $Id: PKGBUILD 158568 2012-05-04 23:57:16Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=3.6.4
+pkgver=3.6.5
 # 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.4
-pkgrel=2
+_realver=3.6.5
+pkgrel=1
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
@@ -35,7 +35,7 @@ build() {
               --with-fhs \
               --with-pam \
               --with-pam_smbpass \
-              --with-pammodulesdir=/lib/security \
+              --with-pammodulesdir=/usr/lib/security \
               --with-dnsupdate \
               --with-automount \
               --with-quotas \
@@ -114,10 +114,10 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
   # fix logrotate
   sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default
   # nsswitch libraries
-  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so
-  ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2
-  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so
-  ln -s libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so.2
+  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so
+  ln -s libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so.2
+  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so
+  ln -s libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so.2
   # winbind krb5 locator
   mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5
   install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5
@@ -154,7 +154,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
   done
   install -D -m644 ${srcdir}/smbd.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf 
 }
-md5sums=('d8e070e2a3b12f202f347e4427469bc2'
+md5sums=('2f0c14547333c1b48fd4728b031e7040'
          'dfc6f9018c556b9783c7140de183727f'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
diff --git a/extra/systemd/PKGBUILD b/extra/systemd/PKGBUILD
index c09599940..3a62d466d 100644
--- a/extra/systemd/PKGBUILD
+++ b/extra/systemd/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 155750 2012-04-06 00:06:04Z tomegun $
+# $Id: PKGBUILD 158570 2012-05-04 23:57:21Z allan $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd')
 pkgver=44
-pkgrel=5
+pkgrel=7
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2')
+license=('GPL2' 'LGPL2.1' 'MIT')
 makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
              'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
 options=('!libtool')
@@ -25,10 +25,10 @@ md5sums=('11f44ff74c87850064e4351518bcff17'
 build() {
   cd "$pkgname-$pkgver"
 
-  # https://bugzilla.redhat.com/show_bug.cgi?id=803358
+  # https://bugzilla.redhat.com/show_bug.cgi?id=803358 (upstream 5ebff53375)
   patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch"
 
-  # https://bugs.archlinux.org/task/28386
+  # https://bugs.archlinux.org/task/28386 (upstream 75c8e3cffd)
   patch -Np1 <"$srcdir/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch"
 
   # Fix broken 'systemctl list-unit-files' (upstream fb5ef067c49)
@@ -36,10 +36,11 @@ build() {
 
   ./configure --sysconfdir=/etc \
               --libexecdir=/usr/lib \
-              --with-pamlibdir=/lib/security \
+              --with-pamlibdir=/usr/lib/security \
               --localstatedir=/var \
               --with-distro=arch \
-              --enable-split-usr
+              --enable-split-usr \
+              --disable-ima
 
   make
 }
@@ -75,9 +76,8 @@ package_systemd() {
   chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
 
   # symlink to /bin/systemd for compat and sanity
-  install -dm755 "$pkgdir/bin" "$pkgdir/lib/systemd"
+  install -dm755 "$pkgdir/bin"
   ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/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"
diff --git a/extra/systemd/systemd.install b/extra/systemd/systemd.install
index 822108c0f..0c3e9abee 100644
--- a/extra/systemd/systemd.install
+++ b/extra/systemd/systemd.install
@@ -29,18 +29,14 @@ post_upgrade() {
   fi
 
   if sd_booted; then
-    systemctl daemon-reload
-    systemctl daemon-reexec
-  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
+    # 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
+    # reboot instead.
+    if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then
+      echo "warning: refusing to reexec systemd. the system should be rebooted."
+    else
+      systemctl daemon-reload
+      systemctl daemon-reexec
     fi
   fi
 }
diff --git a/extra/thinkfinger/PKGBUILD b/extra/thinkfinger/PKGBUILD
index 04d7b5b2d..2212b5dec 100644
--- a/extra/thinkfinger/PKGBUILD
+++ b/extra/thinkfinger/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 144027 2011-12-02 07:42:30Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 158572 2012-05-04 23:57:24Z allan $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: François Charette <francois.archlinux.org>
 # Contributor: Damir Perisa <damir.archlinux.org>
 # Contributor: Björn Martensen <bjoern.martensen@gmail.com>
 
 pkgname=thinkfinger
 pkgver=0.3
-pkgrel=5
+pkgrel=6
 pkgdesc="A driver for the SGS Thomson Microelectronics fingerprint reader found in most IBM/Lenovo ThinkPads"
 url="http://thinkfinger.sourceforge.net/"
 arch=('i686' 'x86_64')
@@ -30,7 +30,6 @@ build() {
   patch -p1 -i "${srcdir}"/gcc46.patch
 
   ./configure --prefix=/usr \
-  		--with-securedir=/lib/security \
 		--with-birdir=/etc/pam_thinkfinger
   make
 }
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 099481254..37f872972 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 156992 2012-04-23 09:10:47Z ibiru $
+# $Id: PKGBUILD 158542 2012-05-04 17:15:31Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
-pkgver=0.14.0
+pkgver=0.14.1
 _tver=${pkgver%.*}
-pkgrel=3
+pkgrel=1
 pkgdesc="All-in-one indexer, search tool and metadata database"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -19,7 +19,7 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('78e432c5c14b9d186ccca3c382accdcdb4f07c2c6e25989fda48401b4a68f7d4')
+sha256sums=('17ac4125d02c5f820eae9a785ac1c90b0e93682730a3950f82fd4a3dff238a43')
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/extra/usbmuxd/PKGBUILD b/extra/usbmuxd/PKGBUILD
index 1fe072642..f7d7f6d50 100644
--- a/extra/usbmuxd/PKGBUILD
+++ b/extra/usbmuxd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 134490 2011-08-04 15:41:22Z ibiru $
+# $Id: PKGBUILD 158609 2012-05-05 03:08:45Z allan $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gabriel Martinez < reitaka at gmail dot com >
 
 pkgname=usbmuxd
 pkgver=1.0.7
-pkgrel=2
+pkgrel=3
 pkgdesc="USB Multiplex Daemon"
 url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
 arch=('i686' 'x86_64')
@@ -29,4 +29,8 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
+
+  # fix udev dir being hardcoded
+  mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
+  rmdir "${pkgdir}/lib"
 }
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index 56ccaee39..62ec3d6c4 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 149800 2012-02-10 23:21:36Z thomas $
+# $Id: PKGBUILD 158613 2012-05-05 03:14:18Z allan $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
-pkgver=0.8.6
+pkgver=0.8.8
 pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('i686' 'x86_64')
@@ -15,8 +15,6 @@ optdepends=('qt')
 depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
 source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2
         http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc)
-sha256sums=('3a53ac6348363bbdc94ea11ca48dadc0342a579384a910f6c956b6a185f0c20f'
-            '3c2613c77dd68e94ac9eb2b2e856b94e3d3cea57f5de054b95150cbc905b1f18')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -30,4 +28,8 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make install PREFIX="/usr" DESTDIR="${pkgdir}/"
   rm -f "${pkgdir}/usr/bin/ivtv-ctl"
+  mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
+  rm -rf "${pkgdir}/lib"
 }
+md5sums=('40fdda3f4055ed818012d7a7b5ef5be5'
+         'cceb1325f35789c95f875b705b3eb373')
diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD
index fcf0ea299..9fb79abff 100644
--- a/extra/xf86-input-wacom/PKGBUILD
+++ b/extra/xf86-input-wacom/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 153317 2012-03-12 20:53:04Z andyrtr $
+# $Id: PKGBUILD 158636 2012-05-05 03:31:18Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: M Rawash <mrawash@gmail.com>
 
 pkgname=xf86-input-wacom
 pkgver=0.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org Wacom tablet driver"
 arch=('i686' 'x86_64')
 url="http://linuxwacom.sourceforge.net/"
@@ -30,6 +30,6 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  install -m755 -d "${pkgdir}/lib/udev/rules.d"
-  install -m644 "${srcdir}/70-wacom.rules"  "${pkgdir}/lib/udev/rules.d/"
+  install -m755 -d "${pkgdir}/usr/lib/udev/rules.d"
+  install -m644 "${srcdir}/70-wacom.rules"  "${pkgdir}/usr/lib/udev/rules.d/"
 }