version bump. fix multilib issues (#90777). updated usb.ids to 20050408.

Package-Manager: portage-2.0.51.21

6 files changed, 31 insertions, 67 deletions

diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog
index a05f769eddd3..fafb1271c9b8 100644
--- a/sys-apps/usbutils/ChangeLog
+++ b/sys-apps/usbutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/usbutils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.36 2005/04/09 13:04:47 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.37 2005/05/09 11:09:28 liquidx Exp $
+
+*usbutils-0.11-r6 (08 May 2005)
+
+  08 May 2005; Alastair Tse <liquidx@gentoo.org> -usbutils-0.11-r3.ebuild,
+  -usbutils-0.11-r4.ebuild, +usbutils-0.11-r6.ebuild:
+  version bump. fix multilib issues (#90777). updated usb.ids to 20050408
 
   09 Apr 2005; Markus Rothe <corsair@gentoo.org> usbutils-0.11-r5.ebuild:
   Stable on ppc64
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 8be62cd7d8b5..ac6904031924 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,11 +1,19 @@
-MD5 17850ac91bd13bf87ad729466b4482c8 ChangeLog 4285
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 16affc3890dc2213329b145add6c5e32 ChangeLog 4522
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 f59d591f93e68e96c3ee424d575a910f usbutils-0.11-r3.ebuild 1390
+MD5 3bf5ce706718e4c6b91aa5399624c849 usbutils-0.11-r6.ebuild 1486
 MD5 126fca63244365009de4c30b6b0c41d2 usbutils-0.11-r5.ebuild 1440
-MD5 63bc5e2e0107c5ee4e395213a6ffa381 usbutils-0.11-r4.ebuild 1397
-MD5 f703ade59119743d4225df9fb4623aa8 files/digest-usbutils-0.11-r4 128
-MD5 ff18a11aef5916bf61226bf1d9503b15 files/digest-usbutils-0.11-r3 128
 MD5 f703ade59119743d4225df9fb4623aa8 files/digest-usbutils-0.11-r5 128
 MD5 d20a32b2ea8220b81490216ee51cba82 files/usbutils-0.11-fix-usb-ids-man-page-ref.patch 384
-MD5 79f1705c48b215f002d9f6541cdca376 files/0.11/ppc64-usbutils-kheaderfix.patch 621
+MD5 ab0f2b4ad3bb0eaf089d8538ec6586de files/digest-usbutils-0.11-r6 128
 MD5 02a749d768d2c60df972e04643b4a071 files/0.11/lsusb-endian.patch 1834
+MD5 79f1705c48b215f002d9f6541cdca376 files/0.11/ppc64-usbutils-kheaderfix.patch 621
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCf0T+TM53OX+9xmMRAudTAJsEsBwcgwWYLCfX4dpg5BaY22sUBACg1EbJ
+6W985/OQ3EtC2h3kqtxDfuM=
+=YfVY
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/usbutils/files/digest-usbutils-0.11-r4 b/sys-apps/usbutils/files/digest-usbutils-0.11-r4
deleted file mode 100644
index 451d9c57e9b9..000000000000
--- a/sys-apps/usbutils/files/digest-usbutils-0.11-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-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.11-r3 b/sys-apps/usbutils/files/digest-usbutils-0.11-r6
index cdb4e4eaa235..b559b137d135 100644
--- a/sys-apps/usbutils/files/digest-usbutils-0.11-r3
+++ b/sys-apps/usbutils/files/digest-usbutils-0.11-r6
@@ -1,2 +1,2 @@
 MD5 05157bed61af65749f02713c10b8ef26 usbutils-0.11.tar.gz 229161
-MD5 aae03faabd6b439ffa7a37280ac03693 usb.ids-20030906.gz 45060
+MD5 7734441ada5e18f18bb554b111aea172 usb.ids-20050408.gz 54354
diff --git a/sys-apps/usbutils/usbutils-0.11-r3.ebuild b/sys-apps/usbutils/usbutils-0.11-r3.ebuild
deleted file mode 100644
index d39cfe9989d3..000000000000
--- a/sys-apps/usbutils/usbutils-0.11-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.17 2005/03/14 14:49:58 gustavoz Exp $
-
-inherit gnuconfig eutils
-
-# 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 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-r4.ebuild b/sys-apps/usbutils/usbutils-0.11-r6.ebuild
index 72e5afc4329d..ec7986e7a0ec 100644
--- a/sys-apps/usbutils/usbutils-0.11-r4.ebuild
+++ b/sys-apps/usbutils/usbutils-0.11-r6.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2005 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.2 2005/03/14 14:49:59 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11-r6.ebuild,v 1.1 2005/05/09 11:09:28 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"
+USB_IDS_VER="20050408"
 
 DESCRIPTION="USB enumeration utilities"
+HOMEPAGE="http://usb.cs.tum.edu/"
 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"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
 
 DEPEND="virtual/libc"
 
@@ -31,6 +31,8 @@ src_unpack() {
 
 	# Fix endian-issues
 	( cd "${S}" && epatch "${FILESDIR}/0.11/lsusb-endian.patch" )
+
+	epatch ${FILESDIR}/usbutils-0.11-fix-usb-ids-man-page-ref.patch	#bug #62786
 }
 
 src_compile() {
@@ -45,6 +47,6 @@ src_install() {
 
 	# we don't need libusb.* from usbutils because it conflicts
 	# with dev-libs/libusb
-	rm -rf ${D}/usr/lib
+	rm -rf ${D}/usr/lib*
 	rm -rf ${D}/usr/include
 }