Add support for Pete Zaitcev's binary usbmon support for 2.6.20+ kernels (compiles...

Package-Manager: portage-2.1.2.2

diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog
index 3e6f0e9c8f53c5a1171a5dea1cc7a0dc152023b4..44cd91e356ee6dad39ba23a59446b5b8ed2f162b 100644 (file)
--- 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/Manifest b/sys-apps/usbutils/Manifest
index 518fd0af0dd21bbca678f5abc0f660afe4e3dfe5..7d8d5ac457522f081ffac82ecea2929627204337 100644 (file)
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX usbutils-0.71-new-video-format.patch 2391 RMD160 683496cfc8a8021406083a73e011ee3e206c718a SHA1 43b7ee15f01c84681cdee9b4b547327d71534d37 SHA256 14b39cb2981ec852dc2a0bb17a5b96d4c9854db088e3b077e3f709219b6cf0e8
 MD5 e092e74597092401bebd1db3c9ce6122 files/usbutils-0.71-new-video-format.patch 2391
 RMD160 683496cfc8a8021406083a73e011ee3e206c718a files/usbutils-0.71-new-video-format.patch 2391
@@ -14,6 +11,7 @@ MD5 8d68566ebeefcf9fabf7c78c4dcce805 files/usbutils.cron 42
 RMD160 463be9cd3993b1abfc05be0d3f8f8deed30e83bd files/usbutils.cron 42
 SHA256 4e53150761fc4a00b2a3593edd72e61c8710d619b96f0ae88b3c73360fac15d2 files/usbutils.cron 42
 DIST usbutils-0.71.tar.gz 163811 RMD160 88795765c880e2befe99ad5db1736990cd77dfcc SHA1 6e4a3ae72de11c40d90c4cf472ad09e0a80f178c SHA256 606d5a5a943a01c2b163eb66a8595596b4ad9466eebeff51b70e0bdce46e256f
+DIST usbutils-0.72-mon1.diff 14741 RMD160 642cfcd545e6e56a92859403b1ec6964260991bf SHA1 52c9a44866c5f0f3189d7409e25b44f5b000e3a2 SHA256 8190104af11715a13b136615881e334ef3939dae6056574616195b6633eba32b
 DIST usbutils-0.72.tar.gz 166354 RMD160 7af32b146e196d1df3de8e403fa92137bfe3d4c7 SHA1 891b8825d964880146d5c980e52bb9e23d92fe2b SHA256 00385353242173b878413e0423c1dddcbbb50a3cadc3bb9d0a6adcf335794423
 EBUILD usbutils-0.71-r1.ebuild 1288 RMD160 ff10d901037028a01748bdd4731e704c246bcb46 SHA1 1f68f71ac6189064fa8233b7abc025f0288bb993 SHA256 1f0e575f31b9a63d8f8c08a89188289737b9b659f6f2c52fd646341659fd68f5
 MD5 9e455c19f62460848676e4ab6bf613ef usbutils-0.71-r1.ebuild 1288
@@ -27,14 +25,18 @@ EBUILD usbutils-0.72-r1.ebuild 1259 RMD160 01dac19430f3ab2a31d1063a429c01c44075d
 MD5 f14ee2d7b1a3549f95afe0f1e4bad6fb usbutils-0.72-r1.ebuild 1259
 RMD160 01dac19430f3ab2a31d1063a429c01c44075d889 usbutils-0.72-r1.ebuild 1259
 SHA256 2b6dc0350e7d14b18984c04c84a0b43b6dfff5111bcb6db330ee088d55448543 usbutils-0.72-r1.ebuild 1259
