Fix compiling with linux-headers-2.6.21, Bug #178474.

Package-Manager: portage-2.1.2.7

4 files changed, 43 insertions, 11 deletions

diff --git a/sys-apps/fxload/ChangeLog b/sys-apps/fxload/ChangeLog
index 2742b45063f2..90f53a89ad74 100644
--- a/sys-apps/fxload/ChangeLog
+++ b/sys-apps/fxload/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/fxload
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fxload/ChangeLog,v 1.14 2007/05/01 09:41:54 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fxload/ChangeLog,v 1.15 2007/05/14 07:37:24 zzam Exp $
+
+  14 May 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/fxload-20020411-linux-headers-2.6.21.patch, fxload-20020411.ebuild:
+  Fix compiling with linux-headers-2.6.21, Bug #178474.
 
   01 May 2007; Markus Rothe <corsair@gentoo.org> fxload-20020411.ebuild:
   Stable on ppc64; bug #175141
diff --git a/sys-apps/fxload/Manifest b/sys-apps/fxload/Manifest
index cd9a159da490..aed2ffd33b2b 100644
--- a/sys-apps/fxload/Manifest
+++ b/sys-apps/fxload/Manifest
@@ -1,16 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fxload-20020411-linux-headers-2.6.19.patch 393 RMD160 0b334d13c68b8577ba0d5dd40e9d028912ccf596 SHA1 fb21443122e24296728202d2c8b2e4e4e69fa4d7 SHA256 26839c80fbef82e130bc86b6fa24c50915fbb25039e9907ec1e990b87d600717
 MD5 210a4831e318405daebea819cba8deb1 files/fxload-20020411-linux-headers-2.6.19.patch 393
 RMD160 0b334d13c68b8577ba0d5dd40e9d028912ccf596 files/fxload-20020411-linux-headers-2.6.19.patch 393
 SHA256 26839c80fbef82e130bc86b6fa24c50915fbb25039e9907ec1e990b87d600717 files/fxload-20020411-linux-headers-2.6.19.patch 393
+AUX fxload-20020411-linux-headers-2.6.21.patch 393 RMD160 32cba0410d862d9a327e9451e49bcb709b09a027 SHA1 f3ad72d92ec25d19d5f98c57c2a38f17bbf84ae7 SHA256 f7ccfa6628a1ca45b8644140313ed69bbe3e219d2c6c5f79a17ee5902d624046
+MD5 abbfbdd9ad4e1faf68cd88b3ba077a5a files/fxload-20020411-linux-headers-2.6.21.patch 393
+RMD160 32cba0410d862d9a327e9451e49bcb709b09a027 files/fxload-20020411-linux-headers-2.6.21.patch 393
+SHA256 f7ccfa6628a1ca45b8644140313ed69bbe3e219d2c6c5f79a17ee5902d624046 files/fxload-20020411-linux-headers-2.6.21.patch 393
 DIST fxload-2002_04_11.tar.gz 22866 RMD160 94f4902ec827912f42ff9f4696feb4393a11cae5 SHA1 8fc6ba63faac40b9f141a68ea2d088c51437c936 SHA256 15116da28bc90e961bd5fea454adf79272bc741f86d9636ed8b9b771d74814c3
