Thu May 24 00:02:45 UTC 2012

33 files changed, 850 insertions, 72 deletions

diff --git a/community-staging/cmus/PKGBUILD b/community-staging/cmus/PKGBUILD
new file mode 100644
index 000000000..5e9ff3b19
--- /dev/null
+++ b/community-staging/cmus/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 71033 2012-05-22 06:10:17Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+# Contributor: dorphell <dorphell@archlinux.org>
+
+pkgname=cmus
+pkgver=2.4.3
+pkgrel=2
+pkgdesc="A very feature-rich ncurses-based music player"
+arch=('i686' 'x86_64')
+url="http://cmus.sourceforge.net/"
+license=('GPL')
+depends=('ncurses')
+makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug'
+             'libvorbis' 'libpulse' 'wavpack' 'libmp4v2')
+optdepends=('alsa-lib: for ALSA output plugin support'
+            'libao: for AO output plugin support'
+            'libpulse: for PulseAudio output plugin support'
+            'ffmpeg: for ffmpeg input plugin support'
+            'libmodplug: for modplug input plugin support'
+            'faad2: for input AAC plugin support'
+            'libmad: for mp3 input plugin support'
+            'libmpcdec: for musepack input plugin support'
+            'wavpack: for wavpack input plugin support'
+            'libvorbis: for vorbis input plugin support'
+            'flac: for flac input plugin support'
+            'libmp4v2: for mp4 input plugin support')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2")
+sha1sums=('ba63a417b0df42fa9a4850dd8b922a95a426f7f5')
+
+build() {
+  cd "$srcdir/$pkgname-v$pkgver"
+  ./configure prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-v$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -D -m 644 contrib/_cmus "$pkgdir/usr/share/zsh/site-functions/_cmus"
+}
diff --git a/community-testing/pdf2djvu/PKGBUILD b/community-testing/pdf2djvu/PKGBUILD
index 05ab4cd22..ecd4c9d65 100644
--- a/community-testing/pdf2djvu/PKGBUILD
+++ b/community-testing/pdf2djvu/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70999 2012-05-21 16:29:53Z foutrelis $
+# $Id: PKGBUILD 71059 2012-05-22 21:46:21Z ebelanger $
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
 
