From 35c29ffeee71924ed2195ff8e6d67201ccbe21d4 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sun, 1 Apr 2007 00:22:14 +0000 Subject: [PATCH] Revert usbmon patch at the request of upstream. It can now be found as a seperate package. Package-Manager: portage-2.1.2.2 --- sys-apps/usbmon/Manifest | 12 +++++ sys-apps/usbutils/ChangeLog | 9 +++- sys-apps/usbutils/Manifest | 15 ++++-- .../usbutils/files/digest-usbutils-0.72-r3 | 3 ++ sys-apps/usbutils/usbutils-0.72-r3.ebuild | 46 +++++++++++++++++++ 5 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 sys-apps/usbmon/Manifest create mode 100644 sys-apps/usbutils/files/digest-usbutils-0.72-r3 create mode 100644 sys-apps/usbutils/usbutils-0.72-r3.ebuild diff --git a/sys-apps/usbmon/Manifest b/sys-apps/usbmon/Manifest new file mode 100644 index 000000000000..7cea7cdfc8bc --- /dev/null +++ b/sys-apps/usbmon/Manifest @@ -0,0 +1,12 @@ +DIST usbmon.4.tar.gz 7602 RMD160 6814f0089d4fa7c613e719165db591d3a8bdf198 SHA1 e362d4c14eb1c5b953a12072382651a095602c6a SHA256 e17f4cbf9d8d9078c75c654c56437dc781c8c3718aa8d8f8ccaace79389734e4 +EBUILD usbmon-4.ebuild 645 RMD160 f3ad124aa86b6486e82cca12f5a6b404358b2c3b SHA1 730e0b23e411ffc94ec5361a18c3a751f7587302 SHA256 88d94a583d8b6c23361c087545ccd1277be752635e4fa9637b94065272a1ff2e +MD5 a2047deb467cd7b2033a65a764c680c0 usbmon-4.ebuild 645 +RMD160 f3ad124aa86b6486e82cca12f5a6b404358b2c3b usbmon-4.ebuild 645 +SHA256 88d94a583d8b6c23361c087545ccd1277be752635e4fa9637b94065272a1ff2e usbmon-4.ebuild 645 +MISC ChangeLog 368 RMD160 c53534e9afcf27d3b9a30388f10adf81d13014dd SHA1 7c30a95ee40d21fbea6293828229942b24526318 SHA256 fc8e861c3bc0f0cc3334d4660066ec335043e28a79920ed79181950ad8816fd8 +MD5 d2484367c2682747cbf5a27a33aebe23 ChangeLog 368 +RMD160 c53534e9afcf27d3b9a30388f10adf81d13014dd ChangeLog 368 +SHA256 fc8e861c3bc0f0cc3334d4660066ec335043e28a79920ed79181950ad8816fd8 ChangeLog 368 +MD5 458e8e7cf406a246ffdc024977b57205 files/digest-usbmon-4 220 +RMD160 a3a16c8f7fe0168ce98833cbcdb415c97b94f90b files/digest-usbmon-4 220 +SHA256 5dc7ceb4319a400ae0a2c849006c7f05fe65277e535785a7f69316f82be94b19 files/digest-usbmon-4 220 diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog index 44cd91e356ee..abd85393fc3d 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.51 2007/03/19 02:23:04 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.52 2007/04/01 00:22:14 robbat2 Exp $ + +*usbutils-0.72-r3 (01 Apr 2007) + + 01 Apr 2007; Robin H. Johnson + +usbutils-0.72-r3.ebuild: + Revert usbmon patch at the request of upstream. It can now be found as a + seperate package. *usbutils-0.72-r2 (19 Mar 2007) diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest index 7d8d5ac45752..9de016ad736a 100644 --- a/sys-apps/usbutils/Manifest +++ b/sys-apps/usbutils/Manifest @@ -29,14 +29,18 @@ EBUILD usbutils-0.72-r2.ebuild 1458 RMD160 11edb9671d726426b42b647c5a5c44a21991f 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-r3.ebuild 1260 RMD160 b0b39189bb8b67d7e696c9b935eddbca42648944 SHA1 69af7426f3358deaebd949638cf1dea48d7941e2 SHA256 01686069a7a9b0f2c408db22e99b9cf67b690135c64d22f8b9625e1717d5f6a9 +MD5 693eab7b84375137aa27107bceab8ca4 usbutils-0.72-r3.ebuild 1260 +RMD160 b0b39189bb8b67d7e696c9b935eddbca42648944 usbutils-0.72-r3.ebuild 1260 +SHA256 01686069a7a9b0f2c408db22e99b9cf67b690135c64d22f8b9625e1717d5f6a9 usbutils-0.72-r3.ebuild 1260 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 6882 RMD160 3d60bc550298847ba4749bc150094ff64b72f6c8 SHA1 ae8860237f281461d026a319be24154e3e324e27 SHA256 674400a4df308577d847d9a4915bff04fdf4a335791b434a0bf9a6e5e675a250 -MD5 f0e1419dd25716017f641951a6768e2f ChangeLog 6882 -RMD160 3d60bc550298847ba4749bc150094ff64b72f6c8 ChangeLog 6882 -SHA256 674400a4df308577d847d9a4915bff04fdf4a335791b434a0bf9a6e5e675a250 ChangeLog 6882 +MISC ChangeLog 7092 RMD160 a4aa494fed92a8ad4ac5ca66013a2313bbef1d21 SHA1 05d0a03a68d9e5276f0bca5c20d0554cbd969458 SHA256 0f497315917b5cf033c11a7b20b947477eb2bbb5c9dfba18224b55a93266e4c4 +MD5 cff3f5cefe2d10c0f5d9b7f692f8765f ChangeLog 7092 +RMD160 a4aa494fed92a8ad4ac5ca66013a2313bbef1d21 ChangeLog 7092 +SHA256 0f497315917b5cf033c11a7b20b947477eb2bbb5c9dfba18224b55a93266e4c4 ChangeLog 7092 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -56,3 +60,6 @@ SHA256 56ba49c410664c0382d790e2dc2a9374efd331d6a1e6ea03ad0dcce0fd005323 files/di 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 +MD5 e185d817a478344a99a1b75ac01b3a42 files/digest-usbutils-0.72-r3 241 +RMD160 12a00bb80257f8bc30fda3ed9d85dd9b8b4e6a60 files/digest-usbutils-0.72-r3 241 +SHA256 56ba49c410664c0382d790e2dc2a9374efd331d6a1e6ea03ad0dcce0fd005323 files/digest-usbutils-0.72-r3 241 diff --git a/sys-apps/usbutils/files/digest-usbutils-0.72-r3 b/sys-apps/usbutils/files/digest-usbutils-0.72-r3 new file mode 100644 index 000000000000..914cebdb1d21 --- /dev/null +++ b/sys-apps/usbutils/files/digest-usbutils-0.72-r3 @@ -0,0 +1,3 @@ +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-r3.ebuild b/sys-apps/usbutils/usbutils-0.72-r3.ebuild new file mode 100644 index 000000000000..e22b2ec86bd3 --- /dev/null +++ b/sys-apps/usbutils/usbutils-0.72-r3.ebuild @@ -0,0 +1,46 @@ +# 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-r3.ebuild,v 1.1 2007/04/01 00:22:14 robbat2 Exp $ + +inherit eutils + +DESCRIPTION="USB enumeration utilities" +HOMEPAGE="http://linux-usb.sourceforge.net/" +SRC_URI="mirror://sourceforge/linux-usb/${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="" + +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 +} + +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 +} -- 2.26.2