Fix compilation with Software Suspend 2 enabled kernels, bug #97570.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 24 insertions, 40 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index 44b2e882816c..179122a2ea06 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/ndiswrapper
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.26 2005/07/01 18:49:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.27 2005/07/02 17:42:43 brix Exp $
+
+  02 Jul 2005; <brix@gentoo.org> +files/ndiswrapper-1.2-suspend2.patch,
+  -files/ndiswrapper-1.2-swsusp2.patch, ndiswrapper-1.2.ebuild:
+  Fix compilation with Software Suspend 2 enabled kernels, bug #97570.
 
   01 Jul 2005; Doug Goldstein <cardoe@gentoo.org> ndiswrapper-1.2.ebuild:
   get rid of swsusp2 until brix fixes it. Since I don't use ndiswrapper 
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index bd145b7a01d5..39d54881b644 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8040a6910254d058835d4bd04a17d78b ChangeLog 5926
-MD5 82add84ad0d2f8b69058e245396e3e89 metadata.xml 507
-MD5 3fb60eb6c06c840fa14b74480b132e02 ndiswrapper-1.2.ebuild 2713
 MD5 955ecb6fb78486d5851d47425e7bae11 ndiswrapper-1.1-r1.ebuild 2660
+MD5 fc73bfe5725f493a673aaa7c6b2dd8d0 ndiswrapper-1.2.ebuild 2363
+MD5 db31d3ad5fa2891a4e1942fd03c219c6 ChangeLog 6132
+MD5 82add84ad0d2f8b69058e245396e3e89 metadata.xml 507
 MD5 fd2f66ff609bafcd303be1db969e9185 files/digest-ndiswrapper-1.2 67
-MD5 afbf30b80f1d07b7da53a5de063a8913 files/ndiswrapper-1.2-swsusp2.patch 494
 MD5 5902d7ca6595f766e3134e2a7cbec8ea files/digest-ndiswrapper-1.1-r1 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCxZD0BtvusYtCZMsRAsKdAJ4+7mjq5Bns+9na0ZO2XOm4Us0dTgCeImhN
-joIQGdVErmT9E2e0fxTZm+4=
-=/ALd
------END PGP SIGNATURE-----
+MD5 9cf5a13dc78b9840d419f0656d1dd920 files/ndiswrapper-1.2-suspend2.patch 553
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.2-suspend2.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.2-suspend2.patch
new file mode 100644
index 000000000000..b2ba8183e316
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.2-suspend2.patch
@@ -0,0 +1,12 @@
+diff -urp ndiswrapper-1.2/driver/ntoskernel.h ndiswrapper-1.2-suspend2/driver/ntoskernel.h
+--- ndiswrapper-1.2/driver/ntoskernel.h	2005-06-10 21:24:31.000000000 +0200
++++ ndiswrapper-1.2-suspend2/driver/ntoskernel.h	2005-07-02 19:35:34.000000000 +0200
+@@ -170,7 +170,7 @@ typedef task_queue workqueue;
+ 
+ #endif // LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ 
+-#if defined(CONFIG_SOFTWARE_SUSPEND2) || defined(CONFIG_SUSPEND2)
++#ifdef PF_SYNCTHREAD
+ #define KTHREAD_RUN(a,b,c) kthread_run(a,b,0,c)
+ #else
+ #define KTHREAD_RUN(a,b,c) kthread_run(a,b,c)
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.2-swsusp2.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.2-swsusp2.patch
deleted file mode 100644
index 494dde4f4e4d..000000000000
--- a/net-wireless/ndiswrapper/files/ndiswrapper-1.2-swsusp2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru ndiswrapper-1.2rc1/driver/ntoskernel.h ndiswrapper-1.2rc1-fixed/driver/ntoskernel.h
---- ndiswrapper-1.2rc1/driver/ntoskernel.h	2005-04-12 09:53:46.000000000 -0400
-+++ ndiswrapper-1.2rc1-fixed/driver/ntoskernel.h	2005-05-24 16:16:21.000000000 -0400
-@@ -170,6 +170,10 @@
- 
- #endif // LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- 
-+#ifdef CONFIG_SUSPEND2
-+#define CONFIG_SOFTWARE_SUSPEND2
-+#endif
-+
- #ifdef CONFIG_SOFTWARE_SUSPEND2
- #define KTHREAD_RUN(a,b,c) kthread_run(a,b,0,c)
- #else
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild
index 94ccd9607f10..61f1f71dbb34 100644
--- a/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild,v 1.3 2005/07/01 18:49:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild,v 1.4 2005/07/02 17:42:43 brix Exp $
 
 inherit linux-mod eutils
 
@@ -28,16 +28,8 @@ MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")
 src_unpack() {
 	unpack ${A}
 
-	if grep '# CONFIG_SOFTWARE_SUSPEND2 is not set' ${ROOT}${KV_DIR}/.config
-	then
-		eerror "You have a kernel patched with Software Suspend 2 (swsusp2)"
-		eerror "but don't have it enabled. You must remove the patch or"
-		eerror "enable Software Suspend 2 (swsusp2)."
-		eerror "http://bugs.gentoo.org/show_bug.cgi?id=74864"
-		die "Please fix your kernel"
-	fi
-
-	#epatch ${FILESDIR}/${P}-swsusp2.patch || die "swsusp2 patch failed"
+	cd ${S}
+	epatch ${FILESDIR}/${P}-suspend2.patch || die "suspend2 patch failed"
 
 	convert_to_m ${S}/driver/Makefile
 }