Tue May 22 00:02:33 UTC 2012

32 files changed, 298 insertions, 105 deletions

diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD
index d72b7df7b..e4b2d706b 100644
--- a/community/c++-gtk-utils/PKGBUILD
+++ b/community/c++-gtk-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 69584 2012-04-19 09:02:57Z giovanni $
+# $Id: PKGBUILD 70950 2012-05-20 14:02:23Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=c++-gtk-utils
-pkgver=2.0.7
+pkgver=2.0.8
 pkgrel=1
 pkgdesc="Classes and functions for programming in GTK+"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL2.1')
 depends=('gtk3')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('aea6396d780d053e798caed5c6a95cac')
+md5sums=('7e2a3c37ed7d2a5f2c2a9bd891fc50d1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD
index 5ccb4d4c6..cb14285f2 100644
--- a/community/dspam/PKGBUILD
+++ b/community/dspam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61608 2012-01-04 21:18:01Z spupykin $
+# $Id: PKGBUILD 70948 2012-05-20 12:51:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=dspam
-pkgver=3.10.1
-pkgrel=2
+pkgver=3.10.2
+pkgrel=1
 pkgdesc="A scalable, open-source statistical anti-spam filter"
 arch=('i686' 'x86_64')
 url="http://dspam.nuclearelephant.com/"
@@ -13,22 +13,22 @@ backup=('etc/dspam/dspam.conf'
 	'srv/http/dspam/cgi-bin/subadmins')
 license=("GPL")
 depends=(readline libcap ncurses zlib openssl)
-makedepends=('libmysqlclient' 'postgresql-libs' 'db' 'sqlite3')
+makedepends=('libmysqlclient' 'postgresql-libs' 'db' 'sqlite')
 optdepends=('libmysqlclient: MySQL support'
 	    'postgresql-libs: PostgreSQL support'
 	    'db: BerkeleyDB support'
-	    'sqlite3: SQLite support')
+	    'sqlite: SQLite support')
 options=('zipman' 'docs' '!libtool')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/project/dspam/dspam/dspam-$pkgver/dspam-$pkgver.tar.gz
 	dspam.logrotated
 	dspam)