+EBUILD usbutils-0.72-r2.ebuild 1458 RMD160 11edb9671d726426b42b647c5a5c44a21991fd22 SHA1 8e23c4697ea6f1dc921492f41d7c5125d2a184c1 SHA256 12d99f8c4f114a9987ac4b746ec8c5156f1f817bce8b6c5bb993ac9fc24d7b69
+MD5 f17b580c9c31166d2afc86aeb6e5430a usbutils-0.72-r2.ebuild 1458
+RMD160 11edb9671d726426b42b647c5a5c44a21991fd22 usbutils-0.72-r2.ebuild 1458
+SHA256 12d99f8c4f114a9987ac4b746ec8c5156f1f817bce8b6c5bb993ac9fc24d7b69 usbutils-0.72-r2.ebuild 1458
 EBUILD usbutils-0.72.ebuild 1209 RMD160 eb89a77140d6477d9ecfebcaa6f3315c51a6eca7 SHA1 b834ee25c9aed48b3b4bee8aaecdd18890242c1b SHA256 b341f3cd6ff86562cea86cabc76e4e344e9adaea0cf7ed3c2f5b928ff9a4f235
 MD5 8fe234a94f3100fe6f6ebbf599fc30b1 usbutils-0.72.ebuild 1209
 RMD160 eb89a77140d6477d9ecfebcaa6f3315c51a6eca7 usbutils-0.72.ebuild 1209
 SHA256 b341f3cd6ff86562cea86cabc76e4e344e9adaea0cf7ed3c2f5b928ff9a4f235 usbutils-0.72.ebuild 1209
-MISC ChangeLog 6656 RMD160 129038a6764f1aae4747ace3ceb7666c1bcc23d2 SHA1 2f7afbfd44062e15f3f810c615c95821a368d2ce SHA256 9a16025b53a97f6ffcca040b7d977507321d5f010cd1192b7e9bd755b93025f3
-MD5 55193f308dc79cd306797314b89f85e5 ChangeLog 6656
-RMD160 129038a6764f1aae4747ace3ceb7666c1bcc23d2 ChangeLog 6656
-SHA256 9a16025b53a97f6ffcca040b7d977507321d5f010cd1192b7e9bd755b93025f3 ChangeLog 6656
+MISC ChangeLog 6882 RMD160 3d60bc550298847ba4749bc150094ff64b72f6c8 SHA1 ae8860237f281461d026a319be24154e3e324e27 SHA256 674400a4df308577d847d9a4915bff04fdf4a335791b434a0bf9a6e5e675a250
+MD5 f0e1419dd25716017f641951a6768e2f ChangeLog 6882
+RMD160 3d60bc550298847ba4749bc150094ff64b72f6c8 ChangeLog 6882
+SHA256 674400a4df308577d847d9a4915bff04fdf4a335791b434a0bf9a6e5e675a250 ChangeLog 6882
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -51,10 +53,6 @@ SHA256 56ba49c410664c0382d790e2dc2a9374efd331d6a1e6ea03ad0dcce0fd005323 files/di
 MD5 e185d817a478344a99a1b75ac01b3a42 files/digest-usbutils-0.72-r1 241
 RMD160 12a00bb80257f8bc30fda3ed9d85dd9b8b4e6a60 files/digest-usbutils-0.72-r1 241
 SHA256 56ba49c410664c0382d790e2dc2a9374efd331d6a1e6ea03ad0dcce0fd005323 files/digest-usbutils-0.72-r1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFzRTG8bi6rjpTunYRAuElAKC+mi/z37uzgL3LVcIzvJRTfVPZuQCfV9Pe
-LxvF3AJeFdWZAraiwZtwJUg=
-=3cmG
------END PGP SIGNATURE-----
+MD5 e8069a47aa0884c2e15a43f8cf63cc9b files/digest-usbutils-0.72-r2 488
+RMD160 4a60a46e9d8cb5c4bf6244d6ac9ff92495e4b7ff files/digest-usbutils-0.72-r2 488
+SHA256 e5cd94490ef873993c38c344e3c699679de1d6b41c6e72c571ead3c9fd6210de files/digest-usbutils-0.72-r2 488

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 (file)
index 0000000..2f33c46
--- /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 (file)
index 0000000..c01e8db
--- /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
+}