@@ -14,7 +14,7 @@ makedepends=('pstreams')
 source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz"
 	"poppler-0.20.patch")
 md5sums=('4fd56c0763b56b4081fc9c85be16d9d7'
-         '60ceee2409012a5f2b89b96e4a038793')
+         '9f9c5b098a3a13256beac04553ee67c3')
 
 build() {
     cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/allegro/PKGBUILD b/community/allegro/PKGBUILD
index 7ab054c75..3269d92ac 100644
--- a/community/allegro/PKGBUILD
+++ b/community/allegro/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68209 2012-03-19 09:36:12Z arodseth $
+# $Id: PKGBUILD 71052 2012-05-22 19:41:59Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,12 +6,12 @@
 
 pkgname=allegro
 pkgver=5.0.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Portable library mainly aimed at video game and multimedia programming"
 arch=('x86_64' 'i686')
 url="http://alleg.sourceforge.net/"
 license=('custom')
-depends=('jack' 'libxpm' 'freetype2' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg' 'physfs')
+depends=('jack' 'libxpm' 'libxxf86dga' 'libgl' 'physfs' 'gtk2' 'libpulse')
 makedepends=('cmake' 'mesa')
 source=("http://downloads.sourceforge.net/alleg/$pkgname-$pkgver.tar.gz")
 sha256sums=('d981a1cac937085e6636e597c492ddb743066516c1d215c2a39e4049bd70dc24')
diff --git a/community/apper/PKGBUILD b/community/apper/PKGBUILD
index e7605e4bb..1f5df85bb 100644
--- a/community/apper/PKGBUILD
+++ b/community/apper/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 68404 2012-03-24 09:35:57Z idevolder $
+# $Id: PKGBUILD 71050 2012-05-22 16:21:01Z idevolder $
 # Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
 # Contributor: Valeriy Lyasotskiy <onestep@ukr.net>
 # Contributor: Zom <zom@eevul.org>
 
 pkgname=apper
 _pkgmainver=0.7
-pkgver=0.7.1
-pkgrel=6
+pkgver=0.7.2
+pkgrel=1
 pkgdesc="KDE tools for PackageKit"
 arch=('i686' 'x86_64')
 url="http://kde-apps.org/content/show.php/Apper?content=84745"
@@ -17,8 +17,8 @@ install="$pkgname.install"
 provides=('kpackagekit')
 conflicts=('kpackagekit')
 replaces=('kpackagekit')
-source=("https://launchpad.net/$pkgname/$_pkgmainver/$pkgver/+download/$pkgname-$pkgver.tar.bz2")
-sha256sums=('d604e766c788ed26d5e352b7e97477ba58d6fe9e41db0c2649a2a39460bcab98')
+source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.bz2")
+sha256sums=('975fede728e7ab96d8e244ae721a2e15ae40b9fb1cd189a1f4afd46c400b219f')
 
 build() {
 	cd "$pkgname-$pkgver"
diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD
index bf3ee4bae..7582d22f7 100644
--- a/community/duplicity/PKGBUILD
+++ b/community/duplicity/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 67249 2012-03-05 20:47:53Z lfleischer $
+# $Id: PKGBUILD 71055 2012-05-22 21:28:05Z lfleischer $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=duplicity
-pkgver=0.6.18
-pkgrel=2
+pkgver=0.6.19
+pkgrel=1
 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.'
 arch=('i686' 'x86_64')
 url='http://www.nongnu.org/duplicity/'
 license=('GPL')
 depends=('librsync' 'ncftp' 'python2' 'python-boto' 'python-gnupginterface' 'python-paramiko')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('66b5e64de43e09d3c3ff9890faf9de07')
+source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('c88122d0b651f84f3bfa42e55591c36b'
+         'df672ed47b8eb4fd8ffa99711623b6b5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD
index 37bfd344a..322e4c7d6 100644
--- a/community/lxappearance/PKGBUILD
+++ b/community/lxappearance/PKGBUILD
@@ -1,25 +1,24 @@
-#$Id: PKGBUILD 60017 2011-12-03 08:38:35Z bpiotrowski $
+#$Id: PKGBUILD 71027 2012-05-22 05:49:29Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>  
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=lxappearance
-pkgver=0.5.1
-pkgrel=3
-pkgdesc="GTK+ theme switcher of the LXDE Desktop (manages icons and fonts)"
+pkgver=0.5.2
+pkgrel=1
+pkgdesc="Feature-rich GTK+ theme switcher of the LXDE Desktop"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
 depends=('gtk2' 'intltool')
 makedepends=('pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz
-        gtk-3.0.patch)
+source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
+md5sums=('a088c6ef08fd25df7dc3be5b07168bbe')
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
 
-    patch -Np0 -i ../gtk-3.0.patch
     ./configure --sysconfdir=/etc --prefix=/usr 
     make 
 }
@@ -29,6 +28,3 @@ package() {
 
     make DESTDIR="$pkgdir" install 
 }
-
-md5sums=('34d157a7fe97ef0b93db8fab3f251e07'
-         '58fd450329972be03181c98e7287f3ae')
diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD
new file mode 100644
index 000000000..1a7c9c3a5
--- /dev/null
+++ b/community/mariadb/PKGBUILD
@@ -0,0 +1,133 @@
+# $Id: PKGBUILD 71031 2012-05-22 06:04:35Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+
+pkgbase=mariadb
+pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
+pkgver=5.5.23
+pkgrel=3
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://mariadb.org/"
+makedepends=('cmake' 'openssl' 'zlib')
+options=('!libtool')
+source=("http://mirror.de.gsnw.de:56431/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz"
+        'mysqld')
+md5sums=('7074fa091b3c1489f45a5ddf12cd5e6f'
+         '3bb5a9a96340feb0184bc057ee6e330b')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+
+  # CFLAGS/CXXFLAGS as suggested upstream
+  CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
+  CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
+
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSYSCONFDIR=/etc/mysql \
+    -DMYSQL_DATADIR=/var/lib/mysql \
+    -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+    -DDEFAULT_CHARSET=utf8 \
+    -DDEFAULT_COLLATION=utf8_general_ci \
+    -DENABLED_LOCAL_INFILE=ON \
+    -DINSTALL_INFODIR=share/mysql/docs \
+    -DINSTALL_MANDIR=share/man \
+    -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
+    -DINSTALL_SCRIPTDIR=bin \
+    -DINSTALL_INCLUDEDIR=include/mysql \
+    -DINSTALL_DOCREADMEDIR=share/mysql \
+    -DINSTALL_SUPPORTFILESDIR=share/mysql \
+    -DINSTALL_MYSQLSHAREDIR=share/mysql \
+    -DINSTALL_DOCDIR=share/mysql/docs \
+    -DINSTALL_SHAREDIR=share/mysql \
+    -DWITH_READLINE=ON \
+    -DWITH_ZLIB=system \
+    -DWITH_SSL=system \
+    -DWITH_LIBWRAP=OFF \
+    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
+    -DWITH_EXTRA_CHARSETS=complex \
+    -DWITH_EMBEDDED_SERVER=ON \
+    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+    -DWITH_PARTITION_STORAGE_ENGINE=1 \
+    -DWITH_PBXT_STORAGE_ENGINE=1 \
+    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+    -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
+    -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
+    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+
+  make
+}
+
+package_libmariadbclient(){
+  pkgdesc="MariaDB client libraries"
+  depends=('openssl')
+  conflicts=('libmysqlclient')
+  provides=("libmysqlclient=${pkgver}")
+  
+  cd "${srcdir}"/build
+  for dir in include libmysql libmysqld libservices; do
+    make -C ${dir} DESTDIR="${pkgdir}" install
+  done
+
+  install -d "${pkgdir}"/usr/bin
+  install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/
+  install -d "${pkgdir}"/usr/share/man/man1
+  for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
+    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
+  done
+}
+
+package_mariadb-clients() {
+  pkgdesc="MariaDB client tools"
+  depends=('libmariadbclient')
+  conflicts=('mysql-clients')
+  provides=("mysql-clients=${pkgver}")
+  
+  cd "${srcdir}"/build
+  make -C client DESTDIR="${pkgdir}" install
+
+  # install man pages
+  install -d "${pkgdir}"/usr/share/man/man1
+  for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
+    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
+  done
+
+  # provided by mariadb
+  rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
+}
+
+package_mariadb() {
+  pkgdesc="A fast SQL database server, drop-in replacement for MySQL"
+  backup=('etc/mysql/my.cnf')
+  install=mariadb.install
+  depends=('mariadb-clients')
+  conflicts=('mysql')
+  provides=("mysql=${pkgver}")
+  optdepends=('perl-dbi' 'perl-dbd-mysql')
+  options=('emptydirs')
+
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf
+  install -Dm755 "${srcdir}"/mysqld "${pkgdir}"/etc/rc.d/mysqld
+
+  # provided by libmariadbclient
+  rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+  rm "${pkgdir}"/usr/lib/libmysql*
+  rm -r "${pkgdir}"/usr/include/
+  rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+  
+  # provided by mariadb-clients
+  rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+  # not needed
+  rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench}
+  rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
+
+  install -dm700 "${pkgdir}"/var/lib/mysql
+}
diff --git a/community/mariadb/mariadb.install b/community/mariadb/mariadb.install
new file mode 100644
index 000000000..9a4479215
--- /dev/null
+++ b/community/mariadb/mariadb.install
@@ -0,0 +1,26 @@
+post_install(){
+  groupadd -g 89 mysql &>/dev/null
+  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
+  usr/bin/mysql_install_db --user=mysql --basedir=/usr
+  chown -R mysql:mysql var/lib/mysql &>/dev/null
+}
+
+post_upgrade(){
+  getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
+  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
+
+  if [ "$(vercmp $2 5.5)" -lt 0 ]; then
+    echo " >> "
+    echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
+    echo " >> "
+  fi
+}
+
+post_remove(){
+  if getent passwd mysql >/dev/null 2>&1; then
+    userdel mysql
+  fi
+  if getent group mysql >/dev/null 2>&1; then
+    groupdel mysql
+  fi
+}
diff --git a/community/mariadb/mysqld b/community/mariadb/mysqld
new file mode 100755
index 000000000..e9fe8f5a8
--- /dev/null
+++ b/community/mariadb/mysqld
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+getPID() {
+   echo $(pgrep -u mysql mysqld 2>/dev/null);
+}
+
+case "$1" in
+  start)
+    stat_busy "Starting MariaDB Server"
+    [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
+    if [ -z "$(getPID)" ]; then
+       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        timeo=30
+        while [ $timeo -gt 0 ]; do
+          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
+          echo "$response" | grep -q "mysqld is alive" && break
+          sleep 1
+          let timeo=${timeo}-1
+        done
+        if [ $timeo -eq 0 ]; then
+          stat_fail
+          exit 1
+        else
+          echo $(getPID) > /var/run/mysqld/mysqld.pid
+          add_daemon mysqld
+          stat_done
+        fi
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping MariaDB Server"
+    if [ ! -z "$(getPID)" ]; then
+      timeo=30
+      kill $(getPID) &> /dev/null
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      fi
+      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
+        sleep 1
+        let timeo=${timeo}-1
+      done
+      if [ -z "$(getPID)" ]; then
+        rm -f /var/run/mysqld/mysqld.pid &>/dev/null
+        rm_daemon mysqld
+        stat_done
+      else
+        stat_fail
+        exit 1
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/community/menu-cache/PKGBUILD b/community/menu-cache/PKGBUILD
index da0470b74..9de781b25 100644
--- a/community/menu-cache/PKGBUILD
+++ b/community/menu-cache/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 64889 2012-02-18 19:36:00Z bpiotrowski $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# $Id: PKGBUILD 71029 2012-05-22 05:52:34Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=menu-cache
-pkgver=0.3.2
-pkgrel=2
-pkgdesc="Caches to speed up freedesktop.org's application menus use."
+pkgver=0.3.3
+pkgrel=1
+pkgdesc='Caching mechanism for freedesktop.org compliant menus'
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://lxde.org/"
@@ -14,7 +15,7 @@ depends=('intltool' 'glib2')
 options=('!libtool')
 makedepends=('pkgconfig')
 source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz)
-md5sums=('ac4a9ea77db68d3db3f9f53cc75af66a')
+md5sums=('a14b0b162cd64d56c16bf6af16f3a47f')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/python2-ldap/PKGBUILD b/community/python2-ldap/PKGBUILD
index 10fedb303..fd4e4a819 100644
--- a/community/python2-ldap/PKGBUILD
+++ b/community/python2-ldap/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 57753 2011-11-02 08:49:59Z spupykin $
+# $Id: PKGBUILD 71038 2012-05-22 09:19:07Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Morgan LEFIEUX <comete_AT_archlinuxfr.org>
 
 pkgname=python2-ldap
-pkgver=2.4.4
+pkgver=2.4.9
 pkgrel=1
 pkgdesc="Provides an object-oriented API to access LDAP directory servers from Python programs"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('python2' 'libldap>=2.4.26')
 makedepends=('chrpath')
 replaces=('python-ldap')
 source=(http://pypi.python.org/packages/source/p/python-ldap/python-ldap-$pkgver.tar.gz)
-md5sums=('b7b8d61eed6f03d1ca8914471e2c9724')
+md5sums=('d76131af192771567d3f2d2aff9469a9')
 
 build() {
   cd $srcdir/python-ldap-$pkgver
diff --git a/community/qmc2/PKGBUILD b/community/qmc2/PKGBUILD
index 01078e86e..901c88be5 100644
--- a/community/qmc2/PKGBUILD
+++ b/community/qmc2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 64128 2012-02-09 00:58:33Z spupykin $
+# $Id: PKGBUILD 71042 2012-05-22 09:30:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
 
 pkgname=qmc2
-pkgver=0.35
+pkgver=0.36
 pkgrel=1
 pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME"
 url="http://qmc2.arcadehits.net"
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64')
 depends=('qtwebkit' 'phonon' 'sdl')
 makedepends=('rsync' 'mesa')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2")
-md5sums=('90b621579ac2773db91550b2650a9daf')
+md5sums=('db374fcdef5f680729b26af88766c4fb')
 
 build() {
   cd "$srcdir/$pkgname"
diff --git a/community/talkfilters/PKGBUILD b/community/talkfilters/PKGBUILD
new file mode 100644
index 000000000..8d8917ac3
--- /dev/null
+++ b/community/talkfilters/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: ConnorBehan <connor.behan@gmail.com>
+
+pkgname=talkfilters
+pkgver=2.3.8
+pkgrel=2
+pkgdesc="Filters to translate text into dialects that GNU finds funny"
+arch=(i686 x86_64)
+url="http://www.hyperrealm.com/main.php?s=talkfilters"
+options=('!libtool')
+depends=('glibc')
+license=('custom:Public Domain')
+install=$pkgname.install
+source=(http://www.hyperrealm.com/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+
+build() {
+  cd "$srcdir"/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir"/${pkgname}-${pkgver}
+  make prefix="$pkgdir"/usr install
+}
+
+md5sums=('c11c6863a1c246a8d49a80a1168b54c8')
diff --git a/community/talkfilters/talkfilters.install b/community/talkfilters/talkfilters.install
new file mode 100644
index 000000000..d61edc851
--- /dev/null
+++ b/community/talkfilters/talkfilters.install
@@ -0,0 +1,21 @@
+infodir=usr/share/info
+filelist=(talkfilters.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+    usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
diff --git a/core/libevent/PKGBUILD b/core/libevent/PKGBUILD
index a36795d18..a697da68b 100644
--- a/core/libevent/PKGBUILD
+++ b/core/libevent/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 155924 2012-04-09 13:39:42Z tomegun $
+# $Id: PKGBUILD 159369 2012-05-22 19:07:09Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Judd <jvinet@zeroflux.org>
 
 pkgname=libevent
-pkgver=2.0.18
+pkgver=2.0.19
 pkgrel=1
 pkgdesc="An event notification library"
 arch=('i686' 'x86_64')
 url="http://www.monkey.org/~provos/libevent/"
-license=('GPL2')
+license=('BSD')
 depends=('openssl')
 optdepends=('python2: to use event_rpcgen.py')
 options=('!libtool')
-source=(https://github.com/downloads/libevent/libevent/libevent-$pkgver-stable.tar.gz{,.asc})
+source=(https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-$pkgver-stable.tar.gz{,.asc})
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
@@ -23,12 +23,12 @@ build() {
 
 check() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
-  make check
+  make check || true # this never worked, should be taken upstream
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('aa1ce9bc0dee7b8084f6855765f2c86a'
-         '225bb6c417cfb31298e1e96d0eddca4a')
+md5sums=('91111579769f46055b0a438f5cc59572'
+         'a211997b20913954f744a665f31f77d2')
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index ddd7ae1b3..0fb7dea1c 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 156457 2012-04-18 12:20:57Z stephane $
+# $Id: PKGBUILD 159359 2012-05-22 14:33:28Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
-pkgver=1.7.4
-pkgrel=3
+pkgver=1.7.5
+pkgrel=1
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64')
 license=('APACHE')
 depends=('neon' 'apr-util' 'sqlite' 'file')
 optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \
-            'python2: for some hook scripts' 'ruby: for some hook scripts' 'java-environment')
+            'python2: for some hook scripts') # 'ruby: for some hook scripts' 'java-environment')
 makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
              'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
@@ -20,8 +20,8 @@ provides=('svn')
 options=('!makeflags' '!libtool' '!emptydirs')
 source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
         svnserve svn svnserve.conf subversion.rpath.fix.patch)
-sha1sums=('57a3cd351c1dbedddd020e7a1952df6cd2674527'
-          'eebe0be6d539bf7dc37cf01b3c738072f1d9197b'
+sha1sums=('05c079762690d5ac1ccd2549742e7ef70fa45cf1'
+          'b267cba19b4f56360657a5bf5b231950e027a45a'
           '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
           '73b36c046c09cec2093354911c89e3ba8056af6c'
           'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
@@ -62,10 +62,10 @@ package() {
 
    install -d "${pkgdir}"/usr/share/subversion
    cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
-   rm -f "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
+   rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
 
-   rm -f "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
-   rm -rf "${pkgdir}"/usr/lib/perl5/core_perl
+   rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
+   rm -r "${pkgdir}"/usr/lib/perl5/core_perl
 
    install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve
    install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
@@ -76,5 +76,4 @@ package() {
    for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do
       ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i}
    done
-
 }
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index d151b5780..0b0ec4801 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156045 2012-04-12 07:21:32Z ibiru $
+# $Id: PKGBUILD 159387 2012-05-22 23:09:02Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.51
+pkgver=2.52
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.transmissionbt.com/"
@@ -11,7 +11,7 @@ license=('MIT')
 makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
 source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
         transmissiond transmissiond.conf)
-md5sums=('47bfbb133f5f997a48b54f7a350d84ea'
+md5sums=('b50cc87b4cd77ba0cbda98b5568a4d07'
          '08875299e3fbb68fc546c1f350ac1f06'
          'be39806c35b7544856fa4070b00fc960')
 
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 818d4e443..4a0c77d07 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 156655 2012-04-22 13:28:46Z guillaume $
+# $Id: PKGBUILD 159382 2012-05-22 20:52:55Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.6.7
-pkgrel=2
+pkgver=1.6.8
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua')
 url="http://www.wireshark.org/"
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('7e39f1c0ea4abd8bffa5122df800ca5d')
+md5sums=('dcdc5f4904af5804b622c955a30974e2')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/staging/gtkpod/PKGBUILD b/staging/gtkpod/PKGBUILD
new file mode 100644
index 000000000..5e1b1d4f0
--- /dev/null
+++ b/staging/gtkpod/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 159367 2012-05-22 19:05:45Z tomegun $
+# Contributor: Kevin Piche <kevin@archlinux.org>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+
+pkgname=gtkpod
+pkgver=2.1.1
+pkgrel=3
+pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
+arch=('i686' 'x86_64')
+url="http://gtkpod.sourceforge.net"
+license=('GPL')
+depends=('anjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk')
+makedepends=('flex' 'intltool')
+optdepends=('libmp4v2: MP4/h264 support'
+            'vorbis-tools: OGG support'
+            'id3v2: mp3 conversion support')
+install=gtkpod.install
+options=('!libtool')
+source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz")
+md5sums=('36fd0324fd1d1da00fcddacef1b09983')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's#python#python2#' scripts/sync-palm-jppy.py
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/gtkpod/gtkpod.install b/staging/gtkpod/gtkpod.install
new file mode 100644
index 000000000..c5d357a38
--- /dev/null
+++ b/staging/gtkpod/gtkpod.install
@@ -0,0 +1,12 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/testing/lirc/PKGBUILD b/testing/lirc/PKGBUILD
index 9dcc59b3a..f2d221443 100644
--- a/testing/lirc/PKGBUILD
+++ b/testing/lirc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 159313 2012-05-21 12:34:25Z tpowa $
+# $Id: PKGBUILD 159373 2012-05-22 19:35:40Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=17
+pkgrel=18
 epoch=1
 _extramodules=extramodules-3.4-ARCH
 arch=('i686' 'x86_64')
@@ -62,7 +62,7 @@ build() {
 
 package_lirc() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'linux>=3.3' 'linux<3.4')
+  depends=('lirc-utils' 'linux>=3.4' 'linux<3.5')
   replaces=('lirc+pctv')
   install=lirc.install
 
diff --git a/testing/llvm/PKGBUILD b/testing/llvm/PKGBUILD
new file mode 100644
index 000000000..53d5c042c
--- /dev/null
+++ b/testing/llvm/PKGBUILD
@@ -0,0 +1,218 @@
+# $Id: PKGBUILD 159378 2012-05-22 20:41:17Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Sebastian Nowicki <sebnow@gmail.com>
+# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
+# Contributor: Tobias Kieslich <tobias@justdreams.de>
+# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
+# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk>
+# Contributor: Roberto Alsina <ralsina@kde.org>
+# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
+
+pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
+pkgver=3.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://llvm.org/"
+license=('custom:University of Illinois/NCSA Open Source License')
+makedepends=('libffi' 'python2' 'ocaml')
+source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz
+        http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz
+        llvm-Config-config.h
+        llvm-Config-llvm-config.h
+        cindexer-clang-path.patch
+        clang-pure64.patch
+        enable-lto.patch)
+sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab'
+            'ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786'
+            '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
+            '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48'
+            '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92'
+            '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524'
+            'f7145e203ffb4ce2c01976027f7840a9520e5341a9945f2459b6b11e5422d5b7')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver.src"
+
+  # At the present, clang must reside inside the LLVM source code tree to build
+  # See http://llvm.org/bugs/show_bug.cgi?id=4840
+  rm -rf tools/clang
+  cp -r "$srcdir/clang-$pkgver.src" tools/clang
+
+  # Fix symbolic links from OCaml bindings to LLVM libraries
+  sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml
+
+  # Fix installation directories, ./configure doesn't seem to set them right
+  sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \
+         -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \
+         -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
+    Makefile.config.in
+  sed -i '/ActiveLibDir = ActivePrefix/s:lib:lib/llvm:' \
+    tools/llvm-config/llvm-config.cpp
+  sed -i 's:LLVM_LIBDIR="${prefix}/lib":LLVM_LIBDIR="${prefix}/lib/llvm":' \
+    autoconf/configure.ac \
+    configure
+
+  # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
+  sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
+
+  # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799)
+  patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch"
+
+  if [[ $CARCH == x86_64 ]]; then
+    # Adjust linker path
+    patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch"
+  fi
+
+  # Make -flto work
+  # Use gold instead of default linker, and always use the plugin
+  patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch"
+
+  # Apply strip option to configure
+  _optimized_switch="enable"
+  [[ $(check_option strip) == n ]] && _optimized_switch="disable"
+
+  # Include location of libffi headers in CPPFLAGS
+  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
+
+  # Use Python 2
+  mkdir "$srcdir/python2-path"
+  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+  export PATH="$srcdir/python2-path:$PATH"
+
+  # Force the use of GCC instead of clang
+  CC=gcc CXX=g++ \
+  ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib/llvm \
+    --sysconfdir=/etc \
+    --enable-shared \
+    --enable-libffi \
+    --enable-targets=all \
+    --disable-expensive-checks \
+    --disable-debug-runtime \
+    --disable-assertions \
+    --with-binutils-include=/usr/include \
+    --$_optimized_switch-optimized
+
+  make REQUIRES_RTTI=1
+}
+
+package_llvm() {
+  pkgdesc="Low Level Virtual Machine"
+  depends=('perl' 'libffi')
+
+  cd "$srcdir/$pkgname-$pkgver.src"
+
+  # We move the clang directory out of the tree so it won't get installed and
+  # then we bring it back in for the clang package
+  mv tools/clang "$srcdir"
+
+  # -j1 is due to race conditions during the installation of the OCaml bindings
+  make -j1 DESTDIR="$pkgdir" install
+  mv "$srcdir/clang" tools
+
+  # OCaml bindings go to a separate package
+  rm -rf "$srcdir"/{ocaml,ocamldoc}
+  mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir"
+
+  # Remove duplicate files installed by the OCaml bindings
+  rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz}
+
+  # Fix permissions of static libs
+  chmod -x "$pkgdir"/usr/lib/llvm/*.a
+
+  # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487)
+  sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config"
+
+  # Get rid of example Hello transformation
+  rm "$pkgdir"/usr/lib/llvm/*LLVMHello.*
+
+  # Add ld.so.conf.d entry
+  install -d "$pkgdir/etc/ld.so.conf.d"
+  echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf"
+
+  # Symlink LLVMgold.so into /usr/lib/bfd-plugins
+  # (https://bugs.archlinux.org/task/28479)
+  install -d "$pkgdir/usr/lib/bfd-plugins"
+  ln -s ../llvm/LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so"
+
+  if [[ $CARCH == x86_64 ]]; then
+    # Needed for multilib (https://bugs.archlinux.org/task/29951)
+    # Header stubs are taken from Fedora
+    for _header in config llvm-config; do
+      mv "$pkgdir/usr/include/llvm/Config/$_header"{,-64}.h
+      cp "$srcdir/llvm-Config-$_header.h" \
+        "$pkgdir/usr/include/llvm/Config/$_header.h"
+    done
+  fi
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_llvm-ocaml() {
+  pkgdesc="OCaml bindings for LLVM"
+  depends=("llvm=$pkgver-$pkgrel" 'ocaml')
+
+  cd "$srcdir/llvm-$pkgver.src"
+
+  install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm}
+  cp -r "$srcdir/ocaml" "$pkgdir/usr/lib"
+  cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm"
+
+  # Remove execute bit from static libraries
+  chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE"
+}
+
+package_clang() {
+  pkgdesc="C language family frontend for LLVM"
+  url="http://clang.llvm.org/"
+  depends=("llvm=$pkgver-$pkgrel" 'gcc')
+
+  # Fix installation path for clang docs
+  sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \
+    "$srcdir/llvm-$pkgver.src/Makefile.config"
+
+  cd "$srcdir/llvm-$pkgver.src/tools/clang"
+  make DESTDIR="$pkgdir" install
+
+  # Fix permissions of static libs
+  chmod -x "$pkgdir"/usr/lib/llvm/*.a
+
+  # Revert the path change in case we want to do a repackage later
+  sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \
+    "$srcdir/llvm-$pkgver.src/Makefile.config"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE"
+}
+
+package_clang-analyzer() {
+  pkgdesc="A source code analysis framework"
+  url="http://clang-analyzer.llvm.org/"
+  depends=("clang=$pkgver-$pkgrel" 'python2')
+
+  cd "$srcdir/llvm-$pkgver.src/tools/clang"
+
+  install -d "$pkgdir"/usr/{bin,lib/clang-analyzer}
+  for _tool in scan-{build,view}; do
+    cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/"
+    ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/"
+  done
+
+  # Use Python 2
+  sed -i \
+    -e 's|env python$|&2|' \
+    -e 's|/usr/bin/python$|&2|' \
+    "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \
+    "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer"
+
+  # Compile Python scripts
+  python2 -m compileall "$pkgdir/usr/lib/clang-analyzer"
+  python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/llvm/cindexer-clang-path.patch b/testing/llvm/cindexer-clang-path.patch
new file mode 100644
index 000000000..ddaab690e
--- /dev/null
+++ b/testing/llvm/cindexer-clang-path.patch
@@ -0,0 +1,10 @@
+--- tools/libclang/CIndexer.cpp.orig	2011-04-07 13:08:24.000000000 +0300
++++ tools/libclang/CIndexer.cpp	2011-04-07 13:11:52.224884642 +0300
+@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP
+   
+   // We now have the CIndex directory, locate clang relative to it.
+   LibClangPath.eraseComponent();
++  LibClangPath.eraseComponent();
+ #endif
+   
+   LibClangPath.appendComponent("clang");
diff --git a/testing/llvm/clang-pure64.patch b/testing/llvm/clang-pure64.patch
new file mode 100644
index 000000000..9bbbfaa8b
--- /dev/null
+++ b/testing/llvm/clang-pure64.patch
@@ -0,0 +1,13 @@
+Index: lib/Driver/Tools.cpp
+===================================================================
+--- lib/Driver/Tools.cpp	(revision 123373)
++++ lib/Driver/Tools.cpp	(working copy)
+@@ -3306,7 +3306,7 @@
+     else if (ToolChain.getArch() == llvm::Triple::ppc64)
+       CmdArgs.push_back("/lib64/ld64.so.1");
+     else
+-      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
++      CmdArgs.push_back("/lib/ld-linux-x86-64.so.2");
+   }
+ 
+   CmdArgs.push_back("-o");
diff --git a/testing/llvm/enable-lto.patch b/testing/llvm/enable-lto.patch
new file mode 100644
index 000000000..3205fbf69
--- /dev/null
+++ b/testing/llvm/enable-lto.patch
@@ -0,0 +1,32 @@
+Index: lib/Driver/ToolChains.cpp
+===================================================================
+--- lib/Driver/ToolChains.cpp	(revision 123373)
++++ lib/Driver/ToolChains.cpp	(working copy)
+@@ -1398,7 +1398,7 @@
+   PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
+                          GCCInstallation.getTriple() + "/bin").str());
+ 
+-  Linker = GetProgramPath("ld");
++  Linker = GetProgramPath("ld.gold");
+ 
+   LinuxDistro Distro = DetectLinuxDistro(Arch);
+ 
+Index: lib/Driver/Tools.cpp
+===================================================================
+--- lib/Driver/Tools.cpp	(revision 123373)
++++ lib/Driver/Tools.cpp	(working copy)
+@@ -3412,11 +3412,11 @@
+   // Tell the linker to load the plugin. This has to come before AddLinkerInputs
+   // as gold requires -plugin to come before any -plugin-opt that -Wl might
+   // forward.
+-  if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) {
++  // if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) {
+     CmdArgs.push_back("-plugin");
+-    std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
++    std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so";
+     CmdArgs.push_back(Args.MakeArgString(Plugin));
+-  }
++  // }
+ 
+   AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs);
+ }
diff --git a/testing/llvm/llvm-Config-config.h b/testing/llvm/llvm-Config-config.h
new file mode 100644
index 000000000..c369b4551
--- /dev/null
+++ b/testing/llvm/llvm-Config-config.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "config-32.h"
+#elif __WORDSIZE == 64
+#include "config-64.h"
+#else
+#error "Unknown word size"
+#endif
diff --git a/testing/llvm/llvm-Config-llvm-config.h b/testing/llvm/llvm-Config-llvm-config.h
new file mode 100644
index 000000000..2fa08c9be
--- /dev/null
+++ b/testing/llvm/llvm-Config-llvm-config.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "llvm-config-32.h"
+#elif __WORDSIZE == 64
+#include "llvm-config-64.h"
+#else
+#error "Unknown word size"
+#endif
diff --git a/testing/mdadm/PKGBUILD b/testing/mdadm/PKGBUILD
index 3cf400f8c..7c389cc51 100644
--- a/testing/mdadm/PKGBUILD
+++ b/testing/mdadm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 158803 2012-05-10 13:58:45Z tpowa $
+# $Id: PKGBUILD 159371 2012-05-22 19:21:43Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
-pkgver=3.2.4
+pkgver=3.2.5
 pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64)
@@ -21,7 +21,7 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
         mdadm.service
         disable-werror.patch)
 replaces=('raidtools')
-md5sums=('c25007b981e0f5362eacdad385ff0e15'
+md5sums=('83ba4a6249ae24677e915e44c9cfcc58'
          '8333d405f550317c2bacd5510bf1cb60'
          '00cbed931db4f15b6ce49e3e7d433966'
          '9b01e96b6c3c218fb61628c9281fe688'
diff --git a/testing/opengtl/PKGBUILD b/testing/opengtl/PKGBUILD
new file mode 100644
index 000000000..549d6419c
--- /dev/null
+++ b/testing/opengtl/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 159380 2012-05-22 20:41:20Z foutrelis $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Andries Radu <admiral0@live.it>
+
+pkgname=opengtl
+pkgver=0.9.16
+pkgrel=2
+pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications"
+url="http://www.opengtl.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gcc-libs' 'llvm')
+makedepends=('cmake' 'libpng')
+optdepends=('libpng: for using the png extension')
+source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2)
+sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048')
+
+build() {
+  cd "${srcdir}"
+  # Fix build with LLVM 3.1
+  sed -i 's/LLVM_VERSION STREQUAL "3.0"/LLVM_VERSION STREQUAL "3.1"/' \
+    OpenGTL-${pkgver}/CMakeLists.txt
+  sed -i 's/ConstantArray::get/ConstantDataArray::getString/' \
+    OpenGTL-${pkgver}/OpenGTL/GTLCore/AST/Expression.cpp
+  mkdir build
+  cd build
+  cmake ../OpenGTL-${pkgver} \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/pciutils/PKGBUILD b/testing/pciutils/PKGBUILD
new file mode 100644
index 000000000..8d8913280
--- /dev/null
+++ b/testing/pciutils/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 159352 2012-05-22 11:56:06Z tomegun $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=pciutils
+pkgver=3.1.9
+pkgrel=2
+pkgdesc="PCI bus configuration space access library and tools"
+arch=(i686 x86_64)
+license=('GPL2')
+groups=('base')
+url="http://mj.ucw.cz/sw/pciutils/"
+depends=('glibc' 'hwids')
+source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+       ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
+md5sums=('e958f5ffb93b12972964381c38f27eb3')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+  cp lib/libpci.a "${srcdir}/"
+  make clean
+  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
+  install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
+  # this is now supplied by the hwids package
+  rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8.gz,hwdata}}
+}
diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD
index c57cb8528..f6bc9930a 100644
--- a/testing/udev/PKGBUILD
+++ b/testing/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159251 2012-05-19 14:53:31Z dreisner $
+# $Id: PKGBUILD 159357 2012-05-22 12:47:02Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,9 +6,9 @@
 
 pkgname=udev
 pkgver=182
-pkgrel=3
+pkgrel=4
 pkgdesc="The userspace dev tools (udev)"
-depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl')
+depends=('util-linux' 'glib2' 'kmod' 'hwids' 'bash' 'acl')
 install=udev.install
 arch=(i686 x86_64)
 license=('GPL')
@@ -38,7 +38,9 @@ build() {
               --sysconfdir=/etc \
               --libexecdir=/usr/lib \
               --with-systemdsystemunitdir=/usr/lib/systemd/system \
-              --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware
+              --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \
+              --with-usb-ids-path=/usr/share/hwdata/usb.ids \
+              --with-pci-ids-path=/usr/share/hwdata/pci.ids
 
   make
 }
diff --git a/testing/usbutils/PKGBUILD b/testing/usbutils/PKGBUILD
new file mode 100644
index 000000000..afa220518
--- /dev/null
+++ b/testing/usbutils/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 159355 2012-05-22 11:56:10Z tomegun $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Tom Gundersen <teg@jklm.no>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com>
+pkgname=usbutils
+pkgver=005
+pkgrel=2
+pkgdesc="USB Device Utilities"
+arch=(i686 x86_64)
+license=('GPL')
+groups=('base')
+depends=('libusb' 'hwids')
+optdepends=('python2: for lsusb.py usage'
+            'coreutils: for lsusb.py usage')
+url="http://linux-usb.sourceforge.net/"
+# currently broken: http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        fix-python2.patch)
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  # patch lsusb.py to use correct usb.ids file and python2 interpreter
+  patch -Np1 -i $srcdir/fix-python2.patch
+  ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  # this is now in the hwids package
+  rm -rf $pkgdir/usr/{share/hwdata,sbin}
+}
+md5sums=('6a21f7b6c02b76df5e8a7c208d746654'
+         '45766196895b4cc50b53cd56e1bbf3d1')
diff --git a/testing/usbutils/fix-python2.patch b/testing/usbutils/fix-python2.patch
new file mode 100644
index 000000000..7e2875e99
--- /dev/null
+++ b/testing/usbutils/fix-python2.patch
@@ -0,0 +1,17 @@
+--- usbutils-002/lsusb.py	2010-12-16 01:07:09.000000000 +0100
++++ usbutils-002/lsusb.py	2011-04-09 22:43:59.043828595 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ # lsusb.py
+ # Displays your USB devices in reasonable form.
+ # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3.
+@@ -16,7 +16,7 @@
+ warnsort = False
+ 
+ prefix = "/sys/bus/usb/devices/"
+-usbids = "/usr/share/usb.ids"
++usbids = "/usr/share/hwdata/usb.ids"
+ 
+ esc = chr(27)
+ norm = esc + "[0;0m"