Mon Apr 30 00:01:38 UTC 2012

181 files changed, 4185 insertions, 299 deletions

diff --git a/community-testing/ecryptfs-utils/PKGBUILD b/community-testing/ecryptfs-utils/PKGBUILD
new file mode 100644
index 000000000..e88479bef
--- /dev/null
+++ b/community-testing/ecryptfs-utils/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 70054 2012-04-28 21:41:48Z dreisner $
+# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
+# Contributor: Richard Murri <admin@richardmurri.com>
+# Contributor: Michal Krenek <mikos@sg1.cz>
+
+pkgname=ecryptfs-utils
+pkgver=96
+pkgrel=2
+arch=('i686' 'x86_64')
+pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux"
+url="https://launchpad.net/ecryptfs"
+license=('GPL')
+makedepends=('swig' 'intltool' 'gettext')
+depends=('keyutils' 'nss' 'python2')
+source=("http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz")
+options=(!libtool)
+md5sums=('4f92c9f6e8f62ac00ca7e2c4e480f1d7')
+
+build() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --with-pamdir=/usr/lib/security PYTHON=python2
+  make
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir/" install
+  chmod +s "$pkgdir"/sbin/mount.ecryptfs_private
+}
diff --git a/community-testing/pam-krb5/PKGBUILD b/community-testing/pam-krb5/PKGBUILD
new file mode 100644
index 000000000..7b0f55e2b
--- /dev/null
+++ b/community-testing/pam-krb5/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 70056 2012-04-28 21:41:50Z dreisner $
+# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# Contributor: Ryan Corder <ryanc@greengrey.org>
+
+pkgname=pam-krb5
+pkgver=4.5
+pkgrel=2
+pkgdesc='A PAM module providing Kerberos v5 support.'
+arch=('i686' 'x86_64')
+url='http://www.eyrie.org/~eagle/software/pam-krb5/'
+license=('custom')
+options=('!libtool')
+depends=('krb5' 'pam')
+source=("http://archives.eyrie.org/software/kerberos/$pkgname-$pkgver.tar.gz")
+md5sums=('5736795225cf7f84718af42a15570fe0')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+    --enable-reduced-depends \
+    --libdir=/usr/lib
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=$pkgdir install
+  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/community-testing/pam_mysql/PKGBUILD b/community-testing/pam_mysql/PKGBUILD
new file mode 100644
index 000000000..25d792b0b
--- /dev/null
+++ b/community-testing/pam_mysql/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 70058 2012-04-28 21:41:51Z dreisner $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Arjan Timmerman<arjan@archlinux.org>
+# Contributor: Manolis Tzanidakis
+pkgname=pam_mysql
+pkgver=0.7RC1
+pkgrel=6
+pkgdesc="A PAM module to authenticate users against mysql."
+arch=(i686 x86_64)
+license=('GPL')
+url="http://pam-mysql.sourceforge.net"
+depends=('pam' 'mysql' 'openssl')
+source=(http://sourceforge.net/projects/pam-mysql/files/pam-mysql/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('6177183d7e98dc12f2e444c9fbd4f13c')
+options=(!libtool)
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  sed -i 's/pam_mysql_la_LIBADD = /pam_mysql_la_LIBADD = -lpam/g' Makefile.in
+  ./configure --prefix=/usr --with-pam-mods-dir=/usr/lib/security
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+}
diff --git a/community-testing/pam_pwcheck/PKGBUILD b/community-testing/pam_pwcheck/PKGBUILD
new file mode 100644
index 000000000..5457ef37a
--- /dev/null
+++ b/community-testing/pam_pwcheck/PKGBUILD
@@ -0,0 +1,20 @@
+# $Id: PKGBUILD 70060 2012-04-28 21:41:52Z dreisner $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=pam_pwcheck
+pkgver=3.9
+pkgrel=4
+pkgdesc="A password strength checking module for PAM-aware password changing programs"
+arch=(i686 x86_64)
+url="http://www.thkukuk.de/pam/pam_pwcheck/"
+depends=('pam')
+license=('GPL')
+source=(ftp://ftp.suse.com/pub/people/kukuk/pam/pam_pwcheck/pam_pwcheck-$pkgver.tar.bz2)
+md5sums=('27be63338af88d14610d182b6a161cd1')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib
+  make
+  make DESTDIR=$pkgdir install
+}
diff --git a/community-testing/parole/PKGBUILD b/community-testing/parole/PKGBUILD
new file mode 100644
index 000000000..fc68c9d76
--- /dev/null
+++ b/community-testing/parole/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 70071 2012-04-29 02:54:14Z foutrelis $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: TDY <tdy@gmx.com>
+
+pkgname=parole
+pkgver=0.2.0.6
+pkgrel=2
+pkgdesc="A modern media player based on the GStreamer framework"
+arch=('i686' 'x86_64')
+url="http://goodies.xfce.org/projects/applications/parole/"
+license=('GPL')
+depends=('gstreamer0.10-base>=0.10.11' 'hicolor-icon-theme' 'libnotify>=0.4.1'
+         'libxfcegui4>=4.6.0' 'taglib>=1.4' 'desktop-file-utils')
+makedepends=('pkgconfig>=0.9.0' 'xfce4-dev-tools')
+optdepends=('xulrunner>=1.9.1: browser plugin')
+conflicts=('parole-media-player-git')
+options=('!libtool')
+install=parole.install
+source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*.*}/$pkgname-$pkgver.tar.bz2)
+md5sums=('5d7e5ab7535bdf89508a8d7e551f9187')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Work around DSO linking issue
+  LDFLAGS+=' -lX11'
+
+  ./configure --prefix=/usr --libexecdir=/usr/lib --enable-taglib --enable-libnotify
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community-testing/parole/parole.install b/community-testing/parole/parole.install
new file mode 100644
index 000000000..dcc06de40
--- /dev/null
+++ b/community-testing/parole/parole.install
@@ -0,0 +1,12 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community-testing/ristretto/PKGBUILD b/community-testing/ristretto/PKGBUILD
new file mode 100644
index 000000000..b41f3d99a
--- /dev/null
+++ b/community-testing/ristretto/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 70073 2012-04-29 02:54:15Z foutrelis $
+# Maintainer:  Bartłomiej Piotrowski
+# Contributor: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=ristretto
+pkgver=0.6.0
+pkgrel=1
+pkgdesc="A fast and lightweight picture-viewer for Xfce"
+arch=('i686' 'x86_64')
+url="http://goodies.xfce.org/projects/applications/ristretto"
+license=('GPL')
+depends=('libxfce4ui' 'libexif' 'desktop-file-utils')
+makedepends=('intltool')
+groups=('xfce4-goodies')
+install=ristretto.install
+source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2")
+md5sums=('a61ef43cd325d985ecf71fcabf0c7940')
+
+build() {
+  cd "${srcdir}/$pkgname-$pkgver"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--localstatedir=/var \
+	--disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/$pkgname-$pkgver"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community-testing/ristretto/ristretto.install b/community-testing/ristretto/ristretto.install
new file mode 100644
index 000000000..75e2b7b55
--- /dev/null
+++ b/community-testing/ristretto/ristretto.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/community-testing/xfmedia/PKGBUILD b/community-testing/xfmedia/PKGBUILD
new file mode 100644
index 000000000..f7dec3857
--- /dev/null
+++ b/community-testing/xfmedia/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 70075 2012-04-29 02:54:16Z foutrelis $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer : Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer : Tom Killian <tomk@runbox.com>
+# Contributor: Spider.007 <archPackage@spider007.net>
+
+pkgname=xfmedia
+pkgver=0.9.2
+pkgrel=11
+pkgdesc="xfce media player"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://spuriousinterrupt.org/projects/xfmedia/"
+depends=('xine-lib' 'taglib' 'exo' 'libxtst' 'libxss' 'libxfcegui4' 'dbus-glib')
+makedepends=('intltool' 'libxt')
+install=xfmedia.install
+source=(http://spuriousinterrupt.org/files/$pkgname/$pkgname-$pkgver.tar.bz2
+	xfmedia-dbus-0.6-support.patch
+	xfmedia-empty-prev-next-fix.patch
+	xfmedia-exo-0.6.patch
+	xfmedia-xine-1.2.0.patch)
+md5sums=('6eb8bd1f67201f829e0f45e733c02bd5'
+         '8f2aa12eea584de65d8ed28179e56b51'
+         '650f8cb9e2ddd9a8a2a03748b8757110'
+         'f5e17fcdf2056dcc8ca8aae8600c0132'
+         '934603c7d3a1a0a66edb847bcb930df1')
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+  patch -Np1 -i ../xfmedia-dbus-0.6-support.patch
+  patch -Np1 -i ../xfmedia-empty-prev-next-fix.patch
+  patch -Np1 -i ../xfmedia-exo-0.6.patch
+  patch -Np1 -i ../xfmedia-xine-1.2.0.patch
+  LDFLAGS="$LDFLAGS -lXext -lm -lgmodule-2.0" ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch b/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch
new file mode 100644
index 000000000..9b1eb3678
--- /dev/null
+++ b/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch
@@ -0,0 +1,14 @@
+diff -Naur xfmedia-0.9.1.orig/src/remote.c xfmedia-0.9.1/src/remote.c
+--- xfmedia-0.9.1.orig/src/remote.c	2005-09-05 00:56:37.000000000 -0400
++++ xfmedia-0.9.1/src/remote.c	2006-04-08 00:27:18.000000000 -0400
+@@ -55,6 +55,10 @@
+ #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER DBUS_SERVICE_REPLY_PRIMARY_OWNER
+ #endif
+ 
++#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT
++#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT DBUS_NAME_FLAG_DO_NOT_QUEUE
++#endif
++
+ #endif  /* HAVE_DBUS */
+ 
+ #include <libxfce4util/libxfce4util.h>
diff --git a/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch b/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch
new file mode 100644
index 000000000..e2d0d8166
--- /dev/null
+++ b/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch
@@ -0,0 +1,25 @@
+diff -wbBur xfmedia-0.9.2/src/mainwin.c xfmedia-0.9.2.my/src/mainwin.c
+--- xfmedia-0.9.2/src/mainwin.c	2006-11-27 07:21:23.000000000 +0000
++++ xfmedia-0.9.2.my/src/mainwin.c	2010-11-01 13:01:17.000000000 +0000
+@@ -1865,6 +1865,10 @@
+     gboolean use_playlist_q  = xfmedia_playlist_queue_n_entries(mwin->playlist_q);
+     gboolean ret = FALSE;
+     
++    if(xfmedia_playlist_get_n_entries(mwin->plist) == 0)
++//    if(xfmedia_playlist_queue_is_empty(mwin->plist))
++	return;
++
+     if(mwin->cur_playing
+        && xfmedia_settings_get_bool("/xfmedia/playlist/shuffle")
+        && !use_playlist_q )
+@@ -1899,6 +1903,10 @@
+ {
+     gint tot_items, idx = -1;
+     
++    if(xfmedia_playlist_get_n_entries(mwin->plist) == 0)
++//    if(xfmedia_playlist_queue_is_empty(mwin->plist))
++	return;
++
+     if(xfmedia_settings_get_bool("/xfmedia/playlist/shuffle")) {
+         XfmediaPlaylistEntryRef *ref = NULL;
+         gboolean playing = FALSE;
diff --git a/community-testing/xfmedia/xfmedia-exo-0.6.patch b/community-testing/xfmedia/xfmedia-exo-0.6.patch
new file mode 100644
index 000000000..1de611c82
--- /dev/null
+++ b/community-testing/xfmedia/xfmedia-exo-0.6.patch
@@ -0,0 +1,196 @@
+diff -wbBur xfmedia-0.9.2/configure xfmedia-0.9.2.my/configure
+--- xfmedia-0.9.2/configure	2006-11-27 20:20:59.000000000 +0000
++++ xfmedia-0.9.2.my/configure	2011-01-31 17:15:58.000000000 +0000
+@@ -27417,7 +27417,7 @@
+ 
+ 
+   if test x"$xdt_cv_EXO_check" = x"yes"; then
+-    if $PKG_CONFIG --exists "exo-0.3 >= 0.3.0" >/dev/null 2>&1; then
++    if $PKG_CONFIG --exists "exo-1 >= 0.3.0" >/dev/null 2>&1; then
+ 
+ 
+   # minimum supported version of pkg-config
+@@ -27501,22 +27501,22 @@
+   fi
+ 
+ 
+-  { echo "$as_me:$LINENO: checking for exo-0.3 >= 0.3.0" >&5
+-echo $ECHO_N "checking for exo-0.3 >= 0.3.0... $ECHO_C" >&6; }
+-  if $PKG_CONFIG "--atleast-version=0.3.0" "exo-0.3" >/dev/null 2>&1; then
+-    EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"`
++  { echo "$as_me:$LINENO: checking for exo-1 >= 0.3.0" >&5
++echo $ECHO_N "checking for exo-1 >= 0.3.0... $ECHO_C" >&6; }
++  if $PKG_CONFIG "--atleast-version=0.3.0" "exo-1" >/dev/null 2>&1; then
++    EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"`
+     { echo "$as_me:$LINENO: result: $EXO_VERSION" >&5
+ echo "${ECHO_T}$EXO_VERSION" >&6; }
+ 
+     { echo "$as_me:$LINENO: checking EXO_CFLAGS" >&5
+ echo $ECHO_N "checking EXO_CFLAGS... $ECHO_C" >&6; }
+-    EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"`
++    EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"`
+     { echo "$as_me:$LINENO: result: $EXO_CFLAGS" >&5
+ echo "${ECHO_T}$EXO_CFLAGS" >&6; }
+ 
+     { echo "$as_me:$LINENO: checking EXO_LIBS" >&5
+ echo $ECHO_N "checking EXO_LIBS... $ECHO_C" >&6; }
+-    EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"`
++    EXO_LIBS=`$PKG_CONFIG --libs "exo-1"`
+     { echo "$as_me:$LINENO: result: $EXO_LIBS" >&5
+ echo "${ECHO_T}$EXO_LIBS" >&6; }
+ 
+@@ -27535,15 +27535,15 @@
+ 
+         EXO_FOUND="yes"
+ 
+-  elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then
+-    xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"`
++  elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then
++    xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"`
+     { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5
+ echo "${ECHO_T}found, but $xdt_cv_version" >&6; }
+ 
+ 
+-      echo "*** The required package exo-0.3 was found on your system,"
++      echo "*** The required package exo-1 was found on your system,"
+       echo "*** but the installed version ($xdt_cv_version) is too old."
+-      echo "*** Please upgrade exo-0.3 to atleast version 0.3.0, or adjust"
++      echo "*** Please upgrade exo-1 to atleast version 0.3.0, or adjust"
+       echo "*** the PKG_CONFIG_PATH environment variable if you installed"
+       echo "*** the new version of the package in a nonstandard prefix so"
+       echo "*** pkg-config is able to find it."
+@@ -27554,8 +27554,8 @@
+ echo "${ECHO_T}not found" >&6; }
+ 
+ 
+-      echo "*** The required package exo-0.3 was not found on your system."
+-      echo "*** Please install exo-0.3 (atleast version 0.3.0) or adjust"
++      echo "*** The required package exo-1 was not found on your system."
++      echo "*** Please install exo-1 (atleast version 0.3.0) or adjust"
+       echo "*** the PKG_CONFIG_PATH environment variable if you"
+       echo "*** installed the package in a nonstandard prefix so that"
+       echo "*** pkg-config is able to find it."
+@@ -27564,14 +27564,14 @@
+   fi
+ 
+     else
+-      { echo "$as_me:$LINENO: checking for optional package exo-0.3 >= 0.3.0" >&5
+-echo $ECHO_N "checking for optional package exo-0.3 >= 0.3.0... $ECHO_C" >&6; }
++      { echo "$as_me:$LINENO: checking for optional package exo-1 >= 0.3.0" >&5
++echo $ECHO_N "checking for optional package exo-1 >= 0.3.0... $ECHO_C" >&6; }
+       { echo "$as_me:$LINENO: result: not found" >&5
+ echo "${ECHO_T}not found" >&6; }
+     fi
+   else
+-    { echo "$as_me:$LINENO: checking for optional package exo-0.3" >&5
+-echo $ECHO_N "checking for optional package exo-0.3... $ECHO_C" >&6; }
++    { echo "$as_me:$LINENO: checking for optional package exo-1" >&5
++echo $ECHO_N "checking for optional package exo-1... $ECHO_C" >&6; }
+     { echo "$as_me:$LINENO: result: disabled" >&5
+ echo "${ECHO_T}disabled" >&6; }
+   fi
+diff -wbBur xfmedia-0.9.2/src/main.c xfmedia-0.9.2.my/src/main.c
+--- xfmedia-0.9.2/src/main.c	2006-11-27 07:21:23.000000000 +0000
++++ xfmedia-0.9.2.my/src/main.c	2011-02-01 11:08:02.000000000 +0000
+@@ -388,6 +388,23 @@
+     return optind;
+ }
+ 
++/**
++ * exo_str_get_md5_str:
++ * @contents : The string to create a digest of.
++ *
++ * Creates a character array MD5 digestof the string
++ * @contents.
++ *
++ * Return value: A newly-allocated character array which
++ *               should be free with g_free() when no
++ *               longer needed.
++ **/
++gchar*
++exo_str_get_md5_str (const gchar *contents)
++{
++  return g_compute_checksum_for_string (G_CHECKSUM_MD5, contents, -1);
++}
++
+ int
+ main(int argc, char **argv)
+ {
+diff -wbBur xfmedia-0.9.2/src/mediamarks.c xfmedia-0.9.2.my/src/mediamarks.c
+--- xfmedia-0.9.2/src/mediamarks.c	2006-11-27 07:21:23.000000000 +0000
++++ xfmedia-0.9.2.my/src/mediamarks.c	2011-02-01 11:04:42.000000000 +0000
+@@ -684,9 +684,9 @@
+     
+     render = exo_cell_renderer_ellipsized_text_new();
+     if(gtk_major_version == 2 && gtk_minor_version >= 6)
+-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+ 	else {
+-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
+ 				"ellipsize-set", TRUE, NULL);
+ 	}
+     gtk_tree_view_column_pack_start(col, render, TRUE);
+@@ -1693,9 +1693,9 @@
+     
+     render = exo_cell_renderer_ellipsized_text_new();
+     if(gtk_major_version == 2 && gtk_minor_version >= 6)
+-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+ 	else {
+-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
+ 				"ellipsize-set", TRUE, NULL);
+ 	}
+     gtk_tree_view_column_pack_start(col, render, TRUE);
+@@ -1705,9 +1705,9 @@
+     
+     render = exo_cell_renderer_ellipsized_text_new();
+     if(gtk_major_version == 2 && gtk_minor_version >= 6)
+-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+ 	else {
+-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
+ 				"ellipsize-set", TRUE, NULL);
+ 	}
+     col = gtk_tree_view_column_new_with_attributes(_("Location"), render,
+diff -wbBur xfmedia-0.9.2/src/playlist.c xfmedia-0.9.2.my/src/playlist.c
+--- xfmedia-0.9.2/src/playlist.c	2006-11-27 07:21:22.000000000 +0000
++++ xfmedia-0.9.2.my/src/playlist.c	2011-02-01 11:04:47.000000000 +0000
+@@ -1409,9 +1409,9 @@
+     
+     render = exo_cell_renderer_ellipsized_text_new();
+ 	if(gtk_major_version == 2 && gtk_minor_version >= 6)
+-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+ 	else {
+-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
+ 				"ellipsize-set", TRUE, NULL);
+ 	}
+     col = gtk_tree_view_column_new_with_attributes(_("Title"), render, "text",
+diff -wbBur xfmedia-0.9.2/src/settings-dialog.c xfmedia-0.9.2.my/src/settings-dialog.c
+--- xfmedia-0.9.2/src/settings-dialog.c	2006-11-27 07:21:23.000000000 +0000
++++ xfmedia-0.9.2.my/src/settings-dialog.c	2011-02-01 11:04:53.000000000 +0000
+@@ -552,7 +552,7 @@
+     render = exo_cell_renderer_ellipsized_text_new();
+     col = gtk_tree_view_column_new_with_attributes("name", render,
+             "text", PLUGINS_NAME, NULL);
+-    g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
++    g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
+             "ellipsize-set", TRUE, NULL);
+     gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col);
+     
+diff -wbBur xfmedia-0.9.2/src/xfmedia-playlist-queue.c xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c
+--- xfmedia-0.9.2/src/xfmedia-playlist-queue.c	2006-11-27 07:21:22.000000000 +0000
++++ xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c	2011-02-01 11:04:57.000000000 +0000
+@@ -171,7 +171,7 @@
+     
+     render = exo_cell_renderer_ellipsized_text_new();
+     g_object_set(G_OBJECT(render),
+-                 "ellipsize", EXO_PANGO_ELLIPSIZE_END,
++                 "ellipsize", PANGO_ELLIPSIZE_END,
+                  "ellipsize-set", TRUE,
+                  NULL);
+     col = gtk_tree_view_column_new_with_attributes("display-name", render,
diff --git a/community-testing/xfmedia/xfmedia-xine-1.2.0.patch b/community-testing/xfmedia/xfmedia-xine-1.2.0.patch
new file mode 100644
index 000000000..2e04ac80a
--- /dev/null
+++ b/community-testing/xfmedia/xfmedia-xine-1.2.0.patch
@@ -0,0 +1,34 @@
+diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.c xfmedia-0.9.2.my/src/xfmedia-xine.c
+--- xfmedia-0.9.2/src/xfmedia-xine.c	2006-11-27 10:21:23.000000000 +0300
++++ xfmedia-0.9.2.my/src/xfmedia-xine.c	2012-01-05 01:23:21.000000000 +0400
+@@ -1450,17 +1450,6 @@
+ }
+ 
+ gboolean
+-xfmedia_xine_trick_mode(XfmediaXine * xfx, gint mode, gint value)
+-{
+-
+-    g_return_val_if_fail(xfx != NULL, 0);
+-    g_return_val_if_fail(XFMEDIA_IS_XINE(xfx), 0);
+-    g_return_val_if_fail(xfx->priv->stream != NULL, 0);
+-
+-    return xine_trick_mode(xfx->priv->stream, mode, value);
+-}
+-
+-gboolean
+ xfmedia_xine_get_pos_length(XfmediaXine *xfx, gint *pos_stream,
+     gint *pos_time, gint *length_time)
+ {
+diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.h xfmedia-0.9.2.my/src/xfmedia-xine.h
+--- xfmedia-0.9.2/src/xfmedia-xine.h	2006-11-27 10:21:23.000000000 +0300
++++ xfmedia-0.9.2.my/src/xfmedia-xine.h	2012-01-05 01:20:47.000000000 +0400
+@@ -87,9 +87,6 @@
+ gboolean     xfmedia_xine_play                       (XfmediaXine *xfx,
+                                                   gint pos,
+                                                   gint start_time);
+-gboolean     xfmedia_xine_trick_mode                 (XfmediaXine *xfx,
+-                                                  gint mode,
+-                                                  gint value);
+ gint         xfmedia_xine_get_stream_info            (XfmediaXine *xfx,
+                                                   gint info);
+ G_CONST_RETURN gchar *xfmedia_xine_get_meta_info     (XfmediaXine *xfx,
diff --git a/community-testing/xfmedia/xfmedia.install b/community-testing/xfmedia/xfmedia.install
new file mode 100644
index 000000000..b95cc069d
--- /dev/null
+++ b/community-testing/xfmedia/xfmedia.install
@@ -0,0 +1,11 @@
+post_install() {
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+}
diff --git a/community/buoh/PKGBUILD b/community/buoh/PKGBUILD
index ef92ea57e..0d0ba0118 100644
--- a/community/buoh/PKGBUILD
+++ b/community/buoh/PKGBUILD
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD 66594 2012-02-26 13:42:22Z lfleischer $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 70031 2012-04-28 12:10:05Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=buoh
 pkgver=0.8.2
-pkgrel=5
-pkgdesc="A reader for online strips comics"
+pkgrel=6
+pkgdesc="Reader for online strips comics"
 arch=('i686' 'x86_64')
 url="http://buoh.steve-o.org/"
 license=('GPL')
-depends=('libgnomeui' 'libsoup>=2.4.0' 'gconf' 'hicolor-icon-theme')
-makedepends=('gettext' 'intltool' 'pkgconfig')
+depends=('gtk2' 'libsoup>=2.4.0' 'gconf' 'hicolor-icon-theme')
+makedepends=('intltool')
+options=('!emptydirs')
 install=buoh.install
-source=("http://buoh.steve-o.org/downloads/${pkgname}-${pkgver}.tar.bz2"
+source=("http://buoh.steve-o.org/downloads/$pkgname-$pkgver.tar.bz2"
         buoh-libsoup24.patch)
 md5sums=('50474a8712ad20ab36d8f8058a4647fb'
          'c44f0e1828492a5d7d8efee764558fb4')
@@ -20,16 +22,19 @@ sha1sums=('29d702b485a901868f65116e753cb515b3e2a2c5'
           '012badf13e33818268b744e106bdcccfd8fc66ed')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
   patch -p1 < ../buoh-libsoup24.patch
   autoconf
 
-  ./configure --prefix=/usr --sysconfdir=/usr/share --disable-schemas-install
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas --without-libgnomeui
   make AM_CFLAGS=-lxml2
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
+
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/buoh/buoh.install b/community/buoh/buoh.install
index 2c1fcdf8a..44175ce06 100644
--- a/community/buoh/buoh.install
+++ b/community/buoh/buoh.install
@@ -2,7 +2,6 @@ pkgname=buoh
 
 post_install() {
   usr/sbin/gconfpkg --install ${pkgname}
-  update-desktop-database -q
   gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
 }
 
@@ -19,6 +18,5 @@ pre_remove() {
 }
 
 post_remove() {
-  update-desktop-database -q
   gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
 }
diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD
index b218cb149..36d2597c8 100644
--- a/community/freemat/PKGBUILD
+++ b/community/freemat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64323 2012-02-11 23:21:03Z allan $
+# $Id: PKGBUILD 70011 2012-04-28 09:24:04Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=freemat
 pkgver=4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
 arch=('i686' 'x86_64')
 url="http://freemat.sourceforge.net"
diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index c43b314b8..53693e857 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69004 2012-04-07 16:55:48Z lcarlier $
+# $Id: PKGBUILD 70013 2012-04-28 09:24:06Z allan $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Biru Ionut <ionut@archlinux.ro>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
          'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
          'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
 pkgver=2.23.1
-pkgrel=9
+pkgrel=10
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net"
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index ef09c474e..be9037be9 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69722 2012-04-23 07:27:51Z lcarlier $
+# $Id: PKGBUILD 70015 2012-04-28 09:24:08Z allan $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 
 pkgbase=gambas3
@@ -13,7 +13,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
          'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
 pkgver=3.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net/"
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index a547ae829..7555de181 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69728 2012-04-23 09:06:52Z ibiru $
+# $Id: PKGBUILD 70017 2012-04-28 09:24:10Z allan $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Hugo Doria <hugo@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=gedit-plugins
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugins for gedit"
 arch=('x86_64' 'i686')
 license=('GPL')
diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD
index 9191853d3..827afcf48 100644
--- a/community/gnustep-base/PKGBUILD
+++ b/community/gnustep-base/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68862 2012-04-04 09:31:15Z allan $
+# $Id: PKGBUILD 70019 2012-04-28 09:24:11Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-base
 pkgver=1.24.0
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNUstep base package"
 arch=('i686' 'x86_64')
 url="http://www.gnustep.org/"
diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD
index 31de7f136..9396b8ee2 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69738 2012-04-23 09:07:48Z ibiru $
+# $Id: PKGBUILD 70021 2012-04-28 09:24:13Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: Christer Solskogen (solskogen@carebears.mine.nu)
 
 pkgname=gtranslator
 pkgver=2.91.3
-pkgrel=2
+pkgrel=3
 pkgdesc="An enhanced gettext po file editor for the GNOME"
 arch=('i686' 'x86_64')
 url="http://projects.gnome.org/gtranslator/"
diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD
index 3d04dbb3e..ac17b81f1 100644
--- a/community/libmemcached/PKGBUILD
+++ b/community/libmemcached/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 69280 2012-04-12 09:17:37Z foutrelis $
+# $Id: PKGBUILD 70077 2012-04-29 03:10:00Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=libmemcached
-pkgver=1.0.6
+pkgver=1.0.7
 pkgrel=1
 pkgdesc="C and C++ client library to the memcached server"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('glibc' 'libsasl' 'libevent')
 makedepends=('perl')
 options=('!libtool')
 source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-sha256sums=('1403b24fe8d32a8e5ae4c39aadb8ad9c72f17b2a3244943eb0d8fc4821f02c70')
+sha256sums=('3efa86c9733eaad55d7119cb16769424e2aa6c22b3392e8f973946fce6678d81')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/librep/PKGBUILD b/community/librep/PKGBUILD
index 7bd623c83..54eb5000d 100644
--- a/community/librep/PKGBUILD
+++ b/community/librep/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68538 2012-03-27 07:09:16Z arodseth $
+# $Id: PKGBUILD 70025 2012-04-28 09:24:16Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: stefan-husmann@t-online.de
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=librep
 pkgver=0.92.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Lisp system for Sawfish"
 license=('GPL2')
 arch=('x86_64' 'i686')
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index 873ad8f01..f194892b5 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69768 2012-04-23 09:16:14Z ibiru $
+# $Id: PKGBUILD 70027 2012-04-28 09:24:17Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
 
 pkgname=parrot
-pkgver=4.2.0
-#_rel=stable
-_rel=devel
+pkgver=4.3.0
+_rel=stable
+#_rel=devel
 pkgrel=1
 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages"
 arch=('x86_64' 'i686')
@@ -14,9 +14,9 @@ license=('GPL')
 depends=('icu' 'openssl' 'libffi')
 makedepends=('perl-json')
 optdepends=('freeglut')
-options=(!makeflags)
-source=("ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('69ee93d9f81babcff67b747cc614358958a32f274e407b65771ca5a056d4c3d4')
+options=('!makeflags')
+source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2)
+sha256sums=('5c3f5ba2de06f6adb53b7835374a4f3e0601ec63e8a1d1dba6c6a07e12cc2990')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD
index a93739555..5c8aeef52 100644
--- a/community/picard/PKGBUILD
+++ b/community/picard/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 62594 2012-01-22 09:34:17Z bisson $
+# $Id: PKGBUILD 70039 2012-04-28 15:51:53Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: sysrq
 
 pkgname=picard
 pkgver=0.16
-pkgrel=4
+pkgrel=5
 pkgdesc='Official MusicBrainz tagger'
 url='http://musicbrainz.org/doc/MusicBrainz_Picard'
 license=('GPL')
@@ -13,13 +13,16 @@ arch=('i686' 'x86_64')
 depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg')
 optdepends=('libdiscid: CD lookup'
             'chromaprint: fingerprinting')
-source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('274071410550ee29051bb0137d72602921a015f9')
+source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'typeheader.patch')
+sha1sums=('274071410550ee29051bb0137d72602921a015f9'
+          '0bd871632c28ef656af7ae89a8e752120f2cd7bd')
 
 install=install
 
 build() {
 	cd "${srcdir}/picard-${pkgver}"
+	patch -p1 -i ../typeheader.patch
 	python2 setup.py config
 }
 
diff --git a/community/picard/typeheader.patch b/community/picard/typeheader.patch
new file mode 100644
index 000000000..b34852673
--- /dev/null
+++ b/community/picard/typeheader.patch
@@ -0,0 +1,25 @@
+diff -Naur old/picard/webservice.py new/picard/webservice.py
+--- old/picard/webservice.py	2011-10-23 19:15:29.000000000 +0200
++++ new/picard/webservice.py	2012-04-28 17:43:17.562422696 +0200
+@@ -149,8 +149,11 @@
+             url.setPassword(self.config.setting["password"])
+         request = QtNetwork.QNetworkRequest(url)
+         request.setRawHeader("User-Agent", "MusicBrainz-Picard/%s" % version_string)
+-        if method == "POST" and host == self.config.setting["server_host"]:
+-            request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/xml; charset=utf-8")
++        if data is not None:
++            if method == "POST" and host == self.config.setting["server_host"]:
++                request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/xml; charset=utf-8")
++            else:
++                request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/x-www-form-urlencoded")
+         send = self._request_methods[method]
+         reply = send(request, data) if data is not None else send(request)
+         key = (host, port)
+@@ -370,6 +373,7 @@
+     def _encode_acoustid_args(self, args):
+         filters = []
+         args['client'] = ACOUSTID_KEY
++        args['clientversion'] = version_string
+         args['format'] = 'xml'
+         for name, value in args.items():
+             value = str(QUrl.toPercentEncoding(value))
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 94b5a2db1..a46b4422d 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69786 2012-04-23 09:37:03Z spupykin $
+# $Id: PKGBUILD 70007 2012-04-28 09:18:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
 pkgver=2.4.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64')
 url="http://redis.io/"
@@ -19,7 +19,7 @@ source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.d"
 	"redis.logrotate")
 md5sums=('ccd193d80196855343840db6110bf58d'
-         'f8fb4b00ee3636c7dc7c173e2f6a4e76'
+         '9d58bcc2bc0e193353206c608e71f5d6'
          '9e2d75b7a9dc421122d673fe520ef17f')
 
 build() {
diff --git a/community/redis/redis.d b/community/redis/redis.d
index afd001fd5..4babbaaa5 100644
--- a/community/redis/redis.d
+++ b/community/redis/redis.d
@@ -12,9 +12,14 @@ PIDFILE=/var/run/redis.pid
 WORKDIR=/var/lib/redis
 CONF="/etc/redis.conf"
 
-PID=$(cat $PIDFILE)
+# Check if process exists
+PID=$(cat $PIDFILE 2>/dev/null)
 [ -d /proc/${PID} ] || rm -f $PIDFILE
 
+# Grab the server password, if exists
+REDISPASS=`egrep -o '^requirepass ([^#]+)' $CONF | cut -d\  -f 2`
+[ -n "$REDISPASS" ] && CLIEXEC="$CLIEXEC -a $REDISPASS"
+
 case "$1" in
   start)
     stat_busy "Starting $daemon_name"
diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD
index 70016c238..50f5808b5 100644
--- a/community/smalltalk/PKGBUILD
+++ b/community/smalltalk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69236 2012-04-10 21:23:38Z arodseth $
+# $Id: PKGBUILD 70029 2012-04-28 09:24:19Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: mrshpot <mrshpot at gmail dot com>
@@ -6,7 +6,7 @@
 
 pkgname=smalltalk
 pkgver=3.2.4
-pkgrel=6
+pkgrel=7
 pkgdesc='Implementation of Smalltalk-80'
 url='http://smalltalk.gnu.org/'
 license=('GPL' 'LGPL')
diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD
index 036da3f52..5ff461c2a 100644
--- a/community/widelands/PKGBUILD
+++ b/community/widelands/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69897 2012-04-25 19:17:33Z svenstaro $
+# $Id: PKGBUILD 70033 2012-04-28 14:02:07Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <rabyte*gmail>
@@ -6,13 +6,13 @@
 pkgname=widelands
 pkgver=17
 _realver=build17
-pkgrel=1
+pkgrel=2
 pkgdesc="A realtime strategy game with emphasis on economy and transport"
 arch=('i686' 'x86_64')
 url="http://widelands.org/"
 license=('GPL')
-depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2' 'widelands-data')
-makedepends=('cmake' 'boost' 'ggz-client-libs')
+depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua' 'glew' 'python2' 'widelands-data')
+makedepends=('cmake' 'boost')
 source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2"
         $pkgname.desktop
         $pkgname.png
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index b673fab98..210621610 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 157012 2012-04-23 09:23:05Z ibiru $
+# $Id: PKGBUILD 157381 2012-04-28 09:25:44Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=glib2
 pkgver=2.32.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('pcre' 'libffi')
-makedepends=('pkgconfig' 'python2')
+makedepends=('pkg-config' 'python2')
 optdepends=('python2: for gdbus-codegen')
 options=('!libtool' '!docs' '!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD
index d0d021b2c..ec02865eb 100644
--- a/core/libffi/PKGBUILD
+++ b/core/libffi/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 139471 2011-10-02 01:24:24Z ibiru $
+# $Id: PKGBUILD 157383 2012-04-28 09:25:57Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libffi
-pkgver=3.0.10
+pkgver=3.0.11
 pkgrel=1
 pkgdesc="A portable, high level programming interface to various calling conventions"
 arch=('i686' 'x86_64')
 url="http://sourceware.org/libffi"
 license=('MIT')
 depends=('glibc')
+checkdepends=('dejagnu')
 options=('!libtool')
 install=libffi.install
 source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
-md5sums=('79390673f5d07a8fb342bc09b5055b6f')
+md5sums=('f69b9693227d976835b4857b1ba7d0e3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -20,6 +21,11 @@ build() {
   make
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index 7f3df45e7..bdcc9129e 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156488 2012-04-19 14:22:45Z bisson $
+# $Id: PKGBUILD 157379 2012-04-28 09:02:47Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=openssl
-_ver=1.0.1a
+_ver=1.0.1b
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -20,8 +20,8 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
         'fix-manpages.patch'
         'no-rpath.patch'
         'ca-dir.patch')
-md5sums=('a0104320c0997cd33e18b8ea798609d1'
-         'df6d2432d3ff03f72fa6744d6f1a7f34'
+md5sums=('a1da58ce63baef3812004714fa302c47'
+         'ca6bcd8641957df69c6c0bb4b93785aa'
          '5bbc0655bda2af95bc8eb568963ce8ba'
          'dc78d3d06baffc16217519242ce92478'
          '3bf51be3a1bbd262be46dc619f92aa90')
@@ -45,6 +45,7 @@ build() {
 	# set ca dir to /etc/ssl by default
 	patch -p0 -i $srcdir/ca-dir.patch
 	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
+	# workaround for PR#2771: OPENSSL_NO_TLS1_2_CLIENT
 	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
 		shared zlib enable-md2 ${optflags} \
 		"${openssltarget}" \
diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD
index 6ddf8ae6b..4a657bb99 100644
--- a/extra/eog-plugins/PKGBUILD
+++ b/extra/eog-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156744 2012-04-23 09:04:31Z ibiru $
+# $Id: PKGBUILD 157387 2012-04-28 09:26:19Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=eog-plugins
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugins for Eye of Gnome"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/"
diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD
index 679d874f1..0d6492879 100644
--- a/extra/eog/PKGBUILD
+++ b/extra/eog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156742 2012-04-23 09:04:28Z ibiru $
+# $Id: PKGBUILD 157385 2012-04-28 09:26:16Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=eog
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD
index 3fc10e827..b62092a0f 100644
--- a/extra/freenx/PKGBUILD
+++ b/extra/freenx/PKGBUILD
@@ -1,25 +1,39 @@
-# $Id: PKGBUILD 140055 2011-10-06 06:24:35Z tpowa $
+# $Id: PKGBUILD 157437 2012-04-28 09:58:42Z andyrtr $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 #Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> 
+
 pkgname=freenx
 pkgver=0.7.3
-pkgrel=10
+pkgrel=11
 pkgdesc="Free Software (GPL) Implementation of the NX Server"
 arch=(i686 x86_64)
 url="http://freenx.berlios.de"
 license=('GPL')
-depends=('nxserver' 'gnu-netcat' 'inetutils' 'openssh' 'expect' 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg')
-backup=(opt/NX/etc/node.conf)
+depends=('nx-common' 'nx-x11' 'nxagent' 'nxproxy' 'gnu-netcat' 'inetutils' 'openssh' 'expect' 'python'
+         'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg')
+optdepends=('cups: adds printing support')
+makedepends=('imake')
+options=('!makeflags')
+conflicts=('nxserver')
+provides=('nxserver')
+backup=(etc/nxserver/node.conf)
 install=freenx.install
 source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz
         keymap.patch
         nxagent-startup.patch
         freenx-latest-svn.patch
-        remove-dialog.patch)
+        remove-dialog.patch
+        freenx-server-0.7.3-nxipp.patch)
+md5sums=('856f597e139018f7ed62713c9d6c9ed5'
+         'f0867659c925f6363fb2b7661f349248'
+         '30dc16d8e2093ff71d5834a169ad9d00'
+         '788f30322783cf2c2dc833e2e4d5e8ad'
+         'cae1773312506eeefe6a8de07c492bd8'
+         'b3244c52a6bafc6d9b528eb4d4426e36')
 
 build() {
   # patch and install nxserver
-  cd $startdir/src/$pkgname-server-$pkgver
+  cd $srcdir/$pkgname-server-$pkgver
   # add latest svn fixes
   patch -Np3 -i ../freenx-latest-svn.patch
   # patch from inside nx
@@ -28,49 +42,54 @@ build() {
   patch -Np0 -i ${srcdir}/keymap.patch 
   # patch nxagent startup to avoid login issues
   patch -Np0 -i ${srcdir}/nxagent-startup.patch
+  # check for cups existance and then symlinks the backend
+  patch -Np1 -i ${srcdir}/freenx-server-0.7.3-nxipp.patch
   # remove broken dialog function
   patch -Np0 -i  ${srcdir}/remove-dialog.patch
   sed -i -e 's,authorized_keys2,authorized_keys,g' nxloadconfig
-  sed -i -e 's,/usr/NX,/opt/NX,g' nxloadconfig
+  sed -i -e 's,\/usr\/NX,\/usr\/lib/nx,g' nxloadconfig node.conf.sample
   sed -i -e 's,netcat,nc,g' nxloadconfig
   sed -i -e 's/utmp/nx/g' nxsetup
   sed -i -e 's,/usr/X11R6/bin/xauth,/usr/bin/xauth,g' nxloadconfig
   sed -i -e 's,COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile",COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile",g' nxloadconfig
-  sed -i -e 's,COMMAND_MD5SUM="openssl md5",COMMAND_MD5SUM="md5sum",g' nxloadconfig
+  sed -i -e 's,COMMAND_MD5SUM="openssl md5",COMMAND_MD5SUM="md5sum",g' nxloadconfig node.conf.sample
   sed -i -e 's|AGENT_EXTRA_OPTIONS_X=""|AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11/rgb -fp /usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 -xkbdir /usr/share/X11/xkb"|g' nxloadconfig
   sed -i -e 's/ENABLE_AUTORECONNECT_BEFORE_140="1"/ENABLE_AUTORECONNECT_BEFORE_140="0"/g' nxloadconfig
   sed -i -e 's,/etc/init.d/ssh,/etc/rc.d/sshd,g' nxsetup
   sed -i -e 's,libXcomp.so,libXcomp.so.3,g' nxloadconfig
   sed -i -e 's,libXcompext.so,libXcompext.so.3,g' nxloadconfig
   sed -i -e 's,libXrender.so.1.2,libXrender.so.1.2.2:$APPLICATION_LIBRARY_PATH/libXcompsh.so.3:$APPLICATION_LIBRARY_PATH/libXcompshad.so.3,g' nxloadconfig
+  sed -i -e 's:NX_ETC_DIR\=$NX_DIR\/etc:NX_ETC_DIR=\/etc\/nxserver:g' nxloadconfig
+  sed -i -e 's:NX_SESS_DIR=$NX_DIR\/var\/db:NX_SESS_DIR=\/var\/lib\/nxserver\/db:g' nxloadconfig
+  sed -i -e 's:NX_HOME_DIR=$NX_DIR:NX_HOME_DIR=\/var\/lib\/nxserver:g' nxloadconfig
+  sed -i -e 's:NOMACHINE_NX_HOME_DIR="/usr/lib/nx/home/nx":NOMACHINE_NX_HOME_DIR="/var/lib/nxserver/home/nx":g' nxloadconfig node.conf.sample
+  sed -i -e 's:\/usr\/NX:\/usr\/lib\/nx:g' nxdialog
+
   # fix key generation
   sed -i -e 's,AUTOMATIC="no",AUTOMATIC="yes",g' nxsetup
+
+  make
 }
 
 package() {
-  cd $startdir/src/$pkgname-server-$pkgver  
-  install -D -m755 nxnode $startdir/pkg/opt/NX/bin/nxnode
-  install -D -m755 nxserver $startdir/pkg/opt/NX/bin/nxserver
-  install -D -m755 nxsetup $startdir/pkg/opt/NX/bin/nxsetup
-  install -D -m755 nxkeygen $startdir/pkg/opt/NX/bin/nxkeygen
-  install -D -m755 nxnode-login $startdir/pkg/opt/NX/bin/nxnode-login
-  install -D -m755 nxloadconfig $startdir/pkg/opt/NX/bin/nxloadconfig
-  install -D -m755 nxdialog $startdir/pkg/opt/NX/bin/nxdialog
-  install -D -m755 nxviewer_helper $startdir/pkg/opt/NX/bin/nxviever_helper
-  install -D -m755 nxcups-gethost $startdir/pkg/opt/NX/bin/nxcups-gethost
-  install -D -m755 nxdesktop_helper $startdir/pkg/opt/NX/bin/nxdesktop_helper
-  # provided by nxclient!
-  #install -D -m755 nxprint $startdir/pkg/opt/NX/bin/nxprint
-  install -D -m755 node.conf.sample $startdir/pkg/opt/NX/etc/node.conf
-  # install nxhelper
-  cd nxserver-helper
-  make
-  install -D -m755 nxserver-helper $startdir/pkg/opt/NX/bin/nxserver-helper
-  # create nxserver homedir
-  mkdir -m700 -p $startdir/pkg/opt/NX/home/nx
+  cd $srcdir/$pkgname-server-$pkgver  
+
+  make install DESTDIR="${pkgdir}"
+
+  # create symlinks
+  install -dm755 ${pkgdir}/usr/bin
+  cd ${pkgdir}/usr/bin
+  for file in ${pkgdir}/usr/lib/nx/bin/*; do
+    ln -sv /usr/lib/nx/bin/`basename $file` .
+  done
+
+  mv $pkgdir/etc/nxserver/node.conf.sample $pkgdir/etc/nxserver/node.conf
+ 
+  # create some missing nxserver directories
+  mkdir -m700 -p $pkgdir/var/lib/nxserver/{home/nx,db}
+  mkdir -m700 -p $pkgdir/usr/lib/nx/share
+
+  # remove files that are part of nxclient
+  rm -f  ${pkgdir}/usr/lib/nx/bin/nxprint
+  rm -f  ${pkgdir}/usr/bin/nxprint
 }
-md5sums=('856f597e139018f7ed62713c9d6c9ed5'
-         'f0867659c925f6363fb2b7661f349248'
-         '30dc16d8e2093ff71d5834a169ad9d00'
-         '788f30322783cf2c2dc833e2e4d5e8ad'
-         'cae1773312506eeefe6a8de07c492bd8')
diff --git a/extra/freenx/freenx-server-0.7.3-nxipp.patch b/extra/freenx/freenx-server-0.7.3-nxipp.patch
new file mode 100644
index 000000000..81b286593
--- /dev/null
+++ b/extra/freenx/freenx-server-0.7.3-nxipp.patch
@@ -0,0 +1,17 @@
+diff -up freenx-server-0.7.3/nxsetup~ freenx-server-0.7.3/nxsetup
+--- freenx-server-0.7.3/nxsetup~	2011-12-30 23:04:53.515194711 +0200
++++ freenx-server-0.7.3/nxsetup	2011-12-30 23:05:55.499954085 +0200
+@@ -366,11 +366,10 @@ EOF
+ 
+ 	echo "done"
+ 
+-	if [ -d "$CUPS_BACKEND" ]
++	if [ -d "$CUPS_BACKEND" ] && [ ! -f "$CUPS_IPP_BACKEND" ]
+ 	then
+ 		echo -n "Setting up cups nxipp backend ..."
+-		cp -af "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND"
+-		chmod 755 "$CUPS_IPP_BACKEND"
++		ln -sf "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND"
+ 		echo "done"
+ 	fi
+ }
diff --git a/extra/freenx/freenx.install b/extra/freenx/freenx.install
index 93a28656f..0f3260166 100644
--- a/extra/freenx/freenx.install
+++ b/extra/freenx/freenx.install
@@ -1,27 +1,59 @@
-# arg 1:  the new package version
 post_install() {
-# setting up freenx
-echo 'Generating keys ...'
-/opt/NX/bin/nxsetup --install --uid 85 --gid 85  2>&1 >/dev/null
-/bin/cat <<THEEND
-ATTENTION FREENX:
-For correct setup please take a look at the wiki:
-http://wiki.archlinux.org/index.php/FreeNX
-THEEND
+  # Make sure the group and user "nx" exists on this system and have the correct values
+  if grep -q "^nx:" /etc/group &> /dev/null ; then
+    groupmod -g 85 -n nx nx &> /dev/null
+  else
+    groupadd -g 85 nx &> /dev/null
+  fi
+
+  if grep -q "^nx:" /etc/passwd 2> /dev/null ; then
+    usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null
+  else
+    useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null
+  fi 
+
+  # setting up freenx
+  echo 'Generating keys ...'
+  /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null
+
+  echo "ATTENTION FREENX:"
+  echo "For correct setup please take a look at the wiki:"
+  echo "http://wiki.archlinux.org/index.php/FreeNX"
 }
 
 post_upgrade() {
-# setting up freenx
-echo 'Rerunning nxsetup ...'
-/opt/NX/bin/nxsetup --install --uid 85 --gid 85 2>&1 >/dev/null
-/bin/cat <<THEEND
-ATTENTION FREENX:
-For correct setup please take a look at the wiki:
-http://wiki.archlinux.org/index.php/FreeNX
-THEEND
+  # Make sure the group and user "nx" exists on this system and have the correct values
+  if grep -q "^nx:" /etc/group &> /dev/null ; then
+    groupmod -g 85 -n nx nx &> /dev/null
+  else
+    groupadd -g 85 nx &> /dev/null
+  fi
+
+  if grep -q "^nx:" /etc/passwd 2> /dev/null ; then
+    usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null
+  else
+    useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null
+  fi
+
+  # setting up freenx
+  echo "Rerunning nxsetup ..."
+  /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null
+
+  if [ "`vercmp $2 0.7.3-10.1`" -lt 0 ]; then
+    # important upgrade notice
+    echo "*** config file location has been moved ***"
+    echo "Please apply your local settings from /opt/NX/etc/node.conf.pacsave"
+    echo "into /etc/nxserver/node.conf. A new key set is required."
+    echo "Please copy to your clients the new client key:"
+    echo "\"/var/lib/nxserver/home/nx/.ssh/client.id_dsa.key\""
+    echo "When you have FreeNX server running clean up with \"rm -rf /opt/NX\"."
+  fi
 }
+
 # arg 1:  the old package version
 pre_remove() {
-  /opt/NX/bin/nxsetup --uninstall --purge 2>&1 >/dev/null
-  usr/sbin/groupdel nx &>/dev/null
+  /usr/lib/nx/bin/nxsetup --uninstall --purge 2>&1 >/dev/null
+#  usr/sbin/groupdel nx &>/dev/null
+    userdel nx &> /dev/null
+    groupdel nx &> /dev/null || /bin/true
 }
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index f8703a3d1..c9d8cb147 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156780 2012-04-23 09:05:29Z ibiru $
+# $Id: PKGBUILD 157391 2012-04-28 09:26:29Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A text editor for GNOME"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD
index 7ba1b164a..bb434d3b6 100644
--- a/extra/gjs/PKGBUILD
+++ b/extra/gjs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156786 2012-04-23 09:05:36Z ibiru $
+# $Id: PKGBUILD 157393 2012-04-28 09:26:32Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gjs
 pkgver=1.32.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Javascript Bindings for GNOME"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/Gjs"
diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD
index 033fcd205..a58e9c848 100644
--- a/extra/gnome-documents/PKGBUILD
+++ b/extra/gnome-documents/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156816 2012-04-23 09:06:38Z ibiru $
+# $Id: PKGBUILD 157395 2012-04-28 09:26:35Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-documents
 pkgver=0.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Documents Manager for GNOME"
 arch=(i686 x86_64)
 url="http://www.gnome.org"
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 41154de40..4d806833d 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156849 2012-04-23 09:07:31Z ibiru $
+# $Id: PKGBUILD 157397 2012-04-28 09:26:38Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The next generation GNOME Shell"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeShell"
diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD
index e7dae31b5..972a8a99e 100644
--- a/extra/gobject-introspection/PKGBUILD
+++ b/extra/gobject-introspection/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156865 2012-04-23 09:07:51Z ibiru $
+# $Id: PKGBUILD 157399 2012-04-28 09:26:41Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gobject-introspection
 pkgver=1.32.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Introspection system for GObject-based libraries"
 url="http://live.gnome.org/GObjectInstrospection"
 arch=('x86_64' 'i686')
diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index 203c72616..dd4aeffea 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 151505 2012-02-26 21:44:47Z bisson $
+# $Id: PKGBUILD 157625 2012-04-29 02:08:46Z bisson $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Anton Leontiev <bunder@t-25.ru>
 
 pkgname=graphicsmagick
-pkgver=1.3.14
+pkgver=1.3.15
 pkgrel=1
 pkgdesc='Image processing system'
 url='http://www.graphicsmagick.org/'
@@ -16,7 +16,7 @@ depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz'
          'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
-sha1sums=('307fb59e60685721c365da4c2f593523743ca599')
+sha1sums=('d5df4000d5531fad3ede9e008f9c8dc2d085d546')
 
 build() {
 	cd "${srcdir}/GraphicsMagick-${pkgver}"
diff --git a/extra/gtk-xfce-engine/PKGBUILD b/extra/gtk-xfce-engine/PKGBUILD
index 221f7b68d..b57e5c801 100644
--- a/extra/gtk-xfce-engine/PKGBUILD
+++ b/extra/gtk-xfce-engine/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 154599 2012-03-30 12:26:06Z foutrelis $
+# $Id: PKGBUILD 157455 2012-04-28 15:51:09Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgbase=gtk-xfce-engine
 pkgname=('gtk2-xfce-engine' 'gtk3-xfce-engine')
-pkgver=2.99.2
+pkgver=3.0.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -12,8 +12,8 @@ license=('GPL2')
 groups=('xfce4')
 makedepends=('gtk2' 'gtk3')
 options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/$pkgbase/2.99/$pkgbase-$pkgver.tar.bz2)
-sha256sums=('81301df31b2bd8b345b40331fa9f1d5deeb6e3e18fa1a60cd23c0fa9b44de2ee')
+source=(http://archive.xfce.org/src/xfce/$pkgbase/3.0/$pkgbase-$pkgver.tar.bz2)
+sha256sums=('90e08fce8cce452656c4090f94afb7aa35a0a92597412f319526b7899d54838d')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/extra/ifplugd/PKGBUILD b/extra/ifplugd/PKGBUILD
index cc6cd83c1..cde1a503b 100644
--- a/extra/ifplugd/PKGBUILD
+++ b/extra/ifplugd/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 150402 2012-02-17 12:01:52Z allan $
+# $Id: PKGBUILD 157472 2012-04-28 18:54:17Z dreisner $
 # Contributor: Manolis Tzanidakis
 # Contributor: kevin <kevin@archlinux.org>
 # Maintainer: 
 
 pkgname=ifplugd
 pkgver=0.28
-pkgrel=8
+pkgrel=10
 pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal."
 arch=('i686' 'x86_64')
 url="http://0pointer.de/lennart/projects/ifplugd"
 license=('GPL2')
-depends=('libdaemon' 'bash')
+depends=('libdaemon' 'bash' 'net-tools')
 backup=('etc/ifplugd/ifplugd.conf' 'etc/ifplugd/ifplugd.action')
 options=('!makeflags')
 source=($url/${pkgname}-${pkgver}.tar.gz 'ifplugd' 'ifplugd.action' 'ifplugd-0.28-interface.patch' 'ifdown.01-route.sh' 'ifup.01-route.sh' 'ifup.02-ntpdate.sh')
-md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3' '70d66121ae5163348855236951e069a2'\
-         'e91a3d77d707ae79fbc10146848032dc' '54eb22844b5aeed161c0b80aa9008570'\
-	 'd6ce6c7bd481a0b3944c944c5b277c0b' 'c35f0a637911b747f8dc3bd3c6156a1b'\
-	 'f8690ee18a5ca72555585ee96826c2cf')
+md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3'
+         'ef27f40434ca85ccaf57a7e388eb001e'
+         '6f98767c4ea2cf0580f73ced81efd21a'
+         '54eb22844b5aeed161c0b80aa9008570'
+         'd6ce6c7bd481a0b3944c944c5b277c0b'
+         'c35f0a637911b747f8dc3bd3c6156a1b'
+         'f8690ee18a5ca72555585ee96826c2cf')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/ifplugd/ifplugd b/extra/ifplugd/ifplugd
index 44019d0ee..667fc1f53 100644
--- a/extra/ifplugd/ifplugd
+++ b/extra/ifplugd/ifplugd
@@ -5,47 +5,64 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
+shopt -s extglob
+
 # env vars
-NAME=ifplugd
-CFG=/etc/ifplugd/ifplugd.conf
-IFPLUGD=/usr/sbin/ifplugd
-PID=`pidof -o %PPID $IFPLUGD`
+daemonname=ifplugd
+cfg=/etc/ifplugd/ifplugd.conf
+PID=$(pidof -o %PPID ifplugd)
 
 # source configuration file
-[ -f $CFG ] && . $CFG
+[[ -r $cfg ]] && . "$cfg"
 
 # discover interfaces to monitor
-# (replacing INTERFACES with NET_IFS, since AL
+# (replacing INTERFACES with net_ifs, since AL
 # already uses it in /etc/rc.conf)
-[ -z "$NET_IFS" ] && 
-  NET_IFS=$(sed -ne 's/.*\<\(eth[0-9]*\):.*/\1/p' /proc/net/dev)
+if [[ -z $net_ifs ]]; then
+  net_ifs=(/sys/class/net/!(lo))
+  net_ifs=("${net_ifs[@]##*/}")
+fi
 
-case "$1" in
+case $1 in
   start)
-    stat_busy "Starting $NAME"
-    [ -z "$PID" ] && ( for IF in $NET_IFS ; do
-      A="`eval echo \$\{ARGS_${IF}\}`"
-      [ -z "$A" ] && A="$ARGS"
-      $IFPLUGD -i $IF $A
-      echo -n " $IF"
-    done )
-    if [ $? -gt 0 ]; then
+    stat_busy "Starting $daemonname: ${net_ifs[*]}"
+
+    for nic in "${net_ifs[@]}"; do
+      # only start if a PID doesn't already exist
+      if [[ ! -f /var/run/ifplugd.$nic.pid ]]; then
+        args=ARGS_$nic
+        [[ -z ${!args} ]] && args=$ARGS || args=${!args}
+        ifplugd -i "$nic" $args
+
+        # use presence of PID file to check for start success
+        [[ -f /var/run/ifplugd.$nic.pid ]] || (( ++err ))
+      fi
+    done
+    unset nic
+
+    if (( err )); then
       stat_fail
+      exit 1
     else
-      add_daemon $NAME
+      add_daemon $daemonname
       stat_done
     fi
     ;;
   stop)
-    stat_busy "Stopping $NAME"
-    [ ! -z "$PID" ] && ( for IF in $NET_IFS ; do
-      $IFPLUGD -k -i $IF
-      echo -n " $IF"
-    done )
-    if [ $? -gt 0 ]; then
+    stat_busy "Stopping $daemonname: ${net_ifs[*]}"
+
+    for nic in /var/run/ifplugd.*.pid; do
+      [[ -f $nic ]] || { (( ++err )); break; }
+      nic=${nic%.pid}
+      nic=${nic##*.}
+      ifplugd -k -i "$nic" || (( ++err ))
+    done
+
+    if (( err )); then
       stat_fail
+      exit 1
     else
-      rm_daemon $NAME
+      rm_daemon $daemonname
       stat_done
     fi
     ;;
@@ -55,35 +72,41 @@ case "$1" in
     $0 start
     ;;
   status)
-    for IF in $NET_IFS; do
-      $IFPLUGD -c -i $IF
+    for nic in "${net_ifs[@]}"; do
+      ifplugd -c -i "$nic"
     done
+    unset nic
     ;;
   suspend)
-    stat_busy "Suspending $NAME"
-    for IF in $NET_IFS; do
-      $IFPLUGD -S -i $IF
-      echo -n " $IF"
-    done 
-    if [ $? -gt 0 ]; then
+    stat_busy "Suspending $daemonname: ${net_ifs[*]}"
+    for nic in "${net_ifs[@]}"; do
+      ifplugd -S -i $nic || (( ++err ))
+    done
+    unset nic
+
+    if (( err )); then
       stat_fail
+      exit 1
     else
       stat_done
-    fi      
+    fi
     ;;
   resume)
-    stat_busy "Resuming $NAME"
-    for IF in $NET_IFS; do
-      $IFPLUGD -R -i $IF
-      echo -n " $IF"
+    stat_busy "Resuming $daemonname ${net_ifs[*]}"
+
+    for nic in "${net_ifs[@]}"; do
+      ifplugd -R -i $nic || (( ++err ))
     done
-    if [ $? -gt 0 ]; then
+    unset nic
+
+    if (( err )); then
       stat_fail
+      exit 1
     else
       stat_done
-    fi      
-    ;;  
+    fi
+    ;;
   *)