-EBUILD fxload-20020411.ebuild 932 RMD160 1e372fdde130caa75ebe29b888a5b6229c2cbdf5 SHA1 7ac6ee7aab3bbb8accbca17844b8048f24e1b98d SHA256 49e26d66ea06b45846ebe8c66ff5140341bc8f65c016d6917fc0837e84366728
-MD5 781c47d7086524476d3797c03649160c fxload-20020411.ebuild 932
-RMD160 1e372fdde130caa75ebe29b888a5b6229c2cbdf5 fxload-20020411.ebuild 932
-SHA256 49e26d66ea06b45846ebe8c66ff5140341bc8f65c016d6917fc0837e84366728 fxload-20020411.ebuild 932
-MISC ChangeLog 1221 RMD160 4c4a7f09e8d4f117c054e4feddc0c5136ec9a406 SHA1 d9e63d3f22fcf9d8d90ea0982bd3191945a23ea8 SHA256 f86a756cbf52bfa08b9e8979417efae5d481439b74efdb2427c2123bce533ab3
-MD5 8be970d858fee490632d9306b3d65a1a ChangeLog 1221
-RMD160 4c4a7f09e8d4f117c054e4feddc0c5136ec9a406 ChangeLog 1221
-SHA256 f86a756cbf52bfa08b9e8979417efae5d481439b74efdb2427c2123bce533ab3 ChangeLog 1221
+EBUILD fxload-20020411.ebuild 1042 RMD160 d5c86e6cb8f81cb5420037639687662e1c73f0e5 SHA1 b07de78e4f1d307cd747618b2ed58a44bee1f751 SHA256 9cdfb1fcbc5c088171f4a43c582f1efe1effccf62ae55a77d3d18907878194a8
+MD5 43ca088f04fb5b15f53bb1c3f278f22d fxload-20020411.ebuild 1042
+RMD160 d5c86e6cb8f81cb5420037639687662e1c73f0e5 fxload-20020411.ebuild 1042
+SHA256 9cdfb1fcbc5c088171f4a43c582f1efe1effccf62ae55a77d3d18907878194a8 fxload-20020411.ebuild 1042
+MISC ChangeLog 1405 RMD160 adb302cf94912ef0c13aef37bc4165f9d50967cd SHA1 a3170c688bee7a7c553ff6dfed93c6b6600612f3 SHA256 3814f50d914c03877a63c0c0264433b44563d85048f3e89f24c923cbb89adaa1
+MD5 f9ebb044273f31713feb548205e11c5f ChangeLog 1405
+RMD160 adb302cf94912ef0c13aef37bc4165f9d50967cd ChangeLog 1405
+SHA256 3814f50d914c03877a63c0c0264433b44563d85048f3e89f24c923cbb89adaa1 ChangeLog 1405
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
@@ -18,3 +25,10 @@ SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata
 MD5 227b8c7f38ca2b0417fc921f3510a720 files/digest-fxload-20020411 250
 RMD160 19b5af5cde67307f7ebbb64666e36d6446eb4b17 files/digest-fxload-20020411 250
 SHA256 59168dd8dba42fd93d6d39e2093c184bdd7a8d050caa1b6c9ab5df1da2273257 files/digest-fxload-20020411 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGSBG7t2vP6XvVdOcRAla7AJoCsXbO6xFpXcJ68cTnFw3cmXXsfgCfbctt
+RHeOxdsuGx3RJB9VOQ0vmMc=
+=WdUE
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/fxload/files/fxload-20020411-linux-headers-2.6.21.patch b/sys-apps/fxload/files/fxload-20020411-linux-headers-2.6.21.patch
new file mode 100644
index 000000000000..e608b9d73caa
--- /dev/null
+++ b/sys-apps/fxload/files/fxload-20020411-linux-headers-2.6.21.patch
@@ -0,0 +1,12 @@
+diff -ru fxload-2002_04_11-orig/ezusb.c fxload-2002_04_11/ezusb.c
+--- fxload-2002_04_11-orig/ezusb.c	2007-05-14 09:27:19.000000000 +0200
++++ fxload-2002_04_11/ezusb.c	2007-05-14 09:30:24.000000000 +0200
+@@ -29,7 +29,7 @@
+ # include  <sys/ioctl.h>
+ 
+ # include  <linux/version.h>
+-# include  <linux/usb.h>
++# include  <linux/usb/ch9.h>
+ # include  <linux/usbdevice_fs.h>
+ 
+ # include "ezusb.h"
diff --git a/sys-apps/fxload/fxload-20020411.ebuild b/sys-apps/fxload/fxload-20020411.ebuild
index b3c9363b6b95..7df7c30d5764 100644
--- a/sys-apps/fxload/fxload-20020411.ebuild
+++ b/sys-apps/fxload/fxload-20020411.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fxload/fxload-20020411.ebuild,v 1.19 2007/05/01 09:41:54 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fxload/fxload-20020411.ebuild,v 1.20 2007/05/14 07:37:24 zzam Exp $
 
 inherit eutils
 
@@ -24,7 +24,9 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 
-	if has_version ">=sys-kernel/linux-headers-2.6.19"; then
+	if has_version ">=sys-kernel/linux-headers-2.6.21"; then
+		epatch ${FILESDIR}/${P}-linux-headers-2.6.21.patch
+	elif has_version ">=sys-kernel/linux-headers-2.6.19"; then
 		epatch ${FILESDIR}/${P}-linux-headers-2.6.19.patch
 	fi
 }