Add support for Pete Zaitcev's binary usbmon support for 2.6.20+ kernels (compiles fine on old ones too).

(Portage version: 2.1.2.2)

3 files changed, 65 insertions, 1 deletions

diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog
index 3e6f0e9c8f53..44cd91e356ee 100644
--- a/sys-apps/usbutils/ChangeLog
+++ b/sys-apps/usbutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/usbutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.50 2007/02/10 00:41:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.51 2007/03/19 02:23:04 robbat2 Exp $
+
+*usbutils-0.72-r2 (19 Mar 2007)
+
+  19 Mar 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +usbutils-0.72-r2.ebuild:
+  Add support for Pete Zaitcev's binary usbmon support for 2.6.20+ kernels
+  (compiles fine on old ones too).
 
   10 Feb 2007; Mike Frysinger <vapier@gentoo.org>
   +files/usbutils-0.72-update-usbids.patch, files/usbutils.cron,
diff --git a/sys-apps/usbutils/files/digest-usbutils-0.72-r2 b/sys-apps/usbutils/files/digest-usbutils-0.72-r2
new file mode 100644
index 000000000000..2f33c46bb67e
--- /dev/null
+++ b/sys-apps/usbutils/files/digest-usbutils-0.72-r2
@@ -0,0 +1,6 @@
+MD5 e8a8c8168e8e2456ee12d1cc7c008f1f usbutils-0.72-mon1.diff 14741
+RMD160 642cfcd545e6e56a92859403b1ec6964260991bf usbutils-0.72-mon1.diff 14741
+SHA256 8190104af11715a13b136615881e334ef3939dae6056574616195b6633eba32b usbutils-0.72-mon1.diff 14741
+MD5 ee345fe605ffcfce843dae4aed81122b usbutils-0.72.tar.gz 166354
+RMD160 7af32b146e196d1df3de8e403fa92137bfe3d4c7 usbutils-0.72.tar.gz 166354
+SHA256 00385353242173b878413e0423c1dddcbbb50a3cadc3bb9d0a6adcf335794423 usbutils-0.72.tar.gz 166354
diff --git a/sys-apps/usbutils/usbutils-0.72-r2.ebuild b/sys-apps/usbutils/usbutils-0.72-r2.ebuild
new file mode 100644
index 000000000000..c01e8dbff96e
--- /dev/null
+++ b/sys-apps/usbutils/usbutils-0.72-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.72-r2.ebuild,v 1.1 2007/03/19 02:23:04 robbat2 Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="USB enumeration utilities"
+HOMEPAGE="http://linux-usb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/linux-usb/${P}.tar.gz
+		http://people.redhat.com/zaitcev/linux/${PN}-0.72-mon1.diff"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/libusb"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-update-usbids.patch
+
+	# put usb.ids in same place as pci.ids (/usr/share/misc)
+	sed -i \
+		-e 's:/usr/share/usb.ids:/usr/share/misc/usb.ids:' \
+		lsusb.8 || die "sed lsusb.8"
+	sed -e '/^DEST=/s:=usb.ids:=/usr/share/misc/usb.ids:' \
+		update-usbids.sh > update-usbids
+
+	# Add support for binary usbmon protocol
+	epatch "${DISTDIR}"/${PN}-0.72-mon1.diff
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_compile() {
+	econf \
+		--datadir=/usr/share/misc \
+		--enable-usbmodules \
+		|| die "./configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dosbin update-usbids || die "update-usbids failed"
+	dodoc AUTHORS ChangeLog NEWS README
+
+	exeinto /etc/cron.monthly
+	newexe "${FILESDIR}"/usbutils.cron update-usbids || die
+}