Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/pigeonhole/PKGBUILD
	community/mingw32-pthreads/PKGBUILD
	community/openbsd-netcat/PKGBUILD
	community/remmina/PKGBUILD
	core/crda/PKGBUILD
	core/libnl/PKGBUILD
	core/wpa_supplicant/PKGBUILD
	extra/fontconfig/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/libcdio/PKGBUILD
	extra/maxima/PKGBUILD
	extra/vcdimager/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xfdesktop/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/q4wine/PKGBUILD
	testing/dovecot/PKGBUILD

45 files changed, 1073 insertions, 226 deletions

diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index d8d7050b2..565602ac1 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,24 +1,23 @@
-# $Id: PKGBUILD 147730 2012-01-27 15:54:11Z heftig $
+# $Id: PKGBUILD 150898 2012-02-23 13:54:59Z allan $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=bluez
 pkgver=4.98
-pkgrel=2
+pkgrel=3
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('dbus-core')
-makedepends=('gstreamer0.10-base' 'libusb-compat' 'libnl' 'libsndfile')
+makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile')
 optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
 	"alsa-lib: Audio bluetooth devices support"
 	"dbus-python: to run bluez-simple-agent"
 	"pygobject: to run bluez-simple-agent"
 	"libusb-compat: USB adapters support"
-	"cups: CUPS backend"
-	"libnl: netlink plugin")
+        "cups: CUPS backend")
 conflicts=('bluez-libs' 'bluez-utils')
 provides=('bluez-libs' 'bluez-utils')
 replaces=('bluez-libs' 'bluez-utils')
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index 880940ef7..1c73468b8 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146778 2012-01-17 13:36:48Z ibiru $
+# $Id: PKGBUILD 150827 2012-02-23 11:03:34Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=colord
-pkgver=0.1.16
+pkgver=0.1.17
 pkgrel=1
 pkgdesc="Color daemon"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,15 +11,19 @@ url="http://www.freedesktop.org/software/colord"
 license=('GPL2')
 depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev')
 makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x')
-source=($url/releases/$pkgname-$pkgver.tar.xz)
+source=($url/releases/$pkgname-$pkgver.tar.xz
+        fix-compilation.patch)
 options=('!libtool')
-sha1sums=('bd2fbad0043d2c1f55ab7ff8cb5e261b684e699c')
+sha1sums=('7716c58a7ab85029637c7e88bdb77e48b6cd5ce9'
+          'b77dd47f623a05055e8988dd568695fcbf457500')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/fix-compilation.patch"
   ./configure --prefix=/usr \
     --sysconfdir=/etc --libexecdir=/usr/lib/colord \
-    --localstatedir=/var --disable-static
+    --localstatedir=/var --disable-static \
+    --with-systemdsystemunitdir=/lib/systemd/system
   make
 }
 
diff --git a/extra/colord/fix-compilation.patch b/extra/colord/fix-compilation.patch
new file mode 100644
index 000000000..b956cb9f6
--- /dev/null
+++ b/extra/colord/fix-compilation.patch
@@ -0,0 +1,38 @@
+From 638a98fef16fa15946522d4112660b4b20c0d630 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Thu, 23 Feb 2012 10:43:37 +0000
+Subject: [PATCH] trivial: Fix compile with older versions of GLib
+
+g_mapped_file_new_from_fd() was introduced in 2.31.0 not 2.30.0 as the
+docs suggested.
+
+Resoves https://bugs.freedesktop.org/show_bug.cgi?id=46481
+---
+ src/cd-profile.c |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/src/cd-profile.c b/src/cd-profile.c
+index a292616..323588b 100644
+--- a/src/cd-profile.c
++++ b/src/cd-profile.c
+@@ -1066,7 +1066,17 @@ cd_profile_set_fd (CdProfile *profile,
+ 	}
+ 
+ 	/* create a mapped file */
++#if GLIB_CHECK_VERSION(2,31,0)
+ 	priv->mapped_file = g_mapped_file_new_from_fd (fd, FALSE, error);
++	if (priv->mapped_file == NULL) {
++		g_set_error (error,
++			     CD_MAIN_ERROR,
++			     CD_MAIN_ERROR_FAILED,
++			     "failed to create mapped file from fd %i",
++			     fd);
++		goto out;
++	}
++#endif
+ 
+ 	/* parse the ICC file */
+ 	lcms_profile = cmsOpenProfileFromStream (stream, "r");
+-- 
+1.7.6
+
diff --git a/extra/ecasound/PKGBUILD b/extra/ecasound/PKGBUILD
index f2f381726..97c51259d 100644
--- a/extra/ecasound/PKGBUILD
+++ b/extra/ecasound/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149067 2012-02-05 16:13:46Z schiv $
+# $Id: PKGBUILD 150935 2012-02-24 01:43:21Z tdziedzic $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ecasound
 pkgver=2.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A software package designed for multitrack audio processing"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.eca.cx/ecasound/"
@@ -29,6 +29,9 @@ md5sums=('d9ded0074a8eeb59dd507c248220d010')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # use vendor_ruby for ruby files
+  sed -e 's/CONFIG\["sitedir"\]/CONFIG\["vendordir"\]/' -i configure
+
   PYTHONPATH=/usr/bin/python2 ./configure \
     --prefix=/usr \
     --with-python-includes=/usr/include/python2.7 \
diff --git a/extra/exempi/PKGBUILD b/extra/exempi/PKGBUILD
index a8f53f5e5..efe77cf33 100644
--- a/extra/exempi/PKGBUILD
+++ b/extra/exempi/PKGBUILD
@@ -1,24 +1,28 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: André Klitzing <aklitzing@online.de>
 pkgname=exempi
-pkgver=2.1.1
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="A library to parse XMP metadata"
 arch=(i686 x86_64 'mips64el')
 url="http://libopenraw.freedesktop.org/wiki/Exempi"
 license=('custom:BSD')
-depends=('gcc-libs>=4.4.2' 'expat>=2.0.1' 'zlib')
-makedepends=('boost>=1.36.0')
+depends=('gcc-libs' 'expat' 'zlib')
+makedepends=('boost')
 options=(!libtool)
