Thu Apr 12 00:01:12 UTC 2012

64 files changed, 1826 insertions, 198 deletions

diff --git a/community-staging/mythtv/PKGBUILD b/community-staging/mythtv/PKGBUILD
new file mode 100644
index 000000000..8cd5aa100
--- /dev/null
+++ b/community-staging/mythtv/PKGBUILD
@@ -0,0 +1,70 @@
+# $Id: PKGBUILD 69245 2012-04-11 02:54:01Z jconder $
+# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: <kleptophobiac@gmail.com>
+# Contributor: dorphell <dorphell@archlinux.org>
+
+pkgname=mythtv
+pkgver=0.25
+pkgrel=1
+epoch=1
+pkgdesc="A Homebrew PVR project"
+arch=('i686' 'x86_64')
+url="http://www.mythtv.org/"
+license=('GPL')
+depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883'
+         'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils' 'mesa'
+	 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6'
+	 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber'
+	 'x264')
+makedepends=('glew' 'libcec' 'libxml2' 'openssl' 'yasm')
+optdepends=('glew: for GPU commercial flagging'
+            'libcec: for consumer electronics control capabilities'
+	    'libxml2: to read blu-ray metadata'
+	    'openssl: for AirTunes (RAOP) support'
+            'xmltv: to download tv listings')
+backup=('etc/conf.d/mythbackend')
+install='mythtv.install'
+source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
+        'mythtv_0.25_gcc_4.7.patch'
+        'mythbackend.rc'
+        'mythbackend.conf')
+md5sums=('e49c81de40e279c83dcb1b2aa9a45748'
+         '6090f5f22a8584db80b76cf19869ee41'
+         '62fd98347c56b1d9b795792f83269d25'
+         '1f72db0586f97a7c3fd3155dfa9a6c6f')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+
+  patch -Np1 -i "$srcdir/mythtv_0.25_gcc_4.7.patch"
+
+  ARCH="${CARCH/_/-}"
+  ./configure --prefix=/usr \
+              --cpu="$ARCH" \
+	      --disable-altivec \
+	      --disable-audio-jack \
+	      --disable-ccache \
+	      --disable-distcc \
+	      --enable-libfftw3 \
+	      --enable-libmp3lame \
+	      --enable-libx264 \
+	      --enable-vaapi \
+	      --python=python2
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make INSTALL_ROOT="$pkgdir" install
+
+  install -D -m755 "$srcdir/mythbackend.rc" "$pkgdir/etc/rc.d/mythbackend"
+  install -D -m644 "$srcdir/mythbackend.conf" "$pkgdir/etc/conf.d/mythbackend"
+  install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql"
+
+  mkdir -p "$pkgdir/usr/share/mythtv"
+  cp -R 'contrib' "$pkgdir/usr/share/mythtv"
+  mkdir -p "$pkgdir/var/log/mythtv"
+}
diff --git a/community-staging/mythtv/mythbackend.conf b/community-staging/mythtv/mythbackend.conf
new file mode 100644
index 000000000..15a248450
--- /dev/null
+++ b/community-staging/mythtv/mythbackend.conf
@@ -0,0 +1,54 @@
+#!/bin/bash
+#
+# Copyright (c) by the MythTV Development Team.
+#
+# Derived from work by:
+#
+#     Michael Thomson <linux at m-thomson dot net>
+#     Stu Tomlinson <stu at nosnilmot dot com>
+#     Axel Thimm <axel.thimm at atrpms dot net>
+# Adopted for ArchLinux:
+#     Jürgen Hoetzel <juergen@archinux.org>
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+###############################################################################
+#
+# User who should start the mythbackend process
+#
+# Running mythbackend as non-root requires you to ensure that audio/video
+# devices used for recording have suitable user permissions. One way
+# to achieve this is to modify existing or create new udev rules which
+# assign these devices to a non-root group with rw permissions and add
+# your mythbackend user to that group. Be aware that console.perms can 
+# also affect device permissions and may need additional configuration.
+# Running as non-root may also introduce increased process latency.
+#
+# MBE_USER='root'
+
+#
+# Startup options for mythbackend (see 'mythbackend --help' for a list).
+#
+# MBE_OPTS=''
+
+#
+# Directory holding the mythbackend log file
+#
+# LOG_PATH='/var/log/mythtv'
+
+#
+# Logging options for mythbackend (see 'mythbackend -v help' for a list)
+#
+# LOG_OPTS=''
diff --git a/community-staging/mythtv/mythbackend.rc b/community-staging/mythtv/mythbackend.rc
new file mode 100644
index 000000000..2b3c2d52e
--- /dev/null
+++ b/community-staging/mythtv/mythbackend.rc
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/profile
+
+###############################################################################
+# Default values to use if none are supplied in the config file.
+#
+# User who should start the mythbackend process
+MBE_USER='root'
+
+# Startup options for mythbackend
+MBE_OPTS=''
+
+# Directory holding the mythbackend log file
+LOG_PATH='/var/log/mythtv'
+
+# Logging options for mythbackend
+LOG_OPTS=''
+###############################################################################
+
+CONFIG_FILE=/etc/conf.d/mythbackend
+PIDFILE=/var/run/mythbackend.pid
+
+if [[ -r "$CONFIG_FILE" ]]; then
+  . "$CONFIG_FILE"
+fi
+
+PID="$(cat "$PIDFILE" 2> /dev/null || pidof mythbackend)"
+export HOME="$(getent passwd "$MBE_USER" | cut -d : -f 6)"
+
+case "$1" in
+  start)
+    stat_busy "Starting MythTV Backend"
+
+    if [[ "$PID" -gt 0 ]] && kill -0 "$PID"; then
+      stat_fail
+      exit 0
+    fi
+
+    touch "$PIDFILE"
+    chown "$MBE_USER" "$PIDFILE" "$LOG_PATH"
+
+    MBE_CMD="/usr/bin/mythbackend --daemon \
+                                  --logpath "$LOG_PATH" $LOG_OPTS \
+                                  --pidfile "$PIDFILE" $MBE_OPTS"
+    if su "$MBE_USER" -c "$MBE_CMD"; then
+      add_daemon mythbackend
+      stat_done
+    else
+      stat_fail
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping MythTV Backend"
+    if [[ "$PID" -gt 0 ]] && kill "$PID" &> /dev/null; then
+      rm_daemon mythbackend
+      stat_done
+      rm -f "$PIDFILE"
+    else
+      stat_fail
+    fi
+    ;;
+  restart)
+    "$0" stop
+    "$0" start
+    ;;
+  *)
+    echo "usage: $0 (start|stop|restart)"
+    ;;
+esac
+exit 0
diff --git a/community-staging/mythtv/mythtv.install b/community-staging/mythtv/mythtv.install
new file mode 100644
index 000000000..c29a53454
--- /dev/null
+++ b/community-staging/mythtv/mythtv.install
@@ -0,0 +1,11 @@
+post_install() {
+   echo "See \"MythTV\" on the Archlinux Wiki for installation information - Extensive!!"
+}
+
+post_upgrade() {
+	return
+}
+
+post_remove() {
+   echo -e "NOTE: mysql database was not removed. To remove run:\nmysql -u root -e 'drop database mythconverg;'"
+}
diff --git a/community-staging/mythtv/mythtv_0.25_gcc_4.7.patch b/community-staging/mythtv/mythtv_0.25_gcc_4.7.patch
new file mode 100644
index 000000000..83c8244a0
--- /dev/null
+++ b/community-staging/mythtv/mythtv_0.25_gcc_4.7.patch
@@ -0,0 +1,107 @@
+*** a/libs/libmythbase/compat.h		2012-03-31 20:52:30.430461503 -0400
+--- b/libs/libmythbase/compat.h		2012-03-31 20:59:05.935585911 -0400
+***************
+*** 44,49 ****
+--- 44,51 ----
+  # include <sys/resource.h> // for setpriority
+  # include <sys/socket.h>
+  # include <sys/wait.h>     // For WIFEXITED on Mac OS X
++ # include <stdio.h>        // for snprintf(), used by inline dlerror()
++ # include <unistd.h>       // for usleep()
+  #endif
+  
+  #ifdef USING_MINGW
+*** a/libs/libmyth/rssparse.h		2012-03-31 20:52:30.427453729 -0400
+--- b/libs/libmyth/rssparse.h		2012-03-31 21:51:11.687438044 -0400
+***************
+*** 13,18 ****
+--- 13,19 ----
+  #include <QPair>
+  #include <QMap>
+  #include <QVariant>
++ #include <sys/types.h>
+  
+  #include "mythexp.h"
+  
+*** a/libs/libmythtv/audioinput.h	2012-03-31 22:41:55.626923063 -0400
+--- b/libs/libmythtv/audioinput.h	2012-03-31 22:41:22.478248297 -0400
+***************
+*** 22,27 ****
+--- 22,28 ----
+  #define _AUDIOINPUT_H_
+  
+  #include <QString>
++ #include <unistd.h>
+  
+  class AudioInput
+  {
+*** a/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c	2012-03-31 20:52:29.923150437 -0400
+--- b/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c	2012-03-31 21:58:48.422270780 -0400
+***************
+*** 398,404 ****
+              "2:                         \n\t"\
+              \
+              : "+a"(src), "+c"(dst)\
+!             : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
+              : "memory"\
+          );\
+          src += 4-(h+5)*srcStride;\
+--- 398,404 ----
+              "2:                         \n\t"\
+              \
+              : "+a"(src), "+c"(dst)\
+!             : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
+              : "memory"\
+          );\
+          src += 4-(h+5)*srcStride;\
+***************
+*** 446,452 ****
+              QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
+              "2:                     \n\t"\
+              : "+a"(src)\
+!             : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\
+              : "memory"\
+              );\
+          tmp += 4;\
+--- 446,452 ----
+              QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
+              "2:                     \n\t"\
+              : "+a"(src)\
+!             : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\
+              : "memory"\
+              );\
+          tmp += 4;\
+***************
+*** 823,829 ****
+          "2:                          \n\t"\
+          \
+          : "+a"(src), "+c"(dst)\
+!         : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
+          : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
+                         "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
+            "memory"\
+--- 823,829 ----
+          "2:                          \n\t"\
+          \
+          : "+a"(src), "+c"(dst)\
+!         : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
+          : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
+                         "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
+            "memory"\
+***************
+*** 878,884 ****
+              QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
+              "2:                         \n\t"
+              : "+a"(src)
+!             : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)
+              : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
+                             "%xmm4", "%xmm5", "%xmm6", "%xmm7",)
+                "memory"
+--- 878,884 ----
+              QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
+              "2:                         \n\t"
+              : "+a"(src)
+!             : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)
+              : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
+                             "%xmm4", "%xmm5", "%xmm6", "%xmm7",)
+                "memory"
diff --git a/community-testing/gnome-packagekit/PKGBUILD b/community-testing/gnome-packagekit/PKGBUILD
new file mode 100644
index 000000000..535845f6e
--- /dev/null
+++ b/community-testing/gnome-packagekit/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 69218 2012-04-10 06:33:58Z jconder $
+# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
+
+pkgname=gnome-packagekit
+pkgver=3.4.0
+pkgrel=1
+pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
+arch=('i686' 'x86_64')
+url='http://www.packagekit.org/'
+license=('GPL')
+depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify'
+         'packagekit')
+makedepends=('gconf' 'gtk-doc' 'intltool' 'libcanberra' 'upower')
+optdepends=('polkit-gnome: required for privileged actions'
+            'gnome-settings-daemon-updates: update and message notifications')
+options=('!emptydirs' '!libtool')
+install="$pkgname.install"
+source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
+sha256sums=('4f23be695b70bdda8b5c15237472a735bb1745af11dbc324eead9b988f2343c6')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  _mime='application/x-xz-compressed-tar;application/x-servicepack;'
+  sed -i "s@MimeType=.*@MimeType=$_mime@" data/gpk-install-local-file.desktop.in
+
+  sed -i 's@python@python2@' python/enum-convertor.py
+  sed -i 's@python enum-convertor.py@python2 enum-convertor.py@' python/packagekit/Makefile.{am,in}
+
+  export PYTHON=/usr/bin/python2
+  ./configure --prefix=/usr \
+	      --sysconfdir=/etc \
+	      --disable-gtk-doc \
+	      --disable-schemas-compile \
+	      --disable-scrollkeeper
+  make -s
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make -s DESTDIR="$pkgdir" install
+}
diff --git a/community-testing/gnome-packagekit/gnome-packagekit.install b/community-testing/gnome-packagekit/gnome-packagekit.install
new file mode 100644
index 000000000..620670d57
--- /dev/null
+++ b/community-testing/gnome-packagekit/gnome-packagekit.install
@@ -0,0 +1,19 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.91.90) < 0 )); then
+    usr/sbin/gconfpkg --uninstall gnome-packagekit
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community-testing/gnome-settings-daemon-updates/PKGBUILD b/community-testing/gnome-settings-daemon-updates/PKGBUILD
new file mode 100644
index 000000000..0358ab285
--- /dev/null
+++ b/community-testing/gnome-settings-daemon-updates/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 69220 2012-04-10 06:39:32Z jconder $
+# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
+
+_pkgname=gnome-settings-daemon
+pkgname=$_pkgname-updates
+pkgver=3.4.0
+pkgrel=1
+pkgdesc="Updates plugin for the GNOME Settings daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gnome-packagekit' "$_pkgname")
+makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom')
+options=('!emptydirs' '!libtool')
+install=$_pkgname.install
+url="http://www.gnome.org"
+source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
+        'systemd-fallback.patch'
+        'arch.patch')
+sha256sums=('5639cbba28caa7b3e33990f49aeed11ed9325e78e76af2175d9ccd5ff298401d'
+            '82b721d0e274af15ed2770052d550d3162d2d37e5e9ee5e6fcebac1ed6cb8199'
+            '727ab3e8181464af32ba604b2931b77cd6d4fbf34e10bbba99bb213eb992466e')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  patch -Np1 -i "$srcdir/arch.patch"
+  patch -Np1 -i "$srcdir/systemd-fallback.patch"
+
+  gnome-autogen.sh --prefix=/usr \
+              --sysconfdir=/etc \
+	      --localstatedir=/var \
+	      --libexecdir=/usr/lib/gnome-settings-daemon \
+	      --disable-static \
+	      --enable-systemd
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make -s
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  make -C 'plugins/updates' DESTDIR="${pkgdir}" install
+
+  _schema='org.gnome.settings-daemon.plugins.updates.gschema.xml'
+  install -D -m644 "data/$_schema" "$pkgdir/usr/share/glib-2.0/schemas/$_schema"
+}
diff --git a/community-testing/gnome-settings-daemon-updates/arch.patch b/community-testing/gnome-settings-daemon-updates/arch.patch
new file mode 100644
index 000000000..6718e4db9
--- /dev/null
+++ b/community-testing/gnome-settings-daemon-updates/arch.patch
@@ -0,0 +1,321 @@
+diff --git a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
+index c09096a..3fa4159 100644
+--- a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
++++ b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
+@@ -31,7 +31,7 @@
+       <_description>Automatically download updates in the background without confirmation. Updates will be auto-downloaded when using wired network connnections, and also WiFi if 'connection-use-wifi' is enabled and mobile broadband if 'connection-use-mobile' is enabled.</_description>
+     </key>
+     <key name="auto-update-type" enum="org.gnome.settings-daemon.GsdUpdateType">
+-      <default>'security'</default>
++      <default>'none'</default>
+       <_summary>Automatically install these types of updates</_summary>
+       <_description>Automatically install these types of updates.</_description>
+     </key>
+@@ -56,7 +56,7 @@
+       <_description>The last time we notified the user about non-critical updates. Value is in seconds since the epoch, or zero for never.</_description>
+     </key>
+     <key name="frequency-get-upgrades" type="i">
+-      <default>604800</default>
++      <default>0</default>
+       <_summary>How often to check for distribution upgrades</_summary>
+       <_description>How often to check for distribution upgrades. Value is in seconds.</_description>
+     </key>
+diff --git a/plugins/updates/Makefile.am b/plugins/updates/Makefile.am
+index 9510c65..191092d 100644
+--- a/plugins/updates/Makefile.am
++++ b/plugins/updates/Makefile.am
+@@ -15,7 +15,9 @@ libupdates_la_SOURCES = \
+ 	gsd-updates-firmware.h \
+ 	gsd-updates-firmware.c \
+ 	gsd-updates-manager.h \
+-	gsd-updates-manager.c
++	gsd-updates-manager.c \
++	gsd-updates-watch.h \
++	gsd-updates-watch.c
+ 
+ libupdates_la_CPPFLAGS = \
+ 	-I$(top_srcdir)/gnome-settings-daemon \
+diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c
+index 4ed046c..9842b32 100644
+--- a/plugins/updates/gsd-updates-manager.c
++++ b/plugins/updates/gsd-updates-manager.c
+@@ -32,6 +32,7 @@
+ #include "gsd-updates-manager.h"
+ #include "gsd-updates-firmware.h"
+ #include "gsd-updates-refresh.h"
++#include "gsd-updates-watch.h"
+ #include "gsd-updates-common.h"
+ #include "gnome-settings-profile.h"
+ 
+@@ -46,6 +47,7 @@ struct GsdUpdatesManagerPrivate
+         GCancellable            *cancellable;
+         GsdUpdatesRefresh       *refresh;
+         GsdUpdatesFirmware      *firmware;
++        GsdUpdatesWatch         *watch;
+         GSettings               *settings_ftp;
+         GSettings               *settings_gsd;
+         GSettings               *settings_http;
+@@ -1358,6 +1360,9 @@ gsd_updates_manager_start (GsdUpdatesManager *manager,
+         g_signal_connect (manager->priv->refresh, "get-updates",
+                           G_CALLBACK (due_get_updates_cb), manager);
+ 
++	/* watch transaction progress */
++	manager->priv->watch = gsd_updates_watch_new ();
++
+         /* get http settings */
+         manager->priv->settings_http = g_settings_new ("org.gnome.system.proxy.http");
+         g_signal_connect (manager->priv->settings_http, "changed",
+@@ -1463,6 +1468,10 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager)
+                 g_object_unref (manager->priv->firmware);
+                 manager->priv->firmware = NULL;
+         }
++        if (manager->priv->watch != NULL) {
++                g_object_unref (manager->priv->watch);
++                manager->priv->watch = NULL;
++        }
+         if (manager->priv->proxy_session != NULL) {
+                 g_object_unref (manager->priv->proxy_session);
+                 manager->priv->proxy_session = NULL;
+diff --git a/plugins/updates/gsd-updates-watch.c b/plugins/updates/gsd-updates-watch.c
+new file mode 100644
+index 0000000..37d8778
+--- /dev/null
++++ b/plugins/updates/gsd-updates-watch.c
+@@ -0,0 +1,179 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2007-2011 Richard Hughes <richard@hughsie.com>
++ *
++ * Licensed under the GNU General Public License Version 2
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ */
++
++#include "config.h"
++
++#include <unistd.h>
++#include <glib/gi18n.h>
++#include <packagekit-glib2/packagekit.h>
++#include <libnotify/notify.h>
++
++#include "gsd-updates-watch.h"
++
++#define GSD_UPDATES_WATCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatchPrivate))
++
++struct GsdUpdatesWatchPrivate
++{
++	PkTransactionList *tlist;
++	PkClient *client;
++};
++
++G_DEFINE_TYPE (GsdUpdatesWatch, gsd_updates_watch, G_TYPE_OBJECT)
++
++static void
++gsd_updates_watch_message_cb (PkMessage *item, GsdUpdatesWatch *watch)
++{
++	NotifyNotification *notification;
++	gchar *details = NULL;
++	const gchar *title, *message;
++	GError *error = NULL;
++
++	g_return_if_fail (PK_IS_MESSAGE (item));
++	g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
++
++	g_object_get (item, "details", &details, NULL);
++	title = _("More information");
++	message = details;
++
++	/* use a better title if available */
++	if (g_str_has_prefix (details, "<b>")) {
++		gchar *end = g_strstr_len (details, -1, "</b>\n");
++		if (end != NULL && g_strstr_len (details, end - details, "\n") == NULL) {
++			title = details + 3;
++			*end = '\0';
++			message = end + 5;
++		}
++	}
++
++	/* display a notification */
++	notification = notify_notification_new (title, message, NULL);
++	notify_notification_set_app_name (notification, _("Software Updates"));
++	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
++	notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL);
++
++	if (!notify_notification_show (notification, &error)) {
++		g_warning ("error: %s", error->message);
++		g_error_free (error);
++	}
++
++	g_free (details);
++}
++
++static void
++gsd_updates_watch_adopt_cb (PkClient *client, GAsyncResult *res, GsdUpdatesWatch *watch)
++{
++	PkResults *results;
++	PkProgress *progress = NULL;
++	guint uid;
++	GPtrArray *array;
++	GError *error = NULL;
++
++	g_return_if_fail (PK_IS_CLIENT (client));
++	g_return_if_fail (G_IS_ASYNC_RESULT (res));
++	g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
++
++	results = pk_client_generic_finish (client, res, &error);
++	if (results == NULL) {
++		g_warning ("failed to adopt: %s", error->message);
++		g_error_free (error);
++		goto out;
++	}
++
++	g_object_get (results, "progress", &progress, NULL);
++	g_object_get (progress, "uid", &uid, NULL);
++
++	/* only display messages from the same user */
++	if (uid != getuid ()) {
++		g_printerr ("ignoring messages\n");
++		goto out;
++	}
++
++	array = pk_results_get_message_array (results);
++	g_ptr_array_foreach (array, (GFunc) gsd_updates_watch_message_cb, watch);
++	g_ptr_array_unref (array);
++
++out:
++	if (progress != NULL) {
++		g_object_unref (progress);
++	}
++	if (results != NULL) {
++		g_object_unref (results);
++	}
++}
++
++static void
++gsd_updates_watch_tlist_added_cb (PkTransactionList *tlist, const gchar *tid, GsdUpdatesWatch *watch)
++{
++	g_return_if_fail (PK_IS_TRANSACTION_LIST (tlist));
++	g_return_if_fail (tid != NULL);
++	g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
++
++	/* listen for messages */
++	pk_client_adopt_async (watch->priv->client, tid, NULL, NULL, NULL,
++			       (GAsyncReadyCallback) gsd_updates_watch_adopt_cb, watch);
++}
++
++static void
++gsd_updates_watch_init (GsdUpdatesWatch *watch)
++{
++	g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
++
++	watch->priv = GSD_UPDATES_WATCH_GET_PRIVATE (watch);
++	watch->priv->tlist = pk_transaction_list_new ();
++	watch->priv->client = pk_client_new ();
++
++	g_signal_connect (watch->priv->tlist, "added",
++			  G_CALLBACK (gsd_updates_watch_tlist_added_cb), watch);
++}
++
++static void
++gsd_updates_watch_finalize (GObject *object)
++{
++	GsdUpdatesWatch *watch;
++
++	g_return_if_fail (GSD_IS_UPDATES_WATCH (object));
++
++	watch = GSD_UPDATES_WATCH (object);
++	g_return_if_fail (watch->priv != NULL);
++
++	if (watch->priv->tlist != NULL) {
++		g_object_unref (watch->priv->tlist);
++	}
++	if (watch->priv->client != NULL) {
++		g_object_unref (watch->priv->client);
++	}
++
++	G_OBJECT_CLASS (gsd_updates_watch_parent_class)->finalize (object);
++}
++
++GsdUpdatesWatch *
++gsd_updates_watch_new (void)
++{
++	return GSD_UPDATES_WATCH (g_object_new (GSD_TYPE_UPDATES_WATCH, NULL));
++}
++
++static void
++gsd_updates_watch_class_init (GsdUpdatesWatchClass *klass)
++{
++	GObjectClass *object_class = G_OBJECT_CLASS (klass);
++	object_class->finalize = gsd_updates_watch_finalize;
++	g_type_class_add_private (klass, sizeof (GsdUpdatesWatchPrivate));
++}
+diff --git a/plugins/updates/gsd-updates-watch.h b/plugins/updates/gsd-updates-watch.h
+new file mode 100644
+index 0000000..d90976e
+--- /dev/null
++++ b/plugins/updates/gsd-updates-watch.h
+@@ -0,0 +1,52 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2007-2011 Richard Hughes <richard@hughsie.com>
++ *
++ * Licensed under the GNU General Public License Version 2
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ */
++
++#ifndef __GSD_UPDATES_WATCH_H
++#define __GSD_UPDATES_WATCH_H
++
++#include <glib-object.h>
++
++G_BEGIN_DECLS
++
++#define GSD_TYPE_UPDATES_WATCH          (gsd_updates_watch_get_type ())
++#define GSD_UPDATES_WATCH(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatch))
++#define GSD_UPDATES_WATCH_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatchClass))
++#define GSD_IS_UPDATES_WATCH(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_UPDATES_WATCH))
++
++typedef struct GsdUpdatesWatchPrivate GsdUpdatesWatchPrivate;
++
++typedef struct
++{
++         GObject                         parent;
++         GsdUpdatesWatchPrivate         *priv;
++} GsdUpdatesWatch;
++
++typedef struct
++{
++        GObjectClass    parent_class;
++} GsdUpdatesWatchClass;
++
++GType                    gsd_updates_watch_get_type           (void);
++GsdUpdatesWatch         *gsd_updates_watch_new                (void);
++
++G_END_DECLS
++
++#endif /* __GSD_UPDATES_WATCH_H */
diff --git a/community-testing/gnome-settings-daemon-updates/gnome-settings-daemon.install b/community-testing/gnome-settings-daemon-updates/gnome-settings-daemon.install
new file mode 100644
index 000000000..326aa98a2
--- /dev/null
+++ b/community-testing/gnome-settings-daemon-updates/gnome-settings-daemon.install
@@ -0,0 +1,11 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community-testing/gnome-settings-daemon-updates/systemd-fallback.patch b/community-testing/gnome-settings-daemon-updates/systemd-fallback.patch
new file mode 100644
index 000000000..ffe953c63
--- /dev/null
+++ b/community-testing/gnome-settings-daemon-updates/systemd-fallback.patch
@@ -0,0 +1,154 @@
+commit b9ded09387f0b99ece97baee18595eb9e86a5b9b
+Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+Date:   Mon Mar 12 01:52:54 2012 +0100
+
+    Fallback to CK if systemd is not available
+
+    Be nice to distributions where systemd is optional. This will select
+    the code path at runtime depending on whether the system was booted
+    using systemd.
+
+diff --git a/configure.ac b/configure.ac
+index 3b4789f..d522852 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -299,7 +299,7 @@ AC_ARG_ENABLE([systemd],
+               [with_systemd=$enableval],
+               [with_systemd=no])
+ if test "$with_systemd" = "yes" ; then
+-  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
++  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
+   AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
+   SESSION_TRACKING=systemd
+ else
+diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c
+index 5786300..83fe21e 100644
+--- a/gnome-settings-daemon/gnome-settings-session.c
++++ b/gnome-settings-daemon/gnome-settings-session.c
+@@ -30,6 +30,7 @@
+ #include "gnome-settings-session.h"
+
+ #ifdef HAVE_SYSTEMD
++#include <systemd/sd-daemon.h>
+ #include <systemd/sd-login.h>
+
+ typedef struct
+@@ -130,10 +131,9 @@ struct GnomeSettingsSessionPrivate
+ {
+ #ifdef HAVE_SYSTEMD
+         GSource                   *sd_source;
+-#else
++#endif
+	GDBusProxy		*proxy_session;
+	GCancellable		*cancellable;
+-#endif
+	gchar			*session_id;
+	GnomeSettingsSessionState state;
+ };
+@@ -237,7 +237,7 @@ sessions_changed (gpointer user_data)
+         return TRUE;
+ }
+
+-#else /* HAVE_SYSTEMD */
++#endif /* HAVE_SYSTEMD */
+
+ static void
+ gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy,
+@@ -371,22 +371,25 @@ got_manager_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_d
+	g_object_unref (proxy_manager);
+ }
+
+-#endif /* HAVE_SYSTEMD */
+-
+ static void
+ gnome_settings_session_init (GnomeSettingsSession *session)
+ {
+	session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session);
+
+ #ifdef HAVE_SYSTEMD
+-        sd_pid_get_session (getpid(), &session->priv->session_id);
++        session->priv->sd_source = NULL;
++
++        if (sd_booted () > 0) {
++                sd_pid_get_session (getpid(), &session->priv->session_id);
+
+-        session->priv->sd_source = sd_source_new ();
+-        g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
+-        g_source_attach (session->priv->sd_source, NULL);
++                session->priv->sd_source = sd_source_new ();
++                g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
++                g_source_attach (session->priv->sd_source, NULL);
+
+-        sessions_changed (session);
+-#else
++                sessions_changed (session);
++                return;
++        }
++#endif
+	session->priv->cancellable = g_cancellable_new ();
+
+	/* connect to ConsoleKit */
+@@ -399,7 +402,6 @@ gnome_settings_session_init (GnomeSettingsSession *session)
+				  session->priv->cancellable,
+				  got_manager_proxy_cb,
+				  session);
+-#endif
+ }
+
+ static void
+@@ -415,15 +417,17 @@ gnome_settings_session_finalize (GObject *object)
+         if (session->priv->sd_source != NULL) {
+                 g_source_destroy (session->priv->sd_source);
+                 g_source_unref (session->priv->sd_source);
++                goto out;
+         }
+-#else
++#endif
++
+	g_cancellable_cancel (session->priv->cancellable);
+
+	if (session->priv->proxy_session != NULL)
+		g_object_unref (session->priv->proxy_session);
+	g_object_unref (session->priv->cancellable);
+-#endif
+
++out:
+	G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object);
+ }
+
+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
+index 8db04e5..9883d76 100644
+--- a/plugins/power/gsd-power-manager.c
++++ b/plugins/power/gsd-power-manager.c
+@@ -2031,7 +2031,7 @@ systemd_stop (void)
+         g_object_unref (bus);
+ }
+
+-#else
++#endif
+
+ static void
+ consolekit_stop_cb (GObject *source_object,
+@@ -2081,7 +2081,6 @@ consolekit_stop (void)
+                            consolekit_stop_cb, NULL);
+         g_object_unref (proxy);
+ }
+-#endif
+
+ static void
+ upower_sleep_cb (GObject *source_object,
+@@ -2135,10 +2134,11 @@ do_power_action_type (GsdPowerManager *manager,
+                  * hibernate is not available and is marginally better
+                  * than just powering down the computer mid-write */
+ #ifdef HAVE_SYSTEMD
+-                systemd_stop ();
+-#else
+-                consolekit_stop ();
++                if (sd_booted () > 0)
++                        systemd_stop ();
++                else
+ #endif
++                        consolekit_stop ();
+                 break;
+         case GSD_POWER_ACTION_BLANK:
+                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD
new file mode 100644
index 000000000..624c12429
--- /dev/null
+++ b/community/cmus/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 69234 2012-04-10 18:41:03Z tdziedzic $
+# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# Contributor: dorphell <dorphell@archlinux.org>
+
+pkgname=cmus
+pkgver=2.4.3
+pkgrel=1
+pkgdesc="A very feature-rich ncurses-based music player"
+arch=('i686' 'x86_64')
+url="http://cmus.sourceforge.net/"
+license=('GPL')
+depends=('ncurses')
+makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug'
+             'libvorbis' 'libpulse' 'wavpack' 'libmp4v2')
+optdepends=('alsa-lib: for ALSA output plugin support'
+            'libao: for AO output plugin support'
+            'libpulse: for PulseAudio output plugin support'
+            'ffmpeg: for ffmpeg input plugin support'
+            'libmodplug: for modplug input plugin support'
+            'faad2: for input AAC plugin support'
+            'libmad: for mp3 input plugin support'
+            'libmpcdec: for musepack input plugin support'
+            'wavpack: for wavpack input plugin support'
+            'libvorbis: for vorbis input plugin support'
+            'flac: for flac input plugin support'
+            'libmp4v2: for mp4 input plugin support')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2")
+sha1sums=('ba63a417b0df42fa9a4850dd8b922a95a426f7f5')
+
+build() {
+  cd "$srcdir/$pkgname-v$pkgver"
+  ./configure prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-v$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -D -m 644 contrib/_cmus "$pkgdir/usr/share/zsh/site-functions/_cmus"
+}
diff --git a/community/dcron/PKGBUILD b/community/dcron/PKGBUILD
new file mode 100644
index 000000000..a84c051f3
--- /dev/null
+++ b/community/dcron/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Paul Mattal <paul.archlinux.org>
+
+pkgname=dcron
+pkgver=4.5
+pkgrel=2
+pkgdesc="dillon's lightweight cron daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.jimpryor.net/linux/dcron.html"
+backup=('var/spool/cron/root' 'etc/conf.d/crond')
+depends=('bash')
+provides=('cron')
+conflicts=('cron')
+source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz")
+md5sums=('078833f3281f96944fc30392b1888326')
+optdepends=('smtp-server: sending cron job output via email')
+install=$pkgname.install
+
+build() {
+	cd "$srcdir/${pkgname}-${pkgver}"
+
+	# by default, any member of group "users" can edit their own crontab
+	make \
+		PREFIX=/usr \
+		CRONTAB_GROUP=users \
+		CRONTABS=/var/spool/cron \
+		CRONSTAMPS=/var/spool/cronstamps
+}
+
+package() {
+	cd "$srcdir/${pkgname}-${pkgver}"
+	make DESTDIR="$pkgdir" install
+
+	# install standard configuration and scripts
+	install -d -m755 "$pkgdir/etc/cron."{hourly,daily,weekly,monthly} 
+
+	install -D -m755 extra/run-cron "$pkgdir/usr/sbin/run-cron"
+	install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root" 
+	install -D -m755 extra/crond.rc "$pkgdir/etc/rc.d/crond"
+	install -D -m0644 extra/crond.conf "$pkgdir/etc/conf.d/crond"
+	install -D -m644 extra/crontab.vim "$pkgdir/usr/share/vim/vimfiles/ftplugin/crontab.vim"
+	sed -i -e 's=/var/spool/cron/cronstamps=/var/spool/cronstamps=' extra/prune-cronstamps
+	install -D -m755 extra/prune-cronstamps "$pkgdir/etc/cron.d/prune-cronstamps"
+}
diff --git a/community/dcron/dcron.install b/community/dcron/dcron.install
new file mode 100644
index 000000000..df23d0224
--- /dev/null
+++ b/community/dcron/dcron.install
@@ -0,0 +1,6 @@
+post_upgrade() {
+	if [ $(vercmp $2 4.0) -lt 0 ]
+	then
+		echo "Restart crond, since you're upgrading to the dcron 4.x series."
+	fi
+}
diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD
index 41293b975..16a512f71 100644
--- a/community/fb-client/PKGBUILD
+++ b/community/fb-client/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at>
 pkgname=fb-client
-pkgver=1.0.2
+pkgver=1.0.3
 pkgrel=1
 pkgdesc="Client for paste.xinu.at"
 arch=('i686' 'x86_64')
@@ -9,8 +9,8 @@ license=('GPL3')
 depends=('curl')
 optdepends=('xclip: for automatically copying the URL into the clipboard')
 source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz{,.sig})
