Sat Oct 1 23:14:36 UTC 2011

64 files changed, 2747 insertions, 91 deletions

diff --git a/community-testing/collectd/PKGBUILD b/community-testing/collectd/PKGBUILD
new file mode 100644
index 000000000..54138c3db
--- /dev/null
+++ b/community-testing/collectd/PKGBUILD
@@ -0,0 +1,86 @@
+# $Id: PKGBUILD 56069 2011-09-30 09:15:09Z ebelanger $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Gerhard Brauer <gerhard.brauer@web.de>
+
+pkgname=collectd
+pkgver=5.0.0
+pkgrel=7
+pkgdesc='Daemon which collects system performance statistics periodically'
+arch=('i686' 'x86_64')
+url='http://collectd.org/'
+license=('GPL')
+options=('!libtool')
+backup=('etc/collectd.conf')
+
+optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
+            'libdbi: dbi plugin'
+            'libesmtp: notify_email plugin'
+            'libgcrypt: encryption and authentication for network plugin'
+            'iptables: iptables plugin'
+            'libmemcached: memcachec plugin'
+            'libmysqlclient: mysql plugin'
+            'iproute2: netlink plugin'
+            'net-snmp: snmp plugin'
+            'libnotify: notify_desktop plugin'
+            'liboping: ping plugin'
+            'libpcap: dns plugin'
+            'perl: perl plugin'
+            'postgresql-libs: postgresql plugin'
+            'python2: python plugin'
+            'rrdtool: rrdtool and rrdcached plugins'
+            'lm_sensors: lm_sensors and sensors plugins'
+            'libvirt: libvirt plugin'
+            'libxml2: ascent and libvirt plugins'
+            'xmms: xmms plugin'
+            'yajl: curl_json plugin')
+
+makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'iptables' 'libmemcached'
+             'libmysqlclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
+             'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors'
+             'libvirt' 'libxml2' 'xmms' 'yajl')
+
+depends=('libtool')
+
+source=("${url}files/${pkgname}-${pkgver}.tar.gz"
+        'libnotify-0.7.patch'
+        'yajl-2.x.patch'
+        'libperl.patch'
+        'rc.d')
+sha1sums=('026e5121348f0e525dedb3844fe61c7713994bb7'
+          'f6fed097c16f6c9c90b9a32a5b8e48d54b35b337'
+          'd3854c39c9596b4f6dcf67a9eb8decea4d17120d'
+          'b221352447b2d42cade4a65ced322bcff8a40366'
+          '0f441718d5519cb043b1130e5a1d0379078adbcc')
+
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../libperl.patch
+	autoconf
+
+	sed -i 's/ipt_error_target/bozo_error_target/g' src/owniptc/libiptc.c
+	patch -p1 -i ../libnotify-0.7.patch
+	patch -p1 -i ../yajl-2.x.patch
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--enable-static=no \
+		--with-python=/usr/bin/python2
+
+	sed -i 's/ -Werror//g' */Makefile* */*/Makefile*
+
+	make all
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
+
+	install -D -m 755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
+	install -D -m 644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
+}
diff --git a/community-testing/collectd/install b/community-testing/collectd/install
new file mode 100644
index 000000000..54cc0e1b3
--- /dev/null
+++ b/community-testing/collectd/install
@@ -0,0 +1,8 @@
+post_install() {
+	cat <<EOF
+==> Customize your /etc/collectd.conf (you really want to).
+==> Then start and stop the daemon using: /etc/rc.d/collectd
+==> To see some result of collected data, use the Perl script:
+==>   /usr/share/collectd/collectd2html.pl
+EOF
+}
diff --git a/community-testing/collectd/libnotify-0.7.patch b/community-testing/collectd/libnotify-0.7.patch
new file mode 100644
index 000000000..5ea67047a
--- /dev/null
+++ b/community-testing/collectd/libnotify-0.7.patch
@@ -0,0 +1,12 @@
+diff -aur old/src/notify_desktop.c new/src/notify_desktop.c
+--- old/src/notify_desktop.c	2011-03-07 23:50:24.096691200 +0100
++++ new/src/notify_desktop.c	2011-03-07 23:52:35.486691201 +0100
+@@ -95,7 +95,7 @@
+ 				: (NOTIF_WARNING == n->severity) ? "WARNING"
+ 				: (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN");
+ 
+-	notification = notify_notification_new (summary, n->message, NULL, NULL);
++	notification = notify_notification_new (summary, n->message, NULL);
+ 	if (NULL == notification) {
+ 		log_err ("Failed to create a new notification.");
+ 		return -1;
diff --git a/community-testing/collectd/libperl.patch b/community-testing/collectd/libperl.patch
new file mode 100644
index 000000000..d6184f29d
--- /dev/null
+++ b/community-testing/collectd/libperl.patch
@@ -0,0 +1,30 @@
+diff -aur old/configure.in new/configure.in
+--- old/configure.in	2011-09-29 20:38:56.725672831 +1000
++++ new/configure.in	2011-09-29 20:39:07.975658829 +1000
+@@ -2810,11 +2810,13 @@
+ then
+   SAVE_CFLAGS="$CFLAGS"
+   SAVE_LDFLAGS="$LDFLAGS"
++  SAVE_LIBS="$LIBS"
+ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
+   PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
+   PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
+   CFLAGS="$CFLAGS $PERL_CFLAGS"
+   LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
++  LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl"
+ 
+   AC_CACHE_CHECK([for libperl],
+     [c_cv_have_libperl],
+@@ -2833,7 +2835,10 @@
+ 			 Nullsv);
+       ]]),
+       [c_cv_have_libperl="yes"],
+-      [c_cv_have_libperl="no"]
++      [ 
++        c_cv_have_libperl="no" 
++        LIBS="$SAVE_LIBS"
++      ]
+     )
+   )
+ 
+Only in new: configure.in.orig
diff --git a/community-testing/collectd/rc.d b/community-testing/collectd/rc.d
new file mode 100644
index 000000000..442f2324a
--- /dev/null
+++ b/community-testing/collectd/rc.d
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+name=collectd
+prog="/usr/sbin/collectdmon"
+
+PID=$(pidof -o %PPID $prog)
+
+case "$1" in
+start)
+	stat_busy "Starting $name daemon"
+	[[ -z "$PID" ]] && $prog \
+	&& { add_daemon $name; stat_done; } \
+	|| { stat_fail; exit 1; }
+	;;
+stop)
+	stat_busy "Stopping $name daemon"
+	[[ -n "$PID" ]] && kill $PID &>/dev/null \
+	&& { rm_daemon $name; stat_done; } \
+	|| { stat_fail; exit 1; }
+	;;
+restart)
+	$0 stop
+	sleep 2
+	$0 start
+	;;
+reload)
+	stat_busy "Sending SIGHUP to $name daemon"
+	[[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
+	&& { stat_done; } \
+	|| { stat_fail; exit 1; }
+	;;
+*)
+	echo "usage: $0 {start|stop|restart|reload}"
+	exit 1
+	;;
+esac
diff --git a/community-testing/collectd/yajl-2.x.patch b/community-testing/collectd/yajl-2.x.patch
new file mode 100644
index 000000000..b90543dfe
--- /dev/null
+++ b/community-testing/collectd/yajl-2.x.patch
@@ -0,0 +1,57 @@
+--- old/src/curl_json.c	2011-04-25 20:43:00.972938855 -0400
++++ new/src/curl_json.c	2011-04-25 20:46:03.859938860 -0400
+@@ -98,8 +98,7 @@
+     return (0);
+ 
+   status = yajl_parse(db->yajl, (unsigned char *)buf, len);
+-  if ((status != yajl_status_ok)
+-      && (status != yajl_status_insufficient_data))
++  if ((status != yajl_status_ok))
+   {
+     unsigned char *msg =
+       yajl_get_error(db->yajl, /* verbose = */ 1,
+@@ -130,7 +129,7 @@
+ /* "number" may not be null terminated, so copy it into a buffer before
+  * parsing. */
+ static int cj_cb_number (void *ctx,
+-    const char *number, unsigned int number_len)
++    const char *number, size_t number_len)
+ {
+   char buffer[number_len + 1];
+ 
+@@ -159,7 +158,7 @@
+ } /* int cj_cb_number */
+ 
+ static int cj_cb_map_key (void *ctx, const unsigned char *val,
+-                            unsigned int len)
++                            size_t len)
+ {
+   cj_t *db = (cj_t *)ctx;
+   c_avl_tree_t *tree;
+@@ -187,7 +186,7 @@
+ }
+ 
+ static int cj_cb_string (void *ctx, const unsigned char *val,
+-                           unsigned int len)
++                           size_t len)
+ {
+   cj_t *db = (cj_t *)ctx;
+   char str[len + 1];
+@@ -697,7 +696,7 @@
+   char *url;
+   yajl_handle yprev = db->yajl;
+ 
+-  db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db);
++  db->yajl = yajl_alloc (&ycallbacks, NULL, (void *)db);
+   if (db->yajl == NULL)
+   {
+     ERROR ("curl_json plugin: yajl_alloc failed.");
+@@ -730,7 +729,7 @@
+     return (-1);
+   }
+ 
+-  status = yajl_parse_complete (db->yajl);
++  status = yajl_complete_parse (db->yajl);
+   if (status != yajl_status_ok)
+   {
+     unsigned char *errmsg;
diff --git a/community-testing/gnome-packagekit/PKGBUILD b/community-testing/gnome-packagekit/PKGBUILD
new file mode 100644
index 000000000..c129e1d67
--- /dev/null
+++ b/community-testing/gnome-packagekit/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 56094 2011-10-01 00:56:14Z jconder $
+# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
+
+pkgname=gnome-packagekit
+pkgver=3.2.0
+pkgrel=1
+pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
+arch=('i686' 'x86_64')
+url='http://www.packagekit.org/'
+license=('GPL')
+depends=('dconf' 'desktop-file-utils' 'gnome-menus' 'gtk3'
+         'hicolor-icon-theme' 'libnotify' 'packagekit')
+makedepends=('gconf' 'gtk-doc' 'intltool' 'libcanberra' 'upower')
+optdepends=('gnome-settings-daemon-updates: update and message notifications')
+options=('!emptydirs' '!libtool')
+install="$pkgname.install"
+source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
+        'arch.patch')
+sha256sums=('a91efca58ac0781f925927772281e72abf16314ef3b9577bf42f8ab3f5b5c0e9'
+            '9c809ac3c8bbf870442e7bc4123c70b144930a287b28626be1b8bae95edf71ac')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Np1 -i "$srcdir/arch.patch"
+  sed -i 's@python@python2@' 'python/enum-convertor.py'
+
+  export PYTHON=/usr/bin/python2
+  ./configure --prefix=/usr \
+	      --sysconfdir=/etc \
+	      --disable-gtk-doc \
+	      --disable-schemas-compile \
+	      --disable-scrollkeeper
+  make -s
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make -s DESTDIR="$pkgdir" install
+
+  rm -rf "$pkgdir/usr/lib/gnome-settings-daemon-3.0/gtk-modules"
+}
diff --git a/community-testing/gnome-packagekit/arch.patch b/community-testing/gnome-packagekit/arch.patch
new file mode 100644
index 000000000..bf4cd91c4
--- /dev/null
+++ b/community-testing/gnome-packagekit/arch.patch
@@ -0,0 +1,28 @@
+diff -Nru a/data/gpk-install-local-file.desktop.in b/data/gpk-install-local-file.desktop.in
+--- a/data/gpk-install-local-file.desktop.in	2011-03-23 23:15:41.000000000 +1300
++++ b/data/gpk-install-local-file.desktop.in	2011-04-10 01:04:51.606666671 +1200
+@@ -8,5 +8,5 @@
+ Icon=system-software-install
+ StartupNotify=true
+ NoDisplay=true
+-MimeType=application/x-rpm;application/x-redhat-package-manager;application/x-servicepack;application/x-deb;
++MimeType=application/x-xz-compressed-tar;application/x-servicepack;
+ 
+diff -Nru a/data/org.gnome.packagekit.gschema.xml b/data/org.gnome.packagekit.gschema.xml
+--- a/data/org.gnome.packagekit.gschema.xml	2011-03-28 21:49:37.000000000 +1300
++++ b/data/org.gnome.packagekit.gschema.xml	2011-04-10 02:37:29.433333340 +1200
+@@ -104,14 +104,4 @@
+       <description>When displaying UI from a session DBus request, force these options to be turned on.</description>
+     </key>
+   </schema>
+-  <schema id="org.gnome.settings-daemon" path="/org/gnome/settings-daemon/">
+-    <child name="gtk-modules" schema="gnome-settings-daemon.gtk-modules"/>
+-  </schema>
+-  <schema id="gnome-settings-daemon.gtk-modules" path="/org/gnome/settings-daemon/gtk-modules/">
+-    <key name="pk-gtk-module" type="b">
+-      <default>true</default>
+-      <summary>GTK+ module for font installation</summary>
+-      <description>This key determines if applications should be able to prompt for fonts.</description>
+-    </key>
+-  </schema>
+ </schemalist>
diff --git a/community-testing/gnome-packagekit/gnome-packagekit.install b/community-testing/gnome-packagekit/gnome-packagekit.install
new file mode 100644
index 000000000..620670d57
--- /dev/null
+++ b/community-testing/gnome-packagekit/gnome-packagekit.install
@@ -0,0 +1,19 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.91.90) < 0 )); then
+    usr/sbin/gconfpkg --uninstall gnome-packagekit
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community-testing/gnome-settings-daemon-updates/PKGBUILD b/community-testing/gnome-settings-daemon-updates/PKGBUILD
new file mode 100644
index 000000000..cb2f33a9b
--- /dev/null
+++ b/community-testing/gnome-settings-daemon-updates/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 56096 2011-10-01 00:59:35Z jconder $
+# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
+
+_pkgname=gnome-settings-daemon
+pkgname=$_pkgname-updates
+pkgver=3.2.0
+pkgrel=1
+pkgdesc="Updates plugin for the GNOME Settings daemon"
+arch=('i686' 'x86_64')
+url="http://www.gnome.org"
+license=('GPL')
+depends=('gnome-packagekit' "$_pkgname")
+makedepends=('intltool' 'gtk-doc' 'gnome-desktop')
+options=('!emptydirs' '!libtool')
+install=$_pkgname.install
+source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
+        'arch.patch')
+sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b'
+            'e5029915c423f72256c4170f917363c385b6fcd180b87ceba0d7bb11a841d7e9')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/arch.patch"
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+	      --localstatedir=/var \
+	      --libexecdir=/usr/lib/gnome-settings-daemon \
+	      --disable-static \
+	      --enable-pulse \
+	      --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make -s
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  make -C 'plugins/updates' DESTDIR="${pkgdir}" install
+
+  _schema='org.gnome.settings-daemon.plugins.updates.gschema.xml'
+  install -D -m644 "data/$_schema" "$pkgdir/usr/share/glib-2.0/schemas/$_schema"
+}
diff --git a/community-testing/gnome-settings-daemon-updates/arch.patch b/community-testing/gnome-settings-daemon-updates/arch.patch
new file mode 100644
index 000000000..f405d7593
--- /dev/null
+++ b/community-testing/gnome-settings-daemon-updates/arch.patch
@@ -0,0 +1,321 @@
+diff --git a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
+index c09096a..3fa4159 100644
+--- a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
++++ b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
+@@ -31,7 +31,7 @@
+       <_description>Automatically download updates in the background without confirmation. Updates will be auto-downloaded when using wired network connnections, and also WiFi if 'connection-use-wifi' is enabled and mobile broadband if 'connection-use-mobile' is enabled.</_description>
+     </key>
+     <key name="auto-update-type" enum="org.gnome.settings-daemon.GsdUpdateType">
+-      <default>'security'</default>
++      <default>'none'</default>
+       <_summary>Automatically install these types of updates</_summary>
+       <_description>Automatically install these types of updates.</_description>
+     </key>
+@@ -56,7 +56,7 @@
+       <_description>The last time we notified the user about non-critical updates. Value is in seconds since the epoch, or zero for never.</_description>
+     </key>
+     <key name="frequency-get-upgrades" type="i">
+-      <default>604800</default>
++      <default>0</default>
+       <_summary>How often to check for distribution upgrades</_summary>
+       <_description>How often to check for distribution upgrades. Value is in seconds.</_description>
+     </key>
+diff --git a/plugins/updates/Makefile.am b/plugins/updates/Makefile.am
+index 9510c65..191092d 100644
+--- a/plugins/updates/Makefile.am
++++ b/plugins/updates/Makefile.am
+@@ -15,7 +15,9 @@ libupdates_la_SOURCES = \
+ 	gsd-updates-firmware.h \
+ 	gsd-updates-firmware.c \
+ 	gsd-updates-manager.h \
+-	gsd-updates-manager.c
++	gsd-updates-manager.c \
++	gsd-updates-watch.h \
++	gsd-updates-watch.c
+ 
+ libupdates_la_CPPFLAGS = \
+ 	-I$(top_srcdir)/gnome-settings-daemon \
+diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c
+index 90ea246..d79455c 100644
+--- a/plugins/updates/gsd-updates-manager.c
++++ b/plugins/updates/gsd-updates-manager.c
+@@ -32,6 +32,7 @@
+ #include "gsd-updates-manager.h"
+ #include "gsd-updates-firmware.h"
+ #include "gsd-updates-refresh.h"
++#include "gsd-updates-watch.h"
+ #include "gsd-updates-common.h"
+ #include "gnome-settings-profile.h"
+ 
+@@ -46,6 +47,7 @@ struct GsdUpdatesManagerPrivate
+         GCancellable            *cancellable;
+         GsdUpdatesRefresh       *refresh;
+         GsdUpdatesFirmware      *firmware;
++        GsdUpdatesWatch         *watch;
+         GSettings               *settings_ftp;
+         GSettings               *settings_gsd;
+         GSettings               *settings_http;
+@@ -1359,6 +1361,9 @@ gsd_updates_manager_start (GsdUpdatesManager *manager,
+         g_signal_connect (manager->priv->refresh, "get-updates",
+                           G_CALLBACK (due_get_updates_cb), manager);
+ 
++	/* watch transaction progress */
++	manager->priv->watch = gsd_updates_watch_new ();
++
+         /* get http settings */
+         manager->priv->settings_http = g_settings_new ("org.gnome.system.proxy.http");
+         g_signal_connect (manager->priv->settings_http, "changed",
+@@ -1464,6 +1469,10 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager)
+                 g_object_unref (manager->priv->firmware);
+                 manager->priv->firmware = NULL;
+         }
++        if (manager->priv->watch != NULL) {
++                g_object_unref (manager->priv->watch);
++                manager->priv->watch = NULL;
++        }
+         if (manager->priv->proxy_session != NULL) {
+                 g_object_unref (manager->priv->proxy_session);
+                 manager->priv->proxy_session = NULL;
+diff --git a/plugins/updates/gsd-updates-watch.c b/plugins/updates/gsd-updates-watch.c
+new file mode 100644
+index 0000000..892acad
+--- /dev/null
++++ b/plugins/updates/gsd-updates-watch.c
+@@ -0,0 +1,179 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2007-2011 Richard Hughes <richard@hughsie.com>
++ *
++ * Licensed under the GNU General Public License Version 2
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ */
++
++#include "config.h"
++
++#include <unistd.h>
++#include <glib/gi18n.h>
++#include <packagekit-glib2/packagekit.h>
++#include <libnotify/notify.h>
++
++#include "gsd-updates-watch.h"
++
++#define GSD_UPDATES_WATCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatchPrivate))
++
++struct GsdUpdatesWatchPrivate
++{
++	PkTransactionList *tlist;
++	PkClient *client;
++};
++
++G_DEFINE_TYPE (GsdUpdatesWatch, gsd_updates_watch, G_TYPE_OBJECT)
++
++static void
++gsd_updates_watch_message_cb (PkMessage *item, GsdUpdatesWatch *watch)
++{
++        NotifyNotification *notification;
++	gchar *details = NULL;
++	const gchar *title, *message;
++	GError *error = NULL;
++
++	g_return_if_fail (PK_IS_MESSAGE (item));
++        g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
++
++	g_object_get (item, "details", &details, NULL);
++	title = _("More information");
++	message = details;
++
++	/* use a better title if available */
++	if (g_str_has_prefix (details, "<b>")) {
++		gchar *end = g_strstr_len (details, -1, "</b>\n");
++		if (end != NULL && g_strstr_len (details, end - details, "\n") == NULL) {
++			title = details + 3;
++			*end = '\0';
++			message = end + 5;
++		}
++	}
++
++	/* display a notification */
++        notification = notify_notification_new (title, message, NULL);
++	notify_notification_set_app_name (notification, _("Software Updates"));
++        notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
++        notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL);
++
++        if (!notify_notification_show (notification, &error)) {
++                g_warning ("error: %s", error->message);
++                g_error_free (error);
++        }
++
++	g_free (details);
++}
++
++static void
++gsd_updates_watch_adopt_cb (PkClient *client, GAsyncResult *res, GsdUpdatesWatch *watch)
++{
++	PkResults *results;
++	PkProgress *progress = NULL;
++	guint uid;
++	GPtrArray *array;
++	GError *error = NULL;
++
++        g_return_if_fail (PK_IS_CLIENT (client));
++	g_return_if_fail (G_IS_ASYNC_RESULT (res));
++        g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
++
++	results = pk_client_generic_finish (client, res, &error);
++	if (results == NULL) {
++		g_warning ("failed to adopt: %s", error->message);
++		g_error_free (error);
++		goto out;
++	}
++
++	g_object_get (results, "progress", &progress, NULL);
++	g_object_get (progress, "uid", &uid, NULL);
++
++	/* only display messages from the same user */
++	if (uid != getuid ()) {
++		g_printerr ("ignoring messages\n");
++		goto out;
++	}
++
++	array = pk_results_get_message_array (results);
++	g_ptr_array_foreach (array, (GFunc) gsd_updates_watch_message_cb, watch);
++	g_ptr_array_unref (array);
++
++out:
++	if (progress != NULL) {
++		g_object_unref (progress);
++	}
++	if (results != NULL) {
++		g_object_unref (results);
++	}
++}
++
++static void
++gsd_updates_watch_tlist_added_cb (PkTransactionList *tlist, const gchar *tid, GsdUpdatesWatch *watch)
++{
++        g_return_if_fail (PK_IS_TRANSACTION_LIST (tlist));
++        g_return_if_fail (tid != NULL);
++        g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
++
++	/* listen for messages */
++	pk_client_adopt_async (watch->priv->client, tid, NULL, NULL, NULL,
++			       (GAsyncReadyCallback) gsd_updates_watch_adopt_cb, watch);
++}
++
++static void
++gsd_updates_watch_init (GsdUpdatesWatch *watch)
++{
++        g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
++
++        watch->priv = GSD_UPDATES_WATCH_GET_PRIVATE (watch);
++	watch->priv->tlist = pk_transaction_list_new ();
++	watch->priv->client = pk_client_new ();
++
++	g_signal_connect (watch->priv->tlist, "added",
++			  G_CALLBACK (gsd_updates_watch_tlist_added_cb), watch);
++}
++
++static void
++gsd_updates_watch_finalize (GObject *object)
++{
++        GsdUpdatesWatch *watch;
++
++        g_return_if_fail (GSD_IS_UPDATES_WATCH (object));
++
++        watch = GSD_UPDATES_WATCH (object);
++        g_return_if_fail (watch->priv != NULL);
++
++	if (watch->priv->tlist != NULL) {
++		g_object_unref (watch->priv->tlist);
++	}
++	if (watch->priv->client != NULL) {
++		g_object_unref (watch->priv->client);
++	}
++
++        G_OBJECT_CLASS (gsd_updates_watch_parent_class)->finalize (object);
++}
++
++GsdUpdatesWatch *
++gsd_updates_watch_new (void)
++{
++        return GSD_UPDATES_WATCH (g_object_new (GSD_TYPE_UPDATES_WATCH, NULL));
++}
++
++static void
++gsd_updates_watch_class_init (GsdUpdatesWatchClass *klass)
++{
++        GObjectClass *object_class = G_OBJECT_CLASS (klass);
++        object_class->finalize = gsd_updates_watch_finalize;
++        g_type_class_add_private (klass, sizeof (GsdUpdatesWatchPrivate));
++}
+diff --git a/plugins/updates/gsd-updates-watch.h b/plugins/updates/gsd-updates-watch.h
+new file mode 100644
+index 0000000..d90976e
+--- /dev/null
++++ b/plugins/updates/gsd-updates-watch.h
+@@ -0,0 +1,52 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2007-2011 Richard Hughes <richard@hughsie.com>
++ *
++ * Licensed under the GNU General Public License Version 2
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ */
++
++#ifndef __GSD_UPDATES_WATCH_H
++#define __GSD_UPDATES_WATCH_H
++
++#include <glib-object.h>
++
++G_BEGIN_DECLS
++
++#define GSD_TYPE_UPDATES_WATCH          (gsd_updates_watch_get_type ())
++#define GSD_UPDATES_WATCH(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatch))
++#define GSD_UPDATES_WATCH_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatchClass))
++#define GSD_IS_UPDATES_WATCH(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_UPDATES_WATCH))
++
++typedef struct GsdUpdatesWatchPrivate GsdUpdatesWatchPrivate;
++
++typedef struct
++{
++         GObject                         parent;
++         GsdUpdatesWatchPrivate         *priv;
++} GsdUpdatesWatch;
++
++typedef struct
++{
++        GObjectClass    parent_class;
++} GsdUpdatesWatchClass;
++
++GType                    gsd_updates_watch_get_type           (void);
++GsdUpdatesWatch         *gsd_updates_watch_new                (void);
++
++G_END_DECLS
++
++#endif /* __GSD_UPDATES_WATCH_H */
diff --git a/community-testing/gnome-settings-daemon-updates/gnome-settings-daemon.install b/community-testing/gnome-settings-daemon-updates/gnome-settings-daemon.install
new file mode 100644
index 000000000..24072f316
--- /dev/null
+++ b/community-testing/gnome-settings-daemon-updates/gnome-settings-daemon.install
@@ -0,0 +1,11 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community-testing/rsyslog/PKGBUILD b/community-testing/rsyslog/PKGBUILD
new file mode 100644
index 000000000..6ebf58514
--- /dev/null
+++ b/community-testing/rsyslog/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 56071 2011-09-30 09:15:21Z ebelanger $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=rsyslog
+pkgver=5.8.5
+pkgrel=2
+pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
+url="http://www.rsyslog.com/"
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('zlib')
+makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls')
+optdepends=('postgresql-libs: PostgreSQL Database Support'
+	    'libmysqlclient: MySQL Database Support'
+	    'net-snmp'
+	    'gnutls')
+backup=('etc/rsyslog.conf' \
+	'etc/logrotate.d/rsyslog'
+	'etc/conf.d/rsyslog')
+options=('strip' 'zipman' '!libtool')
+source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
+	'rsyslog'
+	'rsyslog.logrotate'
+	'rsyslog.conf.d')
+md5sums=('a73cb577cb4bc5b9c8f0d217eb054ad2'
+         'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
+         '8065db4bef3061a4f000ba58779f6829'
+         '1a0cd4530dd5d1439456d5ae230574d9')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+              --enable-mysql \
+              --enable-pgsql \
+              --enable-mail \
+              --enable-imfile \
+              --enable-imtemplate \
+              --enable-snmp \
+              --enable-gnutls \
+              --enable-inet \
+              --with-systemdsystemunitdir=/lib/systemd/system
+  make
+}
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make install DESTDIR=${pkgdir}
+  # Install Daemons and Configuration Files
+  install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d
+  install -D -m644 ${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf
+  install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname}
+  install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
+}
diff --git a/community-testing/rsyslog/rsyslog b/community-testing/rsyslog/rsyslog
new file mode 100755
index 000000000..ee0145418
--- /dev/null
+++ b/community-testing/rsyslog/rsyslog
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/rsyslog
+
+PID=`pidof -o %PPID /usr/sbin/rsyslogd`
+case "$1" in
+  start)
+    stat_busy "Starting RSyslogd"
+    [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon rsyslogd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping RSyslogd"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm -f /var/run/rsyslogd.pid
+      rm -f /var/rsyslogd.persist
+      rm_daemon rsyslogd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community-testing/rsyslog/rsyslog.conf.d b/community-testing/rsyslog/rsyslog.conf.d
new file mode 100644
index 000000000..e39f8c3b9
--- /dev/null
+++ b/community-testing/rsyslog/rsyslog.conf.d
@@ -0,0 +1,6 @@
+#
+# Parameters to be passed to rsyslogd
+# This should almost certainly include at least the current compatability
+# level, e.g. -c4
+#
+RSYSLOGD_ARGS="-c4"
diff --git a/community-testing/rsyslog/rsyslog.logrotate b/community-testing/rsyslog/rsyslog.logrotate
new file mode 100644
index 000000000..76306c560
--- /dev/null
+++ b/community-testing/rsyslog/rsyslog.logrotate
@@ -0,0 +1,7 @@
+/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log {
+    missingok
+    sharedscripts
+    postrotate
+	/usr/bin/killall -HUP /usr/sbin/rsyslogd
+    endscript
+}
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 0ef924973..3d1beb13f 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55873 2011-09-24 07:43:10Z giovanni $
+# $Id: PKGBUILD 56089 2011-09-30 23:22:23Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.20
+pkgver=0.8.21
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
@@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug')
 install=calibre.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'desktop_integration.patch')