-md5sums=('b8b57f7f4ce31de86fa13a656d3bf936'
+md5sums=('0e0e405d3284485b2a43f47eaf6b09bb'
          '2163ca41de383f09f4d754e2d35cb158'
          'bb2300eff5b2a6eb987750c71a2c2169')
 
 build() {
-  OPTS="--enable-delivery-to-stdout --with-dspam-owner=dspam --with-dspam-group=dspam --enable-daemon --enable-virtual-users \
+  OPTS="--with-dspam-owner=dspam --with-dspam-group=dspam --enable-daemon --enable-virtual-users \
 	--with-mysql-includes=/usr/include/mysql --with-mysql-libraries=/usr/lib \
 	--with-storage-driver="mysql_drv,libdb4_drv,pgsql_drv,sqlite3_drv,hash_drv" --with-dspam-home=/var/lib/dspam \
 	--with-logdir=/var/log/dspam --enable-preferences-extension --enable-large-scale"
diff --git a/community/intel-tbb/PKGBUILD b/community/intel-tbb/PKGBUILD
index 8c547be82..bd1f16f29 100644
--- a/community/intel-tbb/PKGBUILD
+++ b/community/intel-tbb/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 67699 2012-03-14 01:27:34Z stephane $
+# $Id: PKGBUILD 70971 2012-05-21 01:19:45Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Denis Martinez <deuns.martinez AT gmail.com>
 
 pkgname=intel-tbb
-pkgver=4.0_20120201
+pkgver=4.0_20120408
 pkgrel=1
 pkgdesc='High level abstract threading library'
 arch=('i686' 'x86_64')
 url='http://www.threadingbuildingblocks.org/'
 license=('GPL')
 depends=('gcc-libs')
-source=("http://threadingbuildingblocks.org/uploads/77/182/4.0%20update%203/tbb40_20120201oss_src.tgz")
-md5sums=('4669e7d4adee018de7a7b8b972987218')
+source=("http://threadingbuildingblocks.org/uploads/77/185/4.0%20update%204/tbb40_20120408oss_src.tgz")
+sha1sums=('04390147d40b86ae6291a9971a9c8afd327db718')
 
 build() {
   cd "${srcdir}"/tbb${pkgver/\./}oss
diff --git a/community/libnetfilter_conntrack/PKGBUILD b/community/libnetfilter_conntrack/PKGBUILD
index 918ef826a..6fbc80694 100644
--- a/community/libnetfilter_conntrack/PKGBUILD
+++ b/community/libnetfilter_conntrack/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66200 2012-02-23 03:12:17Z spupykin $
+# $Id: PKGBUILD 70936 2012-05-20 08:39:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=libnetfilter_conntrack
-pkgver=0.9.1
-pkgrel=2
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="userspace library providing a programming interface (API) to the in-kernel connection tracking state table"
 arch=('i686' 'x86_64')
 depends=(libnfnetlink)
@@ -14,7 +14,7 @@ url="http://www.netfilter.org/projects/libnetfilter_conntrack/index.html"
 license=("GPL")
 options=('!libtool')
 source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('b7506cbb7580433859809d8eac53a199')
+md5sums=('2d17d9da1404728d61a29b4a8338ad0c')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD
index 637747ba0..9f7426ba0 100644
--- a/community/monit/PKGBUILD
+++ b/community/monit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 68168 2012-03-18 20:38:00Z jlichtblau $
+# $Id: PKGBUILD 70938 2012-05-20 10:06:55Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
 # Contributor: Marco Bartholomew <marco@marcobartholomew.com>
 
 pkgname=monit
-pkgver=5.3.2
+pkgver=5.4
 pkgrel=1
 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ backup=('etc/monitrc')
 changelog=$pkgname.changelog
 source=(http://mmonit.com/$pkgname/dist/$pkgname-$pkgver.tar.gz \
         monitd)
-sha256sums=('406a06ac912525c8e76066d07235c848466b331532b2b3de931b61fe455ae915'
+sha256sums=('805c6545de2dd7f3d9e6e0c68018b2aadd5fc98b243c8868178f247a60906038'
             'b235b2fdeec49015d6b74f028d161b289663692f9ee2d2d78cf52d8db87ca496')
 
 build() {
diff --git a/community/monit/monit.changelog b/community/monit/monit.changelog
index 004314b6d..f0472719c 100644
--- a/community/monit/monit.changelog
+++ b/community/monit/monit.changelog
@@ -1,3 +1,6 @@
+2012-05-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* monit 5.4-1
+
 2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* monit 5.3.2-1
 
diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD
index 2343557fc..bec883a14 100644
--- a/community/qlandkartegt/PKGBUILD
+++ b/community/qlandkartegt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67301 2012-03-07 23:39:56Z jlichtblau $
+# $Id: PKGBUILD 70968 2012-05-20 21:22:58Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Matthias Maennich <arch@maennich.net>
 # Contributor: <boenki@gmx.de>
 
 pkgname=qlandkartegt
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="Use your GPS with Linux"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
         $pkgname-mimetypes.xml)
-sha256sums=('7ad2890d0e8192ffca4ae3d6973c885f1cb1f3391c133792e8a3359986f91289'
+sha256sums=('c720dbe484f5cc164cdacfbf70fcb37832de5f0b416cd482147e710b57570e68'
             'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0')
 
 build() {
diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog
index 43dea3dcb..367591af7 100644
--- a/community/qlandkartegt/qlandkartegt.changelog
+++ b/community/qlandkartegt/qlandkartegt.changelog
@@ -1,3 +1,6 @@
+2012-05-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.4.1-1
+
 2012-03-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* qlandkartegt 1.4.0-1
 
diff --git a/community/swftools/PKGBUILD b/community/swftools/PKGBUILD
index 3532e6056..7a069a04f 100644
--- a/community/swftools/PKGBUILD
+++ b/community/swftools/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 67692 2012-03-14 00:02:45Z giovanni $
+# $Id: PKGBUILD 70956 2012-05-20 17:24:25Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Vinay S Shastry <vinayshastry@gmail.com>
 
 pkgname=swftools
-pkgver=0.9.1
-pkgrel=2
+pkgver=0.9.2
+pkgrel=1
 pkgdesc="A collection of SWF manipulation and creation utilities"
 arch=('i686' 'x86_64')
 url="http://www.swftools.org/"
 license=('GPL')
 depends=('avifile' 'giflib' 'freeglut' 'lame' 't1lib' 'libjpeg' 'fontconfig')
-makedepends=('bison' 'flex' 'zlib')
+makedepends=('bison' 'flex' 'zlib' 'patch')
 changelog=$pkgname.changelog
-source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz)
-md5sums=('72dc4a7bf5cdf98c28f9cf9b1d8f5d7a')
+source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz
+        $pkgname-$pkgver.patch)
+sha256sums=('bf6891bfc6bf535a1a99a485478f7896ebacbe3bbf545ba551298080a26f01f1'
+            '80f69c86ed06b315f576a733fd1e24145b88aef9934085f3790179a119b7923d')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
@@ -25,8 +27,10 @@ build() {
 package() {
   cd ${srcdir}/$pkgname-$pkgver
 
-  make prefix=${pkgdir}/usr install
+  patch -Np0 -i ${srcdir}/$pkgname-$pkgver.patch
 
+  make prefix=${pkgdir}/usr install
+  
   cd ${pkgdir}/usr/share/$pkgname/swfs
   rm -f default_loader.swf default_viewer.swf
   ln -s tessel_loader.swf default_loader.swf
diff --git a/community/swftools/swftools-0.9.2.patch b/community/swftools/swftools-0.9.2.patch
new file mode 100644
index 000000000..2ffcd4115
--- /dev/null
+++ b/community/swftools/swftools-0.9.2.patch
@@ -0,0 +1,11 @@
+--- swfs/Makefile.orig	2012-05-20 18:39:44.000000000 +0200
++++ swfs/Makefile	2012-05-20 19:17:45.246528998 +0200
+@@ -44,4 +44,4 @@
+-	rm -f $(pkgdatadir)/swfs/default_viewer.swf -o -L $(pkgdatadir)/swfs/default_viewer.swf
+-	$(LN_S) $(pkgdatadir)/swfs/simple_viewer.swf $(pkgdatadir)/swfs/default_viewer.swf
+-	rm -f $(pkgdatadir)/swfs/default_loader.swf -o -L $(pkgdatadir)/swfs/default_loader.swf
+-	$(LN_S) $(pkgdatadir)/swfs/tessel_loader.swf $(pkgdatadir)/swfs/default_loader.swf
++#	rm -f $(pkgdatadir)/swfs/default_viewer.swf -o -L $(pkgdatadir)/swfs/default_viewer.swf
++#	$(LN_S) $(pkgdatadir)/swfs/simple_viewer.swf $(pkgdatadir)/swfs/default_viewer.swf
++#	rm -f $(pkgdatadir)/swfs/default_loader.swf -o -L $(pkgdatadir)/swfs/default_loader.swf
++#	$(LN_S) $(pkgdatadir)/swfs/tessel_loader.swf $(pkgdatadir)/swfs/default_loader.swf
diff --git a/community/swftools/swftools.changelog b/community/swftools/swftools.changelog
index 71adfbca5..71fe73ae5 100644
--- a/community/swftools/swftools.changelog
+++ b/community/swftools/swftools.changelog
@@ -1,9 +1,8 @@
-2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+2012-05-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* swftools 0.9.2-1
 
+2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* swftools 0.9.1-1
-	* new upstream release
 
 2009-05-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
 	* swftools 0.9.0-1
-	* new upstream release
diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD
index 799d45482..76f27bb29 100644
--- a/community/viking/PKGBUILD
+++ b/community/viking/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 70383 2012-05-05 13:23:37Z jlichtblau $
+# $Id: PKGBUILD 70959 2012-05-20 19:00:08Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Nick Østergaard <oe.nick@gmail.com>
 # Contributor: Jonny Gerold <jonny@fsk141.com>
 
 pkgname=viking
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK+2 application to manage GPS data"
 arch=('i686' 'x86_64')
 url="http://viking.sourceforge.net/"
 license=('GPL2')
-depends=('curl' 'gpsd' 'gtk2' 'hicolor-icon-theme' 'libexif')
+depends=('curl' 'gpsd' 'gtk2' 'hicolor-icon-theme' 'libexif' 'gpsbabel')
 makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('gpsbabel: for GPS management')
 options=('!emptydirs')
 install=$pkgname.install
 changelog=$pkgname.changelog
@@ -22,7 +21,7 @@ sha256sums=('54dc43b0136722118b8402d51ac8d78180ad59cc37e37ddf3fb6a7ee6bf04fdf')
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 
-  ./configure --prefix=/usr --disable-realtime-gps-tracking --enable-geocaches --enable-expedia 
+  ./configure --prefix=/usr --enable-geocaches --enable-expedia 
   make
 }
 
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 5bfda5b64..61230854c 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69182 2012-04-10 00:30:18Z spupykin $
+# $Id: PKGBUILD 70952 2012-05-20 14:22:35Z svenstaro $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Denis Martinez <deuns.martinez@gmail.com>
 
 pkgname=wt
 pkgver=3.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('i686' 'x86_64')
 url="http://www.webtoolkit.eu/"
@@ -33,7 +33,7 @@ build() {
   cmake -DCONNECTOR_HTTP=ON -DCMAKE_INSTALL_PREFIX=/usr \
     -DWEBUSER=http -DWEBGROUP=http -DRUNDIR=/var/run/wt -DDEPLOYROOT=/var/www/wt \
     -DUSE_SYSTEM_SQLITE3=ON -DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \
-    -DDESTDIR=${pkgdir} -DWT_CMAKE_FINDER_INSTALL_DIR="share/cmake-2.8/Modules" ..
+    -DWT_CMAKE_FINDER_INSTALL_DIR="share/cmake-2.8/Modules" ..
   make
 }
 
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index 9fc4a5700..94d9c623f 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146927 2012-01-19 10:01:03Z bluewind $
+# $Id: PKGBUILD 159280 2012-05-20 20:41:32Z bluewind $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: kevin <kevin.archlinux.org>
 # Contributor: judd <jvinet.zeroflux.org>
@@ -28,6 +28,11 @@ md5sums=('04a4c5d3c1f9f19d77daff8e8cd19a26'
          '490852b3d77c3b3866d0d75f5fbf5c5d'
          'c25d86206d649046538c3daab7874564')
 
+# workaround to let the integrity check find the correct provides array
+if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then
+	true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p'))
+fi
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index d68260d52..5b99070d0 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153502 2012-03-15 08:12:52Z allan $
+# $Id: PKGBUILD 159265 2012-05-20 05:50:51Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sudo
-_ver=1.8.4p4
+_ver=1.8.5p1
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
 pkgdesc="Give certain users the ability to run some commands as root"
@@ -15,8 +15,8 @@ backup=('etc/sudoers' 'etc/pam.d/sudo')
 options=('!libtool' '!makeflags')
 source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig}
         sudo.pam)
-md5sums=('b9be6df7ecefedff2263052ed9fc5e93'
-         '24da0bf96506b81678726778aad9ea4c'
+md5sums=('3b843e60e0bb226a24dd784345cbbba8'
+         '0f789f30462c2658afe9bd16602d76b1'
          '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
 
 build() {
diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD
index cafcc74d1..b469acf89 100644
--- a/extra/epiphany/PKGBUILD
+++ b/extra/epiphany/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156746 2012-04-23 09:04:34Z ibiru $
+# $Id: PKGBUILD 159282 2012-05-20 21:18:36Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=epiphany
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME web browser based on the WebKit rendering engine."
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('01f5763340f9fac0994f689ea6655c2c9760bddd77bbd8628b9c6075d9b6ed0d')
+sha256sums=('fb5b0d48c4d8725031d023fd6a054c10cb9f166cd430db7fc2383d8d2af5d615')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD
index 7cc1baea4..c611db88b 100644
--- a/extra/ffmpegthumbnailer/PKGBUILD
+++ b/extra/ffmpegthumbnailer/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=ffmpegthumbnailer
 pkgver=2.0.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="http://code.google.com/p/ffmpegthumbnailer/"
 license=('GPL2')
@@ -12,14 +12,18 @@ arch=('i686' 'x86_64')
 depends=('ffmpeg' 'libjpeg' 'libpng')
 optdepends=('gvfs: support for gio uris')
 source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz"
-        'ffmpegthumbnailer.desktop')
+        'ffmpegthumbnailer.desktop' 'ffmpegapi_fix_r241.patch')
 options=('!libtool')
 sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73'
-          'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53')
+          'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53'
+          '4e1a6a0f06ae3ae322ea44046599ebf3ab693cb6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # Don't use deprecated (removed?) ffmpeg api
+  patch -Np0 -i "${srcdir}/ffmpegapi_fix_r241.patch"
+
   ./configure --prefix=/usr --enable-gio
   make
 }
@@ -29,6 +33,7 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   # FS#24105: Generate thumbnails in nautilus
+  # FS#26540: Rename to .thumbnailer for nautilus
   install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \
-    "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop"
+    "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.thumbnailer"
 }
diff --git a/extra/ffmpegthumbnailer/ffmpegapi_fix_r241.patch b/extra/ffmpegthumbnailer/ffmpegapi_fix_r241.patch
new file mode 100644
index 000000000..37e65b059
--- /dev/null
+++ b/extra/ffmpegthumbnailer/ffmpegapi_fix_r241.patch
@@ -0,0 +1,56 @@
+--- libffmpegthumbnailer/moviedecoder.cpp.old	2012-05-20 11:57:04.503450287 +0200
++++ libffmpegthumbnailer/moviedecoder.cpp	2012-05-20 11:57:14.633450566 +0200
+@@ -58,19 +58,26 @@
+ void MovieDecoder::initialize(const string& filename)
+ {
+     av_register_all();
+-    avcodec_init();
+     avcodec_register_all();
+ 
+     string inputFile = filename == "-" ? "pipe:" : filename;
+     m_AllowSeek = (filename != "-") && (filename.find("rtsp://") != 0);
+-
++    
++#if LIBAVCODEC_VERSION_MAJOR < 53
+     if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, inputFile.c_str(), NULL, 0, NULL) != 0)
++#else
++	if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, inputFile.c_str(), NULL, NULL) != 0)
++#endif
+     {
+ 		destroy();
+         throw logic_error(string("Could not open input file: ") + filename);
+     }
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 53
+     if (av_find_stream_info(m_pFormatContext) < 0)
++#else
++	if (avformat_find_stream_info(m_pFormatContext, NULL) < 0)
++#endif
+     {
+ 		destroy();
+         throw logic_error(string("Could not find stream information"));
+@@ -90,8 +97,12 @@
+ 
+     if ((!m_FormatContextWasGiven) && m_pFormatContext)
+     {
++#if LIBAVCODEC_VERSION_MAJOR < 53
+         av_close_input_file(m_pFormatContext);
+         m_pFormatContext = NULL;
++#else
++        avformat_close_input(&m_pFormatContext);
++#endif
+     }
+ 
+     if (m_pPacket)
+@@ -159,7 +170,11 @@
+ 
+     m_pVideoCodecContext->workaround_bugs = 1;
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 53
+     if (avcodec_open(m_pVideoCodecContext, m_pVideoCodec) < 0)
++#else
++	if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, NULL) < 0)
++#endif
+     {
+         throw logic_error("Could not open video codec");
+     }
diff --git a/extra/fftw/PKGBUILD b/extra/fftw/PKGBUILD
index 053915392..db4322f0b 100644
--- a/extra/fftw/PKGBUILD
+++ b/extra/fftw/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154980 2012-04-01 07:06:27Z ronald $
+# $Id: PKGBUILD 159277 2012-05-20 10:35:50Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=fftw
-pkgver=3.3.1
+pkgver=3.3.2
 pkgrel=1
 pkgdesc="A library for computing the discrete Fourier transform (DFT)"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('gcc-fortran')
 options=('!libtool')
 source=("http://www.fftw.org/${pkgname}-${pkgver}.tar.gz")
 install=fftw.install
-sha1sums=('3fecc492f576503a6a509d2073bd82b3fe0aef13')
+sha1sums=('11a8c31186ff5a7d686a79a3f21b2530888e0dc2')
 
 # notes:
 # http://www.fftw.org/fftw2_doc/fftw_6.html#SEC69
@@ -29,7 +29,7 @@ build() {
   CFLAGS+=" -O3 -fomit-frame-pointer -malign-double -fstrict-aliasing -ffast-math"
 
   CONFIGURE="./configure F77=gfortran --prefix=/usr \
-                 --enable-shared --enable-threads"
+                 --enable-shared --enable-threads --enable-type-prefix"
 
   # build & install double precision
   $CONFIGURE --enable-sse2
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index 56665db73..bcefb1925 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 152254 2012-03-06 02:06:32Z stephane $
+# $Id: PKGBUILD 159285 2012-05-20 22:11:18Z stephane $
 # Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
 # Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
 
 pkgname=hwloc
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('sh' 'pciutils' 'cairo' 'libxml2')
 makedepends=('pkg-config')
 options=('!libtool' '!docs')
 source=(http://www.open-mpi.org/software/hwloc/v1.4/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('911d2ba77fa968c3c72caf75a9e21637f3677acc')
+sha1sums=('2c2ca4101b4ea6782393b555a320c566da50cb68')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 230eafac7..ebc6604ad 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158924 2012-05-13 10:20:49Z giovanni $
+# $Id: PKGBUILD 159279 2012-05-20 14:16:33Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.05.11
+pkgver=2012.05.17
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -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=('6ffb354005fe211dd455042f2e0c6564')
+md5sums=('e46d6070d7043b67c776389276d8bfed')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD
index 5de207936..3e57ddefa 100644
--- a/extra/openmpi/PKGBUILD
+++ b/extra/openmpi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 158183 2012-05-03 13:22:34Z stephane $
+# $Id: PKGBUILD 159287 2012-05-20 22:11:21Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 pkgname=openmpi
-pkgver=1.5.5
-pkgrel=3
+pkgver=1.6
+pkgrel=2
 pkgdesc="High performance message passing library (MPI)"
 arch=('i686' 'x86_64')
 url="http://www.open-mpi.org"
@@ -10,20 +10,20 @@ license=('custom')
 depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc')
 makedepends=('inetutils')
 options=(!libtool)
-source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2
-        openmpi-1.5.4-fix-fakeroot-execution.patch)
-sha1sums=('206e555f6d376443f2342f721d944e67dd1a04ef'
-          'ec46abb6f9e01daca910e4079b9abc036db9ed20')
+source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2
+        openmpi-hostfile.patch)
+sha1sums=('8b81eea712bb8f8120468003b5f29baecedf2367'
+          'a76da03418a106d57cfd020d0f8d887d7ec9225b')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
 