-md5sums=('b5b33d773b3145e4e2306e970d0b5ca1'
-         '07ef0f054d05d74ad75336dc32b956e4')
+md5sums=('d228e2475eaf0141ecff7c7a18ef97a1'
+         '69e60c7c20360262a5cf0b902c0219b2')
 
 build() {
   cd "$srcdir/fb-$pkgver"
diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD
index 542bc4ef4..bea74da61 100644
--- a/community/haskell-x11/PKGBUILD
+++ b/community/haskell-x11/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 69204 2012-04-10 03:10:13Z spupykin $
+# $Id: PKGBUILD 69214 2012-04-10 04:17:58Z 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.6.0
-pkgrel=1
+pkgver=1.5.0.1
+pkgrel=3
 pkgdesc="A Haskell binding to the X11 graphics library."
 arch=(i686 x86_64)
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
@@ -16,7 +16,7 @@ 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=('8199520ce58e91762d31d54ed081b99c')
+md5sums=('7d69b204f773a0335828ced0e1e069f2')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch b/community/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch
new file mode 100644
index 000000000..40dd48b42
--- /dev/null
+++ b/community/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch
@@ -0,0 +1,38 @@
+From 3f6b2390102ea9d808c7075b5aaeec743b7d104e Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Tue, 10 Apr 2012 19:30:35 -0500
+Subject: [PATCH 1/2] Backport for mongodb 2.0.4 "Ignore --fork and --logpath
+ when using --shutdown SERVER-5186 SERVER-5187"
+
+https://github.com/mongodb/mongo/commit/fa2e2ef95c5c934eef63fff4b98d5eb060c5653923
+
+Backported in preparation for backporting the fix for https://jira.mongodb.org/browse/SERVER-5358
+---
+ db/cmdline.cpp |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/db/cmdline.cpp b/db/cmdline.cpp
+index fd759a7..346a9ae 100644
+--- a/db/cmdline.cpp
++++ b/db/cmdline.cpp
+@@ -239,7 +239,7 @@ namespace mongo {
+             cmdLine.noUnixSocket = true;
+         }
+ 
+-        if (params.count("fork")) {
++        if (params.count("fork") && !params.count("shutdown")) {
+             if ( ! params.count( "logpath" ) ) {
+                 cout << "--fork has to be used with --logpath" << endl;
+                 ::exit(-1);
+@@ -304,7 +304,7 @@ namespace mongo {
+         }
+ 
+ #endif
+-        if (params.count("logpath")) {
++        if (params.count("logpath") && !params.count("shutdown")) {
+             if ( logpath.size() == 0 )
+                 logpath = params["logpath"].as<string>();
+             uassert( 10033 ,  "logpath has to be non-zero" , logpath.size() );
+-- 
+1.7.10
+
diff --git a/community/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch b/community/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch
new file mode 100644
index 000000000..aff066450
--- /dev/null
+++ b/community/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch
@@ -0,0 +1,43 @@
+From 77f78f64c192572e6eb956b0fe28ecd975ff6461 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Tue, 10 Apr 2012 19:38:58 -0500
+Subject: [PATCH 2/2] Backport for mongodb 2.0.4 "Don't check /proc/pid/exe in
+ --shutdown SERVER-5358"
+
+Backported to fix https://jira.mongodb.org/browse/SERVER-5358
+
+https://github.com/mongodb/mongo/commit/c28d97d1a14a36ffc056bfd9ba7262b0a1509b5b
+---
+ db/db.cpp |   16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/db/db.cpp b/db/db.cpp
+index b1d1db8..0a21f4d 100644
+--- a/db/db.cpp
++++ b/db/db.cpp
+@@ -989,22 +989,6 @@ int main(int argc, char* argv[]) {
+                     procPath = (str::stream() << "/proc/" << pid);
+                     if (!boost::filesystem::exists(procPath))
+                         failed = true;
+-
+-                    string exePath = procPath + "/exe";
+-                    if (boost::filesystem::exists(exePath)){
+-                        char buf[256];
+-                        int ret = readlink(exePath.c_str(), buf, sizeof(buf)-1);
+-                        buf[ret] = '\0'; // readlink doesn't terminate string
+-                        if (ret == -1) {
+-                            int e = errno;
+-                            cerr << "Error resolving " << exePath << ": " << errnoWithDescription(e);
+-                            failed = true;
+-                        }
+-                        else if (!endsWith(buf, "mongod")){
+-                            cerr << "Process " << pid << " is running " << buf << " not mongod" << endl;
+-                            ::exit(-1);
+-                        }
+-                    }
+                 }
+                 catch (const std::exception& e){
+                     cerr << "Error reading pid from lock file [" << name << "]: " << e.what() << endl;
+-- 
+1.7.10
+
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 9b84c6b69..ce9bd8180 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68267 2012-03-21 01:53:53Z tdziedzic $
+# $Id: PKGBUILD 69242 2012-04-11 01:32:02Z tdziedzic $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Mathias Stearn <mathias@10gen.com>
 # Contributor: Alec Thomas
 
 pkgname=mongodb
 pkgver=2.0.4
-pkgrel=1
+pkgrel=3
 pkgdesc='A high-performance, open source, schema-free document-oriented database.'
 arch=('i686' 'x86_64')
 url='http://www.mongodb.org'
@@ -18,16 +18,26 @@ backup=('etc/mongodb.conf')
 install="mongodb.install"
 source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
         'mongodb.rc'
-        'mongodb.conf')
+        'mongodb.conf'
+        '0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch'
+        '0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch')
 md5sums=('099bc701a3d190a040123c58958e8f67'
          '9c67e00f4626ad761a8f7d4e037a54d7'
-         '4839fe1d638187ca3226e8267b947318')
+         '4839fe1d638187ca3226e8267b947318'
+         'fdbf06b005b3a73a2b6caca257ec8f64'
+         '659f6538f1ee3292809f638a4a37cbad')
 
 build() {
   export SCONSFLAGS="$MAKEFLAGS"
 
   cd mongodb-src-r${pkgver}
 
+  # 0001 suggested to backport along with 0002
+  # 0002 backported for https://jira.mongodb.org/browse/SERVER-5358
+  #      also fixes https://bugs.archlinux.org/task/29050
+  patch -Np1 -i ${srcdir}/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch
+  patch -Np1 -i ${srcdir}/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch
+
   # fix python name for smoke tests
   #sed \
   #  -e 's/python/&2/' \
diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD
index 5638b68d5..950a3d992 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 62671 2012-01-24 01:58:04Z jconder $
+# $Id: PKGBUILD 69216 2012-04-10 05:27:08Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 pkgbase='packagekit'
 pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python')
 pkgver=0.6.21
-pkgrel=2
+pkgrel=3
 pkgdesc="A system designed to make installation and updates of packages easier."
 arch=('i686' 'x86_64')
 url="http://www.packagekit.org"
 license=('GPL')
 makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool'
              'networkmanager' 'pacman'  'pm-utils' 'polkit' 'python2' 'qt'
-             'shared-mime-info' 'sqlite3' 'udev')
+             'shared-mime-info' 'sqlite' 'udev')
 options=('!libtool')
 source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz"
         'alpm.patch')
 sha256sums=('68e5d4d07adf50b1fae6cbc0963555345ba7fc12d86d3e3387874547a5448b8e'
-            '44e7adbff7e2255fd9712eef33df866c3a868b3758ceff4adeef209927a97716')
+            'ab6a9be1741aba6972f3327ac625b802e9404e21fe60ca0919a440e8ac9df965')
 
 build() {
   cd "$srcdir/PackageKit-$pkgver"
@@ -56,7 +56,7 @@ package_packagekit() {
           'etc/PackageKit/alpm.d/pacman.conf'
           'etc/PackageKit/alpm.d/repos.list')
   depends=('dbus-glib' 'pacman>=4.0.0' 'pacman<4.1.0' 'polkit'
-           'shared-mime-info' 'sqlite3' 'udev')
+           'shared-mime-info' 'sqlite' 'udev')
   optdepends=('networkmanager')
   install='packagekit.install'
 
@@ -72,8 +72,9 @@ package_packagekit() {
   rm -rf "$pkgdir/usr/lib/python"*
   rm -rf "$pkgdir/usr/share/PackageKit/website"
 
+  mkdir -p "$pkgdir/usr/share/bash-completion/completions"
   mv "$pkgdir/etc/bash_completion.d/pk-completion.bash" \
-     "$pkgdir/etc/bash_completion.d/pkcon"
+     "$pkgdir/usr/share/bash-completion/completions/pkcon"
   touch "$pkgdir/var/log/PackageKit"
 }
 
diff --git a/community/packagekit/alpm.patch b/community/packagekit/alpm.patch
index 997d252b2..904cb11d1 100644
--- a/community/packagekit/alpm.patch
+++ b/community/packagekit/alpm.patch
@@ -246,7 +246,7 @@ index 23a2724..ecd6d0f 100644
  extern gchar *xfercmd;
  extern alpm_list_t *holdpkgs;
 diff --git a/backends/alpm/pk-backend-config.c b/backends/alpm/pk-backend-config.c
-index 21a4c54..d62b927 100644
+index 21a4c54..c8fd13b 100644
 --- a/backends/alpm/pk-backend-config.c
 +++ b/backends/alpm/pk-backend-config.c
 @@ -28,29 +28,44 @@
@@ -594,7 +594,7 @@ index 21a4c54..d62b927 100644
  			     "unrecognised directive '%s'", key);
  		break;
  	}