-    echo "usage: $0 {start|stop|restart|status|suspend|resume}"  
+    echo "usage: $0 {start|stop|restart|status|suspend|resume}"
 esac
 exit 0
diff --git a/extra/ifplugd/ifplugd.action b/extra/ifplugd/ifplugd.action
index 23b74c60d..07895bcad 100644
--- a/extra/ifplugd/ifplugd.action
+++ b/extra/ifplugd/ifplugd.action
@@ -1,28 +1,29 @@
-#!/bin/sh
+#!/bin/bash
 #
 # ifplugd.action script for Arch Linux
+#
 
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-plugscript(){ #argumets are ifup|ifdown, interface_name
+plugscript() { # arguments are ifup|ifdown, interface_name
   for script in /etc/ifplugd/$1.d/*.sh; do
-    [ -x $script ] && $script $2
+    [[ -x $script ]] && "$script" $2
   done
   return 0
 }
 
-case "$2" in
+case $2 in
   up)
-    /etc/rc.d/network ifup $1
-    plugscript ifup $1
+    /etc/rc.d/network ifup "$1"
+    plugscript ifup "$1"
   ;;
   down)
-    plugscript ifdown $1
+    plugscript ifdown "$1"
     /etc/rc.d/network ifdown $1
   ;;
   *)
-    echo "Wrong arguments" > /dev/stderr
+    echo "Wrong arguments" >&2
   ;;
 esac
 
diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD
index 6096bee43..9efc001dd 100644
--- a/extra/libgpod/PKGBUILD
+++ b/extra/libgpod/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 155743 2012-04-06 00:05:54Z tomegun $
+# $Id: PKGBUILD 157452 2012-04-28 13:14:16Z ibiru $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=libgpod
 pkgver=0.8.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A shared library to access the contents of an iPod"
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice')
 makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2')
-optdepends=('gtk-sharp-2: Mono bindings')
+optdepends=('gtk-sharp-2: Mono bindings'
+            'python2-gobject2: python bindings')
 url="http://www.gtkpod.org/libgpod/"
 source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
 options=('!libtool' '!emptydirs')
diff --git a/extra/libmp4v2/PKGBUILD b/extra/libmp4v2/PKGBUILD
index f6ad2056c..b01f571d0 100644
--- a/extra/libmp4v2/PKGBUILD
+++ b/extra/libmp4v2/PKGBUILD
@@ -1,32 +1,32 @@
-# $Id: PKGBUILD 157108 2012-04-23 23:49:53Z tomegun $
+# $Id: PKGBUILD 157441 2012-04-28 10:45:14Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libmp4v2
 pkgver=1.9.1
-pkgrel=3
+pkgrel=4
 pkgdesc="MPEG-4 library"
 arch=('i686' 'x86_64')
 license=('MPL')
 url="http://code.google.com/p/mp4v2/"
 depends=('gcc-libs')
 options=('!libtool')
-#source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2")
-source=("http://mp4v2.googlecode.com/files/mp4v2-trunk-r479.tar.bz2")
+source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2")
+#source=("http://mp4v2.googlecode.com/files/mp4v2-trunk-r479.tar.bz2")
 
 build() {
-#  cd ${srcdir}/mp4v2-${pkgver}
-  cd ${srcdir}/mp4v2-trunk-r479
+  cd ${srcdir}/mp4v2-${pkgver}
+#  cd ${srcdir}/mp4v2-trunk-r479
 
   ./configure --prefix=/usr
   make
 }
 
 package() {
-#  cd ${srcdir}/mp4v2-${pkgver}
-  cd ${srcdir}/mp4v2-trunk-r479
+  cd ${srcdir}/mp4v2-${pkgver}
+#  cd ${srcdir}/mp4v2-trunk-r479
   make DESTDIR=${pkgdir} install
   make DESTDIR=${pkgdir} install-man
 }
-md5sums=('9ffd774fa88ad993e28236551511850b')
+md5sums=('986701929ef15b03155ac4fb16444797')
diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD
index d9c52e4f8..fa2394ed0 100644
--- a/extra/libpeas/PKGBUILD
+++ b/extra/libpeas/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156912 2012-04-23 09:08:54Z ibiru $
+# $Id: PKGBUILD 157401 2012-04-28 09:26:44Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libpeas
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A GObject-based plugins engine"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 0dd4b3f3e..cac1e51e0 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156598 2012-04-21 13:33:33Z ibiru $
+# $Id: PKGBUILD 157451 2012-04-28 13:13:49Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
@@ -18,7 +18,7 @@ sha1sums=('3e461d9ede5fab3fb59be6a9f0cbc52121d536c4')
 
 build() {
   cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
+  PYTHON2=/usr/bin/python2 ./configure --prefix=/usr \
       --enable-python-binding \
       --with-libgeoip=system
   make
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index 634e997de..099dac6f4 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156168 2012-04-15 04:29:31Z heftig $
+# $Id: PKGBUILD 157403 2012-04-28 09:26:49Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -11,7 +11,7 @@
 
 pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
 pkgver=3.0
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -34,6 +34,11 @@ sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477'
 build() {
   cd "$srcdir/$pkgname-$pkgver.src"
 
+  # Build without -ftree-pre as a workaround for clang segfaulting on x86_64
+  # https://bugzilla.redhat.com/show_bug.cgi?id=791365
+  CFLAGS+=' -fno-tree-pre'
+  CXXFLAGS+=' -fno-tree-pre'
+
   # At the present, clang must reside inside the LLVM source code tree to build
   # See http://llvm.org/bugs/show_bug.cgi?id=4840
   rm -rf tools/clang
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index 5c88e297d..437ada2f5 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 156934 2012-04-23 09:09:23Z ibiru $
+# $Id: PKGBUILD 157405 2012-04-28 09:26:53Z allan $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD
index 6f7e14445..f5864f238 100644
--- a/extra/nx-common/PKGBUILD
+++ b/extra/nx-common/PKGBUILD
@@ -1,59 +1,51 @@
-# $Id: PKGBUILD 153969 2012-03-21 06:21:07Z pierre $
+# $Id: PKGBUILD 157435 2012-04-28 09:58:39Z andyrtr $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
 
 pkgname=nx-common
 pkgver=3.5.0
-pkgrel=4
+pkgrel=5
 pkgdesc="NoMachine NX common package for client and server"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://nomachine.com/"
-depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'bash')
-makedepends=('xorg-server-devel')
-source=( #Compression libs and proxy sources
-	http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz
-	http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
-	http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz
-	nxcompsh-gcc43.patch
-	nx-3.5.0-libpng15.patch)
-options=(!libtool)
-md5sums=('ad8c0f133122c6d07732ca69c8759410'
-         '84ade443b79ea079380b754aba9d392e'
+depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'libxcomp') # 'bash'
+makedepends=('xorg-server-devel' 'nx-headers')
+source=(http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
+        http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz
+        nxcompsh-gcc43.patch)
+options=('!libtool')
+md5sums=('84ade443b79ea079380b754aba9d392e'
          'f52fcdb38e09f8dcfb9ff0344dfbbbd6'
-         'b6c279654dac421fc3dd1a27d66ff53c'
-         '2966353cabb96829eab291212ef078dc')
+         'b6c279654dac421fc3dd1a27d66ff53c')
 
 build() {
-  # nxcomp
-  cd ${srcdir}/nxcomp
-  patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
-
-  ./configure --prefix=/opt/NX
-  make
   # nxcompsh
   cd ${srcdir}/nxcompsh
   patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
- 
-  ./configure --prefix=/opt/NX
+  ./configure --prefix=/usr/lib/nx
   make
+
   # nxssh
   cd ${srcdir}/nxssh
-  ./configure --prefix=/opt/NX
+  sed -i "s:NX.h:nx/NX.h:g" clientloop.c packet.c proxy.c
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib
   make
 }
 
 package() {
-  mkdir -p ${pkgdir}/opt/NX/bin
-  mkdir -p ${pkgdir}/opt/NX/lib 
+  install -dm755 ${pkgdir}/usr/{bin,lib/nx}
 
-  # nxcomp
-  cd ${srcdir}/nxcomp
-  cp -a libXcomp.so* ${pkgdir}/opt/NX/lib
   # nxcompsh
   cd ${srcdir}/nxcompsh
-  cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib
+  cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcompsh.so{,.3,.3.5.0} .
+  # ^ really needed?
+
   # nxssh
   cd ${srcdir}/nxssh
-  install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh
+  install -D -m755 nxssh ${pkgdir}/usr/lib/nx/bin/nxssh
+  cd ${pkgdir}/usr/bin
+  ln -sv /usr/lib/nx/bin/nxssh .
 }
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
new file mode 100644
index 000000000..664358563
--- /dev/null
+++ b/extra/nx/PKGBUILD
@@ -0,0 +1,116 @@
+# $Id: PKGBUILD 157433 2012-04-28 09:58:35Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
+pkgver=3.5.0.12
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://wiki.x2go.org/"
+license=('GPL')
+options=('!makeflags')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
+             'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
+             )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
+        nx-x11.ld.so.conf.d)
+md5sums=('a2011e034a318016cf2260c30a567301'
+         'f2ec60c7e2d81bef2f7292d2b33681a6')
+
+build() {
+  cd "${srcdir}/nx-libs_$pkgver"
+  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+  # fake install
+  mkdir $srcdir/fakeinstall
+  make DESTDIR="$srcdir/fakeinstall" install
+}
+
+package_libxcomp() {
+  
+  pkgdesc="NX X compression library"
+  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
+	
+  install -dm755 ${pkgdir}/usr/lib/nx/lib
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} .
+}
+
+package_nxproxy() {
+
+  pkgdesc="NX proxy"
+  depends=('libxcomp')
+  
+  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
+  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx/bin
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv /usr/lib/nx/bin/nxproxy .
+  
+  # the wrapper
+  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin
+  chmod +x ${pkgdir}/usr/bin/nxproxy
+  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1
+}
+
+package_nx-xcompext() {
+  
+  pkgdesc="Xcompext/Xcompshad library for NX"
+  depends=('libxcomp' 'nx-x11')
+	
+  install -dm755 ${pkgdir}/usr/lib/nx
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 ${pkgdir}/usr/lib/nx
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv libXcompext.so.3.5.0 libXcompext.so.3
+  ln -sv libXcompext.so.3.5.0 libXcompext.so
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
+}
+
+package_nx-x11() {
+ 
+  pkgdesc="NX-X11 lib for the NX framework"
+  depends=('libxcomp')
+	
+  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/bin}
+  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx
+
+  cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx/bin
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv /usr/lib/nx/bin/nxauth .
+  
+  # the wrapper
+  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin
+  chmod +x ${pkgdir}/usr/bin/nxauth
+  
+  install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf"
+}
+
+package_nxagent() {
+  
+  pkgdesc="NX X server based on Xnest"
+  depends=('nx-xcompext')
+	
+  install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin}
+  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx/bin
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv /usr/lib/nx/bin/nxagent .
+  
+  # the wrapper
+  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin
+  chmod +x ${pkgdir}/usr/bin/nxagent
+  # required nxcompshad libs
+  cp -a ${srcdir}/nx-libs_$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3
+  ln -sv libXcompshad.so.3.5.0 libXcompshad.so
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
+}
+
+package_nx-headers() {
+
+  pkgdesc="NX headers"
+  
+  install -dm755 ${pkgdir}/usr/include/nx
+  cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
+}  
diff --git a/extra/nx/nx-x11.ld.so.conf.d b/extra/nx/nx-x11.ld.so.conf.d
new file mode 100644
index 000000000..5d15cb6e2
--- /dev/null
+++ b/extra/nx/nx-x11.ld.so.conf.d
@@ -0,0 +1 @@
+/usr/lib/nx/
diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index 47ce4369e..fbfb18060 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146236 2012-01-06 17:00:30Z heftig $
+# $Id: PKGBUILD 157462 2012-04-28 17:12:24Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -8,7 +8,7 @@ pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse)
 pkgdesc="A featureful, general-purpose sound server"
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 arch=(i686 x86_64)
 url="http://pulseaudio.org/"
 license=(GPL LGPL)
@@ -41,7 +41,7 @@ build() {
 }
 
 package_pulseaudio() {
-  depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex tdb udev fftw orc
+  depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb udev fftw orc
            libsamplerate)
   optdepends=('avahi: zeroconf support'
               'bluez: bluetooth support'
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 43ed3a9b5..7ab25d12c 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156960 2012-04-23 09:10:04Z ibiru $
+# $Id: PKGBUILD 157407 2012-04-28 09:26:56Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=pygobject
 pkgname=(python-gobject python2-gobject pygobject-devel)
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="https://live.gnome.org/PyGObject"
 license=('LGPL')
diff --git a/extra/pygobject2/PKGBUILD b/extra/pygobject2/PKGBUILD
index aef58044c..85897fda7 100644
--- a/extra/pygobject2/PKGBUILD
+++ b/extra/pygobject2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139421 2011-10-01 19:01:05Z ibiru $
+# $Id: PKGBUILD 157409 2012-04-28 09:27:01Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://www.pygtk.org/"
 license=('LGPL')
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index ac7911bb3..f7b84f893 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 156459 2012-04-18 12:20:59Z stephane $
+# $Id: PKGBUILD 157411 2012-04-28 09:27:08Z allan $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=python
 pkgver=3.2.3
-pkgrel=1
+pkgrel=3
 _pybasever=3.2
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64')
diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD
index 2bdd0ace7..a5e0d0116 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148573 2012-02-03 20:15:23Z eric $
+# $Id: PKGBUILD 157415 2012-04-28 09:27:18Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=racket
 pkgver=5.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development"
 arch=('i686' 'x86_64')
 url="http://racket-lang.org/"
@@ -14,7 +14,7 @@ options=('!libtool' '!strip')
 install=racket.install
 source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \
         drracket.desktop)
-sha1sums=('a4ea408818236f8eaf937291dd641fd73a997793'
+sha1sums=('b51cdd8b9825edb60e5c2c80472cec8220918cd1'
           'a20808f6b250225704856f82a544681a962a299d')
 
 build() {
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index 1853ae971..5df25b236 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156962 2012-04-23 09:10:07Z ibiru $
+# $Id: PKGBUILD 157417 2012-04-28 09:27:22Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
 pkgver=2.96
-pkgrel=2
+pkgrel=3
 pkgdesc="An iTunes-like music playback and management application"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 7242aafe1..084545294 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=ruby
 pkgver=1.9.3_p194
-pkgrel=1
+pkgrel=2
 pkgdesc='An object-oriented language for quick and easy programming'
 arch=('i686' 'x86_64')
 url='http://www.ruby-lang.org/en/'
diff --git a/extra/seed/PKGBUILD b/extra/seed/PKGBUILD
index 8b437560a..9713fa013 100644
--- a/extra/seed/PKGBUILD
+++ b/extra/seed/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139429 2011-10-01 19:01:18Z ibiru $
+# $Id: PKGBUILD 157423 2012-04-28 09:27:33Z allan $
 #Maintainer : Ionut Biru <ibiru@archlinux.org>
 #Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=seed
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Library and interpreter for JavaScript with GObject type system bindings."
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/Seed/"
diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD
index de23127a0..5141cea76 100644
--- a/extra/squid/PKGBUILD
+++ b/extra/squid/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 151208 2012-02-25 07:43:33Z pierre $
+# $Id: PKGBUILD 157558 2012-04-29 00:21:17Z eric $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=squid
 pkgver=3.1.19
-pkgrel=1
+pkgrel=2
 pkgdesc="A full-featured Web proxy cache server."
 arch=('i686' 'x86_64')
 url="http://www.squid-cache.org"
-depends=('openssl' 'pam' 'cron' 'perl' 'libtool')
+depends=('openssl' 'pam' 'cron' 'perl' 'libltdl')
 makedepends=('libcap')
 license=('GPL')
 backup=('etc/squid/squid.conf' 'etc/squid/mime.conf' 'etc/conf.d/squid')
diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD
index 4c12fd746..c0a7e7b23 100644
--- a/extra/sushi/PKGBUILD
+++ b/extra/sushi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156968 2012-04-23 09:10:15Z ibiru $
+# $Id: PKGBUILD 157425 2012-04-28 09:27:36Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=sushi
 pkgver=0.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A quick previewer for Nautilus"
 arch=(i686 x86_64)
 url="http://www.gnome.org"
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index a1b0891b4..1f48c9214 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 156988 2012-04-23 09:10:41Z ibiru $
+# $Id: PKGBUILD 157429 2012-04-28 09:27:53Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
 url="http://www.gnome.org"
 arch=('i686' 'x86_64')
diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD
index 5b088ca76..916fc6075 100644
--- a/extra/tumbler/PKGBUILD
+++ b/extra/tumbler/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 154454 2012-03-28 18:48:51Z foutrelis $
+# $Id: PKGBUILD 157532 2012-04-28 22:21:55Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan Jezek <honzin.jezek@gmail.com>
 
 pkgname=tumbler
-pkgver=0.1.24
+pkgver=0.1.25
 pkgrel=1
 pkgdesc="D-Bus service for applications to request thumbnails"
 arch=('i686' 'x86_64')
@@ -22,7 +22,7 @@ optdepends=('ffmpegthumbnailer: for video thumbnails'
             'freetype2: for font thumbnails')
 options=('!libtool')
 source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2)
-sha256sums=('18fe74900851211cbd10eff4e9e487229284d1701aa60f0c3d35cdd457c72566')
+sha256sums=('02d5de508d8c18692a25a832a9280c2043f6b7c90dd3fcbd87f5955337015546')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-mount-plugin/PKGBUILD b/extra/xfce4-mount-plugin/PKGBUILD
index f0d684d2c..2a406f37f 100644
--- a/extra/xfce4-mount-plugin/PKGBUILD
+++ b/extra/xfce4-mount-plugin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157202 2012-04-25 17:31:31Z eric $
+# $Id: PKGBUILD 157457 2012-04-28 16:24:13Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-mount-plugin
-pkgver=0.6.2
+pkgver=0.6.3
 pkgrel=1
 pkgdesc="Plugin for the Xfce4 panel to mount and unmount volumes"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('intltool')
 options=('!libtool')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('dbbf8e29c50ec1cd9ba0fa65f7255ca0788a372e')
+sha1sums=('bbc031f8518dc873d3a3ef42b3e228eeb0c9bb86')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/multilib/lib32-util-linux/PKGBUILD b/multilib/lib32-util-linux/PKGBUILD
index ddddb6f6f..2a300690b 100644
--- a/multilib/lib32-util-linux/PKGBUILD
+++ b/multilib/lib32-util-linux/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 68069 2012-03-17 16:13:59Z lcarlier $
-# Maintainer: judd <jvinet@zeroflux.org>
+# $Id: PKGBUILD 70041 2012-04-28 16:26:51Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
 
 _pkgbasename=util-linux
 pkgname=lib32-$_pkgbasename
-pkgver=2.21
+pkgver=2.21.1
 pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux (32-bit)"
 url='http://www.kernel.org/pub/linux/utils/util-linux/'
@@ -16,12 +17,12 @@ replaces=('lib32-util-linux-ng')
 license=('GPL2')
 options=('!libtool' '!emptydirs')
 source=("ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.21/util-linux-$pkgver.tar.xz")
-md5sums=('208aa058f4117759d2939d1be7d662fc')
+md5sums=('ad602dcd528f340b1329cfa6200d8f80')
 
 shopt -s extglob
 
 build() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
+  cd "$_pkgbasename-$pkgver"
 
   export CC="gcc -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
@@ -35,9 +36,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  make DESTDIR="$pkgdir" install
+  make -C "$_pkgbasename-$pkgver" DESTDIR="$pkgdir" install
 
   # remove everything but libs
   rm -rf "$pkgdir"/!(usr) "$pkgdir"/usr/!(lib32)
diff --git a/testing/consolekit/PKGBUILD b/testing/consolekit/PKGBUILD
index 8576a741b..41fc67e92 100644
--- a/testing/consolekit/PKGBUILD
+++ b/testing/consolekit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 155918 2012-04-09 13:20:09Z tomegun $
+# $Id: PKGBUILD 157504 2012-04-28 21:40:59Z dreisner $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: onestep_ua <onestep@ukr.net>
 
 pkgname=consolekit
 pkgver=0.4.6
-pkgrel=1
+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"
@@ -12,7 +12,9 @@ license=('GPL')
 depends=('polkit' 'zlib' 'libx11' 'dbus-glib')
 makedepends=('pkgconfig' 'xmlto' 'docbook-xsl')
 options=(!libtool)
-source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-$pkgver.tar.bz2
+#source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-$pkgver.tar.bz2
+# this has not been released yet, so this is a snapshot
+source=(ftp://ftp.archlinux.org/other/${pkgname}/ConsoleKit-${pkgver}.tar.bz2
         pam-foreground-compat.ck consolekit.logrotate consolekit.tmpfiles.conf)
 
 build() {
@@ -23,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/testing/exo/PKGBUILD b/testing/exo/PKGBUILD
new file mode 100644
index 000000000..7fd77ab6e
--- /dev/null
+++ b/testing/exo/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 157629 2012-04-29 02:53:26Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+# Contributor: Aurelien Foret <orelien@chez.com>
+
+pkgname=exo
+pkgver=0.8.0
+pkgrel=1
+pkgdesc="Extensions to Xfce by os-cillation"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/projects/exo"
+license=('GPL2' 'LGPL')
+groups=('xfce4')
+depends=('libxfce4ui' 'gtk2' 'hicolor-icon-theme' )
+makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth')
+optdepends=('perl-uri: for mail-compose helper script')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/0.8/$pkgname-$pkgver.tar.bz2)
+sha256sums=('6e21aa30692affcb45fc8283d034da4a02221d26e3e1facb968d04fed4ba05b0')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Python 2 fix
+  export PYTHON=python2
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --localstatedir=/var  \
+    --disable-static \
+    --enable-gtk-doc \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/exo/exo.install b/testing/exo/exo.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/testing/exo/exo.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/fprintd/PKGBUILD b/testing/fprintd/PKGBUILD
new file mode 100644
index 000000000..fdeddae5b
--- /dev/null
+++ b/testing/fprintd/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 157506 2012-04-28 21:41:01Z dreisner $
+# Maintainer:
+# Contributor: Nikolay Rysev <mad.f3ka@gmail.com>
+
+pkgname=fprintd
+pkgver=0.4.1
+pkgrel=4
+pkgdesc="D-Bus service to access fingerprint readers"
+arch=(i686 x86_64)
+url="http://www.freedesktop.org/wiki/Software/fprint/fprintd"
+license=(GPL)
+depends=(libfprint dbus-glib polkit)
+makedepends=(intltool gtk-doc)
+groups=(fprint)
+options=(!libtool)
+_snap=V_${pkgver//./_}
+source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2)
+md5sums=('58fcac035c181dce8f49c374181aa2ae')
+
+build() {
+  cd "$srcdir/$_snap"
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+    --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$_snap"
+  make DESTDIR="$pkgdir" pammoddir="/usr/lib/security" install
+}
diff --git a/testing/garcon/PKGBUILD b/testing/garcon/PKGBUILD
new file mode 100644
index 000000000..d841bcb28
--- /dev/null
+++ b/testing/garcon/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 157631 2012-04-29 02:53:28Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
+
+pkgname=garcon
+pkgver=0.2.0
+pkgrel=1
+pkgdesc="Implementation of the freedesktop.org menu specification"
+arch=('i686' 'x86_64')
+url="http://wiki.xfce.org/dev/garcon"
+license=('LGPL')
+groups=('xfce4')
+depends=('glib2' 'libxfce4util')
+makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools')
+replaces=('libxfce4menu')
+options=('!libtool' '!makeflags')
+source=(http://archive.xfce.org/src/xfce/garcon/0.2/garcon-$pkgver.tar.bz2)
+sha256sums=('02dea3edb9c0039eca4748e964c61b0e1cc10f2d7f9ce0c837287ac5fa9ef76c')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-keyring/PKGBUILD b/testing/gnome-keyring/PKGBUILD
index ae13fa741..adc16a27e 100644
--- a/testing/gnome-keyring/PKGBUILD
+++ b/testing/gnome-keyring/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 156239 2012-04-16 13:00:46Z jgc $
+#$Id: PKGBUILD 157508 2012-04-28 21:41:03Z dreisner $
 # 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/testing/libcap/PKGBUILD b/testing/libcap/PKGBUILD
new file mode 100644
index 000000000..8c99b8d7f
--- /dev/null
+++ b/testing/libcap/PKGBUILD
@@ -0,0 +1,31 @@
+#$Id: PKGBUILD 157510 2012-04-28 21:41:05Z dreisner $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+
+pkgname=libcap
+pkgver=2.22
+pkgrel=3
+pkgdesc="POSIX 1003.1e capabilities"
+arch=('i686' 'x86_64')
+url="http://sites.google.com/site/fullycapable/"
+license=('GPL2')
+depends=('glibc' 'attr')
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
+md5sums=('b4896816b626bea445f0b3849bdd4077'
+         '9d0983e25e5a251d098507f9561d2b27')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make prefix=/usr DESTDIR=${pkgdir} RAISE_SETFCAP=no install
+  
+  chmod 755 ${pkgdir}/usr/lib/libcap.so.${pkgver}
+  rm ${pkgdir}/usr/lib/libcap.a
+  
+  install -Dm644 pam_cap/capability.conf \
+    $pkgdir/usr/share/doc/$pkgname/capability.conf.example
+}
diff --git a/testing/libxfce4ui/PKGBUILD b/testing/libxfce4ui/PKGBUILD
new file mode 100644
index 000000000..a34407e6f
--- /dev/null
+++ b/testing/libxfce4ui/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 157633 2012-04-29 02:53:32Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
+
+pkgname=libxfce4ui
+pkgver=4.10.0
+pkgrel=1
+pkgdesc="Commonly used Xfce widgets among Xfce applications"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+depends=('libxfce4util' 'gtk2' 'xfconf' 'libsm' 'startup-notification'
+         'hicolor-icon-theme')
+makedepends=('intltool' 'gtk-doc')
+#replaces=('libxfcegui4') - later when all is ported
+options=('!libtool')
+install=libxfce4ui.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('a2b9fa288ccb5f16fa13264e507ba3f7b8da0176da259a11239f21538c0ea3e2')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-gtk-doc \
+    --disable-debug \
+    --with-vendor-info='Arch Linux'
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/libxfce4ui/libxfce4ui.install b/testing/libxfce4ui/libxfce4ui.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/testing/libxfce4ui/libxfce4ui.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/libxfce4util/PKGBUILD b/testing/libxfce4util/PKGBUILD
new file mode 100644
index 000000000..7af325862
--- /dev/null
+++ b/testing/libxfce4util/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 157635 2012-04-29 02:53:34Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=libxfce4util
+pkgver=4.10.0
+pkgrel=1
+pkgdesc="Basic utility non-GUI functions for Xfce"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+depends=('glib2')
+makedepends=('pkgconfig' 'intltool' 'gtk-doc')
+options=('!libtool')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('0979fee12880bb5f011ab38d6c7cc9afe5fd68eb96ccda895cb56dbc16e7608e')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-gtk-doc \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/libxfcegui4/PKGBUILD b/testing/libxfcegui4/PKGBUILD
new file mode 100644
index 000000000..f8044928f
--- /dev/null
+++ b/testing/libxfcegui4/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 157637 2012-04-29 02:53:36Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
+
+pkgname=libxfcegui4
+pkgver=4.10.0
+pkgrel=1
+pkgdesc="Various Gtk widgets for Xfce"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+depends=('startup-notification' 'xfconf' 'libglade' 'libsm'
+         'hicolor-icon-theme')
+makedepends=('intltool')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('2b82f9979175d8856880c8f349e6eede491ca92fe6940c69c8958115418d4533')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/libxfcegui4/libxfcegui4.install b/testing/libxfcegui4/libxfcegui4.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/testing/libxfcegui4/libxfcegui4.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/lirc/PKGBUILD b/testing/lirc/PKGBUILD
index d38889651..65fe28ef0 100644
--- a/testing/lirc/PKGBUILD
+++ b/testing/lirc/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 153760 2012-03-19 15:45:10Z tpowa $
+# $Id: PKGBUILD 157376 2012-04-28 07:35:03Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=13
+pkgrel=16
 epoch=1
 _extramodules=extramodules-3.3-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
 arch=('i686' 'x86_64')
 url="http://www.lirc.org/"
 license=('GPL')
+### NOTICE don't forget to bump version in depends in package_lirc
 makedepends=('help2man' 'linux-headers>=3.3' 'linux-headers<3.4' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
@@ -32,6 +32,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086'
          '69d099e6deedfa3c1ee2b6e82d9b8bfb')
 
 build() {
+  _kernver="$(cat /lib/modules/${_extramodules}/version)"
   cd "${srcdir}/lirc-${pkgver}"
   patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
   patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
@@ -61,7 +62,7 @@ build() {
 
 package_lirc() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'linux>=3.2' 'linux<3.3')
+  depends=('lirc-utils' 'linux>=3.3' 'linux<3.4')
   replaces=('lirc+pctv')
   install=lirc.install
 
diff --git a/testing/orage/PKGBUILD b/testing/orage/PKGBUILD
new file mode 100644
index 000000000..49d5efdf1
--- /dev/null
+++ b/testing/orage/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 157639 2012-04-29 02:53:38Z foutrelis $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=orage
+pkgver=4.8.3
+pkgrel=2
+pkgdesc="A simple calendar application with reminders for Xfce"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.xfce.org/projects/orage/"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libical' 'popt' 'libnotify>=0.7.1' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('intltool' 'xfce4-dev-tools' 'popt')
+options=('!libtool')
+replaces=('xfcalendar')
+install=${pkgname}.install
+source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('f4f89ea1f301514c419e7643661b510132ebb012')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--enable-libical \
+	--disable-static \
+	--disable-debug 
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -j1 DESTDIR="${pkgdir}" install
+}
diff --git a/testing/orage/orage.install b/testing/orage/orage.install
new file mode 100644
index 000000000..bce670aff
--- /dev/null
+++ b/testing/orage/orage.install
@@ -0,0 +1,12 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/testing/pam/PKGBUILD b/testing/pam/PKGBUILD
new file mode 100644
index 000000000..8e8ca8491
--- /dev/null
+++ b/testing/pam/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id: PKGBUILD 157512 2012-04-28 21:41:09Z dreisner $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=pam
+pkgver=1.1.5
+pkgrel=3
+pkgdesc="PAM (Pluggable Authentication Modules) library"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.kernel.org/pub/linux/libs/pam/"
+depends=('glibc' 'db' 'cracklib' 'libtirpc')
+makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
+backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment)
+source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
+        #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
+        ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2
+        other)
+options=('!libtool' '!emptydirs')
+md5sums=('927ee5585bdec5256c75117e9348aa47'
+         'e2788389a6c59224110a45fcff30e02b'
+         '6e6c8719e5989d976a14610f340bd33a')
+
+build() {
+  cd $srcdir/Linux-PAM-$pkgver
+  ./configure --libdir=/usr/lib
+  make
+
+  cd $srcdir/pam_unix2-2.6
+  ./configure --libdir=/usr/lib
+  make
+}
+
+package() {
+  cd $srcdir/Linux-PAM-$pkgver
+  make DESTDIR=$pkgdir install
+  install -D -m644 ../other $pkgdir/etc/pam.d/other
+
+  # build pam_unix2 module
+  # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
+  cd $srcdir/pam_unix2-2.6
+  make DESTDIR=$pkgdir install
+
+  # add the realtime permissions for audio users
+  sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf
+  cat >>$pkgdir/etc/security/limits.conf <<_EOT
+*               -       rtprio          0
+*               -       nice            0
+@audio          -       rtprio          65
+@audio          -       nice           -10
+@audio          -       memlock         40000
+_EOT
+
+  # fix some missing symlinks from old pam for compatibility
+  cd $pkgdir/usr/lib/security
+  ln -s pam_unix.so pam_unix_acct.so
+  ln -s pam_unix.so pam_unix_auth.so
+  ln -s pam_unix.so pam_unix_passwd.so
+  ln -s pam_unix.so pam_unix_session.so
+
+  # set unix_chkpwd uid
+  chmod +s $pkgdir/sbin/unix_chkpwd
+}
+md5sums=('927ee5585bdec5256c75117e9348aa47'
+         'e2788389a6c59224110a45fcff30e02b'
+         '6e6c8719e5989d976a14610f340bd33a')
diff --git a/testing/pam/other b/testing/pam/other
new file mode 100644
index 000000000..08498b423
--- /dev/null
+++ b/testing/pam/other
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth		required	pam_unix.so
+account		required	pam_unix.so
+password	required	pam_unix.so
+session		required	pam_unix.so
diff --git a/testing/pam/pam.install b/testing/pam/pam.install
new file mode 100644
index 000000000..9d4588084
--- /dev/null
+++ b/testing/pam/pam.install
@@ -0,0 +1,12 @@
+# arg 1:  the new package version
+post_install() {
+  # need to run this immediately -- pacman only runs it at the end of
+  # all package installs
+  /sbin/ldconfig -r .
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install $1
+}
diff --git a/testing/pam_ldap/PKGBUILD b/testing/pam_ldap/PKGBUILD
new file mode 100644
index 000000000..c74c181cb
--- /dev/null
+++ b/testing/pam_ldap/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 157514 2012-04-28 21:41:11Z dreisner $
+# Maintainer:
+# Contributor: Comete <la_comete@tiscali.fr>
+
+pkgname=pam_ldap
+pkgver=186
+pkgrel=3
+pkgdesc="LDAP authentication module for the PAM framework"
+arch=('i686' 'x86_64')
+url="http://www.padl.com/OSS/pam_ldap.html"
+license=('LGPL')
+depends=('libldap' 'pam')
+backup=('etc/pam_ldap.conf')
+options=('!makeflags')
+source=("http://www.padl.com/download/${pkgname}-${pkgver}.tar.gz")
+md5sums=('58c8689921c5c4578363438acd8503c2')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --libdir=/lib \
+      --with-ldap-conf-file=/etc/pam_ldap.conf \
+      --mandir=/usr/share/man
+  PATH="${PATH}:${srcdir}/${pkgname}-${pkgver}" make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  mv "${pkgdir}/etc/ldap.conf" "${pkgdir}/etc/pam_ldap.conf"
+
+  # move /lib to /usr/lib
+  mv "${pkgdir}/lib/security" "${pkgdir}/usr/lib"
+  rmdir "${pkgdir}/lib"
+}
diff --git a/testing/samba/PKGBUILD b/testing/samba/PKGBUILD
index 749414a95..55c1b7916 100644
--- a/testing/samba/PKGBUILD
+++ b/testing/samba/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157197 2012-04-25 14:01:40Z tpowa $
+# $Id: PKGBUILD 157516 2012-04-28 21:41:15Z dreisner $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
@@ -8,7 +8,7 @@ pkgver=3.6.4
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.6.4
-pkgrel=2
+pkgrel=3
 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 \
diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD
index 58ed7a3c5..2655255a1 100644
--- a/testing/systemd/PKGBUILD
+++ b/testing/systemd/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 155508 2012-04-04 13:26:44Z dreisner $
+# $Id: PKGBUILD 157518 2012-04-28 21:41:17Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd')
 pkgver=44
-pkgrel=5
+pkgrel=6
 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
 }
diff --git a/testing/terminal/PKGBUILD b/testing/terminal/PKGBUILD
new file mode 100644
index 000000000..5977a9227
--- /dev/null
+++ b/testing/terminal/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 157641 2012-04-29 02:53:40Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+# Contributor: Aurelien Foret <orelien@chez.com>
+
+pkgname=terminal
+pkgver=0.4.8
+pkgrel=2
+pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/projects/terminal/"
+license=('GPL2')
+groups=('xfce4')
+depends=('exo' 'vte' 'dbus-glib' 'startup-notification' 'hicolor-icon-theme')
+makedepends=('pkgconfig' 'intltool')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/apps/$pkgname/0.4/Terminal-$pkgver.tar.bz2)
+sha256sums=('fe5db0b7127ce87efa1e10f44d8915be88005b6ce4f0bfea6b64533e25cc788d')
+
+build() {
+  cd "$srcdir/Terminal-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/Terminal-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/terminal/terminal.install b/testing/terminal/terminal.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/testing/terminal/terminal.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/thinkfinger/PKGBUILD b/testing/thinkfinger/PKGBUILD
new file mode 100644
index 000000000..7aae89b5d
--- /dev/null
+++ b/testing/thinkfinger/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 157520 2012-04-28 21:41:20Z dreisner $
+# 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=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')
+license=("GPL")
+depends=('pam' 'libusb-compat')
+install=thinkfinger.install
+options=('!libtool' 'emptydirs')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+        'thinkfinger-uinput-hack.patch'
+        'gcc46.patch')
+md5sums=('588565233bcbea5ff0a7f5314361c380'
+         '71dc334282d19e6db4f6254542ba563c'
+         '93c80f342329a5bd40f5f324fe670225')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # Patch from Ubuntu: see http://bugs.archlinux.org/task/12580
+  patch -p0 -i "${srcdir}"/thinkfinger-uinput-hack.patch
+
+  patch -p1 -i "${srcdir}"/gcc46.patch
+
+  ./configure --prefix=/usr \
+		--with-birdir=/etc/pam_thinkfinger
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # create dir to store fingerprints
+  install -d $pkgdir/etc/pam_thinkfinger
+  
+  make DESTDIR=$pkgdir install
+}
diff --git a/testing/thinkfinger/gcc46.patch b/testing/thinkfinger/gcc46.patch
new file mode 100644
index 000000000..24e4b534f
--- /dev/null
+++ b/testing/thinkfinger/gcc46.patch
@@ -0,0 +1,22 @@
+--- a/pam/Makefile.am
++++ b/pam/Makefile.am
+@@ -8,7 +8,7 @@ pam_thinkfinger_so_SOURCES = pam_thinkfinger-compat.c pam_thinkfinger-compat.h p
+ else
+ pam_thinkfinger_so_SOURCES = pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
+ endif
+-pam_thinkfinger_so_LDFLAGS = -shared --strip-all -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
++pam_thinkfinger_so_LDFLAGS = -shared -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
+ pam_thinkfinger_so_CFLAGS = $(CFLAGS)
+ pam_thinkfinger_so_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la $(PAM_LIBS) $(PTHREAD_LIBS)
+ 
+--- a/pam/Makefile.in
++++ b/pam/Makefile.in
+@@ -201,7 +201,7 @@ pamdir = $(SECUREDIR)
+ INCLUDES = -I$(top_srcdir)/libthinkfinger
+ @HAVE_OLD_PAM_FALSE@pam_thinkfinger_so_SOURCES = pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
+ @HAVE_OLD_PAM_TRUE@pam_thinkfinger_so_SOURCES = pam_thinkfinger-compat.c pam_thinkfinger-compat.h pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
+-pam_thinkfinger_so_LDFLAGS = -shared --strip-all -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
++pam_thinkfinger_so_LDFLAGS = -shared -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
+ pam_thinkfinger_so_CFLAGS = $(CFLAGS)
+ pam_thinkfinger_so_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la $(PAM_LIBS) $(PTHREAD_LIBS)
+ all: all-am
diff --git a/testing/thinkfinger/thinkfinger-uinput-hack.patch b/testing/thinkfinger/thinkfinger-uinput-hack.patch
new file mode 100644
index 000000000..0ac153464
--- /dev/null
+++ b/testing/thinkfinger/thinkfinger-uinput-hack.patch
@@ -0,0 +1,13 @@
+#Source: http://launchpadlibrarian.net/18515541/thinkfinger-uinput-hack.patch (26-12-2008)
+Index: pam/pam_thinkfinger-uinput.c
+===================================================================
+--- pam/pam_thinkfinger-uinput.c	(revision 118)
++++ pam/pam_thinkfinger-uinput.c	(working copy)
+@@ -95,6 +95,7 @@
+ 	/* our single key keyboard */
+ 	i  = ioctl (*fd, UI_SET_EVBIT, EV_KEY) < 0;
+ 	i |= ioctl (*fd, UI_SET_KEYBIT, KEY_ENTER) < 0;
++	i |= ioctl (*fd, UI_SET_KEYBIT, KEY_A) < 0;
+ 
+ 	if (write (*fd, &device, device_size) != device_size) {
+ 		retval = errno;
diff --git a/testing/thinkfinger/thinkfinger.install b/testing/thinkfinger/thinkfinger.install
new file mode 100644
index 000000000..bb1f6dde0
--- /dev/null
+++ b/testing/thinkfinger/thinkfinger.install
@@ -0,0 +1,4 @@
+post_install() {
+  echo "==> To use thinkfinger, add 'uinput' to the MODULES=() in /etc/rc.conf."
+  echo "    More Infos: http://wiki.archlinux.org/index.php/Thinkfinger"
+}
diff --git a/testing/thunar-media-tags-plugin/PKGBUILD b/testing/thunar-media-tags-plugin/PKGBUILD
new file mode 100644
index 000000000..3af494411
--- /dev/null
+++ b/testing/thunar-media-tags-plugin/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 157645 2012-04-29 02:53:43Z foutrelis $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
+
+pkgname=thunar-media-tags-plugin
+pkgver=0.2.0
+pkgrel=2
+pkgdesc="Adds special features for media files to the Thunar File Manager"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin"
+groups=('xfce4-goodies')
+depends=('taglib' 'thunar')
+makedepends=('intltool')
+options=('!libtool')
+source=(http://archive.xfce.org/src/thunar-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('1111b4dae10156ab91adb4eadb26586593b1b023')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib/xfce4 \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/thunar-volman/PKGBUILD b/testing/thunar-volman/PKGBUILD
new file mode 100644
index 000000000..325e964f9
--- /dev/null
+++ b/testing/thunar-volman/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 157647 2012-04-29 02:53:47Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=thunar-volman
+pkgver=0.8.0
+pkgrel=1
+pkgdesc="Automatic management of removeable devices in Thunar"
+arch=('i686' 'x86_64')
+url="http://foo-projects.org/~benny/projects/thunar-volman"
+license=('GPL2')
+groups=('xfce4')
+depends=('thunar' 'libxfce4ui' 'hicolor-icon-theme')
+makedepends=('intltool')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/apps/$pkgname/0.8/$pkgname-$pkgver.tar.bz2)
+sha256sums=('ff0887c862b578580d05f4cd7db66081382ff143f9cc7ea3c9ba58cf5d02bceb')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/thunar-volman/thunar-volman.install b/testing/thunar-volman/thunar-volman.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/testing/thunar-volman/thunar-volman.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/thunar/PKGBUILD b/testing/thunar/PKGBUILD
new file mode 100644
index 000000000..b4d208493
--- /dev/null
+++ b/testing/thunar/PKGBUILD
@@ -0,0 +1,57 @@
+# $Id: PKGBUILD 157643 2012-04-29 02:53:42Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
+
+pkgname=thunar
+pkgver=1.4.0
+pkgrel=1
+pkgdesc="Modern file manager for Xfce"
+arch=('i686' 'x86_64')
+url="http://thunar.xfce.org"
+license=('GPL2' 'LGPL2.1')
+groups=('xfce4')
+depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify' 'udev'
+         'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
+makedepends=('intltool' 'gtk-doc' 'xfce4-panel')
+optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
+            'polkit-gnome: for mounting internal partitions (needs root password)'
+            'xfce4-panel: for trash applet'
+            'tumbler: for thumbnail previews'
+            'thunar-volman: manages removable devices'
+            'thunar-archive-plugin: create and deflate archives'
+            'thunar-media-tags-plugin: view/edit id3/ogg tags')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2)
+sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba')
+
+build() {
+  cd "$srcdir/Thunar-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-gio-unix \
+    --enable-dbus \
+    --enable-startup-notification \
+    --enable-gudev \
+    --enable-notifications \
+    --enable-exif \
+    --enable-pcre \
+    --enable-gtk-doc \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/Thunar-$pkgver"
+
+  make DESTDIR=${pkgdir} install
+  sed -i 's:x-directory/gnome-default-handler;::' \
+    "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/thunar/thunar.install b/testing/thunar/thunar.install
new file mode 100644
index 000000000..87c29e4db
--- /dev/null
+++ b/testing/thunar/thunar.install
@@ -0,0 +1,14 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfburn/PKGBUILD b/testing/xfburn/PKGBUILD
new file mode 100755
index 000000000..b46a5987e
--- /dev/null
+++ b/testing/xfburn/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 157649 2012-04-29 02:53:52Z foutrelis $
+# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
+# Contributor: Alois Nespor alois.nespor@gmail.com
+
+pkgname=xfburn
+pkgver=0.4.3
+pkgrel=6
+arch=('i686' 'x86_64')
+pkgdesc="A simple CD/DVD burning tool based on libburnia libraries"
+url="http://goodies.xfce.org/projects/applications/xfburn"
+license=('GPL2')
+groups=('xfce4-goodies')
+install=${pkgname}.install
+depends=('libburn' 'libisofs' 'libxfcegui4' 'exo' 'gstreamer0.10-base'
+         'hicolor-icon-theme' 'desktop-file-utils' 'librsvg')
+makedepends=('intltool')
+source=(http://archive.xfce.org/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2
+        fix_empty_dir_segfault.diff)
+sha1sums=('52d33e56b7ce9774fba680f50723eaf1a7215091'
+          'e374dd4942a49b52166fa9f2aa40e9aefb3aa3ec')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # fix https://bugs.archlinux.org/task/26121
+  patch -Np0 -i "$srcdir/fix_empty_dir_segfault.diff"
+
+  # fix build issue
+  sed -i '1 i\
+    #include <glib-object.h>' \
+    xfburn/xfburn-settings.h
+
+  ./configure \
+    --prefix=/usr \
+    --enable-gstreamer \
+    --enable-dbus \
+    --disable-hal
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfburn/fix_empty_dir_segfault.diff b/testing/xfburn/fix_empty_dir_segfault.diff
new file mode 100644
index 000000000..af3fe07c8
--- /dev/null
+++ b/testing/xfburn/fix_empty_dir_segfault.diff
@@ -0,0 +1,48 @@
+--- xfburn/xfburn-data-composition.c	2011-02-17 16:37:03.000000000 +0100
++++ xfburn/xfburn-data-composition_patched.c	2011-02-17 16:40:40.000000000 +0100
+@@ -1874,26 +1874,29 @@
+           g_error ("Failed adding %s as a node to the image: code %X!", src, r);
+       }
+ 
+-      basename = g_path_get_basename (src);
++      /* Check names only for items not manually created (#613563) */
++      if (type != DATA_COMPOSITION_TYPE_DIRECTORY || src != NULL) {
++        basename = g_path_get_basename (src);
++
++        /* check if the file has been renamed */
++        if (strcmp (basename, name) != 0) {
++          /* rename the iso_node */
++          r = iso_node_set_name (node, name);
++
++          if (r == 0) {
++            /* The first string is the renamed name, the second one the original name */
++            xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src);
++
++            g_free (basename);
++            g_free (name);
++            g_free (src);
+ 
+-      /* check if the file has been renamed */
+-      if (strcmp (basename, name) != 0) {
+-        /* rename the iso_node */
+-        r = iso_node_set_name (node, name);
+-
+-        if (r == 0) {
+-          /* The first string is the renamed name, the second one the original name */
+-          xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src);
+-
+-          g_free (basename);
+-          g_free (name);
+-          g_free (src);
+-
+-          continue;
++            continue;
++          }
+         }
++        g_free (basename);
+       }
+ 
+-      g_free (basename);
+       g_free (name);
+       g_free (src);
+
diff --git a/testing/xfburn/xfburn.install b/testing/xfburn/xfburn.install
new file mode 100644
index 000000000..9bbbab888
--- /dev/null
+++ b/testing/xfburn/xfburn.install
@@ -0,0 +1,14 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-appfinder/PKGBUILD b/testing/xfce4-appfinder/PKGBUILD
new file mode 100644
index 000000000..a08a24374
--- /dev/null
+++ b/testing/xfce4-appfinder/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 157651 2012-04-29 02:53:55Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: AndyRTR <andyrtr@archlinux.org>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfce4-appfinder
+pkgver=4.10.0
+pkgrel=1
+pkgdesc="An application finder for Xfce"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/projects/xfce4-appfinder"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'garcon' 'hicolor-icon-theme')
+makedepends=('intltool')
+replaces=('xfce-utils')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('042aae7e366428a6a92b6353b3f2727d64823076a7752b8e0a15f1f8f3645439')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-appfinder/xfce4-appfinder.install b/testing/xfce4-appfinder/xfce4-appfinder.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/testing/xfce4-appfinder/xfce4-appfinder.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-battery-plugin/PKGBUILD b/testing/xfce4-battery-plugin/PKGBUILD
new file mode 100644
index 000000000..1ecb47585
--- /dev/null
+++ b/testing/xfce4-battery-plugin/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 157653 2012-04-29 02:53:58Z foutrelis $
+# Maintainer: aurelien <aurelien@archlinux.org>
+# Contributor: Aurelien Foret <orelien@chez.com>
+
+pkgname=xfce4-battery-plugin
+pkgver=1.0.1
+pkgrel=2
+pkgdesc="A battery monitor plugin for the Xfce panel"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://xfce-goodies.berlios.de/"
+groups=('xfce4-goodies')
+depends=('xfce4-panel')
+makedepends=('intltool')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('28c20a9cfa4461e5411b428aecad4a3c2f49eab69bb9a208b6ebb151c8bf212f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-battery-plugin/xfce4-battery-plugin.install b/testing/xfce4-battery-plugin/xfce4-battery-plugin.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/testing/xfce4-battery-plugin/xfce4-battery-plugin.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-clipman-plugin/PKGBUILD b/testing/xfce4-clipman-plugin/PKGBUILD
new file mode 100644
index 000000000..7f0b3fefb
--- /dev/null
+++ b/testing/xfce4-clipman-plugin/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 157655 2012-04-29 02:54:00Z foutrelis $
+# Maintainer: tobias <tobias at archlinux.org>
+# Contributor: Aurelien Foret <orelien@chez.com>
+
+pkgname=xfce4-clipman-plugin
+pkgver=1.2.3
+pkgrel=2
+pkgdesc="A clipboard plugin for the Xfce4 panel"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libunique' 'libxtst')
+makedepends=('intltool')
+options=('!libtool')
+install=${pkgname}.install
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('61f3be97efa379cb358980c94e14692a')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|$(TARGET_DIR)/C/media|$(docdir)/html/C/media|' doc/Makefile.in
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--enable-unique \
+	--disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/xfce4-clipman-plugin/xfce4-clipman-plugin.install b/testing/xfce4-clipman-plugin/xfce4-clipman-plugin.install
new file mode 100644
index 000000000..fee9e5d11
--- /dev/null
+++ b/testing/xfce4-clipman-plugin/xfce4-clipman-plugin.install
@@ -0,0 +1,12 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
diff --git a/testing/xfce4-cpufreq-plugin/PKGBUILD b/testing/xfce4-cpufreq-plugin/PKGBUILD
new file mode 100644
index 000000000..8669ae1c2
--- /dev/null
+++ b/testing/xfce4-cpufreq-plugin/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 157657 2012-04-29 02:54:03Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfce4-cpufreq-plugin
+pkgver=1.0.0
+pkgrel=3
+pkgdesc="CPU frequency plugin for the Xfce4 panel"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
+groups=('xfce4-goodies')
+depends=('xfce4-panel>=4.7.4' 'libxfcegui4' 'hicolor-icon-theme')
+makedepends=('intltool')
+options=('!libtool')
+install=${pkgname}.install
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('24cae9b8583cae82b715b4f72aa8e341')
+
+build() {
+  cd ${srcdir}/xfce4-cpufreq-plugin-${pkgver}
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd ${srcdir}/xfce4-cpufreq-plugin-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/testing/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.install b/testing/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.install
new file mode 100644
index 000000000..21b79d2d4
--- /dev/null
+++ b/testing/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/testing/xfce4-cpugraph-plugin/PKGBUILD b/testing/xfce4-cpugraph-plugin/PKGBUILD
new file mode 100644
index 000000000..a29fb3b76
--- /dev/null
+++ b/testing/xfce4-cpugraph-plugin/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 157659 2012-04-29 02:54:06Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Aurelien Foret <orelien@chez.com>
+
+pkgname=xfce4-cpugraph-plugin
+pkgver=1.0.1
+pkgrel=4
+pkgdesc="CPU graph plugin for the Xfce4 panel"
+arch=('i686' 'x86_64')
+license=('GPL' 'custom')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme')
+makedepends=('intltool')
+install=${pkgname}.install
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('ff551087b1f61c47b8746e8687c572aa')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}
diff --git a/testing/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.install b/testing/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.install
new file mode 100644
index 000000000..b7e9ea08e
--- /dev/null
+++ b/testing/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.install
@@ -0,0 +1,12 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
diff --git a/testing/xfce4-datetime-plugin/PKGBUILD b/testing/xfce4-datetime-plugin/PKGBUILD
new file mode 100644
index 000000000..785a2c007
--- /dev/null
+++ b/testing/xfce4-datetime-plugin/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 157661 2012-04-29 02:54:09Z foutrelis $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Aurelien Foret <orelien@chez.com>
+
+pkgname=xfce4-datetime-plugin
+pkgver=0.6.1
+pkgrel=3
+pkgdesc="A date and time display plugin for the Xfce panel"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://xfce-goodies.berlios.de/"
+groups=('xfce4-goodies')
+depends=('xfce4-panel>=4.7.4' 'libxfcegui4')
+makedepends=('intltool')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('e82f51ff0e75a63e5cbd139e43e094f9')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/testing/xfce4-dev-tools/PKGBUILD b/testing/xfce4-dev-tools/PKGBUILD
new file mode 100644
index 000000000..ef1207c79
--- /dev/null
+++ b/testing/xfce4-dev-tools/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 157663 2012-04-29 02:54:11Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
+
+pkgname=xfce4-dev-tools
+pkgver=4.10.0
+pkgrel=1
+pkgdesc="Xfce developer tools"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+depends=('gtk-doc' 'automake' 'make' 'intltool' 'pkg-config')
+options=('!libtool')
+source=(http://archive.xfce.org/src/xfce/xfce4-dev-tools/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-dict/PKGBUILD b/testing/xfce4-dict/PKGBUILD
new file mode 100644
index 000000000..4641d01d3
--- /dev/null
+++ b/testing/xfce4-dict/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 157665 2012-04-29 02:54:14Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Aurelien Foret <orelien@chez.com>
+
+pkgname=xfce4-dict
+pkgver=0.6.0
+pkgrel=3
+pkgdesc="A dictionary plugin for the Xfce panel"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://goodies.xfce.org/projects/applications/xfce4-dict"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme' 'librsvg')
+makedepends=('intltool')
+provides=('xfce4-dict-plugin')
+conflicts=('xfce4-dict-plugin')
+replaces=('xfce4-dict-plugin')
+options=('!libtool')
+install=${pkgname}.install
+source=(http://archive.xfce.org/src/apps/xfce4-dict/0.6/xfce4-dict-${pkgver}.tar.bz2)
+md5sums=('c371c5c0bbe45a2bfac336cfe01dfe01')
+
+build() {
+  cd ${srcdir}/xfce4-dict-${pkgver}
+
+  # Work around DSO linking issue
+  LDFLAGS+=' -Wl,--copy-dt-needed-entries'
+
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd ${srcdir}/xfce4-dict-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/testing/xfce4-dict/xfce4-dict.install b/testing/xfce4-dict/xfce4-dict.install
new file mode 100644
index 000000000..21b79d2d4
--- /dev/null
+++ b/testing/xfce4-dict/xfce4-dict.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/testing/xfce4-diskperf-plugin/PKGBUILD b/testing/xfce4-diskperf-plugin/PKGBUILD
new file mode 100644
index 000000000..93ee0ef12
--- /dev/null
+++ b/testing/xfce4-diskperf-plugin/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 157667 2012-04-29 02:54:18Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Aurelien Foret <orelien@chez.com>
+
+pkgname=xfce4-diskperf-plugin
+pkgver=2.5.1
+pkgrel=2
+pkgdesc="Plugin for the Xfce4 panel displaying instant disk/partition performance"
+arch=('i686' 'x86_64')
+license=('BSD')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
+groups=('xfce4-goodies')
+depends=('xfce4-panel')
+makedepends=('intltool')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('b6053881f3ddff90a0a0baa655c84b27')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
diff --git a/testing/xfce4-eyes-plugin/PKGBUILD b/testing/xfce4-eyes-plugin/PKGBUILD
new file mode 100644
index 000000000..7fcb09445
--- /dev/null
+++ b/testing/xfce4-eyes-plugin/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 157669 2012-04-29 02:54:21Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Aurelien Foret <orelien@chez.com>
+
+pkgname=xfce4-eyes-plugin
+pkgver=4.4.1
+pkgrel=3
+pkgdesc="A rolling eyes (following mouse pointer) plugin for the Xfce panel"
+arch=(i686 x86_64)
+license=('GPL2')
+url="http://xfce-goodies.berlios.de/"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme')
+makedepends=('intltool' 'perlxml')
+install=${pkgname}.install
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/4.4/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('dcbf6ea9035d379d168b479be0d09f14')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/testing/xfce4-eyes-plugin/xfce4-eyes-plugin.install b/testing/xfce4-eyes-plugin/xfce4-eyes-plugin.install
new file mode 100644
index 000000000..21b79d2d4
--- /dev/null
+++ b/testing/xfce4-eyes-plugin/xfce4-eyes-plugin.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/testing/xfce4-fsguard-plugin/PKGBUILD b/testing/xfce4-fsguard-plugin/PKGBUILD
new file mode 100644
index 000000000..f7f62c2a7
--- /dev/null
+++ b/testing/xfce4-fsguard-plugin/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 157671 2012-04-29 02:54:24Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Ben <ben@benmazer.net>
+
+pkgname=xfce4-fsguard-plugin
+pkgver=1.0.0
+pkgrel=3
+pkgdesc="File system usage monitor plugin for the Xfce4 panel"
+arch=(i686 x86_64)
+license=('GPL2')
+url="http://xfce-goodies.berlios.de/"
+groups=('xfce4-goodies')
+depends=('xfce4-panel>=4.7.4' 'hicolor-icon-theme' 'libxfcegui4')
+makedepends=('intltool')
+options=(!libtool)
+install=${pkgname}.install
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('8378f922b59a0d5a378af5e45a18c4a3')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/testing/xfce4-fsguard-plugin/xfce4-fsguard-plugin.install b/testing/xfce4-fsguard-plugin/xfce4-fsguard-plugin.install
new file mode 100644
index 000000000..21b79d2d4
--- /dev/null
+++ b/testing/xfce4-fsguard-plugin/xfce4-fsguard-plugin.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/testing/xfce4-genmon-plugin/PKGBUILD b/testing/xfce4-genmon-plugin/PKGBUILD
new file mode 100644
index 000000000..abb6de9d6
--- /dev/null
+++ b/testing/xfce4-genmon-plugin/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 157673 2012-04-29 02:54:28Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-genmon-plugin
+pkgver=3.3.1
+pkgrel=2
+pkgdesc="plugin that monitors customizable programs stdout for the Xfce4 panel"
+arch=(i686 x86_64)
+license=('LGPL2.1')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libxfcegui4')
+makedepends=('intltool')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/3.3/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('e0022e15d4211a87c17d9f252b68e1d3')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/testing/xfce4-mailwatch-plugin/PKGBUILD b/testing/xfce4-mailwatch-plugin/PKGBUILD
new file mode 100644
index 000000000..37c6fd869
--- /dev/null
+++ b/testing/xfce4-mailwatch-plugin/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 157675 2012-04-29 02:54:31Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Suzy Williams <suzanne.williams3@verizon.net>
+
+pkgname=xfce4-mailwatch-plugin
+pkgver=1.1.0
+pkgrel=5
+pkgdesc="A mailbox watch/check plugin for the Xfce4 panel"
+arch=(i686 x86_64)
+license=('GPL2')
+url="http://spurint.org/projects/xfce4-mailwatch-plugin/"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libxfcegui4' 'gnutls' 'libgcrypt' 'hicolor-icon-theme')
+makedepends=('intltool' 'xfce4-dev-tools')
+options=('!libtool')
+install=${pkgname}.install
+source=(http://spuriousinterrupt.org/files/mailwatch/${pkgname}-${pkgver}.tar.bz2
+	xfce4-mailwatch-plugin-1.1.0-underlink.patch
+	only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch)
+md5sums=('f84dce86be1d7f25f169f262aaacee4e'
+         '47fe8588e3bb642e1b507a854927e6db'
+         'd91ca2b9534e9e2d8dcbd94306b91ade')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np0 -i ${srcdir}/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch
+  # fix for panel4.8 from Fedora
+  patch -Np1 -i ${srcdir}/xfce4-mailwatch-plugin-1.1.0-underlink.patch
+  xdt-autogen
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/testing/xfce4-mailwatch-plugin/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch b/testing/xfce4-mailwatch-plugin/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch
new file mode 100644
index 000000000..349e78555
--- /dev/null
+++ b/testing/xfce4-mailwatch-plugin/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch
@@ -0,0 +1,13 @@
+--- libmailwatch-core/mailwatch-net-conn.c.orig	2012-04-29 05:38:20.015564589 +0300
++++ libmailwatch-core/mailwatch-net-conn.c	2012-04-29 05:39:01.943290639 +0300
+@@ -621,8 +621,10 @@ xfce_mailwatch_net_conn_make_secure(Xfce
+                            net_conn->gt_creds);
+     gnutls_transport_set_ptr(net_conn->gt_session,
+                              (gnutls_transport_ptr_t)net_conn->fd);
++#if GNUTLS_VERSION_NUMBER < 0x020c00
+     if(fcntl(net_conn->fd, F_GETFL) & O_NONBLOCK)
+         gnutls_transport_set_lowat(net_conn->gt_session, 0);
++#endif
+     
+     if(!xfce_mailwatch_net_conn_tls_handshake(net_conn, error)) {
+ #if 0
diff --git a/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch b/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch
new file mode 100644
index 000000000..ada0df041
--- /dev/null
+++ b/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch
@@ -0,0 +1,21 @@
+--- xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am	2008-08-26 03:42:36.000000000 +0100
++++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am.new	2011-01-14 17:27:44.116199383 +0000
+@@ -50,6 +50,7 @@
+ 	-I$(top_srcdir)/libmailwatch-core \
+ 	@GTHREAD_CFLAGS@ \
+ 	@LIBXFCE4PANEL_CFLAGS@ \
++	@LIBXFCEGUI4_CFLAGS@ \
+ 	-DDATADIR=\"$(datadir)\" \
+ 	-DLOCALEDIR=\"$(localedir)\"
+ 
+@@ -60,7 +61,9 @@
+ 	$(top_builddir)/libmailwatch-core/libmailwatch-core.la \
+ 	@GTHREAD_LIBS@ \
+ 	@LIBXFCE4PANEL_LIBS@ \
+-	@GNUTLS_LIBS@
++	@LIBXFCEGUI4_LIBS@ \
++	@GNUTLS_LIBS@ \
++	-lgcrypt
+ 
+ if HAVE_CYGWIN
+   xfce4_mailwatch_plugin_LDFLAGS += \
diff --git a/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install b/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install
new file mode 100644
index 000000000..21b79d2d4
--- /dev/null
+++ b/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/testing/xfce4-mixer/PKGBUILD b/testing/xfce4-mixer/PKGBUILD
new file mode 100644
index 000000000..5f6cf2d9c
--- /dev/null
+++ b/testing/xfce4-mixer/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 157677 2012-04-29 02:54:35Z foutrelis $
+# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
+
+pkgname=xfce4-mixer
+pkgver=4.8.0
+pkgrel=3
+pkgdesc="The volume control plugin for the Xfce panel"
+arch=(i686 x86_64)
+license=('GPL2')
+url="http://www.xfce.org/"
+groups=('xfce4')
+depends=("xfce4-panel>=4.8.0" 'gstreamer0.10-base>=0.10.22' 'hicolor-icon-theme')
+makedepends=('intltool')
+optdepends=('gstreamer0.10-base-plugins:  to support basic audio hardware' \
+            'gstreamer0.10-good-plugins:  well supported hardware'\
+            'gstreamer0.10-bad-plugins:   not so well supported hardware'\
+            'gstreamer0.10-ugly-plugins:  might contain questionable license hardware')
+options=('!libtool')
+install=${pkgname}.install
+source=(http://archive.xfce.org/src/apps/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('3fa3a9973e18c04da26709a654e242ff')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--with-sound=alsa \
+	--disable-debug
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/testing/xfce4-mixer/xfce4-mixer.install b/testing/xfce4-mixer/xfce4-mixer.install
new file mode 100644
index 000000000..21b79d2d4
--- /dev/null
+++ b/testing/xfce4-mixer/xfce4-mixer.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/testing/xfce4-mount-plugin/PKGBUILD b/testing/xfce4-mount-plugin/PKGBUILD
new file mode 100644
index 000000000..ba35e0181
--- /dev/null
+++ b/testing/xfce4-mount-plugin/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 157679 2012-04-29 02:54:38Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-mount-plugin
+pkgver=0.6.3
+pkgrel=2
+pkgdesc="Plugin for the Xfce4 panel to mount and unmount volumes"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://xfce-goodies.berlios.de/"
+groups=('xfce4-goodies')
+depends=('xfce4-panel')
+makedepends=('intltool')
+options=('!libtool')
+install=${pkgname}.install
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('bbc031f8518dc873d3a3ef42b3e228eeb0c9bb86')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/xfce4-mount-plugin/xfce4-mount-plugin.install b/testing/xfce4-mount-plugin/xfce4-mount-plugin.install
new file mode 100644
index 000000000..21b79d2d4
--- /dev/null
+++ b/testing/xfce4-mount-plugin/xfce4-mount-plugin.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/testing/xfce4-mpc-plugin/PKGBUILD b/testing/xfce4-mpc-plugin/PKGBUILD
new file mode 100644
index 000000000..f75ac18b5
--- /dev/null
+++ b/testing/xfce4-mpc-plugin/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 157681 2012-04-29 02:54:42Z foutrelis $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: aurelien <aurelien@archlinux.org>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-mpc-plugin
+pkgver=0.4.0
+pkgrel=2
+pkgdesc="A plugin to control the music player daemon from the xfce4-panel"
+arch=('i686' 'x86_64')
+license=('BSD')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libmpd>=0.16.1')
+makedepends=('intltool')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('ae9b285e24385e27cfd797ab605a1b7f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/testing/xfce4-netload-plugin/PKGBUILD b/testing/xfce4-netload-plugin/PKGBUILD
new file mode 100644
index 000000000..cd0a161ac
--- /dev/null
+++ b/testing/xfce4-netload-plugin/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 157683 2012-04-29 02:54:47Z foutrelis $
+# Maintainer: aurelien <aurelien@archlinux.org>
+# Contributor: Aurelien Foret <orelien@chez.com>
+
+pkgname=xfce4-netload-plugin
+pkgver=1.1.0
+pkgrel=2
+pkgdesc="A netload plugin for the Xfce panel"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://xfce-goodies.berlios.de/"
+groups=('xfce4-goodies')
+depends=('xfce4-panel')
+makedepends=('intltool')
+options=('!libtool')
+install=xfce4-netload-plugin.install
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('8029daacf1602275c75ab07d1e2cccea0993caab')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/xfce4-netload-plugin/xfce4-netload-plugin.install b/testing/xfce4-netload-plugin/xfce4-netload-plugin.install
new file mode 100644
index 000000000..b7e9ea08e
--- /dev/null
+++ b/testing/xfce4-netload-plugin/xfce4-netload-plugin.install
@@ -0,0 +1,12 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
diff --git a/testing/xfce4-notes-plugin/PKGBUILD b/testing/xfce4-notes-plugin/PKGBUILD
new file mode 100644
index 000000000..7dc9fc33c
--- /dev/null
+++ b/testing/xfce4-notes-plugin/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 157685 2012-04-29 02:54:51Z foutrelis $
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Ben Mazer <contrasutra@myrealbox.com>
+
+pkgname=xfce4-notes-plugin
+pkgver=1.7.7
+pkgrel=4
+pkgdesc="A notes plugin for the Xfce4 panel"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://xfce-goodies.berlios.de/"
+groups=('xfce4-goodies')
+depends=('xfce4-panel>=4.7.0' 'libxfcegui4' 'libunique' 'hicolor-icon-theme')
+makedepends=('intltool')
+options=('!libtool')
+install=${pkgname}.install
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.7/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('42b924b23f2fec6a1099e9b7a87db4a3')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/xfce4-notes-plugin/xfce4-notes-plugin.install b/testing/xfce4-notes-plugin/xfce4-notes-plugin.install
new file mode 100644
index 000000000..fee9e5d11
--- /dev/null
+++ b/testing/xfce4-notes-plugin/xfce4-notes-plugin.install
@@ -0,0 +1,12 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
diff --git a/testing/xfce4-notifyd/PKGBUILD b/testing/xfce4-notifyd/PKGBUILD
new file mode 100644
index 000000000..7291f3fe7
--- /dev/null
+++ b/testing/xfce4-notifyd/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 157687 2012-04-29 02:54:55Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfce4-notifyd
+pkgver=0.2.2
+pkgrel=3
+pkgdesc="Notification daemon for the Xfce desktop"
+arch=('i686' 'x86_64')
+url="http://goodies.xfce.org/projects/applications/xfce4-notifyd"
+license=('GPL2')
+groups=('xfce4-goodies')
+depends=('libxfce4ui' 'hicolor-icon-theme')
+makedepends=('intltool')
+provides=('notification-daemon')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2)
+sha256sums=('b66e68dfc2164bcf479acd3c7e8b6f83065d23aef988535e2db3506d06a39168')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-notifyd/xfce4-notifyd.install b/testing/xfce4-notifyd/xfce4-notifyd.install
new file mode 100644
index 000000000..abf924aa2
--- /dev/null
+++ b/testing/xfce4-notifyd/xfce4-notifyd.install
@@ -0,0 +1,14 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-panel/PKGBUILD b/testing/xfce4-panel/PKGBUILD
new file mode 100644
index 000000000..5eca0d699
--- /dev/null
+++ b/testing/xfce4-panel/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 157689 2012-04-29 02:54:59Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfce4-panel
+pkgver=4.10.0
+pkgrel=1
+pkgdesc="Panel for the Xfce desktop environment"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('exo' 'garcon' 'libxfce4ui' 'libwnck' 'libsm' 'hicolor-icon-theme'
+         'desktop-file-utils')
+makedepends=('intltool' 'gtk-doc')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('3321f998af2bbd14ba68654a8881774f6ea2ec4f1a3544598e7f47d3ed0009b9')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-gio-unix \
+    --enable-gtk-doc \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-panel/xfce4-panel.install b/testing/xfce4-panel/xfce4-panel.install
new file mode 100644
index 000000000..c7a5da359
--- /dev/null
+++ b/testing/xfce4-panel/xfce4-panel.install
@@ -0,0 +1,14 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-power-manager/PKGBUILD b/testing/xfce4-power-manager/PKGBUILD
new file mode 100644
index 000000000..ed372d5a6
--- /dev/null
+++ b/testing/xfce4-power-manager/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 157691 2012-04-29 02:55:02Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
+
+pkgname=xfce4-power-manager
+pkgver=1.2.0
+pkgrel=1
+pkgdesc="Power manager for Xfce desktop"
+arch=('i686' 'x86_64')
+url="http://xfce-goodies.berlios.de/"
+license=('GPL2')
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'upower' 'udisks' 'libnotify' 'hicolor-icon-theme')
+makedepends=('pkgconfig' 'intltool')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/apps/$pkgname/1.2/$pkgname-$pkgver.tar.bz2)
+sha256sums=('d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-network-manager \
+    --enable-polkit \
+    --enable-dpms \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-power-manager/xfce4-power-manager.install b/testing/xfce4-power-manager/xfce4-power-manager.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/testing/xfce4-power-manager/xfce4-power-manager.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-quicklauncher-plugin/PKGBUILD b/testing/xfce4-quicklauncher-plugin/PKGBUILD
new file mode 100644
index 000000000..f640e98a9
--- /dev/null
+++ b/testing/xfce4-quicklauncher-plugin/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 157693 2012-04-29 02:55:06Z foutrelis $
+# Maintainer: 
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-quicklauncher-plugin
+pkgver=1.9.4
+pkgrel=7
+pkgdesc="plugin that creates 4 little application launcher in the Xfce4 panel"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://xfce-goodies.berlios.de/"
+groups=('xfce4-goodies')
+depends=('xfce4-panel>=4.7.4' 'libxfcegui4')
+makedepends=('intltool')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.9/${pkgname}-${pkgver}.tar.bz2
+	xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
+	xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
+	xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
+	xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
+	xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch)
+md5sums=('299e17f196ecfa5fb018cf65abb19b56'
+         'a7826c9f8199a2f1e914fd39b7f9e2bf'
+         '4ea4d06ab7284e78ddc4d60304f02cdf'
+         '5e8126c05def1211fb4a2a65f2812a1b'
+         '474237b205035214df1c723407251ade'
+         '9e7f789129b08c787978c7a72a55fae7')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # Fedora patches
+  patch -Np0 -i "${srcdir}/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch"
+  patch -Np0 -i "${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch"
+  patch -Np1 -i "${srcdir}/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch"
+  patch -Np1 -i "${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch"
+  patch -Np0 -i "${srcdir}/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch"
+  
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch b/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
new file mode 100644
index 000000000..907c1f23e
--- /dev/null
+++ b/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
@@ -0,0 +1,10 @@
+--- panel-plugin/quicklauncher.desktop.in.in.orig	2009-07-04 00:46:34.000000000 +0200
++++ panel-plugin/quicklauncher.desktop.in.in	2009-07-04 00:46:51.000000000 +0200
+@@ -4,4 +4,6 @@
+ _Name=Quicklauncher
+ _Comment=Program with several launchers
+ Icon=gnome-fs-executable
+-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libquicklauncher.so
++X-XFCE-Module=quicklauncher
++X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@
++X-XFCE-Unique=false
diff --git a/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch b/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
new file mode 100644
index 000000000..96f256770
--- /dev/null
+++ b/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
@@ -0,0 +1,103 @@
+diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/configure xfce4-quicklauncher-plugin-1.9.4.new/configure
+--- xfce4-quicklauncher-plugin-1.9.4/configure	2007-06-27 21:07:14.000000000 +0200
++++ xfce4-quicklauncher-plugin-1.9.4.new/configure	2008-03-04 22:11:23.000000000 +0100
+@@ -21181,7 +21181,7 @@
+ 
+ 
+ 
+-    ALL_LINGUAS="cs el eu fr gl hu ja pl ru vi"
++    ALL_LINGUAS="cs el en eu fr gl hu ja pl ru vi"
+ 
+ 
+ for ac_header in locale.h
+diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/po/en.po xfce4-quicklauncher-plugin-1.9.4.new/po/en.po
+--- xfce4-quicklauncher-plugin-1.9.4/po/en.po	1970-01-01 01:00:00.000000000 +0100
++++ xfce4-quicklauncher-plugin-1.9.4.new/po/en.po	2008-03-04 22:10:58.000000000 +0100
+@@ -0,0 +1,87 @@
++# English translation of xfce4-quicklauncher-plugin.
++# Copyright (C) 2007 THE xfce4-quicklauncher-plugin'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the xfce4-quicklauncher-plugin package.
++# Jeff Bailes <thepizzaking@gmail.com>, 2007.
++# , fuzzy
++# 
++# 
++msgid ""
++msgstr ""
++"Project-Id-Version: xfce4-quicklauncher-plugin\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2007-05-17 21:37+0200\n"
++"PO-Revision-Date: 2007-03-31 10:17+1000\n"
++"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
++"Language-Team: English\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit"
++
++#: ../panel-plugin/callbacks.c:79
++msgid "Configure Quicklauncher"
++msgstr "Configure Quicklauncher"
++
++#: ../panel-plugin/callbacks.c:93
++msgid "Lines: "
++msgstr "Lines: "
++
++#: ../panel-plugin/callbacks.c:123
++msgid "Espace entre les lanceurs :"
++msgstr "Space between launchers"
++
++#: ../panel-plugin/callbacks.c:131
++msgid "afficher les tooltips"
++msgstr "Show tooltips"
++
++#: ../panel-plugin/callbacks.c:135
++msgid "afficher les labels"
++msgstr "Show labels"
++
++#: ../panel-plugin/callbacks.c:216
++msgid "icone"
++msgstr "icon"
++
++#: ../panel-plugin/callbacks.c:222
++msgid "commande"
++msgstr "command"
++
++#: ../panel-plugin/callbacks.c:228
++msgid "nom"
++msgstr "name"
++
++#: ../panel-plugin/callbacks.c:327
++msgid "Open icon"
++msgstr "Open icon"
++
++#: ../panel-plugin/main.c:163 ../panel-plugin/quicklauncher.desktop.in.in.h:2
++msgid "Quicklauncher"
++msgstr "Quicklauncher"
++
++#: ../panel-plugin/main.c:166
++msgid "Allows you to add launchers easily and display them on many lines."
++msgstr "Allows you to add launchers easily and display them on many lines."
++
++#: ../panel-plugin/main.c:168
++msgid "Other plugins available here"
++msgstr "Other plugins available here"
++
++#: ../panel-plugin/main.c:320
++msgid "Lock"
++msgstr "Lock"
++
++#: ../panel-plugin/main.c:323
++msgid "Parameters"
++msgstr "Parameters"
++
++#: ../panel-plugin/main.c:326
++msgid "Applications"
++msgstr "Applications"
++
++#: ../panel-plugin/main.c:329
++msgid "Help"
++msgstr "Help"
++
++#: ../panel-plugin/quicklauncher.desktop.in.in.h:1
++msgid "Program with several launchers"
++msgstr "Program with several launchers"
++
diff --git a/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch b/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
new file mode 100644
index 000000000..9845ce122
--- /dev/null
+++ b/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
@@ -0,0 +1,27 @@
+--- panel-plugin/main.c.org	2008-05-13 09:29:29.000000000 -0600
++++ panel-plugin/main.c	2008-05-13 09:29:33.000000000 -0600
+@@ -148,6 +148,7 @@
+ 	t_qck_launcher_opt_dlg* dlg;
+ 	xfce_panel_plugin_block_menu(plugin);
+ 	dlg = create_qck_launcher_dlg();
++        gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin));
+ 	qck_launcher_opt_dlg_set_quicklauncher(quicklauncher);
+ 	gtk_dialog_run(GTK_DIALOG(dlg->dialog));
+ 	xfce_panel_plugin_unblock_menu(plugin);
+@@ -160,6 +161,7 @@
+ 	GtkWidget *about;
+ 	const gchar* authors[2] = {"Bountykiller <masse_nicolas@yahoo.fr>", NULL};
+ 	about = gtk_about_dialog_new();
++        gtk_window_set_screen (GTK_WINDOW (about), gtk_widget_get_screen (plugin));
+ 	gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(about), _("Quicklauncher"));
+ 	gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about), NULL);
+ 	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about), (const gchar**) authors);
+@@ -461,7 +463,7 @@
+ 		if(launcher->quicklauncher->_last_zoomed_launcher == launcher)
+ 		{
+ 			g_return_val_if_fail(launcher->clicked_img, FALSE);
+-			xfce_exec(launcher->command, FALSE, FALSE, NULL);
++			xfce_exec_on_screen(gtk_widget_get_screen (box), launcher->command, FALSE, FALSE, NULL);
+ 			gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->def_img);
+ 		}
+ 		else
diff --git a/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch b/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
new file mode 100644
index 000000000..85dd21729
--- /dev/null
+++ b/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
@@ -0,0 +1,12 @@
+Index: xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c
+===================================================================
+--- xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(révision 3779)
++++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(révision 3780)
+@@ -151,6 +151,7 @@
+         gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin));
+ 	qck_launcher_opt_dlg_set_quicklauncher(quicklauncher);
+ 	gtk_dialog_run(GTK_DIALOG(dlg->dialog));
++	quicklauncher_save(plugin, quicklauncher);
+ 	xfce_panel_plugin_unblock_menu(plugin);
+ }
+ 
diff --git a/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch b/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch
new file mode 100644
index 000000000..8314d7a3c
--- /dev/null
+++ b/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch
@@ -0,0 +1,11 @@
+--- panel-plugin/main.c.orig	2009-09-09 21:15:01.000000000 +0200
++++ panel-plugin/main.c	2009-09-09 21:23:12.000000000 +0200
+@@ -320,7 +320,7 @@
+ 	launcher = launcher_new(_("Lock"), "xflock4", XFCE_ICON_CATEGORY_SYSTEM,
+ 							NULL, quicklauncher);
+ 	quicklauncher_add_element(quicklauncher, launcher);
+-	launcher = launcher_new(_("Parameters"),"xfce-setting-show", XFCE_ICON_CATEGORY_SETTINGS,
++	launcher = launcher_new(_("Parameters"),"xfce4-settings-manager", XFCE_ICON_CATEGORY_SETTINGS,
+ 							NULL, quicklauncher);
+ 	quicklauncher_add_element(quicklauncher, launcher);
+ 	launcher = launcher_new(_("Applications"), "xfce4-appfinder", XFCE_ICON_CATEGORY_UTILITY,
diff --git a/testing/xfce4-screenshooter/PKGBUILD b/testing/xfce4-screenshooter/PKGBUILD
new file mode 100644
index 000000000..278e536ba
--- /dev/null
+++ b/testing/xfce4-screenshooter/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 157695 2012-04-29 02:55:10Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-screenshooter
+pkgver=1.8.0
+pkgrel=3
+pkgdesc="Plugin that makes screenshots for the Xfce panel"
+arch=('i686' 'x86_64')
+url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
+license=('GPL2')
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libsoup' 'hicolor-icon-theme')
+makedepends=('intltool')
+install=$pkgname.install
+options=('!libtool')
+source=(http://archive.xfce.org/src/apps/$pkgname/1.8/$pkgname-$pkgver.tar.bz2
+        xfce4-screenshooter-1.7.9-dsofix.patch
+        fs-25873-segfault-in-awesome-wm.patch)
+conflicts=('xfce4-screenshooter-plugin')
+replaces=('xfce4-screenshooter-plugin')
+sha256sums=('68748a42ae68c5a8e9ed1c14ec5c741a344ab30b5b325b8812220539548ad83e'
+            '6902495c0394af19a76e2f90399ca7295e8dfb3ffb29d3b4f3b3a9fb7489c464'
+            '76cc9127167c9f4a800b01e9d16b85bf3af335d0eb44588d859739aa9d457e38')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Np1 -i "$srcdir/xfce4-screenshooter-1.7.9-dsofix.patch"
+
+  # segfaults trying to capture screenshot of active window in awesome WM
+  # https://bugs.archlinux.org/task/25873
+  # patch by Bruno Ramos @ https://bugzilla.xfce.org/show_bug.cgi?id=8080#c2
+  patch -Np1 -i "$srcdir/fs-25873-segfault-in-awesome-wm.patch"
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-screenshooter/fix_segfault.diff b/testing/xfce4-screenshooter/fix_segfault.diff
new file mode 100644
index 000000000..e2a2f3d95
--- /dev/null
+++ b/testing/xfce4-screenshooter/fix_segfault.diff
@@ -0,0 +1,17 @@
+--- xfce4-screenshooter-1.7.9/lib/screenshooter-utils.c.orig	2010-01-02 12:42:24.000000000 +0100
++++ xfce4-screenshooter-1.7.9/lib/screenshooter-utils.c	2010-05-20 22:40:38.347861374 +0200
+@@ -94,11 +94,11 @@
+           g_free (title);
+           title =
+             g_strdup (xfce_rc_read_entry (rc, "title", _("Screenshot")));
+-        }
+ 
+-      TRACE ("Close the rc file");
++          TRACE ("Close the rc file");
+ 
+-      xfce_rc_close (rc);
++          xfce_rc_close (rc);
++        }
+     }
+ 
+   /* And set the sd values */
diff --git a/testing/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch b/testing/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch
new file mode 100644
index 000000000..47e067144
--- /dev/null
+++ b/testing/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch
@@ -0,0 +1,21 @@
+--- a/lib/screenshooter-capture.c	
++++ a/lib/screenshooter-capture.c	
+@@ -381,6 +381,18 @@ static GdkPixbuf
+                   rec_height += rectangle.y;
+                 }
+ 
++              if (rec_x < 0)
++                {
++                  rec_width = rec_width + rec_x;
++                  rec_x = 0;
++                }
++
++              if (rec_y < 0)
++                {
++                  rec_height = rec_height + rec_y;
++                  rec_y = 0;
++                }
++
+               if (x_orig + rec_x + rec_width > gdk_screen_width ())
+                 rec_width = gdk_screen_width () - x_orig - rec_x;
+ 
diff --git a/testing/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch b/testing/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch
new file mode 100644
index 000000000..a142df822
--- /dev/null
+++ b/testing/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch
@@ -0,0 +1,11 @@
+--- xfce4-screenshooter-1.7.9.orig/Makefile.in	2010-02-07 14:45:15.000000000 +0100
++++ xfce4-screenshooter-1.7.9/Makefile.in	2010-02-16 23:57:31.000000000 +0100
+@@ -282,7 +282,7 @@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lm -lX11
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/testing/xfce4-screenshooter/xfce4-screenshooter.install b/testing/xfce4-screenshooter/xfce4-screenshooter.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/testing/xfce4-screenshooter/xfce4-screenshooter.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-sensors-plugin/PKGBUILD b/testing/xfce4-sensors-plugin/PKGBUILD
new file mode 100644
index 000000000..9f00a0ce8
--- /dev/null
+++ b/testing/xfce4-sensors-plugin/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 157697 2012-04-29 02:55:13Z foutrelis $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Merk Matthias <macem@chello.at>
+
+pkgname=xfce4-sensors-plugin
+pkgver=1.2.3
+pkgrel=5
+pkgdesc="A lm_sensors plugin for the Xfce panel"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'lm_sensors' 'libnotify' 'hddtemp' 'hicolor-icon-theme')
+makedepends=('intltool' 'gnu-netcat')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.2/$pkgname-$pkgver.tar.bz2)
+sha256sums=('3dd27348f7b38b55e53aa8d851cdb80e090b8830ca9e705bf32641679f08d326')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Satisfy the check that hddtemp is queryable via netcat
+  # (https://bugs.archlinux.org/task/28275)
+  echo ohai | nc -l -p 7634 -s localhost -c &
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --datadir=/usr/share \
+    --datarootdir=/usr/share \
+    --disable-static \
+    --with-pathhddtemp=/usr/sbin/hddtemp \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-sensors-plugin/xfce4-sensors-plugin.install b/testing/xfce4-sensors-plugin/xfce4-sensors-plugin.install
new file mode 100644
index 000000000..ef6375367
--- /dev/null
+++ b/testing/xfce4-sensors-plugin/xfce4-sensors-plugin.install
@@ -0,0 +1,25 @@
+post_common() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_install() {
+  post_common
+
+  echo '> Make sure the hddtemp daemon is running, otherwise xfce4-sensors will'
+  echo '> crash on start.'
+}
+
+post_upgrade() {
+  post_common
+
+  if (($(vercmp $2 1.2.3-4) < 0)); then
+    echo '> Make sure the hddtemp daemon is running, otherwise xfce4-sensors will'
+    echo '> crash on start.'
+  fi
+}
+
+post_remove() {
+  post_common
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-session/PKGBUILD b/testing/xfce4-session/PKGBUILD
new file mode 100644
index 000000000..3c313b5da
--- /dev/null
+++ b/testing/xfce4-session/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 157699 2012-04-29 02:55:15Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfce4-session
+pkgver=4.10.0
+pkgrel=1
+pkgdesc="A session manager for Xfce"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+# keep xorg-server-utils for https://bugs.archlinux.org/task/21096
+# upower and consolekit for reboot/shutdown/hibernate/suspend
+depends=('libxfce4ui' 'libgnome-keyring' 'libwnck' 'libsm' 'xorg-iceauth'
+         'upower' 'consolekit' 'hicolor-icon-theme')
+makedepends=('intltool')
+optdepends=('fortune-mod: for xfce4-tips')
+replaces=('xfce-utils')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-libgnome-keyring \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-session/xfce4-session.install b/testing/xfce4-session/xfce4-session.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/testing/xfce4-session/xfce4-session.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-settings/PKGBUILD b/testing/xfce4-settings/PKGBUILD
new file mode 100644
index 000000000..5cf3275d5
--- /dev/null
+++ b/testing/xfce4-settings/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 157701 2012-04-29 02:55:18Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+# Contributor: Corrado Primier <bardo@aur.archlinux.org>
+
+pkgname=xfce4-settings
+pkgver=4.10.0
+pkgrel=1
+pkgdesc="Settings manager for xfce"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('exo' 'garcon' 'libxfce4ui' 'libnotify' 'libxklavier'
+         'gnome-icon-theme' 'gtk-engines' 'gtk2-xfce-engine')
+makedepends=('intltool')
+optdepends=('libcanberra: for sound control')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
+        xfce4-settings-xml-4.10.0.patch)
+sha256sums=('0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e'
+            '544d4409bac1cba1c0897317838cf2e24345f6ed4e3bf497a89b38d2643925c1')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # enable gnome icon theme, clearlooks theme and font hinting by default
+  # (taken from Fedora)
+  patch -Np1 -i "$srcdir/xfce4-settings-xml-4.10.0.patch"
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-xrandr \
+    --enable-xcursor \
+    --enable-libnotify \
+    --enable-libxklavier \
+    --enable-pluggable-dialogs \
+    --enable-sound-settings \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-settings/xfce4-settings-xml-4.10.0.patch b/testing/xfce4-settings/xfce4-settings-xml-4.10.0.patch
new file mode 100644
index 000000000..cb3a4a0d3
--- /dev/null
+++ b/testing/xfce4-settings/xfce4-settings-xml-4.10.0.patch
@@ -0,0 +1,26 @@
+diff -Nur xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml xfce4-settings-4.9.4/xfsettingsd/xsettings.xml
+--- xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml	2012-04-01 03:58:17.000000000 -0600
++++ xfce4-settings-4.9.4/xfsettingsd/xsettings.xml	2012-04-02 14:59:57.555572009 -0600
+@@ -6,8 +6,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <channel name="xsettings" version="1.0">
+   <property name="Net" type="empty">
+-    <property name="ThemeName" type="empty"/>
+-    <property name="IconThemeName" type="empty"/>
++    <property name="ThemeName" type="Clearlooks"/>
++    <property name="IconThemeName" type="gnome"/>
+     <property name="DoubleClickTime" type="int" value="250"/>
+     <property name="DoubleClickDistance" type="int" value="5"/>
+     <property name="DndDragThreshold" type="int" value="8"/>
+@@ -19,9 +19,9 @@
+   </property>
+   <property name="Xft" type="empty">
+     <property name="DPI" type="empty"/>
+-    <property name="Antialias" type="int" value="-1"/>
++    <property name="Antialias" type="int" value="1"/>
+     <property name="Hinting" type="int" value="-1"/>
+-    <property name="HintStyle" type="string" value="hintnone"/>
++    <property name="HintStyle" type="string" value="hintfull"/>
+     <property name="RGBA" type="string" value="none"/>
+     <!-- <property name="Lcdfilter" type="string" value="none"/> -->
+   </property>
diff --git a/testing/xfce4-smartbookmark-plugin/PKGBUILD b/testing/xfce4-smartbookmark-plugin/PKGBUILD
new file mode 100644
index 000000000..45dbf913f
--- /dev/null
+++ b/testing/xfce4-smartbookmark-plugin/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 157703 2012-04-29 02:55:21Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-smartbookmark-plugin
+pkgver=0.4.4
+pkgrel=2
+pkgdesc="Plugin for the Xfce4 panel that let you quicksearch from selected websites"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libxfcegui4')
+makedepends=('intltool' 'libxt')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2
+	xfce4-smartbookmark-plugin-archlinux.patch)
+md5sums=('273e38306a82f14e1b8c2c5db912f6c3'
+         '323ac898cfcfdb078f67f9ecd1905aec')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i "${srcdir}/xfce4-smartbookmark-plugin-archlinux.patch"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-archlinux.patch b/testing/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-archlinux.patch
new file mode 100644
index 000000000..45c9ad42e
--- /dev/null
+++ b/testing/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-archlinux.patch
@@ -0,0 +1,24 @@
+--- src/smartbookmark.c.redhat	2006-12-18 02:06:21.000000000 +0100
++++ src/smartbookmark.c	2006-12-18 02:11:33.000000000 +0100
+@@ -197,8 +197,8 @@
+     box = gtk_vbox_new(FALSE, 0);
+ 
+     /* default options */
+-    search->url = "http://bugs.debian.org/";
+-    search->label_text = "BTS";
++    search->url = "http://bugs.archlinux.org/";
++    search->label_text = "ArchBug #";
+     search->size = 5;
+     search->hide_label = FALSE;
+     /* read config file options */
+@@ -269,8 +269,8 @@
+     if( (rcfile = xfce_rc_simple_open(filename, TRUE) ))
+     {
+         xfce_rc_set_group(rcfile, NULL);
+-        search->url = g_strdup(xfce_rc_read_entry(rcfile,"url","http://bugs.debian.org/"));
+-        search->label_text = g_strdup(xfce_rc_read_entry(rcfile,"value","DBS"));
++        search->url = g_strdup(xfce_rc_read_entry(rcfile,"url","http://bugs.archlinux.org/"));
++        search->label_text = g_strdup(xfce_rc_read_entry(rcfile,"value","ArchBug #"));
+         search->size = xfce_rc_read_int_entry(rcfile, "size", 5);
+         search->hide_label = xfce_rc_read_bool_entry(rcfile, "hidelabel", FALSE);
+     }
diff --git a/testing/xfce4-systemload-plugin/PKGBUILD b/testing/xfce4-systemload-plugin/PKGBUILD
new file mode 100644
index 000000000..0f6af5284
--- /dev/null
+++ b/testing/xfce4-systemload-plugin/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 157705 2012-04-29 02:55:23Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Aurelien Foret <orelien@chez.com>
+
+pkgname=xfce4-systemload-plugin
+pkgver=1.1.0
+pkgrel=2
+pkgdesc="A system load plugin for the Xfce4 panel"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
+groups=('xfce4-goodies')
+depends=('xfce4-panel>=4.7.4')
+makedepends=('intltool')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('130ad7befddd8705ca09a98e9cee5c3e')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
diff --git a/testing/xfce4-time-out-plugin/PKGBUILD b/testing/xfce4-time-out-plugin/PKGBUILD
new file mode 100644
index 000000000..367a2b02c
--- /dev/null
+++ b/testing/xfce4-time-out-plugin/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 157707 2012-04-29 02:55:26Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Abhishek Dasgupta <abhidg@gmail.com>
+
+pkgname=xfce4-time-out-plugin
+pkgver=1.0.1
+pkgrel=2
+pkgdesc="Take a break from your computer with this plugin for XFCE4."
+arch=('i686' 'x86_64')
+url="http://xfce-goodies.berlios.de/"
+groups=('xfce4-goodies')
+license=('GPL')
+depends=('xfce4-panel>=4.7.0')
+makedepends=('intltool')
+options=('!libtool')
+install=${pkgname}.install
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+md5sums=('b6e4a3145d31c341e2506fb17b014587')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
diff --git a/testing/xfce4-time-out-plugin/xfce4-time-out-plugin.install b/testing/xfce4-time-out-plugin/xfce4-time-out-plugin.install
new file mode 100644
index 000000000..21b79d2d4
--- /dev/null
+++ b/testing/xfce4-time-out-plugin/xfce4-time-out-plugin.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/testing/xfce4-timer-plugin/PKGBUILD b/testing/xfce4-timer-plugin/PKGBUILD
new file mode 100644
index 000000000..411de49f5
--- /dev/null
+++ b/testing/xfce4-timer-plugin/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 157709 2012-04-29 02:55:28Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-timer-plugin
+pkgver=0.6.4
+pkgrel=2
+pkgdesc="plugin to track time for the Xfce4 panel"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libxfcegui4')
+makedepends=('intltool')
+options=('!libtool')
+install=xfce4-timer-plugin.install
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('c2f9e113dcda742cd1559129b79f609b')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib/ \
+	--localstatedir=/var \
+	--disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/xfce4-timer-plugin/xfce4-timer-plugin.install b/testing/xfce4-timer-plugin/xfce4-timer-plugin.install
new file mode 100644
index 000000000..17ca8f78a
--- /dev/null
+++ b/testing/xfce4-timer-plugin/xfce4-timer-plugin.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/testing/xfce4-verve-plugin/PKGBUILD b/testing/xfce4-verve-plugin/PKGBUILD
new file mode 100644
index 000000000..1ce0fd8bc
--- /dev/null
+++ b/testing/xfce4-verve-plugin/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 157711 2012-04-29 02:55:31Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-verve-plugin
+pkgver=1.0.0
+pkgrel=3
+pkgdesc="command line plugin Xfce4 panel"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://xfce-goodies.berlios.de/"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libxfcegui4')
+makedepends=('intltool')
+replaces=('verve-plugin')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.0/$pkgname-$pkgver.tar.bz2)
+md5sums=('ed7039c40d6e560ed8bcf9a324d2ae86')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/xfce4-wavelan-plugin/PKGBUILD b/testing/xfce4-wavelan-plugin/PKGBUILD
new file mode 100644
index 000000000..de7ae6670
--- /dev/null
+++ b/testing/xfce4-wavelan-plugin/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 157713 2012-04-29 02:55:34Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-wavelan-plugin
+pkgver=0.5.10
+pkgrel=3
+pkgdesc="Plugin to monitor wifi connectivity for the Xfce4 panel"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin/"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'net-tools')
+makedepends=('intltool')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('a4cd20ef471123936e762a139f1025e1')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
diff --git a/testing/xfce4-weather-plugin/PKGBUILD b/testing/xfce4-weather-plugin/PKGBUILD
new file mode 100644
index 000000000..cd383bef4
--- /dev/null
+++ b/testing/xfce4-weather-plugin/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 157715 2012-04-29 02:55:36Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Suzy Williams <suzanne.williams3@verizon.net>
+
+pkgname=xfce4-weather-plugin
+pkgver=0.7.4
+pkgrel=3
+pkgdesc="A weather plugin for the Xfce4 panel"
+arch=('i686' 'x86_64')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
+license=('GPL2')
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libxfcegui4' 'libxml2' 'hicolor-icon-theme')
+makedepends=('intltool')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.7/$pkgname-$pkgver.tar.bz2)
+sha256sums=('3f76207b8a845d15bfec6825bd5300aedd086c455259c4dd8670a89a3c8ab382')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Switch to a working license key
+  # https://bugs.archlinux.org/task/26815
+  sed -i \
+    -e 's/^#define PARTNER_ID.*/#define PARTNER_ID "1003666583"/' \
+    -e 's/^#define LICENSE_KEY.*/#define LICENSE_KEY "4128909340a9b2fc"/' \
+    panel-plugin/weather.h
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-weather-plugin/xfce4-weather-plugin.install b/testing/xfce4-weather-plugin/xfce4-weather-plugin.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/testing/xfce4-weather-plugin/xfce4-weather-plugin.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-xkb-plugin/PKGBUILD b/testing/xfce4-xkb-plugin/PKGBUILD
new file mode 100644
index 000000000..8e0c63ed4
--- /dev/null
+++ b/testing/xfce4-xkb-plugin/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 157717 2012-04-29 02:55:39Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-xkb-plugin
+pkgver=0.5.4.3
+pkgrel=2
+pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg')
+makedepends=('intltool')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('4dc42f96dc16a3bd78f86454ea3a931464e18497')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
diff --git a/testing/xfconf/PKGBUILD b/testing/xfconf/PKGBUILD
new file mode 100644
index 000000000..9a4d99570
--- /dev/null
+++ b/testing/xfconf/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 157719 2012-04-29 02:55:41Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfconf
+pkgver=4.10.0
+pkgrel=1
+pkgdesc="A simple client-server configuration storage and query system"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+# http://www.xfce.org/documentation/requirements
+# keep dbus, see also http://bugs.archlinux.org/task/14536
+depends=('libxfce4util' 'dbus-glib' 'dbus')
+makedepends=('pkgconfig' 'perl-extutils-depends' 'perl-extutils-pkgconfig'
+             'glib-perl' 'intltool' 'gtk-doc' 'chrpath')
+options=('!libtool' '!emptydirs')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-gtk-doc \
+    --with-perl-options=INSTALLDIRS="vendor" \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # remove unneeded dynloader bootstrap file
+  rm "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.bs"
+
+  # fix insecure rpath, http://bugs.archlinux.org/task/19980
+  chrpath -d "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.so"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfdesktop/PKGBUILD b/testing/xfdesktop/PKGBUILD
new file mode 100644
index 000000000..66f4fdb0a
--- /dev/null
+++ b/testing/xfdesktop/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 157721 2012-04-29 02:55:44Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfdesktop
+pkgver=4.10.0
+pkgrel=1
+pkgdesc="A desktop manager for Xfce"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'thunar' '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.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-gio-unix \
+    --enable-thunarx \
+    --enable-notifications \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfdesktop/implement-paste-on-desktop.patch b/testing/xfdesktop/implement-paste-on-desktop.patch
new file mode 100644
index 000000000..a84e6cb05
--- /dev/null
+++ b/testing/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/testing/xfdesktop/xfdesktop.install b/testing/xfdesktop/xfdesktop.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/testing/xfdesktop/xfdesktop.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfwm4/PKGBUILD b/testing/xfwm4/PKGBUILD
new file mode 100644
index 000000000..1d6cf4edf
--- /dev/null
+++ b/testing/xfwm4/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 157723 2012-04-29 02:55:47Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfwm4
+pkgver=4.10.0
+pkgrel=1
+pkgdesc="Xfce window manager"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme')
+makedepends=('intltool')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-startup-notification \
+    --enable-randr \
+    --enable-compositor \
+    --enable-xsync \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/xfwm4/xfwm4.install b/testing/xfwm4/xfwm4.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/testing/xfwm4/xfwm4.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et: