Allow compiling against Software Suspend 2.1.8.7 patched kernel, restructured ebuild.

(Portage version: 2.0.51.21-r1)

6 files changed, 78 insertions, 18 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index c45201520259..7868af7c7a8b 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/ipw2100
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.72 2005/04/28 15:03:36 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.73 2005/05/05 19:55:41 brix Exp $
+
+  05 May 2005; <brix@gentoo.org> +files/ipw2100-1.1.0-suspend2.patch,
+  ipw2100-1.1.0.ebuild:
+  Allow compiling against Software Suspend 2.1.8.7 patched kernel,
+  restructured ebuild.
 
   28 Apr 2005; <brix@gentoo.org> ipw2100-1.1.0.ebuild:
   Stable on x86.
diff --git a/net-wireless/ipw2100/files/ipw2100-1.1.0-suspend2.patch b/net-wireless/ipw2100/files/ipw2100-1.1.0-suspend2.patch
new file mode 100644
index 000000000000..6147571eb755
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-1.1.0-suspend2.patch
@@ -0,0 +1,29 @@
+diff -urp ipw2100-1.1.0/ipw2100.c ipw2100-1.1.0-suspend2/ipw2100.c
+--- ipw2100-1.1.0/ipw2100.c	2005-05-05 21:35:56.000000000 +0200
++++ ipw2100-1.1.0-suspend2/ipw2100.c	2005-05-05 21:41:05.000000000 +0200
+@@ -6401,7 +6401,7 @@ static struct net_device *ipw2100_alloc_
+ 	INIT_STAT(&priv->fw_pend_stat);
+ 
+ 
+-#ifdef CONFIG_SOFTWARE_SUSPEND2
++#ifdef CONFIG_SOFTWARE_SUSPEND2_BUILTIN
+ 	priv->workqueue = create_workqueue(DRV_NAME, 0);
+ #else
+ 	priv->workqueue = create_workqueue(DRV_NAME);
+diff -urp ipw2100-1.1.0/ipw2100.h ipw2100-1.1.0-suspend2/ipw2100.h
+--- ipw2100-1.1.0/ipw2100.h	2005-05-05 21:35:56.000000000 +0200
++++ ipw2100-1.1.0-suspend2/ipw2100.h	2005-05-05 21:40:30.000000000 +0200
+@@ -57,6 +57,13 @@ typedef void irqreturn_t;
+ #define IW_QUAL_NOISE_INVALID 0x40
+ #endif
+ 
++#if !defined(CONFIG_SOFTWARE_SUSPEND2_BUILTIN) && \
++	(defined(CONFIG_SUSPEND2) || \
++	defined(CONFIG_SOFTWARE_SUSPEND2) ||		\
++	defined(CONFIG_SOFTWARE_SUSPEND2_MODULE))
++#define CONFIG_SOFTWARE_SUSPEND2_BUILTIN
++#endif
++
+ #if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5) )
+ #define pci_dma_sync_single_for_cpu	pci_dma_sync_single
+ #define pci_dma_sync_single_for_device	pci_dma_sync_single
diff --git a/net-wireless/ipw2100/ipw2100-1.1.0.ebuild b/net-wireless/ipw2100/ipw2100-1.1.0.ebuild
index 5bf470d60222..646e810a6c70 100644
--- a/net-wireless/ipw2100/ipw2100-1.1.0.ebuild
+++ b/net-wireless/ipw2100/ipw2100-1.1.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.1.0.ebuild,v 1.2 2005/04/28 15:03:36 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.1.0.ebuild,v 1.3 2005/05/05 19:55:41 brix Exp $
 
-inherit linux-mod eutils
+inherit eutils linux-mod
 
 FW_VERSION="1.3"
 
@@ -20,7 +20,6 @@ RDEPEND="=net-wireless/ipw2100-firmware-${FW_VERSION}
 		>=net-wireless/wireless-tools-27_pre23
 		!net-wireless/ipw2200"
 
-BUILD_PARAMS="KSRC=${KV_DIR}"
 BUILD_TARGETS="all"
 
 MODULE_NAMES="ipw2100(net:)
@@ -32,11 +31,11 @@ MODULE_NAMES="ipw2100(net:)
 MODULESD_IPW2100_DOCS="README.ipw2100"
 
 CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC FW_LOADER CRC32"
-NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-CRYPTO_ARC4_ERROR="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
-CRYPTO_MICHAEL_MIC_ERROR="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
-FW_LOADER_ERROR="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-CRC32_ERROR="${P} requires support for CRC32 functions (CONFIG_CRC32)."
+ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+ERROR_CRYPTO_ARC4="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
+ERROR_CRYPTO_MICHAEL_MIC="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
+ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
+ERROR_CRC32="${P} requires support for CRC32 functions (CONFIG_CRC32)."
 
 pkg_setup() {
 	if kernel_is 2 4; then
@@ -50,6 +49,8 @@ pkg_setup() {
 	fi
 
 	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KSRC=${KV_DIR}"
 }
 
 src_unpack() {
@@ -57,6 +58,9 @@ src_unpack() {
 
 	unpack ${A}
 
+	cd ${S}
+	epatch ${FILESDIR}/${P}-suspend2.patch
+
 	use debug && debug="y"
 	sed -i \
 		-e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=$debug:" \
diff --git a/net-wireless/ipw2200/ChangeLog b/net-wireless/ipw2200/ChangeLog
index 6d0569b73b3d..77291944f523 100644
--- a/net-wireless/ipw2200/ChangeLog
+++ b/net-wireless/ipw2200/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/ipw2200
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.30 2005/05/04 11:17:46 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.31 2005/05/05 19:57:16 brix Exp $
+
+  05 May 2005; <brix@gentoo.org> +files/ipw2200-1.0.3-suspend2.patch,
+  ipw2200-1.0.3.ebuild:
+  Allow compiling against Software Suspend 2.1.8.7 patched kernel,
+  restructured ebuild.
 
   04 May 2005; <brix@gentoo.org> ipw2200-1.0.3.ebuild:
   Stable on x86.
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.3-suspend2.patch b/net-wireless/ipw2200/files/ipw2200-1.0.3-suspend2.patch
new file mode 100644
index 000000000000..100b7a5b09b4
--- /dev/null
+++ b/net-wireless/ipw2200/files/ipw2200-1.0.3-suspend2.patch
@@ -0,0 +1,13 @@
+diff -urp ipw2200-1.0.3/ipw2200.h ipw2200-1.0.3-suspend2/ipw2200.h
+--- ipw2200-1.0.3/ipw2200.h	2005-04-08 23:36:51.000000000 +0200
++++ ipw2200-1.0.3-suspend2/ipw2200.h	2005-05-05 21:39:40.000000000 +0200
+@@ -65,7 +65,8 @@ typedef void irqreturn_t;
+ #endif
+ 
+ #if !defined(CONFIG_SOFTWARE_SUSPEND2_BUILTIN) && \
+-	(defined(CONFIG_SOFTWARE_SUSPEND2) || \
++	(defined(CONFIG_SUSPEND2) || \
++	defined(CONFIG_SOFTWARE_SUSPEND2) ||		\
+ 	defined(CONFIG_SOFTWARE_SUSPEND2_MODULE))
+ #define CONFIG_SOFTWARE_SUSPEND2_BUILTIN
+ #endif
diff --git a/net-wireless/ipw2200/ipw2200-1.0.3.ebuild b/net-wireless/ipw2200/ipw2200-1.0.3.ebuild
index c8c2a88d8009..0c7ef631bc4a 100644
--- a/net-wireless/ipw2200/ipw2200-1.0.3.ebuild
+++ b/net-wireless/ipw2200/ipw2200-1.0.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.3.ebuild,v 1.2 2005/05/04 11:17:46 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.3.ebuild,v 1.3 2005/05/05 19:57:16 brix Exp $
 
-inherit linux-mod
+inherit eutils linux-mod
 
 # The following works with both pre-releases and releases
 MY_P=${P/_/-}
@@ -24,7 +24,6 @@ RDEPEND="=net-wireless/ipw2200-firmware-${FW_VERSION}
 		net-wireless/wireless-tools
 		!net-wireless/ipw2100"
 
-BUILD_PARAMS="KSRC=${KV_DIR}"
 BUILD_TARGETS="all"
 
 MODULE_NAMES="ipw2200(net:)
@@ -36,11 +35,11 @@ MODULE_NAMES="ipw2200(net:)
 MODULESD_IPW2200_DOCS="README.ipw2200"
 
 CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC FW_LOADER CRC32"
-NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-CRYPTO_ARC4_ERROR="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
-CRYPTO_MICHAEL_MIC_ERROR="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
-FW_LOADER_ERROR="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-CRC32_ERROR="${P} requires support for CRC32 functions (CONFIG_CRC32)."
+ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+ERROR_CRYPTO_ARC4="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
+ERROR_CRYPTO_MICHAEL_MIC="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
+ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
+ERROR_CRC32="${P} requires support for CRC32 functions (CONFIG_CRC32)."
 
 pkg_setup() {
 	if kernel_is 2 4; then
@@ -54,6 +53,8 @@ pkg_setup() {
 	fi
 
 	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KSRC=${KV_DIR}"
 }
 
 src_unpack() {
@@ -61,6 +62,9 @@ src_unpack() {
 
 	unpack ${A}
 
+	cd ${S}
+	epatch ${FILESDIR}/${P}-suspend2.patch
+
 	use debug && debug="y"
 	sed -i \
 		-e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=$debug:" \