-@@ -611,107 +742,100 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
+@@ -611,107 +742,101 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
  	}
  }
  
@@ -611,6 +611,7 @@ index 21a4c54..d62b927 100644
  
 -	if (config->root == NULL) {
 +	if (config->root == NULL || *config->root == '\0') {
++		g_free (config->root);
  		config->root = g_strdup (PK_BACKEND_DEFAULT_ROOT);
 +	} else if (!g_str_has_suffix (config->root, G_DIR_SEPARATOR_S)) {
 +		dir = 0;
@@ -761,7 +762,7 @@ index 21a4c54..d62b927 100644
  
  	/* backend takes ownership */
  	g_free (xfercmd);
-@@ -719,9 +843,9 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
+@@ -719,9 +844,9 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
  	config->xfercmd = NULL;
  
  	if (xfercmd != NULL) {
@@ -773,7 +774,7 @@ index 21a4c54..d62b927 100644
  	}
  
  	/* backend takes ownership */
-@@ -735,41 +859,53 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
+@@ -735,41 +860,53 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
  	config->syncfirsts = NULL;
  
  	/* alpm takes ownership */
@@ -1612,7 +1613,7 @@ index 65a6c11..d0cbca2 100644
  
  void
 diff --git a/backends/alpm/pk-backend-packages.c b/backends/alpm/pk-backend-packages.c
-index e9a7c94..2d057aa 100644
+index e9a7c94..c90cd7d 100644
 --- a/backends/alpm/pk-backend-packages.c
 +++ b/backends/alpm/pk-backend-packages.c
 @@ -27,13 +27,11 @@
@@ -1760,7 +1761,32 @@ index e9a7c94..2d057aa 100644
  		const alpm_list_t *i;
  
  		GString *licenses;
-@@ -286,7 +285,7 @@ pk_backend_get_details_thread (PkBackend *self)
+@@ -271,28 +270,30 @@ pk_backend_get_details_thread (PkBackend *self)
+ 			break;
+ 		}
+ 
+-		licenses = g_string_new ("");
+ 		i = alpm_pkg_get_licenses (pkg);
+-		for (; i != NULL; i = i->next) {
+-			/* assume OR although it may not be correct */
+-			g_string_append_printf (licenses, " or %s",
+-						(const gchar *) i->data);
+-		}
+-		if (licenses->len == 0) {
+-			g_string_append (licenses, " or Unknown");
++		if (i == NULL) {
++			licenses = g_string_new ("Unknown");
++		} else {
++			licenses = g_string_new ((const gchar *) i->data);
++			while ((i = i->next) != NULL) {
++				const gchar *license = (const gchar *) i->data;
++				/* assume OR although it may not be correct */
++				g_string_append_printf (licenses, " or %s",
++							license);
++			}
+ 		}
+ 
+ 		group = pk_group_enum_from_string (alpm_pkg_get_group (pkg));
  		desc = alpm_pkg_get_desc (pkg);
  		url = alpm_pkg_get_url (pkg);
  
@@ -1769,7 +1795,14 @@ index e9a7c94..2d057aa 100644
  			size = alpm_pkg_get_isize (pkg);
  		} else {
  			size = alpm_pkg_download_size (pkg);
-@@ -317,17 +316,19 @@ pk_backend_get_files_thread (PkBackend *self)
+ 		}
+ 
+-		pk_backend_details (self, *packages, licenses->str + 4, group,
++		pk_backend_details (self, *packages, licenses->str, group,
+ 				    desc, url, size);
+ 		g_string_free (licenses, TRUE);
+ 	}
+@@ -317,17 +318,19 @@ pk_backend_get_files_thread (PkBackend *self)
  	GError *error = NULL;
  
  	g_return_val_if_fail (self != NULL, FALSE);
@@ -1792,7 +1825,7 @@ index e9a7c94..2d057aa 100644
  
  		if (pk_backend_cancelled (self)) {
  			break;
-@@ -338,11 +339,13 @@ pk_backend_get_files_thread (PkBackend *self)
+@@ -338,14 +341,17 @@ pk_backend_get_files_thread (PkBackend *self)
  			break;
  		}
  
@@ -1806,10 +1839,15 @@ index e9a7c94..2d057aa 100644
 +		filelist = alpm_pkg_get_files (pkg);
 +		for (i = 0; i < filelist->count; ++i) {
 +			const gchar *file = filelist->files[i].name;
-+			g_string_append_printf (files, ";%s%s", root, file);
++			g_string_append_printf (files, "%s%s;", root, file);
  		}
  
- 		pk_backend_files (self, *packages, files->str + 1);
+-		pk_backend_files (self, *packages, files->str + 1);
++		g_string_truncate (files, MAX (files->len, 1) - 1);
++		pk_backend_files (self, *packages, files->str);
+ 		g_string_free (files, TRUE);
+ 	}
+ 
 diff --git a/backends/alpm/pk-backend-packages.h b/backends/alpm/pk-backend-packages.h
 index 4b2d7f8..2d54684 100644
 --- a/backends/alpm/pk-backend-packages.h
diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD
index fd95362ad..70016c238 100644
--- a/community/smalltalk/PKGBUILD
+++ b/community/smalltalk/PKGBUILD
@@ -1,54 +1,60 @@
-# $Id: PKGBUILD 68673 2012-03-31 10:11:37Z rvanharen $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# $Id: PKGBUILD 69236 2012-04-10 21:23:38Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: mrshpot <mrshpot at gmail dot com>
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
 
 pkgname=smalltalk
 pkgver=3.2.4
-pkgrel=5
-pkgdesc='A free implementation of Smalltalk-80 by the GNU project'
+pkgrel=6
+pkgdesc='Implementation of Smalltalk-80'
 url='http://smalltalk.gnu.org/'
 license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 options=('!libtool' '!emptydirs')
-
 depends=('gmp' 'libffi' 'libsigsegv' 'readline' 'libltdl')
-makedepends=('gdbm' 'gtk2' 'sqlite3' 'tk' 'zip')
-optdepends=('tk: for gst-blox'
-            'sqlite3'
-            'sed: for examples'
-            'gtk2')
+makedepends=('gdbm' 'gtk2' 'sqlite' 'tk' 'zip')
 install=smalltalk.install
 source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('a36a7c9beddca08dc492b500738efc82')
+sha256sums=('901cc7090a1fa44bc60900a970d207de4aa3bdfdce72bea55114e243bc1eb1b3')
+optdepends=('tk: for gst-blox'
+            'sqlite: database in a file'
+            'sed: for examples'
+            'gtk2: GUI toolkit')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --libexecdir=/usr/lib/smalltalk \
     --with-imagedir=/var/lib/smalltalk \
     --enable-gtk=yes \
     --with-system-libffi \
     --with-system-libsigsegv \
     --with-readline \
-    --with-tcl --with-tk \
-    --with-x --without-emacs
+    --with-tcl \
+    --with-tk \
+    --with-x \
+    --without-emacs
 
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
 #  make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
+
   make DESTDIR="$pkgdir" install
 
   # fix manpage symlink