-md5sums=('1b14bd08233302e3475d9dca0e0941e7'
+md5sums=('46317b1f4bd6f1cd5279a5f8a1d712ae'
          '253ce4fe5d01f8ff76b63cd3825755ea')
 
 build() {
diff --git a/community/jwm/PKGBUILD b/community/jwm/PKGBUILD
index f57809dbf..6fe9358d5 100644
--- a/community/jwm/PKGBUILD
+++ b/community/jwm/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 8961 2010-01-22 23:39:01Z dgriffiths $
+# $Id: PKGBUILD 56063 2011-09-30 07:00:29Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=jwm
-pkgver=2.0.1
-pkgrel=5
+pkgver=2.1.0
+pkgrel=1
 pkgdesc="A lightweight window manager for the X11 Window System"
 arch=('i686' 'x86_64')
 url="http://joewing.net/programs/jwm/"
@@ -11,12 +12,16 @@ license=('GPL2')
 depends=('libx11' 'libxft' 'libjpeg>=7' 'libxpm' 'libxinerama' 'libpng')
 backup=('etc/system.jwmrc')
 source=(http://joewing.net/programs/jwm/releases/jwm-$pkgver.tar.bz2)
-md5sums=('48f323cd78ea891172b2a61790e8c0ec')
+md5sums=('e8fab21b2410eb82032b7c3472af642c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-fribidi 
-  make || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make BINDIR="$pkgdir/usr/bin" MANDIR="$pkgdir/usr/share/man" \
-       SYSCONF="$pkgdir/etc" install || return 1
+       SYSCONF="$pkgdir/etc" install
 }
diff --git a/community/medit/PKGBUILD b/community/medit/PKGBUILD
index c11facc74..0d66fb048 100644
--- a/community/medit/PKGBUILD
+++ b/community/medit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 45179 2011-04-18 08:57:22Z spupykin $
+# $Id: PKGBUILD 56067 2011-09-30 09:08:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=medit
-pkgver=1.0.3
+pkgver=1.0.4
 pkgrel=1
 pkgdesc="A GTK text editor"
 arch=('i686' 'x86_64')
@@ -11,11 +11,11 @@ url="http://mooedit.sourceforge.net"
 options=('!emptydirs')
 license=('GPL')
 depends=('pygtk' 'libxml2' 'pcre' 'libsm' 'python2' 'gtk2' 'gcc-libs')
-optdepends=('ctags')
+optdepends=('ctags' 'vte: terminal emulator')
 makedepends=(pkgconfig perlxml intltool gcc-objc)
 install=medit.install
 source=(http://downloads.sourceforge.net/mooedit/medit-$pkgver.tar.bz2)
-md5sums=('8f863082ce984e347b95627e3726e936')
+md5sums=('dc3a24e7f23deaa21f59d221fd321131')
 
 build() {
   cd $srcdir/medit-$pkgver
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 7507f3eb4..c03032002 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55082 2011-09-02 09:21:05Z spupykin $
+# $Id: PKGBUILD 56085 2011-09-30 23:18:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
 
@@ -11,8 +11,8 @@ _user=http
 _group=http
 
 pkgname=nginx
-pkgver=1.0.6
-pkgrel=3
+pkgver=1.0.7
+pkgrel=1
 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
 arch=('i686' 'x86_64')
 depends=('pcre' 'zlib' 'openssl')
@@ -34,7 +34,7 @@ backup=("etc/nginx/conf/fastcgi.conf"
 changelog=changelog
 source=(http://nginx.org/download/nginx-$pkgver.tar.gz
 	nginx)
-md5sums=('bc98bac3f0b85da1045bc02e6d8fc80d'
+md5sums=('2a63d20301b924fa44c7d02586ae7ade'
          '0e8032d3ba26c3276e8c7c30588d375f')
 
 build() {
@@ -56,6 +56,19 @@ build() {
 		--with-http_gzip_static_module \
 		--with-ipv6 \
 		--add-module=/usr/lib/passenger/ext/nginx
+		#--with-http_mp4_module \
+		#--with-http_realip_module \
+		#--with-http_addition_module \
+		#--with-http_xslt_module \
+		#--with-http_image_filter_module \
+		#--with-http_geoip_module \
+		#--with-http_sub_module \
+		#--with-http_flv_module \
+		#--with-http_gzip_static_module \
+		#--with-http_random_index_module \
+		#--with-http_secure_link_module \
+		#--with-http_degradation_module \
+		#--with-http_perl_module \
 
 	make
 }
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index eb5f198b7..d608c5908 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 48652 2011-06-03 17:21:22Z stephane $
+# $Id: PKGBUILD 56087 2011-09-30 23:19:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributer: mpie <michael.kyne-phillips1@ntlworld.com>
 
 pkgname=parrot
-pkgver=3.3.0
-#_rel=devel
-_rel=stable
+pkgver=3.8.0
+_rel=devel
+#_rel=stable
 pkgrel=2
 pkgdesc="standalone virtual machine that can be used to execute bytecode compiled dynamic languages"
 arch=(i686 x86_64)
@@ -16,7 +16,7 @@ makedepends=('perl-json')
 optdepends=('freeglut')
 options=(!emptydirs !makeflags)
 source=(ftp://ftp.parrot.org/pub/parrot/releases/${_rel}/$pkgver/parrot-$pkgver.tar.gz)
-md5sums=('335d50fbef245bfe6d0bb277e224c728')
+md5sums=('72bac15a47f01bacef5ad28e45fe08b9')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index e6b73c70e..0e05e0aca 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 54803 2011-08-26 10:44:32Z stativ $
+# $Id: PKGBUILD 56081 2011-09-30 14:47:59Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
 # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
 # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
 # Contributor: Archie <mymaud@gmail.com>
 
 pkgname=rawtherapee
-pkgver=4.0.2
+pkgver=4.0.3
 pkgrel=1
 pkgdesc="RAW photo editor"
 arch=('i686' 'x86_64')
diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD
index 0eb11d0fd..d5a011512 100644
--- a/community/tomoyo-tools/PKGBUILD
+++ b/community/tomoyo-tools/PKGBUILD
@@ -1,29 +1,26 @@
-# $Id: PKGBUILD 53999 2011-08-11 17:49:23Z spupykin $
+# $Id: PKGBUILD 56076 2011-09-30 09:42:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
 
 pkgname=tomoyo-tools
-_basever=2.4.0
-_timestamp=20110806
+_basever=2.3.0
+_timestamp=20110929
 pkgver=${_basever}.${_timestamp}
 pkgrel=1
-pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernel 2.6.36 and later'
+pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernels 2.6.36 - 3.0'
 arch=('i686' 'x86_64')
 url='http://tomoyo.sourceforge.jp'
+#url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818'
 license=('GPL')
 depends=('ncurses')
-makedepends=('help2man')
 conflicts=('ccs-tools')
 install=tomoyo-tools.install
-source=("tomoyo-tools-${_basever}-${_timestamp}.tar.gz::http://sourceforge.jp/frs/redir.php?m=iij&f=%2Ftomoyo%2F52848%2Ftomoyo-tools-${_basever}-${_timestamp}.tar.gz"
-	build-fix.patch)
-md5sums=('111109a71684f48bcac58bba07b8f49e'
-         '063c85ec6c56b90796ced9c203098f41')
+source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/48663/${pkgname}-${_basever}-${_timestamp}.tar.gz")
+md5sums=('4444feb74a84f2ae50a9a5d8065c3a8e')
 
 build() {
   cd "${srcdir}/${pkgname}"
-  patch -p1 <$srcdir/build-fix.patch
-  make
+  make -j1
 }
 
 package() {
diff --git a/community/tomoyo-tools/tomoyo-tools.install b/community/tomoyo-tools/tomoyo-tools.install
index 6fb5e16d2..695a53f19 100644
--- a/community/tomoyo-tools/tomoyo-tools.install
+++ b/community/tomoyo-tools/tomoyo-tools.install
@@ -1,9 +1,9 @@
 post_install () {
-	echo
-	echo " * To enable TOMOYO Linux, append 'security=tomoyo' to the kernel"
-	echo "   boot options and initialize policy with this command:"
-	echo "     /usr/lib/tomoyo/init_policy"
-	echo
+  echo
+  echo " * To enable TOMOYO Linux, append 'security=tomoyo' to the kernel"
+  echo "   boot options and initialize policy with this command:"
+  echo "     /usr/lib/tomoyo/init_policy"
+  echo
 }
 
 post_upgrade () {
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index a08f746ec..fc2610b7d 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgname=unbound
-pkgver=1.4.12
+pkgver=1.4.13
 pkgrel=1
 pkgdesc='Validating, recursive, and caching DNS resolver'
 arch=('i686' 'x86_64')
@@ -14,17 +14,17 @@ depends=('openssl' 'ldns')
 makedepends=('expat')
 optdepends=('expat: unbound-anchor')
 backup=('etc/unbound/unbound.conf')
-source=("http://unbound.net/downloads/$pkgname-$pkgver.tar.gz"
+source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
         'unbound.conf'
         'rc.d')
-sha1sums=('c46c05d1fa2402a59c10f51864fd4c62d10a472f'
+sha1sums=('834ccfd1cb41a44f53b33f8338a8f9cc68febaf7'
           '5d473ec2943fd85367cdb653fcd58e186f07383f'
           'a0c8c496d71d43ed9e09b170d3df836dfb096480')
 
 install=install
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -37,10 +37,10 @@ build() {
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-	install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-	install -D -m755 ../rc.d "$pkgdir/etc/rc.d/$pkgname"
-	install -D -m644 ../unbound.conf "$pkgdir/etc/unbound/unbound.conf"
-	install -D -m644 doc/example.conf.in "$pkgdir/etc/unbound/unbound.conf.example"
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
+	install -D -m644 ../unbound.conf "${pkgdir}/etc/unbound/unbound.conf"
+	install -D -m644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example"
 }
diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD
index 07256a53f..f868fcfa9 100644
--- a/community/wine/PKGBUILD
+++ b/community/wine/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55863 2011-09-24 02:48:10Z svenstaro $
+# $Id: PKGBUILD 56091 2011-09-30 23:44:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=wine
 pkgver=1.3.29
-pkgrel=1
+pkgrel=2
 
 _pkgbasever=${pkgver/rc/-rc}
 
@@ -63,6 +63,7 @@ optdepends=(
   libcups         lib32-libcups
   gnutls          lib32-gnutls
   v4l-utils       lib32-v4l-utils
+  libpulse        lib32-libpulse
   oss
 )
 
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
index 79d50449a..e1777c791 100644
--- a/extra/icedtea-web/PKGBUILD
+++ b/extra/icedtea-web/PKGBUILD
@@ -1,16 +1,18 @@
-# $Id: PKGBUILD 136837 2011-09-02 08:00:13Z andyrtr $
+# $Id: PKGBUILD 139127 2011-09-30 05:42:46Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.1.2
+pkgver=1.1.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
 makedepends=('openjdk6' 'zip' 'xulrunner')
 source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
-md5sums=('564e10820887793b86b04ac9979cb6e5')
+md5sums=('0e2e653c7436d81edcbc1d4255571ab6')
+sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37')
+
 
 build() {
   _javaver=6
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index 59c3a4f31..e4dbbdc8d 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 135966 2011-08-21 02:57:32Z foutrelis $
+# $Id: PKGBUILD 139167 2011-09-30 16:27:55Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.10.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://pidgin.im/"
 license=('GPL')
@@ -17,9 +17,11 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'networkmanager')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-        nm09-more.patch)
-md5sums=('e1453c9093c4f32beec19abd14069a3f'
-         'a673659d86c7a65aa710f7c8c7feda82')
+        nm09-more.patch
+        pidgin-2.10.0-silc-remote-crash-fix.diff)
+sha1sums=('859c6d9c9795c1adcf762b73e072e04a3a85a78d'
+          '0676b26f092fac3ee4bbea2261042b3f433c7751'
+          '8c7fc96abeca0f76d895bb33a530bf49e12f5bc6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,8 +30,12 @@ build() {
   # http://developer.pidgin.im/ticket/13859
   patch -Np1 -i "$srcdir/nm09-more.patch"
 
+  # Fix remote crash in SILC plugin
+  # http://developer.pidgin.im/ticket/14636
+  patch -Np0 -i "$srcdir/pidgin-2.10.0-silc-remote-crash-fix.diff"
+
   # Use Python 2
-  sed -i 's/env python$/\02/' */plugins/*.py \
+  sed -i 's/env python$/&2/' */plugins/*.py \
     libpurple/purple-{remote,notifications-example,url-handler}
 
   ./configure \
@@ -48,8 +54,8 @@ build() {
 
 package_pidgin(){
   pkgdesc="Multi-protocol instant messaging client"
-  depends=("libpurple=$pkgver-$pkgrel" 'startup-notification' 'gtkspell'
-           'libxss' 'libsm' 'gstreamer0.10' 'hicolor-icon-theme')
+  depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
+           'gstreamer0.10' 'hicolor-icon-theme')
   optdepends=('aspell: for spelling correction'
               'ca-certificates: SSL CA certificates'
               'gstreamer0.10-good-plugins: video and voice support'
diff --git a/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff b/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff
new file mode 100644
index 000000000..de4b126d0
--- /dev/null
+++ b/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff
@@ -0,0 +1,21 @@
+============================================================
+--- libpurple/protocols/silc/ops.c	30ab18780af11a53b6564a44c4e8ebfc1a296d78
++++ libpurple/protocols/silc/ops.c	80bd9a7d3faf9e5ef28438647159fe19847e9839
+@@ -408,9 +408,16 @@ silc_private_message(SilcClient client, 
+ 	}
+ 
+ 	if (flags & SILC_MESSAGE_FLAG_UTF8) {
+-		tmp = g_markup_escape_text((const char *)message, -1);
++		const char *msg = (const char *)message;
++		char *salvaged = NULL;
++		if (!g_utf8_validate((const char *)message, -1, NULL)) {
++			salvaged = purple_utf8_salvage((const char *)message);
++			msg = salvaged;
++		}
++		tmp = g_markup_escape_text(msg, -1);
+ 		/* Send to Purple */
+ 		serv_got_im(gc, sender->nickname, tmp, 0, time(NULL));
++		g_free(salvaged);
+ 		g_free(tmp);
+ 	}
+ }
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index d147e5e76..ef3574080 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 136171 2011-08-23 17:11:36Z schiv $
+# $Id: PKGBUILD 139163 2011-09-30 13:55:54Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=snd
-pkgver=12.4
+pkgver=12.5
 pkgrel=1
 pkgdesc="An advanced sound editor"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'libxpm'
 optdepends=('ladspa' 'wavpack' 'flac' 'speex'
             'timidity++' 'mpg123' 'vorbis-tools')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('107e5a4fd5df2d1432d0ec51cb31a88b')
+md5sums=('53bed2048fe9287f9a0e6a6d63536729')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 4ee6e3427..3976d4666 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137072 2011-09-05 21:46:27Z eric $
+# $Id: PKGBUILD 139129 2011-09-30 05:59:05Z eric $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,9 +6,9 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=294
+_patchlevel=322
 pkgver=${_topver}.${_patchlevel}
-__hgrev=9c96fb7330b5 
+__hgrev=5e84f6567623
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:vim')
diff --git a/extra/xscreensaver/PKGBUILD b/extra/xscreensaver/PKGBUILD
index f95504400..09280bc69 100644
--- a/extra/xscreensaver/PKGBUILD
+++ b/extra/xscreensaver/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 139121 2011-09-30 02:29:24Z eric $
+# $Id: PKGBUILD 139172 2011-09-30 22:43:18Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xscreensaver
 pkgver=5.15
-pkgrel=1
+pkgrel=2
 pkgdesc="Screen saver and locker for the X Window System"
 arch=('i686' 'x86_64')
 url="http://www.jwz.org/xscreensaver/"
 license=('BSD')
-depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu')
+depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' 'perl-libwww')
 makedepends=('bc')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \
diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD
index dea611e72..46887f4c7 100644
--- a/multilib/wine/PKGBUILD
+++ b/multilib/wine/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55867 2011-09-24 03:06:17Z svenstaro $
+# $Id: PKGBUILD 56092 2011-09-30 23:53:08Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=wine
 pkgver=1.3.29
-pkgrel=1
+pkgrel=2
 
 _pkgbasever=${pkgver/rc/-rc}
 
@@ -63,6 +63,7 @@ optdepends=(
   libcups         lib32-libcups
   gnutls          lib32-gnutls
   v4l-utils       lib32-v4l-utils
+  libpulse        lib32-libpulse
   oss
 )
 
diff --git a/testing/claws-mail-extra-plugins/PKGBUILD b/testing/claws-mail-extra-plugins/PKGBUILD
new file mode 100644
index 000000000..cc21970ba
--- /dev/null
+++ b/testing/claws-mail-extra-plugins/PKGBUILD
@@ -0,0 +1,75 @@
+# $Id: PKGBUILD 139133 2011-09-30 07:33:19Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Mildred <mildred593 at online dot fr>
+
+pkgname=claws-mail-extra-plugins
+pkgver=3.7.10
+pkgrel=2
+pkgdesc="Extra plugins for claws-mail"
+url="http://www.claws-mail.org/plugins.php?branch=EXT"
+license=('GPL3')
+arch=('i686' 'x86_64')
+depends=('claws-mail>=3.7.10')
+makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7'
+             'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1'
+             'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata')
+optdepends=('libgtkhtml: for gtkhtml2_viewer plugin'
+            'perl: for perl plugin'
+            'libnotify: for notification plugin'
+            'libcanberra: for notification plugin'
+            'dbus-core: for notification plugin'
+            'libxml2: for gtkhtml2_viewer and rssyl plugins'
+            'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins'
+            'libarchive: for archive plugin'
+            'libytnef: for tnef_parse plugin'
+            'libwebkit: for the fancy webkit html plugin'
+            'libsoup-gnome: for the fancy webkit html plugin'
+            'python2: for python plugin'
+	    'libgdata: for gdata plugin')
+conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin'
+           'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin'
+           'sylpheed-claws-extra-plugins' 'claws-tnef-plugin'
+           'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn')
+replaces=('sylpheed-claws-extra-plugins')
+options=('!libtool' '!strip')
+source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2
+	webkit1.6.1.patch)
+md5sums=('fe782b2d4762c9727e22c1bb7979f7d6'
+         '8b94fa44072331b9c3926607eb42ba26')
+sha1sums=('c5200936cb4811022774e960dc3f43d19eb320cf'
+          '8efd800617406dfe58a14422f243a678c582a90d')
+
+build() {
+  cd "$srcdir/claws-mail-extra-plugins-$pkgver"
+
+  # fix for new webkit api
+  pushd fancy*
+  patch -Np0 -i ${srcdir}/webkit1.6.1.patch
+  popd
+
+  # fix for python2
+  export PYTHON="/usr/bin/python2"
+
+  # fix gdata plugin build
+  sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.2/configure
+ 
+  for dir in */; do
+    [[ $dir != geolocation_plugin-* ]] && (
+      cd $dir
+
+      ./configure --prefix=/usr --disable-static
+      make
+    )
+  done
+}
+
+package() {
+  cd "$srcdir/claws-mail-extra-plugins-$pkgver"
+  for dir in */; do
+    [[ $dir != geolocation_plugin-* ]] && 
+      make -C $dir DESTDIR="$pkgdir" install
+  done
+
+  # fix fileconflict with libical, #11485
+  rm -f "$pkgdir/usr/include/ical.h"
+}
diff --git a/testing/claws-mail-extra-plugins/webkit1.6.1.patch b/testing/claws-mail-extra-plugins/webkit1.6.1.patch
new file mode 100644
index 000000000..82bc5d062
--- /dev/null
+++ b/testing/claws-mail-extra-plugins/webkit1.6.1.patch
@@ -0,0 +1,106 @@
+--- src/fancy_viewer.c	2011-07-01 11:50:25.000000000 +0200
++++ src/fancy_viewer.c	2011-09-30 06:02:45.000000000 +0200
+@@ -83,8 +83,10 @@
+ static void download_file_cb(GtkWidget *widget, FancyViewer *viewer);
+ #endif
+ 
+-/*FIXME substitute webkitwebsettings.cpp functions with their API when available */
+-gchar* webkit_web_view_get_selected_text(WebKitWebView* webView);
++#if !WEBKIT_CHECK_VERSION (1,5,1)
++gchar* webkit_web_view_get_selected_text(WebKitWebView* web_view);
++#endif
++
+ /*------*/
+ static GtkWidget *fancy_get_widget(MimeViewer *_viewer)
+ {
+@@ -243,6 +245,8 @@
+ 
+ 	gtk_print_unix_dialog_set_manual_capabilities(print_dialog,
+ 												  GTK_PRINT_CAPABILITY_GENERATE_PS);
++	gtk_print_unix_dialog_set_manual_capabilities(print_dialog,
++												  GTK_PRINT_CAPABILITY_PREVIEW);
+ 
+ 	result = gtk_dialog_run (GTK_DIALOG (dialog));
+ 	gtk_widget_hide (dialog);
+@@ -293,7 +297,19 @@
+ {
+ 	debug_print("fancy_get_selection\n");
+ 	FancyViewer *viewer = (FancyViewer *) _viewer;
++#if WEBKIT_CHECK_VERSION(1,5,1)
++	viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view));
++	viewer->window = webkit_dom_document_get_default_view (viewer->doc);
++	viewer->selection = webkit_dom_dom_window_get_selection (viewer->window);
++	if (viewer->selection == NULL)
++		return NULL;
++	viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL);
++	if (viewer->range == NULL)
++		return NULL;
++	gchar *sel = webkit_dom_range_get_text (viewer->range);
++#else
+ 	gchar *sel = webkit_web_view_get_selected_text(viewer->view);
++#endif
+ 	if (!viewer->view || strlen(sel) == 0) {
+ 		g_free(sel);
+ 		return NULL;
+@@ -686,7 +702,15 @@
+ 	debug_print("Clicked on Search on Web\n");
+ 	if (webkit_web_view_has_selection(viewer->view)) {
+ 		gchar *search;
++#if WEBKIT_CHECK_VERSION(1,5,1)
++		viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view));
++		viewer->window = webkit_dom_document_get_default_view (viewer->doc);
++		viewer->selection = webkit_dom_dom_window_get_selection (viewer->window);
++		viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL);
++		gchar *tmp = webkit_dom_range_get_text (viewer->range);
++#else
+ 		gchar *tmp = webkit_web_view_get_selected_text(viewer->view);
++#endif
+ 		search = g_strconcat(GOOGLE_SEARCH, tmp, NULL);
+ 		webkit_web_view_open(viewer->view, search);
+ 		g_free(search);
+@@ -896,7 +920,6 @@
+ static gboolean populate_popup_cb (WebKitWebView *view, GtkWidget *menu, 
+ 								   FancyViewer *viewer)
+ {
+-	/*FIXME hack..until webkit does not give the proper way to handle it*/
+ 	Plugin *plugin = plugin_get_loaded_by_name("RSSyl");
+ 	gtk_container_foreach(GTK_CONTAINER(menu), 
+ 						  (GtkCallback)viewer_menu_handler, 
+@@ -941,7 +964,19 @@
+ 	if (webkit_web_view_can_copy_clipboard(view)) {
+ 		GtkClipboard *wv_clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+ 		const gchar *sel_text;
+-		sel_text = (const gchar*)webkit_web_view_get_selected_text(view);
++#if WEBKIT_CHECK_VERSION(1,5,1)
++		viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view));
++		viewer->window = webkit_dom_document_get_default_view (viewer->doc);
++		viewer->selection = webkit_dom_dom_window_get_selection (viewer->window);
++		if (viewer->selection == NULL)
++			return NULL;
++		viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL);
++		if (viewer->range == NULL)
++			return NULL;
++		sel_text = (const *gchar)webkit_dom_range_get_text (viewer->range);
++#else
++		sel_text = (const *gchar)webkit_web_view_get_selected_text(viewer->view);
++#endif
+ 		gtk_clipboard_set_text(wv_clipboard, sel_text, -1);
+ 	}
+ 	return FALSE;
+--- src/fancy_viewer.h	2011-07-01 11:50:25.000000000 +0200
++++ src/fancy_viewer.h	2011-09-30 06:02:45.000000000 +0200
+@@ -113,6 +113,14 @@
+ 	gint              tag;
+ 	gint              loading;
+ 	gint              stop_previous;
++
++	/* DOM Objects */
++#if WEBKIT_CHECK_VERSION(1,5,1)
++	WebKitDOMDocument	  *doc;
++	WebKitDOMDOMWindow    *window;
++	WebKitDOMDOMSelection *selection;
++	WebKitDOMRange		  *range;
++#endif
+ };
+ #define OPEN_INTERNAL FALSE
+ #define OPEN_EXTERNAL TRUE
diff --git a/testing/clutter-gst/PKGBUILD b/testing/clutter-gst/PKGBUILD
new file mode 100644
index 000000000..eca5f998a
--- /dev/null
+++ b/testing/clutter-gst/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 139157 2011-09-30 11:58:56Z ibiru $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+pkgname=clutter-gst
+pkgver=1.4.0
+pkgrel=1
+pkgdesc="GStreamer bindings for clutter"
+arch=('i686' 'x86_64')
+url="http://www.clutter-project.org/"
+license=('LGPL')
+depends=('clutter' 'gstreamer0.10-base' 'libxdamage')
+makedepends=('gobject-introspection' 'gtk-doc')
+options=('!libtool')
+source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('d47b771e1453eec4848bac8d58258058a435319d925b22256a28d348bc8d5270')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/fwbuilder/PKGBUILD b/testing/fwbuilder/PKGBUILD
new file mode 100644
index 000000000..b0e0eb0c8
--- /dev/null
+++ b/testing/fwbuilder/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 139139 2011-09-30 09:12:13Z eric $
+# Maintainer: Kevin Piche <kevin@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+pkgname=fwbuilder
+pkgver=5.0.0.3568
+pkgrel=2
+pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms"
+url="http://www.fwbuilder.org/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libxslt' 'net-snmp' 'qt')
+conflicts=('libfwbuilder')
+install=fwbuilder.install
+source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/5.0.0/fwbuilder-${pkgver}.tar.gz")
+md5sums=('0324edab10329dde029953d646aa8dad')
+
+build() {
+  cd "${srcdir}/fwbuilder-${pkgver}"
+  ./autogen.sh
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/fwbuilder-${pkgver}"
+  make INSTALL_ROOT="${pkgdir}" install
+}
diff --git a/testing/fwbuilder/fwbuilder.install b/testing/fwbuilder/fwbuilder.install
new file mode 100644
index 000000000..45f0c2242
--- /dev/null
+++ b/testing/fwbuilder/fwbuilder.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
+
diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD
index 9792cc7d3..4e9c5a3b2 100644
--- a/testing/gnome-games/PKGBUILD
+++ b/testing/gnome-games/PKGBUILD
@@ -1,16 +1,14 @@
-# $Id: PKGBUILD 138917 2011-09-28 19:30:24Z ibiru $
+# $Id: PKGBUILD 139159 2011-09-30 12:26:55Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-games
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Some Games for GNOME"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed' 'pygobject')
+depends=('libsm' 'gconf' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf')
 makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-provides=('glchess')
-conflicts=('glchess')
 options=('!emptydirs' '!libtool')
 install=gnome-games.install
 url="http://www.gnome.org"
diff --git a/testing/hplip/PKGBUILD b/testing/hplip/PKGBUILD
new file mode 100644
index 000000000..f91e41043
--- /dev/null
+++ b/testing/hplip/PKGBUILD
@@ -0,0 +1,71 @@
+# $Id: PKGBUILD 139141 2011-09-30 09:12:15Z eric $
+# Maintainer : Rémy Oudompheng <remy@archlinux.org>
+# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
+
+pkgname=hplip
+pkgver=3.11.7
+pkgrel=2
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com"
+license=('GPL')
+makedepends=('python2-qt' 'python2-gobject2' 'pkg-config' 'sane' 'rpcbind' 'cups')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+	'libcups>=1.3.10-3' 'net-snmp>=5.7.1' 'libusb-compat')
+optdepends=('cups: for printing support'
+            'dbus-python: for dbus support'
+            'sane: for scanner support'
+            'python-imaging: for commandline scanning support'
+            'python-notify: for Desktop notification support'
+            'rpcbind: for network support'
+            'python2-qt: for running hp-toolbox'
+            'pygobject: for running hp-toolbox'
+            'hplip-plugin: binary blobs for specific devices')
+replaces=('hpijs')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+        hplip-cups-1.5.0-compatibility.patch)
+md5sums=('5cb89a00b0c680d8bf9bf4b4f1f863b1'
+         'f4422ee0dc842e1a53b75c24f468d65c'
+         'a767000ce920e9f7f6a5b0a8e4392ef9')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -p1 -i "$srcdir/hplip-cups-1.5.0-compatibility.patch"
+ export PYTHON=python2
+ find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+ ./configure --prefix=/usr \
+             --enable-qt4 \
+             --enable-foomatic-rip-hplip-install \
+             --enable-foomatic-ppd-install \
+             --enable-hpcups-install \
+             --enable-cups-drv-install \
+             --enable-hpijs-install \
+             --enable-foomatic-drv-install \
+             --enable-pp-build \
+             --enable-udev-acl-rules
+
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
+
+ rm -rf "$pkgdir/etc/sane.d"
+ # remove autostart of hp-daemon
+ rm -r "$pkgdir/etc/xdg"
+ # move udev rules to /lib/udev/rules.d
+ mkdir -p "$pkgdir/lib/udev/rules.d"
+ mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/"
+ rm -r "$pkgdir/etc/udev"
+ # remove lp user, it's not used on archlinux
+ sed -i 's|OWNER="lp", ||g' "$pkgdir/lib/udev/rules.d/40-hplip.rules"
+ # fix sysfs rules
+ sed -i -e "s|SYSFS|ATTR|g" \
+        -e "s|sysfs|attr|g" \
+        -e 's|"bin/sh|"/bin/sh|g' \
+   "$pkgdir/lib/udev/rules.d/56-hpmud_support.rules"
+}
+
diff --git a/testing/hplip/hplip-cups-1.5.0-compatibility.patch b/testing/hplip/hplip-cups-1.5.0-compatibility.patch
new file mode 100644
index 000000000..a4039e6c9
--- /dev/null
+++ b/testing/hplip/hplip-cups-1.5.0-compatibility.patch
@@ -0,0 +1,10 @@
+--- hplip-3.11.7~/prnt/hpps/hppsfilter.c	2011-07-24 18:58:05.000000000 +0000
++++ hplip-3.11.7/prnt/hpps/hppsfilter.c	2011-08-09 20:51:54.150214165 +0000
+@@ -38,6 +38,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
diff --git a/testing/hplip/hplip.install b/testing/hplip/hplip.install
new file mode 100644
index 000000000..cb0eaf8e8
--- /dev/null
+++ b/testing/hplip/hplip.install
@@ -0,0 +1,10 @@
+post_install() {
+  cat << EOF
+
+NOTE
+----
+# If you want to use this driver with sane:
+#  echo "hpaio" >> /etc/sane.d/dll.conf
+
+EOF
+}
diff --git a/testing/hpoj/PKGBUILD b/testing/hpoj/PKGBUILD
new file mode 100644
index 000000000..a523ec699
--- /dev/null
+++ b/testing/hpoj/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 139143 2011-09-30 09:12:18Z eric $
+# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
+
+
+pkgname=hpoj
+pkgver=0.91
+pkgrel=17
+pkgdesc="Hewlett-Packard OfficeJet, PSC, LaserJet, and PhotoSmart printer multi-function peripherals (MFPs) drivers"
+arch=('i686' 'x86_64')
+url="http://hpoj.sourceforge.net"
+license=('GPL' 'custom')
+depends=('perl' 'libusb-compat' 'net-snmp' 'hplip>=1.7.2')
+makedepends=('qt3')
+optdepends=('qt3: for using xojpanel')
+install=hpoj.install
+source=(http://downloads.sourceforge.net/sourceforge/hpoj/$pkgname-$pkgver.tgz \
+	hpoj-gcc4.patch hpoj-kernel26.patch hpoj-pack.patch \
+        hpoj_gcc43.diff hpoj0.91-snmp5.5.patch)
+md5sums=('0e083aeab9b00495aa433fa9465456e0' '347bb155c5dde443a93d92d8e64579a2'\
+         '18481d3dcf6e9cadf0a3d196ee164e37' '1c3b99f1a2178675d56ece29daba0fd7'\
+         '42bb57791cacf83e4d339e3653ad003e' 'af1cf13e95ff2654b84e470d0e18f537')
+sha1sums=('36785cf1a925f569ed3983b8c068620e2c9b4456' 'cd2d37c2620e29b92b96fe779d10a6635c7f31b7'\
+         'fe3328fd7a43ec83d76d0d7fb7be6c41027cddb3' '80258e3190ffb514c20386e8a7cf70ee18df95a5'\
+         '22409b96d7bc67a10384a88c6b710981c0b90078' '4827cfa319bcd74ff8956e1bc69360f319a26c6a')
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+  # adding various patches
+   patch -Np1 -i ../hpoj-gcc4.patch
+   patch -Np1 -i ../hpoj-kernel26.patch
+   patch -Np1 -i ../hpoj-pack.patch
+   patch -Np1 -i ../hpoj_gcc43.diff
+   patch -Np1 -i ../hpoj0.91-snmp5.5.patch
+  ./configure --prefix=/usr
+   make
+}
+
+package() {
+   cd "$srcdir"/$pkgname-$pkgver
+   make prefix="$pkgdir"/usr/ user_install
+   mkdir -p "$pkgdir"/etc/rc.d
+   mkdir -p "$pkgdir"/usr/lib/sane
+   mkdir -p "$pkgdir"/usr/lib/cups/backend
+   install -m 644 lib/sane/libsane-hpoj.so.1.0 "$pkgdir"/usr/lib/sane
+   install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+   install -D -m644 LICENSE.OpenSSL $pkgdir/usr/share/licenses/$pkgname/LICENSE.OpenSSL
+   cd "$pkgdir"/usr/lib/sane  
+   ln -s libsane-hpoj.so.1.0 libsane-hpoj.so
+   ln -s libsane-hpoj.so.1.0 libsane-hpoj.so.1
+   ln -s /usr/sbin/ptal-init "$pkgdir"/etc/rc.d
+   ln -s /usr/sbin/ptal-cups "$pkgdir"/usr/lib/cups/backend/ptal
+ }
diff --git a/testing/hpoj/hpoj-gcc4.patch b/testing/hpoj/hpoj-gcc4.patch
new file mode 100644
index 000000000..ab1c125dd
--- /dev/null
+++ b/testing/hpoj/hpoj-gcc4.patch
@@ -0,0 +1,194 @@
+--- hpoj-0.91/lib/hpojip/xjpg_fix.c.gcc4	2002-07-25 11:01:24.000000000 +0200
++++ hpoj-0.91/lib/hpojip/xjpg_fix.c	2005-03-01 23:05:52.905482223 +0100
+@@ -389,7 +389,7 @@
+ \*****************************************************************************/
+ 
+ 
+-#define MYLOCATE(p) (void *)(p)=(g->headerBuffer+lenAddedHeader)
++#define MYLOCATE(p) (p)=(typeof(p))(g->headerBuffer+lenAddedHeader)
+ #define MYWRITE(p) lenAddedHeader+=sizeof(*(p))
+ #define MYWRITEBUF(data,datalen) \
+     do { \
+--- hpoj-0.91/mlcd/ExMgr.h.gcc4	2003-11-04 02:03:18.000000000 +0100
++++ hpoj-0.91/mlcd/ExMgr.h	2005-03-01 23:38:34.297977986 +0100
+@@ -127,8 +127,8 @@
+ 	QueueEntry(): prev(0),next(0) { } 
+ #ifdef JD_DEBUGLITE
+ 	void dump(void) {
+-		printf("QueueEntry(0x%8.8X): prev=0x%8.8X, next=0x%8.8X\n",
+-			(int)this,(int)prev,(int)next);
++		printf("QueueEntry(%p): prev=%p, next=%p\n",
++			this,prev,next);
+ 	}
+ #endif
+ 	int isEnqueued(void) { return (prev || next); }
+--- hpoj-0.91/mlcd/ExMgr.cpp.gcc4	2003-11-04 02:03:18.000000000 +0100
++++ hpoj-0.91/mlcd/ExMgr.cpp	2005-03-01 23:41:49.408864110 +0100
+@@ -248,8 +248,8 @@
+ 
+ #ifdef JD_DEBUGLITE
+ void ExWatchdogTimer::dump(void) {
+-	printf("pMsgHandler=0x%8.8X\n",(int)pMsgHandler);
+-	printf("pMsg=0x%8.8X\n",(int)pMsg);
++	printf("pMsgHandler=%p\n",pMsgHandler);
++	printf("pMsg=%p\n",pMsg);
+ 	printf("delay=%d seconds, %d usec\n",
+ 		(int)delay.tv_sec,(int)delay.tv_usec);
+ 	printf("cancelled=%d\n",cancelled);
+@@ -1307,13 +1307,13 @@
+ 	printf("\tstate=%d\n",session[scd].state);
+ 	printf("\tfd=%d\n",session[scd].fd);
+ 	printf("\tscdlink=%d\n",session[scd].scdlink);
+-	printf("\tpLookup=0x%8.8X\n",(int)session[scd].pLookup);
++	printf("\tpLookup=%p\n",session[scd].pLookup);
+ 	printf("\toutstandingForwardBdrCount=%d\n",
+ 		session[scd].outstandingForwardBdrCount);
+ 	printf("\tpReverseBdrQueue: depth=%d\n",
+ 		session[scd].pReverseBdrQueue->depth());
+-	printf("\ttcd=0x%8.8X\n",(int)session[scd].tcd);
+-	printf("\tpCommandBdr=0x%8.8X\n",(int)session[scd].pCommandBdr);
++	printf("\ttcd=%p\n",session[scd].tcd);
++	printf("\tpCommandBdr=%p\n",session[scd].pCommandBdr);
+ 	printf("\tpmlTrapsRegistered=%d\n",session[scd].pmlTrapsRegistered);
+ 	printf("\tbitbucketSocket=%d\n",session[scd].bitbucketSocket);
+ 
+@@ -2407,8 +2407,8 @@
+ 	}
+ 	printf("llioPossibleNameCount=%d\n",llioPossibleNameCount);
+ 	printf("llioName=<%s>\n",SAFE_STRING(llioName));
+-	printf("llioGlobBuffer.gl_pathc=%d\n",llioGlobBuffer.gl_pathc);
+-	printf("llioGlobBuffer.gl_offs=%d\n",llioGlobBuffer.gl_offs);
++	printf("llioGlobBuffer.gl_pathc=%lu\n",(unsigned long)llioGlobBuffer.gl_pathc);
++	printf("llioGlobBuffer.gl_offs=%lu\n",(unsigned long)llioGlobBuffer.gl_offs);
+ 	printf("llioGlobFlags=%d\n",llioGlobFlags);
+ 	for (i=0;i<llioMatchDeviceIDCount;i++) {
+ 		printf("llioMatchDeviceID[%d]=<%s>\n",i,
+--- hpoj-0.91/mlcd/transport/ExTransport.cpp.gcc4	2005-03-04 14:00:57.000000000 +0000
++++ hpoj-0.91/mlcd/transport/ExTransport.cpp	2005-03-04 14:03:37.000000000 +0000
+@@ -70,6 +70,7 @@
+ 
+ #ifdef JD_DEBUGLITE
+ void ExLookup::dump(void) {
++#if 0
+ 	printf("sizeof(ExLookup)=%d, this=0x%8.8X\n",
+ 		sizeof(ExLookup),(int)this);
+ 	printf("pService=0x%8.8X\n",
+@@ -82,6 +83,7 @@
+ 		lastSet);
+ 	printf("status=%d\n",
+ 		status);
++#endif
+ }
+ void ExLookup__dump(ExLookup *_this) {
+ 	return _this->dump();
+@@ -316,6 +318,7 @@
+ 
+ #ifdef JD_DEBUGLITE
+ void ExTransportChannel::dump(void) {
++#if 0
+ 	printf("this=0x%8.8X\n",
+ 		(int)this);
+ 	printf("port=%d\n",
+@@ -378,6 +381,7 @@
+ 		currentGrabbedCredit);
+ 	printf("currentGrabbedTransaction=%d\n",
+ 		currentGrabbedTransaction);
++#endif
+ }
+ #endif
+ 
+@@ -922,6 +926,7 @@
+ #ifdef JD_DEBUGLITE
+ 
+ void ExTransport::dump(void) {
++#if 0
+ 	int channel;
+ 
+ 	printf("this=0x%8.8X\n",
+@@ -971,6 +976,7 @@
+     if (pLookupRequest) {
+ 	pLookupRequest->dump();
+     }
++#endif
+ }
+ 
+ void ExTransport::dumpall(void) {
+@@ -1101,7 +1107,7 @@
+ 	ExMsg *pMsg=pMgr->getFreeMsg();
+ 
+ 	pMsg->setType(eEXMSG_ACTIVATE_WAIT);
+-	pMsg->setParams(eEXCLASS_TRANSPORT,(int)this);
++	pMsg->setParams(eEXCLASS_TRANSPORT,(int)(long)this); // HACK
+ 	pMsg->send(pMgr);
+ }
+ 
+@@ -1248,7 +1254,7 @@
+ 	ExMsg *pMsg=pMgr->getFreeMsg();
+ 
+ 	pMsg->setType(eEXMSG_ACTIVATE_RESPONSE);
+-	pMsg->setParams(eEXCLASS_TRANSPORT,(int)this,status);
++	pMsg->setParams(eEXCLASS_TRANSPORT,(int)(long)this,status); // HACK
+ 	pMsg->send(pMgr);
+ }
+ 
+@@ -1282,7 +1288,7 @@
+ 	ExMsg *pMsg=pMgr->getFreeMsg();
+ 
+ 	pMsg->setType(eEXMSG_DEACTIVATE_RESPONSE);
+-	pMsg->setParams(eEXCLASS_TRANSPORT,(int)this,status);
++	pMsg->setParams(eEXCLASS_TRANSPORT,(int)(long)this,status); // HACK
+ 	pMsg->send(pMgr);
+ }
+ 
+--- hpoj-0.91/mlcd/transport/ExMlcTransport.cpp.gcc4	2005-03-04 14:28:28.000000000 +0000
++++ hpoj-0.91/mlcd/transport/ExMlcTransport.cpp	2005-03-04 14:29:40.000000000 +0000
+@@ -409,6 +409,7 @@
+ 
+ #ifdef JD_DEBUGLITE
+ void ExMlcTransportChannel::dump(void) {
++#if 0
+ 	ExTransportChannel::dump();
+ 	printf("----------------\n");
+ 	printf("pMlcTransport=0x%8.8X\n",
+@@ -487,6 +488,7 @@
+ 		countHandleEmptyCreditRequestReply.get());
+ 	printf("isGusher=%d\n",
+ 		isGusher());
++#endif
+ }
+ #endif
+ 
+@@ -1597,6 +1599,7 @@
+ 
+ #ifdef JD_DEBUGLITE
+ void ExMlcTransport::dump(void) {
++#if 0
+ 	int i;
+ 
+ 	ExTransport::dump();
+@@ -1631,6 +1634,7 @@
+ 		remoteSocketArray[i].maxForwardPacketSize,
+ 		remoteSocketArray[i].maxReversePacketSize);
+     }
++#endif
+ }
+ #endif
+ 
+--- hpoj-0.91/mlcd/transport/ExMlcCommandChannel.cpp.gcc4	2005-03-04 14:37:19.000000000 +0000
++++ hpoj-0.91/mlcd/transport/ExMlcCommandChannel.cpp	2005-03-04 14:37:46.000000000 +0000
+@@ -214,6 +214,7 @@
+ 
+ #ifdef JD_DEBUGLITE
+ void ExMlcCommandChannel::dump(void) {
++#if 0
+ 	ExMlcTransportChannel::dump();
+ 	printf("----------------\n");
+ 	printf("pForwardCommandPool=0x%8.8X\n",
+@@ -238,6 +239,7 @@
+ 		lastPsid);
+ 	printf("lastSsid=%d\n",
+ 		lastSsid);
++#endif
+ }
+ #endif
+ 
diff --git a/testing/hpoj/hpoj-kernel26.patch b/testing/hpoj/hpoj-kernel26.patch
new file mode 100644
index 000000000..38b8d0464
--- /dev/null
+++ b/testing/hpoj/hpoj-kernel26.patch
@@ -0,0 +1,86 @@
+--- hpoj-0.91/scripts/ptal-init.in.kernel26	2004-03-03 17:30:47.000000000 +0000
++++ hpoj-0.91/scripts/ptal-init.in	2004-03-03 17:30:59.000000000 +0000
+@@ -90,6 +90,11 @@
+ my $varLock="/var/lock";
+ my $varLockSubsys="$varLock/subsys";
+ my $osPlatform=`uname -s 2>/dev/null`;
++chomp $osPlatform;
++my $linuxVersion=($osPlatform eq 'Linux' ? `uname -r 2>/dev/null` : '');
++$linuxVersion=~s/^(\s*)(\d+\.\d+)(\..*)$/$2/;
++chomp $linuxVersion;
++my $usbprintermodule = ($linuxVersion eq '2.6' ? "usblp" : "printer");
+ my %devnames;
+ my %obsoleteDevnames;
+ my %configInfo;
+@@ -1222,12 +1227,12 @@
+ # undef -- skip USB probe
+ # 0 -- do nothing, proceed with USB probe
+ # >0 -- load printer.o
+-# <0 -- disable and unload printer.o
++# <0 -- disable and unload printer.o/usblp.o
+ sub linuxWhatShouldWeDoAboutUsbPrinterModule {
+ 	my $isSmp=&linuxIsSmp;
+ 	my $libusbSupported=&ptalMlcdSupportsLibusb;
+ 	my $usblpIsLoaded=&linuxUsblpIsLoaded;
+-	my $printerIsLoaded=&linuxModuleIsLoaded("printer");
++	my $printerIsLoaded=&linuxModuleIsLoaded($usbprintermodule);
+ 
+ 	# non-SMP:
+ 	if (!$isSmp) {
+@@ -1261,9 +1266,10 @@
+ 		}
+ 		goto allowInsmodPrinter;
+ 
+-	# SMP, libusb support, some sort of printer.c functionality loaded:
++	# SMP, libusb support, some sort of printer.c/usblp.c
++	# functionality loaded:
+ 	} elsif ($usblpIsLoaded) {
+-	    # printer.c compiled into the kernel:
++	    # printer.c/usblp.c compiled into the kernel:
+ 	    if (!$printerIsLoaded) {
+ 		if (!&askYN(
+ "\n".
+@@ -1280,7 +1286,7 @@
+ 			return undef;
+ 		}
+ 
+-	    # printer.c compiled and loaded as a module:
++	    # printer.c/usblp.c compiled and loaded as a module:
+ 	    } else {
+ promptDisableRmmodPrinter:
+ 		my $r=&askYN(
+@@ -1301,8 +1307,9 @@
+ 		}
+ 	    }
+ 
+-	# SMP, libusb support, printer.c enabled although not loaded:
+-	} elsif (!&linuxModuleIsDisabled("printer")) {
++	# SMP, libusb support, printer.c/usblp.c enabled although not 
++	# loaded:
++	} elsif (!&linuxModuleIsDisabled($usbprintermodule)) {
+ 		goto promptDisableRmmodPrinter;
+ 	}
+ 
+@@ -1326,11 +1333,11 @@
+ 			return 1;
+ 		}
+ 		if ($r<0) {
+-			$r=&linuxDisableAndUnloadModule("printer",
++			$r=&linuxDisableAndUnloadModule($usbprintermodule,
+ "to prevent possible system instability due to SMP+USB");
+ 		} else {
+ linuxJustLoad:
+-			$r=&linuxInsmod("printer",$quiet);
++			$r=&linuxInsmod($usbprintermodule,$quiet);
+ 		}
+ 		if (!$r && !$quiet &&
+ 		    &askYN("\n*** Continue with the USB probe anyway".$msg,0)) {
+@@ -1601,7 +1608,7 @@
+ 
+     } else {
+ 	my $parModulesLoaded=0;
+-	# Don't "modprobe printer" on SMP Linux with libusb support:
++	# Don't "modprobe printer/usblp" on SMP Linux with libusb support:
+ 	my $usbModulesLoaded=
+ 		(&ptalMlcdSupportsLibusb &&
+ 		 $osPlatform=~/Linux/ && &linuxIsSmp);
diff --git a/testing/hpoj/hpoj-pack.patch b/testing/hpoj/hpoj-pack.patch
new file mode 100644
index 000000000..beb7040dc
--- /dev/null
+++ b/testing/hpoj/hpoj-pack.patch
@@ -0,0 +1,59 @@
+There is a rather scary and longstanding GCC bug [1] which causes
+instant crashes if a program defines a struct with function-pointers
+and that structure happens to be "packed".  Why anybody would want to
+do such a thing is beyond me, but suffice it to say that hpoj v0.91 is
+doing precisely that.  The current Debian/sarge package for hpoj is
+definitely affected (any attempt to scan an image results in an
+instant crash).
+
+A patch to work around the problem is attached.
+
+Perhaps the hpoj developers can tell us whether it was really
+intentional to have the #pragma pack(1) span all of <stdlib.h> and
+<xform.h>?
+
+Thanks,
+
+	--david
+
+[1] http://gcc.gnu.org/bugzilla/show_bug.cgi?id=1844
+
+--- hpoj-0.91/include/hpojip.h	2002-07-25 02:01:24.000000000 -0700
++++ hpoj-0.91-davidm/include/hpojip.h	2004-11-11 21:19:58.775236374 -0800
+@@ -131,12 +132,15 @@
+ 	float fl;
+ } DWORD_OR_PVOID;
+ 
++#pragma pack ()
++
+ #ifdef HPOJIP_INTERNAL
+ #include "../lib/hpojip/xform.h"   // this file uses the above definitions
+ #else
+ typedef struct IP_XFORM_TBL_s FAR *LPIP_XFORM_TBL;
+ #endif
+ 
++#pragma pack (1)
+ 
+ /****************************************************************************\
+  ****************************************************************************
+@@ -587,8 +591,6 @@
+ 
+ EXPORT(WORD) ipGetFuncPtrs (LPIP_JUMP_TBL lpJumpTbl);
+ 
+-#pragma pack ()
+-
+ /****************************************************************************\
+  ****************************************************************************
+  *
+
+
+-------------------------------------------------------
+This SF.Net email is sponsored by:
+Sybase ASE Linux Express Edition - download now for FREE
+LinuxWorld Reader's Choice Award Winner for best database on Linux.
+http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
+
+_______________________________________________
+hpoj-devel mailing list
+hpoj-devel@lists.sourceforge.net
+https://lists.sourceforge.net/lists/listinfo/hpoj-devel
diff --git a/testing/hpoj/hpoj.install b/testing/hpoj/hpoj.install
new file mode 100644
index 000000000..acce9b033
--- /dev/null
+++ b/testing/hpoj/hpoj.install
@@ -0,0 +1,7 @@
+post_install() {
+cat << EOF
+==> To get the HP-Officejet working run as root: ptal-init setup
+==> Add ptal-init to /etc/rc.conf daemon list and place it before cups is started!
+==> To access scanner enable in /etc/sane.d/dll.conf hpoj line.
+EOF
+}
diff --git a/testing/hpoj/hpoj0.91-snmp5.5.patch b/testing/hpoj/hpoj0.91-snmp5.5.patch
new file mode 100644
index 000000000..2042d6f1a
--- /dev/null
+++ b/testing/hpoj/hpoj0.91-snmp5.5.patch
@@ -0,0 +1,11 @@
+diff -Naur hpoj-0.91-orig/lib/ptal/ptal-hpjd.c hpoj-0.91/lib/ptal/ptal-hpjd.c
+--- hpoj-0.91-orig/lib/ptal/ptal-hpjd.c	2010-02-19 22:33:54.000000000 -0500
++++ hpoj-0.91/lib/ptal/ptal-hpjd.c	2010-02-19 22:34:45.000000000 -0500
+@@ -45,6 +45,7 @@
+ #include <stdlib.h>
+ 
+ #ifdef HAVE_SNMP
++#include <net-snmp/net-snmp-config.h>
+ #include <asn1.h>
+ #include <snmp.h>
+ #include <snmp_api.h>
diff --git a/testing/hpoj/hpoj_gcc43.diff b/testing/hpoj/hpoj_gcc43.diff
new file mode 100644
index 000000000..099c9d755
--- /dev/null
+++ b/testing/hpoj/hpoj_gcc43.diff
@@ -0,0 +1,20 @@
+diff -Nru --exclude changelog hpoj-0.91/mlcd/transport/ExMlcTransport.h hpoj-0.91/mlcd/transport/ExMlcTransport.h
+--- hpoj-0.91/mlcd/transport/ExMlcTransport.h	2003-11-04 06:33:19.000000000 +0530
++++ hpoj-0.91/mlcd/transport/ExMlcTransport.h	2008-03-20 10:14:02.000000000 +0530
+@@ -888,14 +888,14 @@
+ 	void remsockReset(void);
+     public:
+ 	STATUS remsockLookup(int socketID,int *pState,
+-	    int *pMaxForwardPacketSize,int *pMaxForwardPacketSize);
++	    int *pMaxForwardPacketSize,int *pMaxForwardPacketSize2);
+ 	STATUS remsockAdd(int socketID);
+ 	void handleConfigSocketReply(int result,int socketID,
+ 	    int maxPriToSecPacketSize,int maxSecToPriPacketSize,
+ 	    int statusLevel);
+     protected:
+ 	STATUS remsockUpdate(int socketID,
+-	    int maxForwardPacketSize,int maxForwardPacketSize);
++	    int maxForwardPacketSize,int maxForwardPacketSize2);
+ 	STATUS remsockDelete(int socketID);
+ 
+ 	// Peripheral-initiated opens (not supported):
diff --git a/testing/icedtea-web-java7/PKGBUILD b/testing/icedtea-web-java7/PKGBUILD
index 91d3c1290..5aa4b468f 100644
--- a/testing/icedtea-web-java7/PKGBUILD
+++ b/testing/icedtea-web-java7/PKGBUILD
@@ -4,16 +4,18 @@
 pkgbase=icedtea-web-java7
 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
 pkgver=1.1.3
-_date=20110925
-pkgrel=0.${_date}.1
+#_date=20110925
+#pkgrel=0.${_date}.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
 makedepends=('jdk7-openjdk' 'zip' 'xulrunner')
-source=(ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz)
+source=(#ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz
+	http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
 	#http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz
-md5sums=('5da8a5aa74fb92fcb84cb9921c909ab1')
-sha1sums=('b9b1fb5ee4f280945cd22731af49f25038592607')
+md5sums=('0e2e653c7436d81edcbc1d4255571ab6')
+sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37')
 
 _javaver=7
 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
diff --git a/testing/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch b/testing/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch
new file mode 100644
index 000000000..5352688a2
--- /dev/null
+++ b/testing/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch
@@ -0,0 +1,40 @@
+From 715c6ddf3de90936c9ba7a6bb6904b7072d3b241 Mon Sep 17 00:00:00 2001
+From: Ionut Biru <ibiru@archlinux.org>
+Date: Fri, 30 Sep 2011 10:57:14 +0000
+Subject: [PATCH] Avoid use of deprecated G_CONST_RETURN
+
+Signed-off-by: Ionut Biru <ibiru@archlinux.org>
+---
+ libepc/enums.c.in |    2 +-
+ libepc/enums.h.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libepc/enums.c.in b/libepc/enums.c.in
+index 75f737c..bc81b84 100644
+--- a/libepc/enums.c.in
++++ b/libepc/enums.c.in
+@@ -65,7 +65,7 @@ G@Type@Class*
+  *
+  * Returns: The string representation of @value, or %NULL.
+  */
+-G_CONST_RETURN gchar*
++const gchar*
+ @enum_name@_to_string (@EnumName@ value)
+ {
+   const G@Type@Value *@type@_value = g_@type@_get_value (@enum_name@_get_class (), value);
+diff --git a/libepc/enums.h.in b/libepc/enums.h.in
+index fea8b07..48973e5 100644
+--- a/libepc/enums.h.in
++++ b/libepc/enums.h.in
+@@ -19,7 +19,7 @@ G_BEGIN_DECLS
+ 
+ GType                 @enum_name@_get_type  (void) G_GNUC_CONST;
+ G@Type@Class*           @enum_name@_get_class (void) G_GNUC_CONST;
+-G_CONST_RETURN gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE;
++const gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE;
+ /*** END value-header ***/
+ 
+ /*** BEGIN file-tail ***/
+-- 
+1.7.6.4
+
diff --git a/testing/libepc/PKGBUILD b/testing/libepc/PKGBUILD
new file mode 100644
index 000000000..21b5e79d7
--- /dev/null
+++ b/testing/libepc/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 139151 2011-09-30 11:14:26Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=libepc
+pkgver=0.4.1
+pkgrel=1
+pkgdesc="Easy Publish and Consume Library"
+arch=(i686 x86_64)
+license=('LGPL')
+url="http://live.gnome.org/libepc"
+depends=('gtk3' 'avahi' 'libsoup')
+makedepends=('intltool' 'gtk-doc' 'gnome-common')
+options=('!libtool' '!makeflags')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.xz
+        0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch)
+sha256sums=('1377defd339122a5ef71509d3b761810c58f178985d655b74bc34760ef4ae49e'
+            'd2bcfd72abc4cd74975a70c667c38d88154117d1eef10a8e8b75bc07cb1dde06')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch"
+  gnome-autogen.sh
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
+
diff --git a/testing/net-snmp/PKGBUILD b/testing/net-snmp/PKGBUILD
new file mode 100644
index 000000000..4f3080b9e
--- /dev/null
+++ b/testing/net-snmp/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 139145 2011-09-30 09:12:20Z eric $
+# Maintainer: 
+# Contributor: Dale Blount <dale@archlinux.org>
+
+pkgname=net-snmp
+pkgver=5.7.1
+pkgrel=1
+pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
+arch=('i686' 'x86_64')
+url="http://www.net-snmp.org/"
+license=('BSD')
+depends=('openssl' 'libnl' 'pciutils')
+makedepends=('python2-distribute')
+optdepends=('perl-term-readkey: for snmpcheck application' 
+            'perl-tk: for snmpcheck and tkmib applications'
+            'python2: for the python modules')
+provides=('ucd-snmp')
+backup=('etc/conf.d/snmpd')
+options=('!libtool' '!makeflags' '!emptydirs')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
+        snmpd.confd snmpd.rc)
+sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a'
+          '2bdc2839ce09d7daa608cd54687fa8beb47ed907'
+          'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b'
+          '90600c0141eed10d6e3ca3ccc97ad8dda15c2112')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in
+  PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --mandir=/usr/share/man \
+    --enable-ucd-snmp-compatibility \
+    --enable-ipv6 \
+    --with-python-modules \
+    --with-default-snmp-version="3" \
+    --with-sys-contact="root@localhost" \
+    --with-sys-location="Unknown" \
+    --with-logfile="/var/log/snmpd.log" \
+    --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \
+    --with-persistent-directory="/var/net-snmp"
+  make NETSNMP_DONT_CHECK_VERSION=1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install
+  install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
+  install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/testing/net-snmp/snmpd.confd b/testing/net-snmp/snmpd.confd
new file mode 100644
index 000000000..926b09bbf
--- /dev/null
+++ b/testing/net-snmp/snmpd.confd
@@ -0,0 +1,5 @@
+#
+# Parameters to be passed to snmpd
+#
+SNMPD_ARGS=""
+
diff --git a/testing/net-snmp/snmpd.rc b/testing/net-snmp/snmpd.rc
new file mode 100644
index 000000000..b00c09f4f
--- /dev/null
+++ b/testing/net-snmp/snmpd.rc
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/snmpd
+
+PID=`pidof -o %PPID /usr/sbin/snmpd`
+case "$1" in
+  start)
+    stat_busy "Starting Net-SNMP"
+    [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      echo $PID > /var/run/snmpd.pid
+      add_daemon snmpd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Net-SNMP"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm /var/run/snmpd.pid
+      rm_daemon snmpd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 2
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD
new file mode 100644
index 000000000..67e323089
--- /dev/null
+++ b/testing/php/PKGBUILD
@@ -0,0 +1,363 @@
+# $Id: PKGBUILD 139147 2011-09-30 09:12:23Z eric $
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+
+pkgbase=php
+pkgname=('php'
+         'php-cgi'
+         'php-apache'
+         'php-fpm'
+         'php-embed'
+         'php-pear'
+         'php-enchant'
+         'php-gd'
+         'php-intl'
+         'php-ldap'
+         'php-mcrypt'
+         'php-mssql'
+         'php-odbc'
+         'php-pgsql'
+         'php-pspell'
+         'php-snmp'
+         'php-sqlite'
+         'php-tidy'
+         'php-xsl')
+pkgver=5.3.8
+_suhosinver=5.3.7-0.9.10
+pkgrel=4
+arch=('i686' 'x86_64')
+license=('PHP')
+url='http://www.php.net'
+makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
+             'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
+             'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
+             'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
+source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
+        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
+        'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
+        'logrotate.d.php-fpm')
+md5sums=('704cd414a0565d905e1074ffdc1fadfb'
+         '08582e502fed8221c6577042ca45ddb8'
+         '65606c606df97a0760dfe5aaf9893afc'
+         'dec2cbaad64e3abf4f0ec70e1de4e8e9'
+         'b01be5f816988fcee7e78225836e5e27'
+         '09005dabd90c48ddd392b3dbf05f8a82'
+         '07c4e412909ac65a44ec90e7a2c4bade')
+
+build() {
+	phpconfig="--srcdir=../${pkgbase}-${pkgver} \
+		--prefix=/usr \
+		--sysconfdir=/etc/php \
+		--localstatedir=/var \
+		--with-layout=GNU \
+		--with-config-file-path=/etc/php \
+		--with-config-file-scan-dir=/etc/php/conf.d \
+		--enable-inline-optimization \
+		--disable-debug \
+		--disable-rpath \
+		--disable-static \
+		--enable-shared \
+		--mandir=/usr/share/man \
+		--without-pear \
+		"
+
+	phpextensions="--enable-bcmath=shared \
+		--enable-calendar=shared \
+		--enable-dba=shared \
+		--enable-exif=shared \
+		--enable-ftp=shared \
+		--enable-gd-native-ttf \
+		--enable-intl=shared \
+		--enable-json=shared \
+		--enable-mbregex \
+		--enable-mbstring \
+		--enable-pdo \
+		--enable-phar=shared \
+		--enable-posix=shared \
+		--enable-session \
+		--enable-shmop=shared \
+		--enable-soap=shared \
+		--enable-sockets=shared \
+		--enable-sqlite-utf8 \
+		--enable-sysvmsg=shared \
+		--enable-sysvsem=shared \
+		--enable-sysvshm=shared \
+		--enable-xml \
+		--enable-zip=shared \
+		--with-bz2=shared \
+		--with-curl=shared \
+		--with-db4=/usr \
+		--with-enchant=shared,/usr \
+		--with-freetype-dir=shared,/usr \
+		--with-gd=shared \
+		--with-gdbm=shared \
+		--with-gettext=shared \
+		--with-gmp=shared \
+		--with-iconv=shared \
+		--with-icu-dir=/usr \
+		--with-imap-ssl=shared \
+		--with-imap=shared \
+		--with-jpeg-dir=shared,/usr \
+		--with-ldap=shared \
+		--with-ldap-sasl \
+		--with-mcrypt=shared \
+		--with-mhash \
+		--with-mssql=shared \
+		--with-mysql-sock=/var/run/mysqld/mysqld.sock \
+		--with-mysql=shared,mysqlnd \
+		--with-mysqli=shared,mysqlnd \
+		--with-openssl=shared \
+		--with-pcre-regex=/usr \
+		--with-pdo-mysql=shared,mysqlnd \
+		--with-pdo-odbc=shared,unixODBC,/usr \
+		--with-pdo-pgsql=shared \
+		--with-pdo-sqlite=shared,/usr \
+		--with-pgsql=shared \
+		--with-png-dir=shared,/usr \
+		--with-pspell=shared \
+		--with-regex=php \
+		--with-snmp=shared \
+		--with-sqlite3=shared,/usr \
+		--with-sqlite=shared \
+		--with-tidy=shared \
+		--with-unixODBC=shared,/usr \
+		--with-xmlrpc=shared \
+		--with-xsl=shared \
+		--with-zlib \
+		--without-db2 \
+		--without-db3 \
+		"
+
+	EXTENSION_DIR=/usr/lib/php/modules
+	export EXTENSION_DIR
+	PEAR_INSTALLDIR=/usr/share/pear
+	export PEAR_INSTALLDIR
+
+	cd ${srcdir}/${pkgbase}-${pkgver}
+
+	# apply suhosin patch
+	patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
+
+	# adjust paths
+	patch -p0 -i ${srcdir}/php.ini.patch
+	patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
+
+	# php
+	mkdir ${srcdir}/build-php
+	cd ${srcdir}/build-php
+	ln -s ../${pkgbase}-${pkgver}/configure
+	./configure ${phpconfig} \
+		--disable-cgi \
+		--with-readline \
+		--enable-pcntl \
+		${phpextensions}
+	make
+
+	# cgi and fcgi
+	# reuse the previous run; this will save us a lot of time
+	cp -a ${srcdir}/build-php ${srcdir}/build-cgi
+	cd ${srcdir}/build-cgi
+	./configure ${phpconfig} \
+		--disable-cli \
+		--enable-cgi \
+		${phpextensions}
+	make
+
+	# apache
+	cp -a ${srcdir}/build-php ${srcdir}/build-apache
+	cd ${srcdir}/build-apache
+	./configure ${phpconfig} \
+		--disable-cli \
+		--with-apxs2 \
+		${phpextensions}
+	make
+
+	# fpm
+	cp -a ${srcdir}/build-php ${srcdir}/build-fpm
+	cd ${srcdir}/build-fpm
+	./configure ${phpconfig} \
+		--disable-cli \
+		--enable-fpm \
+		--with-fpm-user=http \
+		--with-fpm-group=http \
+		${phpextensions}
+	make
+
+	# embed
+	cp -a ${srcdir}/build-php ${srcdir}/build-embed
+	cd ${srcdir}/build-embed
+	./configure ${phpconfig} \
+		--disable-cli \
+		--enable-embed=shared \
+		${phpextensions}
+	make
+
+	# pear
+	cp -a ${srcdir}/build-php ${srcdir}/build-pear
+	cd ${srcdir}/build-pear
+	./configure ${phpconfig} \
+		--disable-cgi \
+		--with-readline \
+		--enable-pcntl \
+		--with-pear \
+		${phpextensions}
+	make
+}
+
+# check() {
+# 	cd ${srcdir}/build-php
+# 	make test
+# }
+
+package_php() {
+	pkgdesc='An HTML-embedded scripting language'
+	depends=('pcre' 'libxml2' 'bzip2' 'curl')
+	replaces=('php-fileinfo' 'php-gmp' 'php-curl')
+	provides=('php-fileinfo' 'php-gmp' 'php-curl')
+	conflicts=('php-fileinfo' 'php-gmp' 'php-curl')
+	backup=('etc/php/php.ini')
+
+	cd ${srcdir}/build-php
+	make -j1 INSTALL_ROOT=${pkgdir} install
+	install -d -m755 ${pkgdir}/usr/share/pear
+	# install php.ini
+	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini
+	install -d -m755 ${pkgdir}/etc/php/conf.d/
+
+	# remove static modules
+	rm -f ${pkgdir}/usr/lib/php/modules/*.a
+	# remove modules provided by sub packages
+	rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
+	# remove empty directory
+	rmdir ${pkgdir}/usr/include/php/include
+}
+
+package_php-cgi() {
+	pkgdesc='CGI and FCGI SAPI for PHP'
+	depends=('php')
+
+	install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi
+}
+
+package_php-apache() {
+	pkgdesc='Apache SAPI for PHP'
+	depends=('php' 'apache')
+	backup=('etc/httpd/conf/extra/php5_module.conf')
+
+	install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so
+	install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf
+}
+
+package_php-fpm() {
+	pkgdesc='FastCGI Process Manager for PHP'
+	depends=('php')
+	backup=('etc/php/php-fpm.conf')
+
+	install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm
+	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8
+	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf
+	install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm
+	install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm
+	install -d -m755 ${pkgdir}/etc/php/fpm.d
+}
+
+package_php-embed() {
+	pkgdesc='Embed SAPI for PHP'
+	depends=('php')
+
+	install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so
+	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h
+}
+
+package_php-pear() {
+	pkgdesc='PHP Extension and Application Repository'
+	depends=('php')
+	backup=('etc/php/pear.conf')
+
+	cd ${srcdir}/build-pear
+	make -j1 install-pear INSTALL_ROOT=${pkgdir}
+	local i
+	while read i; do
+		[ ! -e "$i" ] || rm -rf "$i"
+	done < <(find ${pkgdir} -name '.*')
+}
+
+package_php-enchant() {
+	depends=('php' 'enchant')
+	pkgdesc='enchant module for PHP'
+	install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so
+}
+
+package_php-gd() {
+	depends=('php' 'libpng' 'libjpeg' 'freetype2')
+	pkgdesc='gd module for PHP'
+	install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
+}
+
+package_php-intl() {
+	depends=('php' 'icu')
+	pkgdesc='intl module for PHP'
+	install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so
+}
+
+package_php-ldap() {
+	depends=('php' 'libldap')
+	pkgdesc='ldap module for PHP'
+	install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so
+}
+
+package_php-mcrypt() {
+	depends=('php' 'libmcrypt' 'libltdl')
+	pkgdesc='mcrypt module for PHP'
+	install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so
+}
+
+package_php-mssql() {
+	depends=('php' 'freetds')
+	pkgdesc='mssql module for PHP'
+	install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so
+}
+
+package_php-odbc() {
+	depends=('php' 'unixodbc')
+	pkgdesc='ODBC modules for PHP'
+	install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so
+	install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so
+}
+
+package_php-pgsql() {
+	depends=('php' 'postgresql-libs')
+	pkgdesc='PostgreSQL modules for PHP'
+	install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so
+	install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so
+}
+
+package_php-pspell() {
+	depends=('php' 'aspell')
+	pkgdesc='pspell module for PHP'
+	install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so
+}
+
+package_php-snmp() {
+	depends=('php' 'net-snmp')
+	pkgdesc='snmp module for PHP'
+	install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so
+}
+
+package_php-sqlite() {
+	depends=('php' 'sqlite3')
+	pkgdesc='sqlite3 module for PHP'
+	install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so
+	install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so
+}
+
+package_php-tidy() {
+	depends=('php' 'tidyhtml')
+	pkgdesc='tidy module for PHP'
+	install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so
+}
+
+package_php-xsl() {
+	depends=('php' 'libxslt')
+	pkgdesc='xsl module for PHP'
+	install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so
+}
diff --git a/testing/php/apache.conf b/testing/php/apache.conf
new file mode 100644
index 000000000..c3ca0aad5
--- /dev/null
+++ b/testing/php/apache.conf
@@ -0,0 +1,13 @@
+# Required modules: dir_module, php5_module
+
+<IfModule dir_module>
+	<IfModule php5_module>
+		DirectoryIndex index.php index.html
+		<FilesMatch "\.php$">
+			SetHandler application/x-httpd-php
+		</FilesMatch>
+		<FilesMatch "\.phps$">
+			SetHandler application/x-httpd-php-source
+		</FilesMatch>
+	</IfModule>
+</IfModule>
diff --git a/testing/php/logrotate.d.php-fpm b/testing/php/logrotate.d.php-fpm
new file mode 100644
index 000000000..7a1ba2597
--- /dev/null
+++ b/testing/php/logrotate.d.php-fpm
@@ -0,0 +1,6 @@
+/var/log/php-fpm.log {
+	missingok
+	postrotate
+	/etc/rc.d/php-fpm logrotate >/dev/null || true
+	endscript
+}
diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch
new file mode 100644
index 000000000..b4dd32f96
--- /dev/null
+++ b/testing/php/php-fpm.conf.in.patch
@@ -0,0 +1,80 @@
+--- sapi/fpm/php-fpm.conf.in	2011-07-04 23:22:56.000000000 +0200
++++ sapi/fpm/php-fpm.conf.in	2011-08-12 16:56:23.686606725 +0200
+@@ -12,7 +12,7 @@
+ ; Relative path can also be used. They will be prefixed by:
+ ;  - the global prefix if it's been set (-p arguement)
+ ;  - @prefix@ otherwise
+-;include=etc/fpm.d/*.conf
++;include=/etc/php/fpm.d/*.conf
+ 
+ ;;;;;;;;;;;;;;;;;;
+ ; Global Options ;
+@@ -22,7 +22,7 @@
+ ; Pid file
+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+ ; Default Value: none
+-;pid = run/php-fpm.pid
++pid = run/php-fpm/php-fpm.pid
+ 
+ ; Error log file
+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+@@ -102,7 +102,8 @@
+ ;                            specific port;
+ ;   '/path/to/unix/socket' - to listen on a unix socket.
+ ; Note: This value is mandatory.
+-listen = 127.0.0.1:9000
++;listen = 127.0.0.1:9000
++listen = /var/run/php-fpm/php-fpm.sock
+ 
+ ; Set listen(2) backlog. A value of '-1' means unlimited.
+ ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
+@@ -121,9 +122,9 @@
+ ; BSD-derived systems allow connections regardless of permissions. 
+ ; Default Values: user and group are set as the running user
+ ;                 mode is set to 0666
+-;listen.owner = @php_fpm_user@
+-;listen.group = @php_fpm_group@
+-;listen.mode = 0666
++listen.owner = @php_fpm_user@
++listen.group = @php_fpm_group@
++listen.mode = 0660
+ 
+ ; Unix user/group of processes
+ ; Note: The user is mandatory. If the group is not set, the default user's group
+@@ -163,23 +164,23 @@
+ ; The number of child processes created on startup.
+ ; Note: Used only when pm is set to 'dynamic'
+ ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
+-;pm.start_servers = 20
++pm.start_servers = 20
+ 
+ ; The desired minimum number of idle server processes.
+ ; Note: Used only when pm is set to 'dynamic'
+ ; Note: Mandatory when pm is set to 'dynamic'
+-;pm.min_spare_servers = 5
++pm.min_spare_servers = 5
+ 
+ ; The desired maximum number of idle server processes.
+ ; Note: Used only when pm is set to 'dynamic'
+ ; Note: Mandatory when pm is set to 'dynamic'
+-;pm.max_spare_servers = 35
++pm.max_spare_servers = 35
+  
+ ; The number of requests each child process should execute before respawning.
+ ; This can be useful to work around memory leaks in 3rd party libraries. For
+ ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
+ ; Default Value: 0
+-;pm.max_requests = 500
++pm.max_requests = 500
+ 
+ ; The URI to view the FPM status page. If this value is not set, no URI will be
+ ; recognized as a status page. By default, the status page shows the following
+@@ -333,7 +334,7 @@
+ ; Chdir to this directory at the start.
+ ; Note: relative path can be used.
+ ; Default Value: current directory or / when chroot
+-;chdir = /var/www
++;chdir = /srv/http
+  
+ ; Redirect worker stdout and stderr into main error log. If not set, stdout and
+ ; stderr will be redirected to /dev/null according to FastCGI specs.
diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch
new file mode 100644
index 000000000..46c842921
--- /dev/null
+++ b/testing/php/php.ini.patch
@@ -0,0 +1,126 @@
+--- php.ini-production	2011-02-09 01:25:44.000000000 +0100
++++ php.ini-production	2011-03-19 11:11:44.496987763 +0100
+@@ -376,7 +376,7 @@
+ ; or per-virtualhost web server configuration file. This directive is
+ ; *NOT* affected by whether Safe Mode is turned On or Off.
+ ; http://php.net/open-basedir
+-;open_basedir =
++open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/
+ 
+ ; This directive allows you to disable certain functions for security reasons.
+ ; It receives a comma-delimited list of function names. This directive is
+@@ -781,7 +781,7 @@
+ ;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ ; UNIX: "/path1:/path2"
+-;include_path = ".:/php/includes"
++include_path = ".:/usr/share/pear"
+ ;
+ ; Windows: "\path1;\path2"
+ ;include_path = ".;c:\php\includes"
+@@ -804,7 +804,7 @@
+ 
+ ; Directory in which the loadable extensions (modules) reside.
+ ; http://php.net/extension-dir
+-; extension_dir = "./"
++extension_dir = "/usr/lib/php/modules/"
+ ; On windows:
+ ; extension_dir = "ext"
+ 
+@@ -938,53 +938,49 @@
+ ; If you only provide the name of the extension, PHP will look for it in its
+ ; default extension directory.
+ ;
+-; Windows Extensions
+-; Note that ODBC support is built in, so no dll is needed for it.
+-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
+-; extension folders as well as the separate PECL DLL download (PHP 5).
+-; Be sure to appropriately set the extension_dir directive.
+-;
+-;extension=php_bz2.dll
+-;extension=php_curl.dll
+-;extension=php_fileinfo.dll
+-;extension=php_gd2.dll
+-;extension=php_gettext.dll
+-;extension=php_gmp.dll
+-;extension=php_intl.dll
+-;extension=php_imap.dll
+-;extension=php_interbase.dll
+-;extension=php_ldap.dll
+-;extension=php_mbstring.dll
+-;extension=php_exif.dll      ; Must be after mbstring as it depends on it
+-;extension=php_mysql.dll
+-;extension=php_mysqli.dll
+-;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
+-;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
+-;extension=php_openssl.dll
+-;extension=php_pdo_firebird.dll
+-;extension=php_pdo_mssql.dll
+-;extension=php_pdo_mysql.dll
+-;extension=php_pdo_oci.dll
+-;extension=php_pdo_odbc.dll
+-;extension=php_pdo_pgsql.dll
+-;extension=php_pdo_sqlite.dll
+-;extension=php_pgsql.dll
+-;extension=php_pspell.dll
+-;extension=php_shmop.dll
+-
+-; The MIBS data available in the PHP distribution must be installed. 
+-; See http://www.php.net/manual/en/snmp.installation.php 
+-;extension=php_snmp.dll
+-
+-;extension=php_soap.dll
+-;extension=php_sockets.dll
+-;extension=php_sqlite.dll
+-;extension=php_sqlite3.dll
+-;extension=php_sybase_ct.dll
+-;extension=php_tidy.dll
+-;extension=php_xmlrpc.dll
+-;extension=php_xsl.dll
+-;extension=php_zip.dll
++;extension=bcmath.so
++;extension=bz2.so
++;extension=calendar.so
++extension=curl.so
++;extension=dba.so
++;extension=enchant.so
++;extension=exif.so
++;extension=ftp.so
++;extension=gd.so
++extension=gettext.so
++;extension=gmp.so
++;extension=iconv.so
++;extension=imap.so
++;extension=intl.so
++extension=json.so
++;extension=ldap.so
++;extension=mcrypt.so
++;extension=mssql.so
++;extension=mysqli.so
++;extension=mysql.so
++;extension=odbc.so
++;extension=openssl.so
++;extension=pdo_mysql.so
++;extension=pdo_odbc.so
++;extension=pdo_pgsql.so
++;extension=pdo_sqlite.so
++;extension=pgsql.so
++;extension=phar.so
++;extension=posix.so
++;extension=pspell.so
++;extension=shmop.so
++;extension=snmp.so
++;extension=soap.so
++;extension=sockets.so
++;extension=sqlite3.so
++;extension=sqlite.so
++;extension=sysvmsg.so
++;extension=sysvsem.so
++;extension=sysvshm.so
++;extension=tidy.so
++;extension=xmlrpc.so
++;extension=xsl.so
++;extension=zip.so
+ 
+ ;;;;;;;;;;;;;;;;;;;
+ ; Module Settings ;
diff --git a/testing/php/rc.d.php-fpm b/testing/php/rc.d.php-fpm
new file mode 100644
index 000000000..54bcf4d5b
--- /dev/null
+++ b/testing/php/rc.d.php-fpm
@@ -0,0 +1,158 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+
+wait_for_pid () {
+	try=0
+	while test $try -lt 35 ; do
+		case "$1" in
+			'created')
+			if [ -f "$2" ] ; then
+				try=''
+				break
+			fi
+			;;
+			'removed')
+			if [ ! -f "$2" ] ; then
+				try=''
+				break
+			fi
+			;;
+		esac
+
+		stat_append '.'
+		try=`expr $try + 1`
+		sleep 1
+	done
+}
+
+test_config() {
+	stat_busy 'Checking configuration'
+	if [ $(id -u) -ne 0 ]; then
+		stat_append '(This script must be run as root)'
+		stat_die
+	fi
+
+	if [ ! -r /etc/php/php-fpm.conf ]; then
+		stat_append '(/etc/php/php-fpm.conf not found)'
+		stat_die
+	fi
+
+	local test=$(/usr/sbin/php-fpm -t 2>&1)
+	if [ $? -gt 0 ]; then
+		stat_append '(error in /etc/php/php-fpm.conf)'
+		stat_die
+	elif echo $test | grep -qi 'error'; then
+		stat_append '(error in /etc/php/php.ini)'
+		stat_die
+	fi
+
+	[ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm
+
+	stat_done
+}
+
+case "$1" in
+	start)
+		test_config
+		stat_busy 'Starting php-fpm'
+
+		/usr/sbin/php-fpm
+
+		if [ "$?" != 0 ] ; then
+			stat_fail
+			exit 1
+		fi
+
+		wait_for_pid created /var/run/php-fpm/php-fpm.pid
+
+		if [ -n "$try" ] ; then
+			stat_fail
+			exit 1
+		else
+			add_daemon php-fpm
+			stat_done
+		fi
+	;;
+
+	stop)
+		test_config
+		stat_busy 'Gracefully shutting down php-fpm'
+
+		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
+			stat_fail
+			exit 1
+		fi
+
+		kill -QUIT `cat /var/run/php-fpm/php-fpm.pid`
+
+		wait_for_pid removed /var/run/php-fpm.pid
+
+		if [ -n "$try" ] ; then
+			stat_fail
+			exit 1
+		else
+			rm_daemon php-fpm
+			stat_done
+		fi
+	;;
+
+	force-quit)
+		stat_busy 'Terminating php-fpm'
+
+		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
+			stat_fail
+			exit 1
+		fi
+
+		kill -TERM `cat /var/run/php-fpm/php-fpm.pid`
+
+		wait_for_pid removed /var/run/php-fpm/php-fpm.pid
+
+		if [ -n "$try" ] ; then
+			stat_fail
+			exit 1
+		else
+			rm_daemon php-fpm
+			stat_done
+		fi
+	;;
+
+	restart)
+		$0 stop
+		$0 start
+	;;
+
+	reload)
+		test_config
+		stat_busy 'Reload service php-fpm'
+
+		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
+			stat_fail
+			exit 1
+		fi
+
+		kill -USR2 `cat /var/run/php-fpm/php-fpm.pid`
+		stat_done
+	;;
+
+	logrotate)
+		stat_busy 'Reopen php-fpm log'
+
+		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
+			stat_fail
+			exit 1
+		fi
+
+		kill -USR1 `cat /var/run/php-fpm/php-fpm.pid`
+		stat_done
+	;;
+
+	*)
+		echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}"
+		exit 1
+	;;
+
+esac
diff --git a/testing/telepathy-glib/PKGBUILD b/testing/telepathy-glib/PKGBUILD
index a4ae11451..73f2c19af 100644
--- a/testing/telepathy-glib/PKGBUILD
+++ b/testing/telepathy-glib/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 139057 2011-09-28 19:33:16Z ibiru $
+# $Id: PKGBUILD 139169 2011-09-30 19:17:32Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 
 pkgname=telepathy-glib
-pkgver=0.15.5
-pkgrel=1
+pkgver=0.15.6
+pkgrel=2
 pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
 arch=('i686' 'x86_64')
 url="http://telepathy.freedesktop.org"
@@ -14,11 +14,14 @@ license=('LGPL2.1')
 options=('!libtool' '!emptydirs')
 depends=('dbus-glib')
 makedepends=('libxslt' 'vala' 'gobject-introspection')
-source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('18c93456fcf3568e47c6a6342b8c46f5')
+source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        fix_gnome-shell.patch)
+md5sums=('37881cb8d2a33184cf5957db809b8278'
+         '015037782eeb8658a9fb093f49a2097f')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
+    patch -Np1 -i "${srcdir}/fix_gnome-shell.patch"
     PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
         --libexecdir=/usr/lib/telepathy \
         --enable-vala-bindings \
diff --git a/testing/telepathy-glib/fix_gnome-shell.patch b/testing/telepathy-glib/fix_gnome-shell.patch
new file mode 100644
index 000000000..425a6ce48
--- /dev/null
+++ b/testing/telepathy-glib/fix_gnome-shell.patch
@@ -0,0 +1,123 @@
+commit 014135b89d23f15464d8a82f462ed0f9f98344e0
+Author: Jan Steffens <jan.steffens@gmail.com>
+Date:   Fri Sep 30 21:09:25 2011 +0200
+
+    Revert "Sort alphabetically introspected files"
+    
+    This reverts commit 48998822d5e9575af822c1936b35be514dc2401b.
+    
+    Conflicts:
+    
+    	telepathy-glib/introspection.am
+
+diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am
+index 2027c5f..0c867cc 100644
+--- a/telepathy-glib/introspection.am
++++ b/telepathy-glib/introspection.am
+@@ -8,63 +8,64 @@ introspection_extra_dist = \
+ if HAVE_INTROSPECTION
+ 
+ INTROSPECTION_FILES = \
++	$(srcdir)/proxy.c _gen/proxy-introspectable.h \
+ 	$(srcdir)/account.c $(srcdir)/account.h \
+ 	$(srcdir)/account-channel-request.c $(srcdir)/account-channel-request.h \
+ 	$(srcdir)/account-manager.c $(srcdir)/account-manager.h \
+-	$(srcdir)/add-dispatch-operation-context.c $(srcdir)/add-dispatch-operation-context.h \
+ 	$(srcdir)/automatic-client-factory.c $(srcdir)/automatic-client-factory.h \
+ 	$(srcdir)/automatic-proxy-factory.c $(srcdir)/automatic-proxy-factory.h \
+-	$(srcdir)/base-client.c $(srcdir)/base-client.h \
+-	$(srcdir)/base-connection.c $(srcdir)/base-connection.h \
+ 	$(srcdir)/basic-proxy-factory.c $(srcdir)/basic-proxy-factory.h \
+-	$(srcdir)/capabilities.c $(srcdir)/capabilities.h \
+-	$(srcdir)/channel.c $(srcdir)/channel.h \
+-	$(srcdir)/channel-contacts.c \
+-	$(srcdir)/channel-dispatcher.c $(srcdir)/channel-dispatcher.h \
+-	$(srcdir)/channel-dispatch-operation.c $(srcdir)/channel-dispatch-operation.h \
+-	$(srcdir)/channel-group.c \
+-	$(srcdir)/channel-request.c $(srcdir)/channel-request.h \
+ 	$(srcdir)/client-channel-factory.c $(srcdir)/client-channel-factory.h \
+-	$(srcdir)/client-message.c $(srcdir)/client-message.h \
+ 	$(srcdir)/connection.c $(srcdir)/connection.h \
+-	$(srcdir)/connection-avatars.c \
+ 	$(srcdir)/connection-contact-list.c $(srcdir)/connection-contact-list.h \
+ 	$(srcdir)/connection-handles.c $(srcdir)/connection-contact-info.c \
++	$(srcdir)/connection-avatars.c \
++	$(srcdir)/protocol.c $(srcdir)/protocol.h \
+ 	$(srcdir)/connection-manager.c $(srcdir)/connection-manager.h \
++	$(srcdir)/channel.c $(srcdir)/channel.h \
++	$(srcdir)/channel-contacts.c \
++	$(srcdir)/channel-group.c \
++	$(srcdir)/handle.c $(srcdir)/handle.h \
++	$(srcdir)/handle-channels-context.c $(srcdir)/handle-channels-context.h \
++	$(srcdir)/dbus-daemon.c $(srcdir)/dbus-daemon.h \
++	$(srcdir)/interfaces.c \
++	$(srcdir)/intset.c $(srcdir)/intset.h \
++	$(srcdir)/dbus.c $(srcdir)/dbus.h \
++	$(srcdir)/capabilities.c $(srcdir)/capabilities.h \
+ 	$(srcdir)/contact.c $(srcdir)/contact.h \
+ 	$(srcdir)/contact-operations.c $(srcdir)/contact-operations.h \
+ 	$(srcdir)/contact-search.c $(srcdir)/contact-search.h \
+ 	$(srcdir)/contact-search-result.c $(srcdir)/contact-search-result.h \
+-	$(srcdir)/contacts-mixin.c $(srcdir)/contacts-mixin.h \
+-	$(srcdir)/dbus.c $(srcdir)/dbus.h \
+-	$(srcdir)/dbus-daemon.c $(srcdir)/dbus-daemon.h \
+-	$(srcdir)/dbus-properties-mixin.c $(srcdir)/dbus-properties-mixin.h \
+-	$(srcdir)/dbus-tube-channel.c $(srcdir)/dbus-tube-channel.h \
+-	$(srcdir)/debug.c $(srcdir)/debug.h \
+ 	$(srcdir)/defs.h \
+-	$(srcdir)/errors.c $(srcdir)/errors.h \
+-	$(srcdir)/file-transfer-channel.c $(srcdir)/file-transfer-channel.h \
+-	$(srcdir)/group-mixin.c $(srcdir)/group-mixin.h \
+-	$(srcdir)/handle.c $(srcdir)/handle.h \
+-	$(srcdir)/handle-channels-context.c $(srcdir)/handle-channels-context.h \
+-	$(srcdir)/handle-repo.c $(srcdir)/handle-repo.h $(srcdir)/handle-set.c \
+-	$(srcdir)/interfaces.c \
+-	$(srcdir)/intset.c $(srcdir)/intset.h \
+-	$(srcdir)/message.c $(srcdir)/message.h \
+-	$(srcdir)/observe-channels-context.c $(srcdir)/observe-channels-context.h \
+-	$(srcdir)/presence-mixin.c $(srcdir)/presence-mixin.h \
+-	$(srcdir)/protocol.c $(srcdir)/protocol.h \
+-	$(srcdir)/proxy.c _gen/proxy-introspectable.h \
+-	$(srcdir)/signalled-message.c $(srcdir)/signalled-message.h \
++	$(srcdir)/debug.c $(srcdir)/debug.h \
++	$(srcdir)/base-client.c $(srcdir)/base-client.h \
+ 	$(srcdir)/simple-approver.c $(srcdir)/simple-approver.h \
+ 	$(srcdir)/simple-client-factory.c $(srcdir)/simple-client-factory.h \
+ 	$(srcdir)/simple-handler.c $(srcdir)/simple-handler.h \
+ 	$(srcdir)/simple-observer.c $(srcdir)/simple-observer.h \
++	$(srcdir)/dbus-properties-mixin.c $(srcdir)/dbus-properties-mixin.h \
++	$(srcdir)/contacts-mixin.c $(srcdir)/contacts-mixin.h \
++	$(srcdir)/group-mixin.c $(srcdir)/group-mixin.h \
++	$(srcdir)/presence-mixin.c $(srcdir)/presence-mixin.h \
++	$(srcdir)/channel-dispatch-operation.c $(srcdir)/channel-dispatch-operation.h \
++	$(srcdir)/channel-request.c $(srcdir)/channel-request.h \
++	$(srcdir)/observe-channels-context.c $(srcdir)/observe-channels-context.h \
++	$(srcdir)/add-dispatch-operation-context.c $(srcdir)/add-dispatch-operation-context.h \
++	$(srcdir)/protocol.c $(srcdir)/protocol.h \
++	$(srcdir)/base-connection.c $(srcdir)/base-connection.h \
++	$(srcdir)/handle-repo.c $(srcdir)/handle-repo.h $(srcdir)/handle-set.c \
+ 	$(srcdir)/stream-tube-channel.c $(srcdir)/stream-tube-channel.h \
++	$(srcdir)/dbus-tube-channel.c $(srcdir)/dbus-tube-channel.h \
+ 	$(srcdir)/stream-tube-connection.c $(srcdir)/stream-tube-connection.h \
+ 	$(srcdir)/text-channel.c $(srcdir)/text-channel.h \
++	$(srcdir)/file-transfer-channel.c $(srcdir)/file-transfer-channel.h \
++	$(srcdir)/client-message.c $(srcdir)/client-message.h \
++	$(srcdir)/message.c $(srcdir)/message.h \
++	$(srcdir)/signalled-message.c $(srcdir)/signalled-message.h \
++	$(srcdir)/channel-dispatcher.c $(srcdir)/channel-dispatcher.h \
++	$(srcdir)/errors.c $(srcdir)/errors.h \
+ 	_gen/telepathy-enums.h _gen/telepathy-enums-gtk-doc.h \
+-	_gen/telepathy-interfaces.h _gen/telepathy-interfaces-gtk-doc.h\
++	_gen/telepathy-interfaces.h \
+ 	$(NULL)
+ 
+ _gen/proxy-introspectable.h: proxy.h introspection.am
+@@ -76,7 +77,6 @@ TelepathyGLib-0.12.gir: $(INTROSPECTION_SCANNER) \
+ 		$(srcdir)/kludge.xsl \
+ 		$(INTROSPECTION_FILES)
+ 	$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
+-		--warn-all \
+ 		--namespace TelepathyGLib \
+ 		--nsversion=0.12 \
+ 		--identifier-prefix=Tp \
+
diff --git a/testing/totem/PKGBUILD b/testing/totem/PKGBUILD
index 116fc431a..9ea91174e 100644
--- a/testing/totem/PKGBUILD
+++ b/testing/totem/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139065 2011-09-28 19:33:24Z ibiru $
+# $Id: PKGBUILD 139155 2011-09-30 11:49:44Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
 url="http://www.gnome.org"
 arch=('i686' 'x86_64')