Thu Sep 15 23:14:42 UTC 2011

58 files changed, 1042 insertions, 322 deletions

diff --git a/community/agg/PKGBUILD b/community/agg/PKGBUILD
index 0a2c65cc2..7a50506a2 100644
--- a/community/agg/PKGBUILD
+++ b/community/agg/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 49798 2009-08-16 14:04:06Z jgc $
-# Maintainer:
+# $Id: PKGBUILD 55569 2011-09-14 10:30:07Z andrea $
+# Maintainer: Jonathan Conder <jonno dot conder at gmail dot com>
 
 pkgname=agg
 pkgver=2.5
-pkgrel=3
+pkgrel=4
 pkgdesc="A High Quality Rendering Engine for C++"
 arch=('i686' 'x86_64')
 url="http://www.antigrain.com/"
 license=('GPL')
-depends=('gcc-libs>=4.4.1' 'sdl>=1.2.13' 'freetype2>=2.3.9')
-makedepends=('automake')
+depends=('gcc-libs' 'sdl' 'freetype2')
 provides=('antigrain')
 replaces=('antigrain')
 options=('!libtool' '!makeflags')
-source=(http://www.antigrain.com/${pkgname}-${pkgver}.tar.gz
+source=("http://www.antigrain.com/${pkgname}-${pkgver}.tar.gz"
         agg-2.4-depends.patch
         agg-2.5-pkgconfig.patch)
 md5sums=('0229a488bc47be10a2fee6cf0b2febd6'
@@ -22,10 +21,14 @@ md5sums=('0229a488bc47be10a2fee6cf0b2febd6'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/agg-2.4-depends.patch" || return 1
-  patch -Np1 -i "${srcdir}/agg-2.5-pkgconfig.patch" || return 1
-  sh ./autogen.sh || return 1
-  ./configure --prefix=/usr --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  patch -Np1 -i "${srcdir}/agg-2.4-depends.patch"
+  patch -Np1 -i "${srcdir}/agg-2.5-pkgconfig.patch"
+  sh ./autogen.sh
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/antiword/PKGBUILD b/community/antiword/PKGBUILD
index 9103de17c..3d5c45644 100644
--- a/community/antiword/PKGBUILD
+++ b/community/antiword/PKGBUILD
@@ -1,26 +1,34 @@
-# Maintainer : Aaron, phrakture, Griffin <aaron@archlinux.org>
+# $Id: PKGBUILD 55537 2011-09-14 08:02:10Z andrea $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Aaron, phrakture, Griffin <aaron@archlinux.org>
 # Contributor: Gustav Munkby <grddev@gmx.net>
 
 pkgname=antiword
 pkgver=0.37
-pkgrel=2
-pkgdesc="Antiword is a free MS Word reader for Linux and RISC OS"
+pkgrel=3
+pkgdesc="A free MS Word reader for Linux and RISC OS"
 arch=('i686' 'x86_64')
 url="http://www.winfield.demon.nl/"
-license="GPL"
-depends=('glibc')
+license=('GPL')
+depends=('bash')
 install=antiword.install
-source=(http://www.winfield.demon.nl/linux/$pkgname-$pkgver.tar.gz \
-        antiword-helper)
-md5sums=('f868e2a269edcbc06bf77e89a55898d1' '01a988376cfd4bb268120ab597c9abe3')
+source=("http://www.winfield.demon.nl/linux/$pkgname-$pkgver.tar.gz"
+        'antiword-helper')
+md5sums=('f868e2a269edcbc06bf77e89a55898d1'
+         '01a988376cfd4bb268120ab597c9abe3')
 
-build()
-{
-  cd $srcdir/$pkgname-$pkgver
-  sed -i "s|CFLAGS	=.*|CFLAGS = $CFLAGS -DNDEBUG|g; \
-          s|GLOBAL_INSTALL_DIR =.*|GLOBAL_INSTALL_DIR = /usr/bin|g" \
-          Makefile.Linux
-  make DESTDIR=$pkgdir global_install
+build(){
+  cd "${srcdir}"/$pkgname-$pkgver
+
+  sed -i "s|GLOBAL_INSTALL_DIR =.*|GLOBAL_INSTALL_DIR = /usr/bin|g" \
+    Makefile.Linux
+
+  make OPT="${CFLAGS} -DNDEBUG" LDFLAGS="${LDFLAGS}"
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" global_install
   install -m755 $srcdir/antiword-helper $pkgdir/usr/bin/
   install -Dm644 Docs/antiword.1 $pkgdir/usr/share/man/man1/antiword.1
 }
diff --git a/community/antiword/antiword.install b/community/antiword/antiword.install
index 58aaccde7..010579522 100644
--- a/community/antiword/antiword.install
+++ b/community/antiword/antiword.install
@@ -1,5 +1,4 @@
-post_install()
-{
+post_install() {
   cat << EOF
 NOTES On Antiword Integration:
 
@@ -15,12 +14,3 @@ NOTES On Antiword Integration:
 * To enable drag-and-drop support in KDE, use the kantiword script
 EOF
 }
-
-post_upgrade()
-{
-  post_install $1
-}
-
-op=$1
-shift
-$op $*
diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD
index ecdc98517..0e50f3466 100644
--- a/community/apcupsd/PKGBUILD
+++ b/community/apcupsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 53371 2011-08-03 09:47:21Z spupykin $
+# $Id: PKGBUILD 55548 2011-09-14 08:57:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Todd Musall <tmusall@comcast.net>
 
 pkgname=apcupsd
-pkgver=3.14.9
-pkgrel=2
-pkgdesc="Apcupsd can be used for power mangement and controlling most of APC's UPS models on Unix and Windows machines."
+pkgver=3.14.10
+pkgrel=1
+pkgdesc="power mangement and controlling most of APC's UPS models"
 arch=(i686 x86_64)
 url="http://www.apcupsd.org"
 license=('GPL')
@@ -18,7 +18,7 @@ backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf
         etc/apcupsd/multimon.conf)
 source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz
 	apcupsd)
-md5sums=('aa5e2c2954a81c2f07e0a356e38fe853'
+md5sums=('5928822d855c5cf7ac29655e3e0b8c23'
          '8bc674da24188c69b0ad5d7fe7510f73')
 
 build() {
diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD
index 661805132..0aa86474b 100644
--- a/community/busybox/PKGBUILD
+++ b/community/busybox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55242 2011-09-07 09:24:20Z spupykin $
+# $Id: PKGBUILD 55598 2011-09-14 21:43:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jens Pranaitis <jens@jenux.homelinux.org>
 
 pkgname=busybox
 pkgver=1.19.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Utilities for rescue and embedded systems"
 arch=("i686" "x86_64")
 url="http://busybox.net"
@@ -26,5 +26,5 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  install -Dm755 busybox $pkgdir/bin/busybox
+  install -Dm4755 busybox $pkgdir/bin/busybox
 }
diff --git a/community/chrpath/PKGBUILD b/community/chrpath/PKGBUILD
index 2fefddfc2..c978d17a9 100644
--- a/community/chrpath/PKGBUILD
+++ b/community/chrpath/PKGBUILD
@@ -1,20 +1,25 @@
+# $Id: PKGBUILD 55552 2011-09-14 09:27:16Z andrea $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=chrpath
 pkgver=0.13
-pkgrel=2
+pkgrel=3
 pkgdesc="Change or delete the rpath or runpath in ELF files"
 arch=('i686' 'x86_64')
-url="http://packages.debian.org/chrpath"
+url="http://directory.fsf.org/project/chrpath/"
 license=('GPL2')
 depends=('glibc')
-source=(http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz)
+source=("http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('b73072a8fbba277558c50364b65bb407')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-
+  cd "${srcdir}"/$pkgname-$pkgver
   ./configure --prefix=/usr --mandir=/usr/share/man
-  make || return 1
-  make DESTDIR=$pkgdir docdir=/usr/share/doc/chrpath install
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" docdir=/usr/share/doc/chrpath install
 }
diff --git a/community/fftw2/PKGBUILD b/community/fftw2/PKGBUILD
index 4198e96fc..e46a44e49 100644
--- a/community/fftw2/PKGBUILD
+++ b/community/fftw2/PKGBUILD
@@ -1,34 +1,52 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: damir <damir@archlinux.org>
+# $Id: PKGBUILD 55583 2011-09-14 11:20:19Z andrea $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: damir <damir@archlinux.org>
 
 pkgname=fftw2
 pkgver=2.1.5
-pkgrel=4
-pkgdesc="FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of both real and complex data, and of arbitrary input size. This is package is offering backwards compatibility version 2.x.y. of fftw."
-arch=(i686 x86_64)
+pkgrel=5
+pkgdesc="A C subroutine library for computing the discrete Fourier transform (DFT)"
+arch=('i686' 'x86_64')
 url="http://www.fftw.org/"
 license=('GPL2')
 depends=('glibc')
-options=(!libtool)
-source=(http://www.fftw.org/fftw-${pkgver}.tar.gz)
+makedepends=('gcc-fortran')
+options=('!libtool')
+source=("http://www.fftw.org/fftw-${pkgver}.tar.gz")
 md5sums=('8d16a84f3ca02a785ef9eb36249ba433')
 
 build() {
-  cd ${startdir}/src/fftw-${pkgver}
-  # build + install double precision
+  cd "${srcdir}"
+  
+  cp -r fftw-${pkgver} fftw-${pkgver}-double
+ 
+  # build single precision
+  cd fftw-${pkgver}
   ./configure F77=gfortran --prefix=/usr \
-              --enable-type-prefix --enable-shared \
-              --enable-threads
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+              --enable-float \
+              --enable-type-prefix \
+              --enable-shared \
+              --enable-threads \
+              --infodir=/usr/share/info
+  make
+  cd ../
 
-  make clean
-
-  # build + install single precision
+  # build double precision
+  cd fftw-${pkgver}-double
   ./configure F77=gfortran --prefix=/usr \
-              --enable-float --enable-type-prefix --enable-shared \
-              --enable-threads
-  make || return 1
-  #make prefix=$startdir/pkg/usr install || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+              --enable-type-prefix \
+              --enable-shared \
+              --enable-threads \
+              --infodir=/usr/share/info
+  make
+}
+
+package() {
+  # install single precision
+  cd "${srcdir}"/fftw-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  # install double precision
+  cd "${srcdir}"/fftw-${pkgver}-double
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/gsynaptics/PKGBUILD b/community/gsynaptics/PKGBUILD
index af8b8cc81..137235be1 100644
--- a/community/gsynaptics/PKGBUILD
+++ b/community/gsynaptics/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 248 2009-07-21 09:55:45Z spupykin $
+# $Id: PKGBUILD 55543 2011-09-14 08:26:19Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gsynaptics
 pkgver=0.9.16
-pkgrel=1
+pkgrel=2
 pkgdesc="A settings tool for Synaptics touchpad driver"
-arch=(i686 x86_64)
-url="http://gsynaptics.sourceforge.jp"
-license=("GPL")
+arch=('i686' 'x86_64')
+url="http://gsynaptics.sourceforge.jp/"
+license=('GPL')
 depends=('libgnomeui' 'synaptics')
 makedepends=('intltool' 'gettext' 'gnome-doc-utils')
 install=$pkgname.install
-source=(http://globalbase.dl.sourceforge.jp/gsynaptics/38463/gsynaptics-$pkgver.tar.gz \
-	do-not-set-zero.dpatch \
-	dot-fixes.dpatch \
-	build-filename.dpatch)
+source=("http://sourceforge.jp/frs/redir.php?m=iij&f=/${pkgname}/38463/${pkgname}-${pkgver}.tar.gz"
+        do-not-set-zero.dpatch
+        dot-fixes.dpatch
+        build-filename.dpatch)
 md5sums=('571828ddca2f1d9d6ea47e072db1959d'
          'd6308d93fd4d04c686ba24422ed99905'
          '4c35d5d0803296233d50146963a0bcbc'
-         '11011a651f143103614fb69dd5aa77a1')
+         'd227a70304bef3cc0272b37c5e322463')
 
 build() {
-  cd $startdir/src/gsynaptics-$pkgver
-  patch -p1 <$srcdir/dot-fixes.dpatch
-  patch -p1 <$srcdir/do-not-set-zero.dpatch
-  patch -p1 <$srcdir/build-filename.dpatch
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/dot-fixes.dpatch
+  patch -p1 -i "${srcdir}"/do-not-set-zero.dpatch
+  patch -p1 -i "${srcdir}"/build-filename.dpatch
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/gsynaptics/build-filename.dpatch b/community/gsynaptics/build-filename.dpatch
index c48689533..404e6fab7 100644
--- a/community/gsynaptics/build-filename.dpatch
+++ b/community/gsynaptics/build-filename.dpatch
@@ -13,7 +13,7 @@ diff -urNad gsynaptics-0.9.14~/src/main.c gsynaptics-0.9.14/src/main.c
  
  	gtk_window_set_default_size (GTK_WINDOW (widget), 400, -1);
  
--	path = g_build_filename (DATADIR "/pixmaps", "touchpad.png");
+-	path = g_build_filename (DATADIR "/pixmaps", "touchpad.png", NULL);
 +	path = g_build_filename (DATADIR, "pixmaps", "touchpad.png", NULL);
  	if (path)
  	{
diff --git a/community/gsynaptics/gsynaptics.install b/community/gsynaptics/gsynaptics.install
index a0f279ee6..5b505b7b3 100644
--- a/community/gsynaptics/gsynaptics.install
+++ b/community/gsynaptics/gsynaptics.install
@@ -10,7 +10,3 @@ cat << EOF
 >>>
 EOF
 }
-
-op=$1
-shift
-$op $*
diff --git a/community/hacburn/PKGBUILD b/community/hacburn/PKGBUILD
index da8654e32..2c4ea446e 100644
--- a/community/hacburn/PKGBUILD
+++ b/community/hacburn/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 7841 2010-01-11 23:20:21Z dgriffiths $
+# $Id: PKGBUILD 55602 2011-09-14 23:25:07Z dreisner $
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 pkgname=hacburn
 pkgver=0.3.5
-pkgrel=3.1
+pkgrel=4
 pkgdesc="HacBurn is a script written in perl to aid in writing CDs. It is a graphical interface (using gtk+) to cdrtools, mpg321 and ogg123."
 arch=('i686' 'x86_64')
 url="http://hacburn.sourceforge.net/"
 license=('GPL')
-depends=('gtk2-perl' 'glib-perl' 'cdrtools' 'mpg321' 'vorbis-tools' 'gtk2' 'xorg-server' 'perl' 'cddb_get' 'lame')
+depends=('gtk2-perl' 'glib-perl' 'cdrkit' 'mpg321' 'vorbis-tools' 'gtk2' 'xorg-server' 'perl' 'cddb_get' 'lame')
 conflicts=('hacburn-cvs')
 source=(http://downloads.sourceforge.net/sourceforge/hacburn/HacBurn-$pkgver.tar.bz2)
 md5sums=('1e4b3e4b49de58259a446b7752f59f22')
diff --git a/community/httptunnel/PKGBUILD b/community/httptunnel/PKGBUILD
index e9a048daa..dad2e7b9a 100644
--- a/community/httptunnel/PKGBUILD
+++ b/community/httptunnel/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 31032 2009-03-24 04:10:30Z eric $
-# Maintainer: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 55529 2011-09-14 07:38:23Z andrea $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=httptunnel
 pkgver=3.3
-pkgrel=2
-pkgdesc="httptunnel creates a bidirectional virtual data connection tunnelled in HTTP requests"
-arch=(i686 x86_64)
+pkgrel=3
+pkgdesc="Creates a bidirectional virtual data connection tunnelled in HTTP requests"
+arch=('i686' 'x86_64')
 url="http://www.nocrew.org/software/httptunnel"
 license=('GPL2')
 depends=('glibc')
-source=(http://www.nocrew.org/software/httptunnel/$pkgname-$pkgver.tar.gz)
+source=("http://www.nocrew.org/software/${pkgname}/$pkgname-$pkgver.tar.gz")
 md5sums=('493cc0f5f21e9955db27ee9cd9a976d5')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  cd "${srcdir}"/$pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/id3lib-rcc/PKGBUILD b/community/id3lib-rcc/PKGBUILD
index 1aacda468..cb62b1ef9 100644
--- a/community/id3lib-rcc/PKGBUILD
+++ b/community/id3lib-rcc/PKGBUILD
@@ -1,21 +1,19 @@
-# $Id: PKGBUILD 2097 2009-09-08 15:34:53Z spupykin $
+# $Id: PKGBUILD 55559 2011-09-14 10:08:38Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=id3lib-rcc
 pkgver=3.8.3
-pkgrel=6
+pkgrel=7
 pkgdesc="id3lib with librcc patch"
 arch=('i686' 'x86_64')
 url="http://id3lib.sourceforge.net/"
 license=('GPL')
-depends=(libxml2 db librcc zlib)
-makedepends=(patch)
-provides=(id3lib)
-conflicts=(id3lib)
+depends=('libxml2' 'librcc' 'gcc-libs')
+provides=('id3lib')
+conflicts=('id3lib')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/id3lib/id3lib-$pkgver.tar.gz \
-	http://downloads.sourceforge.net/rusxmms/id3lib-csa2.tar.bz2 \
+source=(http://downloads.sourceforge.net/id3lib/id3lib-$pkgver.tar.gz
+	http://downloads.sourceforge.net/rusxmms/id3lib-csa2.tar.bz2
 	arch.patch
 	id3lib-gcc4.patch)
 md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7'
@@ -24,16 +22,22 @@ md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7'
          '94191cf1fe6f5fd391d95a6de81a48b9')
 
 build() {
-  cd $startdir/src/id3lib-$pkgver
+  cd "${srcdir}"/id3lib-$pkgver
 
-  patch -Np1 <../id3lib/id3lib-ds-rcc.patch
-  patch -Np1 <$srcdir/id3lib-gcc4.patch
-  (cd src && patch -Np0 <../../arch.patch)
+  patch -Np1 -i "${srcdir}"/id3lib/id3lib-ds-rcc.patch
+  patch -Np1 -i "${srcdir}"/id3lib-gcc4.patch
+  cd src
+  patch -Np0 -i "${srcdir}"/arch.patch
+  cd ..
 
   sed -i 's#iomanip.h##' configure
   sed -i 's|size_t size_t, size_t \*size_t|size_t s1, size_t *s2|' src/rccpatch.h
 
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr
-  make LDFLAGS=-lrcc || return 1
-  make DESTDIR=$startdir/pkg install
+  ./configure --prefix=/usr
+  make LDFLAGS=-lrcc
+}
+
+package() {
+  cd "${srcdir}"/id3lib-$pkgver
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/iksemel/PKGBUILD b/community/iksemel/PKGBUILD
index 242ec9323..9034cbbe1 100644
--- a/community/iksemel/PKGBUILD
+++ b/community/iksemel/PKGBUILD
@@ -1,26 +1,31 @@
-# $Id: PKGBUILD 1020 2009-08-11 22:19:38Z mherych $
-# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
+# $Id: PKGBUILD 55571 2011-09-14 10:35:20Z andrea $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributos: Guillermo Vaya driadan@willinux.net
+# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
+# Contributor: Guillermo Vaya driadan@willinux.net
 
 pkgname=iksemel
 pkgver=1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="XML parser library for Jabber applications in ANSI C"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/iksemel/"
 license=('LGPL')
-depends=('gnutls')
-source=(http://iksemel.googlecode.com/files/iksemel-$pkgver.tar.gz)
+depends=('glibc')
+install=iksemel.install
+source=("http://iksemel.googlecode.com/files/${pkgname}-$pkgver.tar.gz")
 md5sums=('532e77181694f87ad5eb59435d11c1ca')
 options=('!libtool')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
   ./configure --prefix=/usr \
   	--infodir=/usr/share/info
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  mv $pkgdir/usr/share/info/$pkgname $pkgdir/usr/share/info/$pkgname.info
-  rm -rf $pkgdir/usr/share/info/dir
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+  mv "${pkgdir}"/usr/share/info/$pkgname "${pkgdir}"/usr/share/info/$pkgname.info
+  rm -rf "${pkgdir}"/usr/share/info/dir
 }
diff --git a/community/iksemel/iksemel.install b/community/iksemel/iksemel.install
new file mode 100644
index 000000000..1cd1dbf31
--- /dev/null
+++ b/community/iksemel/iksemel.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(iksemel.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD
index bc8e83ab3..c64ad3e44 100644
--- a/community/incron/PKGBUILD
+++ b/community/incron/PKGBUILD
@@ -1,36 +1,40 @@
-# $Id: PKGBUILD 1515 2009-08-24 21:08:19Z spupykin $
+# $Id: PKGBUILD 55563 2011-09-14 10:20:14Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 # Contributor: scj <scj(at)archlinux(dot)us>
+
 pkgname=incron
 pkgver=0.5.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods"
 arch=('i686' 'x86_64')
 url="http://incron.aiken.cz/"
-license=("GPL")
-depends=('gcc-libs')
+license=('GPL')
+depends=('gcc-libs' 'bash')
 install=incron.install
-source=(http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz \
-	incron.init)
-options=(emptydirs)
+source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz"
+    	'incron.init')
+options=('emptydirs')
 md5sums=('a285b9e14af7bf9f9524fe051a06255f'
          '648e1ca1a4b1e624401d9d71aa3756b3')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
   
-  install -D -m 755 $startdir/incron.init $startdir/pkg/etc/rc.d/incrond
-  mkdir -p $startdir/pkg/usr/share/man $startdir/pkg/usr/bin $startdir/pkg/usr/sbin
+  install -D -m 755 "${srcdir}"/incron.init "${pkgdir}"/etc/rc.d/incrond
+  install -d "${pkgdir}"/usr/share/man "${pkgdir}"/usr/{s,}bin
 
   sed -i '1,1i#include <stdio.h>' icd-main.cpp inotify-cxx.cpp usertable.cpp appargs.cpp
   sed -i 's|strchr(s,|(char*)strchr(s,|' incroncfg.cpp
 
-  make || return 1
+  make
+}
 
-  make PREFIX=$startdir/pkg/usr \
-    MANPATH=$startdir/pkg/usr/share/man \
-    USERDATADIR=$startdir/pkg/var/spool/incron \
-    CFGDIR=$startdir/pkg/etc \
-    SYSDATADIR=$startdir/pkg/etc/incron.d install
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make PREFIX="${pkgdir}"/usr \
+    MANPATH="${pkgdir}"/usr/share/man \
+    USERDATADIR="${pkgdir}"/var/spool/incron \
+    CFGDIR="${pkgdir}"/etc \
+    SYSDATADIR="${pkgdir}"/etc/incron.d install
 }
diff --git a/community/incron/incron.install b/community/incron/incron.install
index 3c4535b00..de4de3742 100644
--- a/community/incron/incron.install
+++ b/community/incron/incron.install
@@ -12,4 +12,3 @@ pre_remove() {
   usr/sbin/userdel incron >& /dev/null
   usr/sbin/groupdel incron >& /dev/null
 }
-
diff --git a/community/libnfnetlink/PKGBUILD b/community/libnfnetlink/PKGBUILD
index 17e77c144..fc8e6d8dd 100644
--- a/community/libnfnetlink/PKGBUILD
+++ b/community/libnfnetlink/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 191 2009-07-20 09:12:55Z spupykin $
+# $Id: PKGBUILD 55539 2011-09-14 08:04:26Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
-# Maintainer: Filip Wojciechowski, filip at loka dot pl
+# Contributor: Filip Wojciechowski, filip at loka dot pl
+
 pkgname=libnfnetlink
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="low-level library for netfilter related kernel/userspace communication"
-depends=(glibc)
+arch=('i686' 'x86_64')
 url="http://www.netfilter.org/projects/libnfnetlink/index.html"
 license=('GPL')
-arch=('i686' 'x86_64')
+depends=('glibc')
 options=('!libtool')
-source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
+source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
 md5sums=('016fdec8389242615024c529acc1adb8')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index b17d54d64..69c5e52cc 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 54469 2011-08-18 15:07:52Z bluewind $
+# $Id: PKGBUILD 55591 2011-09-14 14:47:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
 pkgver=0.9.4
-pkgrel=2
+pkgrel=3
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -16,18 +16,13 @@ depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2'
 makedepends=('pkgconfig' 'lvm2')
 optdepends=('bridge-utils: for briged networking (default)'
 	    'dnsmasq: for NAT/DHCP for guests'
-	    'kernel26-ovz24: for openvz guests'
 	    'kvm'
-	    'lxc'
 	    'openbsd-netcat: for remote management over ssh'
 	    'qemu'
-	    'user-mode-linux'
-	    'virtualbox_bin'
-	    'virtualbox-ose'
-	    'xen'
 	    'radvd')
 options=('emptydirs' '!libtool')
 backup=('etc/conf.d/libvirtd'
+	'etc/conf.d/libvirtd-guests'
 	'etc/libvirt/libvirtd.conf'
 	'etc/libvirt/qemu.conf'
 	'etc/sasl2/libvirt.conf')
@@ -35,12 +30,16 @@ install="libvirt.install"
 source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	libvirtd.rc.d
 	libvirtd.conf.d
+	libvirtd-guests.rc.d
+	libvirtd-guests.conf.d
 	openbsd-netcat-default.patch
 	unixperms.patch
 	yajl-2.x.patch)
 md5sums=('86b411b11bd23d4af20611699f372af7'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
+         '6f36bf189ef0e5847038787d13535420'
+         'bc2971dacdbac967fc3474e50affc345'
          'ee7052f3929d5d918236c646a59edebf'
          'db95aecdf2ccf3693fef5821cdcb7eba'
          '5745bb8d0b254abb7a3528c66e03b0f9')
@@ -74,8 +73,14 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
+
   make DESTDIR="$pkgdir" install
+
   install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd
   install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd
+
+  install -D -m755 "$srcdir"/libvirtd-guests.rc.d "$pkgdir"/etc/rc.d/libvirtd-guests
+  install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests
+
   rm -rf $pkgdir/var/run
 }
diff --git a/community/libvirt/libvirtd-guests.conf.d b/community/libvirt/libvirtd-guests.conf.d
new file mode 100644
index 000000000..02a933715
--- /dev/null
+++ b/community/libvirt/libvirtd-guests.conf.d
@@ -0,0 +1,11 @@
+LIBVIRTD_STOP_ACTION=suspend
+
+#LIBVIRTD_URI="-c qemu+ssh://user@host/system"
+LIBVIRTD_URI=""
+
+#LIBVIRTD_BYPASS_CACHE="--bypass-cache"
+LIBVIRTD_BYPASS_CACHE=""
+
+LIBVIRTD_START_DELAY=0
+
+LIBVIRTD_SHUTDOWN_TIMEOUT=3
diff --git a/community/libvirt/libvirtd-guests.rc.d b/community/libvirt/libvirtd-guests.rc.d
new file mode 100755
index 000000000..a97a8d9d1
--- /dev/null
+++ b/community/libvirt/libvirtd-guests.rc.d
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+. /etc/conf.d/libvirtd-guests
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+LIBVIRTD_LISTFILE="/var/state/libvirtd/vm-list"
+
+# get guest state by name
+libvirt_get_guest_state()
+{
+	virsh $LIBVIRTD_URI dominfo "$1" | grep -E '^State:' | awk '{print $2}'
+}
+
+# list IDs of running guests
+libvirt_list()
+{
+	virsh $LIBVIRTD_URI list | awk 'NR > 2 {print $2}'
+}
+
+# suspend guest by name
+libvirt_suspend()
+{
+	virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE managedsave "$1" >/dev/null
+	timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT
+	while [ "$timeout" -gt 0 ]; do
+		sleep 1
+		timeout=$((timeout - 1))
+		state=`libvirt_get_guest_state "$1"`
+		[ "x$state" == "xshut" ] && return 0
+	done
+	return 1
+}
+
+# shutdown guest by name
+libvirt_shutdown()
+{
+	virsh $LIBVIRTD_URI shutdown "$1" >/dev/null
+	timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT
+	while [ "$timeout" -gt 0 ]; do
+		sleep 1
+		timeout=$((timeout - 1))
+		state=`libvirt_get_guest_state "$1"`
+		[ "x$state" != "xshut" ] && return 0
+	done
+	return 1
+}
+
+# start guest by name
+libvirt_start()
+{
+	virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE start "$1" >/dev/null
+}
+
+# stop all guests
+libvirt_stop_all()
+{
+	mkdir -p `dirname $LIBVIRTD_LISTFILE`
+	echo -n >$LIBVIRTD_LISTFILE
+	for i in `libvirt_list`; do
+		if [ "x$LIBVIRTD_STOP_ACTION" == "xsuspend" ]; then
+			stat_busy "Suspending libvirtd/$i guest"
+			libvirt_suspend "$i"
+		else
+			stat_busy "Shutting libvirtd/$i guest down"
+			libvirt_shutdown "$i"
+		fi
+		[ $? -eq 0 ] && stat_done || stat_fail
+		echo $i >>$LIBVIRTD_LISTFILE
+	done
+}
+
+# start all guests
+libvirt_start_all()
+{
+	if [ -f $LIBVIRTD_LISTFILE ]; then
+		for i in `cat $LIBVIRTD_LISTFILE`; do
+			stat_busy "Starting/resuming libvirtd/$i guest"
+			libvirt_start "$i"
+			[ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail
+		done
+	fi
+	rm -f $LIBVIRTD_LISTFILE
+}
+
+# main
+LC_ALL=C
+LANG=C
+case "$1" in
+    start)
+		libvirt_start_all
+		add_daemon libvirtd-guests
+	;;
+    stop)
+		libvirt_stop_all
+		rm_daemon libvirtd-guests
+	;;
+    restart)
+	$0 stop
+	sleep 1
+	$0 start
+	;;
+    *)
+        echo $"Usage: $0 {start|stop|restart}"
+        ;;
+esac
+exit 0
diff --git a/community/libx86/PKGBUILD b/community/libx86/PKGBUILD
index fcf0ddc68..460166174 100644
--- a/community/libx86/PKGBUILD
+++ b/community/libx86/PKGBUILD
@@ -1,36 +1,41 @@
-# $Id: PKGBUILD 46956 2011-05-13 20:41:19Z andrea $
+# $Id: PKGBUILD 55525 2011-09-14 07:30:42Z andrea $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: tardo <tardo@nagi-fanboi.net>
-# Maintainer: Thayer Williams <thayer@archlinux.org>
+# Contributor: Thayer Williams <thayer@archlinux.org>
 
 pkgname=libx86
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Provides an lrmi interface that works on x86, am64 and alpha"
 arch=('i686' 'x86_64')
 url="http://www.codon.org.uk/~mjg59/libx86/"
 license=('custom')
 depends=('glibc')
-source=(http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$pkgver.tar.gz 
-        libx86-ifmask.patch)
+source=("http://www.codon.org.uk/~mjg59/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz" 
+        'libx86-ifmask.patch')
 md5sums=('41bee1f8e22b82d82b5f7d7ba51abc2a'
          '573897186eb8670d8d97c64ea7614001')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
 
   # lrmi.c patch courtesy of Gentoo
-  patch -Np0 -i $srcdir/libx86-ifmask.patch || return 1
+  patch -Np0 -i "${srcdir}"/libx86-ifmask.patch
 
   # compensate for x86_64
   if [ "$CARCH" = "x86_64" ]; then
-		make BACKEND=x86emu || return 1
-    else
-	  make || return 1
+    make BACKEND=x86emu
+  else
+    make
   fi
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
 
-  make DESTDIR=$pkgdir install || return 1
-  chmod 644 $pkgdir/usr/lib/libx86.a || return 1
+  make DESTDIR="${pkgdir}" install
+  chmod 644 "${pkgdir}"/usr/lib/libx86.a
 
-  install -D -m 644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT || return 1
+  install -D -m 644 COPYRIGHT "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/community/notion/ChangleLog b/community/notion/ChangleLog
new file mode 100644
index 000000000..2107408db
--- /dev/null
+++ b/community/notion/ChangleLog
@@ -0,0 +1,5 @@
+2011-09-14 Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+	* 20110914-1 :
+	Add contrib/ to /usr/share/notion/contrib
+	Add mod_*.lua to /etc/notion/
diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD
index b90bfdfed..304d14760 100644
--- a/community/notion/PKGBUILD
+++ b/community/notion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55503 2011-09-13 16:34:12Z spupykin $
+# $Id: PKGBUILD 55596 2011-09-14 16:51:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com
 # Contributor: aunoor
 
 pkgname=notion
-pkgver=20110913
+pkgver=20110914
 pkgrel=1
 pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
 url="http://sourceforge.net/projects/notion/"
@@ -15,13 +15,15 @@ optdepends=('libxinerama' 'libxrandr')
 makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr'
 	     'rubber' 'latex2html' 'texlive-htmlxml' 'texlive-latexextra')
 provides=('libtu' 'libextl')
