Merge branch 'master' of gitpar:abslibre-mips64el

author: Joshua Ismael Haase Hernández <hahj87@gmail.com> 2011-08-16 09:15:21 -0500
committer: Joshua Ismael Haase Hernández <hahj87@gmail.com> 2011-08-16 09:15:21 -0500
commit: 62225296a3577815866985bce97b1173a236df0c (patch)
tree: 600925f71231cb677773e15f08b86b37eac245bf
parent: 1ef7f9b567946775e54dfe3b06258d53cdc889f5 (diff)
parent: 3de3a024e4363dffac1dd89c5d8ad6ecdeb6794e (diff)
308 files changed, 7666 insertions, 2180 deletions
diff --git a/community-staging/openscenegraph/PKGBUILD b/community-staging/openscenegraph/PKGBUILD
deleted file mode 100644
index 23024aec9..000000000
--- a/community-staging/openscenegraph/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 50969 2011-07-03 18:11:27Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Hans Janssen <janserv@gmail.com>
-# Contributor: my64 <packages@obordes.com>
-# Contributor: Colin Pitrat <colin.pitrat@gmail.com>
-
-pkgname=openscenegraph
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="An Open Source, high performance real-time graphics toolkit"
-arch=('i686' 'x86_64' 'mips64el')
-license=('custom:OSGPL')
-url="http://www.openscenegraph.org"
-depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth')
-makedepends=('cmake' 'libvncserver')
-optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib')
-conflicts=('openthreads')
-provides=('openthreads')
-#source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip)
-source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip")
-md5sums=('121829b854349a9e9d1aebc25cf3e52d')
-
-build() {
-  cd OpenSceneGraph-$pkgver
-  [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
-  sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp
-  make
-}
-
-package() {
-  cd OpenSceneGraph-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true
-}
diff --git a/community-staging/qwtpolar-svn/PKGBUILD b/community-staging/qwtpolar-svn/PKGBUILD
deleted file mode 100644
index 6fb7c7265..000000000
--- a/community-staging/qwtpolar-svn/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Kévin Guilloy <kevin at guilloy dot ath dot cx>
-
-pkgname=qwtpolar-svn
-pkgver=122
-pkgrel=1
-pkgdesc='An extension of the Qwt library to support polar plots.'
-arch=('i686' 'x86_64' 'mips64el')
-url="http://qwtpolar.sourceforge.net/"
-license=('Qwt License, Version 1.0')
-depends=('qwt')
-conflicts=('qwtpolar')
-makedepends=('subversion')
-
-_svntrunk='https://qwtpolar.svn.sourceforge.net/svnroot/qwtpolar/trunk/qwtpolar'
-_svnmod='qwtpolar'
-
-build() {
-  svn co ${_svntrunk} ${_svnmod}
-
-  msg 'SVN checkout or server timeout'
-  msg 'Building sofware...'
-
-  cd qwtpolar/
-  sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/doc/\/usr\/share\/doc\/qwt\//' qwtpolarconfig.pri
-  sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/include/\/usr\/include\/qwt\//' qwtpolarconfig.pri
-  sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/lib/\/usr\/lib\//' qwtpolarconfig.pri
-  sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/features/\/usr\/share\/qwt\/features\//' qwtpolarconfig.pri
-  sed -i -e 's/^.*QwtPolarDesigner//' qwtpolarconfig.pri
-  sed -i -e 's/^.*QwtPolarExamples//' qwtpolarconfig.pri
-  echo "INCLUDEPATH += /usr/include/qwt" >> qwtpolarbuild.pri
-
-  qmake
-
-  make
-}
-
-package() {
-  cd qwtpolar
-
-  make INSTALL_ROOT=${pkgdir} install
-
-  install -d ${pkgdir}/usr/share/licenses/qwtpolar-svn
-  install -m644 COPYING \
-    ${pkgdir}/usr/share/licenses/qwtpolar-svn
-}
diff --git a/community-staging/aria2/PKGBUILD b/community-testing/aria2/PKGBUILD
index c2317ad5e..19a015c8a 100644
--- a/community-staging/aria2/PKGBUILD
+++ b/community-testing/aria2/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=aria2
 pkgver=1.12.1
 pkgrel=2
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url='http://aria2.sourceforge.net/'
 license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates')
diff --git a/community-staging/ekg2/PKGBUILD b/community-testing/ekg2/PKGBUILD
index ec55c1dc3..403ec002d 100644
--- a/community-staging/ekg2/PKGBUILD
+++ b/community-testing/ekg2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ekg2
 pkgver=0.3.1
 pkgrel=1
 pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://ekg2.org/"
 license=('GPL')
 depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib' 'gpgme')
diff --git a/community-staging/filezilla/PKGBUILD b/community-testing/filezilla/PKGBUILD
index 3c4381398..73cb4f030 100644
--- a/community-staging/filezilla/PKGBUILD
+++ b/community-testing/filezilla/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=filezilla
 pkgver=3.5.0
 pkgrel=2
 pkgdesc="Fast and reliable FTP, FTPS and SFTP client"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://filezilla-project.org/"
 license=('GPL')
 depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite3')
diff --git a/community-staging/filezilla/filezilla.install b/community-testing/filezilla/filezilla.install
index 1a05f573e..1a05f573e 100644
--- a/community-staging/filezilla/filezilla.install
+++ b/community-testing/filezilla/filezilla.install
diff --git a/community-staging/freerdp/PKGBUILD b/community-testing/freerdp/PKGBUILD
index bbfc84448..799008275 100644
--- a/community-staging/freerdp/PKGBUILD
+++ b/community-testing/freerdp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freerdp
 pkgver=0.8.2
 pkgrel=3
 pkgdesc="Free RDP client"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://freerdp.sourceforge.net"
 license=('GPL')
 depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib')
diff --git a/community-staging/freerdp/freerdp.changelog b/community-testing/freerdp/freerdp.changelog
index d47f165c3..d47f165c3 100644
--- a/community-staging/freerdp/freerdp.changelog
+++ b/community-testing/freerdp/freerdp.changelog
diff --git a/community-staging/gloox/PKGBUILD b/community-testing/gloox/PKGBUILD
index afd927984..bd6adf0e1 100644
--- a/community-staging/gloox/PKGBUILD
+++ b/community-testing/gloox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gloox
 pkgver=1.0
 pkgrel=2
 pkgdesc="C++ libraries for development of Jabber client/component/server"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://camaya.net/gloox"
 options=('!libtool')
 license=("GPL")
diff --git a/community-staging/gnustep-base/ChangeLog b/community-testing/gnustep-base/ChangeLog
index 590f23f5e..590f23f5e 100644
--- a/community-staging/gnustep-base/ChangeLog
+++ b/community-testing/gnustep-base/ChangeLog
diff --git a/community-staging/gnustep-base/PKGBUILD b/community-testing/gnustep-base/PKGBUILD
index 28bf82f0a..d13e1f326 100644
--- a/community-staging/gnustep-base/PKGBUILD
+++ b/community-testing/gnustep-base/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnustep-base
 pkgver=1.22.0
 pkgrel=3
 pkgdesc="The GNUstep base package"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.gnustep.org/"
 license=("GPL" "LGPL")
 depends=(libxslt avahi gmp gcc-libs openssl libffi gnustep-make gnutls)
diff --git a/community-staging/gsasl/PKGBUILD b/community-testing/gsasl/PKGBUILD
index 9fb0f9d70..735a57862 100644
--- a/community-staging/gsasl/PKGBUILD
+++ b/community-testing/gsasl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gsasl
 pkgver=1.6.1
 pkgrel=3
 pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms"
-arch=("i686" "x86_64" 'mips64el')
+arch=("i686" "x86_64")
 url="http://josefsson.org/gsasl/"
 license=("GPL")
 depends=('gnutls' 'libidn' 'krb5' 'libgcrypt')
diff --git a/community-staging/gtk-gnutella/PKGBUILD b/community-testing/gtk-gnutella/PKGBUILD
index b20139b23..1eb8c2b0f 100644
--- a/community-staging/gtk-gnutella/PKGBUILD
+++ b/community-testing/gtk-gnutella/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gtk-gnutella
 pkgver=0.97
 pkgrel=2
 pkgdesc="A Gnutella client written in C"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://gtk-gnutella.sourceforge.net/"
 license=('GPL')
 depends=('gtk2')
diff --git a/community-staging/gwenhywfar/PKGBUILD b/community-testing/gwenhywfar/PKGBUILD
index e02df72d8..1512a7eb1 100644
--- a/community-staging/gwenhywfar/PKGBUILD
+++ b/community-testing/gwenhywfar/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gwenhywfar
 pkgver=4.2.0
 pkgrel=2
 pkgdesc="OS abstraction functions for various projects"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://www.aquamaniac.de"
 options=('!libtool')
 license=("LGPL")
diff --git a/community-staging/ifuse/PKGBUILD b/community-testing/ifuse/PKGBUILD
index 5d49eabee..e85372405 100644
--- a/community-staging/ifuse/PKGBUILD
+++ b/community-testing/ifuse/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.1.1
 pkgrel=4
 pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch'
 url='http://libimobiledevice.org/'
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('LGPL2.1')
 depends=('libimobiledevice' 'fuse')
 source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2")
diff --git a/community-staging/jabberd14/PKGBUILD b/community-testing/jabberd14/PKGBUILD
index dccfba3cf..fccef817a 100644
--- a/community-staging/jabberd14/PKGBUILD
+++ b/community-testing/jabberd14/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=jabberd14
 pkgver=1.6.1.1
 pkgrel=10
 pkgdesc="old (1.4) jabber server branch"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://jabberd.org/"
 license=("GPL")
 depends=(pth libidn expat popt gnutls)
diff --git a/community-staging/jabberd14/build-fix.patch b/community-testing/jabberd14/build-fix.patch
index 4f39b523e..4f39b523e 100644
--- a/community-staging/jabberd14/build-fix.patch
+++ b/community-testing/jabberd14/build-fix.patch
diff --git a/community-staging/jabberd14/jabberd b/community-testing/jabberd14/jabberd
index afbe6ef69..afbe6ef69 100644
--- a/community-staging/jabberd14/jabberd
+++ b/community-testing/jabberd14/jabberd
diff --git a/community-staging/libinfinity/PKGBUILD b/community-testing/libinfinity/PKGBUILD
index 48059c609..6f6e5f123 100644
--- a/community-staging/libinfinity/PKGBUILD
+++ b/community-testing/libinfinity/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libinfinity
 pkgver=0.5.1
 pkgrel=2
 pkgdesc="An implementation of the Infininote protocol written in GObject-based C"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://gobby.0x539.de"
 license=('GPL')
 depends=('gnutls>=1.7.2' 'gsasl>=0.2.21' 'glib2>=2.16' 'libxml2>=2.0' 'gtk2')
diff --git a/community-staging/libmicrohttpd/PKGBUILD b/community-testing/libmicrohttpd/PKGBUILD
index e27df4838..357863f07 100644
--- a/community-staging/libmicrohttpd/PKGBUILD
+++ b/community-testing/libmicrohttpd/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=libmicrohttpd
 pkgver=0.9.12
 pkgrel=2
 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libmicrohttpd/"
 license=('LGPL')
 options=('!libtool')
diff --git a/community-staging/libmicrohttpd/libmicrohttpd.install b/community-testing/libmicrohttpd/libmicrohttpd.install
index dc0d2b996..dc0d2b996 100644
--- a/community-staging/libmicrohttpd/libmicrohttpd.install
+++ b/community-testing/libmicrohttpd/libmicrohttpd.install
diff --git a/community-staging/libvirt/PKGBUILD b/community-testing/libvirt/PKGBUILD
index 389a20958..87c98529a 100644
--- a/community-staging/libvirt/PKGBUILD
+++ b/community-testing/libvirt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libvirt
 pkgver=0.9.4
 pkgrel=2
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://libvirt.org/"
 license=('LGPL')
 depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2'
diff --git a/community-staging/libvirt/libvirt.install b/community-testing/libvirt/libvirt.install
index 3881386d2..3881386d2 100644
--- a/community-staging/libvirt/libvirt.install
+++ b/community-testing/libvirt/libvirt.install
diff --git a/community-staging/libvirt/libvirtd.conf.d b/community-testing/libvirt/libvirtd.conf.d
index d4d25b47a..d4d25b47a 100644
--- a/community-staging/libvirt/libvirtd.conf.d
+++ b/community-testing/libvirt/libvirtd.conf.d
diff --git a/community-staging/libvirt/libvirtd.rc.d b/community-testing/libvirt/libvirtd.rc.d
index 193bffa9c..193bffa9c 100755
--- a/community-staging/libvirt/libvirtd.rc.d
+++ b/community-testing/libvirt/libvirtd.rc.d
diff --git a/community-staging/libvirt/openbsd-netcat-default.patch b/community-testing/libvirt/openbsd-netcat-default.patch
index c7543c5a4..c7543c5a4 100644
--- a/community-staging/libvirt/openbsd-netcat-default.patch
+++ b/community-testing/libvirt/openbsd-netcat-default.patch
diff --git a/community-staging/libvirt/unixperms.patch b/community-testing/libvirt/unixperms.patch
index b3fb86cf5..b3fb86cf5 100644
--- a/community-staging/libvirt/unixperms.patch
+++ b/community-testing/libvirt/unixperms.patch
diff --git a/community-staging/libvirt/yajl-2.x.patch b/community-testing/libvirt/yajl-2.x.patch
index 80d3edce0..80d3edce0 100644
--- a/community-staging/libvirt/yajl-2.x.patch
+++ b/community-testing/libvirt/yajl-2.x.patch
diff --git a/community-staging/mailutils/PKGBUILD b/community-testing/mailutils/PKGBUILD
index e1e8af3a9..521f58a01 100644
--- a/community-staging/mailutils/PKGBUILD
+++ b/community-testing/mailutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mailutils
 pkgver=2.2
 pkgrel=3
 pkgdesc="MUA command line tool (mailx)"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://www.gnu.org/software/mailutils/"
 license=('GPL')
 depends=('libldap' 'pam' 'gnutls' 'guile')
diff --git a/community-staging/mailutils/mailutils.install b/community-testing/mailutils/mailutils.install
index 03b451b3e..03b451b3e 100644
--- a/community-staging/mailutils/mailutils.install
+++ b/community-testing/mailutils/mailutils.install
diff --git a/community-staging/minbif/PKGBUILD b/community-testing/minbif/PKGBUILD
index e3326d320..663b6d65a 100644
--- a/community-staging/minbif/PKGBUILD
+++ b/community-testing/minbif/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=minbif
 pkgver=1.0.4
 pkgrel=4
 pkgdesc='An IRC gateway to IM networks that uses libpurple.'
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url='http://minbif.im/'
 license=('GPL2')
 depends=('gnutls' 'libcaca' 'libpurple')
diff --git a/community-staging/minbif/minbif b/community-testing/minbif/minbif
index 47888d169..47888d169 100644
--- a/community-staging/minbif/minbif
+++ b/community-testing/minbif/minbif
diff --git a/community-staging/minbif/minbif.install b/community-testing/minbif/minbif.install
index 264763407..264763407 100644
--- a/community-staging/minbif/minbif.install
+++ b/community-testing/minbif/minbif.install
diff --git a/community-staging/net6/PKGBUILD b/community-testing/net6/PKGBUILD
index fbf2a9dd1..1d5a6e025 100644
--- a/community-staging/net6/PKGBUILD
+++ b/community-testing/net6/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=net6
 pkgver=1.3.12
 pkgrel=2
 pkgdesc="A library that provides a TCP protocol abstraction for C++"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://gobby.0x539.de/"
 license=('LGPL')
 depends=('gnutls' 'libsigc++2.0')
diff --git a/community-staging/net6/build-fix.patch b/community-testing/net6/build-fix.patch
index 7e932bce6..7e932bce6 100644
--- a/community-staging/net6/build-fix.patch
+++ b/community-testing/net6/build-fix.patch
diff --git a/community-staging/nzbget/ChangeLog b/community-testing/nzbget/ChangeLog
index 74030cd3d..74030cd3d 100644
--- a/community-staging/nzbget/ChangeLog
+++ b/community-testing/nzbget/ChangeLog
diff --git a/community-staging/nzbget/PKGBUILD b/community-testing/nzbget/PKGBUILD
index 3ede32b27..278e38ac8 100644
--- a/community-staging/nzbget/PKGBUILD
+++ b/community-testing/nzbget/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=nzbget
 pkgver=0.7.0
 pkgrel=3
 pkgdesc="Downloads from Usenet using .nzb files"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://nzbget.sourceforge.net/"
 license=('GPL')
 depends=('gnutls' 'libpar2' 'libxml2' 'ncurses')
diff --git a/community-staging/remmina-plugins/PKGBUILD b/community-testing/remmina-plugins/PKGBUILD
index eea5258fa..9e4534e2f 100644
--- a/community-staging/remmina-plugins/PKGBUILD
+++ b/community-testing/remmina-plugins/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="Remina plugins"
 #"Remmina supports multiple network protocols in an integrated and consistant user interface.
 # Currently RDP, VNC, XDMCP and SSH are supported."
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://sourceforge.net/projects/remmina/"
 license=('GPL')
 conflicts=(remmina-plugins-svn)
diff --git a/community-staging/remmina-plugins/remmina-plugins.install b/community-testing/remmina-plugins/remmina-plugins.install
index 1a05f573e..1a05f573e 100644
--- a/community-staging/remmina-plugins/remmina-plugins.install
+++ b/community-testing/remmina-plugins/remmina-plugins.install
diff --git a/community-staging/rsyslog/PKGBUILD b/community-testing/rsyslog/PKGBUILD
index a156ec4fb..14d38eb88 100644
--- a/community-staging/rsyslog/PKGBUILD
+++ b/community-testing/rsyslog/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=5.8.4
 pkgrel=2
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('zlib')
 makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls')
diff --git a/community-staging/rsyslog/rsyslog b/community-testing/rsyslog/rsyslog
index ee0145418..ee0145418 100755
--- a/community-staging/rsyslog/rsyslog
+++ b/community-testing/rsyslog/rsyslog
diff --git a/community-staging/rsyslog/rsyslog.conf.d b/community-testing/rsyslog/rsyslog.conf.d
index e39f8c3b9..e39f8c3b9 100644
--- a/community-staging/rsyslog/rsyslog.conf.d
+++ b/community-testing/rsyslog/rsyslog.conf.d
diff --git a/community-staging/rsyslog/rsyslog.logrotate b/community-testing/rsyslog/rsyslog.logrotate
index 76306c560..76306c560 100644
--- a/community-staging/rsyslog/rsyslog.logrotate
+++ b/community-testing/rsyslog/rsyslog.logrotate
diff --git a/community-staging/smalltalk/PKGBUILD b/community-testing/smalltalk/PKGBUILD
index b275cf3f6..1be6f7500 100644
--- a/community-staging/smalltalk/PKGBUILD
+++ b/community-testing/smalltalk/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc='A free implementation of Smalltalk-80 by the GNU project'
 url='http://smalltalk.gnu.org/'
 license=('GPL' 'LGPL')
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 options=('!libtool')
 
 depends=('gmp' 'libffi' 'libsigsegv' 'readline')
diff --git a/community/acpitool/PKGBUILD b/community/acpitool/PKGBUILD
index 35ba084ca..95c0534e9 100644
--- a/community/acpitool/PKGBUILD
+++ b/community/acpitool/PKGBUILD
@@ -1,28 +1,29 @@
-# $Id: PKGBUILD 24573 2010-08-26 12:50:31Z lcarlier $
+# $Id: PKGBUILD 54004 2011-08-11 17:55:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 # Contributor: Milosz Piglas <archeofuture@gmail.com>
 
 pkgname=acpitool
 pkgver=0.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc="ACPI client - replacement for apm tool"
 url="http://sourceforge.net/projects/acpitool/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2)
 depends=('gcc-libs')
-md5sums=('9e4ec55201be0be71ffbc56d38b42b57')
+source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2
+	linux-3.0.patch)
+md5sums=('9e4ec55201be0be71ffbc56d38b42b57'
+         'eb149edb32be6cdf20a7d16beb3e9f70')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
+  patch -p1 <$srcdir/linux-3.0.patch
   ./configure --prefix=/usr
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
   make prefix="$pkgdir/usr" install
 }
diff --git a/community/acpitool/linux-3.0.patch b/community/acpitool/linux-3.0.patch
new file mode 100644
index 000000000..ba454a0c2
--- /dev/null
+++ b/community/acpitool/linux-3.0.patch
@@ -0,0 +1,18 @@
+diff -wbBur acpitool-0.5.1/src/acpitool.cpp acpitool-0.5.1.my/src/acpitool.cpp
+--- acpitool-0.5.1/src/acpitool.cpp	2009-08-13 23:37:48.000000000 +0400
++++ acpitool-0.5.1.my/src/acpitool.cpp	2011-08-11 21:53:17.000000000 +0400
+@@ -205,8 +205,12 @@
+ 	Kernel_24 = 1;           
+ 	Kernel_26 = 0;
+     }
+-        
+-    if(strncmp(str,"2.6",3)==0)
++    else if(strncmp(str,"2.6",3)==0)
++    {
++	Kernel_24 = 0;
++	Kernel_26 = 1;
++    }
++    else
+     {
+ 	Kernel_24 = 0;           
+ 	Kernel_26 = 1;
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index a275d84a4..d3266773c 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 53589 2011-08-06 08:10:57Z giovanni $
+# $Id: PKGBUILD 54056 2011-08-12 21:56:43Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.13
+pkgver=0.8.14
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug')
 install=calibre.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         desktop_integration.patch)
-md5sums=('5612e030dce1cd5e46762d0dcaed00b0'
+md5sums=('61e41474f9104ea8513bd21e8754b7be'
          '253ce4fe5d01f8ff76b63cd3825755ea')
 
 build() {
diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD
index 9e0b345b7..acc641245 100644
--- a/community/cclive/PKGBUILD
+++ b/community/cclive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 52534 2011-07-26 04:19:55Z svenstaro $
+# $Id: PKGBUILD 54180 2011-08-14 12:19:01Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 # Contributor: nathan owe ndowens04 at gmail dot com
 
 pkgname=cclive
-pkgver=0.7.4.1
-pkgrel=2
+pkgver=0.7.5
+pkgrel=1
 pkgdesc='Commandline downloader for popular video websites.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://cclive.sourceforge.net/'
@@ -13,7 +13,7 @@ license=('GPL3')
 depends=('boost-libs' 'quvi')
 makedepends=('boost')
 source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz")
-md5sums=('5416049225c45c20e4ebe9a6e90a5a58')
+md5sums=('7d727db64bcf490b7ecd192ec0f6a7fa')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/community/conkeror-git/PKGBUILD b/community/conkeror-git/PKGBUILD
index 6aa7f0460..29458c3c1 100644
--- a/community/conkeror-git/PKGBUILD
+++ b/community/conkeror-git/PKGBUILD
@@ -1,10 +1,10 @@
 # Contributor: Heeru Kiyura <M8R-p9i5nh@mailinator.com>
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
-_commit=5b74557e78bb16af6dabf72e9499e02ece5ae2be
+_commit=8b8d97035432f02e16f26334a47ca340b47d81fd
 pkgname=conkeror-git
 pkgver=0.9.3
-pkgrel=8
+pkgrel=9
 pkgdesc="A highly programmable web browser based on Mozilla XULRunner."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://conkeror.mozdev.org/"
diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD
deleted file mode 100644
index 7a31249d5..000000000
--- a/community/desmume/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 38953 2011-02-03 21:59:54Z bfanella $
-# Maintainer: Jonathan Conder <jonno dot conder at gmail dot com>
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Nathan Jones <nathanj@insightbb.com>
-# Contributor: Javier "Phrodo_00" Aravena <phrodo.00 at gmail dot com>
-# Contributor: angvp <angvp at archlinux dot us>
-# Contributor: Allan <mcrae_allan at hotmail dot com>
-# Contributor: w0rm <w0rmtux at gmail dot com>
-# Contributor: vEX <vex at niechift dot com>
-# Contributor: Asher256 <achrafcherti at gmail dot com>
-
-pkgname=desmume
-pkgver=0.9.7
-pkgrel=3
-pkgdesc="Nintendo DS emulator"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://desmume.org/"
-license=('GPL')
-depends=('agg' 'gtkglext' 'intltool' 'libgl' 'libglade' 'mesa')
-replaces=('desmume-core' 'desmume-cli' 'desmume-gtk' 'desmume-glade')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-sha256sums=('0a0f7ef3cc76ff0bbc6f3df47c3689653617074ea7ffc354e9fa1240c5336523')
-
-build() {
-  	cd "$srcdir/$pkgname-$pkgver"
-  	./configure --prefix=/usr --enable-wifi
-	make
-}
-
-package() {
-  	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir/" install
-}
diff --git a/community/dopewars/PKGBUILD b/community/dopewars/PKGBUILD
index 4433977cc..4116a23d3 100644
--- a/community/dopewars/PKGBUILD
+++ b/community/dopewars/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 51778 2011-07-14 18:25:43Z schuay $
+# $Id: PKGBUILD 54061 2011-08-13 02:36:39Z ebelanger $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
@@ -6,41 +6,42 @@
 
 pkgname=dopewars
 pkgver=1.5.12
-pkgrel=5
+pkgrel=6
 pkgdesc="A drug dealing game set in New York"
 url="http://dopewars.sourceforge.net/"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('gtk2' 'alsa-lib' 'audiofile' 'esd' 'sdl_mixer' 'ncurses')
+depends=('gtk2' 'alsa-lib' 'audiofile' 'sdl_mixer' 'ncurses')
 install='dopewars.install'
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('debf749de9053dc2fb2e74c37ae06206')
 
 build() {
-    cd $srcdir/$pkgname-$pkgver
+    cd "$srcdir/$pkgname-$pkgver"
 
     ./configure --prefix=/usr --localstatedir=/var/games \
         --mandir=/usr/share/man
     make
 }
+
 package() {
-    cd $srcdir/$pkgname-$pkgver
+    cd "$srcdir/$pkgname-$pkgver"
 
-    make DESTDIR=$pkgdir install
+    make DESTDIR="$pkgdir" install
 
     # setup shortcut menu entries
-    mkdir -p $pkgdir/usr/share/applications
-    mv $pkgdir/usr/share/gnome/apps/Games/dopewars.desktop \
-       $pkgdir/usr/share/applications
-    rm -r $pkgdir/usr/share/gnome
+    mkdir -p "$pkgdir/usr/share/applications"
+    mv "$pkgdir/usr/share/gnome/apps/Games/dopewars.desktop" \
+       "$pkgdir/usr/share/applications"
+    rm -r "$pkgdir/usr/share/gnome"
 
     # set appropriate permissions and destinations
-    chown root:games $pkgdir/usr/bin/dopewars
-    chmod 2755 $pkgdir/usr/bin/dopewars
-    chown root:games $pkgdir/var/games
-    chmod 775 $pkgdir/var/games
+    chown root:games "$pkgdir/usr/bin/dopewars"
+    chmod 2755 "$pkgdir/usr/bin/dopewars"
+    chown root:games "$pkgdir/var/games"
+    chmod 775 "$pkgdir/var/games"
 
     # Handle the scores file creation in the install script
-    rm $pkgdir/var/games/dopewars.sco
+    rm "$pkgdir/var/games/dopewars.sco"
 }
 
diff --git a/community/fceux/ChangeLog b/community/fceux/ChangeLog
deleted file mode 100644
index 93ba8b368..000000000
--- a/community/fceux/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-2009-11-06  Eric Belanger  <eric@archlinux.org>
-
-	* fceux 2.1.2-1
-	* Upstream update
-
-2009-08-05  Eric Belanger  <eric@archlinux.org>
-
-	* fceux 2.1.1-1
-	* gfceux 2.1.1-1
-	* Upstream update
-	* Implemented split packages
-
-2009-04-06  Eric Belanger  <eric@archlinux.org>
-
-	* fceux 2.1.0a-1
-	* Upstream update
-
-2009-03-06  Eric Belanger  <eric@archlinux.org>
-
-	* fceux 2.0.3-1
-	* Added to [community] repo to replace fceu
diff --git a/community/fceux/fceux.desktop b/community/fceux/fceux.desktop
deleted file mode 100644
index c166755e8..000000000
--- a/community/fceux/fceux.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Fceux
-GenericName=NES/Famicom emulator
-Exec=fceux
-Icon=/usr/share/pixmaps/fceux.png
-Type=Application
-Categories=Game;Emulator;
-Encoding=UTF-8
-
-
diff --git a/community/fceux/fceux.png b/community/fceux/fceux.png
deleted file mode 100644
index 1cf27b1fd..000000000
--- a/community/fceux/fceux.png
+++ /dev/null
diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD
index bfdb31285..54909e46e 100644
--- a/community/flightgear/PKGBUILD
+++ b/community/flightgear/PKGBUILD
@@ -1,30 +1,32 @@
-# $Id: PKGBUILD 50330 2011-06-28 12:02:03Z spupykin $
+# $Id: PKGBUILD 54030 2011-08-11 23:28:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 # Contributor: Hans Janssen <hans@janserv.xs4all.nl>
 
 pkgname=flightgear
-pkgver=2.0.0
-pkgrel=3
+pkgver=2.4.0
+pkgrel=1
 pkgdesc="An open-source, multi-platform flight simulator"
-arch=(i686 x86_64 'mips64el')
-depends=('simgear' 'libxmu' 'libxi' 'zlib' 'flightgear-data' 'openscenegraph' 'subversion')
+arch=(i686 x86_64 mips64el)
+depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion') # 'flightgear-data')
 makedepends=('boost')
 license=("GPL")
 url="http://www.flightgear.org"
 options=('!makeflags')
-#source=(ftp://ftp.ibiblio.org/pub/mirrors/flightgear/ftp/Source/FlightGear-$pkgver.tar.gz)
-source=(http://ftp.linux.kiev.ua/pub/fgfs/Source/FlightGear-$pkgver.tar.gz)
-md5sums=('549aa45171480082f5b6e5e8d5ce8930')
+source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver")
+md5sums=('eb8d1ed8b1de5f1ac7926c9d0c2f37f8')
 
 build() {
-  cd $startdir/src/FlightGear-$pkgver
-  [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <stdio.h>' {} \;
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr
+  cd $srcdir/fg-flightgear
+#  [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <stdio.h>' {} \;
+#  [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <GL/glu.h>' {} \;
+  [ -x configure ] || ./autogen.sh
+  [ -f Makefile ] || ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $startdir/src/FlightGear-$pkgver
-  make DESTDIR=$startdir/pkg install
+  depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'flightgear-data')
+  cd $srcdir/fg-flightgear
+  make DESTDIR=$pkgdir install
 }
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index b91ae57da..bb70c97e7 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 53990 2011-08-11 07:04:13Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 
 pkgbase=gambas3
@@ -11,8 +12,8 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
          'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
          'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
-pkgver=2.99.1
-pkgrel=4
+pkgver=2.99.2
+pkgrel=1
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gambas.sourceforge.net/"
@@ -21,12 +22,12 @@ groups=('gambas3')
 makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
          'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2'
          'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
-         'curl' 'poppler' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre'
+         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre'
          'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring')
 options=('!emptydirs' '!makeflags')
 source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
         'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('ab4c182b9d7dfec06b3a42bb002a779a'
+md5sums=('247a13e28972985766855a6bc4d6d368'
          'b284be39d147ec799f1116a6abc068b4'
          'a8ec8e5a6aba7a7e453ce7a35c1800a9')
 
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD
index ed9b26701..e0c68877d 100644
--- a/community/gmerlin/PKGBUILD
+++ b/community/gmerlin/PKGBUILD
@@ -1,24 +1,36 @@
-# $Id: PKGBUILD 43364 2011-03-25 11:11:43Z mherych $
+# $Id: PKGBUILD 54036 2011-08-12 13:08:25Z lfleischer $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=gmerlin
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Multimedia architecture for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openmovieeditor.sourceforge.net/HomePage"
 license=('GPL')
 depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'mesa' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools')
-optdepends=('esound')
+makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils')
+optdepends=('alsa-lib: for ALSA support'
+            'jack: for JACK support'
+            'libquicktime: for movie encoding'
+            'pulseaudio: for PulseAudio support'
+            'v4l-utils: for video conversion')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
 options=('!libtool')
 md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6')
+
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
+
   rm -rf cpuinfo.sh
-  ./configure --prefix=/usr \
-  	--without-doxygen
-  make || return 1
-  make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/usr/share/info/dir
+
+  ./configure --prefix=/usr --without-doxygen
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  rm -rf "$pkgdir/usr/share/info/dir"
 }
diff --git a/community/lash/PKGBUILD b/community/lash/PKGBUILD
new file mode 100644
index 000000000..70985c530
--- /dev/null
+++ b/community/lash/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: DonVla <donvla@users.sourceforge.net>
+
+pkgname=lash
+pkgver=0.6.0~rc2
+_relver=0.6.0.594
+pkgrel=5
+pkgdesc="A session management system for JACK and ALSA"
+arch=('i686' 'x86_64')
+options=('!libtool')
+url="http://lash-audio.org"
+license=('GPL')
+depends=('dbus-core' 'gtk2' 'jack' 'libxml2' 'python2')
+install=$pkgname.install
+source=("http://download.savannah.gnu.org/releases/lash/${pkgname}-${pkgver}.tar.bz2" "makefile.patch")
+md5sums=('af1dc4f4ceb284b1b0845de4f4c2fe47'
+         '24ceb7e3d008c25e1490102983165612')
+
+build() {
+  cd "${srcdir}/${pkgname}-${_relver}"
+  patch -p0 < "${srcdir}/makefile.patch"
+
+  # Python2 fixes
+  export PYTHON="python2"
+  sed -i "s#env python#&2#" clients/lash_control
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${_relver}"
+  make DESTDIR=${pkgdir} install
+}
diff --git a/community/lash/lash.install b/community/lash/lash.install
new file mode 100644
index 000000000..a169a2211
--- /dev/null
+++ b/community/lash/lash.install
@@ -0,0 +1,6 @@
+post_install() {
+  printf "\n"
+  printf "==> You might need to add following line to your /etc/services(without quotes):\n"
+  printf "==> \"lash	14541/tcp	# LASH client/server protocol\"\n"
+  printf "\n"
+}
diff --git a/community/lash/makefile.patch b/community/lash/makefile.patch
new file mode 100644
index 000000000..3d35a1d2d
--- /dev/null
+++ b/community/lash/makefile.patch
@@ -0,0 +1,14 @@
+--- docs/Makefile.in.orig	2008-11-09 22:45:28.000000000 +0100
++++ docs/Makefile.in	2011-07-23 17:12:26.000000000 +0200
+@@ -527,9 +527,9 @@
+ @HAVE_TEXI2HTML_TRUE@	  mkdir -lash-manual-html-split; \
+ @HAVE_TEXI2HTML_TRUE@	fi
+ @HAVE_TEXI2HTML_TRUE@	cd lash-manual-html-one-page && \
+-@HAVE_TEXI2HTML_TRUE@	  texi2html --number ../$(top_srcdir)/docs/lash-manual.texi
++@HAVE_TEXI2HTML_TRUE@	  texi2html --number-footnotes --number-sections ../$(top_srcdir)/docs/lash-manual.texi
+ @HAVE_TEXI2HTML_TRUE@	cd lash-manual-html-split && \
+-@HAVE_TEXI2HTML_TRUE@	  texi2html --number --split=chapter ../$(top_srcdir)/docs/lash-manual.texi
++@HAVE_TEXI2HTML_TRUE@	  texi2html --number-footnotes --number-sections --split=chapter ../$(top_srcdir)/docs/lash-manual.texi
+ @HAVE_TEXI2HTML_TRUE@	touch html-manual-stamp
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD
index 57e7f6553..557d2a242 100644
--- a/community/libmediainfo/PKGBUILD
+++ b/community/libmediainfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 50998 2011-07-04 11:41:36Z spupykin $
+# $Id: PKGBUILD 54192 2011-08-14 19:28:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  hydro <hydro@freenet.de>
 
 pkgname=libmediainfo
-pkgver=0.7.45
+pkgver=0.7.47
 pkgrel=1
 pkgdesc="shared library for mediainfo"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('libtool' 'automake' 'autoconf')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2
 	"libmediainfo-0.7.44-libmms.patch::http://www.calculate-linux.org/packages/media-libs/libmediainfo/files/libmediainfo-0.7.44-libmms.patch?format=raw")
-md5sums=('b2148a4da794bb1d0721cfa328d59aeb'
+md5sums=('d18e86a4b3e3e893e04bb3afd638fa97'
          '1bdae4d3006b72e3f07cb1a9fa124950')
 
 build() {
diff --git a/community/lua-zlib/PKGBUILD b/community/lua-zlib/PKGBUILD
index 3bd622bac..971baccb9 100644
--- a/community/lua-zlib/PKGBUILD
+++ b/community/lua-zlib/PKGBUILD
@@ -1,9 +1,11 @@
-# $Id: PKGBUILD 23493 2010-08-11 18:21:33Z lcarlier $
+# $Id: PKGBUILD 54197 2011-08-14 19:29:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=lua-zlib
-pkgver=0
-pkgrel=3
+pkgver=0.2
+pkgrel=1
+_gitver=8d07669
+_luaver=5.1
 url="http://github.com/brimworks/lua-zlib"
 pkgdesc='Simple streaming interface to zlib for Lua.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,22 +13,18 @@ license=('MIT')
 depends=('lua' 'zlib')
 makedepends=('cmake')
 conflicts=('lua-lzlib')
-source=("lua-zlib-$pkgver.tar.gz::http://github.com/brimworks/lua-zlib/tarball/version-0")
-md5sums=('c404284a796e2f9143629bfdcb1ba200')
+source=("lua-zlib-$pkgver.zip::https://github.com/brimworks/lua-zlib/zipball/v$pkgver")
+md5sums=('d7ca7d12b6e50e3ec4c2057f65ca87d1')
 
 build() {
-    cd $srcdir/brimworks-lua-zlib-da0549e
-
-    local _luaver=5.1
+    cd $srcdir/brimworks-lua-zlib-${_gitver}
     sed -i "s#share/lua/cmod#lib/lua/${_luaver}#" CMakeLists.txt
-
     cmake -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_INSTALL_PREFIX=/usr .
 }
 
 package() {
-    cd $srcdir/brimworks-lua-zlib-da0549e
-
-    make DESTDIR="$pkgdir" install || return 1
+    cd $srcdir/brimworks-lua-zlib-${_gitver}
+    make DESTDIR="$pkgdir" install
     install -D -m644 "README" "$pkgdir/usr/share/licenses/lua-zlib/README"
 }
diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD
index b204ddf3e..0b36db444 100644
--- a/community/mediainfo-gui/PKGBUILD
+++ b/community/mediainfo-gui/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 51008 2011-07-04 11:43:50Z spupykin $
+# $Id: PKGBUILD 54207 2011-08-14 19:31:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: hydro <hydro@freenet.de>
 
 pkgname=mediainfo-gui
-pkgver=0.7.45
+pkgver=0.7.47
 pkgrel=1
 pkgdesc="GUI for mediainfo"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('libmediainfo>=0.7.35' 'wxgtk')
 makedepends=('libtool' 'automake' 'autoconf')
 install=mediainfo-gui.install
 source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2)
-md5sums=('8b8287dcc6d9805a1ba5209d99727ffb')
+md5sums=('865b38a17f462edda89aa226418c968a')
 
 build() {
   cd $srcdir/MediaInfo/Project/GNU/GUI
diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD
index 25da7fb81..c1e5321df 100644
--- a/community/mediainfo/PKGBUILD
+++ b/community/mediainfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 51003 2011-07-04 11:42:54Z spupykin $
+# $Id: PKGBUILD 54202 2011-08-14 19:30:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: hydro <hydro@freenet.de>
 
 pkgname=mediainfo
-pkgver=0.7.45
+pkgver=0.7.47
 pkgrel=1
 pkgdesc="supplies technical and tag information about a video or audio file"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('libmediainfo>=0.7.35')
 makedepends=('libtool' 'automake' 'autoconf')
 source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2)
-md5sums=('8b8287dcc6d9805a1ba5209d99727ffb')
+md5sums=('865b38a17f462edda89aa226418c968a')
 
 build() {
   cd $srcdir/MediaInfo/Project/GNU/CLI
diff --git a/community/mednafen/ChangeLog b/community/mednafen/ChangeLog
deleted file mode 100644
index a3097076c..000000000
--- a/community/mednafen/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-2011-05-17 Angel Velasquez <angvp@archlinux.org>
-    * Updated to 0.8.D.3
-	* Removed fix_build patch
-	* Cleaned PKGBUILD
-	* Adding ChangeLog
-
diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD
deleted file mode 100755
index 5a9120418..000000000
--- a/community/mednafen/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
-# Contributor: kagan <juanynie@mi.madritel.es>
-pkgname=mednafen
-pkgver=0.8.D.3
-pkgrel=1
-pkgdesc="A command-line multi-system gaming emulator"
-url="http://mednafen.sourceforge.net/"
-license=(GPL)
-arch=('i686' 'x86_64' 'mips64el')
-depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib')
-makedepends=('pkgconfig' 'mesa')
-changelog=ChangeLog
-source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2)
-md5sums=('57d22805071becd81858b0c088a275e5')
-
-build() {
-  cd $srcdir/$pkgname
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname
-  make DESTDIR=$pkgdir install
-}
diff --git a/community/mupen64plus/PKGBUILD b/community/mupen64plus/PKGBUILD
deleted file mode 100644
index a2f86d0f8..000000000
--- a/community/mupen64plus/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 50291 2011-06-27 20:35:36Z jelle $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Zephyr
-
-pkgname=mupen64plus
-pkgver=1.99.4
-pkgrel=2
-pkgdesc='Nintendo64 Emulator'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://code.google.com/p/mupen64plus/'
-license=('GPL')
-depends=('mesa' 'libsamplerate' 'libpng' 'sdl' 'freetype2')
-source=("http://mupen64plus.googlecode.com/files/mupen64plus-bundle-src-${pkgver}.tar.gz")
-md5sums=('81c4f11c341d7ea4dbd81cf2f0467dc2')
-
-build() {
-  cd mupen64plus-bundle-src-${pkgver}
-
-  sh m64p_build.sh
-}
-
-package() {
-  cd mupen64plus-bundle-src-$pkgver
-  
-  # set LDCONFIG since we are using fakeroot and scripts run root commands by checking the uid
-  ./m64p_install.sh DESTDIR="$pkgdir" PREFIX='/usr' MANDIR='/usr/share/man/man6' LDCONFIG='true'
-}
-
-# vim: ts=2:sw=2:et
diff --git a/community/musca/PKGBUILD b/community/musca/PKGBUILD
deleted file mode 100644
index 004a08a37..000000000
--- a/community/musca/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 31936 2010-11-08 00:00:11Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Murtuza Akhtari <inxsible at gmail dot com>
-
-pkgname=musca
-pkgver=0.9.24
-pkgrel=1
-pkgdesc='A simple X11 dynamic window manager with features nicked from ratpoison and dwm.'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://aerosuidae.net/musca/'
-license=('GPL3')
-depends=('libx11' 'dmenu')
-source=("http://aerosuidae.net/${pkgname}-${pkgver}.tgz")
-md5sums=('e067a8e39b1a97d62fc8e43800edee70')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 "${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1"
-}
diff --git a/community/nestopia/ChangeLog b/community/nestopia/ChangeLog
deleted file mode 100644
index 5077d00b2..000000000
--- a/community/nestopia/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-2008-12-16  Tiago Pierezan Camargo  <tcamargo@gmail.com>
-
-	* PKGBUILD: Minor corrections.
-
-2008-12-04  Tiago Pierezan Camargo  <tcamargo@gmail.com>
-
-	* PKGBUILD (source): Package adopted.
-	Variable/version cleanup.
-	Patch to remove bogus error messages on program exit.
-	New dependency: mesa.
-	Renamed executable to nestopia.
-
diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD
deleted file mode 100644
index 743bf5a4e..000000000
--- a/community/nestopia/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 53185 2011-07-31 19:02:49Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com>
-# Contributor: robb_force <robb_force@holybuffalo.net>
-
-pkgname=nestopia
-pkgver=1.40h
-pkgrel=4
-pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.'
-url='http://rbelmont.mameworld.info/?page_id=200'
-license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('sdl>=1.2.12' 'alsa-lib' 'gtk2>=2.4' 'mesa')
-makedepends=('unzip')
-# rbelmont.mameworld.info blocks some user-agents
-DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --user-agent=Mozilla/5.0 -O %o %u'
-	  'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u')
-source=("https://downloads.sourceforge.net/project/nestopia/Nestopia/v${pkgver//[a-z]/}/Nestopia${pkgver//[.a-z]/}src.zip"
-	"http://rbelmont.mameworld.info/nst${pkgver//[a.a-z]/}_lnx_release_${pkgver:${#pkgver}-1:1}.zip"
-	"nestopia"
-	"nestopia_bogus_error_on_save_settings.patch")
-md5sums=('526c99a06d2b257135e7047b0ed95ae0'
-         'f9a9a905bada67e11dac1364612d0b35'
-         'abc2f030dd291f58d65c9095ef024225'
-         '0160078c9afcbb1a6ac389c3989929f7')
-
-build() {
-  cd ${srcdir}
-  # remove a bogus error message on exit
-  patch -p0 < nestopia_bogus_error_on_save_settings.patch
-  make -j1
-
-  # Install the nestopia script that copies required files to ~/.nestopia
-  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/usr/bin/${pkgname}
-
-  # Older releases used a .sh file. Make a symlink to make everyone happy
-  cd ${pkgdir}/usr/bin
-  ln -s ${pkgname} ${pkgname}.sh
-
-  # Install the required files and executable in /usr/share
-  cd ${srcdir}
-  install -Dm755 nst ${pkgdir}/usr/bin/${pkgname}-bin
-  install -dm775 ${pkgdir}/usr/share/${pkgname}/
-  install -m644 nstcontrols ${pkgdir}/usr/share/${pkgname}/
-  install -m644 NstDatabase.xml ${pkgdir}/usr/share/${pkgname}/
-}
diff --git a/community/nestopia/nestopia b/community/nestopia/nestopia
deleted file mode 100644
index 52bd2b2b3..000000000
--- a/community/nestopia/nestopia
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ ! -e $HOME/.nestopia ]; then
-  echo "Running NEStopia for the first time..."
-  echo "Copying required files to ~/.nestopia..."
-  mkdir $HOME/.nestopia
-  cp /usr/share/nestopia/{nstcontrols,NstDatabase.xml} $HOME/.nestopia/
-fi
-
-nestopia-bin "$@"
diff --git a/community/nestopia/nestopia_bogus_error_on_save_settings.patch b/community/nestopia/nestopia_bogus_error_on_save_settings.patch
deleted file mode 100644
index 63f33bc72..000000000
--- a/community/nestopia/nestopia_bogus_error_on_save_settings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/linux/settings.cpp.old	2008-10-23 05:45:58.000000000 +0200
-+++ source/linux/settings.cpp	2008-12-04 23:17:59.000000000 +0100
-@@ -16,7 +16,7 @@
- using namespace LinuxNst;
- 
- #define READ_SETTING(x) fread(&x, sizeof(x), 1, f)
--#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != sizeof(x)) std::cout << "Error writing setting!\n"
-+#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != 1) std::cout << "Error writing setting!\n"
- 
- static int rates[4] = { 11025, 22050, 44100, 48000 };
- 
diff --git a/community/ogre/PKGBUILD b/community/ogre/PKGBUILD
deleted file mode 100644
index b4ba27669..000000000
--- a/community/ogre/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 52770 2011-07-28 04:02:26Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-pkgbase=ogre
-pkgname=('ogre' 'ogre-docs')
-pkgver=1.7.3
-pkgrel=4
-pkgdesc="A scene-oriented, flexible 3D engine written in C++"
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.ogre3d.org'
-license=('custom:MIT')
-depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr' 
-         'nvidia-cg-toolkit' 'mesa' 'zziplib' 'ois')
-makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu')
-optdepends=('cppunit: unit testing'
-            'intel-tbb: better threading support'
-            'poco: portability'
-            'boost: for developing using ogre')
-install=ogre.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_src_v${pkgver//./-}.tar.bz2")
-md5sums=('7a85d3b8f0d64debd186e48ebe9556aa')
-
-build() {
-  cd ${srcdir}/${pkgname}_src_v${pkgver//./-}
-
-  # get a clean build dir
-  [[ -d build ]] && rm -rf build
-	mkdir build
-	cd build
-
-  # generate CMake Makefile
-  cmake .. \
- 	  -DCMAKE_INSTALL_PREFIX=/usr \
-	  -DOGRE_INSTALL_PLUGINS_HEADERS=TRUE \
-	  -DOGRE_INSTALL_SAMPLES=TRUE \
-	  -DOGRE_INSTALL_DOCS=TRUE \
-    -DOGRE_INSTALL_MEDIA=TRUE \
-	  -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \
-    -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
-
-  # compile
-  make
-
-  # generate docs
-  if [[ $(which dot) && $(which doxygen) ]]; then
-    make doc
-  fi
-}
-
-package_ogre() {
-  optdepends=('ogre-docs: documentation')
-
-  cd ${srcdir}/${pkgname}_src_v${pkgver//./-}/build
-
-  # install the bugger
-  make DESTDIR=${pkgdir} install
-
-  # fix up samples
-  install -dm775 -o root -g users ${pkgdir}/opt/OGRE/samples/
-  mv ${pkgdir}/usr/share/OGRE/*.cfg ${pkgdir}/opt/OGRE/samples/
-  mv ${pkgdir}/usr/bin/SampleBrowser ${pkgdir}/opt/OGRE/samples/
-
-  # make sample launcher
-  echo "#!/bin/bash" > ${pkgdir}/usr/bin/OgreSampleBrowser
-  echo "cd /opt/OGRE/samples && ./SampleBrowser" >> ${pkgdir}/usr/bin/OgreSampleBrowser
-  chmod +x ${pkgdir}/usr/bin/OgreSampleBrowser
-  
-  # install license
-  install -Dm644 ../Docs/License.html ${pkgdir}/usr/share/licenses/${pkgname}/license.html
-
-  # move docs out of this package
-  mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs
-}
-
-package_ogre-docs() {
-  pkgdesc="Documentation for ogre"
-  depends=()
-
-  cd ${srcdir}/${pkgbase}_src_v${pkgver//./-}/build
-
-  # move docs into this package
-  install -dm755 ${pkgdir}/usr/share/doc
-  mv ${srcdir}/docs ${pkgdir}/usr/share/doc/OGRE/
-
-  # symlink for docs
-  install -dm755 ${pkgdir}/usr/share/OGRE/
-  cd ${pkgdir}/usr/share
-  ln -s doc/OGRE/ OGRE/docs
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/ogre/ogre.install b/community/ogre/ogre.install
deleted file mode 100644
index 5db668d9e..000000000
--- a/community/ogre/ogre.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-    echo "To view the OGRE samples just run OgreSampleBrowser or launch"
-    echo "it directly in /opt/OGRE/samples/"
-}
diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD
index 00f4ad0df..23024aec9 100644
--- a/community/openscenegraph/PKGBUILD
+++ b/community/openscenegraph/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 50319 2011-06-28 10:21:19Z spupykin $
+# $Id: PKGBUILD 50969 2011-07-03 18:11:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Hans Janssen <janserv@gmail.com>
 # Contributor: my64 <packages@obordes.com>
 # Contributor: Colin Pitrat <colin.pitrat@gmail.com>
 
 pkgname=openscenegraph
-pkgver=2.8.5
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,9 @@ makedepends=('cmake' 'libvncserver')
 optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib')
 conflicts=('openthreads')
 provides=('openthreads')
-source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip)
-md5sums=('de844947d410726ba50ed07eb6319e6f')
+#source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip)
+source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip")
+md5sums=('121829b854349a9e9d1aebc25cf3e52d')
 
 build() {
   cd OpenSceneGraph-$pkgver
diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD
index f5e95e73d..92ea3ded2 100644
--- a/community/oss/PKGBUILD
+++ b/community/oss/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 53275 2011-08-02 16:11:02Z bluewind $
+# $Id: PKGBUILD 54037 2011-08-12 13:13:29Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=oss
-pkgver=4.2_2004
-pkgrel=2
+pkgver=4.2_2005
+pkgrel=1
 pkgdesc="Open Sound System UNIX audio architecture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.opensound.com/"
@@ -23,7 +23,7 @@ source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_
 	"soundon.patch"
 	"remove-hal.patch"
 	)
-md5sums=('256aba264d523fb8ee444aaacfb8d3da'
+md5sums=('964b1ec63b48b22baba6688fe2fc0633'
          'b9a380a0ac8896390d71ac13676f27e1'
          'cbcbce5c03b127df5eafa8faa091492c'
          '65f07fe241bfbf912f76d8b6d8f276b5'
diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD
index f19c3c1be..5ca5b140c 100644
--- a/community/parcellite/PKGBUILD
+++ b/community/parcellite/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 53903 2011-08-09 19:26:51Z spupykin $
+# $Id: PKGBUILD 54009 2011-08-11 18:03:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=parcellite
 pkgver=1.0.2rc3
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight GTK+ clipboard manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://parcellite.sourceforge.net/"
 license=('GPL3')
 depends=('gtk2')
 makedepends=('intltool')
-source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz)
-md5sums=('3fe1196cc2bb3f34d57d0e34e10449b3')
+source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz
+	history_menu_crash_patch)
+md5sums=('3fe1196cc2bb3f34d57d0e34e10449b3'
+         '8fd6e07fa907865ca4db7b3e13441ce6')
 
 build() {
   cd "$srcdir/parcellite-$pkgver"
+  (cd src && patch -p0 <$srcdir/history_menu_crash_patch)
   ./configure --prefix=/usr --sysconfdir=/etc
   make
   make DESTDIR="$pkgdir" install
diff --git a/community/parcellite/history_menu_crash_patch b/community/parcellite/history_menu_crash_patch
new file mode 100644
index 000000000..961106839
--- /dev/null
+++ b/community/parcellite/history_menu_crash_patch
@@ -0,0 +1,39 @@
+Index: main.c
+===================================================================
+--- main.c	(revision 232)
++++ main.c	(working copy)
+@@ -1199,24 +1199,28 @@
+     {
+       GString* string = g_string_new((gchar*)element->data);
+       /* Ellipsize text */
+-      if (string->len > prefs.item_length)
++      glong len = g_utf8_strlen(string->str, string->len);
++      if (len > prefs.item_length)
+       {
+         switch (prefs.ellipsize)
+         {
+           case PANGO_ELLIPSIZE_START:
+-            string = g_string_erase(string, 0, string->len-(prefs.item_length));
++            string = g_string_erase(string, 0, g_utf8_offset_to_pointer(string->str, len - prefs.item_length) - string->str);
+             string = g_string_prepend(string, "...");
+             break;
+           case PANGO_ELLIPSIZE_MIDDLE:
+-            string = g_string_erase(string, (prefs.item_length/2), string->len-(prefs.item_length));
+-            string = g_string_insert(string, (string->len/2), "...");
++            ; /* to avoid wierd gcc error */
++            gchar* p1 = g_utf8_offset_to_pointer(string->str, prefs.item_length / 2);
++            gchar* p2 = g_utf8_offset_to_pointer(string->str, len - prefs.item_length / 2);
++            string = g_string_erase(string, p1 - string->str, p2 - p1);
++            string = g_string_insert(string, p1 - string->str, "...");
+             break;
+           case PANGO_ELLIPSIZE_END:
+-            string = g_string_truncate(string, prefs.item_length);
++            string = g_string_truncate(string, g_utf8_offset_to_pointer(string->str, prefs.item_length) - string->str);
+             string = g_string_append(string, "...");
+             break;
+         }
+-      }
++      }
+ 		  /* Remove control characters */
+       gsize i = 0;
+       while (i < string->len)
diff --git a/community/prelink/PKGBUILD b/community/prelink/PKGBUILD
index 767c61739..9336274c2 100644
--- a/community/prelink/PKGBUILD
+++ b/community/prelink/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 35759 2010-12-22 11:17:45Z lfleischer $
+# $Id: PKGBUILD 54150 2011-08-13 19:36:37Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Rouslan Solomakhin <rouslan@localnet.com>
 
 pkgname=prelink
-pkgver=20100106
-pkgrel=3
+pkgver=20110622
+pkgrel=1
 pkgdesc='ELF prelinking utility to speed up dynamic linking.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://people.redhat.com/jakub/prelink/'
 license=('GPL')
 depends=('elfutils')
 backup=('etc/prelink.conf')
-source=("http://people.redhat.com/jakub/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'prelink.conf'
-        'arch-x86_64-dynamic_linker.patch')
-md5sums=('56e2a1b5a478795352bf6e4d2bc6e0ab'
+md5sums=('2863a9c9e68d076916bf9a46ad6bca78'
          '0793ed49e9b31c125cba4d936c333cf6'
          'b347580536e078b34c547742d36a3e9d')
+source=("http://pkgs.fedoraproject.org/repo/pkgs/${pkgname}/${pkgname}-${pkgver}.tar.bz2/${md5sums[0]}/${pkgname}-${pkgver}.tar.bz2"
+        'prelink.conf'
+        'arch-x86_64-dynamic_linker.patch')
 
 build() {
   cd "${srcdir}/${pkgname}"
diff --git a/community/qps/PKGBUILD b/community/qps/PKGBUILD
index 3a821f022..6d7869391 100644
--- a/community/qps/PKGBUILD
+++ b/community/qps/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 52003 2011-07-19 16:41:14Z spupykin $
+# $Id: PKGBUILD 54014 2011-08-11 18:04:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Rosenstrauch <darose@darose.net>
 
 pkgname=qps
 pkgver=1.10.15
 _dlpkgver=5946
-pkgrel=1
+pkgrel=2
 pkgdesc="a visual process manager, an X11 version of 'top' or 'ps'."
 url="http://qps.kldp.net/projects/qps"
 depends=('qt')
 arch=('i686' 'x86_64' 'mips64el')
 license="GPL"
-source=(http://kldp.net/frs/download.php/${_dlpkgver}/qps-$pkgver.tar.bz2)
-md5sums=('25a6c6f8ac9172a6874e3514edf1eda1')
+source=(http://kldp.net/frs/download.php/${_dlpkgver}/qps-$pkgver.tar.bz2
+	version-patch.diff)
+md5sums=('25a6c6f8ac9172a6874e3514edf1eda1'
+         'e323a796a3dbf44a99af386e867f7848')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  patch -p0 <$srcdir/version-patch.diff
   qmake
   make
 }
diff --git a/community/qps/version-patch.diff b/community/qps/version-patch.diff
new file mode 100644
index 000000000..bfddd2a0a
--- /dev/null
+++ b/community/qps/version-patch.diff
@@ -0,0 +1,14 @@
+--- proc_linux.cpp	2011-07-17 08:03:52.000000000 -0400
++++ proc_linux.cpp.new	2011-08-09 11:09:47.278589772 -0400
+@@ -1962,7 +1962,10 @@
+ 	    int result;
+ 
+         result = sscanf(p, "%d.%d.%d", &major, &minor, &patch);
+-        if(result < 3) {
++        if(result == 2) {
++		patch = 0;
++	}
++        else if(result < 3) {
+ 			fprintf(stderr, "Qps: can't determine version, read %s \n",	p);
+ 			fprintf(stderr, "please report this bug.\n");
+ 			exit(1);
diff --git a/community/rusxmms/PKGBUILD b/community/rusxmms/PKGBUILD
index 13f8b6f97..96b89ac1c 100644
--- a/community/rusxmms/PKGBUILD
+++ b/community/rusxmms/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 14511 2010-04-04 18:33:41Z spupykin $
+# $Id: PKGBUILD 54066 2011-08-13 05:45:42Z ebelanger $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
@@ -6,12 +6,12 @@ pkgname=rusxmms
 pkgver=1.2.11_csa43
 _xmmsver=1.2.11
 _csaver=csa43
-pkgrel=2
+pkgrel=3
 pkgdesc="XMMS with librcc"
 arch=(i686 x86_64 'mips64el')
 license=(GPL)
 url="http://rusxmms.sourceforge.net/"
-depends=(libsm libxxf86vm zlib gtk libvorbis esd alsa-lib libgl librcc librcd openssl)
+depends=(libsm libxxf86vm zlib gtk libvorbis alsa-lib libgl librcc librcd openssl)
 makedepends=(mesa patch)
 provides=(xmms)
 conflicts=(xmms)
@@ -22,16 +22,24 @@ md5sums=('f3e6dbaf0b3f571a532ab575656be506'
          '8f387dd2e5c95f8730979e09687b6e02')
 
 build() {
-  cd ${startdir}/src/xmms-${_xmmsver}
+  cd "${srcdir}"/xmms-${_xmmsver}
 
 if true; then
-  ln -s $srcdir/RusXMMS2 $srcdir/xmms-${_xmmsver}/RusXMMS2
-  (cd $srcdir/xmms-${_xmmsver}/RusXMMS2 && ./apply.sh) || return 1
+  ln -s "$srcdir"/RusXMMS2 "$srcdir"/xmms-${_xmmsver}/RusXMMS2
+  (cd "$srcdir"/xmms-${_xmmsver}/RusXMMS2 && ./apply.sh)
 
-  mv $srcdir/RusXMMS2/source/* $srcdir/xmms-${_xmmsver}/libxmms/ && \
-#  sed -i 's#charset.c charset.h#charset.c charset.h rcc.h rcc.c rcc_lang.h#g' $srcdir/xmms-${_xmmsver}/libxmms/Makefile.am && \
-  aclocal && automake && autoconf || return 1
-  (cd libxmms && aclocal && automake && autoconf) || return 1
+  mv "$srcdir"/RusXMMS2/source/* "$srcdir"/xmms-${_xmmsver}/libxmms/
+#  sed -i 's#charset.c charset.h#charset.c charset.h rcc.h rcc.c rcc_lang.h#g' "$srcdir"/xmms-${_xmmsver}/libxmms/Makefile.am && \
+
+# I already remove esound from repo and it has some autotools errors that I can't seem to figure out. So let's use a hack to get the esound removal rebuild done.
+#  aclocal
+# automake
+autoconf
+  sed -i 's/unicode.c//g' Input/mpg123/Makefile.in
+  sed -i 's/unicode.lo//g' Input/mpg123/Makefile.in
+
+
+  (cd libxmms && aclocal && automake && autoconf)
 
   case $CARCH in
     x86_64)
@@ -46,13 +54,17 @@ if true; then
   esac
 fi
 
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  make
+}
+
+package(){
+  cd "${srcdir}"/xmms-${_xmmsver}
+  make DESTDIR="$pkgdir" install
 
-  mkdir -p ${startdir}/pkg/usr/share/{applications,pixmaps}
-  install -m 644 xmms/xmms.desktop ${startdir}/pkg/usr/share/applications && \
-  install -m 644 xmms/xmms_mini.xpm ${startdir}/pkg/usr/share/pixmaps/xmms.xpm || return 1
+  mkdir -p "$pkgdir"/usr/share/{applications,pixmaps}
+  install -m 644 xmms/xmms.desktop "$pkgdir"/usr/share/applications
+  install -m 644 xmms/xmms_mini.xpm "$pkgdir"/usr/share/pixmaps/xmms.xpm
   # don't want wmxmms
-  rm -rf $startdir/pkg/usr/bin/wmxmms $startdir/pkg/usr/share/xmms && \
-  rm -f $startdir/pkg/usr/man/man1/{gnomexmms.1,wmxmms.1}
+  rm -rf "$pkgdir"/usr/bin/wmxmms "$pkgdir"/usr/share/xmms
+  rm -f "$pkgdir"/usr/share/man/man1/{gnomexmms.1,wmxmms.1}
 }
diff --git a/community/scrotwm/PKGBUILD b/community/scrotwm/PKGBUILD
index 772c5899b..78ffbde73 100644
--- a/community/scrotwm/PKGBUILD
+++ b/community/scrotwm/PKGBUILD
@@ -2,20 +2,20 @@
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=scrotwm
-pkgver=0.9.33
-pkgrel=1
+pkgver=0.9.34
+pkgrel=2
 pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.scrotwm.org"
 license=('custom:ISC')
-depends=('dmenu' 'libxrandr' 'profont')
+depends=('dmenu' 'libxrandr' 'libxtst' 'profont')
 makedepends=('libxt')
 optdepends=('scrot: screenshots' 'xlockmore: screenlocking' 'terminus-font: great font')
 backup=(etc/scrotwm.conf)
 source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \
 	LICENSE \
         baraction.sh)
-md5sums=('fcfd0aba8e48217e26db823226640547'
+md5sums=('d38e296dd0bf014046e82cd42932f398'
          'a67cfe51079481e5b0eab1ad371379e3'
          '6132ba773ee00f39d8f67ac0347a9814')
 
@@ -24,6 +24,7 @@ build() {
   
   # it is like a patch, only less fragile
   sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' scrotwm.c
+  sed -i 's/verbose_layout = 0;/verbose_layout = 1;/' scrotwm.c
   sed -i 's/# modkey = Mod1/modkey = Mod4/' scrotwm.conf
   sed -i 's/-\*-terminus-medium-\*-\*-\*-\*-\*-\*-\*-\*-\*-\*-\*/-*-profont-*-*-*-*-12-*-*-*-*-*-*-*/' scrotwm.conf
 
diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD
index 182bbba57..8867a38b6 100644
--- a/community/sfml/PKGBUILD
+++ b/community/sfml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 52817 2011-07-28 21:00:43Z svenstaro $
+# $Id: PKGBUILD 54051 2011-08-12 21:19:26Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Ondrej Martinak <omartinak@gmail.com>
 
@@ -7,7 +7,7 @@ pkgname=sfml
 _git=true
 
 if [[ "${_git}" = "true" ]]; then
-    pkgver=1.99.git20110728
+    pkgver=1.99.git20110812
 fi
 
 pkgrel=1
diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD
index 2b688116e..47fb6260e 100644
--- a/community/simgear/PKGBUILD
+++ b/community/simgear/PKGBUILD
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD 50327 2011-06-28 11:35:39Z spupykin $
+# $Id: PKGBUILD 54019 2011-08-11 20:22:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 # Contributor: Hans Janssen <hans@janserv.xs4all.nl>
 
 pkgname=simgear
-pkgver=2.0.0
-pkgrel=3
+pkgver=2.4.0
+pkgrel=1
 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications."
 arch=(i686 x86_64 'mips64el')
 depends=('glut' 'freealut' 'plib' 'openscenegraph')
 makedepends=('boost')
 license=("GPL")
-url="http://www.simgear.org"
+#url="http://www.simgear.org"
+url="https://gitorious.org/fg"
 options=('!makeflags')
-source=(ftp://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/SimGear-$pkgver.tar.gz)
-md5sums=('414bea545ea1e8ce17e4aa0809159cec')
+source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver"
+	build-fix.patch)
+md5sums=('e2c6fab13a74cd42992f8cfd5ad46cde'
+         '905a05cc1364c067b3b9574d41cef7fa')
 
 build() {
-  cd $startdir/src/SimGear-$pkgver
-  ./configure --prefix=/usr
+  cd $srcdir/fg-simgear
+#  patch -p1 <$srcdir/build-fix.patch
+  [ -x configure ] || ./autogen.sh
+  [ -f Makefile ] || ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $startdir/src/SimGear-$pkgver
-  make DESTDIR=$startdir/pkg install
+  cd $srcdir/fg-simgear
+  make DESTDIR=$pkgdir install
 }
diff --git a/community/simgear/build-fix.patch b/community/simgear/build-fix.patch
new file mode 100644
index 000000000..da4ba81f8
--- /dev/null
+++ b/community/simgear/build-fix.patch
@@ -0,0 +1,71 @@
+diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx
+--- SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx	2011-07-04 13:02:57.000000000 +0400
+@@ -70,9 +70,6 @@
+   osg::ref_ptr<osg::RefMatrix> mModelView;
+ };
+ 
+-osgUtil::RegisterRenderBinProxy
+-SGClipGroup::clipBinProxy("ClipRenderBin", new SGClipGroup::ClipRenderBin);
+-
+ class SGClipGroup::CullCallback : public osg::NodeCallback {
+ public:
+   virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx
+--- SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx	2011-07-04 13:03:01.000000000 +0400
+@@ -51,8 +51,6 @@
+   class ClipRenderBin;
+ 
+   std::vector<osg::ref_ptr<osg::ClipPlane> > mClipPlanes;
+-
+-  static osgUtil::RegisterRenderBinProxy clipBinProxy;
+ };
+ 
+ #endif
+diff -wbBur SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx
+--- SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx	2011-07-12 15:12:21.000000000 +0400
+@@ -21,6 +21,7 @@
+ #include <osgDB/ReadFile>
+ #include <osgDB/Input>
+ #include <osgDB/ParameterOutput>
++#include <osgDB/DatabasePager>
+ 
+ #include <simgear/debug/logstream.hxx>
+ #include <simgear/structure/OSGVersion.hxx>
+@@ -67,9 +68,12 @@
+     unsigned childNum = getNumChildren();
+     setTimeStamp(childNum, 0);
+     double priority=1.0;
++/*
++FIXME:!!!
+     dbp->requestNodeFile(getFileName(childNum),this,priority,0,
+                          getDatabaseRequest(childNum),
+                          _readerWriterOptions.get());
++*/
+ }
+ 
+ bool SGPagedLOD_writeLocalData(const Object& obj, osgDB::Output& fw)
+diff -wbBur SimGear-2.0.0/simgear/scene/sky/bbcache.cxx SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx
+--- SimGear-2.0.0/simgear/scene/sky/bbcache.cxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx	2011-07-12 15:14:16.000000000 +0400
+@@ -31,6 +31,7 @@
+ #include <simgear/screen/extensions.hxx>
+ #include <simgear/screen/RenderTexture.h>
+ #include <osg/GLU>
++#include <GL/glu.h>
+ 
+ #include "bbcache.hxx"
+ 
+diff -wbBur SimGear-2.0.0/simgear/screen/tr.cxx SimGear-2.0.0.my/simgear/screen/tr.cxx
+--- SimGear-2.0.0/simgear/screen/tr.cxx	2010-02-17 18:39:22.000000000 +0300
++++ SimGear-2.0.0.my/simgear/screen/tr.cxx	2011-07-12 15:16:01.000000000 +0400
+@@ -145,6 +145,7 @@
+ #endif
+ 
+ #include <osg/GLU>
++#include <GL/glu.h>
+ 
+ #include "tr.h"
+ 
diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD
index 698163689..d22d93518 100644
--- a/community/stone-soup/PKGBUILD
+++ b/community/stone-soup/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jakob Gruber <jakob.gruber@gmail.com>
 
 pkgname=stone-soup
-pkgver=0.8.1
+pkgver=0.9.0
 pkgrel=1
 pkgdesc="An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('custom')
 install=('stone-soup.install')
 source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.bz2"
         "${pkgname}.desktop")
-md5sums=('7ddeb1ff048401e55af0d1c11038f937'
+md5sums=('3f73fb051215df3633a554d81e67a452'
          '98be780cddb2a0915bbab15ad93644f1')
 
 build() {
diff --git a/community/thoggen/ChangeLog b/community/thoggen/ChangeLog
deleted file mode 100644
index 45138e297..000000000
--- a/community/thoggen/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-2008-06-19 Mateusz Herych <heniekk@gmail.com>
-
-* Updated to 0.7.1
-
-2007-06-27 tardo <tardo@nagi-fanboi.net>
-* built for x86_64
diff --git a/community/thoggen/PKGBUILD b/community/thoggen/PKGBUILD
deleted file mode 100644
index c692232f0..000000000
--- a/community/thoggen/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 22322 2010-07-20 23:22:32Z mherych $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Maintainer: Robert Emil Berge <filoktetes@linuxophic.org>
-
-pkgname=thoggen
-pkgver=0.7.1
-pkgrel=5
-pkgdesc="A DVD ripper based on GStreamer and Gtk+."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://thoggen.net/"
-license=('GPL')
-depends=('libofa' 'perlxml' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-ugly-plugins' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-ffmpeg' 'libdvdread' 'hal' 'libglade')
-source=(http://downloads.sourceforge.net/sourceforge/thoggen/$pkgname-$pkgver.tar.gz)
-md5sums=('e36c1ceb098f8ed51ca6c0d1e7ae8279')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
-
diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD
index 3f2e01124..14212e190 100644
--- a/community/tomoyo-tools/PKGBUILD
+++ b/community/tomoyo-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 48297 2011-05-31 09:33:14Z spupykin $
+# $Id: PKGBUILD 53999 2011-08-11 17:49:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
 
 pkgname=tomoyo-tools
-_basever=2.3.0
-_timestamp=20110511
+_basever=2.4.0
+_timestamp=20110806
 pkgver=${_basever}.${_timestamp}
 pkgrel=1
 pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernel 2.6.36 and later'
@@ -15,15 +15,18 @@ depends=('ncurses')
 makedepends=('help2man')
 conflicts=('ccs-tools')
 install=tomoyo-tools.install
-source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/48663/${pkgname}-${_basever}-${_timestamp}.tar.gz")
-md5sums=('bbbbaeb145ae12e5fe6154707807b90e')
+source=("tomoyo-tools-${_basever}-${_timestamp}.tar.gz::http://sourceforge.jp/frs/redir.php?m=iij&f=%2Ftomoyo%2F52848%2Ftomoyo-tools-${_basever}-${_timestamp}.tar.gz"
+	build-fix.patch)
+md5sums=('111109a71684f48bcac58bba07b8f49e'
+         '063c85ec6c56b90796ced9c203098f41')
 
 build() {
-    cd "${srcdir}/${pkgname}"
-    make -j1
+  cd "${srcdir}/${pkgname}"
+  patch -p1 <$srcdir/build-fix.patch
+  make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
-    make INSTALLDIR="${pkgdir}" install
+  cd "${srcdir}/${pkgname}"
+  make INSTALLDIR="${pkgdir}" install
 }
diff --git a/community/tomoyo-tools/build-fix.patch b/community/tomoyo-tools/build-fix.patch
new file mode 100644
index 000000000..ca949072b
--- /dev/null
+++ b/community/tomoyo-tools/build-fix.patch
@@ -0,0 +1,11 @@
+diff -wbBur tomoyo-tools/usr_lib_tomoyo/tomoyo-editpolicy-agent.c tomoyo-tools.my/usr_lib_tomoyo/tomoyo-editpolicy-agent.c
+--- tomoyo-tools/usr_lib_tomoyo/tomoyo-editpolicy-agent.c	2011-08-06 04:00:00.000000000 +0400
++++ tomoyo-tools.my/usr_lib_tomoyo/tomoyo-editpolicy-agent.c	2011-08-11 21:47:05.000000000 +0400
+@@ -35,6 +35,7 @@
+ #include <dirent.h>
+ #define _GNU_SOURCE
+ #include <sched.h>
++#include <linux/sched.h>
+ #include <sys/mount.h>
+ 
+ static _Bool wait_data(const int fd)
diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD
index cbb8cf506..4ea807b62 100644
--- a/community/virtviewer/PKGBUILD
+++ b/community/virtviewer/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 52795 2011-07-28 14:05:17Z spupykin $
+# $Id: PKGBUILD 54218 2011-08-14 19:34:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=virtviewer
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS."
 depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt')
@@ -12,7 +12,7 @@ url="http://virt-manager.et.redhat.com"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz")
-md5sums=('392a32a650dd07bed2c858faa85208ba')
+md5sums=('1cc86ed3fbbe37a56faa6476b2e6dbcd')
 
 build() {
   cd $srcdir/virt-viewer-$pkgver
diff --git a/community/xapian-core/PKGBUILD b/community/xapian-core/PKGBUILD
index 214c31f00..fec3402fb 100644
--- a/community/xapian-core/PKGBUILD
+++ b/community/xapian-core/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 53882 2011-08-09 08:32:11Z spupykin $
+# $Id: PKGBUILD 54076 2011-08-13 09:16:09Z spupykin $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=xapian-core
-pkgver=1.2.6
+pkgver=1.2.7
 pkgrel=1
 pkgdesc='Open source search engine library.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('sh' 'gcc-libs' 'zlib' 'util-linux')
 # xapian config requires libxapian.la
 options=('libtool')
 source=("http://oligarchy.co.uk/xapian/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('30f5cc976f063694f93cbdf9b83dc2ea')
+md5sums=('6684eb7a990b9cedf4257f41bfddb584')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD
new file mode 100644
index 000000000..b07dafb05
--- /dev/null
+++ b/community/zynaddsubfx/PKGBUILD
@@ -0,0 +1,62 @@
+# $Id: PKGBUILD 54081 2011-08-13 09:18:00Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: SpepS <dreamspepser at yahoo dot it>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: DonVla <donvla@users.sourceforge.net>
+
+_p=ZynAddSubFX
+pkgname=zynaddsubfx
+pkgver=2.4.1
+pkgrel=3
+pkgdesc="An opensource software synthesizer capable of making a countless number of instruments."
+arch=('i686' 'x86_64')
+url="http://zynaddsubfx.sourceforge.net"
+license=('GPL')
+depends=('fltk' 'fftw' 'lash')
+makedepends=('mxml' 'cmake')
+options=('!emptydirs')
+source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$_p-$pkgver.tar.bz2"
+        "$pkgname.desktop" "$pkgname.svg"
+        "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch"
+        "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch")
+md5sums=('59eb69ce24d6f8c605f8ba43958d0526'
+         '5da6735ee59fdfa21f171fdc4d6c80cb'
+         '6f7e9c3ce3947088a10c99c46a65431f'
+         'eb95d339ff5deac8c6b54965f04a8c60'
+         '49464a33ab9c4250520eda0df7705663')
+
+build() {
+  cd "$srcdir/$_p-$pkgver"
+
+  # patches
+  patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch"
+  patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch"
+
+  [ -d build ] || mkdir build && cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DOutputModule=jack ..
+  make
+
+  # build external programs
+  cd ../ExternalPrograms/Spliter && make
+  cd ../Controller && sed -i "s|Box\.h|Box\.H|" ControllerUI.fl && make
+}
+
+package() {
+  cd "$srcdir/$_p-$pkgver/build"
+
+  make DESTDIR="$pkgdir/" install
+
+  # install external programs
+  install -Dm755 ../ExternalPrograms/Spliter/spliter "$pkgdir/usr/bin/spliter"
+  install -Dm755 ../ExternalPrograms/Controller/controller "$pkgdir/usr/bin/controller"
+  install -Dm644 ../ExternalPrograms/Spliter/readme.txt "$pkgdir/usr/share/doc/$pkgname/SPLITER.txt"
+
+  # banks and examples
+  install -d "$pkgdir/usr/share/$pkgname"
+  cp -a ../banks "$pkgdir/usr/share/$pkgname"
+  cp -a ../examples "$pkgdir/usr/share/$pkgname"
+
+  # desktop file and icon
+  install -Dm644 "$srcdir/$pkgname.svg" "$pkgdir/usr/share/pixmaps/$pkgname.svg"
+  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+}
diff --git a/community/zynaddsubfx/zynaddsubfx.desktop b/community/zynaddsubfx/zynaddsubfx.desktop
new file mode 100644
index 000000000..ebca740ef
--- /dev/null
+++ b/community/zynaddsubfx/zynaddsubfx.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=ZynAddSubFX
+Comment=A powerful realtime software synthesizer
+Exec=zynaddsubfx
+Icon=zynaddsubfx
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;
diff --git a/community/zynaddsubfx/zynaddsubfx.svg b/community/zynaddsubfx/zynaddsubfx.svg
new file mode 100644
index 000000000..d81c651ad
--- /dev/null
+++ b/community/zynaddsubfx/zynaddsubfx.svg
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg1"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.2 r9819"
+   width="507.1875"
+   height="509.21875"
+   sodipodi:docname="zynaddsubfx_icon.svg"
+   version="1.1">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient4809">
+      <stop
+         style="stop-color:#d5d8db;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4810" />
+      <stop
+         style="stop-color:#6d8ec2;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4811" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4179">
+      <stop
+         style="stop-color:#bec8c6;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4180" />
+      <stop
+         style="stop-color:#bbcac9;stop-opacity:1.0000000;"
+         offset="0.59527779"
+         id="stop4182" />
+      <stop
+         style="stop-color:#879797;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4181" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4038">
+      <stop
+         style="stop-color:#4a8a61;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4039" />
+      <stop
+         style="stop-color:#557c7d;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4040" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2162">
+      <stop
+         style="stop-color:#549c6d;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2163" />
+      <stop
+         style="stop-color:#679697;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2164" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2158">
+      <stop
+         style="stop-color:#dbdbdb;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2159" />
+      <stop
+         style="stop-color:#a1aec2;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2160" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2158"
+       id="radialGradient2165"
+       cx="205.28555"
+       cy="152.50184"
+       r="486.22545"
+       fx="198.52472"
+       fy="148.59325"
+       gradientTransform="matrix(0.99940285,0,0,1.0005975,-127.46875,-47)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4038"
+       id="linearGradient4043"
+       x1="119.48864"
+       y1="387.75519"
+       x2="462.45943"
+       y2="302.28432"
+       gradientTransform="scale(1.0666754,0.9374923)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4809"
+       id="radialGradient4184"
+       cx="-6.2401056"
+       cy="138.19312"
+       r="63.0278"
+       fx="-5.4719041"
+       fy="137.48498"
+       spreadMethod="pad"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.0322663,0.96874227)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4809"
+       id="radialGradient3021"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad"
+       cx="-6.2401056"
+       cy="138.19312"
+       fx="-5.4719041"
+       fy="137.48498"
+       r="63.0278"
+       gradientTransform="scale(1.0322663,0.96874227)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.61399264"
+     inkscape:cx="305.35982"
+     inkscape:cy="328.83153"
+     inkscape:window-width="1278"
+     inkscape:window-height="760"
+     inkscape:window-x="0"
+     inkscape:window-y="19"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     showgrid="false"
+     inkscape:snap-global="true"
+     inkscape:snap-nodes="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.13874531pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="rect2793"
+     width="497.32657"
+     height="497.92426"
+     x="8.5265961"
+     y="9.9727058"
+     rx="10"
+     ry="10.000001" />
+  <rect
+     style="fill:url(#radialGradient2165);fill-opacity:0.75;fill-rule:evenodd;stroke:#c7ffc7;stroke-width:2.67499995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+     id="rect1532"
+     width="497.32657"
+     height="497.92426"
+     x="1.3287659"
+     y="1.3353081"
+     rx="10"
+     ry="10.000001" />
+  <g
+     id="g4871"
+     transform="matrix(1,0,0,0.72153,-123.39704,-123.99862)">
+    <rect
+       style="fill:url(#linearGradient4043);fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.50865927pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2794"
+       width="374.5567"
+       height="328.96643"
+       x="144.30453"
+       y="199.03429"
+       rx="10.000001"
+       ry="13.85943" />
+    <path
+       style="fill:none;stroke:#fafafa;stroke-width:20;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 153.53968,361.37008 c 70.53877,201.53936 110.35828,210.2256 177.45839,6.10757 66.67288,-202.81841 104.2451,-205.61109 176.22345,0.24698"
+       id="path4175"
+       sodipodi:nodetypes="czc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:7.375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 145.99255,362.80964 c 369.96869,0 369.3724,1.43957 369.3724,1.43957"
+       id="path4176"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g4852"
+     transform="matrix(-1.360555,0.352222,-0.352222,-1.360555,196.67455,583.0333)">
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3021);fill-opacity:0.75;fill-rule:evenodd;stroke:none"
+       id="path4853"
+       sodipodi:cx="16.555019"
+       sodipodi:cy="147.59439"
+       sodipodi:rx="46.785923"
+       sodipodi:ry="43.906792"
+       d="m 63.340942,147.59439 a 46.785923,43.906792 0 1 1 -93.571846,0 46.785923,43.906792 0 1 1 93.571846,0 z"
+       transform="matrix(1.045432,0,0,1.113986,-125.3003,-37.14836)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:11.85730171;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:11.857302, 23.714604;stroke-dashoffset:0"
+       id="path4854"
+       sodipodi:cx="16.555019"
+       sodipodi:cy="147.59439"
+       sodipodi:rx="46.785923"
+       sodipodi:ry="43.906792"
+       d="m 63.340942,147.59439 a 46.785923,43.906792 0 1 1 -93.571846,0 46.785923,43.906792 0 1 1 93.571846,0 z"
+       transform="matrix(1.162718,0.507361,-0.579194,1.268918,-39.94742,-66.78193)" />
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m -108.49675,123.27211 c 36.885113,-10.80173 39.904052,-12.46015 39.904052,-12.46015 l -33.461822,23.25931 -6.44223,-10.79916 z"
+       id="path4855"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g4864"
+     transform="matrix(0.687211,0,0,0.854478,499.66235,-75.81607)">
+    <rect
+       style="fill:#000000;fill-opacity:0.75;fill-rule:evenodd;stroke:none"
+       id="rect4856"
+       width="110.64801"
+       height="545.60913"
+       x="-136.40228"
+       y="109.76131" />
+    <rect
+       style="fill:#00bc1a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="rect4857"
+       width="39.393082"
+       height="442.41235"
+       x="-128.61479"
+       y="205.44652" />
+    <rect
+       style="fill:#00bc1a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="rect4858"
+       width="37.357227"
+       height="525.88245"
+       x="-74.664627"
+       y="120.64261" />
+    <rect
+       style="fill:#000000;fill-opacity:0.17543862;fill-rule:evenodd;stroke:none"
+       id="rect4860"
+       width="95.883904"
+       height="12.21513"
+       x="-128.35823"
+       y="221.73334" />
+    <rect
+       style="fill:#000000;fill-opacity:0.17543862;fill-rule:evenodd;stroke:none"
+       id="rect4862"
+       width="95.883904"
+       height="12.21513"
+       x="-129.37616"
+       y="563.75702" />
+    <rect
+       style="fill:#000000;fill-opacity:0.17543862;fill-rule:evenodd;stroke:none"
+       id="rect4863"
+       width="95.883904"
+       height="12.21513"
+       x="-127.34029"
+       y="386.6376" />
+  </g>
+  <g
+     id="g4875"
+     transform="matrix(-1.360555,0.352222,-0.352222,-1.360555,3.44525,587.1877)">
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient4184);fill-opacity:0.75;fill-rule:evenodd;stroke:none"
+       id="path4876"
+       sodipodi:cx="16.555019"
+       sodipodi:cy="147.59439"
+       sodipodi:rx="46.785923"
+       sodipodi:ry="43.906792"
+       d="m 63.340942,147.59439 c 0,24.24905 -20.946771,43.90679 -46.785923,43.90679 -25.8391514,0 -46.785923,-19.65774 -46.785923,-43.90679 0,-24.24905 20.9467716,-43.90679 46.785923,-43.90679 25.839152,0 46.785923,19.65774 46.785923,43.90679 z"
+       transform="matrix(1.045432,0,0,1.113986,-125.3003,-37.14836)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:11.85730171;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:11.857302, 23.714604;stroke-dashoffset:0"
+       id="path4877"
+       sodipodi:cx="16.555019"
+       sodipodi:cy="147.59439"
+       sodipodi:rx="46.785923"
+       sodipodi:ry="43.906792"
+       d="m 63.340942,147.59439 c 0,24.24905 -20.946771,43.90679 -46.785923,43.90679 -25.8391514,0 -46.785923,-19.65774 -46.785923,-43.90679 0,-24.24905 20.9467716,-43.90679 46.785923,-43.90679 25.839152,0 46.785923,19.65774 46.785923,43.90679 z"
+       transform="matrix(1.162718,0.507361,-0.579194,1.268918,-39.94742,-66.78193)" />
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m -108.49675,123.27211 c 36.885113,-10.80173 39.904052,-12.46015 39.904052,-12.46015 l -33.461822,23.25931 -6.44223,-10.79916 z"
+       id="path4878"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD
index da36b6c63..d90a8a570 100644
--- a/core/openvpn/PKGBUILD
+++ b/core/openvpn/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 123913 2011-05-14 10:10:30Z thomas $
+# $Id: PKGBUILD 135525 2011-08-14 20:37:18Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=openvpn
-pkgver=2.2.0
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
 arch=(i686 x86_64 'mips64el')
 url="http://openvpn.net/index.php/open-source.html"
-depends=('openssl' 'lzo2')
+depends=('openssl' 'lzo2' 'iproute2')
 license=('custom')
 backup=(usr/share/openvpn/easy-rsa/vars
-        usr/share/openvpn/easy-rsa/openssl.cnf
+        usr/share/openvpn/easy-rsa/openssl-1.0.0.cnf
         etc/conf.d/openvpn-tapdev)
 source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz
         openvpn.rc
         openvpn-tapdev.rc
         openvpn-tapdev.conf)
-md5sums=('4f440603eac45fec7be218b87d570834'
+md5sums=('500bee5449b29906150569aaf2eb2730'
          'a3809b9727f0c2af2d0770f5c7442db2'
          'd2c48e970088d679dd3c2afd914ff731'
          '722f483c9e3ce2ec66d3301aaf7cf3d5')
@@ -24,7 +24,11 @@ md5sums=('4f440603eac45fec7be218b87d570834'
 build() {
   cd $srcdir/$pkgname-$pkgver
   # Build openvpn
-  CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure --prefix=/usr --enable-password-save --mandir=/usr/share/man
+  CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \
+    --prefix=/usr \
+    --enable-password-save \
+    --mandir=/usr/share/man \
+    --enable-iproute2
   make
 
   # Build plugins
@@ -50,10 +54,15 @@ package() {
   for plug in auth-pam down-root; do
     cd $srcdir/$pkgname-$pkgver/plugin/$plug
     install -D -m755 openvpn-$plug.so $pkgdir/usr/lib/openvpn/openvpn-$plug.so
+    cd -
   done
+  # Install contrib
+  install -d -m755 $pkgdir/usr/share/openvpn/contrib
+  cp -r contrib $pkgdir/usr/share/openvpn
   # Install easy-rsa
   cd $srcdir/$pkgname-$pkgver
   make -C easy-rsa/2.0 install DESTDIR=$pkgdir PREFIX=usr/share/openvpn/easy-rsa
+  rm -f ${pkgdir}/usr/share/openvpn/easy-rsa/openssl-0.9.?.cnf
   # Install rc scripts
   install -D -m755 $srcdir/openvpn.rc $pkgdir/etc/rc.d/openvpn
   install -D -m755 $srcdir/openvpn-tapdev.rc $pkgdir/etc/rc.d/openvpn-tapdev
diff --git a/extra/archboot/PKGBUILD b/extra/archboot/PKGBUILD
deleted file mode 100644
index 801fab5e8..000000000
--- a/extra/archboot/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 133661 2011-07-30 09:38:54Z tpowa $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=archboot
-pkgver=2011.08
-pkgrel=1
-pkgdesc="Advanced, modular arch boot/install image creation utility"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.archlinux.org/"
-depends=('mkinitcpio>=0.7.2-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.07.3-1' 'subversion>=1.6.17-6' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-3' 'cryptsetup>=1.3.1-2' 'dialog>=1.1_20110707-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=4.0.0-1' 'grep>=2.9-1' 'iputils>=20101006-1' 'jfsutils>=1.1.15-2' 'less>=444-1' 'lvm2>=2.02.86-1' 'mdadm>=3.2.2-2' 'module-init-tools>=3.16-1' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-18' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-4' 'psmisc>=22.14-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-3' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P4-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-3' 'openssh>=5.8p2-9' 'hwdetect>=2011.06-1' 'shadow>=4.1.4.3-2' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre2-1' 'dosfstools>=3.0.11-1' 'glibc>=2.14-4' 'linux-api-headers>=2.6.39.1-1' 'linux>=3.0-2' 'kernel26-lts>=2.6.32.43-1' 'xinetd>=2.3.14-7' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-7' 'lilo>=23.2-1' 'iptables>=1.4.12-2' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=003-1' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-2' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.86-1' 'screen>=4.0.3-12' 'elfutils>=0.152-1' 'pam>=1.1.3-2' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.4-1' 'nfsidmap>=0.24-2' 'readline>=6.2.001-2' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.266-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-6' 'libldap>=2.4.26-3' 'gpm>=1.20.6-6' 'libevent>=2.0.12-1' 'gcc-libs>=4.6.1-2' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.10-1' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.6-1' 'dmraid>=1.0.0.rc16.3-2' 'linux-atm>=2.5.1-2' 'netcfg>=2.6.5-1' 'parted>=3.0-3' 'tzdata>=2011h-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.5.0-1' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.39-1' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-2' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.17-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.3-1' 'libtirpc>=0.2.2-2' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=172-2' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.3-1' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.2-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-6' 'linux-firmware>=20110727-1' 'iana-etc>=2.30-2' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.5.2-1' 'libisoburn>=1.1.2-1' 'squashfs-tools>=4.2-1')
-optdepends=('grub2-bios: for grub2 support'
-            'grub2-efi-i386: for grub2 support'
-            'grub2-efi-x86_64: for grub2 support'
-            'efibootmgr: for grub2 support'
-)
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.bz2 vmware-detect.c)
-backup=('etc/archboot/allinone.conf'
-        'etc/archboot/allinone-lts.conf'
-        'etc/archboot/default.conf'
-        'etc/archboot/default-ftp.conf'
-        'etc/archboot/default-pxelinux.conf'
-        'etc/archboot/default-ftp-pxelinux.conf'
-        'etc/archboot/presets/allinone'
-        'etc/archboot/presets/allinone-lts'
-        'etc/archboot/presets/isolinux'
-        'etc/archboot/presets/isolinux-ftp'
-        'etc/archboot/presets/syslinux'
-        'etc/archboot/presets/syslinux-ftp'
-        'etc/archboot/presets/pxelinux'
-        'etc/archboot/presets/pxelinux-ftp'
-)
-install=archboot.install
-
-### to bump the depends list use this:
-#for i in $(grep ^depends= PKGBUILD | sed  -e 's/depends=(//g' -e 's/)//g'); do sed -i -e "s/$(echo $i)/$(echo $i | sed -e "s/>=.*/>=$(pacman -Qi $(echo $i | sed -e "s/'//g" -e 's/>=.*//g') | grep ^Version | sed -e 's/.*: //g')'/g")/g" PKGBUILD; done
-
-build()
-{
-  cd $srcdir/$pkgname-$pkgver-$pkgrel
-  mv * $pkgdir/
-  # vmware-detect
-  cd $startdir/src
-  gcc -o vmware-detect vmware-detect.c
-  install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect
-}
-md5sums=('4b71827d6767c99c1144df9215108349'
-         '7e2b03463747cb22ab388e79a09fa0cb')
diff --git a/extra/archboot/archboot.install b/extra/archboot/archboot.install
deleted file mode 100644
index 315f97d7e..000000000
--- a/extra/archboot/archboot.install
+++ /dev/null
@@ -1,20 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-post_install() {
-  cat << EOF
-ARCHBOOT usage:
----------------
---> Main config files were installed to '/etc/archboot/'.
-    Preset files were installed to '/etc/archboot/presets'.
-    Modify them to your needs.
---> Use the preset files as config file of your build tool:
-    mkisolinux, mksyslinux or mkpxelinux
---> For Allinone ISOs use archboot-allinone.sh
-EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
diff --git a/extra/archboot/vmware-detect.c b/extra/archboot/vmware-detect.c
deleted file mode 100644
index d242a388d..000000000
--- a/extra/archboot/vmware-detect.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdio.h>
-int main() {
-  unsigned char idtr[6];
-  asm("sidt %0" : "=m" (idtr));
-  if(0xff==idtr[5])
-  {
-    return 0;
-  }
-  else
-  {
-    return 1;
-  }
-}
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 1d8ecb84c..29c8d9b28 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 132306 2011-07-22 16:28:25Z bisson $
+# $Id: PKGBUILD 135326 2011-08-12 20:59:31Z bisson $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=audacious
-pkgver=3.0
-pkgrel=5
+pkgver=3.0.1
+pkgrel=1
 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://audacious-media-player.org/'
@@ -13,7 +13,7 @@ license=('GPL3')
 depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('unzip: zipped skins support')
 source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('d32de719f5b09440d0f6c802a5140a32b3827475')
+sha1sums=('1532fce78702da80418d940dea96b857b75c1f9e')
 
 provides=('audacious-player')
 replaces=('audacious-player')
diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD
index 5d3424581..664c29d51 100644
--- a/extra/bftpd/PKGBUILD
+++ b/extra/bftpd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 123903 2011-05-14 09:54:29Z thomas $
+# $Id: PKGBUILD 135462 2011-08-13 23:06:44Z thomas $
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=bftpd
-pkgver=3.4
+pkgver=3.6
 pkgrel=1
 pkgdesc="Small, easy-to-configure FTP server"
 arch=(i686 x86_64 'mips64el')
@@ -19,7 +19,7 @@ source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz
         bftpd.logrotate
         bftpd.pam
         bftpd.xinetd)
-md5sums=('dcee04b5fad8c918e86c49712424fcdd'
+md5sums=('7c45b158646e3b266530bf46778fc2d0'
          '56a1bf7738a6db2b2cff89e611f4f11a'
          '853680dad0df39d0b4d2fb43d4be430a'
          '96f82c38f3f540b53f3e5144900acf17'
diff --git a/extra/bmp/PKGBUILD b/extra/bmp/PKGBUILD
index 800feeca4..ea646f637 100644
--- a/extra/bmp/PKGBUILD
+++ b/extra/bmp/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 134409 2011-08-03 18:32:37Z angvp $
+# $Id: PKGBUILD 135355 2011-08-13 06:32:50Z eric $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Ben <contrasutra@myrealbox.com>
 
 pkgname=bmp
 pkgver=0.9.7.1
-pkgrel=6
+pkgrel=8
 pkgdesc="gtk2 port of xmms"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64 mips64el)
 url="http://sourceforge.net/projects/beepmp/"
 license=('GPL')
-depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'unzip')
+depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'alsa-lib' 'unzip' 'desktop-file-utils')
 makedepends=('libxt')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch)
+install=bmp.install
+source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz \
+        ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch)
 md5sums=('c25d5a8d49cc5851d13d525a20023c4c'
          'fa1bdf5a8d03e8539a6bed5caa471176'
          '42ad4109ddb66024d4c6d1f3e572ab86')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p0 -i ../${pkgver}-visualization.patch 
   patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch 
   ./configure --prefix=/usr --mandir=/usr/share/man 
@@ -26,7 +28,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install 
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install 
 }
 # vim: ts=2 sw=2 et ft=sh
diff --git a/staging/telepathy-gabble/telepathy-gabble.install b/extra/bmp/bmp.install
index 87d7838b8..2eaa60550 100644
--- a/staging/telepathy-gabble/telepathy-gabble.install
+++ b/extra/bmp/bmp.install
@@ -1,5 +1,5 @@
 post_install() {
-  killall -HUP dbus-daemon 2>&1
+  update-desktop-database -q
 }
 
 post_upgrade() {
@@ -9,5 +9,3 @@ post_upgrade() {
 post_remove() {
   post_install $1
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 727981572..0b64ad9d0 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 117080 2011-03-28 14:57:03Z dan $
+# $Id: PKGBUILD 135533 2011-08-15 02:13:14Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.7.4
+pkgver=1.7.5
 pkgrel=1
 license=('GPL')
 arch=(i686 x86_64 'mips64el')
 url="http://www.doxygen.org/"
 makedepends=('flex' 'texlive-core' 'ghostscript' 'texlive-latexextra') #'qt' 
 source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
-md5sums=('ff908759ff7cd9464424b04ae6c68e48')
-sha1sums=('4f68b655c93265cb15ef1b8c9ca35ebc39698cf0')
+md5sums=('40912d0a4b8248d78df6f705837dcd80')
+sha1sums=('406c261950b73037d91a2dce0799693a42d96051')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/esound/PKGBUILD b/extra/esound/PKGBUILD
deleted file mode 100644
index bf8f8c0c3..000000000
--- a/extra/esound/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 131830 2011-07-16 00:02:10Z dreisner $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=esound
-pkgver=0.2.41
-pkgrel=2
-pkgdesc="Enlightened Sound Daemon"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL')
-depends=('audiofile' 'alsa-lib>=1.0.18')
-url="http://www.tux.org/~ricdude/EsounD.html"
-provides=("esd=${pkgver}")
-replaces=('esd')
-conflicts=('esd')
-backup=('etc/esd.conf')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2
-	esd-0.2.38-alsa-drain.patch
-	esd)
-md5sums=('8d9aad3d94d15e0d59ba9dc0ea990c6c'
-         '3de93efcd1bc196a3585e6aef50eac48'
-         'a4c76e7c7f75b201ea7ab6fb15b47472')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/esd-0.2.38-alsa-drain.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static \
-              --with-audiofile --without-libwrap \
-              --enable-alsa --disable-artstest
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 "${srcdir}/esd" "${pkgdir}/etc/rc.d/esd"
-}
diff --git a/extra/esound/esd-0.2.38-alsa-drain.patch b/extra/esound/esd-0.2.38-alsa-drain.patch
deleted file mode 100644
index f2fb716ba..000000000
--- a/extra/esound/esd-0.2.38-alsa-drain.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- esound-0.2.38/audio_alsa09.c.old	2007-06-11 12:22:24.000000000 +0200
-+++ esound-0.2.38/audio_alsa09.c	2007-06-11 12:22:49.000000000 +0200
-@@ -486,7 +486,7 @@ void esd_audio_flush(void)
- 	}
- 
- 	if (alsa_playback_handle != NULL)
--		snd_pcm_drain( alsa_playback_handle );
-+		snd_pcm_drop( alsa_playback_handle );
-   
- 	if (alsadbg) 
- 		print_state();
diff --git a/extra/ettercap/01_pointers_and_ints_dont_mix.diff b/extra/ettercap/01_pointers_and_ints_dont_mix.diff
index bf7022266..65571309c 100644
--- a/extra/ettercap/01_pointers_and_ints_dont_mix.diff
+++ b/extra/ettercap/01_pointers_and_ints_dont_mix.diff
@@ -1,12 +1,13 @@
 See debian bug #521857, patch from Timothy Redaelli <timothy@redaelli.eu>
+Revised by Robert Edmonds <edmonds@debian.org>
 
---- ettercap-0.7.3.orig/src/protocols/ec_tcp.c
-+++ ettercap-0.7.3/src/protocols/ec_tcp.c
+--- a/src/protocols/ec_tcp.c
++++ b/src/protocols/ec_tcp.c
 @@ -116,7 +116,7 @@
     tcp = (struct tcp_header *)DECODE_DATA;
     
     opt_start = (u_char *)(tcp + 1);
 -   opt_end = (u_char *)((int)tcp + tcp->off * 4);
-+   opt_end = (u_char *)(tcp + tcp->off * 4);
++   opt_end = (u_char *)(((u_char *)tcp) + tcp->off * 4);
  
     DECODED_LEN = (u_int32)(tcp->off * 4);
diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD
index 4c26f1985..34d86d7e1 100644
--- a/extra/ettercap/PKGBUILD
+++ b/extra/ettercap/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 134606 2011-08-06 11:42:31Z giovanni $
+# $Id: PKGBUILD 135334 2011-08-12 21:28:33Z giovanni $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ettercap
 pkgver=NG_0.7.3
 _origver=NG-0.7.3
-pkgrel=17
+pkgrel=18
 pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ettercap.sourceforge.net/"
@@ -18,8 +18,8 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_origver}.tar.
         01_pointers_and_ints_dont_mix.diff
         ettercap-NG-0.7.3_dns_support_on_x86_64.patch)
 md5sums=('28fb15cd024162c55249888fe1b97820'
-         'ad235cd90aaa3e168575d06efac4d862'
-         'f3d66186eece056a6d71453f9f288623')
+         'c8f2b004f69ac3522ffebb530478b324'
+         'd44f80292afcefdc13cba9a30c6391d6')
 
 build() {
   cd ${srcdir}/${pkgname}-${_origver}
diff --git a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
index ed455a878..1754f2e3d 100644
--- a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
+++ b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
@@ -14,7 +14,7 @@
  
  else
 -   if false; then
-+if true; then
++   if true; then
    HAVE_DN_EXPAND_TRUE=
    HAVE_DN_EXPAND_FALSE='#'
  else
diff --git a/extra/hal/PKGBUILD b/extra/hal/PKGBUILD
deleted file mode 100644
index a78832db8..000000000
--- a/extra/hal/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 105528 2011-01-10 10:53:12Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=hal
-pkgver=0.5.14
-pkgrel=6
-pkgdesc="Hardware Abstraction Layer"
-arch=(i686 x86_64 'mips64el')
-license=('GPL' 'custom')
-url="http://www.freedesktop.org/wiki/Software/hal"
-depends=('dbus-glib>=0.82' 'libusb-compat' 'udev>=146' 'filesystem>=0.7.1-5' 'hal-info>=0.20090716' 'eject' 'dmidecode' 'pciutils>=3.0.2' 'usbutils>=0.73-5' 'pm-utils>=1.2.5' 'consolekit>=0.4.1' 'util-linux-ng>=2.16')
-makedepends=('pkgconfig' 'gperf')
-options=('!libtool' '!makeflags')
-install=hal.install
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
-        hal
-        hal-0.5.9-hide-diagnostic.patch
-        hal-remove-dell-killswitch.patch
-        hal-KVM-evdev.patch
-        hal-HDAPS-blacklist.patch
-        hal-xen-unignore-axes.patch
-        hal-use-at-console.patch
-        fix-libusb-detection.patch
-        dbus-error-init.patch
-        path-max.patch
-        handle-input-touchpad.patch
-        macbook-fix-ioperm.patch
-        hal-ignore-internal-dm-devices.patch)
-md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
-         '277e96ac130d7bfce0b30f0b80db8782'
-         '4d4b6801a1cedca22b8bdd9db73b16fb'
-         '6d87c3e63184ae3a69caafc846f538a3'
-         '6507e5091ee2d11a87ae738a8e2caecb'
-         '1171c2d83b76059f2da7a3538e08fa4e'
-         '52bd305299aa22ae07f1a862c22d30fa'
-         '3f11234fb5e5044fbfc5199ec65b182c'
-         'da088f12cfc2d190bbf95b747e19ab9e'
-         '634f4ec2203eff7de8fa2ed2c6b9cbe0'
-         'f8c9b3a40d03907b498feef571d42466'
-         '0575677614db0632b17b1a719798c7e0'
-         '46a5db3ff896ee37762aa8d7e70942c4'
-         '17bc2b911f245cef4a1d98769d5c4d14')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch"
-  patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch"
-  patch -Np1 -i "${srcdir}/hal-KVM-evdev.patch"
-  patch -Np1 -i "${srcdir}/hal-HDAPS-blacklist.patch"
-  patch -Np1 -i "${srcdir}/hal-xen-unignore-axes.patch"
-  patch -Np1 -i "${srcdir}/hal-use-at-console.patch"
-  patch -Np1 -i "${srcdir}/fix-libusb-detection.patch"
-  patch -Np1 -i "${srcdir}/dbus-error-init.patch"
-  patch -Np1 -i "${srcdir}/path-max.patch"
-  patch -Np1 -i "${srcdir}/handle-input-touchpad.patch"
-  patch -Np1 -i "${srcdir}/macbook-fix-ioperm.patch"
-  patch -Np1 -i "${srcdir}/hal-ignore-internal-dm-devices.patch"
-  
-  libtoolize --force
-  aclocal
-  autoconf
-  automake
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/hal --with-udev-prefix=/etc \
-      --enable-static=no --disable-acpi-ibm \
-      --disable-docbook-docs --disable-console-kit \
-      --disable-policy-kit --disable-acl-management \
-      --enable-umount-helper --disable-smbios \
-      --with-hal-user=hal --with-hal-group=hal \
-      --with-pid-file=/var/run/hald.pid \
-      --disable-gtk-doc
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 -d "${pkgdir}/media"
-  install -m755 "${srcdir}/hal" "${pkgdir}/etc/rc.d/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-  
-  # Fix udev rule location
-  install -d -m755 "${pkgdir}/lib"
-  mv "${pkgdir}/etc/udev" "${pkgdir}/lib/"
-}
diff --git a/extra/hal/dbus-error-init.patch b/extra/hal/dbus-error-init.patch
deleted file mode 100644
index fb3ad020a..000000000
--- a/extra/hal/dbus-error-init.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From dcb2829b8eff61463b0869614ddb07b1c86cecaa Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Wed, 30 Dec 2009 11:42:52 +0000
-Subject: linux/probe-input: don't use error prio init
-
-it may happen in the out: case that LIBHAL_FREE_DBUS_ERROR (&error) is
-called before the error structure is initialized via
-dbus_error_init (&error). This could lead to a segfault during startup
-as seen in dmesg:
-
-|Intel AES-NI instructions are not detected.
-|padlock: VIA PadLock not detected.
-|hald-probe-inpu[1793]: segfault at 2 ip 00007f656fb68969 sp 00007fff39eeb950 error 4 in libc-2.10.2.so[7f656faf3000+14a000]
-|hald-probe-inpu[1796]: segfault at 2 ip 00007fa2c3293969 sp 00007fffd92a5dd0 error 4 in libc-2.10.2.so[7fa2c321e000+14a000]
-|hald-probe-inpu[1797]: segfault at 2 ip 00007f1d08ba2969 sp 00007fff34244e30 error 4 in libc-2.10.2.so[7f1d08b2d000+14a000]
-|hald-probe-inpu[1799]: segfault at 2 ip 00007f35c0e3d969 sp 00007fffe5ec7ee0 error 4 in libc-2.10.2.so[7f35c0dc8000+14a000]
-|hald-probe-inpu[1800]: segfault at 2 ip 00007f931c556969 sp 00007fffe1825b60 error 4 in libc-2.10.2.so[7f931c4e1000+14a000]
-|hald-probe-inpu[1801]: segfault at 2 ip 00007f5156d9a969 sp 00007fff4e620af0 error 4 in libc-2.10.2.so[7f5156d25000+14a000]
-|RPC: Registered udp transport module.
-|RPC: Registered tcp transport module.
-
-What I run into seems to be reported as Debian #562068 [0]. This patch
-makes the segfault go away on my machine.
-
-[0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=562068
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
----
-diff --git a/hald/linux/probing/probe-input.c b/hald/linux/probing/probe-input.c
-index 94e9929..cad47d3 100644
---- a/hald/linux/probing/probe-input.c
-+++ b/hald/linux/probing/probe-input.c
-@@ -70,6 +70,7 @@ main (int argc, char *argv[])
- 	fd = -1;
- 
- 	setup_logger ();
-+	dbus_error_init (&error);
- 
- 	button_type = getenv ("HAL_PROP_BUTTON_TYPE");
- 	if (button_type == NULL)
-@@ -96,7 +97,6 @@ main (int argc, char *argv[])
- 	if (udi == NULL)
- 		goto out;
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- 		goto out;
- 
---
-cgit v0.8.3-6-g21f6
-From baa61a879985d63f549854518ef14efd40e62e8c Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Wed, 24 Feb 2010 16:19:28 +0000
-Subject: Make sure dbus_error_init() is called before LIBHAL_FREE_DBUS_ERROR()
-
-If dbus_error_init() is not called before LIBHAL_FREE_DBUS_ERROR() is
-called on that error, then it is uninitialized and may segfault.  This
-means that dbus_error_init() must be called before any "goto out" if
-"out:" calls LIBHAL_FREE_DBUS_ERROR().
-
-Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
----
-diff --git a/hald/linux/probing/probe-hiddev.c b/hald/linux/probing/probe-hiddev.c
-index 45d2084..bffc040 100644
---- a/hald/linux/probing/probe-hiddev.c
-+++ b/hald/linux/probing/probe-hiddev.c
-@@ -57,11 +57,12 @@ main (int argc, char *argv[])
- 	/* assume failure */
- 	ret = 1;
- 
-+	dbus_error_init (&error);
-+
- 	udi = getenv ("UDI");
- 	if (udi == NULL)
- 		goto out;
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- 		goto out;
- 
-diff --git a/hald/linux/probing/probe-ieee1394-unit.c b/hald/linux/probing/probe-ieee1394-unit.c
-index 70b0f86..aaa92e2 100644
---- a/hald/linux/probing/probe-ieee1394-unit.c
-+++ b/hald/linux/probing/probe-ieee1394-unit.c
-@@ -388,6 +388,8 @@ int main (int argc, char *argv[])
- 
- 	setup_logger ();
- 
-+	dbus_error_init (&error);
-+
- 	udi = getenv ("UDI");
- 	if (udi == NULL)
- 		goto out;
-@@ -396,7 +398,6 @@ int main (int argc, char *argv[])
- 	if (ieee1394_udi == NULL)
- 		goto out;
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- 		goto out;
- 
-diff --git a/hald/linux/probing/probe-net-bluetooth.c b/hald/linux/probing/probe-net-bluetooth.c
-index 0b1b912..e911eea 100644
---- a/hald/linux/probing/probe-net-bluetooth.c
-+++ b/hald/linux/probing/probe-net-bluetooth.c
-@@ -141,6 +141,8 @@ main (int argc, char *argv[])
- 	DBusMessage *reply = NULL;
- 	DBusError error;
- 
-+	dbus_error_init (&error);
-+
- 	udi = getenv ("UDI");
- 	if (udi == NULL)
- 		goto out;
-@@ -151,8 +153,6 @@ main (int argc, char *argv[])
- 
- 	HAL_INFO (("Investigating '%s'", iface));
- 
--	dbus_error_init (&error);
--
- 	if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL)
- 		goto out;
- 
-diff --git a/hald/linux/probing/probe-printer.c b/hald/linux/probing/probe-printer.c
-index 91ed7bc..7c6d1c6 100644
---- a/hald/linux/probing/probe-printer.c
-+++ b/hald/linux/probing/probe-printer.c
-@@ -66,6 +66,8 @@ main (int argc, char *argv[])
- 	ret = 1;
- 
- 	setup_logger ();
-+
-+	dbus_error_init (&error);
- 	
- 	udi = getenv ("UDI");
- 	if (udi == NULL) {
-@@ -73,7 +75,6 @@ main (int argc, char *argv[])
- 		goto out;
- 	}
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
- 		HAL_ERROR (("ctx init failed"));
- 		goto out;
-diff --git a/hald/linux/probing/probe-smbios.c b/hald/linux/probing/probe-smbios.c
-index 0bc9689..15c0d4f 100644
---- a/hald/linux/probing/probe-smbios.c
-+++ b/hald/linux/probing/probe-smbios.c
-@@ -129,6 +129,8 @@ main (int argc, char *argv[])
- 	ret = 1;
- 
- 	setup_logger ();
-+
-+	dbus_error_init (&error);
- 	
- 	udi = getenv ("UDI");
- 	if (udi == NULL) {
-@@ -136,7 +138,6 @@ main (int argc, char *argv[])
- 		goto out;
- 	}
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
- 		HAL_ERROR (("ctx init failed"));
- 		goto out;
-diff --git a/hald/linux/probing/probe-storage.c b/hald/linux/probing/probe-storage.c
-index 824a82e..dd524ca 100644
---- a/hald/linux/probing/probe-storage.c
-+++ b/hald/linux/probing/probe-storage.c
-@@ -109,6 +109,8 @@ main (int argc, char *argv[])
- 	/* assume failure */
- 	ret = 1;
- 
-+	dbus_error_init (&error);
-+
- 	if ((udi = getenv ("UDI")) == NULL)
- 		goto out;
- 	if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
-@@ -127,7 +129,6 @@ main (int argc, char *argv[])
- 	else
- 		only_check_for_fs = FALSE;
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- 		goto out;
- 
-diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c
-index cf913c0..7bc13e8 100644
---- a/hald/linux/probing/probe-video4linux.c
-+++ b/hald/linux/probing/probe-video4linux.c
-@@ -58,6 +58,8 @@ main (int argc, char *argv[])
- 
- 	setup_logger ();
- 
-+	dbus_error_init (&error);
-+
- 	device_file = getenv ("HAL_PROP_VIDEO4LINUX_DEVICE");
- 	if (device_file == NULL)
- 		goto out;
-@@ -66,7 +68,6 @@ main (int argc, char *argv[])
- 	if (udi == NULL)
- 		goto out;
- 
--	dbus_error_init (&error);
- 	ctx = libhal_ctx_init_direct (&error);
- 	if (ctx == NULL)
- 		goto out;
-diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c
-index 0de1b91..7268fff 100644
---- a/hald/linux/probing/probe-volume.c
-+++ b/hald/linux/probing/probe-volume.c
-@@ -318,6 +318,8 @@ main (int argc, char *argv[])
- 	/* assume failure */
- 	ret = 1;
- 
-+	dbus_error_init (&error);
-+
- 	if ((udi = getenv ("UDI")) == NULL)
- 		goto out;
- 	if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
-@@ -346,7 +348,6 @@ main (int argc, char *argv[])
- 
- 	fsusage = getenv ("HAL_PROP_VOLUME_FSUSAGE");
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- 		goto out;
- 
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/hal/fix-libusb-detection.patch b/extra/hal/fix-libusb-detection.patch
deleted file mode 100644
index d4f966dec..000000000
--- a/extra/hal/fix-libusb-detection.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From fce91df8ba7f305c624baf1f06961c040b088ecc Mon Sep 17 00:00:00 2001
-From: Joe Marcus Clarke <marcus@FreeBSD.org>
-Date: Tue, 08 Dec 2009 00:05:27 +0000
-Subject: Fix libusb detection on Linux
-
-Adjust the FreeBSD libusb20 code so that it does not interfere with the
-Linux libusb detection.
-
-Reported by:	Robby Workman <rw@rlworkman.net>
----
-diff --git a/configure.in b/configure.in
-index a8fda51..8363595 100644
---- a/configure.in
-+++ b/configure.in
-@@ -479,9 +479,6 @@ if test "x$with_libpci" != xno ; then
- fi 
- AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
- 
--USE_LIBUSB20=no
--USE_LIBUSB=no
--LIBUSB20_LIBS=""
- AC_ARG_WITH([backend],
- 	    AS_HELP_STRING([--with-backend=<name>],
- 	                   [backend to use (linux/solaris/freebsd/dummy)]),
-@@ -510,21 +507,25 @@ AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compilin
- AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
- AC_SUBST(HALD_BACKEND)
- if test "x$HALD_BACKEND" = "xfreebsd"; then
--    AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no])
--fi
--if test "x$USE_LIBUSB20" = "xno"; then
--    AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no])
--fi
--AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"])
--AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"])
--if test "x$USE_LIBUSB20" = "xyes"; then
--    AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
--    LIBUSB20_LIBS="-lusb20"
--elif test "x$USE_LIBUSB" = "xyes"; then
--    AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
--    LIBUSB20_LIBS="-lusb"
-+    USE_BSDLIBUSB20=no
-+    USE_BSDLIBUSB=no
-+    LIBUSB20_LIBS=""
-+    AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_BSDLIBUSB20=yes], [USE_BSDLIBUSB20=no])
-+    if test "x$USE_BSDLIBUSB20" = "xno"; then
-+        AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_BSDLIBUSB=yes], [USE_BSDLIBUSB=no])
-+    fi
-+    AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"])
-+    if test "x$USE_BSDLIBUSB20" = "xyes"; then
-+        AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
-+        LIBUSB20_LIBS="-lusb20"
-+    elif test "x$USE_BSDLIBUSB" = "xyes"; then
-+        AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
-+        LIBUSB20_LIBS="-lusb"
-+    fi
-+    AC_SUBST(LIBUSB20_LIBS)
-+else
-+    AM_CONDITIONAL([HAVE_LIBUSB20], [false])
- fi
--AC_SUBST(LIBUSB20_LIBS)
- 
- dnl DBUS API is subject to changes
- AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change])
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/hal/hal b/extra/hal/hal
deleted file mode 100644
index 012d456ed..000000000
--- a/extra/hal/hal
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-        #Check for running dbus, start when not running
-    	ck_daemon dbus && /etc/rc.d/dbus start
-	if [ -x /etc/rc.d/acpid ]; then
-		ck_daemon acpid && /etc/rc.d/acpid start
-	fi
-        stat_busy "Starting Hardware Abstraction Layer"
-        if [ ! -x /var/cache/hald ] ; then
-		install -m755 -g 82 -o 82 -d /var/cache/hald
-        fi
-	if [ ! -x /var/run/hald ]; then
-		install -m755 -g 82 -o 82 -d /var/run/hald
-	fi
-	if [ ! -x /var/run/hald/hald-local ]; then
-		install -m755 -g 0 -o 0 -d /var/run/hald/hald-local
-	fi
-	if [ ! -x /var/run/hald/hald-runner ]; then
-		install -m755 -g 0 -o 0 -d /var/run/hald/hald-runner
-	fi
-	/usr/sbin/hald
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		add_daemon hal
-		stat_done
-	fi
-        ;;
-    stop)
-	stat_busy "Stopping Hardware Abstraction Layer"
-	[ -f /var/run/hald.pid ] && kill `cat /var/run/hald.pid` &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		rm_daemon hal
-		stat_done
-	fi
-	;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/extra/hal/hal-0.5.9-hide-diagnostic.patch b/extra/hal/hal-0.5.9-hide-diagnostic.patch
deleted file mode 100644
index 58c882d77..000000000
--- a/extra/hal/hal-0.5.9-hide-diagnostic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi.orig	2007-05-01 21:39:31.000000000 +0000
-+++ hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi	2007-05-01 21:51:14.000000000 +0000
-@@ -100,6 +100,11 @@
- 	</match>
-       </match>
- 
-+      <!-- Hide partitions marked as Compaq Diagnostics -->
-+      <match key="volume.partition.type" string="0x12">
-+        <merge key="volume.ignore" type="bool">true</merge>
-+      </match>
-+
-       <!-- EFI firmware partitions -->
-       <match key="volume.fstype" string="vfat">
- 	<match key="volume.label" string="EFI">
diff --git a/extra/hal/hal-HDAPS-blacklist.patch b/extra/hal/hal-HDAPS-blacklist.patch
deleted file mode 100644
index 8a6822817..000000000
--- a/extra/hal/hal-HDAPS-blacklist.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e1f85fe0cdfa7e4d4ce7a811d0b0c90bf38fba0c Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 25 Jun 2009 09:47:27 +1000
-Subject: [PATCH] Blacklist HDAPS accelerometer device from being picked up in X.
-
-This device posts accelerometer data through ABS_X/ABS_Y, making X unusable
-if it's controlling the pointer.
----
- fdi/policy/10osvendor/10-x11-input.fdi |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
-index a342421..89ba672 100644
---- a/fdi/policy/10osvendor/10-x11-input.fdi
-+++ b/fdi/policy/10osvendor/10-x11-input.fdi
-@@ -38,5 +38,11 @@
-         <merge key="input.x11_driver" type="string">evdev</merge>
-       </match>
-     </match>
-+
-+    <!-- http://bugs.freedesktop.org/show_bug.cgi?id=22442 
-+         Posts accel data through ABS_X/ABS_Y, makes X unusable -->
-+    <match key="info.product" contains="ThinkPad HDAPS accelerometer data">
-+        <remove key="input.x11_driver" />
-+    </match>
-   </device>
- </deviceinfo>
--- 
-1.6.3.rc1.2.g0164.dirty
-
diff --git a/extra/hal/hal-KVM-evdev.patch b/extra/hal/hal-KVM-evdev.patch
deleted file mode 100644
index 917655ed1..000000000
--- a/extra/hal/hal-KVM-evdev.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7618498eec840cb26474dc47821e083957772706 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri, 20 Mar 2009 14:37:24 +1000
-Subject: [PATCH] Add x11_driver for American Megatrends KVM.
-
-This device exposes only ABS_X, ABS_Y and buttons. It gets input.joystick
-assigned but not input.mouse, hence the default evdev mapping doesn't pick up
-on it.
-
-Red Hat Bug 484776 <https://bugzilla.redhat.com/show_bug.cgi?id=484776>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- fdi/policy/10osvendor/10-x11-input.fdi |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
-index 769f75b..eb9767e 100644
---- a/fdi/policy/10osvendor/10-x11-input.fdi
-+++ b/fdi/policy/10osvendor/10-x11-input.fdi
-@@ -2,6 +2,12 @@
- <deviceinfo version="0.2">
-   <device>
- 
-+    <!-- This KVMS has abs x/y and buttons. It only has inputInfo.joystick
-+         set by hal and doesn't get picked up by default -->
-+    <match key="input.product" contains="American Megatrends Inc. Virtual Keyboard and Mouse">
-+       <merge key="input.x11_driver" type="string">evdev</merge>
-+    </match>
-+
-     <!-- KVM emulates a USB graphics tablet which works in absolute coordinate mode -->
-     <match key="input.product" contains="QEMU USB Tablet">
-        <merge key="input.x11_driver" type="string">evdev</merge>
--- 
-1.6.0.6
-
diff --git a/extra/hal/hal-ignore-internal-dm-devices.patch b/extra/hal/hal-ignore-internal-dm-devices.patch
deleted file mode 100644
index 9ad8656ca..000000000
--- a/extra/hal/hal-ignore-internal-dm-devices.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6f16321da13f6a7cbd9c424ddba2e727e434fa25 Mon Sep 17 00:00:00 2001
-From: Milan Broz <mbroz@redhat.com>
-Date: Tue, 13 Jul 2010 14:07:32 +0000
-Subject: HAL: Ignore internal DM devices with new DM udev rules
-
-With new device-mapper udev rules are /dev/mapper/* symlinks
-to basic device name /dev/dm-X.
-(Change requested by udev upstream.)
-
-This change breaks temporary-cryptsetup workaround inside hal.
-
-With new dm-udev rules (uncluded since device-mapper 1.02.39)
-there is DM_UDEV_DISABLE_OTHER_RULES_FLAG variable
-which controls that scan should be ignored for this device
-(it is set for all internal devices, including temporary cryptsetup,
-internal parts of lvm devices etc.)
-
-Ignore device if this flag is set.
-
-See bugs
-https://bugzilla.redhat.com/show_bug.cgi?id=613909
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586286
-
-Signed-off-by: Milan Broz <mbroz@redhat.com>
----
-diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
-index a8233fd..6d616bc 100644
---- a/hald/linux/osspec.c
-+++ b/hald/linux/osspec.c
-@@ -215,6 +215,11 @@ hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data)
- 				g_free (str);
- 			}
- 			g_free (dstr);
-+		} else if (strncmp(key, "DM_UDEV_DISABLE_OTHER_RULES_FLAG=", 33) == 0) {
-+			if (strtoul(&key[33], NULL, 10) == 1) {
-+				HAL_INFO (("ignoring device requested by DM udev rules"));
-+				goto invalid;
-+			}
- 		}
- 	}
- 
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/hal/hal-remove-dell-killswitch.patch b/extra/hal/hal-remove-dell-killswitch.patch
deleted file mode 100644
index ae0cf7a2b..000000000
--- a/extra/hal/hal-remove-dell-killswitch.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux
---- hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux	2008-08-22 07:34:47.000000000 +0100
-+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux	2009-03-03 10:45:20.000000000 +0000
-@@ -8,11 +8,6 @@
- # the Free Software Foundation; either version 2 of the License, or
- # (at your option) any later version.
- 
--DELL_WCTL=/usr/bin/dellWirelessCtl
--if [ -x "/usr/sbin/dellWirelessCtl" ]; then
--  DELL_WCTL=/usr/sbin/dellWirelessCtl
--fi
--
- if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
-     if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
- 	value="`hal-system-sonypic getbluetooth`"
-@@ -22,25 +17,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
- 	    exit 1
- 	fi
- 	exit ${value}
--    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
--	if [ -x "$DELL_WCTL" ]; then
--	    # TODO: write our own binary that links with libsmbios?
--	    $DELL_WCTL --st_bt
--	    value=$?
--	    if [ "$value" = "0" ]; then
--	        exit 1
--	    elif [ "$value" = "1" ]; then
--	        exit 0
--	    else
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $value" >&2
--                exit 1
--	    fi
--        else
--	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--	    exit 1
--	fi
-     elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -r "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
- 	read value < $HAL_PROP_LINUX_SYSFS_PATH 2> /dev/null
- 	if [ $? -eq 0 ]; then
-@@ -55,56 +31,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
- 	echo "Access type not supported" >&2
- 	exit 1
-     fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
--    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
--	if [ -x "$DELL_WCTL" ]; then
-- 	    # TODO: write our own binary that links with libsmbios?
--	    $DELL_WCTL --st_wlan
--	    value=$?
--	    if [ "$value" = "0" ]; then
--	        exit 1
--	    elif [ "$value" = "1" ]; then
--	        exit 0
--	    else
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $value" >&2
--                exit 1
--	    fi
--	else 
--	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--	    exit 1
--	fi
--    else
--	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	echo "Access type not supported" >&2
--	exit 1
--    fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
--    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
--	if [ -x "$DELL_WCTL" ]; then
--   	    # TODO: write our own binary that links with libsmbios?
--	    $DELL_WCTL --st_wwan
--	    value=$?
--	    if [ "$value" = "0" ]; then
--	        exit 1
--	    elif [ "$value" = "1" ]; then
--	        exit 0
--	    else
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $value" >&2
--                exit 1
--	    fi
--	else 
--	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--	    exit 1
--	fi
--    else
--	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	echo "Access type not supported" >&2
--	exit 1
--    fi
- else
-     echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-     echo "Killswitch type not supported" >&2
-diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux
---- hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux	2008-10-24 09:45:54.000000000 +0100
-+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux	2009-03-03 10:44:49.000000000 +0000
-@@ -8,11 +8,6 @@
- # the Free Software Foundation; either version 2 of the License, or
- # (at your option) any later version.
- 
--DELL_WCTL=/usr/bin/dellWirelessCtl
--if [ -x "/usr/sbin/dellWirelessCtl" ]; then
--    DELL_WCTL=/usr/sbin/dellWirelessCtl
--fi
--
- if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
-     if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
- 	hal-system-sonypic setbluetooth $value
-@@ -23,26 +18,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
- 	    exit 1
- 	fi
- 	exit 0
--    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
--	if [ -x "$DELL_WCTL" ]; then
--	    # TODO: write our own binary that links with libsmbios?
--	    if [ "$value" = "true" ]; then
--	        $DELL_WCTL --bt 1
--	        ret=$?
--	    else
--	        $DELL_WCTL --bt 0
--	        ret=$?
--	    fi
--	    if [ "$ret" != "0" ]; then
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $ret" >&2
--	        exit 1
--	    fi
--        else
--            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--            exit 1
--        fi
-     elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -w "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
-         if [ "$value" = "true" ]; then 
- 	    bit=1; 
-@@ -61,60 +36,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
- 	echo "Access type not supported" >&2
- 	exit 1
-     fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
--    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
--	if [ -x "$DELL_WCTL" ]; then
--	    # As a side effect we disable the physical kill switch
--	    # TODO: write our own binary that links with libsmbios?
--	    if [ "$value" = "true" ]; then
--	        $DELL_WCTL --sw_wlan 0 --wlan 1
--	        ret=$?
--	    else
--	        $DELL_WCTL --sw_wlan 0 --wlan 0
--	        ret=$?
--	    fi
--	    if [ "$ret" != "0" ]; then
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $ret" >&2
--                exit 1
--	    fi
--        else
--            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--            exit 1
--        fi
--    else
--	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	echo "Access type not supported" >&2
--	exit 1
--    fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
--    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then 
--	if [ -x "$DELL_WCTL" ]; then
--	    # As a side effect we disable the physical kill switch
--	    # TODO: write our own binary that links with libsmbios?
--	    if [ "$value" = "true" ]; then
--	        $DELL_WCTL --sw_wwan 0 --wwan 1
--	        ret=$?
--	    else
--	        $DELL_WCTL --sw_wwan 0 --wwan 0
--	        ret=$?
--	    fi
--	    if [ "$ret" != "0" ]; then
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $ret" >&2
--                exit 1
--	    fi
--        else
--            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--            exit 1
--        fi
--    else
--	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	echo "Access type not supported" >&2
--	exit 1
--    fi
- else
-     echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-     echo "Killswitch type not supported" >&2
diff --git a/extra/hal/hal-use-at-console.patch b/extra/hal/hal-use-at-console.patch
deleted file mode 100644
index 0b32f17f0..000000000
--- a/extra/hal/hal-use-at-console.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -up hal-0.5.13/hal.conf.in.drop-polkit hal-0.5.13/hal.conf.in
---- hal-0.5.13/hal.conf.in.drop-polkit	2009-02-04 17:07:23.000000000 -0500
-+++ hal-0.5.13/hal.conf.in	2009-07-29 23:15:16.866766074 -0400
-@@ -25,7 +25,41 @@
-            send_interface="org.freedesktop.Hal.Device"/>
-     <allow send_destination="org.freedesktop.Hal"
-            send_interface="org.freedesktop.Hal.Manager"/>
-+  </policy>
-+
-+  <!-- Only allow users at the local console to manipulate devices -->
-+  <policy at_console="true">
-+    <allow send_destination="org.freedesktop.Hal"
-+           send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.DockStation"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.KillSwitch"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.KeyboardBacklight"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Leds"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.LightSensor"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Storage"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Storage.Removable"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Volume"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.WakeOnLan"/>
-+
-+  </policy>
- 
-+  <!-- well,...and root too -->
-+  <policy user="root">
-     <allow send_destination="org.freedesktop.Hal"
-            send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
-     <allow send_destination="org.freedesktop.Hal"
diff --git a/extra/hal/hal-xen-unignore-axes.patch b/extra/hal/hal-xen-unignore-axes.patch
deleted file mode 100644
index b248639b7..000000000
--- a/extra/hal/hal-xen-unignore-axes.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e48f59d2b9bcb43ea8a7b8c884dcb73c8f65b170 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 19 Oct 2009 14:27:20 +1000
-Subject: [PATCH] Un-ignore absolute axes for the Xen Virtual Pointer.
-
-The evdev-internal axis type picking fails for the Xen Virtual Pointer as it
-exposes both relative and absolute axes. Evdev picks the relative axes by
-default, leading to a immovable pointer if the Xen backend only sends
-absolute coordinates.
-
-Explicitly tell evdev to not ignore the absolute axes.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=523914
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- fdi/policy/10osvendor/10-x11-input.fdi |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
-index 89ba672..752c4ab 100644
---- a/fdi/policy/10osvendor/10-x11-input.fdi
-+++ b/fdi/policy/10osvendor/10-x11-input.fdi
-@@ -44,5 +44,12 @@
-     <match key="info.product" contains="ThinkPad HDAPS accelerometer data">
-         <remove key="input.x11_driver" />
-     </match>
-+
-+    <!-- https://bugzilla.redhat.com/show_bug.cgi?id=523914
-+         Mouse does not move in PV Xen guest -->
-+    <match key="info.product" contains="Xen Virtual Pointer">
-+      <merge key="input.x11_options.IgnoreAbsoluteAxes" type="string">false</merge>
-+      <merge key="input.x11_options.IgnoreRelativeAxes" type="string">false</merge>
-+    </match>
-   </device>
- </deviceinfo>
--- 
-1.6.2.5
-
diff --git a/extra/hal/hal.install b/extra/hal/hal.install
deleted file mode 100644
index d6afee384..000000000
--- a/extra/hal/hal.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  getent group hal >/dev/null || usr/sbin/groupadd -g 82 hal
-  getent group optical >/dev/null || usr/sbin/groupadd -g 93 optical
-  getent group floppy >/dev/null || usr/sbin/groupadd -g 94 floppy
-  getent group storage >/dev/null || usr/sbin/groupadd -g 95 storage
-  getent passwd hal >/dev/null || usr/sbin/useradd -c 'HAL daemon' -u 82 -g hal -G optical,floppy,storage -d '/' -s /bin/false hal
-  usr/bin/passwd -l hal &>/dev/null
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-# arg 1:  the old package version
-post_remove() {
-  if getent passwd hal &>/dev/null; then
-    usr/sbin/userdel hal
-  fi
-  if getent group hal &>/dev/null; then
-    usr/sbin/groupdel hal
-  fi
-}
diff --git a/extra/hal/handle-input-touchpad.patch b/extra/hal/handle-input-touchpad.patch
deleted file mode 100644
index 9cd646422..000000000
--- a/extra/hal/handle-input-touchpad.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 6dccf8e3ad181e8f56b1d2a994ec50a1953a1c2d Mon Sep 17 00:00:00 2001
-From: Michael Witten <mfwitten@gmail.com>
-Date: Wed, 06 Jan 2010 00:53:17 +0000
-Subject: Policy: handle `input.touchpad' explicitly
-
-This commit essentially duplicates the policy for:
-
-   <match key="info.capabilities" contains="input.mouse">
-
-and then changes `input.mouse' to `input.touchpad'. This
-is necessary because in Linus Torvalds's Linux repo:
-
-    git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
-
-the following commit:
-
-    commit 7105d2ea73e1391b681d0e1212c42f561c64d429
-    Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-    Date:   Fri Dec 11 23:54:54 2009 -0800
-
-        Input: ALPS - do not set REL_X/REL_Y capabilities on the touchpad
-
-        Relative events are only reported via secondary device therefore device
-        associated with the touchpad should not advertise these capabilities.
-
-        Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-
-made these few changes:
-
-    diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
-    index a3f492a..b03e7e0 100644
-    /--- a/drivers/input/mouse/alps.c
-    /+++ b/drivers/input/mouse/alps.c
-    /@@ -487,6 +487,17 @@ int alps_init(struct psmouse *psmouse)
-     	if (alps_hw_init(psmouse))
-     		goto init_fail;
-
-    +	/*
-    +	 * Undo part of setup done for us by psmouse core since touchpad
-    +	 * is not a relative device.
-    +	 */
-    +	__clear_bit(EV_REL, dev1->evbit);
-    +	__clear_bit(REL_X, dev1->relbit);
-    +	__clear_bit(REL_Y, dev1->relbit);
-    +
-    +	/*
-    +	 * Now set up our capabilities.
-    +	 */
-     	dev1->evbit[BIT_WORD(EV_KEY)] |= BIT_MASK(EV_KEY);
-     	dev1->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH);
-     	dev1->keybit[BIT_WORD(BTN_TOOL_FINGER)] |= BIT_MASK(BTN_TOOL_FINGER);
-
-so that HAL no longer adds:
-
-    input.mouse
-
-to an ALPS touchpad's:
-
-    info.capabilities
-
-so that HAL no longer marks the ALPS touchpad with:
-
-    input.x11_driver = 'evdev'
-
-because the policy file:
-
-    fdi/policy/10osvendor/10-x11-input.fdi
-
-doesn't define the policy for:
-
-    <match key="info.capabilities" contains="input.touchpad">
-
-which was previous unnecessary because everything used to
-be caught by the policy for:
-
-    <match key="info.capabilities" contains="input.mouse">
-
-Signed-off-by: Michael Witten <mfwitten@gmail.com>
-Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
----
-diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
-index cff8fc5..8bbe263 100644
---- a/fdi/policy/10osvendor/10-x11-input.fdi
-+++ b/fdi/policy/10osvendor/10-x11-input.fdi
-@@ -16,6 +16,14 @@
-       </match>
-     </match>
- 
-+    <match key="info.capabilities" contains="input.touchpad">
-+      <merge key="input.x11_driver" type="string">mouse</merge>
-+      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-+             string="Linux">
-+        <merge key="input.x11_driver" type="string">evdev</merge>
-+      </match>
-+    </match>
-+
-     <match key="info.capabilities" contains="input.tablet">
-       <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-              string="Linux">
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/hal/macbook-fix-ioperm.patch b/extra/hal/macbook-fix-ioperm.patch
deleted file mode 100644
index 14d0b392d..000000000
--- a/extra/hal/macbook-fix-ioperm.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 597c1ffffd61a15a334ce42f2a569c59f0270bcb Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Thu, 25 Feb 2010 10:25:18 +0000
-Subject: Fix incorrect arguments to ioperm() call
-
-The second argument of ioperm() is not the last port to be accessed
-but rather length of the port range [port, port + len).
-
-Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
----
-diff --git a/hald/linux/addons/addon-imac-backlight.c b/hald/linux/addons/addon-imac-backlight.c
-index e869192..54e4ea3 100644
---- a/hald/linux/addons/addon-imac-backlight.c
-+++ b/hald/linux/addons/addon-imac-backlight.c
-@@ -158,7 +158,8 @@ main (int argc, char **argv)
- 		goto out;
- 	}
- 
--	if (ioperm(0xB2, 0xB3, 1) < 0)
-+	/* Allow access to ports 0xB2 and 0xB3 */
-+	if (ioperm(0xB2, 2, 1) < 0)
- 	{
- 		HAL_ERROR (("ioperm failed (you should be root)."));
- 		exit(1);
-diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c
-index 2a6fef6..c1bbbac 100644
---- a/hald/linux/addons/addon-macbookpro-backlight.c
-+++ b/hald/linux/addons/addon-macbookpro-backlight.c
-@@ -507,7 +507,8 @@ main (int argc, char *argv[])
-  	state = INREG(0x7ae4);
-  	OUTREG(0x7ae4, state);
- 
--	if (ioperm (0x300, 0x304, 1) < 0) {
-+	/* Allow access to porta 0x300 through 0x304 */
-+	if (ioperm (0x300, 5, 1) < 0) {
- 		HAL_ERROR (("ioperm failed (you should be root)."));
- 		exit(1);
- 	}
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/hal/path-max.patch b/extra/hal/path-max.patch
deleted file mode 100644
index 304185d7d..000000000
--- a/extra/hal/path-max.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a2c3dd5a04d79265772c09c4280606d5c2ed72c6 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Mon, 04 Jan 2010 15:56:13 +0000
-Subject: Bump HAL_PATH_MAX to 4096
-
-Some bits in the code use realpath() with destination paths of size
-HAL_PATH_MAX. This potentially breaks on systems where PATH_MAX is bigger than
-HAL_PATH_MAX (which was 512 until now).
-
-Since we can't use PATH_MAX directly (due to platforms like GNU/Hurd, which
-apparently don't have it), just bump HAL_PATH_MAX to 4096 (as PATH_MAX is on
-Linux), to avoid potential buffer overflows and also fix hal on Linux when
-enabling FORTIFY in gcc.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=25888
----
-diff --git a/hald/util.h b/hald/util.h
-index c2a1584..7883333 100644
---- a/hald/util.h
-+++ b/hald/util.h
-@@ -38,7 +38,7 @@
- #endif
- 
- #define HAL_NAME_MAX 256
--#define HAL_PATH_MAX 512
-+#define HAL_PATH_MAX 4096
- 
- gboolean hal_util_remove_trailing_slash (gchar *path);
- 
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/hydrogen/PKGBUILD b/extra/hydrogen/PKGBUILD
index 3dc9b7c38..b56f92c4c 100644
--- a/extra/hydrogen/PKGBUILD
+++ b/extra/hydrogen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 115128 2011-03-17 06:06:23Z schiv $
+# $Id: PKGBUILD 135233 2011-08-11 10:28:18Z schiv $
 # Maintainer: tobias <tobias@archlinux.org>
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: K. Piche <kpiche@rogers.com>
@@ -14,13 +14,16 @@ url="http://www.hydrogen-music.org/"
 depends=('libarchive' 'liblrdf' 'qt' 'jack')
 makedepends=('scons')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e96f291d60e58f5d62fe616cee577dc0')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        lrdf_raptor2.patch)
+md5sums=('e96f291d60e58f5d62fe616cee577dc0'
+         '2124851e890f46158189b5fa90006d40')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   export QTDIR=/usr
+  patch -Np1 -i "${srcdir}/lrdf_raptor2.patch"
   scons prefix=/usr libarchive=1
 }
 
diff --git a/extra/hydrogen/lrdf_raptor2.patch b/extra/hydrogen/lrdf_raptor2.patch
new file mode 100644
index 000000000..ec176b716
--- /dev/null
+++ b/extra/hydrogen/lrdf_raptor2.patch
@@ -0,0 +1,11 @@
+diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct
+--- hydrogen-0.9.5.old/Sconstruct	2011-08-11 18:00:07.889112348 +0800
++++ hydrogen-0.9.5/Sconstruct	2011-08-11 18:00:34.945632437 +0800
+@@ -83,6 +83,7 @@
+ 	includes.append( './' )
+ 	includes.append( 'gui/src/' )
+ 	includes.append( '3rdparty/install/include' )
++	includes.append( '/usr/include/raptor2' )
+ 
+ 	if sys.platform == "darwin":
+ 		ldflags.append( '-L/opt/local/lib' )
diff --git a/extra/java-commons-daemon/PKGBUILD b/extra/java-commons-daemon/PKGBUILD
index 4b7821882..9d804dc5f 100644
--- a/extra/java-commons-daemon/PKGBUILD
+++ b/extra/java-commons-daemon/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 pkgname=('java-commons-daemon' 'java-jsvc')
 pkgbase=java-commons-daemon
-pkgver=1.0.5
+pkgver=1.0.6
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://commons.apache.org/daemon/"
 license=('APACHE')
 _libname=commons-daemon
 source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz)
-md5sums=('2fe0a35d4a9c0338ecd45dad20f33662')
+md5sums=('28dc2e0a3634b2dc3605e9e6444d079f')
 makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
 
 
@@ -25,7 +25,7 @@ build() {
 }
 
 package_java-commons-daemon() {
-  pkgdesc="Set of Apache libraries for making Java applications run on UNIX more easily"
+  pkgdesc="Alternative invocation mechanism for unix-daemon-like java code"
   depends=('java-runtime')
 
   cd "${srcdir}/${_libname}-${pkgver}-src"
@@ -40,7 +40,6 @@ package_java-jsvc() {
   pkgdesc="Apache application for making Java applications run on UNIX more easily"
   depends=("java-${_libname}" 'libcap')
 
-  # jsvc
   cd "${srcdir}/${_libname}-${pkgver}-src/src/native/unix"
 
   install -Dm755 jsvc ${pkgdir}/usr/bin/jsvc
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index 2497c7894..06c3b05cf 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132576 2011-07-25 00:12:30Z andrea $
+# $Id: PKGBUILD 135257 2011-08-11 16:57:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-python
 pkgver=4.7.0
-pkgrel=1
-pkgdesc="KDE bindings for python"
+pkgrel=2
+pkgdesc="KDE bindings for Python"
 url="http://kde.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
index c7a73e6bb..e51eb9258 100644
--- a/extra/kdebindings-smokeqt/PKGBUILD
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 133252 2011-07-27 22:57:56Z andrea $
+# $Id: PKGBUILD 135366 2011-08-13 08:45:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokeqt
-pkgver=4.6.95
+pkgver=4.7.0
 pkgrel=1
 pkgdesc="Language independent library for Qt bindings"
 url="http://kde.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
-depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'qwt')
+depends=('kdebase-runtime' 'qimageblitz' 'qscintilla')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2")
-sha1sums=('304fcb7a38b3656db1d6614b8ff77e6e27274de6')
+source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2")
+sha1sums=('7f0366cc6144ea684c571ed3876dd0eac6d72fb6')
 
 build() {
   cd "${srcdir}"
@@ -21,7 +21,8 @@ build() {
   cd build
   cmake ../smokeqt-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_Qwt5=OFF
   make
 }
 
diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD
index 3ed7dec43..c818e5e30 100644
--- a/extra/lcms2/PKGBUILD
+++ b/extra/lcms2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lcms2
 pkgver=2.2
 pkgrel=1
 pkgdesc="Small-footprint color management engine, version 2"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64 mips64el)
 license=('MIT')
 depends=('libtiff>=3.9.4')
 url="http://www.littlecms.com"
diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD
index 3f6cc1113..2040b2742 100644
--- a/extra/libxfont/PKGBUILD
+++ b/extra/libxfont/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 97682 2010-11-01 09:15:00Z jgc $
+# $Id: PKGBUILD 135207 2011-08-11 07:14:39Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxfont
-pkgver=1.4.3
+pkgver=1.4.4
 pkgrel=1
 pkgdesc="X11 font rasterisation library"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto')
 makedepends=('xorg-util-macros' 'xtrans')
 options=('!libtool')
 source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2)
-sha1sums=('191b40c566f80737cf6838747d86ebaee7b0c7d7')
+sha1sums=('189dd7a3756cb80bcf41b779bf05ec3c366e3041')
 
 build() {
   cd "${srcdir}/libXfont-${pkgver}"
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index b441d8e90..afb279677 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,5 +1,5 @@
-# $Id: PKGBUILD 128517 2011-06-24 07:46:40Z foutrelis $
-# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
+# $Id: PKGBUILD 135431 2011-08-13 11:30:30Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -7,7 +7,7 @@
 
 pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.9.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin.im/"
 license=('GPL')
@@ -17,17 +17,23 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'networkmanager')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-        nm09-more.patch)
+        nm09-more.patch
+        ticket-14351-multiple-display-of-room-members.patch)
 md5sums=('2cd285c7a40f93b7a51bfe733971d3a6'
-         'a673659d86c7a65aa710f7c8c7feda82')
+         'a673659d86c7a65aa710f7c8c7feda82'
+         '47f16f838b741cfdeda18d7b08a7b816')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # Further fixes for NetworkManager 0.9
-  # (http://developer.pidgin.im/ticket/13859)
+  # http://developer.pidgin.im/ticket/13859
   patch -Np1 -i "$srcdir/nm09-more.patch"
 
+  # Fix upstream issue #14351: multiple display of room members
+  # http://developer.pidgin.im/ticket/14351
+  patch -Np0 -i "$srcdir/ticket-14351-multiple-display-of-room-members.patch"
+
   # Use Python 2
   sed -i 's/env python$/\02/' */plugins/*.py \
     libpurple/purple-{remote,notifications-example,url-handler}
@@ -74,8 +80,7 @@ package_pidgin(){
 
 package_libpurple(){
   pkgdesc="IM library extracted from Pidgin"
-  depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss'
-           'cyrus-sasl-plugins')
+  depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss')
   optdepends=('avahi: Bonjour protocol support'
               'dbus-python: for purple-remote and purple-url-handler')
 
diff --git a/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch b/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch
new file mode 100644
index 000000000..bf0966891
--- /dev/null
+++ b/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch
@@ -0,0 +1,17 @@
+#
+#
+# patch "libpurple/conversation.c"
+#  from [cd6817f4863abafef969359f65cc025f9483b401]
+#    to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803]
+#
+============================================================
+--- libpurple/conversation.c	cd6817f4863abafef969359f65cc025f9483b401
++++ libpurple/conversation.c	19aac10ceebae1ee28788b6f0c02bcfcff0c8803
+@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC
+ 	}
+ 
+ 	g_hash_table_remove_all(chat->users);
+-	chat->users = NULL;
+ 
+ 	g_list_free(users);
+ 	chat->in_room = NULL;
diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index 73cc1d3a2..713e1bc06 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -13,7 +13,8 @@ url="http://pulseaudio.org/"
 license=(GPL LGPL)
 makedepends=(libasyncns libcap attr libxtst libsm libsndfile libtool rtkit
              speex libsamplerate tdb udev dbus-core xcb-util avahi bluez
-             gconf intltool jack lirc-utils openssl)
+             gconf intltool jack openssl)
+[ "$CARCH" = "mips64el" ] || makedepends+=(lirc-utils)
 options=(!emptydirs !libtool !makeflags)
 source=("http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.gz"
         $pkgbase.xinit)
@@ -47,8 +48,8 @@ package_pulseaudio() {
               'bluez: bluetooth support'
               'gconf: configuration through gconf'
               'jack: jack support'
-              'lirc-utils: infra-red support'
               'openssl: RAOP support')
+[ "$CARCH" = "mips64el" ] || optdepends+=('lirc-utils: infra-red support')
   backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
   install=pulseaudio.install
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index 5f2d31f30..ce2edc0c0 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 122181 2011-05-02 17:31:08Z andrea $
+# $Id: PKGBUILD 135252 2011-08-11 16:55:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgbase=pyqt
 pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.8.4
+pkgver=4.8.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
@@ -13,7 +13,7 @@ license=('GPL')
 makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
              'python-opengl' 'qt-assistant-compat')
 source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('97c5dc1042feb5b3fe20baabad055af1')
+md5sums=('0e4264bb912edfbda319bb236ac84407')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
deleted file mode 100644
index 9ac060591..000000000
--- a/extra/python2/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 129895 2011-06-29 15:22:59Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributer: Allan McRae <allan@archlinux.org>
-# Contributer: Jason Chu <jason@archlinux.org>
-
-pkgname=python2
-pkgver=2.7.2
-pkgrel=2
-pkgrel=1 # holdver
-_pybasever=2.7
-pkgdesc="A high-level scripting language"
-arch=('i686' 'x86_64' 'mips64el')
-license=('PSF')
-url="http://www.python.org/"
-depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
-makedepends=('tk')
-optdepends=('tk: for IDLE')
-conflicts=('python<3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53')
-
-build() {
-  cd "${srcdir}/Python-${pkgver}"
-
-  # Temporary workaround for FS#22322
-  # See http://bugs.python.org/issue10835 for upstream report
-  sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
-
-  # Enable built-in SQLite3 module to load extensions (fix FS#22122)
-  sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
-
-  # FS#23997
-  sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
-
-  # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
-  # rather than copies shipped in the tarball
-  rm -r Modules/expat
-  rm -r Modules/zlib
-  rm -r Modules/_ctypes/{darwin,libffi}*
-
-  export OPT="${CFLAGS}"
-  ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
-              --enable-unicode=ucs4 --with-system-expat --with-system-ffi
-
-  make
-}
-
-package() {
-  cd "${srcdir}/Python-${pkgver}"
-  make DESTDIR="${pkgdir}" altinstall maninstall
-
-  ln -sf python${_pybasever}        "${pkgdir}/usr/bin/python2"
-  ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config"
-  ln -sf python${_pybasever}.1      "${pkgdir}/usr/share/man/man1/python2.1"
-
-  ln -sf ../../libpython${_pybasever}.so \
-    "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so"
-
-  mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/"
-
-  # some useful "stuff"
-  install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
-  install -m755 Tools/i18n/{msgfmt,pygettext}.py \
-    "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/"
-  install -m755 Tools/scripts/{README,*py} \
-    "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/"
-
-  # fix conflicts with python
-  mv "${pkgdir}"/usr/bin/idle{,2}
-  mv "${pkgdir}"/usr/bin/pydoc{,2}
-  mv "${pkgdir}"/usr/bin/2to3{,-2.7}
-
-  # clean up #!s
-  find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \
-    xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
-
-  # clean-up reference to build directory
-  sed -i "s#${srcdir}/Python-${pkgver}:##" \
-    "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile"
-
-  # license
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD
index 2f16810e5..e1016b0c9 100644
--- a/extra/qemu-kvm/PKGBUILD
+++ b/extra/qemu-kvm/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 126938 2011-06-08 20:01:54Z tpowa $
+# $Id: PKGBUILD 135290 2011-08-12 09:22:48Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu-kvm
-pkgver=0.14.1
-pkgrel=2
+pkgver=0.15.0
+pkgrel=1
 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64 'mips64el')
 license=('GPL2' 'LGPL2.1')
 url="http://www.linux-kvm.org"
-depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'esound' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng')
-makedepends=('texi2html' 'perl')
+depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng')
+makedepends=('texi2html' 'perl' 'python2')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu-kvm.install
 conflicts=('qemu')
@@ -23,8 +23,9 @@ build()
     cd ${srcdir}/${pkgname}-${pkgver}
     # fix esound building
     ./configure --prefix=/usr \
+                --python=/usr/bin/python2 \
                 --sysconfdir=/etc \
-                --audio-drv-list=alsa,sdl,oss,esd \
+                --audio-drv-list=alsa,sdl,oss \
                 --audio-card-list=ac97,sb16,es1370,hda \
                 --enable-docs
     make
@@ -53,5 +54,5 @@ package()
       esac
     done
 }
-md5sums=('ed37a2c0b1981220b842920140574c63'
+md5sums=('b45b0deebba4ce47dcaaab3807f6ed47'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index f6b1913ea..61389e8e7 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 124178 2011-05-17 13:06:59Z tpowa $
+# $Id: PKGBUILD 135285 2011-08-12 09:21:08Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
-pkgver=0.14.1
+pkgver=0.15.0
 pkgrel=1
-pkgdesc="QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
+pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL2.1')
 url="http://wiki.qemu.org/Index.html"
-makedepends=('texi2html' 'perl')
-depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'esound' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl')
+makedepends=('texi2html' 'perl' 'python2')
+depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu.install
-source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz
         65-kvm.rules)
 options=(!strip)
 
@@ -19,10 +19,10 @@ build()
 {
   cd ${srcdir}/${pkgname}-${pkgver}
   sed -i -e 's/lib64/lib/g' x86_64.ld
-  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,esd \
+  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl \
+              --python=/usr/bin/python2 \
               --audio-card-list=ac97,sb16,es1370,hda \
-              --enable-docs \
-              --kerneldir="/usr/src/linux-$(uname -r)"
+              --enable-docs
               make
 }
 
@@ -40,5 +40,5 @@ package() {
     done
 
 }
-md5sums=('b6c713a8db638e173af53a62d5178640'
+md5sums=('dbc55b014bcd21b98e347f6a90f7fb6d'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index c41f9caee..b2c5880a7 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124858 2011-05-24 19:56:15Z schiv $
+# $Id: PKGBUILD 135263 2011-08-11 18:35:34Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -13,22 +13,23 @@ url="http://www.rosegardenmusic.com/"
 license=('GPL')
 depends=('liblrdf' 'dssi' 'fftw' 'lirc-utils'
          'perl' 'qt' 'shared-mime-info')
-makedepends=('pkgconfig' 'imake')
+makedepends=('imake')
 optdepends=('lilypond: notation display'
             'cups: printing support'
             'okular: print preview, or any other PDF viewer'
             'timidity++: MIDI playback, or any other softsynth'
             'flac'
             'wavpack')
-[ "$CARCH" = "i686" ] && optdepends=("${optdepends[@]}"
-                                     'dssi-vst: win32 VST support')
+[ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
 install=$pkgname.install
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
 md5sums=('77ab43d06de53ace338843ff82e26288')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # lrdf + raptor2 compatibility
+  export lrdf_CFLAGS="$(pkg-config --cflags raptor2)"
   ./configure --prefix=/usr
   make
 }
@@ -36,7 +37,7 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch b/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch
new file mode 100644
index 000000000..fe5a807ee
--- /dev/null
+++ b/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch
@@ -0,0 +1,43 @@
+From b43c51beeb0569a38900e1e5a78606711f987742 Mon Sep 17 00:00:00 2001
+From: Paul Khuong <pvk@pvk.ca>
+Date: Wed, 3 Aug 2011 10:20:41 -0400
+Subject: [PATCH] Fix version string parsing for Linux 3.0
+
+ Stop assuming the presence of minor and patch version numbers; missing
+ values are defaulted to 0 (e.g. 3.0.0).
+
+ Reported by a few people on IRC.
+---
+ src/runtime/linux-os.c |   14 ++++++++++----
+ 1 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c
+index db72fa6..e262f41 100644
+--- a/src/runtime/linux-os.c
++++ b/src/runtime/linux-os.c
+@@ -198,12 +198,18 @@ os_init(char *argv[], char *envp[])
+     int patch_version;
+     char *p;
+     uname(&name);
++
+     p=name.release;
+     major_version = atoi(p);
+-    p=strchr(p,'.')+1;
+-    minor_version = atoi(p);
+-    p=strchr(p,'.')+1;
+-    patch_version = atoi(p);
++    minor_version = patch_version = 0;
++    p=strchr(p,'.');
++    if (p != NULL) {
++            minor_version = atoi(++p);
++            p=strchr(p,'.');
++            if (p != NULL)
++                    patch_version = atoi(++p);
++    }
++
+     if (major_version<2) {
+         lose("linux kernel version too old: major version=%d (can't run in version < 2.0.0)\n",
+              major_version);
+-- 
+1.7.6
+
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 6b53be48d..c1e659b61 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 132801 2011-07-26 10:22:05Z juergen $
+# $Id: PKGBUILD 135444 2011-08-13 20:11:24Z dreisner $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Leslie Polzer (skypher) 
+# Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
 pkgver=1.0.50
-pkgrel=1
+pkgrel=2
 pkgdesc="Steel Bank Common Lisp"
+url="http://www.sbcl.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('glibc')
@@ -20,17 +21,24 @@ source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pk
 md5sums=('74ce9b24516885d066ec4287cde52e8c'
          '7ac0c1936547f4278198b8bf7725204d'
          'a456535d65d6c5b85b1b646f11455fce')
-url="http://www.sbcl.org/"
 install=sbcl.install
+source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
+        "arch-fixes.lisp"
+        "0001-Fix-version-string-parsing-for-Linux-3.0.patch")
+md5sums=('74ce9b24516885d066ec4287cde52e8c'
+         '7ac0c1936547f4278198b8bf7725204d'
+         '7af58d1de2d788ad6a8d82c89279a75f')
 
 build() {
-  export CFLAGS="${CFLAGS} -DSBCL_HOME=\\\"/usr/lib/sbcl\\\""
+  cd "$srcdir/$pkgname-$pkgver"
+
+  export CFLAGS+=" -DSBCL_HOME=\\\"/usr/lib/sbcl\\\""
   export GNUMAKE="make -e"
 
   # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS
-  export LINKFLAGS="$LD_FLAGS" 
+  export LINKFLAGS="$LDFLAGS"
   unset LDFLAGS
-  cd ${startdir}/src/${pkgname}-${pkgver}
+
   # Make a multi-threaded SBCL, disable LARGEFILE  
   cat >customize-target-features.lisp <<EOF
 (lambda (features)
@@ -40,44 +48,40 @@ build() {
   (disable :largefile)))
 EOF
 
+  # fix build against 3.0-ARCH
+  patch -Np1 < "$srcdir/0001-Fix-version-string-parsing-for-Linux-3.0.patch"
   patch -Nup1 < "${srcdir}/mips-arch.h.diff"
 
   if [ "$CARCH" = "mips64el" ]; then
-  sh make.sh clisp
+    sh make.sh clisp
   else
-  sh make.sh sbcl
+    sh make.sh sbcl
   fi
-  mkdir -p ${startdir}/pkg/usr
-  pushd doc/manual
-  make info || return 1
-  popd 
-  INSTALL_ROOT=${startdir}/pkg/usr sh install.sh
+
+  make -C doc/manual info
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  INSTALL_ROOT="$pkgdir/usr" sh install.sh
 
   src/runtime/sbcl --core output/sbcl.core --script ${startdir}/src/arch-fixes.lisp
   mv sbcl-new.core ${startdir}/pkg/usr/lib/sbcl/sbcl.core
 
-# sources
-  mkdir -p ${startdir}/pkg/usr/share/sbcl-source
-  cp -R -t ${startdir}/pkg/usr/share/sbcl-source \
-    ${startdir}/src/${pkgname}-${pkgver}/{src,contrib}
+  # sources
+  mkdir -p "$pkgdir/usr/share/sbcl-source"
+  cp -R -t "$pkgdir/usr/share/sbcl-source" "$srcdir/$pkgname-$pkgver/"{src,contrib}
 
-# drop unwanted files
-  find ${startdir}/pkg/usr/share/sbcl-source -type f \
-    -name \*.fasl -or \
-    -name \*.o -or \
-    -name \*.log -or \
-    -name \*.so -or \
-    -name a.out -delete
-
-  rm ${startdir}/pkg/usr/share/sbcl-source/src/runtime/sbcl
-  rm ${startdir}/pkg/usr/share/sbcl-source/src/runtime/sbcl.nm
+  # license
+  install -D -m644 "$srcdir/$pkgname-$pkgver/COPYING" \
+                   "$pkgdir/usr/share/licenses/$pkgname/license.txt"
 
-  find ${startdir}/pkg \( -name Makefile -o -name .cvsignore \) -delete
+  # drop unwanted files
+  find "$pkgdir" \( -name Makefile -o -name .cvsignore \) -delete
+  find "$pkgdir/usr/share/sbcl-source" -type f \
+    \( -name \*.fasl -o -name \*.o -o -name \*.log -o -name \*.so -o -name a.out \) -delete
 
-  rm $startdir/pkg/usr/share/info/dir
-  gzip -9nf $startdir/pkg/usr/share/info/*
+  rm "$pkgdir/usr/share/sbcl-source/src/runtime/sbcl"{,.nm}
 
-  # license
-  install -D -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYING \
-                   ${startdir}/pkg/usr/share/licenses/${pkgname}/license.txt
 }
diff --git a/extra/scummvm/PKGBUILD b/extra/scummvm/PKGBUILD
index c894ec8dd..1fa433641 100644
--- a/extra/scummvm/PKGBUILD
+++ b/extra/scummvm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 106447 2011-01-17 06:22:16Z angvp $
+# $Id: PKGBUILD 135227 2011-08-11 09:16:00Z juergen $
 # Maintainer: juergen <juergen@hoetzel.info>
 # Contributor: Manolis Tzanidakis, Petter Gundersen
 
 pkgname=scummvm
-pkgver=1.2.1
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL')
 url="http://www.scummvm.org/"
 depends=('gcc-libs' 'alsa-lib' 'libmad' 'libvorbis' 'zlib' 'flac>=1.1.4' 'sdl' 'fluidsynth')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b1d224d7640bc7fdccaca958164b31df')
+md5sums=('87e5076e93bfa762f1c5d7f45b41d4e2')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/sdl/PKGBUILD b/extra/sdl/PKGBUILD
index b7c5035aa..daaf7073f 100644
--- a/extra/sdl/PKGBUILD
+++ b/extra/sdl/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 99967 2010-11-19 16:37:58Z heftig $
+# $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=sdl
 pkgver=1.2.14
-pkgrel=6
+pkgrel=7
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libsdl.org"
 license=('LGPL')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'esound' 'mesa' 'libpulse')
+makedepends=('alsa-lib' 'mesa' 'libpulse')
 options=('!libtool')
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
         sdl-1.2.14-joystick-crash.diff
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 471f0bedb..2a0edc878 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,25 +1,20 @@
-# $Id: PKGBUILD 130000 2011-06-30 19:02:46Z andrea $
+# $Id: PKGBUILD 135247 2011-08-11 16:54:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python2-sip')
-pkgver=4.12.3
-pkgrel=2
+pkgver=4.12.4
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 makedepends=('python' 'python2')
-source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz"
-        'fix-regression.patch')
-md5sums=('d0f1fa60494db04b4d115d4c2d92f79e'
-         '598ffc65ebaf1c0e8855a352b02c43e7')
+source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz")
+md5sums=('6cbd56abb7d35aad833789c98ae61652')
 
 build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -p1 -i "${srcdir}"/fix-regression.patch
-
   cd "${srcdir}"
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
 
diff --git a/extra/sip/fix-regression.patch b/extra/sip/fix-regression.patch
deleted file mode 100644
index d4dc794ad..000000000
--- a/extra/sip/fix-regression.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# HG changeset patch
-# User Phil Thompson <phil@riverbankcomputing.com>
-# Date 1308852953 -3600
-# Node ID f9f4b161c94021c117e995eccba945d4dd3d0ed4
-# Parent  df42f6bf92c8cd12dd7cc5a30231728a4c23ead4
-Fixed a regression introduced in the recent sipIsPyMethod() changes in the
-handling of special methods implemented by object (eg. __lt__).
-
-diff -r df42f6bf92c8 -r f9f4b161c940 siplib/siplib.c.in
---- a/siplib/siplib.c.in	Thu Jun 23 17:24:41 2011 +0100
-+++ b/siplib/siplib.c.in	Thu Jun 23 19:15:53 2011 +0100
-@@ -7604,9 +7604,10 @@
- #endif
- 
-         /*
--         * Check any possible reimplementation is not the wrapped C++ method.
-+         * Check any possible reimplementation is not the wrapped C++ method or
-+         * a default special method implementation..
-          */
--        if (cls_dict != NULL && (cls_attr = PyDict_GetItem(cls_dict, mname_obj)) != NULL && Py_TYPE(cls_attr) != &sipMethodDescr_Type)
-+        if (cls_dict != NULL && (cls_attr = PyDict_GetItem(cls_dict, mname_obj)) != NULL && Py_TYPE(cls_attr) != &sipMethodDescr_Type && Py_TYPE(cls_attr) != &PyWrapperDescr_Type)
-         {
-             reimp = cls_attr;
-             break;
-
diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD
index cff9140ab..9cdf5653b 100644
--- a/extra/telepathy-gabble/PKGBUILD
+++ b/extra/telepathy-gabble/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 133089 2011-07-27 19:11:28Z ibiru $
+# $Id: PKGBUILD 135521 2011-08-14 19:04:44Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Daniel Balieiro <daniel@balieiro.com>
 # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
 pkgname=telepathy-gabble
 pkgver=0.12.4
-pkgrel=1
+pkgrel=3
 pkgdesc="A Jabber/XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
@@ -20,7 +20,7 @@ md5sums=('428962565d568667d3ff1aa7eee3da51')
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-  	--libexecdir=/usr/lib/telepathy
+  	--libexecdir=/usr/lib/telepathy --with-tls=openssl
   make
 }
 
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index 7fd6833d9..3c35d24a2 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 126185 2011-06-02 11:28:46Z thomas $
+# $Id: PKGBUILD 135456 2011-08-13 22:59:53Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
-pkgver=0.8.4
+pkgver=0.8.5
 pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('qt')
 optdepends=('qt')
 depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
 source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('20bf73b0c2255dfc6ae82806ec8a663e00ab039df9ee6eadae633466841c0dd7')
+sha256sums=('c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 9defcf845..32d40024d 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,29 +10,24 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.0
 pkgver=${_basekernel}.1
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://linux-libre.fsfla.org/"
+pkgrel=5
+arch=('i686' 'x86_64' 'mips64el')
+url="http://linux-libre.fsfla.org"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
         "${pkgname}.preset"
+        'Kbuild'
+        'Kbuild.platforms'
         'boot-logo.patch'
         'fix-i915.patch'
         'change-default-console-loglevel.patch')
-md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
-         'af8d721036d89ed5500675c3289e3b48'
-         '66dff8af6b00eb8d054b2af85aaa5ef7'
-         '1a98b8b8f2140ac8f95c3814cba8cc95'
-         'a8a3843046926eb7ab81312cd438c5c5'
-         '04b21c79df0a952c22d681dd4f4562df'
-         '263725f20c0b9eb9c353040792d644e5'
-         '9d3c56a4b999c8bfbd4018089a62f662')
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
@@ -50,7 +45,19 @@ build() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  cat "${srcdir}/config.${CARCH}" > ./.config # simpler
+  if [ "$CARCH" == "mips64el" ]; then
+    sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
+    msg2 "Adding loongson-community patches"
+    patch -Np1 -i "${srcdir}/${_basekernel}-*-loongson-community.patch"
+    patch -Np0 -i "${srcdir}/lxo-config.patch"
+
+# ensure N32
+    sed -i "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" ./.config
+    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config
+  else
+    cat "${srcdir}/config.${CARCH}" > ./.config # simpler
+  fi
+
 
   if [ "${_kernelname}" != "" ]; then
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
@@ -58,6 +65,7 @@ build() {
 
   # remove the "-libre" extraversion from Makefile
   sed -i 's|^EXTRAVERSION =.*$|EXTRAVERSION =|g' Makefile
+  sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|# CONFIG_LOCALVERSION_AUTO is not set|g" ./.config
 
   # remove the sublevel from Makefile
   # this ensures our kernel version is always 3.X-LIBRE
@@ -107,13 +115,19 @@ package_linux-libre() {
   cd "${srcdir}/linux-${_basekernel}"
 
   KARCH=x86
+  [[ $CARCH = "mips64el" ]] && KARCH=mips
 
   # get kernel version
   _kernver="$(make kernelrelease)"
 
   mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
   make INSTALL_MOD_PATH="${pkgdir}" modules_install
-  cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgname}"
+
+  if [ "$CARCH" == "mips64el" ]; then
+    cp vmlinuz ${pkgdir}/boot/vmlinuz-${pkgname}
+  else
+    cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgname}"
+  fi
 
   # add vmlinux
   install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
@@ -131,6 +145,13 @@ package_linux-libre() {
     -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \
     -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset"
 
+# mkinitcpio 0.7 relies on bzImage to find the kernel version
+  if [ "$CARCH" == "mips64el" ]; then
+    sed \
+    -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|g" \
+    -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset"
+  fi
+
   # remove build and source links
   rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
   # remove the firmware
@@ -145,6 +166,15 @@ package_linux-libre-headers() {
   conflicts=('kernel26-headers' 'linux-headers')
   replaces=('kernel26-headers' 'linux-headers')
 
+  KARCH=x86
+  [[ $CARCH = "mips64el" ]] && KARCH=mips
+
+# In case of repackaging this is empty
+  if [ -z "${_kernver}" ]; then
+    cd ${srcdir}/linux-$pkgver
+    _kernver="$(make kernelrelease)"
+  fi
+
   mkdir -p "${pkgdir}/lib/modules/${_kernver}"
 
   cd "${pkgdir}/lib/modules/${_kernver}"
@@ -166,13 +196,19 @@ package_linux-libre-headers() {
   done
 
   # copy arch includes for external modules
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/x86"
-  cp -a arch/x86/include "${pkgdir}/usr/src/linux-${_kernver}/arch/x86/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}"
+  cp -a "arch/${KARCH}/include" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
 
   # copy files necessary for later builds
   cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
   cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
 
+  if [ "$CARCH" = "mips64el" ]; then
+    cp -a "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp -a "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
+  fi
+
   # fix permissions on scripts dir
   chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
@@ -267,7 +303,12 @@ package_linux-libre-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
+  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
+  if [ "$CARCH" = "mips64el" ]; then
+    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86
+  else
+    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/mips
+  fi
 }
 
 package_linux-libre-docs() {
@@ -288,3 +329,14 @@ package_linux-libre-docs() {
 }
 
 # vim:set ts=2 sw=2 et:
+md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
+         'af8d721036d89ed5500675c3289e3b48'
+         '9a5db9c3dfb190b91dfe7c3bdcfe67a8'
+         '66dff8af6b00eb8d054b2af85aaa5ef7'
+         '1a98b8b8f2140ac8f95c3814cba8cc95'
+         'a8a3843046926eb7ab81312cd438c5c5'
+         '2967cecc3af9f954ccc822fd63dca6ff'
+         '8267264d9a8966e57fdacd1fa1fc65c4'
+         '04b21c79df0a952c22d681dd4f4562df'
+         '263725f20c0b9eb9c353040792d644e5'
+         '9d3c56a4b999c8bfbd4018089a62f662')
diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD
new file mode 100644
index 000000000..2007b690b
--- /dev/null
+++ b/multilib-testing/binutils-multilib/PKGBUILD
@@ -0,0 +1,75 @@
+# $Id: PKGBUILD 54236 2011-08-15 03:34:39Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+
+pkgname=binutils-multilib
+pkgver=2.21.1
+pkgrel=2
+_date=20110627
+pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib"
+arch=('x86_64')
+url="http://www.gnu.org/software/binutils/"
+license=('GPL')
+groups=('multilib-devel')
+provides=("binutils=$pkgver-$pkgrel")
+conflicts=('binutils')
+depends=('glibc>=2.14' 'zlib')
+makedepends=('dejagnu' 'gcc-multilib') # Make sure we compile this with gcc-multilib
+options=('!libtool' '!distcc' '!ccache')
+install=binutils.install
+source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2)
+md5sums=('2face559e80d649ba148e42bb2d1fb0f')
+
+build() {
+  cd ${srcdir}
+  mkdir binutils-build && cd binutils-build
+
+  ${srcdir}/binutils/configure --prefix=/usr \
+    --enable-ld=default --enable-gold \
+    --enable-plugins --enable-threads \
+    --enable-shared \
+    --enable-64-bit-bfd --enable-multilib
+
+  # check the host environment and makes sure all the necessary tools are available
+  make configure-host
+
+  make tooldir=${pkgdir}/usr
+}
+
+check() {
+  cd ${srcdir}/binutils-build
+
+  # do not abort on errors - manually check log files
+  make -k -j1 check || true
+}
+
+package() {
+  cd ${srcdir}/binutils-build
+  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
+  
+  # Add some useful headers
+  install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include
+  install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include
+
+  # Rebuild libiberty.a with -fPIC
+  make -C libiberty clean
+  make CFLAGS="$CFLAGS -fPIC" -C libiberty
+  install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib
+
+  # Rebuild libbfd.a with -fPIC
+  make -C bfd clean
+  # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
+  make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd
+  install -m644 bfd/libbfd.a ${pkgdir}/usr/lib
+
+  # Remove Windows/Novell specific man pages
+  rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
+
+  # Remove these symlinks, they are not ABI stable.
+  # Programs should compile static to the .a file.
+  rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
+  echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so
+  echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so
+}
diff --git a/multilib-testing/binutils-multilib/binutils.install b/multilib-testing/binutils-multilib/binutils.install
new file mode 100644
index 000000000..8bf9f3a47
--- /dev/null
+++ b/multilib-testing/binutils-multilib/binutils.install
@@ -0,0 +1,17 @@
+infodir=usr/share/info
+filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
+
+post_upgrade() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD
new file mode 100644
index 000000000..3d2dea8af
--- /dev/null
+++ b/multilib-testing/gcc-multilib/PKGBUILD
@@ -0,0 +1,318 @@
+# $Id: PKGBUILD 54239 2011-08-15 03:36:24Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+# NOTE: libtool requires rebuilt with each new gcc version
+
+pkgbase='gcc-multilib'
+pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
+pkgver=4.6.1
+pkgrel=3
+#_snapshot=4.6-20110603
+_libstdcppmanver=20110201		# Note: check source directory name when updating this
+pkgdesc="The GNU Compiler Collection for multilib"
+arch=('x86_64')
+license=('GPL' 'LGPL' 'FDL' 'custom')
+url="http://gcc.gnu.org"
+makedepends=('binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib'
+             'lib32-glibc>=2.14')
+checkdepends=('dejagnu')
+options=('!libtool' '!emptydirs')
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
+	gcc_pure64.patch
+	gcc-hash-style-both.patch)
+md5sums=('c57a9170c677bf795bdc04ed796ca491'
+         '1e9fd2eaf0ee47ea64e82c48998f1999'
+         '22cec272f9cc2801d3cd348feaca888b'
+         '4df25b623799b148a0703eaeec8fdf3f')
+
+if [ -n "${_snapshot}" ]; then
+  _basedir="${srcdir}/gcc-${_snapshot}"
+else
+  _basedir="${srcdir}/gcc-${pkgver}"
+fi
+
+build() {
+  cd ${_basedir}
+
+  # Do not install libiberty
+  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+
+  # Do not run fixincludes
+  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
+  patch -Np1 -i ${srcdir}/gcc_pure64.patch
+  patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
+
+  echo ${pkgver} > gcc/BASE-VER
+
+  cd ${srcdir}
+  mkdir gcc-build && cd gcc-build
+
+  ${_basedir}/configure --prefix=/usr \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --mandir=/usr/share/man --infodir=/usr/share/info \
+      --with-bugurl=https://bugs.archlinux.org/ \
+      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
+      --enable-shared --enable-threads=posix \
+      --with-system-zlib --enable-__cxa_atexit \
+      --disable-libunwind-exceptions --enable-clocale=gnu \
+      --enable-gnu-unique-object --enable-linker-build-id \
+      --with-ppl --enable-cloog-backend=isl \
+      --enable-lto --enable-gold --enable-ld=default \
+      --enable-plugin --with-plugin-ld=ld.gold \
+      --enable-multilib --disable-libstdcxx-pch \
+      --enable-checking=release
+  make
+  
+  # rebuild libssp without -fstack-protector and -D_FORTIFY_SOURCE=2
+  # adjusting Makefile.in prior to build still results in these leaking through (yay libtool...)
+  cd $CHOST/libssp
+  sed -i -e "s#-fstack-protector#-fno-stack-protector#" \
+         -e "s#-D_FORTIFY_SOURCE=2#-U_FORTIFY_SOURCE#" Makefile
+  make clean
+  make
+
+  # rebuild 32-bit libssp
+  cd ../32/libssp
+  sed -i -e "s#-fstack-protector#-fno-stack-protector#" \
+         -e "s#-D_FORTIFY_SOURCE=2#-U_FORTIFY_SOURCE#" Makefile
+  make clean
+  make
+}
+
+check() {
+  cd gcc-build
+
+  # increase stack size to prevent test failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
+  ulimit -s 32768
+
+  # do not abort on error as some are "expected"
+  make -k check || true
+  ${_basedir}/contrib/test_summary
+}
+
+package_gcc-libs-multilib()
+{
+  pkgdesc="Runtime libraries shipped by GCC for multilib"
+  depends=('glibc>=2.14' "lib32-gcc-libs=$pkgver-$pkgrel")
+  provides=("gcc-libs=$pkgver-$pkgrel")
+  conflicts=('gcc-libs')
+  install=gcc-libs.install
+
+  cd gcc-build
+  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
+  for lib in libmudflap libgomp libssp libstdc++-v3/src; do
+    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+  done
+  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
+  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
+
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
+  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
+  make -j1 DESTDIR=${pkgdir} install-target-libobjc
+
+  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
+  rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
+
+  # remove stuff in lib32-gcc-libs
+  rm -rf ${pkgdir}/usr/lib32
+
+  # remove static libraries
+  find ${pkgdir} -name *.a -delete
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_lib32-gcc-libs()
+{
+  pkgdesc="Runtime libraries shipped by GCC (32-bit)"
+  depends=('lib32-glibc>=2.14' "gcc-libs>=$pkgver")
+
+  cd gcc-build
+  make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared
+  for lib in libmudflap libgomp libssp libstdc++-v3/src; do
+    make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+  done
+
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
+  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
+  make -j1 DESTDIR=${pkgdir} install-target-libobjc
+
+  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
+  rm ${pkgdir}/usr/lib32/libgfortran.spec
+
+  # remove stuff in gcc-libs-multilib
+  rm -rf ${pkgdir}/usr/lib
+  rm -rf ${pkgdir}/usr/share/info
+
+  # remove static libraries
+  find ${pkgdir} -name *.a -delete
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-multilib()
+{
+  pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib"
+  depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl')
+  groups=('multilib-devel')
+  provides=("gcc=$pkgver-$pkgrel")
+  conflicts=('gcc')
+  install=gcc.install
+
+  cd gcc-build
+  
+  # unfortunately it is much, much easier to install the lot and clean-up the mess...
+  make -j1 DESTDIR=${pkgdir} install
+  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
+  rm $pkgdir/usr/lib{,32}/*.so*
+  rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
+  rm $pkgdir/usr/lib{,32}/libgfortran.spec
+  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,{,32/}libgfortranbegin.a}
+  rm -r $pkgdir/usr/lib{,32}/go
+  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
+  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
+  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
+  rm $pkgdir/usr/share/man/man3/ffi*
+
+  # many packages require these symlinks
+  install -dm755 ${pkgdir}/lib
+  ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
+  ln -sf gcc ${pkgdir}/usr/bin/cc
+  ln -sf g++ ${pkgdir}/usr/bin/c++
+
+  # install gengtype for plugin support
+  install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
+  install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
+
+  # POSIX conformance launcher scripts for c89 and c99
+  cat > $pkgdir/usr/bin/c89 <<"EOF"
+#!/bin/sh
+fl="-std=c89"
+for opt; do
+  case "$opt" in
+    -ansi|-std=c89|-std=iso9899:1990) fl="";;
+    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
+EOF
+
+  cat > $pkgdir/usr/bin/c99 <<"EOF"
+#!/bin/sh
+fl="-std=c99"
+for opt; do
+  case "$opt" in
+    -std=c99|-std=iso9899:1999) fl="";;
+    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
+EOF
+
+  chmod 755 $pkgdir/usr/bin/c{8,9}9
+
+  # install the libstdc++ man pages
+  install -dm755 ${pkgdir}/usr/share/man/man3
+  install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-fortran-multilib()
+{
+  pkgdesc="Fortran front-end for GCC for multilib"
+  depends=("gcc-multilib=$pkgver-$pkgrel")
+  provides=("gcc-fortran=$pkgver-$pkgrel")
+  conflicts=('gcc-fortran')
+  install=gcc-fortran.install
+
+  cd gcc-build
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
+  make -j1 DESTDIR=$pkgdir install-target-libgfortran
+  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
+  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
+  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
+  
+  # remove libraries included in gcc-libs
+  rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so*
+  rm ${pkgdir}/usr/share/info/libquadmath.info
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-objc-multilib()
+{
+  pkgdesc="Objective-C front-end for GCC for multilib"
+  depends=("gcc-multilib=$pkgver-$pkgrel")
+  provides=("gcc-objc=$pkgver-$pkgrel")
+  conflicts=('gcc-objc')
+
+  cd gcc-build
+  make -j1 DESTDIR=$pkgdir install-target-libobjc
+  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+
+  # remove libraries included in gcc-libs
+  rm ${pkgdir}/usr/lib{,32}/libobjc.so*
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-ada-multilib()
+{
+  pkgdesc="Ada front-end for GCC (GNAT) for multilib"
+  depends=("gcc-multilib=$pkgver-$pkgrel")
+  provides=("gcc-ada=$pkgver-$pkgrel")
+  conflicts=('gcc-ada')
+  install=gcc-ada.install
+
+  cd gcc-build/gcc
+  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
+  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
+
+  cd ../$CHOST/32/libada
+  make -j1 DESTDIR=${pkgdir} INSTALL="install" \
+    INSTALL_DATA="install -m644" install-gnatlib
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-go-multilib()
+{
+  pkgdesc="Go front-end for GCC for multilib"
+  depends=("gcc-multilib=$pkgver-$pkgrel")
+  provides=("gcc-go=$pkgver-$pkgrel")
+  conflicts=('gcc-go')
+  install=gcc-go.install
+
+  cd gcc-build
+  make -j1 DESTDIR=$pkgdir install-target-libgo
+  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
+  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
+}
diff --git a/multilib-testing/gcc-multilib/gcc-ada.install b/multilib-testing/gcc-multilib/gcc-ada.install
new file mode 100644
index 000000000..df0553a4f
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc-ada.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/multilib-testing/gcc-multilib/gcc-fortran.install b/multilib-testing/gcc-multilib/gcc-fortran.install
new file mode 100644
index 000000000..b15d89a97
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc-fortran.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+file="gfortran.info"
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+}
diff --git a/testing/wget/wget.install b/multilib-testing/gcc-multilib/gcc-go.install
index 8eb6a2c3f..7dc50dee5 100644
--- a/testing/wget/wget.install
+++ b/multilib-testing/gcc-multilib/gcc-go.install
@@ -1,10 +1,10 @@
 infodir=usr/share/info
-filelist=(wget.info)
+filelist=(gccgo.info)
 
 post_install() {
   [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
@@ -15,6 +15,6 @@ post_upgrade() {
 pre_remove() {
   [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
diff --git a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
new file mode 100644
index 000000000..8b59f4535
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
@@ -0,0 +1,122 @@
+--- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
+@@ -41,7 +41,7 @@
+ 
+ #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
+ 
+-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
++#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
+   %{O*:-O3} %{!O*:-O1}						\
+   %{shared:-shared}						\
+   %{!shared:							\
+--- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
++++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
+@@ -78,7 +78,7 @@
+  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
++#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
++++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -104,7 +104,7 @@
+   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
++#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+--- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -64,7 +64,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "\
++#define LINK_SPEC "--hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
++++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
+@@ -389,11 +389,11 @@
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
+ 
+ 
+-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
+ 
+-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
+ 
+--- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
++++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
+@@ -830,7 +830,7 @@
+ #define LINUX_DYNAMIC_LINKER \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
+ 
+-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
+ 
+--- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -77,7 +77,7 @@
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC \
+-  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
++  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
+    %{shared:-shared} \
+    %{!shared: \
+       %{static:-static} \
+--- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
++++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
+@@ -113,7 +113,7 @@
+   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
+   { "link_arch",	 LINK_ARCH_SPEC },
+ 
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+@@ -121,7 +121,7 @@
+       %{static:-static}} \
+ "
+ 
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+@@ -193,7 +193,7 @@
+ #else /* !SPARC_BI_ARCH */
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+--- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
++++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -74,7 +74,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+ #undef  LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
+   %{!mno-relax:%{!r:-relax}} \
+   %{!shared: \
+     %{!static: \
diff --git a/multilib-testing/gcc-multilib/gcc-libs.install b/multilib-testing/gcc-multilib/gcc-libs.install
new file mode 100644
index 000000000..23553b8f0
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc-libs.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+filelist=(libgomp.info libquadmath.info)
+
+post_upgrade() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/multilib-testing/gcc-multilib/gcc.install b/multilib-testing/gcc-multilib/gcc.install
new file mode 100644
index 000000000..3407a5e1f
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/multilib-testing/gcc-multilib/gcc_pure64.patch b/multilib-testing/gcc-multilib/gcc_pure64.patch
new file mode 100644
index 000000000..8c6b08171
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc_pure64.patch
@@ -0,0 +1,24 @@
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
+--- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
+@@ -49,7 +49,7 @@
+    done.  */
+ 
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
+ 
+ #undef	LINK_SPEC
+ #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
+--- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
+@@ -6,7 +6,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES = ../lib ../lib32
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
new file mode 100644
index 000000000..59d2be1b5
--- /dev/null
+++ b/multilib-testing/lib32-glibc/PKGBUILD
@@ -0,0 +1,167 @@
+# $Id: PKGBUILD 54235 2011-08-15 03:34:11Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+# NOTE: valgrind requires rebuild with each new glibc version
+
+_pkgbasename=glibc
+pkgname=lib32-$_pkgbasename
+pkgver=2.14
+pkgrel=5
+_glibcdate=20110617
+pkgdesc="GNU C Library for multilib"
+arch=('x86_64')
+url="http://www.gnu.org/software/libc"
+license=('GPL' 'LGPL')
+depends=("glibc>=$pkgver")
+makedepends=('gcc-multilib>=4.6')
+options=('!strip' '!emptydirs')
+source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz
+        glibc-2.10-dont-build-timezone.patch
+        glibc-2.10-bz4781.patch
+        glibc-__i686.patch
+        glibc-2.12.1-static-shared-getpagesize.patch
+        glibc-2.12.2-ignore-origin-of-privileged-program.patch
+        glibc-2.13-futex.patch
+        glibc-2.14-libdl-crash.patch
+        #glibc-2.14-fix-resolver-crash-typo.patch
+        glibc-2.14-revert-4462fad3.patch
+        glibc-2.14-reexport-rpc-interface.patch
+        glibc-2.14-reinstall-nis-rpc-headers.patch
+        lib32-glibc.conf)
+md5sums=('e441d745609d93c907b72548ba646dad'
+         '4dadb9203b69a3210d53514bb46f41c3'
+         '0c5540efc51c0b93996c51b57a8540ae'
+         '40cd342e21f71f5e49e32622b25acc52'
+         'a3ac6f318d680347bb6e2805d42b73b2'
+         'b042647ea7d6f22ad319e12e796bd13e'
+         '7d0154b7e17ea218c9fa953599d24cc4'
+         'cea62cc6b903d222c5f26e05a3c0e0e6'
+         '46e56492cccb1c9172ed3a235cf43c6c'
+         'c5de2a946215d647c8af5432ec4b0da0'
+         '55febbb72139ac7b65757df085024b83'
+         '6e052f1cb693d5d3203f50f9d4e8c33b')
+
+build() {
+  cd ${srcdir}/glibc
+
+  # timezone data is in separate package (tzdata)
+  patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
+
+  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
+  patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
+
+  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
+  # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
+  patch -Np1 -i ${srcdir}/glibc-__i686.patch
+
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=11929
+  # using Fedora "fix" as patch in that bug report causes breakages...
+  patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch
+
+  # http://www.exploit-db.com/exploits/15274/
+  # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
+  patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
+  patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
+
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
+  # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
+  patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
+
+  # This fixes the main segfault but not the assert fail (FS#24615)
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 
+  #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch
+  # resort to reverting the bad commit completely for the moment
+  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch
+
+  # re-export RPC interface until libtirpc is ready as a replacement
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
+  patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
+  patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
+
+  cd ${srcdir}
+  mkdir glibc-build
+  cd glibc-build
+
+  export CC="gcc -m32"
+
+  # Hack to fix NPTL issues with Xen, only required on 32bit platforms
+  export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
+
+  echo "slibdir=/usr/lib32" >> configparms
+
+  # remove hardening options from CFLAGS for building libraries
+  CFLAGS=${CFLAGS/-fstack-protector/}
+  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
+
+  ${srcdir}/glibc/configure --prefix=/usr \
+      --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
+      --with-headers=/usr/include \
+      --enable-add-ons=nptl,libidn \
+      --enable-kernel=2.6.27 \
+      --with-tls --with-__thread \
+      --enable-bind-now --without-gd \
+      --without-cvs --disable-profile \
+      --disable-multi-arch i686-unknown-linux-gnu
+
+  # build libraries with hardening disabled
+  echo "build-programs=no" >> configparms
+  make
+  
+  # re-enable hardening for programs
+  sed -i "s#=no#=yes#" configparms
+  echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
+  echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
+  make
+
+  # remove harding in preparation to run test-suite
+  sed -i '2,4d' configparms
+}
+
+check() {
+  cd ${srcdir}/glibc-build
+
+  # some errors are expected - manually check log files
+  make -k check || true
+}
+
+package() {
+  cd ${srcdir}/glibc-build
+  make install_root=${pkgdir} install
+
+  rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share}}
+
+  # We need one 32 bit specific header file
+  find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete
+
+  # manually strip files as stripping libpthread-*.so and libthread_db.so
+  # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks
+  # valgrind on x86_64
+
+  cd $pkgdir
+  strip $STRIP_BINARIES usr/lib32/getconf/*
+
+  strip $STRIP_STATIC usr/lib32/*.a \
+                      usr/lib32/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
+
+  strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
+                      usr/lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
+                      usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
+                      usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
+                      usr/lib32/{pt_chown,{audit,gconv}/*.so}
+
+  # Dynamic linker
+  install -d -m755 ${pkgdir}/lib
+  ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/
+
+  # Add /usr/lib32 to the default library search path
+  install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf"
+
+  # Symlink /usr/lib32/locale to /usr/lib/locale
+  ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
+}
diff --git a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch
new file mode 100644
index 000000000..cf1a97a18
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch
@@ -0,0 +1,42 @@
+diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-09 13:35:30.000000000 +1000
++++ glibc/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-23 13:27:46.000000000 +1000
+@@ -120,9 +120,6 @@
+ 	ret
+ 
+ L(thread_start):
+-	cfi_startproc;
+-	/* Clearing frame pointer is insufficient, use CFI.  */
+-	cfi_undefined (eip);
+ 	/* Note: %esi is zero.  */
+ 	movl	%esi,%ebp	/* terminate the stack frame */
+ #ifdef RESET_PID
+@@ -155,7 +152,6 @@
+ 	jmp	L(haspid)
+ 	.previous
+ #endif
+-	cfi_endproc;
+ 
+ 	cfi_startproc
+ PSEUDO_END (BP_SYM (__clone))
+diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-09 13:35:30.000000000 +1000
++++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-23 13:27:46.000000000 +1000
+@@ -89,9 +89,6 @@
+ 	ret
+ 
+ L(thread_start):
+-	cfi_startproc;
+-	/* Clearing frame pointer is insufficient, use CFI.  */
+-	cfi_undefined (rip);
+ 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
+ 	   the outermost frame obviously.  */
+ 	xorl	%ebp, %ebp
+@@ -116,7 +113,6 @@
+ 	/* Call exit with return value from function call. */
+ 	movq	%rax, %rdi
+ 	call	HIDDEN_JUMPTARGET (_exit)
+-	cfi_endproc;
+ 
+ 	cfi_startproc;
+ PSEUDO_END (BP_SYM (__clone))
diff --git a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch
new file mode 100644
index 000000000..d3abeff17
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch
@@ -0,0 +1,13 @@
+timezone data has been split into the package sys-libs/timezone-data
+
+--- glibc-2.4/Makeconfig
++++ glibc-2.4/Makeconfig
+@@ -931,7 +931,7 @@
+ 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
+ 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
+ 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
+-	      crypt nss localedata timezone rt conform debug		    \
++	      crypt nss localedata rt conform debug		    \
+ 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
+ 
+ ifndef avoid-generated
diff --git a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch b/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch
new file mode 100644
index 000000000..e84754279
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch
@@ -0,0 +1,11 @@
+--- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c
++++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c
+@@ -28,7 +28,7 @@
+ int
+ __getpagesize ()
+ {
+-#ifdef __ASSUME_AT_PAGESIZE
++#if 0 && defined __ASSUME_AT_PAGESIZE
+   assert (GLRO(dl_pagesize) != 0);
+   return GLRO(dl_pagesize);
+ #else
diff --git a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
new file mode 100644
index 000000000..ce089b49c
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
@@ -0,0 +1,26 @@
+From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@redhat.com>
+Date: Thu, 9 Dec 2010 15:00:59 +0100
+Subject: [PATCH 1/1] Ignore origin of privileged program
+
+---
+ ChangeLog       |    5 +++++
+ elf/dl-object.c |    3 +++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/elf/dl-object.c b/elf/dl-object.c
+index 22a1635..7674d49 100644
+--- a/elf/dl-object.c
++++ b/elf/dl-object.c
+@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type,
+     out:
+       new->l_origin = origin;
+     }
++  else if (INTUSE(__libc_enable_secure) && type == lt_executable)
++    /* The origin of a privileged program cannot be trusted.  */
++    new->l_origin = (char *) -1;
+ 
+   return new;
+ }
+-- 
+1.7.2
diff --git a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch b/multilib-testing/lib32-glibc/glibc-2.13-futex.patch
new file mode 100644
index 000000000..9b9c3ac45
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.13-futex.patch
@@ -0,0 +1,31 @@
+--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S	
++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S	
+@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock:
+ 	cfi_restore(%r12)
+ 	retq
+ 
+-#ifdef __ASSUME_PRIVATE_FUTEX
++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
+ 	cfi_adjust_cfa_offset(16)
+ 	cfi_rel_offset(%r12, 8)
+ 	cfi_rel_offset(%r13, 0)
+--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S	
++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S	
+@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock:
+ 
+ 7:	movq	%rdx, %rax
+ 
+-#ifndef __ASSUME_PRIVATE_FUTEX
++#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
+ 	addq	$16, %rsp
+ 	cfi_adjust_cfa_offset(-16)
+ 	popq	%r14
+@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock:
+ 	cfi_restore(%r12)
+ 	retq
+ 
+-#ifdef __ASSUME_PRIVATE_FUTEX
++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
+ 	cfi_adjust_cfa_offset(16)
+ 	cfi_rel_offset(%r12, 8)
+ 	cfi_rel_offset(%r13, 0)
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch b/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch
new file mode 100644
index 000000000..b5d86c7d2
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch
@@ -0,0 +1,22 @@
+diff --git a/resolv/res_send.c b/resolv/res_send.c
+index 97142b7..a001c1e 100644
+--- a/resolv/res_send.c
++++ b/resolv/res_send.c
+@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
+ 				    ns, ansp, ansp2, nansp2, resplen2);
+ 			if (n < 0)
+ 				return (-1);
+-			if (n == 0 && (buf2 == NULL || resplen2 == 0))
++			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
+ 				goto next_ns;
+ 		} else {
+ 			/* Use datagrams. */
+@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
+ 				    ansp2, nansp2, resplen2);
+ 			if (n < 0)
+ 				return (-1);
+-			if (n == 0 && (buf2 == NULL || resplen2 == 0))
++			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
+ 				goto next_ns;
+ 			if (v_circuit)
+ 			  // XXX Check whether both requests failed or
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch
new file mode 100644
index 000000000..ee29f8c20
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch
@@ -0,0 +1,132 @@
+diff --git a/elf/dl-close.c b/elf/dl-close.c
+index 73b2a2f..9bd91e3 100644
+--- a/elf/dl-close.c
++++ b/elf/dl-close.c
+@@ -1,5 +1,5 @@
+ /* Close a shared object opened by `_dl_open'.
+-   Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
+   if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
+       || dl_close_state != not_pending)
+     {
+-      if (map->l_direct_opencount == 0)
+-	{
+-	  if (map->l_type == lt_loaded)
+-	    dl_close_state = rerun;
+-	  else if (map->l_type == lt_library)
+-	    {
+-	      struct link_map **oldp = map->l_initfini;
+-	      map->l_initfini = map->l_orig_initfini;
+-	      _dl_scope_free (oldp);
+-	    }
+-	}
++      if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
++	dl_close_state = rerun;
+ 
+       /* There are still references to this object.  Do nothing more.  */
+       if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
+diff --git a/elf/dl-deps.c b/elf/dl-deps.c
+index 9e30594..3890d00 100644
+--- a/elf/dl-deps.c
++++ b/elf/dl-deps.c
+@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
+ 		  nneeded * sizeof needed[0]);
+ 	  atomic_write_barrier ();
+ 	  l->l_initfini = l_initfini;
++	  l->l_free_initfini = 1;
+ 	}
+ 
+       /* If we have no auxiliary objects just go on to the next map.  */
+@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
+   l_initfini[nlist] = NULL;
+   atomic_write_barrier ();
+   map->l_initfini = l_initfini;
++  map->l_free_initfini = 1;
+   if (l_reldeps != NULL)
+     {
+       atomic_write_barrier ();
+@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
+       _dl_scope_free (old_l_reldeps);
+     }
+   if (old_l_initfini != NULL)
+-      map->l_orig_initfini = old_l_initfini;
++    _dl_scope_free (old_l_initfini);
+ }
+diff --git a/elf/dl-libc.c b/elf/dl-libc.c
+index 7be9483..a13fce3 100644
+--- a/elf/dl-libc.c
++++ b/elf/dl-libc.c
+@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
+ 
+   for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
+     {
+-      /* Remove all additional names added to the objects.  */
+       for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
+ 	{
+ 	  struct libname_list *lnp = l->l_libname->next;
+ 
+ 	  l->l_libname->next = NULL;
+ 
++	  /* Remove all additional names added to the objects.  */
+ 	  while (lnp != NULL)
+ 	    {
+ 	      struct libname_list *old = lnp;
+@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
+ 	      if (! old->dont_free)
+ 		free (old);
+ 	    }
++
++	  /* Free the initfini dependency list.  */
++	  if (l->l_free_initfini)
++	    free (l->l_initfini);
+ 	}
+ 
+       if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 4a9109e..617e30e 100644
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
+ 	      lnp->dont_free = 1;
+ 	      lnp = lnp->next;
+ 	    }
++	  l->l_free_initfini = 0;
+ 
+ 	  if (l != &GL(dl_rtld_map))
+ 	    _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
+diff --git a/include/link.h b/include/link.h
+index e877104..051b99a 100644
+--- a/include/link.h
++++ b/include/link.h
+@@ -1,6 +1,6 @@
+ /* Data structure for communication from the run-time dynamic linker for
+    loaded ELF shared objects.
+-   Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -192,6 +192,9 @@ struct link_map
+ 						 during LD_TRACE_PRELINKING=1
+ 						 contains any DT_SYMBOLIC
+ 						 libraries.  */
++    unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
++				       freed, ie. not allocated with
++				       the dummy malloc in ld.so.  */
+ 
+     /* Collected information about own RPATH directories.  */
+     struct r_search_path_struct l_rpath_dirs;
+@@ -240,9 +243,6 @@ struct link_map
+ 
+     /* List of object in order of the init and fini calls.  */
+     struct link_map **l_initfini;
+-    /* The init and fini list generated at startup, saved when the
+-       object is also loaded dynamically.  */
+-    struct link_map **l_orig_initfini;
+ 
+     /* List of the dependencies introduced through symbol binding.  */
+     struct link_map_reldeps
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
new file mode 100644
index 000000000..e2beea881
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
@@ -0,0 +1,26 @@
+diff --git a/include/libc-symbols.h b/include/libc-symbols.h
+index 67e1ca2..5e7cca5 100644
+--- a/include/libc-symbols.h
++++ b/include/libc-symbols.h
+@@ -635,7 +635,7 @@ for linking")
+ # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
+ # define libc_hidden_def(name) hidden_def (name)
+ # define libc_hidden_weak(name) hidden_weak (name)
+-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
++# define libc_hidden_nolink(name, version) hidden_def (name)
+ # define libc_hidden_ver(local, name) hidden_ver (local, name)
+ # define libc_hidden_data_def(name) hidden_data_def (name)
+ # define libc_hidden_data_weak(name) hidden_data_weak (name)
+diff --git a/sunrpc/Makefile b/sunrpc/Makefile
+index 5134ce9..40c73d1 100644
+--- a/sunrpc/Makefile
++++ b/sunrpc/Makefile
+@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
+ 				    des_crypt.h)
+ headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
+ 		       $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
+-headers = rpc/netdb.h
++headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
+ install-others = $(inst_sysconfdir)/rpc
+ generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
+ 	    $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
new file mode 100644
index 000000000..eb0fd822d
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
@@ -0,0 +1,28 @@
+From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@redhat.com>
+Date: Tue, 17 May 2011 17:42:30 +0200
+Subject: [PATCH] Reinstall NIS RPC headers
+
+---
+ nis/Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/nis/Makefile b/nis/Makefile
+index b5c9609..d2934d9 100644
+--- a/nis/Makefile
++++ b/nis/Makefile
+@@ -23,9 +23,9 @@ subdir	:= nis
+ 
+ aux			:= nis_hash
+ 
++headers			:= $(wildcard rpcsvc/*.[hx])
+ distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
+-			   nisplus-parser.h nis_xdr.h nss \
+-			   $(wildcard rpcsvc/*.[hx])
++			   nisplus-parser.h nis_xdr.h nss
+ 
+ # These are the databases available for the nis (and perhaps later nisplus)
+ # service.  This must be a superset of the services in nss.
+-- 
+1.7.5.4
+
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch b/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch
new file mode 100644
index 000000000..d71e37492
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch
@@ -0,0 +1,37 @@
+diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
+--- glibc-orig//resolv/res_send.c	2011-06-10 18:59:03.041436996 +1000
++++ glibc/resolv/res_send.c	2011-06-10 19:08:09.379309323 +1000
+@@ -549,7 +549,7 @@
+ 				    ns, ansp, ansp2, nansp2, resplen2);
+ 			if (n < 0)
+ 				return (-1);
+-			if (n == 0 && (buf2 == NULL || resplen2 == 0))
++			if (n == 0)
+ 				goto next_ns;
+ 		} else {
+ 			/* Use datagrams. */
+@@ -559,7 +559,7 @@
+ 				    ansp2, nansp2, resplen2);
+ 			if (n < 0)
+ 				return (-1);
+-			if (n == 0 && (buf2 == NULL || resplen2 == 0))
++			if (n == 0)
+ 				goto next_ns;
+ 			if (v_circuit)
+ 			  // XXX Check whether both requests failed or
+@@ -1275,14 +1275,10 @@
+ 				(*thisresplenp > *thisanssizp)
+ 				? *thisanssizp : *thisresplenp);
+ 
+-			if (recvresp1 || (buf2 != NULL && recvresp2)) {
+-			  *resplen2 = 0;
++			if (recvresp1 || (buf2 != NULL && recvresp2))
+ 			  return resplen;
+-			}
+ 			if (buf2 != NULL)
+ 			  {
+-			    /* No data from the first reply.  */
+-			    resplen = 0;
+ 			    /* We are waiting for a possible second reply.  */
+ 			    if (hp->id == anhp->id)
+ 			      recvresp1 = 1;
diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch
new file mode 100644
index 000000000..28d5dd424
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-__i686.patch
@@ -0,0 +1,13 @@
+diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile
+--- glibc-old//sysdeps/i386/Makefile	2010-03-18 11:52:30.000000000 +1000
++++ glibc//sysdeps/i386/Makefile	2010-04-16 15:05:50.000000000 +1000
+@@ -1,6 +1,7 @@
+ # The mpn functions need a #define for asm syntax flavor.
+-# Every i386 port in use uses gas syntax (I think).
+-asm-CPPFLAGS += -DGAS_SYNTAX
++# Every i386 port in use uses gas syntax (I think).  Don't replace
++# __i686 in __i686.get_pc_thunk.bx.
++asm-CPPFLAGS += -DGAS_SYNTAX  -U __i686
+ 
+ # The i386 `long double' is a distinct type we support.
+ long-double-fcts = yes
diff --git a/multilib-testing/lib32-glibc/lib32-glibc.conf b/multilib-testing/lib32-glibc/lib32-glibc.conf
new file mode 100644
index 000000000..9b08c3f43
--- /dev/null
+++ b/multilib-testing/lib32-glibc/lib32-glibc.conf
@@ -0,0 +1 @@
+/usr/lib32
diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD
index 51db62e26..fdf89a41c 100644
--- a/social/tinc/PKGBUILD
+++ b/social/tinc/PKGBUILD
@@ -2,7 +2,7 @@ pkgname=tinc
 pkgver=1.0.16
 pkgrel=1
 pkgdesc="VPN (Virtual Private Network) daemon"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64 mips64el)
 url="http://www.tinc-vpn.org/"
 license=('GPL')
 depends=('lzo2' 'zlib' 'openssl')
diff --git a/staging/telepathy-gabble/PKGBUILD b/staging/telepathy-gabble/PKGBUILD
deleted file mode 100644
index 3999c7852..000000000
--- a/staging/telepathy-gabble/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 134985 2011-08-09 18:45:11Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Daniel Balieiro <daniel@balieiro.com>
-# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
-pkgname=telepathy-gabble
-pkgver=0.12.4
-pkgrel=2
-pkgdesc="A Jabber/XMPP connection manager for Telepathy"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://telepathy.freedesktop.org"
-groups=('telepathy')
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3')
-makedepends=('libxslt' 'python2')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz)
-install=telepathy-gabble.install
-md5sums=('428962565d568667d3ff1aa7eee3da51')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-  	--libexecdir=/usr/lib/telepathy
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/staging/xf86-input-wacom/70-wacom.rules b/staging/xf86-input-wacom/70-wacom.rules
new file mode 100644
index 000000000..f6aa20835
--- /dev/null
+++ b/staging/xf86-input-wacom/70-wacom.rules
@@ -0,0 +1,12 @@
+ACTION!="add|change", GOTO="wacom_end"
+
+# Match all serial wacom tablets with a serial ID starting with WACf
+# Notes: We assign NAME though we shouldn't, but currently the server requires it
+#        We assign the lot to subsystem pnp too because server reads NAME from
+#        the parent device. Once all that's fixed, as simple SUBSYSTEM="tty"
+#        will do and the ENV{NAME} can be removed.
+SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
+SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
+
+LABEL="wacom_end"
+
diff --git a/staging/xf86-input-wacom/PKGBUILD b/staging/xf86-input-wacom/PKGBUILD
new file mode 100644
index 000000000..9f693c3c5
--- /dev/null
+++ b/staging/xf86-input-wacom/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 135212 2011-08-11 07:18:08Z jgc $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: M Rawash <mrawash@gmail.com>
+
+pkgname=xf86-input-wacom
+pkgver=0.11.1
+pkgrel=3
+pkgdesc="X.Org Wacom tablet driver"
+arch=('i686' 'x86_64')
+url="http://linuxwacom.sourceforge.net/"
+license=('GPL')
+backup=('etc/X11/xorg.conf.d/50-wacom.conf')
+depends=('libxi' 'libxrandr')
+makedepends=('xorg-server-devel>=1.10.99.902' 'libxext' 'libxi')
+conflicts=('xorg-server<1.10.99.902')
+options=(!libtool)
+source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        70-wacom.rules)
+md5sums=('0aec4a338cc583ed497b6af68d6d80ab'
+         '10db4f8272286690255c1bcc18bfdd92')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/lib/udev/rules.d"
+  install -m644 "${srcdir}/70-wacom.rules"  "${pkgdir}/lib/udev/rules.d/"
+}
diff --git a/staging/xf86-video-voodoo/PKGBUILD b/staging/xf86-video-voodoo/PKGBUILD
new file mode 100644
index 000000000..10d718da0
--- /dev/null
+++ b/staging/xf86-video-voodoo/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 135221 2011-08-11 07:49:16Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-voodoo
+pkgver=1.2.4
+pkgrel=5
+pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.10.99.902' 'xf86dgaproto')
+conflicts=('xorg-server<1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('7ecd232cc0b7fe507e18e08799791eefa9fdaf48')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/staging/xf86-video-xgi/PKGBUILD b/staging/xf86-video-xgi/PKGBUILD
new file mode 100644
index 000000000..731c3ea69
--- /dev/null
+++ b/staging/xf86-video-xgi/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 135218 2011-08-11 07:46:30Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-xgi
+pkgver=1.6.0
+pkgrel=4
+pkgdesc="X.org XGI video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'xf86dgaproto')
+conflicts=('xorg-server<1.10.99.902')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        git-fixes.patch)
+sha1sums=('826f14d6ba799cd2aae9f0c818f84cf8b75f1ddb'
+          '61ce13325c69befaa710c3389a85a8aa9d1cf28d')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/git-fixes.patch"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/staging/xf86-video-xgi/git-fixes.patch b/staging/xf86-video-xgi/git-fixes.patch
new file mode 100644
index 000000000..f15fea88a
--- /dev/null
+++ b/staging/xf86-video-xgi/git-fixes.patch
@@ -0,0 +1,451 @@
+diff --git a/man/xgi.man b/man/xgi.man
+index 19880f2..5699ae4 100644
+--- a/man/xgi.man
++++ b/man/xgi.man
+@@ -1,4 +1,3 @@
+-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/xgi/xgi.man,v 1.14 2003/11/12 16:50:36 twini Exp $
+ .\" shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH XGI __drivermansuffix__ __vendorversion__
+diff --git a/src/vb_init.c b/src/vb_init.c
+index 8338410..50980c4 100755
+--- a/src/vb_init.c
++++ b/src/vb_init.c
+@@ -131,6 +131,8 @@ static void XGINew_SetDRAMDefaultRegister340(PXGI_HW_DEVICE_INFO, USHORT,
+ static void XGINew_SetDRAMDefaultRegisterXG45(PXGI_HW_DEVICE_INFO, USHORT, 
+     PVB_DEVICE_INFO);
+ static UCHAR XGINew_Get340DRAMType(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO);
++/* horrible */
++#define XGINew_GetXG20DRAMType XGINew_Get340DRAMType
+ 
+ static int XGINew_SetDDRChannel(int index, UCHAR ChannelNo,
+     UCHAR XGINew_ChannelAB, const USHORT DRAMTYPE_TABLE[][5],
+@@ -1451,7 +1453,7 @@ void XGINew_SetDRAMDefaultRegister340( PXGI_HW_DEVICE_INFO HwDeviceExtension ,
+     }
+ 
+     temp3 = 0 ;
+-    for( k = 0 ; k < 4 ; k++ )
++    for( k = 1 ; k < 4 ; k++ )
+     {
+         XGI_SetRegANDOR((XGIIOADDRESS) P3d4 , 0x6E , 0xFC , temp3 ) ;		/* CR6E_D[1:0] select channel */
+         temp2 = 0 ;
+diff --git a/src/vgatypes.h b/src/vgatypes.h
+index 8a60927..7484661 100755
+--- a/src/vgatypes.h
++++ b/src/vgatypes.h
+@@ -1,5 +1,3 @@
+-/* $XFree86$ */
+-/* $XdotOrg$ */
+ /*
+  * General type definitions for universal mode switching modules
+  *
+diff --git a/src/xgi.h b/src/xgi.h
+index 715502f..e818631 100755
+--- a/src/xgi.h
++++ b/src/xgi.h
+@@ -981,6 +981,7 @@ int compute_vclk(int Clock, int *out_n, int *out_dn, int *out_div,
+ void XGI_WaitBeginRetrace(XGIIOADDRESS RelIO);
+ void XGI_WaitEndRetrace(XGIIOADDRESS RelIO);
+ 
++#include <unistd.h>
+ /* 2005/11/21 added by jjtseng */
+ #define DelayS(sec) usleep((sec)*1000000)
+ #define DelayMS(millisec) usleep((millisec)*1000)
+diff --git a/src/xgi_accel.c b/src/xgi_accel.c
+index c072691..4c298ed 100755
+--- a/src/xgi_accel.c
++++ b/src/xgi_accel.c
+@@ -200,20 +200,7 @@ extern int FbDevExist;
+ #endif
+ 
+ #if X_BYTE_ORDER == X_BIG_ENDIAN
+-static CARD32 BE_SWAP32 (CARD32 val)
+-{
+-	PDEBUG(ErrorF("X_BIG_ENDIAN...\n"));
+-    if (CurrentColorDepth == 8)
+-	    return   ((((val) & 0x000000ff) << 24) | \
+-                  (((val) & 0x0000ff00) << 8) |  \
+-                  (((val) & 0x00ff0000) >> 8) |  \
+-                  (((val) & 0xff000000) >> 24));
+-    if (CurrentColorDepth == 24)
+-        return val;
+-    if (CurrentColorDepth == 16)
+-        return ((((val) & 0x0000ffff) << 16) | \
+-		         (((val) & 0xffff0000) >> 16));
+-}    
++#define BE_SWAP32(x) lswapl(x)
+ #else 
+ static CARD32 BE_SWAP32 (CARD32 val)
+ {
+diff --git a/src/xgi_dga.c b/src/xgi_dga.c
+index 04f90aa..8bd84bc 100755
+--- a/src/xgi_dga.c
++++ b/src/xgi_dga.c
+@@ -103,18 +103,18 @@ XGISetupDGAMode(
+ 
+ 	if(pMode->HDisplay != otherPitch) {
+ 
+-	    newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec));
++	    newmodes = realloc(modes, (*num + 2) * sizeof(DGAModeRec));
+ 	    oneMore  = TRUE;
+ 
+ 	} else {
+ 
+-	    newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec));
++	    newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec));
+ 	    oneMore  = FALSE;
+ 
+ 	}
+ 
+ 	if(!newmodes) {
+-	    xfree(modes);
++	    free(modes);
+ 	    return NULL;
+ 	}
+ 	modes = newmodes;
+diff --git a/src/xgi_dri.c b/src/xgi_dri.c
+index 93687e1..e575c19 100755
+--- a/src/xgi_dri.c
++++ b/src/xgi_dri.c
+@@ -46,7 +46,6 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Priv.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+@@ -145,13 +144,13 @@ XGIInitVisualConfigs(ScreenPtr pScreen)
+     }
+     if (!(pXGIConfigs = (XGIConfigPrivPtr)xnfcalloc(sizeof(XGIConfigPrivRec),
+ 						    numConfigs))) {
+-      xfree(pConfigs);
++      free(pConfigs);
+       return FALSE;
+     }
+     if (!(pXGIConfigPtrs = (XGIConfigPrivPtr*)xnfcalloc(sizeof(XGIConfigPrivPtr),
+ 							  numConfigs))) {
+-      xfree(pConfigs);
+-      xfree(pXGIConfigs);
++      free(pConfigs);
++      free(pXGIConfigs);
+       return FALSE;
+     }
+     for (i=0; i<numConfigs; i++)
+@@ -333,7 +332,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen)
+   pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
+ 
+   if (!DRIScreenInit(pScreen, pDRIInfo, &pXGI->drmSubFD)) {
+-    xfree(pDRIInfo->devPrivate);
++    free(pDRIInfo->devPrivate);
+     pDRIInfo->devPrivate=0;
+     DRIDestroyInfoRec(pXGI->pDRIInfo);
+     pXGI->pDRIInfo=0;
+@@ -537,14 +536,14 @@ XGIDRICloseScreen(ScreenPtr pScreen)
+ 
+   if (pXGI->pDRIInfo) {
+     if (pXGI->pDRIInfo->devPrivate) {
+-      xfree(pXGI->pDRIInfo->devPrivate);
++      free(pXGI->pDRIInfo->devPrivate);
+       pXGI->pDRIInfo->devPrivate=0;
+     }
+     DRIDestroyInfoRec(pXGI->pDRIInfo);
+     pXGI->pDRIInfo=0;
+   }
+-  if (pXGI->pVisualConfigs) xfree(pXGI->pVisualConfigs);
+-  if (pXGI->pVisualConfigsPriv) xfree(pXGI->pVisualConfigsPriv);
++  if (pXGI->pVisualConfigs) free(pXGI->pVisualConfigs);
++  if (pXGI->pVisualConfigsPriv) free(pXGI->pVisualConfigsPriv);
+ 
+   if(pXGI->agpSize){
+ /* ErrorF("Freeing agp memory\n"); */
+diff --git a/src/xgi_driver.c b/src/xgi_driver.c
+index b4f83b8..b8b8679 100755
+--- a/src/xgi_driver.c
++++ b/src/xgi_driver.c
+@@ -54,7 +54,7 @@
+ #include "fb.h"
+ #include "micmap.h"
+ #include "xf86.h"
+-#include "xf86Priv.h"
++#include "xf86Module.h"
+ #include "xf86_OSproc.h"
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86Resources.h"
+@@ -106,6 +106,10 @@
+ #include <unistd.h>
+ #endif
+ 
++#ifndef DEFAULT_DPI
++#define DEFAULT_DPI 96
++#endif
++
+ /* Jong 01/22/2009; compiler error; type conflict */
+ /*
+ #include <fcntl.h>
+@@ -556,13 +560,13 @@ XGIFreeRec(ScrnInfoPtr pScrn)
+              * head.
+              */
+             if (pXGIEnt->BIOS)
+-                xfree(pXGIEnt->BIOS);
++                free(pXGIEnt->BIOS);
+             pXGIEnt->BIOS = pXGI->BIOS = NULL;
+             if (pXGIEnt->XGI_Pr)
+-                xfree(pXGIEnt->XGI_Pr);
++                free(pXGIEnt->XGI_Pr);
+             pXGIEnt->XGI_Pr = pXGI->XGI_Pr = NULL;
+             if (pXGIEnt->RenderAccelArray)
+-                xfree(pXGIEnt->RenderAccelArray);
++                free(pXGIEnt->RenderAccelArray);
+             pXGIEnt->RenderAccelArray = pXGI->RenderAccelArray = NULL;
+         }
+         else {
+@@ -573,19 +577,19 @@ XGIFreeRec(ScrnInfoPtr pScrn)
+     }
+     else {
+         if (pXGI->BIOS)
+-            xfree(pXGI->BIOS);
++            free(pXGI->BIOS);
+         pXGI->BIOS = NULL;
+         if (pXGI->XGI_Pr)
+-            xfree(pXGI->XGI_Pr);
++            free(pXGI->XGI_Pr);
+         pXGI->XGI_Pr = NULL;
+         if (pXGI->RenderAccelArray)
+-            xfree(pXGI->RenderAccelArray);
++            free(pXGI->RenderAccelArray);
+         pXGI->RenderAccelArray = NULL;
+     }
+ 
+ #ifdef XGIMERGED
+     if (pXGI->MetaModes)
+-        xfree(pXGI->MetaModes);
++        free(pXGI->MetaModes);
+     pXGI->MetaModes = NULL;
+ 
+     if (pXGI->CRT1Modes) {
+@@ -595,8 +599,8 @@ XGIFreeRec(ScrnInfoPtr pScrn)
+                 do {
+                     DisplayModePtr p = pScrn->currentMode->next;
+                     if (pScrn->currentMode->Private)
+-                        xfree(pScrn->currentMode->Private);
+-                    xfree(pScrn->currentMode);
++                        free(pScrn->currentMode->Private);
++                    free(pScrn->currentMode);
+                     pScrn->currentMode = p;
+                 } while (pScrn->currentMode != pScrn->modes);
+             }
+@@ -612,7 +616,7 @@ XGIFreeRec(ScrnInfoPtr pScrn)
+     pXGI->pVbe = NULL;
+     if (pScrn->driverPrivate == NULL)
+         return;
+-    xfree(pScrn->driverPrivate);
++    free(pScrn->driverPrivate);
+     pScrn->driverPrivate = NULL;
+ }
+ 
+@@ -975,7 +979,7 @@ XGIProbe(DriverPtr drv, int flags)
+                                     numDevSections, drv, &usedChips);
+ 
+     /* Free it since we don't need that list after this */
+-    xfree(devSections);
++    free(devSections);
+     if (numUsed <= 0)
+         return FALSE;
+ 
+@@ -1015,7 +1019,7 @@ XGIProbe(DriverPtr drv, int flags)
+ 
+ #endif
+         }
+-    xfree(usedChips);
++    free(usedChips);
+ 
+     return foundScreen;
+ }
+@@ -1044,11 +1048,11 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
+ 
+ 	ErrorF("XGICopyModeNLink()...Use Virtual Size-1\n");
+ 
+-    if (!((mode = xalloc(sizeof(DisplayModeRec)))))
++    if (!((mode = malloc(sizeof(DisplayModeRec)))))
+         return dest;
+     memcpy(mode, i, sizeof(DisplayModeRec));
+-    if (!((mode->Private = xalloc(sizeof(XGIMergedDisplayModeRec))))) {
+-        xfree(mode);
++    if (!((mode->Private = malloc(sizeof(XGIMergedDisplayModeRec))))) {
++        free(mode);
+         return dest;
+     }
+     ((XGIMergedDisplayModePtr) mode->Private)->CRT1 = i;
+@@ -1125,8 +1129,8 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
+         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                    "Skipped %dx%d, not enough video RAM or beyond hardware specs\n",
+                    mode->HDisplay, mode->VDisplay);
+-        xfree(mode->Private);
+-        xfree(mode);
++        free(mode->Private);
++        free(mode);
+ 
+         return dest;
+     }
+@@ -1559,10 +1563,10 @@ XGIFreeCRT2Structs(XGIPtr pXGI)
+                                    pXGI->CRT2pScrn->monitor->Modes);
+             }
+             if (pXGI->CRT2pScrn->monitor->DDC)
+-                xfree(pXGI->CRT2pScrn->monitor->DDC);
+-            xfree(pXGI->CRT2pScrn->monitor);
++                free(pXGI->CRT2pScrn->monitor->DDC);
++            free(pXGI->CRT2pScrn->monitor);
+         }
+-        xfree(pXGI->CRT2pScrn);
++        free(pXGI->CRT2pScrn);
+         pXGI->CRT2pScrn = NULL;
+     }
+ }
+@@ -2438,7 +2442,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
+ 
+ #ifdef XGIMERGED
+     if (pXGI->MergedFB) {
+-        pXGI->CRT2pScrn->monitor = xalloc(sizeof(MonRec));
++        pXGI->CRT2pScrn->monitor = malloc(sizeof(MonRec));
+         if (pXGI->CRT2pScrn->monitor) {
+             DisplayModePtr tempm = NULL, currentm = NULL, newm = NULL;
+             memcpy(pXGI->CRT2pScrn->monitor, pScrn->monitor, sizeof(MonRec));
+@@ -2446,11 +2450,11 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
+             pXGI->CRT2pScrn->monitor->Modes = NULL;
+             tempm = pScrn->monitor->Modes;
+             while (tempm) {
+-                if (!(newm = xalloc(sizeof(DisplayModeRec))))
++                if (!(newm = malloc(sizeof(DisplayModeRec))))
+                     break;
+                 memcpy(newm, tempm, sizeof(DisplayModeRec));
+-                if (!(newm->name = xalloc(strlen(tempm->name) + 1))) {
+-                    xfree(newm);
++                if (!(newm->name = malloc(strlen(tempm->name) + 1))) {
++                    free(newm);
+                     break;
+                 }
+                 strcpy(newm->name, tempm->name);
+@@ -2490,7 +2494,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
+                         "Failed to allocate memory for CRT2 monitor, %s.\n",
+                         mergeddisstr);
+             if (pXGI->CRT2pScrn)
+-                xfree(pXGI->CRT2pScrn);
++                free(pXGI->CRT2pScrn);
+             pXGI->CRT2pScrn = NULL;
+             pXGI->MergedFB = FALSE;
+         }
+@@ -3540,7 +3544,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
+         /* Do some MergedFB mode initialisation */
+ #ifdef XGIMERGED
+         if (pXGI->MergedFB) {
+-        pXGI->CRT2pScrn = xalloc(sizeof(ScrnInfoRec));
++        pXGI->CRT2pScrn = malloc(sizeof(ScrnInfoRec));
+         if (!pXGI->CRT2pScrn) {
+             XGIErrorLog(pScrn,
+                         "Failed to allocate memory for 2nd pScrn, %s\n",
+@@ -3586,7 +3590,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
+                     XGIErrorLog(pScrn, mergednocrt1, mergeddisstr);
+                 }
+                 if (pXGI->CRT2pScrn)
+-                    xfree(pXGI->CRT2pScrn);
++                    free(pXGI->CRT2pScrn);
+                 pXGI->CRT2pScrn = NULL;
+                 pXGI->MergedFB = FALSE;
+             }
+@@ -3627,7 +3631,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
+                 XGIErrorLog(pScrn, mergednocrt2, mergeddisstr);
+             }
+             if (pXGI->CRT2pScrn)
+-                xfree(pXGI->CRT2pScrn);
++                free(pXGI->CRT2pScrn);
+             pXGI->CRT2pScrn = NULL;
+             pXGI->MergedFB = FALSE;
+         }
+@@ -4901,7 +4905,7 @@ XGIScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 
+     if (pXGI->ShadowFB) {
+         pXGI->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
+-        pXGI->ShadowPtr = xalloc(pXGI->ShadowPitch * height);
++        pXGI->ShadowPtr = malloc(pXGI->ShadowPitch * height);
+         displayWidth = pXGI->ShadowPitch / (pScrn->bitsPerPixel >> 3);
+         FBStart = pXGI->ShadowPtr;
+     }
+@@ -5777,17 +5781,17 @@ XGICloseScreen(int scrnIndex, ScreenPtr pScreen)
+     }
+ 
+     if (pXGI->ShadowPtr) {
+-        xfree(pXGI->ShadowPtr);
++        free(pXGI->ShadowPtr);
+         pXGI->ShadowPtr = NULL;
+     }
+ 
+     if (pXGI->DGAModes) {
+-        xfree(pXGI->DGAModes);
++        free(pXGI->DGAModes);
+         pXGI->DGAModes = NULL;
+     }
+ 
+     if (pXGI->adaptor) {
+-        xfree(pXGI->adaptor);
++        free(pXGI->adaptor);
+         pXGI->adaptor = NULL;
+         pXGI->ResetXv = pXGI->ResetXvGamma = NULL;
+     }
+diff --git a/src/xgi_opt.c b/src/xgi_opt.c
+index 09346e4..c0608d5 100755
+--- a/src/xgi_opt.c
++++ b/src/xgi_opt.c
+@@ -195,7 +195,7 @@ xgiOptions(ScrnInfoPtr pScrn)
+     xf86CollectOptions(pScrn, NULL);
+ 
+     /* Process the options */
+-    if(!(pXGI->Options = xalloc(sizeof(XGIOptions)))) return;
++    if(!(pXGI->Options = malloc(sizeof(XGIOptions)))) return;
+ 
+     memcpy(pXGI->Options, XGIOptions, sizeof(XGIOptions));
+ 
+diff --git a/src/xgi_setup.c b/src/xgi_setup.c
+index c1d2cdc..6641b09 100755
+--- a/src/xgi_setup.c
++++ b/src/xgi_setup.c
+@@ -678,7 +678,7 @@ bAccessVGAPCIInfo(PXGI_HW_DEVICE_INFO pHwDevInfo, ULONG ulOffset, ULONG ulSet, U
+ 	err = pci_device_cfg_write_u32(pXGI->PciInfo, *pulValue,
+ 				       ulOffset & ~3);
+     } else {
+-	err = pci_device_cfg_write_u32(pXGI->PciInfo, pulValue,
++	err = pci_device_cfg_read_u32(pXGI->PciInfo, pulValue,
+ 				       ulOffset & ~3);
+     }
+ 
+diff --git a/src/xgi_video.c b/src/xgi_video.c
+index 31cffd5..df76d14 100755
+--- a/src/xgi_video.c
++++ b/src/xgi_video.c
+@@ -142,7 +142,7 @@ void XGIInitVideo(ScreenPtr pScreen)
+             adaptors = &newAdaptor;
+         } else {
+             newAdaptors =  /* need to free this someplace */
+-                xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
++                malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+             if(newAdaptors) {
+                 memcpy(newAdaptors, adaptors, num_adaptors *
+                                         sizeof(XF86VideoAdaptorPtr));
+@@ -157,7 +157,7 @@ void XGIInitVideo(ScreenPtr pScreen)
+         xf86XVScreenInit(pScreen, adaptors, num_adaptors);
+ 
+     if(newAdaptors)
+-        xfree(newAdaptors);
++        free(newAdaptors);
+ 
+ }
+ 
+@@ -395,7 +395,7 @@ XGISetupImageVideo(ScreenPtr pScreen)
+     struct v4l2_standard 	standard;
+ # endif//VC    
+ 
+-    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
++    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
+                             sizeof(XGIPortPrivRec) +
+                             sizeof(DevUnion))))
+         return NULL;
diff --git a/staging/xf86-video-xgixp/PKGBUILD b/staging/xf86-video-xgixp/PKGBUILD
new file mode 100644
index 000000000..afe49186d
--- /dev/null
+++ b/staging/xf86-video-xgixp/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 135215 2011-08-11 07:24:33Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-xgixp
+pkgver=1.8.0
+pkgrel=4
+pkgdesc="X.org XGIXP video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
+conflicts=('xorg-server<1.10.99.902')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        api-compat-fix-for-DRAWABLE_BUFFER.patch)
+sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3'
+          'ea140a13963bbf33cdff1ad75789d765867ec53b')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/api-compat-fix-for-DRAWABLE_BUFFER.patch"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/staging/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch b/staging/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch
new file mode 100644
index 000000000..f8cb64673
--- /dev/null
+++ b/staging/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch
@@ -0,0 +1,23 @@
+From 86258a6fd8fc8bb09a52ee446b37abe6bd0843ef Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Fri, 25 Mar 2011 22:46:55 +0000
+Subject: API compat fix for DRAWABLE_BUFFER
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/xgi_driver.c b/src/xgi_driver.c
+index e54d8c7..189b84a 100644
+--- a/src/xgi_driver.c
++++ b/src/xgi_driver.c
+@@ -2708,7 +2708,9 @@ xg47_setup_fb_wrap(ReadMemoryProcPtr *read_ptr,
+ {
+     switch (pDraw->type) {
+     case DRAWABLE_WINDOW:
++#ifdef DRAWABLE_BUFFER
+     case DRAWABLE_BUFFER:
++#endif
+ 	*read_ptr = xg47_read_memory_swap_func;
+ 	*write_ptr = xg47_write_memory_swap_func;
+ 	break;
+--
+cgit v0.8.3-6-g21f6
diff --git a/testing/abiword/PKGBUILD b/testing/abiword/PKGBUILD
new file mode 100644
index 000000000..fc132f7b3
--- /dev/null
+++ b/testing/abiword/PKGBUILD
@@ -0,0 +1,63 @@
+# $Id: PKGBUILD 135371 2011-08-13 09:02:34Z andyrtr $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Maël Lavault <moimael@neuf.fr>
+
+pkgbase=abiword
+pkgname=('abiword' 'abiword-plugins')
+pkgver=2.8.6
+pkgrel=5
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.abisource.com"
+makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup')
+options=('!makeflags' '!libtool')
+source=("http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbase}-${pkgver}.tar.gz"
+        compat_libwpg_0_9.patch
+	abiword-2.8.6-no-undefined.patch)
+sha1sums=('998f69d038000b3fc027d4259548f02d67c8d0df'
+          'e5374f439e3d9b63a4bbd2cd39146c67cf1e85ea'
+          '159b1cd0b9354868ab86f851b64a03dae7d254dc')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch"
+  # fix a gcc 4.6.x build issue, patch from Fedora
+  patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch"
+  libtoolize --force
+  autoreconf
+
+  ./configure --prefix=/usr --enable-clipart --enable-templates --enable-collab-backend-xmpp --enable-collab-backend-tcp --enable-collab-backend-service --disable-collab-backend-sugar --enable-plugins --without-gnomevfs --with-gio --with-goffice --disable-static --with-psiconv-config=/nothere
+  make
+}
+
+package_abiword() {
+  pkgdesc="A fully-featured word processor"
+  depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils')
+  install=$pkgname.install
+  optdepends=('abiword-plugins')
+  conflicts=("abiword-plugins<${pkgver}-${pkgrel}")
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  sed -i plugins/Makefile \
+      -e 's/ collab / /' \
+      -e 's/ wpg / /' \
+      -e 's/ wmf / /' \
+      -e 's/ grammar / /' \
+      -e 's/ mathview / /' \
+      -e 's/ aiksaurus / /' \
+      -e 's/ latex / /' \
+      -e 's/ ots / /' \
+      -e 's/ wordperfect / /'
+  make DESTDIR="${pkgdir}" install
+}
+
+package_abiword-plugins() {
+  pkgdesc="Additional plugins for Abiword"
+  depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/plugins"
+  for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do
+    make -C ${dir} DESTDIR="${pkgdir}" install
+  done
+}
diff --git a/testing/abiword/abiword-2.8.6-no-undefined.patch b/testing/abiword/abiword-2.8.6-no-undefined.patch
new file mode 100644
index 000000000..c07000edb
--- /dev/null
+++ b/testing/abiword/abiword-2.8.6-no-undefined.patch
@@ -0,0 +1,21 @@
+diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am
+--- abiword-2.8.6.orig/src/Makefile.am	2009-09-09 15:11:01.000000000 +0200
++++ abiword-2.8.6/src/Makefile.am	2011-08-02 23:35:51.904761961 +0200
+@@ -107,7 +107,7 @@
+ 
+ AbiWord_LDFLAGS = \
+ 	$(DEPS_LIBS) \
+-	--no-undefined \
++	-Wl,--no-undefined \
+ 	-avoid-version \
+ 	-export-dynamic \
+ 	-headerpad_max_install_names 
+@@ -129,7 +129,7 @@
+ 
+ abiword_LDFLAGS = \
+ 	$(platform_ldflags) \
+-	--no-undefined      \
++	-Wl,--no-undefined      \
+ 	-avoid-version      \
+ 	-export-dynamic
+ 
diff --git a/testing/abiword/abiword.install b/testing/abiword/abiword.install
new file mode 100644
index 000000000..2eaa60550
--- /dev/null
+++ b/testing/abiword/abiword.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/testing/abiword/compat_libwpg_0_9.patch b/testing/abiword/compat_libwpg_0_9.patch
new file mode 100644
index 000000000..cf36e188e
--- /dev/null
+++ b/testing/abiword/compat_libwpg_0_9.patch
@@ -0,0 +1,371 @@
+diff -Nur abiword-2.8.6.orig//plugin-configure.m4 abiword-2.8.6/plugin-configure.m4
+--- abiword-2.8.6.orig//plugin-configure.m4	2010-06-13 14:17:27.000000000 -0700
++++ abiword-2.8.6/plugin-configure.m4	2010-12-06 13:59:43.083048588 -0800
+@@ -794,7 +794,7 @@
+ AC_SUBST([OPENXML_LIBS])
+ 
+ 
+-wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
++wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
+ wpg_deps="no"
+ 
+ if test "$enable_wpg" != ""; then
+@@ -1497,8 +1497,8 @@
+ AC_SUBST([EML_LIBS])
+ 
+ 
+-wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
+-wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
++wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
++wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
+ wordperfect_deps="no"
+ 
+ WORDPERFECT_CFLAGS=
+diff -Nur abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 abiword-2.8.6/plugins/wordperfect/plugin.m4
+--- abiword-2.8.6.orig//plugins/wordperfect/plugin.m4	2010-05-30 07:50:46.000000000 -0700
++++ abiword-2.8.6/plugins/wordperfect/plugin.m4	2010-12-06 13:59:53.929715254 -0800
+@@ -1,6 +1,6 @@
+ 
+-wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
+-wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
++wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
++wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
+ wordperfect_deps="no"
+ 
+ WORDPERFECT_CFLAGS=
+diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
+--- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	2010-02-06 13:06:11.000000000 -0800
++++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	2010-12-06 13:59:53.926381921 -0800
+@@ -60,7 +60,7 @@
+ 
+ // Stream class
+ 
+-#include <libwpd/WPXStream.h>
++#include <libwpd-stream/libwpd-stream.h>
+ 
+ #include <gsf/gsf-input.h>
+ #include <gsf/gsf-infile.h>
+@@ -70,12 +70,7 @@
+ #include <libwps/libwps.h>
+ #endif
+ 
+-class AbiWordperfectInputStream :
+-#ifdef HAVE_LIBWPS
+-	public WPSInputStream
+-#else
+-    public WPXInputStream
+-#endif
++class AbiWordperfectInputStream : public WPXInputStream
+ {
+ public:
+ 	AbiWordperfectInputStream(GsfInput *input);
+@@ -86,7 +81,7 @@
+ 
+ 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
+ 
+-	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
++	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
+ 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
+ 	virtual long tell();
+ 	virtual bool atEOS();
+@@ -98,11 +93,7 @@
+ };
+ 
+ AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) :
+-#ifdef HAVE_LIBWPS
+-	WPSInputStream(),
+-#else
+-	WPXInputStream(true),
+-#endif
++	WPXInputStream(),
+ 	m_input(input),
+ 	m_ole(NULL)
+ {
+@@ -117,9 +108,9 @@
+ 	g_object_unref(G_OBJECT(m_input));
+ }
+ 
+-const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead)
++const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
+ {
+-	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
++	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
+ 
+ 	if (buf == NULL)
+ 		numBytesRead = 0;
+@@ -256,19 +247,12 @@
+ {
+ 	AbiWordperfectInputStream gsfInput(input);
+ 
+-	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true);
++	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput);
+ 
+ 	switch (confidence)
+ 	{
+ 		case WPD_CONFIDENCE_NONE:
+-		// libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document)
+-		// however, we'll let the text importer handle such cases
+-		case WPD_CONFIDENCE_POOR: 
+ 			return UT_CONFIDENCE_ZILCH;
+-		case WPD_CONFIDENCE_LIKELY:
+-			return UT_CONFIDENCE_SOSO;
+-		case WPD_CONFIDENCE_GOOD:
+-			return UT_CONFIDENCE_GOOD;
+ 		case WPD_CONFIDENCE_EXCELLENT:
+ 			return UT_CONFIDENCE_PERFECT;
+ 		default:
+@@ -328,7 +312,7 @@
+ UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input)
+ {
+ 	AbiWordperfectInputStream gsfInput(input);
+-	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
++	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL);
+ 
+ 	if (error != WPD_OK)
+ 	{
+@@ -381,9 +365,9 @@
+ 	float marginLeft = 1.0f, marginRight = 1.0f;
+ 
+ 	if (propList["fo:margin-left"])
+-		marginLeft = propList["fo:margin-left"]->getFloat();
++		marginLeft = propList["fo:margin-left"]->getDouble();
+ 	if (propList["fo:margin-right"])
+-		marginRight = propList["fo:margin-right"]->getFloat();
++		marginRight = propList["fo:margin-right"]->getDouble();
+ 
+ 	if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */
+ 		/* marginTop != m_marginBottom || marginBottom != m_marginBottom */ )
+@@ -456,15 +440,15 @@
+ 	float marginTop = 0.0f, marginBottom = 0.0f;
+ 	float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f;
+ 	if (propList["fo:margin-top"])
+-	    marginTop = propList["fo:margin-top"]->getFloat();
++	    marginTop = propList["fo:margin-top"]->getDouble();
+ 	if (propList["fo:margin-bottom"])
+-	    marginBottom = propList["fo:margin-bottom"]->getFloat();
++	    marginBottom = propList["fo:margin-bottom"]->getDouble();
+ 	if (propList["fo:margin-left"])
+-	    marginLeft = propList["fo:margin-left"]->getFloat();
++	    marginLeft = propList["fo:margin-left"]->getDouble();
+ 	if (propList["fo:margin-right"])
+-	    marginRight = propList["fo:margin-right"]->getFloat();
++	    marginRight = propList["fo:margin-right"]->getDouble();
+ 	if (propList["fo:text-indent"])
+-	    textIndent = propList["fo:text-indent"]->getFloat();
++	    textIndent = propList["fo:text-indent"]->getDouble();
+ 
+ 	m_topMargin = marginTop;
+ 	m_bottomMargin = marginBottom;
+@@ -487,7 +471,7 @@
+ 
+ 	float lineSpacing = 1.0f;
+ 	if (propList["fo:line-height"])
+-		lineSpacing = propList["fo:line-height"]->getFloat();
++		lineSpacing = propList["fo:line-height"]->getDouble();
+ 	
+ 	UT_String tmpBuffer;
+ 	UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f",
+@@ -504,7 +488,7 @@
+ 			propBuffer += tmpBuffer;
+ 			if (i()["style:position"])
+ 			{
+-				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat());
++				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble());
+ 				propBuffer += tmpBuffer;
+ 			}
+ 
+@@ -640,9 +624,9 @@
+ 
+ 	// TODO: support spaceAfter
+ 	if (propList["fo:margin-left"])
+-		marginLeft = propList["fo:margin-left"]->getFloat();
++		marginLeft = propList["fo:margin-left"]->getDouble();
+ 	if (propList["fo:margin-right"])
+-		marginRight = propList["fo:margin-right"]->getFloat();
++		marginRight = propList["fo:margin-right"]->getDouble();
+ 
+ 	if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount)
+ 		m_bSectionChanged = true;
+@@ -709,9 +693,9 @@
+ 	if (propList["style:num-format"])
+ 		listType = propList["style:num-format"]->getStr().cstr()[0];
+ 	if (propList["text:space-before"])
+-		listLeftOffset = propList["text:space-before"]->getFloat();
++		listLeftOffset = propList["text:space-before"]->getDouble();
+ 	if (propList["text:min-label-width"])
+-		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
++		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
+ 
+ 	if (!m_pCurrentListDefinition || 
+ 		m_pCurrentListDefinition->getOutlineHash() != listID ||
+@@ -749,9 +733,9 @@
+ 	if (propList["libwpd:level"])
+ 		level = propList["libwpd:level"]->getInt();
+ 	if (propList["text:space-before"])
+-		listLeftOffset = propList["text:space-before"]->getFloat();
++		listLeftOffset = propList["text:space-before"]->getDouble();
+ 	if (propList["text:min-label-width"])
+-		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
++		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
+ 
+ 	if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID)
+ 	{
+@@ -871,10 +855,10 @@
+ 
+ 	UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel)
+ 					+ m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
+-					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
++					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
+ 	propBuffer += tempBuffer;
+ 	UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
+-					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
++					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
+ 	propBuffer += tempBuffer;
+ 
+ 	listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME;
+@@ -1263,7 +1247,7 @@
+     virtual UT_Error _loadFile(GsfInput * input)
+ 	{
+ 		AbiWordperfectInputStream gsfInput(input);
+-		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
++		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this));
+ 
+ 		if (error != WPS_OK)
+ 			{
+@@ -1302,18 +1286,12 @@
+ {
+ 	AbiWordperfectInputStream gsfInput(input);
+ 
+-	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true);
++	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput);
+ 
+ 	switch (confidence)
+ 	{
+ 		case WPS_CONFIDENCE_NONE:
+ 			return UT_CONFIDENCE_ZILCH;
+-		case WPS_CONFIDENCE_POOR: 
+-			return UT_CONFIDENCE_POOR;
+-		case WPS_CONFIDENCE_LIKELY:
+-			return UT_CONFIDENCE_SOSO;
+-		case WPS_CONFIDENCE_GOOD:
+-			return UT_CONFIDENCE_GOOD;
+ 		case WPS_CONFIDENCE_EXCELLENT:
+ 			return UT_CONFIDENCE_PERFECT;
+ 		default:
+diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h
+--- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h	2009-06-19 01:55:49.000000000 -0700
++++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h	2010-12-06 13:59:53.929715254 -0800
+@@ -30,13 +30,7 @@
+ #define IE_IMP_WP_H
+ 
+ #include <stdio.h>
+-#ifdef _WIN32
+-#define POINT WPX_POINT
+-#endif
+ #include <libwpd/libwpd.h>
+-#ifdef _WIN32
+-#undef POINT
+-#endif
+ #include "ie_imp.h"
+ #include "ut_string.h"
+ #include "ut_string_class.h"
+@@ -98,7 +92,7 @@
+ 					IE_Imp ** ppie);
+ };
+ 
+-class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl
++class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface
+ {
+ public:
+     IE_Imp_WordPerfect(PD_Document * pDocument);
+@@ -154,6 +148,21 @@
+     virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {}
+     virtual void closeTable();
+ 
++    virtual void definePageStyle(const WPXPropertyList&) {}
++    virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
++    virtual void defineCharacterStyle(const WPXPropertyList&) {}
++    virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
++    virtual void insertSpace() {}
++    virtual void insertField(const WPXString&, const WPXPropertyList&) {}
++    virtual void openComment(const WPXPropertyList&) {}
++    virtual void closeComment() {}
++    virtual void openTextBox(const WPXPropertyList&) {}
++    virtual void closeTextBox() {}
++    virtual void openFrame(const WPXPropertyList&) {}
++    virtual void closeFrame() {}
++    virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {}
++    virtual void insertEquation(const WPXPropertyList&, const WPXString&) {}
++
+     
+ protected:
+ 	virtual UT_Error _loadFile(GsfInput * input);
+diff -Nur abiword-2.8.6.orig//plugins/wpg/plugin.m4 abiword-2.8.6/plugins/wpg/plugin.m4
+--- abiword-2.8.6.orig//plugins/wpg/plugin.m4	2010-05-30 07:50:46.000000000 -0700
++++ abiword-2.8.6/plugins/wpg/plugin.m4	2010-12-06 13:59:53.929715254 -0800
+@@ -1,5 +1,5 @@
+ 
+-wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
++wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
+ wpg_deps="no"
+ 
+ if test "$enable_wpg" != ""; then
+diff -Nur abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp
+--- abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp	2008-08-15 14:52:32.000000000 -0700
++++ abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp	2010-12-06 13:59:53.923048588 -0800
+@@ -31,11 +31,10 @@
+ #include <gsf/gsf-input-memory.h>
+ #include <gsf/gsf-input-stdio.h>
+ #include <gsf/gsf-infile-msole.h>
+-#include <libwpd/WPXStream.h>
++#include <libwpd-stream/libwpd-stream.h>
+ #include "xap_Module.h"
+ 
+ using libwpg::WPGraphics;
+-using libwpg::WPGString;
+ 
+ ABI_PLUGIN_DECLARE("WPG")
+ 
+@@ -48,7 +47,7 @@
+ 	virtual bool isOLEStream();
+ 	virtual WPXInputStream * getDocumentOLEStream();
+ 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
+-	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
++	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
+ 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
+ 	virtual long tell();
+ 	virtual bool atEOS();
+@@ -60,7 +59,7 @@
+ };
+ 
+ AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) :
+-	WPXInputStream(true),
++	WPXInputStream(),
+ 	m_input(input),
+ 	m_ole(NULL)
+ {
+@@ -75,9 +74,9 @@
+ 	g_object_unref(G_OBJECT(m_input));
+ }
+ 
+-const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead)
++const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
+ {
+-	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
++	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
+ 
+ 	if (buf == NULL)
+ 		numBytesRead = 0;
+@@ -245,10 +244,10 @@
+ UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg)
+ {
+ 	AbiWordPerfectGraphicsInputStream gsfInput(input);
+-	WPGString svgOutput;
++	WPXString svgOutput;
+ 	if (WPGraphics::generateSVG(&gsfInput, svgOutput))
+ 	{
+-		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false);
++		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
+ 		UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
+ 		g_object_unref(svgInput);
+ 		return result;
diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD
new file mode 100644
index 000000000..bfdb3aece
--- /dev/null
+++ b/testing/binutils/PKGBUILD
@@ -0,0 +1,83 @@
+# $Id: PKGBUILD 135501 2011-08-14 10:07:19Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+
+pkgname=binutils
+pkgver=2.21.1
+pkgrel=2
+_date=20110627
+pkgdesc="A set of programs to assemble and manipulate binary and object files"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/binutils/"
+license=('GPL')
+groups=('base')
+depends=('glibc>=2.14' 'zlib')
+checkdepends=('dejagnu')
+options=('!libtool' '!distcc' '!ccache')
+install=binutils.install
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2)
+md5sums=('2face559e80d649ba148e42bb2d1fb0f')
+
+mksource() {
+  mkdir ${pkgname}-${_date}
+  cd ${pkgname}-${_date}
+  export _TAG=binutils-2_21-branch
+  export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src'
+  cvs -z9 co -r $_TAG binutils || return 1
+  mv src binutils
+  tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/*
+}
+
+build() {
+  cd ${srcdir}
+  mkdir binutils-build && cd binutils-build
+
+  [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib"
+
+  ${srcdir}/binutils/configure --prefix=/usr \
+    --enable-ld=default --enable-gold \
+    --enable-plugins --enable-threads \
+    --enable-shared $CONFIGFLAG
+
+  # check the host environment and makes sure all the necessary tools are available
+  make configure-host
+
+  make tooldir=${pkgdir}/usr
+}
+
+check() {
+  cd ${srcdir}/binutils-build
+
+  # do not abort on errors - manually check log files
+  make -k -j1 check || true
+}
+
+package() {
+  cd ${srcdir}/binutils-build
+  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
+  
+  # Add some useful headers
+  install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include
+  install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include
+
+  # Rebuild libiberty.a with -fPIC
+  make -C libiberty clean
+  make CFLAGS="$CFLAGS -fPIC" -C libiberty
+  install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib
+
+  # Rebuild libbfd.a with -fPIC
+  make -C bfd clean
+  # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
+  make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd
+  install -m644 bfd/libbfd.a ${pkgdir}/usr/lib
+
+  # Remove Windows/Novell specific man pages
+  rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
+
+  # Remove these symlinks, they are not ABI stable.
+  # Programs should compile static to the .a file.
+  rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
+  echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so
+  echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so
+}
diff --git a/testing/binutils/binutils.install b/testing/binutils/binutils.install
new file mode 100644
index 000000000..8bf9f3a47
--- /dev/null
+++ b/testing/binutils/binutils.install
@@ -0,0 +1,17 @@
+infodir=usr/share/info
+filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
+
+post_upgrade() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
diff --git a/testing/blender/PKGBUILD b/testing/blender/PKGBUILD
new file mode 100644
index 000000000..1e283304a
--- /dev/null
+++ b/testing/blender/PKGBUILD
@@ -0,0 +1,92 @@
+# $Id: PKGBUILD 135345 2011-08-13 01:50:31Z eric $
+# Contributor: John Sowiak <john@archlinux.org>
+# Maintainer: tobias <tobias@archlinux.org>
+
+# Apparently, the blender guys refuse to release source tarballs for
+# intermediate releases that deal mainly with binaries but incorporate tiny
+# minor changes from svn. Since I'm sick and tired of the urges of users that
+# look for release numbers only, we make a messy PKGBUILD that can checkout svn
+# release if necessary.
+
+#_svn=true
+_svn=false
+
+pkgname=blender
+pkgver=2.59
+pkgrel=1
+epoch=2
+pkgdesc="A fully integrated 3D graphics creation suite"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.blender.org"
+depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
+         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
+         'freetype2' 'openal' 'libsamplerate' 'ffmpeg')
+makedepends=('cmake') # 'subversion'
+install=blender.install
+if [ $_svn = false ]; then
+  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
+  md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe')
+else
+  source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
+  md5sums=('7579d1139d0d6025df8afcfca64a65c4')
+fi
+
+# source PKGBUILD && mksource
+mksource() {
+  _svnver=38016
+  _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
+  _svnmod="$pkgname-$pkgver"
+  mkdir ${pkgname}-$pkgver
+  pushd ${pkgname}-$pkgver
+  svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
+  find . -depth -type d -name .svn -exec rm -rf {} \;
+  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
+  popd
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  mkdir build
+  cd build
+
+  [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF"
+
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+    -DCMAKE_BUILD_TYPE:STRING=Release \
+    -DWITH_INSTALL_PORTABLE:BOOL=OFF \
+    -DWITH_PYTHON_INSTALL:BOOL=OFF \
+    -DWITH_OPENCOLLADA:BOOL=OFF \
+    -DWITH_GAMEENGINE:BOOL=ON \
+    -DWITH_PLAYER:BOOL=ON \
+    -DWITH_BUILTIN_GLEW:BOOL=OFF \
+    -DWITH_CODEC_FFMPEG:BOOL=ON \
+    -DWITH_CODEC_SNDFILE:BOOL=ON \
+    -DPYTHON_VERSION:STRING=3.2 \
+    -DPYTHON_LIBPATH:STRING=/usr/lib \
+    -DPYTHON_LIBRARY:STRING=python3.2mu \
+    -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
+    $ENABLESSE2
+
+  make $MAKEFLAGS
+
+  cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \
+    "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/
+  cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi
+  chmod 755 bmake
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver/build"
+  make DESTDIR="${pkgdir}" install
+  python -m compileall "${pkgdir}/usr/share/blender"
+
+# install plugins
+  install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
+  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
+    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
+  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
+    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
+}
diff --git a/testing/blender/blender.install b/testing/blender/blender.install
new file mode 100644
index 000000000..f4d7cc443
--- /dev/null
+++ b/testing/blender/blender.install
@@ -0,0 +1,17 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_remove() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
diff --git a/staging/claws-mail/PKGBUILD b/testing/claws-mail/PKGBUILD
index 09ce5df6f..b395a6177 100644
--- a/staging/claws-mail/PKGBUILD
+++ b/testing/claws-mail/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=claws-mail
 pkgver=3.7.9
 pkgrel=5
 pkgdesc="A GTK+ based e-mail client."
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://www.claws-mail.org"
 depends=('gtk2' 'gnutls' 'startup-notification' 'pilot-link' 'enchant'
diff --git a/staging/claws-mail/claws-mail.install b/testing/claws-mail/claws-mail.install
index 648480c3b..648480c3b 100644
--- a/staging/claws-mail/claws-mail.install
+++ b/testing/claws-mail/claws-mail.install
diff --git a/staging/claws-mail/claws-notify-crash.patch b/testing/claws-mail/claws-notify-crash.patch
index e1d4eb686..e1d4eb686 100644
--- a/staging/claws-mail/claws-notify-crash.patch
+++ b/testing/claws-mail/claws-notify-crash.patch
diff --git a/testing/cloog/PKGBUILD b/testing/cloog/PKGBUILD
new file mode 100644
index 000000000..1b26aee0f
--- /dev/null
+++ b/testing/cloog/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 135495 2011-08-14 09:41:50Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+pkgname=cloog
+pkgver=0.16.2
+pkgrel=2
+pkgdesc="Library that generates loops for scanning polyhedra"
+arch=('i686' 'x86_64')
+url="http://www.bastoul.net/cloog/"
+license=('GPL')
+depends=('isl' 'gmp')
+conflicts=('cloog-ppl<0.15.10-2')
+options=('!libtool')
+source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz)
+md5sums=('83877caaa879c7160063138bb18348e7')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --with-isl=system --with-gmp=system
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make check
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/staging/cups/PKGBUILD b/testing/cups/PKGBUILD
index 29355b823..628600839 100644
--- a/staging/cups/PKGBUILD
+++ b/testing/cups/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.4.8
 pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
 makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
diff --git a/staging/cups/cups b/testing/cups/cups
index 744c8e663..744c8e663 100755
--- a/staging/cups/cups
+++ b/testing/cups/cups
diff --git a/staging/cups/cups-avahi.patch b/testing/cups/cups-avahi.patch
index cf1056a75..cf1056a75 100644
--- a/staging/cups/cups-avahi.patch
+++ b/testing/cups/cups-avahi.patch
diff --git a/staging/cups/cups-no-export-ssllibs.patch b/testing/cups/cups-no-export-ssllibs.patch
index 9be3c819b..9be3c819b 100644
--- a/staging/cups/cups-no-export-ssllibs.patch
+++ b/testing/cups/cups-no-export-ssllibs.patch
diff --git a/staging/cups/cups-no-gcrypt.patch b/testing/cups/cups-no-gcrypt.patch
index 203b4f4ac..203b4f4ac 100644
--- a/staging/cups/cups-no-gcrypt.patch
+++ b/testing/cups/cups-no-gcrypt.patch
diff --git a/staging/cups/cups.install b/testing/cups/cups.install
index 47c3d9b82..47c3d9b82 100644
--- a/staging/cups/cups.install
+++ b/testing/cups/cups.install
diff --git a/staging/cups/cups.logrotate b/testing/cups/cups.logrotate
index 9c49bbdaf..9c49bbdaf 100644
--- a/staging/cups/cups.logrotate
+++ b/testing/cups/cups.logrotate
diff --git a/staging/cups/cups.pam b/testing/cups/cups.pam
index 53724d1f8..53724d1f8 100644
--- a/staging/cups/cups.pam
+++ b/testing/cups/cups.pam
diff --git a/staging/empathy/PKGBUILD b/testing/empathy/PKGBUILD
index 33f310704..952c577d6 100644
--- a/staging/empathy/PKGBUILD
+++ b/testing/empathy/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=empathy
 pkgver=3.0.2
 pkgrel=2
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://live.gnome.org/Empathy"
 license=('GPL2')
 depends=('telepathy-glib' 'telepathy-mission-control' 'folks' 'telepathy-logger' 'telepathy-farsight' 'gnome-keyring' 'gnutls' 'evolution-data-server'
diff --git a/staging/empathy/empathy.install b/testing/empathy/empathy.install
index 63dd6b907..63dd6b907 100644
--- a/staging/empathy/empathy.install
+++ b/testing/empathy/empathy.install
diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD
new file mode 100644
index 000000000..559239a1f
--- /dev/null
+++ b/testing/gcc/PKGBUILD
@@ -0,0 +1,262 @@
+# $Id: PKGBUILD 135498 2011-08-14 09:49:10Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+# NOTE: libtool requires rebuilt with each new gcc version
+
+pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
+pkgver=4.6.1
+pkgrel=3
+#_snapshot=4.6-20110603
+_libstdcppmanver=20110201		# Note: check source directory name when updating this
+pkgdesc="The GNU Compiler Collection"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL' 'custom')
+url="http://gcc.gnu.org"
+makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
+checkdepends=('dejagnu')
+options=('!libtool' '!emptydirs')
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
+	gcc_pure64.patch
+	gcc-hash-style-both.patch)
+md5sums=('c57a9170c677bf795bdc04ed796ca491'
+         '1e9fd2eaf0ee47ea64e82c48998f1999'
+         '4030ee1c08dd1e843c0225b772360e76'
+         '4df25b623799b148a0703eaeec8fdf3f')
+
+if [ -n "${_snapshot}" ]; then
+  _basedir="${srcdir}/gcc-${_snapshot}"
+else
+  _basedir="${srcdir}/gcc-${pkgver}"
+fi
+
+build() {
+  cd ${_basedir}
+
+  # Do not install libiberty
+  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+
+  # Do not run fixincludes
+  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    patch -Np1 -i ${srcdir}/gcc_pure64.patch
+  fi
+  patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
+
+  echo ${pkgver} > gcc/BASE-VER
+
+  cd ${srcdir}
+  mkdir gcc-build && cd gcc-build
+
+  ${_basedir}/configure --prefix=/usr \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --mandir=/usr/share/man --infodir=/usr/share/info \
+      --with-bugurl=https://bugs.archlinux.org/ \
+      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
+      --enable-shared --enable-threads=posix \
+      --with-system-zlib --enable-__cxa_atexit \
+      --disable-libunwind-exceptions --enable-clocale=gnu \
+      --enable-gnu-unique-object --enable-linker-build-id \
+      --with-ppl --enable-cloog-backend=isl \
+      --enable-lto --enable-gold --enable-ld=default \
+      --enable-plugin --with-plugin-ld=ld.gold \
+      --disable-multilib --disable-libstdcxx-pch \
+      --enable-checking=release
+  make
+  
+  # rebuild libssp without -fstack-protector and -D_FORTIFY_SOURCE=2
+  # adjusting Makefile.in prior to build still results in these leaking through (yay libtool...)
+  cd $CHOST/libssp
+  sed -i -e "s#-fstack-protector#-fno-stack-protector#" \
+         -e "s#-D_FORTIFY_SOURCE=2#-U_FORTIFY_SOURCE#" Makefile
+  make clean
+  make
+}
+
+check() {
+  cd gcc-build
+
+  # increase stack size to prevent test failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
+  ulimit -s 32768
+
+  # do not abort on error as some are "expected"
+  make -k check || true
+  ${_basedir}/contrib/test_summary
+}
+
+package_gcc-libs()
+{
+  pkgdesc="Runtime libraries shipped by GCC"
+  groups=('base')
+  depends=('glibc>=2.14')
+  install=gcc-libs.install
+
+  cd gcc-build
+  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
+  for lib in libmudflap libgomp libssp libstdc++-v3/src; do
+    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+  done
+  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
+  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
+
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
+  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
+  make -j1 DESTDIR=${pkgdir} install-target-libobjc
+
+  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
+  rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
+
+  # remove static libraries
+  find ${pkgdir} -name *.a -delete
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc()
+{
+  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
+  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.21.1' 'libmpc' 'cloog' 'ppl')
+  groups=('base-devel')
+  install=gcc.install
+
+  cd gcc-build
+  
+  # unfortunately it is much, much easier to install the lot and clean-up the mess...
+  make -j1 DESTDIR=${pkgdir} install
+  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
+  rm $pkgdir/usr/lib/*.so*
+  rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
+  rm $pkgdir/usr/lib/libgfortran.spec
+  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a}
+  rm -r $pkgdir/usr/lib/go
+  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
+  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
+  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
+  rm $pkgdir/usr/share/man/man3/ffi*
+
+  # many packages require these symlinks
+  install -dm755 ${pkgdir}/lib
+  ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
+  ln -sf gcc ${pkgdir}/usr/bin/cc
+  ln -sf g++ ${pkgdir}/usr/bin/c++
+
+  # install gengtype for plugin support
+  install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
+  install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
+
+  # POSIX conformance launcher scripts for c89 and c99
+  cat > $pkgdir/usr/bin/c89 <<"EOF"
+#!/bin/sh
+fl="-std=c89"
+for opt; do
+  case "$opt" in
+    -ansi|-std=c89|-std=iso9899:1990) fl="";;
+    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
+EOF
+
+  cat > $pkgdir/usr/bin/c99 <<"EOF"
+#!/bin/sh
+fl="-std=c99"
+for opt; do
+  case "$opt" in
+    -std=c99|-std=iso9899:1999) fl="";;
+    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
+EOF
+
+  chmod 755 $pkgdir/usr/bin/c{8,9}9
+
+  # install the libstdc++ man pages
+  install -dm755 ${pkgdir}/usr/share/man/man3
+  install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-fortran()
+{
+  pkgdesc="Fortran front-end for GCC"
+  depends=("gcc=$pkgver-$pkgrel")
+  install=gcc-fortran.install
+
+  cd gcc-build
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
+  make -j1 DESTDIR=$pkgdir install-target-libgfortran
+  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
+  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
+  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
+  
+  # remove libraries included in gcc-libs
+  rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
+  rm ${pkgdir}/usr/share/info/libquadmath.info
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-objc()
+{
+  pkgdesc="Objective-C front-end for GCC"
+  depends=("gcc=$pkgver-$pkgrel")
+
+  cd gcc-build
+  make -j1 DESTDIR=$pkgdir install-target-libobjc
+  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+
+  # remove libraries included in gcc-libs
+  rm ${pkgdir}/usr/lib/libobjc.so*
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-ada()
+{
+  pkgdesc="Ada front-end for GCC (GNAT)"
+  depends=("gcc=$pkgver-$pkgrel")
+  install=gcc-ada.install
+
+  cd gcc-build/gcc
+  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
+  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-go()
+{
+  pkgdesc="Go front-end for GCC"
+  depends=("gcc=$pkgver-$pkgrel")
+  install=gcc-go.install
+
+  cd gcc-build
+  make -j1 DESTDIR=$pkgdir install-target-libgo
+  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
+  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
+}
diff --git a/testing/gcc/gcc-ada.install b/testing/gcc/gcc-ada.install
new file mode 100644
index 000000000..df0553a4f
--- /dev/null
+++ b/testing/gcc/gcc-ada.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/gcc/gcc-fortran.install b/testing/gcc/gcc-fortran.install
new file mode 100644
index 000000000..b15d89a97
--- /dev/null
+++ b/testing/gcc/gcc-fortran.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+file="gfortran.info"
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+}
diff --git a/testing/gcc/gcc-go.install b/testing/gcc/gcc-go.install
new file mode 100644
index 000000000..7dc50dee5
--- /dev/null
+++ b/testing/gcc/gcc-go.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gccgo.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/gcc/gcc-hash-style-both.patch b/testing/gcc/gcc-hash-style-both.patch
new file mode 100644
index 000000000..8b59f4535
--- /dev/null
+++ b/testing/gcc/gcc-hash-style-both.patch
@@ -0,0 +1,122 @@
+--- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
+@@ -41,7 +41,7 @@
+ 
+ #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
+ 
+-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
++#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
+   %{O*:-O3} %{!O*:-O1}						\
+   %{shared:-shared}						\
+   %{!shared:							\
+--- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
++++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
+@@ -78,7 +78,7 @@
+  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
++#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
++++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -104,7 +104,7 @@
+   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
++#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+--- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -64,7 +64,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "\
++#define LINK_SPEC "--hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
++++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
+@@ -389,11 +389,11 @@
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
+ 
+ 
+-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
+ 
+-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
+ 
+--- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
++++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
+@@ -830,7 +830,7 @@
+ #define LINUX_DYNAMIC_LINKER \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
+ 
+-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
+ 
+--- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -77,7 +77,7 @@
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC \
+-  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
++  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
+    %{shared:-shared} \
+    %{!shared: \
+       %{static:-static} \
+--- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
++++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
+@@ -113,7 +113,7 @@
+   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
+   { "link_arch",	 LINK_ARCH_SPEC },
+ 
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+@@ -121,7 +121,7 @@
+       %{static:-static}} \
+ "
+ 
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+@@ -193,7 +193,7 @@
+ #else /* !SPARC_BI_ARCH */
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+--- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
++++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -74,7 +74,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+ #undef  LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
+   %{!mno-relax:%{!r:-relax}} \
+   %{!shared: \
+     %{!static: \
diff --git a/testing/gcc/gcc-libs.install b/testing/gcc/gcc-libs.install
new file mode 100644
index 000000000..23553b8f0
--- /dev/null
+++ b/testing/gcc/gcc-libs.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+filelist=(libgomp.info libquadmath.info)
+
+post_upgrade() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/gcc/gcc.install b/testing/gcc/gcc.install
new file mode 100644
index 000000000..3407a5e1f
--- /dev/null
+++ b/testing/gcc/gcc.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/gcc/gcc_pure64.patch b/testing/gcc/gcc_pure64.patch
new file mode 100644
index 000000000..8c0baf8e2
--- /dev/null
+++ b/testing/gcc/gcc_pure64.patch
@@ -0,0 +1,26 @@
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
+--- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
+@@ -49,8 +49,8 @@
+    When the -shared link option is used a final link is not being
+    done.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
+ 
+ #undef	LINK_SPEC
+ #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
+--- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
+@@ -6,7 +6,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES = ../lib ../lib32
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
diff --git a/staging/glib-networking/PKGBUILD b/testing/glib-networking/PKGBUILD
index 0ed755eb8..d97a99aad 100644
--- a/staging/glib-networking/PKGBUILD
+++ b/testing/glib-networking/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 134916 2011-08-09 12:05:52Z ibiru $
+# $Id: PKGBUILD 135436 2011-08-13 13:27:37Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=glib-networking
 pkgver=2.28.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Network-related giomodules for glib"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 license=('GPL2')
 depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas')
 makedepends=('intltool')
 options=('!libtool')
 install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2
+        glib-networking-2.29.9-port-gnutls3-API.patch)
+sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c'
+            '101daf107773f84d08d7ab55a354875e2e021c3b5dd3cdc259fb544f94a8beee')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -Np0 -i "$srcdir/glib-networking-2.29.9-port-gnutls3-API.patch"
   ./configure \
     --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/glib-networking --disable-static
diff --git a/testing/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch b/testing/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch
new file mode 100644
index 000000000..19a168638
--- /dev/null
+++ b/testing/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch
@@ -0,0 +1,17 @@
+Index: tls/gnutls/gtlsconnection-gnutls.c
+===================================================================
+--- tls/gnutls/gtlsconnection-gnutls.c
++++ tls/gnutls/gtlsconnection-gnutls.c	2011-08-04 00:40:33.194189789 +0200
+@@ -860,9 +860,10 @@
+ 
+   if (peer_certificate)
+     {
+-      int status;
++      int verify_ret;
++      unsigned int status;
+ 
+-      status = gnutls_certificate_verify_peers (gnutls->priv->session);
++      verify_ret = gnutls_certificate_verify_peers2 (gnutls->priv->session, &status); 
+       peer_certificate_errors = g_tls_certificate_gnutls_convert_flags (status);
+       if (peer_certificate_errors)
+ 	{
diff --git a/staging/glib-networking/glib-networking.install b/testing/glib-networking/glib-networking.install
index 595f1c75b..595f1c75b 100644
--- a/staging/glib-networking/glib-networking.install
+++ b/testing/glib-networking/glib-networking.install
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
new file mode 100644
index 000000000..d762b7aae
--- /dev/null
+++ b/testing/glibc/PKGBUILD
@@ -0,0 +1,203 @@
+# $Id: PKGBUILD 135504 2011-08-14 10:26:15Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+# NOTE: valgrind requires rebuilt with each new glibc version
+
+pkgname=glibc
+pkgver=2.14
+pkgrel=5
+_glibcdate=20110617
+pkgdesc="GNU C Library"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/libc"
+license=('GPL' 'LGPL')
+groups=('base')
+depends=('linux-api-headers>=3.0' 'tzdata')
+makedepends=('gcc>=4.6')
+backup=(etc/locale.gen
+        etc/nscd.conf)
+options=('!strip')
+install=glibc.install
+source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz
+        glibc-2.10-dont-build-timezone.patch
+        glibc-2.10-bz4781.patch
+        glibc-__i686.patch
+        glibc-2.12.1-static-shared-getpagesize.patch
+        glibc-2.12.2-ignore-origin-of-privileged-program.patch
+        glibc-2.13-futex.patch
+        glibc-2.14-libdl-crash.patch
+        #glibc-2.14-fix-resolver-crash-typo.patch
+        glibc-2.14-revert-4462fad3.patch
+        glibc-2.14-reexport-rpc-interface.patch
+        glibc-2.14-reinstall-nis-rpc-headers.patch
+        nscd
+        locale.gen.txt
+        locale-gen)
+md5sums=('e441d745609d93c907b72548ba646dad'
+         '4dadb9203b69a3210d53514bb46f41c3'
+         '0c5540efc51c0b93996c51b57a8540ae'
+         '40cd342e21f71f5e49e32622b25acc52'
+         'a3ac6f318d680347bb6e2805d42b73b2'
+         'b042647ea7d6f22ad319e12e796bd13e'
+         '7d0154b7e17ea218c9fa953599d24cc4'
+         'cea62cc6b903d222c5f26e05a3c0e0e6'
+         '46e56492cccb1c9172ed3a235cf43c6c'
+         'c5de2a946215d647c8af5432ec4b0da0'
+         '55febbb72139ac7b65757df085024b83'
+         'b587ee3a70c9b3713099295609afde49'
+         '07ac979b6ab5eeb778d55f041529d623'
+         '476e9113489f93b348b21e144b6a8fcf')
+
+
+mksource() {
+  git clone git://sourceware.org/git/glibc.git
+  pushd glibc
+  git checkout -b glibc-2.14-arch origin/release/2.14/master
+  popd
+  tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
+}
+
+build() {
+  cd ${srcdir}/glibc
+
+  # timezone data is in separate package (tzdata)
+  patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
+
+  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
+  patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
+
+  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
+  # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
+  patch -Np1 -i ${srcdir}/glibc-__i686.patch
+
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=11929
+  # using Fedora "fix" as patch in that bug report causes breakages...
+  patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch
+
+  # http://www.exploit-db.com/exploits/15274/
+  # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
+  patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
+  patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
+
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
+  # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
+  patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
+
+  # This fixes the main segfault but not the assert fail (FS#24615)
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 
+  #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch
+  # resort to reverting the bad commit completely for the moment
+  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch
+
+  # re-export RPC interface until libtirpc is ready as a replacement
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
+  patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
+  patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
+
+  install -dm755 ${pkgdir}/etc
+  touch ${pkgdir}/etc/ld.so.conf
+
+  cd ${srcdir}
+  mkdir glibc-build
+  cd glibc-build
+
+  if [[ ${CARCH} = "i686" ]]; then
+    # Hack to fix NPTL issues with Xen, only required on 32bit platforms
+    export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
+  fi
+
+  echo "slibdir=/lib" >> configparms
+
+  # remove hardening options from CFLAGS for building libraries
+  CFLAGS=${CFLAGS/-fstack-protector/}
+  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
+
+  ${srcdir}/glibc/configure --prefix=/usr \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --with-headers=/usr/include \
+      --enable-add-ons=nptl,libidn \
+      --enable-kernel=2.6.27 \
+      --with-tls --with-__thread \
+      --enable-bind-now --without-gd \
+      --without-cvs --disable-profile \
+      --disable-multi-arch
+
+  # build libraries with hardening disabled
+  echo "build-programs=no" >> configparms
+  make
+  
+  # re-enable hardening for programs
+  sed -i "s#=no#=yes#" configparms
+  echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
+  echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
+  make
+
+  # remove harding in preparation to run test-suite
+  sed -i '2,4d' configparms
+}
+
+check() {
+  cd ${srcdir}/glibc-build
+
+  # some errors are expected - manually check log files
+  make -k check || true
+}
+
+package() {
+  cd ${srcdir}/glibc-build
+  make install_root=${pkgdir} install
+
+  rm -f ${pkgdir}/etc/ld.so.{cache,conf}
+
+  install -dm755 ${pkgdir}/etc/rc.d
+  install -dm755 ${pkgdir}/usr/sbin
+  install -dm755 ${pkgdir}/usr/lib/locale
+  install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
+  install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd
+  install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
+  install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf
+
+  sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf
+
+  # create /etc/locale.gen
+  install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
+  sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED
+  sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED
+  sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED
+  cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
+  sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen
+
+  if [[ ${CARCH} = "x86_64" ]]; then
+    # fix for the linker
+    sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
+    # Comply with multilib binaries, they look for the linker in /lib64
+    mkdir ${pkgdir}/lib64
+    cd ${pkgdir}/lib64
+    ln -v -s ../lib/ld* .
+  fi
+  
+  # manually strip files as stripping libpthread-*.so and libthread_db.so
+  # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks
+  # valgrind on x86_64
+
+  cd $pkgdir
+  strip $STRIP_BINARIES sbin/{ldconfig,sln} \
+                        usr/bin/{gencat,getconf,getent,iconv,locale} \
+                        usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \
+                        usr/lib/getconf/* \
+                        usr/sbin/{iconvconfig,nscd}
+  [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
+
+  strip $STRIP_STATIC usr/lib/*.a \
+                      lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
+
+  strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
+                      lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
+                      lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
+                      lib/{libmemusage,libpcprofile,libSegFault}.so \
+                      usr/lib/{pt_chown,{audit,gconv}/*.so}
+}
diff --git a/testing/glibc/glibc-2.10-bz4781.patch b/testing/glibc/glibc-2.10-bz4781.patch
new file mode 100644
index 000000000..cf1a97a18
--- /dev/null
+++ b/testing/glibc/glibc-2.10-bz4781.patch
@@ -0,0 +1,42 @@
+diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-09 13:35:30.000000000 +1000
++++ glibc/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-23 13:27:46.000000000 +1000
+@@ -120,9 +120,6 @@
+ 	ret
+ 
+ L(thread_start):
+-	cfi_startproc;
+-	/* Clearing frame pointer is insufficient, use CFI.  */
+-	cfi_undefined (eip);
+ 	/* Note: %esi is zero.  */
+ 	movl	%esi,%ebp	/* terminate the stack frame */
+ #ifdef RESET_PID
+@@ -155,7 +152,6 @@
+ 	jmp	L(haspid)
+ 	.previous
+ #endif
+-	cfi_endproc;
+ 
+ 	cfi_startproc
+ PSEUDO_END (BP_SYM (__clone))
+diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-09 13:35:30.000000000 +1000
++++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-23 13:27:46.000000000 +1000
+@@ -89,9 +89,6 @@
+ 	ret
+ 
+ L(thread_start):
+-	cfi_startproc;
+-	/* Clearing frame pointer is insufficient, use CFI.  */
+-	cfi_undefined (rip);
+ 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
+ 	   the outermost frame obviously.  */
+ 	xorl	%ebp, %ebp
+@@ -116,7 +113,6 @@
+ 	/* Call exit with return value from function call. */
+ 	movq	%rax, %rdi
+ 	call	HIDDEN_JUMPTARGET (_exit)
+-	cfi_endproc;
+ 
+ 	cfi_startproc;
+ PSEUDO_END (BP_SYM (__clone))
diff --git a/testing/glibc/glibc-2.10-dont-build-timezone.patch b/testing/glibc/glibc-2.10-dont-build-timezone.patch
new file mode 100644
index 000000000..d3abeff17
--- /dev/null
+++ b/testing/glibc/glibc-2.10-dont-build-timezone.patch
@@ -0,0 +1,13 @@
+timezone data has been split into the package sys-libs/timezone-data
+
+--- glibc-2.4/Makeconfig
++++ glibc-2.4/Makeconfig
+@@ -931,7 +931,7 @@
+ 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
+ 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
+ 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
+-	      crypt nss localedata timezone rt conform debug		    \
++	      crypt nss localedata rt conform debug		    \
+ 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
+ 
+ ifndef avoid-generated
diff --git a/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch b/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch
new file mode 100644
index 000000000..e84754279
--- /dev/null
+++ b/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch
@@ -0,0 +1,11 @@
+--- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c
++++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c
+@@ -28,7 +28,7 @@
+ int
+ __getpagesize ()
+ {
+-#ifdef __ASSUME_AT_PAGESIZE
++#if 0 && defined __ASSUME_AT_PAGESIZE
+   assert (GLRO(dl_pagesize) != 0);
+   return GLRO(dl_pagesize);
+ #else
diff --git a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
new file mode 100644
index 000000000..ce089b49c
--- /dev/null
+++ b/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
@@ -0,0 +1,26 @@
+From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@redhat.com>
+Date: Thu, 9 Dec 2010 15:00:59 +0100
+Subject: [PATCH 1/1] Ignore origin of privileged program
+
+---
+ ChangeLog       |    5 +++++
+ elf/dl-object.c |    3 +++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/elf/dl-object.c b/elf/dl-object.c
+index 22a1635..7674d49 100644
+--- a/elf/dl-object.c
++++ b/elf/dl-object.c
+@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type,
+     out:
+       new->l_origin = origin;
+     }
++  else if (INTUSE(__libc_enable_secure) && type == lt_executable)
++    /* The origin of a privileged program cannot be trusted.  */
++    new->l_origin = (char *) -1;
+ 
+   return new;
+ }
+-- 
+1.7.2
diff --git a/testing/glibc/glibc-2.13-futex.patch b/testing/glibc/glibc-2.13-futex.patch
new file mode 100644
index 000000000..9b9c3ac45
--- /dev/null
+++ b/testing/glibc/glibc-2.13-futex.patch
@@ -0,0 +1,31 @@
+--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S	
++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S	
+@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock:
+ 	cfi_restore(%r12)
+ 	retq
+ 
+-#ifdef __ASSUME_PRIVATE_FUTEX
++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
+ 	cfi_adjust_cfa_offset(16)
+ 	cfi_rel_offset(%r12, 8)
+ 	cfi_rel_offset(%r13, 0)
+--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S	
++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S	
+@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock:
+ 
+ 7:	movq	%rdx, %rax
+ 
+-#ifndef __ASSUME_PRIVATE_FUTEX
++#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
+ 	addq	$16, %rsp
+ 	cfi_adjust_cfa_offset(-16)
+ 	popq	%r14
+@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock:
+ 	cfi_restore(%r12)
+ 	retq
+ 
+-#ifdef __ASSUME_PRIVATE_FUTEX
++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
+ 	cfi_adjust_cfa_offset(16)
+ 	cfi_rel_offset(%r12, 8)
+ 	cfi_rel_offset(%r13, 0)
diff --git a/testing/glibc/glibc-2.14-fix-resolver-crash-typo.patch b/testing/glibc/glibc-2.14-fix-resolver-crash-typo.patch
new file mode 100644
index 000000000..b5d86c7d2
--- /dev/null
+++ b/testing/glibc/glibc-2.14-fix-resolver-crash-typo.patch
@@ -0,0 +1,22 @@
+diff --git a/resolv/res_send.c b/resolv/res_send.c
+index 97142b7..a001c1e 100644
+--- a/resolv/res_send.c
++++ b/resolv/res_send.c
+@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
+ 				    ns, ansp, ansp2, nansp2, resplen2);
+ 			if (n < 0)
+ 				return (-1);
+-			if (n == 0 && (buf2 == NULL || resplen2 == 0))
++			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
+ 				goto next_ns;
+ 		} else {
+ 			/* Use datagrams. */
+@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
+ 				    ansp2, nansp2, resplen2);
+ 			if (n < 0)
+ 				return (-1);
+-			if (n == 0 && (buf2 == NULL || resplen2 == 0))
++			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
+ 				goto next_ns;
+ 			if (v_circuit)
+ 			  // XXX Check whether both requests failed or
diff --git a/testing/glibc/glibc-2.14-libdl-crash.patch b/testing/glibc/glibc-2.14-libdl-crash.patch
new file mode 100644
index 000000000..ee29f8c20
--- /dev/null
+++ b/testing/glibc/glibc-2.14-libdl-crash.patch
@@ -0,0 +1,132 @@
+diff --git a/elf/dl-close.c b/elf/dl-close.c
+index 73b2a2f..9bd91e3 100644
+--- a/elf/dl-close.c
++++ b/elf/dl-close.c
+@@ -1,5 +1,5 @@
+ /* Close a shared object opened by `_dl_open'.
+-   Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
+   if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
+       || dl_close_state != not_pending)
+     {
+-      if (map->l_direct_opencount == 0)
+-	{
+-	  if (map->l_type == lt_loaded)
+-	    dl_close_state = rerun;
+-	  else if (map->l_type == lt_library)
+-	    {
+-	      struct link_map **oldp = map->l_initfini;
+-	      map->l_initfini = map->l_orig_initfini;
+-	      _dl_scope_free (oldp);
+-	    }
+-	}
++      if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
++	dl_close_state = rerun;
+ 
+       /* There are still references to this object.  Do nothing more.  */
+       if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
+diff --git a/elf/dl-deps.c b/elf/dl-deps.c
+index 9e30594..3890d00 100644
+--- a/elf/dl-deps.c
++++ b/elf/dl-deps.c
+@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
+ 		  nneeded * sizeof needed[0]);
+ 	  atomic_write_barrier ();
+ 	  l->l_initfini = l_initfini;
++	  l->l_free_initfini = 1;
+ 	}
+ 
+       /* If we have no auxiliary objects just go on to the next map.  */
+@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
+   l_initfini[nlist] = NULL;
+   atomic_write_barrier ();
+   map->l_initfini = l_initfini;
++  map->l_free_initfini = 1;
+   if (l_reldeps != NULL)
+     {
+       atomic_write_barrier ();
+@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
+       _dl_scope_free (old_l_reldeps);
+     }
+   if (old_l_initfini != NULL)
+-      map->l_orig_initfini = old_l_initfini;
++    _dl_scope_free (old_l_initfini);
+ }
+diff --git a/elf/dl-libc.c b/elf/dl-libc.c
+index 7be9483..a13fce3 100644
+--- a/elf/dl-libc.c
++++ b/elf/dl-libc.c
+@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
+ 
+   for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
+     {
+-      /* Remove all additional names added to the objects.  */
+       for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
+ 	{
+ 	  struct libname_list *lnp = l->l_libname->next;
+ 
+ 	  l->l_libname->next = NULL;
+ 
++	  /* Remove all additional names added to the objects.  */
+ 	  while (lnp != NULL)
+ 	    {
+ 	      struct libname_list *old = lnp;
+@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
+ 	      if (! old->dont_free)
+ 		free (old);
+ 	    }
++
++	  /* Free the initfini dependency list.  */
++	  if (l->l_free_initfini)
++	    free (l->l_initfini);
+ 	}
+ 
+       if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 4a9109e..617e30e 100644
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
+ 	      lnp->dont_free = 1;
+ 	      lnp = lnp->next;
+ 	    }
++	  l->l_free_initfini = 0;
+ 
+ 	  if (l != &GL(dl_rtld_map))
+ 	    _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
+diff --git a/include/link.h b/include/link.h
+index e877104..051b99a 100644
+--- a/include/link.h
++++ b/include/link.h
+@@ -1,6 +1,6 @@
+ /* Data structure for communication from the run-time dynamic linker for
+    loaded ELF shared objects.
+-   Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -192,6 +192,9 @@ struct link_map
+ 						 during LD_TRACE_PRELINKING=1
+ 						 contains any DT_SYMBOLIC
+ 						 libraries.  */
++    unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
++				       freed, ie. not allocated with
++				       the dummy malloc in ld.so.  */
+ 
+     /* Collected information about own RPATH directories.  */
+     struct r_search_path_struct l_rpath_dirs;
+@@ -240,9 +243,6 @@ struct link_map
+ 
+     /* List of object in order of the init and fini calls.  */
+     struct link_map **l_initfini;
+-    /* The init and fini list generated at startup, saved when the
+-       object is also loaded dynamically.  */
+-    struct link_map **l_orig_initfini;
+ 
+     /* List of the dependencies introduced through symbol binding.  */
+     struct link_map_reldeps
diff --git a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch
new file mode 100644
index 000000000..e2beea881
--- /dev/null
+++ b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch
@@ -0,0 +1,26 @@
+diff --git a/include/libc-symbols.h b/include/libc-symbols.h
+index 67e1ca2..5e7cca5 100644
+--- a/include/libc-symbols.h
++++ b/include/libc-symbols.h
+@@ -635,7 +635,7 @@ for linking")
+ # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
+ # define libc_hidden_def(name) hidden_def (name)
+ # define libc_hidden_weak(name) hidden_weak (name)
+-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
++# define libc_hidden_nolink(name, version) hidden_def (name)
+ # define libc_hidden_ver(local, name) hidden_ver (local, name)
+ # define libc_hidden_data_def(name) hidden_data_def (name)
+ # define libc_hidden_data_weak(name) hidden_data_weak (name)
+diff --git a/sunrpc/Makefile b/sunrpc/Makefile
+index 5134ce9..40c73d1 100644
+--- a/sunrpc/Makefile
++++ b/sunrpc/Makefile
+@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
+ 				    des_crypt.h)
+ headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
+ 		       $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
+-headers = rpc/netdb.h
++headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
+ install-others = $(inst_sysconfdir)/rpc
+ generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
+ 	    $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
diff --git a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
new file mode 100644
index 000000000..eb0fd822d
--- /dev/null
+++ b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
@@ -0,0 +1,28 @@
+From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@redhat.com>
+Date: Tue, 17 May 2011 17:42:30 +0200
+Subject: [PATCH] Reinstall NIS RPC headers
+
+---
+ nis/Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/nis/Makefile b/nis/Makefile
+index b5c9609..d2934d9 100644
+--- a/nis/Makefile
++++ b/nis/Makefile
+@@ -23,9 +23,9 @@ subdir	:= nis
+ 
+ aux			:= nis_hash
+ 
++headers			:= $(wildcard rpcsvc/*.[hx])
+ distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
+-			   nisplus-parser.h nis_xdr.h nss \
+-			   $(wildcard rpcsvc/*.[hx])
++			   nisplus-parser.h nis_xdr.h nss
+ 
+ # These are the databases available for the nis (and perhaps later nisplus)
+ # service.  This must be a superset of the services in nss.
+-- 
+1.7.5.4
+
diff --git a/testing/glibc/glibc-2.14-revert-4462fad3.patch b/testing/glibc/glibc-2.14-revert-4462fad3.patch
new file mode 100644
index 000000000..d71e37492
--- /dev/null
+++ b/testing/glibc/glibc-2.14-revert-4462fad3.patch
@@ -0,0 +1,37 @@
+diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
+--- glibc-orig//resolv/res_send.c	2011-06-10 18:59:03.041436996 +1000
++++ glibc/resolv/res_send.c	2011-06-10 19:08:09.379309323 +1000
+@@ -549,7 +549,7 @@
+ 				    ns, ansp, ansp2, nansp2, resplen2);
+ 			if (n < 0)
+ 				return (-1);
+-			if (n == 0 && (buf2 == NULL || resplen2 == 0))
++			if (n == 0)
+ 				goto next_ns;
+ 		} else {
+ 			/* Use datagrams. */
+@@ -559,7 +559,7 @@
+ 				    ansp2, nansp2, resplen2);
+ 			if (n < 0)
+ 				return (-1);
+-			if (n == 0 && (buf2 == NULL || resplen2 == 0))
++			if (n == 0)
+ 				goto next_ns;
+ 			if (v_circuit)
+ 			  // XXX Check whether both requests failed or
+@@ -1275,14 +1275,10 @@
+ 				(*thisresplenp > *thisanssizp)
+ 				? *thisanssizp : *thisresplenp);
+ 
+-			if (recvresp1 || (buf2 != NULL && recvresp2)) {
+-			  *resplen2 = 0;
++			if (recvresp1 || (buf2 != NULL && recvresp2))
+ 			  return resplen;
+-			}
+ 			if (buf2 != NULL)
+ 			  {
+-			    /* No data from the first reply.  */
+-			    resplen = 0;
+ 			    /* We are waiting for a possible second reply.  */
+ 			    if (hp->id == anhp->id)
+ 			      recvresp1 = 1;
diff --git a/testing/glibc/glibc-__i686.patch b/testing/glibc/glibc-__i686.patch
new file mode 100644
index 000000000..28d5dd424
--- /dev/null
+++ b/testing/glibc/glibc-__i686.patch
@@ -0,0 +1,13 @@
+diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile
+--- glibc-old//sysdeps/i386/Makefile	2010-03-18 11:52:30.000000000 +1000
++++ glibc//sysdeps/i386/Makefile	2010-04-16 15:05:50.000000000 +1000
+@@ -1,6 +1,7 @@
+ # The mpn functions need a #define for asm syntax flavor.
+-# Every i386 port in use uses gas syntax (I think).
+-asm-CPPFLAGS += -DGAS_SYNTAX
++# Every i386 port in use uses gas syntax (I think).  Don't replace
++# __i686 in __i686.get_pc_thunk.bx.
++asm-CPPFLAGS += -DGAS_SYNTAX  -U __i686
+ 
+ # The i386 `long double' is a distinct type we support.
+ long-double-fcts = yes
diff --git a/testing/glibc/glibc.install b/testing/glibc/glibc.install
new file mode 100644
index 000000000..7f85ade96
--- /dev/null
+++ b/testing/glibc/glibc.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
+
+post_upgrade() {
+  sbin/ldconfig -r .
+  [ -x sbin/init ] && sbin/init u
+  usr/sbin/locale-gen
+  
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/glibc/locale-gen b/testing/glibc/locale-gen
new file mode 100755
index 000000000..5aff344c4
--- /dev/null
+++ b/testing/glibc/locale-gen
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+set -e
+
+LOCALEGEN=/etc/locale.gen
+LOCALES=/usr/share/i18n/locales
+if [ -n "$POSIXLY_CORRECT" ]; then
+  unset POSIXLY_CORRECT
+fi
+
+
+[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0;
+
+# Remove all old locale dir and locale-archive before generating new
+# locale data.
+rm -rf /usr/lib/locale/* || true
+
+umask 022
+
+is_entry_ok() {
+  if [ -n "$locale" -a -n "$charset" ] ; then
+    true
+  else
+    echo "error: Bad entry '$locale $charset'"
+    false
+  fi
+}
+
+echo "Generating locales..."
+while read locale charset; do \
+	case $locale in \#*) continue;; "") continue;; esac; \
+	is_entry_ok || continue
+	echo -n "  `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \
+	echo -n ".$charset"; \
+	echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
+	echo -n '...'; \
+        if [ -f $LOCALES/$locale ]; then input=$locale; else \
+        input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \
+	localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \
+	echo ' done'; \
+done < $LOCALEGEN
+echo "Generation complete."
diff --git a/testing/glibc/locale.gen.txt b/testing/glibc/locale.gen.txt
new file mode 100644
index 000000000..ccdd81734
--- /dev/null
+++ b/testing/glibc/locale.gen.txt
@@ -0,0 +1,23 @@
+# Configuration file for locale-gen
+#
+# lists of locales that are to be generated by the locale-gen command.
+#
+# Each line is of the form:
+#
+#     <locale> <charset>
+#
+#  where <locale> is one of the locales given in /usr/share/i18n/locales
+#  and <charset> is one of the character sets listed in /usr/share/i18n/charmaps
+#
+#  Examples:
+#  en_US ISO-8859-1
+#  en_US.UTF-8 UTF-8
+#  de_DE ISO-8859-1
+#  de_DE@euro ISO-8859-15
+#
+#  The locale-gen command will generate all the locales,
+#  placing them in /usr/lib/locale.
+#
+#  A list of supported locales is included in this file.
+#  Uncomment the ones you need.
+#
diff --git a/testing/glibc/nscd b/testing/glibc/nscd
new file mode 100755
index 000000000..8b14f2a3f
--- /dev/null
+++ b/testing/glibc/nscd
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/nscd`
+case "$1" in
+  start)
+    stat_busy "Starting nscd"
+    # create necessary directories if they don't already exist
+    mkdir -p /var/run/nscd /var/db/nscd 2>/dev/null
+    # remove stale files
+    rm -f /var/db/nscd/* /var/run/nscd/* 2>/dev/null
+    [ -z "$PID" ] && /usr/sbin/nscd
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon nscd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping nscd"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon nscd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/testing/gmp/538dfce27f41.patch b/testing/gmp/538dfce27f41.patch
new file mode 100644
index 000000000..2e0a1af50
--- /dev/null
+++ b/testing/gmp/538dfce27f41.patch
@@ -0,0 +1,38 @@
+
+# HG changeset patch
+# User Torbjorn Granlund <tege@gmplib.org>
+# Date 1310730221 -7200
+# Node ID 538dfce27f410b910d5e2f011119269e224d16a3
+# Parent  03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366
+(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right.
+
+diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c
+--- a/mpn/generic/dcpi1_bdiv_q.c	Thu Jun 16 12:22:24 2011 +0200
++++ b/mpn/generic/dcpi1_bdiv_q.c	Fri Jul 15 13:43:41 2011 +0200
+@@ -7,7 +7,7 @@
+    SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+    GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+ 
+-Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
++Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+ 
+ This file is part of the GNU MP Library.
+ 
+@@ -28,7 +28,6 @@
+ #include "gmp-impl.h"
+ 
+ 
+-
+ mp_size_t
+ mpn_dcpi1_bdiv_q_n_itch (mp_size_t n)
+ {
+@@ -130,7 +129,7 @@
+       qn = nn - qn;
+       while (qn > dn)
+ 	{
+-	  mpn_sub_1 (np + dn, np + dn, qn, cy);
++	  mpn_sub_1 (np + dn, np + dn, qn - dn, cy);
+ 	  cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp);
+ 	  qp += dn;
+ 	  np += dn;
+
diff --git a/testing/gmp/PKGBUILD b/testing/gmp/PKGBUILD
new file mode 100644
index 000000000..f1055efa5
--- /dev/null
+++ b/testing/gmp/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 135480 2011-08-14 09:28:35Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gmp
+pkgver=5.0.2
+pkgrel=3
+pkgdesc="A free library for arbitrary precision arithmetic"
+arch=('i686' 'x86_64')
+url="http://gmplib.org/"
+depends=('gcc-libs' 'sh')
+license=('LGPL3')
+options=(!libtool)
+install=gmp.install
+source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2
+        538dfce27f41.patch)
+md5sums=('0bbaedc82fb30315b06b1588b9077cd3'
+         'a769be9c41618ca9c35d83375e7097d0')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i $srcdir/538dfce27f41.patch
+  
+  [ "${CARCH}" = "i686" ] && export ABI="32"
+  ./configure --build=${CHOST} \
+    --prefix=/usr --infodir=/usr/share/info \
+    --enable-cxx
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/gmp/gmp.install b/testing/gmp/gmp.install
new file mode 100644
index 000000000..cad3354f9
--- /dev/null
+++ b/testing/gmp/gmp.install
@@ -0,0 +1,20 @@
+info_dir=usr/share/info
+info_files=(gmp.info gmp.info-1 gmp.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
diff --git a/staging/gnome-vfs/PKGBUILD b/testing/gnome-vfs/PKGBUILD
index 93094211f..5b98fc8e8 100644
--- a/staging/gnome-vfs/PKGBUILD
+++ b/testing/gnome-vfs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-vfs
 pkgver=2.24.4
 pkgrel=5
 pkgdesc="The GNOME Virtual File System"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 license=('LGPL')
 depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls' 'libgcrypt')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
diff --git a/staging/gnome-vfs/gcrypt-config.patch b/testing/gnome-vfs/gcrypt-config.patch
index 8ce91870a..8ce91870a 100644
--- a/staging/gnome-vfs/gcrypt-config.patch
+++ b/testing/gnome-vfs/gcrypt-config.patch
diff --git a/staging/gnome-vfs/gnome-vfs.install b/testing/gnome-vfs/gnome-vfs.install
index 793a3e7ab..793a3e7ab 100644
--- a/staging/gnome-vfs/gnome-vfs.install
+++ b/testing/gnome-vfs/gnome-vfs.install
diff --git a/staging/gnome-vfs/gnutls-config.patch b/testing/gnome-vfs/gnutls-config.patch
index f6fa18b17..f6fa18b17 100644
--- a/staging/gnome-vfs/gnutls-config.patch
+++ b/testing/gnome-vfs/gnutls-config.patch
diff --git a/staging/gnutls/PKGBUILD b/testing/gnutls/PKGBUILD
index 493aa74a1..232866e8e 100644
--- a/staging/gnutls/PKGBUILD
+++ b/testing/gnutls/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 134729 2011-08-07 19:08:57Z andyrtr $
+# $Id: PKGBUILD 135280 2011-08-12 06:48:04Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL')
 url="http://www.gnu.org/software/gnutls/"
 install=gnutls.install
 options=('!libtool' '!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=('0677a66667f48810ff8df8335a9a9f9b')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz
+	align.patch)
+md5sums=('0677a66667f48810ff8df8335a9a9f9b'
+         'bce979498addb45d0fa8d6951f93fab3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # fix AES-NI for i686
+  patch -Np1 -i ${srcdir}/align.patch
   ./configure --prefix=/usr \
 	--with-zlib \
 	--disable-static \
@@ -24,13 +28,10 @@ build() {
   make
 }
 
-# i686 test segfault
-
-#check() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-  #make check # passes all  || /bin/true
-#  make check # || /bin/true # see https://lists.gnu.org/archive/html/gnutls-devel/2011-06/msg00007.html
-#}
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check # passes all  || /bin/true
+}
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/testing/gnutls/align.patch b/testing/gnutls/align.patch
new file mode 100644
index 000000000..dce5cf408
--- /dev/null
+++ b/testing/gnutls/align.patch
@@ -0,0 +1,64 @@
+diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/intel/aes-x86.c
+index 6801e7e..ff5b714 100644
+--- a/lib/accelerated/intel/aes-x86.c
++++ b/lib/accelerated/intel/aes-x86.c
+@@ -40,6 +40,10 @@ struct aes_ctx
+   uint8_t iv[16];
+ };
+ 
++#define AESNI_MIN_ALIGN 16
++#define AESNI_ALIGN(x) \
++        ((void *)(((size_t)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1)))
++
+ static int
+ aes_cipher_init (gnutls_cipher_algorithm_t algorithm, void **_ctx)
+ {
+@@ -69,11 +73,11 @@ aes_cipher_setkey (void *_ctx, const void *userkey, size_t keysize)
+   struct aes_ctx *ctx = _ctx;
+   int ret;
+ 
+-  ret = aesni_set_encrypt_key (userkey, keysize * 8, &ctx->expanded_key);
++  ret = aesni_set_encrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key));
+   if (ret != 0)
+     return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED);
+ 
+-  ret = aesni_set_decrypt_key (userkey, keysize * 8, &ctx->expanded_key_dec);
++  ret = aesni_set_decrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key_dec));
+   if (ret != 0)
+     return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED);
+ 
+@@ -95,7 +99,7 @@ aes_encrypt (void *_ctx, const void *src, size_t src_size,
+ {
+   struct aes_ctx *ctx = _ctx;
+ 
+-  aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key, ctx->iv, 1);
++  aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key), ctx->iv, 1);
+   return 0;
+ }
+ 
+@@ -105,7 +109,7 @@ aes_decrypt (void *_ctx, const void *src, size_t src_size,
+ {
+   struct aes_ctx *ctx = _ctx;
+ 
+-  aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key_dec, ctx->iv, 0);
++  aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key_dec), ctx->iv, 0);
+ 
+   return 0;
+ }
+diff --git a/lib/accelerated/intel/aes-x86.h b/lib/accelerated/intel/aes-x86.h
+index 8f49ff3..20a169e 100644
+--- a/lib/accelerated/intel/aes-x86.h
++++ b/lib/accelerated/intel/aes-x86.h
+@@ -11,10 +11,11 @@ void register_x86_crypto (void);
+ # define ALIGN16
+ #endif
+ 
++#define AES_KEY_ALIGN_SIZE 8
+ #define AES_MAXNR 14
+ typedef struct
+ {
+-  uint32_t ALIGN16 rd_key[4 * (AES_MAXNR + 1)];
++  uint32_t rd_key[4 * (AES_MAXNR + 1)+AES_KEY_ALIGN_SIZE];
+   int rounds;
+ } AES_KEY;
+ 
diff --git a/staging/gnutls/gnutls.install b/testing/gnutls/gnutls.install
index 9ce7c6edc..9ce7c6edc 100644
--- a/staging/gnutls/gnutls.install
+++ b/testing/gnutls/gnutls.install
diff --git a/staging/gtk-vnc/PKGBUILD b/testing/gtk-vnc/PKGBUILD
index fb9d6a902..b8e4c8856 100644
--- a/staging/gtk-vnc/PKGBUILD
+++ b/testing/gtk-vnc/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gtk-vnc
 pkgver=0.4.3
 pkgrel=2
 pkgdesc="A VNC viewer widget for GTK"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://live.gnome.org/gtk-vnc"
 license=('LGPL')
 depends=('gtk3')
diff --git a/testing/isl/PKGBUILD b/testing/isl/PKGBUILD
new file mode 100644
index 000000000..5a118360a
--- /dev/null
+++ b/testing/isl/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 135492 2011-08-14 09:39:59Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+pkgname=isl
+pkgver=0.06
+pkgrel=2
+pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
+arch=('i686' 'x86_64')
+url="http://www.kotnet.org/~skimo/isl/"
+license=('LGPL2.1')
+options=('!libtool')
+source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2)
+md5sums=('504f054eaffdd8d07c497ebe3ebc7e04')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make check
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -j1 DESTDIR="$pkgdir/" install
+  
+  # this seems a better place for this file...
+  install -dm755 $pkgdir/usr/share/gdb/auto-load/
+  mv $pkgdir/usr/{lib,share/gdb/auto-load}/libisl.so.6.0.0-gdb.py
+}
diff --git a/staging/lftp/PKGBUILD b/testing/lftp/PKGBUILD
index 3de86c3dc..9cd8e8d15 100644
--- a/staging/lftp/PKGBUILD
+++ b/testing/lftp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lftp
 pkgver=4.3.1
 pkgrel=2
 pkgdesc="Sophisticated command line based FTP client"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh')
 optdepends=('perl: needed for convert-netscape-cookies and verify-file')
diff --git a/testing/libedit/PKGBUILD b/testing/libedit/PKGBUILD
new file mode 100644
index 000000000..781325d1b
--- /dev/null
+++ b/testing/libedit/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 135318 2011-08-12 19:30:04Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Roman Cheplyaka <roma@ro-che.info>
+
+pkgname=libedit
+pkgver=20110802_3.0
+pkgrel=1
+pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions'
+arch=('i686' 'x86_64')
+url='http://www.thrysoee.dk/editline/'
+license=('BSD')
+depends=('ncurses')
+options=('!libtool')
+source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz")
+sha1sums=('b06e3cf248a4235617c71454e15ca3a54a61d467')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver/_/-}"
+	./configure --prefix=/usr --enable-widec --enable-static=no
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver/_/-}"
+	make prefix="${pkgdir}"/usr install
+
+	cp "${pkgdir}"/usr/share/man/man3/editline.3 "${pkgdir}"/usr/share/man/man3/el.3
+	install -D -m0644 COPYING "${pkgdir}"/usr/share/licenses/libedit/LICENSE
+}
diff --git a/testing/libepc/PKGBUILD b/testing/libepc/PKGBUILD
new file mode 100644
index 000000000..55d302e51
--- /dev/null
+++ b/testing/libepc/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 135240 2011-08-11 10:52:34Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=libepc
+pkgver=0.3.11
+pkgrel=2
+pkgdesc="Easy Publish and Consume Library"
+arch=(i686 x86_64)
+license=('LGPL')
+url="http://live.gnome.org/libepc"
+depends=('gtk2' 'avahi' 'libsoup')
+makedepends=('intltool')
+options=('!libtool' '!makeflags')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('ec38fe4206fab7a8939fb351d7b419cc681ac44afcdd5aab9bdb8fc3386df25c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/libgnomecups/PKGBUILD b/testing/libgnomecups/PKGBUILD
new file mode 100644
index 000000000..ad012813e
--- /dev/null
+++ b/testing/libgnomecups/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 135360 2011-08-13 07:42:39Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Paulius Palevicius <paulius@birzai.com>
+
+pkgname=libgnomecups
+pkgver=0.2.3
+pkgrel=9
+pkgdesc="GNOME cups library"
+arch=(i686 x86_64)
+license=('LGPL' 'GPL')
+url="http://www.gnome.org"
+depends=('libcups' 'glib2' 'krb5' 'gnutls')
+makedepends=('perlxml')
+options=(!libtool)
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2
+        libgnomecups_0.2.3-ignore-ipp-not-found.patch)
+md5sums=('dc4920c15c9f886f73ea74fbff0ae48b'
+         '973a1b9d93013ce431400a14b78f5d94')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # This avoids generating huge 'IPP request failed with status 1030' lines
+  patch -Np1 -i ${srcdir}/libgnomecups_0.2.3-ignore-ipp-not-found.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch b/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch
new file mode 100644
index 000000000..797367bf9
--- /dev/null
+++ b/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch
@@ -0,0 +1,11 @@
+--- a/libgnomecups/gnome-cups-request.c	2007-01-31 10:49:17.000000000 -0800
++++ b/libgnomecups/gnome-cups-request.c	2009-11-24 12:49:30.000000000 -0800
+@@ -349,7 +349,7 @@
+ 		if (request->response == NULL)
+ 			status = IPP_INTERNAL_ERROR;
+ 
+-		if (status > IPP_OK_CONFLICT) {
++		if (status > IPP_OK_CONFLICT && status != IPP_NOT_FOUND) {
+ 			g_warning ("IPP request failed with status %d", status);
+ 			if (request->error != NULL)
+ 				*(request->error) = g_error_new (GNOME_CUPS_ERROR, 
diff --git a/testing/libgnomeprint/PKGBUILD b/testing/libgnomeprint/PKGBUILD
new file mode 100644
index 000000000..3e86111ac
--- /dev/null
+++ b/testing/libgnomeprint/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 135363 2011-08-13 07:48:01Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=libgnomeprint
+pkgver=2.18.8
+pkgrel=3
+pkgdesc="Printing routines for GNOME"
+arch=(i686 x86_64)
+license=('LGPL' 'GPL')
+depends=('pango' 'libart-lgpl' 'libxml2' 'libgnomecups' 'krb5' 'gnutls' 'libgcrypt' 'bzip2')
+makedepends=('intltool' 'pkgconfig')
+replaces=('libgnomeprint-cups')
+conflicts=('libgnomeprint-cups')
+url="http://www.gnome.org"
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/libgpod/PKGBUILD b/testing/libgpod/PKGBUILD
index 035d5adf6..58ef7b358 100644
--- a/staging/libgpod/PKGBUILD
+++ b/testing/libgpod/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgpod
 pkgver=0.8.2
 pkgrel=2
 pkgdesc="A shared library to access the contents of an iPod"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 license=('LGPL')
 depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice')
 makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject-devel' 'gtk-sharp-2')
diff --git a/staging/libimobiledevice/PKGBUILD b/testing/libimobiledevice/PKGBUILD
index 3d01bae13..a6f48d786 100644
--- a/staging/libimobiledevice/PKGBUILD
+++ b/testing/libimobiledevice/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.1.1
 pkgrel=2
 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
 url="http://libimobiledevice.org/"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
 depends=('glib2' 'gnutls' 'libgcrypt' 'libplist' 'usbmuxd')
 makedepends=('swig' 'python2')
diff --git a/staging/libimobiledevice/swig-version-check.patch b/testing/libimobiledevice/swig-version-check.patch
index c56b095db..c56b095db 100644
--- a/staging/libimobiledevice/swig-version-check.patch
+++ b/testing/libimobiledevice/swig-version-check.patch
diff --git a/testing/libmpc/PKGBUILD b/testing/libmpc/PKGBUILD
new file mode 100644
index 000000000..cc456ec0d
--- /dev/null
+++ b/testing/libmpc/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 135486 2011-08-14 09:36:03Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+pkgname=libmpc
+pkgver=0.9
+pkgrel=2
+pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision"
+arch=('i686' 'x86_64')
+url="http://www.multiprecision.org/"
+license=('LGPL')
+depends=('mpfr>=3.0.0')
+options=('!libtool')
+install=libmpc.install
+source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz
+        libmpc-0.9-configure_cflags_egrep_issue.patch)
+md5sums=('0d6acab8d214bd7d1fbbc593e83dd00d'
+         '35d5bb02dc6c1153e581b7c34a738a08')
+
+build() {
+  cd "${srcdir}/mpc-${pkgver}"
+
+  # http://lists.gforge.inria.fr/pipermail/mpc-discuss/2011-February/000805.html
+  patch -Np1 -i $srcdir/libmpc-0.9-configure_cflags_egrep_issue.patch
+  autoreconf
+  
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "${srcdir}/mpc-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/mpc-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  mv ${pkgdir}/usr/share/info/{mpc,libmpc}.info
+}
diff --git a/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch b/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch
new file mode 100644
index 000000000..3bf324728
--- /dev/null
+++ b/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch
@@ -0,0 +1,63 @@
+--- trunk/configure.ac	2011/02/21 12:18:31	932
++++ trunk/configure.ac	2011/02/21 16:41:09	936
+@@ -33,7 +33,7 @@
+ AC_CANONICAL_HOST
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-dnl Extra arguments to configure
++# Extra arguments to configure
+ AC_ARG_WITH([mpfr_include],
+             [AC_HELP_STRING([--with-mpfr-include=DIR],
+                             [MPFR include directory])],
+@@ -85,18 +85,19 @@
+              )
+ 
+ 
+-dnl Setup CC and CFLAGS
++# Setup CC and CFLAGS
++AC_PROG_CC
++AC_LANG(C)
+ 
+-dnl Check for user specification of CC or CFLAGS
++# Set up LibTool
++AC_PROG_LIBTOOL
++
++# Check for user specification of CC or CFLAGS
+ if test -n "$CFLAGS" || test -n "$CC" ; then
+    user_redefine_cc=yes
+ fi
+ 
+-# Check for programs
+-AC_PROG_CC
+-AC_LANG(C)
+-
+-dnl Check GMP Header
++# Check GMP Header
+ AC_MSG_CHECKING(for gmp.h)
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #include "gmp.h"
+@@ -105,22 +106,19 @@
+  AC_MSG_ERROR([gmp.h can't be found, or is unusable.])
+ ])
+ 
+-dnl Check for GMP CFLAGS in gmp.h
++# Check for GMP CFLAGS in gmp.h
+ if test -z "$user_redefine_cc" ; then
+    MPC_GMP_CC_CFLAGS
+ fi
+ 
+ 
+-dnl Configs for Windows DLLs
++# Configs for Windows DLLs
+ case $host in
+   *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+      MPC_WINDOWS
+ esac
+ 
+ 
+-dnl Finally set up LibTool
+-AC_PROG_LIBTOOL
+-
+ # Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h])
diff --git a/testing/libmpc/libmpc.install b/testing/libmpc/libmpc.install
new file mode 100644
index 000000000..b0718c745
--- /dev/null
+++ b/testing/libmpc/libmpc.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(libmpc.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/staging/libvncserver/PKGBUILD b/testing/libvncserver/PKGBUILD
index 4e9773e9c..f67790f2e 100644
--- a/staging/libvncserver/PKGBUILD
+++ b/testing/libvncserver/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 134732 2011-08-07 19:13:36Z andrea $
+# $Id: PKGBUILD 135543 2011-08-15 02:52:19Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libvncserver
 pkgver=0.9.8
-pkgrel=3
+pkgrel=4
 pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://libvncserver.sourceforge.net/"
 license=('GPL')
-depends=('libjpeg' 'zlib' 'gnutls')
+depends=('libjpeg' 'gnutls' 'libgcrypt')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz")
 md5sums=('dda9e75a1d5d7c37bb57d90ead7b32b3')
diff --git a/testing/links/PKGBUILD b/testing/links/PKGBUILD
new file mode 100644
index 000000000..b826f16da
--- /dev/null
+++ b/testing/links/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 135532 2011-08-15 01:04:50Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=links
+pkgver=2.3
+pkgrel=1
+pkgdesc="A text WWW browser, similar to Lynx"
+arch=('i686' 'x86_64')
+url="http://links.twibright.com/"
+license=('GPL')
+depends=('bzip2' 'zlib' 'openssl' 'gpm')
+makedepends=('libtiff' 'libpng' 'libxt')
+optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks')
+provides=('links-g')
+conflicts=('links-g')
+replaces=('links-g')
+source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop)
+md5sums=('1dc17862e766cec7c544166186e7167b'
+         '7c47b15aaef51f1de129ff3a2afb7eac')
+sha1sums=('0f91e550a80a2bc358ce3bdf48a23504a0582b02'
+          'f600e27c2a71184444f7dd07a10230aa44463a02')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  (cd intl; ./gen-intl; ./synclang)
+  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
+    --enable-graphics --with-x --with-fb
+  make
+  mv links xlinks
+
+  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
+    --disable-graphics --without-x  --without-fb
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 xlinks "${pkgdir}/usr/bin/xlinks"
+  ln -s links.1.gz "${pkgdir}/usr/share/man/man1/xlinks.1.gz"
+
+  install -D -m644 "${srcdir}/links.desktop" "${pkgdir}/usr/share/applications/links.desktop"
+  install -d "${pkgdir}/usr/share/pixmaps"
+  install -m644 links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm "${pkgdir}/usr/share/pixmaps/"
+
+  install -d "${pkgdir}/usr/share/doc/links/calibration"
+  install -m644 doc/links_cal/* "${pkgdir}/usr/share/doc/links/calibration/"
+}
diff --git a/testing/links/links.desktop b/testing/links/links.desktop
new file mode 100644
index 000000000..9d6338a5b
--- /dev/null
+++ b/testing/links/links.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Links
+Exec=xlinks -g
+Icon=links_32x32.xpm
+Type=Application
+Terminal=false
+Categories=Network;WebBrowser;
diff --git a/testing/linux-api-headers/PKGBUILD b/testing/linux-api-headers/PKGBUILD
new file mode 100644
index 000000000..06dce5838
--- /dev/null
+++ b/testing/linux-api-headers/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 135474 2011-08-14 09:22:16Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+
+pkgname=linux-api-headers
+pkgver=3.0.1
+_basever=3.0
+pkgrel=1
+pkgdesc="Kernel headers sanitized for use in userspace"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/libc"
+license=('GPL2')
+provides=("kernel-headers=${pkgver}")
+conflicts=('kernel-headers')
+replaces=('kernel-headers')
+source=(http://www.kernel.org/pub/linux/kernel/v${_basever}/linux-${_basever}.tar.bz2
+	http://www.kernel.org/pub/linux/kernel/v${_basever}/patch-${pkgver}.bz2)
+md5sums=('398e95866794def22b12dfbc15ce89c0'
+         'ac49f7907f1fc85fbab92d0f1aa1552a')
+
+build() {
+  cd ${srcdir}/linux-${_basever}
+  [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${pkgver}
+
+  make mrproper
+  make headers_check
+}
+
+package() {
+  cd ${srcdir}/linux-${_basever}
+  make INSTALL_HDR_PATH=${pkgdir}/usr headers_install
+
+  # use headers from libdrm
+  rm -rf ${pkgdir}/usr/include/drm
+  
+  # clean-up unnecessary files generated during install
+  find ${pkgdir} -name .install -or -name ..install.cmd | xargs rm -f
+}
diff --git a/testing/loudmouth/01-fix-sasl-md5-digest-uri.patch b/testing/loudmouth/01-fix-sasl-md5-digest-uri.patch
new file mode 100644
index 000000000..5bca69c0c
--- /dev/null
+++ b/testing/loudmouth/01-fix-sasl-md5-digest-uri.patch
@@ -0,0 +1,24 @@
+diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c
+index 21c1bc2..ae8de94 100644
+--- a/loudmouth/lm-connection.c
++++ b/loudmouth/lm-connection.c
+@@ -1441,11 +1441,18 @@ lm_connection_authenticate (LmConnection      *connection,
+ 	connection->effective_jid = g_strdup_printf ("%s/%s", 
+ 		connection->jid, connection->resource);
+ 
+ 	if (connection->use_sasl) {
++		gchar *domain = NULL;
++
++		if (!connection_get_server_from_jid (connection->jid, &domain)) {
++			domain = g_strdup (connection->server);
++		}
++
+ 		lm_sasl_authenticate (connection->sasl,
+ 				      username, password,
+-				      connection->server,
++				      domain,
+ 				      connection_sasl_auth_finished);
++		g_free (domain);
+ 
+ 		connection->features_cb  =
+ 			lm_message_handler_new (connection_features_cb,
diff --git a/testing/loudmouth/03-drop-stanzas-on-fail.patch b/testing/loudmouth/03-drop-stanzas-on-fail.patch
new file mode 100644
index 000000000..87b86a998
--- /dev/null
+++ b/testing/loudmouth/03-drop-stanzas-on-fail.patch
@@ -0,0 +1,45 @@
+From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+Date: Tue, 13 Jan 2009 11:28:44 +0000
+Subject: [PATCH] Drop stanzas when failing to convert them to LmMessages
+
+when a stanza comes in that for some reason can't be parsed into an LmMessage,
+just drop them on the floor instead of blocking the parser. I've seen this
+issue happen in practise because some (buggy?) client sending an iq with a
+prefix e.g. <client:iq xmlns:client="jabber:client" ... />
+---
+ loudmouth/lm-parser.c |   15 ++++++---------
+ 1 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/loudmouth/lm-parser.c b/loudmouth/lm-parser.c
+index 1938d56..89f6675 100644
+--- a/loudmouth/lm-parser.c
++++ b/loudmouth/lm-parser.c
+@@ -151,19 +151,16 @@ parser_end_node_cb (GMarkupParseContext  *context,
+ 		if (!m) {
+ 			g_warning ("Couldn't create message: %s\n",
+ 				   parser->cur_root->name);
+-			return;
+-		}
+-
+-		g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
++		} else {
++			g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
+ 		       "Have a new message\n");
+-		if (parser->function) {
+-			(* parser->function) (parser, m, parser->user_data);
++			if (parser->function) {
++				(* parser->function) (parser, m, parser->user_data);
++			}
++			lm_message_unref (m);
+ 		}
+ 
+-		lm_message_unref (m);
+ 		lm_message_node_unref (parser->cur_root);
+-		
+-			
+ 		parser->cur_node = parser->cur_root = NULL;
+ 	} else {
+ 		LmMessageNode *tmp_node;
+-- 
+1.5.6.5
+
diff --git a/testing/loudmouth/04-use-pkg-config-for-gnutls.patch b/testing/loudmouth/04-use-pkg-config-for-gnutls.patch
new file mode 100644
index 000000000..20f388e89
--- /dev/null
+++ b/testing/loudmouth/04-use-pkg-config-for-gnutls.patch
@@ -0,0 +1,23 @@
+Description: use pkg-config to detect gnutls
+Debian: http://bugs.debian.org/529835
+Origin: http://groups.google.com/group/loudmouth-dev/browse_thread/thread/3f78255837048daf#
+
+--- a/configure.ac.orig	2009-08-16 20:29:36.000000000 +0200
++++ b/configure.ac	2009-08-16 20:30:43.000000000 +0200
+@@ -146,10 +146,12 @@ AC_ARG_WITH(openssl-libs,
+ enable_ssl=no
+ if test "x$ac_ssl" = "xgnutls"; then
+   dnl Look for GnuTLS
+-  AM_PATH_LM_LIBGNUTLS($GNUTLS_REQUIRED, have_libgnutls=yes, have_libgnutls=no)
+-  if test "x$have_libgnutls" = "xyes"; then
+-    CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+-    LIBS="$LIBS $LIBGNUTLS_LIBS"
++  PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED, have_gnutls=yes, have_gnutls=no)
++  if test "x$have_gnutls" = "xyes"; then 
++    AC_SUBST(ASYNCNS_CFLAGS)
++    AC_SUBST(ASYNCNS_LIBS)
++    CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
++    LIBS="$LIBS $GNUTLS_LIBS"
+     AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
+     enable_ssl=GnuTLS
+   else
diff --git a/testing/loudmouth/PKGBUILD b/testing/loudmouth/PKGBUILD
new file mode 100644
index 000000000..d1686df56
--- /dev/null
+++ b/testing/loudmouth/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
+# Contributor: Brice Carpentier <brice.carpentier@orange.fr>
+
+pkgname=loudmouth
+pkgver=1.4.3
+pkgrel=3
+pkgdesc="A lightweight Jabber client library written in C/Glib"
+arch=('i686' 'x86_64')
+license=('LGPL')
+url="http://groups.google.com/group/loudmouth-dev"
+depends=('glib2' 'gnutls' 'libidn')
+options=('!libtool')
+makedepends=('intltool' 'pkgconfig' 'gtk-doc')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2
+        01-fix-sasl-md5-digest-uri.patch
+        03-drop-stanzas-on-fail.patch
+        04-use-pkg-config-for-gnutls.patch)
+md5sums=('55339ca42494690c3942ee1465a96937'
+         'dc799cea18b24847b1e008c7424010a3'
+         'b7b2d81b01a5eee5fd5e21cae67b4af7'
+         'bffb25b9551df43255fe1706588582f3')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/01-fix-sasl-md5-digest-uri.patch"
+  patch -Np1 -i "${srcdir}/03-drop-stanzas-on-fail.patch"
+  patch -Np1 -i "${srcdir}/04-use-pkg-config-for-gnutls.patch"
+  libtoolize --force
+  autoreconf
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules
new file mode 100644
index 000000000..d2c167324
--- /dev/null
+++ b/testing/lvm2/11-dm-initramfs.rules
@@ -0,0 +1,3 @@
+# needed with new udev/mkinitcpio and as implemented in dracut:
+# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
+SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD
new file mode 100644
index 000000000..c29ed8030
--- /dev/null
+++ b/testing/lvm2/PKGBUILD
@@ -0,0 +1,64 @@
+# $Id: PKGBUILD 135451 2011-08-13 22:32:08Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+
+pkgbase=lvm2
+pkgname=('lvm2' 'device-mapper')
+pkgver=2.02.87
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://sourceware.org/lvm2/"
+license=('GPL2' 'LGPL2.1')
+groups=('base')
+source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz
+        lvm2_install
+        lvm2_hook
+        11-dm-initramfs.rules)
+md5sums=('4c36c7f216edfe65a6193d2adc389ecd'
+         'dcb82506d732cc7b10159a89b579dba8'
+         '8d613b84a175cd85f752a75198e40e15'
+         '69e40679cd8b3658bfc619e48baae125')
+sha1sums=('4b217d405133bdc6120568253574a49fae2caa4f'
+          '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
+          'a0e0513c2efb183006e57e595d93ce18be297928'
+          'f6a554eea9557c3c236df2943bb6e7e723945c41')
+
+build() {
+  cd "${srcdir}/LVM2.${pkgver}"
+  sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh
+  unset LDFLAGS
+  ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
+    --includedir=/usr/include --with-usrlibdir=/usr/lib \
+    --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
+    --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules
+  make
+}
+
+package_device-mapper() {
+  pkgdesc="Device mapper userspace library and tools"
+  url="http://sourceware.org/dm/"
+  depends=('glibc' 'udev')
+
+  cd "${srcdir}/LVM2.${pkgver}"
+  make DESTDIR="${pkgdir}" install_device-mapper
+  # extra udev rule for device-mapper in initramfs
+  install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules"
+}
+
+package_lvm2() {
+  pkgdesc="Logical Volume Manager 2 utilities"
+  depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
+  conflicts=('lvm' 'mkinitcpio<0.7')
+  backup=('etc/lvm/lvm.conf')
+  options=('!makeflags')
+
+  cd "${srcdir}/LVM2.${pkgver}"
+  make DESTDIR="${pkgdir}" install_lvm2
+  # install applib
+  make -C liblvm DESTDIR="${pkgdir}" install
+  # /etc directories
+  install -d "${pkgdir}"/etc/lvm/{archive,backup}
+  # mkinitcpio hook
+  install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2"
+  install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2"
+}
diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook
new file mode 100644
index 000000000..874b91d06
--- /dev/null
+++ b/testing/lvm2/lvm2_hook
@@ -0,0 +1,25 @@
+# vim:set ft=sh:
+run_hook ()
+{
+    /sbin/modprobe -q dm-mod >/dev/null 2>&1
+    if [ -e "/sys/class/misc/device-mapper" ]; then
+        if [ ! -e "/dev/mapper/control" ]; then
+            mkdir /dev/mapper
+            mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |')
+        fi
+
+        # If the lvmwait= parameter has been specified on the command line
+        # wait for the device(s) before trying to activate the volume group(s)
+        if [ -n "${lvmwait}" ]; then
+            for pvdev in $(echo ${lvmwait} | sed 's|,| |g'); do
+                poll_device ${pvdev} ${rootdelay}
+            done
+        fi
+
+        [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null"
+
+        msg "Activating logical volumes..."
+        [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit
+        eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
+    fi
+}
diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install
new file mode 100644
index 000000000..94175b523
--- /dev/null
+++ b/testing/lvm2/lvm2_install
@@ -0,0 +1,29 @@
+# vim: set ft=sh:
+
+build()
+{
+    MODULES=" dm-mod dm-snapshot dm-mirror"
+    BINARIES=""
+    FILES=""
+    SCRIPT="lvm2"
+
+    add_binary "/sbin/lvm"
+    add_binary "/sbin/dmsetup"
+    add_file "/lib/udev/rules.d/10-dm.rules"
+    add_file "/lib/udev/rules.d/13-dm-disk.rules"
+    add_file "/lib/udev/rules.d/95-dm-notify.rules"
+    add_file "/lib/udev/rules.d/11-dm-lvm.rules"
+    add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
+}
+
+help ()
+{
+cat<<HELPEOF
+  This hook loads the necessary modules for an LVM2 root device.
+
+  The optional lvmwait= parameter followed by a comma-separated
+  list of device names can be given on the command line.
+  It will cause the hook to wait until all given devices exist
+  before trying to scan and activate any volume groups.
+HELPEOF
+}
diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD
new file mode 100644
index 000000000..0e50e672b
--- /dev/null
+++ b/testing/mkinitcpio-busybox/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 135465 2011-08-13 23:34:47Z thomas $
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+pkgname=mkinitcpio-busybox
+pkgver=1.18.5
+pkgrel=1
+pkgdesc="base initramfs tools"
+arch=('i686' 'x86_64')
+url="http://www.busybox.net/"
+license=('GPL')
+depends=('glibc')
+source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2
+        config)
+sha256sums=('10954fcd5c48d8a262a3497b16227bf983a05658bf2bf661af2fdeca773f2fc0'
+            '0961b4db5eb5eaa1b8d353a3fc792884f4f2733ec0f5715ba88a0e667f0f48ec')
+
+build() {
+  cd "${srcdir}/busybox-${pkgver}"
+
+  unset CFLAGS CXXFLAGS
+  if [ ${CARCH} = "x86_64" ]; then
+    sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config
+  else
+    sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=i686 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config
+  fi
+  make
+}
+
+package() {
+  install -D -m755 "${srcdir}/busybox-${pkgver}"/busybox "${pkgdir}/lib/initcpio/busybox"
+}
+# vim:set ts=2 sw=2 et:
diff --git a/testing/mkinitcpio-busybox/config b/testing/mkinitcpio-busybox/config
new file mode 100644
index 000000000..31a9d4330
--- /dev/null
+++ b/testing/mkinitcpio-busybox/config
@@ -0,0 +1,990 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.18.5
+# Sun Aug 14 01:22:25 2011
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_DESKTOP is not set
+# CONFIG_EXTRA_COMPAT is not set
+# CONFIG_INCLUDE_SUSv2 is not set
+# CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_PLATFORM_LINUX=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+# CONFIG_FEATURE_VERBOSE_USAGE is not set
+# CONFIG_FEATURE_COMPRESS_USAGE is not set
+CONFIG_FEATURE_INSTALLER=y
+# CONFIG_INSTALL_NO_USR is not set
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_UNICODE_SUPPORT=y
+# CONFIG_UNICODE_USING_LOCALE is not set
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=63
+CONFIG_LAST_SUPPORTED_WCHAR=767
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+# CONFIG_UNICODE_PRESERVE_BROKEN is not set
+CONFIG_LONG_OPTS=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+# CONFIG_FEATURE_WTMP is not set
+# CONFIG_FEATURE_UTMP is not set
+# CONFIG_FEATURE_PIDFILE is not set
+CONFIG_FEATURE_SUID=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_EXTRA_CFLAGS=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+
+#
+# Installation Options ("make install" behavior)
+#
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=0
+CONFIG_FEATURE_FAST_TOP=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+# CONFIG_FEATURE_USE_TERMIOS is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+# CONFIG_FEATURE_EDITING_VI is not set
+CONFIG_FEATURE_EDITING_HISTORY=15
+# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+# CONFIG_FEATURE_HWIB is not set
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_FEATURE_SEAMLESS_XZ is not set
+# CONFIG_FEATURE_SEAMLESS_LZMA is not set
+# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
+# CONFIG_FEATURE_SEAMLESS_GZ is not set
+# CONFIG_FEATURE_SEAMLESS_Z is not set
+# CONFIG_AR is not set
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+# CONFIG_FEATURE_AR_CREATE is not set
+# CONFIG_BUNZIP2 is not set
+# CONFIG_BZIP2 is not set
+# CONFIG_CPIO is not set
+# CONFIG_FEATURE_CPIO_O is not set
+# CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+# CONFIG_GUNZIP is not set
+# CONFIG_GZIP is not set
+# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
+# CONFIG_LZOP is not set
+# CONFIG_LZOP_COMPR_HIGH is not set
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+# CONFIG_TAR is not set
+# CONFIG_FEATURE_TAR_CREATE is not set
+# CONFIG_FEATURE_TAR_AUTODETECT is not set
+# CONFIG_FEATURE_TAR_FROM is not set
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_FEATURE_TAR_TO_COMMAND is not set
+# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
+# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
+# CONFIG_FEATURE_TAR_SELINUX is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+# CONFIG_LZMA is not set
+# CONFIG_UNXZ is not set
+# CONFIG_XZ is not set
+# CONFIG_UNZIP is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAT=y
+# CONFIG_DATE is not set
+# CONFIG_FEATURE_DATE_ISOFMT is not set
+# CONFIG_FEATURE_DATE_NANO is not set
+# CONFIG_FEATURE_DATE_COMPAT is not set
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+# CONFIG_TR is not set
+# CONFIG_FEATURE_TR_CLASSES is not set
+# CONFIG_FEATURE_TR_EQUIV is not set
+# CONFIG_BASE64 is not set
+# CONFIG_CAL is not set
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+# CONFIG_COMM is not set
+CONFIG_CP=y
+# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
+CONFIG_CUT=y
+CONFIG_DD=y
+# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
+# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+# CONFIG_FEATURE_DF_FANCY is not set
+CONFIG_DIRNAME=y
+# CONFIG_DOS2UNIX is not set
+# CONFIG_UNIX2DOS is not set
+CONFIG_DU=y
+# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+# CONFIG_FSYNC is not set
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+# CONFIG_HOSTID is not set
+# CONFIG_ID is not set
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+# CONFIG_LOGNAME is not set
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+# CONFIG_FEATURE_LS_COLOR is not set
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+# CONFIG_NICE is not set
+# CONFIG_NOHUP is not set
+# CONFIG_OD is not set
+# CONFIG_PRINTENV is not set
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+# CONFIG_REALPATH is not set
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SHA256SUM=y
+CONFIG_SHA512SUM=y
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_FEATURE_FLOAT_SLEEP=y
+CONFIG_SORT=y
+# CONFIG_FEATURE_SORT_BIG is not set
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
+CONFIG_STAT=y
+CONFIG_FEATURE_STAT_FORMAT=y
+# CONFIG_STTY is not set
+# CONFIG_SUM is not set
+# CONFIG_SYNC is not set
+# CONFIG_TAC is not set
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+# CONFIG_TEE is not set
+# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+CONFIG_TOUCH=y
+CONFIG_TRUE=y
+# CONFIG_TTY is not set
+CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
+CONFIG_UNIQ=y
+# CONFIG_USLEEP is not set
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+CONFIG_WC=y
+CONFIG_FEATURE_WC_LARGE=y
+# CONFIG_WHO is not set
+# CONFIG_WHOAMI is not set
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+# CONFIG_CHVT is not set
+# CONFIG_FGCONSOLE is not set
+# CONFIG_CLEAR is not set
+# CONFIG_DEALLOCVT is not set
+# CONFIG_DUMPKMAP is not set
+CONFIG_KBD_MODE=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+# CONFIG_RESET is not set
+# CONFIG_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
+# CONFIG_SETCONSOLE is not set
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+CONFIG_SETFONT=y
+# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
+CONFIG_DEFAULT_SETFONT_DIR=""
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
+# CONFIG_SHOWKEY is not set
+
+#
+# Common options for loadfont and setfont
+#
+CONFIG_FEATURE_LOADFONT_PSF2=y
+CONFIG_FEATURE_LOADFONT_RAW=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+# CONFIG_RUN_PARTS is not set
+# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
+# CONFIG_START_STOP_DAEMON is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
+# CONFIG_WHICH is not set
+
+#
+# Editors
+#
+# CONFIG_PATCH is not set
+CONFIG_AWK=y
+# CONFIG_FEATURE_AWK_LIBM is not set
+# CONFIG_CMP is not set
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_ED is not set
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=4096
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_ASK_TERMINAL=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+# CONFIG_FEATURE_ALLOW_EXEC is not set
+
+#
+# Finding Utilities
+#
+# CONFIG_FIND is not set
+# CONFIG_FEATURE_FIND_PRINT0 is not set
+# CONFIG_FEATURE_FIND_MTIME is not set
+# CONFIG_FEATURE_FIND_MMIN is not set
+# CONFIG_FEATURE_FIND_PERM is not set
+# CONFIG_FEATURE_FIND_TYPE is not set
+# CONFIG_FEATURE_FIND_XDEV is not set
+# CONFIG_FEATURE_FIND_MAXDEPTH is not set
+# CONFIG_FEATURE_FIND_NEWER is not set
+# CONFIG_FEATURE_FIND_INUM is not set
+# CONFIG_FEATURE_FIND_EXEC is not set
+# CONFIG_FEATURE_FIND_USER is not set
+# CONFIG_FEATURE_FIND_GROUP is not set
+# CONFIG_FEATURE_FIND_NOT is not set
+# CONFIG_FEATURE_FIND_DEPTH is not set
+# CONFIG_FEATURE_FIND_PAREN is not set
+# CONFIG_FEATURE_FIND_SIZE is not set
+# CONFIG_FEATURE_FIND_PRUNE is not set
+# CONFIG_FEATURE_FIND_DELETE is not set
+# CONFIG_FEATURE_FIND_PATH is not set
+# CONFIG_FEATURE_FIND_REGEX is not set
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+# CONFIG_FEATURE_FIND_LINKS is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set
+# CONFIG_FEATURE_GREP_CONTEXT is not set
+# CONFIG_XARGS is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
+
+#
+# Init Utilities
+#
+# CONFIG_BOOTCHARTD is not set
+# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
+# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
+# CONFIG_INIT is not set
+# CONFIG_FEATURE_USE_INITTAB is not set
+# CONFIG_FEATURE_KILL_REMOVED is not set
+CONFIG_FEATURE_KILL_DELAY=0
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_INIT_SYSLOG is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+CONFIG_INIT_TERMINAL_TYPE=""
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_ADD_SHELL is not set
+# CONFIG_REMOVE_SHELL is not set
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_CRYPT is not set
+# CONFIG_USE_BB_CRYPT_SHA is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_FIRST_SYSTEM_ID=0
+CONFIG_LAST_SYSTEM_ID=0
+# CONFIG_ADDGROUP is not set
+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+# CONFIG_DELUSER is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+# CONFIG_GETTY is not set
+# CONFIG_LOGIN is not set
+# CONFIG_PAM is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+# CONFIG_FEATURE_NOLOGIN is not set
+# CONFIG_FEATURE_SECURETTY is not set
+# CONFIG_PASSWD is not set
+# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
+# CONFIG_CRYPTPW is not set
+# CONFIG_CHPASSWD is not set
+# CONFIG_SU is not set
+# CONFIG_FEATURE_SU_SYSLOG is not set
+# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
+
+#
+# Linux Ext2 FS Progs
+#
+# CONFIG_CHATTR is not set
+# CONFIG_FSCK is not set
+# CONFIG_LSATTR is not set
+# CONFIG_TUNE2FS is not set
+
+#
+# Linux Module Utilities
+#
+CONFIG_MODINFO=y
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+CONFIG_INSMOD=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+# CONFIG_MODPROBE is not set
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+# CONFIG_DEPMOD is not set
+
+#
+# Options common to multiple modutils
+#
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+# CONFIG_FEATURE_MODUTILS_ALIAS is not set
+# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
+CONFIG_DEFAULT_MODULES_DIR=""
+CONFIG_DEFAULT_DEPMOD_FILE=""
+
+#
+# Linux System Utilities
+#
+# CONFIG_BLOCKDEV is not set
+# CONFIG_REV is not set
+# CONFIG_ACPID is not set
+# CONFIG_FEATURE_ACPID_COMPAT is not set
+# CONFIG_BLKID is not set
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+# CONFIG_FDISK is not set
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+# CONFIG_FEATURE_FDISK_WRITABLE is not set
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_GPT_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FINDFS is not set
+# CONFIG_FLOCK is not set
+# CONFIG_FREERAMDISK is not set
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_EXT2 is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+# CONFIG_MKFS_REISER is not set
+# CONFIG_MKFS_VFAT is not set
+CONFIG_GETOPT=y
+CONFIG_FEATURE_GETOPT_LONG=y
+CONFIG_HEXDUMP=y
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+# CONFIG_HD is not set
+# CONFIG_HWCLOCK is not set
+# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
+# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+CONFIG_LOSETUP=y
+# CONFIG_LSPCI is not set
+# CONFIG_LSUSB is not set
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_RENAME is not set
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+# CONFIG_MKSWAP is not set
+# CONFIG_FEATURE_MKSWAP_UUID is not set
+# CONFIG_MORE is not set
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_FAKE=y
+CONFIG_FEATURE_MOUNT_VERBOSE=y
+CONFIG_FEATURE_MOUNT_HELPERS=y
+CONFIG_FEATURE_MOUNT_LABEL=y
+CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+# CONFIG_PIVOT_ROOT is not set
+# CONFIG_RDATE is not set
+# CONFIG_RDEV is not set
+# CONFIG_READPROFILE is not set
+# CONFIG_RTCWAKE is not set
+# CONFIG_SCRIPT is not set
+# CONFIG_SCRIPTREPLAY is not set
+# CONFIG_SETARCH is not set
+# CONFIG_SWAPONOFF is not set
+# CONFIG_FEATURE_SWAPON_PRI is not set
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+CONFIG_VOLUMEID=y
+
+#
+# Filesystem/Volume identification
+#
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_CONSPY is not set
+# CONFIG_NANDWRITE is not set
+# CONFIG_NANDDUMP is not set
+# CONFIG_UBIATTACH is not set
+# CONFIG_UBIDETACH is not set
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
+# CONFIG_BEEP is not set
+CONFIG_FEATURE_BEEP_FREQ=0
+CONFIG_FEATURE_BEEP_LENGTH_MS=0
+# CONFIG_CHAT is not set
+# CONFIG_FEATURE_CHAT_NOFAIL is not set
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+# CONFIG_CHRT is not set
+# CONFIG_CROND is not set
+# CONFIG_FEATURE_CROND_D is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR=""
+# CONFIG_CRONTAB is not set
+# CONFIG_DC is not set
+# CONFIG_FEATURE_DC_LIBM is not set
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_DEVMEM is not set
+# CONFIG_EJECT is not set
+# CONFIG_FEATURE_EJECT_SCSI is not set
+# CONFIG_FBSPLASH is not set
+# CONFIG_FLASHCP is not set
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASH_ERASEALL is not set
+# CONFIG_IONICE is not set
+# CONFIG_INOTIFYD is not set
+# CONFIG_LAST is not set
+# CONFIG_FEATURE_LAST_SMALL is not set
+# CONFIG_FEATURE_LAST_FANCY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_LINENUMS is not set
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MAN is not set
+# CONFIG_MICROCOM is not set
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_MT is not set
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+# CONFIG_RFKILL is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+# CONFIG_SETSID is not set
+CONFIG_STRINGS=y
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+# CONFIG_TIME is not set
+# CONFIG_TIMEOUT is not set
+# CONFIG_TTYSIZE is not set
+# CONFIG_VOLNAME is not set
+# CONFIG_WALL is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+# CONFIG_NBDCLIENT is not set
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+# CONFIG_NC_110_COMPAT is not set
+CONFIG_FEATURE_IPV6=y
+# CONFIG_FEATURE_UNIX_LOCAL is not set
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+# CONFIG_ARPING is not set
+# CONFIG_BRCTL is not set
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+# CONFIG_DNSD is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPD is not set
+# CONFIG_FEATURE_FTP_WRITE is not set
+# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+# CONFIG_HOSTNAME is not set
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+# CONFIG_FEATURE_HTTPD_GZIP is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+# CONFIG_IFENSLAVE is not set
+# CONFIG_IFPLUGD is not set
+# CONFIG_IFUPDOWN is not set
+CONFIG_IFUPDOWN_IFSTATE_PATH=""
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+CONFIG_NETSTAT=y
+CONFIG_FEATURE_NETSTAT_WIDE=y
+CONFIG_FEATURE_NETSTAT_PRG=y
+CONFIG_NSLOOKUP=y
+# CONFIG_NTPD is not set
+# CONFIG_FEATURE_NTPD_SERVER is not set
+CONFIG_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_PSCAN is not set
+CONFIG_ROUTE=y
+# CONFIG_SLATTACH is not set
+# CONFIG_TCPSVD is not set
+CONFIG_TELNET=y
+# CONFIG_FEATURE_TELNET_TTYPE is not set
+# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+
+#
+# Common options for tftp/tftpd
+#
+CONFIG_FEATURE_TFTP_GET=y
+# CONFIG_FEATURE_TFTP_PUT is not set
+# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+# CONFIG_TFTP_DEBUG is not set
+# CONFIG_TRACEROUTE is not set
+# CONFIG_TRACEROUTE6 is not set
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_TUNCTL is not set
+# CONFIG_FEATURE_TUNCTL_UG is not set
+# CONFIG_UDHCPD is not set
+# CONFIG_DHCPRELAY is not set
+# CONFIG_DUMPLEASES is not set
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_DHCPD_LEASES_FILE=""
+# CONFIG_UDHCPC is not set
+# CONFIG_FEATURE_UDHCPC_ARPING is not set
+# CONFIG_FEATURE_UDHCP_PORT is not set
+CONFIG_UDHCP_DEBUG=0
+# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+CONFIG_UDHCPC_DEFAULT_SCRIPT=""
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
+# CONFIG_UDPSVD is not set
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_FEATURE_WGET_TIMEOUT=y
+# CONFIG_ZCIP is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
+
+#
+# Mail Utilities
+#
+# CONFIG_MAKEMIME is not set
+CONFIG_FEATURE_MIME_CHARSET=""
+# CONFIG_POPMAILDIR is not set
+# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
+# CONFIG_REFORMIME is not set
+# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+# CONFIG_SENDMAIL is not set
+
+#
+# Process Utilities
+#
+# CONFIG_IOSTAT is not set
+# CONFIG_MPSTAT is not set
+# CONFIG_PMAP is not set
+# CONFIG_POWERTOP is not set
+# CONFIG_SMEMCAP is not set
+CONFIG_FREE=y
+# CONFIG_FUSER is not set
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+# CONFIG_KILLALL5 is not set
+# CONFIG_NMETER is not set
+CONFIG_PGREP=y
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+# CONFIG_PKILL is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+# CONFIG_FEATURE_PS_TIME is not set
+# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+# CONFIG_RENICE is not set
+# CONFIG_BB_SYSCTL is not set
+# CONFIG_TOP is not set
+# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
+# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+# CONFIG_FEATURE_TOPMEM is not set
+# CONFIG_FEATURE_SHOW_THREADS is not set
+CONFIG_UPTIME=y
+# CONFIG_WATCH is not set
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+# CONFIG_SV is not set
+CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Shells
+#
+CONFIG_ASH=y
+CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_GETOPTS=y
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_CMDCMD=y
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+CONFIG_ASH_EXPAND_PRMT=y
+CONFIG_CTTYHACK=y
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_MODE_X is not set
+# CONFIG_MSH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+# CONFIG_FEATURE_BASH_IS_ASH is not set
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
+CONFIG_FEATURE_BASH_IS_NONE=y
+CONFIG_SH_MATH_SUPPORT=y
+# CONFIG_SH_MATH_SUPPORT_64 is not set
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+
+#
+# System Logging Utilities
+#
+# CONFIG_SYSLOGD is not set
+# CONFIG_FEATURE_ROTATE_LOGFILE is not set
+# CONFIG_FEATURE_REMOTE_LOG is not set
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
+# CONFIG_LOGREAD is not set
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+# CONFIG_KLOGD is not set
+# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
+# CONFIG_LOGGER is not set
diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD
new file mode 100644
index 000000000..0e8ce5323
--- /dev/null
+++ b/testing/mpfr/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 135483 2011-08-14 09:33:15Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
+
+pkgname=mpfr
+_pkgver=3.0.1
+_patchlevel=p4
+pkgver=${_pkgver}.${_patchlevel}
+pkgrel=2
+pkgdesc="Multiple-precision floating-point library"
+arch=('i686' 'x86_64')
+url="http://www.mpfr.org/"
+license=('LGPL')
+depends=('gmp>=5.0')
+options=('!libtool')
+install=mpfr.install
+source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz
+        mpfr-${_pkgver}.${_patchlevel}.patch)
+md5sums=('645882d9d179113a70af84d27086ed9f'
+         '52c2ac5ffbbbf0c68f08e89f016ba7aa')
+
+build() {
+  cd "${srcdir}/${pkgname}-${_pkgver}"
+  patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch
+  ./configure --prefix=/usr --enable-thread-safe --enable-shared
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${_pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${_pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/mpfr/mpfr-3.0.1.p4.patch b/testing/mpfr/mpfr-3.0.1.p4.patch
new file mode 100644
index 000000000..9604635a2
--- /dev/null
+++ b/testing/mpfr/mpfr-3.0.1.p4.patch
@@ -0,0 +1,367 @@
+diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
+--- mpfr-3.0.1-a/PATCHES	2011-04-12 10:50:02.000000000 +0000
++++ mpfr-3.0.1-b/PATCHES	2011-04-12 10:50:02.000000000 +0000
+@@ -0,0 +1 @@
++asin_exprange
+diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
+--- mpfr-3.0.1-a/VERSION	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/VERSION	2011-04-12 10:50:02.000000000 +0000
+@@ -1 +1 @@
+-3.0.1
++3.0.1-p1
+diff -Naurd mpfr-3.0.1-a/asin.c mpfr-3.0.1-b/asin.c
+--- mpfr-3.0.1-a/asin.c	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/asin.c	2011-04-12 10:50:02.000000000 +0000
+@@ -63,11 +63,14 @@
+ 
+   compared = mpfr_cmp_ui (xp, 1);
+ 
++  MPFR_SAVE_EXPO_MARK (expo);
++
+   if (MPFR_UNLIKELY (compared >= 0))
+     {
+       mpfr_clear (xp);
+       if (compared > 0)                  /* asin(x) = NaN for |x| > 1 */
+         {
++          MPFR_SAVE_EXPO_FREE (expo);
+           MPFR_SET_NAN (asin);
+           MPFR_RET_NAN;
+         }
+@@ -80,13 +83,11 @@
+               inexact = -mpfr_const_pi (asin, MPFR_INVERT_RND(rnd_mode));
+               MPFR_CHANGE_SIGN (asin);
+             }
+-          mpfr_div_2ui (asin, asin, 1, rnd_mode); /* May underflow */
+-          return inexact;
++          mpfr_div_2ui (asin, asin, 1, rnd_mode);
+         }
+     }
+-
+-  MPFR_SAVE_EXPO_MARK (expo);
+-
++  else
++    {
+   /* Compute exponent of 1 - ABS(x) */
+   mpfr_ui_sub (xp, 1, xp, MPFR_RNDD);
+   MPFR_ASSERTD (MPFR_GET_EXP (xp) <= 0);
+@@ -115,6 +116,7 @@
+   inexact = mpfr_set (asin, xp, rnd_mode);
+ 
+   mpfr_clear (xp);
++    }
+ 
+   MPFR_SAVE_EXPO_FREE (expo);
+   return mpfr_check_range (asin, inexact, rnd_mode);
+diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
+--- mpfr-3.0.1-a/mpfr.h	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/mpfr.h	2011-04-12 10:50:02.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 0
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.0.1"
++#define MPFR_VERSION_STRING "3.0.1-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.0.1-a/tests/tasin.c mpfr-3.0.1-b/tests/tasin.c
+--- mpfr-3.0.1-a/tests/tasin.c	2011-04-04 10:19:17.000000000 +0000
++++ mpfr-3.0.1-b/tests/tasin.c	2011-04-12 10:50:02.000000000 +0000
+@@ -219,6 +219,49 @@
+   mpfr_clear (y);
+ }
+ 
++static void
++reduced_expo_range (void)
++{
++  mpfr_exp_t emin, emax;
++  mpfr_t x, y, ex_y;
++  int inex, ex_inex;
++  unsigned int flags, ex_flags;
++
++  emin = mpfr_get_emin ();
++  emax = mpfr_get_emax ();
++
++  mpfr_inits2 (4, x, y, ex_y, (mpfr_ptr) 0);
++  mpfr_set_str (x, "-0.1e1", 2, MPFR_RNDN);
++
++  mpfr_set_emin (1);
++  mpfr_set_emax (1);
++  mpfr_clear_flags ();
++  inex = mpfr_asin (y, x, MPFR_RNDA);
++  flags = __gmpfr_flags;
++  mpfr_set_emin (emin);
++  mpfr_set_emax (emax);
++
++  mpfr_set_str (ex_y, "-0.1101e1", 2, MPFR_RNDN);
++  ex_inex = -1;
++  ex_flags = MPFR_FLAGS_INEXACT;
++
++  if (SIGN (inex) != ex_inex || flags != ex_flags ||
++      ! mpfr_equal_p (y, ex_y))
++    {
++      printf ("Error in reduced_expo_range\non x = ");
++      mpfr_dump (x);
++      printf ("Expected y = ");
++      mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN);
++      printf ("\n         inex = %d, flags = %u\n", ex_inex, ex_flags);
++      printf ("Got      y = ");
++      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
++      printf ("\n         inex = %d, flags = %u\n", SIGN (inex), flags);
++      exit (1);
++    }
++
++  mpfr_clears (x, y, ex_y, (mpfr_ptr) 0);
++}
++
+ int
+ main (void)
+ {
+@@ -226,6 +269,7 @@
+ 
+   special ();
+   special_overflow ();
++  reduced_expo_range ();
+ 
+   test_generic (2, 100, 15);
+ 
+diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
+--- mpfr-3.0.1-a/version.c	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/version.c	2011-04-12 10:50:02.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.0.1";
++  return "3.0.1-p1";
+ }
+diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
+--- mpfr-3.0.1-a/PATCHES	2011-05-04 11:18:33.000000000 +0000
++++ mpfr-3.0.1-b/PATCHES	2011-05-04 11:18:33.000000000 +0000
+@@ -0,0 +1 @@
++rec_sqrt-carry
+diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
+--- mpfr-3.0.1-a/VERSION	2011-04-12 10:50:02.000000000 +0000
++++ mpfr-3.0.1-b/VERSION	2011-05-04 11:18:33.000000000 +0000
+@@ -1 +1 @@
+-3.0.1-p1
++3.0.1-p2
+diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
+--- mpfr-3.0.1-a/mpfr.h	2011-04-12 10:50:02.000000000 +0000
++++ mpfr-3.0.1-b/mpfr.h	2011-05-04 11:18:33.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 0
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.0.1-p1"
++#define MPFR_VERSION_STRING "3.0.1-p2"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.0.1-a/rec_sqrt.c mpfr-3.0.1-b/rec_sqrt.c
+--- mpfr-3.0.1-a/rec_sqrt.c	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/rec_sqrt.c	2011-05-04 11:18:33.000000000 +0000
+@@ -375,20 +375,37 @@
+       MPFR_ASSERTD(un == ln + 1 || un == ln + 2);
+       /* the high un-ln limbs of u will overlap the low part of {x+ln,xn},
+          we need to add or subtract the overlapping part {u + ln, un - ln} */
++      /* Warning! th may be 0, in which case the mpn_add_1 and mpn_sub_1
++         below (with size = th) mustn't be used. In such a case, the limb
++         (carry) will be 0, so that this is semantically a no-op, but if
++         mpn_add_1 and mpn_sub_1 are used, GMP (currently) still does a
++         non-atomic read/write in a place that is not always allocated,
++         with the possible consequences: a crash if the corresponding
++         address is not mapped, or (rather unlikely) memory corruption
++         if another process/thread writes at the same place; things may
++         be worse with future GMP versions. Hence the tests carry != 0. */
+       if (neg == 0)
+         {
+           if (ln > 0)
+             MPN_COPY (x, u, ln);
+           cy = mpn_add (x + ln, x + ln, xn, u + ln, un - ln);
+           /* add cu at x+un */
+-          cy += mpn_add_1 (x + un, x + un, th, cu);
++          if (cu != 0)
++            {
++              MPFR_ASSERTD (th != 0);
++              cy += mpn_add_1 (x + un, x + un, th, cu);
++            }
+         }
+       else /* negative case */
+         {
+           /* subtract {u+ln, un-ln} from {x+ln,un} */
+           cy = mpn_sub (x + ln, x + ln, xn, u + ln, un - ln);
+           /* carry cy is at x+un, like cu */
+-          cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */
++          if (cy + cu != 0)
++            {
++              MPFR_ASSERTD (th != 0);
++              cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */
++            }
+           /* cy cannot be zero, since the most significant bit of Xh is 1,
+              and the correction is bounded by 2^{-h+3} */
+           MPFR_ASSERTD(cy == 0);
+diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
+--- mpfr-3.0.1-a/version.c	2011-04-12 10:50:02.000000000 +0000
++++ mpfr-3.0.1-b/version.c	2011-05-04 11:18:33.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.0.1-p1";
++  return "3.0.1-p2";
+ }
+diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
+--- mpfr-3.0.1-a/PATCHES	2011-05-05 00:00:35.000000000 +0000
++++ mpfr-3.0.1-b/PATCHES	2011-05-05 00:00:35.000000000 +0000
+@@ -0,0 +1 @@
++atan-expo-range
+diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
+--- mpfr-3.0.1-a/VERSION	2011-05-04 11:18:33.000000000 +0000
++++ mpfr-3.0.1-b/VERSION	2011-05-05 00:00:35.000000000 +0000
+@@ -1 +1 @@
+-3.0.1-p2
++3.0.1-p3
+diff -Naurd mpfr-3.0.1-a/atan.c mpfr-3.0.1-b/atan.c
+--- mpfr-3.0.1-a/atan.c	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/atan.c	2011-05-05 00:00:35.000000000 +0000
+@@ -431,5 +431,5 @@
+   MPFR_GROUP_CLEAR (group);
+ 
+   MPFR_SAVE_EXPO_FREE (expo);
+-  return mpfr_check_range (arctgt, inexact, rnd_mode);
++  return mpfr_check_range (atan, inexact, rnd_mode);
+ }
+diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
+--- mpfr-3.0.1-a/mpfr.h	2011-05-04 11:18:33.000000000 +0000
++++ mpfr-3.0.1-b/mpfr.h	2011-05-05 00:00:35.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 0
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.0.1-p2"
++#define MPFR_VERSION_STRING "3.0.1-p3"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.0.1-a/tests/tatan.c mpfr-3.0.1-b/tests/tatan.c
+--- mpfr-3.0.1-a/tests/tatan.c	2011-04-04 10:19:17.000000000 +0000
++++ mpfr-3.0.1-b/tests/tatan.c	2011-05-05 00:00:35.000000000 +0000
+@@ -535,6 +535,52 @@
+   mpfr_clears (a, x, y, (mpfr_ptr) 0);
+ }
+ 
++/* http://websympa.loria.fr/wwsympa/arc/mpfr/2011-05/msg00008.html
++ * Incorrect flags (in debug mode on a 32-bit machine, assertion failure).
++ */
++static void
++reduced_expo_range (void)
++{
++  mpfr_exp_t emin, emax;
++  mpfr_t x, y, ex_y;
++  int inex, ex_inex;
++  unsigned int flags, ex_flags;
++
++  emin = mpfr_get_emin ();
++  emax = mpfr_get_emax ();
++
++  mpfr_inits2 (12, x, y, ex_y, (mpfr_ptr) 0);
++  mpfr_set_str (x, "0.1e-5", 2, MPFR_RNDN);
++
++  mpfr_set_emin (-5);
++  mpfr_set_emax (-5);
++  mpfr_clear_flags ();
++  inex = mpfr_atan (y, x, MPFR_RNDN);
++  flags = __gmpfr_flags;
++  mpfr_set_emin (emin);
++  mpfr_set_emax (emax);
++
++  mpfr_set_str (ex_y, "0.1e-5", 2, MPFR_RNDN);
++  ex_inex = 1;
++  ex_flags = MPFR_FLAGS_INEXACT;
++
++  if (SIGN (inex) != ex_inex || flags != ex_flags ||
++      ! mpfr_equal_p (y, ex_y))
++    {
++      printf ("Error in reduced_expo_range\non x = ");
++      mpfr_dump (x);
++      printf ("Expected y = ");
++      mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN);
++      printf ("\n         inex = %d, flags = %u\n", ex_inex, ex_flags);
++      printf ("Got      y = ");
++      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
++      printf ("\n         inex = %d, flags = %u\n", SIGN (inex), flags);
++      exit (1);
++    }
++
++  mpfr_clears (x, y, ex_y, (mpfr_ptr) 0);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -546,6 +592,7 @@
+   smallvals_atan2 ();
+   atan2_bug_20071003 ();
+   atan2_different_prec ();
++  reduced_expo_range ();
+ 
+   test_generic_atan  (2, 200, 17);
+   test_generic_atan2 (2, 200, 17);
+diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
+--- mpfr-3.0.1-a/version.c	2011-05-04 11:18:33.000000000 +0000
++++ mpfr-3.0.1-b/version.c	2011-05-05 00:00:35.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.0.1-p2";
++  return "3.0.1-p3";
+ }
+diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
+--- mpfr-3.0.1-a/PATCHES	2011-05-09 14:48:24.000000000 +0000
++++ mpfr-3.0.1-b/PATCHES	2011-05-09 14:48:24.000000000 +0000
+@@ -0,0 +1 @@
++texp-zero
+diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
+--- mpfr-3.0.1-a/VERSION	2011-05-05 00:00:35.000000000 +0000
++++ mpfr-3.0.1-b/VERSION	2011-05-09 14:48:24.000000000 +0000
+@@ -1 +1 @@
+-3.0.1-p3
++3.0.1-p4
+diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
+--- mpfr-3.0.1-a/mpfr.h	2011-05-05 00:00:35.000000000 +0000
++++ mpfr-3.0.1-b/mpfr.h	2011-05-09 14:48:24.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 0
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.0.1-p3"
++#define MPFR_VERSION_STRING "3.0.1-p4"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.0.1-a/tests/texp.c mpfr-3.0.1-b/tests/texp.c
+--- mpfr-3.0.1-a/tests/texp.c	2011-04-04 10:19:17.000000000 +0000
++++ mpfr-3.0.1-b/tests/texp.c	2011-05-09 14:48:24.000000000 +0000
+@@ -170,7 +170,9 @@
+       mpfr_set_prec (x, prec);
+       mpfr_set_prec (y, prec);
+       mpfr_set_prec (z, prec);
+-      mpfr_urandomb (x, RANDS);
++      do
++        mpfr_urandomb (x, RANDS);
++      while (MPFR_IS_ZERO (x));  /* 0 is handled by mpfr_exp only */
+       rnd = RND_RAND ();
+       mpfr_exp_2 (y, x, rnd);
+       mpfr_exp_3 (z, x, rnd);
+diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
+--- mpfr-3.0.1-a/version.c	2011-05-05 00:00:35.000000000 +0000
++++ mpfr-3.0.1-b/version.c	2011-05-09 14:48:24.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.0.1-p3";
++  return "3.0.1-p4";
+ }
diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install
new file mode 100644
index 000000000..d6dd0475b
--- /dev/null
+++ b/testing/mpfr/mpfr.install
@@ -0,0 +1,20 @@
+info_dir=usr/share/info
+info_files=(mpfr.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
diff --git a/staging/msmtp/PKGBUILD b/testing/msmtp/PKGBUILD
index 4162e392c..44d3e6209 100644
--- a/staging/msmtp/PKGBUILD
+++ b/testing/msmtp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=msmtp
 pkgver=1.4.24
 pkgrel=3
 pkgdesc="A mini smtp client"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://msmtp.sourceforge.net"
 depends=('gnutls' 'libidn')
diff --git a/staging/msmtp/msmtp.install b/testing/msmtp/msmtp.install
index c4dd76476..c4dd76476 100644
--- a/staging/msmtp/msmtp.install
+++ b/testing/msmtp/msmtp.install
diff --git a/staging/nettle/PKGBUILD b/testing/nettle/PKGBUILD
index 632b018f1..e079a16f8 100644
--- a/staging/nettle/PKGBUILD
+++ b/testing/nettle/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nettle
 pkgver=2.2
 pkgrel=1
 pkgdesc="A low-level cryptographic library"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.lysator.liu.se/~nisse/nettle/"
 license=('GPL2')
 install=$pkgname.install
diff --git a/staging/nettle/nettle.install b/testing/nettle/nettle.install
index 3d19b5f19..3d19b5f19 100644
--- a/staging/nettle/nettle.install
+++ b/testing/nettle/nettle.install
diff --git a/testing/ppl/PKGBUILD b/testing/ppl/PKGBUILD
new file mode 100644
index 000000000..6d0c7cfc1
--- /dev/null
+++ b/testing/ppl/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 135489 2011-08-14 09:37:40Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: ezzetabi <ezzetabi at gawab dot com>
+
+pkgname=ppl
+pkgver=0.11.2
+pkgrel=2
+pkgdesc="A modern library for convex polyhedra and other numerical abstractions."
+arch=('i686' 'x86_64')
+url="http://www.cs.unipr.it/ppl"
+license=('GPL3')
+depends=('gmp>=5.0')
+options=('!docs' '!libtool')
+source=(http://www.cs.unipr.it/ppl/Download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz)
+md5sums=('ce014f153a28006009db207ca953a984')
+
+build() {
+  cd $srcdir/ppl-$pkgver
+  ./configure --prefix=/usr --enable-interfaces="c,cxx"
+  make
+}
+
+check() {
+  cd $srcdir/ppl-$pkgver
+  make check
+}
+
+package() {
+  cd $srcdir/ppl-$pkgver
+  make DESTDIR=$pkgdir install
+}
+
diff --git a/testing/qemu-kvm/65-kvm.rules b/testing/qemu-kvm/65-kvm.rules
new file mode 100644
index 000000000..c2f7317aa
--- /dev/null
+++ b/testing/qemu-kvm/65-kvm.rules
@@ -0,0 +1 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/testing/qemu-kvm/PKGBUILD b/testing/qemu-kvm/PKGBUILD
new file mode 100644
index 000000000..604d55da4
--- /dev/null
+++ b/testing/qemu-kvm/PKGBUILD
@@ -0,0 +1,58 @@
+# $Id: PKGBUILD 135315 2011-08-12 16:52:46Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=qemu-kvm
+pkgver=0.15.0
+pkgrel=2
+pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
+arch=(i686 x86_64)
+license=('GPL2' 'LGPL2.1')
+url="http://www.linux-kvm.org"
+depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng')
+makedepends=('texi2html' 'perl' 'python2')
+backup=('etc/qemu/target-x86_64.conf')
+install=qemu-kvm.install
+conflicts=('qemu')
+provides=('qemu')
+replaces=('kvm')
+source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz
+        65-kvm.rules)
+options=(!strip)
+
+build()
+{
+    cd ${srcdir}/${pkgname}-${pkgver}
+    # fix esound building
+    ./configure --prefix=/usr \
+                --python=/usr/bin/python2 \
+                --sysconfdir=/etc \
+                --audio-drv-list=alsa,sdl,oss \
+                --audio-card-list=ac97,sb16,es1370,hda \
+                --enable-docs
+    make
+}
+package()
+{
+    cd ${srcdir}/${pkgname}-${pkgver}
+    make DESTDIR=${pkgdir} install
+    # symbolic link for backwards compatibility
+    ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu-kvm
+    # symbolic link for to qemu binary for emulator apps
+    ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu
+    # symbolic link for to qemu binary for emulator apps
+    ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/kvm
+    # fix man page
+    mv ${pkgdir}/usr/share/man/man1/qemu.1 \
+                     ${pkgdir}/usr/share/man/man1/qemu-kvm.1
+    # install udev rules
+    install -D -m644 ${srcdir}/65-kvm.rules \
+                     ${pkgdir}/lib/udev/rules.d/65-kvm.rules
+    # strip scripts directory
+    find ${pkgdir}/usr/bin  -type f -perm -u+w 2>/dev/null | while read binary ; do
+      case "$(file -bi "$binary")" in
+        *application/x-executable*) # Binaries
+        /usr/bin/strip $STRIP_BINARIES "$binary";;
+      esac
+    done
+}
+md5sums=('b45b0deebba4ce47dcaaab3807f6ed47'
+         'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/testing/qemu-kvm/qemu-kvm.install b/testing/qemu-kvm/qemu-kvm.install
new file mode 100644
index 000000000..84aa773b9
--- /dev/null
+++ b/testing/qemu-kvm/qemu-kvm.install
@@ -0,0 +1,16 @@
+post_install() {
+  groupadd kvm -f -g 78
+  echo ">>> PLEASE READ FOR KVM USAGE!"
+  echo ">>>  Load the correct KVM module, you will need a KVM capable CPU!"
+  echo ">>>  Add yourself to the group 'kvm'."
+  echo ">>>  Use 'qemu-kvm -enable-kvm' to use KVM."
+  echo ""
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  groupdel kvm
+}
diff --git a/testing/qemu/65-kvm.rules b/testing/qemu/65-kvm.rules
new file mode 100644
index 000000000..c2f7317aa
--- /dev/null
+++ b/testing/qemu/65-kvm.rules
@@ -0,0 +1 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/testing/qemu/PKGBUILD b/testing/qemu/PKGBUILD
new file mode 100644
index 000000000..0fbbd0d46
--- /dev/null
+++ b/testing/qemu/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 135352 2011-08-13 06:11:28Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=qemu
+pkgver=0.15.0
+pkgrel=2
+pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
+arch=('i686' 'x86_64')
+license=('GPL2' 'LGPL2.1')
+url="http://wiki.qemu.org/Index.html"
+makedepends=('texi2html' 'perl' 'python2')
+depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl')
+backup=('etc/qemu/target-x86_64.conf')
+install=qemu.install
+source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz
+        65-kvm.rules)
+options=(!strip)
+
+build()
+{
+  cd ${srcdir}/${pkgname}-${pkgver}
+  sed -i -e 's/lib64/lib/g' x86_64.ld
+  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl \
+              --python=/usr/bin/python2 \
+              --audio-card-list=ac97,sb16,es1370,hda \
+              --enable-docs
+              make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -D -m644 ${srcdir}/65-kvm.rules \
+                   ${pkgdir}/lib/udev/rules.d/65-kvm.rules
+  # strip scripts directory
+    find ${pkgdir}/usr/src/linux-${_kernver}/scripts  -type f -perm -u+w 2>/dev/null | while read binary ; do
+      case "$(file -bi "$binary")" in
+        *application/x-executable*) # Binaries
+        /usr/bin/strip $STRIP_BINARIES "$binary";;
+      esac
+    done
+
+}
+md5sums=('dbc55b014bcd21b98e347f6a90f7fb6d'
+         'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/testing/qemu/qemu.install b/testing/qemu/qemu.install
new file mode 100644
index 000000000..e16ac027c
--- /dev/null
+++ b/testing/qemu/qemu.install
@@ -0,0 +1,24 @@
+# kvm:  the new package version
+post_install() {
+  #
+  groupadd kvm -f -g 78
+  echo ">>> PLEASE READ FOR KVM USAGE!"
+  echo ">>>  Load the correct KVM module, you will need a KVM capable CPU!"
+  echo ">>>  Add yourself to the group 'kvm'."
+  echo ">>>  Use 'qemu -enable-kvm' to use KVM."
+  echo ""
+  if [ "$(vercmp $2 0.11)" -lt 0 ]; then
+    echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
+    echo "is no longer supported and will be removed from the repositories. You"
+    echo "can safely uninstall it from your system."
+  fi
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  #
+  groupdel kvm
+}
diff --git a/testing/samba/PKGBUILD b/testing/samba/PKGBUILD
new file mode 100644
index 000000000..2343a7aa5
--- /dev/null
+++ b/testing/samba/PKGBUILD
@@ -0,0 +1,138 @@
+# $Id: PKGBUILD 135295 2011-08-12 10:01:24Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+pkgbase=samba
+pkgname=('smbclient' 'samba')
+pkgver=3.6.0
+# We use the 'A' to fake out pacman's version comparators.  Samba chooses
+# to append 'a','b',etc to their subsequent releases, which pamcan
+# misconstrues as alpha, beta, etc.  Bad samba!
+_realver=3.6.0
+pkgrel=1
+arch=(i686 x86_64)
+url="http://www.samba.org"
+license=('GPL3')
+makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb')
+options=(!makeflags)
+source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
+        samba samba.logrotate
+        swat.xinetd
+        samba.pam
+        samba.conf.d
+        fix-ipv6-mount.patch)
+### UNINSTALL dmapi package before building!!!
+
+build() {
+  cd ${srcdir}/${pkgbase}-${_realver}/source3
+  ./configure --prefix=/usr \
+              --libdir=/usr/lib/ \
+              --localstatedir=/var \
+              --with-configdir=/etc/samba \
+              --with-lockdir=/var/cache/samba \
+              --with-piddir=/var/run/samba \
+              --with-fhs \
+              --with-pam \
+              --with-pam_smbpass \
+              --with-pammodulesdir=/lib/security \
+              --with-ads \
+              --with-acl-support \
+              --with-cifsmount \
+              --with-libsmbclient \
+              --with-syslog \
+              --enable-external-libtalloc \
+              --disable-dnssd \
+              --disable-avahi \
+              --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \
+              --enable-external-libtdb
+  make
+}
+
+package_smbclient () {
+pkgdesc="Tools to access a server's filespace and printers via SMB"
+depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc')
+  cd ${srcdir}/${pkgbase}-${_realver}/source3
+  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
+  install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/
+  for i in libnetapi* libwbclient* libsmbclient*;do
+      cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
+  done
+  install -m755 script/smbtar ${pkgdir}/usr/bin/
+  mkdir -p ${pkgdir}/usr/lib/cups/backend
+  ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
+  mkdir -p ${pkgdir}/usr/include
+  install -m644 include/libsmbclient.h ${pkgdir}/usr/include/
+  install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/
+  mkdir -p ${pkgdir}/usr/share/man/man{1,7}
+  for man in rpcclient smbcacls smbclient smbcquotas smbget \
+      smbtree smbtar nmblookup; do
+      install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/
+  done
+  install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/
+}
+
+package_samba () {
+pkgdesc="Tools to access a server's filespace and printers via SMB"
+backup=(etc/logrotate.d/samba
+        etc/pam.d/samba
+        etc/samba/smb.conf
+        etc/xinetd.d/swat
+        etc/conf.d/samba)
+depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
+  cd ${srcdir}/samba-${_realver}/source3
+  mkdir -p ${pkgdir}/etc/samba/private
+  chmod 700 ${pkgdir}/etc/samba/private
+  make DESTDIR=${pkgdir} install
+  chmod 644 ${pkgdir}/usr/include/*.h
+  rm -rf ${pkgdir}/usr/var
+  (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
+  install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba
+  install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba
+  mkdir -p ${pkgdir}/etc/samba
+  cat ../examples/smb.conf.default | \
+    sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default
+  install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba
+  install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat
+  install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba
+  # spool directory
+  install -d -m1777 ${pkgdir}/var/spool/samba
+  sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default
+  # fix logrotate
+  sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default
+  # nsswitch libraries
+  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so
+  ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2
+  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so
+  # remove conflict files of smbclient
+  for man in libsmbclient smbspool \
+      mount.cifs net cifs.upcall; do
+      rm -f ${pkgdir}/usr/share/man/man8/${man}.8
+  done
+  for i in libnetapi* libwbclient* libsmbclient*;do
+      rm -f ${pkgdir}/usr/lib/$i
+  done
+  for bin in net \
+      nmblookup rpcclient smbcacls smbclient \
+      smbcquotas smbget smbspool smbtar smbtree; do
+      rm -f ${pkgdir}/usr/bin/$bin
+  done
+  rm -f ${pkgdir}/usr/sbin/cifs.upcall
+  rm -f ${pkgdir}/usr/include/netapi.h
+  for man in rpcclient smbcacls smbclient smbcquotas \
+      smbtree smbtar nmblookup smbget; do
+      rm -f ${pkgdir}/usr/share/man/man1/${man}.1
+  done
+  for man in tdbbackup tdbdump tdbtool; do
+      rm -f ${pkgdir}/usr/share/man/man8/${man}.8
+  done
+  rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7
+  rm -f ${pkgdir}/usr/include/libsmbclient.h
+  # copy ldap example
+  install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
+}
+md5sums=('e297e0ea7923c7de8d7c1d8fd0ec0a05'
+         'a3da19515a234c703876cf850c44e996'
+         '5697da77590ec092cc8a883bae06093c'
+         'a4bbfa39fee95bba2e7ad6b535fae7e6'
+         '96f82c38f3f540b53f3e5144900acf17'
+         'f2f2e348acd1ccb566e95fa8a561b828'
+         'c6a38a8c8fa24979e6217aed533358ea')
diff --git a/testing/samba/fix-ipv6-mount.patch b/testing/samba/fix-ipv6-mount.patch
new file mode 100644
index 000000000..89bef6533
--- /dev/null
+++ b/testing/samba/fix-ipv6-mount.patch
@@ -0,0 +1,11 @@
+--- client/mount.cifs.c.orig	2010-03-03 13:42:02.143936727 +1000
++++ client/mount.cifs.c	2010-03-04 01:53:22.752879004 +1000
+@@ -1563,7 +1563,7 @@
+ 		}
+ 	}
+
+-	if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
++	if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
+ 		strlcat(options, "%", options_size);
+ 		current_len = strnlen(options, options_size);
+ 		optionstail = options + current_len; 
diff --git a/testing/samba/samba b/testing/samba/samba
new file mode 100755
index 000000000..458eb8e2b
--- /dev/null
+++ b/testing/samba/samba
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba
+
+[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd)
+
+case "$1" in
+	start)
+		rc=0
+		stat_busy "Starting Samba Server"
+		if [ ! -x /var/run/samba ] ; then
+			install -m755 -g 81 -o 81 -d /var/run/samba
+		fi
+                if [ ! -x /var/log/samba ] ; then
+                        install -m755 -g 81 -o 81 -d /var/log/samba
+                fi
+		for d in ${SAMBA_DAEMONS[@]}; do
+			PID=`pidof -o %PPID /usr/sbin/$d`
+			[ -z "$PID" ] && /usr/sbin/$d -D
+			rc=$(($rc+$?))
+		done
+		if [ $rc -gt 0 ]; then
+			stat_fail
+		else
+			add_daemon samba
+			stat_done
+		fi
+	;;
+	stop)
+		rc=0
+		stat_busy "Stopping Samba Server"
+		for d in ${SAMBA_DAEMONS[@]}; do
+			PID=`pidof -o %PPID /usr/sbin/$d`
+			[ -z "$PID" ] || kill $PID &> /dev/null
+			rc=$(($rc+$?))
+		done
+		if [ $rc -gt 0 ]; then
+			stat_fail
+		else
+			rm /var/run/samba/smbd.pid &>/dev/null
+			rm /var/run/samba/nmbd.pid &>/dev/null
+			rm /var/run/samba/winbindd.pid &>/dev/null
+			rm_daemon samba
+			stat_done
+		fi
+	;;
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+	;;
+	*)
+		echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/testing/samba/samba.conf.d b/testing/samba/samba.conf.d
new file mode 100644
index 000000000..8721f956a
--- /dev/null
+++ b/testing/samba/samba.conf.d
@@ -0,0 +1,7 @@
+#
+# Configuration for the samba init script
+#
+
+# space separated list of daemons to launch
+SAMBA_DAEMONS=(smbd nmbd)
+#SAMBA_DAEMONS=(smbd nmbd winbindd)
diff --git a/testing/samba/samba.logrotate b/testing/samba/samba.logrotate
new file mode 100644
index 000000000..581f4c33b
--- /dev/null
+++ b/testing/samba/samba.logrotate
@@ -0,0 +1,9 @@
+/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log {
+   notifempty
+   missingok
+   sharedscripts
+   copytruncate
+   postrotate
+      /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true
+   endscript
+}
diff --git a/testing/samba/samba.pam b/testing/samba/samba.pam
new file mode 100644
index 000000000..53724d1f8
--- /dev/null
+++ b/testing/samba/samba.pam
@@ -0,0 +1,3 @@
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so
diff --git a/testing/samba/swat.xinetd b/testing/samba/swat.xinetd
new file mode 100644
index 000000000..2e62a82b2
--- /dev/null
+++ b/testing/samba/swat.xinetd
@@ -0,0 +1,10 @@
+service swat
+{
+        socket_type             = stream
+        wait                    = no
+        user                    = root
+        server                  = /usr/sbin/swat
+        log_on_success  += HOST DURATION
+        log_on_failure  += HOST
+        disable                 = yes
+}
diff --git a/staging/vino/PKGBUILD b/testing/vino/PKGBUILD
index 1c4308861..ddd37f61e 100644
--- a/staging/vino/PKGBUILD
+++ b/testing/vino/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=vino
 pkgver=3.0.3
 pkgrel=2
 pkgdesc="a VNC server for the GNOME desktop"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils')
 makedepends=('intltool' 'networkmanager')
diff --git a/staging/vino/vino.install b/testing/vino/vino.install
index 469266843..469266843 100644
--- a/staging/vino/vino.install
+++ b/testing/vino/vino.install
diff --git a/staging/vlc/PKGBUILD b/testing/vlc/PKGBUILD
index 81309310e..c7d6642bf 100644
--- a/staging/vlc/PKGBUILD
+++ b/testing/vlc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=vlc
 pkgver=1.1.11
 pkgrel=4
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('GPL')
 depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
diff --git a/staging/vlc/vlc.install b/testing/vlc/vlc.install
index 4a1091bc5..4a1091bc5 100644
--- a/staging/vlc/vlc.install
+++ b/testing/vlc/vlc.install
diff --git a/testing/vpnc/PKGBUILD b/testing/vpnc/PKGBUILD
new file mode 100644
index 000000000..04ee61cfc
--- /dev/null
+++ b/testing/vpnc/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 135374 2011-08-13 09:06:19Z thomas $
+# Maintainer: Thomas Baechler <thomas@archlinux.org>
+
+pkgname=vpnc
+pkgver=0.5.3
+pkgrel=4
+pkgdesc="VPN client for cisco3000 VPN Concentrators"
+url="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
+license=('GPL')
+depends=('libgcrypt' 'openssl' 'iproute2' 'net-tools')
+optdepends=('openresolv: Let vpnc manage resolv.conf')
+arch=('i686' 'x86_64')
+source=("http://www.unix-ag.uni-kl.de/~massar/vpnc/$pkgname-$pkgver.tar.gz"
+        'vpnc.conf'
+        'vpnc.rc'
+        fix-iproute-syntax.patch)
+backup=('etc/vpnc/default.conf')
+md5sums=('4378f9551d5b077e1770bbe09995afb3'
+         'a3f4e0cc682f437e310a1c86ae198e45'
+         'c5885162ac198eaa36da9a01e7c0c55b'
+         '193a35773594667a2782701aff372551')
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  # Build hybrid support
+  sed -i 's|^#OPENSSL|OPENSSL|g' Makefile
+  
+  # Fix vpnc-script
+  sed 's|/sbin/resolvconf|/usr/sbin/resolvconf|g' -i vpnc-script.in
+  patch -p1 -i "${srcdir}"/fix-iproute-syntax.patch
+
+  make PREFIX=/usr
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" PREFIX=/usr install
+
+  install -D -m644 "${srcdir}"/vpnc.conf "${pkgdir}"/etc/vpnc/default.conf
+  install -D -m755 "${srcdir}"/vpnc.rc "${pkgdir}"/etc/rc.d/vpnc
+  rm -f "${pkgdir}"/etc/vpnc/vpnc.conf
+}
diff --git a/testing/vpnc/fix-iproute-syntax.patch b/testing/vpnc/fix-iproute-syntax.patch
new file mode 100644
index 000000000..9cba4bec3
--- /dev/null
+++ b/testing/vpnc/fix-iproute-syntax.patch
@@ -0,0 +1,26 @@
+From a1cac186f66d0f2e8b1dce67e648aae4219c3013 Mon Sep 17 00:00:00 2001
+From: Alessandro Suardi <alessandro.suardi@gmail.com>
+Date: Sat, 28 May 2011 23:20:15 +0100
+Subject: [PATCH 1/1] Cope with new kernel/iproute including ipid in route list
+
+Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+---
+ vpnc-script |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/vpnc-script b/vpnc-script
+index cc62997..e0140c5 100755
+--- a/vpnc-script.in
++++ b/vpnc-script.in
+@@ -139,7 +139,7 @@ destroy_tun_device() {
+ 
+ if [ -n "$IPROUTE" ]; then
+ 	fix_ip_get_output () {
+-		sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g'
++		sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g;s/ipid 0x....//g'
+ 	}
+ 
+ 	set_vpngateway_route() {
+-- 
+1.7.3.4
+
diff --git a/testing/vpnc/vpnc.conf b/testing/vpnc/vpnc.conf
new file mode 100644
index 000000000..914f827fd
--- /dev/null
+++ b/testing/vpnc/vpnc.conf
@@ -0,0 +1,17 @@
+# example vpnc configuration file
+# see vpnc --long-help for details
+
+#Interface name tun0 
+#IKE DH Group dh2
+#Perfect Forward Secrecy nopfs
+
+# You may replace this script with something better
+#Script /etc/vpnc/vpnc-script
+# Enable this option for NAT traversal
+#UDP Encapsulate
+
+#IPSec gateway my.gateway.com
+#IPSec ID someid
+#IPSec secret somesecret
+#Xauth username myusername
+#Xauth password mypassword
diff --git a/extra/esound/esd b/testing/vpnc/vpnc.rc
index d90ef55fa..972ed3211 100755..100644
--- a/extra/esound/esd
+++ b/testing/vpnc/vpnc.rc
@@ -3,27 +3,24 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/bin/esd`
 case "$1" in
   start)
-    stat_busy "Starting Esound Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/bin/esd -nobeeps &
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
+    stat_busy "Connecting to VPN"
+    /usr/sbin/vpnc
+    if [ $? -gt 0 ]; then
       stat_fail
     else
-      add_daemon esd
+      add_daemon vpnc
       stat_done
     fi
     ;;
   stop)
-    stat_busy "Stopping Esound Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    stat_busy "Disconnecting from VPN"
+    /usr/sbin/vpnc-disconnect
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      rm_daemon esd
+      rm_daemon vpnc
       stat_done
     fi
     ;;
@@ -35,3 +32,4 @@ case "$1" in
   *)
     echo "usage: $0 {start|stop|restart}"  
 esac
+exit 0
diff --git a/staging/weechat/PKGBUILD b/testing/weechat/PKGBUILD
index 7efbd6806..6e53c7d86 100644
--- a/staging/weechat/PKGBUILD
+++ b/testing/weechat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=weechat
 pkgver=0.3.5
 pkgrel=3
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.weechat.org/"
 license=('GPL')
 depends=('gnutls')
diff --git a/testing/wget/PKGBUILD b/testing/wget/PKGBUILD
deleted file mode 100644
index 32fab8910..000000000
--- a/testing/wget/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 135027 2011-08-09 21:59:45Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=wget
-pkgver=1.13
-pkgrel=1
-pkgdesc="A network utility to retrieve files from the Web"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnu.org/software/wget/wget.html"
-license=('GPL3')
-groups=('base')
-depends=('glibc' 'openssl')
-optdepends=('ca-certificates: HTTPS downloads')
-backup=('etc/wgetrc')
-install=wget.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('48c5384123156e7b7501d2f5b5c7189a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Note : We do not build with --enable-nls, because there is a bug in wget causing
-  # international domain names to be not properly converted to punycode if
-  # the current locale is a UTF-8 one
-  # See : http://lists.gnu.org/archive/html/bug-wget/2011-02/msg00026.html
-
-  ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  cat >> "$pkgdir/etc/wgetrc" <<EOF
-
-# default root certs location
-ca_certificate=/etc/ssl/certs/ca-certificates.crt
-EOF
-
-  # remove IRI option from wgetrc as it does not work (see above)
-  sed -i '118,120d' $pkgdir/etc/wgetrc
-
-}
diff --git a/staging/wireshark/PKGBUILD b/testing/wireshark/PKGBUILD
index 2f39f312a..66b2f859c 100644
--- a/staging/wireshark/PKGBUILD
+++ b/testing/wireshark/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=(wireshark-cli wireshark-gtk)
 pkgbase=wireshark
 pkgver=1.6.1
 pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'lua')
 url="http://www.wireshark.org/"
diff --git a/staging/wireshark/wireshark-gtk.install b/testing/wireshark/wireshark-gtk.install
index 6b1b64bdd..6b1b64bdd 100644
--- a/staging/wireshark/wireshark-gtk.install
+++ b/testing/wireshark/wireshark-gtk.install
diff --git a/staging/wireshark/wireshark.install b/testing/wireshark/wireshark.install
index 6585ba272..6585ba272 100644
--- a/staging/wireshark/wireshark.install
+++ b/testing/wireshark/wireshark.install
diff --git a/staging/xfce4-mailwatch-plugin/PKGBUILD b/testing/xfce4-mailwatch-plugin/PKGBUILD
index 552175317..4a992bd09 100644
--- a/staging/xfce4-mailwatch-plugin/PKGBUILD
+++ b/testing/xfce4-mailwatch-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-mailwatch-plugin
 pkgver=1.1.0
 pkgrel=4
 pkgdesc="A mailbox watch/check plugin for the Xfce4 panel"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 license=('GPL2')
 url="http://spurint.org/projects/xfce4-mailwatch-plugin/"
 groups=('xfce4-goodies')
diff --git a/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch b/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch
index ada0df041..ada0df041 100644
--- a/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch
+++ b/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch
diff --git a/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install b/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install
index 21b79d2d4..21b79d2d4 100644
--- a/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install
+++ b/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install
diff --git a/staging/xmlsec/PKGBUILD b/testing/xmlsec/PKGBUILD
index 273a4075e..c15a0ac98 100644
--- a/staging/xmlsec/PKGBUILD
+++ b/testing/xmlsec/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.2.18
 pkgrel=2
 pkgdesc="XML Security Library is a C library based on LibXML2"
 license=('custom')
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://www.aleksey.com/xmlsec/index.html"
 depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls' 'nss>=3.12.10' 'libtool')
 makedepends=('pkgconfig')
diff --git a/testing/zlib/PKGBUILD b/testing/zlib/PKGBUILD
new file mode 100644
index 000000000..49d3001de
--- /dev/null
+++ b/testing/zlib/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 135477 2011-08-14 09:25:17Z allan $
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=zlib
+pkgver=1.2.5
+pkgrel=4
+pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://www.zlib.net/"
+depends=('glibc')
+options=('!makeflags')
+source=("http://zlib.net/zlib-${pkgver}.tar.gz"
+        'zlib-1.2.5-lfs-decls.patch')
+md5sums=('c735eab2d659a96e5a594c9e8541ad63'
+         '4cb279ea3beab621f3526bf7b7ab99e5')
+
+build() {
+	cd ${srcdir}/zlib-$pkgver
+	# see http://bugs.archlinux.org/task/19280
+	patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch
+	# work around gcc bug; see https://bugs.archlinux.org/task/20647
+	export CFLAGS="${CFLAGS/-O2/-O3} -fno-tree-vectorize -DUNALIGNED_OK"
+	./configure --prefix=/usr
+	make
+
+	grep -A 24 '^  Copyright' zlib.h > LICENSE
+}
+
+check() {
+	cd ${srcdir}/zlib-$pkgver
+	make check
+}
+
+package() {
+	cd ${srcdir}/zlib-$pkgver
+	make install DESTDIR=${pkgdir}
+	install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/zlib/LICENSE
+}
diff --git a/testing/zlib/zlib-1.2.5-lfs-decls.patch b/testing/zlib/zlib-1.2.5-lfs-decls.patch
new file mode 100644
index 000000000..36e26af03
--- /dev/null
+++ b/testing/zlib/zlib-1.2.5-lfs-decls.patch
@@ -0,0 +1,13 @@
+Index: zlib-1.2.5/zlib.h
+===================================================================
+--- zlib-1.2.5.orig/zlib.h
++++ zlib-1.2.5/zlib.h
+@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
+ #  define gzoffset gzoffset64
+ #  define adler32_combine adler32_combine64
+ #  define crc32_combine crc32_combine64
+-#  ifdef _LARGEFILE64_SOURCE
++#  ifndef _LARGEFILE64_SOURCE
+      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
author	Joshua Ismael Haase Hernández <hahj87@gmail.com>	2011-08-16 09:15:21 -0500
committer	Joshua Ismael Haase Hernández <hahj87@gmail.com>	2011-08-16 09:15:21 -0500
commit	62225296a3577815866985bce97b1173a236df0c (patch)
tree	600925f71231cb677773e15f08b86b37eac245bf
parent	1ef7f9b567946775e54dfe3b06258d53cdc889f5 (diff)
parent	3de3a024e4363dffac1dd89c5d8ad6ecdeb6794e (diff)