Thu May 24 00:02:45 UTC 2012

13 files changed, 423 insertions, 10 deletions

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"