From ef61aa5a9cead170fa18dba44609c32bbf18306a Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Thu, 5 May 2011 19:02:44 +0000
Subject: Thu May  5 19:02:44 UTC 2011

---
 core/usbutils/PKGBUILD          | 14 ++++++++++----
 core/usbutils/fix-python2.patch | 17 +++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 core/usbutils/fix-python2.patch

(limited to 'core/usbutils')

diff --git a/core/usbutils/PKGBUILD b/core/usbutils/PKGBUILD
index 871bd2111..b03109219 100644
--- a/core/usbutils/PKGBUILD
+++ b/core/usbutils/PKGBUILD
@@ -1,23 +1,29 @@
-# $Id: PKGBUILD 116702 2011-03-25 08:26:34Z tpowa $
+# $Id: PKGBUILD 118970 2011-04-09 20:52:11Z tpowa $
 # Maintainer: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com>
 pkgname=usbutils
 pkgver=002
-pkgrel=1
+pkgrel=2
 pkgdesc="USB Device Utilities"
 arch=(i686 x86_64)
 license=('GPL')
 groups=('base')
 makedepends=('wget')
 depends=('glibc' 'libusb')
+optdepends=('python2: for lsusb.py usage'
+           'coreutils: for lsusb.py usage')
 url="http://linux-usb.sourceforge.net/"
-source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('05610d15c3c8c8ada3d691c320ca784a')
+source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz
+        fix-python2.patch)
+md5sums=('05610d15c3c8c8ada3d691c320ca784a'
+         '45766196895b4cc50b53cd56e1bbf3d1')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   rm usb.ids
   wget http://www.linux-usb.org/usb.ids
+  # patch lsusb.py to use correct usb.ids file and python2 interpreter
+  patch -Np1 -i ../fix-python2.patch
   ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib
   make
 }
diff --git a/core/usbutils/fix-python2.patch b/core/usbutils/fix-python2.patch
new file mode 100644
index 000000000..7e2875e99
--- /dev/null
+++ b/core/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"
-- 
cgit v1.2.3-54-g00ecf