cleanup and update usb.ids

9 files changed, 60 insertions, 111 deletions

diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog
index 25f0c806e402..c6c70dcc4473 100644
--- a/sys-apps/usbutils/ChangeLog
+++ b/sys-apps/usbutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/usbutils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.28 2004/09/03 21:03:24 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.29 2004/09/22 12:21:53 liquidx Exp $
+
+*usbutils-0.11-r4 (22 Sep 2004)
+
+  22 Sep 2004; Alastair Tse <liquidx@gentoo.org> +usbutils-0.11-r4.ebuild:
+  new sanitised usb.ids (#59411)
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   usbutils-0.11-r1.ebuild, usbutils-0.11.ebuild:
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 46ee45f7ff37..bbad558a3f0a 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,12 +1,8 @@
-MD5 6a38bac824d1ad0486dda4b52a054fcb ChangeLog 3371
+MD5 bdd6de36e85f7f0cf43b48fe1490c496 ChangeLog 3512
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 867fcd4cc4b1cac65ecf2d1998a45a0f usbutils-0.11-r1.ebuild 992
 MD5 5891bb850ba9b34c67c037c90f3a1016 usbutils-0.11-r3.ebuild 1390
-MD5 e4722ddf30da48f71f2e41542ecfb36b usbutils-0.11.ebuild 766
-MD5 48d8a8da9bd07b4fb883dcc856aa268c usbutils-0.9.ebuild 759
-MD5 5513f7a6e7cd2707ec619a3885be6724 files/digest-usbutils-0.11 65
-MD5 5513f7a6e7cd2707ec619a3885be6724 files/digest-usbutils-0.11-r1 65
+MD5 2a3ab2fbd47668ba8fb125e2f80aa898 usbutils-0.11-r4.ebuild 1396
 MD5 ff18a11aef5916bf61226bf1d9503b15 files/digest-usbutils-0.11-r3 128
-MD5 2164369bd1bd95109baae92b4d45fb65 files/digest-usbutils-0.9 64
+MD5 f703ade59119743d4225df9fb4623aa8 files/digest-usbutils-0.11-r4 128
 MD5 02a749d768d2c60df972e04643b4a071 files/0.11/lsusb-endian.patch 1834
 MD5 79f1705c48b215f002d9f6541cdca376 files/0.11/ppc64-usbutils-kheaderfix.patch 621
diff --git a/sys-apps/usbutils/files/digest-usbutils-0.11-r1 b/sys-apps/usbutils/files/digest-usbutils-0.11-r1
deleted file mode 100644
index f192c47b55fa..000000000000
--- a/sys-apps/usbutils/files/digest-usbutils-0.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 05157bed61af65749f02713c10b8ef26 usbutils-0.11.tar.gz 229161
diff --git a/sys-apps/usbutils/files/digest-usbutils-0.11 b/sys-apps/usbutils/files/digest-usbutils-0.11-r4
index f192c47b55fa..451d9c57e9b9 100644
--- a/sys-apps/usbutils/files/digest-usbutils-0.11
+++ b/sys-apps/usbutils/files/digest-usbutils-0.11-r4
@@ -1 +1,2 @@
 MD5 05157bed61af65749f02713c10b8ef26 usbutils-0.11.tar.gz 229161
+MD5 efeabe86dc3ab36dc48a7c07b21cb7df usb.ids-20040902.gz 49178
diff --git a/sys-apps/usbutils/files/digest-usbutils-0.9 b/sys-apps/usbutils/files/digest-usbutils-0.9
deleted file mode 100644
index ce5a1dc00c8a..000000000000
--- a/sys-apps/usbutils/files/digest-usbutils-0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a7076627efb02bc2a0b7186ef249eb05 usbutils-0.9.tar.gz 221251
diff --git a/sys-apps/usbutils/usbutils-0.11-r1.ebuild b/sys-apps/usbutils/usbutils-0.11-r1.ebuild
deleted file mode 100644
index 1e657919ce2d..000000000000
--- a/sys-apps/usbutils/usbutils-0.11-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11-r1.ebuild,v 1.13 2004/09/03 21:03:24 pvdabeel Exp $
-
-inherit gnuconfig
-
-inherit gnuconfig
-
-DESCRIPTION="USB enumeration utilities"
-SRC_URI="http://usb.cs.tum.edu/download/usbutils/${P}.tar.gz"
-HOMEPAGE="http://usb.cs.tum.edu/"
-KEYWORDS="x86 amd64 ppc ~sparc hppa alpha"
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${P}
-	mv usb.ids usb.ids.orig
-	wget http://www.linux-usb.org/usb.ids
-	if [ ! -f usb.ids ] ; then mv usb.ids.orig usb.ids ; fi
-
-	gnuconfig_update
-}
-
-src_compile() {
-	# put usb.ids in same place as pci.ids (/usr/share/misc)
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--datadir=/usr/share/misc || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/sys-apps/usbutils/usbutils-0.11-r4.ebuild b/sys-apps/usbutils/usbutils-0.11-r4.ebuild
new file mode 100644
index 000000000000..c54ec4efeca4
--- /dev/null
+++ b/sys-apps/usbutils/usbutils-0.11-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11-r4.ebuild,v 1.1 2004/09/22 12:21:53 liquidx Exp $
+
+inherit eutils gnuconfig
+
+# note: update these regularly from http://www.linux-usb.org/usb.ids
+#       and upload to gentoo mirrors - <liquidx@gentoo.org>
+USB_IDS_VER="20040902"
+
+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 ~ia64 ~ppc64 ~mips"
+IUSE=""
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	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"
+
+	use ppc64 && ( cd ${S}; epatch ${FILESDIR}/0.11/ppc64-usbutils-kheaderfix.patch )
+
+	# Fix endian-issues
+	( cd "${S}" && epatch "${FILESDIR}/0.11/lsusb-endian.patch" )
+}
+
+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
+}
diff --git a/sys-apps/usbutils/usbutils-0.11.ebuild b/sys-apps/usbutils/usbutils-0.11.ebuild
deleted file mode 100644
index 878d4a4a34d7..000000000000
--- a/sys-apps/usbutils/usbutils-0.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11.ebuild,v 1.11 2004/09/03 21:03:24 pvdabeel Exp $
-
-DESCRIPTION="USB enumeration utilities"
-SRC_URI="http://usb.cs.tum.edu/download/usbutils/${P}.tar.gz"
-HOMEPAGE="http://usb.cs.tum.edu/"
-KEYWORDS="x86 amd64 ppc ~sparc ~hppa"
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	# put usb.ids in same place as pci.ids (/usr/share/misc)
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--datadir=/usr/share/misc || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/sys-apps/usbutils/usbutils-0.9.ebuild b/sys-apps/usbutils/usbutils-0.9.ebuild
deleted file mode 100644
index d26523e0f34c..000000000000
--- a/sys-apps/usbutils/usbutils-0.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.9.ebuild,v 1.17 2004/07/15 02:46:14 agriffis Exp $
-
-DESCRIPTION="USB enumeration utilities"
-SRC_URI="http://usb.cs.tum.edu/download/usbutils/${P}.tar.gz"
-HOMEPAGE="http://usb.cs.tum.edu/"
-KEYWORDS="x86 amd64 ppc sparc "
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	# put usb.ids in same place as pci.ids (/usr/share/misc)
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--datadir=/usr/share/misc || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}