Fixed compilation with linux-headers-2.6.19, removed dependency to sys-apps/hotplug...

Package-Manager: portage-2.1.2-r3

diff --git a/sys-apps/fxload/ChangeLog b/sys-apps/fxload/ChangeLog
index 93637ee327c615611b6019e95a817e2cdb3e53c4..a5a09d19d3e87144b6fda0fbfe38a6e2b853a52e 100644 (file)
--- a/sys-apps/fxload/ChangeLog
+++ b/sys-apps/fxload/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/fxload
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fxload/ChangeLog,v 1.11 2005/02/23 00:16:30 agriffis Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fxload/ChangeLog,v 1.12 2007/01/24 10:23:38 zzam Exp $
+
+  24 Jan 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/fxload-20020411-linux-headers-2.6.19.patch, fxload-20020411.ebuild:
+  Fixed compilation with linux-headers-2.6.19, removed dependency to
+  sys-apps/hotplug, solving Bug #159931.
 
   22 Feb 2005; Aron Griffis <agriffis@gentoo.org> fxload-20020411.ebuild:
   stable on ia64

diff --git a/sys-apps/fxload/Manifest b/sys-apps/fxload/Manifest
index 8a70606ab714b9b8a1cd2868c5fb1beb43d50063..7b1b71674c29c277a4e83135af5afd76dfc37cf6 100644 (file)
--- a/sys-apps/fxload/Manifest
+++ b/sys-apps/fxload/Manifest
@@ -1,15 +1,19 @@
 -----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
 DIST fxload-2002_04_11.tar.gz 22866 RMD160 94f4902ec827912f42ff9f4696feb4393a11cae5 SHA1 8fc6ba63faac40b9f141a68ea2d088c51437c936 SHA256 15116da28bc90e961bd5fea454adf79272bc741f86d9636ed8b9b771d74814c3
-EBUILD fxload-20020411.ebuild 735 RMD160 41cdc9a1217310c1d70d3c9fc872bf7edfc7fb99 SHA1 bd434906631449668da5bb18d1eb1fcda2ad86bd SHA256 7c0a3927c94e3788274617e19ab96f2a5ee40d9000af95c2a2cec2d9afd0dd42
-MD5 cf081cd006dd2ac0f59a8204b4306f94 fxload-20020411.ebuild 735
-RMD160 41cdc9a1217310c1d70d3c9fc872bf7edfc7fb99 fxload-20020411.ebuild 735
-SHA256 7c0a3927c94e3788274617e19ab96f2a5ee40d9000af95c2a2cec2d9afd0dd42 fxload-20020411.ebuild 735
-MISC ChangeLog 774 RMD160 6b6912f4b9a60d3d22c68b1887ba73b8d5ed8b2e SHA1 c70b5686dcfbfe4b3e7ce09cb6b15d80e9b1dec8 SHA256 fc1e59556c2bbfce5ff7cc1285daad27c7a95cd477353c485433f9559350561d
-MD5 e9bea8f17f939506bba84b77351f370d ChangeLog 774
-RMD160 6b6912f4b9a60d3d22c68b1887ba73b8d5ed8b2e ChangeLog 774
-SHA256 fc1e59556c2bbfce5ff7cc1285daad27c7a95cd477353c485433f9559350561d ChangeLog 774
+EBUILD fxload-20020411.ebuild 923 RMD160 702ec7fdd99723a8d641ef1905bb8f7be3c6f3e0 SHA1 1decf61695f2d0176a8f1e3e05746128706ba2ce SHA256 dd4c678777e7f47e1da0aafb114456e20b3b49dddcbb12295921dc4369158018
+MD5 72e8c68d30788479faf3694d43c21bc6 fxload-20020411.ebuild 923
+RMD160 702ec7fdd99723a8d641ef1905bb8f7be3c6f3e0 fxload-20020411.ebuild 923
+SHA256 dd4c678777e7f47e1da0aafb114456e20b3b49dddcbb12295921dc4369158018 fxload-20020411.ebuild 923
+MISC ChangeLog 1011 RMD160 c737d650dc206ad553880346994852c439988c32 SHA1 a078b1e7900347e553b4f0e375f438f7db96f075 SHA256 c0e04d0bd70f8962c3bbd50fbe33fa935f0ec3376332c90436b5e0badc2861c0
+MD5 e38384b52978e217b00c9889339823ad ChangeLog 1011
+RMD160 c737d650dc206ad553880346994852c439988c32 ChangeLog 1011
+SHA256 c0e04d0bd70f8962c3bbd50fbe33fa935f0ec3376332c90436b5e0badc2861c0 ChangeLog 1011
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
@@ -20,7 +24,7 @@ SHA256 59168dd8dba42fd93d6d39e2093c184bdd7a8d050caa1b6c9ab5df1da2273257 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFnXiz8bi6rjpTunYRAgdpAKDYzsfJhm6OEhmgwk+srzTU6MykEACfX/cY
-PG4ZRWJliay0G4kaU9VHsA0=
-=r7GO
+iD8DBQFFtzOwt2vP6XvVdOcRAl8BAKDQcM3+g6Y8F0p6HwYhn+k7e6ihNgCgnnx9
+HP7Y7ZzzU1kor/27bUAIkNI=
+=u5US
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/fxload/files/fxload-20020411-linux-headers-2.6.19.patch b/sys-apps/fxload/files/fxload-20020411-linux-headers-2.6.19.patch
new file mode 100644 (file)
index 0000000..5a69c01
--- /dev/null
+++ b/sys-apps/fxload/files/fxload-20020411-linux-headers-2.6.19.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-01-24 10:27:42.158833807 +0100
++++ fxload-2002_04_11/ezusb.c  2007-01-24 10:27:59.682033836 +0100
+@@ -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 757126952f37e70b5d955d450ad8131bbe09ff6c..5e35346ff342be3b30f1a063de35cd3acd735efa 100644 (file)
--- a/sys-apps/fxload/fxload-20020411.ebuild
+++ b/sys-apps/fxload/fxload-20020411.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.16 2005/02/23 00:16:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fxload/fxload-20020411.ebuild,v 1.17 2007/01/24 10:23:38 zzam Exp $
+
+inherit eutils
 
 # source maintainers named it fxload-YYYY_MM_DD instead of fxload-YYYYMMDD
 MY_P="${PN}-${PV:0:4}_${PV:4:2}_${PV:6:2}"
@@ -13,11 +15,20 @@ SLOT="0"
 KEYWORDS="amd64 hppa ppc sparc x86 ia64"
 IUSE=""
 
-DEPEND="virtual/libc
-       sys-apps/hotplug"
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+       sys-kernel/linux-headers"
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+       unpack ${A}
+
+       if has_version ">=sys-kernel/linux-headers-2.6.19"; then
+               epatch ${FILESDIR}/${P}-linux-headers-2.6.19.patch
+       fi
+}
+
 src_compile() {
        make RPM_OPT_FLAGS="${CFLAGS}" || die
 }