Merge branch 'master' of vparabola:~/abslibre-pre-mips64el

Conflicts: community/mingw32-gcc/PKGBUILD extra/transmission/PKGBUILD libre/icecat/PKGBUILD multilib/nspluginwrapper/PKGBUILD
author: Joshua Ismael Haase Hernández <hahj87@gmail.com> 2011-06-28 08:22:26 -0500
committer: Joshua Ismael Haase Hernández <hahj87@gmail.com> 2011-06-28 08:22:26 -0500
commit: cf34f2a7f0e4e0ca113a46845509e43cdc0eb3c3 (patch)
tree: 009c64b580f512fe47a0543b590580585b56534f
parent: 3dc4525661db2630038e019a2a31b71fdcbfb74a (diff)
parent: 1732308adb7885b00fc388f978e65b3ad15aa067 (diff)
76 files changed, 1223 insertions, 265 deletions
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index b3851c4b6..5041a2d79 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=aria2
-pkgver=1.11.2
+pkgver=1.12.0
 pkgrel=1
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url='http://aria2.sourceforge.net/'
 license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates')
 source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2")
-sha1sums=('db4761fa311e6d1f9526d1ee25461c2db84750ff')
+sha1sums=('5bc6f07f84f6ad1d0e222d2b5c78cd3118e1a569')
 
 build() {
   cd aria2-${pkgver}
diff --git a/community/cabextract/PKGBUILD b/community/cabextract/PKGBUILD
index 20fd3e5ef..3801ff4b8 100644
--- a/community/cabextract/PKGBUILD
+++ b/community/cabextract/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id: PKGBUILD 34168 2010-12-04 02:18:42Z andrea $
-# Maintainer:
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# $Id: PKGBUILD 50767 2011-06-30 19:23:26Z giovanni $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=cabextract
-pkgver=1.3
+pkgver=1.4
 pkgrel=1
 pkgdesc="A program to extract Microsoft cabinet (.CAB) files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +10,7 @@ license=('GPL')
 url="http://www.cabextract.org.uk/"
 depends=('glibc')
 source=("http://www.cabextract.org.uk/${pkgname}-${pkgver}.tar.gz")
-md5sums=('cb9a4a38470d2a71a0275968e7eb64d3')
+md5sums=('79f41f568cf1a3ac105e0687e8bfb7c0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -24,5 +23,6 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
 }
diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD
index 51abeb437..6920b21fd 100644
--- a/community/courier-mta/PKGBUILD
+++ b/community/courier-mta/PKGBUILD
@@ -8,8 +8,8 @@
 
 
 pkgname=courier-mta
-pkgver=0.66.1
-pkgrel=4
+pkgver=0.66.3
+pkgrel=1
 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
@@ -30,6 +30,7 @@ conflicts=('courier-imap' 'smtp-forwarder' 'smtp-server' 'imap-server' 'courier-
 options=('!libtool')
 install=courier-mta.install
 source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2
+        courier.rc.d
         courier-mta.rc.d 
 		courier-mta.conf.d
         esmtpd.rc.d
@@ -39,7 +40,8 @@ source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/couri
         pop3d.rc.d
         pop3d-ssl.rc.d
         webmaild.rc.d)
-md5sums=('79250d71d88ba2bcb630b7356f0250cd'
+md5sums=('3b28f14afe3db09b74b4845323c3e982'
+         'bc2bdbc2f5c95cee8304f98a3b3a4895'
          'e140f320968e57cfe459cd7a3b4017e0'
          'f3ff70b40c7a1f7a017e8c4cc4d92f4f'
          '799ddd56ff6c9cff132e8c771dde23d9'
@@ -115,6 +117,7 @@ package() {
   # arch specific scripts
   install -Dm 644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/courier-mta
   install -Dm 755 ${srcdir}/${pkgname}.rc.d ${pkgdir}/etc/rc.d/courier-mta
+  install -D -m 755 ${srcdir}/courier.rc.d ${pkgdir}/etc/rc.d/courier
   install -D -m 755 ${srcdir}/imapd.rc.d ${pkgdir}/etc/rc.d/imapd
   install -D -m 755 ${srcdir}/imapd-ssl.rc.d ${pkgdir}/etc/rc.d/imapd-ssl
   install -D -m 755 ${srcdir}/pop3d.rc.d ${pkgdir}/etc/rc.d/pop3d
diff --git a/community/courier-mta/courier-mta.install b/community/courier-mta/courier-mta.install
index 64de4da6b..e835e3efd 100644
--- a/community/courier-mta/courier-mta.install
+++ b/community/courier-mta/courier-mta.install
@@ -27,7 +27,7 @@ post_upgrade() {
   echo "Example prior to this change:"
   echo "    DAEMONS=( ... courier-mta ...)"
   echo "Example after this change:"
-  echo "    DAEMONS=( ... authdaemond esmtpd esmtpd-ssl imapd imapd-ssl"
+  echo "    DAEMONS=( ... authdaemond courier esmtpd esmtpd-ssl imapd imapd-ssl"
   echo "                  pop3d pop3d-ssl webmaild ... )"
   echo "This allows better control over the daemons and will generate"
   echo "correct entries in /run/daemons"
diff --git a/community/courier-mta/courier.rc.d b/community/courier-mta/courier.rc.d
new file mode 100644
index 000000000..7c321d452
--- /dev/null
+++ b/community/courier-mta/courier.rc.d
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+
+    [ -d /var/run/courier ] || mkdir -p /var/run/courier
+	chown courier:courier /var/run/courier
+    
+    if [ ! -f /var/run/daemons/authdaemond ]; then
+      echo "ERROR: authdaemond is not running"
+      stat_fail
+      exit 1
+    fi
+
+    stat_busy "Starting Courier daemon"
+    /usr/sbin/courier start
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon courier
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Courier daemon"
+    /usr/sbin/courier stop > /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon courier
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 1e8718b8b..f98fa3be3 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 45163 2011-04-18 02:26:25Z stephane $
+# $Id: PKGBUILD 50806 2011-07-01 15:04:30Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 pkgname=cppcheck
-pkgver=1.48
+pkgver=1.49
 pkgrel=1
 pkgdesc="A tool for static C/C++ code analysis"
 arch=('i686' 'x86_64' 'mips64el')
@@ -9,7 +9,7 @@ url="http://cppcheck.wiki.sourceforge.net/"
 license=('GPL')
 depends=('pcre')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('10cf38034148b7cb258840febe620ba397114fd1')
+sha1sums=('d04c1b207aca59f845aac57de3b08f44168d5aa9')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 500e28dc9..d062da154 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: Christian Himpel <chressie at gmail dot com>
 
 pkgname=go
-pkgver=r57.1
-pkgrel=3
+pkgver=r58
+pkgrel=1
 epoch=1
 pkgdesc='Google Go compiler and tools (release version)'
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/gprolog/PKGBUILD b/community/gprolog/PKGBUILD
index d9675feec..e65fcb8c7 100644
--- a/community/gprolog/PKGBUILD
+++ b/community/gprolog/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 18237 2010-06-01 19:57:36Z spupykin $
+# $Id: PKGBUILD 50772 2011-06-30 21:54:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Contributer: Jason Chu <jchu@xentac.net>
 
 pkgname=gprolog
-pkgver=1.3.1
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="GNU Prolog"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gprolog.org/"
-depends=(glibc)
+depends=('glibc')
 license=('GPL')
 source=(ftp://ftp.gnu.org/gnu/gprolog/gprolog-$pkgver.tar.gz)
-md5sums=('cbae19c31e17bcfca4b57fe35ec4aba2')
+md5sums=('9d4fc311b7f6e37e524a5e7ccd0b6c28')
 
 build() {
    cd "$srcdir/gprolog-$pkgver/src"
    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-   make || return 1
+   make
+}
+
+package() {
+   cd "$srcdir/gprolog-$pkgver/src"
    make install \
 	INSTALL_DIR="$pkgdir"/usr/share/gprolog \
 	LINKS_DIR="$pkgdir"/usr/bin \
@@ -25,14 +29,14 @@ build() {
 	HTML_DIR="$pkgdir"/usr/share/gprolog/doc/Html \
 	EXAMPLES_DIR="$pkgdir"/usr/share/gprolog \
 	sysconfdir="$pkgdir"/etc \
-	localstatedir="$pkgdir"/var || return 1
+	localstatedir="$pkgdir"/var
    cd "$pkgdir"/usr/bin
    rm *
-   ln -s /usr/share/gprolog/bin/fd2c && \
-   ln -s /usr/share/gprolog/bin/gplc && \
-   ln -s /usr/share/gprolog/bin/gprolog && \
-   ln -s /usr/share/gprolog/bin/hexgplc && \
-   ln -s /usr/share/gprolog/bin/ma2asm && \
-   ln -s /usr/share/gprolog/bin/pl2wam && \
+   ln -s /usr/share/gprolog/bin/fd2c
+   ln -s /usr/share/gprolog/bin/gplc
+   ln -s /usr/share/gprolog/bin/gprolog
+   ln -s /usr/share/gprolog/bin/hexgplc
+   ln -s /usr/share/gprolog/bin/ma2asm
+   ln -s /usr/share/gprolog/bin/pl2wam
    ln -s /usr/share/gprolog/bin/wam2ma
 }
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index 5d18ef625..247a48b09 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 47243 2011-05-19 13:26:51Z stativ $
+# $Id: PKGBUILD 50795 2011-07-01 12:20:10Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=intellij-idea-libs
-pkgver=10.5
-_pkgver=107.105
+pkgver=10.5.1
+_pkgver=107.322
 pkgrel=1
 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,7 +10,7 @@ url="http://www.jetbrains.org/"
 license=('apache')
 depends=('glibc')
 source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('365d1a5ee9255175065c764d634b3698')
+md5sums=('f90ce6b7a2b8d2191156dd111fe6a63d')
 
 build() {
   cd "$srcdir"
diff --git a/community/liblockfile/PKGBUILD b/community/liblockfile/PKGBUILD
new file mode 100644
index 000000000..730fce864
--- /dev/null
+++ b/community/liblockfile/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 50818 2011-07-01 16:29:42Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
+
+pkgname=liblockfile
+pkgver=1.08_4
+_basever=1.08
+pkgrel=1
+pkgdesc="a library with NFS-safe locking functions"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://packages.debian.org/unstable/libs/liblockfile1"
+depends=('glibc')
+makedepends=()
+source=(http://ftp.debian.org/debian/pool/main/libl/$pkgname/${pkgname}_${_basever}.orig.tar.gz
+	http://ftp.debian.org/debian/pool/main/libl/$pkgname/${pkgname}_${pkgver/_/-}.debian.tar.bz2)
+md5sums=('c24e2dfb4a2aab0263fe5ac1564d305e'
+         '50c0c049d2838704f5720f5fd9eaddac')
+
+build() {
+  cd $srcdir/$pkgname-${_basever}
+  for p in `cat ../debian/patches/series` ; do
+    patch -p1 < ../debian/patches/$p
+  done
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-${_basever}
+  mkdir -p $pkgdir/usr/{lib,bin,include,share/man/man1,share/man/man3}
+  make install prefix=$pkgdir/usr mandir=$startdir/pkg/usr/share/man
+}
diff --git a/community/lockfile-progs/PKGBUILD b/community/lockfile-progs/PKGBUILD
new file mode 100644
index 000000000..b49a8f50e
--- /dev/null
+++ b/community/lockfile-progs/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 50822 2011-07-01 16:45:18Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
+
+pkgname=lockfile-progs
+pkgver=0.1.15
+pkgrel=1
+pkgdesc="programs for locking and unlocking files and mailboxes"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://packages.debian.org/unstable/misc/lockfile-progs"
+depends=('glibc')
+makedepends=('gcc' 'make' 'liblockfile')
+source=(http://ftp.debian.org/debian/pool/main/l/lockfile-progs/${pkgname}_${pkgver}.tar.gz)
+md5sums=('abfcda83a1868073673f4d78066b8f8a')
+
+build() {
+    cd $srcdir/sid
+    make CFLAGS="-g -Wall -O2"
+}
+
+package() {
+    cd $srcdir/sid
+    mkdir -p $pkgdir/usr/bin
+    install -s bin/* $pkgdir/usr/bin
+    mkdir -p $pkgdir/usr/share/man/man1
+    install man/*.1 $pkgdir/usr/share/man/man1
+}
diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD
index 4a8581982..736b9a80c 100644
--- a/community/luxrender/PKGBUILD
+++ b/community/luxrender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 50301 2011-06-28 07:26:18Z stativ $
+# $Id: PKGBUILD 50748 2011-06-30 10:59:10Z icelaya $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Initial contributor: flixie <69one@gmx.net>
 # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
@@ -6,8 +6,8 @@ pkgname=luxrender
 pkgver=0.8
 _pkgver=45d3e13eb94c
 _luxblend=9cb3fcee0be8
-_blender=2.57
-pkgrel=4
+_blender=2.58
+pkgrel=6
 pkgdesc="Rendering system for physically correct, unbiased image synthesis"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.luxrender.net/"
@@ -15,13 +15,13 @@ license=('GPL')
 depends=('boost-libs' 'freeimage' 'openexr')
 optdepends=('blender: Blender exporter' 'qt: Qt GUI')
 makedepends=('cmake' 'boost' 'qt' 'luxrays' 'python')
-source=(http://src.luxrender.net/lux/archive/$_pkgver.tar.bz2 \
-        http://src.luxrender.net/luxblend25/archive/$_luxblend.tar.bz2)
-md5sums=('ad8d2ede00aa244cad884d9696ff5fbb'
-         '29c34f97791db3af1b827d9e9a1b3d79')
+source=(http://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2 \
+        http://ftp.archlinux.org/other/community/luxrender/luxblend-"$pkgver".tar.bz2)
+md5sums=('0f2d856385db72131f51e44a7ee527fa'
+         '0c3c8d9efba76133f8c687b5dd2bca8a')
 
 build() {
-  cd "$srcdir"/lux-$_pkgver
+  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
 
@@ -36,7 +36,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir"/lux-$_pkgver
+  cd "$srcdir"/luxrender-lux-$_pkgver
   make DESTDIR="$pkgdir" install
 
   # fix library path on x86_64
@@ -44,9 +44,9 @@ package() {
 
   # install blender exporter
   install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons
-  cp -a "$srcdir"/luxblend25-$_luxblend/src/luxrender \
+  cp -a "$srcdir"/luxrender-luxblend25-$_luxblend/src/luxrender \
     "$pkgdir"/usr/share/blender/$_blender/scripts/addons
-  cp -a "$srcdir"/lux-$_pkgver/pylux.so "$pkgdir"/usr/share/blender/$_blender/scripts/addons/luxrender/
+  cp -a "$srcdir"/luxrender-lux-$_pkgver/pylux.so "$pkgdir"/usr/share/blender/$_blender/scripts/addons/luxrender/
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD
index 03a6b610e..1583ae5f1 100755
--- a/community/mathomatic/PKGBUILD
+++ b/community/mathomatic/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer:  Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=mathomatic
-pkgver=15.6.1
+pkgver=15.6.2
 pkgrel=1
 pkgdesc="General purpose Computer Algebra System written in C"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial'
             'bash: for running a test script' 
             'gnuplot: for plotting')
 source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2)
-md5sums=('78d5eec8b64cbb3b00162f616f6a477c')
+md5sums=('96b64d056c6ab3c72338ff7566b6b11e')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD
index b42d83c86..c71b40770 100644
--- a/community/mingw32-gcc/PKGBUILD
+++ b/community/mingw32-gcc/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 45471 2011-04-22 05:36:00Z spupykin $
+# $Id: PKGBUILD 50734 2011-06-30 10:31:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Ondrej Jirman <megous@megous.com>
 
 pkgname=mingw32-gcc
 pkgver=4.5.2
-pkgrel=3
+pkgrel=4
 arch=(i686 x86_64 mips64el)
 pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux"
-depends=(mingw32-runtime mingw32-binutils mingw32-w32api libmpc elfutils gmp)
-replaces=(mingw32-gcc-base)
-provides=(mingw32-gcc-base)
+depends=('mingw32-pthreads' 'mingw32-runtime' 'mingw32-binutils' 'mingw32-w32api'
+	 'libmpc' 'elfutils' 'gmp')
+replaces=('mingw32-gcc-base')
+provides=('mingw32-gcc-base')
 options=(!strip)
 url="http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GCC/Version4/"
 license=(GPL LGPL)
@@ -35,12 +36,15 @@ build()
      --host=$CHOST \
      --build=$CHOST \
      --prefix=/usr \
+     --libexecdir=/usr/lib \
+     --with-bugurl=https://bugs.parabolagnulinux.org/ \
      --enable-languages=c,c++ \
      --enable-shared \
      --enable-sjlj-exceptions \
      --enable-hash-synchronization \
      --disable-nls \
-     --disable-libssp
+     --disable-libssp \
+     --enable-libgomp
 
   make
   make install DESTDIR=$pkgdir
@@ -51,22 +55,6 @@ build()
   msg "libstdc++"
   make -j1 -C i486-mingw32/libstdc++-v3 DESTDIR=${pkgdir} install
 
-#  msg "libgomp"
-#  mkdir -p i486-mingw32/libgomp
-#  cd i486-mingw32/libgomp
-#  [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \
-#     --target=i486-mingw32 \
-#     --host=$CHOST \
-#     --build=$CHOST \
-#     --prefix=/usr \
-#     --enable-languages=c,c++ \
-#     --enable-shared \
-#     --enable-sjlj-exceptions \
-#     --enable-hash-synchronization \
-#     --disable-nls \
-#     --disable-libssp
-#  make -j1 DESTDIR=$pkgdir all install
-
   msg "fixes"
   mkdir -p $pkgdir/usr/i486-mingw32/bin/
   mv $pkgdir/usr/bin/*.dll $pkgdir/usr/i486-mingw32/bin/
@@ -79,6 +67,6 @@ build()
     usr/share/gcc-$pkgver/python
 
   strip usr/bin/*
-  strip usr/libexec/gcc/i486-mingw32/$pkgver/{cc1*,collect2}
+  strip usr/lib/gcc/i486-mingw32/$pkgver/{cc1*,collect2}
   i486-mingw32-strip -g usr/lib/gcc/i486-mingw32/$pkgver/*.a
 }
diff --git a/community/mingw32-pthreads/PKGBUILD b/community/mingw32-pthreads/PKGBUILD
new file mode 100644
index 000000000..842a8352a
--- /dev/null
+++ b/community/mingw32-pthreads/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 50731 2011-06-30 10:05:09Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Marcel Schneider marcelATcoopmastersDOTde
+
+pkgname=mingw32-pthreads
+pkgver=2.8.0
+_pkgver=2-8-0
+pkgrel=2
+arch=(i686 x86_64)
+pkgdesc="The POSIX 1003.1-2001 standard for writing multithreaded applications."
+license=(LGPL)
+makedepends=('mingw32-gcc-base' 'mingw32-runtime' 'mingw32-w32api')
+url="http://sourceware.org/pthreads-win32/"
+options=(!strip)
+source=(ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-$_pkgver-release.tar.gz)
+md5sums=('6d30c693233b1464ef8983fedd8ccb22')
+
+build() {
+  cd $srcdir/pthreads-w32-$_pkgver-release
+  make CROSS=i486-mingw32- clean GC
+}
+
+package() {
+  cd $srcdir/pthreads-w32-$_pkgver-release
+  mkdir $pkgdir/usr
+  mkdir $pkgdir/usr/i486-mingw32
+  mkdir $pkgdir/usr/i486-mingw32/include
+  mkdir $pkgdir/usr/i486-mingw32/lib
+  install $srcdir/pthreads-w32-$_pkgver-release/pthread.h $pkgdir/usr/i486-mingw32/include/pthread.h
+  install $srcdir/pthreads-w32-$_pkgver-release/sched.h $pkgdir/usr/i486-mingw32/include/sched.h
+  install $srcdir/pthreads-w32-$_pkgver-release/semaphore.h $pkgdir/usr/i486-mingw32/include/semaphore.h
+  install $srcdir/pthreads-w32-$_pkgver-release/libpthreadGC2.a $pkgdir/usr/i486-mingw32/lib/libpthread.a
+  install $srcdir/pthreads-w32-$_pkgver-release/pthreadGC2.dll $pkgdir/usr/i486-mingw32/lib/
+}
diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD
index 60bf50bc8..f710731ae 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 46148 2011-05-04 08:34:19Z spupykin $
+# $Id: PKGBUILD 50803 2011-07-01 12:47:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
 # Contributor: funkyou <spamopfer@nickname.berlin.de>
@@ -8,7 +8,7 @@
 pkgbase=mlt
 pkgname=('mlt' 'mlt-python-bindings')
 pkgver=0.7.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="An open source multimedia framework"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mltframework.org"
@@ -21,7 +21,10 @@ md5sums=('3adeace6642a5ee0db0715b6bd7b7a52')
 build() {
   # mlt
   cd $srcdir/mlt-$pkgver
-  [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2=
+
+#  [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2=
+  SSE2=--disable-sse2
+
   msg "SSE2=$SSE2"
   ./configure --prefix=/usr --enable-gpl \
 	--qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/Qt \
diff --git a/community/mtasc/PKGBUILD b/community/mtasc/PKGBUILD
index 1a0e64ae8..6fb8014a6 100644
--- a/community/mtasc/PKGBUILD
+++ b/community/mtasc/PKGBUILD
@@ -1,31 +1,30 @@
+# $Id: PKGBUILD 50789 2011-07-01 09:55:48Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Niel Drummond <niel.drummond@grumpytoad.org>
 
 pkgname=mtasc
 pkgver=20091229
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source flash (swf) compiler"
 arch=(i686 x86_64 'mips64el')
 url="http://mtasc.org/"
 license=('GPL2')
 depends=('zlib')
 makedepends=('ocaml' 'cvs')
-source=(http://www.mtasc.org/doc/mtasc/install.ml)
-md5sums=('d072094a9c3ec4384ce232d4b65dab40')
+source=("http://arch.p5n.pp.ru/~sergej/dl/mtasc-$pkgver.tar.gz")
+md5sums=('eb686e4fcaa066dfa77d29b2d4551aab')
 
 build() {
-  cd $startdir/src
-  sed -i 's/anonymous@/anonymous:@/' $startdir/src/install.ml
-
-  msg "Running ocaml script..."
-  cd $startdir/src
-  ocaml $startdir/src/install.ml || return 1
-
-  msg "Done compiling..."
-
-  install -D -m755 $startdir/src/bin/${pkgname} $startdir/pkg/usr/bin/${pkgname} || return 1
+  cd $srcdir/mtasc-$pkgver
+  sed -i 's|let base_path = normalize_path (try Extc.executable_path() with _ -> ".") in|let base_path = "/usr/share/mtasc/" in|' ocaml/mtasc/main.ml
+  (cd ocaml/extc && make)
+  ocaml install.ml
+}
 
+package() {
+  cd $srcdir/mtasc-$pkgver
+  install -D -m755 $srcdir/mtasc-$pkgver/bin/${pkgname} $pkgdir/usr/bin/${pkgname}
   for f in $( cd ocaml/mtasc/ && find ./{std,std8} -type f -iname '*.as' | grep -iv cvs ); do
-    install -D -m644 ocaml/mtasc/$f ../pkg/usr/share/mtasc/$f || return 1
+    install -D -m644 ocaml/mtasc/$f $pkgdir/usr/share/mtasc/$f
   done
 }
-
diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD
index e3d0d91b8..422df5989 100644
--- a/community/parcellite/PKGBUILD
+++ b/community/parcellite/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 42044 2011-03-12 11:31:17Z spupykin $
+# $Id: PKGBUILD 50742 2011-06-30 10:48:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=parcellite
-pkgver=1.0.1
+pkgver=1.0.2rc2
 pkgrel=1
 pkgdesc="Lightweight GTK+ clipboard manager"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL3')
 depends=('gtk2')
 makedepends=('intltool')
 source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz)
-md5sums=('b2f1de2a424996c0eb2ff3a728a12cfc')
+md5sums=('c1ade542f9b5e836af18773171e70e95')
 
 build() {
   cd "$srcdir/parcellite-$pkgver"
diff --git a/community/pcsc-perl/PKGBUILD b/community/pcsc-perl/PKGBUILD
index 2f6a561b9..94dceea86 100644
--- a/community/pcsc-perl/PKGBUILD
+++ b/community/pcsc-perl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 42913 2011-03-22 16:19:32Z giovanni $
+# $Id: PKGBUILD 50836 2011-07-01 18:53:03Z bluewind $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com>
 # Contributor: marc0s <marc0s@fsfe.org>
 
 pkgname=pcsc-perl
 pkgver=1.4.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A Perl Module for PC/SC SmartCard access"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"
diff --git a/community/perl-device-serialport/PKGBUILD b/community/perl-device-serialport/PKGBUILD
index a6f90f403..896384913 100644
--- a/community/perl-device-serialport/PKGBUILD
+++ b/community/perl-device-serialport/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 42422 2011-03-16 15:50:28Z spupykin $
+# $Id: PKGBUILD 50831 2011-07-01 18:51:53Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Ross melin <rdmelin@gmail.com>
 
 pkgname=perl-device-serialport
 pkgver=1.04
-pkgrel=2
+pkgrel=3
 pkgdesc="POSIX clone of Win32::SerialPort"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Device-SerialPort"
diff --git a/community/perl-perlio-eol/PKGBUILD b/community/perl-perlio-eol/PKGBUILD
new file mode 100644
index 000000000..81a8c7697
--- /dev/null
+++ b/community/perl-perlio-eol/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 50826 2011-07-01 18:50:47Z bluewind $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Charles Mauch <cmauch@gmail.com>
+
+pkgname=perl-perlio-eol
+pkgver=0.14
+pkgrel=1
+pkgdesc="Perl/CPAN Module PerlIO::eol"
+arch=("i686" "x86_64")
+url="http://search.cpan.org/dist/PerlIO-eol"
+license=("GPL" "PerlArtistic")
+replaces=(perlio-eol)
+source=("http://www.cpan.org/authors/id/A/AU/AUDREYT/PerlIO-eol-$pkgver.tar.gz")
+md5sums=('55c5d3fafab00a511ff1c2722060235c')
+
+build() {
+  cd $srcdir/PerlIO-eol-$pkgver
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+  make || return 1
+  make install DESTDIR=$pkgdir || return 1
+  find $pkgdir -name '.packlist' -delete
+  find $pkgdir -name '*.pod' -delete
+}
diff --git a/community/python2-basemap/PKGBUILD b/community/python2-basemap/PKGBUILD
index a0611b72d..a903b14ed 100644
--- a/community/python2-basemap/PKGBUILD
+++ b/community/python2-basemap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 40923 2011-03-01 17:22:50Z stephane $
+# $Id: PKGBUILD 50811 2011-07-01 15:17:50Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Julien Morin <jmorin@cp.dias.ie>
 
 pkgname=python2-basemap
-pkgver=1.0
-pkgrel=2
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="Toolkit for plotting data on map projections"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://matplotlib.sourceforge.net/basemap/doc/html/"
@@ -16,7 +16,7 @@ provides=('python-matplotlib-basemap')
 replaces=('python-matplotlib-basemap')
 conflicts=('python-matplotlib-basemap')
 source=("http://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-${pkgver}/basemap-${pkgver}.tar.gz")
-sha1sums=('c1e2a9e76fdc6582dd951b86b4479cc439e8b372')
+sha1sums=('bd278580c004ec597020e313cc2c568593a018eb')
 
 build() {
    cd "${srcdir}/basemap-${pkgver}"
diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD
index 4e8feebc8..ee86cf453 100644
--- a/community/root/PKGBUILD
+++ b/community/root/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Sebastian Voecking <voeck@web.de>
 
 pkgname=root
-pkgver=5.28.00e
+pkgver=5.30.00
 pkgrel=1
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
         'rootd'
         'root.desktop'
         'root.xml')
-md5sums=('e023538c046ebdde7f93284b5f6511e2'
+md5sums=('b4e00f419f63d5ec6b7f1aace33c0c6f'
          '0e883ad44f99da9bc7c23bc102800b62'
          'efd06bfa230cc2194b38e0c8939e72af'
          'ac61b17395d75a2705fefa2ef841a6bf'
@@ -39,11 +39,12 @@ build() {
   ./configure \
     ${TARGET} \
     --prefix=/usr \
-    --disable-builtin-glew \
-    --disable-builtin-freetype \
     --disable-builtin-ftgl \
+    --disable-builtin-freetype \
+    --disable-builtin-glew \
     --disable-builtin-pcre \
     --disable-builtin-zlib \
+    --enable-builtin-lzma \
     --enable-gdml \
     --enable-gsl-shared \
     --enable-minuit2 \
@@ -52,12 +53,14 @@ build() {
     --enable-python \
     --with-python-incdir=/usr/include/python2.7 \
     --with-python-libdir=/usr/lib
-    #--disable-krb5
-    # disable krb5 because of compile error
 
     # move from aur
     #--disable-builtin-afterimage \
 
+    # causes an error because it includes lzma/lzma.h directly.. need to file a BR for this
+    # http://root.cern.ch/phpBB3/viewtopic.php?f=3&t=13013&p=55971
+    #--disable-builtin-lzma \
+
   make
 }
 
@@ -66,10 +69,14 @@ package() {
 
   make DESTDIR=${pkgdir} install
 
-  install -D ${srcdir}/root.sh ${pkgdir}/etc/profile.d/root.sh
-  install -D ${srcdir}/rootd ${pkgdir}/etc/rc.d/rootd
-  install -D -m644 ${srcdir}/root.desktop ${pkgdir}/usr/share/applications/root.desktop
-  install -D -m644 ${srcdir}/root.xml ${pkgdir}/usr/share/mime/packages/root.xml
+  install -D ${srcdir}/root.sh \
+    ${pkgdir}/etc/profile.d/root.sh
+  install -D ${srcdir}/rootd \
+    ${pkgdir}/etc/rc.d/rootd
+  install -D -m644 ${srcdir}/root.desktop \
+    ${pkgdir}/usr/share/applications/root.desktop
+  install -D -m644 ${srcdir}/root.xml \
+    ${pkgdir}/usr/share/mime/packages/root.xml
 
   rm -rf ${pkgdir}/etc/root/daemons
 }
diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD
index c24491033..88a0a5139 100644
--- a/community/sxiv/PKGBUILD
+++ b/community/sxiv/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de>
 
 pkgname=sxiv
-pkgver=0.8.1
-pkgrel=3
+pkgver=0.8.2
+pkgrel=1
 pkgdesc='simple x image viewer'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -13,7 +13,7 @@ depends=('libx11' 'xproto' 'imlib2')
 source=("https://github.com/downloads/muennich/sxiv/sxiv-${pkgver}.tar.gz"
         'sxiv.desktop'
         'config.h')
-md5sums=('23006a1900690d46c0ff126c76cdbd02'
+md5sums=('6948b4c02f9458c4160c6e458228b85f'
          '1dda85ff6bed4de337f8fb303075ed11'
          '8018e9f2f63b155098428be9dbaf8b5c')
 
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 11539d3bd..069770de6 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 127014 2011-06-09 16:03:48Z giovanni $
+# $Id: PKGBUILD 129995 2011-06-30 18:10:17Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
 
 pkgname=amule
-pkgver=10576
+pkgver=10587
 pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('1a1f01d356b3d2d5c01004018ffa79c6')
+md5sums=('94228cf3fa58178a84c24658a06022bd')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 0c630fdcd..286cdc9ac 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 128038 2011-06-21 06:55:54Z bisson $
+# $Id: PKGBUILD 129963 2011-06-30 17:15:51Z bisson $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=audacious
-pkgver=2.5.2
+pkgver=2.5.3
 pkgrel=1
 pkgdesc='Lightweight, GTK2-based advanced audio player focused on audio quality'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,21 +12,21 @@ url='http://audacious-media-player.org/'
 license=('GPL3')
 depends=('gtk2' 'libmcs' 'dbus-glib' 'libguess' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('unzip: zipped skins support')
-source=("http://distfiles.atheme.org/$pkgname-$pkgver.tar.gz")
-sha1sums=('48b2662d1513959479ae561465b41df08369a689')
+source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('b40f140ebeb5d767bd865945b7eb5527c265beb7')
 
 provides=('audacious-player')
 replaces=('audacious-player')
 install=install
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	[[ $CARCH == x86_64 ]] && extraopts='' || extraopts='--disable-sse2'
-	./configure --prefix=/usr $extraopts
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	[[ ${CARCH} == x86_64 ]] && extraopts='' || extraopts='--disable-sse2'
+	./configure --prefix=/usr ${extraopts}
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD
index a03a3630e..c71a08880 100644
--- a/extra/epiphany/PKGBUILD
+++ b/extra/epiphany/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 125696 2011-05-28 10:41:59Z ibiru $
+# $Id: PKGBUILD 130020 2011-07-01 09:16:54Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=epiphany
-pkgver=3.0.2
-pkgrel=2
+pkgver=3.0.4
+pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME3 web browser based on the WebKit rendering engine."
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,8 +15,8 @@ makedepends=('intltool' 'networkmanager' 'gnome-doc-utils' 'startup-notification
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('befcc9b6061b2e5e9c78399423b09e27dc301dec55d96bf63590d543ce9bb805')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('3cfc25c4c939e3df960c28e6c27e7e78645e1121d8634ecbd307672df1f37333')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index 04c807a80..7bb65508e 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 127590 2011-06-16 17:26:15Z ibiru $
+# $Id: PKGBUILD 130037 2011-07-01 13:04:18Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.0.5
+pkgver=3.0.6
 pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b4e4a76f8f74e39ad6757a27296a2e24b0b37a0bf156d424354d964352a1f11c')
+sha256sums=('ac5957fe52991f58570d25828130f60a8e4e3f0cb00abe358f25e7d2b9fed252')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index 418a52837..5a6aa519b 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 103133 2010-12-15 19:32:43Z ronald $
+# $Id: PKGBUILD 130047 2011-07-01 15:56:21Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Anton Leontiev <bunder@t-25.ru>
 
 pkgname=graphicsmagick
 pkgver=1.3.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Image processing system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.graphicsmagick.org/"
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index c9ba39286..e366b0490 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 128016 2011-06-20 19:02:22Z ibiru $
+# $Id: PKGBUILD 130030 2011-07-01 11:17:28Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.0.4
+pkgver=3.0.5
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gobject-introspection')
 options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.xz)
-sha256sums=('12b39125b650e70bc3ab958f071e35537d4b2136ec5497829d38b5565e7280a0')
+sha256sums=('3502fb5da443f687fdba228e3c015429874b4286e19670a87055866800f985c5')
 
 build() {
   cd "${srcdir}/$_pkgbasename-${pkgver}"
diff --git a/extra/gweled/PKGBUILD b/extra/gweled/PKGBUILD
index da2e9e518..ce87fb21e 100644
--- a/extra/gweled/PKGBUILD
+++ b/extra/gweled/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 108818 2011-02-03 20:50:44Z eric $
+# $Id: PKGBUILD 130072 2011-07-01 21:54:59Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gweled
-pkgver=0.9
+pkgver=0.9.1
 pkgrel=1
 pkgdesc="A puzzle game similar to Bejeweled (aka Diamond Mine)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="https://launchpad.net/gweled/"
-depends=('librsvg' 'libmikmod')
+depends=('gtk2' 'librsvg' 'libmikmod' 'hicolor-icon-theme')
 makedepends=('intltool')
 install=gweled.install
 source=(http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a3aeec75190710758bbd3c487b637112')
-sha1sums=('70358e0557eaee370a9183e1ea34e95a09d57619')
+md5sums=('746ac14523c968e78140c2f0501fd7cf')
+sha1sums=('ff4a59935c9e1eb4a202e723baabaab39f526714')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD
index ea3fa63b9..ba344c666 100644
--- a/extra/jack/PKGBUILD
+++ b/extra/jack/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 129477 2011-06-28 06:24:10Z schiv $
+# $Id: PKGBUILD 130010 2011-06-30 20:37:27Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: tobias <tobias@archlinux.net>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=jack
 _longname=jack-audio-connection-kit
-pkgver=0.121.1
+pkgver=0.121.2
 pkgrel=1
 pkgdesc="A low-latency audio server"
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,7 +23,7 @@ provides=("$_longname=$pkgver")
 replaces=("$_longname")
 changelog=$pkgname.changelog
 source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz")
-md5sums=('a51005bfd6e993af8517e19e823cf3c6')
+md5sums=('06c080349455afd4d217d6a8f9393e01')
 
 build() {
   cd "$srcdir/$_longname-$pkgver"
diff --git a/extra/libebml/PKGBUILD b/extra/libebml/PKGBUILD
index c426289e3..764976794 100644
--- a/extra/libebml/PKGBUILD
+++ b/extra/libebml/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 108561 2011-02-01 17:18:01Z giovanni $
+# $Id: PKGBUILD 129933 2011-06-30 13:52:37Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: 03/08/04 <lefungus@altern.org>
 
 pkgname=libebml
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="Extensible Binary Meta Language library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dl.matroska.org/downloads/libebml/"
 license=('LGPL')
 depends=('gcc-libs')
-source=("${url}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('26fbaa556bb497c1134d33b84ab34443')
+source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('13c5a10e260e703d3a7f003fdc995183')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
-  make || return 1
+
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
-  make prefix="${pkgdir}/usr" install || return 1
+
+  make prefix="${pkgdir}/usr" install
 }
diff --git a/extra/libmatroska/PKGBUILD b/extra/libmatroska/PKGBUILD
index c92aaafb2..4febacedf 100644
--- a/extra/libmatroska/PKGBUILD
+++ b/extra/libmatroska/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 108572 2011-02-01 18:22:49Z giovanni $
+# $Id: PKGBUILD 129938 2011-06-30 14:07:10Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor 03/08/04 <lefungus@altern.org>
 
 pkgname=libmatroska
-pkgver=1.1.0
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="Matroska library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dl.matroska.org/downloads/libmatroska/"
 license=('LGPL')
 depends=('libebml')
-source=("${url}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('21e5ee3e2573f0ae99db195348bdfb98')
+source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('a4f967f9ade56d5181714f3199ffa241')
 
 build() {
- cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
- make sharedlib || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
+
+  make sharedlib
 }
 
 package() {
- cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
- make prefix="${pkgdir}/usr" install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
+
+  make prefix="${pkgdir}/usr" install
 }
diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD
index 779c4b22f..a92973938 100644
--- a/extra/libwebkit/PKGBUILD
+++ b/extra/libwebkit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 126732 2011-06-06 21:34:03Z andyrtr $
+# $Id: PKGBUILD 130015 2011-07-01 08:50:25Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="An opensource web content engine"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,12 +15,12 @@ options=('!libtool')
 install=libwebkit.install
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz
         replace-switch-with-given-when.patch)
-md5sums=('c1a4f732a77d6f8197437b50678d3dbc'
+md5sums=('361f8420e93d12101d650758fec09fa0'
          '3ba708a26b7af0e1e853867966fe14f7')
 
 build() {
   cd "${srcdir}/webkit-${pkgver}"
-  patch -Np1 -i "${srcdir}/replace-switch-with-given-when.patch"
+#  patch -Np1 -i "${srcdir}/replace-switch-with-given-when.patch"
   mkdir build-gtk{2,3}
 
   ( cd build-gtk2 && _build --with-gtk=2.0 )
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index f3eb81f78..17b6a7845 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 116022 2011-03-22 15:58:44Z giovanni $
+# $Id: PKGBUILD 129953 2011-06-30 15:40:13Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2011.03.14
+pkgver=2011.06.16
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('ff65b2c598e970b4b6c8219a1811de00')
+md5sums=('9895e723ee9fe87422f120dc646875d5')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD
index 2ccb3e680..7e3d00838 100644
--- a/extra/miro/PKGBUILD
+++ b/extra/miro/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127855 2011-06-18 21:42:16Z eric $
+# $Id: PKGBUILD 130052 2011-07-01 16:18:58Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
-pkgver=4.0.1.1
-pkgrel=2
+pkgver=4.0.2
+pkgrel=1
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.getmiro.com"
@@ -17,7 +17,7 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
 makedepends=('pkg-config')
 install=miro.install
 source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('f6dbfb661bd642ccf60b38405c63182c7a9142df')
+sha1sums=('22342897ca748fa19738c9c1c510510f314fa7eb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/linux"
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 79b1e0abf..457e176f9 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127788 2011-06-18 10:58:55Z giovanni $
+# $Id: PKGBUILD 129948 2011-06-30 15:26:18Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=mkvtoolnix
 pkgver=4.8.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD
index 114e8441c..cde8c2b20 100644
--- a/extra/modemmanager/PKGBUILD
+++ b/extra/modemmanager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 126693 2011-06-06 16:09:07Z ibiru $
+# $Id: PKGBUILD 130025 2011-07-01 09:21:47Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=modemmanager
 _realname=ModemManager
-pkgver=0.4.997
+pkgver=0.4.998
 pkgrel=1
 pkgdesc="Mobile broadband modem management service"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool')
 options=('!libtool')
 source=(http://download.gnome.org/sources/${_realname}/0.4/${_realname}-${pkgver}.tar.xz)
 optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
-sha256sums=('88fa2f098b9fbbfb4e91e78e200404ce6dd6258102a197a635a3bd789302c6e4')
+sha256sums=('a0d96d0f9e06f1542b4c32d114833114b330682f93eea16fda8cdba289ceadf5')
 
 build() {
   cd "$srcdir/${_realname}-${pkgver}"
diff --git a/extra/mtools/PKGBUILD b/extra/mtools/PKGBUILD
index 9f90d79a2..1e9924ca9 100644
--- a/extra/mtools/PKGBUILD
+++ b/extra/mtools/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120053 2011-04-18 22:34:00Z giovanni $
+# $Id: PKGBUILD 130005 2011-06-30 19:10:40Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=mtools
-pkgver=4.0.16
+pkgver=4.0.17
 pkgrel=1
 pkgdesc="A collection of utilities to access MS-DOS disks"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ optdepends=('libx11: required by floppyd'
 backup=('etc/mtools.conf')
 install=mtools.install
 source=("http://ftp.gnu.org/gnu/mtools/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('e9b07f35272210f407012abaf5d1b9b5')
+md5sums=('15571c615d8f75f5f6d294272f80c7fa')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,12 +26,12 @@ build() {
               --mandir=/usr/share/man \
               --infodir=/usr/share/info \
 	      --sysconfdir=/etc
-  make || return 1
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make -j 1 DESTDIR="${pkgdir}" install || return 1
-  install -Dm644 mtools.conf "${pkgdir}/etc/mtools.conf" || return 1
+  make -j 1 DESTDIR="${pkgdir}" install
+  install -Dm644 mtools.conf "${pkgdir}/etc/mtools.conf"
 }
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 510afc089..5d73e1d73 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 127700 2011-06-17 17:59:14Z andrea $
+# $Id: PKGBUILD 130000 2011-06-30 19:02:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
@@ -6,15 +6,20 @@
 pkgbase=sip
 pkgname=('sip' 'python2-sip')
 pkgver=4.12.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 makedepends=('python' 'python2')
-source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('d0f1fa60494db04b4d115d4c2d92f79e')
+source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz"
+        'fix-regression.patch')
+md5sums=('d0f1fa60494db04b4d115d4c2d92f79e'
+         '598ffc65ebaf1c0e8855a352b02c43e7')
 
 build() {
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  patch -p1 -i "${srcdir}"/fix-regression.patch
+
   cd "${srcdir}"
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
 
diff --git a/extra/sip/fix-regression.patch b/extra/sip/fix-regression.patch
new file mode 100644
index 000000000..d4dc794ad
--- /dev/null
+++ b/extra/sip/fix-regression.patch
@@ -0,0 +1,26 @@
+
+# HG changeset patch
+# User Phil Thompson <phil@riverbankcomputing.com>
+# Date 1308852953 -3600
+# Node ID f9f4b161c94021c117e995eccba945d4dd3d0ed4
+# Parent  df42f6bf92c8cd12dd7cc5a30231728a4c23ead4
+Fixed a regression introduced in the recent sipIsPyMethod() changes in the
+handling of special methods implemented by object (eg. __lt__).
+
+diff -r df42f6bf92c8 -r f9f4b161c940 siplib/siplib.c.in
+--- a/siplib/siplib.c.in	Thu Jun 23 17:24:41 2011 +0100
++++ b/siplib/siplib.c.in	Thu Jun 23 19:15:53 2011 +0100
+@@ -7604,9 +7604,10 @@
+ #endif
+ 
+         /*
+-         * Check any possible reimplementation is not the wrapped C++ method.
++         * Check any possible reimplementation is not the wrapped C++ method or
++         * a default special method implementation..
+          */
+-        if (cls_dict != NULL && (cls_attr = PyDict_GetItem(cls_dict, mname_obj)) != NULL && Py_TYPE(cls_attr) != &sipMethodDescr_Type)
++        if (cls_dict != NULL && (cls_attr = PyDict_GetItem(cls_dict, mname_obj)) != NULL && Py_TYPE(cls_attr) != &sipMethodDescr_Type && Py_TYPE(cls_attr) != &PyWrapperDescr_Type)
+         {
+             reimp = cls_attr;
+             break;
+
diff --git a/extra/telepathy-salut/PKGBUILD b/extra/telepathy-salut/PKGBUILD
index 1c93e7143..ab1bbfafd 100644
--- a/extra/telepathy-salut/PKGBUILD
+++ b/extra/telepathy-salut/PKGBUILD
@@ -1,24 +1,30 @@
-# $Id: PKGBUILD 94337 2010-10-06 16:43:18Z ibiru $
+# $Id: PKGBUILD 129928 2011-06-30 10:52:28Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Daniel Balieiro <daniel@balieiro.com>
 pkgname=telepathy-salut
-pkgver=0.4.0
+pkgver=0.5.0
 pkgrel=1
 pkgdesc="A link-local XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
 groups=('telepathy')
 license=('LGPL')
-depends=('telepathy-glib>=0.12.0' 'avahi' 'libsoup')
-makedepends=('libxslt' 'python2')
+depends=('telepathy-glib' 'avahi' 'libsoup')
+makedepends=('libxslt' 'python2' 'xmldiff')
 install=telepathy-salut.install
 source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('95f0cf9681912104474b0f4c4d00807f')
+md5sums=('0642bd33d5d5e8e50087ace1faa769cd')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure --prefix=/usr \
-    	--libexecdir=/usr/lib/telepathy
+    	--libexecdir=/usr/lib/telepathy \
+        --disable-plugins --disable-Werror \
+        --with-tls=openssl
     make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index 429869265..5e27ee382 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 124261 2011-05-18 07:05:56Z ibiru $
+# $Id: PKGBUILD 129943 2011-06-30 15:04:13Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
-pkgname=('transmission-cli' 'transmission-gtk')
-pkgver=2.31
+pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
+pkgver=2.32
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.transmissionbt.com/"
 license=('MIT')
-makedepends=('gtk2' 'intltool' 'curl' 'libnotify' 'desktop-file-utils' 'libevent' 'libcanberra' 'dbus-glib')
+makedepends=('gtk2' 'intltool' 'curl' 'libnotify' 'qt' 'libevent' 'libcanberra' 'dbus-glib')
 source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.bz2
         transmissiond transmissiond.conf)
-md5sums=('2785016d74bbecf842cef04883e56400'
+md5sums=('cac5d0e07b92e563b34b61de5a6235c7'
          '08875299e3fbb68fc546c1f350ac1f06'
          'be39806c35b7544856fa4070b00fc960')
 build() {
@@ -21,6 +21,9 @@ build() {
 
   ./configure --prefix=/usr --disable-gconf2
   make
+  pushd qt
+  qmake qtr.pro
+  make
 }
 package_transmission-cli() {
   pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index 28eff256b..29734c07a 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124509 2011-05-22 17:12:02Z giovanni $
+# $Id: PKGBUILD 130042 2011-07-01 14:45:36Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=udisks
 pkgver=1.0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/udisks"
@@ -11,19 +11,14 @@ license=('GPL')
 depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'lvm2' 'eject')
 makedepends=('intltool' 'docbook-xsl' 'gtk-doc')
 options=(!libtool)
-#source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
-        01-mkfs-tempdir.patch
-        fix_well_known_filesystems.patch)
-sha256sums=('a4d18b2de59c1567df5342f26960c6c3e70a0320f7bafe42893f2708c9b57dd5'
-            '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c'
-            '00d92030de44c5856c7408339c4849bf9b88b66d6cfa6617364b4e8d9ed2bc5e')
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
+        01-mkfs-tempdir.patch)
+sha256sums=('d95bceb52a70c727291b934c4c05774899a0074927c8138a219b81a784de8a4b'
+            '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/01-mkfs-tempdir.patch"
-  patch -Np1 -i "${srcdir}/fix_well_known_filesystems.patch"
-  ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/udisks --disable-static
   #fix location for bash_completion helper
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index c861b3ac6..43d28f429 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 129407 2011-06-27 11:36:20Z stephane $
+# $Id: PKGBUILD 129958 2011-06-30 16:26:39Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=1.1.10
-pkgrel=5
+pkgrel=6
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -45,7 +45,7 @@ build() {
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
 
   # FS#24872
-  patch -Np1 -i ../vlc-1.1.10-libavformat.patch
+  patch -Np1 -i ${srcdir}/vlc-1.1.10-libavformat.patch
 
   ./configure --prefix=/usr \
               --disable-rpath \
diff --git a/extra/xfconf/PKGBUILD b/extra/xfconf/PKGBUILD
index 2364ba0f8..5c10d59d1 100644
--- a/extra/xfconf/PKGBUILD
+++ b/extra/xfconf/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 106342 2011-01-16 16:22:15Z andyrtr $
+# $Id: PKGBUILD 130064 2011-07-01 20:39:13Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfconf
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="a simple client-server configuration storage and query system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD
new file mode 100644
index 000000000..a0c1b154d
--- /dev/null
+++ b/libre/audacity-libre/PKGBUILD
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Joseph Yaworski <jy@dervormund.info>
+
+pkgname=audacity-libre
+pkgver=1.3.13
+pkgrel=1
+pkgdesc="A program that lets you manipulate digital audio waveforms, libre"
+arch=('i686' 'x86_64')
+url="http://audacity.sourceforge.net/"
+license=('GPL')
+depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' 'hicolor-icon-theme'
+	'shared-mime-info' 'desktop-file-utils' 'redland' 'jack' 'soundtouch')
+makedepends=('zip')
+options=('!makeflags')
+install=audacity-libre.install
+source=(http://repo.parabolagnulinux.org/other/${pkgname}-minsrc-${pkgver}-beta.tar.bz2
+	remove-unfree-nyquist.patch
+	audacity-libre.install)
+provides=("audacity=$pkgver")
+replaces=('audacity')
+conflicts=('audacity')
+
+# source PKGBUILD; mksource
+mksource() {
+	wget http://audacity.googlecode.com/files/audacity-minsrc-${pkgver}-beta.tar.bz2 -O - | \
+        tar -jxvf -
+
+    pushd audacity-src-${pkgver}-beta/
+        rm -rfv {,lib-src/lib}nyquist
+        find -iname '*nyquist*' -print0 | xargs -0 \
+            rm -rfv 
+        patch -Np0 -i ../remove-unfree-nyquist.patch || return 1
+    popd
+
+	mv audacity-src-${pkgver}-beta/ ${pkgname}-src-${pkgver}-beta/
+	tar -cjf ${pkgname}-minsrc-${pkgver}-beta.tar.bz2 ${pkgname}-src-${pkgver}-beta/
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
+  WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
+    --with-portaudio --with-libsamplerate \
+    --without-libresample --with-libmad \
+    --with-id3tag --with-libflac \
+    --with-vorbis --with-libexpat \
+    --with-libsndfile --with-soundtouch \
+    --enable-unicode --without-taglib \
+    --disable-nyquist #unfree
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
+  make DESTDIR="${pkgdir}" install
+}
+md5sums=('0dca3e9b337ff1357b0580bd6de4e3b1'
+         '7c49dbe048d1f0f1706fd84bbea2fee4'
+         'd1942ad63ff1ef27cae2531ee914d5c8')
diff --git a/libre/audacity-libre/audacity-libre.install b/libre/audacity-libre/audacity-libre.install
new file mode 100644
index 000000000..028c9f62a
--- /dev/null
+++ b/libre/audacity-libre/audacity-libre.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/libre/audacity-libre/remove-unfree-nyquist.patch b/libre/audacity-libre/remove-unfree-nyquist.patch
new file mode 100644
index 000000000..b2f9f31e3
--- /dev/null
+++ b/libre/audacity-libre/remove-unfree-nyquist.patch
@@ -0,0 +1,24 @@
+--- Makefile.in.orig	2011-07-01 13:27:11.000000000 -0300
++++ Makefile.in	2011-07-01 13:27:39.000000000 -0300
+@@ -41,12 +41,6 @@ install: audacity $(EXTRAINSTALLTARGETS)
+ 		$(INSTALL) -m 644 help/audacity.1.gz \
+ 		$(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1.gz
+ 
+-	# install nyquist
+-	$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist
+-	$(INSTALL) -m 644 nyquist/*.lsp nyquist/nyquist-plot.txt $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist
+-	$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist/rawwaves
+-	$(INSTALL) -m 644 nyquist/rawwaves/*.raw $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist/rawwaves
+-
+ 	# install plug-ins
+ 	$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/plug-ins
+ 	$(INSTALL) -m 644 plug-ins/*.ny $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/plug-ins
+@@ -103,8 +97,6 @@ uninstall: $(EXTRAUNINSTALLTARGETS)
+ 	rm -rf $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)
+ 	# remove man page
+ 	rm -rf $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1.gz
+-	# remove nyquist
+-	rm -rf $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist
+ 	# remove plug-ins
+ 	rm -rf $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/plug-ins
+ 	# remove locales
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index b18691b41..5fc57db23 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -19,27 +19,25 @@
 # * Disabled ContentHandlers and other Google/Yahoo! related services
 
 pkgname=icecat
-pkgver=4.0.1
+pkgver=5.0
 pkgrel=2
-_xulver=2.0.1
 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gnuzilla/"
-license=('GPL2' 'MPL' 'LGPL')
-depends=("xulrunner=${_xulver}" 'desktop-file-utils')
-makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa')
-provides=("firefox=${pkgver}")
-conflicts=('firefox')
-replaces=('firefox')
+license=('GPL' 'MPL' 'LGPL')
+depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss>=3.12.10' 'libxt'
+         'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib'
+         'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'desktop-file-utils'
+         'libvpx' 'lcms' 'nspr>=4.8.8' 'libevent' 'libpng' 'cairo')
+makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools'
+             'yasm' 'mesa' 'autoconf2.13' 'gconf' 'xorg-server-xvfb')
 install=icecat.install
-source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
+source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
         mozconfig
         icecat.desktop
         icecat-safe.desktop
         mozilla-firefox-1.0-lang.patch
-	    xulrunner-copy-stub.patch
 # Search engines
-		arch-linux-wiki.xml
 		internet-archive.xml
 		jamendo-en.xml
 		logless-search.xml
@@ -58,7 +56,6 @@ build() {
   msg2 "Patching some files..."
   cd "${srcdir}/${pkgname}-${pkgver}/"
   patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
-  patch -Np0 -i "${srcdir}/xulrunner-copy-stub.patch"
   
   cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
   cp --remove-destination ${srcdir}/firefox.js ./browser/app/profile/
@@ -66,16 +63,16 @@ build() {
   msg2 "Starting build..."
   cp "${srcdir}/mozconfig" .mozconfig
 
-  [ "$CARCH" = "mips64el" ] && echo "ac_add_options --disable-ipc" >> .mozconfig
-
-  unset CFLAGS
-  unset CXXFLAGS
-
-  export LDFLAGS="-Wl,-rpath,${ICECATDIR}"
+  if [ "$CARCH" = "mips64el" ]: then
+    echo "ac_add_options --disable-ipc" >> .mozconfig
+    unset CFLAGS
+    unset CXXFLAGS
+    export LDFLAGS="-Wl,-rpath,${ICECATDIR}"
+  fi
 
+  # Start build
   ./configure
   make MOZ_MAKE_FLAGS="${MAKEFLAGS}"
-  msg2 "Build complete"
 
 }
 
@@ -95,19 +92,26 @@ package() {
   cd ${pkgdir}/usr/lib
   ln -s ${ICECATDIR} icecat
 
+  # Remove included dictionaries, add symlink to system myspell path
+  # Note: this will cause file conflicts when users have installed dictionaries in the old location
+  #rm -rf "${pkgdir}/usr/lib/firefox-$pkgver/dictionaries"
+  #ln -sf /usr/share/myspell/dicts \
+  #  "${pkgdir}/usr/lib/firefox-$pkgver/dictionaries"
+
+  # We don't want the development stuff
+  rm -r "$pkgdir"/usr/{include,lib/icecat-devel-$pkgver,share/idl}
+
   msg2 "Removing proprietary and anti-privacy search engines"
   rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml
   msg2 "And provide better ones..."
   install -m755 -d ${pkgdir}${ICECATDIR}/searchplugins/
   install -m644 ${srcdir}/*.xml ${pkgdir}${ICECATDIR}/searchplugins/
 }
-md5sums=('1b4d44ee5badc28fd332cba564ecde0a'
-         '436db1f6167ffe82fcd71a53ffd80d0e'
+md5sums=('3fd4f4c2bfdacdd52bbd6e197ceda95f'
+         '105f2e5d98d719c37cba5601a59b8593'
          'e81ad01dbc16ba28bf92ba4b7c309ca7'
          'd93fe402b87cd000a869e1fd6badc6c9'
          'bd5db57c23c72a02a489592644f18995'
-         '5a1938673a367b20ecfa009a5eb767aa'
-         '3403175087e584a8c5e840cc62310cd9'
          '462c68585461f8cdc23c93c46f6ee4cf'
          '2d492295c4308f9bba9ece28d8b3af2d'
          '937ac0e5392b060d93bd33e761fbfa51'
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index 0162c51ac..442dfe76d 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -10,9 +10,11 @@ ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
 ac_add_options --with-system-png
 ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-cairo
+ac_add_options --enable-system-lcms
 ac_add_options --with-pthreads
 
 ac_add_options --enable-default-toolkit=cairo-gtk2
@@ -21,13 +23,11 @@ ac_add_options --disable-safe-browsing
 ac_add_options --enable-extensions=default
 ac_add_options --enable-startup-notification
 ac_add_options --enable-pango
-ac_add_options --enable-strip
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --enable-smil
 ac_add_options --enable-canvas3d
 ac_add_options --enable-places
-ac_add_options --enable-shared-js
 ac_add_options --enable-url-classifier
 
 ac_add_options --enable-optimize
@@ -37,21 +37,19 @@ ac_add_options --enable-jemalloc
 ac_add_options --enable-xterm-updates
 ac_add_options --enable-printing
 ac_add_options --enable-xinerama
-ac_add_options --enable-libxul
-ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-2.0
-ac_add_options --with-branding=browser/branding/unofficial
 ac_add_options --with-distribution-id=org.gnu.gnuzilla
 ac_add_options --with-user-appdir=.gnuzilla
+ac_add_options --with-branding=browser/branding/unofficial
 
 ac_add_options --disable-javaxpcom
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-tests
-ac_add_options --disable-xprint
 ac_add_options --disable-mochitest
 ac_add_options --disable-debug
 ac_add_options --disable-installer
 ac_add_options --disable-pedantic
+ac_add_options --disable-static
 
 ac_add_options --enable-gio
 ac_add_options --disable-gnomevfs
@@ -62,3 +60,9 @@ export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
+
+# PGO
+ac_add_options --enable-profile-guided-optimization
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
diff --git a/staging/subversion/PKGBUILD b/staging/subversion/PKGBUILD
index 44c626813..8f8e8adbe 100644
--- a/staging/subversion/PKGBUILD
+++ b/staging/subversion/PKGBUILD
@@ -1,26 +1,34 @@
-# $Id: PKGBUILD 129526 2011-06-28 16:08:03Z stephane $
+# $Id: PKGBUILD 130071 2011-07-01 21:53:41Z stephane $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
 pkgver=1.6.17
-pkgrel=5
-pkgdesc="Replacement for CVS, another versioning system (SVN)"
+pkgrel=6
+pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64')
 license=('apache' 'bsd')
 depends=('neon' 'apr-util' 'sqlite3')
+optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion')
 makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 
              'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
-source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
-        svnserve svn svnserve.conf svnmerge.py
-        subversion.rpath.fix.patch
-        subversion.suppress.deprecation.warnings.patch)
-
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 url="http://subversion.apache.org/"
 provides=('svn')
 options=('!makeflags' '!libtool')
-optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion')
+source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
+        svnserve svn svnserve.conf svnmerge.py
+        subversion.rpath.fix.patch
+        subversion.suppress.deprecation.warnings.patch
+        subversion-perl-bindings.patch)
+md5sums=('81e5dc5beee4b3fc025ac70c0b6caa14'
+         'a2b029e8385007ffb99b437b30521c90'
+         'a0db6dd43af33952739b6ec089852630'
+         'c459e299192552f61578f3438abf0664'
+         'a6371baeda7e224504629ecdda2749b4'
+         '6b4340ba9d8845cd8497e013ae01be3f'
+         '1166f3b7413d7e7450299b3525680bbe'
+         '0591aa39837931161b4d61ff35c7b147')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
@@ -30,6 +38,7 @@ build() {
    # apply patches
    patch -Np0 -i ../subversion.rpath.fix.patch
    patch -Np1 -i ../subversion.suppress.deprecation.warnings.patch
+   patch -Np1 -i ../subversion-perl-bindings.patch
 
    # configure
    autoreconf
@@ -89,10 +98,3 @@ package() {
    install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \
                ${pkgdir}/etc/bash_completion.d/subversion
 }
-md5sums=('81e5dc5beee4b3fc025ac70c0b6caa14'
-         'a2b029e8385007ffb99b437b30521c90'
-         'a0db6dd43af33952739b6ec089852630'
-         'c459e299192552f61578f3438abf0664'
-         'a6371baeda7e224504629ecdda2749b4'
-         '6b4340ba9d8845cd8497e013ae01be3f'
-         '1166f3b7413d7e7450299b3525680bbe')
diff --git a/staging/subversion/subversion-perl-bindings.patch b/staging/subversion/subversion-perl-bindings.patch
new file mode 100644
index 000000000..3c34daa47
--- /dev/null
+++ b/staging/subversion/subversion-perl-bindings.patch
@@ -0,0 +1,12 @@
+diff -Naur subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in
+--- subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in	2010-11-24 20:42:16.000000000 +0000
++++ subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in	2011-07-01 20:16:16.520892074 +0000
+@@ -43,7 +43,7 @@
+ my %config = (
+     ABSTRACT => 'Perl bindings for Subversion',
+     DEFINE => $cppflags,
+-    CCFLAGS => $cflags,
++    CCFLAGS => $Config{ccflags},
+     INC  => join(' ',$apr_cflags, $apu_cflags, 
+                  " -I$swig_srcdir/perl/libsvn_swig_perl",
+                  " -I$svnlib_srcdir/include",
diff --git a/testing/cryptsetup/PKGBUILD b/testing/cryptsetup/PKGBUILD
new file mode 100644
index 000000000..a2a11ec9e
--- /dev/null
+++ b/testing/cryptsetup/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 129976 2011-06-30 17:57:50Z thomas $
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+pkgname=cryptsetup
+pkgver=1.3.1
+pkgrel=2
+pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://code.google.com/p/cryptsetup/"
+groups=('base')
+depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt')
+conflicts=('mkinitcpio<0.7')
+options=('!libtool' '!emptydirs')
+source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
+        encrypt_hook
+	encrypt_install)
+sha256sums=('7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a'
+            'b8269d358363eb8d67d1ffa1469068e454a89154636283bcc3edc6486b7fff4e'
+            'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573')
+
+build() {
+  cd $srcdir/$pkgname-${pkgver}
+  ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-${pkgver}
+  make DESTDIR=$pkgdir install
+  # install hook
+  install -D -m644 $srcdir/encrypt_hook $pkgdir/lib/initcpio/hooks/encrypt
+  install -D -m644 $srcdir/encrypt_install $pkgdir/lib/initcpio/install/encrypt
+  # Fix pkgconfig location
+  install -d -m755 $pkgdir/usr/lib
+  mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib/
+}
diff --git a/testing/cryptsetup/encrypt_hook b/testing/cryptsetup/encrypt_hook
new file mode 100644
index 000000000..54aaa2236
--- /dev/null
+++ b/testing/cryptsetup/encrypt_hook
@@ -0,0 +1,132 @@
+# vim: set ft=sh:
+# TODO this one needs some work to work with lots of different
+#       encryption schemes
+run_hook ()
+{
+    /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1
+    if [ -e "/sys/class/misc/device-mapper" ]; then
+        if [ ! -e "/dev/mapper/control" ]; then
+            mkdir /dev/mapper
+            mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |')
+        fi
+        [ "${quiet}" = "y" ] && CSQUIET=">/dev/null"
+
+        # Get keyfile if specified
+        ckeyfile="/crypto_keyfile.bin"
+        if [ "x${cryptkey}" != "x" ]; then
+            ckdev="$(echo "${cryptkey}" | cut -d: -f1)"
+            ckarg1="$(echo "${cryptkey}" | cut -d: -f2)"
+            ckarg2="$(echo "${cryptkey}" | cut -d: -f3)"
+            if poll_device "${ckdev}" ${rootdelay}; then
+                case ${ckarg1} in
+                    *[!0-9]*)
+                        # Use a file on the device
+                        # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path
+                        mkdir /ckey
+                        mount -r -t ${ckarg1} ${ckdev} /ckey
+                        dd if=/ckey/${ckarg2} of=${ckeyfile} >/dev/null 2>&1
+                        umount /ckey
+                        ;;
+                    *)
+                        # Read raw data from the block device
+                        # ckarg1 is numeric: ckarg1=offset, ckarg2=length
+                        dd if=${ckdev} of=${ckeyfile} bs=1 skip=${ckarg1} count=${ckarg2} >/dev/null 2>&1
+                        ;;
+                esac
+            fi
+            [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase."
+        fi
+
+        if [ -n "${cryptdevice}" ]; then
+            DEPRECATED_CRYPT=0
+            cryptdev="$(echo "${cryptdevice}" | cut -d: -f1)"
+            cryptname="$(echo "${cryptdevice}" | cut -d: -f2)"
+        else
+            DEPRECATED_CRYPT=1
+            cryptdev="${root}"
+            cryptname="root"
+        fi
+
+        warn_deprecated() {
+            echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated"
+            echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead."
+        }
+
+        if  poll_device "${cryptdev}" ${rootdelay}; then
+            if /sbin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then
+                [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
+                dopassphrase=1
+                # If keyfile exists, try to use that
+                if [ -f ${ckeyfile} ]; then
+                    if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; then
+                        dopassphrase=0
+                    else
+                        echo "Invalid keyfile. Reverting to passphrase."
+                    fi
+                fi
+                # Ask for a passphrase
+                if [ ${dopassphrase} -gt 0 ]; then
+                    echo ""
+                    echo "A password is required to access the ${cryptname} volume:"
+
+                    #loop until we get a real password
+                    while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; do
+                        sleep 2;
+                    done
+                fi
+                if [ -e "/dev/mapper/${cryptname}" ]; then
+                    if [ ${DEPRECATED_CRYPT} -eq 1 ]; then
+                        export root="/dev/mapper/root"
+                    fi
+                else
+                    err "Password succeeded, but ${cryptname} creation failed, aborting..."
+                    exit 1
+                fi
+            elif [ -n "${crypto}" ]; then
+                [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
+                msg "Non-LUKS encrypted device found..."
+                if [ $# -ne 5 ]; then
+                    err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip"
+                    err "Non-LUKS decryption not attempted..."
+                    return 1
+                fi
+                exe="/sbin/cryptsetup create ${cryptname} ${cryptdev}"
+                tmp=$(echo "${crypto}" | cut -d: -f1)
+                [ -n "${tmp}" ] && exe="${exe} --hash \"${tmp}\""
+                tmp=$(echo "${crypto}" | cut -d: -f2)
+                [ -n "${tmp}" ] && exe="${exe} --cipher \"${tmp}\""
+                tmp=$(echo "${crypto}" | cut -d: -f3)
+                [ -n "${tmp}" ] && exe="${exe} --key-size \"${tmp}\""
+                tmp=$(echo "${crypto}" | cut -d: -f4)
+                [ -n "${tmp}" ] && exe="${exe} --offset \"${tmp}\""
+                tmp=$(echo "${crypto}" | cut -d: -f5)
+                [ -n "${tmp}" ] && exe="${exe} --skip \"${tmp}\""
+                if [ -f ${ckeyfile} ]; then
+                    exe="${exe} --key-file ${ckeyfile}"
+                else
+                    exe="${exe} --verify-passphrase"
+                    echo ""
+                    echo "A password is required to access the ${cryptname} volume:"
+                fi
+                eval "${exe} ${CSQUIET}"
+
+                if [ $? -ne 0 ]; then
+                    err "Non-LUKS device decryption failed. verify format: "
+                    err "      crypto=hash:cipher:keysize:offset:skip"
+                    exit 1
+                fi
+                if [ -e "/dev/mapper/${cryptname}" ]; then
+                    if [ ${DEPRECATED_CRYPT} -eq 1 ]; then
+                        export root="/dev/mapper/root"
+                    fi
+                else
+                    err "Password succeeded, but ${cryptname} creation failed, aborting..."
+                    exit 1
+                fi
+            else
+                err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified."
+            fi
+        fi
+        rm -f ${ckeyfile}
+    fi
+}
diff --git a/testing/cryptsetup/encrypt_install b/testing/cryptsetup/encrypt_install
new file mode 100644
index 000000000..13174ec06
--- /dev/null
+++ b/testing/cryptsetup/encrypt_install
@@ -0,0 +1,26 @@
+# vim: set ft=sh:
+
+build()
+{
+    if [ -z "${CRYPTO_MODULES}" ]; then
+        MODULES=" dm-crypt $(all_modules "/crypto/") "
+    else
+        MODULES=" dm-crypt ${CRYPTO_MODULES} "
+    fi
+    FILES=""
+    SCRIPT="encrypt"
+    [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup"
+    [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup"
+    add_binary "/sbin/dmsetup"
+    add_file "/lib/udev/rules.d/10-dm.rules"
+    add_file "/lib/udev/rules.d/13-dm-disk.rules"
+    add_file "/lib/udev/rules.d/95-dm-notify.rules"
+    add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
+}
+
+help ()
+{
+cat<<HELPEOF
+  This hook allows for an encrypted root device.
+HELPEOF
+}
diff --git a/testing/dmraid/PKGBUILD b/testing/dmraid/PKGBUILD
new file mode 100644
index 000000000..5af91a2ec
--- /dev/null
+++ b/testing/dmraid/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 129977 2011-06-30 18:03:08Z thomas $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+#Contributor: Urs Wolfer <uwolfer @ fwo.ch>
+
+pkgname=dmraid
+pkgver=1.0.0.rc16.3
+pkgrel=2
+pkgdesc="Device mapper RAID interface"
+url="http://people.redhat.com/~heinzm/sw/dmraid/"
+conflicts=('mkinitcpio<0.7')
+depends=('device-mapper>=2.0.54')
+arch=('i686' 'x86_64')
+license=('GPL')
+source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2
+        http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-1.0.0.rc16-3.tar.bz2
+        dmraid_install
+        dmraid_hook)
+install=dmraid.install
+md5sums=('819338fcef98e8e25819f0516722beeb'
+         'bf6c61a11dbbb40d5152835075c9f438'
+         '2a1ef82fb32f065ee560dceef736475e')
+
+build() {
+  cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname
+  ./configure --enable-led --enable-intel_led
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname
+  make DESTDIR="$pkgdir" prefix=/ libdir=/lib mandir=/usr/share/man includedir=/usr/include install
+  mkdir -p "$pkgdir"/var/lock/dmraid
+  chmod 1777 "$pkgdir"/var/lock/
+  install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/lib/initcpio/install/dmraid
+  install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/lib/initcpio/hooks/dmraid
+  # fix permissions
+  chmod 644 "$pkgdir"/lib/libdmraid.a
+  chmod 644 "$pkgdir"/usr/include/dmraid/*
+}
diff --git a/testing/dmraid/dmraid.install b/testing/dmraid/dmraid.install
new file mode 100644
index 000000000..64899e785
--- /dev/null
+++ b/testing/dmraid/dmraid.install
@@ -0,0 +1,14 @@
+post_upgrade() {
+  if [ "$(vercmp $2 1.0.0.rc15)" -lt 0 ]; then
+    # important upgrade notice
+    echo ">>>"
+    echo ">>> IMPORTANT DMRAID UPGRADE NOTICE"
+    echo ">>> -------------------------------"
+    echo ">>> Version 1.0.0.rc15 and greater introduce a new name scheme:"
+    echo ">>> You need to add an additional 'p' in front of your number."
+    echo ">>> e.g. <yourname><number> --> <yourname>p<number>"
+    echo ">>>      firsthd1           --> firsthdp1"
+    echo ">>> Please change your bootloader and fstab accordingly."
+    echo ">>>"
+  fi
+}
diff --git a/testing/dmraid/dmraid_hook b/testing/dmraid/dmraid_hook
new file mode 100644
index 000000000..6219a718a
--- /dev/null
+++ b/testing/dmraid/dmraid_hook
@@ -0,0 +1,19 @@
+# vim: set ft=sh:
+run_hook ()
+{
+    /sbin/modprobe -q dm-mod >/dev/null 2>&1
+    /sbin/modprobe -q dm-mirror >/dev/null 2>&1
+    if [ -e "/sys/class/misc/device-mapper" ]; then
+        if [ ! -e "/dev/mapper/control" ]; then
+            mkdir /dev/mapper
+            mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |')
+        fi
+        msg ":: Activating dmraid arrays..."
+	# prevent any event monitoring calls with -I
+        if [ "${quiet}" = "y" ]; then
+            /sbin/dmraid -ay -I -Z >/dev/null
+        else
+            /sbin/dmraid -ay -I -Z
+        fi
+    fi
+}
diff --git a/testing/dmraid/dmraid_install b/testing/dmraid/dmraid_install
new file mode 100644
index 000000000..eeb9e0893
--- /dev/null
+++ b/testing/dmraid/dmraid_install
@@ -0,0 +1,19 @@
+# vim: set ft=sh:
+
+build()
+{
+    MODULES=" dm-mod dm-mirror "
+    BINARIES="/sbin/dmraid /sbin/dmsetup"
+    FILES=""
+    SCRIPT="dmraid"
+    add_file "/lib/udev/rules.d/10-dm.rules"
+    add_file "/lib/udev/rules.d/13-dm-disk.rules"
+    add_file "/lib/udev/rules.d/95-dm-notify.rules"
+}
+
+help ()
+{
+cat<<HELPEOF
+  This hook loads the necessary modules for a dmraid root device.
+HELPEOF
+}
diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD
new file mode 100644
index 000000000..6dc3dcc01
--- /dev/null
+++ b/testing/krb5/PKGBUILD
@@ -0,0 +1,61 @@
+# $Id: PKGBUILD 129991 2011-06-30 18:09:30Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+
+pkgname=krb5
+pkgver=1.9.1
+pkgrel=2
+pkgdesc="The Kerberos network authentication system"
+arch=('i686' 'x86_64')
+url="http://web.mit.edu/kerberos/"
+license=('custom')
+depends=('e2fsprogs' 'libldap' 'keyutils')
+makedepends=('perl')
+provides=('heimdal')
+replaces=('heimdal')
+conflicts=('heimdal')
+backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
+source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
+        krb5-kadmind
+        krb5-kdc)
+sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
+          '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
+          '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393')
+options=('!emptydirs')
+
+build() {
+   tar zxvf ${pkgname}-${pkgver}.tar.gz
+   cd "${srcdir}/${pkgname}-${pkgver}/src"
+
+   export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
+   export CPPFLAGS+=" -I/usr/include/et"
+   ./configure --prefix=/usr \
+               --mandir=/usr/share/man \
+               --localstatedir=/var/lib \
+               --enable-shared \
+               --with-system-et \
+               --with-system-ss \
+               --disable-rpath \
+               --without-tcl \
+               --enable-dns-for-realm \
+               --with-ldap
+   make
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}/src"
+   make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install
+
+   # Sample KDC config file
+   install -dm 755 "${pkgdir}"/var/lib/krb5kdc
+   install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf
+
+   # Default configuration file
+   install -dm 755 "${pkgdir}"/etc
+   install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
+
+   install -dm 755 "${pkgdir}"/etc/rc.d
+   install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d
+   install -m 755 ../../krb5-kadmind  "${pkgdir}"/etc/rc.d
+
+   install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/testing/krb5/krb5-kadmind b/testing/krb5/krb5-kadmind
new file mode 100644
index 000000000..04df0dcff
--- /dev/null
+++ b/testing/krb5/krb5-kadmind
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/kadmind`
+case "$1" in
+    start)
+        stat_busy "Starting Kerberos Admin Daemon"
+        if [ -z "$PID" ]; then
+           /usr/sbin/kadmind
+        fi
+        if [ ! -z "$PID" -o $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon krb5-kadmind
+            stat_done
+        fi
+        ;;
+    stop)
+        stat_busy "Stopping Kerberos Admin Daemon"
+	    [ ! -z "$PID" ] && kill $PID &> /dev/null
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            rm_daemon krb5-kadmind
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+	sleep 1
+        $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"
+	;;
+esac
+exit 0
diff --git a/testing/krb5/krb5-kdc b/testing/krb5/krb5-kdc
new file mode 100644
index 000000000..05a03411e
--- /dev/null
+++ b/testing/krb5/krb5-kdc
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/krb5kdc`
+case "$1" in
+    start)
+        stat_busy "Starting Kerberos Authentication"
+        if [ -z "$PID" ]; then
+           /usr/sbin/krb5kdc
+        fi
+        if [ ! -z "$PID" -o $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon krb5-kdc
+            stat_done
+        fi
+        ;;
+    stop)
+        stat_busy "Stopping Kerberos Authentication"
+	    [ ! -z "$PID" ] && kill $PID &> /dev/null
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            rm_daemon krb5-kdc
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+	sleep 1
+        $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"
+	;;
+esac
+exit 0
diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules
new file mode 100644
index 000000000..d2c167324
--- /dev/null
+++ b/testing/lvm2/11-dm-initramfs.rules
@@ -0,0 +1,3 @@
+# needed with new udev/mkinitcpio and as implemented in dracut:
+# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
+SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
diff --git a/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff b/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff
new file mode 100644
index 000000000..e75499e8e
--- /dev/null
+++ b/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff
@@ -0,0 +1,17 @@
+Do not issue an error message when unable to remove .cache on read-only fs.
+===================================================================
+RCS file: /cvs/lvm2/LVM2/lib/filters/filter-persistent.c,v
+retrieving revision 1.49
+retrieving revision 1.50
+diff -u -r1.49 -r1.50
+--- LVM2/lib/filters/filter-persistent.c	2011/04/22 12:05:33	1.49
++++ LVM2/lib/filters/filter-persistent.c	2011/05/12 12:42:48	1.50
+@@ -108,7 +108,7 @@
+ 			log_very_verbose("Obtaining device list from "
+ 					 "udev. Removing obolete %s.",
+ 					 pf->file);
+-			if (unlink(pf->file) < 0)
++			if (unlink(pf->file) < 0 && errno != EROFS)
+ 				log_sys_error("unlink", pf->file);
+ 		}
+ 		return 1;
diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD
new file mode 100644
index 000000000..0e13adba9
--- /dev/null
+++ b/testing/lvm2/PKGBUILD
@@ -0,0 +1,71 @@
+# $Id: PKGBUILD 129975 2011-06-30 17:54:05Z thomas $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+
+pkgbase=lvm2
+pkgname=('lvm2' 'device-mapper')
+pkgver=2.02.85
+_pkgverlvm=${pkgver}
+pkgrel=3
+arch=('i686' 'x86_64')
+url="http://sourceware.org/lvm2/"
+license=('GPL2' 'LGPL2.1')
+groups=('base')
+source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz
+        lvm2_install
+        lvm2_hook
+        Be-quiet-on-removing-cache-on-read-only-fs.diff
+        11-dm-initramfs.rules)
+md5sums=('91785ca438e5ce679dd3a386b183d552'
+         'dcb82506d732cc7b10159a89b579dba8'
+         '8d613b84a175cd85f752a75198e40e15'
+         '6db89da27928d2415a8e26cd0a842712'
+         '69e40679cd8b3658bfc619e48baae125')
+sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7'
+          '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
+          'a0e0513c2efb183006e57e595d93ce18be297928'
+          '6d7dd04be291d7537235704c816a701fd5beacc0'
+          'f6a554eea9557c3c236df2943bb6e7e723945c41')
+
+build() {
+  cd "${srcdir}/LVM2.${_pkgverlvm}"
+  sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh
+  patch -p1 -i ../Be-quiet-on-removing-cache-on-read-only-fs.diff
+  unset LDFLAGS
+  ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
+    --includedir=/usr/include --with-usrlibdir=/usr/lib \
+    --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
+    --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules
+  make
+}
+
+package_device-mapper() {
+  pkgdesc="Device mapper userspace library and tools"
+  url="http://sourceware.org/dm/"
+  depends=('glibc' 'udev')
+
+  cd "${srcdir}/LVM2.${_pkgverlvm}"
+  make DESTDIR="${pkgdir}" install_device-mapper
+  # extra udev rule for device-mapper in initramfs
+  install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules"
+}
+
+package_lvm2() {
+  pkgdesc="Logical Volume Manager 2 utilities"
+  depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
+  conflicts=('lvm' 'mkinitcpio<0.7')
+  backup=('etc/lvm/lvm.conf')
+  options=('!makeflags')
+
+  cd "${srcdir}/LVM2.${_pkgverlvm}"
+  make DESTDIR="${pkgdir}" install_lvm2
+  # install applib
+  cd liblvm
+  make DESTDIR="${pkgdir}" install
+  cd ..
+  # /etc directories
+  install -d "${pkgdir}"/etc/lvm/{archive,backup}
+  # mkinitcpio hook
+  install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2"
+  install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2"
+}
diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook
new file mode 100644
index 000000000..874b91d06
--- /dev/null
+++ b/testing/lvm2/lvm2_hook
@@ -0,0 +1,25 @@
+# vim:set ft=sh:
+run_hook ()
+{
+    /sbin/modprobe -q dm-mod >/dev/null 2>&1
+    if [ -e "/sys/class/misc/device-mapper" ]; then
+        if [ ! -e "/dev/mapper/control" ]; then
+            mkdir /dev/mapper
+            mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |')
+        fi
+
+        # If the lvmwait= parameter has been specified on the command line
+        # wait for the device(s) before trying to activate the volume group(s)
+        if [ -n "${lvmwait}" ]; then
+            for pvdev in $(echo ${lvmwait} | sed 's|,| |g'); do
+                poll_device ${pvdev} ${rootdelay}
+            done
+        fi
+
+        [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null"
+
+        msg "Activating logical volumes..."
+        [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit
+        eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
+    fi
+}
diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install
new file mode 100644
index 000000000..94175b523
--- /dev/null
+++ b/testing/lvm2/lvm2_install
@@ -0,0 +1,29 @@
+# vim: set ft=sh:
+
+build()
+{
+    MODULES=" dm-mod dm-snapshot dm-mirror"
+    BINARIES=""
+    FILES=""
+    SCRIPT="lvm2"
+
+    add_binary "/sbin/lvm"
+    add_binary "/sbin/dmsetup"
+    add_file "/lib/udev/rules.d/10-dm.rules"
+    add_file "/lib/udev/rules.d/13-dm-disk.rules"
+    add_file "/lib/udev/rules.d/95-dm-notify.rules"
+    add_file "/lib/udev/rules.d/11-dm-lvm.rules"
+    add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
+}
+
+help ()
+{
+cat<<HELPEOF
+  This hook loads the necessary modules for an LVM2 root device.
+
+  The optional lvmwait= parameter followed by a comma-separated
+  list of device names can be given on the command line.
+  It will cause the hook to wait until all given devices exist
+  before trying to scan and activate any volume groups.
+HELPEOF
+}
diff --git a/testing/mdadm/PKGBUILD b/testing/mdadm/PKGBUILD
index 3da2fec8d..0f9d96fc8 100644
--- a/testing/mdadm/PKGBUILD
+++ b/testing/mdadm/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 127622 2011-06-17 07:48:12Z tpowa $
+# $Id: PKGBUILD 129978 2011-06-30 18:05:23Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 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.5.99')
+conflicts=('mkinitcpio<0.7')
 depends=('glibc')
 backup=('etc/mdadm.conf')
 source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
@@ -23,7 +23,7 @@ replaces=('raidtools')
 md5sums=('12ee2fbf3beddb60601fb7a4c4905651'
          '6df172c8f77b280018cf87eb3d313f29'
          '00cbed931db4f15b6ce49e3e7d433966'
-         '53f58d4a8f6e23c452d67007186262e3'
+         '4bb000166fb13e82ceaa2422fdfaac7e'
          '36f7cc564ed3267888d90208e0eb7adc'
          '4ad87b74a4bc9a34621280abe0e0c3e4')
 
diff --git a/testing/mdadm/mdadm_install b/testing/mdadm/mdadm_install
index 59f4bc67b..f351cb292 100644
--- a/testing/mdadm/mdadm_install
+++ b/testing/mdadm/mdadm_install
@@ -1,6 +1,6 @@
 # vim: set ft=sh:
 
-install ()
+build()
 {
     MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
     BINARIES=""
diff --git a/testing/sqlite3/PKGBUILD b/testing/sqlite3/PKGBUILD
index 78e063ee7..fd4fe1d87 100644
--- a/testing/sqlite3/PKGBUILD
+++ b/testing/sqlite3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 129519 2011-06-28 15:50:46Z andyrtr $
+# $Id: PKGBUILD 130058 2011-07-01 19:36:29Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite3"
 pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
-_amalgamationver=3070700
+_amalgamationver=3070701
 _amalgamationver2=${_amalgamationver/00/}
 _docver=${_amalgamationver}	#3070700
 pkgver=${_amalgamationver2//0/.}
@@ -20,8 +20,8 @@ source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a
 	http://www.sqlite.org/sqlite-doc-${_docver}.zip
 	license.txt)
 options=('!libtool' '!emptydirs')
-md5sums=('a98df57053adf4c132b6b7ab59e9f333'
-         '91a9a3327b46d6d0a1341e9c95cba1e9'
+md5sums=('554026fe7fac47b1cf61c18d5fe43419'
+         '2bca5613abf9352bc525b6a8fd80156e'
          'c1cdbc5544034d9012e421e75a5e4890')
 
 build() {
diff --git a/testing/v86d/PKGBUILD b/testing/v86d/PKGBUILD
new file mode 100644
index 000000000..5e3bb7af1
--- /dev/null
+++ b/testing/v86d/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 129979 2011-06-30 18:07:08Z thomas $
+# Maintainer: Thomas Baechler <thomas@archlinux.org>
+
+pkgname=v86d
+pkgver=0.1.10
+pkgrel=2
+pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment"
+arch=('i686' 'x86_64')
+url="http://dev.gentoo.org/~spock/projects/uvesafb/"
+license=('GPL2')
+depends=('glibc')
+conflicts=('mkinitcpio<0.7')
+backup=('etc/modprobe.d/uvesafb.conf')
+options=('!makeflags')
+source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2
+        v86d
+        v86d_hook
+        modprobe.uvesafb)
+md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0'
+         '2748ca01397e5c4435f87692f7d042a8'
+         '813958b8f6c75a7063e4858f31509694'
+         '2d7cc8dc6a41916a13869212d0191147')
+
+build() {
+  cd "$srcdir/v86d-$pkgver"
+  ./configure --with-x86emu
+  # we only need /usr/include/video/uvesafb.h
+  make KDIR=/usr
+}
+
+package() {
+  cd "$srcdir/v86d-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  install -D -m644 "$srcdir/v86d" "$pkgdir/lib/initcpio/install/v86d"
+  install -D -m644 "$srcdir/v86d_hook" "$pkgdir/lib/initcpio/hooks/v86d"
+  install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/etc/modprobe.d/uvesafb.conf"
+}
diff --git a/testing/v86d/modprobe.uvesafb b/testing/v86d/modprobe.uvesafb
new file mode 100644
index 000000000..5e46e1088
--- /dev/null
+++ b/testing/v86d/modprobe.uvesafb
@@ -0,0 +1,10 @@
+#
+# This file sets the parameters for uvesafb module.
+# The following format should be used:
+# options uvesafb mode=<xres>x<yres>[-<bpp>][@<refresh>] scroll=<ywrap|ypan|redraw> ...
+#
+# For more details see:
+# http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=Documentation/fb/uvesafb.txt
+#
+ 
+options uvesafb mode_option=1024x768-32 scroll=ywrap
diff --git a/testing/v86d/v86d b/testing/v86d/v86d
new file mode 100644
index 000000000..2065b8e64
--- /dev/null
+++ b/testing/v86d/v86d
@@ -0,0 +1,12 @@
+build() {
+    add_binary "/sbin/v86d"
+    add_file "/etc/modprobe.d/uvesafb.conf"
+    MODULES="uvesafb"
+    SCRIPT="v86d"
+}
+
+help() {
+    echo "This hook sets up v86d, the userspace helper for uvesafb."
+}
+
+# vim: set ft=sh ts=4 sw=4 expandtab:
diff --git a/testing/v86d/v86d_hook b/testing/v86d/v86d_hook
new file mode 100644
index 000000000..e5dff01c1
--- /dev/null
+++ b/testing/v86d/v86d_hook
@@ -0,0 +1,4 @@
+run_hook()
+{
+  /sbin/modprobe uvesafb
+}
+\ No newline at end of file
author	Joshua Ismael Haase Hernández <hahj87@gmail.com>	2011-06-28 08:22:26 -0500
committer	Joshua Ismael Haase Hernández <hahj87@gmail.com>	2011-06-28 08:22:26 -0500
commit	cf34f2a7f0e4e0ca113a46845509e43cdc0eb3c3 (patch)
tree	009c64b580f512fe47a0543b590580585b56534f
parent	3dc4525661db2630038e019a2a31b71fdcbfb74a (diff)
parent	1732308adb7885b00fc388f978e65b3ad15aa067 (diff)