201 files changed, 8437 insertions, 581 deletions
diff --git a/community-testing/blender/PKGBUILD b/community-testing/blender/PKGBUILD
new file mode 100644
index 000000000..20169f8cb
--- /dev/null
+++ b/community-testing/blender/PKGBUILD
@@ -0,0 +1,102 @@
+# $Id: PKGBUILD 66980 2012-03-03 08:10:57Z ibiru $
+# Contributor: John Sowiak <john@archlinux.org>
+# Contributor: tobias <tobias@archlinux.org>
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+
+# 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.62
+pkgrel=2
+epoch=3
+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' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'openimageio')
+makedepends=('cmake' 'boost' 'cuda-toolkit')
+optdepends=('cuda-toolkit: cycles renderer cuda support')
+options=(!strip)
+install=blender.install
+if [ $_svn = false ]; then
+  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
+  md5sums=('f2357584a5081b03f6e60ba3efe2a610')
+else
+  source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
+  md5sums=('7579d1139d0d6025df8afcfca64a65c4')
+fi
+
+# source PKGBUILD && mksource
+mksource() {
+  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
+  _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=ON \
+    -DOPENIMAGEIO_ROOT_DIR:STRING=/usr \
+    -DWITH_GAMEENGINE:BOOL=ON \
+    -DWITH_PLAYER:BOOL=ON \
+    -DWITH_BUILTIN_GLEW:BOOL=OFF \
+    -DWITH_CODEC_FFMPEG:BOOL=ON \
+    -DWITH_CODEC_SNDFILE:BOOL=ON \
+    -DWITH_CYCLES:BOOL=ON \
+    -DWITH_CYCLES_CUDA_BINARIES:BOOL=ON \
+    -DCUDA_TOOLKIT_ROOT_DIR:STRING=/opt/cuda-toolkit/ \
+    -DWITH_FFTW3:BOOL=ON \
+    -DWITH_MOD_OCEANSIM: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/community-testing/blender/blender.install b/community-testing/blender/blender.install
new file mode 100644
index 000000000..724bfce00
--- /dev/null
+++ b/community-testing/blender/blender.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community-testing/cclive/PKGBUILD b/community-testing/cclive/PKGBUILD
new file mode 100644
index 000000000..77f2561c6
--- /dev/null
+++ b/community-testing/cclive/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 66982 2012-03-03 08:11:02Z ibiru $
+# 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.8
+pkgrel=3
+pkgdesc='Commandline downloader for popular video websites.'
+arch=('i686' 'x86_64')
+url='http://cclive.sourceforge.net/'
+license=('GPL3')
+depends=('boost-libs' 'pcre' 'curl' 'libquvi')
+makedepends=('boost')
+source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz")
+md5sums=('01ffbe54e48440721b3c283c993928f1')
+
+build() {
+  cd "$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community-testing/encfs/PKGBUILD b/community-testing/encfs/PKGBUILD
new file mode 100644
index 000000000..56fb64ce2
--- /dev/null
+++ b/community-testing/encfs/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 66984 2012-03-03 08:11:07Z ibiru $
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
+# Contributor: Sven Kauber, <celeon@gmail.com>
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=encfs
+pkgver=1.7.4
+pkgrel=7
+pkgdesc='Encrypted filesystem in user-space'
+arch=('i686' 'x86_64')
+url='http://www.arg0.net/encfs'
+license=('GPL')
+depends=('rlog' 'openssl' 'fuse' 'boost-libs')
+makedepends=('boost')
+options=('!libtool')
+source=("http://encfs.googlecode.com/files/${pkgname}-${pkgver}.tgz")
+md5sums=('ac90cc10b2e9fc7e72765de88321d617')
+
+build(){
+  cd ${pkgname}-${pkgver}
+
+  ./configure \
+    --prefix=/usr
+
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+}
diff --git a/community-testing/fatrat/PKGBUILD b/community-testing/fatrat/PKGBUILD
new file mode 100644
index 000000000..8a1b86ca7
--- /dev/null
+++ b/community-testing/fatrat/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 66986 2012-03-03 08:11:16Z ibiru $
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+
+pkgname=fatrat
+pkgver=1.2.0_beta1
+pkgrel=4
+pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
+arch=('i686' 'x86_64')
+url="http://fatrat.dolezel.info/"
+license=('GPL')
+depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net' 'qtwebkit')
+optdepends=('geoip: GeoIP support')
+makedepends=('boost' 'cmake' 'java-environment')
+source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz)
+md5sums=('7ce4d5e6318361f36ba5ac86a5755da9')
+
+build() {
+  cd $pkgname-$pkgver
+
+  . /etc/profile.d/jre.sh
+  . /etc/profile.d/jdk.sh
+
+  cmake \
+    -DWITH_EVERYTHING=ON \
+    -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS="-lpthread" \
+    -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    .
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/glob2/PKGBUILD b/community-testing/glob2/PKGBUILD
new file mode 100644
index 000000000..4840313d5
--- /dev/null
+++ b/community-testing/glob2/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 66990 2012-03-03 08:11:35Z ibiru $
+# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
+# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
+
+pkgname=glob2
+pkgver=0.9.4.4
+pkgrel=11
+pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units"
+arch=('i686' 'x86_64')
+url="http://www.globulation2.org/"
+license=('GPL3')
+depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa'
+         'fribidi' 'desktop-file-utils')
+makedepends=('scons' 'boost')
+install=glob2.install
+source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz
+	glob2-0.9.4.1-gcc44.patch)
+md5sums=('94c527325f355a29a2807f8f18a6e6a8' 'b13cb1f73ece23bfc6413773678d583e')
+sha1sums=('14aa8d840ef5f95a9af591789082fe2322fa8cad' '3e5ae81d85a727387a7049c3a0dfb3db930391b3')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch"
+  scons BINDIR="${pkgdir}/usr/bin" INSTALLDIR="${pkgdir}/usr/share"
+}
+
+package () {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  scons install
+  find "${pkgdir}/usr/share" -type f -exec chmod 644 '{}' \;
+  install -Dm644 data/icons/glob2-icon-48x48.png "${pkgdir}/usr/share/pixmaps/glob2-icon-48x48.png"
+}
diff --git a/community-testing/glob2/glob2-0.9.4.1-gcc44.patch b/community-testing/glob2/glob2-0.9.4.1-gcc44.patch
new file mode 100644
index 000000000..b425b25ec
--- /dev/null
+++ b/community-testing/glob2/glob2-0.9.4.1-gcc44.patch
@@ -0,0 +1,87 @@
+diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h
+--- libgag/include/StreamBackend.h.orig	2009-03-18 03:46:47.000000000 +0100
++++ libgag/include/StreamBackend.h	2009-06-20 14:21:10.000000000 +0200
+@@ -43,7 +43,7 @@ namespace GAGCore
+ 		virtual void flush(void) = 0;
+ 		virtual void read(void *data, size_t size) = 0;
+ 		virtual void putc(int c) = 0;
+-		virtual int getc(void) = 0;
++		virtual int get_c(void) = 0;
+ 		virtual void seekFromStart(int displacement) = 0;
+ 		virtual void seekFromEnd(int displacement) = 0;
+ 		virtual void seekRelative(int displacement) = 0;
+@@ -67,7 +67,7 @@ namespace GAGCore
+ 		virtual void flush(void) { assert(fp); fflush(fp); }
+ 		virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); }
+ 		virtual void putc(int c) { assert(fp); fputc(c, fp); }
+-		virtual int getc(void) { assert(fp); return fgetc(fp); }
++		virtual int get_c(void) { assert(fp); return fgetc(fp); }
+ 		virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); }
+ 		virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); }
+ 		virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); }
+@@ -92,7 +92,7 @@ namespace GAGCore
+ 		virtual void flush(void);
+ 		virtual void read(void *data, size_t size);
+ 		virtual void putc(int c);
+-		virtual int getc(void);
++		virtual int get_c(void);
+ 		virtual void seekFromStart(int displacement);
+ 		virtual void seekFromEnd(int displacement);
+ 		virtual void seekRelative(int displacement);
+@@ -117,7 +117,7 @@ namespace GAGCore
+ 		virtual void flush(void) { }
+ 		virtual void read(void *data, size_t size);
+ 		virtual void putc(int c);
+-		virtual int getc(void);
++		virtual int get_c(void);
+ 		virtual void seekFromStart(int displacement);
+ 		virtual void seekFromEnd(int displacement);
+ 		virtual void seekRelative(int displacement);
+diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp
+--- libgag/src/StreamBackend.cpp.orig	2009-03-18 03:46:47.000000000 +0100
++++ libgag/src/StreamBackend.cpp	2009-06-20 14:21:53.000000000 +0200
+@@ -75,9 +75,9 @@ namespace GAGCore
+ 		buffer->putc(c);
+ 	}
+ 	
+-	int ZLibStreamBackend::getc(void)
++	int ZLibStreamBackend::get_c(void)
+ 	{
+-		return buffer->getc();
++		return buffer->get_c();
+ 	}
+ 	
+ 	void ZLibStreamBackend::seekFromStart(int displacement)
+@@ -147,7 +147,7 @@ namespace GAGCore
+ 		write(&ch, 1);
+ 	}
+ 	
+-	int MemoryStreamBackend::getc(void)
++	int MemoryStreamBackend::get_c(void)
+ 	{
+ 		Uint8 ch;
+ 		read(&ch, 1);
+diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp
+--- libgag/src/Stream.cpp.orig	2009-03-18 03:46:47.000000000 +0100
++++ libgag/src/Stream.cpp	2009-06-20 14:21:35.000000000 +0200
+@@ -60,7 +60,7 @@ namespace GAGCore
+ 		std::string s;
+ 		while (1)
+ 		{
+-			int c = backend->getc();
++			int c = backend->get_c();
+ 			if(c=='\r')
+ 				continue;
+ 			if ((c >= 0) && (c != '\n'))
+diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp
+--- libgag/src/TextStream.cpp.orig	2009-03-18 03:46:47.000000000 +0100
++++ libgag/src/TextStream.cpp	2009-06-20 14:21:22.000000000 +0200
+@@ -150,7 +150,7 @@ namespace GAGCore
+ 		
+ 		int nextChar(void)
+ 		{
+-			next = stream->getc();
++			next = stream->get_c();
+ 			if 	(next == '\n')
+ 			{
+ 				column = 0;
diff --git a/community-testing/glob2/glob2.install b/community-testing/glob2/glob2.install
new file mode 100644
index 000000000..7463b6e76
--- /dev/null
+++ b/community-testing/glob2/glob2.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+}
+
diff --git a/community-testing/glom/PKGBUILD b/community-testing/glom/PKGBUILD
new file mode 100644
index 000000000..f90bc5f8e
--- /dev/null
+++ b/community-testing/glom/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 66992 2012-03-03 08:11:43Z ibiru $
+# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
+# Contributor: William Rea <sillywilly@gmail.com>
+# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+
+pkgname=glom
+pkgver=1.20.4
+pkgrel=1
+pkgdesc="An easy-to-use database designer and user interface"
+arch=('i686' 'x86_64')
+url="http://www.glom.org/"
+license=('GPL')
+depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql')
+makedepends=('intltool' 'gnome-doc-utils' 'python2-sphinx' 'boost')
+options=('!libtool')
+install=$pkgname.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('038d106313774832c56c61312bb387a54cd2ffff50e6c7e56e47bc98b8b8531b')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr \
+    --with-postgres-utils=/usr/bin \
+    --disable-scrollkeeper \
+    --disable-update-mime-database \
+    --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community-testing/glom/glom.install b/community-testing/glom/glom.install
new file mode 100644
index 000000000..1ad77f9aa
--- /dev/null
+++ b/community-testing/glom/glom.install
@@ -0,0 +1,15 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+  update-mime-database usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+  update-mime-database usr/share/mime > /dev/null
+}
diff --git a/community-testing/gnash/PKGBUILD b/community-testing/gnash/PKGBUILD
new file mode 100644
index 000000000..251a9f65b
--- /dev/null
+++ b/community-testing/gnash/PKGBUILD
@@ -0,0 +1,81 @@
+# $Id: PKGBUILD 66994 2012-03-03 08:11:56Z ibiru $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgbase=gnash
+pkgname=(gnash-common gnash-gtk)
+pkgver=0.8.10
+pkgrel=2
+arch=(i686 x86_64)
+url="http://www.gnu.org/software/gnash/"
+license=(GPL3)
+makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool
+             speex fontconfig ffmpeg
+             gstreamer0.10-base gstreamer0.10-ffmpeg
+             gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf
+             pkgconfig boost)
+options=(!libtool !emptydirs)
+source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2
+        nodebug.patch)
+sha256sums=('9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224'
+            '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551')
+
+build() {
+  cd "$srcdir/gnash-$pkgver"
+
+  # Disable very, very verbose debugging (gigabytes of logs)
+  patch -Np1 -i "$srcdir/nodebug.patch"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-plugins-install=system \
+    --with-npapi-plugindir=/usr/lib/mozilla/plugins \
+    --enable-gui=sdl,gtk,dump \
+    --enable-media=gst,ffmpeg \
+    --enable-renderer=agg,cairo \
+    --enable-device=x11
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make
+}
+
+package_gnash-common() {
+  pkgdesc="A GNU Flash movie player"
+  depends=(curl giflib sdl agg libjpeg libpng libltdl
+           speex fontconfig ffmpeg cairo
+           gstreamer0.10-base gstreamer0.10-ffmpeg
+           boost-libs)
+  backup=(etc/gnashrc etc/gnashthumbnailrc)
+
+  cd "$srcdir/gnash-$pkgver"
+
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+
+  # Split gnash-gtk
+  mkdir -p "$srcdir"/gtk/{etc,usr/{bin,share/man/man1}}
+  mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} \
+    "$srcdir/gtk/usr/bin/"
+  mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 \
+    "$srcdir/gtk/usr/share/man/man1/"
+  mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/usr/share/"
+  mv "$pkgdir"/etc/gnashpluginrc "$srcdir/gtk/etc/"
+}
+
+package_gnash-gtk() {
+  pkgdesc="A GNU Flash movie player"
+  depends=("gnash-common=$pkgver"
+            gtk2 libldap hicolor-icon-theme desktop-file-utils gconf)
+  install=gnash-gtk.install
+  backup=(etc/gnashpluginrc)
+
+  mv "$srcdir"/gtk/* "$pkgdir"
+  
+  cd "$srcdir/gnash-$pkgver"
+  make DESTDIR="$pkgdir" install-plugin
+
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/gnash.schemas" --domain gnash \
+    "$pkgdir"/usr/share/applications/*.schemas
+  rm -f "$pkgdir"/usr/share/applications/*.schemas
+}
diff --git a/community-testing/gnash/gnash-gtk.install b/community-testing/gnash/gnash-gtk.install
new file mode 100644
index 000000000..6678a7f8a
--- /dev/null
+++ b/community-testing/gnash/gnash-gtk.install
@@ -0,0 +1,22 @@
+post_install() {
+  gconfpkg --install gnash
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  pre_remove
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  gconfpkg --uninstall gnash
+}
+
+post_remove() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/community-testing/gnash/nodebug.patch b/community-testing/gnash/nodebug.patch
new file mode 100644
index 000000000..ca160b898
--- /dev/null
+++ b/community-testing/gnash/nodebug.patch
@@ -0,0 +1,48 @@
+diff -u -r gnash-0.8.9/libbase/log.h gnash-0.8.9-nodebug/libbase/log.h
+--- gnash-0.8.9/libbase/log.h	2011-02-26 19:11:08.000000000 +0100
++++ gnash-0.8.9-nodebug/libbase/log.h	2012-01-18 09:39:02.004103494 +0100
+@@ -331,27 +331,27 @@
+ 
+ // Define to 0 to completely remove parse debugging at compile-time
+ #ifndef VERBOSE_PARSE
+-#define VERBOSE_PARSE 1
++#define VERBOSE_PARSE 0
+ #endif
+ 
+ // Define to 0 to completely remove action debugging at compile-time
+ #ifndef VERBOSE_ACTION
+-#define VERBOSE_ACTION 1
++#define VERBOSE_ACTION 0
+ #endif
+ 
+ // Define to 0 to remove ActionScript errors verbosity at compile-time
+ #ifndef VERBOSE_ASCODING_ERRORS
+-#define VERBOSE_ASCODING_ERRORS  1
++#define VERBOSE_ASCODING_ERRORS  0
+ #endif
+ 
+ // Define to 0 this to remove invalid SWF verbosity at compile-time
+ #ifndef VERBOSE_MALFORMED_SWF
+-#define VERBOSE_MALFORMED_SWF 1
++#define VERBOSE_MALFORMED_SWF 0
+ #endif
+ 
+ // Define to 0 this to remove Networking verbosity at compile-time
+ #ifndef VERBOSE_NETWORKING
+-#define VERBOSE_NETWORKING 1
++#define VERBOSE_NETWORKING 0
+ #endif
+ 
+ #if VERBOSE_PARSE
+diff -u -r gnash-0.8.9/libcore/vm/ActionExec.cpp gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp
+--- gnash-0.8.9/libcore/vm/ActionExec.cpp	2011-03-13 17:47:36.000000000 +0100
++++ gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp	2012-01-18 09:40:25.653458508 +0100
+@@ -46,7 +46,7 @@
+ // too much information for my tastes. I really want just
+ // to see how stack changes while executing actions...
+ // --strk Fri Jun 30 02:28:46 CEST 2006
+-# define DEBUG_STACK 1
++//# define DEBUG_STACK 1
+ 
+ // Max number of stack item to dump. 0 for unlimited.
+ # define STACK_DUMP_LIMIT 32
diff --git a/community-testing/gpsdrive/PKGBUILD b/community-testing/gpsdrive/PKGBUILD
new file mode 100644
index 000000000..6b42fa2ff
--- /dev/null
+++ b/community-testing/gpsdrive/PKGBUILD
@@ -0,0 +1,69 @@
+# $Id: PKGBUILD 66996 2012-03-03 08:12:16Z ibiru $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Maintainer: damir <damir@archlinux.org>
+
+pkgname=gpsdrive
+pkgver=2.11
+pkgrel=12
+pkgdesc="A car (bike, ship, plane) navigation system"
+arch=("i686" "x86_64")
+url="http://www.gpsdrive.de/"
+license=('GPL2')
+depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' 'postgresql-libs' 'openstreetmap-map-icons-svn'
+         'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp' 'perl-www-mechanize' 'perl-libwww' 'perl-uri'
+         'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple' 'perl-xml-twig' 'perl-xml-writer'
+        ) # already in core ('sqlite3')
+makedepends=('cmake>=2.4.4' 'boost' 'cfitsio')
+install="gpsdrive.install"
+source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz"
+	"gpsd-2.96.patch")
+md5sums=('6eeeca8e5c647115bea836d1f8fb6e0c'
+         '5769e12c6d8932fb721212434c64f505')
+
+build() {
+  cd "$srcdir"
+
+  # python2 fix
+  for file in $(find . -name '*.py' -print); do
+    sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
+    sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
+  done
+
+  rm -rf build
+  mkdir build
+  cd build
+
+  # fix the mapnik default values
+  sed -i 's|"/usr/lib/mapnik/0.7/input/"|"/usr/lib/mapnik/input/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c"
+  sed -i 's|"/usr/share/fonts/truetype/ttf-dejavu/"|"/usr/share/fonts/TTF/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c"
+
+  export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/
+  export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/
+  export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/
+  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
+  export LDFLAGS="`pkg-config --libs gtk+-2.0` -lboost_system -lboost_thread"
+
+  # see DefineOptions.cmake for a list of common options and defaults
+  # cmake -L for a more in-depth listing
+  cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DWITH_SCRIPTS=ON \
+    -DWITH_MAPNIK=ON \
+    -DWITH_POSTGIS=ON \
+    -DWITH_GDAL=ON \
+    -DWITH_BASEMAPS=ON \
+    -DWITH_FRIENDSD=ON \
+    -DWITH_KISMET=ON \
+    -DWITH_NAVIGATION=ON \
+    -DWITH_SPEECH=OFF \
+    -DWITH_DBUS=OFF \
+    -DLIBGPS_OLD=OFF \
+    "$srcdir/gpsdrive-$pkgver"
+  (cd "$srcdir/gpsdrive-$pkgver" && patch -p1 <$srcdir/gpsd-2.96.patch)
+  make
+}
+
+package() {
+  cd "$srcdir/build"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community-testing/gpsdrive/gpsd-2.96.patch b/community-testing/gpsdrive/gpsd-2.96.patch
new file mode 100644
index 000000000..bc6c7475f
--- /dev/null
+++ b/community-testing/gpsdrive/gpsd-2.96.patch
@@ -0,0 +1,44 @@
+diff -wbBur gpsdrive-2.11/src/gps_handler.c gpsdrive-2.11.my/src/gps_handler.c
+--- gpsdrive-2.11/src/gps_handler.c	2010-06-24 19:53:32.000000000 +0000
++++ gpsdrive-2.11.my/src/gps_handler.c	2011-04-18 13:21:33.000000000 +0000
+@@ -264,7 +264,8 @@
+ #define GPS_TIMER 500
+ 
+ static gint gps_timeout_source = 0;
+-static struct gps_data_t *gpsdata;
++static struct gps_data_t __gd;
++static struct gps_data_t *gpsdata = &__gd;
+ 
+ /* SYMBOLS USED IN LIBGPS:
+  * 
+@@ -410,9 +411,10 @@
+ 	 */
+ 	gps_query (gpsdata, "oys\n");
+ #else
+-	if (gps_waiting(gpsdata))
++	if (gps_waiting(gpsdata, 1000000))
+ 	{
+-		gps_poll (gpsdata);
++		gps_read (gpsdata);
++		gps_hook_cb(gpsdata, NULL);
+ 	}
+ #endif
+ 
+@@ -447,7 +449,7 @@
+ 	}
+ 
+ 	/* try to open connection */
+-	gpsdata =  gps_open (local_config.gpsd_server, local_config.gpsd_port);
++	gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port, gpsdata) ? NULL : &__gd;
+ 	if (!gpsdata)
+ 	{
+ 		g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n",
+@@ -466,7 +468,7 @@
+ 	gps_sats = g_new (gps_satellite_struct, MAXCHANNELS);
+ 
+ 	/* set hook function to handle gps data */
+-	gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb);
++//	gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb);
+ 
+ #ifndef LIBGPS_OLD
+ 	/* enable watch mode to get data stream from gpsd */
diff --git a/community-testing/gpsdrive/gpsdrive.install b/community-testing/gpsdrive/gpsdrive.install
new file mode 100644
index 000000000..8ea63912e
--- /dev/null
+++ b/community-testing/gpsdrive/gpsdrive.install
@@ -0,0 +1,4 @@
+post_install() {
+  echo "Don't forget to generate geoinfo.db with geoinfo.pl script"
+  echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive"
+}
diff --git a/community-testing/luxrender/PKGBUILD b/community-testing/luxrender/PKGBUILD
new file mode 100644
index 000000000..647c6c052
--- /dev/null
+++ b/community-testing/luxrender/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 66998 2012-03-03 08:12:24Z ibiru $
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Initial contributor: flixie <69one@gmx.net>
+# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
+pkgname=luxrender
+pkgver=0.8
+_pkgver=45d3e13eb94c
+pkgrel=13
+pkgdesc="Rendering system for physically correct, unbiased image synthesis"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('boost-libs' 'freeimage' 'openexr' 'libcl')
+optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
+            'python: Python interface (pylux)'
+            'nvidia-utils: OpenCL support for nVidia GPUs' \
+            'amdstream: OpenCL support for AMD GPUs' \
+            'intel-opencl-sdk: OpenCL support for Intel CPUs')
+makedepends=('cmake' 'boost' 'qt' 'luxrays' 'python' 'opencl-headers')
+source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2)
+md5sums=('0f2d856385db72131f51e44a7ee527fa')
+
+build() {
+  cd "$srcdir"/luxrender-lux-$_pkgver
+
+  sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt
+
+  export CXXFLAGS="$CXXFLAGS -lpthread"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLUXRAYS_DISABLE_OPENCL=OFF \
+    -DPYTHON_CUSTOM=ON \
+    -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \
+    -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \
+    .
+  make
+}
+
+package() {
+  cd "$srcdir"/luxrender-lux-$_pkgver
+  make DESTDIR="$pkgdir" install
+
+  # fix library path on x86_64
+  [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
+
+  #install pylux
+  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/mapnik/PKGBUILD b/community-testing/mapnik/PKGBUILD
new file mode 100644
index 000000000..45a0e5dc4
--- /dev/null
+++ b/community-testing/mapnik/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 67000 2012-03-03 08:12:30Z ibiru $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: David Dent <thewinch@gmail.com>
+# Contributor: orbisvicis <orbisvicis@gmail.com>
+
+pkgname=mapnik
+pkgver=0.7.1
+pkgrel=14
+pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps."
+arch=('i686' 'x86_64')
+url="http://mapnik.org/"
+license=('LGPL')
+depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2'
+	 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo'
+	 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool')
+	# already in core ('zlib' 'sqlite3')
+optdepends=('libxslt:         Web Map Service'
+            'python-lxml:     Web Map Service'
+            'python-imaging:  Web Map Service'
+            'python-nose:     Web Map Service'
+            'apache:          Web Map Service'
+            'mod_fastcgi:     Web Map Service - or:'
+            'mod_fcgid:       Web Map Service - or:'
+            'mod_wsgi:        Web Map Service'
+           )
+makedepends=('scons' 'boost') # already in core ('pkg-config')
+conflicts=('mapnik-svn')
+install="mapnik.install"
+source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('8f65fda2a792518d6f6be8a85f62fc73')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64
+  sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct
+  sed -i 's|png_ptr->io_ptr|png_get_io_ptr(png_ptr)|g' src/png_reader.cpp
+  sed -i 's/-ansi -Wall/-ansi -DBOOST_FILESYSTEM_VERSION=2 -Wall/' SConstruct
+
+  scons configure \
+    PREFIX="/usr" \
+    INPUT_PLUGINS=all \
+    DESTDIR="$pkgdir"
+  scons
+}
+package(){
+  cd "$srcdir/$pkgname-$pkgver"
+  scons install
+  # fix permissions on SCons-autogenerated files
+  chmod 644 "${pkgdir}/usr/lib/python2.7/site-packages/mapnik/paths.py"
+}
diff --git a/community-testing/mapnik/mapnik.install b/community-testing/mapnik/mapnik.install
new file mode 100644
index 000000000..46f265d5b
--- /dev/null
+++ b/community-testing/mapnik/mapnik.install
@@ -0,0 +1,11 @@
+post_install() {
+  /sbin/ldconfig
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community-testing/mongodb/PKGBUILD b/community-testing/mongodb/PKGBUILD
new file mode 100644
index 000000000..e8867af8e
--- /dev/null
+++ b/community-testing/mongodb/PKGBUILD
@@ -0,0 +1,73 @@
+# $Id: PKGBUILD 67002 2012-03-03 08:12:49Z ibiru $
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Mathias Stearn <mathias@10gen.com>
+# Contributor: Alec Thomas
+
+pkgname=mongodb
+pkgver=2.0.3
+pkgrel=2
+pkgdesc='A high-performance, open source, schema-free document-oriented database.'
+arch=('i686' 'x86_64')
+url='http://www.mongodb.org'
+license=('AGPL3')
+depends=('boost-libs')
+makedepends=('scons' 'boost')
+#checkdepends=('python2-pymongo')
+optdepends=('libpcap: needed for mongosniff')
+backup=('etc/mongodb.conf')
+install="mongodb.install"
+source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
+        'mongodb.rc'
+        'mongodb.conf')
+md5sums=('f588cae93196b94599ec50e3c4956592'
+         '9c67e00f4626ad761a8f7d4e037a54d7'
+         '4839fe1d638187ca3226e8267b947318')
+
+build() {
+  export SCONSFLAGS="$MAKEFLAGS"
+
+  cd mongodb-src-r${pkgver}
+
+  # fix python name for smoke tests
+  sed \
+    -e 's/python/&2/' \
+    -i SConstruct
+
+  scons \
+    all \
+    --full
+}
+
+<<COMMENT
+check() {
+  export SCONSFLAGS="$MAKEFLAGS"
+
+  cd mongodb-src-r${pkgver}
+
+  scons \
+    smokeAll \
+    --smokedbprefix=${srcdir}
+}
+COMMENT
+
+package() {
+  export SCONSFLAGS="$MAKEFLAGS"
+
+  cd mongodb-src-r${pkgver}
+
+  scons \
+    install \
+    --full \
+    --prefix=${pkgdir}/usr
+
+  install -D -m755 ${srcdir}/mongodb.rc \
+    ${pkgdir}/etc/rc.d/mongodb
+  install -D -m644 ${srcdir}/mongodb.conf \
+    ${pkgdir}/etc/mongodb.conf
+  install -d -m700 ${pkgdir}/var/lib/mongodb
+  install -d -m755 ${pkgdir}/var/log/mongodb
+
+  if [ -d ${pkgdir}/usr/lib64 ]; then
+    mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib
+  fi
+}
diff --git a/community-testing/mongodb/mongodb.conf b/community-testing/mongodb/mongodb.conf
new file mode 100644
index 000000000..c5272b7f2
--- /dev/null
+++ b/community-testing/mongodb/mongodb.conf
@@ -0,0 +1,8 @@
+# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details
+# Run mongod --help to see a list of options
+
+bind_ip = 127.0.0.1
+quiet = true
+dbpath = /var/lib/mongodb
+logpath = /var/log/mongodb/mongod.log
+logappend = true
diff --git a/community-testing/mongodb/mongodb.install b/community-testing/mongodb/mongodb.install
new file mode 100644
index 000000000..3922c12ef
--- /dev/null
+++ b/community-testing/mongodb/mongodb.install
@@ -0,0 +1,32 @@
+# vim: syntax=sh
+
+post_install() {
+  useradd -r -g daemon -d /var/lib/mongodb -s /bin/bash mongodb
+  chown -R mongodb:daemon /var/lib/mongodb
+  chown -R mongodb:daemon /var/log/mongodb
+
+  if [ "$(arch)" != "x86_64" ]
+  then
+    echo '==> Warning: the 32 bit version of MongoDB is limited to about 2GB of data.'
+    echo '==> See http://blog.mongodb.org/post/137788967/32-bit-limitations'
+  fi
+}
+
+post_upgrade() {
+  chown -R mongodb:daemon /var/lib/mongodb
+  chown -R mongodb:daemon /var/log/mongodb
+
+  if [ "$(vercmp $2 1.8.2-3)" -lt 0 ]
+  then
+    # have to fix my fudge up in 1.8.2-2 and 1.8.2-3
+    # added july 5th, 2011
+    usermod -s /bin/bash mongodb >& /dev/null
+    echo 'The dbpath has changed from /var/state/mongodb to /var/lib/mongodb'
+    echo 'Make sure you move your data files to the new dbpath before you start/restart mongodb'
+    echo 'The logpath has changed from /var/log/mongod to /var/log/mongodb/mongod.log'
+  fi
+}
+
+pre_remove() {
+  userdel mongodb
+}
diff --git a/community-testing/mongodb/mongodb.rc b/community-testing/mongodb/mongodb.rc
new file mode 100644
index 000000000..30f2bbf79
--- /dev/null
+++ b/community-testing/mongodb/mongodb.rc
@@ -0,0 +1,39 @@
+#!/bin/bash
+# vim: syntax=sh
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=$(pidof /usr/bin/mongod)
+case "$1" in
+  start)
+    stat_busy "Starting mongodb"
+    [ -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --fork" > /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon mongodb
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping mongodb"
+    [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon mongodb
+      while [ ! -z "$(pidof /usr/bin/mongod)" ]; do
+        sleep 1;
+      done
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community-testing/openimageio/PKGBUILD b/community-testing/openimageio/PKGBUILD
new file mode 100644
index 000000000..0f4bb0102
--- /dev/null
+++ b/community-testing/openimageio/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 67006 2012-03-03 08:13:05Z ibiru $
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+
+_pkg=OpenImageIO
+pkgname=openimageio
+pkgver=0.10.4
+pkgrel=6
+pkgdesc="A library for reading and writing images, including classes, utilities, and applications."
+arch=(i686 x86_64)
+url="http://www.openimageio.org/"
+license=('custom')
+depends=('openexr' 'boost-libs' 'jasper' 'glew')
+makedepends=('cmake' 'qt' 'python2' 'boost')
+optdepends=('qt: iv image viewer' 'python2: bindings support')
+options=(!buildflags)
+source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}"
+        "openimageio-0.10.2-libpng15.patch")
+md5sums=('08a1bc2b82862ad5547bba569f4f633f'
+         'd12829808610a54b6bc3350dc5419db3')
+
+build() {
+  cd "$srcdir"/$_pkg*
+
+  # remove insecure rpath
+  sed -i "/RPATH/d" src/CMakeLists.txt
+
+  patch -d src/ -Np0 < $srcdir/openimageio-0.10.2-libpng15.patch
+
+  # strange bug on i686, see https://github.com/OpenImageIO/oiio/issues/204
+  [[ $CARCH == "i686" ]] && make debug || make
+}
+
+package() {
+  cd "$srcdir"/$_pkg*/dist/*
+
+  # prepare dirs
+  install -d "$pkgdir"/usr/{share/doc/$_pkg,lib/python2.7/site-packages}
+
+  # bin
+  cp -r bin include lib "$pkgdir/usr"
+
+  # docs
+  cp -r doc/* "$pkgdir/usr/share/doc/$_pkg"
+
+  # python module
+  cp -r python/* "$pkgdir/usr/lib/python2.7/site-packages"
+
+  # license
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/community-testing/openimageio/openimageio-0.10.2-libpng15.patch b/community-testing/openimageio/openimageio-0.10.2-libpng15.patch
new file mode 100644
index 000000000..97375d5fb
--- /dev/null
+++ b/community-testing/openimageio/openimageio-0.10.2-libpng15.patch
@@ -0,0 +1,11 @@
+--- ico.imageio/icooutput.cpp
++++ ico.imageio/icooutput.cpp
+@@ -32,6 +32,8 @@
+ #include <cstdlib>
+ #include <cmath>
+ 
++#include <zlib.h> /* Z_BEST_COMPRESSION */
++
+ #include "ico.h"
+ #include "../png.imageio/png_pvt.h"
+ 
diff --git a/community-testing/performous/PKGBUILD b/community-testing/performous/PKGBUILD
new file mode 100644
index 000000000..af0874e3f
--- /dev/null
+++ b/community-testing/performous/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 67008 2012-03-03 08:13:15Z ibiru $
+# Maintainer : Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=performous
+pkgver=0.6.1
+pkgrel=13
+pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
+arch=('i686' 'x86_64')
+url="http://performous.org/"
+license=('GPL')
+depends=('boost-libs>=1.48' 'imagemagick' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg')
+#depends=('boost-libs>=1.48' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \
+#         'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo')
+makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.48')
+optdepends=('performous-freesongs: free songs for performous')
+source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2
+        boost-filesystem-v3.patch
+        ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a"
+	png15.patch)
+md5sums=('451a759de77984b5a699e91107fe52e2'
+         '42a8c825d80b0de16bd5752d2a80e585'
+         'ff0ffa681dfaa09c4f42133a65309bf0'
+         '89157d5e21b0efd09fcbeee299d23c7e')
+
+build() {
+  cd ${srcdir}/Performous-${pkgver}-Source
+
+  # fix to built against boost 1.46 and later, upstream (git) now support v3
+  patch -Np1 -i ../boost-filesystem-v3.patch
+  # fix with ffmpeg-0.8
+  patch -Np1 -i ../ffmpeg-0.8.patch
+  # fix for libpng 1.5
+  patch -Np1 -i ../png15.patch
+
+  mkdir -p build
+  cd build
+
+  # fix config loading with libxml++
+  export LDFLAGS=${LDFLAGS/-Wl,--as-needed/}
+
+  cmake -DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_INSTALL_PREFIX=/usr ..
+
+  make
+}
+
+package() {
+  cd ${srcdir}/Performous-${pkgver}-Source/build
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community-testing/performous/boost-filesystem-v3.patch b/community-testing/performous/boost-filesystem-v3.patch
new file mode 100644
index 000000000..22dd07213
--- /dev/null
+++ b/community-testing/performous/boost-filesystem-v3.patch
@@ -0,0 +1,135 @@
+diff --git a/game/backgrounds.cc b/game/backgrounds.cc
+index 7fd3cd0..cdedefb 100644
+--- a/game/backgrounds.cc
++++ b/game/backgrounds.cc
+@@ -55,8 +55,13 @@ void Backgrounds::reload_internal(fs::path const& parent) {
+ 		for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) {
+ 			fs::path p = dirIt->path();
+ 			if (fs::is_directory(p)) { reload_internal(p); continue; }
++#if BOOST_FILESYSTEM_VERSION < 3
+ 			std::string name = p.leaf(); // File basename
+ 			std::string path = p.directory_string(); // Path without filename
++#else
++			std::string name = p.filename().string(); // File basename
++			std::string path = p.string(); // Path without filename
++#endif
+ 			path.erase(path.size() - name.size());
+ 			if (!regex_match(name.c_str(), match, expression)) continue;
+ 			{
+diff --git a/game/cache.cc b/game/cache.cc
+index 69974e2..0f1edd0 100644
+--- a/game/cache.cc
++++ b/game/cache.cc
+@@ -9,7 +9,11 @@ namespace cache {
+ 	fs::path constructSVGCacheFileName(fs::path const& svgfilename, double factor){
+ 		fs::path cache_filename;
+ 		std::string const lod = (boost::format("%.2f") % factor).str();
++#if BOOST_FILESYSTEM_VERSION < 3
+ 		std::string const cache_basename = svgfilename.filename() + ".cache_" + lod + ".png";
++#else
++		std::string const cache_basename = svgfilename.filename().string() + ".cache_" + lod + ".png";
++#endif
+ 
+ 		if (isThemeResource(svgfilename)) {
+ 			std::string const theme_name = (config["game/theme"].s().empty() ? "default" : config["game/theme"].s());
+diff --git a/game/filemagic.hh b/game/filemagic.hh
+index bf87ded..29e81fe 100644
+--- a/game/filemagic.hh
++++ b/game/filemagic.hh
+@@ -71,7 +71,11 @@ namespace filemagic {
+ 		// For now, just check the extension an assume it's not lying.
+ 
+ 		// Get file extension in lower case
++#if BOOST_FILESYSTEM_VERSION < 3
+ 		std::string ext = filename.extension();
++#else
++		std::string ext = filename.extension().string();
++#endif
+ 		// somehow this does not convert the extension to lower case:
+ 		//std::for_each(ext.begin(), ext.end(), static_cast<int(*)(int)>(std::tolower));
+ 		std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower );
+diff --git a/game/fs.cc b/game/fs.cc
+index e34a784..767a7ab 100644
+--- a/game/fs.cc
++++ b/game/fs.cc
+@@ -128,7 +128,11 @@ std::string getThemePath(std::string const& filename) {
+ 
+ bool isThemeResource(fs::path filename){
+ 	try {
++#if BOOST_FILESYSTEM_VERSION < 3
+ 		std::string themefile = getThemePath(filename.filename());
++#else
++		std::string themefile = getThemePath(filename.filename().string());
++#endif
+ 		return themefile == filename;
+ 	} catch (...) { return false; }
+ }
+diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc
+index 38e163b..db15d79 100644
+--- a/game/songparser-ini.cc
++++ b/game/songparser-ini.cc
+@@ -104,7 +104,11 @@ void SongParser::iniParseHeader() {
+ 	// Search the dir for the music files
+ 	for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) {
+ 		boost::filesystem::path p = dirIt->path();
++#if BOOST_FILESYSTEM_VERSION < 3
+ 		std::string name = p.leaf(); // File basename (notes.txt)
++#else
++		std::string name = p.filename().string(); // File basename (notes.txt)
++#endif
+ 		if (regex_match(name.c_str(), match, midifile)) {
+ 			 s.midifilename = name;
+ 		} else if (regex_match(name.c_str(), match, audiofile_background)) {
+diff --git a/game/songparser.cc b/game/songparser.cc
+index 2b7b9b4..ac9f3f6 100644
+--- a/game/songparser.cc
++++ b/game/songparser.cc
+@@ -100,7 +100,11 @@ SongParser::SongParser(Song& s):
+ 
+ 		for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) {
+ 			boost::filesystem::path p = dirIt->path();
++#if BOOST_FILESYSTEM_VERSION < 3
+ 			std::string name = p.leaf(); // File basename
++#else
++			std::string name = p.filename().string(); // File basename
++#endif
+ 			if (m_song.cover.empty() && regex_match(name.c_str(), match, coverfile)) {
+ 				m_song.cover = name;
+ 			} else if (m_song.background.empty() && regex_match(name.c_str(), match, backgroundfile)) {
+diff --git a/game/songs.cc b/game/songs.cc
+index 62ab26d..afab383 100644
+--- a/game/songs.cc
++++ b/game/songs.cc
+@@ -67,8 +67,13 @@ void Songs::reload_internal(fs::path const& parent) {
+ 		for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) {
+ 			fs::path p = dirIt->path();
+ 			if (fs::is_directory(p)) { reload_internal(p); continue; }
++#if BOOST_FILESYSTEM_VERSION < 3
+ 			std::string name = p.leaf(); // File basename (notes.txt)
+ 			std::string path = p.directory_string(); // Path without filename
++#else
++			std::string name = p.filename().string(); // File basename (notes.txt)
++			std::string path = p.string(); // Path without filename
++#endif
+ 			path.erase(path.size() - name.size());
+ 			if (!regex_match(name.c_str(), match, expression)) continue;
+ 			try {
+diff --git a/tools/ss_helpers.hh b/tools/ss_helpers.hh
+index 58e19dc..8895d94 100644
+--- a/tools/ss_helpers.hh
++++ b/tools/ss_helpers.hh
+@@ -10,7 +10,11 @@ extern "C" void xmlLogger(void* logger, char const* msg, ...) { if (logger) *(st
+ void enableXMLLogger(std::ostream& os = std::cerr) { xmlSetGenericErrorFunc(&os, xmlLogger); }
+ void disableXMLLogger() { xmlSetGenericErrorFunc(NULL, xmlLogger); }
+ 
++#if BOOST_FILESYSTEM_VERSION < 3
+ std::string filename(boost::filesystem::path const& p) { return *--p.end(); }
++#else
++std::string filename(boost::filesystem::path const& p) { return p.filename().string(); }
++#endif
+ 
+ /** Fix Singstar's b0rked XML **/
+ std::string xmlFix(std::vector<char> const& data) {
+-- 
+1.7.4.1
+
diff --git a/community-testing/performous/png15.patch b/community-testing/performous/png15.patch
new file mode 100644
index 000000000..b6fb8fb14
--- /dev/null
+++ b/community-testing/performous/png15.patch
@@ -0,0 +1,33 @@
+diff -ur Performous-0.6.1-Source/cmake/Modules/FindPng.cmake Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake
+--- Performous-0.6.1-Source/cmake/Modules/FindPng.cmake	2010-10-31 17:05:44.000000000 +0100
++++ Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake	2012-01-29 01:07:56.339648832 +0100
+@@ -10,7 +10,7 @@
+ 
+ include(LibFindMacros)
+ 
+-libfind_pkg_check_modules(Png_PKGCONF Png)
++libfind_pkg_check_modules(Png_PKGCONF libpng)
+ 
+ find_path(Png_INCLUDE_DIR
+   NAMES pngconf.h
+@@ -18,7 +18,7 @@
+ )
+ 
+ find_library(Png_LIBRARY
+-  NAMES png png12 png14
++  NAMES png png12 png14 png15
+   PATHS ${Png_PKGCONF_LIBRARY_DIRS}
+ )
+ 
+diff -ur Performous-0.6.1-Source/game/image.hh Performous-0.6.1a-Source/game/image.hh
+--- Performous-0.6.1-Source/game/image.hh	2010-10-31 17:05:43.000000000 +0100
++++ Performous-0.6.1a-Source/game/image.hh	2012-01-29 01:44:16.050575186 +0100
+@@ -26,7 +26,7 @@
+ 	}
+ 	void loadPNG_internal(png_structp pngPtr, png_infop infoPtr, std::ifstream& file, std::vector<unsigned char>& image, std::vector<png_bytep>& rows, unsigned& w, unsigned& h) {
+ 		if (setjmp(png_jmpbuf(pngPtr))) throw std::runtime_error("Reading PNG failed");
+-		png_set_read_fn(pngPtr,(voidp)&file, readPngHelper);
++		png_set_read_fn(pngPtr, &file, readPngHelper);
+ 		png_read_info(pngPtr, infoPtr);
+ 		png_set_expand(pngPtr);  // Expand everything to RGB(A)
+ 		png_set_strip_16(pngPtr);  // Strip everything down to 8 bit/component
diff --git a/community-testing/pingus/ChangeLog b/community-testing/pingus/ChangeLog
new file mode 100644
index 000000000..c182f92eb
--- /dev/null
+++ b/community-testing/pingus/ChangeLog
@@ -0,0 +1,21 @@
+2010-03-18  Jaroslav Lichtblau  <dragonlord@aur.archlinux.org>
+
+        * pingus 0.7.2-8
+        * Rebuilt against boost 1.41.0
+
+2010-02-23  Eric Belanger  <eric@archlinux.org>
+
+	* pingus 0.7.2-7
+	* Rebuilt against boost 1.42.0
+
+2010-01-20  Eric Belanger  <eric@archlinux.org>
+
+	* pingus 0.7.2-6
+	* Rebuilt against libpng 1.4/libjpeg 8
+
+2009-07-13  Eric Belanger  <eric@archlinux.org>
+
+	* pingus 0.7.2-2
+	* Rebuilt against boost 1.39
+	* Added gcc 4.4 patch
+	* Added ChangeLog
diff --git a/community-testing/pingus/PKGBUILD b/community-testing/pingus/PKGBUILD
new file mode 100644
index 000000000..8f8619de5
--- /dev/null
+++ b/community-testing/pingus/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 67010 2012-03-03 08:13:23Z ibiru $
+# Maintainer: Eric Belanger <eric@archlinux.org>
+
+pkgname=pingus
+pkgver=0.7.6
+pkgrel=3
+pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
+arch=('i686' 'x86_64')
+url="http://pingus.seul.org"
+license=('GPL')
+depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.49')
+makedepends=('scons' 'boost>=1.49' 'mesa')
+source=(http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
+	pingus.desktop)
+md5sums=('561798686f34d3fa4e69135d655f47ac'
+         '9eec34047bdcff49e08f41e81764e20c')
+sha1sums=('b5f5a25d71beb197c9466fb8928018a377f56487'
+          '579a1144f161ce89e6e024cea37210149b89c0c0')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  scons prefix=/usr
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make install DESTDIR="${pkgdir}" PREFIX="/usr"
+
+  install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop"
+}
diff --git a/community-testing/pingus/pingus.desktop b/community-testing/pingus/pingus.desktop
new file mode 100644
index 000000000..276db36a4
--- /dev/null
+++ b/community-testing/pingus/pingus.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Pingus
+Comment=A free Lemmings[tm] clone
+Exec=pingus
+Terminal=false
+Type=Application
+Categories=Application;Game;LogicGame
+Icon=/usr/share/pingus/images/core/editor/actions.png
diff --git a/community-testing/pion-net/PKGBUILD b/community-testing/pion-net/PKGBUILD
new file mode 100644
index 000000000..714f38b37
--- /dev/null
+++ b/community-testing/pion-net/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 67012 2012-03-03 08:13:30Z ibiru $
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Contributor: David Watzke <david@watzke.cz>
+
+pkgname=pion-net
+pkgver=4.0.7
+pkgrel=3
+pkgdesc="A C++ development library for implementing lightweight HTTP interfaces"
+url="http://www.pion.org/projects/pion-network-library"
+arch=('i686' 'x86_64')
+license=('custom:Boost')
+depends=('boost-libs' 'openssl' 'log4cpp')
+makedepends=('boost')
+source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2"
+        "$pkgname-4.0.5-build.patch")
+md5sums=('761c8af8dc54102b637f8d91d162f987'
+         'd75ea2af90163a81d2bc71fda00f0c00')
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	patch -p1 -i "$srcdir/$pkgname-4.0.5-build.patch"
+
+	# override configure bug (forces debug even when nobody asked for it)
+	sed -i "s/ -ggdb//g;s/ -DNDEBUG//g" configure
+
+	./configure --prefix=/usr --disable-doxygen-doc --with-log4cpp
+
+	find -name Makefile -print0 | xargs -0 \
+	sed -i -r '/^C(XX)?FLAGS/ s/$/ -DBOOST_FILESYSTEM_VERSION=2/' Makefile
+
+	# override Makefile bug
+	sed -i "/docs:/ s/doxygen-doc//" Makefile
+
+	make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
+
+	# install license
+	install -D -m0755 COPYING "$pkgdir/usr/share/licenses/$pkgname/Boost"
+}
diff --git a/community-testing/pion-net/pion-net-4.0.5-build.patch b/community-testing/pion-net/pion-net-4.0.5-build.patch
new file mode 100644
index 000000000..25fdca20b
--- /dev/null
+++ b/community-testing/pion-net/pion-net-4.0.5-build.patch
@@ -0,0 +1,12 @@
+diff -ru pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp
+--- pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp	2010-12-21 03:07:13.000000000 +0100
++++ pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp	2011-07-31 09:01:38.445559768 +0200
+@@ -639,7 +639,7 @@
+ 	
+ 	/// returns reference to the io_service used for async operations
+ 	inline boost::asio::io_service& getIOService(void) {
+-		return m_ssl_socket.lowest_layer().io_service();
++		return m_ssl_socket.lowest_layer().get_io_service();
+ 	}
+ 
+ 	/// returns non-const reference to underlying TCP socket object
diff --git a/community-testing/pokerth/PKGBUILD b/community-testing/pokerth/PKGBUILD
new file mode 100644
index 000000000..6b0e9972c
--- /dev/null
+++ b/community-testing/pokerth/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 67014 2012-03-03 08:13:34Z ibiru $
+# Maintainer:  Mateusz Herych <heniekk@gmail.com>
+# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
+# Contributor: Vasco Costa <vasco.costa@meiodigital.com>
+
+pkgname=pokerth
+_realname=PokerTH
+pkgver=0.9.3
+pkgrel=2
+pkgdesc="Poker game written in C++/QT4"
+arch=('i686' 'x86_64')
+url="http://www.pokerth.net/"
+license=('GPL' 'custom')
+depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls'
+         'qt' 'sdl_mixer' 'libircclient' 'tinyxml')
+makedepends=('boost')
+source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2)
+md5sums=('09d173512f723441f288b2844e3c68cb')
+
+build() {
+  cd "$srcdir/$_realname-$pkgver-src"
+
+  sed -i 's/QMAKE_CXXFLAGS += -std=gnu++0x/QMAKE_CXXFLAGS += -std=gnu++0x -DBOOST_FILESYSTEM_VERSION=2/' *.pro
+
+  sed -i '23 i #include <libircclient/libirc_rfcnumeric.h>' src/net/common/ircthread.cpp
+
+  # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms'
+  sed \
+    -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \
+    -i zlib_compress.pro pokerth_game.pro pokerth_server.pro
+
+  qmake $pkgname.pro
+  make
+}
+
+package() {
+  cd "$srcdir/$_realname-$pkgver-src"
+
+  make INSTALL_ROOT="$pkgdir" install
+
+  install -D "$pkgname" "$pkgdir/usr/bin/$pkgname"
+  install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1"
+  install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt"
+  rm -f "$pkgdir/usr/share/pokerth/data/data-copyright.txt"
+}
diff --git a/community-testing/schroot/PKGBUILD b/community-testing/schroot/PKGBUILD
new file mode 100644
index 000000000..cf8ed49e8
--- /dev/null
+++ b/community-testing/schroot/PKGBUILD
@@ -0,0 +1,70 @@
+# $Id: PKGBUILD 67016 2012-03-03 08:13:50Z ibiru $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
+
+pkgname=schroot
+pkgver=1.4.25
+pkgrel=1
+pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)."
+url="http://packages.qa.debian.org/s/schroot.html"
+license=('GPL3')
+depends=('pam' 'lockdev' 'boost' 'e2fsprogs')
+optdepends=('btrfs-progs-unstable' 'lvm2')
+arch=('i686' 'x86_64')
+conflicts=('dchroot')
+replaces=('dchroot')
+provides=('schroot' 'sbuild' 'dchroot')
+backup=('etc/schroot/schroot.conf'
+	'etc/schroot/arch32/config'
+	'etc/schroot/arch32/copyfiles'
+	'etc/schroot/arch32/mount'
+	'etc/schroot/arch32/nssdatabases')
+options=(!libtool)
+source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2"
+	'pam.d.schroot.patch'
+	'arch32-example'
+	'arch32-config'
+	'arch32-copyfiles'
+	'arch32-mount'
+	'arch32-nssdatabases')
+md5sums=('c9e5056becd82b6330ac4502f59260f1'
+         'a8d77cac806a0a9adef3f93cdbeb280a'
+         '1e34db5387c4e5de911e15d8a9208bdb'
+         '5a3f7b839c7e0b8933748da7c5b6385b'
+         '06db41d42f9fce5449a28feb76ded556'
+         'f0d5d5b5e34a860f6f90b5628c680f46'
+         'af1da6edd8c8c0dafeeb2c2c4e0c840b')
+
+build() {
+	cd ${pkgname}-${pkgver}
+	export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
+	./configure \
+		--prefix=/usr \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--enable-dchroot \
+		--enable-lvm-snapshot \
+		--enable-btrfs-snapshot \
+		BTRFS=/sbin/btrfs \
+		BTRFSCTL=/sbin/btrfsctl \
+		LVCREATE=/sbin/lvcreate \
+		LVREMOVE=/sbin/lvremove
+		# --enable-csbuild
+	make
+}
+
+check() {
+	cd ${pkgname}-${pkgver}
+	make -k check
+}
+
+package() {
+	cd ${pkgname}-${pkgver}
+	make DESTDIR=$pkgdir install
+	install -dm 755 ${pkgdir}/etc/schroot/arch32
+	install -m 644 ${srcdir}/arch32-{config,mount,copyfiles,nssdatabases} ${pkgdir}/etc/schroot/arch32
+	rename 'arch32-' '' ${pkgdir}/etc/schroot/arch32/*
+	install -m 644 ${srcdir}/arch32-example ${pkgdir}/etc/schroot/chroot.d/arch32.conf.example
+	patch -i ${srcdir}/pam.d.schroot.patch ${pkgdir}/etc/pam.d/schroot
+}
diff --git a/community-testing/schroot/arch32-config b/community-testing/schroot/arch32-config
new file mode 100644
index 000000000..0ee72d522
--- /dev/null
+++ b/community-testing/schroot/arch32-config
@@ -0,0 +1,11 @@
+# Default settings for chroot setup and exec scripts.
+# See schroot-script-config(5) for further details.
+
+# Filesystems to mount inside the chroot.
+FSTAB="/etc/schroot/arch32/mount"
+
+# Files to copy from the host system into the chroot.
+COPYFILES="/etc/schroot/arch32/copyfiles"
+
+# System databases to copy into the chroot
+NSSDATABASES="/etc/schroot/arch32/nssdatabases"
diff --git a/community-testing/schroot/arch32-copyfiles b/community-testing/schroot/arch32-copyfiles
new file mode 100644
index 000000000..88f093ceb
--- /dev/null
+++ b/community-testing/schroot/arch32-copyfiles
@@ -0,0 +1,7 @@
+/etc/group
+/etc/hosts
+/etc/passwd
+/etc/resolv.conf
+/etc/rc.conf
+/etc/localtime
+/etc/locale.gen
diff --git a/community-testing/schroot/arch32-example b/community-testing/schroot/arch32-example
new file mode 100644
index 000000000..3f059e3c0
--- /dev/null
+++ b/community-testing/schroot/arch32-example
@@ -0,0 +1,10 @@
+[arch32]
+description=Arch32
+type=directory
+directory=/opt/arch32
+#users=username
+groups=users
+root-groups=root
+script-config=arch32/config
+personality=linux32
+#aliases=32,i686
diff --git a/community-testing/schroot/arch32-mount b/community-testing/schroot/arch32-mount
new file mode 100644
index 000000000..075d6e451
--- /dev/null
+++ b/community-testing/schroot/arch32-mount
@@ -0,0 +1,12 @@
+# mount.defaults: static file system information for chroots.
+# Note that the mount point will be prefixed by the chroot path
+# (CHROOT_PATH)
+#
+# <file system>	<mount point>	<type>	<options>	<dump>	<pass>
+proc		/proc		proc	defaults	0	0
+/dev		/dev		none	rw,bind		0	0
+#/dev/pts	/dev/pts	none	rw,bind		0	0
+tmpfs		/dev/shm	tmpfs	defaults	0	0
+/sys		/sys		none	rw,bind		0	0
+/tmp		/tmp		none	rw,bind		0	0
+/home		/home		none	rw,bind		0	0
diff --git a/community-testing/schroot/arch32-nssdatabases b/community-testing/schroot/arch32-nssdatabases
new file mode 100644
index 000000000..815ddce3f
--- /dev/null
+++ b/community-testing/schroot/arch32-nssdatabases
@@ -0,0 +1,6 @@
+# System databases to copy into the chroot from the host system.
+#
+# <database name>
+passwd
+shadow
+group
diff --git a/community-testing/schroot/pam.d.schroot.patch b/community-testing/schroot/pam.d.schroot.patch
new file mode 100644
index 000000000..528acb5f7
--- /dev/null
+++ b/community-testing/schroot/pam.d.schroot.patch
@@ -0,0 +1,15 @@
+@@ -23,13 +23,6 @@
+ # time restrainst on schroot usage.
+ # account    requisite  pam_time.so
+ 
+-# The standard Unix authentication modules, used with
+-# NIS (man nsswitch) as well as normal /etc/passwd and
+-# /etc/shadow entries.
+-@include common-auth
+-@include common-account
+-@include common-session
+-
+ # Sets up user limits, please uncomment and read /etc/security/limits.conf
+ # to enable this functionality.
+ # session    required   pam_limits.so
+
diff --git a/community-testing/smc/PKGBUILD b/community-testing/smc/PKGBUILD
new file mode 100644
index 000000000..9bbdc2211
--- /dev/null
+++ b/community-testing/smc/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 67018 2012-03-03 08:14:00Z ibiru $
+# Maintainer:
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: Kritoke <typeolinux@yahoo.com>
+
+pkgname=smc
+pkgver=1.9
+pkgrel=15
+pkgdesc="Secret Maryo Chronicles"
+arch=('i686' 'x86_64')
+url="http://www.secretmaryo.org/"
+license=('GPL3')
+depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data')
+makedepends=('autoconf' 'automake' 'boost')
+source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2
+        smc-for-cegui-v0-7.diff
+        smc.desktop
+        smc.png)
+md5sums=('75ab7826303c49aec25b052a8b90287f'
+         '51dfea21b741ad19df14e738df52f1cf'
+         '80fe208132ff41dd7677a53ee429ecdb'
+         'efca7580e28748625eb676c9d24ee122')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # to remove when smc will be compatible with cegui-0.7.x
+  patch -Np1 -i "${srcdir}/smc-for-cegui-v0-7.diff"
+  # fix for boost-1.46
+  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
+
+  ./autogen.sh
+  LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make install DESTDIR="$pkgdir"
+  # install some freedesktop.org compatibility
+  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+
+  rm -rf "$pkgdir/usr/share/smc/"
+}
diff --git a/community-testing/smc/smc-for-cegui-v0-7.diff b/community-testing/smc/smc-for-cegui-v0-7.diff
new file mode 100644
index 000000000..a99cbce6c
--- /dev/null
+++ b/community-testing/smc/smc-for-cegui-v0-7.diff
@@ -0,0 +1,437 @@
+diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac
+--- smc-1.9/configure.ac	2009-08-17 15:59:00.000000000 +0200
++++ smc-1.9-b/configure.ac	2011-01-19 00:43:37.809884881 +0100
+@@ -53,7 +53,7 @@
+ 	AC_MSG_ERROR([SDL_ttf library not found]))
+ 
+ # Check for the CEGUI library
+-PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0)
++PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0)
+ CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS"
+ LIBS="$LIBS $CEGUI_LIBS"
+ 
+diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp
+--- smc-1.9/src/core/editor.cpp	2009-08-13 17:11:42.000000000 +0200
++++ smc-1.9-b/src/core/editor.cpp	2011-01-19 00:44:46.734328121 +0100
+@@ -118,16 +118,10 @@
+ 	return tmp;
+ }
+ 
+-void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const
++void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const
+ {
+ 	// draw text
+-	list_text->draw( position, alpha, clipper );
+-}
+-
+-void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const
+-{
+-	// draw text
+-	list_text->draw( cache, targetRect, zBase, alpha, clipper );
++	list_text->draw( buffer, targetRect, alpha, clipper );
+ }
+ 
+ void cEditor_Item_Object :: Draw_Image( void )
+@@ -533,12 +527,12 @@
+ 	if( editor_window->getXPosition().asRelative( 1 ) >= 0 )
+ 	{
+ 		// Listbox dimension
+-		float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley;
+-		float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley;
++		float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley;
++		float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley;
+ 		// Vertical ScrollBar Position
+ 		float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley;
+ 		// font height
+-		float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley;
++		float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley;
+ 
+ 		// draw items
+ 		for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ )
+diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h
+--- smc-1.9/src/core/editor.h	2009-02-18 05:21:30.000000000 +0100
++++ smc-1.9-b/src/core/editor.h	2011-01-19 00:43:37.809884881 +0100
+@@ -62,8 +62,7 @@
+ 	*/
+ 	virtual	CEGUI::Size getPixelSize( void ) const;
+ 	// draw
+-	void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const;
+-	void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const;
++	void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const;
+ 	// draw image
+ 	void Draw_Image( void );
+ 
+diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp
+--- smc-1.9/src/core/game_core.cpp	2009-08-16 18:44:42.000000000 +0200
++++ smc-1.9-b/src/core/game_core.cpp	2011-01-19 00:59:02.668958883 +0100
+@@ -265,7 +265,7 @@
+ 
+ 
+ 	// align text
+-	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ 	// fixme : Can't handle multiple lines of text
+ 	float text_width = font->getTextExtent( text ) * global_downscalex;
+ 
+@@ -1182,7 +1182,7 @@
+ 	text_default->setText( gui_text );
+ 
+ 	// align text
+-	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ 	float text_width = font->getTextExtent( gui_text ) * global_downscalex;
+ 
+ 	text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) );
+@@ -1190,7 +1190,7 @@
+ 	text_default->moveToFront();
+ 
+ 	// set window height
+-	text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) );
++	text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) );
+ 
+ 	while( draw )
+ 	{
+diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp
+--- smc-1.9/src/core/main.cpp	2009-05-12 10:36:04.000000000 +0200
++++ smc-1.9-b/src/core/main.cpp	2011-01-19 00:43:37.809884881 +0100
+@@ -444,13 +444,15 @@
+ 
+ 	if( pGuiSystem )
+ 	{
+-		delete pGuiSystem;
++		CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider();
++		pGuiSystem->destroy();
+ 		pGuiSystem = NULL;
++		delete rp;
+ 	}
+ 
+ 	if( pGuiRenderer )
+ 	{
+-		delete pGuiRenderer;
++		pGuiRenderer->destroy( *pGuiRenderer );
+ 		pGuiRenderer = NULL;
+ 	}
+ 
+@@ -507,7 +509,7 @@
+ 		}
+ 		case SDL_VIDEORESIZE:
+ 		{
+-			pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) );
++			pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) );
+ 			break;
+ 		}
+ 		case SDL_KEYDOWN:
+diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp
+--- smc-1.9/src/gui/hud.cpp	2009-05-01 15:00:16.000000000 +0200
++++ smc-1.9-b/src/gui/hud.cpp	2011-01-19 00:43:37.816550365 +0100
+@@ -946,7 +946,7 @@
+ 		m_text_debug_text->setVisible( 1 );
+ 
+ 		// update position
+-		CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++		CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ 		float text_width = font->getTextExtent( gui_text ) * global_downscalex;
+ 
+ 		if( text_width > 800.0f )
+diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp
+--- smc-1.9/src/input/mouse.cpp	2009-04-24 21:16:58.000000000 +0200
++++ smc-1.9-b/src/input/mouse.cpp	2011-01-19 00:43:37.813217623 +0100
+@@ -432,17 +432,12 @@
+ 
+ void cMouseCursor :: Render( void ) const
+ {
+-	if( !m_active )
+-	{
++	CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
++
++	if ( m_active == mouse->isVisible() )
+ 		return;
+-	}
+ 
+-	// Render CEGUI Mouse
+-	pGuiRenderer->setQueueingEnabled( 0 );
+-	CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
+-	mouse->setVisible( 1 );
+-	mouse->draw();
+-	mouse->setVisible( 0 );
++	mouse->setVisible( m_active );
+ }
+ 
+ void cMouseCursor :: Update_Position( void )
+diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp
+--- smc-1.9/src/level/level_settings.cpp	2009-08-07 03:04:28.000000000 +0200
++++ smc-1.9-b/src/level/level_settings.cpp	2011-01-19 01:06:59.064259070 +0100
+@@ -163,8 +163,8 @@
+ 	editbox->setText( int_to_string( bg_color_2.blue ).c_str() );
+ 	// preview window
+ 	CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
+-	background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 );
+-	background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 );
++	background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 );
++	background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 );
+ 
+ 	Update_BG_Colors( CEGUI::EventArgs() );
+ 
+@@ -555,8 +555,8 @@
+ 
+ 	// set default rect
+ 	CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
+-	background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex;
+-	background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley;
++	background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex;
++	background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley;
+ 
+ 	if( !File_Exists( filename ) )
+ 	{
+diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp
+--- smc-1.9/src/objects/sprite.cpp	2009-04-18 09:55:06.000000000 +0200
++++ smc-1.9-b/src/objects/sprite.cpp	2011-01-19 00:43:37.813217623 +0100
+@@ -1663,7 +1663,7 @@
+ 	window_name->setText( name );
+ 	window_name->setTooltipText( tooltip );
+ 	// get text width
+-	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ 	float text_width = 12 + font->getTextExtent( name ) * global_downscalex;
+ 	// all names should have the same width
+ 	if( text_width > m_editor_window_name_width )
+diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp
+--- smc-1.9/src/video/video.cpp	2009-07-04 11:46:56.000000000 +0200
++++ smc-1.9-b/src/video/video.cpp	2011-01-19 01:22:45.338524592 +0100
+@@ -103,15 +103,15 @@
+ 
+ /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
+ 
+-cFake_Renderer :: cFake_Renderer( void )
+-{
+-	d_identifierString = "Fake Renderer";
+-}
++//cFake_Renderer :: cFake_Renderer( void )
++//{
++//	d_identifierString = "Fake Renderer";
++//}
+ 
+-cFake_Renderer :: ~cFake_Renderer( void )
+-{
++//cFake_Renderer :: ~cFake_Renderer( void )
++//{
+ 
+-}
++//}
+ 
+ /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
+ 
+@@ -158,7 +158,7 @@
+ 	std::string log_dump_dir = "/dev/null";
+ #endif
+ 	// create fake system and renderer
+-	pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir );
++	pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir );
+ }
+ 
+ void cVideo :: Delete_CEGUI_Fake( void ) const
+@@ -166,7 +166,7 @@
+ 	CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider();
+ 	CEGUI::Renderer *renderer = pGuiSystem->getRenderer();
+ 
+-	delete pGuiSystem;
++	pGuiSystem->destroy();
+ 	pGuiSystem = NULL;
+ 	delete renderer;
+ 	delete rp;
+@@ -177,7 +177,7 @@
+ 	// create renderer
+ 	try
+ 	{
+-		pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h );
++		pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) );
+ 	}
+ 	// catch CEGUI Exceptions
+ 	catch( CEGUI::Exception &ex )
+@@ -186,10 +186,10 @@
+ 		exit( EXIT_FAILURE );
+ 	}
+ 
+-	/* create Resource Provider
+-	 * no need to destroy it later since it is handled by the CEGUI renderer
+-	*/
+-	CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider());
++	pGuiRenderer->enableExtraStateSettings(true);
++
++	// create Resource Provider
++	CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider;
+ 
+ 	// set Resource Provider directories
+ 	rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" );
+@@ -215,7 +215,7 @@
+ 	// create system
+ 	try
+ 	{
+-		pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
++		pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
+ 	}
+ 	// catch CEGUI Exceptions
+ 	catch( CEGUI::Exception &ex )
+@@ -242,7 +242,7 @@
+ 	// load the scheme file, which auto-loads the imageset
+ 	try
+ 	{
+-		CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );
++		CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" );
+ 	}
+ 	// catch CEGUI Exceptions
+ 	catch( CEGUI::Exception &ex )
+@@ -254,9 +254,7 @@
+ 	// default mouse cursor
+ 	pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );
+ 	// force new mouse image
+-	CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) );
+-	// hide CEGUI mouse always because we render it manually
+-	CEGUI::MouseCursor::getSingleton().hide();
++	CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) );
+ 	// default tooltip
+ 	pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" );
+ 	// create default root window
+@@ -553,7 +551,7 @@
+ 		pFont->Restore_Textures();
+ 
+ 		// send new size to CEGUI
+-		pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
++		pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
+ 
+ 		// check if CEGUI is initialized
+ 		bool cegui_initialized = pGuiSystem->getGUISheet() != NULL;
+diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h
+--- smc-1.9/src/video/video.h	2009-07-04 10:49:50.000000000 +0200
++++ smc-1.9-b/src/video/video.h	2011-01-19 01:16:42.791283379 +0100
+@@ -23,7 +23,7 @@
+ #include "SDL_opengl.h"
+ // CEGUI
+ #include "CEGUI.h"
+-#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h"
++#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>
+ 
+ namespace SMC
+ {
+@@ -129,31 +129,100 @@
+ 	EFFECT_IN_AMOUNT
+ };
+ 
+-/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
++/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */
++// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did...
++class cFake_GeometryBuffer : public CEGUI::GeometryBuffer
++{
++	void draw() const {}
++	void setTranslation(const CEGUI::Vector3&) {}
++	void setRotation(const CEGUI::Vector3&) {}
++	void setPivot(const CEGUI::Vector3&) {}
++	void setClippingRegion(const CEGUI::Rect&) {}
++	void appendVertex(const CEGUI::Vertex&) {}
++	void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {}
++	void setActiveTexture(CEGUI::Texture*) {}
++	void reset() {}
++	CEGUI::Texture* getActiveTexture() const { return 0; }
++	CEGUI::uint getVertexCount() const { return 0; }
++	CEGUI::uint getBatchCount() const { return 0; }
++	void setRenderEffect(CEGUI::RenderEffect*) {}
++	CEGUI::RenderEffect* getRenderEffect() { return 0; }
++};
+ 
+-class cFake_Renderer : public CEGUI::Renderer
++class cFake_Texture : public CEGUI::Texture
++{
++public:
++	cFake_Texture() :
++	  m_size(1, 1),
++	  m_scaling(1, 1) {}
++
++	const CEGUI::Size& getSize() const { return m_size; }
++	const CEGUI::Size& getOriginalDataSize() const { return m_size; }
++	const CEGUI::Vector2& getTexelScaling() const { return m_scaling; }
++	void loadFromFile(const CEGUI::String&, const CEGUI::String&) {}
++	void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {}
++	void saveToMemory(void*) {}
++
++private:
++	CEGUI::Size m_size;
++	CEGUI::Vector2 m_scaling;
++};
++
++class cFake_RenderTarget : public CEGUI::RenderTarget
+ {
+ public:
+-	cFake_Renderer( void );
+-	virtual ~cFake_Renderer( void );
++	cFake_RenderTarget() : m_area(0, 0, 0, 0) {}
++	void draw(const CEGUI::GeometryBuffer&) {}
++	void draw(const CEGUI::RenderQueue&) {}
++	void setArea(const CEGUI::Rect&) {}
++	const CEGUI::Rect& getArea() const { return m_area; }
++	bool isImageryCache() const { return false; }
++	void activate() {}
++	void deactivate() {}
++	void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {}
++
++private:
++	CEGUI::Rect m_area;
++};
+ 
+-	virtual	void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {};
+-	virtual	void doRender(void) {};
+-	virtual	void clearRenderList(void) {};
+-	virtual void setQueueingEnabled(bool setting) {};
+-	virtual	CEGUI::Texture *createTexture(void) { return NULL; };
+-	virtual	CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; };
+-	virtual	CEGUI::Texture *createTexture(float size) { return NULL; };
+-	virtual	void destroyTexture(CEGUI::Texture* texture) {};
+-	virtual void destroyAllTextures(void) {};
+-	virtual bool isQueueingEnabled(void) const { return 0; };
+-	virtual float getWidth(void) const { return 0; };
+-	virtual float getHeight(void) const { return 0; };
+-	virtual CEGUI::Size getSize(void) const { return CEGUI::Size();};
+-	virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();};
+-	virtual	unsigned int getMaxTextureSize(void) const { return 0; };
+-	virtual	unsigned int getHorzScreenDPI(void) const { return 0; };
+-	virtual	unsigned int getVertScreenDPI(void) const { return 0; };
++class cFake_Renderer : public CEGUI::Renderer
++{
++public:
++	cFake_Renderer( void ) :
++	  m_size(0, 0),
++	  m_dpi(0, 0),
++	  m_identifierString("Fake Renderer"),
++	  m_root(m_target) {}
++	~cFake_Renderer( void ) {}
++
++	CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; }
++	CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; }
++	void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {}
++	void destroyAllGeometryBuffers() {}
++	CEGUI::TextureTarget* createTextureTarget() { return 0; }
++	void destroyTextureTarget(CEGUI::TextureTarget*) {}
++	void destroyAllTextureTargets() {}
++	CEGUI::Texture& createTexture() { return m_texture; }
++	CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; }
++	CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; }
++	void destroyTexture(CEGUI::Texture&) {}
++	void destroyAllTextures() {}
++	void beginRendering() {}
++	void endRendering() {}
++	void setDisplaySize(const CEGUI::Size&) {}
++	const CEGUI::Size& getDisplaySize() const { return m_size; }
++	const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; }
++	CEGUI::uint getMaxTextureSize() const { return 0; }
++	const CEGUI::String& getIdentifierString() const { return m_identifierString; }
++
++private:
++	CEGUI::Size m_size;
++	CEGUI::Vector2 m_dpi;
++	CEGUI::String m_identifierString;
++	cFake_GeometryBuffer m_geometry;
++	cFake_Texture m_texture;
++	cFake_RenderTarget m_target;
++	CEGUI::RenderingRoot m_root;
+ };
+ 
+ /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
diff --git a/community-testing/smc/smc.desktop b/community-testing/smc/smc.desktop
new file mode 100644
index 000000000..6cfe5b018
--- /dev/null
+++ b/community-testing/smc/smc.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Secret Maryo Chronicles
+GenericName=Arcade Game
+Exec=smc
+Icon=smc.png
+Terminal=false
+Type=Application
+Categories=Game;ArcadeGame;KidsGame;
+StartupNotify=false
+\ No newline at end of file
diff --git a/community-testing/smc/smc.png b/community-testing/smc/smc.png
new file mode 100644
index 000000000..f02af1bfc
--- /dev/null
+++ b/community-testing/smc/smc.png
diff --git a/community-testing/spring/PKGBUILD b/community-testing/spring/PKGBUILD
new file mode 100644
index 000000000..0fa8affa7
--- /dev/null
+++ b/community-testing/spring/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 67020 2012-03-03 08:14:04Z ibiru $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=spring
+pkgver=0.86.0
+_pkgver=86.0
+pkgrel=2
+pkgdesc='A free 3D real-time-strategy (RTS) game engine'
+arch=('i686' 'x86_64')
+url="http://springrts.com/"
+license=('GPL')
+depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl'
+         'libxcursor')
+makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2' 'java-environment')
+optdepends=('python2: python-based bots'
+            'java-runtime: java-based bots')
+source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
+md5sums=('047511adf2e4cd711df61d556367e7af')
+
+build() {
+  bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
+  
+  cd spring_${_pkgver}
+ 
+  cmake	. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+	-DDATADIR=share/spring
+  make
+}
+
+package() {
+  cd spring_${_pkgver}
+
+  make DESTDIR=$pkgdir install
+
+  install -d $pkgdir/etc/spring
+  echo '$HOME/.spring' > $pkgdir/etc/spring/datadir
+}
+
+# vim sw=2:ts=2 et:
diff --git a/community-testing/springlobby/PKGBUILD b/community-testing/springlobby/PKGBUILD
new file mode 100644
index 000000000..eb0575480
--- /dev/null
+++ b/community-testing/springlobby/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 67022 2012-03-03 08:14:16Z ibiru $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: DuGi <dugi@irc.pl>
+
+pkgname=springlobby
+pkgver=0.141
+pkgrel=2
+pkgdesc="A free cross-platform lobby client for the Spring RTS project."
+arch=('i686' 'x86_64')
+url="http://springlobby.info/"
+license=('GPL2')
+depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs')
+optdepends=('sdl' 'sdl_sound' 'sdl_mixer') 
+makedepends=('boost' 'asio' 'cmake')
+install=springlobby.install
+source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 
+        springlobby.desktop
+        springlobby.png)
+md5sums=('a7e5a9b031a1e72a1df59575289fed3f'
+         '45f8b59d033931d02e734fe3bd7777dd'
+         '1f388187539aeb0358b51995e26ed890')
+
+build() {
+  cd $srcdir/${pkgname}-$pkgver
+
+  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
+
+  sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt
+
+  cmake . \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DOPTION_SOUND=false
+  make 
+}
+
+package() {
+  cd $srcdir/${pkgname}-$pkgver
+
+  make DESTDIR=$pkgdir install
+  
+  install -m755 -d $pkgdir/usr/share/applications
+  install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications
+
+  install -m755 -d -p $pkgdir/usr/share/pixmaps
+  install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps
+}
+
+# vim: sw=2:ts=2 et:
diff --git a/community-testing/springlobby/springlobby.desktop b/community-testing/springlobby/springlobby.desktop
new file mode 100644
index 000000000..1dce96b90
--- /dev/null
+++ b/community-testing/springlobby/springlobby.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=SpringLobby
+Comment=Lobby for Spring. An open source RTS with similar gameplay to TA
+Exec=springlobby
+Icon=springlobby.png
+Terminal=false
+Type=Application
+Categories=Application;Game;StrategyGame;
diff --git a/community-testing/springlobby/springlobby.install b/community-testing/springlobby/springlobby.install
new file mode 100644
index 000000000..1a05f573e
--- /dev/null
+++ b/community-testing/springlobby/springlobby.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community-testing/springlobby/springlobby.png b/community-testing/springlobby/springlobby.png
new file mode 100644
index 000000000..89c7ab0ac
--- /dev/null
+++ b/community-testing/springlobby/springlobby.png
diff --git a/community-testing/tagpy/PKGBUILD b/community-testing/tagpy/PKGBUILD
new file mode 100644
index 000000000..99b9b60b7
--- /dev/null
+++ b/community-testing/tagpy/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 67024 2012-03-03 08:14:22Z ibiru $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
+# Contributor: Scott Horowitz <stonecrest@gmail.com>
+
+pkgname=tagpy
+pkgver=0.94.8
+pkgrel=7
+pkgdesc="Python bindings for TagLib"
+arch=('i686' 'x86_64')
+url="http://pypi.python.org/pypi/tagpy"
+license=('MIT')
+depends=('python2' 'taglib' 'boost-libs')
+makedepends=('python2-distribute' 'boost')
+source=("http://pypi.python.org/packages/source/t/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('6baff63318cf90b9bc5a2497a0597802')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+    $(find . -name '*.py') 
+ 
+  ./configure.py --taglib-lib-dir=/usr/lib/ \
+  	--taglib-inc-dir=/usr/include/taglib/ \
+	--boost-inc-dir=/usr/include/boost/ \
+	--boost-lib-dir=/usr/lib/ \
+	--boost-python-libname=boost_python
+  python2 setup.py build
+}
+
+package(){
+  cd ${srcdir}/${pkgname}-${pkgver}
+  python2 setup.py install --root="${pkgdir}" --optimize=1
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/community-testing/twinkle/PKGBUILD b/community-testing/twinkle/PKGBUILD
new file mode 100644
index 000000000..fec2fb473
--- /dev/null
+++ b/community-testing/twinkle/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 67026 2012-03-03 08:14:28Z ibiru $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Jeff Mickey <jeff@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+
+pkgname=twinkle
+pkgver=1.4.2
+pkgrel=15
+pkgdesc="Softphone for voice over IP and IM communication using SIP"
+arch=('x86_64' 'i686')
+url="http://www.twinklephone.com/"
+license=('GPL')
+depends=('file' 'speex' 'boost-libs' 'libsndfile' 'qt3' 'libzrtpcpp')
+makedepends=('pkg-config' 'boost')
+source=("http://www.xs4all.nl/~mfnboer/$pkgname/download/$pkgname-$pkgver.tar.gz"
+        "twinkle.desktop")
+sha256sums=('807686c7ac1b54bb0ea27ff4be362db6926d1d3d6f1802f6d359a353157e89a5'
+            '88578b314f434d88ef387ee8bf541dcdd4dfeffba161c1c66e43ac54103b3862')
+sha256sums=('807686c7ac1b54bb0ea27ff4be362db6926d1d3d6f1802f6d359a353157e89a5'
+            '88578b314f434d88ef387ee8bf541dcdd4dfeffba161c1c66e43ac54103b3862')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  . /etc/profile.d/qt3.sh
+  ./configure --prefix=/usr \
+	--without-kde \
+	--with-speex \
+	--without-ilbc \
+	--mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -Dm644 "$pkgdir/usr/share/twinkle/twinkle48.png" \
+    "$pkgdir/usr/share/pixmaps/twinkle.png"
+  install -Dm644 twinkle.desktop \
+    "$pkgdir/usr/share/applications/twinkle.desktop"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/twinkle/twinkle.desktop b/community-testing/twinkle/twinkle.desktop
new file mode 100644
index 000000000..60688b5fe
--- /dev/null
+++ b/community-testing/twinkle/twinkle.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Twinkle
+Comment=SIP softphone for Qt
+Icon=twinkle.png
+Exec=twinkle
+Terminal=false
+Type=Application
+Categories=Network;
+StartupNotify=false
diff --git a/community-testing/wesnoth/PKGBUILD b/community-testing/wesnoth/PKGBUILD
new file mode 100644
index 000000000..35e8b4cd0
--- /dev/null
+++ b/community-testing/wesnoth/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 67028 2012-03-03 08:14:39Z ibiru $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Jacobo Arvelo <unix4all@ya.com>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+
+pkgname=wesnoth
+pkgver=1.10.1
+pkgrel=2
+pkgdesc="A turn-based strategy game on a fantasy world"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.wesnoth.org/"
+depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data" 'dbus-core' 'python2')
+makedepends=('boost' 'cmake')
+install=wesnoth.install
+options=(!emptydirs)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
+        wesnoth.tmpfiles.conf
+        wesnothd.rc.d)
+md5sums=('a2ac2d629d4e3e5fc7e7e48f935d9960'
+         'b8122f5054e3895c9c054e87460869dc'
+         '85659b47d22dfdf4e4d046556973fc3e')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  mkdir build && cd build
+  cmake .. \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DENABLE_OMP=ON \
+      -DENABLE_TOOLS=ON \
+      -DMANDIR=share/man \
+      -DFIFO_DIR=/var/run/wesnothd
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  rm -r $pkgdir/usr/share/applications
+  rm -r $pkgdir/usr/share/doc
+  rm -r $pkgdir/usr/share/pixmaps
+  rm -r $pkgdir/usr/share/wesnoth
+
+  install -Dm644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf"
+  install -Dm755 "$srcdir/wesnothd.rc.d" "$pkgdir/etc/rc.d/wesnothd"
+}
diff --git a/community-testing/wesnoth/wesnoth.install b/community-testing/wesnoth/wesnoth.install
new file mode 100644
index 000000000..4f1e419ae
--- /dev/null
+++ b/community-testing/wesnoth/wesnoth.install
@@ -0,0 +1,9 @@
+# arg 1:  the new package version
+post_install() {
+cat << EOF
+Note:
+==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma"
+==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth
+==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output.
+EOF
+}
diff --git a/community-testing/wesnoth/wesnoth.tmpfiles.conf b/community-testing/wesnoth/wesnoth.tmpfiles.conf
new file mode 100644
index 000000000..3ec0f6013
--- /dev/null
+++ b/community-testing/wesnoth/wesnoth.tmpfiles.conf
@@ -0,0 +1 @@
+D /run/wesnothd 0700 root root -
diff --git a/community-testing/wesnoth/wesnothd.rc.d b/community-testing/wesnoth/wesnothd.rc.d
new file mode 100755
index 000000000..95e312b7b
--- /dev/null
+++ b/community-testing/wesnoth/wesnothd.rc.d
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=$(pidof -o %PPID /usr/bin/wesnothd)
+
+case "$1" in
+  start)
+    stat_busy "Starting Wesnoth Server Daemon"
+    [[ -d /var/run/wesnothd ]] || mkdir /var/run/wesnothd
+    [ -z "$PID" ] && /usr/bin/wesnothd -d &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      PID=$(pidof -o %PPID /usr/bin/wesnothd)
+      echo $PID > /var/run/wesnotd/pid
+      add_daemon wesnothd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Wesnoth Server Daemon"
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon wesnothd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community-testing/wt/PKGBUILD b/community-testing/wt/PKGBUILD
new file mode 100644
index 000000000..f77371f96
--- /dev/null
+++ b/community-testing/wt/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 67030 2012-03-03 08:14:45Z ibiru $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Denis Martinez <deuns.martinez@gmail.com>
+
+pkgname=wt
+pkgver=3.2.0
+pkgrel=3
+pkgdesc="a C++ library and application server for developing and deploying web applications"
+arch=('i686' 'x86_64')
+url="http://www.webtoolkit.eu/"
+license=('GPL')
+depends=('boost-libs>=1.36')
+makedepends=('boost>=1.36' 'cmake>=2.8'
+	     'postgresql-libs' 'zlib' 'fcgi' 'sqlite3' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt')
+optdepends=('openssl: for SSL support in built-in webserver'
+	    'zlib: for compression in HTTP protocol'
+	    'fcgi: for FastCGI support'
+	    'postgresql-libs: for PostgreSQL Dbo support'
+	    'sqlite3: for Sqlite3 Dbo support'
+	    'libharu: for PDF generation (WPdfImage)'
+	    'graphicsmagick: for raster image support (WRasterImage)'
+	    'pango: for advanced font rendering (WRasterImage)'
+	    'mysql++: for the hangman example'
+	    'qt: for the Wt/Qt interopability example (wtwithqt)')
+backup=('etc/wt/wt_config.xml')
+source=(http://downloads.sourceforge.net/witty/$pkgname-${pkgver}.tar.gz)
+md5sums=('82ff039bccf7a941b37142c9d3fc7f32')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  mkdir -p build
+  cd build
+  cmake -DCONNECTOR_HTTP=ON -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWEBUSER=http -DWEBGROUP=http -DRUNDIR=/var/run/wt -DDEPLOYROOT=/var/www/wt \
+    -DUSE_SYSTEM_SQLITE3=ON -DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \
+    -DDESTDIR=${pkgdir} -DWT_CMAKE_FINDER_INSTALL_DIR="share/cmake-2.8/Modules" ..
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}/build
+  make DESTDIR=${pkgdir} install
+  rm -rf $pkgdir/var/run
+}
diff --git a/community-testing/wt/wt-boost-1.47.patch b/community-testing/wt/wt-boost-1.47.patch
new file mode 100644
index 000000000..919e1371f
--- /dev/null
+++ b/community-testing/wt/wt-boost-1.47.patch
@@ -0,0 +1,11 @@
+diff -wbBur wt-3.1.10.q/src/CMakeLists.txt wt-3.1.10/src/CMakeLists.txt
+--- wt-3.1.10.q/src/CMakeLists.txt	2011-07-26 00:58:19.000000000 +0400
++++ wt-3.1.10/src/CMakeLists.txt	2011-06-24 18:51:54.000000000 +0400
+@@ -236,6 +236,7 @@
+ web/TimeUtil.C
+ web/XSSFilter.C
+ web/XSSUtils.C
++web/random_device.cpp
+ web/base64.cpp
+ Plain_html.C
+ Boot_html.C
diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD
index f6968e962..2eec21229 100644
--- a/community/gtk2hs-buildtools/PKGBUILD
+++ b/community/gtk2hs-buildtools/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 57325 2011-10-25 20:41:56Z spupykin $
+# $Id: PKGBUILD 67044 2012-03-03 16:09:25Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=gtk2hs-buildtools
 pkgver=0.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries."
 url="http://hackage.haskell.org/package/gtk2hs-buildtools"
 license=('GPL2')
 arch=('i686' 'x86_64')
-makedepends=('ghc' 'alex' 'happy')
+makedepends=('ghc' 'alex' 'happy' 'haskell-random')
 depends=('gmp')
 options=('strip')
 provides=('haskell-gtk2hs-buildtools')
diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD
index 1db2fa2bd..63b99f4ca 100644
--- a/community/gtkwave/PKGBUILD
+++ b/community/gtkwave/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64826 2012-02-18 13:49:20Z kkeen $
+# $Id: PKGBUILD 66978 2012-03-03 05:41:51Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Jared Casper <jaredcasper@gmail.com>
 
 pkgname=gtkwave
-pkgver=3.3.32
+pkgver=3.3.33
 pkgrel=1
 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files'
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2')
 makedepends=('gperf')
 install='gtkwave.install'
 source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz")
-md5sums=('716bba48c1898e39c81b43118e192ac3')
+md5sums=('18a8acc803814d4873fd342bc70b6b8a')
 
 build() {
   cd "${srcdir}/gtkwave-${pkgver}"
diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD
index 92b3bec3e..b7f9b44bc 100644
--- a/community/haddock/PKGBUILD
+++ b/community/haddock/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 59136 2011-11-21 12:20:52Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Maintainer: 
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 pkgname=haddock
-pkgver=2.9.2
-pkgrel=4
+pkgver=2.10.0
+pkgrel=1
 pkgdesc="Tool for generating documentation for Haskell libraries"
-url="http://hackage.haskell.org/package/$pkgname"
+url="http://hackage.haskell.org/package/haddock"
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
 makedepends=('alex' 'happy')
-depends=('ghc' 'haskell-mtl' 'haskell-xhtml>=3000.2' 'haskell-ghc-paths') 
-options=(strip)
-install=haddock.install
+depends=('ghc=7.4.1-2' 'haskell-xhtml=3000.2.0.5-2' 'haskell-ghc-paths=0.1.0.8-7') # 'haskell-mtl'
+install=$pkgname.install
 source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('04928e132827a1da20ace52babb43e47')
+sha256sums=('d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   
+  # These doesn't make haddock work for ghc 7.4.1
   #sed -i 's:ghc >= 7.2 && < 7.4:ghc:' haddock.cabal
+  #sed -i 's:base >= 4.3 && < 4.5:base:' haddock.cabal
+  #sed -i 's:#elif __GLASGOW_HASKELL__ == 703:#elif __GLASGOW_HASKELL__ == 704:' src/Haddock/InterfaceFile.hs
+
   runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
     --docdir=/usr/share/doc/"$pkgname" --libsubdir=\$compiler/site-local/\$pkgid
   runhaskell Setup build
@@ -41,5 +45,3 @@ package() {
   rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
   mv "$pkgdir/usr/bin/haddock" "$pkgdir/usr/bin/haddock-cabal"
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/haskell-binary/PKGBUILD b/community/haskell-binary/PKGBUILD
index ae5bcab42..f3651c935 100644
--- a/community/haskell-binary/PKGBUILD
+++ b/community/haskell-binary/PKGBUILD
@@ -1,18 +1,20 @@
+# $Id: PKGBUILD 67046 2012-03-03 16:09:33Z tdziedzic $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 pkgname=haskell-binary
-pkgver=0.5.0.2
-pkgrel=8
+pkgver=0.5.1.0
+pkgrel=1
 pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings"
 url="http://hackage.haskell.org/package/binary"
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-depends=(ghc=7.0.3-2 sh)
+depends=(ghc=7.4.1 sh)
 options=('strip')
 source=("http://hackage.haskell.org/packages/archive/binary/$pkgver/binary-$pkgver.tar.gz")
 install=haskell-binary.install
-md5sums=('6bf8f3d1441602c9ab09a75e3bd6e926')
+sha256sums=('2ad477b47e9158d61517689f5f0c7b0240ff891059418d6758879020800351a3')
 
 build() {
   cd "$srcdir/binary-$pkgver"
diff --git a/community/haskell-binary/haskell-binary.install b/community/haskell-binary/haskell-binary.install
index 0084ebef8..844b8a67c 100644
--- a/community/haskell-binary/haskell-binary.install
+++ b/community/haskell-binary/haskell-binary.install
@@ -1,18 +1,24 @@
 HS_DIR=usr/share/haskell/haskell-binary
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
+
 pre_upgrade() {
   ${HS_DIR}/unregister.sh
 }
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
 post_upgrade() {
   ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  post_remove
 }
-pre_remove() {
-  ${HS_DIR}/unregister.sh
+
+post_install() {
+  post_upgrade
 }
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+
+pre_remove() {
+  pre_upgrade
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD
index 2ee9c0cb4..576ac74a3 100644
--- a/community/haskell-bytestring-show/PKGBUILD
+++ b/community/haskell-bytestring-show/PKGBUILD
@@ -1,23 +1,18 @@
-# $Id$
+# $Id: PKGBUILD 67048 2012-03-03 16:09:42Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-bytestring-show
-pkgver=0.3.5
-pkgrel=1
+pkgver=0.3.5.1
+pkgrel=2
 pkgdesc="Efficient conversion of values into readable byte strings."
 url="http://code.haskell.org/~dolio/"
 license=("BSD3")
 arch=('i686' 'x86_64')
 makedepends=()
-depends=("ghc=7.0.3"
-         "haskell-array=0.3.0.2"
-         "haskell-binary=0.5.0.2"
-         "haskell-bytestring=0.9.1.10"
-         "haskell-containers=0.4.0.0")
-options=('strip')
+depends=("ghc=7.4.1-2")
 install="${pkgname}.install"
 source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz")
-md5sums=('934edba94aeceef6e9fc1b174d4f94ea')
+md5sums=('7396bc2e8f88dedc3374c3f12f24e4bd')
 
 build() {
   cd ${srcdir}/bytestring-show-${pkgver}
diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD
index 4d58b76ea..05b65a6ee 100644
--- a/community/haskell-cairo/PKGBUILD
+++ b/community/haskell-cairo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58942 2011-11-20 18:00:00Z spupykin $
+# $Id: PKGBUILD 67050 2012-03-03 16:09:51Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-cairo
 pkgver=0.12.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Binding to the cairo library for Gtk2Hs."
 url="http://hackage.haskell.org/package/cairo"
 license=('LGPL2.1')
@@ -20,6 +20,7 @@ md5sums=('b3583136fe84d25cd9d4f7bda3c3db0c')
 
 build() {
     cd ${srcdir}/cairo-$pkgver
+    sed -i 's#cToBool :: Num a => a -> Bool#cToBool :: (Eq a, Num a) => a -> Bool#' Graphics/Rendering/Cairo/Types.chs
     runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
       --prefix=/usr --docdir=/usr/share/doc/haskell-cairo \
       --libsubdir=\$compiler/site-local/\$pkgid
diff --git a/community/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD
index cd94ed17c..729f0b7d4 100644
--- a/community/haskell-dataenc/PKGBUILD
+++ b/community/haskell-dataenc/PKGBUILD
@@ -1,19 +1,20 @@
+# $Id: PKGBUILD 67052 2012-03-03 16:10:16Z tdziedzic $
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.5
+
 _hkgname=dataenc
 pkgname=haskell-dataenc
-pkgver=0.13.0.4
-pkgrel=3.2
+pkgver=0.14.0.3
+pkgrel=1
 pkgdesc="Data encoding library"
 url="http://hackage.haskell.org/package/dataenc"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
+depends=('ghc=7.4.1-2' sh)
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('4764fa7f75ed3ee95a759d67d1347d46')
+md5sums=('643a8c022b9c840f801faf9a661fe637')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD
index e90cf6dc0..73dd03a21 100644
--- a/community/haskell-ghc-paths/PKGBUILD
+++ b/community/haskell-ghc-paths/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 58269 2011-11-09 16:24:41Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Maintainer:
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 pkgname=haskell-ghc-paths
 pkgver=0.1.0.8
-pkgrel=5
+pkgrel=7
 pkgdesc="Knowledge of GHC's installation directories"
 url="http://hackage.haskell.org/package/ghc-paths"
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-makedepends=()
-depends=(ghc=7.0.3-2)
-options=('strip')
+depends=('ghc=7.4.1-2')
 source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz")
 install=haskell-ghc-paths.install
 md5sums=('d2b23dc563888e380588501d2ce1d82b')
@@ -42,4 +41,5 @@ package() {
   install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
 }
+
 # vim:set ts=2 sw=2 et:
diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD
index 7adc33eaf..1f31860dc 100644
--- a/community/haskell-glib/PKGBUILD
+++ b/community/haskell-glib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58944 2011-11-20 18:01:09Z spupykin $
+# $Id: PKGBUILD 67054 2012-03-03 16:10:24Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-glib
 pkgver=0.12.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Binding to the GLIB library for Gtk2Hs."
 url="http://hackage.haskell.org/package/glib"
 license=('LGPL2.1')
@@ -20,6 +20,7 @@ md5sums=('5d8a04be9a975fb70c6508f95aeb3265')
 
 build() {
     cd ${srcdir}/glib-$pkgver
+    sed -i 's|cap=rts_evalIO|rts_evalIO|' System/Glib/hsgclosure.c
     runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
       --prefix=/usr --docdir=/usr/share/doc/haskell-glib \
       --libsubdir=\$compiler/site-local/\$pkgid
diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD
index 0a5bb037d..415881fe9 100644
--- a/community/haskell-gtk/PKGBUILD
+++ b/community/haskell-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58946 2011-11-20 18:02:05Z spupykin $
+# $Id: PKGBUILD 67056 2012-03-03 16:10:32Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-gtk
 pkgver=0.12.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Binding to the gtk library for Gtk2Hs."
 url="http://hackage.haskell.org/package/gtk"
 license=('LGPL2.1')
diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD
index 5a6124fd3..eacb744ee 100644
--- a/community/haskell-haskeline/PKGBUILD
+++ b/community/haskell-haskeline/PKGBUILD
@@ -1,19 +1,20 @@
+# $Id: PKGBUILD 67058 2012-03-03 16:10:40Z tdziedzic $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
+
 _hkgname=haskeline
 pkgname=haskell-haskeline
-pkgver=0.6.3.2
-pkgrel=2.2
+pkgver=0.6.4.6
+pkgrel=1
 pkgdesc="A command-line interface for user input, written in Haskell."
 url="http://hackage.haskell.org/package/haskeline"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' sh 'haskell-utf8-string=0.3.6-7.2' 'haskell-mtl=2.0.1.0-3.1' 'haskell-terminfo=0.3.1.3')
-options=('strip')
+depends=('ghc=7.4.1-2' 'sh' 'haskell-utf8-string=0.3.7-1' 'haskell-mtl=2.0.1.0-4' 'haskell-terminfo=0.3.2.3-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('d75863f63a1cfb499d0198e4f28ac2af')
+md5sums=('c43d01e3ea23eed266060391ca680a76')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD
index 8b58c7f3e..76e4d10a8 100644
--- a/community/haskell-hslogger/PKGBUILD
+++ b/community/haskell-hslogger/PKGBUILD
@@ -1,17 +1,15 @@
-# $Id: PKGBUILD 57050 2011-10-19 10:31:34Z spupykin $
+# $Id: PKGBUILD 67060 2012-03-03 16:10:47Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
 
-_hkgname=hslogger
 pkgname=haskell-hslogger
 pkgver=1.1.5
-pkgrel=1
+pkgrel=6
 pkgdesc="Versatile logging framework"
 url="http://hackage.haskell.org/package/hslogger"
 license=('LGPL')
 arch=('i686' 'x86_64')
-depends=('ghc' 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2')
-options=('strip')
+depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-network=2.3.0.11-1')
 install=${pkgname}.install
 source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz)
 md5sums=('cd3dfd6f88176bd53b333ea29130a857')
@@ -29,9 +27,6 @@ build() {
 }
 
 package() {
-  _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-  depends=("ghc=${_ghcver}" 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2')
-
   cd ${srcdir}/hslogger-${pkgver}
   install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
   install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD
index def9c2c71..ff6d0017b 100644
--- a/community/haskell-pango/PKGBUILD
+++ b/community/haskell-pango/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58948 2011-11-20 18:06:21Z spupykin $
+# $Id: PKGBUILD 67062 2012-03-03 16:10:53Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-pango
 pkgver=0.12.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Binding to the pango library for Gtk2Hs."
 url="http://hackage.haskell.org/package/pango"
 license=('LGPL2.1')
diff --git a/community/haskell-stm/PKGBUILD b/community/haskell-stm/PKGBUILD
index fe62847d3..fa9819d51 100644
--- a/community/haskell-stm/PKGBUILD
+++ b/community/haskell-stm/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=stm
 pkgname=haskell-stm
 pkgver=2.2.0.1
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A modular composable concurrency abstraction."
 url="http://hackage.haskell.org/package/stm"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' 'sh')
+depends=('ghc=7.4.1' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
 md5sums=('b1cf03ed315e00c33160746feeee8682')
diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD
index 64faf05ed..9223379b2 100644
--- a/community/haskell-syb/PKGBUILD
+++ b/community/haskell-syb/PKGBUILD
@@ -2,17 +2,17 @@
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 _hkgname=syb
 pkgname=haskell-syb
-pkgver=0.3
-pkgrel=2.1
+pkgver=0.3.6
+pkgrel=1
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' sh)
+depends=('ghc=7.4.1' sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('c4f6771fa32d467a029e6e813757a9fe')
+md5sums=('0d807bb244fdeb95fa546b4311fcd8df')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD
index 401074d56..deaccdaf3 100644
--- a/community/haskell-tar/PKGBUILD
+++ b/community/haskell-tar/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 58293 2011-11-10 12:03:04Z arodseth $
+# $Id: PKGBUILD 67068 2012-03-03 16:11:12Z tdziedzic $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 pkgname=haskell-tar
-pkgver=0.3.1.0
-pkgrel=5
+pkgver=0.4.0.0
+pkgrel=1
 pkgdesc="Reading, writing and manipulating \".tar\" archive files."
 url="http://hackage.haskell.org/package/tar"
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-depends=('ghc=7.0.3-2' sh)
+depends=('ghc=7.4.1')
 options=('strip')
 source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz")
 install=haskell-tar.install
-md5sums=('10b54856495f9ef0a42aa270085c7d5e')
+sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113')
 
 build() {
   cd "$srcdir/tar-$pkgver"
@@ -41,4 +42,5 @@ package() {
   install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
 }
+
 # vim:set ts=2 sw=2 et:
diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD
index 51e968853..eb1f1fc2c 100644
--- a/community/haskell-terminfo/PKGBUILD
+++ b/community/haskell-terminfo/PKGBUILD
@@ -1,18 +1,19 @@
+# $Id: PKGBUILD 67070 2012-03-03 16:11:18Z tdziedzic $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 _hkgname=terminfo
 pkgname=haskell-terminfo
-pkgver=0.3.1.3
-pkgrel=4.2
+pkgver=0.3.2.3
+pkgrel=1
 pkgdesc="Haskell bindings to the terminfo library."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' sh)
-options=('strip')
+depends=('ghc=7.4.1-2' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('8c0e052340f628b76f5687fa23379628')
+md5sums=('706f546c629ac100a402c9c2629c25fa')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-utf8-string/PKGBUILD b/community/haskell-utf8-string/PKGBUILD
index e6d27dfad..03160c647 100644
--- a/community/haskell-utf8-string/PKGBUILD
+++ b/community/haskell-utf8-string/PKGBUILD
@@ -1,19 +1,19 @@
+# $Id: PKGBUILD 67072 2012-03-03 16:11:24Z tdziedzic $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
 _hkgname=utf8-string
 pkgname=haskell-utf8-string
-pkgver=0.3.6
-pkgrel=7.2
+pkgver=0.3.7
+pkgrel=1
 pkgdesc="Support for reading and writing UTF8 Strings"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+depends=('ghc=7.4.1' 'sh')
 install=${pkgname}.install
-md5sums=('be8c5ef52a0824babdc89d60c1e9b600')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+md5sums=('50e5c395713e716e0e4a56da73f87ccd')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-x11-xft/PKGBUILD b/community/haskell-x11-xft/PKGBUILD
index 871e0306f..54771e0f1 100644
--- a/community/haskell-x11-xft/PKGBUILD
+++ b/community/haskell-x11-xft/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 60408 2011-12-13 13:21:02Z spupykin $
+# $Id: PKGBUILD 67076 2012-03-03 16:11:39Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 _hkgname=X11-xft
 pkgname=haskell-x11-xft
 pkgver=0.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('LGPL')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' 'haskell-x11=1.5.0.1' 'haskell-utf8-string=0.3.6-7.2' 'libxft')
+depends=('ghc=7.4.1' 'haskell-x11=1.5.0.1' 'haskell-utf8-string=0.3.7' 'libxft')
 options=('strip')
 install=haskell-x11-xft.install
 source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz)
diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD
index 445c8ddd1..42302c331 100644
--- a/community/haskell-x11/PKGBUILD
+++ b/community/haskell-x11/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 60398 2011-12-13 10:28:38Z spupykin $
+# $Id: PKGBUILD 67074 2012-03-03 16:11:32Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: shild <sxp@bk.ru>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
@@ -6,13 +6,13 @@
 _hkgname=X11
 pkgname=haskell-x11
 pkgver=1.5.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A Haskell binding to the X11 graphics library."
 arch=(i686 x86_64)
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
 license=('custom:BSD3')
 options=('strip')
-depends=("ghc=7.0.3-2" "haskell-syb=0.3-2.1" 'libx11' 'libxinerama')
+depends=("ghc=7.4.1" "haskell-syb=0.3.6" 'libx11' 'libxinerama')
 conflicts=(haskell-x11-extras)
 install=hsmod.install
 source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
diff --git a/community/haskell-xhtml/PKGBUILD b/community/haskell-xhtml/PKGBUILD
new file mode 100644
index 000000000..b3762851d
--- /dev/null
+++ b/community/haskell-xhtml/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+# Package generated by cabal2arch 0.7.6
+
+_hkgname=xhtml
+pkgname=haskell-xhtml
+pkgver=3000.2.0.5
+pkgrel=2
+pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants."
+url="http://hackage.haskell.org/package/xhtml"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.4.1-2' 'sh')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
+install=${pkgname}.install
+md5sums=('d51e20de416b825aba6b874a221acfc4')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
+      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-xhtml/haskell-xhtml.install b/community/haskell-xhtml/haskell-xhtml.install
new file mode 100644
index 000000000..d03b8a053
--- /dev/null
+++ b/community/haskell-xhtml/haskell-xhtml.install
@@ -0,0 +1,19 @@
+HS_DIR=usr/share/haskell/haskell-xhtml
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh &> /dev/null
+  exit 0
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index 6958d81df..30c3347e3 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -1,17 +1,20 @@
-# $Id: PKGBUILD 58974 2011-11-20 18:15:24Z spupykin $
+# $Id: PKGBUILD 67078 2012-03-03 16:11:51Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hedgewars
 pkgver=0.9.17
-pkgrel=1
+pkgrel=2
 pkgdesc="Free Worms-like turn based strategy game"
 arch=('i686' 'x86_64')
 url="http://hedgewars.org"
 license=('GPL' 'custom')
 depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua')
-makedepends=('fpc' 'cmake' 'ghc'
-	     'haskell-utf8-string' 'haskell-dataenc' 'haskell-network'
-	     'haskell-hslogger' 'haskell-bytestring-show' 'haskell-deepseq')
+makedepends=('fpc' 'cmake'
+             # haskell specific
+             'ghc=7.4.1-2'
+	     'haskell-network=2.3.0.11-1' 'haskell-bytestring-show=0.3.5.1-2'
+	     'haskell-utf8-string=0.3.7-1' 'haskell-dataenc=0.14.0.3-1' 
+	     'haskell-hslogger=1.1.5-6')
 source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
 	hedgewars.desktop
 	hedgewars.png)
@@ -20,20 +23,25 @@ md5sums=('77c0bc4bc664604adbba67fab606d8f1'
          'eeb14d50df39063549ac5eca9dbc65d1')
 
 build() {
-  cd $srcdir/$pkgname-src-$pkgver
+  cd $pkgname-src-$pkgver
+
 #  sed -i 's|.*misc/liblua.*||' CMakeLists.txt
+
   cmake \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DDATA_INSTALL_DIR=/usr/share \
 	-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \
 	-DQT_MOC_EXECUTABLE=/usr/bin/moc \
 	-DWITH_SERVER=1 .
+
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-src-$pkgver
+  cd $pkgname-src-$pkgver
+
   make DESTDIR=$pkgdir install
+
   install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt
   install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png
   install -D -m644 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 2abdad16a..611a2a158 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 66318 2012-02-23 14:03:47Z allan $
+# $Id: PKGBUILD 67039 2012-03-03 14:31:16Z giovanni $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
 pkgver=0.9.10
-pkgrel=1
+pkgrel=2
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
diff --git a/community/macchanger/PKGBUILD b/community/macchanger/PKGBUILD
index 2ba309655..23672a8e8 100644
--- a/community/macchanger/PKGBUILD
+++ b/community/macchanger/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 66755 2012-02-28 08:12:38Z giovanni $
+# $Id: PKGBUILD 67090 2012-03-03 20:37:59Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=macchanger
 pkgver=1.5.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A small utility to change you NIC's MAC address"
 arch=('i686' 'x86_64')
 url="http://ftp.gnu.org/gnu/macchanger"
@@ -13,7 +13,7 @@ source=(http://ftp.gnu.org/gnu/macchanger/${pkgname}-${pkgver}.tar.gz)
 md5sums=('79b7cdaeca3d8ebafa764c4b0dd03ab7')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
               --infodir=/usr/share/man
@@ -21,7 +21,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/php-memcached/PKGBUILD b/community/php-memcached/PKGBUILD
index c66b6ec3f..1b6180ff0 100644
--- a/community/php-memcached/PKGBUILD
+++ b/community/php-memcached/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61909 2012-01-10 16:08:51Z foutrelis $
+# $Id: PKGBUILD 67035 2012-03-03 11:31:56Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=php-memcached
-pkgver=1.0.2
-pkgrel=6
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="PHP extension for interfacing with memcached via libmemcached library"
 arch=('i686' 'x86_64')
 url="http://pecl.php.net/package/memcached"
@@ -11,7 +11,7 @@ license=('PHP')
 depends=('php' 'libmemcached')
 backup=('etc/php/conf.d/memcached.ini')
 source=(http://pecl.php.net/get/memcached-$pkgver.tgz)
-sha256sums=('16de77317e43b0a5bfd802c0bd2ef575adbad2093e8632d58738974e6cb14129')
+sha256sums=('3d06dfc9ef3ec11c48427965dd8310b6a7af2cf6187319a55013f0829b86a16f')
 
 build() {
   cd "$srcdir/memcached-$pkgver"
diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD
index d71dbdbe0..fafb6e54c 100644
--- a/community/qtractor/PKGBUILD
+++ b/community/qtractor/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61485 2012-01-01 11:40:37Z schiv $
+# $Id: PKGBUILD 67085 2012-03-03 16:18:50Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
 
 pkgname=qtractor
-pkgver=0.5.3
+pkgver=0.5.4
 pkgrel=1
 pkgdesc="Audio/MIDI multitrack sequencer"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('qt' 'jack' 'slv2' 'libmad' 'liblo'
 makedepends=('ladspa' 'dssi')
 [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('cae94dd21628f22351dec5521b5a564d')
+md5sums=('9f52ff00ed66d6de07dc444537949ed9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/sfk/PKGBUILD b/community/sfk/PKGBUILD
index 3a6cb9e24..10e7381bf 100644
--- a/community/sfk/PKGBUILD
+++ b/community/sfk/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 59548 2011-11-28 01:04:30Z seblu $
-# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# $Id: PKGBUILD 67087 2012-03-03 17:34:42Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Baumi <baumi@gmx.com>
 
 pkgname=sfk
-pkgver=1.6.4
-pkgrel=2
+pkgver=1.6.5
+pkgrel=1
 pkgdesc='Swiss File Knife - A Command Line Tools Collection'
 arch=('i686' 'x86_64')
 url='http://stahlforce.com/dev/?tool=sfk'
 license=('custom: BSD')
+depends=('gcc-libs')
 source=("http://downloads.sourceforge.net/swissfileknife/${pkgname}${pkgver//./}.zip")
-md5sums=('263df6a8e18f6ebb6032f3c048df0b6d')
+md5sums=('b40c0c01785d40e7cde7cba3e4227f0b')
 
 build() {
   cd ${pkgname}${pkgver//./}
-  g++ $CXXFLAGS $LDFLAGS sfk.cpp sfknet.cpp patch.cpp inst.cpp -o sfk
+  g++ $CXXFLAGS $LDFLAGS sfk.cpp sfknet.cpp patch.cpp inst.cpp -o $pkgname
 }
 
 package() {
diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD
index 43b2db0c9..2df798cad 100644
--- a/community/xmobar/PKGBUILD
+++ b/community/xmobar/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 60406 2011-12-13 10:42:25Z spupykin $
+# $Id: PKGBUILD 67080 2012-03-03 16:12:00Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.4
 
 pkgname=xmobar
 pkgver=0.14
-pkgrel=1
+pkgrel=2
 pkgdesc="A Minimalistic Text Based Status Bar"
 url="http://hackage.haskell.org/package/xmobar"
 license=('custom:BSD3')
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD
index 59774e0dd..196ce1e68 100644
--- a/community/xmonad-contrib/PKGBUILD
+++ b/community/xmonad-contrib/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 60798 2011-12-18 11:12:08Z jelle $
+# $Id: PKGBUILD 67084 2012-03-03 16:12:24Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: orbisvicis <gmail.com>
 
 pkgname=xmonad-contrib
 pkgver=0.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Add-ons for xmonad"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.0.3' 'xmonad=0.10' 'sh' 'haskell-x11=1.5.0.1'
-         'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.6')
+depends=('ghc=7.4.1-2' 'xmonad=0.10-3' 'sh' 'haskell-x11=1.5.0.1-2' 'haskell-x11-xft=0.3.1-3' 'haskell-utf8-string=0.3.7-1' 'haskell-random=1.0.1.1-1')
 install='xmonad-contrib.install'
 source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('616cbc632bbde5cd4cdb643ee47e74d2')
+md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -33,4 +32,3 @@ package() {
   runhaskell Setup.lhs copy --destdir=$pkgdir
   install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE
 }
-md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81')
diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD
index fdf5a8987..14c49cecc 100644
--- a/community/xmonad/PKGBUILD
+++ b/community/xmonad/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 62068 2012-01-15 15:18:39Z jelle $
+# $Id: PKGBUILD 67082 2012-03-03 16:12:17Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: shild <shildv@gmail.com>
 
 pkgname=xmonad
 pkgver=0.10
-pkgrel=2
+pkgrel=3
 pkgdesc="A lightweight X11 tiled window manager written in Haskell"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.0.3' 'gmp' 'haskell-x11=1.5.0.1' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.6')
+depends=('ghc=7.4.1' 'gmp' 'haskell-x11=1.5.0.1' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.7')
 optdepends=('xorg-xmessage: for displaying visual error messages')
 install='xmonad.install'
 source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 3a70b66ed..2a06375ec 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150228 2012-02-15 09:53:59Z allan $
+# $Id: PKGBUILD 151829 2012-03-03 08:49:00Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.15
-pkgrel=6
+pkgrel=7
 _glibcdate=20111227
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
@@ -22,13 +22,12 @@ 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.2-ignore-origin-of-privileged-program.patch
         glibc-2.14-libdl-crash.patch
-        glibc-2.14-revert-4768ae77.patch
         glibc-2.14-reexport-rpc-interface.patch
         glibc-2.14-reinstall-nis-rpc-headers.patch
+        glibc-2.15-fix-res_query-assert.patch
         glibc-2.15-regex.patch
         glibc-2.15-lddebug-scopes.patch
         glibc-2.15-revert-c5a0802a.patch
@@ -40,29 +39,46 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t
         glibc-2.15-revert-netlink-cache.patch
         glibc-2.15-arena.patch
         glibc-2.15-negative-result-cache.patch
+        glibc-2.15-multiarch-x86-strcmp.patch
+        glibc-2.15-vdso.patch
+        glibc-2.15-feraiseexcept-plt.patch
+        glibc-2.15-vfprintf-nargs.patch
+        glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
+        glibc-2.15-fmtmsg-locking.patch
+        glibc-2.15-non-signalling-comparisons.patch
+        glibc-2.15-rintf-rounding.patch
+        glibc-2.15-nearbyintf-rounding.patch
         nscd
         locale.gen.txt
         locale-gen)
 md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
          '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
          '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
+         'e60e33591c9ec1447e4cddadcbb9cf3a'
          '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
          'c5de2a946215d647c8af5432ec4b0da0'
          '55febbb72139ac7b65757df085024b83'
+         '31f415b41197d85d3bbee3d1eecd06a3'
          'b3526cbd5e29773560dba725db99af5a'
          '3c219ddfb619b6df903cac4cc42c611d'
          '7ae3e426251ae33e73dbad71f9c91378'
-         '39353f53168f4a7509ba5fe0d9f218b8'
-         '136eb969f5d6bb6f5155f72a1a7cf23e'
+         'f0782ddbf38e0b30ec6b85348816046f'
+         '3d844b53b2dbb7c996e39c7ad932f55d'
          '41ae047ac88e8f6f547c70b0a0bc3b72'
          'fccb89f6628f59752278e125c35941f8'
          'c4cd34f20ccd37817f6c1374bd4ee68e'
-         '6771b0b2bb8aa3870a259fd2f46c424f'
+         '94b61302a7ca6c5764d013dc7738fcfe'
          'a9ffadcfd2d357f91fee0b861fd4a7c6'
          '2c46b8e294de24c531f2253ff69aeef3'
+         '7a2998a04ebfcf8bf820540f490ce714'
+         '0d77d20fa7fe2f87ad945cb9edb4d91d'
+         'bfdefac3d705f41fbf84b1de1dc945af'
+         'dded423e264cdd178500f3e8ad62fe66'
+         '340deaa582a95ddde86edb624c3bfea0'
+         '6bbac50e6ff82187654e6a0a7bd849e7'
+         'c483504cf404ed0b44480af627813a97'
+         '1419d61fd1dbc6cdc48bb59da86fa66f'
+         '7ff501435078b1a2622124fbeaafc921'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
@@ -77,34 +93,25 @@ mksource() {
   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
+  patch -p1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
 
-  # Undefine __i686 for gcc <= 4.6
+  # undefine __i686 for gcc <= 4.6
   # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
   # fix in http://sourceware.org/git/?p=glibc.git;a=commit;h=d4a54ac6 requires additional backporting...
-  patch -Np1 -i ${srcdir}/glibc-__i686.patch
+  patch -p1 -i ${srcdir}/glibc-__i686.patch
 
   # http://www.exploit-db.com/exploits/15274/
   # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09  (fedora branch)
-  patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+  patch -p1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
 
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9  (fedora branch)
   # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
-  patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
-
-  # Revert commit causing issues with crappy DNS servers...
-  # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
-  # Note that both these patches appear not to fix the issue completely (but rebuilds may fix):
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013  (used by opensuse)
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3  (fedora branch)
-  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
+  patch -p1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
 
   # re-export RPC interface until libtirpc is ready as a replacement
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873  (fedora branch)
@@ -112,7 +119,11 @@ build() {
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3  (fedora branch)
   patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
 
-  # Fix up regcomp/regexec
+  # fix res_query assertion
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
+  patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch
+
+  # fix up regcomp/regexec
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745
   patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch
 
@@ -137,28 +148,65 @@ build() {
   # fix AVX detection
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=08cf777f
-  patch -Np1 -i ${srcdir}/glibc-2.15-avx.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-avx.patch
   # and "fix" strcasecmp
-  patch -Np1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch
 
   # fix GB18030 charmap
   # http://sourceware.org/bugzilla/show_bug.cgi?id=11837
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=2a57bd79  (fedora branch)
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=3d828a61  (fedora branch)
-  patch -Np1 -i ${srcdir}/glibc-2.15-gb18030.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-gb18030.patch
 
   # fix crash in __nscd_get_mapping if nscd not running
   # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential "fix" in comment)
   # reverts commit 3a2c0242 and other necessary following changes...
-  patch -Np1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch
 
   # handle ARENA_TEST correctly
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=41b81892
-  patch -Np1 -i ${srcdir}/glibc-2.15-arena.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-arena.patch
 
   # Do not cache negative results in nscd if these are transient
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=3e1aa84e
-  patch -Np1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch
+
+  # strcasecmp_l, strncasecmp_l act as strcmp for multiarch x86
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=0bab47b6
+  patch -p1 -i ${srcdir}/glibc-2.15-multiarch-x86-strcmp.patch
+  
+  # always set l_used for vDSO.
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=1f393a11
+  patch -p1 -i ${srcdir}/glibc-2.15-vdso.patch
+
+  # fix x86 PLT slot usage for feraiseexcept
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=7c35ffed
+  patch -p1 -i ${srcdir}/glibc-2.15-feraiseexcept-plt.patch
+
+  # vfprintf nargs overflow - CVE-2012-0864
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13656
+  # http://sourceware.org/ml/libc-alpha/2012-02/msg00328.html
+  patch -p1 -i ${srcdir}/glibc-2.15-vfprintf-nargs.patch
+
+  # avoid out ouf bounds read in __libc_res_nquerydomain
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=8fdceb2e
+  patch -p1 -i ${srcdir}/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
+
+  # make fmtmsg function thread-safe
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=7724defc
+  patch -p1 -i ${srcdir}/glibc-2.15-fmtmsg-locking.patch
+
+  # use non-signaling floating-point comparisons in math functions
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=92221550
+  patch -p1 -i ${srcdir}/glibc-2.15-non-signalling-comparisons.patch
+
+  # fix rintf rounding.
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=fe45ce09
+  patch -p1 -i ${srcdir}/glibc-2.15-rintf-rounding.patch
+
+  # fix nearbyintf rounding
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=6cbeae47
+  patch -p1 -i ${srcdir}/glibc-2.15-nearbyintf-rounding.patch
 
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
diff --git a/core/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/core/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
index ce089b49c..533fc1b4b 100644
--- a/core/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ b/core/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
@@ -1,13 +1,3 @@
-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
@@ -22,5 +12,3 @@ index 22a1635..7674d49 100644
  
    return new;
  }
--- 
-1.7.2
diff --git a/core/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch b/core/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
new file mode 100644
index 000000000..6f0a0398f
--- /dev/null
+++ b/core/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
@@ -0,0 +1,24 @@
+diff --git a/resolv/res_query.c b/resolv/res_query.c
+index 947c651..abccd4a 100644
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
+@@ -556,12 +556,16 @@ __libc_res_nquerydomain(res_state statp,
+ 		 * copy without '.' if present.
+ 		 */
+ 		n = strlen(name);
+-		if (n >= MAXDNAME) {
++
++		/* Decrement N prior to checking it against MAXDNAME
++		   so that we detect a wrap to SIZE_MAX and return
++		   a reasonable error.  */
++		n--;
++		if (n >= MAXDNAME - 1) {
+ 			RES_SET_H_ERRNO(statp, NO_RECOVERY);
+ 			return (-1);
+ 		}
+-		n--;
+-		if (n >= 0 && name[n] == '.') {
++		if (name[n] == '.') {
+ 			strncpy(nbuf, name, n);
+ 			nbuf[n] = '\0';
+ 		} else
diff --git a/core/glibc/glibc-2.15-feraiseexcept-plt.patch b/core/glibc/glibc-2.15-feraiseexcept-plt.patch
new file mode 100644
index 000000000..c41acc169
--- /dev/null
+++ b/core/glibc/glibc-2.15-feraiseexcept-plt.patch
@@ -0,0 +1,20 @@
+diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c
+index 70f9ee2..6e2ce35 100644
+--- a/sysdeps/i386/fpu/feupdateenv.c
++++ b/sysdeps/i386/fpu/feupdateenv.c
+@@ -1,5 +1,5 @@
+ /* Install given floating-point environment and raise exceptions.
+-   Copyright (C) 1997,99,2000,01,07,2010 Free Software Foundation, Inc.
++   Copyright (C) 1997,99,2000,01,07,2010,2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+ 
+@@ -44,7 +44,7 @@ __feupdateenv (const fenv_t *envp)
+   /* Raise the saved exception.  Incidently for us the implementation
+      defined format of the values in objects of type fexcept_t is the
+      same as the ones specified using the FE_* constants.  */
+-  feraiseexcept ((int) temp);
++  __feraiseexcept ((int) temp);
+ 
+   /* Success.  */
+   return 0;
diff --git a/core/glibc/glibc-2.15-fix-res_query-assert.patch b/core/glibc/glibc-2.15-fix-res_query-assert.patch
new file mode 100644
index 000000000..a894da9c7
--- /dev/null
+++ b/core/glibc/glibc-2.15-fix-res_query-assert.patch
@@ -0,0 +1,51 @@
+--- a/resolv/res_query.c	
++++ a/resolv/res_query.c	
+@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp,
+ 		  int *resplen2)
+ {
+ 	HEADER *hp = (HEADER *) answer;
++	HEADER *hp2;
+ 	int n, use_malloc = 0;
+ 	u_int oflags = statp->_flags;
+ 
+@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp,
+ 	  /* __libc_res_nsend might have reallocated the buffer.  */
+ 	  hp = (HEADER *) *answerp;
+ 
+-	/* We simplify the following tests by assigning HP to HP2.  It
+-	   is easy to verify that this is the same as ignoring all
+-	   tests of HP2.  */
+-	HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
+-
+-	if (n < (int) sizeof (HEADER) && answerp2 != NULL
+-	    && *resplen2 > (int) sizeof (HEADER))
++	/* We simplify the following tests by assigning HP to HP2 or
++	   vice versa.  It is easy to verify that this is the same as
++	   ignoring all tests of HP or HP2.  */
++	if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
+ 	  {
+-	    /* Special case of partial answer.  */
+-	    assert (hp != hp2);
+-	    hp = hp2;
++	    hp2 = hp;
+ 	  }
+-	else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
+-		 && n > (int) sizeof (HEADER))
++	else
+ 	  {
+-	    /* Special case of partial answer.  */
+-	    assert (hp != hp2);
+-	    hp2 = hp;
++	    hp2 = (HEADER *) *answerp2;
++	    if (n < (int) sizeof (HEADER))
++	      {
++	        hp = hp2;
++	      }
+ 	  }
+ 
++	/* Make sure both hp and hp2 are defined */
++	assert((hp != NULL) && (hp2 != NULL));
++
+ 	if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
+ 	    && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
+ #ifdef DEBUG
diff --git a/core/glibc/glibc-2.15-fmtmsg-locking.patch b/core/glibc/glibc-2.15-fmtmsg-locking.patch
new file mode 100644
index 000000000..f5976abd9
--- /dev/null
+++ b/core/glibc/glibc-2.15-fmtmsg-locking.patch
@@ -0,0 +1,148 @@
+diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
+index 9203317..4c02302 100644
+--- a/stdlib/fmtmsg.c
++++ b/stdlib/fmtmsg.c
+@@ -103,7 +103,6 @@ fmtmsg (long int classification, const char *label, int severity,
+ 	const char *text, const char *action, const char *tag)
+ {
+   __libc_once_define (static, once);
+-  int result = MM_OK;
+   struct severity_info *severity_rec;
+ 
+   /* Make sure everything is initialized.  */
+@@ -124,17 +123,6 @@ fmtmsg (long int classification, const char *label, int severity,
+ 	return MM_NOTOK;
+     }
+ 
+-  for (severity_rec = severity_list; severity_rec != NULL;
+-       severity_rec = severity_rec->next)
+-    if (severity == severity_rec->severity)
+-      /* Bingo.  */
+-      break;
+-
+-  /* If we don't know anything about the severity level return an error.  */
+-  if (severity_rec == NULL)
+-    return MM_NOTOK;
+-
+-
+ #ifdef __libc_ptf_call
+   /* We do not want this call to be cut short by a thread
+      cancellation.  Therefore disable cancellation for now.  */
+@@ -143,54 +131,73 @@ fmtmsg (long int classification, const char *label, int severity,
+ 		   0);
+ #endif
+ 
+-  /* Now we can print.  */
+-  if (classification & MM_PRINT)
+-    {
+-      int do_label = (print & label_mask) && label != MM_NULLLBL;
+-      int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
+-      int do_text = (print & text_mask) && text != MM_NULLTXT;
+-      int do_action = (print & action_mask) && action != MM_NULLACT;
+-      int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
+-
+-      if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
+-		      do_label ? label : "",
+-		      do_label && (do_severity | do_text | do_action | do_tag)
+-		      ? ": " : "",
+-		      do_severity ? severity_rec->string : "",
+-		      do_severity && (do_text | do_action | do_tag)
+-		      ? ": " : "",
+-		      do_text ? text : "",
+-		      do_text && (do_action | do_tag) ? "\n" : "",
+-		      do_action ? "TO FIX: " : "",
+-		      do_action ? action : "",
+-		      do_action && do_tag ? "  " : "",
+-		      do_tag ? tag : "") < 0)
+-	/* Oh, oh.  An error occurred during the output.  */
+-	result = MM_NOMSG;
+-    }
++  __libc_lock_lock (lock);
+ 
+-  if (classification & MM_CONSOLE)
++  for (severity_rec = severity_list; severity_rec != NULL;
++       severity_rec = severity_rec->next)
++    if (severity == severity_rec->severity)
++      /* Bingo.  */
++      break;
++
++  /* If we don't know anything about the severity level return an error.  */
++  int result = MM_NOTOK;
++  if (severity_rec != NULL)
+     {
+-      int do_label = label != MM_NULLLBL;
+-      int do_severity = severity != MM_NULLSEV;
+-      int do_text = text != MM_NULLTXT;
+-      int do_action = action != MM_NULLACT;
+-      int do_tag = tag != MM_NULLTAG;
+-
+-      syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
+-	      do_label ? label : "",
+-	      do_label && (do_severity | do_text | do_action | do_tag)
+-	      ? ": " : "",
+-	      do_severity ? severity_rec->string : "",
+-	      do_severity && (do_text | do_action | do_tag) ? ": " : "",
+-	      do_text ? text : "",
+-	      do_text && (do_action | do_tag) ? "\n" : "",
+-	      do_action ? "TO FIX: " : "",
+-	      do_action ? action : "",
+-	      do_action && do_tag ? "  " : "",
+-	      do_tag ? tag : "");
++      result = MM_OK;
++
++      /* Now we can print.  */
++      if (classification & MM_PRINT)
++	{
++	  int do_label = (print & label_mask) && label != MM_NULLLBL;
++	  int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
++	  int do_text = (print & text_mask) && text != MM_NULLTXT;
++	  int do_action = (print & action_mask) && action != MM_NULLACT;
++	  int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
++	  int need_colon = (do_label
++			    && (do_severity | do_text | do_action | do_tag));
++
++	  if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
++			  do_label ? label : "",
++			  need_colon ? ": " : "",
++			  do_severity ? severity_rec->string : "",
++			  do_severity && (do_text | do_action | do_tag)
++			  ? ": " : "",
++			  do_text ? text : "",
++			  do_text && (do_action | do_tag) ? "\n" : "",
++			  do_action ? "TO FIX: " : "",
++			  do_action ? action : "",
++			  do_action && do_tag ? "  " : "",
++			  do_tag ? tag : "") < 0)
++	    /* Oh, oh.  An error occurred during the output.  */
++	    result = MM_NOMSG;
++	}
++
++      if (classification & MM_CONSOLE)
++	{
++	  int do_label = label != MM_NULLLBL;
++	  int do_severity = severity != MM_NULLSEV;
++	  int do_text = text != MM_NULLTXT;
++	  int do_action = action != MM_NULLACT;
++	  int do_tag = tag != MM_NULLTAG;
++	  int need_colon = (do_label
++			    && (do_severity | do_text | do_action | do_tag));
++
++	  syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
++		  do_label ? label : "",
++		  need_colon ? ": " : "",
++		  do_severity ? severity_rec->string : "",
++		  do_severity && (do_text | do_action | do_tag) ? ": " : "",
++		  do_text ? text : "",
++		  do_text && (do_action | do_tag) ? "\n" : "",
++		  do_action ? "TO FIX: " : "",
++		  do_action ? action : "",
++		  do_action && do_tag ? "  " : "",
++		  do_tag ? tag : "");
++	}
+     }
+ 
++  __libc_lock_unlock (lock);
++
+ #ifdef __libc_ptf_call
+   __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
+ #endif
diff --git a/core/glibc/glibc-2.15-ifunc.patch b/core/glibc/glibc-2.15-ifunc.patch
index 8ad0b9d7a..115afa02a 100644
--- a/core/glibc/glibc-2.15-ifunc.patch
+++ b/core/glibc/glibc-2.15-ifunc.patch
@@ -1,23 +1,3 @@
-
-From 6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4 Mon Sep 17 00:00:00 2001
-From: Ulrich Drepper <drepper@gmail.com>
-Date: Fri, 27 Jan 2012 15:05:19 -0500
-Subject: [PATCH] Sort objects before relocations
-
----
- ChangeLog              |   11 ++++
- Makeconfig             |    6 ++
- NEWS                   |    4 +-
- elf/Makefile           |   15 +++++-
- elf/dl-open.c          |  128 ++++++++++++++++++++++++++++++++++++------------
- elf/tst-relsort1.c     |   19 +++++++
- elf/tst-relsort1mod1.c |    7 +++
- elf/tst-relsort1mod2.c |    7 +++
- 8 files changed, 160 insertions(+), 37 deletions(-)
- create mode 100644 elf/tst-relsort1.c
- create mode 100644 elf/tst-relsort1mod1.c
- create mode 100644 elf/tst-relsort1mod2.c
-
 diff --git a/Makeconfig b/Makeconfig
 index 2db2821..68547b2 100644
 --- a/Makeconfig
@@ -280,6 +260,3 @@ index 0000000..a2c3e55
 +{
 +  return floor (d) != 0.0;
 +}
--- 
-1.7.3.4
-
diff --git a/core/glibc/glibc-2.15-multiarch-x86-strcmp.patch b/core/glibc/glibc-2.15-multiarch-x86-strcmp.patch
new file mode 100644
index 000000000..38c9e617f
--- /dev/null
+++ b/core/glibc/glibc-2.15-multiarch-x86-strcmp.patch
@@ -0,0 +1,39 @@
+diff --git a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
+index d10e872..d4fcd2b 100644
+--- a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
++++ b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
+@@ -6,6 +6,8 @@ extern __typeof (strcasecmp_l) __strcasecmp_l_nonascii;
+ #define USE_IN_EXTENDED_LOCALE_MODEL    1
+ #include <string/strcasecmp.c>
+ 
++strong_alias (__strcasecmp_l_nonascii, __strcasecmp_l_ia32)
++
+ /* The needs of strcasecmp in libc are minimal, no need to go through
+    the IFUNC.  */
+ strong_alias (__strcasecmp_l_nonascii, __GI___strcasecmp_l)
+diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S
+index 5410d17..b3b9eb8 100644
+--- a/sysdeps/i386/i686/multiarch/strcmp.S
++++ b/sysdeps/i386/i686/multiarch/strcmp.S
+@@ -111,6 +111,7 @@ END(STRCMP)
+ # endif
+ #endif
+ 
+-#ifndef USE_AS_STRNCMP
++#if !defined USE_AS_STRNCMP && !defined USE_AS_STRCASECMP_L \
++    && !defined USE_AS_STRNCASECMP_L
+ # include "../strcmp.S"
+ #endif
+diff --git a/sysdeps/i386/i686/multiarch/strncase_l-c.c b/sysdeps/i386/i686/multiarch/strncase_l-c.c
+index 0c68b8d..7e601af 100644
+--- a/sysdeps/i386/i686/multiarch/strncase_l-c.c
++++ b/sysdeps/i386/i686/multiarch/strncase_l-c.c
+@@ -6,6 +6,8 @@ extern __typeof (strncasecmp_l) __strncasecmp_l_nonascii;
+ #define USE_IN_EXTENDED_LOCALE_MODEL    1
+ #include <string/strncase.c>
+ 
++strong_alias (__strncasecmp_l_nonascii, __strncasecmp_l_ia32)
++
+ /* The needs of strcasecmp in libc are minimal, no need to go through
+    the IFUNC.  */
+ strong_alias (__strncasecmp_l_nonascii, __GI___strncasecmp_l)
diff --git a/core/glibc/glibc-2.15-nearbyintf-rounding.patch b/core/glibc/glibc-2.15-nearbyintf-rounding.patch
new file mode 100644
index 000000000..b2bb9caac
--- /dev/null
+++ b/core/glibc/glibc-2.15-nearbyintf-rounding.patch
@@ -0,0 +1,75 @@
+diff --git a/math/libm-test.inc b/math/libm-test.inc
+index c8186c8..1016753 100644
+--- a/math/libm-test.inc
++++ b/math/libm-test.inc
+@@ -4632,6 +4632,29 @@ nearbyint_test (void)
+   TEST_f_f (nearbyint, 524286.75, 524287.0);
+   TEST_f_f (nearbyint, 524288.75, 524289.0);
+ 
++  TEST_f_f (nearbyint, 1048576.75, 1048577.0);
++  TEST_f_f (nearbyint, 2097152.75, 2097153.0);
++  TEST_f_f (nearbyint, 2492472.75, 2492473.0);
++  TEST_f_f (nearbyint, 2886220.75, 2886221.0);
++  TEST_f_f (nearbyint, 3058792.75, 3058793.0);
++  TEST_f_f (nearbyint, -1048576.75, -1048577.0);
++  TEST_f_f (nearbyint, -2097152.75, -2097153.0);
++  TEST_f_f (nearbyint, -2492472.75, -2492473.0);
++  TEST_f_f (nearbyint, -2886220.75, -2886221.0);
++  TEST_f_f (nearbyint, -3058792.75, -3058793.0);
++#ifndef TEST_FLOAT
++  TEST_f_f (nearbyint, 70368744177664.75, 70368744177665.0);
++  TEST_f_f (nearbyint, 140737488355328.75, 140737488355329.0);
++  TEST_f_f (nearbyint, 281474976710656.75, 281474976710657.0);
++  TEST_f_f (nearbyint, 562949953421312.75, 562949953421313.0);
++  TEST_f_f (nearbyint, 1125899906842624.75, 1125899906842625.0);
++  TEST_f_f (nearbyint, -70368744177664.75, -70368744177665.0);
++  TEST_f_f (nearbyint, -140737488355328.75, -140737488355329.0);
++  TEST_f_f (nearbyint, -281474976710656.75, -281474976710657.0);
++  TEST_f_f (nearbyint, -562949953421312.75, -562949953421313.0);
++  TEST_f_f (nearbyint, -1125899906842624.75, -1125899906842625.0);
++#endif
++
+   END (nearbyint);
+ }
+ 
+diff --git a/sysdeps/ieee754/flt-32/s_nearbyintf.c b/sysdeps/ieee754/flt-32/s_nearbyintf.c
+index 04ef9ab..a6d602b 100644
+--- a/sysdeps/ieee754/flt-32/s_nearbyintf.c
++++ b/sysdeps/ieee754/flt-32/s_nearbyintf.c
+@@ -30,18 +30,12 @@ __nearbyintf(float x)
+ {
+ 	fenv_t env;
+ 	int32_t i0,j0,sx;
+-	u_int32_t i,i1;
+ 	float w,t;
+ 	GET_FLOAT_WORD(i0,x);
+ 	sx = (i0>>31)&1;
+ 	j0 = ((i0>>23)&0xff)-0x7f;
+ 	if(j0<23) {
+ 	    if(j0<0) {
+-		if((i0&0x7fffffff)==0) return x;
+-		i1 = (i0&0x07fffff);
+-		i0 &= 0xfff00000;
+-		i0 |= ((i1|-i1)>>9)&0x400000;
+-		SET_FLOAT_WORD(x,i0);
+ 		libc_feholdexceptf (&env);
+ 		w = TWO23[sx]+x;
+ 		t =  w-TWO23[sx];
+@@ -49,17 +43,11 @@ __nearbyintf(float x)
+ 		GET_FLOAT_WORD(i0,t);
+ 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
+ 		return t;
+-	    } else {
+-		i = (0x007fffff)>>j0;
+-		if((i0&i)==0) return x; /* x is integral */
+-		i>>=1;
+-		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
+ 	    }
+ 	} else {
+ 	    if(__builtin_expect(j0==0x80, 0)) return x+x;	/* inf or NaN */
+ 	    else return x;		/* x is integral */
+ 	}
+-	SET_FLOAT_WORD(x,i0);
+ 	libc_feholdexceptf (&env);
+ 	w = TWO23[sx]+x;
+ 	t = w-TWO23[sx];
diff --git a/core/glibc/glibc-2.15-non-signalling-comparisons.patch b/core/glibc/glibc-2.15-non-signalling-comparisons.patch
new file mode 100644
index 000000000..874f8b4cb
--- /dev/null
+++ b/core/glibc/glibc-2.15-non-signalling-comparisons.patch
@@ -0,0 +1,886 @@
+diff --git a/math/w_acos.c b/math/w_acos.c
+index 3138408..0490933 100644
+--- a/math/w_acos.c
++++ b/math/w_acos.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ __acos (double x)
+ {
+-  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabs (x), 1.0), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* acos(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_acosf.c b/math/w_acosf.c
+index 0e41a2c..2500a7d 100644
+--- a/math/w_acosf.c
++++ b/math/w_acosf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ float
+ __acosf (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* acos(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_acosh.c b/math/w_acosh.c
+index 0bd2686..d632987 100644
+--- a/math/w_acosh.c
++++ b/math/w_acosh.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ double
+ __acosh (double x)
+ {
+-  if (__builtin_expect (x < 1.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x,  1.0), 0) && _LIB_VERSION != _IEEE_)
+     /* acosh(x<1) */
+     return __kernel_standard (x, x, 29);
+ 
+diff --git a/math/w_acoshf.c b/math/w_acoshf.c
+index c59bf94..f77df2b 100644
+--- a/math/w_acoshf.c
++++ b/math/w_acoshf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ float
+ __acoshf (float x)
+ {
+-  if (__builtin_expect (x < 1.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x, 1.0f), 0) && _LIB_VERSION != _IEEE_)
+     /* acosh(x<1) */
+     return __kernel_standard_f (x, x, 129);
+ 
+diff --git a/math/w_acoshl.c b/math/w_acoshl.c
+index 819bdfc..cc823b8 100644
+--- a/math/w_acoshl.c
++++ b/math/w_acoshl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ long double
+ __acoshl (long double x)
+ {
+-  if (__builtin_expect (x < 1.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x, 1.0L), 0) && _LIB_VERSION != _IEEE_)
+     /* acosh(x<1) */
+     return __kernel_standard (x, x, 229);
+ 
+diff --git a/math/w_acosl.c b/math/w_acosl.c
+index 6417068..05023b4 100644
+--- a/math/w_acosl.c
++++ b/math/w_acosl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __acosl (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* acos(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_asin.c b/math/w_asin.c
+index d4e89ce..0fa9487 100644
+--- a/math/w_asin.c
++++ b/math/w_asin.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ __asin (double x)
+ {
+-  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabs (x),  1.0), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* asin(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_asinf.c b/math/w_asinf.c
+index 270961f..c28edab 100644
+--- a/math/w_asinf.c
++++ b/math/w_asinf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ float
+ __asinf (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* asin(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_asinl.c b/math/w_asinl.c
+index 32e5273..e4036d8 100644
+--- a/math/w_asinl.c
++++ b/math/w_asinl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __asinl (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* asin(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_atanh.c b/math/w_atanh.c
+index 1022bd5..190d2e9 100644
+--- a/math/w_atanh.c
++++ b/math/w_atanh.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,8 @@
+ double
+ __atanh (double x)
+ {
+-  if (__builtin_expect (fabs (x) >= 1.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreaterequal (fabs (x), 1.0), 0)
++      && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x,
+ 			      fabs (x) > 1.0
+ 			      ? 30		/* atanh(|x|>1) */
+diff --git a/math/w_atanhf.c b/math/w_atanhf.c
+index 3c8cf83..e0c5dc3 100644
+--- a/math/w_atanhf.c
++++ b/math/w_atanhf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,8 @@
+ float
+ __atanhf (float x)
+ {
+-  if (__builtin_expect (fabsf (x) >= 1.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreaterequal (fabsf (x), 1.0f), 0)
++      && _LIB_VERSION != _IEEE_)
+     return __kernel_standard_f (x, x,
+ 				fabsf (x) > 1.0f
+ 				? 130		/* atanh(|x|>1) */
+diff --git a/math/w_atanhl.c b/math/w_atanhl.c
+index f582acf..319535d 100644
+--- a/math/w_atanhl.c
++++ b/math/w_atanhl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,8 @@
+ long double
+ __atanhl (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) >= 1.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreaterequal (fabsl (x), 1.0L), 0)
++      && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x,
+ 			      fabsl (x) > 1.0L
+ 			      ? 230		/* atanh(|x|>1) */
+diff --git a/math/w_exp2.c b/math/w_exp2.c
+index bf22326..7a3b0af 100644
+--- a/math/w_exp2.c
++++ b/math/w_exp2.c
+@@ -12,7 +12,8 @@ static const double u_threshold = (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1);
+ double
+ __exp2 (double x)
+ {
+-  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
++  if (__builtin_expect (islessequal (x, u_threshold)
++			|| isgreater (x, o_threshold), 0)
+       && _LIB_VERSION != _IEEE_ && __finite (x))
+     /* exp2 overflow: 44, exp2 underflow: 45 */
+     return __kernel_standard (x, x, 44 + (x <= o_threshold));
+diff --git a/math/w_exp2f.c b/math/w_exp2f.c
+index 7215fca..c4e9e94 100644
+--- a/math/w_exp2f.c
++++ b/math/w_exp2f.c
+@@ -12,7 +12,8 @@ static const float u_threshold = (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1);
+ float
+ __exp2f (float x)
+ {
+-  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
++  if (__builtin_expect (islessequal (x, u_threshold)
++			|| isgreater (x, o_threshold), 0)
+       && _LIB_VERSION != _IEEE_ && __finitef (x))
+     /* exp2 overflow: 144, exp2 underflow: 145 */
+     return __kernel_standard_f (x, x, 144 + (x <= o_threshold));
+diff --git a/math/w_exp2l.c b/math/w_exp2l.c
+index ac8d231..442a637 100644
+--- a/math/w_exp2l.c
++++ b/math/w_exp2l.c
+@@ -13,7 +13,8 @@ static const long double u_threshold
+ long double
+ __exp2l (long double x)
+ {
+-  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
++  if (__builtin_expect (islessequal (x, u_threshold)
++			|| isgreater (x, o_threshold), 0)
+       && _LIB_VERSION != _IEEE_ && __finitel (x))
+     /* exp2 overflow: 244, exp2 underflow: 245 */
+     return __kernel_standard (x, x, 244 + (x <= o_threshold));
+diff --git a/math/w_j0.c b/math/w_j0.c
+index 1dff8b4..f8d3724 100644
+--- a/math/w_j0.c
++++ b/math/w_j0.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ j0 (double x)
+ {
+-  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* j0(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 34);
+ 
+@@ -40,7 +41,8 @@ strong_alias (j0, j0l)
+ double
+ y0 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0)
+ 	{
+diff --git a/math/w_j0f.c b/math/w_j0f.c
+index fc52f26..cef36aa 100644
+--- a/math/w_j0f.c
++++ b/math/w_j0f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ j0f (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
++  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     /* j0(|x|>X_TLOSS) */
+     return __kernel_standard_f (x, x, 134);
+@@ -38,7 +38,8 @@ j0f (float x)
+ float
+ y0f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
++  if (__builtin_expect (islessequal (x, 0.0f)
++                        || isgreater (x, (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0f)
+diff --git a/math/w_j0l.c b/math/w_j0l.c
+index 8d72d50..144f33c 100644
+--- a/math/w_j0l.c
++++ b/math/w_j0l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __j0l (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* j0(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 234);
+ 
+@@ -38,7 +39,8 @@ weak_alias (__j0l, j0l)
+ long double
+ __y0l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0L)
+ 	{
+diff --git a/math/w_j1.c b/math/w_j1.c
+index 358e0e1..e9a5357 100644
+--- a/math/w_j1.c
++++ b/math/w_j1.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ j1 (double x)
+ {
+-  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* j1(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 36);
+ 
+@@ -40,7 +41,8 @@ strong_alias (j1, j1l)
+ double
+ y1 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0)
+ 	{
+diff --git a/math/w_j1f.c b/math/w_j1f.c
+index 096fdf5..29bd949 100644
+--- a/math/w_j1f.c
++++ b/math/w_j1f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ float
+ j1f (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsf (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* j1(|x|>X_TLOSS) */
+     return __kernel_standard_f (x, x, 136);
+ 
+@@ -37,7 +38,8 @@ j1f (float x)
+ float
+ y1f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
++  if (__builtin_expect (islessequal (x, 0.0f)
++			|| isgreater (x, (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0f)
+diff --git a/math/w_j1l.c b/math/w_j1l.c
+index 93e4ee4..01b8551 100644
+--- a/math/w_j1l.c
++++ b/math/w_j1l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __j1l (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* j1(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 236);
+ 
+@@ -38,7 +39,8 @@ weak_alias (__j1l, j1l)
+ long double
+ __y1l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0L)
+ 	{
+diff --git a/math/w_jn.c b/math/w_jn.c
+index f0dd8c6..fd3fb16 100644
+--- a/math/w_jn.c
++++ b/math/w_jn.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ jn (int n, double x)
+ {
+-  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* jn(n,|x|>X_TLOSS) */
+     return __kernel_standard (n, x, 38);
+ 
+@@ -40,7 +41,8 @@ strong_alias (jn, jnl)
+ double
+ yn (int n, double x)
+ {
+-  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0)
+ 	{
+diff --git a/math/w_jnf.c b/math/w_jnf.c
+index ef29eb4..36d6f6d 100644
+--- a/math/w_jnf.c
++++ b/math/w_jnf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ jnf (int n, float x)
+ {
+-  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
++  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     /* jn(n,|x|>X_TLOSS) */
+     return __kernel_standard_f (n, x, 138);
+@@ -38,7 +38,8 @@ jnf (int n, float x)
+ float
+ ynf (int n, float x)
+ {
+-  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
++  if (__builtin_expect (islessequal (x, 0.0f)
++			|| isgreater (x, (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0f)
+diff --git a/math/w_log.c b/math/w_log.c
+index efc1c4c..ec33605 100644
+--- a/math/w_log.c
++++ b/math/w_log.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ double
+ __log (double x)
+ {
+-  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log10.c b/math/w_log10.c
+index 2717ade..fe799ad 100644
+--- a/math/w_log10.c
++++ b/math/w_log10.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ double
+ __log10 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log10f.c b/math/w_log10f.c
+index 60737ca..4b821f7 100644
+--- a/math/w_log10f.c
++++ b/math/w_log10f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ __log10f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0f)
+ 	{
+diff --git a/math/w_log10l.c b/math/w_log10l.c
+index b26f18c..0e5a137 100644
+--- a/math/w_log10l.c
++++ b/math/w_log10l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ long double
+ __log10l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0L)
+ 	{
+diff --git a/math/w_log2.c b/math/w_log2.c
+index 998e5d9..e58e109 100644
+--- a/math/w_log2.c
++++ b/math/w_log2.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ double
+ __log2 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log2f.c b/math/w_log2f.c
+index 6d91bf4..6963ed2 100644
+--- a/math/w_log2f.c
++++ b/math/w_log2f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ __log2f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log2l.c b/math/w_log2l.c
+index e51c1bc..eed04ff6c 100644
+--- a/math/w_log2l.c
++++ b/math/w_log2l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ long double
+ __log2l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0L)
+ 	{
+diff --git a/math/w_logf.c b/math/w_logf.c
+index 8aa27c8..38d408f 100644
+--- a/math/w_logf.c
++++ b/math/w_logf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ __logf (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0f)
+ 	{
+diff --git a/math/w_logl.c b/math/w_logl.c
+index a3139ff..593b37d 100644
+--- a/math/w_logl.c
++++ b/math/w_logl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ long double
+ __logl (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0L)
+ 	{
+diff --git a/math/w_sqrt.c b/math/w_sqrt.c
+index 409a6df..f6ba542 100644
+--- a/math/w_sqrt.c
++++ b/math/w_sqrt.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ double
+ __sqrt (double x)
+ {
+-  if (__builtin_expect (x < 0.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x, 26); /* sqrt(negative) */
+ 
+   return __ieee754_sqrt (x);
+diff --git a/math/w_sqrtf.c b/math/w_sqrtf.c
+index 3c3d2f8..c128e9b 100644
+--- a/math/w_sqrtf.c
++++ b/math/w_sqrtf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ float
+ __sqrtf (float x)
+ {
+-  if (__builtin_expect (x < 0.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     return __kernel_standard_f (x, x, 126); /* sqrt(negative) */
+ 
+   return __ieee754_sqrtf (x);
+diff --git a/math/w_sqrtl.c b/math/w_sqrtl.c
+index 5e18f44..2a4a048 100644
+--- a/math/w_sqrtl.c
++++ b/math/w_sqrtl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ long double
+ __sqrtl (long double x)
+ {
+-  if (__builtin_expect (x < 0.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x, 226); /* sqrt(negative) */
+ 
+   return __ieee754_sqrtl (x);
+diff --git a/sysdeps/ieee754/dbl-64/e_atanh.c b/sysdeps/ieee754/dbl-64/e_atanh.c
+index 9fc21ab..5f471b1 100644
+--- a/sysdeps/ieee754/dbl-64/e_atanh.c
++++ b/sysdeps/ieee754/dbl-64/e_atanh.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -46,7 +46,7 @@ __ieee754_atanh (double x)
+ {
+   double xa = fabs (x);
+   double t;
+-  if (xa < 0.5)
++  if (isless (xa, 0.5))
+     {
+       if (__builtin_expect (xa < 0x1.0p-28, 0))
+ 	{
+@@ -57,11 +57,11 @@ __ieee754_atanh (double x)
+       t = xa + xa;
+       t = 0.5 * __log1p (t + t * xa / (1.0 - xa));
+     }
+-  else if (__builtin_expect (xa < 1.0, 1))
++  else if (__builtin_expect (isless (xa, 1.0), 1))
+     t = 0.5 * __log1p ((xa + xa) / (1.0 - xa));
+   else
+     {
+-      if (xa > 1.0)
++      if (isgreater (xa, 1.0))
+ 	return (x - x) / (x - x);
+ 
+       return x / 0.0;
+diff --git a/sysdeps/ieee754/dbl-64/w_exp.c b/sysdeps/ieee754/dbl-64/w_exp.c
+index ee42587..b584ed8 100644
+--- a/sysdeps/ieee754/dbl-64/w_exp.c
++++ b/sysdeps/ieee754/dbl-64/w_exp.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -28,12 +28,12 @@ u_threshold= -7.45133219101941108420e+02;  /* 0xc0874910, 0xD52D3051 */
+ double
+ __exp (double x)
+ {
+-  if (__builtin_expect (x > o_threshold, 0))
++  if (__builtin_expect (isgreater (x, o_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 6);
+     }
+-  else if (__builtin_expect (x < u_threshold, 0))
++  else if (__builtin_expect (isless (x, u_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 7);
+diff --git a/sysdeps/ieee754/flt-32/e_atanhf.c b/sysdeps/ieee754/flt-32/e_atanhf.c
+index 75ed691..7af2f6c 100644
+--- a/sysdeps/ieee754/flt-32/e_atanhf.c
++++ b/sysdeps/ieee754/flt-32/e_atanhf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -46,7 +46,7 @@ __ieee754_atanhf (float x)
+ {
+   float xa = fabsf (x);
+   float t;
+-  if (xa < 0.5f)
++  if (isless (xa, 0.5f))
+     {
+       if (__builtin_expect (xa < 0x1.0p-28f, 0))
+ 	{
+@@ -57,11 +57,11 @@ __ieee754_atanhf (float x)
+       t = xa + xa;
+       t = 0.5f * __log1pf (t + t * xa / (1.0f - xa));
+     }
+-  else if (__builtin_expect (xa < 1.0f, 1))
++  else if (__builtin_expect (isless (xa, 1.0f), 1))
+     t = 0.5f * __log1pf ((xa + xa) / (1.0f - xa));
+   else
+     {
+-      if (xa > 1.0f)
++      if (isgreater (xa, 1.0f))
+ 	return (x - x) / (x - x);
+ 
+       return x / 0.0f;
+diff --git a/sysdeps/ieee754/flt-32/w_expf.c b/sysdeps/ieee754/flt-32/w_expf.c
+index 5500872..bc3b2f6 100644
+--- a/sysdeps/ieee754/flt-32/w_expf.c
++++ b/sysdeps/ieee754/flt-32/w_expf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -28,12 +28,12 @@ u_threshold= -1.0397208405e+02;  /* 0xc2cff1b5 */
+ float
+ __expf (float x)
+ {
+-  if (__builtin_expect (x > o_threshold, 0))
++  if (__builtin_expect (isgreater (x, o_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 106);
+     }
+-  else if (__builtin_expect (x < u_threshold, 0))
++  else if (__builtin_expect (isless (x, u_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 107);
+diff --git a/sysdeps/ieee754/ldbl-96/w_expl.c b/sysdeps/ieee754/ldbl-96/w_expl.c
+index ec9d8a7..d61c0a3 100644
+--- a/sysdeps/ieee754/ldbl-96/w_expl.c
++++ b/sysdeps/ieee754/ldbl-96/w_expl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -30,12 +30,12 @@ u_threshold= -1.140019167866942050398521670162263001513e4;
+ long double
+ __expl (long double x)
+ {
+-  if (__builtin_expect (x > o_threshold, 0))
++  if (__builtin_expect (isgreater (x, o_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard (x, x, 206);
+     }
+-  else if (__builtin_expect (x < u_threshold, 0))
++  else if (__builtin_expect (isless (x, u_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard (x, x, 207);
diff --git a/core/glibc/glibc-2.15-revert-netlink-cache.patch b/core/glibc/glibc-2.15-revert-netlink-cache.patch
index f35f6c5f0..87d04c794 100644
--- a/core/glibc/glibc-2.15-revert-netlink-cache.patch
+++ b/core/glibc/glibc-2.15-revert-netlink-cache.patch
@@ -1,20 +1,3 @@
-From 2a3a38c03b6e376a9bc8a1937641e5dee979bcbf Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Sat, 4 Feb 2012 15:28:54 +1000
-Subject: [PATCH] revert stuff
-
----
- include/ifaddrs.h                  |    5 -
- inet/check_pf.c                    |   18 +----
- nscd/connections.c                 |  119 ------------------------
- nscd/nscd-client.h                 |   18 +----
- nscd/nscd_gethst_r.c               |   23 +-----
- nscd/nscd_helper.c                 |   10 +-
- sysdeps/posix/getaddrinfo.c        |   10 +-
- sysdeps/unix/sysv/linux/Makefile   |    2 +-
- sysdeps/unix/sysv/linux/check_pf.c |  176 +++++++-----------------------------
- 9 files changed, 46 insertions(+), 335 deletions(-)
-
 diff --git a/include/ifaddrs.h b/include/ifaddrs.h
 index e1c6cac..50e4c48 100644
 --- a/include/ifaddrs.h
@@ -695,6 +678,3 @@ index 0738a70..d5ad7ea 100644
 -	}
 -    }
 -}
--- 
-1.7.9
-
diff --git a/core/glibc/glibc-2.15-rintf-rounding.patch b/core/glibc/glibc-2.15-rintf-rounding.patch
new file mode 100644
index 000000000..e0240ac6c
--- /dev/null
+++ b/core/glibc/glibc-2.15-rintf-rounding.patch
@@ -0,0 +1,158 @@
+diff --git a/math/libm-test.inc b/math/libm-test.inc
+index 6243e1e..c8186c8 100644
+--- a/math/libm-test.inc
++++ b/math/libm-test.inc
+@@ -5037,6 +5037,22 @@ rint_test (void)
+   TEST_f_f (rint, 262142.75, 262143.0);
+   TEST_f_f (rint, 524286.75, 524287.0);
+   TEST_f_f (rint, 524288.75, 524289.0);
++  TEST_f_f (rint, 1048576.75, 1048577.0);
++  TEST_f_f (rint, 2097152.75, 2097153.0);
++  TEST_f_f (rint, -1048576.75, -1048577.0);
++  TEST_f_f (rint, -2097152.75, -2097153.0);
++#ifndef TEST_FLOAT
++  TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
++  TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
++  TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
++  TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
++  TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
++  TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
++  TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
++  TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
++  TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
++  TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
++#endif
+ #ifdef TEST_LDOUBLE
+   /* The result can only be represented in long double.  */
+   TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
+@@ -5137,6 +5153,22 @@ rint_test_tonearest (void)
+       TEST_f_f (rint, -0.1, -0.0);
+       TEST_f_f (rint, -0.25, -0.0);
+       TEST_f_f (rint, -0.625, -1.0);
++      TEST_f_f (rint, 1048576.75, 1048577.0);
++      TEST_f_f (rint, 2097152.75, 2097153.0);
++      TEST_f_f (rint, -1048576.75, -1048577.0);
++      TEST_f_f (rint, -2097152.75, -2097153.0);
++#ifndef TEST_FLOAT
++      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
++      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
++      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
++      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
++      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
++      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
++      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
++      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
++      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
++      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
++#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
+@@ -5207,6 +5239,22 @@ rint_test_towardzero (void)
+       TEST_f_f (rint, -0.1, -0.0);
+       TEST_f_f (rint, -0.25, -0.0);
+       TEST_f_f (rint, -0.625, -0.0);
++      TEST_f_f (rint, 1048576.75, 1048576.0);
++      TEST_f_f (rint, 2097152.75, 2097152.0);
++      TEST_f_f (rint, -1048576.75, -1048576.0);
++      TEST_f_f (rint, -2097152.75, -2097152.0);
++#ifndef TEST_FLOAT
++      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
++      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
++      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
++      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
++      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
++      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
++      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
++      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
++      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
++      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
++#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
+@@ -5277,6 +5325,22 @@ rint_test_downward (void)
+       TEST_f_f (rint, -0.1, -1.0);
+       TEST_f_f (rint, -0.25, -1.0);
+       TEST_f_f (rint, -0.625, -1.0);
++      TEST_f_f (rint, 1048576.75, 1048576.0);
++      TEST_f_f (rint, 2097152.75, 2097152.0);
++      TEST_f_f (rint, -1048576.75, -1048577.0);
++      TEST_f_f (rint, -2097152.75, -2097153.0);
++#ifndef TEST_FLOAT
++      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
++      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
++      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
++      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
++      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
++      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
++      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
++      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
++      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
++      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
++#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
+@@ -5347,6 +5411,22 @@ rint_test_upward (void)
+       TEST_f_f (rint, -0.1, -0.0);
+       TEST_f_f (rint, -0.25, -0.0);
+       TEST_f_f (rint, -0.625, -0.0);
++      TEST_f_f (rint, 1048576.75, 1048577.0);
++      TEST_f_f (rint, 2097152.75, 2097153.0);
++      TEST_f_f (rint, -1048576.75, -1048576.0);
++      TEST_f_f (rint, -2097152.75, -2097152.0);
++#ifndef TEST_FLOAT
++      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
++      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
++      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
++      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
++      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
++      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
++      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
++      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
++      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
++      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
++#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
+diff --git a/sysdeps/ieee754/flt-32/s_rintf.c b/sysdeps/ieee754/flt-32/s_rintf.c
+index 9ea9b6f..9ba6b57 100644
+--- a/sysdeps/ieee754/flt-32/s_rintf.c
++++ b/sysdeps/ieee754/flt-32/s_rintf.c
+@@ -26,34 +26,22 @@ float
+ __rintf(float x)
+ {
+ 	int32_t i0,j0,sx;
+-	u_int32_t i,i1;
+ 	float w,t;
+ 	GET_FLOAT_WORD(i0,x);
+ 	sx = (i0>>31)&1;
+ 	j0 = ((i0>>23)&0xff)-0x7f;
+ 	if(j0<23) {
+ 	    if(j0<0) {
+-		if((i0&0x7fffffff)==0) return x;
+-		i1 = (i0&0x07fffff);
+-		i0 &= 0xfff00000;
+-		i0 |= ((i1|-i1)>>9)&0x400000;
+-		SET_FLOAT_WORD(x,i0);
+ 		w = TWO23[sx]+x;
+ 		t =  w-TWO23[sx];
+ 		GET_FLOAT_WORD(i0,t);
+ 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
+ 		return t;
+-	    } else {
+-		i = (0x007fffff)>>j0;
+-		if((i0&i)==0) return x; /* x is integral */
+-		i>>=1;
+-		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
+ 	    }
+ 	} else {
+ 	    if(j0==0x80) return x+x;	/* inf or NaN */
+ 	    else return x;		/* x is integral */
+ 	}
+-	SET_FLOAT_WORD(x,i0);
+ 	w = TWO23[sx]+x;
+ 	return w-TWO23[sx];
+ }
diff --git a/core/glibc/glibc-2.15-scanf.patch b/core/glibc/glibc-2.15-scanf.patch
index 7655ae5ab..a2561b232 100644
--- a/core/glibc/glibc-2.15-scanf.patch
+++ b/core/glibc/glibc-2.15-scanf.patch
@@ -1,13 +1,3 @@
-From 20b38e0301279a37a3f1e769843933bcc0d5f736 Mon Sep 17 00:00:00 2001
-From: Paul Pluzhnikov <ppluzhnikov@google.com>
-Date: Sun, 8 Jan 2012 20:13:35 -0500
-Subject: [PATCH 1/1] sscanf always calls realloc
-
----
- ChangeLog              |    5 +++++
- stdio-common/vfscanf.c |    4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
 diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
 index 0e71deb..e18a6c3 100644
 --- a/stdio-common/vfscanf.c
@@ -27,6 +17,3 @@ index 0e71deb..e18a6c3 100644
  	    {								    \
  	      wp = realloc (use_malloc ? wp : NULL, newsize);		    \
  	      if (wp == NULL)						    \
--- 
-1.7.3.4
-
diff --git a/core/glibc/glibc-2.15-vdso.patch b/core/glibc/glibc-2.15-vdso.patch
new file mode 100644
index 000000000..7fd394f90
--- /dev/null
+++ b/core/glibc/glibc-2.15-vdso.patch
@@ -0,0 +1,40 @@
+diff --git a/elf/Makefile b/elf/Makefile
+index 8234ba7..25ffc57 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -1203,3 +1203,14 @@ $(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so
+ $(objpfx)tst-relsort1mod2.so: $(libm)
+ $(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
+ 			   $(objpfx)tst-relsort1mod2.so
++
++tests: $(objpfx)tst-unused-dep.out
++
++$(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so
++	LD_TRACE_LOADED_OBJECTS=1 \
++	LD_DEBUG=unused \
++	LD_PRELOAD= \
++	$(elf-objpfx)${rtld-installed-name} \
++	  --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
++	  $< > $@
++	cmp $@ /dev/null > /dev/null
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 2e4f97f..3e15447 100644
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -1,5 +1,5 @@
+ /* Run time dynamic linker.
+-   Copyright (C) 1995-2010, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1995-2012 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
+@@ -1375,6 +1375,9 @@ of this helper program; chances are you did not intend to run this program.\n\
+ 	  _dl_setup_hash (l);
+ 	  l->l_relocated = 1;
+ 
++	  /* The vDSO is always used.  */
++	  l->l_used = 1;
++
+ 	  /* Initialize l_local_scope to contain just this map.  This allows
+ 	     the use of dl_lookup_symbol_x to resolve symbols within the vdso.
+ 	     So we create a single entry list pointing to l_real as its only
diff --git a/core/glibc/glibc-2.15-vfprintf-nargs.patch b/core/glibc/glibc-2.15-vfprintf-nargs.patch
new file mode 100644
index 000000000..6a37bde68
--- /dev/null
+++ b/core/glibc/glibc-2.15-vfprintf-nargs.patch
@@ -0,0 +1,174 @@
+diff --git a/stdio-common/Makefile b/stdio-common/Makefile
+index a847b28..080badc 100644
+--- a/stdio-common/Makefile
++++ b/stdio-common/Makefile
+@@ -59,7 +59,8 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
+ 	 tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
+ 	 tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
+ 	 bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \
+-	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24
++	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24 \
++	 bug-vfprintf-nargs
+ 
+ test-srcs = tst-unbputc tst-printf
+ 
+diff --git a/stdio-common/bug-vfprintf-nargs.c b/stdio-common/bug-vfprintf-nargs.c
+new file mode 100644
+index 0000000..13c66c0
+--- /dev/null
++++ b/stdio-common/bug-vfprintf-nargs.c
+@@ -0,0 +1,78 @@
++/* Test for vfprintf nargs allocation overflow (BZ #13656).
++   Copyright (C) 2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++   Contributed by Kees Cook <keescook@chromium.org>, 2012.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <stdint.h>
++#include <unistd.h>
++#include <inttypes.h>
++#include <string.h>
++#include <signal.h>
++
++static int
++format_failed (const char *fmt, const char *expected)
++{
++  char output[80];
++
++  printf ("%s : ", fmt);
++
++  memset (output, 0, sizeof output);
++  /* Having sprintf itself detect a failure is good.  */
++  if (sprintf (output, fmt, 1, 2, 3, "test") > 0
++      && strcmp (output, expected) != 0)
++    {
++      printf ("FAIL (output '%s' != expected '%s')\n", output, expected);
++      return 1;
++    }
++  puts ("ok");
++  return 0;
++}
++
++static int
++do_test (void)
++{
++  int rc = 0;
++  char buf[64];
++
++  /* Regular positionals work.  */
++  if (format_failed ("%1$d", "1") != 0)
++    rc = 1;
++
++  /* Regular width positionals work.  */
++  if (format_failed ("%1$*2$d", " 1") != 0)
++    rc = 1;
++
++  /* Positional arguments are constructed via read_int, so nargs can only
++     overflow on 32-bit systems.  On 64-bit systems, it will attempt to
++     allocate a giant amount of memory and possibly crash, which is the
++     expected situation.  Since the 64-bit behavior is arch-specific, only
++     test this on 32-bit systems.  */
++  if (sizeof (long int) == 4)
++    {
++      sprintf (buf, "%%1$d %%%" PRIdPTR "$d", UINT32_MAX / sizeof (int));
++      if (format_failed (buf, "1 %$d") != 0)
++        rc = 1;
++    }
++
++  return rc;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
+index 863cd5d..022e72b 100644
+--- a/stdio-common/vfprintf.c
++++ b/stdio-common/vfprintf.c
+@@ -235,6 +235,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
+      0 if unknown.  */
+   int readonly_format = 0;
+ 
++  /* For the argument descriptions, which may be allocated on the heap.  */
++  void *args_malloced = NULL;
++
+   /* This table maps a character into a number representing a
+      class.  In each step there is a destination label for each
+      class.  */
+@@ -1647,9 +1650,10 @@ do_positional:
+        determine the size of the array needed to store the argument
+        attributes.  */
+     size_t nargs = 0;
+-    int *args_type;
+-    union printf_arg *args_value = NULL;
++    size_t bytes_per_arg;
++    union printf_arg *args_value;
+     int *args_size;
++    int *args_type;
+ 
+     /* Positional parameters refer to arguments directly.  This could
+        also determine the maximum number of arguments.  Track the
+@@ -1698,13 +1702,33 @@ do_positional:
+ 
+     /* Determine the number of arguments the format string consumes.  */
+     nargs = MAX (nargs, max_ref_arg);
++    bytes_per_arg = sizeof (*args_value) + sizeof (*args_size)
++                    + sizeof (*args_type);
++
++    /* Check for potential integer overflow.  */
++    if (nargs > SIZE_MAX / bytes_per_arg)
++      {
++         done = -1;
++         goto all_done;
++      }
+ 
+     /* Allocate memory for the argument descriptions.  */
+-    args_type = alloca (nargs * sizeof (int));
++    if (__libc_use_alloca (nargs * bytes_per_arg))
++        args_value = alloca (nargs * bytes_per_arg);
++    else
++      {
++        args_value = args_malloced = malloc (nargs * bytes_per_arg);
++        if (args_value == NULL)
++          {
++            done = -1;
++            goto all_done;
++          }
++      }
++
++    args_size = &args_value[nargs].pa_int;
++    args_type = &args_size[nargs];
+     memset (args_type, s->_flags2 & _IO_FLAGS2_FORTIFY ? '\xff' : '\0',
+-	    nargs * sizeof (int));
+-    args_value = alloca (nargs * sizeof (union printf_arg));
+-    args_size = alloca (nargs * sizeof (int));
++	    nargs * sizeof (*args_type));
+ 
+     /* XXX Could do sanity check here: If any element in ARGS_TYPE is
+        still zero after this loop, format is invalid.  For now we
+@@ -1973,8 +1997,8 @@ do_positional:
+   }
+ 
+ all_done:
+-  if (__builtin_expect (workstart != NULL, 0))
+-    free (workstart);
++  free (args_malloced);
++  free (workstart);
+   /* Unlock the stream.  */
+   _IO_funlockfile (s);
+   _IO_cleanup_region_end (0);
diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD
index 7ecfd5ab6..8c5f0f507 100644
--- a/core/grep/PKGBUILD
+++ b/core/grep/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150337 2012-02-16 23:38:08Z allan $
+# $Id: PKGBUILD 151831 2012-03-03 08:49:06Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=grep
-pkgver=2.10
-pkgrel=3
+pkgver=2.11
+pkgrel=1
 pkgdesc="A string search utility"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -14,8 +14,8 @@ depends=('glibc' 'pcre' 'sh')
 makedepends=('texinfo')
 install=${pkgname}.install
 source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-md5sums=('709915434d09f5db655e5ebd7fd6bb7f'
-         '9ad5c390a6ad7f566c58db28ddb06aed')
+md5sums=('ad9c6dbdeab93e50d2bc380f10ed3643'
+         'e4fea5e355973c951f93f48bc86f92fa')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index 4ac7cbab1..1fa2fea1c 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150974 2012-02-24 12:10:46Z allan $
+# $Id: PKGBUILD 151833 2012-03-03 08:49:08Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sudo
-_ver=1.8.4p1
+_ver=1.8.4p2
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
 pkgdesc="Give certain users the ability to run some commands as root"
@@ -15,8 +15,8 @@ backup=('etc/sudoers' 'etc/pam.d/sudo')
 options=('!libtool' '!makeflags')
 source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig}
         sudo.pam)
-md5sums=('d7f9bf7675bbc6d75e6f9353a175317c'
-         '51bc933d386af08038349dd61aa243c3'
+md5sums=('c0cc9334246d4f34128660b6c5463e94'
+         'bb692de8ecb24d8bfab00c45292536c5'
          '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
 
 build() {
diff --git a/extra/alex/PKGBUILD b/extra/alex/PKGBUILD
index 59d947f12..32b9ebb2f 100644
--- a/extra/alex/PKGBUILD
+++ b/extra/alex/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 150499 2012-02-18 11:26:02Z pierre $
+# $Id: PKGBUILD 151870 2012-03-03 16:05:52Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Philip Nilsson <pnilsson@nullref.se>
 
 pkgname=alex
-pkgver=2.3.5
-pkgrel=2
+pkgver=3.0.1
+pkgrel=1
 pkgdesc='a lexical analyser generator for Haskell'
 arch=('i686' 'x86_64')
 url='http://www.haskell.org/alex/'
 license=('custom:BSD3')
 depends=('gmp')
-makedepends=('ghc=7.0.3')
+makedepends=('ghc=7.4.1-2' 'haskell-quickcheck=2.4.2-1')
 source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('5e08c688ded0dcff98eaad6fc03a9402')
+md5sums=('5dec239c89165d159faa2154bc0724cd')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD
index 9fddba6ca..864b7fde3 100644
--- a/extra/ghc/PKGBUILD
+++ b/extra/ghc/PKGBUILD
@@ -1,4 +1,5 @@
-# $Id: PKGBUILD 128106 2011-06-22 10:54:11Z vesa $
+# $Id: PKGBUILD 151872 2012-03-03 16:05:55Z tdziedzic $
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Special note for devs looking to upgrade this package:
 #   ghc places a unique hash for each library when it is built.
@@ -6,74 +7,106 @@
 #   This implies that all libraries need to be rebuilt when ghc is rebuilt.
 #   Also, due to dependency loop problems, haskell-ghc-paths and haddock
 #   do not carry version dependencies. You will have to remember to build them too.
+
 pkgname=ghc
-pkgver=7.0.3
+pkgver=7.4.1
 pkgrel=2
-pkgdesc="The Glasgow Haskell Compiler"
-arch=(i686 x86_64)
-url="http://www.haskell.org/ghc/"
-license=("custom")
-depends=('perl' 'gmp>=5.0' gcc)
-makedepends=(ghc happy perl libxslt docbook-xsl)
-provides=("haskell-array=0.3.0.2"
-          "haskell-bytestring=0.9.1.10"
-          "haskell-cabal=1.10.1.0"
-          "haskell-containers=0.4.0.0"
-          "haskell-directory=1.1.0.0"       
-          "haskell-extensible-exceptions=0.1.1.2"
-          "haskell-filepath=1.2.0.0"
-          "haskell-haskell98=1.1.0.1"
-          "haskell-hpc=0.5.0.6"
-          "haskell-old-locale=1.0.0.2"
-          "haskell-old-time=1.0.0.6"
-          "haskell-pretty=1.0.1.2"
-          "haskell-process=1.0.1.5"
-          "haskell-random=1.0.0.3"
-          "haskell-template-haskell=2.5.0.0"
-          "haskell-time=1.2.0.3"
-          "haskell-unix=2.4.2.0"
+pkgdesc='The Glasgow Haskell Compiler'
+arch=('i686' 'x86_64')
+url='http://www.haskell.org/ghc/'
+license=('custom')
+depends=('perl' 'gmp>=5.0' 'gcc' 'libffi')
+makedepends=('ghc' 'happy' 'perl' 'libxslt' 'docbook-xsl')
+checkdepends=('python2')
+install='ghc.install'
+groups=('haskell')
+provides=('haskell-array=0.4.0.0'
+          'haskell-base=4.5.0.0'
+          'haskell-binary=0.5.1.0'
+          'haskell-bin-package-db=0.0.0.0'
+          'haskell-bytestring=0.9.2.1'
+          'haskell-containers=0.4.2.1'
+          'haskell-deepseq=1.3.0.0'
+          'haskell-directory=1.1.0.2'
+          'haskell-extensible-exceptions=0.1.1.4'
+          'haskell-filepath=1.3.0.0'
+          'haskell-ghc-prim=0.2.0.0'
+          'haskell-haskell2010=1.1.0.1'
+          'haskell-haskell98=2.0.0.1'
+          'haskell-hoopl=3.8.7.3'
+          'haskell-hpc=0.5.1.1'
+          'haskell-integer-gmp=0.4.0.0'
+          'haskell-old-locale=1.0.0.4'
+          'haskell-old-time=1.1.0.0'
+          'haskell-pretty=1.1.1.0'
+          'haskell-process=1.1.0.1'
+          'haskell-template-haskell=2.7.0.0'
+          'haskell-time=1.4'
+          'haskell-unix=2.5.1.0'
+          'haskell-cabal=1.14.0'
          )
-replaces=("haskell-array<0.3.0.2" 
-          "haskell-bytestring<0.9.1.10"
-          "haskell-cabal<1.10.1.0"
-          "haskell-containers<0.4.0.0"
-          "haskell-directory<1.1.0.0"
-          "haskell-extensible-exceptions<0.1.1.2"
-          "haskell-filepath<1.2.0.0"
-          "haskell-haskell98<1.1.0.1"
-          "haskell-hpc<0.5.0.6"
-          "haskell-old-locale<1.0.0.2"
-          "haskell-old-time<1.0.0.6"
-          "haskell-pretty<1.0.1.2"
-          "haskell-process<1.0.1.5"
-          "haskell-random<1.0.0.3"
-          "haskell-template-haskell<2.5.0.0"
-          "haskell-time<1.2.0.3"
-          "haskell-unix<2.4.2.0"
+replaces=('haskell-array<0.4.0.0'
+          'haskell-base<4.5.0.0'
+          'haskell-binary<0.5.1.0'
+          'haskell-bin-package-db<0.0.0.0'
+          'haskell-bytestring<0.9.2.1'
+          'haskell-containers<0.4.2.1'
+          'haskell-deepseq<1.3.0.0'
+          'haskell-directory<1.1.0.2'
+          'haskell-extensible-exceptions<0.1.1.4'
+          'haskell-filepath<1.3.0.0'
+          'haskell-ghc-prim<0.2.0.0'
+          'haskell-haskell2010<1.1.0.1'
+          'haskell-haskell98<2.0.0.1'
+          'haskell-hoopl<3.8.7.3'
+          'haskell-hpc<0.5.1.1'
+          'haskell-integer-gmp<0.4.0.0'
+          'haskell-old-locale<1.0.0.4'
+          'haskell-old-time<1.1.0.0'
+          'haskell-pretty<1.1.1.0'
+          'haskell-process<1.1.0.1'
+          'haskell-template-haskell<2.7.0.0'
+          'haskell-time<1.4'
+          'haskell-unix<2.5.1.0'
+          'haskell-cabal<1.14.0'
          )
-
-install=ghc.install
-options=(!strip)
-source=("http://www.haskell.org/ghc/dist/$pkgver/ghc-$pkgver-src.tar.bz2"
-        build.mk)
+source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
+        "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
+        'build.mk')
+md5sums=('5d86c420978b49cc60edea9bd4c36703'
+         '54bc9405c14c3226b6e3de3cd61e2777'
+         '82b67cdd24a2e434a4399f30f14b21a3')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd ghc-${pkgver}
+
+  cp ${srcdir}/build.mk mk/build.mk
 
-  cp $srcdir/build.mk mk/build.mk
+  ./configure \
+    --prefix=/usr
 
-  ./configure --prefix=/usr 
-  make -j1 || return 1
+  make -j4 -l8
 }
 
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  
-  make DESTDIR=$pkgdir install
+check() {
+  cd ghc-${pkgver}
+
+  # python2 rename
+  sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk
+  sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py
 
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license
-  install -d $pkgdir/usr/share/haskell
+  # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856
+  make THREADS=9 test
+  # might be some failures
+  #make fulltest
 }
 
-md5sums=('10bc5e9ae1b581404376efb85f260ff3'
-         '5a3e0880c80b1dcecf779ff2e63a9c0d')
+package() {
+  cd ghc-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+
+  install -d ${pkgdir}/usr/share/licenses/ghc
+  install -m644 LICENSE \
+    ${pkgdir}/usr/share/licenses/ghc
+}
diff --git a/extra/ghc/build.mk b/extra/ghc/build.mk
index f918a0f16..bc26a21fe 100644
--- a/extra/ghc/build.mk
+++ b/extra/ghc/build.mk
@@ -7,15 +7,17 @@
 
 # Uncomment one of these to select a build profile below:
 
-# Full build with max optimisation (slow build)
+# Full build with max optimisation and everything enabled (very slow build)
 BuildFlavour = perf
 
-# Fastest build (libs unoptimised):
-#BuildFlavour = quickest
-
-# Fast build with optimised libraries:
+# Fast build with optimised libraries, no profiling (RECOMMENDED):
 #BuildFlavour = quick
 
+# Even faster build.  NOT RECOMMENDED: the libraries will be
+# completely unoptimised, so any code built with this compiler
+# (including stage2) will run very slowly:
+#BuildFlavour = quickest
+
 # Profile the stage2 compiler:
 #BuildFlavour = prof
 
@@ -25,6 +27,9 @@ BuildFlavour = perf
 # A development build, working on the stage 2 compiler:
 #BuildFlavour = devel2
 
+# An unregisterised, optimised build of ghc, for porting:
+#BuildFlavour = unreg
+
 GhcLibWays = v
 
 # -------- 1. A Performance/Distribution build--------------------------------
@@ -37,7 +42,7 @@ SRC_HC_OPTS     = -O -H64m
 GhcStage1HcOpts = -O -fasm
 GhcStage2HcOpts = -O2 -fasm
 GhcHcOpts       = -Rghc-timing
-GhcLibHcOpts    = -O2 -XGenerics
+GhcLibHcOpts    = -O2
 GhcLibWays     += p
 
 ifeq "$(PlatformSupportsSharedLibs)" "YES"
@@ -112,6 +117,7 @@ HADDOCK_DOCS       = NO
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
+LAX_DEPENDENCIES   = NO
 
 endif
 
@@ -128,23 +134,42 @@ HADDOCK_DOCS       = NO
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
+LAX_DEPENDENCIES   = NO
+
+# After stage 1 and the libraries have been built, you can uncomment this line:
+
+# stage=2
+
+# Then stage 1 will not be touched by the build system, until
+# you comment the line again.  This is a useful trick for when you're
+# working on stage 2 and want to freeze stage 1 and the libraries for
+# a while.
 
 endif
 
-# -----------------------------------------------------------------------------
-# Other settings that might be useful
+# -------- A Unregisterised build) -------------------------------------------
 
-# profiled RTS
-#GhcRtsCcOpts =  -pg -g
+ifeq "$(BuildFlavour)" "unreg"
 
-# Optimised/profiled RTS
-#GhcRtsCcOpts = -O2 -pg
+GhcUnregisterised    = YES
+GhcWithNativeCodeGen = NO
 
-#GhcRtsWithFrontPanel = YES
-#SRC_HC_OPTS += `gtk-config --libs`
+SRC_HC_OPTS          = -O -H64m
+GhcStage1HcOpts      = -O
+GhcStage2HcOpts      = -O2
+GhcHcOpts            = -Rghc-timing
+GhcLibHcOpts         = -O2
+SplitObjs            = NO
+HADDOCK_DOCS         = NO
+BUILD_DOCBOOK_HTML   = NO
+BUILD_DOCBOOK_PS     = NO
+BUILD_DOCBOOK_PDF    = NO
 
-# NoFib settings
-NoFibWays =
-STRIP=:
+endif
 
+# -----------------------------------------------------------------------------
+# Other settings that might be useful
 
+# NoFib settings
+NoFibWays =
+STRIP_CMD = :
diff --git a/extra/ghc/ghc.install b/extra/ghc/ghc.install
index 7d56083bc..c0200e4a6 100644
--- a/extra/ghc/ghc.install
+++ b/extra/ghc/ghc.install
@@ -1,19 +1,10 @@
-pkgname=ghc
-
 pre_upgrade() {
-    cat << EOF
-    ==> Unregistering cabalized packages...
-EOF
-    cd /usr/share/haskell/ && (for a in *; do ghc-pkg unregister --force $a &> /dev/null; done; cd - > /dev/null )
-    cat << EOF
-    ==> Done.
-EOF
-    
+  echo '==> Unregistering cabalized packages...'
+  [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \;
+  echo '==> Done.'
 }
 
 post_upgrade() {
-    cat << EOF
-    ==> All cabalized and yaourt-installed packages need to be reinstalled now.
-    ==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.
-EOF
+  echo '==> All cabalized packages need to be reinstalled now.'
+  echo '==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.'
 }
diff --git a/extra/ghc/print-provides-replaces.sh b/extra/ghc/print-provides-replaces.sh
new file mode 100755
index 000000000..33d1da051
--- /dev/null
+++ b/extra/ghc/print-provides-replaces.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. PKGBUILD
+
+if [[ ! -d src/ghc-${pkgver}/libraries ]]; then
+  echo "error: no directory src/ghc-${pkgver}/libraries: You must extract the source tarball under src/"
+  exit 1
+fi
+
+declare -A exclude
+# no Win32 cause we're not building on windows
+exclude['Win32']=1
+# no integer-simple because we use integer-gmp
+exclude['integer-simple']=1
+# extract excluded libraries from ghc.mk
+for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do
+  exclude[${exclude_pkg}]=1
+done
+
+cd src/ghc-${pkgver}/libraries
+
+# $1 is the name of the variable
+# $2 is the string for the test, either '=' or '<'
+print_var() {
+  printf "$1=("
+  for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do
+    [[ ${exclude[${pkg}]} ]] && continue
+    version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal)
+    printf "'haskell-$pkg$2$version'\n          "
+  done
+  # also add cabal
+  version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal)
+  printf "'haskell-cabal$2$version'\n          "
+  echo -e '\b)'
+}
+
+print_var 'provides' '='
+print_var 'replaces' '<'
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index a44dd3585..6ed6a5c91 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150786 2012-02-22 09:57:59Z giovanni $
+# $Id: PKGBUILD 151860 2012-03-03 14:28:54Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
 pkgver=0.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64')
 url="http://gparted.sourceforge.net"
diff --git a/extra/happy/PKGBUILD b/extra/happy/PKGBUILD
index ac93ba2bf..062f85e81 100644
--- a/extra/happy/PKGBUILD
+++ b/extra/happy/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 127724 2011-06-17 20:54:42Z eric $
-# Maintainer: simo <simo@archlinux.org>
+# $Id: PKGBUILD 151874 2012-03-03 16:05:59Z tdziedzic $
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
+# Contributor: simo <simo@archlinux.org>
 # Contributor: Vesa Kaihlavirta <vegai@iki.fi>
  
 pkgname=happy
-pkgver=1.18.6
-pkgrel=1
+pkgver=1.18.9
+pkgrel=4
 pkgdesc="The Parser Generator for Haskell"
 url="http://www.haskell.org/happy/"
 arch=('i686' 'x86_64')
 license=("custom:BSD3")
-depends=(gmp)
-makedepends=(ghc=7.0.2 haskell-mtl=2.0.1.0)
-options=(strip)
+depends=('gmp')
+makedepends=('ghc=7.4.1' 'haskell-mtl=2.0.1.0-4')
 source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('7d4d1425f5068633cd477a2b2216880d')
+md5sums=('aeb565fe572f979f15a24db0df2de37d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -27,4 +27,3 @@ package() {
   runhaskell Setup.lhs copy --destdir="${pkgdir}"
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-
diff --git a/extra/haskell-html/PKGBUILD b/extra/haskell-html/PKGBUILD
index 1d207117e..44a3ea50b 100644
--- a/extra/haskell-html/PKGBUILD
+++ b/extra/haskell-html/PKGBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
+
 _hkgname=html
 pkgname=haskell-html
 pkgver=1.0.1.2
-pkgrel=9.1
+pkgrel=10
 pkgdesc="HTML combinator library"
 url="http://hackage.haskell.org/package/html"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
+depends=('ghc=7.4.1-2' sh)
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('2a7de5a2af9a2f80d39825d6a95ee445')
diff --git a/extra/haskell-http/PKGBUILD b/extra/haskell-http/PKGBUILD
index d1106c478..79de205cc 100644
--- a/extra/haskell-http/PKGBUILD
+++ b/extra/haskell-http/PKGBUILD
@@ -1,19 +1,20 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
+
 _hkgname=HTTP
 pkgname=haskell-http
-pkgver=4000.1.1
-pkgrel=3.1
+pkgver=4000.2.2
+pkgrel=1
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' sh 'haskell-network=2.3.0.2-2.1' 'haskell-parsec=3.1.1-2.1' 'haskell-mtl=2.0.1.0-3.1')
-options=('strip')
+depends=('ghc=7.4.1' 'sh' 'haskell-network=2.3.0.11-1' 'haskell-parsec=3.1.2-1' 'haskell-mtl=2.0.1.0-4')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('ddf23d46c4d6dc0048c454e3d01caa57')
+md5sums=('b61ff88ef8d699f73a6ed27c6abf6600')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
@@ -37,4 +38,3 @@ package() {
     install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
     rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
-
diff --git a/extra/haskell-mtl/PKGBUILD b/extra/haskell-mtl/PKGBUILD
index e0ee184de..315d81a73 100644
--- a/extra/haskell-mtl/PKGBUILD
+++ b/extra/haskell-mtl/PKGBUILD
@@ -1,15 +1,16 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 _hkgname=mtl
 pkgname=haskell-mtl
 pkgver=2.0.1.0
-pkgrel=3.1
+pkgrel=4
 pkgdesc="Monad transformer library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh 'haskell-transformers=0.2.2.0-3.1')
-options=('strip')
+depends=('ghc=7.4.1' 'sh' 'haskell-transformers=0.2.2.0-4')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
 md5sums=('934fa813625ef7e88a6a96a09815ff95')
@@ -35,4 +36,3 @@ package() {
     install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
     rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
-md5sums=('934fa813625ef7e88a6a96a09815ff95')
diff --git a/extra/haskell-network/PKGBUILD b/extra/haskell-network/PKGBUILD
index 372cdf623..59dc9334b 100644
--- a/extra/haskell-network/PKGBUILD
+++ b/extra/haskell-network/PKGBUILD
@@ -1,19 +1,20 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
+
 _hkgname=network
 pkgname=haskell-network
-pkgver=2.3.0.2
-pkgrel=2.1
+pkgver=2.3.0.11
+pkgrel=1
 pkgdesc="Networking-related facilities"
 url="http://hackage.haskell.org/package/network"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh 'haskell-parsec=3.1.1-2.1')
-options=('strip')
+depends=('ghc=7.4.1' 'sh' 'haskell-parsec=3.1.2-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('a739fe9b75af744cfa1c05e39d41ac1f')
+md5sums=('cfe4922ac85685be9f86d4d34654f481')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD
index 0810df75b..e4f7da1e6 100644
--- a/extra/haskell-parsec/PKGBUILD
+++ b/extra/haskell-parsec/PKGBUILD
@@ -1,19 +1,20 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # As generated by cabal2arch 0.7.6
+
 _hkgname=parsec
 pkgname=haskell-parsec
-pkgver=3.1.1
-pkgrel=2.1
+pkgver=3.1.2
+pkgrel=1
 pkgdesc="Monadic parser combinators"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1')
-options=('strip')
+depends=('ghc=7.4.1' 'sh' 'haskell-mtl=2.0.1.0-4' 'haskell-text=0.11.1.13-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('3d5500847cac09f6f658db825b6c5df8')
+md5sums=('c2a75dfd247ae4839e2602b62dc87487')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
@@ -36,4 +37,3 @@ package() {
     install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
     rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
-
diff --git a/extra/haskell-quickcheck/PKGBUILD b/extra/haskell-quickcheck/PKGBUILD
index ab05c75f7..7b27cfb0c 100644
--- a/extra/haskell-quickcheck/PKGBUILD
+++ b/extra/haskell-quickcheck/PKGBUILD
@@ -1,19 +1,19 @@
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.5
+
 _hkgname=QuickCheck
 pkgname=haskell-quickcheck
-pkgver=2.4.0.1
-pkgrel=3.1
+pkgver=2.4.2
+pkgrel=1
 pkgdesc="Automatic testing of Haskell programs"
 url="http://hackage.haskell.org/package/QuickCheck"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 haskell-mtl=2.0.1.0-3.1 sh)
-options=('strip')
+depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
-md5sums=('e8c86e95fd1fa4c58fc8e53e2853db5e')
+md5sums=('9e22f9741cbc7d9cd8d52d3928e57b67')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-random/PKGBUILD b/extra/haskell-random/PKGBUILD
new file mode 100644
index 000000000..3b929c3d6
--- /dev/null
+++ b/extra/haskell-random/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
+
+_hkgname=random
+pkgname=haskell-random
+pkgver=1.0.1.1
+pkgrel=1
+pkgdesc="A basic random number generation library"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.4.1' 'sh')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
+      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
+
diff --git a/extra/haskell-random/haskell-random.install b/extra/haskell-random/haskell-random.install
new file mode 100644
index 000000000..b6d807e1a
--- /dev/null
+++ b/extra/haskell-random/haskell-random.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-random
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/extra/haskell-regex-base/PKGBUILD b/extra/haskell-regex-base/PKGBUILD
index 57721d39b..3b8ecb4bb 100644
--- a/extra/haskell-regex-base/PKGBUILD
+++ b/extra/haskell-regex-base/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 _hkgname=regex-base
 pkgname=haskell-regex-base
 pkgver=0.93.2
-pkgrel=4.1
+pkgrel=5
 pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1')
-options=('strip')
+depends=('ghc=7.4.1-2' sh 'haskell-mtl=2.0.1.0-4')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
 md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
diff --git a/extra/haskell-regex-compat/PKGBUILD b/extra/haskell-regex-compat/PKGBUILD
index 507a96618..c880ff4f2 100644
--- a/extra/haskell-regex-compat/PKGBUILD
+++ b/extra/haskell-regex-compat/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 _hkgname=regex-compat
 pkgname=haskell-regex-compat
-pkgver=0.93.1
-pkgrel=4.1
+pkgver=0.95.1
+pkgrel=1
 pkgdesc="Replaces and enhances Text.Regex"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh 'haskell-regex-base=0.93.2-4.1' 'haskell-regex-posix=0.94.4-2.1')
-options=('strip')
+depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5' 'haskell-regex-posix=0.95.1-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('d6becec95ea8098cab663116fdce60a5')
+md5sums=('d0573ab4e2f3de5faa61380b67333320')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-regex-posix/PKGBUILD b/extra/haskell-regex-posix/PKGBUILD
index 3b00616eb..1bed15490 100644
--- a/extra/haskell-regex-posix/PKGBUILD
+++ b/extra/haskell-regex-posix/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 _hkgname=regex-posix
 pkgname=haskell-regex-posix
-pkgver=0.94.4
-pkgrel=2.1
+pkgver=0.95.1
+pkgrel=1
 pkgdesc="The posix regex backend for regex-base"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh 'haskell-regex-base=0.93.2-4.1')
-options=('strip')
+depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('c28a13e8329e93a19bbb51708bf64abb')
+md5sums=('41cbc6d2b99837b64e0cc457c2737cc8')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-text/PKGBUILD b/extra/haskell-text/PKGBUILD
index 7dbc1ce17..c4c9664f7 100644
--- a/extra/haskell-text/PKGBUILD
+++ b/extra/haskell-text/PKGBUILD
@@ -1,18 +1,18 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 _hkgname=text
 pkgname=haskell-text
-pkgver=0.11.0.5
-pkgrel=2.1
+pkgver=0.11.1.13
+pkgrel=1
 pkgdesc="An efficient packed Unicode text type."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' sh 'haskell-deepseq=1.1.0.2-2.1')
-options=('strip')
+depends=('ghc=7.4.1' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('516a6813a6b9061fabdc9f0c3bbb1592')
+md5sums=('62b781a5d9d4dab2b2a1dbf2dc1b593f')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-transformers/PKGBUILD b/extra/haskell-transformers/PKGBUILD
index 446b2ffca..067d27b8d 100644
--- a/extra/haskell-transformers/PKGBUILD
+++ b/extra/haskell-transformers/PKGBUILD
@@ -1,17 +1,18 @@
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# $Id: PKGBUILD 128119 2011-06-22 11:19:38Z vesa $
+# $Id: PKGBUILD 151894 2012-03-03 16:06:32Z tdziedzic $
+
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
+# Contributor: Rémy Oudompheng <remy@archlinux.org>
 
 _hkgname=transformers
 pkgname=haskell-transformers
 pkgver=0.2.2.0
-pkgrel=3.1
+pkgrel=4
 pkgdesc="Concrete functor and monad transformers"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
+depends=('ghc=7.4.1' 'sh')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
 install=${pkgname}.install
 md5sums=('3470ac66116900cd1ba84d3744474e49')
 
diff --git a/extra/haskell-zlib/PKGBUILD b/extra/haskell-zlib/PKGBUILD
index 22a9eb932..d47562b9d 100644
--- a/extra/haskell-zlib/PKGBUILD
+++ b/extra/haskell-zlib/PKGBUILD
@@ -1,19 +1,20 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package originally generated by cabal2arch 0.7.6
+
 _hkgname=zlib
 pkgname=haskell-zlib
-pkgver=0.5.3.1
-pkgrel=2.1
+pkgver=0.5.3.3
+pkgrel=3
 pkgdesc="Compression and decompression in the gzip and zlib formats"
 url="http://hackage.haskell.org/package/zlib"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 'zlib' sh)
-options=('strip')
+depends=('ghc=7.4.1' 'zlib' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('8fb2988b112e38d04a527b892f770507')
+md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index a0026b927..a3507e607 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146519 2012-01-12 10:34:00Z giovanni $
+# $Id: PKGBUILD 151902 2012-03-03 16:12:24Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 
 pkgname=help2man
-pkgver=1.40.5
+pkgver=1.40.6
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('perl-locale-gettext')
 install=help2man.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('75a7d2f93765cd367aab98986a75f88c')
+md5sums=('f9ff9c6e65c74a0763596a7ca2b69aa7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -20,7 +20,7 @@ build() {
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
 	      --infodir=/usr/share/info \
-	      --libdir=/lib
+	      --libdir=/usr/lib
   make
 }
 
diff --git a/extra/help2man/help2man.install b/extra/help2man/help2man.install
index ab6585b91..815a943e2 100644
--- a/extra/help2man/help2man.install
+++ b/extra/help2man/help2man.install
@@ -8,7 +8,7 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 pre_remove() {
diff --git a/extra/libfontenc/PKGBUILD b/extra/libfontenc/PKGBUILD
index 89ef62d2c..314c8fc67 100644
--- a/extra/libfontenc/PKGBUILD
+++ b/extra/libfontenc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151268 2012-02-25 10:31:13Z allan $
+# $Id: PKGBUILD 151844 2012-03-03 13:37:37Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libfontenc
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
 pkgdesc="X11 font encoding library"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ depends=('zlib')
 makedepends=('pkgconfig' 'xproto>=7.0.18')
 options=('!libtool')
 source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('ba158e4c10a1aff2351ef632def03dec0e0ee11e')
+sha1sums=('90bdd53d75585dd0f06ad7bc23faccd8a01bb733')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libfs/PKGBUILD b/extra/libfs/PKGBUILD
index 62b81f057..ebcc30952 100644
--- a/extra/libfs/PKGBUILD
+++ b/extra/libfs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151406 2012-02-26 10:29:26Z pierre $
+# $Id: PKGBUILD 151846 2012-03-03 13:40:06Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libfs
-pkgver=1.0.3
-pkgrel=2
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="X11 Font Services Library"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -12,7 +12,7 @@ depends=('glibc' 'xproto' 'fontsproto')
 makedepends=('xorg-util-macros' 'xtrans')
 options=('!libtool')
 source=("${url}/releases/individual/lib/libFS-${pkgver}.tar.bz2")
-sha1sums=('2b33fa17369605303ae70a7de1aa681879249c92')
+sha1sums=('f114f32f60eb84d3e1d0e6f0dfe7679b07e91295')
 
 build() {
   cd "${srcdir}/libFS-${pkgver}"
diff --git a/extra/libice/PKGBUILD b/extra/libice/PKGBUILD
index 6f64276a6..0144fe780 100644
--- a/extra/libice/PKGBUILD
+++ b/extra/libice/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151270 2012-02-25 10:36:47Z allan $
+# $Id: PKGBUILD 151848 2012-03-03 13:42:06Z andyrtr $
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libice
-pkgver=1.0.7
-pkgrel=2
+pkgver=1.0.8
+pkgrel=1
 pkgdesc="X11 Inter-Client Exchange library"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
@@ -13,7 +13,7 @@ makedepends=('pkgconfig' 'xtrans>=1.2.5')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libICE-${pkgver}.tar.bz2)
 license=('custom')
-sha1sums=('c7d0f4c5b0e999385445b8be1bc89aec4e5de71d')
+sha1sums=('ddb14df8bbc43df7322978f5f9f802936e2a7324')
 
 build() {
   cd "${srcdir}/libICE-${pkgver}"
diff --git a/extra/libsm/PKGBUILD b/extra/libsm/PKGBUILD
index efe242c63..945778b5e 100644
--- a/extra/libsm/PKGBUILD
+++ b/extra/libsm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151272 2012-02-25 10:40:09Z allan $
+# $Id: PKGBUILD 151850 2012-03-03 13:43:52Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsm
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.2.1
+pkgrel=1
 pkgdesc="X11 Session Management library"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -12,7 +12,7 @@ depends=('libice' 'util-linux-ng')
 makedepends=('xorg-util-macros' 'xtrans')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libSM-${pkgver}.tar.bz2)
-sha1sums=('f78bc72f0b3ec26cbf980f84f014422ba854544d')
+sha1sums=('8d354a165e330022ffd3606aba562b8c8154213d')
 
 build() {
   cd "${srcdir}/libSM-${pkgver}"
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index 049eaf05a..d0998b4fd 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 150853 2012-02-23 12:53:44Z juergen $
+# $Id: PKGBUILD 151864 2012-03-03 15:22:53Z giovanni $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=licq
 pkgver=1.6.0
-pkgrel=1
+pkgrel=3
 pkgdesc="Advanced graphical ICQ clone and more for Unix" 
 arch=('i686' 'x86_64')
 url="http://www.licq.org"
 license=('GPL')
-depends=('libxss' 'qt' 'openssl')
+depends=('boost-libs' 'gpgme' 'libxss' 'qt')
 makedepends=('cmake' 'boost')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD
index 9bed37472..c5cf289c1 100644
--- a/extra/monodevelop/PKGBUILD
+++ b/extra/monodevelop/PKGBUILD
@@ -4,12 +4,12 @@
 
 pkgname=monodevelop
 pkgver=2.8.6.5
-pkgrel=1
+pkgrel=2
 pkgdesc="An IDE primarily designed for C# and other .NET languages"
 arch=('i686' 'x86_64')
 url="http://www.monodevelop.com"
 license=('GPL')
-depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp' 'gecko-sharp-2.0>=0.10')
+depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp')
 options=(!makeflags)
 install=monodevelop.install
 source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD
index 0d15a095a..0fab3f728 100644
--- a/extra/openjdk6/PKGBUILD
+++ b/extra/openjdk6/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150232 2012-02-15 10:39:26Z andyrtr $
+# $Id: PKGBUILD 151907 2012-03-03 18:57:24Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -9,7 +9,7 @@ _icedteaver=1.11.1
 _openjdk_version=b24
 _openjdk_date=14_nov_2011
 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
+pkgrel=2
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
 license=('custom')
@@ -75,7 +75,8 @@ build() {
 	--with-jaxp-drop-zip=${srcdir}/jaxp144_03.zip \
   	--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \
 	--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
-	--disable-bootstrap
+	--disable-bootstrap \
+	--with-abs-install-dir=${_jvmdir}
   LD_PRELOAD="" make 
 }
 
diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD
index 6b32478c2..7a9416441 100644
--- a/extra/parted/PKGBUILD
+++ b/extra/parted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143925 2011-11-30 21:06:41Z giovanni $
+# $Id: PKGBUILD 151858 2012-03-03 14:28:32Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=parted
-pkgver=3.0
-pkgrel=4
+pkgver=3.1
+pkgrel=1
 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -13,17 +13,12 @@ depends=('device-mapper' 'e2fsprogs')
 makedepends=('pkg-config')
 options=('!libtool')
 install=parted.install
-source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-        'linux.c.patch')
-md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7'
-         '08c942e212424e238271217f52c59706')
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('5d89d64d94bcfefa9ce8f59f4b81bdcb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # FS#25307
-  patch -Np1 -i ${srcdir}/linux.c.patch
-
   ./configure --prefix=/usr \
               --disable-debug \
               --disable-rpath
diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD
index 89c7b8b28..36f51b31b 100644
--- a/extra/smplayer/PKGBUILD
+++ b/extra/smplayer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 148399 2012-01-31 11:14:02Z ibiru $
+# $Id: PKGBUILD 151842 2012-03-03 11:22:09Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: shamrok <szamrok@gmail.com>
 
 pkgname=smplayer
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="A complete front-end for MPlayer"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ license=('GPL')
 depends=('qt' 'mplayer')
 install=smplayer.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('e39ba5b54e6218d411ecd296002d77bb')
+md5sums=('e50046399ee918bb7b57e98971425c95')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/taglib-sharp/PKGBUILD b/extra/taglib-sharp/PKGBUILD
index e36a4a057..cead242c6 100644
--- a/extra/taglib-sharp/PKGBUILD
+++ b/extra/taglib-sharp/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 149091 2012-02-05 17:08:11Z daniel $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 151835 2012-03-03 09:21:08Z daniel $
+# Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Carlos Ruiz <cailovirtual@gmail.com>
 
 pkgname=taglib-sharp
-pkgver=2.0.3.7
-pkgrel=2
-pkgdesc="Free and Open Source library for the .NET 2.0 and Mono frameworks which will let you tag your software with as much or as little detail as you like without slowing you down."
+pkgver=2.0.4.0
+pkgrel=1
+pkgdesc="It's a library for reading and writing metadata in media files, including video, audio, and photo formats for Mono"
 arch=('i686' 'x86_64')
-url="http://www.taglib-sharp.com/Main_Page"
+url="https://github.com/mono/taglib-sharp"
 license=('LGPL2')
 depends=('mono')
 source=(http://download.banshee-project.org/taglib-sharp/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('fa45d2519ca26b04716789fe4ac81f8b')
+md5sums=('b886a65083aafdfefa0675675bcbeb9a')
 
 build() {
   export MONO_SHARED_DIR="${startdir}/src/.wabi"
   mkdir -p "${MONO_SHARED_DIR}"
 
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-docs || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  ./configure --prefix=/usr --disable-docs
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
 }
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index 68017ee1a..abf99a578 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136339 2011-08-26 17:03:08Z ibiru $
+# $Id: PKGBUILD 151862 2012-03-03 14:29:19Z giovanni $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=udisks
 pkgver=1.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
diff --git a/libre/apache-ant-libre/PKGBUILD b/libre/apache-ant-libre/PKGBUILD
new file mode 100644
index 000000000..9f5ef223b
--- /dev/null
+++ b/libre/apache-ant-libre/PKGBUILD
@@ -0,0 +1,72 @@
+# Maintainer (Arch): Paul Mattal <paul@archlinux.org>
+# Contributor: Andrew Wright <andreww@photism.org>
+
+_pkgname=apache-ant
+pkgname=apache-ant-libre
+pkgver=1.8.2
+
+provides=("$_pkgname=$pkgver")
+replaces=("$_pkgname")
+conflicts=("$_pkgname")
+
+pkgrel=3
+pkgdesc="A java-based build tool"
+arch=('any')
+license=('APACHE')
+url="http://ant.apache.org/"
+depends=('java-environment')
+makedepends=('junit')
+optdepends=('junit: to have JUnit on the classpath in javac tasks')
+source=(http://archive.apache.org/dist/ant/source/${_pkgname}-${pkgver}-src.tar.bz2
+        ${_pkgname}.sh ${_pkgname}.csh
+        ant_diagnostics.patch)
+
+build() {
+  # This directory is what becomes
+  # http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2
+  # which is what Arch uses
+  rm -rf "${srcdir}"/${_pkgname}-${pkgver}-bin
+  mkdir -p "${srcdir}"/${_pkgname}-${pkgver}-bin
+
+  cd "${srcdir}"/${_pkgname}-${pkgver}
+  ln -sf /usr/share/java/junit.jar lib/optional # JUnit isn't really optional
+  sh build.sh -Ddist.dir="${srcdir}"/${_pkgname}-${pkgver}-bin dist
+}
+
+package() {
+  # install profile.d script
+  install -dm755 "${pkgdir}"/etc/profile.d
+  install -m755 "${srcdir}"/${_pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/
+
+  # Get the ANT_HOME env var
+  source "${srcdir}"/${_pkgname}.sh
+
+  cd "${srcdir}"/${_pkgname}-${pkgver}-bin
+  install -dm755 "${pkgdir}"/${ANT_HOME}/{bin,lib}
+
+  install -m644 ./lib/*.jar "${pkgdir}"/${ANT_HOME}/lib
+  cp -Rp ./etc "${pkgdir}"/${ANT_HOME}
+
+  # Do not copy Windows .bat/.cmd files
+  find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
+    -exec install -m755 {} "${pkgdir}"/${ANT_HOME}/bin \;
+
+  # symlink to junit so it's on the javac build path for ant
+  # matches behavior on ubuntu 9 and makes sense for compatibility
+  # http://bugs.archlinux.org/task/15229
+  ln -sf /usr/share/java/junit.jar "${pkgdir}"/usr/share/java/apache-ant/lib/
+
+  # fix python2 path
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/usr/share/java/apache-ant/bin/runant.py
+
+  # The license says the NOTICE file should be redistributed for derivative
+  # works, so lets supply it.
+  cd "${srcdir}"/${_pkgname}-${pkgver}
+  install -dm755 "${pkgdir}"/usr/share/licenses/${_pkgname}
+  install -m644 LICENSE NOTICE "${pkgdir}"/usr/share/licenses/${_pkgname}
+}
+
+md5sums=('0d9e108afcd15b820150b8085c96d2b1'
+         '593ee6ebd9b8ec321534a028e686880f'
+         '475b684eb8202c09cbb51496cd8ee1e0'
+         'cbaab423be40a6e63f0fde901b91eb50')
diff --git a/libre/apache-ant-libre/ant_diagnostics.patch b/libre/apache-ant-libre/ant_diagnostics.patch
new file mode 100644
index 000000000..38148b45c
--- /dev/null
+++ b/libre/apache-ant-libre/ant_diagnostics.patch
@@ -0,0 +1,23 @@
+--- a/src/main/org/apache/tools/ant/Diagnostics.java
++++ b/src/main/org/apache/tools/ant/Diagnostics.java
+@@ -179,7 +179,10 @@
+      * @param clazz the class to get the information from.
+      * @since Ant 1.8.0
+      */
+-    private static URL getClassLocation(Class clazz) {
++    private static URL getClassLocation(Class clazz) {
++		if (clazz.getProtectionDomain().getCodeSource() == null) {
++			return null;
++		}
+         return clazz.getProtectionDomain().getCodeSource().getLocation();
+     }
+ 
+@@ -241,7 +244,7 @@
+         }
+         Transformer transformer = null;
+         try {
+-            transformer = transformerFactory.newTransformer();
++            transformer = transformerFactory.newTransformer();
+         } catch (Exception e) {
+             // ignore
+             ignoreThrowable(e);
diff --git a/libre/apache-ant-libre/apache-ant.csh b/libre/apache-ant-libre/apache-ant.csh
new file mode 100644
index 000000000..b6a6d5840
--- /dev/null
+++ b/libre/apache-ant-libre/apache-ant.csh
@@ -0,0 +1,2 @@
+setenv ANT_HOME /usr/share/java/apache-ant
+setenv PATH ${PATH}:${ANT_HOME}/bin
diff --git a/libre/apache-ant-libre/apache-ant.sh b/libre/apache-ant-libre/apache-ant.sh
new file mode 100644
index 000000000..ab602fb28
--- /dev/null
+++ b/libre/apache-ant-libre/apache-ant.sh
@@ -0,0 +1,3 @@
+export ANT_HOME=/usr/share/java/apache-ant
+export PATH=$PATH:$ANT_HOME/bin
+
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 0c9e95b83..63463cc0a 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -8,7 +8,9 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.0
-pkgver=${_basekernel}.22
+_sublevel=23
+pkgver=${_basekernel}.${_sublevel}
+_lxopkgver=${_basekernel}.22 # nearly always the same as pkgver
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
@@ -17,7 +19,6 @@ 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
@@ -27,10 +28,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
-        'ext4-options.patch')
+        'ext4-options.patch'
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2")
 md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
-         'ddc0925df01b70f6eef95e9b4160f28a'
-         '248d057fd2341d315ada5e844cdbdc1f'
+         '5b6f929403ddad35a65b934ed5df2f8a'
          '054af37f538b74a8090fc3e783a2edfa'
          'e195768d5b8cbe788dbe615561d4314f'
          'd2c0701480bce49fd4b40dc46b9863f1'
@@ -39,7 +40,13 @@ md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-         '74d2b710d6c97aee441d7566f8f68815')
+         '74d2b710d6c97aee441d7566f8f68815'
+         '248d057fd2341d315ada5e844cdbdc1f')
+if [ "$CARCH" != "mips64el" ]; then
+    # Don't use the Loongson-specific patches on non-mips64el arches.
+    unset source[${#source[@]}-1]
+    unset md5sums[${#md5sums[@]}-1]
+fi
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
@@ -71,16 +78,22 @@ build() {
 
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
+    sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
+        < "${srcdir}/lxo-config.patch" > lxo-config.patch
     msg2 "Adding loongson-community patches"
     patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
-    patch -Np0 -i "${srcdir}/lxo-config.patch"
+    patch -Np0 -i lxo-config.patch
 
-# ensure N32, add localversion and remove uevent helper as per
+# ensure N32, add localversion, remove uevent helper as per
 # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
-    sed -i -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+# and make USB storage support builtin (e.g. for booting from USB
+# disks without slowly loading an initramfs)
+    sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
-        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config
+        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" \
+        -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
+        ./.config
   else
     cat "${srcdir}/config.${CARCH}" > ./.config # simpler
   fi
@@ -114,7 +127,12 @@ build() {
 
   # build!
   if [ "$CARCH" == "mips64el" ]; then
-    make ${MAKEFLAGS} vmlinuz modules
+    # The build system passes it directly to linker, disable to avoid
+    # having unknown -Wl,... options.
+    export LDFLAGS=""
+    # bzImage is arch-specific and not supported on mips; vmlinux is
+    # useful for oprofile.
+    make ${MAKEFLAGS} vmlinux vmlinuz modules
   else
     make ${MAKEFLAGS} bzImage modules
   fi
@@ -123,13 +141,19 @@ build() {
 package_linux-libre-lts() {
   pkgdesc="The Linux-libre Kernel and modules - stable longtime supported kernel package suitable for servers"
   groups=('base')
-  depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
+  depends=('coreutils' 'module-init-tools>=3.16')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=('kernel26-lts' "linux-lts=$pkgver")
   conflicts=('kernel26-lts' 'kernel26-libre-lts' 'linux-lts')
   replaces=('kernel26-lts' 'kernel26-libre-lts' 'linux-lts')
   backup=("etc/mkinitcpio.d/${pkgname}.preset")
   install=${pkgname}.install
+  if [ "$CARCH" = "mips64el" ]; then
+      optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
+      conflicts+=('mkinitcpio<0.7')
+  else
+      depends+=('mkinitcpio>=0.7')
+  fi
 
   cd "${srcdir}/linux-${_basekernel}"
 
@@ -144,6 +168,7 @@ package_linux-libre-lts() {
 
   if [ "$CARCH" == "mips64el" ]; then
     cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}"
+    cp vmlinux "${pkgdir}/boot/vmlinux-${pkgname}"
   else
     cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}"
   fi
@@ -195,7 +220,7 @@ package_linux-libre-lts-headers() {
 
 # In case of repackaging this is empty
   if [ -z "${_kernver}" ]; then
-    cd ${srcdir}/linux-$pkgver
+    cd "${srcdir}/linux-${_basekernel}"
     _kernver="$(make kernelrelease)"
   fi
 
@@ -229,7 +254,7 @@ package_linux-libre-lts-headers() {
 
   if [ "$CARCH" = "mips64el" ]; then
     cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
     cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
   fi
 
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 6cf57ce44..2de3804e6 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.22-1-LIBRE-LTS
+KERNEL_VERSION=3.0.23-1-LIBRE-LTS
 
 post_install () {
   # updating module dependencies
@@ -17,8 +17,9 @@ post_install () {
     [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
     if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
       # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img /boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img /boot/kernel26${KERNEL_NAME}-fallback.img
+      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
+      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
+        boot/kernel26${KERNEL_NAME}-fallback.img
       ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
     fi
   fi
diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD
index 5fc5179b9..b260cafd4 100644
--- a/multilib/lib32-glibc/PKGBUILD
+++ b/multilib/lib32-glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 66282 2012-02-23 10:49:16Z heftig $
+# $Id: PKGBUILD 67033 2012-03-03 08:49:11Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -9,7 +9,7 @@
 _pkgbasename=glibc
 pkgname=lib32-$_pkgbasename
 pkgver=2.15
-pkgrel=6
+pkgrel=7
 _glibcdate=20111227
 pkgdesc="GNU C Library for multilib"
 arch=('x86_64')
@@ -20,13 +20,12 @@ makedepends=('gcc-multilib>=4.6')
 options=('!strip' '!emptydirs')
 source=(ftp://ftp.archlinux.org/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.2-ignore-origin-of-privileged-program.patch
         glibc-2.14-libdl-crash.patch
-        glibc-2.14-revert-4768ae77.patch
         glibc-2.14-reexport-rpc-interface.patch
         glibc-2.14-reinstall-nis-rpc-headers.patch
+        glibc-2.15-fix-res_query-assert.patch
         glibc-2.15-regex.patch
         glibc-2.15-lddebug-scopes.patch
         glibc-2.15-revert-c5a0802a.patch
@@ -38,57 +37,64 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda
         glibc-2.15-revert-netlink-cache.patch
         glibc-2.15-arena.patch
         glibc-2.15-negative-result-cache.patch
+        glibc-2.15-multiarch-x86-strcmp.patch
+        glibc-2.15-vdso.patch
+        glibc-2.15-feraiseexcept-plt.patch
+        glibc-2.15-vfprintf-nargs.patch
+        glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
+        glibc-2.15-fmtmsg-locking.patch
+        glibc-2.15-non-signalling-comparisons.patch
+        glibc-2.15-rintf-rounding.patch
+        glibc-2.15-nearbyintf-rounding.patch
         lib32-glibc.conf)
 md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
          '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
          '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
+         'e60e33591c9ec1447e4cddadcbb9cf3a'
          '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
          'c5de2a946215d647c8af5432ec4b0da0'
          '55febbb72139ac7b65757df085024b83'
+         '31f415b41197d85d3bbee3d1eecd06a3'
          'b3526cbd5e29773560dba725db99af5a'
          '3c219ddfb619b6df903cac4cc42c611d'
          '7ae3e426251ae33e73dbad71f9c91378'
-         '39353f53168f4a7509ba5fe0d9f218b8'
-         '136eb969f5d6bb6f5155f72a1a7cf23e'
+         'f0782ddbf38e0b30ec6b85348816046f'
+         '3d844b53b2dbb7c996e39c7ad932f55d'
          '41ae047ac88e8f6f547c70b0a0bc3b72'
          'fccb89f6628f59752278e125c35941f8'
          'c4cd34f20ccd37817f6c1374bd4ee68e'
-         '6771b0b2bb8aa3870a259fd2f46c424f'
+         '94b61302a7ca6c5764d013dc7738fcfe'
          'a9ffadcfd2d357f91fee0b861fd4a7c6'
          '2c46b8e294de24c531f2253ff69aeef3'
+         '7a2998a04ebfcf8bf820540f490ce714'
+         '0d77d20fa7fe2f87ad945cb9edb4d91d'
+         'bfdefac3d705f41fbf84b1de1dc945af'
+         'dded423e264cdd178500f3e8ad62fe66'
+         '340deaa582a95ddde86edb624c3bfea0'
+         '6bbac50e6ff82187654e6a0a7bd849e7'
+         'c483504cf404ed0b44480af627813a97'
+         '1419d61fd1dbc6cdc48bb59da86fa66f'
+         '7ff501435078b1a2622124fbeaafc921'
          '6e052f1cb693d5d3203f50f9d4e8c33b')
 
 build() {
   cd ${srcdir}/glibc
 
   # timezone data is in separate package (tzdata)
-  patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
+  patch -p1 -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
-
-  # Undefine __i686 for gcc <= 4.6
+  # undefine __i686 for gcc <= 4.6
   # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
   # fix in http://sourceware.org/git/?p=glibc.git;a=commit;h=d4a54ac6 requires additional backporting...
-  patch -Np1 -i ${srcdir}/glibc-__i686.patch
+  patch -p1 -i ${srcdir}/glibc-__i686.patch
 
   # http://www.exploit-db.com/exploits/15274/
   # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09  (fedora branch)
-  patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+  patch -p1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
 
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9  (fedora branch)
   # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
-  patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
-
-  # Revert commit causing issues with crappy DNS servers...
-  # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
-  # Note that both these patches appear not to fix the issue completely (but rebuilds may fix):
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013  (used by opensuse)
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3  (fedora branch)
-  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
+  patch -p1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
 
   # re-export RPC interface until libtirpc is ready as a replacement
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873  (fedora branch)
@@ -96,7 +102,11 @@ build() {
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3  (fedora branch)
   patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
 
-  # Fix up regcomp/regexec
+  # fix res_query assertion
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
+  patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch
+
+  # fix up regcomp/regexec
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745
   patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch
 
@@ -121,29 +131,65 @@ build() {
   # fix AVX detection
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=08cf777f
-  patch -Np1 -i ${srcdir}/glibc-2.15-avx.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-avx.patch
   # and "fix" strcasecmp
-  patch -Np1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch
 
   # fix GB18030 charmap
   # http://sourceware.org/bugzilla/show_bug.cgi?id=11837
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=2a57bd79  (fedora branch)
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=3d828a61  (fedora branch)
-  patch -Np1 -i ${srcdir}/glibc-2.15-gb18030.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-gb18030.patch
 
   # fix crash in __nscd_get_mapping if nscd not running
   # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential "fix" in comment)
   # reverts commit 3a2c0242 and other necessary following changes...
-  patch -Np1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch
 
   # handle ARENA_TEST correctly
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=41b81892
-  patch -Np1 -i ${srcdir}/glibc-2.15-arena.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-arena.patch
 
   # Do not cache negative results in nscd if these are transient
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=3e1aa84e
-  patch -Np1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch
 
+  # strcasecmp_l, strncasecmp_l act as strcmp for multiarch x86
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=0bab47b6
+  patch -p1 -i ${srcdir}/glibc-2.15-multiarch-x86-strcmp.patch
+  
+  # always set l_used for vDSO.
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=1f393a11
+  patch -p1 -i ${srcdir}/glibc-2.15-vdso.patch
+
+  # fix x86 PLT slot usage for feraiseexcept
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=7c35ffed
+  patch -p1 -i ${srcdir}/glibc-2.15-feraiseexcept-plt.patch
+
+  # vfprintf nargs overflow - CVE-2012-0864
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13656
+  # http://sourceware.org/ml/libc-alpha/2012-02/msg00328.html
+  patch -p1 -i ${srcdir}/glibc-2.15-vfprintf-nargs.patch
+
+  # avoid out ouf bounds read in __libc_res_nquerydomain
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=8fdceb2e
+  patch -p1 -i ${srcdir}/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
+
+  # make fmtmsg function thread-safe
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=7724defc
+  patch -p1 -i ${srcdir}/glibc-2.15-fmtmsg-locking.patch
+
+  # use non-signaling floating-point comparisons in math functions
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=92221550
+  patch -p1 -i ${srcdir}/glibc-2.15-non-signalling-comparisons.patch
+
+  # fix rintf rounding.
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=fe45ce09
+  patch -p1 -i ${srcdir}/glibc-2.15-rintf-rounding.patch
+
+  # fix nearbyintf rounding
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=6cbeae47
+  patch -p1 -i ${srcdir}/glibc-2.15-nearbyintf-rounding.patch
 
   cd ${srcdir}
   mkdir glibc-build
diff --git a/multilib/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
index ce089b49c..533fc1b4b 100644
--- a/multilib/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ b/multilib/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
@@ -1,13 +1,3 @@
-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
@@ -22,5 +12,3 @@ index 22a1635..7674d49 100644
  
    return new;
  }
--- 
-1.7.2
diff --git a/multilib/lib32-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch b/multilib/lib32-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
new file mode 100644
index 000000000..6f0a0398f
--- /dev/null
+++ b/multilib/lib32-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
@@ -0,0 +1,24 @@
+diff --git a/resolv/res_query.c b/resolv/res_query.c
+index 947c651..abccd4a 100644
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
+@@ -556,12 +556,16 @@ __libc_res_nquerydomain(res_state statp,
+ 		 * copy without '.' if present.
+ 		 */
+ 		n = strlen(name);
+-		if (n >= MAXDNAME) {
++
++		/* Decrement N prior to checking it against MAXDNAME
++		   so that we detect a wrap to SIZE_MAX and return
++		   a reasonable error.  */
++		n--;
++		if (n >= MAXDNAME - 1) {
+ 			RES_SET_H_ERRNO(statp, NO_RECOVERY);
+ 			return (-1);
+ 		}
+-		n--;
+-		if (n >= 0 && name[n] == '.') {
++		if (name[n] == '.') {
+ 			strncpy(nbuf, name, n);
+ 			nbuf[n] = '\0';
+ 		} else
diff --git a/multilib/lib32-glibc/glibc-2.15-feraiseexcept-plt.patch b/multilib/lib32-glibc/glibc-2.15-feraiseexcept-plt.patch
new file mode 100644
index 000000000..c41acc169
--- /dev/null
+++ b/multilib/lib32-glibc/glibc-2.15-feraiseexcept-plt.patch
@@ -0,0 +1,20 @@
+diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c
+index 70f9ee2..6e2ce35 100644
+--- a/sysdeps/i386/fpu/feupdateenv.c
++++ b/sysdeps/i386/fpu/feupdateenv.c
+@@ -1,5 +1,5 @@
+ /* Install given floating-point environment and raise exceptions.
+-   Copyright (C) 1997,99,2000,01,07,2010 Free Software Foundation, Inc.
++   Copyright (C) 1997,99,2000,01,07,2010,2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+ 
+@@ -44,7 +44,7 @@ __feupdateenv (const fenv_t *envp)
+   /* Raise the saved exception.  Incidently for us the implementation
+      defined format of the values in objects of type fexcept_t is the
+      same as the ones specified using the FE_* constants.  */
+-  feraiseexcept ((int) temp);
++  __feraiseexcept ((int) temp);
+ 
+   /* Success.  */
+   return 0;
diff --git a/multilib/lib32-glibc/glibc-2.15-fix-res_query-assert.patch b/multilib/lib32-glibc/glibc-2.15-fix-res_query-assert.patch
new file mode 100644
index 000000000..a894da9c7
--- /dev/null
+++ b/multilib/lib32-glibc/glibc-2.15-fix-res_query-assert.patch
@@ -0,0 +1,51 @@
+--- a/resolv/res_query.c	
++++ a/resolv/res_query.c	
+@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp,
+ 		  int *resplen2)
+ {
+ 	HEADER *hp = (HEADER *) answer;
++	HEADER *hp2;
+ 	int n, use_malloc = 0;
+ 	u_int oflags = statp->_flags;
+ 
+@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp,
+ 	  /* __libc_res_nsend might have reallocated the buffer.  */
+ 	  hp = (HEADER *) *answerp;
+ 
+-	/* We simplify the following tests by assigning HP to HP2.  It
+-	   is easy to verify that this is the same as ignoring all
+-	   tests of HP2.  */
+-	HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
+-
+-	if (n < (int) sizeof (HEADER) && answerp2 != NULL
+-	    && *resplen2 > (int) sizeof (HEADER))
++	/* We simplify the following tests by assigning HP to HP2 or
++	   vice versa.  It is easy to verify that this is the same as
++	   ignoring all tests of HP or HP2.  */
++	if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
+ 	  {
+-	    /* Special case of partial answer.  */
+-	    assert (hp != hp2);
+-	    hp = hp2;
++	    hp2 = hp;
+ 	  }
+-	else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
+-		 && n > (int) sizeof (HEADER))
++	else
+ 	  {
+-	    /* Special case of partial answer.  */
+-	    assert (hp != hp2);
+-	    hp2 = hp;
++	    hp2 = (HEADER *) *answerp2;
++	    if (n < (int) sizeof (HEADER))
++	      {
++	        hp = hp2;
++	      }
+ 	  }
+ 
++	/* Make sure both hp and hp2 are defined */
++	assert((hp != NULL) && (hp2 != NULL));
++
+ 	if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
+ 	    && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
+ #ifdef DEBUG
diff --git a/multilib/lib32-glibc/glibc-2.15-fmtmsg-locking.patch b/multilib/lib32-glibc/glibc-2.15-fmtmsg-locking.patch
new file mode 100644
index 000000000..f5976abd9
--- /dev/null
+++ b/multilib/lib32-glibc/glibc-2.15-fmtmsg-locking.patch
@@ -0,0 +1,148 @@
+diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
+index 9203317..4c02302 100644
+--- a/stdlib/fmtmsg.c
++++ b/stdlib/fmtmsg.c
+@@ -103,7 +103,6 @@ fmtmsg (long int classification, const char *label, int severity,
+ 	const char *text, const char *action, const char *tag)
+ {
+   __libc_once_define (static, once);
+-  int result = MM_OK;
+   struct severity_info *severity_rec;
+ 
+   /* Make sure everything is initialized.  */
+@@ -124,17 +123,6 @@ fmtmsg (long int classification, const char *label, int severity,
+ 	return MM_NOTOK;
+     }
+ 
+-  for (severity_rec = severity_list; severity_rec != NULL;
+-       severity_rec = severity_rec->next)
+-    if (severity == severity_rec->severity)
+-      /* Bingo.  */
+-      break;
+-
+-  /* If we don't know anything about the severity level return an error.  */
+-  if (severity_rec == NULL)
+-    return MM_NOTOK;
+-
+-
+ #ifdef __libc_ptf_call
+   /* We do not want this call to be cut short by a thread
+      cancellation.  Therefore disable cancellation for now.  */
+@@ -143,54 +131,73 @@ fmtmsg (long int classification, const char *label, int severity,
+ 		   0);
+ #endif
+ 
+-  /* Now we can print.  */
+-  if (classification & MM_PRINT)
+-    {
+-      int do_label = (print & label_mask) && label != MM_NULLLBL;
+-      int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
+-      int do_text = (print & text_mask) && text != MM_NULLTXT;
+-      int do_action = (print & action_mask) && action != MM_NULLACT;
+-      int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
+-
+-      if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
+-		      do_label ? label : "",
+-		      do_label && (do_severity | do_text | do_action | do_tag)
+-		      ? ": " : "",
+-		      do_severity ? severity_rec->string : "",
+-		      do_severity && (do_text | do_action | do_tag)
+-		      ? ": " : "",
+-		      do_text ? text : "",
+-		      do_text && (do_action | do_tag) ? "\n" : "",
+-		      do_action ? "TO FIX: " : "",
+-		      do_action ? action : "",
+-		      do_action && do_tag ? "  " : "",
+-		      do_tag ? tag : "") < 0)
+-	/* Oh, oh.  An error occurred during the output.  */
+-	result = MM_NOMSG;
+-    }
++  __libc_lock_lock (lock);
+ 
+-  if (classification & MM_CONSOLE)
++  for (severity_rec = severity_list; severity_rec != NULL;
++       severity_rec = severity_rec->next)
++    if (severity == severity_rec->severity)
++      /* Bingo.  */
++      break;
++
++  /* If we don't know anything about the severity level return an error.  */
++  int result = MM_NOTOK;
++  if (severity_rec != NULL)
+     {
+-      int do_label = label != MM_NULLLBL;
+-      int do_severity = severity != MM_NULLSEV;
+-      int do_text = text != MM_NULLTXT;
+-      int do_action = action != MM_NULLACT;
+-      int do_tag = tag != MM_NULLTAG;
+-
+-      syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
+-	      do_label ? label : "",
+-	      do_label && (do_severity | do_text | do_action | do_tag)
+-	      ? ": " : "",
+-	      do_severity ? severity_rec->string : "",
+-	      do_severity && (do_text | do_action | do_tag) ? ": " : "",
+-	      do_text ? text : "",
+-	      do_text && (do_action | do_tag) ? "\n" : "",
+-	      do_action ? "TO FIX: " : "",
+-	      do_action ? action : "",
+-	      do_action && do_tag ? "  " : "",
+-	      do_tag ? tag : "");
++      result = MM_OK;
++
++      /* Now we can print.  */
++      if (classification & MM_PRINT)
++	{
++	  int do_label = (print & label_mask) && label != MM_NULLLBL;
++	  int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
++	  int do_text = (print & text_mask) && text != MM_NULLTXT;
++	  int do_action = (print & action_mask) && action != MM_NULLACT;
++	  int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
++	  int need_colon = (do_label
++			    && (do_severity | do_text | do_action | do_tag));
++
++	  if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
++			  do_label ? label : "",
++			  need_colon ? ": " : "",
++			  do_severity ? severity_rec->string : "",
++			  do_severity && (do_text | do_action | do_tag)
++			  ? ": " : "",
++			  do_text ? text : "",
++			  do_text && (do_action | do_tag) ? "\n" : "",
++			  do_action ? "TO FIX: " : "",
++			  do_action ? action : "",
++			  do_action && do_tag ? "  " : "",
++			  do_tag ? tag : "") < 0)
++	    /* Oh, oh.  An error occurred during the output.  */
++	    result = MM_NOMSG;
++	}
++
++      if (classification & MM_CONSOLE)
++	{
++	  int do_label = label != MM_NULLLBL;
++	  int do_severity = severity != MM_NULLSEV;
++	  int do_text = text != MM_NULLTXT;
++	  int do_action = action != MM_NULLACT;
++	  int do_tag = tag != MM_NULLTAG;
++	  int need_colon = (do_label
++			    && (do_severity | do_text | do_action | do_tag));
++
++	  syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
++		  do_label ? label : "",
++		  need_colon ? ": " : "",
++		  do_severity ? severity_rec->string : "",
++		  do_severity && (do_text | do_action | do_tag) ? ": " : "",
++		  do_text ? text : "",
++		  do_text && (do_action | do_tag) ? "\n" : "",
++		  do_action ? "TO FIX: " : "",
++		  do_action ? action : "",
++		  do_action && do_tag ? "  " : "",
++		  do_tag ? tag : "");
++	}
+     }
+ 
++  __libc_lock_unlock (lock);
++
+ #ifdef __libc_ptf_call
+   __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
+ #endif
diff --git a/multilib/lib32-glibc/glibc-2.15-ifunc.patch b/multilib/lib32-glibc/glibc-2.15-ifunc.patch
index 8ad0b9d7a..115afa02a 100644
--- a/multilib/lib32-glibc/glibc-2.15-ifunc.patch
+++ b/multilib/lib32-glibc/glibc-2.15-ifunc.patch
@@ -1,23 +1,3 @@
-
-From 6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4 Mon Sep 17 00:00:00 2001
-From: Ulrich Drepper <drepper@gmail.com>
-Date: Fri, 27 Jan 2012 15:05:19 -0500
-Subject: [PATCH] Sort objects before relocations
-
----
- ChangeLog              |   11 ++++
- Makeconfig             |    6 ++
- NEWS                   |    4 +-
- elf/Makefile           |   15 +++++-
- elf/dl-open.c          |  128 ++++++++++++++++++++++++++++++++++++------------
- elf/tst-relsort1.c     |   19 +++++++
- elf/tst-relsort1mod1.c |    7 +++
- elf/tst-relsort1mod2.c |    7 +++
- 8 files changed, 160 insertions(+), 37 deletions(-)
- create mode 100644 elf/tst-relsort1.c
- create mode 100644 elf/tst-relsort1mod1.c
- create mode 100644 elf/tst-relsort1mod2.c
-
 diff --git a/Makeconfig b/Makeconfig
 index 2db2821..68547b2 100644
 --- a/Makeconfig
@@ -280,6 +260,3 @@ index 0000000..a2c3e55
 +{
 +  return floor (d) != 0.0;
 +}
--- 
-1.7.3.4
-
diff --git a/multilib/lib32-glibc/glibc-2.15-multiarch-x86-strcmp.patch b/multilib/lib32-glibc/glibc-2.15-multiarch-x86-strcmp.patch
new file mode 100644
index 000000000..38c9e617f
--- /dev/null
+++ b/multilib/lib32-glibc/glibc-2.15-multiarch-x86-strcmp.patch
@@ -0,0 +1,39 @@
+diff --git a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
+index d10e872..d4fcd2b 100644
+--- a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
++++ b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
+@@ -6,6 +6,8 @@ extern __typeof (strcasecmp_l) __strcasecmp_l_nonascii;
+ #define USE_IN_EXTENDED_LOCALE_MODEL    1
+ #include <string/strcasecmp.c>
+ 
++strong_alias (__strcasecmp_l_nonascii, __strcasecmp_l_ia32)
++
+ /* The needs of strcasecmp in libc are minimal, no need to go through
+    the IFUNC.  */
+ strong_alias (__strcasecmp_l_nonascii, __GI___strcasecmp_l)
+diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S
+index 5410d17..b3b9eb8 100644
+--- a/sysdeps/i386/i686/multiarch/strcmp.S
++++ b/sysdeps/i386/i686/multiarch/strcmp.S
+@@ -111,6 +111,7 @@ END(STRCMP)
+ # endif
+ #endif
+ 
+-#ifndef USE_AS_STRNCMP
++#if !defined USE_AS_STRNCMP && !defined USE_AS_STRCASECMP_L \
++    && !defined USE_AS_STRNCASECMP_L
+ # include "../strcmp.S"
+ #endif
+diff --git a/sysdeps/i386/i686/multiarch/strncase_l-c.c b/sysdeps/i386/i686/multiarch/strncase_l-c.c
+index 0c68b8d..7e601af 100644
+--- a/sysdeps/i386/i686/multiarch/strncase_l-c.c
++++ b/sysdeps/i386/i686/multiarch/strncase_l-c.c
+@@ -6,6 +6,8 @@ extern __typeof (strncasecmp_l) __strncasecmp_l_nonascii;
+ #define USE_IN_EXTENDED_LOCALE_MODEL    1
+ #include <string/strncase.c>
+ 
++strong_alias (__strncasecmp_l_nonascii, __strncasecmp_l_ia32)
++
+ /* The needs of strcasecmp in libc are minimal, no need to go through
+    the IFUNC.  */
+ strong_alias (__strncasecmp_l_nonascii, __GI___strncasecmp_l)
diff --git a/multilib/lib32-glibc/glibc-2.15-nearbyintf-rounding.patch b/multilib/lib32-glibc/glibc-2.15-nearbyintf-rounding.patch
new file mode 100644
index 000000000..b2bb9caac
--- /dev/null
+++ b/multilib/lib32-glibc/glibc-2.15-nearbyintf-rounding.patch
@@ -0,0 +1,75 @@
+diff --git a/math/libm-test.inc b/math/libm-test.inc
+index c8186c8..1016753 100644
+--- a/math/libm-test.inc
++++ b/math/libm-test.inc
+@@ -4632,6 +4632,29 @@ nearbyint_test (void)
+   TEST_f_f (nearbyint, 524286.75, 524287.0);
+   TEST_f_f (nearbyint, 524288.75, 524289.0);
+ 
++  TEST_f_f (nearbyint, 1048576.75, 1048577.0);
++  TEST_f_f (nearbyint, 2097152.75, 2097153.0);
++  TEST_f_f (nearbyint, 2492472.75, 2492473.0);
++  TEST_f_f (nearbyint, 2886220.75, 2886221.0);
++  TEST_f_f (nearbyint, 3058792.75, 3058793.0);
++  TEST_f_f (nearbyint, -1048576.75, -1048577.0);
++  TEST_f_f (nearbyint, -2097152.75, -2097153.0);
++  TEST_f_f (nearbyint, -2492472.75, -2492473.0);
++  TEST_f_f (nearbyint, -2886220.75, -2886221.0);
++  TEST_f_f (nearbyint, -3058792.75, -3058793.0);
++#ifndef TEST_FLOAT
++  TEST_f_f (nearbyint, 70368744177664.75, 70368744177665.0);
++  TEST_f_f (nearbyint, 140737488355328.75, 140737488355329.0);
++  TEST_f_f (nearbyint, 281474976710656.75, 281474976710657.0);
++  TEST_f_f (nearbyint, 562949953421312.75, 562949953421313.0);
++  TEST_f_f (nearbyint, 1125899906842624.75, 1125899906842625.0);
++  TEST_f_f (nearbyint, -70368744177664.75, -70368744177665.0);
++  TEST_f_f (nearbyint, -140737488355328.75, -140737488355329.0);
++  TEST_f_f (nearbyint, -281474976710656.75, -281474976710657.0);
++  TEST_f_f (nearbyint, -562949953421312.75, -562949953421313.0);
++  TEST_f_f (nearbyint, -1125899906842624.75, -1125899906842625.0);
++#endif
++
+   END (nearbyint);
+ }
+ 
+diff --git a/sysdeps/ieee754/flt-32/s_nearbyintf.c b/sysdeps/ieee754/flt-32/s_nearbyintf.c
+index 04ef9ab..a6d602b 100644
+--- a/sysdeps/ieee754/flt-32/s_nearbyintf.c
++++ b/sysdeps/ieee754/flt-32/s_nearbyintf.c
+@@ -30,18 +30,12 @@ __nearbyintf(float x)
+ {
+ 	fenv_t env;
+ 	int32_t i0,j0,sx;
+-	u_int32_t i,i1;
+ 	float w,t;
+ 	GET_FLOAT_WORD(i0,x);
+ 	sx = (i0>>31)&1;
+ 	j0 = ((i0>>23)&0xff)-0x7f;
+ 	if(j0<23) {
+ 	    if(j0<0) {
+-		if((i0&0x7fffffff)==0) return x;
+-		i1 = (i0&0x07fffff);
+-		i0 &= 0xfff00000;
+-		i0 |= ((i1|-i1)>>9)&0x400000;
+-		SET_FLOAT_WORD(x,i0);
+ 		libc_feholdexceptf (&env);
+ 		w = TWO23[sx]+x;
+ 		t =  w-TWO23[sx];
+@@ -49,17 +43,11 @@ __nearbyintf(float x)
+ 		GET_FLOAT_WORD(i0,t);
+ 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
+ 		return t;
+-	    } else {
+-		i = (0x007fffff)>>j0;
+-		if((i0&i)==0) return x; /* x is integral */
+-		i>>=1;
+-		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
+ 	    }
+ 	} else {
+ 	    if(__builtin_expect(j0==0x80, 0)) return x+x;	/* inf or NaN */
+ 	    else return x;		/* x is integral */
+ 	}
+-	SET_FLOAT_WORD(x,i0);
+ 	libc_feholdexceptf (&env);
+ 	w = TWO23[sx]+x;
+ 	t = w-TWO23[sx];
diff --git a/multilib/lib32-glibc/glibc-2.15-non-signalling-comparisons.patch b/multilib/lib32-glibc/glibc-2.15-non-signalling-comparisons.patch
new file mode 100644
index 000000000..874f8b4cb
--- /dev/null
+++ b/multilib/lib32-glibc/glibc-2.15-non-signalling-comparisons.patch
@@ -0,0 +1,886 @@
+diff --git a/math/w_acos.c b/math/w_acos.c
+index 3138408..0490933 100644
+--- a/math/w_acos.c
++++ b/math/w_acos.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ __acos (double x)
+ {
+-  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabs (x), 1.0), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* acos(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_acosf.c b/math/w_acosf.c
+index 0e41a2c..2500a7d 100644
+--- a/math/w_acosf.c
++++ b/math/w_acosf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ float
+ __acosf (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* acos(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_acosh.c b/math/w_acosh.c
+index 0bd2686..d632987 100644
+--- a/math/w_acosh.c
++++ b/math/w_acosh.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ double
+ __acosh (double x)
+ {
+-  if (__builtin_expect (x < 1.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x,  1.0), 0) && _LIB_VERSION != _IEEE_)
+     /* acosh(x<1) */
+     return __kernel_standard (x, x, 29);
+ 
+diff --git a/math/w_acoshf.c b/math/w_acoshf.c
+index c59bf94..f77df2b 100644
+--- a/math/w_acoshf.c
++++ b/math/w_acoshf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ float
+ __acoshf (float x)
+ {
+-  if (__builtin_expect (x < 1.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x, 1.0f), 0) && _LIB_VERSION != _IEEE_)
+     /* acosh(x<1) */
+     return __kernel_standard_f (x, x, 129);
+ 
+diff --git a/math/w_acoshl.c b/math/w_acoshl.c
+index 819bdfc..cc823b8 100644
+--- a/math/w_acoshl.c
++++ b/math/w_acoshl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ long double
+ __acoshl (long double x)
+ {
+-  if (__builtin_expect (x < 1.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x, 1.0L), 0) && _LIB_VERSION != _IEEE_)
+     /* acosh(x<1) */
+     return __kernel_standard (x, x, 229);
+ 
+diff --git a/math/w_acosl.c b/math/w_acosl.c
+index 6417068..05023b4 100644
+--- a/math/w_acosl.c
++++ b/math/w_acosl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __acosl (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* acos(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_asin.c b/math/w_asin.c
+index d4e89ce..0fa9487 100644
+--- a/math/w_asin.c
++++ b/math/w_asin.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ __asin (double x)
+ {
+-  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabs (x),  1.0), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* asin(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_asinf.c b/math/w_asinf.c
+index 270961f..c28edab 100644
+--- a/math/w_asinf.c
++++ b/math/w_asinf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ float
+ __asinf (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* asin(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_asinl.c b/math/w_asinl.c
+index 32e5273..e4036d8 100644
+--- a/math/w_asinl.c
++++ b/math/w_asinl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __asinl (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       /* asin(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_atanh.c b/math/w_atanh.c
+index 1022bd5..190d2e9 100644
+--- a/math/w_atanh.c
++++ b/math/w_atanh.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,8 @@
+ double
+ __atanh (double x)
+ {
+-  if (__builtin_expect (fabs (x) >= 1.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreaterequal (fabs (x), 1.0), 0)
++      && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x,
+ 			      fabs (x) > 1.0
+ 			      ? 30		/* atanh(|x|>1) */
+diff --git a/math/w_atanhf.c b/math/w_atanhf.c
+index 3c8cf83..e0c5dc3 100644
+--- a/math/w_atanhf.c
++++ b/math/w_atanhf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,8 @@
+ float
+ __atanhf (float x)
+ {
+-  if (__builtin_expect (fabsf (x) >= 1.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreaterequal (fabsf (x), 1.0f), 0)
++      && _LIB_VERSION != _IEEE_)
+     return __kernel_standard_f (x, x,
+ 				fabsf (x) > 1.0f
+ 				? 130		/* atanh(|x|>1) */
+diff --git a/math/w_atanhl.c b/math/w_atanhl.c
+index f582acf..319535d 100644
+--- a/math/w_atanhl.c
++++ b/math/w_atanhl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,8 @@
+ long double
+ __atanhl (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) >= 1.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreaterequal (fabsl (x), 1.0L), 0)
++      && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x,
+ 			      fabsl (x) > 1.0L
+ 			      ? 230		/* atanh(|x|>1) */
+diff --git a/math/w_exp2.c b/math/w_exp2.c
+index bf22326..7a3b0af 100644
+--- a/math/w_exp2.c
++++ b/math/w_exp2.c
+@@ -12,7 +12,8 @@ static const double u_threshold = (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1);
+ double
+ __exp2 (double x)
+ {
+-  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
++  if (__builtin_expect (islessequal (x, u_threshold)
++			|| isgreater (x, o_threshold), 0)
+       && _LIB_VERSION != _IEEE_ && __finite (x))
+     /* exp2 overflow: 44, exp2 underflow: 45 */
+     return __kernel_standard (x, x, 44 + (x <= o_threshold));
+diff --git a/math/w_exp2f.c b/math/w_exp2f.c
+index 7215fca..c4e9e94 100644
+--- a/math/w_exp2f.c
++++ b/math/w_exp2f.c
+@@ -12,7 +12,8 @@ static const float u_threshold = (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1);
+ float
+ __exp2f (float x)
+ {
+-  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
++  if (__builtin_expect (islessequal (x, u_threshold)
++			|| isgreater (x, o_threshold), 0)
+       && _LIB_VERSION != _IEEE_ && __finitef (x))
+     /* exp2 overflow: 144, exp2 underflow: 145 */
+     return __kernel_standard_f (x, x, 144 + (x <= o_threshold));
+diff --git a/math/w_exp2l.c b/math/w_exp2l.c
+index ac8d231..442a637 100644
+--- a/math/w_exp2l.c
++++ b/math/w_exp2l.c
+@@ -13,7 +13,8 @@ static const long double u_threshold
+ long double
+ __exp2l (long double x)
+ {
+-  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
++  if (__builtin_expect (islessequal (x, u_threshold)
++			|| isgreater (x, o_threshold), 0)
+       && _LIB_VERSION != _IEEE_ && __finitel (x))
+     /* exp2 overflow: 244, exp2 underflow: 245 */
+     return __kernel_standard (x, x, 244 + (x <= o_threshold));
+diff --git a/math/w_j0.c b/math/w_j0.c
+index 1dff8b4..f8d3724 100644
+--- a/math/w_j0.c
++++ b/math/w_j0.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ j0 (double x)
+ {
+-  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* j0(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 34);
+ 
+@@ -40,7 +41,8 @@ strong_alias (j0, j0l)
+ double
+ y0 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0)
+ 	{
+diff --git a/math/w_j0f.c b/math/w_j0f.c
+index fc52f26..cef36aa 100644
+--- a/math/w_j0f.c
++++ b/math/w_j0f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ j0f (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
++  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     /* j0(|x|>X_TLOSS) */
+     return __kernel_standard_f (x, x, 134);
+@@ -38,7 +38,8 @@ j0f (float x)
+ float
+ y0f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
++  if (__builtin_expect (islessequal (x, 0.0f)
++                        || isgreater (x, (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0f)
+diff --git a/math/w_j0l.c b/math/w_j0l.c
+index 8d72d50..144f33c 100644
+--- a/math/w_j0l.c
++++ b/math/w_j0l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __j0l (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* j0(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 234);
+ 
+@@ -38,7 +39,8 @@ weak_alias (__j0l, j0l)
+ long double
+ __y0l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0L)
+ 	{
+diff --git a/math/w_j1.c b/math/w_j1.c
+index 358e0e1..e9a5357 100644
+--- a/math/w_j1.c
++++ b/math/w_j1.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ j1 (double x)
+ {
+-  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* j1(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 36);
+ 
+@@ -40,7 +41,8 @@ strong_alias (j1, j1l)
+ double
+ y1 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0)
+ 	{
+diff --git a/math/w_j1f.c b/math/w_j1f.c
+index 096fdf5..29bd949 100644
+--- a/math/w_j1f.c
++++ b/math/w_j1f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ float
+ j1f (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsf (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* j1(|x|>X_TLOSS) */
+     return __kernel_standard_f (x, x, 136);
+ 
+@@ -37,7 +38,8 @@ j1f (float x)
+ float
+ y1f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
++  if (__builtin_expect (islessequal (x, 0.0f)
++			|| isgreater (x, (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0f)
+diff --git a/math/w_j1l.c b/math/w_j1l.c
+index 93e4ee4..01b8551 100644
+--- a/math/w_j1l.c
++++ b/math/w_j1l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __j1l (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* j1(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 236);
+ 
+@@ -38,7 +39,8 @@ weak_alias (__j1l, j1l)
+ long double
+ __y1l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0L)
+ 	{
+diff --git a/math/w_jn.c b/math/w_jn.c
+index f0dd8c6..fd3fb16 100644
+--- a/math/w_jn.c
++++ b/math/w_jn.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ jn (int n, double x)
+ {
+-  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     /* jn(n,|x|>X_TLOSS) */
+     return __kernel_standard (n, x, 38);
+ 
+@@ -40,7 +41,8 @@ strong_alias (jn, jnl)
+ double
+ yn (int n, double x)
+ {
+-  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
++      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0)
+ 	{
+diff --git a/math/w_jnf.c b/math/w_jnf.c
+index ef29eb4..36d6f6d 100644
+--- a/math/w_jnf.c
++++ b/math/w_jnf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ jnf (int n, float x)
+ {
+-  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
++  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     /* jn(n,|x|>X_TLOSS) */
+     return __kernel_standard_f (n, x, 138);
+@@ -38,7 +38,8 @@ jnf (int n, float x)
+ float
+ ynf (int n, float x)
+ {
+-  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
++  if (__builtin_expect (islessequal (x, 0.0f)
++			|| isgreater (x, (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0f)
+diff --git a/math/w_log.c b/math/w_log.c
+index efc1c4c..ec33605 100644
+--- a/math/w_log.c
++++ b/math/w_log.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ double
+ __log (double x)
+ {
+-  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log10.c b/math/w_log10.c
+index 2717ade..fe799ad 100644
+--- a/math/w_log10.c
++++ b/math/w_log10.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ double
+ __log10 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log10f.c b/math/w_log10f.c
+index 60737ca..4b821f7 100644
+--- a/math/w_log10f.c
++++ b/math/w_log10f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ __log10f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0f)
+ 	{
+diff --git a/math/w_log10l.c b/math/w_log10l.c
+index b26f18c..0e5a137 100644
+--- a/math/w_log10l.c
++++ b/math/w_log10l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ long double
+ __log10l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0L)
+ 	{
+diff --git a/math/w_log2.c b/math/w_log2.c
+index 998e5d9..e58e109 100644
+--- a/math/w_log2.c
++++ b/math/w_log2.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ double
+ __log2 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log2f.c b/math/w_log2f.c
+index 6d91bf4..6963ed2 100644
+--- a/math/w_log2f.c
++++ b/math/w_log2f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ __log2f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log2l.c b/math/w_log2l.c
+index e51c1bc..eed04ff6c 100644
+--- a/math/w_log2l.c
++++ b/math/w_log2l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ long double
+ __log2l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0L)
+ 	{
+diff --git a/math/w_logf.c b/math/w_logf.c
+index 8aa27c8..38d408f 100644
+--- a/math/w_logf.c
++++ b/math/w_logf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ __logf (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0f)
+ 	{
+diff --git a/math/w_logl.c b/math/w_logl.c
+index a3139ff..593b37d 100644
+--- a/math/w_logl.c
++++ b/math/w_logl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ long double
+ __logl (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0L)
+ 	{
+diff --git a/math/w_sqrt.c b/math/w_sqrt.c
+index 409a6df..f6ba542 100644
+--- a/math/w_sqrt.c
++++ b/math/w_sqrt.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ double
+ __sqrt (double x)
+ {
+-  if (__builtin_expect (x < 0.0, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x, 26); /* sqrt(negative) */
+ 
+   return __ieee754_sqrt (x);
+diff --git a/math/w_sqrtf.c b/math/w_sqrtf.c
+index 3c3d2f8..c128e9b 100644
+--- a/math/w_sqrtf.c
++++ b/math/w_sqrtf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ float
+ __sqrtf (float x)
+ {
+-  if (__builtin_expect (x < 0.0f, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     return __kernel_standard_f (x, x, 126); /* sqrt(negative) */
+ 
+   return __ieee754_sqrtf (x);
+diff --git a/math/w_sqrtl.c b/math/w_sqrtl.c
+index 5e18f44..2a4a048 100644
+--- a/math/w_sqrtl.c
++++ b/math/w_sqrtl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ long double
+ __sqrtl (long double x)
+ {
+-  if (__builtin_expect (x < 0.0L, 0) && _LIB_VERSION != _IEEE_)
++  if (__builtin_expect (isless (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x, 226); /* sqrt(negative) */
+ 
+   return __ieee754_sqrtl (x);
+diff --git a/sysdeps/ieee754/dbl-64/e_atanh.c b/sysdeps/ieee754/dbl-64/e_atanh.c
+index 9fc21ab..5f471b1 100644
+--- a/sysdeps/ieee754/dbl-64/e_atanh.c
++++ b/sysdeps/ieee754/dbl-64/e_atanh.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -46,7 +46,7 @@ __ieee754_atanh (double x)
+ {
+   double xa = fabs (x);
+   double t;
+-  if (xa < 0.5)
++  if (isless (xa, 0.5))
+     {
+       if (__builtin_expect (xa < 0x1.0p-28, 0))
+ 	{
+@@ -57,11 +57,11 @@ __ieee754_atanh (double x)
+       t = xa + xa;
+       t = 0.5 * __log1p (t + t * xa / (1.0 - xa));
+     }
+-  else if (__builtin_expect (xa < 1.0, 1))
++  else if (__builtin_expect (isless (xa, 1.0), 1))
+     t = 0.5 * __log1p ((xa + xa) / (1.0 - xa));
+   else
+     {
+-      if (xa > 1.0)
++      if (isgreater (xa, 1.0))
+ 	return (x - x) / (x - x);
+ 
+       return x / 0.0;
+diff --git a/sysdeps/ieee754/dbl-64/w_exp.c b/sysdeps/ieee754/dbl-64/w_exp.c
+index ee42587..b584ed8 100644
+--- a/sysdeps/ieee754/dbl-64/w_exp.c
++++ b/sysdeps/ieee754/dbl-64/w_exp.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -28,12 +28,12 @@ u_threshold= -7.45133219101941108420e+02;  /* 0xc0874910, 0xD52D3051 */
+ double
+ __exp (double x)
+ {
+-  if (__builtin_expect (x > o_threshold, 0))
++  if (__builtin_expect (isgreater (x, o_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 6);
+     }
+-  else if (__builtin_expect (x < u_threshold, 0))
++  else if (__builtin_expect (isless (x, u_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 7);
+diff --git a/sysdeps/ieee754/flt-32/e_atanhf.c b/sysdeps/ieee754/flt-32/e_atanhf.c
+index 75ed691..7af2f6c 100644
+--- a/sysdeps/ieee754/flt-32/e_atanhf.c
++++ b/sysdeps/ieee754/flt-32/e_atanhf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -46,7 +46,7 @@ __ieee754_atanhf (float x)
+ {
+   float xa = fabsf (x);
+   float t;
+-  if (xa < 0.5f)
++  if (isless (xa, 0.5f))
+     {
+       if (__builtin_expect (xa < 0x1.0p-28f, 0))
+ 	{
+@@ -57,11 +57,11 @@ __ieee754_atanhf (float x)
+       t = xa + xa;
+       t = 0.5f * __log1pf (t + t * xa / (1.0f - xa));
+     }
+-  else if (__builtin_expect (xa < 1.0f, 1))
++  else if (__builtin_expect (isless (xa, 1.0f), 1))
+     t = 0.5f * __log1pf ((xa + xa) / (1.0f - xa));
+   else
+     {
+-      if (xa > 1.0f)
++      if (isgreater (xa, 1.0f))
+ 	return (x - x) / (x - x);
+ 
+       return x / 0.0f;
+diff --git a/sysdeps/ieee754/flt-32/w_expf.c b/sysdeps/ieee754/flt-32/w_expf.c
+index 5500872..bc3b2f6 100644
+--- a/sysdeps/ieee754/flt-32/w_expf.c
++++ b/sysdeps/ieee754/flt-32/w_expf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -28,12 +28,12 @@ u_threshold= -1.0397208405e+02;  /* 0xc2cff1b5 */
+ float
+ __expf (float x)
+ {
+-  if (__builtin_expect (x > o_threshold, 0))
++  if (__builtin_expect (isgreater (x, o_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 106);
+     }
+-  else if (__builtin_expect (x < u_threshold, 0))
++  else if (__builtin_expect (isless (x, u_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 107);
+diff --git a/sysdeps/ieee754/ldbl-96/w_expl.c b/sysdeps/ieee754/ldbl-96/w_expl.c
+index ec9d8a7..d61c0a3 100644
+--- a/sysdeps/ieee754/ldbl-96/w_expl.c
++++ b/sysdeps/ieee754/ldbl-96/w_expl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -30,12 +30,12 @@ u_threshold= -1.140019167866942050398521670162263001513e4;
+ long double
+ __expl (long double x)
+ {
+-  if (__builtin_expect (x > o_threshold, 0))
++  if (__builtin_expect (isgreater (x, o_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard (x, x, 206);
+     }
+-  else if (__builtin_expect (x < u_threshold, 0))
++  else if (__builtin_expect (isless (x, u_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard (x, x, 207);
diff --git a/multilib/lib32-glibc/glibc-2.15-revert-netlink-cache.patch b/multilib/lib32-glibc/glibc-2.15-revert-netlink-cache.patch
index f35f6c5f0..87d04c794 100644
--- a/multilib/lib32-glibc/glibc-2.15-revert-netlink-cache.patch
+++ b/multilib/lib32-glibc/glibc-2.15-revert-netlink-cache.patch
@@ -1,20 +1,3 @@
-From 2a3a38c03b6e376a9bc8a1937641e5dee979bcbf Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Sat, 4 Feb 2012 15:28:54 +1000
-Subject: [PATCH] revert stuff
-
----
- include/ifaddrs.h                  |    5 -
- inet/check_pf.c                    |   18 +----
- nscd/connections.c                 |  119 ------------------------
- nscd/nscd-client.h                 |   18 +----
- nscd/nscd_gethst_r.c               |   23 +-----
- nscd/nscd_helper.c                 |   10 +-
- sysdeps/posix/getaddrinfo.c        |   10 +-
- sysdeps/unix/sysv/linux/Makefile   |    2 +-
- sysdeps/unix/sysv/linux/check_pf.c |  176 +++++++-----------------------------
- 9 files changed, 46 insertions(+), 335 deletions(-)
-
 diff --git a/include/ifaddrs.h b/include/ifaddrs.h
 index e1c6cac..50e4c48 100644
 --- a/include/ifaddrs.h
@@ -695,6 +678,3 @@ index 0738a70..d5ad7ea 100644
 -	}
 -    }
 -}
--- 
-1.7.9
-
diff --git a/multilib/lib32-glibc/glibc-2.15-rintf-rounding.patch b/multilib/lib32-glibc/glibc-2.15-rintf-rounding.patch
new file mode 100644
index 000000000..e0240ac6c
--- /dev/null
+++ b/multilib/lib32-glibc/glibc-2.15-rintf-rounding.patch
@@ -0,0 +1,158 @@
+diff --git a/math/libm-test.inc b/math/libm-test.inc
+index 6243e1e..c8186c8 100644
+--- a/math/libm-test.inc
++++ b/math/libm-test.inc
+@@ -5037,6 +5037,22 @@ rint_test (void)
+   TEST_f_f (rint, 262142.75, 262143.0);
+   TEST_f_f (rint, 524286.75, 524287.0);
+   TEST_f_f (rint, 524288.75, 524289.0);
++  TEST_f_f (rint, 1048576.75, 1048577.0);
++  TEST_f_f (rint, 2097152.75, 2097153.0);
++  TEST_f_f (rint, -1048576.75, -1048577.0);
++  TEST_f_f (rint, -2097152.75, -2097153.0);
++#ifndef TEST_FLOAT
++  TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
++  TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
++  TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
++  TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
++  TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
++  TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
++  TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
++  TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
++  TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
++  TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
++#endif
+ #ifdef TEST_LDOUBLE
+   /* The result can only be represented in long double.  */
+   TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
+@@ -5137,6 +5153,22 @@ rint_test_tonearest (void)
+       TEST_f_f (rint, -0.1, -0.0);
+       TEST_f_f (rint, -0.25, -0.0);
+       TEST_f_f (rint, -0.625, -1.0);
++      TEST_f_f (rint, 1048576.75, 1048577.0);
++      TEST_f_f (rint, 2097152.75, 2097153.0);
++      TEST_f_f (rint, -1048576.75, -1048577.0);
++      TEST_f_f (rint, -2097152.75, -2097153.0);
++#ifndef TEST_FLOAT
++      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
++      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
++      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
++      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
++      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
++      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
++      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
++      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
++      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
++      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
++#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
+@@ -5207,6 +5239,22 @@ rint_test_towardzero (void)
+       TEST_f_f (rint, -0.1, -0.0);
+       TEST_f_f (rint, -0.25, -0.0);
+       TEST_f_f (rint, -0.625, -0.0);
++      TEST_f_f (rint, 1048576.75, 1048576.0);
++      TEST_f_f (rint, 2097152.75, 2097152.0);
++      TEST_f_f (rint, -1048576.75, -1048576.0);
++      TEST_f_f (rint, -2097152.75, -2097152.0);
++#ifndef TEST_FLOAT
++      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
++      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
++      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
++      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
++      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
++      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
++      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
++      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
++      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
++      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
++#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
+@@ -5277,6 +5325,22 @@ rint_test_downward (void)
+       TEST_f_f (rint, -0.1, -1.0);
+       TEST_f_f (rint, -0.25, -1.0);
+       TEST_f_f (rint, -0.625, -1.0);
++      TEST_f_f (rint, 1048576.75, 1048576.0);
++      TEST_f_f (rint, 2097152.75, 2097152.0);
++      TEST_f_f (rint, -1048576.75, -1048577.0);
++      TEST_f_f (rint, -2097152.75, -2097153.0);
++#ifndef TEST_FLOAT
++      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
++      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
++      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
++      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
++      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
++      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
++      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
++      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
++      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
++      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
++#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
+@@ -5347,6 +5411,22 @@ rint_test_upward (void)
+       TEST_f_f (rint, -0.1, -0.0);
+       TEST_f_f (rint, -0.25, -0.0);
+       TEST_f_f (rint, -0.625, -0.0);
++      TEST_f_f (rint, 1048576.75, 1048577.0);
++      TEST_f_f (rint, 2097152.75, 2097153.0);
++      TEST_f_f (rint, -1048576.75, -1048576.0);
++      TEST_f_f (rint, -2097152.75, -2097152.0);
++#ifndef TEST_FLOAT
++      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
++      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
++      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
++      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
++      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
++      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
++      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
++      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
++      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
++      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
++#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
+diff --git a/sysdeps/ieee754/flt-32/s_rintf.c b/sysdeps/ieee754/flt-32/s_rintf.c
+index 9ea9b6f..9ba6b57 100644
+--- a/sysdeps/ieee754/flt-32/s_rintf.c
++++ b/sysdeps/ieee754/flt-32/s_rintf.c
+@@ -26,34 +26,22 @@ float
+ __rintf(float x)
+ {
+ 	int32_t i0,j0,sx;
+-	u_int32_t i,i1;
+ 	float w,t;
+ 	GET_FLOAT_WORD(i0,x);
+ 	sx = (i0>>31)&1;
+ 	j0 = ((i0>>23)&0xff)-0x7f;
+ 	if(j0<23) {
+ 	    if(j0<0) {
+-		if((i0&0x7fffffff)==0) return x;
+-		i1 = (i0&0x07fffff);
+-		i0 &= 0xfff00000;
+-		i0 |= ((i1|-i1)>>9)&0x400000;
+-		SET_FLOAT_WORD(x,i0);
+ 		w = TWO23[sx]+x;
+ 		t =  w-TWO23[sx];
+ 		GET_FLOAT_WORD(i0,t);
+ 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
+ 		return t;
+-	    } else {
+-		i = (0x007fffff)>>j0;
+-		if((i0&i)==0) return x; /* x is integral */
+-		i>>=1;
+-		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
+ 	    }
+ 	} else {
+ 	    if(j0==0x80) return x+x;	/* inf or NaN */
+ 	    else return x;		/* x is integral */
+ 	}
+-	SET_FLOAT_WORD(x,i0);
+ 	w = TWO23[sx]+x;
+ 	return w-TWO23[sx];
+ }
diff --git a/multilib/lib32-glibc/glibc-2.15-scanf.patch b/multilib/lib32-glibc/glibc-2.15-scanf.patch
index 7655ae5ab..a2561b232 100644
--- a/multilib/lib32-glibc/glibc-2.15-scanf.patch
+++ b/multilib/lib32-glibc/glibc-2.15-scanf.patch
@@ -1,13 +1,3 @@
-From 20b38e0301279a37a3f1e769843933bcc0d5f736 Mon Sep 17 00:00:00 2001
-From: Paul Pluzhnikov <ppluzhnikov@google.com>
-Date: Sun, 8 Jan 2012 20:13:35 -0500
-Subject: [PATCH 1/1] sscanf always calls realloc
-
----
- ChangeLog              |    5 +++++
- stdio-common/vfscanf.c |    4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
 diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
 index 0e71deb..e18a6c3 100644
 --- a/stdio-common/vfscanf.c
@@ -27,6 +17,3 @@ index 0e71deb..e18a6c3 100644
  	    {								    \
  	      wp = realloc (use_malloc ? wp : NULL, newsize);		    \
  	      if (wp == NULL)						    \
--- 
-1.7.3.4
-
diff --git a/multilib/lib32-glibc/glibc-2.15-vdso.patch b/multilib/lib32-glibc/glibc-2.15-vdso.patch
new file mode 100644
index 000000000..7fd394f90
--- /dev/null
+++ b/multilib/lib32-glibc/glibc-2.15-vdso.patch
@@ -0,0 +1,40 @@
+diff --git a/elf/Makefile b/elf/Makefile
+index 8234ba7..25ffc57 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -1203,3 +1203,14 @@ $(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so
+ $(objpfx)tst-relsort1mod2.so: $(libm)
+ $(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
+ 			   $(objpfx)tst-relsort1mod2.so
++
++tests: $(objpfx)tst-unused-dep.out
++
++$(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so
++	LD_TRACE_LOADED_OBJECTS=1 \
++	LD_DEBUG=unused \
++	LD_PRELOAD= \
++	$(elf-objpfx)${rtld-installed-name} \
++	  --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
++	  $< > $@
++	cmp $@ /dev/null > /dev/null
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 2e4f97f..3e15447 100644
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -1,5 +1,5 @@
+ /* Run time dynamic linker.
+-   Copyright (C) 1995-2010, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1995-2012 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
+@@ -1375,6 +1375,9 @@ of this helper program; chances are you did not intend to run this program.\n\
+ 	  _dl_setup_hash (l);
+ 	  l->l_relocated = 1;
+ 
++	  /* The vDSO is always used.  */
++	  l->l_used = 1;
++
+ 	  /* Initialize l_local_scope to contain just this map.  This allows
+ 	     the use of dl_lookup_symbol_x to resolve symbols within the vdso.
+ 	     So we create a single entry list pointing to l_real as its only
diff --git a/multilib/lib32-glibc/glibc-2.15-vfprintf-nargs.patch b/multilib/lib32-glibc/glibc-2.15-vfprintf-nargs.patch
new file mode 100644
index 000000000..6a37bde68
--- /dev/null
+++ b/multilib/lib32-glibc/glibc-2.15-vfprintf-nargs.patch
@@ -0,0 +1,174 @@
+diff --git a/stdio-common/Makefile b/stdio-common/Makefile
+index a847b28..080badc 100644
+--- a/stdio-common/Makefile
++++ b/stdio-common/Makefile
+@@ -59,7 +59,8 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
+ 	 tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
+ 	 tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
+ 	 bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \
+-	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24
++	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24 \
++	 bug-vfprintf-nargs
+ 
+ test-srcs = tst-unbputc tst-printf
+ 
+diff --git a/stdio-common/bug-vfprintf-nargs.c b/stdio-common/bug-vfprintf-nargs.c
+new file mode 100644
+index 0000000..13c66c0
+--- /dev/null
++++ b/stdio-common/bug-vfprintf-nargs.c
+@@ -0,0 +1,78 @@
++/* Test for vfprintf nargs allocation overflow (BZ #13656).
++   Copyright (C) 2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++   Contributed by Kees Cook <keescook@chromium.org>, 2012.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <stdint.h>
++#include <unistd.h>
++#include <inttypes.h>
++#include <string.h>
++#include <signal.h>
++
++static int
++format_failed (const char *fmt, const char *expected)
++{
++  char output[80];
++
++  printf ("%s : ", fmt);
++
++  memset (output, 0, sizeof output);
++  /* Having sprintf itself detect a failure is good.  */
++  if (sprintf (output, fmt, 1, 2, 3, "test") > 0
++      && strcmp (output, expected) != 0)
++    {
++      printf ("FAIL (output '%s' != expected '%s')\n", output, expected);
++      return 1;
++    }
++  puts ("ok");
++  return 0;
++}
++
++static int
++do_test (void)
++{
++  int rc = 0;
++  char buf[64];
++
++  /* Regular positionals work.  */
++  if (format_failed ("%1$d", "1") != 0)
++    rc = 1;
++
++  /* Regular width positionals work.  */
++  if (format_failed ("%1$*2$d", " 1") != 0)
++    rc = 1;
++
++  /* Positional arguments are constructed via read_int, so nargs can only
++     overflow on 32-bit systems.  On 64-bit systems, it will attempt to
++     allocate a giant amount of memory and possibly crash, which is the
++     expected situation.  Since the 64-bit behavior is arch-specific, only
++     test this on 32-bit systems.  */
++  if (sizeof (long int) == 4)
++    {
++      sprintf (buf, "%%1$d %%%" PRIdPTR "$d", UINT32_MAX / sizeof (int));
++      if (format_failed (buf, "1 %$d") != 0)
++        rc = 1;
++    }
++
++  return rc;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
+index 863cd5d..022e72b 100644
+--- a/stdio-common/vfprintf.c
++++ b/stdio-common/vfprintf.c
+@@ -235,6 +235,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
+      0 if unknown.  */
+   int readonly_format = 0;
+ 
++  /* For the argument descriptions, which may be allocated on the heap.  */
++  void *args_malloced = NULL;
++
+   /* This table maps a character into a number representing a
+      class.  In each step there is a destination label for each
+      class.  */
+@@ -1647,9 +1650,10 @@ do_positional:
+        determine the size of the array needed to store the argument
+        attributes.  */
+     size_t nargs = 0;
+-    int *args_type;
+-    union printf_arg *args_value = NULL;
++    size_t bytes_per_arg;
++    union printf_arg *args_value;
+     int *args_size;
++    int *args_type;
+ 
+     /* Positional parameters refer to arguments directly.  This could
+        also determine the maximum number of arguments.  Track the
+@@ -1698,13 +1702,33 @@ do_positional:
+ 
+     /* Determine the number of arguments the format string consumes.  */
+     nargs = MAX (nargs, max_ref_arg);
++    bytes_per_arg = sizeof (*args_value) + sizeof (*args_size)
++                    + sizeof (*args_type);
++
++    /* Check for potential integer overflow.  */
++    if (nargs > SIZE_MAX / bytes_per_arg)
++      {
++         done = -1;
++         goto all_done;
++      }
+ 
+     /* Allocate memory for the argument descriptions.  */
+-    args_type = alloca (nargs * sizeof (int));
++    if (__libc_use_alloca (nargs * bytes_per_arg))
++        args_value = alloca (nargs * bytes_per_arg);
++    else
++      {
++        args_value = args_malloced = malloc (nargs * bytes_per_arg);
++        if (args_value == NULL)
++          {
++            done = -1;
++            goto all_done;
++          }
++      }
++
++    args_size = &args_value[nargs].pa_int;
++    args_type = &args_size[nargs];
+     memset (args_type, s->_flags2 & _IO_FLAGS2_FORTIFY ? '\xff' : '\0',
+-	    nargs * sizeof (int));
+-    args_value = alloca (nargs * sizeof (union printf_arg));
+-    args_size = alloca (nargs * sizeof (int));
++	    nargs * sizeof (*args_type));
+ 
+     /* XXX Could do sanity check here: If any element in ARGS_TYPE is
+        still zero after this loop, format is invalid.  For now we
+@@ -1973,8 +1997,8 @@ do_positional:
+   }
+ 
+ all_done:
+-  if (__builtin_expect (workstart != NULL, 0))
+-    free (workstart);
++  free (args_malloced);
++  free (workstart);
+   /* Unlock the stream.  */
+   _IO_funlockfile (s);
+   _IO_cleanup_region_end (0);
diff --git a/testing/akonadi/PKGBUILD b/testing/akonadi/PKGBUILD
new file mode 100644
index 000000000..a8037d8c9
--- /dev/null
+++ b/testing/akonadi/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 151801 2012-03-03 08:08:39Z ibiru $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=akonadi
+pkgver=1.7.0
+pkgrel=2
+pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
+arch=('i686' 'x86_64')
+url='http://pim.kde.org/akonadi'
+license=('LGPL')
+depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
+install="${pkgname}.install"
+source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('804309dca70ede35b4a654ab764e9079')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
+  make
+}
+
+package() {
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/akonadi/akonadi.install b/testing/akonadi/akonadi.install
new file mode 100644
index 000000000..7c8a8bd2b
--- /dev/null
+++ b/testing/akonadi/akonadi.install
@@ -0,0 +1,11 @@
+post_install() {
+	update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/testing/avogadro/PKGBUILD b/testing/avogadro/PKGBUILD
new file mode 100644
index 000000000..396c17171
--- /dev/null
+++ b/testing/avogadro/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 151803 2012-03-03 08:08:41Z ibiru $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
+
+pkgname=avogadro
+pkgver=1.0.3
+pkgrel=5
+pkgdesc="An advanced molecular editor based on Qt"
+arch=('i686' 'x86_64')
+url="http://avogadro.openmolecules.net/wiki/Main_Page"
+license=('GPL2')
+depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
+makedepends=('cmake' 'boost')
+install=avogadro.install
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'replace-qt4_automoc-with-qt4_wrap_cpp.patch'
+        'fix-boost.patch'
+        'fix-opengl-headers.patch')
+md5sums=('92c2702c1980f70fb6d87a1a58147911'
+         'aec516daab066c15326a9681f8f15abc'
+         '46282e4709429447e44a0a54d51ad2ec'
+         'f420bfd22e3d5d8fcddc625cf5e711f6')
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch
+  patch -p1 -i "${srcdir}"/fix-boost.patch
+  patch -p1 -i "${srcdir}"/fix-opengl-headers.patch
+
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+    -DQT_MKSPECS_RELATIVE=share/qt/mkspecs
+  make
+}
+
+package() {
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/avogadro/avogadro.install b/testing/avogadro/avogadro.install
new file mode 100644
index 000000000..2eaa60550
--- /dev/null
+++ b/testing/avogadro/avogadro.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/avogadro/fix-boost.patch b/testing/avogadro/fix-boost.patch
new file mode 100644
index 000000000..8fb53ef12
--- /dev/null
+++ b/testing/avogadro/fix-boost.patch
@@ -0,0 +1,33 @@
+--- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~	2011-11-29 18:33:01.777291627 +0000
++++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-11-29 18:33:23.480814612 +0000
+@@ -149,7 +149,7 @@
+   endforeach(P_ITEM ${PYTHON_SRCS})
+ endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
+ 
+-QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
++QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+ 
+ # you have to add link_directories before you add the target
+ if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
+--- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~	2011-11-29 18:37:15.449506548 +0000
++++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:37:52.729831744 +0000
+@@ -11,7 +11,7 @@
+ # use all cpp files in this directory
+ FILE(GLOB wrapper_SRCS "*.cpp")
+ 
+-QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
++QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+ 
+ ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
+ SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
+--- avogadro-1.0.3/libavogadro/CMakeLists.txt~	2011-11-29 19:41:34.066938217 +0000
++++ avogadro-1.0.3/libavogadro/CMakeLists.txt	2011-11-29 19:42:53.084320315 +0000
+@@ -18,7 +18,7 @@
+   # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp
+   # We should probably scan the header to verify the Q_OBJECT macro is used
+   string(REPLACE ".cpp" ".h" hdr_list "${src_list}")
+-  qt4_wrap_cpp(moc_files ${hdr_list})
++  qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+   # Now sort out the ui and qrc files, process them as appropriate
+   set(ui_plugin_files)
+   set(qrc_plugin_files)
diff --git a/testing/avogadro/fix-opengl-headers.patch b/testing/avogadro/fix-opengl-headers.patch
new file mode 100644
index 000000000..e6e8bc3b5
--- /dev/null
+++ b/testing/avogadro/fix-opengl-headers.patch
@@ -0,0 +1,53 @@
+--- avogadro-1.0.3/libavogadro/src/camera.cpp~	2012-02-27 18:35:52.109999585 +0000
++++ avogadro-1.0.3/libavogadro/src/camera.cpp	2012-02-27 18:36:27.103053453 +0000
+@@ -25,6 +25,8 @@
+ #include "camera.h"
+ #include "glwidget.h"
+ #include <avogadro/molecule.h>
++#include <Eigen/LU>
++#include <GL/glu.h>
+ 
+ using namespace Eigen;
+ 
+--- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~	2012-02-27 18:37:28.535894209 +0000
++++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp	2012-02-27 18:37:46.912413557 +0000
+@@ -42,6 +42,7 @@
+ #include <QColor>
+ #include <QVarLengthArray>
+ #include <Eigen/Geometry>
++#include <GL/glu.h>
+ 
+ namespace Avogadro
+ {
+--- avogadro-1.0.3/libavogadro/src/glwidget.cpp~	2012-02-27 18:37:55.099014598 +0000
++++ avogadro-1.0.3/libavogadro/src/glwidget.cpp	2012-02-27 18:38:30.805395066 +0000
+@@ -70,6 +70,8 @@
+ 
+ #include <openbabel/mol.h>
+ 
++#include <GL/glu.h>
++
+ using namespace OpenBabel;
+ using namespace Eigen;
+ 
+--- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~	2012-02-27 18:36:53.646173944 +0000
++++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp	2012-02-27 18:37:10.739370227 +0000
+@@ -36,6 +36,7 @@
+ #include <QFile>
+ #include <QDebug>
+ #include <Eigen/Geometry>
++#include <GL/glu.h>
+ 
+ namespace Avogadro
+ {
+--- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~	2012-02-27 18:38:47.491928000 +0000
++++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp	2012-02-27 18:39:05.735115136 +0000
+@@ -44,6 +44,8 @@
+ #include <QComboBox>
+ #include <QDebug>
+ 
++#include <GL/glu.h>
++
+ using namespace std;
+ using namespace OpenBabel;
+ using namespace Eigen;
diff --git a/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
new file mode 100644
index 000000000..11f58a505
--- /dev/null
+++ b/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
@@ -0,0 +1,778 @@
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt
+--- avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt	2011-11-29 18:49:58.520790652 +0100
+@@ -75,6 +75,42 @@
+   zmatrix.h
+ )
+ 
++SET(libavogadro_MOC_HDRS
++  animation.h
++  atom.h
++  bond.h
++  color.h
++  colorbutton.h
++  colors/elementcolor.h
++  cube.h
++  elementdetail_p.h
++  elementtranslator.h
++  engine.h
++  engines/bsdyengine.h
++  extension.h
++  fragment.h
++  glwidget.h
++  mesh.h
++  molecule.h
++  moleculefile.h
++  moleculefile_p.h
++  periodictablescene_p.h
++  periodictableview.h
++  plotwidget.h
++  plugin.h
++  pluginmanager.h
++  primitive.h
++  protein.h
++  pythonengine_p.h
++  pythonerror.h
++  pythonextension_p.h
++  pythontool_p.h
++  residue.h
++  tool.h
++  toolgroup.h
++  zmatrix.h
++)
++
+ set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS})
+ # Also add in the qtiocompressor class
+ #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp)
+@@ -113,7 +148,7 @@
+   endforeach(P_ITEM ${PYTHON_SRCS})
+ endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
+ 
+-qt4_automoc(${libavogadro_SRCS})
++QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
+ 
+ # you have to add link_directories before you add the target
+ if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
+@@ -149,7 +184,7 @@
+     COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}")
+ endforeach(headerFile ${libavogadro_HDRS})
+ 
+-add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
++add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
+ set_target_properties(avogadro
+   PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
+ target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp
+--- avogadro-1.0.3/libavogadro/src/animation.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp	2011-11-29 18:48:47.967839537 +0100
+@@ -224,5 +224,3 @@
+   }
+ 
+ } // end namespace Avogadro
+-
+-#include "animation.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp
+--- avogadro-1.0.3/libavogadro/src/atom.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp	2011-11-29 18:48:39.561218412 +0100
+@@ -293,5 +293,3 @@
+    }
+ 
+  } // End namespace Avogadro
+-
+-#include "atom.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp
+--- avogadro-1.0.3/libavogadro/src/bond.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp	2011-11-29 18:49:00.067773985 +0100
+@@ -166,5 +166,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "bond.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp
+--- avogadro-1.0.3/libavogadro/src/color.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/color.cpp	2011-11-29 18:49:05.207746140 +0100
+@@ -152,5 +152,3 @@
+     return "Generic Color";
+   }
+ }
+-
+-#include "color.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp
+--- avogadro-1.0.3/libavogadro/src/colorbutton.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp	2011-11-29 18:49:11.987709410 +0100
+@@ -94,5 +94,3 @@
+   }
+ 
+ } // end namespace
+-
+-#include "colorbutton.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp
+--- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp	2011-11-29 18:50:11.077389292 +0100
+@@ -63,7 +63,5 @@
+ 
+ }
+ 
+-#include "elementcolor.moc"
+ //this is a static color plugin...
+ //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory)
+-
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp
+--- avogadro-1.0.3/libavogadro/src/cube.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp	2011-11-29 18:50:26.357306516 +0100
+@@ -322,5 +322,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "cube.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp
+--- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp	2011-11-29 18:50:37.680578505 +0100
+@@ -132,5 +132,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "elementdetail_p.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp
+--- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp	2011-11-29 18:50:48.160521729 +0100
+@@ -401,5 +401,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "elementtranslator.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp
+--- avogadro-1.0.3/libavogadro/src/engine.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp	2011-11-29 18:50:54.397154610 +0100
+@@ -377,5 +377,3 @@
+       return m_molecule->bonds();
+   }
+ }
+-
+-#include "engine.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp
+--- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp	2011-11-29 18:51:18.733689435 +0100
+@@ -442,7 +442,5 @@
+   }
+ 
+ }
+-
+-#include "bsdyengine.moc"
+ // This is a static engine...
+ // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory )
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp
+--- avogadro-1.0.3/libavogadro/src/extension.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp	2011-11-29 18:51:56.360152261 +0100
+@@ -80,5 +80,3 @@
+   }
+ 
+ }
+-
+-#include "extension.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp
+--- avogadro-1.0.3/libavogadro/src/fragment.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp	2011-11-29 18:52:01.906788880 +0100
+@@ -82,5 +82,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "fragment.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp
+--- avogadro-1.0.3/libavogadro/src/glwidget.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp	2011-11-29 18:52:14.346721486 +0100
+@@ -1966,5 +1966,3 @@
+     d->updateCache = true;
+   }
+ }
+-
+-#include "glwidget.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp
+--- avogadro-1.0.3/libavogadro/src/mesh.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp	2011-11-29 18:52:23.033341093 +0100
+@@ -231,5 +231,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "mesh.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp
+--- avogadro-1.0.3/libavogadro/src/molecule.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp	2011-11-29 18:52:33.573283993 +0100
+@@ -1575,5 +1575,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "molecule.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp
+--- avogadro-1.0.3/libavogadro/src/moleculefile.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp	2011-11-29 18:56:26.728687548 +0100
+@@ -22,23 +22,14 @@
+   02110-1301, USA.
+  **********************************************************************/
+ 
+-#include "moleculefile.h"
++#include "moleculefile_p.h"
+ 
+ #include <avogadro/molecule.h>
+ 
+-#include <QFile>
+ #include <QFileInfo>
+-#include <QStringList>
+-#include <QThread>
+ #include <QDebug>
+ #include <QPointer>
+ 
+-#include <openbabel/mol.h>
+-#include <openbabel/obconversion.h>
+-
+-// Included in obconversion.h
+-//#include <iostream>
+-
+ namespace Avogadro {
+ 
+   using OpenBabel::OBConversion;
+@@ -578,164 +569,6 @@
+     return false;
+   }
+ 
+-  class ReadFileThread : public QThread
+-  {
+-    //    Q_OBJECT 
+-
+-    public:
+-      ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
+-      {
+-      }
+-      
+-      void addConformer(const OpenBabel::OBMol &conformer)
+-      {
+-        unsigned int numAtoms = conformer.NumAtoms();
+-        std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
+-        for (unsigned int i = 0; i < numAtoms; ++i)
+-          coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
+-        m_moleculeFile->m_conformers.push_back(coords);
+-      }
+-
+-      void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
+-      {
+-        if (!c) {
+-          // this is the first molecule read
+-          m_moleculeFile->setConformerFile(true);
+-          addConformer(current);
+-          return;
+-        }
+-
+-        if (!m_moleculeFile->isConformerFile())
+-          return;
+-
+-        // as long as we are not sure if this really is a 
+-        // conformer/trajectory file, add the conformers
+-        addConformer(current);
+-
+-        // performance: check only certain molecule 1-10,20,50
+-        switch (c) {
+-          case 1:
+-          case 2:
+-          case 3:
+-          case 4:
+-          case 5:
+-          case 6:
+-          case 7:
+-          case 8:
+-          case 9:
+-          case 10:
+-          case 20:
+-          case 50:
+-            break;
+-          default:
+-            return;
+-        }
+-
+-        if (first.NumAtoms() != current.NumAtoms()) {
+-          m_moleculeFile->setConformerFile(false);
+-          m_moleculeFile->m_conformers.clear();
+-          return;
+-        }
+-
+-        for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
+-          OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
+-          OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
+-          if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
+-            m_moleculeFile->setConformerFile(false);
+-            m_moleculeFile->m_conformers.clear();
+-            return;
+-          }    
+-        }
+-      }
+-
+-      void run()
+-      {
+-        // Check that the file can be read from disk
+-        if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
+-          // Cannot read the file
+-          m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
+-                                         .arg(m_moleculeFile->m_fileName));
+-          return;
+-        }
+- 
+-        // Construct the OpenBabel objects, set the file type
+-        OpenBabel::OBConversion conv;
+-        OpenBabel::OBFormat *inFormat;
+-        if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
+-          // Input format not supported
+-          m_moleculeFile->m_error.append(
+-              QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
+-          return;
+-        } else {
+-          inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
+-          if (!inFormat || !conv.SetInFormat(inFormat)) {
+-            // Input format not supported
+-            m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
+-                                           .arg(m_moleculeFile->m_fileName));
+-            return;
+-          }
+-        }
+-
+-        // set any options
+-        if (!m_moleculeFile->m_fileOptions.isEmpty()) {
+-          foreach(const QString &option,
+-              m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
+-            conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
+-          }
+-        }
+-
+-        // Now attempt to read the molecule in
+-        ifstream ifs;
+-        ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
+-        if (!ifs) // Should not happen, already checked file could be opened
+-          return;
+-      
+-        // read all molecules
+-        OpenBabel::OBMol firstOBMol, currentOBMol;
+-        unsigned int c = 0;
+-        conv.SetInStream(&ifs);
+-        m_moleculeFile->streamposRef().push_back(ifs.tellg());
+-        while (ifs.good() && conv.Read(&currentOBMol)) {
+-          if (!c)
+-            firstOBMol = currentOBMol;
+-
+-          if (c > 20 && !m_moleculeFile->isConformerFile())
+-            m_moleculeFile->setFirstReady(true);
+-
+-          // detect conformer/trajectory files
+-          detectConformers(c, firstOBMol, currentOBMol);
+-          // store information about molecule
+-          m_moleculeFile->streamposRef().push_back(ifs.tellg());
+-          m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
+-          // increment count
+-          ++c;
+-        }
+-        m_moleculeFile->streamposRef().pop_back();
+-
+-        // signle molecule files are not conformer files
+-        if (c == 1) {
+-          m_moleculeFile->setConformerFile(false);
+-          m_moleculeFile->m_conformers.clear();
+-        }
+-
+-        // check for empty titles
+-        for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
+-          if (!m_moleculeFile->titlesRef()[i].isEmpty())
+-            continue;
+-
+-          QString title;
+-          if (m_moleculeFile->isConformerFile())
+-            title = tr("Conformer %1").arg(i+1);
+-          else
+-            title = tr("Molecule %1").arg(i+1);
+-        
+-          m_moleculeFile->titlesRef()[i] = title;
+-        }
+-      }
+-
+-      MoleculeFile *m_moleculeFile;
+-  }; // end ReadFileThread class
+-
+   MoleculeFile* MoleculeFile::readFile(const QString &fileName,
+       const QString &fileType, const QString &fileOptions, bool wait)
+   {
+@@ -794,6 +627,3 @@
+   }
+ 
+ } // end namespace Avogadro
+-
+-#include "moleculefile.moc"
+-
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h
+--- avogadro-1.0.3/libavogadro/src/moleculefile_p.h	1970-01-01 01:00:00.000000000 +0100
++++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h	2011-11-29 18:57:43.108273764 +0100
+@@ -0,0 +1,202 @@
++/**********************************************************************
++  MoleculeFile - Class representing molecule file.
++
++  Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch
++
++  This file is part of the Avogadro molecular editor project.
++  For more information, see <http://avogadro.openmolecules.net/>
++
++  Avogadro is free software; you can redistribute it and/or modify
++  it under the terms of the GNU General Public License as published by
++  the Free Software Foundation; either version 2 of the License, or
++  (at your option) any later version.
++
++  Avogadro is distributed in the hope that it will be useful,
++  but WITHOUT ANY WARRANTY; without even the implied warranty of
++  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++  GNU General Public License for more details.
++
++  You should have received a copy of the GNU General Public License
++  along with this program; if not, write to the Free Software
++  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++  02110-1301, USA.
++ **********************************************************************/
++
++#ifndef MOLECULEFILE_P_H
++#define MOLECULEFILE_P_H
++
++#include "moleculefile.h"
++
++#include <openbabel/mol.h>
++#include <openbabel/obconversion.h>
++
++#include <QFile>
++#include <QStringList>
++#include <QThread>
++
++namespace Avogadro {
++
++  using OpenBabel::OBConversion;
++  using std::ifstream;
++
++class ReadFileThread : public QThread
++{
++      Q_OBJECT
++
++  public:
++    ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
++    {
++    }
++
++    void addConformer(const OpenBabel::OBMol &conformer)
++    {
++      unsigned int numAtoms = conformer.NumAtoms();
++      std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
++      for (unsigned int i = 0; i < numAtoms; ++i)
++        coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
++      m_moleculeFile->m_conformers.push_back(coords);
++    }
++
++    void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
++    {
++      if (!c) {
++        // this is the first molecule read
++        m_moleculeFile->setConformerFile(true);
++        addConformer(current);
++        return;
++      }
++
++      if (!m_moleculeFile->isConformerFile())
++        return;
++
++      // as long as we are not sure if this really is a
++      // conformer/trajectory file, add the conformers
++      addConformer(current);
++
++      // performance: check only certain molecule 1-10,20,50
++      switch (c) {
++        case 1:
++        case 2:
++        case 3:
++        case 4:
++        case 5:
++        case 6:
++        case 7:
++        case 8:
++        case 9:
++        case 10:
++        case 20:
++        case 50:
++          break;
++        default:
++          return;
++      }
++
++      if (first.NumAtoms() != current.NumAtoms()) {
++        m_moleculeFile->setConformerFile(false);
++        m_moleculeFile->m_conformers.clear();
++        return;
++      }
++
++      for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
++        OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
++        OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
++        if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
++          m_moleculeFile->setConformerFile(false);
++          m_moleculeFile->m_conformers.clear();
++          return;
++        }
++      }
++    }
++
++    void run()
++    {
++      // Check that the file can be read from disk
++      if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
++        // Cannot read the file
++        m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
++                                       .arg(m_moleculeFile->m_fileName));
++        return;
++      }
++
++      // Construct the OpenBabel objects, set the file type
++      OpenBabel::OBConversion conv;
++      OpenBabel::OBFormat *inFormat;
++      if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
++        // Input format not supported
++        m_moleculeFile->m_error.append(
++            QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
++        return;
++      } else {
++        inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
++        if (!inFormat || !conv.SetInFormat(inFormat)) {
++          // Input format not supported
++          m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
++                                         .arg(m_moleculeFile->m_fileName));
++          return;
++        }
++      }
++
++      // set any options
++      if (!m_moleculeFile->m_fileOptions.isEmpty()) {
++        foreach(const QString &option,
++            m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
++          conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
++        }
++      }
++
++      // Now attempt to read the molecule in
++      ifstream ifs;
++      ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
++      if (!ifs) // Should not happen, already checked file could be opened
++        return;
++
++      // read all molecules
++      OpenBabel::OBMol firstOBMol, currentOBMol;
++      unsigned int c = 0;
++      conv.SetInStream(&ifs);
++      m_moleculeFile->streamposRef().push_back(ifs.tellg());
++      while (ifs.good() && conv.Read(&currentOBMol)) {
++        if (!c)
++          firstOBMol = currentOBMol;
++
++        if (c > 20 && !m_moleculeFile->isConformerFile())
++          m_moleculeFile->setFirstReady(true);
++
++        // detect conformer/trajectory files
++        detectConformers(c, firstOBMol, currentOBMol);
++        // store information about molecule
++        m_moleculeFile->streamposRef().push_back(ifs.tellg());
++        m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
++        // increment count
++        ++c;
++      }
++      m_moleculeFile->streamposRef().pop_back();
++
++      // signle molecule files are not conformer files
++      if (c == 1) {
++        m_moleculeFile->setConformerFile(false);
++        m_moleculeFile->m_conformers.clear();
++      }
++
++      // check for empty titles
++      for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
++        if (!m_moleculeFile->titlesRef()[i].isEmpty())
++          continue;
++
++        QString title;
++        if (m_moleculeFile->isConformerFile())
++          title = tr("Conformer %1").arg(i+1);
++        else
++          title = tr("Molecule %1").arg(i+1);
++
++        m_moleculeFile->titlesRef()[i] = title;
++      }
++    }
++
++    MoleculeFile *m_moleculeFile;
++};
++
++} // end namespace Avogadro
++
++#endif // MOLECULEFILE_P_H
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp
+--- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp	2011-11-29 18:52:50.259860261 +0100
+@@ -213,5 +213,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "periodictablescene_p.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp
+--- avogadro-1.0.3/libavogadro/src/periodictableview.cpp     2011-11-29 19:30:25.130970122 +0000
++++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp        2011-11-29 18:52:50.259860261 +0100
+@@ -69,4 +69,3 @@
+ 
+ } // End namespace Avogadro
+ 
+-#include "periodictableview.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp
+--- avogadro-1.0.3/libavogadro/src/plotwidget.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp	2011-11-29 18:53:09.389756626 +0100
+@@ -27,7 +27,6 @@
+  **********************************************************************/
+ 
+ #include "plotwidget.h"
+-#include "plotwidget.moc"
+ 
+ #include <math.h>
+ #include <QDebug>
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp
+--- avogadro-1.0.3/libavogadro/src/plugin.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp	2011-11-29 18:53:16.016387394 +0100
+@@ -65,5 +65,3 @@
+   }
+ 
+ } // end namespace Avogadro
+-
+-#include "plugin.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp
+--- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp	2011-11-29 18:53:23.569679807 +0100
+@@ -784,5 +784,3 @@
+   }
+ 
+ }
+-
+-#include "pluginmanager.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp
+--- avogadro-1.0.3/libavogadro/src/primitive.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp	2011-11-29 18:53:29.139649631 +0100
+@@ -77,5 +77,3 @@
+   }
+ 
+ }
+-
+-#include "primitive.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp
+--- avogadro-1.0.3/libavogadro/src/protein.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp	2011-11-29 18:53:37.952935219 +0100
+@@ -978,5 +978,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "protein.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt
+--- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:58:02.354836165 +0100
+@@ -11,9 +11,9 @@
+ # use all cpp files in this directory
+ FILE(GLOB wrapper_SRCS "*.cpp")
+ 
+-qt4_automoc(moleculelist.cpp)
++QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
+ 
+-ADD_LIBRARY(python-module MODULE ${wrapper_SRCS})
++ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
+ SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
+ SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "")
+ if (WIN32)
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp
+--- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp     2011-11-29 19:26:07.562214311 +0100
++++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp      2011-11-29 19:26:14.538843182 +0100
+@@ -70,4 +70,3 @@
+ 
+ }
+ 
+-#include "moleculelist.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp
+--- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp	2011-11-29 18:53:45.492894371 +0100
+@@ -289,5 +289,3 @@
+ 
+ 
+ }
+-
+-#include "pythonengine_p.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp
+--- avogadro-1.0.3/libavogadro/src/pythonerror.cpp     2011-11-29 19:24:26.949426045 +0100
++++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp      2011-11-29 19:24:41.176015640 +0100
+@@ -112,4 +112,3 @@
+ 
+ } // namespace
+ 
+-#include "pythonerror.moc"
+
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp
+--- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp	2011-11-29 18:53:54.082847836 +0100
+@@ -340,5 +340,3 @@
+   }
+ 
+ }
+-
+-#include "pythonextension_p.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp
+--- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp	2011-11-29 18:54:02.269470152 +0100
+@@ -344,5 +344,3 @@
+   }
+ 
+ }
+-
+-#include "pythontool_p.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp
+--- avogadro-1.0.3/libavogadro/src/residue.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp	2011-11-29 18:54:14.316071557 +0100
+@@ -160,6 +160,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+- #include "residue.moc"
+-
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp
+--- avogadro-1.0.3/libavogadro/src/tool.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp	2011-11-29 18:55:05.515794184 +0100
+@@ -117,5 +117,3 @@
+   }
+ 
+ } // end namespace Avogadro
+-
+-#include "tool.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp
+--- avogadro-1.0.3/libavogadro/src/toolgroup.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp	2011-11-29 18:55:11.699094018 +0100
+@@ -206,5 +206,3 @@
+   }
+ 
+ } // end namespace Avogadro
+-
+-#include "toolgroup.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp
+--- avogadro-1.0.3/libavogadro/src/zmatrix.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp	2011-11-29 18:55:17.209064168 +0100
+@@ -149,5 +149,3 @@
+ 
+ 
+ } // End namespace Avogadro
+-
+-#include "zmatrix.moc"
diff --git a/testing/boost/PKGBUILD b/testing/boost/PKGBUILD
new file mode 100644
index 000000000..f771f698b
--- /dev/null
+++ b/testing/boost/PKGBUILD
@@ -0,0 +1,118 @@
+# $Id: PKGBUILD 151805 2012-03-03 08:08:44Z ibiru $
+# Maintainer: kevin <kevin@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Kritoke <kritoke@gamebox.net>
+# Contributor: Luca Roccia <little_rock@users.sourceforge.net>
+
+pkgbase=boost
+pkgname=('boost-libs' 'boost')
+pkgver=1.49.0
+_boostver=${pkgver//./_}
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.boost.org/"
+makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
+source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
+        exceptions.patch)
+license=('custom')
+md5sums=('e0defc8c818e4f1c5bbb29d0292b76ca'
+         '9b44c28b36303152050c8c82469569c5')
+
+_stagedir="${srcdir}/stagedir"
+
+build() {
+  # set python path for bjam
+  cd "${srcdir}/${pkgbase}_${_boostver}/tools"
+  echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
+  echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
+  echo "using mpi ;" >> build/v2/user-config.jam
+
+  cd "${srcdir}"/${pkgbase}_${_boostver}
+  # https://svn.boost.org/trac/boost/ticket/5731
+  patch -p0 -i "${srcdir}/exceptions.patch"
+
+
+  # build bjam
+  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
+  ./build.sh cc
+
+  _bindir="bin.linuxx86"
+  [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
+
+  install -d "${_stagedir}"/usr/bin
+  install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
+
+  # build tools
+  cd "${srcdir}/${pkgbase}_${_boostver}/tools/"
+  "${_stagedir}"/usr/bin/bjam --toolset=gcc
+
+  # copy the tools
+  cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin"
+  for i in *;do
+      install -m755 "${i}" "${_stagedir}/usr/bin/${i}"
+  done
+
+  #boostbook needed by quickbook
+  cd "${srcdir}/${pkgbase}_${_boostver}/dist/"
+  cp -r share "${_stagedir}"
+
+  # build libs
+  cd "${srcdir}/${pkgbase}_${_boostver}"
+
+  # default "minimal" install: "release link=shared,static
+  # runtime-link=shared threading=single,multi"
+  # --layout=tagged will add the "-mt" suffix for multithreaded libraries
+  # and installs includes in /usr/include/boost.
+  # --layout=system no longer adds the -mt suffix for multi-threaded libs.
+  # install to ${_stagedir} in preparation for split packaging
+
+  "${_stagedir}"/usr/bin/bjam \
+      release debug-symbols=off threading=multi \
+      runtime-link=shared link=shared,static \
+      cflags=-fno-strict-aliasing \
+      toolset=gcc \
+      --prefix="${_stagedir}" \
+      -sTOOLS=gcc \
+      --layout=system \
+      ${MAKEFLAGS} \
+      install
+}
+
+package_boost() {
+    pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
+    depends=("boost-libs=${pkgver}")
+    optdepends=('python: for python bindings'
+                'python2: for python2 bindings'
+		'boost-build: to use boost jam for building your project.')
+
+    install -d "${pkgdir}"/usr/{include,lib,share}
+    # headers/source files
+    cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
+
+    # static libs
+    cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/
+
+    # utilities (bjam, bcp, pyste)
+    cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
+
+    #boostbook
+    cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share
+
+    # license
+    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
+        "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
+}
+
+package_boost-libs() {
+    pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
+    depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
+    optdepends=('openmpi: for mpi support')
+
+    install -d "${pkgdir}/usr/lib"
+    #shared libs
+    cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
+
+    # license
+    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
+        "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
+}
diff --git a/testing/boost/exceptions.patch b/testing/boost/exceptions.patch
new file mode 100644
index 000000000..9faa71526
--- /dev/null
+++ b/testing/boost/exceptions.patch
@@ -0,0 +1,25 @@
+diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp
+--- boost/numeric/conversion/converter_policies.hpp~	2008-10-13 11:00:03.000000000 +0200
++++ boost/numeric/conversion/converter_policies.hpp	2011-07-22 11:46:40.961876274 +0200
+@@ -20,6 +20,7 @@
+ 
+ #include "boost/mpl/if.hpp"
+ #include "boost/mpl/integral_c.hpp"
++#include "boost/throw_exception.hpp"
+ 
+ namespace boost { namespace numeric
+ {
+@@ -159,9 +160,9 @@ struct def_overflow_handler
+   void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow)
+   {
+     if ( r == cNegOverflow )
+-      throw negative_overflow() ;
++      boost::throw_exception( negative_overflow() ) ;
+     else if ( r == cPosOverflow )
+-           throw positive_overflow() ;
++      boost::throw_exception( positive_overflow() ) ;
+   }
+ } ;
+ 
+
+Diff finished.  Fri Jul 22 11:46:49 2011
diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD
new file mode 100644
index 000000000..0dc6893fa
--- /dev/null
+++ b/testing/dnsutils/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id: PKGBUILD 151909 2012-03-03 22:30:05Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: kevin <kevin@archlinux.org>
+# Contributor: mario <mario_vazq@hotmail.com>
+
+pkgname=dnsutils
+
+# Use a period and not a hyphen before the patch level for proper versioning.
+pkgver=9.9.0
+_pkgver=9.9.0
+pkgrel=1
+
+pkgdesc='DNS utilities: dig host nslookup'
+url='http://www.isc.org/software/bind/'
+license=('custom:ISC')
+arch=('i686' 'x86_64')
+options=('!makeflags')
+depends=('openssl' 'krb5' 'idnkit')
+source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
+        'remove-bind.patch'
+        'trusted-key.key')
+sha1sums=('6be77c75c8649088b0ae7124d819b5f412bb0094'
+          'b465ef6160b004838f04de9978fe1be8422af777'
+          'ca93da30c89de4365b846325d6ec4674a3e4fc02')
+
+replaces=('bind-tools' 'host')
+
+build() {
+	cd "${srcdir}/bind-${_pkgver}"
+
+	patch -p1 -i ../remove-bind.patch
+	export STD_CDEFINES='-DDIG_SIGCHASE'
+
+	# hack to remove unused bloat from the binaries
+	CFLAGS+=' -fdata-sections -ffunction-sections'
+	LDFLAGS+=' -Wl,--gc-sections'
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-linux-caps \
+		--with-openssl \
+		--with-idn \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/bind-${_pkgver}"
+	install -Dm644 ../trusted-key.key "${pkgdir}"/etc/trusted-key.key
+	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	cd bin; make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/dnsutils/remove-bind.patch b/testing/dnsutils/remove-bind.patch
new file mode 100644
index 000000000..19d650964
--- /dev/null
+++ b/testing/dnsutils/remove-bind.patch
@@ -0,0 +1,25 @@
+diff -aur old/bin/Makefile.in new/bin/Makefile.in
+--- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
++++ new/bin/Makefile.in	2011-08-28 19:16:17.245495043 -0700
+@@ -19,8 +19,7 @@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
+-		check confgen @PKCS11_TOOLS@
++SUBDIRS =	dig
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
+diff -aur old/lib/Makefile.in new/lib/Makefile.in
+--- old/lib/Makefile.in	2007-06-19 16:47:13.000000000 -0700
++++ new/lib/Makefile.in	2011-08-28 19:17:50.828688599 -0700
+@@ -23,7 +23,7 @@
+ # Attempt to disable parallel processing.
+ .NOTPARALLEL:
+ .NO_PARALLEL:
+-SUBDIRS =	isc isccc dns isccfg bind9 lwres tests
++SUBDIRS =	isc dns isccfg bind9 lwres
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
diff --git a/testing/dnsutils/trusted-key.key b/testing/dnsutils/trusted-key.key
new file mode 100644
index 000000000..866cadda2
--- /dev/null
+++ b/testing/dnsutils/trusted-key.key
@@ -0,0 +1,2 @@
+.			172800	IN	DNSKEY	256 3 8 AwEAAZ/NErKzyMlImJ+2HTmK9qeH2sLUywlsF+mJbTP5GKoYFHoU2vn2 Zqr261Lk7a6jfBKYny5GX7BDRJcVvig36TgOinE9QP5KVS0RxdrOl98g KLwFMORfNf/wjCwjPdEl1GgaGYl0npJ4c+x+o6aa/xmDKJo9zUlpvb7B LxbJ7HwF
+.			172800	IN	DNSKEY	257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq QxA+Uk1ihz0=
diff --git a/testing/ekiga/PKGBUILD b/testing/ekiga/PKGBUILD
new file mode 100644
index 000000000..062c0b673
--- /dev/null
+++ b/testing/ekiga/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 151807 2012-03-03 08:08:47Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Tom K <tomk@runbox.com>
+
+pkgname=ekiga
+pkgver=3.3.2
+pkgrel=3
+pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
+url="http://www.ekiga.org"
+license=(GPL)
+arch=(i686 x86_64)
+depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
+makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
+optdepends=('evolution-data-server: Evolution integration')
+options=(!emptydirs)
+groups=('gnome-extra')
+install=ekiga.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-schemas-install \
+      --disable-scrollkeeper --enable-dbus
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
+
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+}
diff --git a/testing/ekiga/ekiga.install b/testing/ekiga/ekiga.install
new file mode 100644
index 000000000..b1d76a4a3
--- /dev/null
+++ b/testing/ekiga/ekiga.install
@@ -0,0 +1,22 @@
+pkgname=ekiga
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/testing/hugin/PKGBUILD b/testing/hugin/PKGBUILD
new file mode 100644
index 000000000..d5f04fc5c
--- /dev/null
+++ b/testing/hugin/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 151809 2012-03-03 08:08:49Z ibiru $
+# Maintainer: Tobias Kieslich <tobias@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Dominik Ryba <domryba@post.pl>
+
+pkgname=hugin
+pkgver=2011.4.0
+pkgrel=2
+pkgdesc="A frontend to the panorama-tools"
+arch=('i686' 'x86_64')
+url="http://hugin.sourceforge.net/"
+license=('GPL')
+depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
+         'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool')
+makedepends=('zip' 'cmake' 'boost' 'tclap')
+install=hugin.install
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake "${srcdir}/${pkgname}-${pkgver}" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
+    -DENABLE_LAPACK=yes
+  make
+}
+
+package(){
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/hugin/hugin.install b/testing/hugin/hugin.install
new file mode 100644
index 000000000..362749233
--- /dev/null
+++ b/testing/hugin/hugin.install
@@ -0,0 +1,15 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+  update-desktop-database -q
+  update-mime-database usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+  update-desktop-database -q
+  update-mime-database usr/share/mime > /dev/null
+}
diff --git a/testing/kdeedu-kig/PKGBUILD b/testing/kdeedu-kig/PKGBUILD
new file mode 100644
index 000000000..94d5aa3d2
--- /dev/null
+++ b/testing/kdeedu-kig/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 151811 2012-03-03 08:08:52Z ibiru $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kig
+pkgver=4.8.0
+pkgrel=2
+pkgdesc="Interactive Geometry"
+url="http://kde.org/applications/education/kig/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2")
+sha1sums=('141a4c9230ab134dcf7016c2880357d9e52b8f69')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kig-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+
+  # Use the python2 executable
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py
+}
diff --git a/testing/kdeedu-kig/kdeedu-kig.install b/testing/kdeedu-kig/kdeedu-kig.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/testing/kdeedu-kig/kdeedu-kig.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/testing/kdeedu-rocs/PKGBUILD b/testing/kdeedu-rocs/PKGBUILD
new file mode 100644
index 000000000..6d1b2e357
--- /dev/null
+++ b/testing/kdeedu-rocs/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 151813 2012-03-03 08:08:55Z ibiru $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-rocs
+pkgver=4.8.0
+pkgrel=2
+pkgdesc="Rocs Graph Theory"
+url="http://kde.org/applications/education/rocs/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'boost-libs')
+makedepends=('cmake' 'automoc4' 'boost')
+source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2")
+sha1sums=('d29daa9633e2ba6e2d3e0c7155ade752216a8969')
+options=('!makeflags')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../rocs-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD
new file mode 100644
index 000000000..f407bcc07
--- /dev/null
+++ b/testing/kmod/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 151797 2012-03-03 05:10:17Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+
+pkgname=kmod
+pkgver=6
+pkgrel=1
+pkgdesc="Linux kernel module handling"
+arch=('i686' 'x86_64')
+url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
+license=('GPL2')
+depends=('glibc' 'zlib')
+options=('!libtool')
+provides=('module-init-tools=3.16')
+conflicts=('module-init-tools')
+replaces=('module-init-tools')
+source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
+        "depmod-search.conf")
+md5sums=('bad08102fad212cd34405136d9a7eb94'
+         '4b8cbcbc54b9029c99fd730e257d4436')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+    --sysconfdir=/etc \
+    --with-zlib
+
+  make
+}
+
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
+package() {
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+  # extra directories
+  install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d "$pkgdir/sbin"
+
+  # add symlinks to kmod
+  ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe"
+  ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod"
+
+  for tool in {ins,ls,rm}mod modinfo; do
+    ln -s kmod "$pkgdir/usr/bin/$tool"
+  done
+
+  # install depmod.d file for search/ dir
+  install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/lib/depmod.d/search.conf"
+}
+
+# vim: ft=sh syn=sh et
diff --git a/testing/kmod/depmod-search.conf b/testing/kmod/depmod-search.conf
new file mode 100644
index 000000000..3feb67b05
--- /dev/null
+++ b/testing/kmod/depmod-search.conf
@@ -0,0 +1,5 @@
+#
+# /etc/depmod.d/depmod.conf
+#
+
+search updates extramodules built-in
diff --git a/testing/liborigin2/PKGBUILD b/testing/liborigin2/PKGBUILD
new file mode 100644
index 000000000..1e4edb312
--- /dev/null
+++ b/testing/liborigin2/PKGBUILD
@@ -0,0 +1,57 @@
+# $Id: PKGBUILD 151815 2012-03-03 08:08:57Z ibiru $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: damir <damir@archlinux.org>
+
+pkgbase=liborigin2
+pkgname=('liborigin2' 'liborigin2-docs')
+pkgver=20110829
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://soft.proindependent.com/liborigin2/"
+license=('GPL3')
+makedepends=('doxygen' 'qt' 'boost')
+replaces=('liborigin')
+provides=('liborigin')
+source=(http://download.berlios.de/qtiplot/${pkgbase}-20110829.zip
+	liborigin.pro.archlinux
+	http://tree.phi-sci.com/tree.hh)
+sha1sums=('13851b17b21ec49375e4f5dfbd3ab4b9bf72f5be'
+          '9bb73eccc031b3a9e7c061b8cdbaf3e20aa2669d'
+          '2fd9ff17ff6b6f34b20fc473c82bf17ac1922e86')
+
+build() {
+	cd "${srcdir}/${pkgbase}"
+
+	install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin2.pro
+        install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases
+	qmake liborigin2.pro QMAKESPEC=linux-g++
+  	make QTDIR=/usr/ QMAKESPEC=linux-g++
+
+	 # create documentation
+        cd doc
+        doxygen
+}
+
+package_liborigin2() {
+        pkgdesc="A library for reading OriginLab OPJ project files"
+        depends=('boost-libs')
+
+        cd "${srcdir}/${pkgbase}"
+
+  	INSTALL_ROOT="${pkgdir}" make install
+
+        # install missing includes
+        install -Dm644 tree.hh "${pkgdir}/usr/include/liborigin2/tree.hh"
+        for i in *.h; do
+          install -Dm644 ${i} "${pkgdir}/usr/include/liborigin2/${i}"
+        done
+}
+package_liborigin2-docs() {
+        pkgdesc="Documentation for liborigin2: a library for reading OriginLab OPJ project files"
+
+        cd "${srcdir}/${pkgbase}/doc"
+	install -d "${pkgdir}/usr/share/doc/${pkgbase}"
+	cp -rf html/* "${pkgdir}/usr/share/doc/${pkgbase}"
+	chmod 755 "${pkgdir}/usr/share/doc/liborigin2/images"
+	chmod 644 "${pkgdir}/usr/share/doc/liborigin2/images/origin_import.png"
+}
diff --git a/testing/liborigin2/liborigin.pro.archlinux b/testing/liborigin2/liborigin.pro.archlinux
new file mode 100644
index 000000000..f0eef7293
--- /dev/null
+++ b/testing/liborigin2/liborigin.pro.archlinux
@@ -0,0 +1,20 @@
+TARGET           = origin2
+TEMPLATE     = lib
+CONFIG      += warn_on release thread
+#CONFIG      += staticlib
+MOC_DIR      = ./tmp
+OBJECTS_DIR  = ./tmp
+
+DESTDIR      = ./
+
+#INCLUDEPATH += boost_1_33_0
+LIBS        += -lboost_date_time
+LIBS        += -lboost_thread
+
+headers.files = \$\$HEADERS
+headers.path = /usr/include/liborigin2
+target.path = /usr/lib
+INSTALLS = target headers
+
+include(liborigin2.pri)
+
diff --git a/testing/libpst/PKGBUILD b/testing/libpst/PKGBUILD
new file mode 100644
index 000000000..df08f1f9c
--- /dev/null
+++ b/testing/libpst/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 151817 2012-03-03 08:09:00Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=libpst
+pkgname=('libpst' 'libpst-docs')
+pkgver=0.6.54
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.five-ten-sg.com/libpst/"
+license=('GPL')
+makedepends=('python2' 'boost')
+source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
+sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+      --disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2
+  make
+}
+
+package_libpst() {
+  pkgdesc="Outlook .pst file converter"
+  depends=('gcc-libs')
+  optdepends=('boost-libs: for libpst python interface')
+  options=('!libtool' '!docs')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
+package_libpst-docs() {
+  pkgdesc="Documentation for Outlook .pst file converter"
+  options=('!libtool')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install-htmlDATA
+  cd "${srcdir}/${pkgbase}-${pkgver}/html"
+  make DESTDIR="${pkgdir}" install-htmldevelDATA
+}
diff --git a/testing/libtorrent-rasterbar/PKGBUILD b/testing/libtorrent-rasterbar/PKGBUILD
new file mode 100644
index 000000000..945acefaa
--- /dev/null
+++ b/testing/libtorrent-rasterbar/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 151819 2012-03-03 08:09:02Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+
+pkgname=libtorrent-rasterbar
+pkgver=0.15.10
+pkgrel=1
+pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
+url="http://www.rasterbar.com/products/libtorrent/"
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('boost-libs' 'geoip' 'python2')
+makedepends=('boost')
+options=('!libtool' '!emptydirs')
+source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
+sha1sums=('3e461d9ede5fab3fb59be6a9f0cbc52121d536c4')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  export CFLAGS+=" -fvisibility=hidden"
+  export CXXFLAGS+=" -fvisibility=hidden"
+  ./configure --prefix=/usr \
+      --enable-python-binding \
+      --with-libgeoip=system
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/testing/licq/PKGBUILD b/testing/licq/PKGBUILD
new file mode 100644
index 000000000..d75786518
--- /dev/null
+++ b/testing/licq/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 151866 2012-03-03 15:34:37Z giovanni $
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+
+pkgname=licq
+pkgver=1.6.0
+pkgrel=4
+pkgdesc="Advanced graphical ICQ clone and more for Unix" 
+arch=('i686' 'x86_64')
+url="http://www.licq.org"
+license=('GPL')
+depends=('boost-libs' 'gpgme' 'libxss' 'qt')
+makedepends=('cmake' 'boost')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
+md5sums=('383153697e281a0b1b4ff008936731b8')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # licq
+  mkdir build
+  cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr  ..
+  make
+
+  # qt4-gui
+  cd ../plugins/qt4-gui
+  mkdir build
+  cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake"  ..
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/build"
+  make DESTDIR="${pkgdir}" install
+
+  cd ../plugins/qt4-gui/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/lyx/PKGBUILD b/testing/lyx/PKGBUILD
new file mode 100644
index 000000000..618a89fc7
--- /dev/null
+++ b/testing/lyx/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 151823 2012-03-03 08:09:08Z ibiru $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Jason Chu <jason@archlinux.org>
+
+pkgname=lyx
+pkgver=2.0.3
+pkgrel=2
+pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
+arch=('i686' 'x86_64')
+url="http://www.lyx.org"
+depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
+makedepends=('boost')
+optdepends=('rcs: built-in version control system'
+            'texlive-latexextra: float wrap support')
+license=('GPL')
+source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
+        lyx.desktop lyxrc.dist)
+backup=('etc/lyx/lyxrc.dist')
+install=lyx.install
+options=('emptydirs')
+sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f'
+          'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
+          '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} +
+  sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp
+  export CXXFLAGS="$CXXFLAGS -fpermissive"
+  ./configure --prefix=/usr \
+    --with-frontend=qt4 --without-included-boost \
+    --without-included-mythes
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # install desktop entry
+  install -Dm644 "${srcdir}/lyx.desktop" \
+    "${pkgdir}/usr/share/applications/lyx.desktop"
+  install -Dm644 "lib/images/lyx.png" \
+    "${pkgdir}/usr/share/pixmaps/lyx.png"
+
+  # install default config file
+  install -Dm644 "${srcdir}/lyxrc.dist" "${pkgdir}/etc/lyx/lyxrc.dist"
+  ln -sf /etc/lyx/lyxrc.dist "${pkgdir}/usr/share/lyx/lyxrc.dist"
+}
diff --git a/testing/lyx/lyx.desktop b/testing/lyx/lyx.desktop
new file mode 100644
index 000000000..649b30c98
--- /dev/null
+++ b/testing/lyx/lyx.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=LyX Document Processor
+GenericName=Document Processor
+Comment=High level LaTeX frontend
+Exec=lyx %F
+TryExec=lyx
+Icon=lyx
+StartupNotify=false
+StartupWMClass=Lyx
+Terminal=false
+Categories=Office;WordProcessor;Qt;
+MimeType=text/x-lyx;application/x-lyx;
diff --git a/testing/lyx/lyx.install b/testing/lyx/lyx.install
new file mode 100644
index 000000000..c15c17b3a
--- /dev/null
+++ b/testing/lyx/lyx.install
@@ -0,0 +1,14 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove () {
+  post_install
+}
+
+
+
diff --git a/testing/lyx/lyxrc.dist b/testing/lyx/lyxrc.dist
new file mode 100644
index 000000000..dd18694f9
--- /dev/null
+++ b/testing/lyx/lyxrc.dist
@@ -0,0 +1,14 @@
+### This file is part of
+### ========================================================
+###          LyX, The Document Processor
+###
+###          Copyright 1995 Matthias Ettrich
+###          Copyright 1995-2011 The LyX Team.
+###
+### ========================================================
+
+# The file lyxrc.dist gives initial global options for all LyX users.
+# Almost all settings here can be overridden through the preferences in LyX.
+
+\thesaurusdir_path "/usr/share/mythes"
+\hunspelldir_path "/usr/share/myspell"
diff --git a/testing/mkvtoolnix/PKGBUILD b/testing/mkvtoolnix/PKGBUILD
new file mode 100644
index 000000000..4e0998e89
--- /dev/null
+++ b/testing/mkvtoolnix/PKGBUILD
@@ -0,0 +1,84 @@
+# $Id: PKGBUILD 151825 2012-03-03 08:09:10Z ibiru $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: xduugu <xduugu@gmx.com>
+
+pkgbase=mkvtoolnix
+pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
+pkgver=5.3.0
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
+makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
+             'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
+source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
+md5sums=('2cd84ff24e1d9217dd3caf170f34e758')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  # Disable automagic curl dep used for online update checking
+  sed -i -e '/curl/d' configure.in
+  export CURL_CFLAGS="" CURL_LIBS=""
+
+  export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
+  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
+
+  autoreconf
+
+  ./configure --prefix=/usr \
+              --with-boost-libdir=/usr/lib \
+              --disable-gui
+  rake
+
+  mv src/mkvinfo{,-cli}
+
+  ./configure --prefix=/usr \
+              --with-boost-libdir=/usr/lib
+  rake
+}
+
+package_mkvtoolnix-cli() {
+  pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
+  depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2')
+  provides=('mkvtoolnix')
+  conflicts=('mkvtoolnix')
+  replaces=('mkvtoolnix')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  rake DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/bin/mkvinfo
+  install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
+
+  rm -rf "${pkgdir}"/usr/bin/mmg
+  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1
+  rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
+  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
+  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
+  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
+  rm -rf "${pkgdir}"/usr/share/applications
+  rm -rf "${pkgdir}"/usr/share/icons
+  rm -rf "${pkgdir}"/usr/share/mime
+}
+
+package_mkvtoolnix-gtk() {
+  pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
+  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils')
+  install=mkvtoolnix.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  rake DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/bin/mkv*
+  install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk
+  sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop
+
+  rm -rf "${pkgdir}"/usr/share/doc
+  rm -rf "${pkgdir}"/usr/share/locale
+  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv*
+  rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
+  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
+  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
+  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
+}
diff --git a/testing/mkvtoolnix/mkvtoolnix.install b/testing/mkvtoolnix/mkvtoolnix.install
new file mode 100644
index 000000000..74d9eb2ef
--- /dev/null
+++ b/testing/mkvtoolnix/mkvtoolnix.install
@@ -0,0 +1,14 @@
+post_install() {
+   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+   if [ -f usr/bin/update-mime-database ]; then
+      update-mime-database usr/share/mime &> /dev/null
+   fi
+}
+
+post_upgrade() {
+   post_install
+}
+
+pre_remove() {
+   post_install
+}
diff --git a/testing/mlocate/PKGBUILD b/testing/mlocate/PKGBUILD
new file mode 100644
index 000000000..ecc508bc3
--- /dev/null
+++ b/testing/mlocate/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 151799 2012-03-03 05:54:38Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: lydgate
+
+pkgname=mlocate
+pkgver=0.25
+pkgrel=1
+pkgdesc="Faster merging drop-in for slocate"
+arch=('i686' 'x86_64')
+url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate"
+license=('GPL')
+conflicts=('slocate')
+provides=('slocate')
+replaces=('slocate')
+depends=('glibc' 'coreutils' 'sh')
+backup=('etc/updatedb.conf'
+        'etc/cron.daily/updatedb')
+install=mlocate.install
+source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz
+	updatedb.conf
+	updatedb.cron.daily)
+md5sums=('c6d043b170613b0e327a815b497f680a'
+         'c374ff223f2e07b5e602ba22359f2335'
+         'cde5da81bebad2de556ef2e43d895e13')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  sed -i '/^groupname /s/mlocate/locate/' Makefile.in
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
+  make
+
+}
+
+check() {
+  cd $srcdir/$pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  
+  # Set up a default updatedb.conf and a daily cronjob
+  install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf
+  install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb
+
+  # Install Mlocate
+  make DESTDIR=$pkgdir install
+
+  ln -sv locate $pkgdir/usr/bin/slocate
+  chgrp -v 21 $pkgdir/usr/bin/locate
+  chmod -v 2755 $pkgdir/usr/bin/locate
+
+  install -dm755 $pkgdir/var/lib
+  install -d -m750 -g21 $pkgdir/var/lib/locate
+}
diff --git a/testing/mlocate/mlocate.install b/testing/mlocate/mlocate.install
new file mode 100644
index 000000000..c7b7f9cf7
--- /dev/null
+++ b/testing/mlocate/mlocate.install
@@ -0,0 +1,18 @@
+post_install() {
+  post_upgrade "$1" "$1"
+  echo "mlocate command is technically locate, but slocate is symlinked and still works."
+  echo "You should run updatedb as root."
+}
+
+post_upgrade() {
+  # This can be removed after {m,x}locate have both been updated
+  getent group slocate &>/dev/null && usr/sbin/groupdel slocate &>/dev/null
+  getent group mlocate &>/dev/null && usr/sbin/groupdel mlocate &>/dev/null
+
+  getent group locate &>/dev/null || usr/sbin/groupadd -g 21 locate &>/dev/null
+  chown -R root:locate var/lib/mlocate
+}
+
+pre_remove() {
+  getent group locate &>/dev/null && usr/sbin/groupdel locate &>/dev/null
+}
diff --git a/testing/mlocate/updatedb.conf b/testing/mlocate/updatedb.conf
new file mode 100644
index 000000000..722b04205
--- /dev/null
+++ b/testing/mlocate/updatedb.conf
@@ -0,0 +1,5 @@
+# directories to exclude from the slocate database:
+PRUNEPATHS="/media /mnt /tmp /var/tmp /var/cache /var/lock /var/run /var/spool"
+
+# filesystems to exclude from the slocate database:
+PRUNEFS="afs auto autofs binfmt_misc cifs coda configfs cramfs debugfs devpts devtmpfs ftpfs iso9660 mqueue ncpfs nfs nfs4 proc ramfs securityfs shfs smbfs sshfs sysfs tmpfs udf usbfs vboxsf"
diff --git a/testing/mlocate/updatedb.cron.daily b/testing/mlocate/updatedb.cron.daily
new file mode 100755
index 000000000..cac9bb063
--- /dev/null
+++ b/testing/mlocate/updatedb.cron.daily
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
+NICE=19
+
+# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
+IONICE_CLASS=2
+
+# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
+IONICE_PRIORITY=7
+
+UPDATEDB="/usr/bin/updatedb"
+
+if [ -x /usr/bin/nice ]; then
+  UPDATEDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEDB}"
+fi
+
+if [ -x /usr/bin/ionice ]; then
+  UPDATEDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEDB}"
+fi
+
+# Update the "locate" database
+if [ -x /usr/bin/updatedb ]; then
+  if [ -f /etc/updatedb.conf ]; then
+    ${UPDATEDB}
+  else
+    ${UPDATEDB} -f proc
+  fi
+fi
diff --git a/testing/source-highlight/PKGBUILD b/testing/source-highlight/PKGBUILD
new file mode 100644
index 000000000..32c6d6a76
--- /dev/null
+++ b/testing/source-highlight/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 151827 2012-03-03 08:09:13Z ibiru $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+
+pkgname=source-highlight
+pkgver=3.1.6
+pkgrel=2
+pkgdesc="Convert source code to syntax highlighted document"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/src-highlite/"
+license=('GPL')
+depends=('gcc-libs' 'bash' 'boost-libs')
+makedepends=('ctags' 'boost')
+options=('!libtool')
+install=$pkgname.install
+source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz")
+md5sums=('44856c15a5dc8694e30d92f640ed348f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+	      --with-bash-completion=${pkgdir}/etc/bash_completion.d
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make prefix="${pkgdir}/usr" install
+}
diff --git a/testing/source-highlight/source-highlight.install b/testing/source-highlight/source-highlight.install
new file mode 100644
index 000000000..4fd1b3005
--- /dev/null
+++ b/testing/source-highlight/source-highlight.install
@@ -0,0 +1,18 @@
+info_dir=usr/share/info
+info_files=(source-highlight.info source-highlight-lib.info)
+
+post_install() {
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}