-source=(http://libopenraw.freedesktop.org/download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('62ecb5a01387b9f940a5429b3df67e65')
+source=(http://libopenraw.freedesktop.org/download/$pkgname-$pkgver.tar.bz2)
+md5sums=('f46d96975613593ee17aaf48cd350228')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/${pkgname}-${pkgver}/COPYING" \
-  	"${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  install -m644 "$srcdir/$pkgname-$pkgver/COPYING" \
+  	"$pkgdir/usr/share/licenses/$pkgname"
 }
diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD
index 73953f1f8..03bfc38b9 100644
--- a/extra/fontconfig/PKGBUILD
+++ b/extra/fontconfig/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 59982 2009-11-29 20:19:34Z jgc $
+# $Id: PKGBUILD 150857 2012-02-23 13:01:06Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=fontconfig
 pkgver=2.8.0
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64 'mips64el')
 url="http://www.fontconfig.org/release/"
 license=('custom')
-depends=('expat>=2.0.1' 'freetype2>=2.3.11')
+depends=('expat' 'freetype2')
 options=('!libtool')
 install=fontconfig.install
-source=(http://www.fontconfig.org/release/${pkgname}-${pkgver}.tar.gz
+source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz
         29-replace-bitmap-fonts.conf
         30-urw-aliases.patch)
 md5sums=('77e15a92006ddc2adbb06f840d591c0e'
@@ -18,18 +18,22 @@ md5sums=('77e15a92006ddc2adbb06f840d591c0e'
          '51bc6cb633b50f3c28793361738aac5b')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/30-urw-aliases.patch" || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/30-urw-aliases.patch"
   # enable Position Independent Code for prelinking
-  export CFLAGS="${CFLAGS} -fPIC"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m644 "${srcdir}/29-replace-bitmap-fonts.conf" \
-      "${pkgdir}/etc/fonts/conf.avail" || return 1
-  rm -f ${pkgdir}/etc/fonts/conf.d/*.conf
+  export CFLAGS="$CFLAGS -fPIC"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -m644 "$srcdir/29-replace-bitmap-fonts.conf" \
+      "$pkgdir/etc/fonts/conf.avail"
+  rm -f "$pkgdir"/etc/fonts/conf.d/*.conf
 
   #Install license
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
+  install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
 }
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 351938883..8d9b014e1 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149828 2012-02-11 09:25:31Z bisson $
+# $Id: PKGBUILD 150925 2012-02-23 21:04:37Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=2.7.3
+pkgver=2.7.4
 pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 url='http://hyperrate.com/dir.php?eid=67'
@@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method'
             'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz"
         'qt4-lib64.patch')
-sha1sums=('d27a236f7d3a3cf54a688ecaeb576325dca4f89f'
+sha1sums=('d580c772b670ccb34f510dce5535628dd22dd6cb'
           '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70')
 
 install=install
diff --git a/extra/gconf-editor/PKGBUILD b/extra/gconf-editor/PKGBUILD
index d47432967..3ccd24668 100644
--- a/extra/gconf-editor/PKGBUILD
+++ b/extra/gconf-editor/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 117817 2011-04-04 18:08:43Z ibiru $
+# $Id: PKGBUILD 150859 2012-02-23 13:04:28Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gconf-editor
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Graphical gconf registry editor"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -17,17 +17,17 @@ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$p
 sha256sums=('184e17416c2dd927ccb3a9b435d86fbe4b654316b91a6db724a3fd447a9fae60')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
      --localstatedir=/var --disable-scrollkeeper
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
 
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gconf-editor ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gconf-editor "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
 }
diff --git a/extra/gnome-keyring-sharp/PKGBUILD b/extra/gnome-keyring-sharp/PKGBUILD
index 39807dce4..fcd30024a 100644
--- a/extra/gnome-keyring-sharp/PKGBUILD
+++ b/extra/gnome-keyring-sharp/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 104610 2011-01-04 16:15:34Z ibiru $
+# $Id: PKGBUILD 150836 2012-02-23 12:21:20Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=gnome-keyring-sharp
 pkgver=1.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A fully managed implementation of libgnome-keyring"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mono-project.com/Libraries"
 license=('custom')
 depends=('ndesk-dbus>=0.4' 'libgnome-keyring')
 makedepends=('gtk-sharp-2')
-replaces=('gnome-keyring-sharp-svn')
 source=(http://www.go-mono.com/archive/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-options=('!makeflags')
+options=('!makeflags' '!libtool')
 md5sums=('f9a48319f3fe6123017b000d714d68b1')
 
 build() {
@@ -21,6 +20,11 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
   rm -rf "${MONO_SHARED_DIR}"
   ln -sf gnome-keyring-sharp-1.0.pc "${pkgdir}/usr/lib/pkgconfig/gnome-keyring-sharp.pc"
diff --git a/extra/gnome-python-extras/PKGBUILD b/extra/gnome-python-extras/PKGBUILD
index 19dbcdbb6..b196124de 100644
--- a/extra/gnome-python-extras/PKGBUILD
+++ b/extra/gnome-python-extras/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139493 2011-10-02 11:50:40Z ibiru $
+# $Id: PKGBUILD 150866 2012-02-23 13:12:25Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gnome-python-extras
 pkgname=('gnome-python-extras' 'python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell')
 pkgver=2.25.3
-pkgrel=11
+pkgrel=12
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.daa.com.au/~james/pygtk/"
 license=('GPL' 'LGPL')
diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD
index 27c8bf8f4..d37be36ab 100644
--- a/extra/gnucash/PKGBUILD
+++ b/extra/gnucash/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146667 2012-01-16 05:26:24Z eric $
+# $Id: PKGBUILD 150910 2012-02-23 13:59:07Z juergen $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Mark Schneider <queueRAM@gmail.com>
 
 pkgname=gnucash
-pkgver=2.4.9
+pkgver=2.4.10
 pkgrel=1
 pkgdesc="A personal and small-business financial-accounting application"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ optdepends=('evince: for print preview'
 options=('!libtool' '!makeflags' '!emptydirs')
 install=gnucash.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('a0ed6532e53164b7dc9a319d6503c6563310b878')
+sha1sums=('b1906f8143406fdf8cb5217233143cc08e708b99')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD
index 5c9b76762..5a3dbeb3f 100644
--- a/extra/gstreamer0.10-ugly/PKGBUILD
+++ b/extra/gstreamer0.10-ugly/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149278 2012-02-06 17:33:35Z ibiru $
+# $Id: PKGBUILD 150876 2012-02-23 13:48:00Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gstreamer0.10-ugly
 pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
 pkgver=0.10.18
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
@@ -17,8 +17,8 @@ build() {
   cd "${srcdir}/gst-plugins-ugly-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
-    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
+    --with-package-name="GStreamer Ugly Plugins (Parabola GNU/Linux-libre)" \
+    --with-package-origin="https://parabolagnulinux.org/"
   make
   sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile
 }
diff --git a/extra/guile/PKGBUILD b/extra/guile/PKGBUILD
index 54e90fd83..42dd1d331 100644
--- a/extra/guile/PKGBUILD
+++ b/extra/guile/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 109127 2011-02-06 11:24:26Z andyrtr $
+# $Id: PKGBUILD 150868 2012-02-23 13:23:16Z ibiru $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=guile
 pkgver=1.8.8
-pkgrel=1
+pkgrel=2
 pkgdesc="a portable, embeddable Scheme implementation written in C"
 url="http://www.gnu.org/software/guile/"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
-depends=('gmp' 'libtool' 'ncurses>=5.7' 'texinfo')
+depends=('gmp' 'libltdl' 'ncurses>=5.7' 'texinfo')
 install=guile.install
 source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 26bb44088..90f051f5e 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146709 2012-01-16 19:49:21Z dreisner $
+# $Id: PKGBUILD 150878 2012-02-23 13:48:04Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
 pkgver=1.10.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf')
diff --git a/extra/hddtemp/PKGBUILD b/extra/hddtemp/PKGBUILD
index 32b3c6b03..4a92dc4bd 100644
--- a/extra/hddtemp/PKGBUILD
+++ b/extra/hddtemp/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 98707 2010-11-12 20:24:41Z ibiru $
-# Maintainer: Andrea Scarpino <bash@archlinux.it>
+# $Id: PKGBUILD 150841 2012-02-23 12:31:37Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
@@ -7,7 +8,7 @@ pkgname=hddtemp
 pkgver=0.3.beta15.46
 _origver=0.3-beta15
 _patchver=46
-pkgrel=1
+pkgrel=2
 pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.guzu.net/linux/hddtemp.php"
@@ -32,6 +33,10 @@ build() {
 
   ./configure --prefix=/usr --mandir=/usr/share/man --with-db-path=/usr/share/$pkgname/hddtemp.db
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-${_origver}"
   make DESTDIR=$pkgdir install
 
   install -D -m644 "$srcdir/$pkgname-${_origver}/debian/hddtemp.db" \
diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD
index 4239608af..e13b9b718 100644
--- a/extra/kismet/PKGBUILD
+++ b/extra/kismet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149954 2012-02-11 23:30:59Z allan $
+# $Id: PKGBUILD 150900 2012-02-23 13:55:06Z allan $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Juergen Hoetzel <jason@archlinux.org>
@@ -6,12 +6,12 @@
 pkgname=kismet
 pkgver=2011_03_R2
 _realver="${pkgver//_/-}"
-pkgrel=3
+pkgrel=4
 pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kismetwireless.net/"
 license=('GPL')
-depends=('libcap' 'libnl' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat')
+depends=('libcap' 'libnl1' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat')
 makedepends=() # already in core: ('grep' 'gcc-libs')
 optdepends=('gpsd: log coordinates of detected networks'
             'wireshark-cli: provide OUI files used to determine device manufacturer'
diff --git a/extra/kismet/kismet.changelog b/extra/kismet/kismet.changelog
index e66dcfda0..3078d0625 100644
--- a/extra/kismet/kismet.changelog
+++ b/extra/kismet/kismet.changelog
@@ -1,3 +1,6 @@
+2012-02-10  Eric Bélanger  <eric@archlinux.org>
+	* Change libnl depends to libnl1
+	
 2010-05-07 Angel Velasquez <angvp@archlinux.org>
     * ChangeLog added
 
diff --git a/extra/leafpad/PKGBUILD b/extra/leafpad/PKGBUILD
index 14873c3be..0c35516d7 100644
--- a/extra/leafpad/PKGBUILD
+++ b/extra/leafpad/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 110473 2011-02-19 16:41:59Z ibiru $
+# $Id: PKGBUILD 150844 2012-02-23 12:34:26Z ibiru $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 
diff --git a/extra/libcdio/PKGBUILD b/extra/libcdio/PKGBUILD
index 419d33b11..4b7e9f7b6 100644
--- a/extra/libcdio/PKGBUILD
+++ b/extra/libcdio/PKGBUILD
@@ -1,25 +1,34 @@
-# $Id: PKGBUILD 59886 2009-11-29 15:21:53Z jgc $
-# Maintainer: damir <damir@archlinux.org>
+# $Id: PKGBUILD 150880 2012-02-23 13:48:06Z allan $
+# Maintainer:
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=libcdio
-pkgver=0.82
-pkgrel=1.1
+pkgver=0.83
+pkgrel=1
 pkgdesc="GNU Compact Disc Input and Control Library"
-arch=("i686" "x86_64" 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://www.gnu.org/software/libcdio/"
-depends=('gcc-libs>=4.4.2' 'libcddb' 'ncurses')
+depends=('libcddb' 'ncurses')
 options=('!libtool')
 install=libcdio.install
-source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz)
-md5sums=('1c29b18e01ab2b966162bc727bf3c360')
+source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig}
+        libcdio-0.83-linking.patch)
+md5sums=('b9e0f1bccb142e697cd834fe56b6e6fb'
+         'a7864a4b572a1e2a28cc0a05aa4a67d3'
+         '5a7f50209c03d5919d5b932f07871af7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs || return 1
-  make || return 1
-  make -j1 DESTDIR="${pkgdir}" install || return 1
-  #install -m644 libcdio_paranoia.pc libcdio_cdda.pc \
-  #  "${pkgdir}/usr/lib/pkgconfig/" || return 1
+  patch -Np1 -i $srcdir/libcdio-0.83-linking.patch
+  ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -j1 DESTDIR="${pkgdir}" install
+  
+  sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \
+    $pkgdir/usr/include/cdio/cdio_config.h
 }
diff --git a/extra/libcdio/libcdio-0.83-linking.patch b/extra/libcdio/libcdio-0.83-linking.patch
new file mode 100644
index 000000000..84a0746b5
--- /dev/null
+++ b/extra/libcdio/libcdio-0.83-linking.patch
@@ -0,0 +1,22 @@
+diff -Naur libcdio-0.83-orig/example/C++/OO/Makefile.in libcdio-0.83/example/C++/OO/Makefile.in
+--- libcdio-0.83-orig/example/C++/OO/Makefile.in	2011-10-27 18:02:31.000000000 +1000
++++ libcdio-0.83/example/C++/OO/Makefile.in	2012-02-18 11:10:07.369277231 +1000
+@@ -315,15 +315,15 @@
+ 
+ isofile2_SOURCES = isofile2.cpp
+ isofile2_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
+-	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
++	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
+ 
+ isolist_SOURCES = isolist.cpp
+ isolist_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
+-	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
++	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
+ 
+ iso4_SOURCES = iso4.cpp
+ iso4_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
+-	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
++	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
+ 
+ mmc1_SOURCES = mmc1.cpp
+ mmc1_DEPENDENCIES = $(LIBCDIO_DEPS)
diff --git a/extra/libmusicbrainz3/PKGBUILD b/extra/libmusicbrainz3/PKGBUILD
index 1ac244274..9f14c9dc4 100644
--- a/extra/libmusicbrainz3/PKGBUILD
+++ b/extra/libmusicbrainz3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 92430 2010-09-29 21:08:46Z ibiru $
+# $Id: PKGBUILD 150845 2012-02-23 12:35:42Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Max Fehrm max.fehrm@gmail.com
 pkgname=libmusicbrainz3
 pkgver=3.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Library That Provides Access to the MusicBrainz Server  "
 url="http://musicbrainz.org/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/libnl1/PKGBUILD b/extra/libnl1/PKGBUILD
new file mode 100644
index 000000000..6d35c216d
--- /dev/null
+++ b/extra/libnl1/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 150908 2012-02-23 13:56:22Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=libnl1
+pkgver=1.1
+pkgrel=1
+pkgdesc="Library for applications dealing with netlink sockets (Legacy version)"
+arch=('i686' 'x86_64')
+url="http://www.infradead.org/~tgr/libnl/"
+license=('GPL')
+depends=('glibc')
+source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz"
+        'fix-compilation.patch')
+md5sums=('ae970ccd9144e132b68664f98e7ceeb1'
+         'e1f5e82c8aa1b3ad025c7b588178de1e')
+
+build() {
+  cd ${srcdir}/libnl-${pkgver}
+  patch -Np1 -i ${srcdir}/fix-compilation.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/libnl-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/extra/libnl1/fix-compilation.patch b/extra/libnl1/fix-compilation.patch
new file mode 100644
index 000000000..891562a39
--- /dev/null
+++ b/extra/libnl1/fix-compilation.patch
@@ -0,0 +1,10 @@
+--- libnl-1.1.orig/include/netlink-local.h	2008-01-14 16:48:45.000000000 +0100
++++ libnl-1.1/include/netlink-local.h	2009-06-26 11:15:33.186011844 +0200
+@@ -26,6 +26,7 @@
+ #include <sys/socket.h>
+ #include <inttypes.h>
+ #include <assert.h>
++#include <limits.h>
+ 
+ #include <arpa/inet.h>
+ #include <netdb.h>
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index 3b2767f66..b6b063e8a 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 137082 2011-09-06 03:22:00Z eric $
+# $Id: PKGBUILD 150853 2012-02-23 12:53:44Z juergen $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=licq
-pkgver=1.5.1
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="Advanced graphical ICQ clone and more for Unix" 
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('libxss' 'qt' 'openssl')
 makedepends=('cmake' 'boost')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
-md5sums=('7dbf9f4f190fdae4c34ab6edefb34997')
+md5sums=('383153697e281a0b1b4ff008936731b8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 71595ad27..f220c0d95 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150146 2012-02-13 14:36:40Z ronald $
+# $Id: PKGBUILD 150832 2012-02-23 12:01:17Z juergen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
 pkgver=5.26.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net"
 if [ "${CARCH}" == "mips64el" ] ; then
     depends=('clisp' 'texinfo' 'sh')
 else
-    depends=('sbcl=1.0.54' 'texinfo' 'sh')
+    depends=('sbcl=1.0.55' 'texinfo' 'sh')
 fi
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD
index 983f6e411..996cb331e 100644
--- a/extra/net-snmp/PKGBUILD
+++ b/extra/net-snmp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139480 2011-10-02 02:49:38Z eric $
+# $Id: PKGBUILD 150902 2012-02-23 13:55:13Z allan $
 # Maintainer: 
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=net-snmp
 pkgver=5.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.net-snmp.org/"
@@ -18,14 +18,20 @@ provides=('ucd-snmp')
 backup=('etc/conf.d/snmpd')
 options=('!libtool' '!makeflags' '!emptydirs')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
-        snmpd.confd snmpd.rc)
+        snmpd.confd snmpd.rc libnl32.patch)
 sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a'
           '2bdc2839ce09d7daa608cd54687fa8beb47ed907'
           'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b'
-          '90600c0141eed10d6e3ca3ccc97ad8dda15c2112')
+          '90600c0141eed10d6e3ca3ccc97ad8dda15c2112'
+          '74a9848b95f63378eb1753fc309d2b74de5afb0f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
+  patch -Np1 -i "$srcdir/libnl32.patch"
+  autoreconf -f -i
+
   sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in
   PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
     --sysconfdir=/etc \
@@ -38,7 +44,8 @@ build() {
     --with-sys-location="Unknown" \
     --with-logfile="/var/log/snmpd.log" \
     --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \
-    --with-persistent-directory="/var/net-snmp"
+    --with-persistent-directory="/var/net-snmp" \
+    --disable-static
   make NETSNMP_DONT_CHECK_VERSION=1
 }
 
diff --git a/extra/net-snmp/libnl32.patch b/extra/net-snmp/libnl32.patch
new file mode 100644
index 000000000..d93d7ef67
--- /dev/null
+++ b/extra/net-snmp/libnl32.patch
@@ -0,0 +1,80 @@
+diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c
+--- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c	2011-09-28 06:53:47.000000000 +0200
++++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c	2012-02-09 20:02:49.136022132 +0100
+@@ -566,8 +566,9 @@
+ static int
+ tcpTable_load_netlink(void)
+ {
++	int err;
+ 	/*  TODO: perhaps use permanent nl handle? */
+-	struct nl_handle *nl = nl_handle_alloc();
++	struct nl_sock *nl = nl_socket_alloc();
+ 
+ 	if (nl == NULL) {
+ 		DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n"));
+@@ -575,10 +576,10 @@
+ 		return -1;
+ 	}
+ 
+-	if (nl_connect(nl, NETLINK_INET_DIAG) < 0) {
+-		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror()));
+-		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror());
+-		nl_handle_destroy(nl);
++	if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) {
++		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err)));
++		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err));
++		nl_socket_free(nl);
+ 		return -1;
+ 	}
+ 
+@@ -590,10 +591,10 @@
+ 	struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST);
+ 	nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0);
+ 
+-	if (nl_send_auto_complete(nl, nm) < 0) {
+-		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror()));
+-		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror());
+-		nl_handle_destroy(nl);
++	if ((err = nl_send_auto_complete(nl, nm)) < 0) {
++		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err)));
++		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err));
++		nl_socket_free(nl);
+ 		return -1;
+ 	}
+ 	nlmsg_free(nm);
+@@ -604,9 +605,9 @@
+ 
+ 	while (running) {
+ 		if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) {
+-			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror()));
+-			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror());
+-			nl_handle_destroy(nl);
++			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len)));
++			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len));
++			nl_socket_free(nl);
+ 			return -1;
+ 		}
+ 
+@@ -655,7 +656,7 @@
+ 		free(buf);
+ 	}
+ 
+-	nl_handle_destroy(nl);
++	nl_socket_free(nl);
+ 
+ 	if (tcp_head) {
+ 		DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n"));
+diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2 net-snmp-5.7.1-libnl32/configure.d/config_os_libs2
+--- net-snmp-5.7.1/configure.d/config_os_libs2	2011-09-28 06:53:47.000000000 +0200
++++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2	2012-02-09 20:10:44.282165275 +0100
+@@ -224,8 +224,9 @@
+ if test "x$with_nl" != "xno"; then
+     case $target_os in
+     linux*) # Check for libnl (linux)
++	CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)"
+ 	NETSNMP_SEARCH_LIBS(
+-	    nl_connect, nl,
++	    nl_connect, nl-3,
+ 	    [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS)
+     ;;
+     esac
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index cc0193e0b..be6a2766d 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142491 2011-11-10 19:42:04Z ibiru $
+# $Id: PKGBUILD 150904 2012-02-23 13:55:20Z allan $
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 # Contributor: Tor Krill <tor@krill.nu>
@@ -7,7 +7,7 @@
 
 pkgname=networkmanager
 pkgver=0.9.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/ntrack/PKGBUILD b/extra/ntrack/PKGBUILD
index eddd7a217..4ad369974 100644
--- a/extra/ntrack/PKGBUILD
+++ b/extra/ntrack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150729 2012-02-21 11:02:40Z andrea $
+# $Id: PKGBUILD 150906 2012-02-23 13:55:25Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=ntrack
@@ -21,7 +21,7 @@ build() {
   cd "${srcdir}/${pkgname}-0${pkgver}"
   patch -p1 -i "${srcdir}"/libnl3.patch
 
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+  ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var
   make
diff --git a/extra/oxine/PKGBUILD b/extra/oxine/PKGBUILD
index 0631dc875..79c1047bf 100644
--- a/extra/oxine/PKGBUILD
+++ b/extra/oxine/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 146426 2012-01-10 23:37:48Z eric $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
+# $Id: PKGBUILD 150882 2012-02-23 13:48:09Z allan $
+# Maintainer:
 # Contributor: Rouslan Solomakhin <rouslan@localnet.com>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=oxine
 pkgver=0.7.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A lightweight, purely osd based xine frontend for set-top boxes and home entertainment systems"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://oxine.sourceforge.net/"
diff --git a/extra/python-telepathy/PKGBUILD b/extra/python-telepathy/PKGBUILD
index 828b9ed7f..9b1b9f5eb 100644
--- a/extra/python-telepathy/PKGBUILD
+++ b/extra/python-telepathy/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102076 2010-12-04 12:37:04Z ibiru $
+# $Id: PKGBUILD 150847 2012-02-23 12:38:51Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Daniel Balieiro <daniel@balieiro.com>
 pkgname=python-telepathy
 pkgver=0.15.19
-pkgrel=1
+pkgrel=2
 pkgdesc="Python libraries for use in Telepathy clients and connection managers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
@@ -17,5 +17,9 @@ build() {
     cd "${srcdir}/telepathy-python-${pkgver}"
     ./configure --prefix=/usr
     make
+}
+
+package() {
+    cd "${srcdir}/telepathy-python-${pkgver}"
     make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index d86beea09..02dc5a056 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148912 2012-02-05 11:55:38Z ibiru $
+# $Id: PKGBUILD 150933 2012-02-24 01:09:55Z tdziedzic $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
 pkgver=1.4.5
-pkgrel=5
+pkgrel=6
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rrdtool.org"
@@ -20,7 +20,12 @@ sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl |' bindings/perl-shared/Makefile.PL
+
+  # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby
+  sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in
+
   PYTHON=python2 ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
     --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
     --enable-ruby --enable-ruby-site-install --enable-python \
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index f7df1e584..07621fb23 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146485 2012-01-11 15:22:42Z stephane $
+# $Id: PKGBUILD 150870 2012-02-23 13:25:51Z stephane $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
-pkgver=1.7.2
-pkgrel=2
+pkgver=1.7.3
+pkgrel=1
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64' 'mips64el')
 license=('APACHE')
@@ -22,8 +22,8 @@ provides=('svn')
 options=('!makeflags' '!libtool')
 source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
         svnserve svn svnserve.conf subversion.rpath.fix.patch)
-sha1sums=('8c0824aeb7f42da1ff4f7cd296877af7f59812bb'
-          '66293923ddc1b12a43b0e86f6b6a3c23b70df6ae'
+sha1sums=('624d4070361c0e8d7cf4f5c667629e72459b122d'
+          'cac344ec6e717bab3d97e2f3f1206289d83b8e05'
           '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
           '73b36c046c09cec2093354911c89e3ba8056af6c'
           'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
diff --git a/extra/systemd/PKGBUILD b/extra/systemd/PKGBUILD
index 27934ec81..60a526323 100644
--- a/extra/systemd/PKGBUILD
+++ b/extra/systemd/PKGBUILD
@@ -1,33 +1,16 @@
-# $Id: PKGBUILD 150293 2012-02-16 14:21:25Z dreisner $
+# $Id: PKGBUILD 150927 2012-02-23 21:53:17Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
-pkgname=systemd
+pkgbase=systemd
+pkgname=('systemd' 'libsystemd')
 pkgver=43
-pkgrel=2
-pkgdesc="Session and Startup manager"
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2')
-depends=('acl' 'dbus-core' 'kbd' 'kmod' 'libcap' 'util-linux' 'udev' 'xz')
-makedepends=('gperf' 'cryptsetup' 'docbook-xsl' 'intltool' 'libxslt' 'linux-api-headers')
-optdepends=('cryptsetup: required for encrypted block devices'
-            'dbus-python: systemd-analyze'
-            'initscripts: legacy support for hostname and vconsole setup'
-            'initscripts-systemd: native boot and initialization scripts'
-            'python2-cairo: systemd-analyze'
-            'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
-            'systemd-sysvcompat: symlink package to provide sysvinit binaries')
+makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
+             'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
 options=('!libtool')
-backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-        etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-        etc/dbus-1/system.d/org.freedesktop.login1.conf
-        etc/dbus-1/system.d/org.freedesktop.locale1.conf
-        etc/dbus-1/system.d/org.freedesktop.timedate1.conf
-        etc/systemd/system.conf
-        etc/systemd/user.conf
-        etc/systemd/systemd-logind.conf
-        etc/systemd/systemd-journald.conf)
-install="$pkgname.install"
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         "os-release")
 md5sums=('446cc6db7625617af67e2d8e5f503a49'
@@ -36,53 +19,84 @@ md5sums=('446cc6db7625617af67e2d8e5f503a49'
 build() {
   cd "$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 --sysconfdir=/etc \
               --libexecdir=/usr/lib \
               --libdir=/usr/lib \
+              --with-pamlibdir=/lib/security \
               --localstatedir=/var \
               --with-rootprefix= \
-              --with-rootlibdir=/lib \
               --with-distro=arch
 
   make
-
-  # fix .so links in manpages
-  sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8
-  sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
 }
 
-package() {
+package_systemd() {
+  pkgdesc="systemd and service manager"
+  depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz')
+  optdepends=('cryptsetup: required for encrypted block devices'
+              'dbus-python: systemd-analyze'
+              'initscripts: legacy support for hostname and vconsole setup'
+              'initscripts-systemd: native boot and initialization scripts'
+              'python2-cairo: systemd-analyze'
+              'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
+              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
+  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
+          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
+          etc/dbus-1/system.d/org.freedesktop.login1.conf
+          etc/dbus-1/system.d/org.freedesktop.locale1.conf
+          etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+          etc/systemd/system.conf
+          etc/systemd/user.conf
+          etc/systemd/systemd-logind.conf
+          etc/systemd/systemd-journald.conf)
+  install="$pkgname.install"
+
   cd "$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
   install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-  printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
+
+  printf "d /run/console 755 root root\n" >"$pkgdir/usr/lib/tmpfiles.d/console.conf"
+  chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
 
   # symlink to /bin/systemd for compat and sanity
-  ln -s ../lib/systemd/systemd "$pkgdir"/bin/systemd
+  ln -s ../lib/systemd/systemd "$pkgdir/bin/systemd"
 
-  # fix systemd-analyze for python2
+  # use python2 for systemd-analyze
   sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
 
-  # rename man pages to avoid conflicts with sysvinit and initscripts
-  cd "$pkgdir/usr/share/man"
-
-  # not building this with systemd
+  # didn't build this...
   rm -f "man1/systemadm.1"
 
+  # fix .so links in manpage stubs
+  find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
+      -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} +
+
+  # rename man pages to avoid conflicts with sysvinit and initscripts
   manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
             man5/{hostname,{vconsole,locale}.conf}.5)
-
+  cd "$pkgdir/usr/share/man"
   for manpage in "${manpages[@]}"; do
     IFS='/' read section page <<< "$manpage"
     mv "$manpage" "$section/systemd.$page"
   done
+
+  ### split off libsystemd (libs, includes, pkgconfig, man3)
+  install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig,share/man}
+
+  cd "$srcdir"/libsystemd
+  mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
+  mv "$pkgdir/usr/include/systemd" usr/include
+  mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
+  mv "$pkgdir/usr/share/man/man3" usr/share/man
+}
+
+package_libsystemd() {
+  pkgdesc="systemd client libraries"
+  depends=('libcap' 'xz')
+
+  mv "$srcdir/libsystemd"/* "$pkgdir"
 }
 
 # vim: ft=sh syn=sh et
diff --git a/extra/telepathy-butterfly/PKGBUILD b/extra/telepathy-butterfly/PKGBUILD
index 21cd94c91..4285483d0 100644
--- a/extra/telepathy-butterfly/PKGBUILD
+++ b/extra/telepathy-butterfly/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102171 2010-12-06 12:36:03Z ibiru $
+# $Id: PKGBUILD 150850 2012-02-23 12:45:25Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Daniel Balieiro <daniel@balieiro.com>
 pkgname=telepathy-butterfly
 pkgver=0.5.15
-pkgrel=1
+pkgrel=2
 pkgdesc="A MSN connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
diff --git a/extra/vcdimager/PKGBUILD b/extra/vcdimager/PKGBUILD
index d2c3f139c..04309407a 100644
--- a/extra/vcdimager/PKGBUILD
+++ b/extra/vcdimager/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 135066 2011-08-10 01:37:52Z eric $
+# $Id: PKGBUILD 150884 2012-02-23 13:48:13Z allan $
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=vcdimager
 pkgver=0.7.24
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.vcdimager.org/"
@@ -12,11 +12,14 @@ license=('GPL')
 depends=('libcdio>=0.82' 'libxml2>=2.7.3' 'popt')
 options=('!libtool')
 install=vcdimager.install
-source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3af22978fd79c79d5fda6513b6811145')
+source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz
+        vcdimager-0.7.24-libcdio-0.83.patch)
+md5sums=('3af22978fd79c79d5fda6513b6811145'
+         'f4e7376fd9d975951d2b93a5e9123fdc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i $srcdir/vcdimager-0.7.24-libcdio-0.83.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/vcdimager/vcdimager-0.7.24-libcdio-0.83.patch b/extra/vcdimager/vcdimager-0.7.24-libcdio-0.83.patch
new file mode 100644
index 000000000..467c06073
--- /dev/null
+++ b/extra/vcdimager/vcdimager-0.7.24-libcdio-0.83.patch
@@ -0,0 +1,337 @@
+diff -u vcdimager-0.7.23/include/libvcd/info.h vcdimager-0.7.23/include/libvcd/info.h
+--- vcdimager-0.7.23/include/libvcd/info.h
++++ vcdimager-0.7.23/include/libvcd/info.h
+@@ -32,6 +32,9 @@
+ #include <libvcd/version.h>
+ #include <libvcd/types.h>
+ #include <libvcd/files.h>
++
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include <cdio/cdio.h>
+ #include <cdio/ds.h>
+
+--- vcdimager-0.7.23.orig/frontends/cli/vcd-info.c
++++ vcdimager-0.7.23/frontends/cli/vcd-info.c
+@@ -38,6 +38,8 @@
+ #define POPT_ARGFLAG_OPTIONAL 0
+ #endif
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include <cdio/cdio.h>
+ #include <cdio/bytesex.h>
+ #include <cdio/iso9660.h>
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/frontends/cli/cdxa2mpeg.c
++++ vcdimager-0.7.23/frontends/cli/cdxa2mpeg.c
+@@ -33,6 +33,8 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <unistd.h>
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include <cdio/sector.h>
+ #include <cdio/bytesex.h>
+ 
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_build.c
++++ vcdimager-0.7.23/frontends/xml/vcd_xml_build.c
+@@ -27,8 +27,14 @@
+ #include <string.h>
+ #include <errno.h>
+ 
++#ifdef HAVE_TIME_H
++#include <time.h>
++#endif
++
+ #include <popt.h>
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include <libxml/parserInternals.h>
+ #include <libxml/parser.h>
+ #include <libxml/valid.h>
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_common.c
++++ vcdimager-0.7.23/frontends/xml/vcd_xml_common.c
+@@ -25,6 +25,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
++
+ /* Private includes */
+ #include "vcd_assert.h"
+ #include "vcd.h"
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/lib/info_private.c
++++ vcdimager-0.7.23/lib/info_private.c
+@@ -46,6 +46,8 @@
+ #include <unistd.h>
+ #endif
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include <cdio/cdio.h>
+ #include <cdio/bytesex.h>
+ #include <cdio/util.h>
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/lib/image_nrg.c
++++ vcdimager-0.7.23/lib/image_nrg.c
+@@ -30,6 +30,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include <cdio/cdio.h>
+ #include <cdio/bytesex.h>
+ #include <cdio/iso9660.h>
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/lib/image_cdrdao.c
++++ vcdimager-0.7.23/lib/image_cdrdao.c
+@@ -26,6 +26,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ /* Public headers */
+ #include <cdio/iso9660.h>
+ #include <cdio/util.h>
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/lib/inf.c
++++ vcdimager-0.7.23/lib/inf.c
+@@ -49,6 +49,8 @@
+ #include <unistd.h>
+ #endif
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include <cdio/cdio.h>
+ #include <cdio/bytesex.h>
+ #include <cdio/util.h>
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/lib/vcd_read.h
++++ vcdimager-0.7.23/lib/vcd_read.h
+@@ -22,6 +22,8 @@
+ # include "config.h"
+ #endif
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include <cdio/cdio.h>
+ #include <cdio/iso9660.h>
+ 
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/lib/image.c
++++ vcdimager-0.7.23/lib/image.c
+@@ -23,6 +23,8 @@
+ # include "config.h"
+ #endif
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include <cdio/cdio.h>
+ 
+ /* Public headers */
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/lib/files.c
++++ vcdimager-0.7.23/lib/files.c
+@@ -27,6 +27,8 @@
+ #include <stddef.h>
+ #include <math.h>
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include <cdio/cdio.h>
+ #include <cdio/bytesex.h>
+ #include <cdio/util.h>
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/lib/image_bincue.c
++++ vcdimager-0.7.23/lib/image_bincue.c
+@@ -26,6 +26,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include <cdio/cdio.h>
+ #include <cdio/bytesex.h>
+ #include <cdio/iso9660.h>
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/lib/pbc.c
++++ vcdimager-0.7.23/lib/pbc.c
+@@ -26,6 +26,8 @@
+ #include <stddef.h>
+ #include <math.h>
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include <cdio/cdio.h>
+ #include <cdio/bytesex.h>
+ #include <cdio/util.h>
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/lib/info_private.h
++++ vcdimager-0.7.23/lib/info_private.h
+@@ -25,6 +25,8 @@
+ 
+ #ifndef _VCD_INFO_PRIVATE_H
+ #define _VCD_INFO_PRIVATE_H
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ 
+ #ifdef HAVE_CONFIG_H
+ # include "config.h"
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/lib/vcd.c
++++ vcdimager-0.7.23/lib/vcd.c
+@@ -28,6 +28,9 @@
+ #include <ctype.h>
+ #include <math.h>
+ 
++#define _VCD_INFO_PRIVATE_H
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include <cdio/cdio.h>
+ #include <cdio/util.h>
+ #include <cdio/iso9660.h>
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/include/libvcd/types.h
++++ vcdimager-0.7.23/include/libvcd/types.h
+@@ -21,6 +21,8 @@
+ #ifndef __VCD_TYPES_H__
+ #define __VCD_TYPES_H__
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include <cdio/types.h>
+ 
+ #ifdef __cplusplus
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/test/check_vcd20.sh
++++ vcdimager-0.7.23/test/check_vcd20.sh
+@@ -27,7 +27,7 @@
+   fi
+ else 
+   if do_cksum <<EOF
+-1170593626 1764000 videocd.bin
++1594106842 1764000 videocd.bin
+ 3699460731 172 videocd.cue
+ EOF
+     then
+@@ -60,7 +60,7 @@
+ fi
+ 
+ if do_cksum <<EOF
+-1209563022 4840416 videocd.bin
++3694706815 4840416 videocd.bin
+ 2350689551 447 videocd.cue
+ EOF
+     then
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/test/check_svcd1.sh
++++ vcdimager-0.7.23/test/check_svcd1.sh
+@@ -26,7 +26,7 @@
+   fi
+ else
+   if do_cksum <<EOF
+-3747978987 1587600 videocd.bin
++1923402845 1587600 videocd.bin
+ 3699460731 172 videocd.cue
+ EOF
+     then
+@@ -59,7 +59,7 @@
+ fi
+ 
+ if do_cksum <<EOF
+-4104676060 4059552 videocd.bin
++832619107 4059552 videocd.bin
+ 669873986 424 videocd.cue
+ EOF
+     then
+@@ -112,7 +112,7 @@
+ fi
+ 
+ if do_cksum <<EOF
+-3695643404 2018016 videocd.bin
++4248765257 2018016 videocd.bin
+ 483250638 172 videocd.cue
+ EOF
+     then
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/test/check_vcd11.sh
++++ vcdimager-0.7.23/test/check_vcd11.sh
+@@ -26,8 +26,6 @@
+   fi
+ else 
+   if do_cksum <<EOF
+-3746200718 1764000 videocd.bin
+-3699460731 172 videocd.cue
+ EOF
+     then
+     :
+@@ -58,7 +56,7 @@
+ fi
+ 
+ if do_cksum <<EOF
+-1013953491 3880800 videocd.bin
++4286535819 3880800 videocd.bin
+ 2088931809 424 videocd.cue
+ EOF
+     then
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/test/check_sizeof.c
++++ vcdimager-0.7.23/test/check_sizeof.c
+@@ -28,6 +28,8 @@
+ #include <stdio.h>
+ #include <math.h>
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include <cdio/iso9660.h>
+ #include <libvcd/types.h>
+ #include <libvcd/files.h>
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/test/check_nrg.sh
++++ vcdimager-0.7.23/test/check_nrg.sh
+@@ -27,7 +27,7 @@
+ fi
+ 
+ if do_cksum <<EOF
+-1284184221 2630472 videocd.nrg
++2176989007 2630472 videocd.nrg
+ EOF
+     then
+     :
+@@ -72,7 +72,7 @@
+ fi
+ 
+ if do_cksum <<EOF
+-2897989104 1653964 videocd.nrg
++2290177553 1653964 videocd.nrg
+ EOF
+     then
+     :
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index b82ecab07..37cf8571b 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 150788 2012-02-22 11:22:08Z ibiru $
+# $Id: PKGBUILD 150929 2012-02-23 23:36:49Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=2.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/vlc/"
-license=('GPL')
+license=('LGPL2.1' 'GPL2')
 depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
-         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-         'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-         'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
-         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'  'xcb-util-keysyms'
-         'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
+         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' 'aalib'
+         'libxinerama' 'libtar' 'libtiger' 'lua' 'v4l-utils' 'smbclient' 
+         'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 
+         'libupnp' 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass'
+         'xcb-util-keysyms' 'ttf-freefont')
 makedepends=('avahi' 'pkg-config' 'live-media' 'libnotify' 'libbluray'
-             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
+             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'libgcrypt'
              'libraw1394' 'libdc1394' 'libavc1394' 'libpulse'
-             'gnutls' 'libcaca' 'oss')
+             'gnutls' 'libcaca' 'librsvg' 'portaudio' 'oss'
+             'ncurses' 'libgme' 'schroedinger' 'udev' 'projectm' 'twolame' 
+             'libdvdcss' 'gnome-vfs' 'libgoom2' 'vcdimager')
 [ "$CARCH" = "mips64el" ] || makedepends+=('libva' 'lirc-utils')
 optdepends=('avahi: for service discovery using bonjour protocol'
             'libnotify: for notification plugin'
@@ -29,10 +31,22 @@ optdepends=('avahi: for service discovery using bonjour protocol'
 optdepends+=('libavc1394: for devices using the 1394ta AV/C'
             'libdc1394: for IEEE 1394 plugin'
             'kdelibs: KDE Solid hardware integration'
-            'libpulse: PulseAudio support')
-[ "$CARCH" = "mips64el" ] || optdepends+=('libva-driver-intel: back-end for intel cards')
-optdepends+=('libbluray: for Blu-Ray disks'
-            'oss: for OSS audio')
+            'libpulse: PulseAudio support'
+[ "$CARCH" = "mips64el" ] || optdepends+=('vdpau-video: vdpau back-end for nvidia'
+            'libva-driver-intel: back-end for intel cards')
+optdepends+=('libbluray: for Blu-Ray support' 
+            'oss: for OSS audio support'
+            'portaudio: for portaudio support'
+            'twolame: for TwoLAME mpeg2 encoder plugin'
+            'projectm: for ProjectM visualisation plugin'
+            'udev: for service discovery using udev'
+            'libcaca: for colored ASCII art video output'
+            'libgme: for libgme plugin'
+            'librsvg: for SVG plugin'
+            'libgcrypt: support for some plugins'
+            'gnome-vfs: for GNOME Virtual File System support'
+            'libgoom2: for libgoom plugin'
+            'vcdimager: navigate VCD with libvcdinfo')
 conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 backup=('usr/share/vlc/lua/http/.hosts'
@@ -40,7 +54,7 @@ backup=('usr/share/vlc/lua/http/.hosts'
 options=('!libtool')
 install=vlc.install
 source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
-        access_smb_link_to_smbclient.patch)
+        'access_smb_link_to_smbclient.patch')
 md5sums=('8806bff2ea9c76791123d444a92f708c'
          '5f510fdea99cdb7941423eb40045968a')
 
@@ -57,24 +71,24 @@ build() {
   ./configure --prefix=/usr \
               --disable-rpath \
               --enable-faad \
-              --enable-dbus-control \
               --enable-nls \
               --enable-lirc \
               --enable-pvr \
               --enable-ncurses \
-              --enable-upnp \
-              --enable-oss \
-              --enable-bluray \
-              --enable-live555 \
+              --enable-real \
               --enable-realrtsp \
-              $extraconf
+              --enable-xosd \
+              --enable-aa \
+              --enable-vcdx \
+              --enable-media-library \
+	      $extraconf
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR="${pkgdir}/" install
+  make DESTDIR="${pkgdir}" install
 
   for res in 16 32 48 128; do
     install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD
index f300f061c..635492267 100644
--- a/extra/xfdesktop/PKGBUILD
+++ b/extra/xfdesktop/PKGBUILD
@@ -1,41 +1,50 @@
-# $Id: PKGBUILD 138129 2011-09-17 02:28:33Z allan $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 150819 2012-02-23 06:32:41Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfdesktop
 pkgver=4.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A desktop manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
 url="http://www.xfce.org/"
+license=('GPL2')
 groups=('xfce4')
-depends=('libxfce4ui' 'thunar>=1.2.0' 'garcon' 'hicolor-icon-theme' 'libwnck>=2.30.0')
-makedepends=('intltool' 'xfce4-panel>=4.8.0')
+depends=('libxfce4ui' 'thunar>=1.2.0' 'garcon' 'hicolor-icon-theme' 'libwnck')
+makedepends=('intltool' 'xfce4-panel')
 optdepends=('xfce4-panel: panel menu plugin')
 conflicts=('xfce4-menueditor')
 replaces=('xfce4-menueditor')
 options=('!libtool')
 install=xfdesktop.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('617c667c469698e8c974e38412cb484c')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2
+        implement-paste-on-desktop.patch)
+sha256sums=('e58460f52ae96c389402f6db62c46db61cd51cdb550a42bd97c0ab2a5b62f424'
+            'f26a75fe27c198cd40fad139310e984f4eaac0dfa2cae0d7f32498a8f58322b2')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Fix FS#27866: Paste menu entry in context menu is deactivated
+  # Upstream report/patch: https://bugzilla.xfce.org/show_bug.cgi?id=3804
+  patch -Np1 -i "$srcdir/implement-paste-on-desktop.patch"
+
   ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--enable-gio-unix \
-	--enable-thunarx \
-	--enable-exo \
-	--enable-notifications \
-	--disable-debug
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-gio-unix \
+    --enable-thunarx \
+    --enable-exo \
+    --enable-notifications \
+    --disable-debug
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfdesktop/implement-paste-on-desktop.patch b/extra/xfdesktop/implement-paste-on-desktop.patch
new file mode 100644
index 000000000..a84e6cb05
--- /dev/null
+++ b/extra/xfdesktop/implement-paste-on-desktop.patch
@@ -0,0 +1,236 @@
+From dd57435413a10b288153d1ae0062d37e58bcffd1 Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel@gmail.com>
+Date: Sat, 17 Dec 2011 10:37:04 +0300
+Subject: [PATCH] Adds the code required to perform a paste on the on the
+ desktop. Fixes bug 3804.
+
+---
+ src/xfdesktop-clipboard-manager.c |  114 ++++++++++++++++++++++++++++++-------
+ src/xfdesktop-file-icon-manager.c |   27 ++++++++-
+ 2 files changed, 120 insertions(+), 21 deletions(-)
+
+diff --git a/src/xfdesktop-clipboard-manager.c b/src/xfdesktop-clipboard-manager.c
+index 76b4bef..ed90aa0 100644
+--- a/src/xfdesktop-clipboard-manager.c
++++ b/src/xfdesktop-clipboard-manager.c
+@@ -307,7 +307,6 @@ xfdesktop_clipboard_manager_owner_changed (GtkClipboard           *clipboard,
+ }
+ 
+ 
+-#if 0
+ static void
+ xfdesktop_clipboard_manager_contents_received (GtkClipboard     *clipboard,
+                                             GtkSelectionData *selection_data,
+@@ -318,6 +317,8 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard     *clipboard,
+   GtkWindow                      *parent = GTK_WINDOW(gtk_widget_get_toplevel(request->widget));
+   gboolean                        path_copy = TRUE;
+   GList                          *path_list = NULL;
++  GList                          *dest_file_list  = NULL;
++  GList                          *l               = NULL;
+   gchar                          *data;
+ 
+   /* check whether the retrieval worked */
+@@ -340,19 +341,43 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard     *clipboard,
+         }
+ 
+       /* determine the path list stored with the selection */
+-      path_list = thunar_vfs_path_list_from_string (data, NULL);
++      path_list = xfdesktop_file_utils_file_list_from_string (data);
+     }
+ 
+   /* perform the action if possible */
+   if (G_LIKELY (path_list != NULL))
+     {
++      for (l = path_list; l; l = l->next) {
++        gchar *dest_basename = g_file_get_basename(l->data);
++
++        if(dest_basename && *dest_basename != '\0') {
++          /* If we copy a file, we need to use the new absolute filename
++           * as the destination. If we move, we need to use the destination
++           * directory. */
++           if(path_copy) {
++             GFile *dest_file = g_file_get_child(request->target_file, dest_basename);
++             dest_file_list = g_list_prepend(dest_file_list, dest_file);
++           } else {
++             dest_file_list = g_list_prepend(dest_file_list, request->target_file);
++           }
++         }
++         g_free(dest_basename);
++      }
++
++      dest_file_list = g_list_reverse(dest_file_list);
++
+       if (G_LIKELY (path_copy))
+-        xfdesktop_file_utils_copy_into(parent, path_list, request->target_path);
+-        //thunar_application_copy_into (application, request->widget, path_list, request->target_path, request->new_files_closure);
+-      else
+-        xfdesktop_file_utils_move_into(parent, path_list, request->target_path);
+-        //thunar_application_move_into (application, request->widget, path_list, request->target_path, request->new_files_closure);
+-      thunar_vfs_path_list_free (path_list);
++      {
++        xfdesktop_file_utils_transfer_files(GDK_ACTION_COPY,
++                                            path_list,
++                                            dest_file_list,
++                                            gtk_widget_get_screen(GTK_WIDGET(parent)));
++      } else {
++        xfdesktop_file_utils_transfer_files(GDK_ACTION_MOVE,
++                                            path_list,
++                                            dest_file_list,
++                                            gtk_widget_get_screen(GTK_WIDGET(parent)));
++      }
+ 
+       /* clear the clipboard if it contained "cutted data"
+        * (gtk_clipboard_clear takes care of not clearing
+@@ -365,18 +390,11 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard     *clipboard,
+        * if either the Xserver or our GTK+ version
+        * doesn't support the XFixes extension.
+        */
+-#if GTK_CHECK_VERSION(2,6,0)
+       if (!gdk_display_supports_selection_notification (gtk_clipboard_get_display (manager->clipboard)))
+-#endif
+         {
+           xfdesktop_clipboard_manager_owner_changed (manager->clipboard, NULL, manager);
+         }
+     }
+-  else
+-    {
+-      /* tell the user that we cannot paste */
+-//      thunar_dialogs_show_error (request->widget, NULL, _("There is nothing on the clipboard to paste"));
+-    }
+ 
+   /* free the request */
+   if (G_LIKELY (request->widget != NULL))
+@@ -384,10 +402,11 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard     *clipboard,
+   if (G_LIKELY (request->new_files_closure != NULL))
+     g_closure_unref (request->new_files_closure);
+   g_object_unref (G_OBJECT (request->manager));
+-  thunar_vfs_path_unref (request->target_path);
+-  g_free (request);
++
++  g_list_free(dest_file_list);
++  g_list_free(path_list);
+ }
+-#endif
++
+ 
+ 
+ static void
+@@ -654,6 +673,61 @@ xfdesktop_clipboard_manager_cut_files (XfdesktopClipboardManager *manager,
+ gboolean
+ xfdesktop_clipboard_manager_get_can_paste (XfdesktopClipboardManager *manager)
+ {
+-    /* FIXME: implement */
+-    return FALSE;
++    g_return_val_if_fail (XFDESKTOP_IS_CLIPBOARD_MANAGER (manager), FALSE);
++    return manager->can_paste;
++}
++
++
++/**
++ * thunar_clipboard_manager_paste_files:
++ * @manager           : a #XfdesktopClipboardManager.
++ * @target_file       : the #GFile of the folder to which the contents on the clipboard
++ *                      should be pasted.
++ * @widget            : a #GtkWidget, on which to perform the paste or %NULL if no widget is
++ *                      known.
++ * @new_files_closure : a #GClosure to connect to the job's "new-files" signal,
++ *                      which will be emitted when the job finishes with the
++ *                      list of #GFile<!---->s created by the job, or
++ *                      %NULL if you're not interested in the signal.
++ *
++ * Pastes the contents from the clipboard associated with @manager to the directory
++ * referenced by @target_file.
++ * Code copied and adapted from thunar-clipboard-manager.c
++ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
++ * Copyright (c) 2009-2011 Jannis Pohlmann <jannis@xfce.org>
++ **/
++void
++xfdesktop_clipboard_manager_paste_files (XfdesktopClipboardManager *manager,
++                                      GFile                  *target_file,
++                                      GtkWidget              *widget,
++                                      GClosure               *new_files_closure)
++{
++  XfdesktopClipboardPasteRequest *request;
++
++  g_return_if_fail (XFDESKTOP_IS_CLIPBOARD_MANAGER (manager));
++  g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
++
++  /* prepare the paste request */
++  request = g_slice_new0 (XfdesktopClipboardPasteRequest);
++  request->manager = g_object_ref (G_OBJECT (manager));
++  request->target_file = g_object_ref (target_file);
++  request->widget = widget;
++
++  /* take a reference on the closure (if any) */
++  if (G_LIKELY (new_files_closure != NULL))
++    {
++      request->new_files_closure = new_files_closure;
++      g_closure_ref (new_files_closure);
++      g_closure_sink (new_files_closure);
++    }
++
++  /* get notified when the widget is destroyed prior to
++   * completing the clipboard contents retrieval
++   */
++  if (G_LIKELY (request->widget != NULL))
++    g_object_add_weak_pointer (G_OBJECT (request->widget), (gpointer) &request->widget);
++
++  /* schedule the request */
++  gtk_clipboard_request_contents (manager->clipboard, manager->x_special_gnome_copied_files,
++                                  xfdesktop_clipboard_manager_contents_received, request);
+ }
+diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
+index d3ca2eb..b7fada2 100644
+--- a/src/xfdesktop-file-icon-manager.c
++++ b/src/xfdesktop-file-icon-manager.c
+@@ -858,6 +858,15 @@ xfdesktop_file_icon_menu_delete(GtkWidget *widget,
+ }
+ 
+ static void
++xfdesktop_file_icon_menu_paste(GtkWidget *widget,
++                               gpointer user_data)
++{
++    XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data);
++    if(widget && fmanager)
++        xfdesktop_clipboard_manager_paste_files(clipboard_manager, fmanager->priv->folder, widget, NULL);
++}
++
++static void
+ xfdesktop_file_icon_menu_properties(GtkWidget *widget,
+                                     gpointer user_data)
+ {
+@@ -1616,7 +1625,11 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
+             mi = gtk_image_menu_item_new_from_stock(GTK_STOCK_PASTE, NULL);
+             gtk_widget_show(mi);
+             gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+-            /* FIXME: implement */
++            if(xfdesktop_clipboard_manager_get_can_paste(clipboard_manager)) {
++                g_signal_connect(G_OBJECT(mi), "activate",
++                                 G_CALLBACK(xfdesktop_file_icon_menu_paste),
++                                 fmanager);
++            } else
+             gtk_widget_set_sensitive(mi, FALSE);
+         } else {
+             mi = gtk_image_menu_item_new_from_stock(GTK_STOCK_COPY, NULL);
+@@ -2098,6 +2111,18 @@ xfdesktop_file_icon_manager_key_press(GtkWidget *widget,
+             }
+             return TRUE;
+         
++        case GDK_v:
++        case GDK_V:
++            if(!(evt->state & GDK_CONTROL_MASK)
++               || (evt->state & (GDK_SHIFT_MASK|GDK_MOD1_MASK|GDK_MOD4_MASK)))
++            {
++                return FALSE;
++            }
++            if(xfdesktop_clipboard_manager_get_can_paste(clipboard_manager)) {
++                xfdesktop_clipboard_manager_paste_files(clipboard_manager, fmanager->priv->folder, widget, NULL);
++            }
++            return TRUE;
++
+         case GDK_r:
+         case GDK_R:
+             if(!(evt->state & GDK_CONTROL_MASK)
+-- 
+1.7.5.4
+
diff --git a/extra/xfdesktop/xfdesktop.install b/extra/xfdesktop/xfdesktop.install
index 21b79d2d4..e4f8fd06c 100644
--- a/extra/xfdesktop/xfdesktop.install
+++ b/extra/xfdesktop/xfdesktop.install
@@ -3,9 +3,11 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 1e8716138..6b47332c1 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148646 2012-02-05 03:52:36Z eric $
+# $Id: PKGBUILD 150886 2012-02-23 13:48:15Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xine-project.org"
diff --git a/extra/xorg-xev/PKGBUILD b/extra/xorg-xev/PKGBUILD
index 01d5554d6..56f6f2cb2 100644
--- a/extra/xorg-xev/PKGBUILD
+++ b/extra/xorg-xev/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 149060 2012-02-05 15:59:34Z bisson $
+# $Id: PKGBUILD 150821 2012-02-23 07:20:15Z andyrtr $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=xorg-xev
-pkgver=1.1.0
-pkgrel=3
+pkgver=1.2.0
+pkgrel=1
 pkgdesc='Print contents of X events'
 url='http://xorg.freedesktop.org/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
-depends=('libx11')
-makedepends=('xorg-util-macros')
+depends=('libx11' 'libxrandr')
+makedepends=('xorg-util-macros' 'xproto')
 source=("http://xorg.freedesktop.org/archive/individual/app/xev-${pkgver}.tar.bz2")
-sha1sums=('77dcbdaa2046db56f31936f921843bd05df2255f')
-
+sha1sums=('6b05706ed39382b5d08c5351c00ba7e127709eec')
 groups=('xorg-apps' 'xorg')
 
 build() {
diff --git a/extra/xorg-xwd/PKGBUILD b/extra/xorg-xwd/PKGBUILD
index a4de8a9f1..9a4fb031a 100644
--- a/extra/xorg-xwd/PKGBUILD
+++ b/extra/xorg-xwd/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 113841 2011-03-10 16:01:03Z jgc $
+# $Id: PKGBUILD 150823 2012-02-23 07:34:14Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xwd
-pkgver=1.0.4
-pkgrel=2
+pkgver=1.0.5
+pkgrel=1
 pkgdesc="X Window System image dumping utility"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
-makedepends=('xorg-util-macros')
+makedepends=('xorg-util-macros' 'libxt')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xwd-${pkgver}.tar.bz2)
-sha1sums=('4ef4fd9072a507e9a1ee88ba1d28b314006cc109')
+sha1sums=('3b0e4f3f9d28a07444e72952342e21544d4785b6')
 
 build() {
   cd "${srcdir}/xwd-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/xwd-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index f7ccd3810..b71addde4 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 150666 2012-02-19 20:58:33Z pierre $
+# $Id: PKGBUILD 150931 2012-02-23 23:42:48Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zsh
-pkgver=4.3.16
+pkgver=4.3.17
 pkgrel=1
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ install=zsh.install
 source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
         'zprofile')
 backup=('etc/zsh/zprofile')
-md5sums=('4bf0b8947b5acc0ac4334d75adc87239'
+md5sums=('8258967060b2654f30001a011946ac6a'
          '24a9335edf77252a7b5f52e079f7aef7')
 
 build() {