removing wget in unpack

4 files changed, 62 insertions, 6 deletions

diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog
index d66c984822b1..c7b9fd3a510b 100644
--- a/sys-apps/usbutils/ChangeLog
+++ b/sys-apps/usbutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/usbutils
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.14 2003/09/02 23:14:41 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.15 2003/09/07 18:04:09 liquidx Exp $
+
+*usbutils-0.11-r3 (07 Sep 2003)
+
+  07 Sep 2003; Alastair Tse <liquidx@gentoo.org> usbutils-0.11-r3.ebuild:
+  remove dynamic fetching of usb.ids and replace it with a versioned copy on
+  gentoo mirrors.
 
 *usbutils-0.11-r2 (03 Sep 2003)
 
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 31901eaae403..0692099fbda6 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,10 +1,12 @@
-MD5 2467ec9d85f1e6d7b94e4d966b8b92d5 ChangeLog 1570
-MD5 9422ac19ea76d3fd377cd23f89fa01bd usbutils-0.11.ebuild 794
-MD5 7837472454a7c1a94bc84b392fd4bbda usbutils-0.9.ebuild 779
-MD5 8f146d81d51a09727f7ff5ed328b41c1 usbutils-0.11-r1.ebuild 1064
+MD5 61680db416a365b86c76d637fb91706a ChangeLog 1773
 MD5 c5bef80db01935712c70875b74fd87b9 metadata.xml 276
+MD5 8f146d81d51a09727f7ff5ed328b41c1 usbutils-0.11-r1.ebuild 1064
 MD5 f1d5f7298cb004a79231329aa8aceda0 usbutils-0.11-r2.ebuild 1181
+MD5 f6c51edc125ee248f54f738fd50fa30b usbutils-0.11-r3.ebuild 1259
+MD5 9422ac19ea76d3fd377cd23f89fa01bd usbutils-0.11.ebuild 794
+MD5 7837472454a7c1a94bc84b392fd4bbda usbutils-0.9.ebuild 779
 MD5 5513f7a6e7cd2707ec619a3885be6724 files/digest-usbutils-0.11 65
-MD5 2164369bd1bd95109baae92b4d45fb65 files/digest-usbutils-0.9 64
 MD5 5513f7a6e7cd2707ec619a3885be6724 files/digest-usbutils-0.11-r1 65
 MD5 5513f7a6e7cd2707ec619a3885be6724 files/digest-usbutils-0.11-r2 65
+MD5 ff18a11aef5916bf61226bf1d9503b15 files/digest-usbutils-0.11-r3 128
+MD5 2164369bd1bd95109baae92b4d45fb65 files/digest-usbutils-0.9 64
diff --git a/sys-apps/usbutils/files/digest-usbutils-0.11-r3 b/sys-apps/usbutils/files/digest-usbutils-0.11-r3
new file mode 100644
index 000000000000..cdb4e4eaa235
--- /dev/null
+++ b/sys-apps/usbutils/files/digest-usbutils-0.11-r3
@@ -0,0 +1,2 @@
+MD5 05157bed61af65749f02713c10b8ef26 usbutils-0.11.tar.gz 229161
+MD5 aae03faabd6b439ffa7a37280ac03693 usb.ids-20030906.gz 45060
diff --git a/sys-apps/usbutils/usbutils-0.11-r3.ebuild b/sys-apps/usbutils/usbutils-0.11-r3.ebuild
new file mode 100644
index 000000000000..c1340cc53e21
--- /dev/null
+++ b/sys-apps/usbutils/usbutils-0.11-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11-r3.ebuild,v 1.1 2003/09/07 18:04:09 liquidx Exp $
+
+inherit gnuconfig
+
+# note: update these regularly from http://www.linux-usb.org/usb.ids
+#       and upload to gentoo mirrors - <liquidx@gentoo.org>
+USB_IDS_VER="20030906"
+
+DESCRIPTION="USB enumeration utilities"
+SRC_URI="http://usb.cs.tum.edu/download/usbutils/${P}.tar.gz
+	mirror://gentoo/usb.ids-${USB_IDS_VER}.gz"
+HOMEPAGE="http://usb.cs.tum.edu/"
+
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~alpha"
+IUSE=""
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+ 	unpack ${A}
+	use amd64 && gnuconfig_update
+	use alpha && gnuconfig_update
+	
+	# replace usb.ids with an updated version
+	mv ${WORKDIR}/usb.ids-${USB_IDS_VER} ${S}/usb.ids || die "unable to replace usb.ids"
+}
+
+src_compile() {
+	# put usb.ids in same place as pci.ids (/usr/share/misc)
+	econf \
+		--datadir=/usr/share/misc || die "./configure failed"
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	
+	# we don't need libusb.* from usbutils because it conflicts 
+	# with dev-libs/libusb
+	rm -rf ${D}/usr/lib
+	rm -rf ${D}/usr/include
+}