-   # Fix fakeroot problem (FS#28644)
-   patch -Np1 -i ../openmpi-1.5.4-fix-fakeroot-execution.patch
-   
    # Make sure we use the system ltdl librariry rather than the ones in the tarball
    rm -r opal/libltdl
 
+   # Search for openmpi-default-hostfile in /etc/openmpi
+   patch -Np1 -i ../openmpi-hostfile.patch
+
    ./configure --prefix=/usr \
                --sysconfdir=/etc/${pkgname} \
                --mandir=/usr/share/man \
diff --git a/extra/openmpi/openmpi-hostfile.patch b/extra/openmpi/openmpi-hostfile.patch
new file mode 100644
index 000000000..f6377674b
--- /dev/null
+++ b/extra/openmpi/openmpi-hostfile.patch
@@ -0,0 +1,12 @@
+diff -up openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile openmpi-1.6/orte/runtime/orte_mca_params.c
+--- openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile	2012-04-24 13:18:21.000000000 -0600
++++ openmpi-1.6/orte/runtime/orte_mca_params.c	2012-05-15 16:35:24.769565442 -0600
+@@ -225,7 +225,7 @@ int orte_register_params(void)
+                                 false, false, 1000, &orte_timeout_usec_per_proc);
+     
+     /* default hostfile */
+-    asprintf(&orte_default_hostfile, "%s/etc/openmpi-default-hostfile", opal_install_dirs.prefix);
++    asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir);
+     mca_base_param_reg_string_name("orte", "default_hostfile",
+                                    "Name of the default hostfile (relative or absolute path, \"none\" to ignore environmental or default MCA param setting)",
+                                    false, false, orte_default_hostfile, &orte_default_hostfile);
diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD
index 4e6c88070..6fd029b12 100644
--- a/extra/python-egenix-mx-base/PKGBUILD
+++ b/extra/python-egenix-mx-base/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 152250 2012-03-06 01:50:30Z stephane $
+# $Id: PKGBUILD 159295 2012-05-21 01:39:56Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=python-egenix-mx-base
 _origname=egenix-mx-base
