Upgrade the usbutils Portage package.

Upgrade sys-apps/usbutils to version 006 on amd64.

BUG=chrome-os-partner:11327
BUG=chromium-os:33226
TEST=manual, build image + test lsusb / lspci

Change-Id: I73c5772db40a41898c8ded01bfbc74e90bb0e51a
Reviewed-on: https://gerrit.chromium.org/gerrit/36280
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Shawn Nematbakhsh <shawnn@google.com>
Commit-Ready: Shawn Nematbakhsh <shawnn@google.com>

sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/usbutils-001

@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/libusb:1 zlib? ( sys-libs/zlib ) dev-util/pkgconfig
-DESCRIPTION=USB enumeration utilities
-EAPI=2
-HOMEPAGE=http://linux-usb.sourceforge.net/
-IUSE=network-cron zlib
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:1 zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/usb/usbutils/usbutils-001.tar.gz
-_md5_=99bc5dfa7fea616b5e08d210569ec789

sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/usbutils-006

@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=virtual/libusb:1 zlib? ( sys-libs/zlib ) app-arch/xz-utils virtual/pkgconfig python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+DESCRIPTION=USB enumeration utilities
+EAPI=4
+HOMEPAGE=http://linux-usb.sourceforge.net/
+IUSE=python zlib
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=virtual/libusb:1 zlib? ( sys-libs/zlib ) sys-apps/hwids python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/usb/usbutils/usbutils-006.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=30f643c0ae8d5eaab42fbfff9b58d8d4

sdk_container/src/third_party/portage-stable/sys-apps/usbutils/Manifest

@@ -1 +1 @@
-DIST usbutils-001.tar.gz 577495 RMD160 a72fd0fc3a5a508c5a0100ba4396c05791ec61f3 SHA1 4469a310cc1b90fd5464491a6c1535a48ecd2ab6 SHA256 82f7d0f70aec413856ea4471aaa25b09bad624d9bd78c6a5f4801180371f1cdb
+DIST usbutils-006.tar.xz 408420 RMD160 46082cbf5a0d5547fad0dd5410a01739bd098698 SHA1 478346b28ce3e11965fc038db790311b7fc51156 SHA256 d9b5b5e7e5f797896e42efaa0a1f83089210bfed79312c1f04dd30b4f729ed0e

sdk_container/src/third_party/portage-stable/sys-apps/usbutils/files/usbutils-006-libusbx-1.0.13.patch

@@ -0,0 +1,15 @@
+--- lsusb.c
++++ lsusb.c
+@@ -437,7 +437,11 @@
+ 		printf("      Remote Wakeup\n");
+ 	if (config->bmAttributes & 0x10)
+ 		printf("      Battery Powered\n");
++	#if defined(LIBUSBX_API_VERSION) && (LIBUSBX_API_VERSION >= 0x01000100)
++	printf("    MaxPower            %5umA\n", config->bMaxPower * 2);
++	#else
+ 	printf("    MaxPower            %5umA\n", config->MaxPower * 2);
++	#endif
+ 
+ 	/* avoid re-ordering or hiding descriptors for display */
+ 	if (config->extra_length) {
+

sdk_container/src/third_party/portage-stable/sys-apps/usbutils/files/usbutils.cron

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/sbin/update-usbids -q

sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-001.ebuild

@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-001.ebuild,v 1.10 2011/08/24 17:35:46 radhermit Exp $
-
-EAPI="2"
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="http://linux-usb.sourceforge.net/"
-SRC_URI="mirror://kernel/linux/utils/usb/usbutils/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="network-cron zlib"
-
-RDEPEND="virtual/libusb:1
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_configure() {
-	econf \
-		--datarootdir=/usr/share \
-		--datadir=/usr/share/misc \
-		$(use_enable zlib)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	mv "${D}"/usr/sbin/update-usbids{.sh,} || die
-	newbin "${FILESDIR}"/usbmodules.sh usbmodules || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	use network-cron || return 0
-	exeinto /etc/cron.monthly
-	newexe "${FILESDIR}"/usbutils.cron update-usbids || die
-}

sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-006.ebuild

@@ -0,0 +1,65 @@
+# 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.6 2012/10/02 12:54:36 blueness Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit eutils python
+
+DESCRIPTION="USB enumeration utilities"
+HOMEPAGE="http://linux-usb.sourceforge.net/"
+SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="python zlib"
+
+RDEPEND="virtual/libusb:1
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	sys-apps/hwids"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	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
+	fi
+}
+
+src_configure() {
+	econf \
+		--datarootdir="${EPREFIX}/usr/share" \
+		--datadir="${EPREFIX}/usr/share/misc" \
+		--disable-usbids \
+		$(use_enable zlib)
+}
+
+src_install() {
+	default
+	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
+
+	use python || rm -f "${ED}"/usr/bin/lsusb.py
+
+	newbin "${FILESDIR}"/usbmodules.sh usbmodules
+}
+
+pkg_postinst() {
+	elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
+	elog "usb.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
+}
+