mark ppc64 stable for usbutils-0.11-r3.ebuild, slight header fix for 2.6 madness

4 files changed, 44 insertions, 8 deletions

diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog
index e7e237288921..7709e6505a43 100644
--- a/sys-apps/usbutils/ChangeLog
+++ b/sys-apps/usbutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/usbutils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.21 2004/02/18 13:55:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.22 2004/03/05 13:40:34 tgall Exp $
+
+  05 Mar 2004; Tom Gall <tgall@gentoo.org> usbutils-0.11-r3.ebuild:
+  stable on ppc64 + slight fix to take into account 2.6 kernel 
+  header madness
 
   18 Feb 2004; Aron Griffis <agriffis@gentoo.org> usbutils-0.11-r3.ebuild:
   stable on alpha and ia64
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 2518e3e074ad..739935088f78 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,10 +1,11 @@
-MD5 d391eaec971fcca2daedb605938d3d40 ChangeLog 2352
+MD5 40a6955cdb245f3d6eab9304d4e1c396 ChangeLog 2499
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 4f958f8da0c0753ceb66017dc90f7608 usbutils-0.11-r1.ebuild 1064
+MD5 f29519ed74d404e31d74d59c0daa32f0 usbutils-0.11-r3.ebuild 1374
 MD5 9422ac19ea76d3fd377cd23f89fa01bd usbutils-0.11.ebuild 794
 MD5 7837472454a7c1a94bc84b392fd4bbda usbutils-0.9.ebuild 779
-MD5 4f958f8da0c0753ceb66017dc90f7608 usbutils-0.11-r1.ebuild 1064
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 70bc3c67ecb2207319bf6d8c2c8fa224 usbutils-0.11-r3.ebuild 1255
 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 ff18a11aef5916bf61226bf1d9503b15 files/digest-usbutils-0.11-r3 128
+MD5 2164369bd1bd95109baae92b4d45fb65 files/digest-usbutils-0.9 64
+MD5 79f1705c48b215f002d9f6541cdca376 files/0.11/ppc64-usbutils-kheaderfix.patch 621
diff --git a/sys-apps/usbutils/files/0.11/ppc64-usbutils-kheaderfix.patch b/sys-apps/usbutils/files/0.11/ppc64-usbutils-kheaderfix.patch
new file mode 100644
index 000000000000..849baff7be4d
--- /dev/null
+++ b/sys-apps/usbutils/files/0.11/ppc64-usbutils-kheaderfix.patch
@@ -0,0 +1,28 @@
+--- libusb/access.c.orig	2004-03-04 03:24:41.028301880 +0000
++++ libusb/access.c	2004-03-04 03:35:05.013231200 +0000
+@@ -30,6 +30,9 @@
+ 
+ #include "libusb.h"
+ 
++#include <asm/types.h>
++typedef unsigned long kernel_ulong_t;
++
+ #ifdef HAVE_LINUX_USB_H
+ #include <linux/usb.h>
+ #else
+--- libusb/descparse.c.orig	2004-03-04 03:15:39.897292152 +0000
++++ libusb/descparse.c	2004-03-04 03:35:33.585280600 +0000
+@@ -30,9 +30,13 @@
+ 
+ #include "libusb.h"
+ 
++typedef unsigned long kernel_ulong_t;
++
+ #ifdef HAVE_LINUX_USB_H
++#include <asm/types.h>
+ #include <linux/usb.h>
+ #else
++#include <asm/types.h>
+ #include "usb.h"
+ #endif
+ 
diff --git a/sys-apps/usbutils/usbutils-0.11-r3.ebuild b/sys-apps/usbutils/usbutils-0.11-r3.ebuild
index 711800e47a45..afeba4c9dca1 100644
--- a/sys-apps/usbutils/usbutils-0.11-r3.ebuild
+++ b/sys-apps/usbutils/usbutils-0.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.9 2004/02/18 13:55:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11-r3.ebuild,v 1.10 2004/03/05 13:40:34 tgall Exp $
 
 inherit gnuconfig
 
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="x86 amd64 ppc sparc hppa alpha ia64 ppc64"
 IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
@@ -24,9 +24,12 @@ src_unpack() {
 	unpack ${A}
 	use amd64 && gnuconfig_update
 	use alpha && gnuconfig_update
+	use ppc64 && 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 )
 }
 
 src_compile() {