-pkgver=3.2.3
+pkgver=3.2.4
 pkgrel=1
 pkgdesc="A collection of Python tools"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('python2')
 replaces=('egenix-mx-base')
 provides=('egenix-mx-base')
 source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz")
-sha1sums=('6f56a301859b8f9513141fbeeca3e537e082aa53')
+sha1sums=('22d7fcbd582177f9a43245eadc3644f3b48cc9a7')
 
 build() {
   cd "${srcdir}/${_origname}-${pkgver}"
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index f2509a086..c0fafbfb4 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159008 2012-05-14 20:33:16Z andyrtr $
+# $Id: PKGBUILD 159275 2012-05-20 10:17:15Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
@@ -9,7 +9,7 @@ _amalgamationver2=${_amalgamationver/00/}
 _docver=${_amalgamationver}	#3070700
 #pkgver=${_amalgamationver2//0/.}
 pkgver=3.7.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -47,7 +47,7 @@ package_sqlite() {
  pkgdesc="A C library that implements an SQL database engine"
  depends=('readline')
  provides=("sqlite3=$pkgver")
- replaces=("sqlite3=$pkgver")
+ replaces=("sqlite3")
  
   cd ${srcdir}/sqlite-autoconf-$_amalgamationver
   make DESTDIR=${pkgdir} install
@@ -59,9 +59,9 @@ package_sqlite() {
 package_sqlite-tcl() {
  
  pkgdesc="sqlite Tcl Extension Architecture (TEA)"
- depends=('sqlite>=3.7.5')
+ depends=('sqlite')
  provides=("sqlite3-tcl=$pkgver")
- replaces=("sqlite3-tcl=$pkgver")
+ replaces=("sqlite3-tcl")
  
   cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
   make DESTDIR=${pkgdir} install
@@ -72,7 +72,7 @@ package_sqlite-doc() {
  pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation"
  #arch=('any') - not yet supported
  provides=("sqlite3-doc=$pkgver")
- replaces=("sqlite3-doc=$pkgver")
+ replaces=("sqlite3-doc")
  
   #cd ${srcdir}/sqlite-doc-${_amalgamationver}
   cd ${srcdir}/sqlite-doc-${_docver}
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 27d16ef44..47873d47f 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 159237 2012-05-18 15:27:59Z andyrtr $
+# $Id: PKGBUILD 159267 2012-05-20 08:22:19Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.12.1.901
-pkgrel=3
+pkgver=1.12.1.902
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -16,19 +16,17 @@ options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         autoconfig-nvidia.patch
         autoconfig-sis.patch
-        EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
-        git-fixes.patch
+        #EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
+        #git-fixes.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-sha1sums=('bb9985bae271aa896de7fa12e49a0dbd8e244d2c'
-          '63836e5cfb4ae7353fb2e31239a544409c7ead32'
-          '175de5630b43dbc97778adfba5563b7fdd77f11f'
-          '4acb39587f73bcbb9a331377d6ef99cb73eb95a8'
-          '526cbffbc742dc3449065e3501d290a607d80aa3'
-          'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
-          '6838fc00ef4618c924a77e0fb03c05346080908a'
-          '993798f3d22ad672d769dae5f48d1fa068d5578f')
+sha256sums=('052efb01c47348b4138c89ad5654be022a4d952acc6129b2ad2659bc1ff4d509'
+            '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
+            'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
+            'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
+            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
+            '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -45,7 +43,7 @@ build() {
 #  patch -Np1 -i ${srcdir}/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
 
   # Add post-release patches from 1.12 branch
-  patch -Np1 -i ${srcdir}/git-fixes.patch
+#  patch -Np1 -i ${srcdir}/git-fixes.patch
 
   autoreconf -fi
   ./configure --prefix=/usr \
diff --git a/multilib/lib32-e2fsprogs/PKGBUILD b/multilib/lib32-e2fsprogs/PKGBUILD
index 40b2ef39d..b413c9146 100644
--- a/multilib/lib32-e2fsprogs/PKGBUILD
+++ b/multilib/lib32-e2fsprogs/PKGBUILD
@@ -4,7 +4,7 @@
 
 _pkgbasename=e2fsprogs
 pkgname=lib32-e2fsprogs
-pkgver=1.42.2
+pkgver=1.42.3
 pkgrel=1
 pkgdesc="Ext2 filesystem libraries (32-bit)"
 arch=('x86_64')
@@ -13,7 +13,7 @@ url="http://e2fsprogs.sourceforge.net"
 depends=('lib32-util-linux' $_pkgbasename)
 makedepends=('bc' 'gcc-multilib')
 source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz")
-sha1sums=('bfba3716b78310cf2a288909f13214a718d91e25')
+sha1sums=('0da8c787604876fe23b0f608389c3854ae1a2420')
 
 build() {
   export CC="gcc -m32"
diff --git a/multilib/lib32-libcups/PKGBUILD b/multilib/lib32-libcups/PKGBUILD
index 0258acf26..356b3274a 100644
--- a/multilib/lib32-libcups/PKGBUILD
+++ b/multilib/lib32-libcups/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 63968 2012-02-08 18:20:35Z pschmitz $
+# $Id: PKGBUILD 70966 2012-05-20 20:35:00Z bluewind $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 _pkgbasename=libcups
 pkgname=lib32-$_pkgbasename
-pkgver=1.5.2
+pkgver=1.5.3
 pkgrel=1
 pkgdesc="The CUPS Printing System - client libraries (32-bit)"
 arch=('x86_64')
@@ -11,8 +11,9 @@ license=('GPL')
 url="http://www.cups.org/"
 depends=(lib32-krb5 lib32-libtiff lib32-libpng $_pkgbasename)
 makedepends=(gcc-multilib)
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2)
-md5sums=('9471d2a7c920cfbb17133c32d2e6866f')
+source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 fix-libusb-configure.patch)
+md5sums=('e1ad15257aa6f162414ea3beae0c5df8'
+         '9cf39a66f21d1208a585367b25cf117b')
 
 build() {
   export CC="gcc -m32"
@@ -20,13 +21,15 @@ build() {
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd ${srcdir}/cups-${pkgver}
+
+  patch -p1 -i "$srcdir/fix-libusb-configure.patch"
   
   aclocal -I config-scripts
   autoconf -I config-scripts
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
      --disable-ldap --enable-raw-printing --disable-gssapi --disable-dbus \
-     --enable-ssl=no --disable-gnutls --enable-threads \
+     --enable-ssl=no --disable-gnutls --enable-threads --enable-libusb=no \
      --with-optim="$CFLAGS" --libdir=/usr/lib32
   make
 }
diff --git a/multilib/lib32-libcups/fix-libusb-configure.patch b/multilib/lib32-libcups/fix-libusb-configure.patch
new file mode 100644
index 000000000..02476c0b8
--- /dev/null
+++ b/multilib/lib32-libcups/fix-libusb-configure.patch
@@ -0,0 +1,12 @@
+diff -ur cups-1.5_2012-05-20_223115.3/config-scripts/cups-common.m4 cups-1.5.3/config-scripts/cups-common.m4
+--- cups-1.5_2012-05-20_223115.3/config-scripts/cups-common.m4	2012-05-20 22:31:15.702071734 +0200
++++ cups-1.5.3/config-scripts/cups-common.m4	2012-05-20 22:31:29.395622693 +0200
+@@ -216,7 +216,7 @@
+ AC_SUBST(LIBUSB)
+ 
+ if test "x$PKGCONFIG" != x; then
+-	if test x$enable_libusb = xyes -o $uname != Darwin; then
++	if test x$enable_libusb = xyes -a $uname != Darwin; then
+ 		AC_MSG_CHECKING(for libusb-1.0)
+ 		if $PKGCONFIG --exists libusb-1.0; then
+ 			AC_MSG_RESULT(yes)
diff --git a/staging/pciutils/PKGBUILD b/staging/pciutils/PKGBUILD
new file mode 100644
index 000000000..8458d7f6b
--- /dev/null
+++ b/staging/pciutils/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 159291 2012-05-20 23:30:35Z 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/staging/usbutils/PKGBUILD b/staging/usbutils/PKGBUILD
new file mode 100644
index 000000000..e4c32eb5a
--- /dev/null
+++ b/staging/usbutils/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 159293 2012-05-20 23:41:16Z 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/staging/usbutils/fix-python2.patch b/staging/usbutils/fix-python2.patch
new file mode 100644
index 000000000..7e2875e99
--- /dev/null
+++ b/staging/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"