+changelog=ChangleLog
 _gitroots=("git://notion.git.sourceforge.net/gitroot/notion/notion"
 	   "git://notion.git.sourceforge.net/gitroot/notion/libtu"
 	   "git://notion.git.sourceforge.net/gitroot/notion/libextl"
 	   "git://notion.git.sourceforge.net/gitroot/notion/notion-doc"
 	   "git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama"
 	   "git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents"
-	   "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr")
+	   "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr"
+	   "git://notion.git.sourceforge.net/gitroot/notion/contrib")
 
 build() {
   cd ${srcdir}
@@ -47,7 +49,7 @@ build() {
     cp -r  ${srcdir}/$i ${srcdir}/notion-build/
   done
 
-  # build
+  # build notion
   cd ${srcdir}/notion-build
   msg "Starting make..."
   sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \
@@ -57,9 +59,12 @@ build() {
 	-i system.mk
   make INCLUDES=-I${srcdir}/notion-build
 
+  # doc workaround
   for i in ioncore mod_tiling mod_query de mod_menu mod_dock mod_sp mod_statusbar; do
     (cd $i && make _exports_doc)
   done
+
+  # build doc and modules
   for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do
     (cd $i && make -j1 TOPDIR=.. all)
   done
@@ -67,10 +72,21 @@ build() {
 
 package() {
   cd ${srcdir}/notion-build
+
+  # notion
   make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install
+
+  # modules
   for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do
     (cd $i && make  PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion TOPDIR=.. install)
   done
-  mkdir -p ${pkgdir}/usr/share/licenses/notion
-  cp LICENSE ${pkgdir}/usr/share/licenses/notion
+  cp ${srcdir}/mod_xinerama/*.lua $pkgdir/etc/notion/
+  cp ${srcdir}/mod_xkbevents/*.lua $pkgdir/etc/notion/
+
+  # contrib
+  mkdir -p $pkgdir/usr/share/notion/contrib
+  cp -a ${srcdir}/contrib/* $pkgdir/usr/share/notion/contrib
+
+  # license
+  install -Dm0644 LICENSE ${pkgdir}/usr/share/licenses/notion/LICENSE
 }
diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD
index 77bf55ca1..144788233 100644
--- a/community/pigeonhole/PKGBUILD
+++ b/community/pigeonhole/PKGBUILD
@@ -8,8 +8,8 @@ _dcpkgver=2.0.14
 # Make sure to bump pkgrel if changing this.
 
 pkgname=pigeonhole
-pkgver=0.2.3
-pkgrel=3
+pkgver=0.2.4
+pkgrel=1
 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.0"
 arch=('i686' 'x86_64')
 url="http://pigeonhole.dovecot.org/"
@@ -19,9 +19,9 @@ makedepends=()
 conflicts=('dovecot-sieve' 'pigeonhole-hg')
 source=("http://www.rename-it.nl/dovecot/2.0/dovecot-2.0-$pkgname-$pkgver.tar.gz"
 	"dovecot.conf")
-md5sums=('336cbb2073b48119d968fad7de89817a'
-         '564b771c339f69a477c06babf53e11c2')
 options=('!libtool')
+md5sums=('11d396b901db774799d07db6e4dd805b'
+         '564b771c339f69a477c06babf53e11c2')
 
 build() {
   cd "$srcdir/dovecot-2.0-$pkgname-$pkgver"
diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD
index 2255768f0..273254c36 100644
--- a/community/qbittorrent/PKGBUILD
+++ b/community/qbittorrent/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=qbittorrent
 pkgver=2.8.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
 arch=('i686' 'x86_64')
 url="http://www.qbittorrent.org/"
@@ -14,10 +14,8 @@ makedepends=('boost' 'geoip')
 optdepends=('python2: needed for search'
             'geoip: improves peer country resolution')
 install='qbittorrent.install'
-source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz"
-        'python2.patch')
-md5sums=('5f081231537d53e4295483eb9a8f94b1'
-         'db0d79fee8ce3470ad3741d36b02a94c')
+source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz")
+md5sums=('5f081231537d53e4295483eb9a8f94b1')
 
 build() {
   cd qbittorrent-${pkgver}
@@ -27,8 +25,6 @@ build() {
     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     $(find ./ -name '*.py')
 
-  patch -Np1 -i ${srcdir}/python2.patch
-
   ./configure \
     --prefix=/usr
 
diff --git a/community/qscintilla-qt3/PKGBUILD b/community/qscintilla-qt3/PKGBUILD
index 19c554b7d..97da30f58 100644
--- a/community/qscintilla-qt3/PKGBUILD
+++ b/community/qscintilla-qt3/PKGBUILD
@@ -1,38 +1,37 @@
-# $Id$
-# Maintainer:
+# $Id: PKGBUILD 55531 2011-09-14 07:43:04Z andrea $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: red_over_blue,Ben <ben@benmazer.net>,Kritoke <kritoke@gamebox.net>
 
 pkgname=qscintilla-qt3
 pkgver=1.7.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A port to Qt3 of Neil Hodgson's Scintilla C++ editor class"
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro/"
 license=('GPL2')
 depends=('qt3')
-source=(http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla1/QScintilla-1.71-gpl-$pkgver.tar.gz)
+source=("http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla1/QScintilla-1.71-gpl-$pkgver.tar.gz")
 md5sums=('dfa047b45d4f09ae8d4a8a431ba88a5a')
 
 build() {
   . /etc/profile.d/qt3.sh
-  cd $srcdir/QScintilla-1.71-gpl-$pkgver
+  cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver
   cd qt
-  echo [STARTING sed on qscintilla.pro]
   sed -i "s%DESTDIR.*%DESTDIR=$pkgdir/opt/qt/lib%g" qscintilla.pro
   /opt/qt/bin/qmake qscintilla.pro
   make
 }
 
 package() {
-  cd $srcdir/QScintilla-1.71-gpl-$pkgver
+  cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver/qt
   # installind includes
   for i in qextscintilla*.h; do
-    install -m 644 -D $i $pkgdir/opt/qt/include/$i
+    install -m 644 -D $i "${pkgdir}"/opt/qt/include/$i
   done
-  
+
   #for i in qscintilla*.qm
   #do
-  #install -m 644 -D $i $startdir/pkg/opt/qt/translations/$i
+  #install -m 644 -D $i "${pkgdir}"/opt/qt/translations/$i
   #done
 }
diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD
index 321366e0e..ad189f6e9 100644
--- a/community/roxterm/PKGBUILD
+++ b/community/roxterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 55281 2011-09-08 15:08:58Z ttopper $
+# $Id: PKGBUILD 55595 2011-09-14 14:55:41Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=roxterm
-pkgver=2.1.1
+pkgver=2.1.2
 pkgrel=1
 pkgdesc="Tabbed, VTE-based terminal emulator"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'dbus' 'dbus-core' 'glib2')
 makedepends=('docbook-xsl' 'xmlto' 'po4a')
 install=roxterm.install
 source=(http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.gz)
-md5sums=('45f694c3633a4af2b76472dcac9203a7')
-sha1sums=('c4fb10ca28ca5d781a2ed98cb7e13cbac0762cc9')
+md5sums=('ad94bb37de28fcc3997a5529277708a1')
+sha1sums=('463c334596744f60f9592752d85eb4af4feeef1d')
 
 
 build() {
diff --git a/community/scponly/PKGBUILD b/community/scponly/PKGBUILD
index 96d07c175..30bcd9d44 100644
--- a/community/scponly/PKGBUILD
+++ b/community/scponly/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 46261 2011-05-04 11:37:35Z spupykin $
+# $Id: PKGBUILD 55546 2011-09-14 08:50:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
@@ -7,7 +7,7 @@ pkgver=4.8
 pkgrel=7
 pkgdesc="A limited shell for ssh/scp"
 arch=(i686 x86_64)
-url="http://www.sublimation.org/scponly/"
+url="http://sublimation.org/scponly/"
 depends=('glibc')
 license=('custom')
 options=(docs)
diff --git a/community/splint/PKGBUILD b/community/splint/PKGBUILD
index d0676e311..f6559ab07 100644
--- a/community/splint/PKGBUILD
+++ b/community/splint/PKGBUILD
@@ -1,25 +1,30 @@
-# $Id: PKGBUILD 2039 2009-09-07 16:30:22Z spupykin $
+# $Id: PKGBUILD 55573 2011-09-14 10:41:16Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=splint
 pkgver=3.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool for statically checking C programs for security vulnerabilities and coding mistakes"
 arch=('i686' 'x86_64')
-url="http://www.splint.org"
+url="http://www.splint.org/"
 license=('GPL')
 depends=('glibc')
-source=(http://www.splint.org/downloads/splint-$pkgver.src.tgz \
-	splint.sh)
+source=("http://www.splint.org/downloads/${pkgname}-${pkgver}.src.tgz"
+    	'splint.sh')
 md5sums=('25f47d70bd9c8bdddf6b03de5949c4fd'
          '0efb6341b384dc44590989fe3678c96c')
+options=('!makeflags')
 
 build() {
-  cd $startdir/src/splint-$pkgver
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --mandir=/usr/share/man
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  cd "${srcdir}"/$pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
 
-  install -D -m755 ../splint.sh $startdir/pkg/etc/profile.d/splint.sh
+  install -D -m755 "${srcdir}"/splint.sh "${pkgdir}"/etc/profile.d/splint.sh
 }
diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD
index e7ae09a0e..7c7067615 100644
--- a/community/stunnel/PKGBUILD
+++ b/community/stunnel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55167 2011-09-04 16:26:15Z dreisner $
+# $Id: PKGBUILD 55577 2011-09-14 10:56:19Z lfleischer $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=stunnel
-pkgver=4.42
+pkgver=4.43
 pkgrel=1
 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ options=('!libtool')
 source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc}
         'Makefile.patch'
         'stunnel.rc.d')
-md5sums=('f64a7426166d397dd826deef33bb6aa0'
-         '011dc68c245c465d120e8bfad10cc891'
+md5sums=('84174925a0f2632cc5cd52b3503cf07b'
+         'bc1280f59a117f01bb037d9376f9baf6'
          'f15398497e10e080c2406d2fc541660c'
          'cb647c71ff4cb1e035b6e515d5f13ebf')
 
diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD
index ec922d418..f2ab10d98 100644
--- a/community/tinyproxy/PKGBUILD
+++ b/community/tinyproxy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44216 2011-04-04 13:31:34Z lfleischer $
+# $Id: PKGBUILD 55575 2011-09-14 10:47:03Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=tinyproxy
-pkgver=1.8.2
-pkgrel=3
+pkgver=1.8.3
+pkgrel=1
 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.'
 arch=('i686' 'x86_64')
 url='https://banu.com/tinyproxy/'
@@ -13,7 +13,7 @@ makedepends=('asciidoc')
 backup=('etc/tinyproxy/tinyproxy.conf')
 source=("https://banu.com/pub/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2"
         'tinyproxy')
-md5sums=('edc8502193cfed4974d6a770da173755'
+md5sums=('292ac51da8ad6ae883d4ebf56908400d'
          '464b5d60b1c9cbae26367fe2337c2d77')
 
 build() {
diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD
index 72b5419cc..ab879b77e 100644
--- a/community/tor/PKGBUILD
+++ b/community/tor/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 55094 2011-09-02 11:01:01Z lfleischer $
+# $Id: PKGBUILD 55579 2011-09-14 11:12:14Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: simo <simo@archlinux.org>
 
 pkgname=tor
-pkgver=0.2.2.32
+pkgver=0.2.2.33
 pkgrel=1
 pkgdesc='Anonymizing overlay network.'
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"
         'torrc'
         'tor'
         'tor.conf.d')
-md5sums=('6d70db8da9513453d520168e017a272c'
+md5sums=('ea99aba49694bb982d2fccc57a70d58e'
          '56c75d4e8a66f34167d31e38c43793dd'
          'f8e6868a389877346e7eebaacd1078bb'
          '5c7c6834064b3530c442def6079ac3aa')
diff --git a/community/vbetool/PKGBUILD b/community/vbetool/PKGBUILD
index db48df072..1eb2b244c 100644
--- a/community/vbetool/PKGBUILD
+++ b/community/vbetool/PKGBUILD
@@ -1,28 +1,32 @@
-# $Id: PKGBUILD 46960 2011-05-13 20:41:32Z andrea $
+# $Id: PKGBUILD 55527 2011-09-14 07:33:04Z andrea $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Christian Storm <Christian.Storm@gmx.DE>
 # Contributor: James Rayner <james@archlinux.org>
-# Maintainer: Thayer Williams <thayer@archlinux.org>
+# Contributor: Thayer Williams <thayer@archlinux.org>
 
 pkgname=vbetool
 pkgver=1.1
-pkgrel=1
-pkgdesc="vbetool uses lrmi in order to run code from the video BIOS"
+pkgrel=2
+pkgdesc="Uses lrmi in order to run code from the video BIOS"
 url="http://www.srcf.ucam.org/~mjg59/vbetool/"
 license=('GPL2')
 arch=('i686' 'x86_64')
 depends=('zlib' 'libx86')
 makedepends=('pciutils')
-source=(http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-${pkgver}.tar.gz)
+source=("http://www.codon.org.uk/~mjg59/${pkgname}/download/${pkgname}-${pkgver}.tar.gz")
 md5sums=('ffb03b118867a02296d7449019ad8846')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
   if [ "${CARCH}" = "x86_64" ]; then
-    ./configure --prefix=/usr --without-x86emu || return 1
+    ./configure --prefix=/usr --without-x86emu
   else
-    ./configure --prefix=/usr || return 1
+    ./configure --prefix=/usr
   fi
-  make LIBS=-lpci || return 1
-  make DESTDIR=$pkgdir install || return 1
+  make LIBS=-lpci
 }
 
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community/wmname/PKGBUILD b/community/wmname/PKGBUILD
index 83887bce0..e9c75101e 100644
--- a/community/wmname/PKGBUILD
+++ b/community/wmname/PKGBUILD
@@ -1,21 +1,25 @@
-# Contributer: Vincent Kriek <vincent@vincentkriek.nl>
+# $Id: PKGBUILD 55541 2011-09-14 08:07:38Z andrea $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Vincent Kriek <vincent@vincentkriek.nl>
 
 pkgname=wmname
 pkgver=0.1
-pkgrel=1
-pkgdesc="A utility to set the name of your window manager"
+pkgrel=2
+pkgdesc="An utility to set the name of your window manager"
 url="http://www.suckless.org/programs/wmname.html"
 license=('custom')
-depends=(libx11)
+depends=('libx11')
 arch=('i686' 'x86_64')
-source=('http://code.suckless.org/dl/tools/wmname-0.1.tar.gz')
+source=("http://dl.suckless.org/tools/wmname-$pkgver.tar.gz")
 md5sums=('6903d299f84d335e529fbd2c1d6e49fe')
 
 build() {
-	cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
+  make
+}
 
-	./configure --prefix=/usr
-	make || return 1
-	make PREFIX=$startdir/pkg/usr install || return 1
-	install -Dm0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make PREFIX="${pkgdir}"/usr install
+  install -Dm0644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/community/xosd/PKGBUILD b/community/xosd/PKGBUILD
index 688f6f92b..e604b97e3 100644
--- a/community/xosd/PKGBUILD
+++ b/community/xosd/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 41448 2009-06-04 02:08:19Z eric $
-# Maintainer: damir <damir@archlinux.org>
+# $Id: PKGBUILD 55535 2011-09-14 07:50:30Z andrea $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=xosd
 pkgver=2.2.14
-pkgrel=3
-pkgdesc="XOSD displays text on your screen. On-Screen-Display-libs for some tools."
-arch=("i686" "x86_64")
+pkgrel=4
+pkgdesc="Displays text on your screen. On-Screen-Display-libs for some tools"
+arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.ignavus.net/software.html"
-depends=('libxt' 'libxinerama')
+depends=('libxt' 'libxinerama' 'sh')
 makedepends=('xmms' 'bmp' 'gdk-pixbuf')
 optdepends=('gdk-pixbuf: for using the bmp or xmms plugin')
-options=(!libtool)
-#source=("http://www.ignavus.net/xosd-$pkgver.tar.bz2")
-source=("http://ftp.de.debian.org/debian/pool/main/x/xosd/xosd_$pkgver.orig.tar.gz")
+options=('!libtool')
+source=("http://downloads.sourceforge.net/libxosd/${pkgname}-${pkgver}.tar.gz")
 md5sums=('4b349fe930e4eee2f504d6c02673e24d')
 
 build() {
-  cd "$srcdir/xosd-$pkgver"
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
-  sed -i 's/AC_DEFUN(AM_PATH_LIBXOSD,/AC_DEFUN([AM_PATH_LIBXOSD],/' \
-    "$pkgdir/usr/share/aclocal/libxosd.m4" || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
 }
 
-
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  sed -i 's/AC_DEFUN(AM_PATH_LIBXOSD,/AC_DEFUN([AM_PATH_LIBXOSD],/' \
+    "$pkgdir/usr/share/aclocal/libxosd.m4"
+}
diff --git a/community/xxkb/PKGBUILD b/community/xxkb/PKGBUILD
index c093c1b81..4bcf2b771 100644
--- a/community/xxkb/PKGBUILD
+++ b/community/xxkb/PKGBUILD
@@ -1,40 +1,42 @@
-# $Id: PKGBUILD 1001 2009-08-11 09:14:06Z spupykin $
+# $Id: PKGBUILD 55567 2011-09-14 10:23:32Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xxkb
 pkgver=1.11
-pkgrel=3
+pkgrel=4
 pkgdesc="keyboard layout switcher/indicator"
-arch=(i686 x86_64)
-url="http://sf.net/projects/xxkb/"
-license=(PerlArtistic)
-depends=(libxpm)
-makedepends=(patch imake)
-source=(http://downloads.sourceforge.net/xxkb/xxkb-$pkgver-src.tar.gz
-	XXkb \
-	en22.xpm \
-	ru22.xpm)
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/xxkb/"
+license=('PerlArtistic')
+depends=('libxpm')
+makedepends=('imake')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver-src.tar.gz"
+    	XXkb
+    	en22.xpm
+    	ru22.xpm)
 md5sums=('c2e5c7f3285033f0e26b358ef95a7c89'
          'f181b7a017d3d2524ecf10638317d341'
          '649c6d378fe12853d457b768bd273dc5'
          'f1692f0be5fc697b3b792d0098bdb42f')
 
 build() {
-  cd $srcdir/xxkb
+  cd "${srcdir}"/${pkgname}
   xmkmf
-  make PROJECTROOT=/usr PIXMAPDIR=/usr/share/$pkgname LOCAL_LIBRARIES='-lXext -lXt -lXpm' || return 1
+  make PROJECTROOT=/usr PIXMAPDIR=/usr/share/$pkgname LOCAL_LIBRARIES='-lXext -lXt -lXpm'
+}
 
+package() {
+  cd "${srcdir}"/${pkgname}
   install -d $pkgdir/usr/bin
   install -d $pkgdir/usr/share/$pkgname
   install -d $pkgdir/usr/man/man1
   install -d $pkgdir/usr/share/X11/app-defaults
 
-  install -m 0755 xxkb $pkgdir/usr/bin && \
-  install -m 0644 ../XXkb $pkgdir/usr/share/X11/app-defaults/XXkb && \
-  install -m 0644 pixmaps/*.xpm $pkgdir/usr/share/$pkgname && \
-  install -m 0644 $pkgname.man $pkgdir/usr/man/man1/$pkgname.1 && \
-  install -m 0644 ../*.xpm $pkgdir/usr/share/$pkgname/ || return 1
+  install -m 0755 xxkb $pkgdir/usr/bin
+  install -m 0644 ../XXkb $pkgdir/usr/share/X11/app-defaults/XXkb
+  install -m 0644 pixmaps/*.xpm $pkgdir/usr/share/$pkgname
+  install -m 0644 $pkgname.man $pkgdir/usr/man/man1/$pkgname.1
+  install -m 0644 ../*.xpm $pkgdir/usr/share/$pkgname/
 
   mv $pkgdir/usr/man $pkgdir/usr/share/
 }
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD
new file mode 100644
index 000000000..72cb1194c
--- /dev/null
+++ b/core/curl/PKGBUILD
@@ -0,0 +1,60 @@
+# $Id: PKGBUILD 138015 2011-09-14 11:16:01Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=curl
+pkgver=7.22.0
+pkgrel=1
+pkgdesc="An URL retrival utility and library"
+arch=('i686' 'x86_64')
+url="http://curl.haxx.se"
+license=('MIT')
+depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2')
+options=('!libtool')
+source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+        curlbuild.h)
+md5sums=('e8c36126d21c893f085aca233906b5cc'
+         '1b061c348b63ea3e90c3f2c3af6a08d6'
+         '751bd433ede935c8fae727377625a8ae')
+
+
+case $(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') in
+  8) _curlbuild=curlbuild-64.h ;;
+  4) _curlbuild=curlbuild-32.h ;;
+  *) error "unsupported architecture: %s" "$CARCH"
+    exit 1
+    ;;
+esac
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+      --with-random=/dev/urandom \
+      --prefix=/usr \
+      --mandir=/usr/share/man \
+      --disable-dependency-tracking \
+      --enable-ipv6 \
+      --disable-ldaps \
+      --disable-ldap \
+      --enable-manual \
+      --enable-versioned-symbols \
+      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
+      --without-libidn \
+      --enable-threaded-resolver
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4"
+  mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
+  install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
+}
diff --git a/core/curl/curlbuild.h b/core/curl/curlbuild.h
new file mode 100644
index 000000000..b48862696
--- /dev/null
+++ b/core/curl/curlbuild.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "curlbuild-32.h"
+#elif __WORDSIZE == 64
+#include "curlbuild-64.h"
+#else
+#error "Unknown word size"
+#endif
diff --git a/core/libssh2/PKGBUILD b/core/libssh2/PKGBUILD
new file mode 100644
index 000000000..3fcc6eccd
--- /dev/null
+++ b/core/libssh2/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 138017 2011-09-14 11:16:24Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: ice-man <icemanf@gmail.com>
+
+pkgname=libssh2
+pkgver=1.3.0
+pkgrel=1
+pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts"
+url="http://www.libssh2.org/"
+arch=('i686' 'x86_64')
+license=('BSD')
+depends=('openssl')
+makedepends=('zlib')
+options=('!libtool')
+source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc})
+md5sums=('6425331899ccf1015f1ed79448cb4709'
+         '6ddcc9f2b37941f8291d7494ee8f89b7')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD
index 2db407582..3f38c53f3 100644
--- a/core/make/PKGBUILD
+++ b/core/make/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 129849 2011-06-29 04:28:30Z allan $
+# $Id: PKGBUILD 138005 2011-09-14 05:05:13Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=make
 pkgver=3.82
-pkgrel=3
+pkgrel=4
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/make"
@@ -15,11 +15,13 @@ install=$pkgname.install
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         bug30612.patch
         bug30723.patch
-        make-3.82-sort-blank.patch)
+        make-3.82-sort-blank.patch
+        make-3.82-makeflags.patch)
 md5sums=('1a11100f3c63fcf5753818e59d63088f'
          'c8f496b22191f9fb9420ab14c1a19a47'
          '662e6450e19a5acdaa5c9fcb8ad78dea'
-         '7d01a99f389d8f08dec93ed479071ee4')
+         '7d01a99f389d8f08dec93ed479071ee4'
+         'bc12ad4d0c6e6c0e72d9fb61054f446b')
 
 
 build() {
@@ -34,6 +36,10 @@ build() {
   # https://bugs.archlinux.org/task/22733 (fix from Fedora)
   patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
   
+  # https://savannah.gnu.org/support/index.php?107487
+  # https://savannah.gnu.org/bugs/?33873
+  patch -Np0 -i $srcdir/make-3.82-makeflags.patch
+  
   ./configure --prefix=/usr
   make
 }
diff --git a/core/make/make-3.82-makeflags.patch b/core/make/make-3.82-makeflags.patch
new file mode 100644
index 000000000..3cba3c402
--- /dev/null
+++ b/core/make/make-3.82-makeflags.patch
@@ -0,0 +1,36 @@
+Index: main.c
+===================================================================
+RCS file: /sources/make/make/main.c,v
+retrieving revision 1.246
+diff -u -r1.246 main.c
+--- main.c	29 Aug 2010 23:05:27 -0000	1.246
++++ main.c	27 Jul 2011 22:03:12 -0000
+@@ -2091,10 +2095,16 @@
+ 
+           /* Reset makeflags in case they were changed.  */
+           {
++            if (master_job_slots)
++              {
++                assert (job_slots == default_job_slots);
++                job_slots = master_job_slots;
++              }
+             const char *pv = define_makeflags (1, 1);
+             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
+             sprintf (p, "MAKEFLAGS=%s", pv);
+             putenv (allocated_variable_expand (p));
++            job_slots = default_job_slots;
+           }
+ 
+ 	  if (ISDB (DB_BASIC))
+@@ -2825,9 +2852,11 @@
+ 		       && (*(unsigned int *) cs->value_ptr ==
+ 			   *(unsigned int *) cs->noarg_value))
+ 		ADD_FLAG ("", 0); /* Optional value omitted; see below.  */
++#if 0
+ 	      else if (cs->c == 'j')
+ 		/* Special case for `-j'.  */
+ 		ADD_FLAG ("1", 1);
++#endif
+ 	      else
+ 		{
+ 		  char *buf = alloca (30);
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index e90a5f885..6f2ee060d 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 136658 2011-08-31 11:29:58Z pierre $
+# $Id: PKGBUILD 138021 2011-09-14 11:59:52Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apache
-pkgver=2.2.20
+pkgver=2.2.21
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
@@ -35,7 +35,7 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
         httpd.logrotate
         httpd
         arch.layout)
-md5sums=('1ac251431c8c4285f6b085c1d156bb56'
+md5sums=('1696ae62cd879ab1d4dd9ff021a470f2'
          'f1d9d41360908ceb2374da55ae99197a'
          'cdfa04985a0efa850976aef01c2a0c40'
          '0930d2d0612eb0a53a0d00aea7e8687f'
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index ead1d0b85..106f55cec 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 137536 2011-09-08 21:54:21Z andrea $
+# $Id: PKGBUILD 138026 2011-09-14 18:37:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=digikam
-pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libmediawiki')
-pkgver=2.1.0
+pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
+pkgver=2.1.1
 pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
              'cmake' 'automoc4' 'doxygen')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('3e5228a60ae916c530a7a87e081862b6')
+md5sums=('8cd3f5f2141bbb54ba2fd80371582c2c')
 
 build() {
   cd "${srcdir}"
@@ -61,6 +61,14 @@ package_libkgeomap() {
   make DESTDIR="${pkgdir}" install
 }
 
+package_libkvkontakte() {
+  pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network"
+  depends=('kdelibs')
+
+  cd "${srcdir}"/build/extra/libkvkontakte
+  make DESTDIR="${pkgdir}" install
+}
+
 package_libmediawiki() {
   pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org"
   depends=('kdelibs')
@@ -72,7 +80,7 @@ package_libmediawiki() {
 package_kipi-plugins() {
   pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
   depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane'
-           'opencv' 'qjson')
+           'opencv' 'qjson' 'libkvkontakte')
   optdepends=('libkgeomap'
               'libmediawiki'
               'libgpod'
diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD
index 7a6fe124d..20b9a1b11 100644
--- a/extra/libgee/PKGBUILD
+++ b/extra/libgee/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 108155 2011-01-30 12:17:51Z ibiru $
+# $Id: PKGBUILD 138009 2011-09-14 09:17:28Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libgee
-pkgver=0.6.1
+pkgver=0.6.2.1
 pkgrel=1
 pkgdesc="GObject collection library"
 url="http://live.gnome.org/Libgee"
 license=('LGPL2.1')
 arch=('i686' 'x86_64')
-depends=('glib2>=2.26')
+depends=('glib2')
 makedepends=('gobject-introspection')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/libgee/0.6/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('e6220f321b53f7732e0b45db7b8f29088cf4892e798b9b9a02bed16938030121')
+source=(http://ftp.gnome.org/pub/GNOME/sources/libgee/0.6/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('478f7daebe8369ad72bf83431d953db772af6865ff3aa21bf75bf6730f561389')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure --prefix=/usr --disable-static
     make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
 }
diff --git a/gnome-unstable/gtk3/PKGBUILD b/gnome-unstable/gtk3/PKGBUILD
index 8fb644609..b3d0029e0 100644
--- a/gnome-unstable/gtk3/PKGBUILD
+++ b/gnome-unstable/gtk3/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 137070 2011-09-05 21:25:37Z ibiru $
+# $Id: PKGBUILD 138010 2011-09-14 09:22:13Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.1.18
+pkgver=3.1.90
 pkgrel=1
 pkgdesc="The GTK+ Toolkit (v3)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info')
-makedepends=('gobject-introspection' 'colord')
+depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord')
+makedepends=('gobject-introspection')
 options=('!libtool' '!docs')
 backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.1/gtk+-${pkgver}.tar.xz
         settings.ini)
-sha256sums=('22197439092404b43184d6121d047610f6c4573891309feca36ac8eedeaf6ab4'
+sha256sums=('dc65a5ec50df57cc603b30fb85e6c68be36673688babcb21d2ad6123d63c4a8b'
             'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
 
 build() {
diff --git a/gnome-unstable/mutter/PKGBUILD b/gnome-unstable/mutter/PKGBUILD
index 4a718fbc4..0ce91f06d 100644
--- a/gnome-unstable/mutter/PKGBUILD
+++ b/gnome-unstable/mutter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 136864 2011-09-02 14:00:59Z ibiru $
+# $Id: PKGBUILD 138028 2011-09-14 22:00:55Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=3.1.90.1
+pkgver=3.1.91.1
 pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64)
@@ -16,7 +16,7 @@ groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=mutter.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('6ff689cc3f533fce8682bd8a0eaf50147b0e5d831be8d91cc9b00cf49dfb5bd3')
+sha256sums=('ea665ba523d2b62f8cdfb1b0285c7672ac395774af3cb059bfd39bed8cb71d31')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 44ffecd3b..cc77a04c3 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=texlive-bin-libre
 pkgver=2011.1
 _luatex_ver=0.70.1
-pkgrel=1
+pkgrel=2
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -63,7 +63,7 @@ build() {
    ../source/configure --prefix=/usr -C \
      --disable-native-texlive-build \
      --with-banner-add="/Parabola GNU/Linux-libre" \
-    --enable-cxx-runtime-hack \
+    --disable-cxx-runtime-hack \
     --disable-all-pkgs \
     --disable-dump-share \
     --disable-ptex \
@@ -234,7 +234,8 @@ package() {
    rm -rf ${pkgdir}/usr/{texmf,texmf-dist}
 
    ## install luatex binary
-   install -m755 $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex $pkgdir/usr/bin/
+   cd $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c
+   ./libtool --mode=install install -m755 luatex $pkgdir/usr/bin/
    cd $pkgdir/usr/bin
    /bin/ln -s luatex texlua
    /bin/ln -s luatex texluac
diff --git a/testing/mdadm/PKGBUILD b/testing/mdadm/PKGBUILD
new file mode 100644
index 000000000..755373823
--- /dev/null
+++ b/testing/mdadm/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id: PKGBUILD 138013 2011-09-14 09:45:11Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+pkgname=mdadm
+pkgver=3.2.2
+pkgrel=4
+pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/"
+groups=('base')
+conflicts=('mkinitcpio<0.7')
+depends=('glibc')
+backup=('etc/mdadm.conf')
+source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
+        mdadm 
+        mdadm.conf 
+        mdadm_install
+        mdadm_hook
+        mdadm_udev_install
+        disable-werror.patch
+        linux-3.0.patch)
+install=mdadm.install
+replaces=('raidtools')
+md5sums=('12ee2fbf3beddb60601fb7a4c4905651'
+         '6df172c8f77b280018cf87eb3d313f29'
+         '00cbed931db4f15b6ce49e3e7d433966'
+         '9b01e96b6c3c218fb61628c9281fe688'
+         'c8c0713f5c7da51822ee6f3911473a1c'
+         'cd258e1bf430c02a25f40b4329df9f57'
+         '4ad87b74a4bc9a34621280abe0e0c3e4'
+         'c499b3edbf2c400c8a1984e18c7ce7fa')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np0 -i ../disable-werror.patch
+  patch -Np1 -i ../linux-3.0.patch
+  make CXFLAGS="$CFLAGS"
+  # build static mdassemble for Arch's initramfs
+  make MDASSEMBLE_AUTO=1 mdassemble
+  
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make INSTALL=/bin/install DESTDIR=$pkgdir install
+  install -D -m755 mdassemble $pkgdir/sbin/mdassemble
+  install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
+  install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
+  install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm
+  install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm
+  install -D -m644 ../mdadm_udev_install $pkgdir/lib/initcpio/install/mdadm_udev
+  # symlink for backward compatibility
+  ln -sf /lib/initcpio/hooks/mdadm  $pkgdir/lib/initcpio/hooks/raid
+}
diff --git a/testing/mdadm/disable-werror.patch b/testing/mdadm/disable-werror.patch
new file mode 100644
index 000000000..50a33f19d
--- /dev/null
+++ b/testing/mdadm/disable-werror.patch
@@ -0,0 +1,11 @@
+--- Makefile.old	2011-06-17 09:38:03.269238332 +0200
++++ Makefile	2011-06-17 09:38:14.122398837 +0200
+@@ -42,7 +42,7 @@
+ 
+ CC = $(CROSS_COMPILE)gcc
+ CXFLAGS = -ggdb
+-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
++CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
+ ifdef WARN_UNUSED
+ CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
+ endif
diff --git a/testing/mdadm/linux-3.0.patch b/testing/mdadm/linux-3.0.patch
new file mode 100644
index 000000000..cd9d5473c
--- /dev/null
+++ b/testing/mdadm/linux-3.0.patch
@@ -0,0 +1,45 @@
+From f161d047eed634b3380262767f955eb888502e88 Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb@suse.de>
+Date: Fri, 17 Jun 2011 22:49:24 +1000
+Subject: [PATCH 1/1] util: correctly parse shorter linux version numbers.
+
+The next version of Linux might be 3.0.  If it is, get_linux_version
+will fail.
+So make it more robust.
+
+Reported-by: Namhyung Kim <namhyung@gmail.com>
+Reported-by: Milan Broz <mbroz@redhat.com>
+Signed-off-by: NeilBrown <neilb@suse.de>
+---
+ util.c |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/util.c b/util.c
+index 10bbe56..55d171a 100644
+--- a/util.c
++++ b/util.c
+@@ -146,16 +146,16 @@ int get_linux_version()
+ {
+ 	struct utsname name;
+ 	char *cp;
+-	int a,b,c;
++	int a = 0, b = 0,c = 0;
+ 	if (uname(&name) <0)
+ 		return -1;
+ 
+ 	cp = name.release;
+ 	a = strtoul(cp, &cp, 10);
+-	if (*cp != '.') return -1;
+-	b = strtoul(cp+1, &cp, 10);
+-	if (*cp != '.') return -1;
+-	c = strtoul(cp+1, NULL, 10);
++	if (*cp == '.')
++		b = strtoul(cp+1, &cp, 10);
++	if (*cp == '.')
++		c = strtoul(cp+1, &cp, 10);
+ 
+ 	return (a*1000000)+(b*1000)+c;
+ }
+-- 
+1.7.2.3
+
diff --git a/testing/mdadm/mdadm b/testing/mdadm/mdadm
new file mode 100755
index 000000000..e196f3642
--- /dev/null
+++ b/testing/mdadm/mdadm
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /sbin/mdadm`
+case "$1" in
+  start)
+    stat_busy "Starting mdadm RAID Monitor"
+    if [ -z "$PID" ]; then 
+       /sbin/mdadm --monitor --scan -i /var/run/mdadm.pid -f
+    fi
+    if [ ! -z "$PID" -o $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon mdadm
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping mdadm RAID Monitor"
+    [ ! -z "$PID" ] && kill $PID &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon mdadm
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
diff --git a/testing/mdadm/mdadm.conf b/testing/mdadm/mdadm.conf
new file mode 100644
index 000000000..57bd4c683
--- /dev/null
+++ b/testing/mdadm/mdadm.conf
@@ -0,0 +1,67 @@
+# mdadm configuration file
+#
+# mdadm will function properly without the use of a configuration file,
+# but this file is useful for keeping track of arrays and member disks.
+# In general, a mdadm.conf file is created, and updated, after arrays
+# are created. This is the opposite behavior of /etc/raidtab which is
+# created prior to array construction.
+#
+#
+# the config file takes two types of lines:
+#
+#	DEVICE lines specify a list of devices of where to look for
+#	  potential member disks
+#
+#	ARRAY lines specify information about how to identify arrays so
+#	  so that they can be activated
+#
+
+
+# You can have more than one device line and use wild cards. The first 
+# example includes SCSI the first partition of SCSI disks /dev/sdb,
+# /dev/sdc, /dev/sdd, /dev/sdj, /dev/sdk, and /dev/sdl. The second 
+# line looks for array slices on IDE disks.
+#
+#DEVICE /dev/sd[bcdjkl]1
+#DEVICE /dev/hda1 /dev/hdb1
+#
+# The designation "partitions" will scan all partitions found in
+# /proc/partitions
+DEVICE partitions
+
+
+# ARRAY lines specify an array to assemble and a method of identification.
+# Arrays can currently be identified by using a UUID, superblock minor number,
+# or a listing of devices.
+#
+#	super-minor is usually the minor number of the metadevice
+#	UUID is the Universally Unique Identifier for the array
+# Each can be obtained using
+#
+# 	mdadm -D <md>
+#
+# To capture the UUIDs for all your RAID arrays to this file, run these:
+#    to get a list of running arrays:
+#    # mdadm -D --scan >>/etc/mdadm.conf
+#    to get a list from superblocks:
+#    # mdadm -E --scan >>/etc/mdadm.conf
+#
+#ARRAY /dev/md0 UUID=3aaa0122:29827cfa:5331ad66:ca767371
+#ARRAY /dev/md1 super-minor=1
+#ARRAY /dev/md2 devices=/dev/hda1,/dev/hdb1
+#
+# ARRAY lines can also specify a "spare-group" for each array.  mdadm --monitor
+# will then move a spare between arrays in a spare-group if one array has a
+# failed drive but no spare
+#ARRAY /dev/md4 uuid=b23f3c6d:aec43a9f:fd65db85:369432df spare-group=group1
+#ARRAY /dev/md5 uuid=19464854:03f71b1b:e0df2edd:246cc977 spare-group=group1
+#
+
+
+# When used in --follow (aka --monitor) mode, mdadm needs a
+# mail address and/or a program.  To start mdadm's monitor mode, add
+# "mdadm" to your DAEMONS array in /etc/rc.conf
+#
+# If the lines are not found, mdadm will exit quietly
+#MAILADDR root@mydomain.tld
+#PROGRAM /usr/sbin/handle-mdadm-events
diff --git a/testing/mdadm/mdadm.install b/testing/mdadm/mdadm.install
new file mode 100644
index 000000000..e8404c260
--- /dev/null
+++ b/testing/mdadm/mdadm.install
@@ -0,0 +1,10 @@
+# arg 1:  the new package version
+# arg 2:  the old package version
+
+post_upgrade() {
+  if [ "$(vercmp $2 2.6.8-2)" -lt 0 -a "$(grep raid_partitions /etc/mkinitcpio.conf)" ]; then
+    echo "Attention mdadm update:"
+    echo "raid_partitions hook has been replaced by the more powerfull mdadm hook."
+    echo "Please update your /etc/mkinitcpio.conf accordingly."
+  fi
+}
diff --git a/testing/mdadm/mdadm_hook b/testing/mdadm/mdadm_hook
new file mode 100755
index 000000000..7b2dc1ad1
--- /dev/null
+++ b/testing/mdadm/mdadm_hook
@@ -0,0 +1,44 @@
+# vim: set ft=sh:
+run_hook ()
+{
+    input="$(cat /proc/cmdline)"
+    mdconfig="/etc/mdadm.conf"
+    # for partitionable raid, we need to load md_mod first!
+    modprobe md_mod 2>/dev/null
+    # If md is specified on commandline, create config file from those parameters.
+    if [ "$(echo $input | grep "md=")" ]; then
+        #Create initial mdadm.conf
+        # scan all devices in /proc/partitions
+        echo DEVICE partitions > $mdconfig
+        for i in $input; do 
+            case $i in
+                # raid 
+                md=[0-9]*,/*)
+                    device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')"
+                    array="$(echo $i | cut -d, -f2-)"
+                    echo "ARRAY /dev/$device devices=$array" >> $mdconfig
+                    ;;
+                # partitionable raid
+                md=d[0-9]*,/*)
+                    device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')"
+                    array="$(echo $i | cut -d, -f2-)"
+                    echo "ARRAY /dev/$device devices=$array" >> $mdconfig
+                    ;;
+                # raid UUID 
+                md=[0-9]*,[0-9,a-z]*)
+                    device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')"
+                    array="$(echo $i | cut -d, -f2-)"
+                    echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
+                    ;;
+                # partitionable raid UUID
+                md=d[0-9]*,[0-9,a-z]*)
+                    device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')"
+                    array="$(echo $i | cut -d, -f2-)"
+                    echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
+                    ;;
+            esac 
+        done
+    fi
+    # assemble everything
+    [ -e $mdconfig ] && /sbin/mdassemble
+}
diff --git a/testing/mdadm/mdadm_install b/testing/mdadm/mdadm_install
new file mode 100644
index 000000000..b53258676
--- /dev/null
+++ b/testing/mdadm/mdadm_install
@@ -0,0 +1,45 @@
+# vim: set ft=sh:
+
+build()
+{
+    MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
+    BINARIES=""
+    FILES=""
+    SCRIPT="mdadm"
+    # check if a custom mdadm.conf exists
+    if grep -q ^ARRAY /etc/mdadm.conf; then
+        echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
+        add_file "/etc/mdadm.conf"
+    fi
+    add_binary "/sbin/mdassemble"
+}
+
+help ()
+{
+cat<<HELPEOF
+  This hook loads the necessary modules for any raid root device,
+  and assembles the raid device when run.
+
+  If arrays are defined in /etc/mdadm.conf, the file will be used instead
+  of command line assembling.
+  
+  Command Line Setup:
+  - for raid arrays with persistent superblocks:
+    md=<md device no.>,dev0,dev1,...,devn
+    md=<md device no.>,uuid
+  - for partitionable raid arrays with persistent superblocks:
+    md=d<md device no.>,dev0,dev1,...,devn
+    md=d<md device no.>,uuid
+
+  Parameters:
+  - <md device no.> = the number of the md device: 
+    0 means md0, 1 means md1, ...
+  - <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1
+                   or 0900878d:f95f6057:c39a36e9:55efa60a
+  Examples:
+  - md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1
+    This will setup 2 md partitionable arrays.
+  - md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1
+    This will setup 2 md arrays with persistent superblocks.
+HELPEOF
+}
diff --git a/testing/mdadm/mdadm_udev_install b/testing/mdadm/mdadm_udev_install
new file mode 100644
index 000000000..9fc161624
--- /dev/null
+++ b/testing/mdadm/mdadm_udev_install
@@ -0,0 +1,23 @@
+# vim: set ft=sh:
+
+build()
+{
+    MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
+    BINARIES=""
+    FILES=""
+    SCRIPT=""
+    # check if a custom mdadm.conf exists
+    if grep -q ^ARRAY /etc/mdadm.conf; then
+        echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
+        add_file "/etc/mdadm.conf"
+    fi
+    add_binary "/sbin/mdadm"
+    add_file "/lib/udev/rules.d/64-md-raid.rules"
+}
+
+help ()
+{
+cat<<HELPEOF
+  This hook loads raid arrays with udev.
+HELPEOF
+}
diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD
index 138325de4..209144a69 100644
--- a/~fauno/notmuch/PKGBUILD
+++ b/~fauno/notmuch/PKGBUILD
@@ -3,8 +3,8 @@
 # Maintainer: Richard Murri <admin@richardmurri.com>
 
 pkgname=notmuch
-pkgver=0.7
-pkgrel=2
+pkgver=0.8
+pkgrel=1
 pkgdesc="Notmuch is not much of an email program"
 arch=(i686 x86_64 mips64el)
 url="http://notmuchmail.org/"
@@ -17,7 +17,7 @@ optdepends=('emacs: for using the emacs interface'
             'ruby: for using the ruby bindings'
             'gnupg: for email encryption')
 source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('475197e505255b9603eedb53a68aa32d')
+md5sums=('915fe95817e263d62e6de5c3b3c389c4')
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"