diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-09-24 11:45:07 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-09-24 11:45:07 +0000 |
| commit | 29059760c2bf488363d7b276ad37bfcc9255432d (patch) | |
| tree | be6ad964d35be2d70ca2c3e08f23d0816bc9ae2b /sys-apps/usbutils | |
| parent | Stable for amd64, wrt bug #435714 (diff) | |
| download | gentoo-2-29059760c2bf488363d7b276ad37bfcc9255432d.tar.gz gentoo-2-29059760c2bf488363d7b276ad37bfcc9255432d.tar.bz2 gentoo-2-29059760c2bf488363d7b276ad37bfcc9255432d.zip | |
Fix building against >=dev-libs/libusbx-1.0.13 wrt #435866 by Zoltan Puskas
(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/usbutils')
| -rw-r--r-- | sys-apps/usbutils/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/usbutils/files/usbutils-006-libusbx-1.0.13.patch | 14 | ||||
| -rw-r--r-- | sys-apps/usbutils/usbutils-006.ebuild | 7 |
3 files changed, 24 insertions, 3 deletions
diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog index a5c04ad4296e..7aa5f55f030a 100644 --- a/sys-apps/usbutils/ChangeLog +++ b/sys-apps/usbutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/usbutils # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.141 2012/08/25 22:35:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.142 2012/09/24 11:45:07 ssuominen Exp $ + + 24 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> usbutils-006.ebuild, + +files/usbutils-006-libusbx-1.0.13.patch: + Fix building against >=dev-libs/libusbx-1.0.13 wrt #435866 by Zoltan Puskas 25 Aug 2012; Mike Frysinger <vapier@gentoo.org> usbutils-005.ebuild: Drop useless -vf args to mv #432632 by Joshua B. Kahlenberg. diff --git a/sys-apps/usbutils/files/usbutils-006-libusbx-1.0.13.patch b/sys-apps/usbutils/files/usbutils-006-libusbx-1.0.13.patch new file mode 100644 index 000000000000..f9a1334ebf97 --- /dev/null +++ b/sys-apps/usbutils/files/usbutils-006-libusbx-1.0.13.patch @@ -0,0 +1,14 @@ +http://bugs.gentoo.org/435866 +http://github.com/libusbx/libusbx/commit/3f513b62467d1842ec0771aaec01fde2f57bfb9c + +--- lsusb.c ++++ lsusb.c +@@ -437,7 +437,7 @@ + printf(" Remote Wakeup\n"); + if (config->bmAttributes & 0x10) + printf(" Battery Powered\n"); +- printf(" MaxPower %5umA\n", config->MaxPower * 2); ++ printf(" MaxPower %5umA\n", config->bMaxPower * 2); + + /* avoid re-ordering or hiding descriptors for display */ + if (config->extra_length) { diff --git a/sys-apps/usbutils/usbutils-006.ebuild b/sys-apps/usbutils/usbutils-006.ebuild index 056484a622c5..b45130d5a03f 100644 --- a/sys-apps/usbutils/usbutils-006.ebuild +++ b/sys-apps/usbutils/usbutils-006.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-006.ebuild,v 1.1 2012/07/09 09:10:48 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-006.ebuild,v 1.2 2012/09/24 11:45:07 ssuominen Exp $ EAPI="4" PYTHON_DEPEND="python? 2:2.6" -inherit python +inherit eutils python DESCRIPTION="USB enumeration utilities" HOMEPAGE="http://linux-usb.sourceforge.net/" @@ -33,6 +33,9 @@ pkg_setup() { } src_prepare() { + has_version ">=dev-libs/libusbx-1.0.13" && \ + epatch "${FILESDIR}"/${P}-libusbx-1.0.13.patch + if use python; then python_convert_shebangs 2 lsusb.py sed -i -e '/^usbids/s:/usr/share:/usr/share/misc:' lsusb.py || die |