-  rm -f $pkgdir/usr/share/man/man1/gst-reload.1
-  ln -s gst-load.1 $pkgdir/usr/share/man/man1/gst-reload.1
+  rm -f "$pkgdir/usr/share/man/man1/gst-reload.1"
+  ln -s gst-load.1 "$pkgdir/usr/share/man/man1/gst-reload.1"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/smalltalk/smalltalk.install b/community/smalltalk/smalltalk.install
index 992e4edfb..3f7150d67 100644
--- a/community/smalltalk/smalltalk.install
+++ b/community/smalltalk/smalltalk.install
@@ -19,3 +19,4 @@ pre_remove() {
   done
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/community/vsftpd/PKGBUILD b/community/vsftpd/PKGBUILD
index 1215b4714..6be0249c3 100644
--- a/community/vsftpd/PKGBUILD
+++ b/community/vsftpd/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 67148 2012-03-05 00:08:24Z pschmitz $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# $Id: PKGBUILD 69224 2012-04-10 09:36:37Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=vsftpd
-pkgver=2.3.5
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="Very Secure FTP daemon"
 arch=('i686' 'x86_64')
@@ -14,22 +15,25 @@ backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
 install=vsftpd.install
 source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc}
         'vsftpd.xinetd' 'vsftpd.d')
-sha1sums=('f15b39ba6d68c953ab3c3e613e6ddc2a26493755'
-          '2ddf92782f19dafc72439a2917acb1d7e124d149'
+sha1sums=('436da30cefa33e22a0266077ab95397e9432e297'
+          '2142ac8a84f18ecc1ebac21b9ac07858c35ae6af'
           'c87b4ce56dac15223694a6e86c01ea813b877596'
           '24f268956c24e78be0c234c6d31f41487922eafe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   # build-time config
   sed \
     -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
     -i builddefs.h
-  make CFLAGS="${CFLAGS}"
+
+  make CFLAGS="${CFLAGS} -fPIC"
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   install -D -m755 vsftpd "${pkgdir}/usr/sbin/vsftpd"
   install -D -m644 vsftpd.conf "${pkgdir}/etc/vsftpd.conf"
   install -D -m644 vsftpd.8 "${pkgdir}/usr/share/man/man8/vsftpd.8"
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD
index 196ce1e68..91a537576 100644
--- a/community/xmonad-contrib/PKGBUILD
+++ b/community/xmonad-contrib/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 67084 2012-03-03 16:12:24Z tdziedzic $
+# $Id: PKGBUILD 69222 2012-04-10 09:03:48Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: orbisvicis <gmail.com>
 
 pkgname=xmonad-contrib
 pkgver=0.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Add-ons for xmonad"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.4.1-2' 'xmonad=0.10-3' 'sh' 'haskell-x11=1.5.0.1-2' 'haskell-x11-xft=0.3.1-3' 'haskell-utf8-string=0.3.7-1' 'haskell-random=1.0.1.1-1')
+depends=('ghc=7.4.1-2' 'xmonad=0.10-3' 'sh' 'haskell-x11=1.5.0.1-3' 'haskell-x11-xft=0.3.1-3' 'haskell-utf8-string=0.3.7-1' 'haskell-random=1.0.1.1-1')
 install='xmonad-contrib.install'
 source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
 md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81')
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index e30bba399..e50b0eb4b 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 155405 2012-04-03 11:10:13Z allan $
+# $Id: PKGBUILD 155995 2012-04-11 03:50:59Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,8 +6,8 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
 pkgver=4.7.0
-pkgrel=3
-_snapshot=4.7-20120324
+pkgrel=4
+_snapshot=4.7-20120407
 _libstdcppmanver=20120307		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
 	gcc_pure64.patch
 	gcc-4.7.0-cloog-0.17.patch)
-md5sums=('947f9a70dcbb4baaf20b1e95b518048e'
+md5sums=('e44a8484687ef52c02066d6434ecf42b'
          '489d2f5311535800a120efd8d18db719'
          'ced48436c1b3c981d721a829f1094de1'
          '575f7d17b022e609447a590e481b18b5')
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 1a955558f..77e51d5ba 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 152198 2012-03-05 08:55:37Z ibiru $
+# $Id: PKGBUILD 155962 2012-04-10 08:20:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
-pkgver=1.7.1
+pkgver=1.7.2
 pkgrel=1
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('54e0556d73c22c7b3393069071e0b717')
+md5sums=('c73bb835057a3ee07d37a4f7daaf7ecf')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index a3b1e81c6..b56951402 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 151264 2012-02-25 10:26:10Z giovanni $
+# $Id: PKGBUILD 155990 2012-04-10 22:28:11Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
 
 pkgname=amule
-pkgver=10765
+pkgver=10771
 pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
 url="http://www.amule.org"
 license=('GPL')
-depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
-source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('62d408a9e524452ebf51e807122320b0')
+depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++')
+source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2"
+        'gcc4.7.patch')
+md5sums=('0439a71048c7dbdf912d19979dc0faad'
+         '0498a6795f4ac3a3e8bbcf51a5026820')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
 
+  # Fix gcc-4.7 build
+  patch -Np1 -i "${srcdir}/gcc4.7.patch"
+
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
               --enable-cas \
diff --git a/extra/amule/gcc4.7.patch b/extra/amule/gcc4.7.patch
new file mode 100644
index 000000000..2bfcbe057
--- /dev/null
+++ b/extra/amule/gcc4.7.patch
@@ -0,0 +1,19 @@
+--- a/src/ObservableQueue.h	2011-11-20 19:08:59.000000000 +0100
++++ b/src/ObservableQueue.h	2012-04-11 00:06:28.000000000 +0200
+@@ -331,14 +331,14 @@
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STARTING ), o );
++	this->NotifyObservers( EventType( EventType::STARTING ), o );
+ }
+ 
+ 
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STOPPING ), o );
++	this->NotifyObservers( EventType( EventType::STOPPING ), o );
+ }
+ 
+ 
diff --git a/extra/crypto++/PKGBUILD b/extra/crypto++/PKGBUILD
index c1869b9de..8cebe45ec 100644
--- a/extra/crypto++/PKGBUILD
+++ b/extra/crypto++/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143721 2011-11-28 17:06:53Z giovanni $
+# $Id: PKGBUILD 155988 2012-04-10 20:46:54Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -8,7 +8,7 @@
 pkgname=crypto++
 pkgver=5.6.1
 _srcver=561
-pkgrel=3
+pkgrel=4
 pkgdesc="A free C++ class library of cryptographic schemes"
 arch=('i686' 'x86_64')
 url="http://www.cryptopp.com/"
