Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts: community-testing/sword/PKGBUILD community/freedroidrpg/PKGBUILD community/pgadmin3/PKGBUILD libre/lame-libre/PKGBUILD testing/dbus-core/PKGBUILD testing/libwebkit/PKGBUILD testing/tracker/PKGBUILD testing/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch testing/udev/0002-reinstate-TIMEOUT-handling.patch testing/udev/PKGBUILD
author: Nicolás Reynolds <fauno@kiwwwi.com.ar> 2012-04-11 10:57:18 -0300
committer: Nicolás Reynolds <fauno@kiwwwi.com.ar> 2012-04-11 10:57:18 -0300
commit: c07ca5cb71d277e9f2fd5c7b94cf8a0021bdfab5 (patch)
tree: d9d528762b726855cc356781c89abb1768c8be28
parent: ece2137c9569ec806aacf3740df98c399a51b21a (diff)
parent: 8119da2eaadf53531cad2aed70981ed4606340d6 (diff)
145 files changed, 5250 insertions, 219 deletions
diff --git a/community-testing/couchdb/PKGBUILD b/community-testing/couchdb/PKGBUILD
new file mode 100644
index 000000000..44bb5a33d
--- /dev/null
+++ b/community-testing/couchdb/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 69092 2012-04-09 13:49:06Z tdziedzic $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
+# Contributor: Michael Fellinger <m.fellinger@gmail.com>
+
+pkgname=couchdb
+pkgver=1.2.0
+pkgrel=3
+pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
+arch=('i686' 'x86_64')
+url="http://couchdb.apache.org"
+license=('APACHE')
+depends=('icu' 'erlang' 'js' 'openssl' 'curl')
+install=couchdb.install
+options=('!libtool')
+backup=('etc/couchdb/local.ini'
+	'etc/conf.d/couchdb'
+	'etc/logrotate.d/couchdb')
+source=("http://www.apache.org/dist/couchdb/releases/${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"{,.asc}
+        "rc-script.patch" "configure-fix.patch")
+md5sums=('a5cbbcaac288831b3d8a08b725657f10'
+         '890a85b22219ea113a4901a289c442f8'
+         '8a3b1a1ff98a6411827ad991db7a355b'
+         'fd1669544d08bda09c3318873d51db1e')
+
+build() {
+  cd "$srcdir/apache-$pkgname-$pkgver"
+
+  # workaround for FS#26827
+  patch -Np1 < $srcdir/configure-fix.patch
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var
+  make
+  
+  patch -R etc/init/couchdb <$srcdir/rc-script.patch
+}
+
+package() {
+  cd "$srcdir/apache-$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 etc/default/couchdb $pkgdir/etc/conf.d/couchdb
+  sed -i 's|\(CONFIGURATION_FILE=/etc/\)default\(/couchdb\)|\1conf.d\2|' $pkgdir/etc/rc.d/couchdb
+  sed -i 's|\(COUCHDB_OPTIONS=\)|\1"-p /var/run/couchdb/couchdb.pid"|' $pkgdir/etc/conf.d/couchdb
+
+  rm -rf $pkgdir/etc/default/ $pkgdir/var/run
+}
diff --git a/community-testing/couchdb/configure-fix.patch b/community-testing/couchdb/configure-fix.patch
new file mode 100644
index 000000000..0bb68ecfe
--- /dev/null
+++ b/community-testing/couchdb/configure-fix.patch
@@ -0,0 +1,21 @@
+diff -rup apache-couchdb-1.2.0/configure apache-couchdb-1.2.0.new/configure
+--- apache-couchdb-1.2.0/configure	2012-03-29 23:05:41.000000000 +0200
++++ apache-couchdb-1.2.0.new/configure	2012-04-08 13:50:14.923693056 +0200
+@@ -18234,7 +18234,7 @@ echo "$as_me: error: $erlang_version_err
+     fi
+ fi
+ 
+-otp_release="`${ERL} -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`"
++otp_release="`${ERL} -smp disable -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`"
+ 
+  if test x$otp_release \> xR13B03; then
+   USE_OTP_NIFS_TRUE=
+@@ -18253,7 +18253,7 @@ else
+ fi
+ 
+ 
+-has_crypto=`${ERL} -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop`
++has_crypto=`${ERL} -smp disable -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop`
+ 
+ if test -n "$has_crypto"; then
+     { { echo "$as_me:$LINENO: error: Could not find the Erlang crypto library. Has Erlang been compiled with OpenSSL support?" >&5
diff --git a/community-testing/couchdb/couchdb.install b/community-testing/couchdb/couchdb.install
new file mode 100644
index 000000000..5eff459c7
--- /dev/null
+++ b/community-testing/couchdb/couchdb.install
@@ -0,0 +1,22 @@
+post_install() {
+	id couchdb &>/dev/null || \
+		useradd -r -c "CouchDB daemon" -g daemon -d /var/lib/couchdb -s /bin/false couchdb
+	mkdir -p /var/run/couchdb
+	chown -R couchdb.daemon /etc/couchdb
+	chown -R couchdb.daemon /var/{lib,log,run}/couchdb
+}
+
+pre_upgrade() {
+	id couchdb &>/dev/null || \
+		useradd -r -c "CouchDB daemon" -g daemon -d /var/lib/couchdb -s /bin/false couchdb
+}
+
+post_upgrade() {
+	mkdir -p $pkgdir/var/run/couchdb
+	chown -R couchdb.daemon /etc/couchdb
+	chown -R couchdb.daemon /var/{lib,log,run}/couchdb
+}
+
+post_remove() {
+	userdel couchdb &>/dev/null
+}
diff --git a/community-testing/couchdb/rc-script.patch b/community-testing/couchdb/rc-script.patch
new file mode 100644
index 000000000..1dd723ffc
--- /dev/null
+++ b/community-testing/couchdb/rc-script.patch
@@ -0,0 +1,57 @@
+--- couchdb	2011-12-27 01:21:59.000000000 +0400
++++ couchdb.my	2011-12-27 01:21:18.000000000 +0400
+@@ -1,6 +1,4 @@
+-#!/bin/bash
+-. /etc/rc.conf
+-. /etc/rc.d/functions
++#!/bin/sh -e
+ 
+ # Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ # use this file except in compliance with the License. You may obtain a copy of
+@@ -31,7 +29,7 @@
+ NAME=couchdb
+ SCRIPT_NAME=`basename $0`
+ COUCHDB=/usr/bin/couchdb
+-CONFIGURATION_FILE=/etc/conf.d/couchdb
++CONFIGURATION_FILE=/etc/default/couchdb
+ RUN_DIR=/var/run/couchdb
+ LSB_LIBRARY=/lib/lsb/init-functions
+ 
+@@ -44,14 +42,16 @@
+ fi
+ 
+ log_daemon_msg () {
+-    stat_busy $@
++    # Dummy function to be replaced by LSB library.
++
++    echo $@
+ }
+ 
+ log_end_msg () {
++    # Dummy function to be replaced by LSB library.
++
+     if test "$1" != "0"; then
+-      stat_fail
+-    else
+-      stat_done
++      echo "Error with $DESCRIPTION: $NAME"
+     fi
+     return $1
+ }
+@@ -66,7 +66,7 @@
+         command="$command $COUCHDB_OPTIONS"
+     fi
+     if test -n "$COUCHDB_USER"; then
+-        if su $COUCHDB_USER -s /bin/bash -c "$command"; then
++        if su $COUCHDB_USER -c "$command"; then
+             return $SCRIPT_OK
+         else
+             return $SCRIPT_ERROR
+@@ -84,7 +84,6 @@
+     # Start Apache CouchDB as a background process.
+ 
+     mkdir -p "$RUN_DIR"
+-    chown -R $COUCHDB_USER "$RUN_DIR"
+     command="$COUCHDB -b"
+     if test -n "$COUCHDB_STDOUT_FILE"; then
+         command="$command -o $COUCHDB_STDOUT_FILE"
diff --git a/community-testing/dee/PKGBUILD b/community-testing/dee/PKGBUILD
new file mode 100644
index 000000000..e65c2d80c
--- /dev/null
+++ b/community-testing/dee/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 69158 2012-04-09 22:02:32Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=dee
+pkgver=1.0.8
+pkgrel=1
+pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/dee"
+license=('LGPL')
+depends=('glib2' 'icu')
+makedepends=('python2' 'gobject-introspection' 'vala')
+options=('!libtool')
+source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        fix-crash.patch)
+md5sums=('e9dbf5526ac4aca5a001e87e8cea516d'
+         'e6e95a783dd1f3aa0accc7410a5783e1')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np0 -i "$srcdir/fix-crash.patch"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static --disable-tests \
+              PYTHON=python2
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community-testing/dee/fix-crash.patch b/community-testing/dee/fix-crash.patch
new file mode 100644
index 000000000..9ce664e10
--- /dev/null
+++ b/community-testing/dee/fix-crash.patch
@@ -0,0 +1,86 @@
+=== modified file 'src/dee-shared-model.c'
+--- src/dee-shared-model.c	2012-03-12 11:49:53 +0000
++++ src/dee-shared-model.c	2012-03-29 12:04:44 +0000
+@@ -1183,6 +1183,7 @@
+   guint32                pos;
+   guchar                 change_type;
+   gint                   i, j;
++  gboolean               transaction_error;
+ 
+   g_return_if_fail (DEE_IS_SHARED_MODEL (self));
+   g_return_if_fail (transaction != NULL);
+@@ -1249,48 +1250,56 @@
+   g_variant_get (tt, "(tt)", &seqnum_before, &seqnum_after);
+   g_variant_unref (tt);
+ 
++  transaction_error = FALSE;
+   /* If this is our first transaction we accept anything, if not the
+    * incoming seqnums must align with our own records */
+   current_seqnum = dee_serializable_model_get_seqnum (DEE_MODEL (self));
+-  if (current_seqnum != 0 &&
+-      current_seqnum != seqnum_before)
+-  {
++
++  if (current_seqnum != 0 && current_seqnum != seqnum_before)
++    {
+       g_warning ("Transaction from %s is in the %s. Expected seqnum %"G_GUINT64_FORMAT
+                  ", but got %"G_GUINT64_FORMAT". Ignoring transaction.",
+                  sender_name,
+                  current_seqnum < seqnum_before ? "future" : "past",
+                  current_seqnum, seqnum_before);
+-      if (dee_shared_model_is_leader (self))
+-        {
+-          g_warning ("Invalidating %s", sender_name);
+-          invalidate_peer (self, sender_name, NULL);
+-        }
+-
+-      g_variant_unref (transaction);
+-      g_variant_unref (aav);
+-      g_variant_unref (au);
+-      g_variant_unref (ay);
+-      return;
+-  }
++      transaction_error = TRUE;
++    }
+ 
+   /* Check that the lengths of all the arrays match up */
+   n_rows = g_variant_n_children (aav);
++
+   if (n_rows != g_variant_n_children (au))
+     {
+       g_warning ("Commit from %s has illegal position vector",
+                  sender_name);
+-      // FIXME cleanup
++      transaction_error = TRUE;
+     }
+   if (n_rows != g_variant_n_children (ay))
+     {
+       g_warning ("Commit from %s has illegal change type vector",
+                  sender_name);
+-      // FIXME cleanup
++      transaction_error = TRUE;
+     }
+   if (n_rows > (seqnum_after - seqnum_before))
+     {
+       g_warning ("Commit from %s has illegal seqnum count.",
+                  sender_name);
++      transaction_error = TRUE;
++    }
++
++  if (transaction_error)
++    {
++      if (dee_shared_model_is_leader (self))
++        {
++          g_warning ("Invalidating %s", sender_name);
++          invalidate_peer (self, sender_name, NULL);
++        }
++
++      g_variant_unref (transaction);
++      g_variant_unref (aav);
++      g_variant_unref (au);
++      g_variant_unref (ay);
++      return;
+     }
+   
+   /* Allocate an array on the stack as a temporary row data buffer */
+
diff --git a/community-testing/dwdiff/PKGBUILD b/community-testing/dwdiff/PKGBUILD
new file mode 100644
index 000000000..2b41b97b5
--- /dev/null
+++ b/community-testing/dwdiff/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 69094 2012-04-09 13:49:12Z tdziedzic $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=dwdiff
+pkgver=2.0
+pkgrel=2
+pkgdesc="A front-end for the diff program that operates at the word level instead of the line level"
+arch=('i686' 'x86_64')
+url="http://os.ghalkes.nl/dwdiff.html"
+depends=('diffutils' 'icu')
+license=('GPL')
+source=("http://os.ghalkes.nl/dist/$pkgname-$pkgver.tgz")
+md5sums=('98dd16b58a1f136a2cd49f7dd88c5313')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make prefix="$pkgdir"/usr install
+}
diff --git a/community-testing/ejabberd/PKGBUILD b/community-testing/ejabberd/PKGBUILD
new file mode 100644
index 000000000..d4bf9c2da
--- /dev/null
+++ b/community-testing/ejabberd/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 69116 2012-04-09 13:50:43Z tdziedzic $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+
+pkgname=ejabberd
+pkgver=2.1.10
+pkgrel=4
+pkgdesc="Jabber server written in Erlang"
+arch=('x86_64' 'i686')
+url="http://www.ejabberd.im/"
+license=("GPL")
+depends=('expat' 'openssl' 'zlib' 'erlang' 'pam' 'iproute2')
+backup=(etc/ejabberd/ejabberd.cfg etc/logrotate.d/ejabberd)
+install=$pkgname.install
+source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tar.gz"
+        "$pkgname.logrotate"
+        "$pkgname")
+sha256sums=('9dc2e5889e919a7d51f2b95b83da835116631db81550a115c02e71909ad932be'
+            '31780cac78736d285e46f445f8c8463a70f2aeb2683280c259129db11832ddd2'
+            '93f8f9a8751b9e982b332f74e71f766c3c9c4818876991cadef08fe140b83ca6')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver/src"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --enable-pam --enable-odbc
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver/src"
+
+  make DESTDIR="$pkgdir" install
+  install -D -m 0755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname"
+  install -d "$pkgdir/var/spool/$pkgname"
+  install -d "$pkgdir/var/lib/$pkgname"
+  install -D -m0644 "$srcdir/$pkgname.logrotate" \
+    "$pkgdir/etc/logrotate.d/$pkgname"
+  chmod ug+r "$pkgdir/etc/$pkgname/"*
+  rm -rf "$pkgdir/var/lock"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/ejabberd/ejabberd b/community-testing/ejabberd/ejabberd
new file mode 100644
index 000000000..259d4db66
--- /dev/null
+++ b/community-testing/ejabberd/ejabberd
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+cd /var/log/ejabberd/
+
+get_pid() {
+    pidof epmd >/dev/null || { echo '' ; return 0; }
+    # get port from 'epmd -names', then get pid from 'ss -tlnp'
+    PORT=`epmd -names | grep ejabberd | cut -f5 -d\ `
+    [ -z "$PORT" ] && { echo '' ; return 0; }
+    PID=`ss -tlnp | grep $PORT | grep -oE '[[:digit:]]+,' | cut -d, -f1`
+    [ -z "$PID" ] && { echo '' ; return 0; }
+    echo ${PID%/}
+}
+
+case "$1" in
+  start)
+    stat_busy "Starting ejabber daemon"
+
+    [ -d /var/lock/ejabberdctl ] || mkdir -p /var/lock/ejabberdctl
+    [ -f /var/run/ejabber.pid ] && rm -f /var/run/ejabber.pid
+    PID=`get_pid`
+    if [ -z "$PID" ]; then
+      su ejabberd -s /bin/bash - -c 'erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/spool/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"'
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        echo `get_pid` > /var/run/ejabberd.pid
+        add_daemon ejabberd
+        stat_done
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping ejabber daemon"
+    PID=`get_pid`
+    [ ! -z "$PID" ] && su ejabberd -s /bin/bash - -c "kill $PID" &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm -f /var/run/ejabberd.pid &> /dev/null
+      rm_daemon ejabberd
+      stat_done
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community-testing/ejabberd/ejabberd.install b/community-testing/ejabberd/ejabberd.install
new file mode 100644
index 000000000..9d17a911e
--- /dev/null
+++ b/community-testing/ejabberd/ejabberd.install
@@ -0,0 +1,26 @@
+post_install() {
+  groupadd -r jabber
+  useradd -r -G jabber -d /var/lib/ejabberd ejabberd
+  chown -R ejabberd.jabber /var/log/ejabberd
+  chown -R ejabberd.jabber /var/spool/ejabberd
+  chown -R ejabberd.jabber /var/lib/ejabberd
+  chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
+  chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+  chmod 4750 /usr/lib/ejabberd/priv/bin/epam
+}
+
+post_upgrade() {
+  chown -R ejabberd.jabber /var/log/ejabberd
+  chown -R ejabberd.jabber /var/spool/ejabberd
+  chown -R ejabberd.jabber /var/lib/ejabberd
+  chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+  chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
+  chmod 4750 /usr/lib/ejabberd/priv/bin/epam
+}
+
+post_remove() {
+  userdel ejabberd
+  groupdel jabber
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/ejabberd/ejabberd.logrotate b/community-testing/ejabberd/ejabberd.logrotate
new file mode 100644
index 000000000..03069078a
--- /dev/null
+++ b/community-testing/ejabberd/ejabberd.logrotate
@@ -0,0 +1,12 @@
+/var/log/ejabberd/ejabberd.log {
+     weekly
+     missingok
+     rotate 10
+     compress
+     delaycompress
+     ifempty
+     nomail
+     sharedscripts
+     postrotate ejabberdctl --node ejabberd reopen-log > /dev/null
+     endscript
+}
diff --git a/community-testing/esdl/PKGBUILD b/community-testing/esdl/PKGBUILD
new file mode 100644
index 000000000..1324daaee
--- /dev/null
+++ b/community-testing/esdl/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: kappa <kappacurve@gmail.com>
+
+pkgname=esdl
+pkgver=1.0.1
+pkgrel=2
+epoch=2
+arch=('x86_64' 'i686')
+pkgdesc="SDL and OpenGL bindings for the Erlang programming language"
+url="http://esdl.sourceforge.net/"
+license=('custom')
+depends=('erlang' 'sdl' 'mesa')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.src.tar.gz")
+md5sums=('50230ea81418cb029281a70627a5dd8e')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  find -type f -print0 | xargs -0 chmod 644
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make INSTALLDIR="$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver" install
+
+  ## To make wings3d compile with esdl 1.2
+  #ln -s /usr/lib/erlang/lib/wx-0.99/include/glu.hrl \
+  #  "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver/include/glu.hrl"
+  #ln -s /usr/lib/erlang/lib/wx-0.99/include/gl.hrl \
+  #  "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver/include/gl.hrl"
+
+  install -Dm644 "$srcdir/$pkgname-$pkgver/license.terms" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/fatrat/PKGBUILD b/community-testing/fatrat/PKGBUILD
new file mode 100644
index 000000000..6130fafbd
--- /dev/null
+++ b/community-testing/fatrat/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 69096 2012-04-09 13:49:17Z tdziedzic $
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+
+pkgname=fatrat
+pkgver=1.2.0_beta1
+pkgrel=5
+pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
+arch=('i686' 'x86_64')
+url="http://fatrat.dolezel.info/"
+license=('GPL')
+depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net' 'qtwebkit')
+optdepends=('geoip: GeoIP support')
+makedepends=('boost' 'cmake' 'java-environment')
+source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz)
+md5sums=('7ce4d5e6318361f36ba5ac86a5755da9')
+
+build() {
+  cd $pkgname-$pkgver
+
+  . /etc/profile.d/jre.sh
+  . /etc/profile.d/jdk.sh
+
+  cmake \
+    -DWITH_EVERYTHING=ON \
+    -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS="-lpthread" \
+    -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    .
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/glabels/PKGBUILD b/community-testing/glabels/PKGBUILD
new file mode 100644
index 000000000..4454af492
--- /dev/null
+++ b/community-testing/glabels/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 69135 2012-04-09 18:05:08Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: yugrotavele <yugrotavele at archlinux dot us>
+# Contributor: Damir Perisa <damir@archlinux.org>
+
+pkgname=glabels
+pkgver=3.0.0
+pkgrel=3
+pkgdesc="Creating labels and business cards the very easy way"
+arch=('i686' 'x86_64')
+url="http://glabels.sourceforge.net/"
+license=('GPL' 'LGPL')
+depends=('librsvg' 'evolution-data-server>=3.4.0' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils')
+makedepends=('barcode' 'intltool' 'gnome-doc-utils')
+options=('!libtool')
+install=$pkgname.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        fix-gschema.patch)
+sha256sums=('a3a3db4dd25bfb1a03f4008f01c5d9045174e78e13ae77438b81bfe4bf14e64a'
+            'ef4f368b49fe66fb7e9c1c4edabb96e1f10fd3e8502d695aef6b89388c38cd94')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/fix-gschema.patch"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static --disable-scrollkeeper --disable-schemas-compile
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community-testing/glabels/fix-gschema.patch b/community-testing/glabels/fix-gschema.patch
new file mode 100644
index 000000000..51e197096
--- /dev/null
+++ b/community-testing/glabels/fix-gschema.patch
@@ -0,0 +1,36 @@
+diff -Naur glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in
+--- glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in	2012-04-09 13:58:25.256413359 +0000
++++ glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in	2012-04-09 13:59:40.495830152 +0000
+@@ -2,10 +2,10 @@
+ 
+ 
+   <schema id="org.gnome.glabels-3" path="/apps/glabels-3/" gettext-domain="glabels-3.0">
+-    <child name="ui" schema="org.gnome.glabels.ui"/>
+-    <child name="locale" schema="org.gnome.glabels.locale"/>
+-    <child name="objects" schema="org.gnome.glabels.objects"/>
+-    <child name="history" schema="org.gnome.glabels.history"/>
++    <child name="ui" schema="org.gnome.glabels-3.ui"/>
++    <child name="locale" schema="org.gnome.glabels-3.locale"/>
++    <child name="objects" schema="org.gnome.glabels-3.objects"/>
++    <child name="history" schema="org.gnome.glabels-3.history"/>
+   </schema>
+ 
+ 
+diff -Naur glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in.in glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in.in
+--- glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in.in	2012-04-09 13:58:25.256413359 +0000
++++ glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in.in	2012-04-09 13:59:32.232560783 +0000
+@@ -2,10 +2,10 @@
+ 
+ 
+   <schema id="org.gnome.glabels-3" path="/apps/glabels-3/" gettext-domain="@GETTEXT_PACKAGE@">
+-    <child name="ui" schema="org.gnome.glabels.ui"/>
+-    <child name="locale" schema="org.gnome.glabels.locale"/>
+-    <child name="objects" schema="org.gnome.glabels.objects"/>
+-    <child name="history" schema="org.gnome.glabels.history"/>
++    <child name="ui" schema="org.gnome.glabels-3.ui"/>
++    <child name="locale" schema="org.gnome.glabels-3.locale"/>
++    <child name="objects" schema="org.gnome.glabels-3.objects"/>
++    <child name="history" schema="org.gnome.glabels-3.history"/>
+   </schema>
+ 
+ 
diff --git a/community-testing/glabels/glabels.install b/community-testing/glabels/glabels.install
new file mode 100644
index 000000000..42bb5884d
--- /dev/null
+++ b/community-testing/glabels/glabels.install
@@ -0,0 +1,15 @@
+post_install() {
+  xdg-icon-resource forceupdate
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+
+post_remove() {
+  post_install $1
+}
diff --git a/community-testing/gtranslator/PKGBUILD b/community-testing/gtranslator/PKGBUILD
new file mode 100644
index 000000000..9ad34ee63
--- /dev/null
+++ b/community-testing/gtranslator/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 69147 2012-04-09 20:24:34Z bgyorgy $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+# Contributor: Christer Solskogen (solskogen@carebears.mine.nu)
+
+pkgname=gtranslator
+pkgver=2.91.2
+pkgrel=1
+pkgdesc="An enhanced gettext po file editor for the GNOME"
+arch=('i686' 'x86_64')
+url="http://projects.gnome.org/gtranslator/"
+license=('GPL')
+depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell3' 'iso-codes' 'libgda' 'libpeas' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf')
+makedepends=('intltool' 'gnome-doc-utils' 'gucharmap' 'json-glib')
+optdepends=('gucharmap: for charmap plugin'
+            'json-glib: for open-tran plugin')
+options=('!libtool')
+install=$pkgname.install
+changelog=$pkgname.changelog
+source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz)
+sha256sums=('884c14b5a556c0bb5764315530eda43542a0a887a2142cc3c75f8c917a8ff49e')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+}
diff --git a/community-testing/gtranslator/gtranslator.changelog b/community-testing/gtranslator/gtranslator.changelog
new file mode 100644
index 000000000..33e27a489
--- /dev/null
+++ b/community-testing/gtranslator/gtranslator.changelog
@@ -0,0 +1,36 @@
+2012-04-09 Balló György <ballogyor+arch at gmail dot com>
+	* gtranslator 2.91.2-1
+        replace gtkspell dependency with gtkspell3
+        remove unused libunique dependency
+        remove broken dictionary plugin
+
+2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* gtranslator 2.90.8-1
+
+2011-10-28 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+	* gtranslator 2.90.7-1
+
+2011-08-20 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+	* gtranslator 2.90.5-1
+
+2011-05-12 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+	* gtranslator 2.90.3-1
+
+2011-01-09 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+	* gtranslator-1.9.13-1
+
+2010-08-30 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+	* gtranslator-1.9.11-1
+
+2010-02-23 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+	* gtranslator-1.9.7-1
+
+2007-06-19 Eric Belanger (Snowman) <eric@archlinux.org>
+	* gtranslator-1.1.7-3
+	added x86_64 to arch field
+	added license
+	removed gnome.sh sourcing : no longer necessary
+	
+2007-05-29 Alessio 'mOLOk' Bolognino <themolok@gmail.com>
+	* gtranslator-1.1.7-3
+	move from /opt/gnome to /usr
diff --git a/community-testing/gtranslator/gtranslator.install b/community-testing/gtranslator/gtranslator.install
new file mode 100644
index 000000000..390bbf2b0
--- /dev/null
+++ b/community-testing/gtranslator/gtranslator.install
@@ -0,0 +1,13 @@
+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
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community-testing/gwibber/PKGBUILD b/community-testing/gwibber/PKGBUILD
new file mode 100644
index 000000000..05dd3d6f2
--- /dev/null
+++ b/community-testing/gwibber/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 69159 2012-04-09 22:04:04Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=gwibber
+pkgver=3.4.0
+pkgrel=1
+pkgdesc="Microblogging client for GNOME, which supports Twitter, Identi.ca, StatusNet, Facebook, Flickr, Digg, FriendFeed and Qaiku"
+arch=('i686' 'x86_64')
+url="http://gwibber.com/"
+license=('GPL')
+depends=('libgee' 'libnotify' 'dee>=1.0.0' 'json-glib' 'gtkspell3' 'python2-gobject' 'libwnck3' 'libwebkit3' 'libgnome-keyring>=3.3' 'dbus-python' 'python2-httplib2' 'python-egenix-mx-base' 'python2-oauth' 'python-imaging' 'pyxdg' 'dconf' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('intltool' 'vala>=0.15.0')
+options=('!libtool')
+install=$pkgname.install
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        lp_959068.patch)
+md5sums=('cec2c692d870f7aa7fb6a7cb556617ad'
+         'c15dd5289f36270f980036ead71b6c20')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+  patch -Np1 -i "$srcdir/lp_959068.patch"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static --disable-schemas-compile --disable-unity
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community-testing/gwibber/gwibber.install b/community-testing/gwibber/gwibber.install
new file mode 100644
index 000000000..d973d53f7
--- /dev/null
+++ b/community-testing/gwibber/gwibber.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community-testing/gwibber/lp_959068.patch b/community-testing/gwibber/lp_959068.patch
new file mode 100644
index 000000000..66b288ba7
--- /dev/null
+++ b/community-testing/gwibber/lp_959068.patch
@@ -0,0 +1,27 @@
+=== modified file 'libgwibber/streams.vala'
+--- old/libgwibber/streams.vala	2012-03-19 13:35:30 +0000
++++ new/libgwibber/streams.vala	2012-04-04 20:53:49 +0000
+@@ -213,13 +213,21 @@
+                 model = create_model ();
+               }
+               model.row_removed.connect((_m, _i) => {
++                var to_remove = new GLib.List <string> ();
+                 foreach (var v in seen.entries)
+                 {
+                   if (v.value == _i)
+                   {
+-                    seen.unset(v.key);
++                    /* defer calling unset until after we are done iterating 
++                     * the HashMap, it will resize making the iterator invalid
++                     * This is fixed in the 0.7 series of libgee
++                     * https://bugzilla.gnome.org/show_bug.cgi?id=671327
++                     */
++                    to_remove.prepend (v.key);
+                   }
+                 }
++                foreach (var v in to_remove)
++                  seen.unset(v);
+               });
+               Idle.add(() => {
+                 refresh_model_async.begin ();
+
diff --git a/community-testing/ibus-qt/PKGBUILD b/community-testing/ibus-qt/PKGBUILD
new file mode 100644
index 000000000..c6bd27c11
--- /dev/null
+++ b/community-testing/ibus-qt/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 69098 2012-04-09 13:49:23Z tdziedzic $
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: garion < garion @ mailoo.org >
+# Contributor: leemars
+
+pkgname=ibus-qt
+pkgver=1.3.1
+pkgrel=5
+pkgdesc='IBus qt library and IBus qt input method plugin'
+arch=('i686' 'x86_64')
+license=('LGPL')
+url='http://ibus.googlecode.com'
+depends=('qt' 'ibus' 'icu')
+makedepends=('cmake' 'automoc4' 'doxygen')
+source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz")
+md5sums=('769e8872ca8a59327b2073ce2f142589')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  
+  cmake "../${pkgname}-${pkgver}-Source" -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community-testing/libfbclient/ChangeLog b/community-testing/libfbclient/ChangeLog
new file mode 100644
index 000000000..f02bd5ff5
--- /dev/null
+++ b/community-testing/libfbclient/ChangeLog
@@ -0,0 +1,26 @@
+
+2009-06-08  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Rebuilt for the new icu
+
+2009-04-09  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated for i686: 2.1.2
+
+2008-08-10  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated for i686: 2.1.1
+
+2008-05-10  Mateusz Herych <heniekk@gmail.com>
+
+	* Updated for x86_64 - 2.1.0
+
+2008-04-28  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
+
+	* Updated for i686 - 2.1.0
+	* Sure, firebird is the hell to build. Waiting contributions ;-)
+
+2007-07-06  tardo  <tardo@nagi-fanboi.net>
+	
+	* Built for x86_64
+	* This is the most fucked up pkg evar.
diff --git a/community-testing/libfbclient/LICENSE b/community-testing/libfbclient/LICENSE
new file mode 100644
index 000000000..e735b0cc1
--- /dev/null
+++ b/community-testing/libfbclient/LICENSE
@@ -0,0 +1,44 @@
+
+LICENSES
+--------
+
+The applicable and approved licenses for the source files
+of the Firebird RDBMS project are:
+
+  1) InterBase Public License (IPL), version 1.0
+     http://bdn.borland.com/article/0,1410,30198,00.html
+
+  2) Initial Developer's Public License (IDPL), version 1.0
+     http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl
+
+The IPL is copyright of Borland Corp., the other licenses are copyright
+by the source code authors and contributors.
+
+
+USAGE RULES
+-----------
+
+1) The source code which was released under the IPL must keep this license.
+   All modifications / adaptations of this code are still subjects of the IPL.
+
+2) The files that are derived from the IPL covered code, must also keep
+   this license. It means that if any new file contains some code covered by
+   the IPL, then this file should be released under the IPL too.
+
+3) The new files developed by the members of the Firebird project should
+   be released under the IDPL.
+
+4) The new files contributed by people who are not members of the Firebird
+   project should follow the rule #3. If an author (initial developer) doesn't
+   specify the license to be used, the person who applies the contributed code
+   to the CVS tree (a committer) becomes responsible for the license assigned
+   to the contributed code.
+
+5) Every non-binary file that exists in the CVS tree, should have a header
+   section which describes the license this code is released under. If a file
+   contains no header, it means that this code is freeware and nobody owns the
+   appropriate copyrights.
+
+
+You may find the exhibits for the approved licenses in /doc/license directory
+of the CVS tree.
diff --git a/community-testing/libfbclient/PKGBUILD b/community-testing/libfbclient/PKGBUILD
new file mode 100644
index 000000000..9c5223618
--- /dev/null
+++ b/community-testing/libfbclient/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 69100 2012-04-09 13:49:31Z tdziedzic $
+# Maintainer: Carlier Laurent <lordheavym@gmail.com>
+# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
+
+pkgname=libfbclient
+pkgver=2.5.1.26351
+pkgrel=2
+pkgdesc="Client library for Firebird."
+arch=('i686' 'x86_64')
+url="http://www.firebirdsql.org/"
+license=('custom')
+depends=('gcc-libs' 'icu')
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/firebird/Firebird-$pkgver-0.tar.bz2
+        LICENSE)
+md5sums=('1772fba4f09c8fc84d989282405f90fd'
+         '0d61798861e159c85dbdf0f30fe2f2ce')
+
+build() {
+  cd $srcdir/Firebird-$pkgver-0
+
+  ./configure --prefix=/usr --with-system-icu --without-fbudf \
+    --without-fbsbin --without-fbconf --without-fbdoc --without-fbsample \
+    --without-fbsample-db --without-fbintl --without-fbmisc --without-fbhelp \
+    --without-fbsecure-db --with-fbmsg=/usr/share/firebird --without-fblog \
+    --without-fbglock --without-fbplugins
+
+  make
+}
+
+package() {
+  cd $srcdir/Firebird-$pkgver-0
+
+  mkdir -p $pkgdir/usr/{bin,share/firebird}
+  cp -R gen/firebird/{lib,include} $pkgdir/usr
+  rm -f $pkgdir/usr/lib/libedit.a
+  install -m644 gen/firebird/*.msg $pkgdir/usr/share/firebird
+  install -m755 gen/firebird/bin/fb_config $pkgdir/usr/bin
+  mkdir -p $srcdir/usr/share/licenses/$pkgname/
+  install -D -m644 ${srcdir}/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/community-testing/mapnik/PKGBUILD b/community-testing/mapnik/PKGBUILD
new file mode 100644
index 000000000..3e3ad0524
--- /dev/null
+++ b/community-testing/mapnik/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 69102 2012-04-09 13:49:40Z tdziedzic $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: David Dent <thewinch@gmail.com>
+# Contributor: orbisvicis <orbisvicis@gmail.com>
+
+pkgname=mapnik
+pkgver=0.7.1
+pkgrel=16
+pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps"
+arch=('i686' 'x86_64')
+url="http://mapnik.org/"
+license=('LGPL')
+depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2'
+	 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo'
+	 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool')
+	# already in core ('zlib' 'sqlite3')
+optdepends=('libxslt:         Web Map Service'
+            'python2-lxml:    Web Map Service'
+            'python-imaging:  Web Map Service'
+            'python-nose:     Web Map Service'
+            'apache:          Web Map Service'
+            'mod_fastcgi:     Web Map Service - or:'
+            'mod_fcgid:       Web Map Service - or:'
+            'mod_wsgi:        Web Map Service'
+           )
+makedepends=('scons' 'boost') # already in core ('pkg-config')
+install="mapnik.install"
+source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'gcc47.patch')
+md5sums=('8f65fda2a792518d6f6be8a85f62fc73'
+         'ce7933dc20de7e07427a6a6b5d4fd002')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 -i "${srcdir}"/gcc47.patch
+
+  #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64
+  sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct
+  sed -i 's|png_ptr->io_ptr|png_get_io_ptr(png_ptr)|g' src/png_reader.cpp
+  sed -i 's/-ansi -Wall/-ansi -DBOOST_FILESYSTEM_VERSION=2 -Wall/' SConstruct
+
+  scons configure \
+    PREFIX="/usr" \
+    INPUT_PLUGINS=all \
+    DESTDIR="$pkgdir"
+  scons
+}
+
+package(){
+  cd "$srcdir/$pkgname-$pkgver"
+  scons install
+  # fix permissions on SCons-autogenerated files
+  chmod 644 "${pkgdir}/usr/lib/python2.7/site-packages/mapnik/paths.py"
+}
diff --git a/community-testing/mapnik/gcc47.patch b/community-testing/mapnik/gcc47.patch
new file mode 100644
index 000000000..0532e0c21
--- /dev/null
+++ b/community-testing/mapnik/gcc47.patch
@@ -0,0 +1,11 @@
+--- mapnik-0.7.1/include/mapnik/factory.hpp~	2010-03-22 16:40:04.000000000 +0000
++++ mapnik-0.7.1/include/mapnik/factory.hpp	2012-04-05 15:55:13.460191219 +0000
+@@ -84,7 +84,7 @@
+             {
+                 return (pos->second)(file);
+             }
+-            return on_unknown_type(key);
++            return this->on_unknown_type(key);
+         }
+     };
+ }
diff --git a/community-testing/mapnik/mapnik.install b/community-testing/mapnik/mapnik.install
new file mode 100644
index 000000000..46f265d5b
--- /dev/null
+++ b/community-testing/mapnik/mapnik.install
@@ -0,0 +1,11 @@
+post_install() {
+  /sbin/ldconfig
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community-testing/open-vm-tools/PKGBUILD b/community-testing/open-vm-tools/PKGBUILD
new file mode 100644
index 000000000..3914b43f2
--- /dev/null
+++ b/community-testing/open-vm-tools/PKGBUILD
@@ -0,0 +1,65 @@
+# $Id: PKGBUILD 69104 2012-04-09 13:50:02Z tdziedzic $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
+
+pkgname=open-vm-tools
+pkgver=2012.03.13
+_pkgsubver=651368
+pkgrel=2
+pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools"
+arch=('i686' 'x86_64')
+url="http://open-vm-tools.sourceforge.net/"
+license=('LGPL')
+depends=('open-vm-tools-modules' 'libdnet' 'icu' 'procps' 'uriparser' 'libsigc++' 'libxss')
+makedepends=('chrpath' 'doxygen' 'gtkmm' 'fuse' 'libxtst')
+optdepends=('gtkmm' 'libnotify' 'libxtst' 'fuse' 'libsm')
+options=('docs' '!libtool')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}.tar.gz
+	scripts-network.patch
+	scripts-network-FS19541.patch
+	open-vm-tools-X11Bool.patch
+	open-vm-tools.conf.d
+	open-vm-tools.rc.d
+	tools.conf
+	vmware-guestd
+	xautostart.conf)
+md5sums=('a664206443d5de53f5f8ee8d5fe6c2d7'
+         'b8f68fef3d388489e40dba581b6da18a'
+         '199508b0d3fe6fa9b726d09170bf51f1'
+         '8c333a979578bdc0c3134c1dd6bb7353'
+         '79b0a14d86191fee70a4639da8bd7785'
+         '67cb83a9e5a4dd016c1a1da2863ca36d'
+         'b55d15e2c4be396aad709aeca91033d3'
+         '73cc1a2665b0dd62427733d62ead8b9a'
+         '75a25d83417e683957321f97a00f8465')
+
+build() {
+  cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}"
+  
+  [ -f Makefile ] || ./configure --prefix=/usr --without-kernel-modules
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}"
+
+  make install DESTDIR=$pkgdir
+  install -D -m 755 scripts/common/vmware-xdg-detect-de $pkgdir/usr/bin/vmware-xdg-detect-de
+  chmod 07755 $pkgdir/usr/bin/vmware-user-suid-wrapper
+
+  cd $pkgdir
+  patch -p1 -i $srcdir/scripts-network.patch etc/vmware-tools/scripts/vmware/network
+  patch -p1 -i $srcdir/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network
+
+  install -D -m 755 $srcdir/open-vm-tools.rc.d $pkgdir/etc/rc.d/open-vm-tools
+  install -D -m 644 $srcdir/open-vm-tools.conf.d $pkgdir/etc/conf.d/open-vm-tools
+  install -D -m 644 $srcdir/tools.conf $pkgdir/etc/vmware-tools/tools.conf
+  install -D -m 644 $srcdir/xautostart.conf $pkgdir/etc/vmware-tools/xautostart.conf
+  install -D -m 644 $srcdir/vmware-guestd $pkgdir/etc/pam.d/vmware-guestd
+  rm -rf $pkgdir/usr/etc
+
+  ln -fs /usr/sbin/mount.vmhgfs $pkgdir/sbin/mount.vmhgfs
+
+  cd $pkgdir && find -type f -exec sh -c "file {} | grep ELF >/dev/null && echo {} && chrpath -d {}" \;
+}
diff --git a/community-testing/open-vm-tools/open-vm-tools-X11Bool.patch b/community-testing/open-vm-tools/open-vm-tools-X11Bool.patch
new file mode 100644
index 000000000..f12581807
--- /dev/null
+++ b/community-testing/open-vm-tools/open-vm-tools-X11Bool.patch
@@ -0,0 +1,15 @@
+diff -wbBur open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h
+--- open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h	2010-08-24 19:59:22.000000000 +0000
++++ open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h	2010-08-30 09:38:48.000000000 +0000
+@@ -83,8 +83,11 @@
+ 
+ /* STRICT ANSI means the Xserver build and X defines Bool differently. */
+ #if !defined(__STRICT_ANSI__) || defined(__FreeBSD__) || defined(__MINGW32__)
++#  ifndef _XTYPEDEF_BOOL
++#  define _XTYPEDEF_BOOL
+ typedef char           Bool;
+ #endif
++#endif
+ 
+ #ifndef FALSE
+ #define FALSE          0
diff --git a/community-testing/open-vm-tools/open-vm-tools.conf.d b/community-testing/open-vm-tools/open-vm-tools.conf.d
new file mode 100644
index 000000000..83f7864e8
--- /dev/null
+++ b/community-testing/open-vm-tools/open-vm-tools.conf.d
@@ -0,0 +1,6 @@
+# Enable support for Drag'n'Drop
+VM_DRAG_AND_DROP="yes"
+
+# vmware-guestd settings
+GUESTD_BIN="/usr/sbin/vmware-guestd"
+PIDFILE="/var/run/vmware-guestd.pid"
diff --git a/community-testing/open-vm-tools/open-vm-tools.install b/community-testing/open-vm-tools/open-vm-tools.install
new file mode 100644
index 000000000..88d9b88e6
--- /dev/null
+++ b/community-testing/open-vm-tools/open-vm-tools.install
@@ -0,0 +1,10 @@
+post_install() {
+  [ ! -d "/mnt/hgfs" ] && mkdir /mnt/hgfs
+  echo ">>>"
+  echo ">>> You can mount VMware Shared Folders via:"
+  echo ">>>    mount -t vmhgfs .host:/ /mnt/hgfs"
+  echo ">>>"
+  echo ">>> or by adding this line to /etc/fstab:"
+  echo ">>>    .host:/   /mnt/hgfs   vmhgfs  defaults  0 0"
+  echo ">>>"
+}
diff --git a/community-testing/open-vm-tools/open-vm-tools.rc.d b/community-testing/open-vm-tools/open-vm-tools.rc.d
new file mode 100644
index 000000000..0c9221489
--- /dev/null
+++ b/community-testing/open-vm-tools/open-vm-tools.rc.d
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+# source application-specific settings
+[ -f /etc/conf.d/open-vm-tools ] && . /etc/conf.d/open-vm-tools
+
+PID=`pidof -o %PPID /usr/bin/vmtoolsd`
+case "$1" in
+  start)
+    stat_busy "Starting Open Virtual Machine Tools"
+
+    if [ "$VM_DRAG_AND_DROP" == "yes" ]; then
+	VMBLOCK=`grep -w vmblock /proc/modules`
+	[ -z "$VMBLOCK" ] && modprobe vmblock
+	if [ $? -gt 0 ]; then
+    	    stat_fail
+	    exit 1
+	fi
+	
+	DND_TMPDIR="/tmp/VMwareDnD"
+	if [ ! -d "$DND_TMPDIR" ]; then
+	    mkdir $DND_TMPDIR
+	    chmod 1777 $DND_TMPDIR
+	fi
+	
+	mount -t vmblock none /proc/fs/vmblock/mountPoint
+	if [ $? -gt 0 ]; then
+    	    stat_fail
+	    exit 1
+	fi
+    fi
+
+
+    for m in vmhgfs vmsync; do
+	VMMOD=`grep -w $m /proc/modules`
+	[ -z "$VMMOD" ] && \
+		{ modprobe $m
+		if [ $? -gt 0 ]; then
+		    stat_fail
+		    exit 1
+		fi; }
+    done
+
+
+    [ -z "$PID" ] && /usr/bin/vmtoolsd --background $PIDFILE
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon open-vm-tools
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Open Virtual Machine Tools"
+    [ ! -z "$PID" ]  && kill $PID &>/dev/null
+#    if [ $? -gt 0 ]; then
+#      stat_fail
+#      exit 1
+#    fi
+
+    for m in vmhgfs vmsync vmci; do
+	VMMOD=`grep -w $m /proc/modules`
+	[ ! -z "$VMMOD" ] && rmmod $m
+	if [ $? -gt 0 ]; then
+	  stat_fail
+	  exit 4
+	fi
+    done
+
+    if [ "$VM_DRAG_AND_DROP" == "yes" ]; then
+	MOUNTPOINT=`grep -w "none /proc/fs/vmblock/mountPoint vmblock" /proc/modules`
+	[ -z "$MOUNTPOINT" ] && umount /proc/fs/vmblock/mountPoint
+        if [ $? -gt 0 ]; then
+	  stat_fail
+    	  exit 5
+	fi
+	
+	DND_TMPDIR="/tmp/VMwareDnD"
+	rm -r $DND_TMPDIR
+	
+	VMBLOCK=`grep -w vmblock /proc/modules`
+	[ ! -z "$VMBLOCK" ] && rmmod vmblock
+        if [ $? -gt 0 ]; then
+	  stat_fail
+    	  exit 6
+	fi
+    fi
+        
+    rm_daemon open-vm-tools
+    stat_done
+    ;;
+  restart)
+    $0 stop
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community-testing/open-vm-tools/scripts-network-FS19541.patch b/community-testing/open-vm-tools/scripts-network-FS19541.patch
new file mode 100644
index 000000000..5fcb33ba8
--- /dev/null
+++ b/community-testing/open-vm-tools/scripts-network-FS19541.patch
@@ -0,0 +1,38 @@
+--- network.orig	2011-11-09 18:42:28.000000000 +0400
++++ network	2011-11-09 18:46:22.000000000 +0400
+@@ -76,7 +76,7 @@
+          else
+             echo `date` "[rescue_nic] activating $nic ..."
+ 
+-            ifup $nic
++            ifconfig $nic up
+             exitCode=`expr $exitCode \| $?`
+          fi
+       done < $activeList
+@@ -105,7 +105,7 @@
+    # `which' may be a bit noisy, so we'll shush it.
+    dbusSend=`which dbus-send 2>/dev/null`
+    rc=$?
+-   if [ $rc = 0 ]; then
++   if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then
+       # NetworkManager 0.8.0
+       $dbusSend --system --print-reply          \
+          --dest=org.freedesktop.NetworkManager  \
+@@ -154,7 +154,7 @@
+    # `which' may be a bit noisy, so we'll shush it.
+    dbusSend=`which dbus-send 2>/dev/null`
+    rc=$?
+-   if [ $rc = 0 ]; then
++   if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then
+       # NetworkManager 0.8.0
+       $dbusSend --system --print-reply          \
+          --dest=org.freedesktop.NetworkManager  \
+@@ -203,7 +203,7 @@
+ 
+    # XXX Are these really necessary?  If so, we should have seen customer
+    # complaints by now.
+-   which ifup >/dev/null 2>&1      || Panic "ifup not in search path."
++#   which ifup >/dev/null 2>&1     || Panic "ifup not in search path."
+    which ifconfig >/dev/null 2>&1  || Panic "ifconfig not in search path."
+ 
+    case "$1" in
diff --git a/community-testing/open-vm-tools/scripts-network.patch b/community-testing/open-vm-tools/scripts-network.patch
new file mode 100644
index 000000000..44c7e6dcb
--- /dev/null
+++ b/community-testing/open-vm-tools/scripts-network.patch
@@ -0,0 +1,73 @@
+--- network.org	2012-03-17 22:20:11.000000000 +0400
++++ network	2012-03-17 22:18:47.000000000 +0400
+@@ -34,51 +34,6 @@
+ 
+ 
+ #
+-# find_networking_script --
+-#
+-#    Searches common Linux distro init/rc paths to find a singular network
+-#    services script.
+-#
+-# Result:
+-#    Returns a valid networking script path on success or "error" on failure.
+-#
+-# Side effects:
+-#    None.
+-#
+-
+-find_networking_script() {
+-   local script="error"
+-   for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do
+-      if [ -d "$dir/rc0.d" ] &&
+-         [ -d "$dir/rc1.d" ] &&
+-         [ -d "$dir/rc2.d" ] &&
+-         [ -d "$dir/rc3.d" ] &&
+-         [ -d "$dir/rc4.d" ] &&
+-         [ -d "$dir/rc5.d" ] &&
+-         [ -d "$dir/rc6.d" ]; then
+-
+-         # Now find the appropriate networking script.
+-         if [ -d "$dir/init.d" ]; then
+-            if [ -x "$dir/init.d/network" ]; then
+-               script="$dir/init.d/network"
+-            elif [ -x "$dir/init.d/networking" ]; then
+-               script="$dir/init.d/networking"
+-            fi
+-         else
+-            if [ -x "$dir/network" ]; then
+-               script="$dir/network"
+-            elif [ -x "$dir/networking" ]; then
+-               script="$dir/networking"
+-            fi
+-         fi
+-      fi
+-   done
+-
+-   echo "$script"
+-}
+-
+-
+-#
+ # run_network_script --
+ #
+ # Finds out how to run the system's script used to control networking, and
+@@ -87,17 +42,7 @@
+ #
+ run_network_script()
+ {
+-   script=`find_networking_script`
+-   [ "$script" != "error" ] || Panic "Cannot find system networking script."
+-
+-   # Using SysV "service" if it exists, otherwise fall back to run the script directly
+-   service=`which service 2>/dev/null`
+-   if [ $? = 0 -a -n "$service" ]; then
+-      serviceName=`basename "$script"`
+-      "$service" "$serviceName" "$1"
+-   else
+-      "$script" "$1"
+-   fi
++  /etc/rc.d/network "$1"
+ }
+ 
+ 
diff --git a/community-testing/open-vm-tools/tools.conf b/community-testing/open-vm-tools/tools.conf
new file mode 100644
index 000000000..0bb2681b1
--- /dev/null
+++ b/community-testing/open-vm-tools/tools.conf
@@ -0,0 +1 @@
+bindir = "/usr/bin"
diff --git a/community-testing/open-vm-tools/vmware-guestd b/community-testing/open-vm-tools/vmware-guestd
new file mode 100644
index 000000000..ac80c0385
--- /dev/null
+++ b/community-testing/open-vm-tools/vmware-guestd
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth    sufficient      /lib/security/pam_unix2.so      shadow  nullok
+auth    required        /lib/security/pam_unix_auth.so  shadow  nullok
+account sufficient      /lib/security/pam_unix2.so
+account required        /lib/security/pam_unix_acct.so
diff --git a/community-testing/open-vm-tools/xautostart.conf b/community-testing/open-vm-tools/xautostart.conf
new file mode 100644
index 000000000..829f379ce
--- /dev/null
+++ b/community-testing/open-vm-tools/xautostart.conf
@@ -0,0 +1,6 @@
+gnome-panel
+ksmserver
+startkde
+kwrapper
+panel
+xfce4-panel
diff --git a/community-testing/openttd/PKGBUILD b/community-testing/openttd/PKGBUILD
new file mode 100644
index 000000000..c546a3db3
--- /dev/null
+++ b/community-testing/openttd/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 69106 2012-04-09 13:50:09Z tdziedzic $
+# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
+
+pkgname=openttd
+pkgver=1.2.0rc4
+_realpkgver=1.2.0-RC4
+pkgrel=1
+pkgdesc='An engine for running Transport Tycoon Deluxe.'
+arch=('i686' 'x86_64')
+url='http://www.openttd.org'
+license=('GPL')
+depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo2' 'hicolor-icon-theme' 'desktop-file-utils' 'xz')
+install=openttd.install
+optdepends=('openttd-opengfx: free graphics' 
+            'openttd-opensfx: free soundset')
+source=("http://binaries.openttd.org/releases/${_realpkgver}/${pkgname}-${_realpkgver}-source.tar.xz")
+md5sums=('b8692deb951dc3a88c321a9e4b254dd2')
+
+build() {
+  cd ${pkgname}-${_realpkgver} 
+
+ ./configure \
+    --prefix-dir=/usr \
+    --binary-name=${pkgname} \
+    --binary-dir=bin \
+    --data-dir=share/${pkgname} \
+    --install-dir=${pkgdir} \
+    --doc-dir=share/doc/${pkgname} \
+    --menu-name="OpenTTD" \
+    --personal-dir=.${pkgname}    
+
+  make
+}
+
+package() {
+  cd ${pkgname}-${_realpkgver} 
+
+  make install
+}
diff --git a/community-testing/openttd/openttd.install b/community-testing/openttd/openttd.install
new file mode 100644
index 000000000..85b22a1c5
--- /dev/null
+++ b/community-testing/openttd/openttd.install
@@ -0,0 +1,17 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1
+  update-desktop-database > /dev/null 2>&1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  update-desktop-database > /dev/null 2>&1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1     
+  update-desktop-database > /dev/null 2>&1
+}
diff --git a/community-testing/parrot/PKGBUILD b/community-testing/parrot/PKGBUILD
new file mode 100644
index 000000000..640e7a740
--- /dev/null
+++ b/community-testing/parrot/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 69108 2012-04-09 13:50:17Z tdziedzic $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
+
+pkgname=parrot
+pkgver=4.2.0
+#_rel=stable
+_rel=devel
+pkgrel=1
+pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages"
+arch=('x86_64' 'i686')
+url="http://www.parrotcode.org/"
+license=('GPL')
+depends=('icu' 'openssl' 'libffi')
+makedepends=('perl-json')
+optdepends=('freeglut')
+options=(!makeflags)
+source=("ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.gz")
+sha256sums=('69ee93d9f81babcff67b747cc614358958a32f274e407b65771ca5a056d4c3d4')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  sed -i 's#auto::sha1##' lib/Parrot/Configure/Step/List.pm
+  sed -i 's#auto::git_describe##' lib/Parrot/Configure/Step/List.pm
+
+  perl Configure.pl --prefix=/usr \
+    --parrot_is_shared \
+    --disable-rpath
+
+  find -type f -name Makefile | while read F; do
+    grep "$srcdir" $F  && sed -i \
+      "s#-Wl,-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F
+    grep "$srcdir" $F  && sed -i \
+      "s#-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F
+  done
+
+  export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(pwd)/blib/lib"
+  make all parrot_utils docs html
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install-dev
+
+  sed -i "s#$srcdir#/usr/src#" \
+    $pkgdir/usr/lib/parrot/$pkgver/tools/lib/Parrot/Config/Generated.pm
+}
diff --git a/community-testing/pion-net/PKGBUILD b/community-testing/pion-net/PKGBUILD
new file mode 100644
index 000000000..970c36de2
--- /dev/null
+++ b/community-testing/pion-net/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 69110 2012-04-09 13:50:21Z tdziedzic $
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Contributor: David Watzke <david@watzke.cz>
+
+pkgname=pion-net
+pkgver=4.0.11
+pkgrel=1
+pkgdesc="A C++ development library for implementing lightweight HTTP interfaces"
+url="http://www.pion.org/projects/pion-network-library"
+arch=('i686' 'x86_64')
+license=('custom:Boost')
+depends=('boost-libs' 'openssl' 'log4cpp')
+makedepends=('boost')
+source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2")
+md5sums=('e5cf42a02681c5d73e7be6784d99fece')
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	# override configure bug (forces debug even when nobody asked for it)
+	sed -i "s/ -ggdb//g" configure
+
+	./configure --prefix=/usr --disable-doxygen-doc
+
+	# override Makefile bug
+	sed -i "/docs:/ s/doxygen-doc//" Makefile
+
+	make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
+
+	# install license
+	install -D -m0755 COPYING "$pkgdir/usr/share/licenses/$pkgname/Boost"
+}
diff --git a/community-testing/shotwell/PKGBUILD b/community-testing/shotwell/PKGBUILD
new file mode 100644
index 000000000..a10eff80d
--- /dev/null
+++ b/community-testing/shotwell/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 69088 2012-04-09 09:04:50Z jelle $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
+
+pkgname=shotwell
+pkgver=0.12.1
+pkgrel=1
+pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
+arch=('i686' 'x86_64')
+url="http://yorba.org/shotwell/"
+license=('LGPL2.1')
+depends=('glib2' 'gconf' 'libgee' 'libgphoto2' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw'
+	 'librsvg' 'json-glib' 'desktop-file-utils' 'dconf' 'sqlite' 'gtk3' 'rest')
+makedepends=('intltool' 'vala')
+install=shotwell.install
+source=("http://yorba.org/download/shotwell/0.12/shotwell-${pkgver}.tar.bz2")
+md5sums=('af2fa1f6d9ee498c0e23c23d8bb9fc7b')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+	--with-gconf-schema-file-dir=/usr/share/gconf/schemas \
+	--disable-schemas-install \
+	--disable-desktop-update \
+	--disable-icon-update
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  rm -f $pkgdir/usr/share/glib-2.0/schemas/gschemas.compiled
+}
diff --git a/community-testing/shotwell/shotwell.install b/community-testing/shotwell/shotwell.install
new file mode 100644
index 000000000..bab8ecd29
--- /dev/null
+++ b/community-testing/shotwell/shotwell.install
@@ -0,0 +1,17 @@
+pkgname=shotwell
+
+post_install() {
+  gtk-update-icon-cache -fq -t usr/share/icons/hicolor
+  update-desktop-database -q
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+  gtk-update-icon-cache -fq -t usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
diff --git a/community-testing/wings3d/PKGBUILD b/community-testing/wings3d/PKGBUILD
new file mode 100644
index 000000000..ead5b9e68
--- /dev/null
+++ b/community-testing/wings3d/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: kappa <kappacurve@gmail.com>
+
+pkgname=wings3d
+_pkgname=wings
+pkgver=1.4.1
+pkgrel=6
+pkgdesc="3D modeling program"
+arch=('x86_64' 'i686')
+url="http://www.wings3d.com/"
+license=('GPL')
+depends=('esdl' 'bash' 'desktop-file-utils')
+makedepends=('setconf' 'gendesk')
+optdepends=('povray: rendering support via POV-Ray')
+#            'kerkythea: rendering support via Kerkythea'
+replaces=('wings' 'wings-devel')
+install=$pkgname.install
+source=("http://downloads.sourceforge.net/wings/$_pkgname-$pkgver.tar.bz2"
+        "$pkgname"
+        "$pkgname.png")
+sha256sums=('51aea431e18935e5634ea673caa945f586db2203855554d8dcab5e9545f2789a'
+            '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e'
+            'ad49fded5e503131ee0e2e03a6db0974aa60f50e1ec6cd697fcacef126c40f52')
+_genericname=('3D Modeler')
+
+build() {
+  cd "$srcdir"
+  gendesk
+  setconf "$pkgname.desktop" Categories "Graphics;3DGraphics;"
+
+  cd "$_pkgname-$pkgver"
+  export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*)
+  make
+  make lang
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  mkdir -p "$pkgdir/usr/lib/$pkgname"
+  for subdir in ebin fonts patches plugins shaders textures; do
+    cp -r "$srcdir/$_pkgname-$pkgver/$subdir/" "$pkgdir/usr/lib/$pkgname"
+  done
+
+  install -D -m 755 "$srcdir/wings3d" "$pkgdir/usr/bin/wings3d"
+  install -D -m 644 "$srcdir/wings3d.desktop" \
+    "$pkgdir/usr/share/applications/wings3d.desktop"
+  install -D -m 644 "$srcdir/wings3d.png" \
+    "$pkgdir/usr/share/pixmaps/wings3d.png"
+  install -D -m 644 license.terms \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/wings3d/wings3d b/community-testing/wings3d/wings3d
new file mode 100644
index 000000000..c0fd3b2fb
--- /dev/null
+++ b/community-testing/wings3d/wings3d
@@ -0,0 +1,2 @@
+#!/bin/sh
+erl -noinput -smp disable -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"}
diff --git a/community-testing/wings3d/wings3d.install b/community-testing/wings3d/wings3d.install
new file mode 100644
index 000000000..98f3ea190
--- /dev/null
+++ b/community-testing/wings3d/wings3d.install
@@ -0,0 +1,14 @@
+post_upgrade() {
+  #gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_remove() {
+  post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/wings3d/wings3d.png b/community-testing/wings3d/wings3d.png
new file mode 100644
index 000000000..45a1140bf
--- /dev/null
+++ b/community-testing/wings3d/wings3d.png
diff --git a/community-testing/yaws/PKGBUILD b/community-testing/yaws/PKGBUILD
new file mode 100644
index 000000000..3652a9c06
--- /dev/null
+++ b/community-testing/yaws/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 69122 2012-04-09 13:51:14Z tdziedzic $
+# Maintainer: Vesa Kaihlavirta
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+
+pkgname=yaws
+pkgver=1.92
+pkgrel=2
+pkgdesc='Yet Another Web Server -- The pure Erlang HTTP server/framework'
+arch=('x86_64' 'i686')
+url='http://yaws.hyber.org/'
+license=('BSD')
+depends=('pam' 'erlang')
+backup=('etc/yaws/yaws.conf')
+options=('!emptydirs')
+install=$pkgname.install
+source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz")
+sha256sums=('cde83ca55d8e1b10a89094e1cfdc3e78d91ba9b1036cb5ea4e1994f5922c2357')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  for file in www/cgi.yaws www/cgi-bin/foo.py; do
+    # python2 fix
+	  sed -i '0,/on/s//on2/' "$file"
+  done
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -d "$pkgdir/usr/lib/erlang/lib"
+  ln -s /usr/lib/yaws "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/yaws/yaws.install b/community-testing/yaws/yaws.install
new file mode 100644
index 000000000..2b28403e1
--- /dev/null
+++ b/community-testing/yaws/yaws.install
@@ -0,0 +1,13 @@
+post_upgrade() {
+  mkdir -p /usr/var/log/yaws
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_remove() {
+  rmdir --ignore-fail-on-non-empty /usr/var/log/yaws
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/yaws/yaws.profile b/community-testing/yaws/yaws.profile
new file mode 100644
index 000000000..57303c1f8
--- /dev/null
+++ b/community-testing/yaws/yaws.profile
@@ -0,0 +1 @@
+export PATH=$PATH:/opt/yaws/bin
diff --git a/community-testing/yaz/PKGBUILD b/community-testing/yaz/PKGBUILD
new file mode 100644
index 000000000..30b4a88aa
--- /dev/null
+++ b/community-testing/yaz/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 69114 2012-04-09 13:50:32Z tdziedzic $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: William Rea <sillywilly@gmail.com>
+# Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
+
+pkgname=yaz
+pkgver=4.2.29
+pkgrel=1
+pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers"
+arch=('i686' 'x86_64')
+license=('BSD')
+url="http://www.indexdata.dk/yaz"
+depends=('openssl' 'libxslt' 'icu')
+options=('!libtool')
+source=("http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('584bcf12401f182a42091616c6cf7e0a')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr \
+              --enable-shared=yaz \
+              --with-openssl=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+
+  install -Dm644 LICENSE \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/arm-elf-gcc-base/PKGBUILD b/community/arm-elf-gcc-base/PKGBUILD
index 13d63059a..c3847cddf 100644
--- a/community/arm-elf-gcc-base/PKGBUILD
+++ b/community/arm-elf-gcc-base/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 68141 2012-03-18 17:28:57Z spupykin $
+# $Id: PKGBUILD 69206 2012-04-10 03:43:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=arm-elf-gcc-base
-pkgver=4.6.3
-pkgrel=2
+pkgver=4.7.0
+pkgrel=1
 pkgdesc="The GNU Compiler Collection"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 url="http://gcc.gnu.org"
 depends=('arm-elf-binutils' 'libmpc' 'libelf')
 options=(!libtool !emptydirs zipman docs !strip)
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-core-${pkgver}.tar.bz2)
-md5sums=('766091220c6a14fcaa2c06dd573e3758')
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2)
+md5sums=('2a0f1d99fda235c29d40b561f81d9a77')
 
 build() {
   cd $srcdir/gcc-$pkgver
@@ -19,12 +19,13 @@ build() {
   export CFLAGS="-O2 -pipe"
   export CXXFLAGS="-O2 -pipe"
 
-  [ $NOEXTRACT -eq 1 ] || rm -rf build
+  rm -rf build
   mkdir build
   cd build
 
-  [ $NOEXTRACT -eq 1 ] || ../configure --prefix=/usr \
+  ../configure --prefix=/usr \
 	--target=arm-elf \
+	--enable-obsolete \
 	--host=$CHOST \
 	--build=$CHOST \
 	--enable-shared --disable-nls --enable-languages=c --enable-multilib \
diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD
index 73f977cb2..f4064b5a4 100644
--- a/community/cdfs/PKGBUILD
+++ b/community/cdfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 62253 2012-01-18 19:54:16Z spupykin $
+# $Id: PKGBUILD 69163 2012-04-09 22:08:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
 
 pkgname=cdfs
 pkgver=2.6.27
-pkgrel=19
+pkgrel=20
 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files."
 arch=(i686 x86_64 'mips64el')
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD
index 254b5a9c6..17576f9f3 100644
--- a/community/darkstat/PKGBUILD
+++ b/community/darkstat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 67650 2012-03-13 15:19:52Z spupykin $
+# $Id: PKGBUILD 69208 2012-04-10 03:44:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=darkstat
 pkgver=3.0.715
-pkgrel=1
+pkgrel=2
 pkgdesc="Network statistics gatherer (packet sniffer)."
 url="http://dmr.ath.cx/net/darkstat/"
 license=("GPL")
diff --git a/community/darkstat/darkstat.install b/community/darkstat/darkstat.install
index a92bba909..fa0ccea48 100644
--- a/community/darkstat/darkstat.install
+++ b/community/darkstat/darkstat.install
@@ -2,10 +2,15 @@ daemon_name=darkstat
 daemon_chroot=/var/"$daemon_name"
 
 post_install() {
-  /usr/sbin/useradd -s /bin/false -r -N -g nobody "$daemon_name"
   if [ ! -d "$daemon_chroot" ]; then
     install -d "$daemon_chroot"
   fi
+  /usr/sbin/useradd \
+    --system \
+    --home "$daemon_chroot" \
+    --shell /bin/false \
+    --no-user-group \
+    --gid nobody "$daemon_name"
   chown -R "$daemon_name":nobody "$daemon_chroot"
 }
 
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index 811417a38..d3fd7c3b6 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67862 2012-03-15 15:26:31Z spupykin $
+# $Id: PKGBUILD 69184 2012-04-10 02:18:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Christian Himpel <chressie at gmail dot com>
 # Contributor: Johannes Hanika <hanatos at gmail dot com>
@@ -6,13 +6,13 @@
 pkgname=darktable
 pkgver=1.0
 _pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Utility to organize and develop raw images"
 arch=('i686' 'x86_64' 'mips64el')
 url=http://darktable.sf.net/
 license=('GPL3')
 depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib'
-	 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite3')
+	 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite')
 makedepends=('intltool>=0.40' 'cmake' 'librsvg')
 #	     'gnome-doc-utils' 'libxslt' 'fop')
 optdepends=('librsvg')
diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD
index 811e5b91c..35ab9d4c3 100644
--- a/community/freedroidrpg/PKGBUILD
+++ b/community/freedroidrpg/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 63564 2012-02-05 11:56:19Z ibiru $
+# $Id: PKGBUILD 69136 2012-04-09 18:24:09Z jelle $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: nut543 <kfs1@online.no>
 
 #pkgbase=freedroidrpg
 #pkgname=('freedroidrpg' 'freedroidrpg-data')
 pkgname='freedroidrpg'
-pkgver=0.15
-pkgrel=2
+pkgver=0.15.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 # depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data')
 depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa')
@@ -14,10 +14,10 @@ optdepends=('python2' 'espeak')
 pkgdesc="a mature science fiction role playing game set in the future"
 url="http://freedroid.sourceforge.net"
 license=("GPL")
-source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidrpg-$pkgver.tar.gz
+source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidRPG-$pkgver.tar.gz
 	freedroidrpg.jpg
 	freedroidrpg.desktop)
-md5sums=('003a3f34619cfaa87add2030fea5d120'
+md5sums=('b95ea6abae46bea6ee3ace9a1902f682'
          'b73d9dac44c7e83a6c80fbe4eb96ba79'
          '9a10c2a2064439cdcff5b945dfb1c3ac')
 
diff --git a/community/girara/PKGBUILD b/community/girara/PKGBUILD
index 557533d60..b6cf36235 100644
--- a/community/girara/PKGBUILD
+++ b/community/girara/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67564 2012-03-13 12:32:28Z spupykin $
+# $Id: PKGBUILD 69164 2012-04-09 22:09:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: mlq <mlq@pwmt.org>
 
 pkgbase=girara
 pkgname=(girara-common girara-gtk2 girara-gtk3)
-pkgver=0.1.1
+pkgver=0.1.2
 pkgrel=1
 pkgdesc="user interface library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url="http://pwmt.org/projects/girara"
 license=('custom')
 makedepends=('gtk3' 'gtk2')
 source=(http://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz)
-md5sums=('baa3ddb35703474c4a32dd2535785670')
+md5sums=('78ff028a4ba6ad259fd8e42b2fcc259a')
 
 build() {
   true
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index ea204703d..4a7690194 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63596 2012-02-05 11:58:54Z ibiru $
+# $Id: PKGBUILD 69172 2012-04-09 23:02:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: farid <farid at archlinuc-br.org>
@@ -6,8 +6,8 @@
 
 pkgbase=gmic
 pkgname=('gmic' 'gimp-plugin-gmic')
-pkgver=1.5.0.8
-pkgrel=2
+pkgver=1.5.1.1
+pkgrel=1
 pkgdesc="image procession framework"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:CeCILL')
@@ -16,20 +16,13 @@ makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagema
 options=('docs' '!emptydirs')
 source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz"
 	opencv-buildfix.patch)
-md5sums=('530e733b81e3c1cca7f17bfad4a56821'
-         'f135182ced743c296e08ddd560fa6be9')
+md5sums=('858a1d8d06d19a1903feb5314a58c805'
+         '62515a0e477e71e11ee24f66b5799937')
 
 build() {
   cd "$srcdir/gmic-$pkgver"
-  CFLAGS+=" -Dcimg_use_lapack"
-  LDFLAGS="-llapack"
-  sed -i "s#-lhighgui#-lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann#" configure
-  sed -i "s#-lcv#-lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann#" configure
-  ./configure --prefix=/usr
-  sed -i 's|OPENCV_CFLAGS = .*|OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv `pkg-config --cflags opencv`|' src/Makefile
-  sed -i 's|OPENCV_LDFLAGS = .*|OPENCV_LDFLAGS = `pkg-config --libs opencv`|' src/Makefile
-  sed -i 's|cp -f gmic_gimp.*||' src/Makefile
-  sed -i 's|ln -s $(DESTDIR)$(USR)|ln -s $(USR)|' src/Makefile
+#  CFLAGS+=" -Dcimg_use_lapack"
+#  LDFLAGS="-llapack"
   patch -p1 <$srcdir/opencv-buildfix.patch
   make -C src all
 }
@@ -41,6 +34,9 @@ package_gmic() {
   cd "$srcdir/gmic-$pkgver"
   make -C src install DESTDIR="$pkgdir" USR=/usr
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/gmic/LICENSE"
+  mkdir -p $pkgdir/usr/share/bash-completion/completions/
+  mv $pkgdir/etc/bash_completion.d/gmic $pkgdir/usr/share/bash-completion/completions/gmic
+  rm -rf $pkgdir/etc/bash_completion.d
 }
 
 package_gimp-plugin-gmic() {
diff --git a/community/gmic/opencv-buildfix.patch b/community/gmic/opencv-buildfix.patch
index 7fda2ea54..69778ac93 100644
--- a/community/gmic/opencv-buildfix.patch
+++ b/community/gmic/opencv-buildfix.patch
@@ -1,9 +1,9 @@
-diff -wbBur gmic-1.5.0.3.org/src/CImg.h gmic-1.5.0.3/src/CImg.h
---- gmic-1.5.0.3.org/src/CImg.h	2011-09-22 18:37:54.000000000 +0400
-+++ gmic-1.5.0.3/src/CImg.h	2011-10-05 18:03:25.000000000 +0400
-@@ -234,7 +234,11 @@
- // Using OpenCV is not mandatory.
- #ifdef cimg_use_opencv
+diff -wbBur gmic-1.5.1.1/src/CImg.h gmic-1.5.1.1.my/src/CImg.h
+--- gmic-1.5.1.1/src/CImg.h	2012-04-06 17:47:06.000000000 +0400
++++ gmic-1.5.1.1.my/src/CImg.h	2012-04-10 02:10:19.000000000 +0400
+@@ -243,7 +243,11 @@
+ #define _cimg_redefine_False
+ #endif
  #include <cstddef>
 +#undef True
 +#undef False
@@ -13,3 +13,67 @@ diff -wbBur gmic-1.5.0.3.org/src/CImg.h gmic-1.5.0.3/src/CImg.h
  #include "highgui.h"
  #endif
  
+diff -wbBur gmic-1.5.1.1/src/Makefile gmic-1.5.1.1.my/src/Makefile
+--- gmic-1.5.1.1/src/Makefile	2012-04-06 17:47:05.000000000 +0400
++++ gmic-1.5.1.1.my/src/Makefile	2012-04-10 02:39:09.000000000 +0400
+@@ -164,12 +164,12 @@
+ # Flags to enable native support of webcams, using the OpenCV library.
+ # This requires the presence of the OpenCV include and library files.
+ # (package 'libcv3-2-dev' on Debian).
+-OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
++OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv `pkg-config --cflags opencv`
+ ifeq ($(OS),Darwin)
+-OPENCV_LDFLAGS = `pkg-config opencv --libs`   # Use this for OpenCV 2.2.0 !
++OPENCV_LDFLAGS = `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui
+ else
+-OPENCV_LDFLAGS = -lcv -lhighgui
+-# OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui   # Use this for OpenCV 2.2.0 !
++OPENCV_LDFLAGS = `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui
++# OPENCV_LDFLAGS = `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui
+ endif
+ 
+ # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
+@@ -270,7 +270,6 @@
+ 	$(MAKE) bashcompletion
+ 	$(MAKE) gimp
+ 	$(MAKE) lib
+-	$(MAKE) zart
+ else
+ ifeq ($(OS),Darwin)
+ 	@echo "**"
+@@ -297,7 +296,7 @@
+ 
+ zart: lib
+ ifneq ($(OS),Darwin)
+-	cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart
++	cd ../zart && qmake zart.pro && $(MAKE) && strip zart
+ else
+ 	cd ../zart && qmake zart_mac.pro && $(MAKE) 
+ endif
+@@ -386,16 +385,13 @@
+ # Install/uninstall/clean.
+ install:
+ 	mkdir -p $(DESTDIR)$(PLUGINDIR)/
+-	cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/
++	
+ 	mkdir -p $(DESTDIR)$(USR)/bin/
+ 	cp -f gmic $(DESTDIR)$(USR)/bin/
+ 	mkdir -p $(DESTDIR)$(USR)/include/
+ 	cp -f gmic.h $(DESTDIR)$(USR)/include/
+ ifneq ($(OS),Darwin)
+ 	mkdir -p $(DESTDIR)$(USR)/share
+-	mkdir -p $(DESTDIR)$(USR)/share/zart
+-	cp -f ../zart/haar*.xml $(DESTDIR)$(USR)/share/zart
+-	cp -f ../zart/zart $(DESTDIR)$(USR)/bin/zart
+ 	mkdir -p $(DESTDIR)$(USR)/lib
+ 	cp -f libgmic.so $(DESTDIR)$(USR)/lib/libgmic.so.1.5.1.1
+ 	ln -s libgmic.so.1.5.1.1 $(DESTDIR)$(USR)/lib/libgmic.so.1.5.1
+@@ -420,8 +416,6 @@
+ 	rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
+ 	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
+ 	rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
+-	rm -f $(DESTDIR)$(USR)/bin/zart
+-	rm -rf $(DESTDIR)$(USR)/share/zart/
+ 
+ distclean: clean
+ 
diff --git a/community/gtkspell3/PKGBUILD b/community/gtkspell3/PKGBUILD
new file mode 100644
index 000000000..35929803e
--- /dev/null
+++ b/community/gtkspell3/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 69145 2012-04-09 20:12:18Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Roman Kyrylych <roman@archlinux.org>
+# Contributor: Ben <ben@benmazer.net>
+
+pkgname=gtkspell3
+_pkgname=gtkspell
+pkgver=3.0.0.hg20110814
+_pkgver=3.0.0~hg20110814
+pkgrel=1
+url="http://gtkspell.sourceforge.net/"
+pkgdesc="Provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk3' 'enchant')
+makedepends=('intltool')
+options=('!libtool')
+source=(http://pkgbuild.com/~bgyorgy/sources/${pkgname}_$_pkgver.orig.tar.gz)
+md5sums=('7cebcfa281f1f21fcb419f559a3e9e56')
+
+build() {
+  cd "$srcdir/$_pkgname-3.0.0+dev"
+
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-3.0.0+dev"
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD
index b5740707d..0f4e1d8df 100644
--- a/community/haskell-x11/PKGBUILD
+++ b/community/haskell-x11/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 67074 2012-03-03 16:11:32Z tdziedzic $
+# $Id: PKGBUILD 69204 2012-04-10 03:10:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: shild <sxp@bk.ru>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 _hkgname=X11
 pkgname=haskell-x11
-pkgver=1.5.0.1
-pkgrel=2
+pkgver=1.6.0
+pkgrel=1
 pkgdesc="A Haskell binding to the X11 graphics library."
 arch=(i686 x86_64 'mips64el')
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
 license=('custom:BSD3')
 options=('strip')
-depends=("ghc=7.4.1" "haskell-syb=0.3.6" 'libx11' 'libxinerama')
+depends=("ghc=7.4.1" "haskell-syb=0.3.6" 'libx11' 'libxinerama' 'libxrandr')
 conflicts=(haskell-x11-extras)
 install=hsmod.install
 source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
-md5sums=('7d69b204f773a0335828ced0e1e069f2')
+md5sums=('8199520ce58e91762d31d54ed081b99c')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/iec16022/PKGBUILD b/community/iec16022/PKGBUILD
new file mode 100644
index 000000000..0924cbbce
--- /dev/null
+++ b/community/iec16022/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 69134 2012-04-09 18:02:18Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=iec16022
+pkgver=0.2.4
+pkgrel=1
+pkgdesc="Produce 2D barcodes often also referenced as DataMatrix"
+arch=('i686' 'x86_64')
+url="http://datenfreihafen.org/projects/iec16022.html"
+license=('GPL')
+depends=('popt' 'zlib')
+options=('!libtool')
+source=(http://datenfreihafen.org/~stefan/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('9395108f1deaa2c4bd6d05a9e7c91431')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/iniparser/PKGBUILD b/community/iniparser/PKGBUILD
index 40b50c544..9599a445e 100644
--- a/community/iniparser/PKGBUILD
+++ b/community/iniparser/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 65566 2012-02-21 08:59:10Z spupykin $
+# $Id: PKGBUILD 69186 2012-04-10 02:19:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 
 pkgname=iniparser
-pkgver=3.0
-pkgrel=2
+pkgver=3.1
+pkgrel=1
 pkgdesc="A free stand-alone ini file parsing library written in portable ANSI C"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ndevilla.free.fr/iniparser/"
 license=('MIT')
 depends=()
 source=(http://ndevilla.free.fr/iniparser/$pkgname-$pkgver.tar.gz)
-md5sums=('133d955064d107a4fcb7739214356ce8')
+md5sums=('0aa4f995468ed390caf323f50a285bc3')
 
 build() {
   cd $srcdir/$pkgname
diff --git a/community/libee/PKGBUILD b/community/libee/PKGBUILD
index 02be347cd..6378227b4 100644
--- a/community/libee/PKGBUILD
+++ b/community/libee/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 62738 2012-01-25 15:37:48Z spupykin $
+# $Id: PKGBUILD 69124 2012-04-09 15:33:25Z jelle $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Brian Knox <taotetek@gmail.com>
 
 pkgname=libee
-pkgver=0.3.1
-pkgrel=3
+pkgver=0.4.0
+pkgrel=1
 pkgdesc="event expression library inspired by CEE"
 url="http://www.libee.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
-depends=('libestr')
+depends=('libestr' 'glibc')
 makedepends=()
 optdepends=()
 options=(!libtool)
 source=("http://www.libee.org/files/download/libee-$pkgver.tar.gz")
-md5sums=('61403a9a62b984381cf48454664f915e')
+md5sums=('257a23d5cc8f211fb99464a462bc92cd')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD
index 28c825bf7..420451b09 100644
--- a/community/libinfinity/PKGBUILD
+++ b/community/libinfinity/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 63646 2012-02-05 12:03:09Z ibiru $
+# $Id: PKGBUILD 69176 2012-04-10 00:10:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Gregory Haynes <greg@greghaynes.net>
 
 pkgname=libinfinity
-pkgver=0.5.1
-pkgrel=3
+pkgver=0.5.2
+pkgrel=1
 pkgdesc="An implementation of the Infininote protocol written in GObject-based C"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gobby.0x539.de"
@@ -16,7 +16,7 @@ optdepends=('avahi: zeroconf support'
             'gtk2: gtk support')
 options=('!libtool')
 source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('85e6d75e101fe25503653d2202054eff')
+md5sums=('1b2eee8150654baa7bba5900b96ffdc3')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index f0269c451..0366a92be 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67806 2012-03-14 13:44:05Z spupykin $
+# $Id: PKGBUILD 69188 2012-04-10 02:21:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=0.9.10
-pkgrel=4
+pkgver=0.9.11
+pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvirt.org/"
@@ -37,7 +37,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	openbsd-netcat-default.patch
 	unixperms.patch
 	yajl-2.x.patch)
-md5sums=('a424bb793521e637349da47e93dd5fff'
+md5sums=('6e9fab115075a8fd21d9bd0d7e558a52'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '4091cf082b1b743f5e7af060b3760276'
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index d522d0efe..2f221c36e 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68386 2012-03-23 19:11:14Z tdziedzic $
+# $Id: PKGBUILD 69141 2012-04-09 18:43:26Z tdziedzic $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
@@ -7,7 +7,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.6.14
+pkgver=0.6.15
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
 options=('!emptydirs')
 source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
-md5sums=('3033a866e230cca64e212ee8f2af27dd')
+md5sums=('852cfb1ed8125a4cdba456446d869d19')
 
 build() {
   cd node-v${pkgver}
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD
index 893894e68..3b05b901d 100644
--- a/community/open-vm-tools-modules/PKGBUILD
+++ b/community/open-vm-tools-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68084 2012-03-17 18:56:06Z spupykin $
+# $Id: PKGBUILD 69166 2012-04-09 22:10:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools-modules
 pkgver=2012.03.13
 _pkgsubver=651368
-pkgrel=1
+pkgrel=3
 pkgdesc="kernel modules for the open source implementation of VMware Tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://open-vm-tools.sourceforge.net/"
diff --git a/community/ozerocdoff/PKGBUILD b/community/ozerocdoff/PKGBUILD
index 54bf5564c..e4225e508 100644
--- a/community/ozerocdoff/PKGBUILD
+++ b/community/ozerocdoff/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61756 2012-01-07 11:39:19Z spupykin $
+# $Id: PKGBUILD 69167 2012-04-09 22:11:35Z spupykin $
 # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
 
 pkgname=ozerocdoff
 pkgver=2
-pkgrel=6
+pkgrel=7
 pkgdesc="Userspace driver for Option High Speed Mobile Devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pharscape.org/ozerocdoff.html"
@@ -27,6 +27,6 @@ package() {
   make DESTDIR="${pkgdir}" install
   rm -rf $pkgdir/usr/lib/hal
   rm -rf $pkgdir/usr/share/hal
-  mkdir -p $pkgdir/lib
-  mv $pkgdir/etc/udev $pkgdir/lib
+  mkdir -p $pkgdir/usr/lib
+  mv $pkgdir/etc/udev $pkgdir/usr/lib
 }
diff --git a/community/perl-dbd-odbc/PKGBUILD b/community/perl-dbd-odbc/PKGBUILD
index 870fa3e7e..134a8dfd9 100644
--- a/community/perl-dbd-odbc/PKGBUILD
+++ b/community/perl-dbd-odbc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61117 2011-12-21 20:57:54Z andrea $
+# $Id: PKGBUILD 69177 2012-04-10 00:11:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-dbd-odbc
-pkgver=1.33
-pkgrel=2
+pkgver=1.37
+pkgrel=1
 pkgdesc="ODBC Driver for DBI"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DBD-ODBC/"
@@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic')
 depends=('perl-dbi' 'perl' 'unixodbc')
 options=('!emptydirs')
 source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz")
-md5sums=('3e44ea4eb4b0bb711eea93632b76de17')
+md5sums=('0c294f8e3365c841dcee8a0ba4671c99')
 
 build() {
   cd  DBD-ODBC-${pkgver}
diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD
index b6c6e74d7..bcff2506c 100644
--- a/community/perl-params-validate/PKGBUILD
+++ b/community/perl-params-validate/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 66100 2012-02-23 01:04:43Z spupykin $
+# $Id: PKGBUILD 69212 2012-04-10 03:46:07Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-params-validate
 pkgver=1.06
-pkgrel=1
+pkgrel=2
 pkgdesc="Validate sub params against a spec"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Params-Validate"
 license=('GPL' 'PerlArtistic')
-depends=('perl')
+depends=('perl' 'perl-module-implementation')
 options=('!emptydirs')
 source=("http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-${pkgver}.tar.gz")
 md5sums=('4f7a281269cd30d7c3994ba5acb50857')
diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD
index 8293d399f..5b830dc27 100644
--- a/community/pgadmin3/PKGBUILD
+++ b/community/pgadmin3/PKGBUILD
@@ -1,34 +1,39 @@
-# $Id: PKGBUILD 61990 2012-01-13 12:30:02Z spupykin $
+# $Id: PKGBUILD 69179 2012-04-10 00:12:07Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Benjamin Andresen <benny@klapmuetz.org>
 # Contributor: bekks <eduard.warkentin@gmx.de>
 
 pkgname=pgadmin3
-pkgver=1.14.1
+pkgver=1.14.2
 pkgrel=1
-pkgdesc="A comprehensive design and management interface for PostgreSQL database"
+pkgdesc="Comprehensive design and management interface for PostgreSQL"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pgadmin.org"
 license=('custom')
 depends=('wxgtk' 'postgresql-libs' 'libxslt')
-makedepends=('libpqxx' 'krb5' 'postgresql')
-source=(ftp://ftp.de.postgresql.org/pub/packages/databases/PostgreSQL/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz
-	pgadmin3.desktop)
-md5sums=('ba943ac3a1d748bd32123c3d442606b2'
-         'd07ba4df54baead30b66d19d7450bcad')
+makedepends=('libpqxx' 'krb5' 'postgresql' 'gendesk' 'imagemagick')
+source=(ftp://ftp.de.postgresql.org/pub/packages/databases/PostgreSQL/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz)
+md5sums=('49f039353539b346616b663bbedd17c8')
 
 build() {
-  cd $srcdir/pgadmin3-${pkgver}
+  cd "$srcdir"
+  gendesk
+
+  cd "pgadmin3-${pkgver}"
   [ -f Makefile ] || ./configure --prefix=/usr
   make
+
+  convert pgadmin/include/images/pgAdmin3.ico pgadmin3.png
 }
 
 package() {
   cd $srcdir/pgadmin3-${pkgver}
+
   make DESTDIR=$pkgdir/ install
   install -Dm644 i18n/$pkgname.lng $pkgdir/usr/share/pgadmin3/i18n
   install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
   install -Dm644 pgadmin/include/images/pgAdmin3.ico $pkgdir/usr/share/pgadmin3/pixmaps/pgAdmin3.ico
-  install -Dm644 $srcdir/pgadmin3.desktop $pkgdir/usr/share/applications/pgadmin3.desktop
+  install -Dm644 "$srcdir/pgadmin3.png" "$pkgdir/usr/share/pixmaps/pgadmin3.png"
+  install -Dm644 "$srcdir/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop"
 }
diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD
index 7a341fcfa..f1603d01c 100644
--- a/community/pigeonhole/PKGBUILD
+++ b/community/pigeonhole/PKGBUILD
@@ -4,12 +4,12 @@
 # This must be built against the version of dovecot being used,
 # else mail delivery will fail.
 # Specify the version of dovecot to be used here:
-_dcpkgver=2.1.3
+_dcpkgver=2.1.4
 # Make sure to bump pkgrel if changing this.
 
 pkgname=pigeonhole
 pkgver=0.3.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pigeonhole.dovecot.org/"
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 808c0704d..811e77238 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67321 2012-03-08 16:32:59Z spupykin $
+# $Id: PKGBUILD 69168 2012-04-09 22:12:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=2.4.8
+pkgver=2.4.10
 pkgrel=1
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ backup=("etc/redis.conf"
 source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.d"
 	"redis.logrotate")
-md5sums=('ac776d25f238b142d3d526cfcdc621ab'
+md5sums=('71938de99cbb4fdefd74d7571831fa28'
          '9726d06d0a0c60cb5d55a31b3dc1e55d'
          '9e2d75b7a9dc421122d673fe520ef17f')
 
diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD
index 1e3fb4438..8077f4cc9 100644
--- a/community/schroot/PKGBUILD
+++ b/community/schroot/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67210 2012-03-05 08:59:27Z ibiru $
+# $Id: PKGBUILD 69192 2012-04-10 02:23:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
 
 pkgname=schroot
 pkgver=1.4.25
-pkgrel=1
+pkgrel=2
 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)."
 url="http://packages.qa.debian.org/s/schroot.html"
 license=('GPL3')
@@ -46,6 +46,7 @@ build() {
 		--enable-dchroot \
 		--enable-lvm-snapshot \
 		--enable-btrfs-snapshot \
+		--with-bash-completion-dir=/usr/share/bash-completion/completions/ \
 		BTRFS=/sbin/btrfs \
 		BTRFSCTL=/sbin/btrfsctl \
 		LVCREATE=/sbin/lvcreate \
diff --git a/community/tmux/PKGBUILD b/community/tmux/PKGBUILD
index 6f5bf908f..c904ed536 100644
--- a/community/tmux/PKGBUILD
+++ b/community/tmux/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 62681 2012-01-24 12:53:39Z spupykin $
+# $Id: PKGBUILD 69194 2012-04-10 02:24:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  TDY <tdy@gmx.com>
 # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
 
 pkgname=tmux
 pkgver=1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A terminal multiplexer"
 url="http://tmux.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -30,6 +30,6 @@ package() {
   install -dm755 "$pkgdir/usr/share/tmux/"
   install -m644 examples/* "$pkgdir/usr/share/tmux/"
 #  mv $pkgdir/usr/man $pkgdir/usr/share/
-  mkdir -p $pkgdir/etc/bash_completion.d/
-  mv $pkgdir/usr/share/tmux/bash_completion_tmux.sh $pkgdir/etc/bash_completion.d/tmux
+  mkdir -p $pkgdir/usr/share/bash-completion/completions/
+  mv $pkgdir/usr/share/tmux/bash_completion_tmux.sh $pkgdir/usr/share/bash-completion/completions/tmux
 }
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index bc8e7f762..865775ffe 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 68929 2012-04-06 00:04:17Z dreisner $
+# $Id: PKGBUILD 69169 2012-04-09 22:13:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=usb_modeswitch
-pkgver=1.2.2
-pkgrel=2
+pkgver=1.2.3
+pkgrel=1
 _pkgdata=20120120
 pkgdesc="Activating switchable USB devices on Linux."
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ backup=("etc/$pkgname.conf")
 source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2"
 	"http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2"
 	"usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt")
-md5sums=('4f3d3b9342b59b488089a8a81abda3ae'
+md5sums=('9b29e8b0d93d7604a9e5efc4696d37a3'
          'c899cc9c71bb35f3ec600b7cd1455c65'
          'c12e19e3992b5beac9b6c48555cff660')
 
@@ -33,9 +33,9 @@ package() {
   mkdir -p $pkgdir/usr/share/man/man1
 
   make DESTDIR=${pkgdir} UDEVDIR=${pkgdir}/usr/lib/udev install
-  
+
   cp $srcdir/usb-modeswitch-${pkgver}-device_reference.txt $pkgdir/etc/usb_modeswitch.setup
 
   cd $srcdir/usb-modeswitch-data-${_pkgdata}
-  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir install RULESDIR=${pkgdir}/usr/lib/udev/rules.d
 }
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 04d987cf8..9cf9d73f1 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 67224 2012-03-05 09:00:24Z ibiru $
+# $Id: PKGBUILD 69182 2012-04-10 00:30:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Denis Martinez <deuns.martinez@gmail.com>
 
 pkgname=wt
-pkgver=3.2.0
-pkgrel=3
+pkgver=3.2.1
+pkgrel=1
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.webtoolkit.eu/"
 license=('GPL')
 depends=('boost-libs>=1.36')
 makedepends=('boost>=1.36' 'cmake>=2.8'
-	     'postgresql-libs' 'zlib' 'fcgi' 'sqlite3' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt')
+	     'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt')
 optdepends=('openssl: for SSL support in built-in webserver'
 	    'zlib: for compression in HTTP protocol'
 	    'fcgi: for FastCGI support'
 	    'postgresql-libs: for PostgreSQL Dbo support'
-	    'sqlite3: for Sqlite3 Dbo support'
+	    'sqlite: for Sqlite Dbo support'
 	    'libharu: for PDF generation (WPdfImage)'
 	    'graphicsmagick: for raster image support (WRasterImage)'
 	    'pango: for advanced font rendering (WRasterImage)'
@@ -24,7 +24,7 @@ optdepends=('openssl: for SSL support in built-in webserver'
 	    'qt: for the Wt/Qt interopability example (wtwithqt)')
 backup=('etc/wt/wt_config.xml')
 source=(http://downloads.sourceforge.net/witty/$pkgname-${pkgver}.tar.gz)
-md5sums=('82ff039bccf7a941b37142c9d3fc7f32')
+md5sums=('92b729e1ddce99e961b3c86653688173')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/xfe/PKGBUILD b/community/xfe/PKGBUILD
index 3efcf49df..d83edfe41 100644
--- a/community/xfe/PKGBUILD
+++ b/community/xfe/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65255 2012-02-20 12:37:23Z spupykin $
+# $Id: PKGBUILD 69198 2012-04-10 02:25:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
 # Contributor: Ravi Desai <ravster3@hotmail.com>
 
 pkgname=xfe
-pkgver=1.32.4
-pkgrel=2
+pkgver=1.32.5
+pkgrel=1
 pkgdesc="X File Explorer (Xfe) is an MS-Explorer like file manager for X."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://roland65.free.fr/xfe"
@@ -13,7 +13,7 @@ license=("GPL")
 depends=('fox')
 makedepends=('intltool')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('ed9db4338b9191adb5267fd12f64e774')
+md5sums=('3b80908b0ebaa78b7e8610d09ee2d154')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD
index ac68dfad2..d48514e95 100644
--- a/community/zathura/PKGBUILD
+++ b/community/zathura/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 67873 2012-03-15 15:50:48Z spupykin $
+# $Id: PKGBUILD 69170 2012-04-09 22:13:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: ML <neldoreth>
 
 pkgname=zathura
-pkgver=0.1.1
-pkgrel=4
+pkgver=0.1.2
+pkgrel=1
 pkgdesc="a document viewer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pwmt.org/projects/zathura/"
 license=('custom')
-depends=('girara-gtk2' 'cairo' 'sqlite3')
+depends=('girara-gtk2' 'cairo' 'sqlite')
 makedepends=('docutils')
 optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-ps')
 install=zathura.install
 source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz)
-md5sums=('1379dfb1657b323da3b521ed251bb87a')
+md5sums=('c018b0385a392adb87b465b0f759aaf9')
 
 build() {
   cd $srcdir/zathura-$pkgver
@@ -23,8 +23,8 @@ build() {
 
 package() {
   cd $srcdir/zathura-$pkgver
-  make install DESTDIR=$pkgdir ZATHURA_GTK_VERSION=3
+  make install DESTDIR=$pkgdir ZATHURA_GTK_VERSION=2
   install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  mkdir -p $pkgdir/etc/bash_completion.d/
-  echo "complete -f -X '!*.[pf]df' zathura" >$pkgdir/etc/bash_completion.d/zathura
+  mkdir -p $pkgdir/usr/share/bash-completion/completions
+  echo "complete -f -X '!*.[pf]df' zathura" >$pkgdir/usr/share/bash-completion/completions/zathura
 }
diff --git a/core/libevent/PKGBUILD b/core/libevent/PKGBUILD
index db90f6ead..df3b43553 100644
--- a/core/libevent/PKGBUILD
+++ b/core/libevent/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150972 2012-02-24 12:02:43Z tomegun $
+# $Id: PKGBUILD 155924 2012-04-09 13:39:42Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Judd <jvinet@zeroflux.org>
 
 pkgname=libevent
-pkgver=2.0.17
+pkgver=2.0.18
 pkgrel=1
 pkgdesc="An event notification library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -30,5 +30,5 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('dad64aaaaff16b5fbec25160c06fee9a'
-         'ef4a32a96df3941fed58fbe39b4eab9d')
+md5sums=('aa1ce9bc0dee7b8084f6855765f2c86a'
+         '225bb6c417cfb31298e1e96d0eddca4a')
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 0af1bd77f..02818582e 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 153623 2012-03-16 18:05:31Z andyrtr $
+# $Id: PKGBUILD 155947 2012-04-09 14:48:18Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 # Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
 
 pkgname=dovecot
-pkgver=2.1.3
+pkgver=2.1.4
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dovecot.org/"
 license=("LGPL")
-depends=('krb5' 'openssl' 'sqlite3>=3.7.5' 'libmysqlclient>=5.5.10'
+depends=('krb5' 'openssl' 'sqlite>=3.7.5' 'libmysqlclient>=5.5.10'
         'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl')
 makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene')
 optdepends=('libldap: ldap plugin'
@@ -20,8 +20,8 @@ provides=('imap-server' 'pop3-server')
 options=('!libtool')
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh)
-md5sums=('a0e25243862c61de6274cf7d682a76ec'
-         '85c2737b822e095b1120e322f13ce3ad'
+md5sums=('9a360fc39462da71e2bfd1d6928f3902'
+         '1ba2a0f1f7b5f226ce867ea8243abe46'
          '587159e84e2da6f83d70b3c706ba87cc')
 
 build() {
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index 880d36e5c..f821eec42 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 151860 2012-03-03 14:28:54Z giovanni $
+# $Id: PKGBUILD 155954 2012-04-09 22:55:13Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
-pkgver=0.12.0
-pkgrel=2
+pkgver=0.12.1
+pkgrel=1
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gparted.sourceforge.net"
 license=('GPL')
-depends=('parted' 'gtkmm' 'libsigc++')
+depends=('parted' 'gtkmm' 'hicolor-icon-theme')
 makedepends=('intltool' 'pkg-config' 'gnome-doc-utils')
 optdepends=('dosfstools: for FAT16 and FAT32 partitions'
             'jfsutils: for jfs partitions'
@@ -24,7 +24,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions'
 install=gparted.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'org.archlinux.pkexec.gparted.policy')
-md5sums=('63a24677ff2ef0e62408ba684f233fab'
+md5sums=('8e07e7d8cf3add3d1facc68993122cf0'
          '27c264cfad8fa413d75954dda7a2dd50')
 
 build() {
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index 450874899..5595aeb26 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154267 2012-03-25 09:24:39Z giovanni $
+# $Id: PKGBUILD 155915 2012-04-09 08:06:09Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 
 pkgname=help2man
-pkgver=1.40.7
+pkgver=1.40.8
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('perl-locale-gettext')
 install=help2man.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('8abef49b3cbbb1a7c599341d9ab1bd0f')
+md5sums=('5a58c9900affd16013e091a89dcddf58')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/gnu/recutils/ChangeLog b/gnu/recutils/ChangeLog
new file mode 100644
index 000000000..02a3a418d
--- /dev/null
+++ b/gnu/recutils/ChangeLog
@@ -0,0 +1,36 @@
+recutils (1.5-1)
+
+  * New upstream release
+    - Version 1.5 (13 January 2012)
+    - The utilities will now ask interactively for a password
+      if it was not provided with the -s command line option.
+      This avoids security problems related to shell history files.
+    - Support for octal and hexadecimal numbers has been added.
+      They can be used in both the records and selection expressions.
+    - It is now possible to select a given number of random records
+      in many of the utilities using the -m command line option.
+    - The -n option now accepts a list of indexes, supporting ranges.
+    - The new -U (uniq) option for recsel removes duplicated fields
+      in the output records.
+    - The new -q option allows to quickly search for the desired record
+      without having to provide a complete selection expression.
+    - Auto generated fields are now considered integers by default.
+      This avoids repetitive patterns involving %auto and %type.
+    - Tab characters are now allowed in blank lines betwwen records.
+    - The API in rec.h is now better documented with comments, and improved.
+    - recfix now exits with an error status
+      if there is a parse error in some input file.
+    - The usage of the internal data structures has been _vastly_ improved,
+      resulting in a much faster operation.
+    - Internal cleanup and code factorization.
+    - Many, many, many bug fixes :D 
+  * PKGBUILD
+    - commenting out "makedepends=(mdbtools)" for now
+      because the current "mdbtools" package from the AUR
+      is missing 'MDB_NOFLAGS' in the "mdbtools.h" file.
+    - all other dependencies to compile and run recutils
+      are already satisfied through the 'base' group.
+  * Added some examples
+
+ -- Sven Wick <sven.wick@gmx.de>  Fri, 20 Jan 2012 16:04:02 +0100
+
diff --git a/gnu/recutils/PKGBUILD b/gnu/recutils/PKGBUILD
new file mode 100644
index 000000000..519c0fa6f
--- /dev/null
+++ b/gnu/recutils/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Max Meyer <dev@fedux.org>
+# Contributor: Sven Wick <sven.wick@gmx.de>
+#
+# Please fork and send me a pull request for changes to package build file(s)
+# Url: https://github.com/maxmeyer/archlinux-recutils
+#
+
+pkgname=recutils
+pkgver=1.5
+pkgrel=1
+pkgdesc="GNU tools and libraries to access human-editable, text-based databases."
+arch=(i686 x86_64 mips64el)
+url="http://www.gnu.org/software/recutils/"
+license=('GPL3')
+depends=(libgcrypt curl)
+optdepends=("mdbtools: for processing M$ Access databases")
+#options=()
+install=recutils.install
+changelog=ChangeLog
+source=("http://ftp.gnu.org/gnu/recutils/$pkgname-$pkgver.tar.gz")
+sha256sums=('7ed67e74468084f52ad9341e4b11c44e5fd9d5325b93b7eb2cb230c839ff5dec')
+options=(!libtool)
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make check
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/gnu/recutils/recutils.install b/gnu/recutils/recutils.install
new file mode 100644
index 000000000..245c7ae01
--- /dev/null
+++ b/gnu/recutils/recutils.install
@@ -0,0 +1,36 @@
+_infodir=/usr/share/info
+_infofiles=( recutils.info.gz )
+
+_mandir=/usr/share/man/man1
+_manfiles=( csv2rec.1.gz rec2csv.1.gz recdel.1.gz recfix.1.gz recfmt.1.gz recinf.1.gz recins.1.gz recsel.1.gz recset.1.gz)
+
+## arg 1:  the new package version
+post_install() {
+  [ -x /usr/bin/mandb ] || return 0
+  for _file in ${_manfiles[@]}; do
+    mandb -f $_mandir/$_file
+  done
+
+  [ -x /usr/bin/install-info ] || return 0
+  for _file in ${_infofiles[@]}; do
+    install-info $_infodir/$_file $_infodir/dir #2> /dev/null
+  done
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+    post_install $1
+}
+
+pre_remove() {
+  [ -x /usr/bin/mandb ] || return 0
+  mandb
+
+  [ -x /usr/bin/install-info ] || return 0
+  for _file in ${_infofiles[@]}; do
+    install-info --delete $_infodir/$_file $_infodir/dir #2> /dev/null
+  done
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/audacity-libre/.directory b/libre/audacity-libre/.directory
new file mode 100644
index 000000000..a65007814
--- /dev/null
+++ b/libre/audacity-libre/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,4,10,15,23,50
diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD
index cbb0aad47..01a5bb944 100644
--- a/libre/audacity-libre/PKGBUILD
+++ b/libre/audacity-libre/PKGBUILD
@@ -1,47 +1,42 @@
-# $Id$
-# Maintainer: Joseph Yaworski <jy@dervormund.info>
+# $Id: PKGBUILD 153455 2012-03-14 17:15:15Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
+_pkgname=audacity
 pkgname=audacity-libre
-pkgver=1.3.13
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="A program that lets you manipulate digital audio waveforms, libre"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://audacity.sourceforge.net/"
 license=('GPL')
-depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' 'hicolor-icon-theme'
-	'shared-mime-info' 'desktop-file-utils' 'redland' 'jack' 'soundtouch')
-makedepends=('zip')
+depends=('libmad' 'libid3tag' 'wxgtk' 'lame-libre' 'hicolor-icon-theme'
+	 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg')
 options=('!makeflags')
 install=audacity-libre.install
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-minsrc-${pkgver}-beta.tar.bz2
+source=(http://audacity.googlecode.com/files/${_pkgname}-minsrc-${pkgver}.tar.bz2
 	remove-unfree-nyquist.patch
 	audacity-libre.install)
+sha1sums=('0175474e63c51aaa97df9b45574f7f307f1d3bc8'
+          'cda4587458aecf15c41102f86c3b466f80acd0f3'
+          '59e511af919f62b07dd62bab251c56bef6344d70')
 provides=("audacity=$pkgver")
 replaces=('audacity')
 conflicts=('audacity')
 
-# source PKGBUILD; mksource
-mksource() {
-	wget http://audacity.googlecode.com/files/audacity-minsrc-${pkgver}-beta.tar.bz2 -O - | \
-        tar -jxvf -
+build() {
+  cd "${srcdir}/${_pkgname}-src-${pkgver}"
 
-    pushd audacity-src-${pkgver}-beta/
+# Removing nyquist
         rm -rfv {,lib-src/lib}nyquist
         find -iname '*nyquist*' -print0 | xargs -0 \
             rm -rfv 
         patch -Np0 -i ../remove-unfree-nyquist.patch || return 1
-    popd
-
-	mv audacity-src-${pkgver}-beta/ ${pkgname}-src-${pkgver}-beta/
-	tar -cjf ${pkgname}-minsrc-${pkgver}-beta.tar.bz2 ${pkgname}-src-${pkgver}-beta/
-}
 
-build() {
-  cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
   WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
     --with-portaudio --with-libsamplerate \
     --without-libresample --with-libmad \
-    --with-id3tag --with-libflac \
+    --with-ffmpeg --with-id3tag --with-libflac \
     --with-vorbis --with-libexpat \
     --with-libsndfile --with-soundtouch \
     --enable-unicode --without-taglib \
@@ -50,9 +45,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
+  cd "${srcdir}/${_pkgname}-src-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('0dca3e9b337ff1357b0580bd6de4e3b1'
-         '7c49dbe048d1f0f1706fd84bbea2fee4'
-         'd1942ad63ff1ef27cae2531ee914d5c8')
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index e9282b5aa..90b39d121 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150594 2012-02-18 18:25:33Z tomegun $
+# $Id: PKGBUILD 155345 2012-04-01 23:43:12Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgname=filesystem
 pkgver=2012.2
-pkgrel=2
+pkgrel=4
 pkgdesc='Base filesystem for Parabola'
 arch=('any')
 license=('GPL')
@@ -62,7 +62,7 @@ package() {
 		install -m600 ${srcdir}/${f} etc/
 	done
 	touch etc/arch-release
-	install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first lib/modprobe.d/usb-load-ehci-first.conf
+	install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
 
 	# setup /var
 	for d in cache/man local opt log/old lib/misc empty run; do
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 38d21a85b..8cef64bb6 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -10,14 +10,14 @@ post_install() {
 
 # args: <group> [options]
 _addgroup() {
-	if ! getent group "$1"; then
+	if ! getent group "$1" >/dev/null; then
 		groupadd "$@" >/dev/null
 	fi
 }
 
 # args: <group> [options]
 _adduser() {
-	if ! getent passwd "$1"; then
+	if ! getent passwd "$1" >/dev/null; then
 		useradd "$@" >/dev/null
 	fi
 }
diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
new file mode 100644
index 000000000..c7f952833
--- /dev/null
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -0,0 +1,78 @@
+# Maintainer: André Silva <andre.paulista@adinet.com.uy>
+
+pkgname=gnu-ghostscript
+_pkgver=9.04
+pkgver=9.04.1
+pkgrel=1
+pkgdesc="An interpreter for the PostScript language from FSF"
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms') # 'lcms2' won't get used) # move in libpaper from community?
+makedepends=('gtk2' 'gnutls')
+optdepends=('texlive-core:      needed for dvipdf'
+            'gtk2:              needed for gsx')
+conflicts=('ghostscript')
+replaces=('ghostscript-lrpng' 'ghostscript')
+provides=('ghostscript-lprng' "ghostscript=$pkgver")
+url="https://www.gnu.org/software/ghostscript/"
+source=(ftp://ftp.gnu.org/gnu/ghostscript/${pkgname}-${pkgver}.tar.xz
+	${pkgname}-cups-rgbw.patch
+	libtool.patch)
+options=('!libtool' '!makeflags')
+md5sums=('aba639a5102afbd2ee30c67831692c27'
+         '5a78af559d44a7502978fd09f840e3aa'
+         '5bd5d4966007b460deed866a30a0b3c8')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  # fix broken color printing https://bugs.archlinux.org/task/25519
+  patch -Np1 -i ${srcdir}/${pkgname}-cups-rgbw.patch
+
+  # fix libtool version
+  patch -Np1 -i ${srcdir}/libtool.patch
+
+  # force it to use system-libs
+  rm -rf jpeg libpng zlib jasper expat tiff lcms freetype
+
+LIBS=-lfreetype  ./configure --prefix=/usr \
+	--enable-dynamic \
+	--with-ijs \
+	--with-jbig2dec \
+	--with-omni \
+	--with-x \
+	--with-drivers=ALL\
+	--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
+	--with-install-cups \
+	--enable-fontconfig \
+	--enable-freetype \
+	--without-luratech \
+	--disable-compile-inits #--help # needed for linking with system-zlib
+  make
+
+  # Build IJS
+  cd ${srcdir}/${pkgname}-${pkgver}/ijs
+  ./autogen.sh
+  ./configure --prefix=/usr --enable-shared --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} \
+	cups_serverroot=${pkgdir}/etc/cups \
+	cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
+
+  # install missing doc files # http://bugs.archlinux.org/task/18023
+  install -m 644 ${srcdir}/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/ghostscript/$_pkgver/doc/
+  
+  mkdir -p ${pkgdir}/usr/share/licenses/ghostscript
+  install -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/
+
+  # remove unwanted localized man-pages
+  rm -rf $pkgdir/usr/share/man/[^man1]*
+
+  # install IJS
+  cd ${srcdir}/${pkgname}-${pkgver}/ijs
+  make DESTDIR=${pkgdir} install
+}
diff --git a/libre/gnu-ghostscript/gnu-ghostscript-cups-rgbw.patch b/libre/gnu-ghostscript/gnu-ghostscript-cups-rgbw.patch
new file mode 100644
index 000000000..81b52a2e6
--- /dev/null
+++ b/libre/gnu-ghostscript/gnu-ghostscript-cups-rgbw.patch
@@ -0,0 +1,263 @@
+diff -up gnu-ghostscript-9.04.1/cups/gdevcups.c.cups-rgbw ghostscript-9.04/cups/gdevcups.c
+--- gnu-ghostscript-9.04.1/cups/gdevcups.c.cups-rgbw	2011-08-05 12:12:21.000000000 +0100
++++ gnu-ghostscript-9.04.1/cups/gdevcups.c	2011-08-22 10:54:24.614010581 +0100
+@@ -225,6 +225,7 @@ typedef struct gx_device_cups_s
+   unsigned short	EncodeLUT[gx_max_color_value + 1];/* RGB value to output color LUT */
+   int			Density[CUPS_MAX_VALUE + 1];/* Density LUT */
+   int			Matrix[3][3][CUPS_MAX_VALUE + 1];/* Color transform matrix LUT */
++  int                   user_icc;
+   int                   cupsRasterVersion;
+ 
+   /* Used by cups_put_params(): */
+@@ -426,6 +427,7 @@ gx_device_cups	gs_cups_device =
+   {0x00},                                  /* EncodeLUT */
+   {0x00},                                  /* Density */
+   {0x00},                                  /* Matrix */
++  0,
+   3                                     /* cupsRasterVersion */
+ };
+ 
+@@ -1182,15 +1184,18 @@ cups_map_cmyk(gx_device *pdev,		/* I - D
+ 
+     case CUPS_CSPACE_RGB :
+     case CUPS_CSPACE_RGBW :
++        c0 = c + k;
++        c1 = m + k;
++        c2 = y + k;
+         if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) {
+-	  c0 = c;
+-	  c1 = m;
+-	  c2 = y;
+-	  c3 = k;
+-	} else {
+-	  c0 = c + k;
+-	  c1 = m + k;
+-	  c2 = y + k;
++	  if ((k >= frac_1 - 1) ||
++	      ((c0 >= frac_1) && (c1 >= frac_1) && (c2 >= frac_1))) {
++	    c0 = frac_1;
++	    c1 = frac_1;
++	    c2 = frac_1;
++	    c3 = frac_1;
++	  } else
++	    c3 = 0;
+ 	}
+ 
+         if (c0 < 0)
+@@ -1212,11 +1217,12 @@ cups_map_cmyk(gx_device *pdev,		/* I - D
+ 	out[2] = frac_1 - (frac)cups->Density[c2];
+ 
+         if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) {
+-	  if (c3 < 0)
+-	    c3 = 0;
+-	  else if (c3 > frac_1)
+-	    c3 = frac_1;
+-	  out[3] = frac_1 - (frac)cups->Density[c3];
++	  if (c3 == 0)
++	    out[3] = frac_1;
++	  else if (c3 == frac_1)
++	    out[3] = 0;
++	  else
++	    out[3] = frac_1;
+ 	}
+         break;
+ 
+@@ -2034,10 +2040,15 @@ cups_map_color_rgb(gx_device      *pdev,
+         * cups->DecodeLUT actually maps to RGBW, not CMYK...
+ 	*/
+ 
+-        k = cups->DecodeLUT[c3];
+-        c = cups->DecodeLUT[c0] + k - gx_max_color_value;
+-        m = cups->DecodeLUT[c1] + k - gx_max_color_value;
+-        y = cups->DecodeLUT[c2] + k - gx_max_color_value;
++        if (c3 == 0) {
++	  c = 0;
++	  m = 0;
++	  y = 0;
++	} else {
++	  c = cups->DecodeLUT[c0];
++	  m = cups->DecodeLUT[c1];
++	  y = cups->DecodeLUT[c2];
++	}
+ 
+         if (c > gx_max_color_value)
+ 	  prgb[0] = gx_max_color_value;
+@@ -2282,20 +2293,20 @@ cups_map_rgb_color(gx_device      *pdev,
+           switch (cups->header.cupsBitsPerColor)
+           {
+             default :
+-        	i = 0x0e;
++        	i = 0x00;
+         	break;
+             case 2 :
+-        	i = 0xfc;
++        	i = 0x00;
+         	break;
+             case 4 :
+-        	i = 0xfff0;
++        	i = 0x0000;
+         	break;
+             case 8 :
+-        	i = 0xffffff00;
++        	i = 0x00000000;
+         	break;
+ #ifdef GX_COLOR_INDEX_TYPE
+ 	    case 16 :
+-		i = 0xffffffffffff0000;
++		i = 0x0000000000000000;
+ 		break;
+ #endif /* GX_COLOR_INDEX_TYPE */
+           }
+@@ -2929,7 +2940,10 @@ cups_put_params(gx_device     *pdev,	/* 
+   int                   xflip = 0,
+                         yflip = 0;
+   int                   found = 0;
+-
++  gs_param_string icc_pro_dummy;
++  int old_cmps = cups->color_info.num_components;
++  int old_depth = cups->color_info.depth;
++  
+ #ifdef DEBUG
+   dprintf2("DEBUG2: cups_put_params(%p, %p)\n", pdev, plist);
+ #endif /* DEBUG */
+@@ -3024,6 +3038,11 @@ cups_put_params(gx_device     *pdev,	/* 
+   margins_set = param_read_float_array(plist, "Margins", &arrayval) == 0;
+   color_set   = param_read_int(plist, "cupsColorSpace", &intval) == 0 ||
+                 param_read_int(plist, "cupsBitsPerColor", &intval) == 0;
++
++  if (!cups->user_icc) {
++      cups->user_icc = param_read_string(plist, "OutputICCProfile", &icc_pro_dummy) == 0;
++  }
++
+   /* We set the old dimensions to 1 if we have a color depth change, so
+      that memory reallocation gets forced. This is perhaps not the correct
+      approach to prevent crashes like in bug 690435. We keep it for the
+@@ -3134,12 +3153,20 @@ cups_put_params(gx_device     *pdev,	/* 
+   if ((code = gdev_prn_put_params(pdev, plist)) < 0)
+     return (code);
+ 
++  /* If cups_set_color_info() changed the color model of the device we want to
++   * force the raster memory to be recreated/reinitialized
++   */
++  if (cups->color_info.num_components != old_cmps || cups->color_info.depth != old_depth) {
++      width_old = 0;
++      height_old = 0;
++  }
++  else {
+   /* pdev->width/height may have been changed by the call to
+    * gdev_prn_put_params()
+    */
+-  width_old = pdev->width;
+-  height_old = pdev->height;
+-
++     width_old = pdev->width;
++     height_old = pdev->height;
++  }
+  /*
+   * Update margins/sizes as needed...
+   */
+@@ -4044,22 +4071,88 @@ cups_set_color_info(gx_device *pdev)	/* 
+     for (k = 0; k <= CUPS_MAX_VALUE; k ++)
+       cups->Density[k] = k;
+   }
+-  /* Set up the ICC profile for ghostscript to use based upon the color space.
+-     This is different than the PPD profile above which appears to be some sort
+-     of matrix based TRC profile */
+-  switch (cups->header.cupsColorSpace) {
+-      /* Use RGB profile for this */
+-    case CUPS_CSPACE_RGBW:
+-      if (pdev->icc_struct == NULL) {
+-        pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
+-      }
+-      if (pdev->icc_struct->device_profile[gsDEFAULTPROFILE] == NULL) {
+-            code = gsicc_set_device_profile(pdev, pdev->memory, 
+-                DEFAULT_RGB_ICC, gsDEFAULTPROFILE);
+-      }
+-      break;
+-    default:
+-      break;
++  if (!cups->user_icc) {
++    /* Set up the ICC profile for ghostscript to use based upon the color space.
++       This is different than the PPD profile above which appears to be some sort
++       of matrix based TRC profile */
++    switch (cups->header.cupsColorSpace)
++    {
++      default :
++      case CUPS_CSPACE_RGBW :
++      case CUPS_CSPACE_RGB :
++      case CUPS_CSPACE_RGBA :
++      case CUPS_CSPACE_CMY :
++      case CUPS_CSPACE_YMC :
++#    ifdef CUPS_RASTER_HAVE_COLORIMETRIC
++      case CUPS_CSPACE_CIELab :
++      case CUPS_CSPACE_ICC1 :
++      case CUPS_CSPACE_ICC2 :
++      case CUPS_CSPACE_ICC3 :
++      case CUPS_CSPACE_ICC4 :
++      case CUPS_CSPACE_ICC5 :
++      case CUPS_CSPACE_ICC6 :
++      case CUPS_CSPACE_ICC7 :
++      case CUPS_CSPACE_ICC8 :
++      case CUPS_CSPACE_ICC9 :
++      case CUPS_CSPACE_ICCA :
++      case CUPS_CSPACE_ICCB :
++      case CUPS_CSPACE_ICCC :
++      case CUPS_CSPACE_ICCD :
++      case CUPS_CSPACE_ICCE :
++      case CUPS_CSPACE_ICCF :
++#    endif /* CUPS_RASTER_HAVE_COLORIMETRIC */
++        if (!pdev->icc_struct || (pdev->icc_struct &&
++             pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsRGB)) {
++
++          if (pdev->icc_struct) {
++              rc_decrement(pdev->icc_struct, "cups_set_color_info");            
++          }
++          pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
++
++          code = gsicc_set_device_profile(pdev, pdev->memory, 
++              (char *)DEFAULT_RGB_ICC, gsDEFAULTPROFILE);
++          }
++        break;
++
++      case CUPS_CSPACE_W :
++      case CUPS_CSPACE_WHITE :
++      case CUPS_CSPACE_K :
++      case CUPS_CSPACE_GOLD :
++      case CUPS_CSPACE_SILVER :
++        if (!pdev->icc_struct || (pdev->icc_struct &&
++             pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsGRAY)) {
++
++          if (pdev->icc_struct) {
++              rc_decrement(pdev->icc_struct, "cups_set_color_info");            
++          }
++          pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
++
++          code = gsicc_set_device_profile(pdev, pdev->memory->non_gc_memory, 
++              (char *)DEFAULT_GRAY_ICC, gsDEFAULTPROFILE);
++        }
++        break;
++      case CUPS_CSPACE_KCMYcm :
++#    ifdef CUPS_RASTER_HAVE_COLORIMETRIC
++      case CUPS_CSPACE_CIEXYZ :
++#endif
++      case CUPS_CSPACE_CMYK :
++      case CUPS_CSPACE_YMCK :
++      case CUPS_CSPACE_KCMY :
++      case CUPS_CSPACE_GMCK :
++      case CUPS_CSPACE_GMCS :
++        if (!pdev->icc_struct || (pdev->icc_struct &&
++             pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsCMYK)) {
++
++          if (pdev->icc_struct) {
++              rc_decrement(pdev->icc_struct, "cups_set_color_info");            
++          }
++          pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
++
++          code = gsicc_set_device_profile(pdev, pdev->memory, 
++              (char *)DEFAULT_CMYK_ICC, gsDEFAULTPROFILE);
++          }
++        break;
++    }
+   }
+ }
+ 
diff --git a/libre/gnu-ghostscript/libtool.patch b/libre/gnu-ghostscript/libtool.patch
new file mode 100644
index 000000000..4271ce69b
--- /dev/null
+++ b/libre/gnu-ghostscript/libtool.patch
@@ -0,0 +1,14 @@
+--- gnu-ghostscript-9.04.1/ltmain.sh	2011-12-31 08:26:26.000000000 -0200
++++ gnu-ghostscript-9.04.1/ltmain.sh	2012-04-10 05:08:19.253341477 -0300
+@@ -79,9 +79,9 @@
+ 
+ PROGRAM=libtool
+ PACKAGE=libtool
+-VERSION=2.4
++VERSION=2.4.2
+ TIMESTAMP=""
+-package_revision=1.3293
++package_revision=1.3337
+ 
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
diff --git a/libre/lame-libre/PKGBUILD b/libre/lame-libre/PKGBUILD
index 66d50a1bf..29e069bbf 100644
--- a/libre/lame-libre/PKGBUILD
+++ b/libre/lame-libre/PKGBUILD
@@ -1,11 +1,15 @@
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 151867 2012-03-03 15:53:13Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor:	Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Maintainer: Henry Jensen <hjensen@connochaetos.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
+_pkgname=lame
 pkgname=lame-libre
-pkgver=3.98.4
-pkgrel=3
-pkgdesc="An MP3 encoder and graphical frame analyzer"
+pkgver=3.99.5
+pkgrel=1
+pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lame.sourceforge.net/"
 depends=('ncurses')
@@ -14,17 +18,24 @@ replaces=('lame')
 provides=("lame=${pkgver}")
 conflicts=('lame')
 license=('LGPL')
-options=('!libtool' '!distcc')
-source=(http://repo.parabolagnulinux.org/other/lame-3.98.4-libre.tar.gz)
-md5sums=('761a8629378974163b98f0b1c91d13e1')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.gz")
+md5sums=('84835b313d4a8b68f5349816d33e07ce')
 
 build() {
-  cd "${srcdir}/lame-${pkgver}-libre"
+  cd "$srcdir/$_pkgname-$pkgver"
 
   ./configure --prefix=/usr \
               --enable-nasm \
-              --enable-shared --disable-frontend
+              --enable-shared
   make
-  make DESTDIR="${pkgdir}" install
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
   rm -rf ${pkgdir}/usr/share/man
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/libui-sh/PKGBUILD b/libre/libui-sh/PKGBUILD
index 5792f88de..075d8c0a6 100644
--- a/libre/libui-sh/PKGBUILD
+++ b/libre/libui-sh/PKGBUILD
@@ -2,16 +2,16 @@
 # Maintainer: Dieter Plaetinck <dieter@plaetinck.be>
 
 pkgname=libui-sh
-pkgver=2011.08.31
-pkgrel=1
+pkgver=2011.10.09
+pkgrel=2
 pkgdesc="a shell library providing useful UI functions"
 arch=('any')
-url="https://projects.parabolagnulinux.org/libui-sh.git"
+url="http://github.com/Dieterbe/libui-sh/"
 license=('GPL3')
 depends=('bash')
 optdepends=('dialog: for ncurses support')
-source=($url/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('79daf01e4cd5b7fb186d1127d3334092')
+source=(ftp://ftp.archlinux.org/other/libui-sh/libui-sh-$pkgver.tar.gz)
+md5sums=('6f855b407d791ab66b78f839835ed915')
 
 build() {
 
@@ -22,3 +22,4 @@ build() {
 }
 
 # vim:set ts=2 sw=2 et:
+
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 8ff32c4c2..c2b31d5eb 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 144935 2011-12-11 03:21:39Z eric $
+# $Id: PKGBUILD 154470 2012-03-28 23:15:22Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor (Parabola): bitlord
 # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
-pkgbasename=liferea
+_pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.8.1b
+pkgver=1.8.4
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,20 +18,20 @@ depends=('gconf' 'libwebkit' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-t
 makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 install=liferea.install
-source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
+source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
         remove-non-free-suggestions.patch)
-md5sums=('70f27bfda41ff5b3b4e49c49c9dc88af'
-         'e2fdcbc485ce6ff7956c8527be152ca6')
+sha1sums=('f887a3928116f56e1b68719c150d40bd1c3c6dff'
+         '0d68c567c3d37932a49709c58c37c3f138fd19cb')
 
 build() {
-  cd "${srcdir}/liferea-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install
   make
 }
 
 package() {
-  cd "${srcdir}/liferea-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   
   install -d "${pkgdir}/usr/share/gconf/schemas"
diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install
index 369a55727..5ad87f7f6 100644
--- a/libre/liferea-libre/liferea.install
+++ b/libre/liferea-libre/liferea.install
@@ -1,4 +1,5 @@
 pkgname=liferea-libre
+
 post_install() {
   usr/sbin/gconfpkg --install ${pkgname}
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index e87e9ceb2..d30a61137 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=linux-libre-tools
 pkgname=('perf-libre' 'cpupower-libre')
 pkgver=3.3
 kernver=${pkgver}
-pkgrel=1.1
+pkgrel=2
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -56,18 +56,18 @@ package_cpupower-libre() {
   conflicts=('cpupower' 'cpufrequtils')
   provides=("cpupower=$pkgver")
 
-  # install rc.d script
-  install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
-  install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
-  install -D -m 644 cpupower.service "$pkgdir/lib/systemd/system/cpupower.service"
-
   cd linux-$kernver/tools/power/cpupower
   make \
     DESTDIR="$pkgdir" \
-    INSTALL='/bin/install -c' \
     mandir='/usr/share/man' \
     docdir='/usr/share/doc/cpupower' \
     install install-man
+  # install rc.d script
+  cd "$srcdir"
+  install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
+  install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
+  install -D -m 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
+
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/lsb-release-libre/PKGBUILD b/libre/lsb-release-libre/PKGBUILD
index 06521d21d..51ec79bea 100644
--- a/libre/lsb-release-libre/PKGBUILD
+++ b/libre/lsb-release-libre/PKGBUILD
@@ -1,4 +1,5 @@
 # Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Parabola contributor: André Silva <andre.paulista@adinet.com.uy>
 # $Id: PKGBUILD 22635 2010-07-25 20:05:28Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Malte Rabenseifner <malte@zearan.de>
@@ -7,7 +8,7 @@
 _pkgname=lsb-release
 pkgname=lsb-release-libre
 pkgver=1.4
-pkgrel=10.1
+pkgrel=12
 pkgdesc="LSB version query program with Parabola name"
 arch=('any')
 url="http://www.linuxbase.org/"
@@ -21,13 +22,17 @@ md5sums=('30537ef5a01e0ca94b7b8eb6a36bb1e4')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
+
   make
 }
 
 package() {
   cd "$srcdir/$_pkgname-$pkgver"
+
   install -dm755 "$pkgdir/etc"
-  echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-libre\"" > "$pkgdir/etc/lsb-release"
+  echo "DISTRIB_ID=parabola" > "$pkgdir/etc/lsb-release"
+  echo "DISTRIB_RELEASE=rolling" >> "$pkgdir/etc/lsb-release"
+  echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-libre\"" >> "$pkgdir/etc/lsb-release"
 
   install -Dm 644 lsb_release.1.gz "$pkgdir/usr/share/man/man1/lsb_release.1.gz"
   install -Dm 755 lsb_release "$pkgdir/usr/bin/lsb_release"
diff --git a/libre/seamonkey-libre/PKGBUILD b/libre/seamonkey-libre/PKGBUILD
index d70356044..0740cd692 100644
--- a/libre/seamonkey-libre/PKGBUILD
+++ b/libre/seamonkey-libre/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 149871 2012-02-11 11:12:41Z ibiru $
+# $Id: PKGBUILD 153522 2012-03-15 14:43:42Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 _pkgname=seamonkey
 pkgname=seamonkey-libre
-pkgver=2.7.1
+pkgver=2.8
 pkgrel=1
 pkgdesc="SeaMonkey internet suite, with GNUZilla addons"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ source=(ftp://releases.mozilla.org/pub/mozilla.org/$_pkgname/releases/$pkgver/so
         seamonkey-2.0-lang.patch
         libvpx.patch
         gnuzilla-addons.patch)
-md5sums=('a16764e55ef8e59c469dc44b63459ad6'
+md5sums=('a7128f6bcd16bebed4a7c3487b69c38f'
          'd02b5f002a7cdf8d15dccd2548d09256'
          '6119a2254716752c9d08e366f8d4c048'
          '25b6fe16ac24cd5c852213e5c1adb272'
diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD
index a55282b95..e9d5cf560 100644
--- a/libre/thunderbird-libre/PKGBUILD
+++ b/libre/thunderbird-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153450 2012-03-14 16:21:51Z ibiru $
+# $Id: PKGBUILD 155759 2012-04-06 07:48:34Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=thunderbird-libre
 pkgver=11.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL')
@@ -25,19 +25,25 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/sourc
         thunderbird-install-dir.patch
         channel-prefs.js
         vendor.js
-        libvpx.patch)
+        libvpx.patch
+        gcc47.patch
+        clrf.patch)
 md5sums=('b500560a006cb10194281263c78841f2'
-         'ca98c2bf1017b33e19dae22fdcef2e73'
+         '41511a6bcdd04cf56706218e4670e631'
          'af3e5b344d2edf1c7d61bb0a5a96de9a'
          'aea906acf72c43dd82ead2fabcc1c6db'
          '476ec205162340fb0679f522c9d31c3b'
          '5a53179d14ae9631b7afe5e4d0fc0b25'
-         '5b2aaff7dfe7f1f94ad965905b20e782')
+         '5b2aaff7dfe7f1f94ad965905b20e782'
+         '07b255039a2ffbcab5b5be7986245e36'
+         '5c8d79a9f1ecadffa818205ce1c23f2f')
 
 build() {
   cd "$srcdir/comm-release"
   patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
   patch -Np1 -i "$srcdir/libvpx.patch"
+  patch -Np1 -i "$srcdir/gcc47.patch"
+  patch -Np2 -i "$srcdir/clrf.patch"
 
   cp "$srcdir/mozconfig" .mozconfig
 
diff --git a/libre/thunderbird-libre/clrf.patch b/libre/thunderbird-libre/clrf.patch
new file mode 100644
index 000000000..9b6fcb8fb
--- /dev/null
+++ b/libre/thunderbird-libre/clrf.patch
@@ -0,0 +1,265 @@
+diff -up thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
+--- thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867	2012-03-13 03:37:12.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-03-16 07:20:29.299342799 +0100
+@@ -688,7 +688,7 @@ nsresult nsMsgSearchAdapter::EncodeImapV
+     PL_strcat(encoding, "{");
+     lengthStr.AppendInt((PRInt32) strlen(value));
+     PL_strcat(encoding, lengthStr.get());
+-    PL_strcat(encoding, "}"CRLF);
++    PL_strcat(encoding, "}" CRLF);
+     PL_strcat(encoding, value);
+     return NS_OK;
+   }
+diff -up thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
+--- thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-03-16 07:20:29.300342735 +0100
+@@ -753,7 +753,7 @@ nsFolderCompactState::OnDataAvailable(ns
+           }
+         }
+       }
+-#define EXTRA_KEYWORD_HDR "                                                                                 "MSG_LINEBREAK
++#define EXTRA_KEYWORD_HDR "                                                                                 " MSG_LINEBREAK
+ 
+        // if status offset isn't in the first block, this code won't work. There's no good reason
+       // for the status offset not to be at the beginning of the message anyway.
+@@ -1203,7 +1203,7 @@ nsOfflineStoreCompactState::OnDataAvaila
+         // check if there's an envelope header; if not, write one.
+         if (strncmp(m_dataBuffer, "From ", 5))
+         {
+-          m_fileStream->Write("From "CRLF, 7, &bytesWritten);
++          m_fileStream->Write("From " CRLF, 7, &bytesWritten);
+           m_offlineMsgSize += bytesWritten;
+         }
+       }
+diff -up thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
+--- thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp	2012-03-16 07:23:01.225877457 +0100
+@@ -1722,7 +1722,7 @@ PRInt32 nsSmtpProtocol::SendQuit()
+ {
+   m_sendDone = PR_TRUE;
+   nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
+-  SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server.
++  SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server.
+   m_nextState = SMTP_RESPONSE;
+   m_nextStateAfterResponse = SMTP_DONE;
+   return(0);
+@@ -1969,7 +1969,7 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI 
+     {
+       nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
+       // send a quit command to close the connection with the server.
+-      if (SendData(url, "QUIT"CRLF) == NS_OK)
++      if (SendData(url, "QUIT" CRLF) == NS_OK)
+       {
+         m_nextState = SMTP_RESPONSE;
+         m_nextStateAfterResponse = SMTP_ERROR_DONE;
+@@ -2118,4 +2118,3 @@ nsSmtpProtocol::GetUsernamePassword(nsAC
+     NS_ENSURE_SUCCESS(rv,rv);
+     return rv;
+ }
+-
+diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp
+--- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp	2012-03-16 07:20:29.309342162 +0100
+@@ -8298,7 +8298,7 @@ nsImapMailFolder::CopyFileToOfflineStore
+           bool needMoreData = false;
+           char * newLine = nsnull;
+           PRUint32 numBytesInLine = 0;
+-          const char *envelope = "From "CRLF;
++          const char *envelope = "From " CRLF;
+           offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
+           fileSize += bytesWritten;
+           do
+diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp
+--- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp	2012-03-16 07:20:29.314341844 +0100
+@@ -1410,7 +1410,7 @@ void nsImapProtocol::HandleIdleResponses
+ {
+   // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
+   nsCAutoString commandBuffer(GetServerCommandTag());
+-  commandBuffer.Append(" IDLE"CRLF);
++  commandBuffer.Append(" IDLE" CRLF);
+ 
+   do
+   {
+@@ -3290,7 +3290,7 @@ void nsImapProtocol::FetchMsgAttribute(c
+     commandString.Append(messageIds);
+     commandString.Append(" (");
+     commandString.Append(attribute);
+-    commandString.Append(")"CRLF);
++    commandString.Append(")" CRLF);
+     nsresult rv = SendData(commandString.get());
+ 
+     if (NS_SUCCEEDED(rv))
+@@ -5283,7 +5283,7 @@ nsImapProtocol::Expunge()
+ 
+   IncrementCommandTagNumber();
+   nsCAutoString command(GetServerCommandTag());
+-  command.Append(" expunge"CRLF);
++  command.Append(" expunge" CRLF);
+ 
+   nsresult rv = SendData(command.get());
+   if (NS_SUCCEEDED(rv))
+@@ -5359,7 +5359,7 @@ void nsImapProtocol::ID()
+   command.Append(gAppName);
+   command.Append("\" \"version\" \"");
+   command.Append(gAppVersion);
+-  command.Append("\")"CRLF);
++  command.Append("\")" CRLF);
+ 
+   nsresult rv = SendData(command.get());
+   if (NS_SUCCEEDED(rv))
+@@ -5816,7 +5816,7 @@ nsresult nsImapProtocol::AuthLogin(const
+     nsCAutoString correctedPassword;
+     EscapeUserNamePasswordString(password.get(), &correctedPassword);
+     command.Append(correctedPassword);
+-    command.Append("\""CRLF);
++    command.Append("\"" CRLF);
+     rv = SendData(command.get(), PR_TRUE /* suppress logging */);
+     NS_ENSURE_SUCCESS(rv, rv);
+     ParseIMAPandCheckForNewMail();
+@@ -7446,7 +7446,7 @@ void nsImapProtocol::CreateMailbox(const
+   nsCString command(GetServerCommandTag());
+   command += " create \"";
+   command += escapedName;
+-  command += "\""CRLF;
++  command += "\"" CRLF;
+ 
+   nsresult rv = SendData(command.get());
+   if(NS_SUCCEEDED(rv))
+@@ -7549,7 +7549,7 @@ void nsImapProtocol::Lsub(const char *ma
+   nsCString command (GetServerCommandTag());
+   command += " lsub \"\" \"";
+   command += escapedPattern;
+-  command += "\""CRLF;
++  command += "\"" CRLF;
+ 
+   PR_Free(boxnameWithOnlineDirectory);
+ 
+@@ -7578,7 +7578,7 @@ void nsImapProtocol::List(const char *ma
+   command += useXLIST ?
+     " xlist \"\" \"" : " list \"\" \"";
+   command += escapedPattern;
+-  command += "\""CRLF;
++  command += "\"" CRLF;
+ 
+   PR_Free(boxnameWithOnlineDirectory);
+ 
+@@ -7599,7 +7599,7 @@ void nsImapProtocol::Subscribe(const cha
+   nsCString command (GetServerCommandTag());
+   command += " subscribe \"";
+   command += escapedName;
+-  command += "\""CRLF;
++  command += "\"" CRLF;
+ 
+   nsresult rv = SendData(command.get());
+   if (NS_SUCCEEDED(rv))
+@@ -7617,7 +7617,7 @@ void nsImapProtocol::Unsubscribe(const c
+   nsCString command (GetServerCommandTag());
+   command += " unsubscribe \"";
+   command += escapedName;
+-  command += "\""CRLF;
++  command += "\"" CRLF;
+ 
+   nsresult rv = SendData(command.get());
+   if (NS_SUCCEEDED(rv))
+@@ -7631,7 +7631,7 @@ void nsImapProtocol::Idle()
+   if (m_urlInProgress)
+     return;
+   nsCAutoString command (GetServerCommandTag());
+-  command += " IDLE"CRLF;
++  command += " IDLE" CRLF;
+   nsresult rv = SendData(command.get());
+   if (NS_SUCCEEDED(rv))
+   {
+@@ -7658,7 +7658,7 @@ void nsImapProtocol::EndIdle(bool waitFo
+   nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
+   if (asyncInputStream)
+     asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
+-  nsresult rv = SendData("DONE"CRLF);
++  nsresult rv = SendData("DONE" CRLF);
+   // set a short timeout if we don't want to wait for a response
+   if (m_transport && !waitForResponse)
+     m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5);
+@@ -7727,8 +7727,8 @@ void nsImapProtocol::Copy(const char * m
+   PRUint32 msgsHandled = 0;
+   const char *formatString;
+   formatString = (idsAreUid)
+-      ? "%s uid store %s %s"CRLF
+-      : "%s store %s %s"CRLF;
++      ? "%s uid store %s %s" CRLF
++      : "%s store %s %s" CRLF;
+ 
+   do
+   {
+diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
+--- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-03-16 07:20:29.316341717 +0100
+@@ -185,7 +185,7 @@ void nsImapServerResponseParser::ParseIM
+   
+   NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && 
+     *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string");
+-  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
++  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
+   if (sendingIdleDone)
+     fWaitingForMoreClientInput = PR_FALSE;
+ 
+diff -up thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp
+--- thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp	2012-03-16 07:23:38.980300990 +0100
+@@ -2483,7 +2483,7 @@ PRInt32 nsPop3Protocol::SendList()
+         return(MK_OUT_OF_MEMORY);
+     m_pop3ConData->next_state_after_response = POP3_GET_LIST;
+     m_listpos = 0;
+-    return SendData(m_url, "LIST"CRLF);
++    return SendData(m_url, "LIST" CRLF);
+ }
+ 
+ 
+diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp
+--- thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp	2012-03-16 07:20:29.320341461 +0100
+@@ -1473,7 +1473,7 @@ mime_parse_stream_complete (nsMIMESessio
+                 *newbody = 0;
+                 PL_strcatn(newbody, newbodylen, "<PRE>");
+                 PL_strcatn(newbody, newbodylen, body);
+-                PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
++                PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
+                 PR_Free(body);
+                 body = newbody;
+               }
+diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp
+--- thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp	2012-03-16 07:20:29.321341397 +0100
+@@ -280,7 +280,7 @@ MimeMultipart_parse_line (const char *li
+             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
+             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
+             MimeWriteAString(obj, fileName);
+-            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
++            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
+             MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
+             MimeWriteAString(obj, obj->options->state->detachedFilePath);
+             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
+@@ -293,10 +293,10 @@ MimeMultipart_parse_line (const char *li
+             status = MimeWriteAString(obj, header);
+             if (status < 0) 
+               return status;
+-            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK));
++            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
+             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: "));
+             MimeWriteAString(obj, fileName);
+-            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
++            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\""));
+           }
+           nsCString result;
+           char timeBuffer[128];
+@@ -306,8 +306,8 @@ MimeMultipart_parse_line (const char *li
+                                  "%a %b %d %H:%M:%S %Y",
+                                  &now);
+           MimeWriteAString(obj, nsDependentCString(timeBuffer));
+-          MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
+-          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK));
++          MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
++          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK));
+           MimeHeaders_write_raw_headers(mult->hdrs, obj->options, PR_FALSE);
+         }
+         PRInt32 old_nchildren = container->nchildren;
diff --git a/libre/thunderbird-libre/gcc47.patch b/libre/thunderbird-libre/gcc47.patch
new file mode 100644
index 000000000..3e1e9b98a
--- /dev/null
+++ b/libre/thunderbird-libre/gcc47.patch
@@ -0,0 +1,63 @@
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc comm-release/mozilla/ipc/chromium/src/base/file_util.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc	2012-04-03 18:38:11.474783536 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/file_util.cc	2012-04-03 18:43:29.218995578 +0000
+@@ -8,7 +8,7 @@
+ #include <io.h>
+ #endif
+ #include <stdio.h>
+-#if defined(ANDROID)
++#if defined(ANDROID) || defined(OS_POSIX)
+ #include <unistd.h>
+ #endif
+ 
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-03 18:38:11.381450924 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-03 18:43:29.218995578 +0000
+@@ -5,6 +5,9 @@
+ #include "base/file_util.h"
+ 
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+ 
+ #include <string>
+ #include <vector>
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-03 18:38:11.438117153 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-03 18:43:29.218995578 +0000
+@@ -6,6 +6,9 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+ 
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc comm-release/mozilla/ipc/chromium/src/base/time_posix.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-03 18:38:11.418117308 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-03 18:43:29.218995578 +0000
+@@ -14,6 +14,8 @@
+ #include <time.h>
+ #endif
+ 
++#include <unistd.h>
++
+ #include <limits>
+ 
+ #include "base/basictypes.h"
+diff -Nur comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in comm-release/mozilla/toolkit/crashreporter/client/Makefile.in
+--- comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in	2012-04-03 18:38:56.101105510 +0000
++++ comm-release/mozilla/toolkit/crashreporter/client/Makefile.in	2012-04-03 18:43:29.218995578 +0000
+@@ -69,6 +69,9 @@
+   $(STDCXX_COMPAT) \
+   $(NULL)
+ 
++# Needed for moz_free
++LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
++
+ ifeq ($(OS_ARCH),WINNT)
+ CPPSRCS += crashreporter_win.cpp
+ LIBS += \
diff --git a/libre/thunderbird-libre/mozconfig b/libre/thunderbird-libre/mozconfig
index 85ed8a648..8950db703 100644
--- a/libre/thunderbird-libre/mozconfig
+++ b/libre/thunderbird-libre/mozconfig
@@ -16,7 +16,7 @@ ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
-ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-cairo
 ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads
 
diff --git a/social/seeks/PKGBUILD b/social/seeks/PKGBUILD
index 2997e1be6..09da52060 100644
--- a/social/seeks/PKGBUILD
+++ b/social/seeks/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=seeks
 pkgver=0.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An open decentralized platform for collaborative search content"
 arch=('i686' 'x86_64')
 url="http://www.seeks-project.info"
@@ -55,11 +55,6 @@ package() {
     install -D -m644 ../seeks.conf.d "${pkgdir}"/etc/conf.d/seeks
     install -D -m600 ../seeks.logrotate  "${pkgdir}"/etc/logrotate.d/seeks
 }
-md5sums=('dd80c832f80c34c392be5872239a8d9f'
-         '33e6da05cca492019e6aff39684aed26'
-         '52e7e06a28974547041012a1cf3207f3'
-         'd1aba6739972239c6cd09178807e196f'
-         'e352306f5396a1af4dfc81a18bfc5a71')
 md5sums=('a2d0b6e7b91036883c0b327ead5e93c0'
          '33e6da05cca492019e6aff39684aed26'
          '52e7e06a28974547041012a1cf3207f3'
diff --git a/social/tomb/PKGBUILD b/social/tomb/PKGBUILD
new file mode 100644
index 000000000..a0ac0334f
--- /dev/null
+++ b/social/tomb/PKGBUILD
@@ -0,0 +1,30 @@
+## PKGBUILD [bash]
+# Maintainer: nignux <nignux@freaknet.org>
+
+pkgname=tomb
+pkgver=1.2
+pkgrel=1
+pkgdesc="Crypto Undertaker, simple tool to manage encrypted storage, from the hashes of the dyne:bolic nesting mechanism."
+arch=('i686' 'x86_64' 'mips64el')
+url="http://tomb.dyne.org"
+license=('GPL3')
+depends=('bc' 'cryptsetup' 'gnupg' 'gtk2' 'libnotify' 'sudo' 'zsh' 'steghide'
+         'dcfldd' 'wipe')
+makedepends=('autoconf')
+provides=('tomb')
+install=${pkgname}.install
+source=(https://github.com/dyne/Tomb/tarball/v1.2)
+md5sums=('30fb11ef26355a1828933b13ee265924')
+
+build() {
+  cd ${srcdir}/dyne-Tomb-ddd9331
+  autoreconf -i
+  ./configure --prefix=/usr
+  make
+}
+ 
+package() {
+  cd ${srcdir}/dyne-Tomb-ddd9331
+  make DESTDIR=${pkgdir} install
+}
+
diff --git a/social/tomb/tomb.install b/social/tomb/tomb.install
new file mode 100644
index 000000000..c1ee8b339
--- /dev/null
+++ b/social/tomb/tomb.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
+
diff --git a/testing/boost/PKGBUILD b/testing/boost/PKGBUILD
new file mode 100644
index 000000000..dc309a981
--- /dev/null
+++ b/testing/boost/PKGBUILD
@@ -0,0 +1,118 @@
+# $Id: PKGBUILD 155928 2012-04-09 13:40:37Z andyrtr $
+# Maintainer: kevin <kevin@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Kritoke <kritoke@gamebox.net>
+# Contributor: Luca Roccia <little_rock@users.sourceforge.net>
+
+pkgbase=boost
+pkgname=('boost-libs' 'boost')
+pkgver=1.49.0
+_boostver=${pkgver//./_}
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://www.boost.org/"
+makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
+source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
+        exceptions.patch)
+license=('custom')
+md5sums=('e0defc8c818e4f1c5bbb29d0292b76ca'
+         '9b44c28b36303152050c8c82469569c5')
+
+_stagedir="${srcdir}/stagedir"
+
+build() {
+  # set python path for bjam
+  cd "${srcdir}/${pkgbase}_${_boostver}/tools"
+  echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
+  echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
+  echo "using mpi ;" >> build/v2/user-config.jam
+
+  cd "${srcdir}"/${pkgbase}_${_boostver}
+  # https://svn.boost.org/trac/boost/ticket/5731
+  patch -p0 -i "${srcdir}/exceptions.patch"
+
+
+  # build bjam
+  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
+  ./build.sh cc
+
+  _bindir="bin.linuxx86"
+  [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
+
+  install -d "${_stagedir}"/usr/bin
+  install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
+
+  # build tools
+  cd "${srcdir}/${pkgbase}_${_boostver}/tools/"
+  "${_stagedir}"/usr/bin/bjam --toolset=gcc
+
+  # copy the tools
+  cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin"
+  for i in *;do
+      install -m755 "${i}" "${_stagedir}/usr/bin/${i}"
+  done
+
+  #boostbook needed by quickbook
+  cd "${srcdir}/${pkgbase}_${_boostver}/dist/"
+  cp -r share "${_stagedir}"
+
+  # build libs
+  cd "${srcdir}/${pkgbase}_${_boostver}"
+
+  # default "minimal" install: "release link=shared,static
+  # runtime-link=shared threading=single,multi"
+  # --layout=tagged will add the "-mt" suffix for multithreaded libraries
+  # and installs includes in /usr/include/boost.
+  # --layout=system no longer adds the -mt suffix for multi-threaded libs.
+  # install to ${_stagedir} in preparation for split packaging
+
+  "${_stagedir}"/usr/bin/bjam \
+      release debug-symbols=off threading=multi \
+      runtime-link=shared link=shared,static \
+      cflags=-fno-strict-aliasing \
+      toolset=gcc \
+      --prefix="${_stagedir}" \
+      -sTOOLS=gcc \
+      --layout=system \
+      ${MAKEFLAGS} \
+      install
+}
+
+package_boost() {
+    pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
+    depends=("boost-libs=${pkgver}")
+    optdepends=('python: for python bindings'
+                'python2: for python2 bindings'
+		'boost-build: to use boost jam for building your project.')
+
+    install -d "${pkgdir}"/usr/{include,lib,share}
+    # headers/source files
+    cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
+
+    # static libs
+    cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/
+
+    # utilities (bjam, bcp, pyste)
+    cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
+
+    #boostbook
+    cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share
+
+    # license
+    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
+        "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
+}
+
+package_boost-libs() {
+    pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
+    depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
+    optdepends=('openmpi: for mpi support')
+
+    install -d "${pkgdir}/usr/lib"
+    #shared libs
+    cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
+
+    # license
+    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
+        "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
+}
diff --git a/testing/boost/exceptions.patch b/testing/boost/exceptions.patch
new file mode 100644
index 000000000..9faa71526
--- /dev/null
+++ b/testing/boost/exceptions.patch
@@ -0,0 +1,25 @@
+diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp
+--- boost/numeric/conversion/converter_policies.hpp~	2008-10-13 11:00:03.000000000 +0200
++++ boost/numeric/conversion/converter_policies.hpp	2011-07-22 11:46:40.961876274 +0200
+@@ -20,6 +20,7 @@
+ 
+ #include "boost/mpl/if.hpp"
+ #include "boost/mpl/integral_c.hpp"
++#include "boost/throw_exception.hpp"
+ 
+ namespace boost { namespace numeric
+ {
+@@ -159,9 +160,9 @@ struct def_overflow_handler
+   void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow)
+   {
+     if ( r == cNegOverflow )
+-      throw negative_overflow() ;
++      boost::throw_exception( negative_overflow() ) ;
+     else if ( r == cPosOverflow )
+-           throw positive_overflow() ;
++      boost::throw_exception( positive_overflow() ) ;
+   }
+ } ;
+ 
+
+Diff finished.  Fri Jul 22 11:46:49 2011
diff --git a/testing/brltty/PKGBUILD b/testing/brltty/PKGBUILD
new file mode 100644
index 000000000..12384ae7c
--- /dev/null
+++ b/testing/brltty/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 155930 2012-04-09 13:40:39Z andyrtr $
+# Maintainer:
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=brltty
+pkgver=4.3
+pkgrel=5
+pkgdesc="Braille display driver for Linux/Unix"
+arch=('i686' 'x86_64')
+url="http://mielke.cc/brltty"
+license=('GPL' 'LGPL')
+depends=('libxaw' 'at-spi2-core' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst' 'pyrex')
+makedepends=('bluez')
+optdepends=('bluez: bluetooth support')
+backup=(etc/brltty.conf etc/conf.d/brltty.conf)
+options=('!makeflags' '!emptydirs')
+install=brltty.install
+source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz
+        'brltty'
+        'brltty.conf')
+md5sums=('5ada573f88df32b6150db3b9a620e20b'
+         '831ebaf0c56091702929c68805d20c4f'
+         'a8ab8b3dd059e96e1734bc9cdcf844fc')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --mandir=/usr/share/man \
+    --localstatedir=/var \
+    --with-screen-driver=a2 \
+    --enable-gpm \
+    --disable-java-bindings \
+    --disable-caml-bindings \
+    PYTHON=/usr/bin/python2
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make INSTALL_ROOT="$pkgdir" install
+  install -D -m755 "$srcdir/brltty" "$pkgdir/etc/rc.d/brltty"
+  install -D -m644 "$srcdir/brltty.conf" "$pkgdir/etc/conf.d/brltty.conf"
+  install -D -m644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
+}
diff --git a/testing/brltty/brltty b/testing/brltty/brltty
new file mode 100755
index 000000000..5ed21a52d
--- /dev/null
+++ b/testing/brltty/brltty
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+daemon_name=brltty
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/$daemon_name.conf
+
+get_pid() {
+	pidof -o %PPID $daemon_name
+}
+
+case "$1" in
+  start)
+    stat_busy "Starting $daemon_name daemon"
+
+    PID=$(get_pid)
+    if [ -z "$PID" ]; then
+      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
+      # RUN
+      $daemon_name $brltty_args
+      #
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        echo $(get_pid) > /var/run/$daemon_name.pid
+        add_daemon $daemon_name
+        stat_done
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping $daemon_name daemon"
+    PID=$(get_pid)
+    # KILL
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    #
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm -f /var/run/$daemon_name.pid &> /dev/null
+      rm_daemon $daemon_name
+      stat_done
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+
+  status)
+    stat_busy "Checking $daemon_name status";
+    ck_status $daemon_name
+    ;;
+
+  *)
+    echo "usage: $0 {start|stop|restart|status}"
+esac
+
+exit 0
diff --git a/testing/brltty/brltty.conf b/testing/brltty/brltty.conf
new file mode 100644
index 000000000..94115e1d5
--- /dev/null
+++ b/testing/brltty/brltty.conf
@@ -0,0 +1,2 @@
+# Specify any arguments to pass to brltty here.
+brltty_args=""
+\ No newline at end of file
diff --git a/testing/brltty/brltty.install b/testing/brltty/brltty.install
new file mode 100644
index 000000000..952ae58ff
--- /dev/null
+++ b/testing/brltty/brltty.install
@@ -0,0 +1,20 @@
+post_install () {
+     getent group brlapi  &>/dev/null || groupadd -r brlapi
+     if [ ! -e /etc/brlapi.key ]; then
+         mcookie >/etc/brlapi.key
+         chmod 0640 /etc/brlapi.key
+         chgrp brlapi /etc/brlapi.key
+         echo "Please add your user to the brlapi group."
+     fi
+}
+
+post_upgrade () {
+    post_install
+}
+
+post_remove () {
+    getent group brlapi >/dev/null 2>&1 && groupdel brlapi
+    if [ -e /etc/brlapi.key ]; then
+        rm -f /etc/brlapi.key
+    fi
+}
diff --git a/testing/consolekit/PKGBUILD b/testing/consolekit/PKGBUILD
new file mode 100644
index 000000000..8576a741b
--- /dev/null
+++ b/testing/consolekit/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 155918 2012-04-09 13:20:09Z tomegun $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: onestep_ua <onestep@ukr.net>
+
+pkgname=consolekit
+pkgver=0.4.6
+pkgrel=1
+pkgdesc="A framework for defining and tracking users, login sessions, and seats"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
+license=('GPL')
+depends=('polkit' 'zlib' 'libx11' 'dbus-glib')
+makedepends=('pkgconfig' 'xmlto' 'docbook-xsl')
+options=(!libtool)
+source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-$pkgver.tar.bz2
+        pam-foreground-compat.ck consolekit.logrotate consolekit.tmpfiles.conf)
+
+build() {
+  cd "$srcdir/ConsoleKit-$pkgver"
+  ./configure --prefix=/usr \
+      --sysconfdir=/etc \
+      --localstatedir=/var \
+      --libexecdir=/usr/lib/ConsoleKit \
+      --with-systemdsystemunitdir=/usr/lib/systemd/system \
+      --enable-pam-module \
+      --enable-docbook-docs \
+      --enable-udev-acl
+  make
+}
+
+package() {
+  cd "$srcdir/ConsoleKit-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -m755 "$srcdir/pam-foreground-compat.ck" "$pkgdir/usr/lib/ConsoleKit/run-session.d/"
+
+  # install the logrotate config
+  install -D -m644 "$srcdir/consolekit.logrotate" "$pkgdir/etc/logrotate.d/consolekit"
+
+  install -D -m644 "$srcdir/consolekit.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/consolekit.conf"
+
+  rm -rf "${pkgdir}/var/run"
+}
+md5sums=('810990b607e338f06a6396c92b8a4a06'
+         'a8a4de71d9b0549b8143e5f6c2a36fc7'
+         '6fefa451d9fe2fc6d6269629d3529793'
+         '8c5a8059db515d40fae1379daf084094')
diff --git a/testing/consolekit/consolekit.logrotate b/testing/consolekit/consolekit.logrotate
new file mode 100644
index 000000000..7c5346ef8
--- /dev/null
+++ b/testing/consolekit/consolekit.logrotate
@@ -0,0 +1,5 @@
+/var/log/ConsoleKit/history {
+    missingok
+    notifempty
+    delaycompress
+}
diff --git a/testing/consolekit/consolekit.tmpfiles.conf b/testing/consolekit/consolekit.tmpfiles.conf
new file mode 100644
index 000000000..4ec125110
--- /dev/null
+++ b/testing/consolekit/consolekit.tmpfiles.conf
@@ -0,0 +1 @@
+d /run/ConsoleKit 0755 - - -
diff --git a/testing/consolekit/pam-foreground-compat.ck b/testing/consolekit/pam-foreground-compat.ck
new file mode 100644
index 000000000..7f6b122d5
--- /dev/null
+++ b/testing/consolekit/pam-foreground-compat.ck
@@ -0,0 +1,16 @@
+#!/bin/sh
+TAGDIR=/var/run/console
+
+[ -n "$CK_SESSION_USER_UID" ] || exit 1
+
+TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
+
+if [ "$1" = "session_added" ]; then
+    mkdir -p "$TAGDIR"
+    echo "$CK_SESSION_ID" >> "$TAGFILE"
+fi
+
+if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then
+    sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
+    [ -s "$TAGFILE" ] || rm -f "$TAGFILE"
+fi
diff --git a/testing/ekiga/PKGBUILD b/testing/ekiga/PKGBUILD
new file mode 100644
index 000000000..3d675830f
--- /dev/null
+++ b/testing/ekiga/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 155948 2012-04-09 15:46:19Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Tom K <tomk@runbox.com>
+
+pkgname=ekiga
+pkgver=3.3.2
+pkgrel=4
+pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
+url="http://www.ekiga.org"
+license=(GPL)
+arch=(i686 x86_64)
+depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
+makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
+optdepends=('evolution-data-server: Evolution integration')
+options=(!emptydirs)
+groups=('gnome-extra')
+install=ekiga.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        gcc47.patch)
+sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a'
+            '9e3000016e1174be5d6cc60c89abeaeb61a98eb163a38abf11f4af4f2d6363ec')
+
+build() {
+  cd "$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/gcc47.patch"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-schemas-install \
+      --disable-scrollkeeper --enable-dbus
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
+
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain ekiga "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+}
diff --git a/testing/ekiga/ekiga.install b/testing/ekiga/ekiga.install
new file mode 100644
index 000000000..91f3a57a0
--- /dev/null
+++ b/testing/ekiga/ekiga.install
@@ -0,0 +1,22 @@
+pkgname=ekiga
+
+post_install() {
+  gconfpkg --install $pkgname
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gconfpkg --uninstall $pkgname
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
diff --git a/testing/ekiga/gcc47.patch b/testing/ekiga/gcc47.patch
new file mode 100644
index 000000000..f12c37524
--- /dev/null
+++ b/testing/ekiga/gcc47.patch
@@ -0,0 +1,99 @@
+From f81a43f2c4ed5e5083e3a850bc7164d11a910358 Mon Sep 17 00:00:00 2001
+From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr>
+Date: Sat, 24 Mar 2012 09:17:40 +0000
+Subject: Fix compile error with gcc 4.7
+
+---
+diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h
+index e16848e..b0a8775 100644
+--- a/lib/engine/account/bank-impl.h
++++ b/lib/engine/account/bank-impl.h
+@@ -203,7 +203,7 @@ template<typename AccountType>
+ void
+ Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account)
+ {
+-  add_object (account);
++  this->add_object (account);
+ 
+   account->questions.connect (boost::ref (questions));
+ }
+@@ -213,7 +213,7 @@ template<typename AccountType>
+ void
+ Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account)
+ {
+-  remove_object (account);
++  this->remove_object (account);
+ }
+ 
+ #endif
+diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h
+index 711d8d9..4fea7d5 100644
+--- a/lib/engine/addressbook/book-impl.h
++++ b/lib/engine/addressbook/book-impl.h
+@@ -204,7 +204,7 @@ void
+ Ekiga::BookImpl<ContactType>::add_contact (boost::shared_ptr<ContactType> contact)
+ {
+   contact->questions.connect (boost::ref (questions));
+-  add_object (contact);
++  this->add_object (contact);
+ }
+ 
+ 
+@@ -212,7 +212,7 @@ template<typename ContactType>
+ void
+ Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_ptr<ContactType> contact)
+ {
+-  remove_object (contact);
++  this->remove_object (contact);
+ }
+ 
+ #endif
+diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h
+index a30cd03..630236f 100644
+--- a/lib/engine/addressbook/source-impl.h
++++ b/lib/engine/addressbook/source-impl.h
+@@ -206,7 +206,7 @@ template<typename BookType>
+ void
+ Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book)
+ {
+-  add_object (book);
++  this->add_object (book);
+ 
+   add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1)));
+ 
+diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h
+index 245a7c6..92074a8 100644
+--- a/lib/engine/presence/cluster-impl.h
++++ b/lib/engine/presence/cluster-impl.h
+@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap)
+ 
+   add_connection (heap, heap->questions.connect (boost::ref (questions)));
+ 
+-  add_object (heap);
++  this->add_object (heap);
+ }
+ 
+ template<typename HeapType>
+diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h
+index d63c491..15fe86f 100644
+--- a/lib/engine/presence/heap-impl.h
++++ b/lib/engine/presence/heap-impl.h
+@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr<PresentityTyp
+ {
+   presentity->questions.connect (boost::ref (questions));
+ 
+-  add_object (presentity);
++  this->add_object (presentity);
+ }
+ 
+ template<typename PresentityType>
+ void
+ Ekiga::HeapImpl<PresentityType>::remove_presentity (boost::shared_ptr<PresentityType> presentity)
+ {
+-  remove_object (presentity);
++  this->remove_object (presentity);
+ }
+ 
+ #endif
+--
+cgit v0.9.0.2
diff --git a/testing/fcitx/Fix-for-gcc-4.7.0.patch b/testing/fcitx/Fix-for-gcc-4.7.0.patch
new file mode 100644
index 000000000..d02852281
--- /dev/null
+++ b/testing/fcitx/Fix-for-gcc-4.7.0.patch
@@ -0,0 +1,31 @@
+From 74ae75e291862530801ec9cc707dc810c52a84fd Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Sun, 25 Mar 2012 09:59:24 +0800
+Subject: [PATCH 1/2] fix for gcc 4.7.0
+
+---
+ src/lib/fcitx-config/CMakeLists.txt |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/fcitx-config/CMakeLists.txt b/src/lib/fcitx-config/CMakeLists.txt
+index f9fd2ec..2b361c6 100644
+--- a/src/lib/fcitx-config/CMakeLists.txt
++++ b/src/lib/fcitx-config/CMakeLists.txt
+@@ -1,10 +1,13 @@
+ set(FCITX_CONFIG_SOURCES
+     fcitx-config.c
+     hotkey.c
+-    sprintf.c
+     xdg.c
+ )
+ 
++if (NOT HAVE_ASPRINTF)
++    set(FCITX_CONFIG_SOURCES ${FCITX_CONFIG_SOURCES} sprintf.c)
++endif (NOT HAVE_ASPRINTF)
++
+ set(FCITX_CONFIG_HEADERS
+     fcitx-config.h
+     hotkey.h
+-- 
+1.7.9.4
+
diff --git a/testing/fcitx/PKGBUILD b/testing/fcitx/PKGBUILD
new file mode 100644
index 000000000..2e4a2d55e
--- /dev/null
+++ b/testing/fcitx/PKGBUILD
@@ -0,0 +1,67 @@
+# $Id: PKGBUILD 155932 2012-04-09 13:40:42Z andyrtr $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: csslayer <wengxt AT gmail com>
+
+pkgbase=fcitx
+pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
+pkgver=4.2.1
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/fcitx/"
+license=('GPL')
+makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu')
+source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz Fix-for-gcc-4.7.0.patch)
+sha1sums=('74ad009cde48fb1efd48f8d2490fa36ddf36d215'
+          '3f9a31d67cdbbb25f2151cb81208f1f3e0dd6e8f')
+
+build() {
+  cd "${srcdir}"
+  (cd ${pkgbase}-${pkgver}; patch -p1 -i ../Fix-for-gcc-4.7.0.patch)
+  mkdir build
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_OPENCC=OFF \
+    -DENABLE_GTK3_IM_MODULE=ON \
+    -DENABLE_QT_IM_MODULE=ON
+  make
+}
+
+package_fcitx() {
+  pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system"
+  depends=('dbus-core' 'pango' 'libxinerama' 'gtk-update-icon-cache' \
+           'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils')
+  install=fcitx.install
+
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+
+  rm -r "${pkgdir}"/usr/lib/{gtk-2.0,gtk-3.0,qt}
+}
+
+package_fcitx-gtk2() {
+  pkgdesc='GTK2 IM Module for fcitx'
+  depends=('gtk2' 'dbus-glib' 'fcitx')
+  install=fcitx-gtk2.install
+
+  cd "${srcdir}"/build/src/frontend/gtk2
+  make DESTDIR="${pkgdir}" install
+}
+
+package_fcitx-gtk3() {
+  pkgdesc='GTK3 IM Module for fcitx'
+  depends=('gtk3' 'dbus-glib' 'fcitx')
+  install=fcitx-gtk3.install
+
+  cd "${srcdir}"/build/src/frontend/gtk3
+  make DESTDIR="${pkgdir}" install
+}
+
+package_fcitx-qt() {
+  pkgdesc='QT IM Module for fcitx'
+  depends=('qt' 'icu' 'fcitx')
+
+  cd "${srcdir}"/build/src/frontend/qt
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/fcitx/fcitx-gtk2.install b/testing/fcitx/fcitx-gtk2.install
new file mode 100644
index 000000000..7503c05eb
--- /dev/null
+++ b/testing/fcitx/fcitx-gtk2.install
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/testing/fcitx/fcitx-gtk3.install b/testing/fcitx/fcitx-gtk3.install
new file mode 100644
index 000000000..b44958797
--- /dev/null
+++ b/testing/fcitx/fcitx-gtk3.install
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-3.0 --update-cache
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/testing/fcitx/fcitx.install b/testing/fcitx/fcitx.install
new file mode 100644
index 000000000..7f156e002
--- /dev/null
+++ b/testing/fcitx/fcitx.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/testing/gptfdisk/PKGBUILD b/testing/gptfdisk/PKGBUILD
new file mode 100644
index 000000000..b24d8bbbb
--- /dev/null
+++ b/testing/gptfdisk/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 155934 2012-04-09 13:40:46Z andyrtr $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Hokum <hokum_at_mail_dot_ru>
+
+pkgname=gptfdisk
+pkgver=0.8.4
+pkgrel=2
+pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
+arch=('i686' 'x86_64')
+url="http://www.rodsbooks.com/gdisk/"
+license=('GPL2')
+depends=('gcc-libs' 'util-linux' 'popt' 'icu')
+provides=("gdisk=$pkgver")
+conflicts=('gdisk')
+replaces=('gdisk')
+source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
+sha256sums=('a4aa6800df3a43bec2900eff3c2d8488d8d60c06833035bc881237f9acb79b85')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make
+}
+
+package () {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  install -d "$pkgdir"/{sbin,usr/share/{doc/gdisk,man/man8}}
+  install -t "$pkgdir/sbin" {,c,s}gdisk fixparts
+  install -m644 -t "$pkgdir/usr/share/man/man8" {{,c,s}gdisk,fixparts}.8
+  install -m644 -t "$pkgdir/usr/share/doc/gdisk" README NEWS
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/icu/PKGBUILD b/testing/icu/PKGBUILD
new file mode 100644
index 000000000..85d52705e
--- /dev/null
+++ b/testing/icu/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 155926 2012-04-09 13:40:35Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Art Gramlich <art@gramlich-net.com>
+
+pkgname=icu
+pkgver=49.1.1
+pkgrel=1
+pkgdesc="International Components for Unicode library"
+arch=(i686 x86_64)
+url="http://www.icu-project.org/"
+license=('custom:"icu"')
+depends=('gcc-libs' 'sh')
+source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
+	    http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
+	    icu.8198.revert.icu5431.patch)
+md5sums=('7c53f83e0327343f4060c0eb83842daf'
+         'ebd5470fc969c75e52baf4af94a9ee82')
+
+build() {
+  cd ${srcdir}/icu/source
+  # fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200
+  patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd ${srcdir}/icu/source
+  make -j1 DESTDIR=${pkgdir} install
+
+  # Install license
+  install -Dm644 ${srcdir}/icu/license.html ${pkgdir}/usr/share/licenses/icu/license.html
+}
diff --git a/testing/icu/icu.8198.revert.icu5431.patch b/testing/icu/icu.8198.revert.icu5431.patch
new file mode 100644
index 000000000..4c3e78b8e
--- /dev/null
+++ b/testing/icu/icu.8198.revert.icu5431.patch
@@ -0,0 +1,129 @@
+Index: icu/trunk/source/layout/IndicReordering.cpp
+===================================================================
+--- icu/trunk/source/layout/IndicReordering.cpp	(revision 25772)
++++ icu/trunk/source/layout/IndicReordering.cpp	(revision 26090)
+@@ -126,4 +126,8 @@
+     FeatureMask fSMFeatures;
+ 
++    LEUnicode   fPreBaseConsonant;
++    LEUnicode   fPreBaseVirama;
++    le_int32    fPBCIndex;
++    FeatureMask fPBCFeatures;
+ 
+     void saveMatra(LEUnicode matra, le_int32 matraIndex, IndicClassTable::CharClass matraClass)
+@@ -172,5 +176,6 @@
+           fMatraFeatures(0), fMPreOutIndex(-1), fMPreFixups(mpreFixups),
+           fVMabove(0), fVMpost(0), fVMIndex(0), fVMFeatures(0),
+-          fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0)
++          fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0),
++          fPreBaseConsonant(0), fPreBaseVirama(0), fPBCIndex(0), fPBCFeatures(0)
+     {
+         // nothing else to do...
+@@ -191,4 +196,6 @@
+         fVMabove = fVMpost  = 0;
+         fSMabove = fSMbelow = 0;
++
++        fPreBaseConsonant = fPreBaseVirama = 0;
+     }
+ 
+@@ -386,4 +393,12 @@
+     }
+ 
++    void notePreBaseConsonant(le_uint32 index,LEUnicode PBConsonant, LEUnicode PBVirama, FeatureMask features)
++    {
++        fPBCIndex = index;
++        fPreBaseConsonant = PBConsonant;
++        fPreBaseVirama = PBVirama;
++        fPBCFeatures = features;
++    }
++
+     void noteBaseConsonant()
+     {
+@@ -465,4 +480,20 @@
+     }
+     
++    void writePreBaseConsonant()
++    {
++        // The TDIL spec says that consonant + virama + RRA should produce a rakar in Malayalam.  However,
++        // it seems that almost none of the fonts for Malayalam are set up to handle this.
++        // So, we're going to force the issue here by using the rakar as defined with RA in most fonts.
++
++        if (fPreBaseConsonant == 0x0d31) { // RRA
++            fPreBaseConsonant = 0x0d30; // RA
++        }
++        
++        if (fPreBaseConsonant != 0) {
++            writeChar(fPreBaseConsonant, fPBCIndex, fPBCFeatures);
++            writeChar(fPreBaseVirama,fPBCIndex-1,fPBCFeatures);
++        }
++    }
++
+     le_int32 getOutputIndex()
+     {
+@@ -723,4 +754,5 @@
+             }
+ 
++            
+             IndicClassTable::CharClass charClass = CC_RESERVED;
+             IndicClassTable::CharClass nextClass = CC_RESERVED;
+@@ -730,7 +762,9 @@
+             le_bool  seenVattu = FALSE;
+             le_bool  seenBelowBaseForm = FALSE;
++            le_bool  seenPreBaseForm = FALSE;
+             le_bool  hasNukta = FALSE;
+             le_bool  hasBelowBaseForm = FALSE;
+             le_bool  hasPostBaseForm = FALSE;
++            le_bool  hasPreBaseForm = FALSE;
+ 
+             if (postBase < markStart && classTable->isNukta(chars[postBase])) {
+@@ -746,12 +780,20 @@
+                 hasBelowBaseForm = IndicClassTable::hasBelowBaseForm(charClass) && !hasNukta;
+                 hasPostBaseForm  = IndicClassTable::hasPostBaseForm(charClass)  && !hasNukta;
++                hasPreBaseForm = IndicClassTable::hasPreBaseForm(charClass) && !hasNukta;
+ 
+                 if (IndicClassTable::isConsonant(charClass)) {
+                     if (postBaseLimit == 0 || seenVattu ||
+                         (baseConsonant > baseLimit && !classTable->isVirama(chars[baseConsonant - 1])) ||
+-                        !(hasBelowBaseForm || hasPostBaseForm)) {
++                        !(hasBelowBaseForm || hasPostBaseForm || hasPreBaseForm)) {
+                         break;
+                     }
+ 
++                    // Note any pre-base consonants
++                    if ( baseConsonant == lastConsonant && lastConsonant > 0 && 
++                         hasPreBaseForm && classTable->isVirama(chars[baseConsonant - 1])) {
++                        output.notePreBaseConsonant(lastConsonant,chars[lastConsonant],chars[lastConsonant-1],tagArray2);
++                        seenPreBaseForm = TRUE;
++   
++                    }
+                     // consonants with nuktas are never vattus
+                     seenVattu = IndicClassTable::isVattu(charClass) && !hasNukta;
+@@ -786,10 +828,12 @@
+ 
+             // write any pre-base consonants
++            output.writePreBaseConsonant();
++
+             le_bool supressVattu = TRUE;
+ 
+             for (i = baseLimit; i < baseConsonant; i += 1) {
+                 LEUnicode ch = chars[i];
+-                // Don't put 'blwf' on first consonant.
+-                FeatureMask features = (i == baseLimit? tagArray2 : tagArray1);
++                // Don't put 'pstf' or 'blwf' on anything before the base consonant.
++                FeatureMask features = tagArray1 & ~( pstfFeatureMask | blwfFeatureMask );
+ 
+                 charClass = classTable->getCharClass(ch);
+@@ -842,5 +886,5 @@
+ 
+             // write below-base consonants
+-            if (baseConsonant != lastConsonant) {
++            if (baseConsonant != lastConsonant && !seenPreBaseForm) {
+                 for (i = bcSpan + 1; i < postBase; i += 1) {
+                     output.writeChar(chars[i], i, tagArray1);
+@@ -872,5 +916,5 @@
+             // write post-base consonants
+             // FIXME: does this put the right tags on post-base consonants?
+-            if (baseConsonant != lastConsonant) {
++            if (baseConsonant != lastConsonant && !seenPreBaseForm) {
+                 if (postBase <= lastConsonant) {
+                     for (i = postBase; i <= lastConsonant; i += 1) {
diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD
new file mode 100644
index 000000000..a4cc3ad79
--- /dev/null
+++ b/testing/libreoffice/PKGBUILD
@@ -0,0 +1,658 @@
+# $Id: PKGBUILD 155936 2012-04-09 13:40:51Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+pkgbase="libreoffice"
+pkgname=('libreoffice-common'
+	'libreoffice-base'
+	'libreoffice-calc'
+	'libreoffice-draw'
+	'libreoffice-gnome'
+	'libreoffice-impress'
+	'libreoffice-kde4'
+	'libreoffice-math'
+	'libreoffice-sdk'
+	'libreoffice-sdk-doc'
+	'libreoffice-writer'
+	'libreoffice-en-US'
+	'libreoffice-postgresql-connector'
+	'libreoffice-extension-pdfimport'
+	'libreoffice-extension-presenter-screen'
+	'libreoffice-extension-presentation-minimizer'
+	'libreoffice-extension-report-builder')
+_LOver=3.5.2.2
+pkgver=3.5.2
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('LGPL3')
+url="http://www.libreoffice.org/"
+makedepends=( # makedepends
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost'
+             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit'
+             'beanshell'  'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
+             'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs'
+              #'saxon' - currently broken 
+             # the runtime dependencies
+             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
+             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" 
+             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
+             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
+	         'ttf-dejavu') # to satisfy regression tests
+
+# http://download.documentfoundation.org/mirrors/all.html
+# http://wiki.documentfoundation.org/Mirrors
+
+_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
+#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
+_additional_source_url="http://dev-www.libreoffice.org/src"
+source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
+	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+	${_additional_source_url}/d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
+	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+	${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+	${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+	${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+	${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+	${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+	${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
+	${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
+	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e
+	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810
+	buildfix_icu49.diff
+	libreoffice-common.sh libreoffice-common.csh)
+noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
+	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+	185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+	e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
+	7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
+	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
+md5sums=('a21156d5657b8619a523ffdc5cc0003e'
+         '3c064a24191274fcd8fd466ce9d5dc42'
+         '17ebcd0d25e716d3905b1a905907fd67'
+         '18f577b374d60b3c760a3a3350407632'
+         'd28864eb2b59bb57b034c0d4662a3cee'
+         '1f24ab1d39f4a51faf22244c94a6203f'
+         '35c94d2df8893241173de1d16b6034c0'
+         '798b2ffdc8bcfe7bca2cf92b62caf685'
+         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
+         'ada24d37d8d638b3d8a9985e80bc2978'
+         '2a177023f9ea8ec8bd00837605c5df1b'
+         'a7983f859eafb2677d7ff386a023bc40'
+         '3c219630e4302863a9a83d0efde889db'
+         '2ae988b339daec234019a7066f96733e'
+         '2c9b0f83ed5890af02c0df1c1776f39b'
+         'af3c3acf618de6108d65fcdc92b492e1'
+         'eeb2c7ddf0d302fba4bfc6e97eac9624'
+         '39bb3fcea1514f1369fcfc87542390fd'
+         '3404ab6b1792ae5f16bbd603bd1e1d03'
+         '97b2d4dba862397f446b217e2b623e71'
+         'f94d9870737518e3b597f9265f4e9803'
+         '8ce2fcd72becf06c41f7201d15373ed9'
+         'd8bd5eed178db6e2b18eeed243f85aa8'
+         '3bdf40c0d199af31923e900d082ca2dd'
+         'ace6ab49184e329db254e454a010f56d'
+         'db60e4fde8dd6d6807523deb71ee34dc'
+         'ba2930200c9f019c2d93a8c88c651a0f'
+         '0ff7d225d087793c8c2c680d77aac3e7'
+         'e1c178b18f130b40494561f02bc1a948'
+         '7c2549f6b0a8bb604e6c4c729ffdcfe6'
+         '185d60944ea767075d27247c3162b3bc'
+         '60ce5dc9bd098f95c2e621a930c98dd9'
+         '661a52a02a31b3afbe4b3b3146061afd'
+         '9734ea20c9f67e1b6e1c5a1247fbd3ff'
+         '32fcd844935434807e68d7bd06b94f09'
+         '06a45184aefe078c4314e002ba666b52')
+
+build() {
+
+	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
+	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
+	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
+
+        cd ${srcdir}/libreoffice-core-$_LOver
+
+	# move external sources into place
+	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
+	for source in "${noextract[@]}"; do
+	  ln -s ${srcdir}/$source .
+	done
+	popd
+	
+	ln -s ../libreoffice-help-$_LOver/helpcontent2 .
+	ln -s ../libreoffice-translations-$_LOver/translations .
+
+	# buildfixes & bugfixes
+	# one late fix to solve make distro-pack-install issue
+	patch -Np1 -i ${srcdir}/gmake_install.diff
+	patch -Np1 -i ${srcdir}/smp_buildfix.diff
+	patch -Np0 -i ${srcdir}/buildfix_icu49.diff
+	
+	# unset C(XX)FLAGS
+	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
+#	unset CFLAGS
+#	unset CXXFLAGS
+
+	#use the CFLAGS but remove the LibO overridden ones
+	for i in $CFLAGS; do
+		case "$i" in
+			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
+		esac
+        ARCH_FLAGS="$ARCH_FLAGS $i"
+	done
+	
+	# python2 fix
+	export PYTHON=python2
+
+#	autoconf -f
+
+	# non-SMP test build
+#	export MAKEFLAGS="-j1"
+	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
+#	touch autogen.lastrun
+	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
+		--with-unix-wrapper="libreoffice" \
+		--enable-split-app-modules \
+		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
+		--with-external-tar="${srcdir}/ext_sources" \
+		--disable-fetch-external \
+		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
+		--libdir=/usr/lib --mandir=/usr/share/man \
+		--disable-verbose \
+		--with-lang="" \
+		--enable-crashdump \
+		--enable-dbus \
+		--enable-evolution2\
+		--enable-gio\
+		--disable-gnome-vfs\
+		--disable-kde\
+		--enable-kde4\
+		--enable-gtk3 \
+		--enable-lockdown\
+		--enable-mergelibs \
+		--enable-opengl \
+		--enable-odk\
+		--disable-ext-mysql-connector \
+		--with-system-mysql \
+		--enable-librsvg=system \
+		--without-fonts\
+		--without-afms\
+		--without-ppds\
+		--without-system-libwps\
+		--without-system-mdds\
+		--without-myspell-dicts \
+		--without-system-libvisio \
+		--without-system-libcmis \
+		--without-system-sampleicc \
+		--without-system-libexttextcat \
+		--with-system-dicts \
+		--with-external-dict-dir=/usr/share/hunspell \
+		--with-external-hyph-dir=/usr/share/hyphen \
+		--with-external-thes-dir=/usr/share/mythes \
+		--with-system-beanshell \
+		--with-system-cppunit\
+		--with-system-graphite\
+		--with-system-libwpg \
+		--with-system-libwps \
+		--with-system-redland\
+		--without-system-saxon\
+		--disable-mozilla \
+		--without-system-mozilla \
+		--without-system-mozilla-headers \
+		--with-ant-home="/usr/share/java/apache-ant"\
+		--with-system-boost\
+		--with-system-cairo\
+		--with-system-libs\
+		--with-system-mythes\
+		--with-system-headers\
+		--with-system-hsqldb \
+		--with-alloc=system\
+		--with-system-lucene\
+		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
+		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
+		--with-java-target-version=1.5 \
+		$EXTRAOPTS
+
+#		--disable-ext-lightproof \
+
+
+#--with-install-dirname="${pkgbase}" 
+#		--enable-cairo\
+#		--with-system-libtextcat \
+#		--with-external-libtextcat-data \
+#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
+
+#--with-servlet-api-jar=JARFILE 
+# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
+#		--with-system-saxon\
+#		--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
+
+	touch src.downloaded
+	#./download
+	make
+	# fake installation to create split file lists
+	mkdir $srcdir/fakeinstall
+	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
+}
+
+#check() {
+#	cd ${srcdir}/build
+#	make check
+#}
+
+package_libreoffice-common() {
+
+ pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
+ install=${pkgbase}.install
+ depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
+          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 
+          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
+          #'saxon'
+ optdepends=('libreoffice-langpack: additional language support'
+             'java-runtime:     adds java support'
+             'libcups:          adds printing support'
+             'gconf:            adds additional gnome support'
+             'nss:              adds support for signed files/macros'
+             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
+             'poppler:          for shipped pdfimport extension'
+             'libmythes:        for use in thesaurus'
+             'beanshell:        interactive java -- good for prototyping /macros'
+             'vigra:            C++ computer vision library, usable in Basebmp'
+             'libmspack:        library for Microsoft compression formats for use in FontOOo'
+             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
+             'lucene:           full-text search engine library for Java needed in the help section'
+             'sane:             for scanner access'
+             'unixodbc:         adds ODBC database support'
+             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
+ backup=(etc/libreoffice/sofficerc
+         etc/libreoffice/bootstraprc
+         etc/libreoffice/psprint.conf)
+ groups=('libreoffice')
+ provides=('go-openoffice')
+ conflicts=('go-openoffice')
+ replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+ 
+ # put configuration files into place
+ install -dm755 ${pkgdir}/etc/libreoffice
+ install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
+ install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
+ # install dummy links to make them found by LibO
+ cd ${pkgdir}/usr/lib/libreoffice/program/
+ ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
+ cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
+ ln -vsf /etc/libreoffice/psprint.conf .
+ 
+ # set python-uno PYTHON path
+ install -dm755 ${pkgdir}/etc/profile.d
+ install -m644 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
+ 
+ # move bash-completion files to its new place
+ install -dm755 ${pkgdir}/usr/share/bash-completion/completions
+ mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
+ rm -rf ${pkgdir}/etc/bash_completion.d
+}
+
+package_libreoffice-base() {
+ pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
+ depends=('libreoffice-common' 'hsqldb-java')
+ optdepends=('libreoffice-postgresql-connector')
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-postgresql-connector() {
+ pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
+ depends=('libreoffice-base' 'postgresql-libs')
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # no file-list so far
+ install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services
+ install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry
+ 
+# # create directories from *list.txt file
+# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
+#   install -dm755 ${pkgdir}/${directory/\%dir/}
+# done
+# # install files into the pkg from fakeinstall dir
+# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
+#   dirname=`dirname $file`
+#   # check if directory has been already been created - some are missing like manpages
+#   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+#   # mv file from fakeinstall to pkgdir
+#   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+# done
+}
+
+package_libreoffice-calc() {
+ pkgdesc="Spreadsheet application for LibreOffice."
+ depends=('libreoffice-common' 'lpsolve' )
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-draw() {
+ pkgdesc="Drawing Application for LibreOffice."
+ depends=('libreoffice-common')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-gnome() {
+ pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
+ depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib'
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-impress() {
+ pkgdesc="Presentation Application for LibreOffice."
+ depends=('libreoffice-common')
+ optdepends=('mesa:             for the OGLTrans extension')
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-kde4() {
+ pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
+ depends=('libreoffice-common' 'kdelibs')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-math() {
+ pkgdesc="Equation Editor Applicationfor LibreOffice."
+ depends=('libreoffice-common')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-sdk() {
+ pkgdesc="Software Development Kit for LibreOffice."
+ depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+ 
+  # fix environment path to keep compatibility with openjdk6 and openjdk7
+  #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:"          /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
+  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
+}
+
+package_libreoffice-sdk-doc() {
+ pkgdesc="Software Development Kit documentation for LibreOffice"
+ depends=('libreoffice-common' 'libreoffice-sdk')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+
+ #fix permissions
+ find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
+}
+
+package_libreoffice-writer() {
+ pkgdesc="Word Processor Applicationfor LibreOffice."
+ depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
+ optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-en-US() {
+  pkgdesc="English (US) language pack for LibreOffice"
+  #arch=('any')
+  provides=('openoffice-en-US' 'libreoffice-langpack')
+  replaces=(openoffice-en-US)
+  conflicts=(openoffice-en-US)
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-extension-pdfimport() {
+
+ pkgdesc="This extension allows you to import and modify PDF documents"
+ depends=('libreoffice-common' 'poppler')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
+}
+
+package_libreoffice-extension-presenter-screen() {
+
+ pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
+}
+
+package_libreoffice-extension-presentation-minimizer() {
+
+ pkgdesc="This extension reduce the file size of the current presentation"
+ depends=('libreoffice-common' 'gcc-libs')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
+}
+
+package_libreoffice-extension-report-builder() {
+
+ pkgdesc="This extension creates smart-looking database reports"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
+}
diff --git a/testing/libreoffice/buildfix_icu49.diff b/testing/libreoffice/buildfix_icu49.diff
new file mode 100644
index 000000000..7a774dee0
--- /dev/null
+++ b/testing/libreoffice/buildfix_icu49.diff
@@ -0,0 +1,42 @@
+https://bugs.gentoo.org/show_bug.cgi?id=410307
+
+--- i18npool/source/breakiterator/data/char_in.txt
++++ i18npool/source/breakiterator/data/char_in.txt
+@@ -15,7 +15,7 @@
+ $CR          = [\p{Grapheme_Cluster_Break = CR}];
+ $LF          = [\p{Grapheme_Cluster_Break = LF}];
+ $Control     = [\p{Grapheme_Cluster_Break = Control}];
+-$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
++# $Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
+ $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
+ $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
+ $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1];
+@@ -72,7 +72,7 @@
+ [^$Control $CR $LF] $Extend;
+ 
+ [^$Control $CR $LF] $SpacingMark;
+-$Prepend [^$Control $CR $LF];
++# $Prepend [^$Control $CR $LF];
+ 
+ 
+ ## -------------------------------------------------
+@@ -94,7 +94,7 @@
+ 
+ $Extend      [^$Control $CR $LF];
+ $SpacingMark [^$Control $CR $LF];
+-[^$Control $CR $LF] $Prepend;
++# [^$Control $CR $LF] $Prepend;
+ 
+ 
+ ## -------------------------------------------------
+--- i18npool/source/breakiterator/data/char.txt
++++ i18npool/source/breakiterator/data/char.txt
+@@ -16,7 +16,7 @@
+ $CR          = [\p{Grapheme_Cluster_Break = CR}];
+ $LF          = [\p{Grapheme_Cluster_Break = LF}];
+ $Control     = [\p{Grapheme_Cluster_Break = Control}];
+-$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
++# $Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
+ $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
+ $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
+ # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data
diff --git a/testing/libreoffice/libreoffice-common.csh b/testing/libreoffice/libreoffice-common.csh
new file mode 100644
index 000000000..625917add
--- /dev/null
+++ b/testing/libreoffice/libreoffice-common.csh
@@ -0,0 +1 @@
+setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program
diff --git a/testing/libreoffice/libreoffice-common.sh b/testing/libreoffice/libreoffice-common.sh
new file mode 100644
index 000000000..ea04b2e6d
--- /dev/null
+++ b/testing/libreoffice/libreoffice-common.sh
@@ -0,0 +1 @@
+export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program"
diff --git a/testing/libreoffice/libreoffice.install b/testing/libreoffice/libreoffice.install
new file mode 100644
index 000000000..e66b66f3d
--- /dev/null
+++ b/testing/libreoffice/libreoffice.install
@@ -0,0 +1,47 @@
+post_install() {
+
+xdg-icon-resource forceupdate --theme hicolor
+update-desktop-database -q
+update-mime-database usr/share/mime > /dev/null 2>&1
+
+echo " * see https://wiki.archlinux.org/index.php/LibreOffice"
+echo "-------------------------------------------------------------------"
+echo "LibreOffice has been split into several packages:"
+echo "- libreoffice-common"
+echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
+echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
+echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
+echo "                              the LibreOffice APIs and for creating"
+echo "                              extensions (UNO components)."
+echo "-------------------------------------------------------------------"
+echo " * you need to install at least one libreoffice-langpack"
+echo " * you may want to pacman -Ss libreoffice-extensions"
+echo "   to see what additional extensions are prepared to install"
+echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg
+         for spell checking"
+echo " * make sure you have installed some ttf font (ttf-dejavu recommended)"
+}
+
+post_upgrade() {
+#  post_install $1
+xdg-icon-resource forceupdate --theme hicolor
+update-desktop-database -q
+update-mime-database usr/share/mime > /dev/null 2>&1
+  if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then
+    # important upgrade notice
+    echo "LibreOffice has been split into several packages:"
+    echo "- libreoffice-common"
+    echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
+    echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
+    echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
+    echo "                              the LibreOffice APIs and for creating"
+    echo "                              extensions (UNO components)."
+    echo "Now you need to install at least one libreoffice-langpack!"
+  fi
+}
+
+post_remove() {
+update-desktop-database -q
+xdg-icon-resource forceupdate --theme hicolor
+update-mime-database usr/share/mime > /dev/null 2>&1
+}
diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD
new file mode 100644
index 000000000..fe09f5643
--- /dev/null
+++ b/testing/php/PKGBUILD
@@ -0,0 +1,368 @@
+# $Id: PKGBUILD 155941 2012-04-09 13:41:06Z andyrtr $
+# 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.10
+_suhosinver=5.3.9-0.9.10
+pkgrel=5
+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"
+        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
+        'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
+        'logrotate.d.php-fpm' 'pcre_info.patch')
+md5sums=('816259e5ca7d0a7e943e56a3bb32b17f'
+         'c099b3d7eac95018ababd41ded7f3066'
+         'c15d18f846be1d69144a5d0056ee6506'
+         'ffc338e8ce2a990f6f2a486355bbab65'
+         'dec2cbaad64e3abf4f0ec70e1de4e8e9'
+         'b01be5f816988fcee7e78225836e5e27'
+         '740ec5fe2ecfd9d7febd4081c90ec65b'
+         '07c4e412909ac65a44ec90e7a2c4bade'
+         '8d3806bbb19e390f9b32ccf21611d937')
+
+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}
+
+	patch -p1 -i ${srcdir}/pcre_info.patch
+
+	# 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/pcre_info.patch b/testing/php/pcre_info.patch
new file mode 100644
index 000000000..e6d10df06
--- /dev/null
+++ b/testing/php/pcre_info.patch
@@ -0,0 +1,43 @@
+--- php-5.3.10/ext/pcre/php_pcre.c	2012-01-01 14:15:04.000000000 +0100
++++ php-5.3.10/ext/pcre/php_pcre.c	2012-02-06 13:31:36.198935107 +0100
+@@ -241,6 +241,7 @@
+ 	char				*pattern;
+ 	int					 do_study = 0;
+ 	int					 poptions = 0;
++	int				count = 0;
+ 	unsigned const char *tables = NULL;
+ #if HAVE_SETLOCALE
+ 	char				*locale = setlocale(LC_CTYPE, NULL);
+@@ -252,10 +252,10 @@
+ 	   back the compiled pattern, otherwise go on and compile it. */
+ 	if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) {
+ 		/*
+-		 * We use a quick pcre_info() check to see whether cache is corrupted, and if it
++		 * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it
+ 		 * is, we flush it and compile the pattern from scratch.
+ 		 */
+-		if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
++		if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
+ 			zend_hash_clean(&PCRE_G(pcre_cache));
+ 		} else {
+ #if HAVE_SETLOCALE
+--- php-5.3.10/ext/pcre/php_pcre.def	2009-01-11 14:59:00.000000000 +0100
++++ php-5.3.10/ext/pcre/php_pcre.def	2012-02-06 13:31:47.775299315 +0100
+@@ -4,7 +4,6 @@
+ php_pcre_exec
+ php_pcre_get_substring
+ php_pcre_get_substring_list
+-php_pcre_info
+ php_pcre_maketables
+ php_pcre_study
+ php_pcre_version
+--- php-5.3.10/main/php_compat.h	2012-01-01 14:15:04.000000000 +0100
++++ php-5.3.10/main/php_compat.h	2012-02-06 13:26:59.272834580 +0100
+@@ -34,7 +34,6 @@
+ #define pcre_exec			php_pcre_exec
+ #define pcre_get_substring		php_pcre_get_substring
+ #define pcre_get_substring_list		php_pcre_get_substring_list
+-#define pcre_info			php_pcre_info
+ #define pcre_maketables			php_pcre_maketables
+ #define pcre_study			php_pcre_study
+ #define pcre_version			php_pcre_version
diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch
new file mode 100644
index 000000000..b923edb38
--- /dev/null
+++ b/testing/php/php-fpm.conf.in.patch
@@ -0,0 +1,52 @@
+--- sapi/fpm/php-fpm.conf.in	2011-10-08 23:04:10.000000000 +0200
++++ sapi/fpm/php-fpm.conf.in	2012-01-11 10:50:14.905161442 +0100
+@@ -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
+ ; If it's set to "syslog", log is sent to syslogd instead of being written
+@@ -140,7 +140,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)
+@@ -151,9 +152,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
+  
+ ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
+ ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+@@ -442,7 +443,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..3dc5b6560
--- /dev/null
+++ b/testing/php/php.ini.patch
@@ -0,0 +1,126 @@
+--- php.ini-production	2011-12-15 11:31:02.000000000 +0100
++++ php.ini-production	2012-01-11 10:43:02.069936043 +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
+@@ -793,7 +793,7 @@
+ ;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ ; UNIX: "/path1:/path2"
+-;include_path = ".:/php/includes"
++include_path = ".:/usr/share/pear"
+ ;
+ ; Windows: "\path1;\path2"
+ ;include_path = ".;c:\php\includes"
+@@ -816,7 +816,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"
+ 
+@@ -950,53 +950,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 11gR2 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/raptor/PKGBUILD b/testing/raptor/PKGBUILD
new file mode 100644
index 000000000..b62ae3b1c
--- /dev/null
+++ b/testing/raptor/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 155943 2012-04-09 13:41:08Z andyrtr $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: eric <eric@archlinux.org>
+# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+
+pkgname=raptor
+pkgver=2.0.7
+pkgrel=2
+pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
+arch=('i686' 'x86_64')
+url="http://librdf.org/raptor"
+depends=('curl' 'libxslt' 'icu')
+license=('LGPL')
+options=('!libtool')
+source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz")
+
+build() {
+  cd "${srcdir}"/raptor2-${pkgver}
+
+  ./configure --prefix=/usr \
+    --disable-static \
+    --with-yajl=no \
+    --with-icu-config=/usr/bin/icu-config
+  make
+}
+
+#check() {
+#	make -C "raptor2-$pkgver" check // currently does not work
+#}
+
+package() {
+  cd "${srcdir}"/raptor2-${pkgver}
+  make prefix="${pkgdir}"/usr install
+}
+md5sums=('699073463467dc8eded2ca89de2ab2ea')
author	Nicolás Reynolds <fauno@kiwwwi.com.ar>	2012-04-11 10:57:18 -0300
committer	Nicolás Reynolds <fauno@kiwwwi.com.ar>	2012-04-11 10:57:18 -0300
commit	c07ca5cb71d277e9f2fd5c7b94cf8a0021bdfab5 (patch)
tree	d9d528762b726855cc356781c89abb1768c8be28
parent	ece2137c9569ec806aacf3740df98c399a51b21a (diff)
parent	8119da2eaadf53531cad2aed70981ed4606340d6 (diff)