@@ -16,13 +16,18 @@ license=('custom')
 depends=('gcc-libs')
 makedepends=('unzip')
 source=("http://www.cryptopp.com/cryptopp${_srcver}.zip"
-        'libcrypto++.pc')
+        'libcrypto++.pc'
+        'gcc4.7.patch')
 md5sums=('96cbeba0907562b077e26bcffb483828'
-         '2337c6edbc552d9142cae8e0854715e7')
+         '2337c6edbc552d9142cae8e0854715e7'
+         'cf26a783d9432e7f9ab7f14d3db3f196')
 
 build() {
   cd ${srcdir}
 
+  # Fix gcc 4.7 build
+  patch -Np1 -i "${srcdir}/gcc4.7.patch"
+
   sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
   export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
   make -f GNUmakefile  
diff --git a/extra/crypto++/gcc4.7.patch b/extra/crypto++/gcc4.7.patch
new file mode 100644
index 000000000..55d5a0a0a
--- /dev/null
+++ b/extra/crypto++/gcc4.7.patch
@@ -0,0 +1,97 @@
+--- a/algebra.cpp	2010-08-06 18:44:32.000000000 +0200
++++ b/algebra.cpp	2012-04-10 13:16:53.000000000 +0200
+@@ -58,7 +58,7 @@
+ 	Element g[3]={b, a};
+ 	unsigned int i0=0, i1=1, i2=2;
+ 
+-	while (!Equal(g[i1], this->Identity()))
++	while (!this->Equal(g[i1], this->Identity()))
+ 	{
+ 		g[i2] = Mod(g[i0], g[i1]);
+ 		unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
+--- a/eccrypto.cpp	2010-08-06 18:44:28.000000000 +0200
++++ b/eccrypto.cpp	2012-04-10 13:19:36.000000000 +0200
+@@ -435,7 +435,7 @@
+ 	StringSource ssG(param.g, true, new HexDecoder);
+ 	Element G;
+ 	bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable());
+-	SetSubgroupGenerator(G);
++	this->SetSubgroupGenerator(G);
+ 	assert(result);
+ 
+ 	StringSource ssN(param.n, true, new HexDecoder);
+@@ -591,7 +591,7 @@
+ 	if (level >= 2 && pass)
+ 	{
+ 		const Integer &q = GetSubgroupOrder();
+-		Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g, q);
++		Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : this->ExponentiateElement(g, q);
+ 		pass = pass && IsIdentity(gq);
+ 	}
+ 	return pass;
+@@ -629,7 +629,7 @@
+ 	typename EC::Point P;
+ 	if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size))
+ 		BERDecodeError();
+-	SetPublicElement(P);
++	this->SetPublicElement(P);
+ }
+ 
+ template <class EC>
+--- a/eccrypto.h	2010-08-06 18:46:24.000000000 +0200
++++ b/eccrypto.h	2012-04-10 13:23:09.000000000 +0200
+@@ -43,7 +43,7 @@
+ 	void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero())
+ 	{
+ 		this->m_groupPrecomputation.SetCurve(ec);
+-		SetSubgroupGenerator(G);
++		this->SetSubgroupGenerator(G);
+ 		m_n = n;
+ 		m_k = k;
+ 	}
+@@ -145,9 +145,9 @@
+ 	typedef typename EC::Point Element;
+ 
+ 	void Initialize(const DL_GroupParameters_EC<EC> &params, const Element &Q)
+-		{this->AccessGroupParameters() = params; SetPublicElement(Q);}
++		{this->AccessGroupParameters() = params; this->SetPublicElement(Q);}
+ 	void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q)
+-		{this->AccessGroupParameters().Initialize(ec, G, n); SetPublicElement(Q);}
++		{this->AccessGroupParameters().Initialize(ec, G, n); this->SetPublicElement(Q);}
+ 
+ 	// X509PublicKey
+ 	void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
+@@ -166,9 +166,9 @@
+ 	void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x)
+ 		{this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);}
+ 	void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC<EC> &params)
+-		{GenerateRandom(rng, params);}
++		{this->GenerateRandom(rng, params);}
+ 	void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n)
+-		{GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));}
++		{this->GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));}
+ 
+ 	// PKCS8PrivateKey
+ 	void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
+--- a/secblock.h	2012-04-10 13:25:40.000000000 +0200
++++ b/secblock.h	2012-04-10 13:25:52.000000000 +0200
+@@ -88,7 +88,7 @@
+ 
+ 	pointer allocate(size_type n, const void * = NULL)
+ 	{
+-		CheckSize(n);
++		this->CheckSize(n);
+ 		if (n == 0)
+ 			return NULL;
+ 
+--- a/panama.cpp	2010-08-09 14:22:42.000000000 +0200
++++ b/panama.cpp	2012-04-10 13:50:12.000000000 +0200
+@@ -422,7 +422,7 @@
+ {
+ 	this->ThrowIfInvalidTruncatedSize(size);
+ 
+-	PadLastBlock(this->BLOCKSIZE, 0x01);
++	this->PadLastBlock(this->BLOCKSIZE, 0x01);
+ 	
+ 	HashEndianCorrectedBlock(this->m_data);
+ 
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD
index 9d0e5dc2e..0c973910a 100644
--- a/extra/gpsd/PKGBUILD
+++ b/extra/gpsd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 155741 2012-04-06 00:05:51Z tomegun $
+# $Id: PKGBUILD 155968 2012-04-10 10:51:55Z tomegun $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=gpsd
 pkgver=3.4
-pkgrel=2
+pkgrel=3
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('i686' 'x86_64')
 url="http://catb.org/gpsd/"
@@ -54,6 +54,8 @@ package() {
 
   install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd"
 
+  sed -i 's|/lib/udev/gpsd|/usr/lib/udev/gpsd|' gpsd.rules
+
   install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/99-gpsd-usb.rules"
 
   sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 88f03a9ae..2adb5bcc2 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kdeplasma-applets-networkmanagement
 epoch=1
-pkgver=0.9.0
+pkgver=0.9.0.1
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic
             'openconnect: Cisco AnyConnect compatible VPN client')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2")
-sha1sums=('6863905534c2c58534992fad197dd794105b8e19')
+sha1sums=('75e16397d00de06947fa183f09632caed11d8857')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libfprint/PKGBUILD b/extra/libfprint/PKGBUILD
index b5b2ab225..a1e059763 100644
--- a/extra/libfprint/PKGBUILD
+++ b/extra/libfprint/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 142730 2011-11-14 08:43:18Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# $Id: PKGBUILD 155974 2012-04-10 15:42:33Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=libfprint
 pkgver=0.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Library for fingerprint readers"
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/wiki/Software/fprint/libfprint"
@@ -12,9 +13,8 @@ license=(LGPL)
 depends=(libusb nss gdk-pixbuf2)
 groups=(fprint)
 options=(!libtool !emptydirs)
-_snap=$pkgname-48ec64f68330452b011d14be67653f1d48fb1405
+_snap=$pkgname-dfff16f3e32519ad071bdb1233c75bfe3ffa5557
 source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2)
-md5sums=('858a0f0d7abd21ac494f9bec904dc156')
 
 build() {
   cd "$srcdir/$_snap"
@@ -27,7 +27,5 @@ build() {
 package() {
   cd "$srcdir/$_snap"
   make DESTDIR="$pkgdir" install
-
-  mkdir -p "$pkgdir/lib/udev/rules.d"
-  mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/"
 }
+md5sums=('aa2fb6b90cf8c53aebd1f0e656dd70c1')
diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD
index e7d7fb122..020cd70c2 100644
--- a/extra/libmtp/PKGBUILD
+++ b/extra/libmtp/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 155745 2012-04-06 00:05:58Z tomegun $
+# $Id: PKGBUILD 155970 2012-04-10 11:26:59Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=libmtp
-pkgver=1.1.2
-pkgrel=2
+pkgver=1.1.3
+pkgrel=1
 pkgdesc="Library implementation of the Media Transfer Protocol"
 arch=("i686" "x86_64")
 url="http://libmtp.sourceforge.net"
 license=('LGPL')
-depends=('libusb')
+depends=('libusb' 'libgcrypt')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('6dc708757e3fd3ccce7445b4f2171263')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -24,3 +24,4 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
+md5sums=('11529eedaf0e1fc00cdd6119eec525f0')
diff --git a/extra/libpciaccess/PKGBUILD b/extra/libpciaccess/PKGBUILD
index 3d396d2bb..4b5bc2e8e 100644
--- a/extra/libpciaccess/PKGBUILD
+++ b/extra/libpciaccess/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libpciaccess
-pkgver=0.13
+pkgver=0.13.1
 pkgrel=1
 pkgdesc="X11 PCI access library"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ depends=('glibc')
 makedepends=('pkgconfig' 'xorg-util-macros')
 options=('!libtool')
 source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('7ddd8e1de27326f6f4a3ac6b4d2241fe77ef5353')
+sha1sums=('ae4dcf27a1b52c6a1fd90b21165fbaecae34e8ac')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libupnp/PKGBUILD b/extra/libupnp/PKGBUILD
index 4bf09a5c1..05b239f0c 100644
--- a/extra/libupnp/PKGBUILD
+++ b/extra/libupnp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154277 2012-03-25 09:49:04Z giovanni $
+# $Id: PKGBUILD 155992 2012-04-10 22:40:27Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org> 
 # Contributor: kastor <kastor@fobos.org.ar>
 
 pkgname=libupnp
-pkgver=1.6.16
+pkgver=1.6.17
 pkgrel=1
 pkgdesc="Portable Open Source UPnP Development Kit"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('glibc')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/pupnp/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('1212df3f9ed370a0a94b641578465585')
+md5sums=('efbf0d470ce7157bc0e6ca836e246de5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index ebe106e00..c5f6e4b38 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 154124 2012-03-23 16:56:11Z bisson $
+# $Id: PKGBUILD 155966 2012-04-10 09:35:44Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,19 +6,19 @@
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=mpd
-pkgver=0.16.7
-pkgrel=3
+pkgver=0.16.8
+pkgrel=2
 pkgdesc='Flexible, powerful, server-side application for playing music'
 url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki'
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
-         'sqlite3' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
+         'sqlite' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
          'libpulse')
 makedepends=('doxygen')
 source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
         'rc.d') 
-sha1sums=('878f3ce82d4f00f6cbad63a625b2c0274c4a704a'
+sha1sums=('977c80db8dc64e65c2bc523f69a9a7a71adca2b1'
           '3777bdb4fff4b7911be3b1242aabae9d2912ef18')
 
 install=install
@@ -37,7 +37,7 @@ build() {
 		--disable-cue \
 		--disable-sidplay \
 		--disable-documentation \
-		--with-systemdsystemunitdir=/lib/systemd/system
+		--with-systemdsystemunitdir=/usr/lib/systemd/system
 
 	make
 }
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index a5de34c50..35d31c11d 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 154122 2012-03-23 16:53:40Z bisson $
+# $Id: PKGBUILD 155960 2012-04-10 05:23:46Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=postfix
 pkgver=2.9.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
 license=('custom')
 arch=('i686' 'x86_64')
-depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db')
+depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite' 'libldap' 'db')
 backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
         'aliases.patch' \
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index ea6041eac..83693d62f 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153857 2012-03-20 05:18:53Z eric $
+# $Id: PKGBUILD 155972 2012-04-10 13:26:02Z tdziedzic $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,8 +6,8 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=475
-__hgrev=74686ae0b181 	
+_patchlevel=495
+__hgrev=a104dae7f903
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -18,8 +18,8 @@ makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
 source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz{,.sig}
         pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
         vimrc archlinux.vim gvim.desktop)
-sha1sums=('56529692b35df97e8a0f8610122957ba93033545'
-          'b52b3d290d5a005ace8a8aefa9e1eb0f4cc563e3'
+sha1sums=('4181e211d0150cda9b3dbd815ec4aa14a6d28196'
+          '039f92d62556a7ccc48ef4ded3c5e02578470b05'
           '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
           '3494baf53a63581ba69f86a81293640ff681c5c5'
           '25dd3c2ce436e73a367c8f73b68f7f6889682437'
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index e834caea0..ae765c1c7 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154986 2012-04-01 08:22:31Z andyrtr $
+# $Id: PKGBUILD 155978 2012-04-10 15:57:30Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.12.0.901
+pkgver=1.12.0.902
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
@@ -20,7 +20,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-sha1sums=('80465deb799cdc6b7c2cc7d61e7ad8b4bc3892d7'
+sha1sums=('75c1ee8d10a2ce6f678deeff23c971e31a212dab'
           '63836e5cfb4ae7353fb2e31239a544409c7ead32'
           '175de5630b43dbc97778adfba5563b7fdd77f11f'
           'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD
index d8e5d8e4f..829871791 100644
--- a/libre/abuse-libre/PKGBUILD
+++ b/libre/abuse-libre/PKGBUILD
@@ -1,50 +1,40 @@
-# $Id: PKGBUILD 46622 2011-05-10 10:00:25Z lfleischer $
+# $Id$
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: jlvsimoes <jlvsimoes@oninet.pt>
 # Contributor: kevin <kevin@archlinux.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
+_pkgname=abuse
 pkgname=abuse-libre
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 pkgdesc='A side-scroller action game that pits you against ruthless alien killers. Without unfree "Claudio"'
 arch=('i686' 'x86_64')
 url='http://abuse.zoy.org/'
-license=('GPL' 'custom:PublicDomain')
+license=('GPL' 'custom')
 depends=('gcc-libs' 'libgl' 'sdl' 'sdl_mixer')
 install='abuse.install'
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz")
-
-# Remove the unfree 'claudio' addon
-# $ source PKGBUILD
-# $ mksource
-mksource() {
-    pushd /tmp >/dev/null
-
-    wget http://abuse.zoy.org/raw-attachment/wiki/download/${pkgname%-libre}-${pkgver}.tar.gz \
-         -O - | tar xzf -
-
-    rm -rvf ./abuse-$pkgver/data/addon/claudio
-    tar czvf ${pkgname}-${pkgver}.tar.gz ./abuse-$pkgver
-
-    popd >/dev/null
-
-    mv -v /tmp/${pkgname}-${pkgver}.tar.gz .
-}
+source=("http://abuse.zoy.org/raw-attachment/wiki/download/${_pkgname}-${pkgver}.tar.gz"
+        non-claudio.patch)
+md5sums=('ec678b8dc8d00e0382d8c805c6438489'
+         '4808c8be42f551bb3c611629a7833f09')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+# Remove the unfree 'claudio' addon
+  rm -rvf ./data/addon/claudio
+  patch -Np1 -i "$srcdir/non-claudio.patch"
 
   ./configure --prefix=/usr --with-assetdir=/usr/share/abuse/orig --with-x
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
 
   install -d "${pkgdir}/usr/share/licenses/abuse"
   sed -n '1,/^$/p' src/view.cpp > "${pkgdir}/usr/share/licenses/abuse/orig.code.license"
 }
-
-md5sums=('10cac59308bff0dadb8437eff8b4d87e')
diff --git a/libre/abuse-libre/abuse.install b/libre/abuse-libre/abuse.install
index ca888f196..4d28ebacd 100644
--- a/libre/abuse-libre/abuse.install
+++ b/libre/abuse-libre/abuse.install
@@ -11,4 +11,3 @@ post_upgrade() {
 	post_install
 }
 
-
diff --git a/libre/abuse-libre/non-claudio.patch b/libre/abuse-libre/non-claudio.patch
new file mode 100644
index 000000000..2a29e53f0
--- /dev/null
+++ b/libre/abuse-libre/non-claudio.patch
@@ -0,0 +1,122 @@
+--- abuse-0.8/data/Makefile.in	2011-05-09 08:06:35.000000000 -0300
++++ abuse-0.8/data/Makefile.in	2012-04-11 15:03:02.854839102 -0300
+@@ -184,7 +184,6 @@
+ 	addon/aliens/objects.lsp addon/aliens/powerold.lsp \
+ 	addon/aliens/powerups.lsp addon/aliens/sfx.lsp \
+ 	addon/aliens/tiles.lsp addon/bong/bong.lsp \
+-	addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \
+ 	addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \
+ 	addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \
+ 	addon/deathmat/large.lsp addon/deathmat/levelset.lsp \
+@@ -245,23 +244,6 @@
+ 	art/tints/guns/orange.spe art/tints/guns/redish.spe \
+ 	addon/aliens/aliens.spe addon/aliens/bactiles.spe \
+ 	addon/aliens/fortiles.spe addon/bong/bong.spe \
+-	addon/claudio/antship.spe addon/claudio/bigexp.spe \
+-	addon/claudio/deepw1.spe addon/claudio/deepw2.spe \
+-	addon/claudio/droid.spe addon/claudio/extiles.spe \
+-	addon/claudio/fire.spe addon/claudio/lamp.spe \
+-	addon/claudio/lava2.spe addon/claudio/mypanels.spe \
+-	addon/claudio/nplatfor.spe addon/claudio/pal21.spe \
+-	addon/claudio/pal2.spe addon/claudio/pal5.spe \
+-	addon/claudio/pal81f.spe addon/claudio/pal81.spe \
+-	addon/claudio/pal82f.spe addon/claudio/pal82.spe \
+-	addon/claudio/pal90.spe addon/claudio/rob2.spe \
+-	addon/claudio/skull.spe addon/claudio/spaced.spe \
+-	addon/claudio/spaceh.spe addon/claudio/spacymed.spe \
+-	addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \
+-	addon/claudio/t_lamp.spe addon/claudio/trex1.spe \
+-	addon/claudio/t_skull.spe addon/claudio/t_space.spe \
+-	addon/claudio/t_trex.spe addon/claudio/t_water.spe \
+-	addon/claudio/umbrel3.spe addon/claudio/watem.spe \
+ 	addon/example/example.spe addon/leon/gray.spe \
+ 	addon/leon/level00.spe addon/leon/level01.spe \
+ 	addon/leon/level02.spe addon/leon/lmisc.spe \
+@@ -333,7 +315,6 @@
+ doc = \
+     addon/aliens/aliens.txt \
+     addon/aliens/readme.txt \
+-    addon/claudio/palettes.txt \
+     addon/leon/leon.txt \
+     addon/newart/tiledoc.txt \
+     addon/pong/pong.txt \
+@@ -414,17 +395,6 @@
+ @HAVE_NONFREE_TRUE@	addon/aliens/aslash01.wav \
+ @HAVE_NONFREE_TRUE@	addon/aliens/egghatch.wav \
+ @HAVE_NONFREE_TRUE@	addon/aliens/jarbreak.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/aship.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/drill.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/fire.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/glass1.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/sewers.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/skull.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/spaceo.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/trex1.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/trex2.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/unhealth.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/wfall.wav \
+ @HAVE_NONFREE_TRUE@	addon/leon/sfx/ambship1.wav \
+ @HAVE_NONFREE_TRUE@	addon/leon/sfx/ambship2.wav \
+ @HAVE_NONFREE_TRUE@	addon/leon/sfx/gren5.wav \
+--- abuse-0.8/data/Makefile.am	2011-05-09 04:58:04.000000000 -0300
++++ abuse-0.8/data/Makefile.am	2012-04-11 15:03:50.282407491 -0300
+@@ -35,7 +35,6 @@
+     \
+     addon/bong/bong.lsp \
+     \
+-    addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \
+     addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \
+     addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \
+     addon/deathmat/large.lsp addon/deathmat/levelset.lsp \
+@@ -113,21 +112,6 @@
+     \
+     addon/bong/bong.spe \
+     \
+-    addon/claudio/antship.spe addon/claudio/bigexp.spe \
+-    addon/claudio/deepw1.spe addon/claudio/deepw2.spe addon/claudio/droid.spe \
+-    addon/claudio/extiles.spe addon/claudio/fire.spe addon/claudio/lamp.spe \
+-    addon/claudio/lava2.spe addon/claudio/mypanels.spe \
+-    addon/claudio/nplatfor.spe addon/claudio/pal21.spe addon/claudio/pal2.spe \
+-    addon/claudio/pal5.spe addon/claudio/pal81f.spe addon/claudio/pal81.spe \
+-    addon/claudio/pal82f.spe addon/claudio/pal82.spe addon/claudio/pal90.spe \
+-    addon/claudio/rob2.spe addon/claudio/skull.spe addon/claudio/spaced.spe \
+-    addon/claudio/spaceh.spe addon/claudio/spacymed.spe \
+-    addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \
+-    addon/claudio/t_lamp.spe addon/claudio/trex1.spe \
+-    addon/claudio/t_skull.spe addon/claudio/t_space.spe \
+-    addon/claudio/t_trex.spe addon/claudio/t_water.spe \
+-    addon/claudio/umbrel3.spe addon/claudio/watem.spe \
+-    \
+     addon/example/example.spe \
+     \
+     addon/leon/gray.spe addon/leon/level00.spe addon/leon/level01.spe \
+@@ -214,7 +198,6 @@
+ doc = \
+     addon/aliens/aliens.txt \
+     addon/aliens/readme.txt \
+-    addon/claudio/palettes.txt \
+     addon/leon/leon.txt \
+     addon/newart/tiledoc.txt \
+     addon/pong/pong.txt \
+@@ -267,11 +250,6 @@
+     addon/aliens/altaunt.wav addon/aliens/aslash01.wav \
+     addon/aliens/egghatch.wav addon/aliens/jarbreak.wav \
+     \
+-    addon/claudio/aship.wav addon/claudio/drill.wav addon/claudio/fire.wav \
+-    addon/claudio/glass1.wav addon/claudio/sewers.wav addon/claudio/skull.wav \
+-    addon/claudio/spaceo.wav addon/claudio/trex1.wav addon/claudio/trex2.wav \
+-    addon/claudio/unhealth.wav addon/claudio/wfall.wav \
+-    \
+     addon/leon/sfx/ambship1.wav addon/leon/sfx/ambship2.wav \
+     addon/leon/sfx/gren5.wav addon/leon/sfx/gren6.wav \
+     addon/leon/sfx/rain2.wav addon/leon/sfx/rain3.wav \
+--- abuse-0.8/data/abuse.lsp	2011-05-09 04:58:04.000000000 -0300
++++ abuse-0.8/data/abuse.lsp	2012-04-11 15:04:15.637788215 -0300
+@@ -42,7 +42,6 @@
+ (load "addon/twist/f2chars.lsp")
+ (load "addon/twist/f2ai.lsp")
+ (load "addon/aliens/astartup.lsp")
+-(load "addon/claudio/claudio.lsp")
+ (load "addon/twist/lisp/dray.lsp")
+ (load "addon/twist/lisp/mario.lsp")
+ (load "addon/leon/4frabs.lsp")
diff --git a/libre/hardinfo/.directory b/libre/hardinfo/.directory
new file mode 100644
index 000000000..725259ee6
--- /dev/null
+++ b/libre/hardinfo/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,4,11,16,57,42
diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD
index 869d2f52a..47f4c1330 100644
--- a/libre/hardinfo/PKGBUILD
+++ b/libre/hardinfo/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 17993 2010-05-29 04:49:43Z ebelanger $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=hardinfo
 pkgver=0.5.1
-pkgrel=2.1
+pkgrel=4
 pkgdesc="A system information and benchmark tool."
 arch=('i686' 'x86_64')
 url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
 license=('GPL2')
-depends=('gtk2' 'libsoup' 'gnutls')
+depends=('gtk2' 'libsoup')
 options=('!emptydirs')
 source=(http://download.berlios.de/hardinfo/${pkgname}-${pkgver}.tar.bz2 \
         fixsensors.patch hardinfo.distro)
@@ -21,18 +21,18 @@ sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../fixsensors.patch 
-  sed -i 's|/usr/lib64|/usr/lib|' configure 
-  ./configure --prefix=/usr 
-  sed -i 's|lib64|lib|' binreloc.c 
-  sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/linux/{parisc,ppc,m68k,x86,common,mips,sparc,x86_64}/modules.h 
-  sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/this/modules.h 
+  patch -p1 < ../fixsensors.patch
+  sed -i 's|/usr/lib64|/usr/lib|' configure
+  ./configure --prefix=/usr
+  sed -i 's|lib64|lib|' binreloc.c
+  sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/linux/{parisc,ppc,m68k,x86,common,mips,sparc,x86_64}/modules.h
+  sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/this/modules.h
   sed -i 's|{ DB_PREFIX "debian_version",	"deb"  },|{ DB_PREFIX "hardinfo.distro",       "parabola"  },{ DB_PREFIX "debian_version",	"deb"  },|' computer.h 
-  make 
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install 
-  install -D -m644 ../hardinfo.distro "${pkgdir}/etc/hardinfo.distro" 
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 ../hardinfo.distro "${pkgdir}/etc/hardinfo.distro"
 }
diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD
new file mode 100644
index 000000000..c813946c7
--- /dev/null
+++ b/libre/luxrays-libre/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+_pkgname=luxrays
+pkgname=luxrays-libre
+pkgver=0.8
+_pkgver=ed424ec77571
+pkgrel=7
+epoch=0
+pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('freeimage' 'freeglut' 'glew')
+makedepends=('cmake' 'boost')
+replaces=('luxrays')
+conflicts=('luxrays')
+provides=("luxrays=$pkgver")
+source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
+md5sums=('2ac9c588675c5971c57f473ef10ac67d')
+
+build() {
+  cd "$srcdir/luxrender-$_pkgname-$_pkgver"
+
+  # fix the break caused by the change of the name of the namespace 'detail' to 'ipcdetail'
+  sed -i 's|::detail|::ipcdetail|' include/luxrays/utils/core/atomic.h
+
+  export CXXFLAGS="$CXXFLAGS -lpthread"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DLUXRAYS_DISABLE_OPENCL=ON \
+    .
+  make
+}
+
+package() {
+  cd "$srcdir/luxrender-$_pkgname-$_pkgver"
+
+  install -d -m755 "$pkgdir"/usr/{bin,include,lib}
+  install -m755 bin/* "$pkgdir"/usr/bin
+  install -m644 lib/* "$pkgdir"/usr/lib
+  cp -a include/luxrays "$pkgdir"/usr/include
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
new file mode 100644
index 000000000..38021313d
--- /dev/null
+++ b/libre/luxrender-libre/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Initial contributor: flixie <69one@gmx.net>
+# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
+# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+pkgname=luxrender-libre
+pkgver=0.8
+_pkgver=45d3e13eb94c
+pkgrel=13
+pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenGL)"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('boost-libs' 'freeimage' 'openexr')
+optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
+            'python: Python interface (pylux)')
+makedepends=('cmake' 'boost' 'qt' 'luxrays-libre' 'python')
+replaces=('luxrender')
+conflicts=('luxrender')
+provides=("luxrender=$pkgver")
+source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2)
+md5sums=('0f2d856385db72131f51e44a7ee527fa')
+
+build() {
+  cd "$srcdir"/luxrender-lux-$_pkgver
+
+  sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt
+
+  export CXXFLAGS="$CXXFLAGS -lpthread"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLUXRAYS_DISABLE_OPENCL=ON \
+    -DPYTHON_CUSTOM=ON \
+    -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \
+    -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \
+    .
+  make
+}
+
+package() {
+  cd "$srcdir"/luxrender-lux-$_pkgver
+  make DESTDIR="$pkgdir" install
+
+  # fix library path on x86_64
+  [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
+
+  #install pylux
+  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/psutils-libre/.directory b/libre/psutils-libre/.directory
new file mode 100644
index 000000000..60ed4bded
--- /dev/null
+++ b/libre/psutils-libre/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,4,11,16,24,1
diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD
index 4cb5ac014..25e88f492 100644
--- a/libre/psutils-libre/PKGBUILD
+++ b/libre/psutils-libre/PKGBUILD
@@ -4,6 +4,7 @@
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: xihh <hahj87@gmail.com>
 
+_pkgname=psutils
 pkgname=psutils-libre
 pkgver=1.17
 pkgrel=3
@@ -11,18 +12,18 @@ arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A set of postscript utilities"
 url="http://www.tardis.ed.ac.uk/~ajcd/psutils/index.html"
 license=('custom')
-depends=('glibc' 'ghostscript-libre')
+depends=('glibc' 'gnu-ghostscript')
 provides=('psutils-lprng' 'psutils')
 replaces=('psutils-lprng' 'psutils')
 conflicts=('psutils-lprng' 'psutils')
 options=('!makeflags')
-source=(http://www.connochaetos.org/misc/${pkgname}-${pkgver}.tar.gz
+source=("ftp://ftp.archlinux.org/other/psutils/${_pkgname}-${pkgver}.tar.gz"
         'psutils-1.17.diff')
-md5sums=('5553b70be2484cef7a76d741a26f24d5'
+md5sums=('b161522f3bd1507655326afa7db4a0ad'
          '2b49e9e796000b42f42804d4b50a2be1')
 
 build() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${_pkgname}"
   patch -Np1 -i "${srcdir}/psutils-1.17.diff"
   make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \
     INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \
@@ -32,12 +33,12 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${_pkgname}"
   install -d -m755 "${pkgdir}/usr/include"
   install -d -m755 "${pkgdir}/usr/share/man"
   make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \
     INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \
     MANDIR="${pkgdir}/usr/share/man/man1" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${_pkgname}"
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/"
 }
diff --git a/libre/psutils-libre/psutils-1.17.diff b/libre/psutils-libre/psutils-1.17.diff
new file mode 100644
index 000000000..4af32bd7f
--- /dev/null
+++ b/libre/psutils-libre/psutils-1.17.diff
@@ -0,0 +1,33 @@
+diff -u -r --new-file psutils.orig/Makefile.unix psutils/Makefile.unix
+--- psutils.orig/Makefile.unix	Tue Mar 11 14:52:59 1997
++++ psutils/Makefile.unix	Thu Jan 18 20:53:36 2001
+@@ -19,16 +19,16 @@
+ # psnup puts multiple logical pages on one physical page
+ # psresize scales and moves pages to fit on different paper sizes
+ 
+-PAPER=a4
++PAPER=letter
+ 
+ # Makefile for PSUtils under Unix
+ 
+ OS = UNIX
+ 
+-BINDIR = /usr/local/bin
++BINDIR = /usr/bin
+ SCRIPTDIR = $(BINDIR)
+-INCLUDEDIR = /usr/local/share/psutils
+-PERL = /usr/local/bin/perl
++INCLUDEDIR = /usr/share/psutils
++PERL = /usr/bin/perl
+ 
+ BINMODE = 0755
+ MANMODE = 0644
+@@ -36,7 +36,7 @@
+ INSTALL = install -c -m $(BINMODE)
+ INSTALLMAN = install -c -m $(MANMODE)
+ MANEXT = 1
+-MANDIR = /usr/local/share/man/man$(MANEXT)
++MANDIR = /usr/man/man$(MANEXT)
+ 
+ CC = gcc
+ CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
diff --git a/libre/seamonkey-libre/PKGBUILD b/libre/seamonkey-libre/PKGBUILD
index 3de183faa..8acde2590 100644
--- a/libre/seamonkey-libre/PKGBUILD
+++ b/libre/seamonkey-libre/PKGBUILD
@@ -25,7 +25,7 @@ md5sums=('a7128f6bcd16bebed4a7c3487b69c38f'
          '6119a2254716752c9d08e366f8d4c048'
          '25b6fe16ac24cd5c852213e5c1adb272'
          '5b2aaff7dfe7f1f94ad965905b20e782'
-         '4347c7be7e48a9987765552f4f6362bc')
+         'f7beeb1f94390957259212dd1dbc171f')
 
 build() {
   cd "$srcdir/comm-release"
diff --git a/libre/seamonkey-libre/gnuzilla-addons.patch b/libre/seamonkey-libre/gnuzilla-addons.patch
index ae95052c5..32a28b3e4 100644
--- a/libre/seamonkey-libre/gnuzilla-addons.patch
+++ b/libre/seamonkey-libre/gnuzilla-addons.patch
@@ -1,11 +1,12 @@
-diff -ru comm-release.orig/suite/browser/browser-prefs.js comm-release/suite/browser/browser-prefs.js
---- comm-release.orig/suite/browser/browser-prefs.js	2012-02-12 21:59:22.006597211 +0100
-+++ comm-release/suite/browser/browser-prefs.js	2012-02-12 22:03:37.727232650 +0100
-@@ -587,10 +587,10 @@
+diff -Naur comm-release.orig/suite/browser/browser-prefs.js comm-release/suite/browser/browser-prefs.js
+--- comm-release.orig/suite/browser/browser-prefs.js	2012-03-13 02:23:17.000000000 -0300
++++ comm-release/suite/browser/browser-prefs.js		2012-04-11 01:57:44.005731215 -0300
+@@ -587,11 +587,10 @@
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);  // also toggles personalized recommendations
  pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
 -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
 -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey");
 -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
@@ -16,7 +17,7 @@ diff -ru comm-release.orig/suite/browser/browser-prefs.js comm-release/suite/bro
  
  // getMoreThemes is used by our UI under our switch theme menu
  pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties");
-@@ -715,7 +715,7 @@
+@@ -716,7 +715,7 @@
  #endif
  
  // plugin finder service url
@@ -25,4 +26,3 @@ diff -ru comm-release.orig/suite/browser/browser-prefs.js comm-release/suite/bro
  pref("plugins.update.url", "http://www.mozilla.com/%LOCALE%/plugincheck/");
  pref("plugins.update.notifyUser", false);
  pref("plugins.hide_infobar_for_outdated_plugin", false);
-Tylko w comm-release/suite/browser: browser-prefs.js~
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 9384e9c1e..82bf28b8b 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63763 2012-02-05 12:13:00Z ibiru $
+# $Id$
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
 # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
@@ -11,8 +11,8 @@
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox-libre
 pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source')
-pkgver=4.1.10
-pkgrel=1.1
+pkgver=4.1.12
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -21,22 +21,10 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor
 #'xorg-server-devel' 'xf86driproto' 'libxcomposite')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
-        10-vboxdrv.rules  vboxdrv-reference.patch gsoap.patch LocalConfig.kmk vboxbuild
+        10-vboxdrv.rules  vboxdrv-reference.patch LocalConfig.kmk vboxbuild
         change_default_driver_dir.patch vbox-service.conf vbox-service.rc
         vboxweb.conf vboxweb.rc)
 
-md5sums=('263e495ef3a7ab75943af28d446ee702'
-         '5f85710e0b8606de967716ded7b2d351'
-         '755ab0dd9bcacf2c00d2275b1ca69547'
-         'b9f4da759d23b60b69b12005213c3aa7'
-         'a1ff1d1b4423556887e48a32978226a6'
-         '3c96faa76894c182c1bb56bb30d9a17e'
-         '97e193f050574dd272a38e5ee5ebe62b'
-         '3c08ad30b89add47d3f45121200a5360'
-         '208cf5f842eb2e3a5b6dcfc59080d26c'
-         '3ac185709bfe688bb753c46e170d0546'
-         'c159d683ba1947290fc2ad2c64194150')
-
 _extramodules=extramodules-3.3-LIBRE
 _kernver="$(cat /lib/modules/${_extramodules}/version)"
 
@@ -45,7 +33,6 @@ build() {
 
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
-    patch -Np0 -i "$srcdir//gsoap.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -66,7 +53,8 @@ package_virtualbox-libre() {
     optdepends=('qt: for VirtualBox GUI'
                 'vde2: Virtual Distributed Ethernet support'
                 'virtualbox-sdk: developer kit'
-                'virtualbox-source: host kernel source modules for non-stock kernels')
+                'virtualbox-source: host kernel source modules for non-stock kernels'
+                'net-tools: for host-only or bridged networking')
 
     backup=('etc/vbox/vbox.cfg')
     replaces=('virtualbox' 'virtualbox-ose')
@@ -206,4 +194,13 @@ package_virtualbox-parabola-additions(){
     # install sample config
     install -D -m644 "$srcdir/vbox-service.conf" "$pkgdir/etc/conf.d/vbox-service"
 }
-
+md5sums=('4e385d2333e1a4832e5618b982fddee5'
+         '5f85710e0b8606de967716ded7b2d351'
+         '755ab0dd9bcacf2c00d2275b1ca69547'
+         'a1ff1d1b4423556887e48a32978226a6'
+         '3c96faa76894c182c1bb56bb30d9a17e'
+         '97e193f050574dd272a38e5ee5ebe62b'
+         '3c08ad30b89add47d3f45121200a5360'
+         '208cf5f842eb2e3a5b6dcfc59080d26c'
+         '3ac185709bfe688bb753c46e170d0546'
+         'c159d683ba1947290fc2ad2c64194150')
diff --git a/libre/virtualbox-libre/virtualbox.install b/libre/virtualbox-libre/virtualbox.install
index 6c9baa21e..29646e973 100644
--- a/libre/virtualbox-libre/virtualbox.install
+++ b/libre/virtualbox-libre/virtualbox.install
@@ -20,7 +20,7 @@ post_install() {
 post_upgrade() {
     getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
     utils
-    if [ "$(vercmp $2 4.1.10-1)" -lt 0 ]; then
+    if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
 /bin/cat << EOF
 ===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules.
 ===> Use virtualbox-source package if you don't use our stock linux-libre package.
diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index cd27b74a8..60a903615 100644
--- a/libre/virtualbox-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -5,19 +5,19 @@
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
-pkgver=4.1.10
-pkgrel=2.1
+pkgver=4.1.12
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
+makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-headers')
 replaces=('virtualbox-modules')
 conflicts=('virtualbox-modules')
 provides=("virtualbox-modules=$pkgver")
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-headers')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
          LocalConfig.kmk 60-vboxguest.rules)
-md5sums=('263e495ef3a7ab75943af28d446ee702'
+md5sums=('4e385d2333e1a4832e5618b982fddee5'
          '4c88bd122677a35f68abd76eb01b378b'
          'ed1341881437455d9735875ddf455fbe')
 
diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD
index 001873ad3..87d775d4e 100644
--- a/libre/xarchiver-libre/PKGBUILD
+++ b/libre/xarchiver-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 121261 2011-04-29 22:06:13Z andyrtr $
+# $Id: PKGBUILD 154769 2012-03-30 16:45:24Z pierre $
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 _pkgname=xarchiver
 pkgname=xarchiver-libre
 pkgver=0.5.2
-pkgrel=4
+pkgrel=5
 pkgdesc="GTK+ frontend to various command line archivers"
 arch=('i686' 'x86_64')
 url="http://xarchiver.sourceforge.net"
@@ -21,10 +21,11 @@ optdepends=('tar: TAR support'
             'bzip2: BZIP2 support'
             'zip: ZIP support'
             'unzip: ZIP support'
+            'ununrar: RAR support'
             'p7zip: 7z support'
             'arj: ARJ support'
             'lha: LHA support'
-            'lzma-utils: LZMA support'
+            'xz: LZMA support'
             'lzop: LZOP support')
 options=('!libtool')
 install=xarchiver.install
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
index ad5b51b59..f7ff098c0 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
@@ -108,4 +108,3 @@ diff -Nur xarchiver-0.5.2.orig/src/7zip.c xarchiver-0.5.2/src/7zip.c
  	entry = xa_set_archive_entries_for_each_row (archive,filename,item);
  	g_free(filename);
  }
-
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch b/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
index bd6df9731..d962a44af 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
@@ -82,4 +82,3 @@ diff -up ./src/rpm.c.rpm2cpio ./src/rpm.c
  	list = NULL;
  	list = g_slist_append(list,command);
  	result = xa_run_command (archive,list);
-
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
index ab907419d..e29d40c41 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
@@ -13,4 +13,3 @@ diff -pur xarchiver-0.5.2/src/open-with-dlg.c xarchiver-0.5.2.new/src/open-with-
  	gtk_tree_model_get(model,&iter,2,&exec,-1);
  	
  	gtk_entry_set_text(GTK_ENTRY(data->custom_command_entry),exec);
-
diff --git a/multilib/lib32-libpciaccess/PKGBUILD b/multilib/lib32-libpciaccess/PKGBUILD
index 43a3145c0..5367bfa70 100644
--- a/multilib/lib32-libpciaccess/PKGBUILD
+++ b/multilib/lib32-libpciaccess/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67498 2012-03-12 21:10:17Z lcarlier $
+# $Id: PKGBUILD 69230 2012-04-10 16:20:33Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 _pkgbasename=libpciaccess
 pkgname=lib32-${_pkgbasename}
-pkgver=0.13
+pkgver=0.13.1
 pkgrel=1
 pkgdesc="X11 PCI access library (32-bit"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ depends=('lib32-glibc' ${_pkgbasename})
 makedepends=('gcc-multilib' 'pkgconfig' 'xorg-util-macros')
 options=('!libtool')
 source=(${url}/releases/individual/lib/${_pkgbasename}-${pkgver}.tar.bz2)
-sha1sums=('7ddd8e1de27326f6f4a3ac6b4d2241fe77ef5353')
+sha1sums=('ae4dcf27a1b52c6a1fd90b21165fbaecae34e8ac')
 
 build() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
diff --git a/testing/lua/PKGBUILD b/testing/lua/PKGBUILD
new file mode 100644
index 000000000..aff34d2e3
--- /dev/null
+++ b/testing/lua/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 155986 2012-04-10 19:56:22Z bluewind $
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+
+pkgname=lua 
+pkgver=5.1.5
+pkgrel=2
+pkgdesc="A powerful light-weight programming language designed for extending applications" 
+arch=('i686' 'x86_64')
+url="http://www.lua.org/"
+depends=('readline')
+license=('MIT')
+options=('!makeflags' '!emptydirs')
+source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz
+        lua-arch.patch lua-5.1-cflags.diff)
+md5sums=('2e115fe26e435e33b0d5c022e4490567'
+         'fa25feb70ef9fec975b1c20da5098b3c'
+         '249582bf1fd861ccf492d2c35a9fe732')
+
+build() { 
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/lua-arch.patch"
+  patch -p1 -i "${srcdir}/lua-5.1-cflags.diff"
+  export CFLAGS="$CFLAGS -fPIC"
+
+  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" \
+    INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
+    linux
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.$pkgver" \
+    INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
+    install
+  install -D -m644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc"
+  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
+
+  # Install the documentation
+  install -d "${pkgdir}/usr/share/doc/lua"
+  install -m644 doc/*.{gif,png,css,html} "${pkgdir}/usr/share/doc/lua"
+}
diff --git a/testing/lua/lua-5.1-cflags.diff b/testing/lua/lua-5.1-cflags.diff
new file mode 100644
index 000000000..db658aeca
--- /dev/null
+++ b/testing/lua/lua-5.1-cflags.diff
@@ -0,0 +1,13 @@
+diff -Naur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile
+--- lua-5.1.orig/src/Makefile	2006-02-16 16:45:09.000000000 +0100
++++ lua-5.1/src/Makefile	2006-03-01 14:55:29.000000000 +0100
+@@ -8,7 +8,8 @@
+ PLAT= none
+ 
+ CC= gcc
+-CFLAGS= -O2 -Wall $(MYCFLAGS)
++CFLAGS ?= -O2 -Wall
++CFLAGS += $(MYCFLAGS)
+ AR= ar rcu
+ RANLIB= ranlib
+ RM= rm -f
diff --git a/testing/lua/lua-arch.patch b/testing/lua/lua-arch.patch
new file mode 100644
index 000000000..d8650c3a2
--- /dev/null
+++ b/testing/lua/lua-arch.patch
@@ -0,0 +1,66 @@
+diff -ur lua-5.1.4/etc/lua.pc lua-5.1.4-new/etc/lua.pc
+--- lua-5.1.4/etc/lua.pc	2008-08-08 14:46:11.000000000 +0200
++++ lua-5.1.4-new/etc/lua.pc	2012-02-23 18:25:34.000000000 +0100
+@@ -8,6 +8,6 @@
+ 
+ # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
+-prefix= /usr/local
++prefix= /usr
+ INSTALL_BIN= ${prefix}/bin
+ INSTALL_INC= ${prefix}/include
+ INSTALL_LIB= ${prefix}/lib
+diff -ur lua-5.1.4/src/luaconf.h lua-5.1.4-new/src/luaconf.h
+--- lua-5.1.4/src/luaconf.h	2008-02-11 17:25:08.000000000 +0100
++++ lua-5.1.4-new/src/luaconf.h	2012-02-23 18:25:34.000000000 +0100
+@@ -94,7 +94,7 @@
+ 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+ 
+ #else
+-#define LUA_ROOT	"/usr/local/"
++#define LUA_ROOT	"/usr/"
+ #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
+ #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
+ #define LUA_PATH_DEFAULT  \
+diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile
+--- lua-5.1.4/src/Makefile	2008-01-19 20:37:58.000000000 +0100
++++ lua-5.1.4-new/src/Makefile	2012-02-23 18:26:43.000000000 +0100
+@@ -23,6 +23,7 @@
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+ 
+ LUA_A=	liblua.a
++LUA_SO=	liblua.so
+ CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
+ 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
+ 	lundump.o lvm.o lzio.o
+@@ -36,7 +37,7 @@
+ LUAC_O=	luac.o print.o
+ 
+ ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
+ ALL_A= $(LUA_A)
+ 
+ default: $(PLAT)
+@@ -51,6 +52,11 @@
+ 	$(AR) $@ $?
+ 	$(RANLIB) $@
+ 
++$(LUA_SO): $(CORE_O) $(LIB_O)
++	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO)
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 
+--- lua-5.1.4/Makefile	2008-08-12 02:40:48.000000000 +0200
++++ lua-5.1.4-new/Makefile	2012-02-23 19:06:32.000000000 +0100
+@@ -53,7 +53,7 @@
+ all:	$(PLAT)
+ 
+ $(PLATS) clean:
+-	cd src && $(MAKE) $@
++	cd src && $(MAKE) $@ V=$(V) R=$(R)
+ 
+ test:	dummy
+ 	src/lua test/hello.lua